优化日志

2025-11-26 21:16:16 +08:00
parent e0157256b1
commit 0908fb50a0
100 changed files with 493 additions and 574 deletions
--- a/src/plugins/built_in/napcat_adapter/plugin.py
+++ b/src/plugins/built_in/napcat_adapter/plugin.py
@@ -41,7 +41,7 @@ class NapcatAdapter(BaseAdapter):
    adapter_description = "基于 MoFox-Bus 的 Napcat/OneBot 11 适配器"
    platform = "qq"

-    run_in_subprocess = False
+    run_in_subprocess = True

    def __init__(self, core_sink: CoreSink, plugin: Optional[BasePlugin] = None, **kwargs):
        """初始化 Napcat 适配器"""
--- a/src/plugins/built_in/napcat_adapter/src/handlers/to_core/message_handler.py
+++ b/src/plugins/built_in/napcat_adapter/src/handlers/to_core/message_handler.py
@@ -25,7 +25,7 @@ from ..utils import *
 if TYPE_CHECKING:
    from ....plugin import NapcatAdapter

-logger = get_logger("napcat_adapter.message_handler")
+logger = get_logger("napcat_adapter")


 class MessageHandler:
@@ -234,27 +234,29 @@ class MessageHandler:
            return {"type": "text", "data": "[无法获取被引用的消息]"}

        # 递归处理被引用的消息
-        reply_segments = []
+        reply_segments: List[SegPayload] = []
        for reply_seg in message_detail.get("message", []):
            if isinstance(reply_seg, dict):
                reply_result = await self.handle_single_segment(reply_seg, raw_message, in_reply=True)
                if reply_result:
                    reply_segments.append(reply_result)

-        if not reply_segments:
-            reply_text = "[无法获取被引用的消息]"
-        else:
-            # 简化处理，只取第一个segment的data
-            reply_text = reply_segments[0].get("data", "") if reply_segments else ""
-
        sender_info = message_detail.get("sender", {})
-        sender_nickname = sender_info.get("nickname", "未知用户")
+        sender_nickname = sender_info.get("nickname") or "未知用户"
        sender_id = sender_info.get("user_id")

-        if sender_id:
-            return {"type": "text", "data": f"[回复<{sender_nickname}({sender_id})>：{reply_text}]，说："}
-        else:
-            return {"type": "text", "data": f"[回复<{sender_nickname}>：{reply_text}]，说："}
+        prefix_text = f"[回复<{sender_nickname}({sender_id})>：" if sender_id else f"[回复<{sender_nickname}>："
+        suffix_text = "]，说："
+
+        # 将被引用的消息段落转换为可读的文本占位，避免嵌套的 base64 污染
+        brief_segments = [
+            {"type": seg.get("type", "text"), "data": seg.get("data", "")} for seg in reply_segments
+        ] or [{"type": "text", "data": "[无法获取被引用的消息]"}]
+
+        return {
+            "type": "seglist",
+            "data": [{"type": "text", "data": prefix_text}, *brief_segments, {"type": "text", "data": suffix_text}],
+        }

    async def _handle_record_message(self, segment: dict) -> SegPayload | None:
        """处理语音消息"""
--- a/src/plugins/built_in/napcat_adapter/src/handlers/to_core/meta_event_handler.py
+++ b/src/plugins/built_in/napcat_adapter/src/handlers/to_core/meta_event_handler.py
@@ -12,7 +12,7 @@ from ...event_models import MetaEventType
 if TYPE_CHECKING:
    from ....plugin import NapcatAdapter

-logger = get_logger("napcat_adapter.meta_event_handler")
+logger = get_logger("napcat_adapter")


 class MetaEventHandler:
--- a/src/plugins/built_in/napcat_adapter/src/handlers/to_core/notice_handler.py
+++ b/src/plugins/built_in/napcat_adapter/src/handlers/to_core/notice_handler.py
@@ -9,7 +9,7 @@ from src.common.logger import get_logger
 if TYPE_CHECKING:
    from ...plugin import NapcatAdapter

-logger = get_logger("napcat_adapter.notice_handler")
+logger = get_logger("napcat_adapter")


 class NoticeHandler:
--- a/src/plugins/built_in/napcat_adapter/src/handlers/to_napcat/send_handler.py
+++ b/src/plugins/built_in/napcat_adapter/src/handlers/to_napcat/send_handler.py
@@ -13,7 +13,7 @@ from src.plugin_system.apis import config_api
 from ...event_models import CommandType
 from ..utils import convert_image_to_gif, get_image_format

