Update get_msg.py

get_msg.py

@@ -239,53 +239,94 @@ def format_json_with_timestamps(value: Any, key: str | None = None) -> Any:
     return value
 
 
-def print_create_message(payload: list[Any]) -> None:
+def _print_message_entity(tag: str, entity: dict[str, Any]) -> None:
+    """メッセージ entity の中身を整形してログ出力する共通処理。"""
+    for key in (
+        "chatKey", "id", "mainKey", "channelId", "chatType", "chatId",
+        "hubId", "personType", "personId", "language", "plainText",
+        "writingType",
+    ):
+        log(tag, f"{key:<11}: {entity.get(key)}")
+    for key in ("createdAt", "updatedAt"):
+        if key in entity:
+            log(tag, f"{key:<11}: {timestamp_to_text(entity[key])}")
+    blocks = entity.get("blocks")
+    if blocks:
+        log(tag, "blocks:")
+        for index, block in enumerate(blocks, 1):
+            if isinstance(block, dict):
+                log(
+                    tag,
+                    f"  [{index}] type={block.get('type')} "
+                    f"value={block.get('value')!r}",
+                )
+            else:
+                log(tag, f"  [{index}] {block!r}")
+
+
+def print_push_message(payload: list[Any]) -> None:
+    """push イベントの payload をパースして表示する。
+
+    想定フォーマット:
+      42/desk/channel,["push",{"event":"push","entity":{...},
+                               "type":"message","refers":{...}}]
+    すなわち payload = ["push", {"event":..., "entity":..., "type":..., "refers":...}]
+    """
     if len(payload) < 2:
-        log_block("CREATE", "payload", json.dumps(payload, ensure_ascii=False, indent=2))
+        log_block("PUSH", "payload", json.dumps(payload, ensure_ascii=False, indent=2))
         return
 
     event_name = payload[0]
-    entity_wrapper = payload[1]
-    log("CREATE", f"受信イベント: {event_name}")
+    wrapper = payload[1]
+    log("PUSH", f"受信イベント: {event_name}")
 
-    if not isinstance(entity_wrapper, dict):
+    if not isinstance(wrapper, dict):
         log_block(
-            "CREATE",
-            "entity_wrapper",
+            "PUSH",
+            "wrapper",
             json.dumps(
-                format_json_with_timestamps(entity_wrapper),
+                format_json_with_timestamps(wrapper),
                 ensure_ascii=False,
                 indent=2,
             ),
         )
         return
 
-    entity = entity_wrapper.get("entity", {})
+    if "type" in wrapper:
+        log("PUSH", f"type       : {wrapper.get('type')}")
+    if "event" in wrapper:
+        log("PUSH", f"event      : {wrapper.get('event')}")
+
+    entity = wrapper.get("entity", {})
     if isinstance(entity, dict):
-        for key in (
-            "chatKey", "id", "mainKey", "channelId", "chatType", "chatId",
-            "hubId", "personType", "personId", "language", "plainText",
-            "writingType",
-        ):
-            log("CREATE", f"{key:<11}: {entity.get(key)}")
-        for key in ("createdAt", "updatedAt"):
-            if key in entity:
-                log("CREATE", f"{key:<11}: {timestamp_to_text(entity[key])}")
-        blocks = entity.get("blocks")
-        if blocks:
-            log("CREATE", "blocks:")
-            for index, block in enumerate(blocks, 1):
-                if isinstance(block, dict):
-                    log(
-                        "CREATE",
-                        f"  [{index}] type={block.get('type')} "
-                        f"value={block.get('value')!r}",
-                    )
-                else:
-                    log("CREATE", f"  [{index}] {block!r}")
+        _print_message_entity("PUSH", entity)
+
+    refers = wrapper.get("refers")
+    if isinstance(refers, dict):
+        manager = refers.get("manager")
+        if isinstance(manager, dict):
+            log(
+                "PUSH",
+                "refers.manager: "
+                f"id={manager.get('id')} name={manager.get('name')!r}",
+            )
+        channel = refers.get("channel")
+        if isinstance(channel, dict):
+            log(
+                "PUSH",
+                "refers.channel: "
+                f"id={channel.get('id')} name={channel.get('name')!r}",
+            )
+        group = refers.get("group")
+        if isinstance(group, dict):
+            log(
+                "PUSH",
+                "refers.group  : "
+                f"id={group.get('id')} title={group.get('title')!r}",
+            )
 
     log_block(
-        "CREATE",
+        "PUSH",
         "詳細JSON",
         json.dumps(
             format_json_with_timestamps(payload),
@@ -573,7 +614,12 @@ def channel_worker(
                         phase_started_at = time.monotonic()
 
                 elif event_name == "create":
-                    print_create_message(payload)
+                    # create はパースせず生パケットをそのままログ出力
+                    log_block("CREATE", "raw packet", packet)
+
+                elif event_name == "push":
+                    # push をパースしてメッセージを表示
+                    print_push_message(payload)
 
                 elif event_name == "expired":
                     log("CHANNEL", "expired を受信しました。接続を終了します。")
@@ -582,6 +628,8 @@ def channel_worker(
         log("CHANNEL", f"エラーで終了: {exc!r}")
     finally:
         ws.close()
+
+
 def account_worker(
     token_holder: dict[str, str],
     client: ChannelWorksClient,