-logger = get_logger("napcat_adapter.send_handler")
+logger = get_logger("napcat_adapter")

 if TYPE_CHECKING:
    from ....plugin import NapcatAdapter
@@ -59,7 +59,6 @@ class SendHandler:
                logger.info("收到adapter_response消息，此消息应该由Bot端处理，跳过")
                return None

-        logger.info("处理普通消息")
        return await self.send_normal_message(envelope)

    async def send_normal_message(self, envelope: MessageEnvelope) -> None:
@@ -104,7 +103,6 @@ class SendHandler:
        else:
            logger.error("无法识别的消息类型")
            return
-        logger.info("尝试发送到napcat")
        logger.debug(
            f"准备发送到napcat的消息体: action='{action}', {id_name}='{target_id}', message='{processed_message}'"
        )
@@ -124,7 +122,7 @@ class SendHandler:
        """
        处理命令类
        """
-        logger.info("处理命令中")
+        logger.debug("处理命令中")
        message_info: Dict[str, Any] = envelope.get("message_info", {})
        group_info: Optional[Dict[str, Any]] = message_info.get("group_info")
        segment: SegPayload = envelope.get("message_segment", {})  # type: ignore[assignment]
@@ -164,9 +162,9 @@ class SendHandler:
            logger.error("命令或参数缺失")
            return None

-        logger.info(f"准备向 Napcat 发送命令: command='{command}', args_dict='{args_dict}'")
+        logger.debug(f"准备向 Napcat 发送命令: command='{command}', args_dict='{args_dict}'")
        response = await self.send_message_to_napcat(command, args_dict)
-        logger.info(f"收到 Napcat 的命令响应: {response}")
+        logger.debug(f"收到 Napcat 的命令响应: {response}")

        if response.get("status") == "ok":
            logger.info(f"命令 {command_name} 执行成功")
@@ -191,7 +189,7 @@ class SendHandler:
                logger.error("适配器命令缺少action参数")
                return

-            logger.info(f"执行适配器命令: {action}")
+            logger.debug(f"执行适配器命令: {action}")

            if action == "get_cookies":
                response = await self.send_message_to_napcat(action, params, timeout=40.0)
@@ -241,7 +239,6 @@ class SendHandler:
            target_id = str(target_id)
            if target_id == "notice":
                return payload
-            logger.info(target_id if isinstance(target_id, str) else "")
            new_payload = self.build_payload(payload, await self.handle_reply_message(target_id, user_info), True)
        elif seg_type == "text":
            text = seg.get("data")
@@ -324,22 +321,22 @@ class SendHandler:

            if not replied_user_id:
                logger.warning(f"无法获取消息 {message_id} 的发送者信息，跳过 @")
-                logger.info(f"最终返回的回复段: {reply_seg}")
+                logger.debug(f"最终返回的回复段: {reply_seg}")
                return reply_seg

            if random.random() < config_api.get_plugin_config(self.plugin_config, "features.reply_at_rate", 0.5):
                at_seg = {"type": "at", "data": {"qq": str(replied_user_id)}}
                text_seg = {"type": "text", "data": {"text": " "}}
                result_seg = [reply_seg, at_seg, text_seg]
-                logger.info(f"最终返回的回复段: {result_seg}")
+                logger.debug(f"最终返回的回复段: {result_seg}")
                return result_seg

        except Exception as e:
            logger.error(f"处理引用回复并尝试@时出错: {e}")
-            logger.info(f"最终返回的回复段: {reply_seg}")
+            logger.debug(f"最终返回的回复段: {reply_seg}")
            return reply_seg

-        logger.info(f"最终返回的回复段: {reply_seg}")
+        logger.debug(f"最终返回的回复段: {reply_seg}")
        return reply_seg

    def handle_text_message(self, message: str) -> dict:
--- a/src/plugins/built_in/napcat_adapter/src/handlers/utils.py
+++ b/src/plugins/built_in/napcat_adapter/src/handlers/utils.py
@@ -90,7 +90,7 @@ async def _set_cached(section: str, key: str, data: Any) -> None:
        try:
            _save_cache_to_disk_locked()
        except Exception:
-            logger.debug("Write napcat cache failed", exc_info=True)
+            logger.debug("Write napcat cache failed")


 def _get_adapter(adapter: "NapcatAdapter | None" = None) -> "NapcatAdapter":