ErisPulse-OneBot11Adapter 3.7.0__tar.gz → 3.7.1__tar.gz

{erispulse_onebot11adapter-3.7.0 → erispulse_onebot11adapter-3.7.1}/ErisPulse_OneBot11Adapter.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ErisPulse-OneBot11Adapter
-Version: 3.7.0
+Version: 3.7.1
 Summary: ErisPulse的OneBotV11协议适配模块，异步的OneBot触发器
 Author-email: wsu2059q <wsu2059@qq.com>
 License: MIT License

{erispulse_onebot11adapter-3.7.0 → erispulse_onebot11adapter-3.7.1}/OneBotAdapter/Core.py

@@ -2,16 +2,14 @@
 import asyncio
 import json
 import aiohttp
-import base64
-import os
-import tempfile
-import uuid
-import filetype
 from fastapi import WebSocket, WebSocketDisconnect
-from typing import Dict, List, Optional, Union
+from typing import Any, Dict, List, Optional, Union
+from collections.abc import Awaitable
 from dataclasses import dataclass
 from ErisPulse import sdk
 from ErisPulse.Core import router
+from ErisPulse.Core.Bases.adapter import RequestDSL
+
 
 @dataclass
 class OneBotAccountConfig:
@@ -32,10 +30,24 @@ class OneBotAdapter(sdk.BaseAdapter):
     OneBot11 平台适配器实现
 
     使用 OneBot11 消息段数组格式，避免 CQ 码字符串拼接
+
+    {!--< tips >!--}
+    1. 支持多账户管理，每个账户有独立的 bot_id
+    2. 支持 self_id → account_name 自动映射，event.reply() 无需关心账户配置
+    3. 提供 WebSocket Server/Client 混合运行模式
+    4. 完整的 DSL 消息发送和请求操作接口
+    {!--< /tips >!--}
     """
 
     class Send(sdk.BaseAdapter.Send):
-        """消息发送DSL实现"""
+        """消息发送DSL实现
+
+        {!--< tips >!--}
+        1. 支持 Text/Image/Voice/Video/Face/File 发送方法
+        2. At/AtAll/Reply 修饰器自动转换为 OneBot11 消息段
+        3. Raw_ob12 自动将 OneBot12 消息段转换为 OneBot11 格式
+        {!--< /tips >!--}
+        """
 
         def __init__(self, adapter, target_type=None, target_id=None, account_id=None):
             super().__init__(adapter, target_type, target_id, account_id)
@@ -43,29 +55,16 @@ class OneBotAdapter(sdk.BaseAdapter):
             self._reply_message_id = None
             self._at_all = False
 
-        def _get_msg_type_by_filetype(self, file: Union[str, bytes]) -> str:
-            try:
-                if isinstance(file, bytes):
-                    kind = filetype.guess(file)
-                else:
-                    kind = filetype.guess(file)
-            except Exception:
-                kind = None
-
-            if kind is None:
-                return "image"
-            if kind.mime.startswith("image/"):
-                return "image"
-            elif kind.mime.startswith("audio/"):
-                return "record"
-            elif kind.mime.startswith("video/"):
-                return "video"
-            else:
-                return "image"
+        def _reset_modifiers(self):
+            self._at_user_ids = []
+            self._reply_message_id = None
+            self._at_all = False
 
-        def _build_message_array(self, message: Union[str, List[Dict]]) -> List[Dict]:
+        def _build_ob11_message(self, message: Union[str, List[Dict]]) -> List[Dict]:
+            """构建完整的 OneBot11 消息段数组（含修饰器）"""
             message_list = []
 
+            # 修饰器按顺序添加到消息段前
             if self._reply_message_id:
                 message_list.append(
                     {"type": "reply", "data": {"id": str(self._reply_message_id)}}
@@ -75,23 +74,22 @@ class OneBotAdapter(sdk.BaseAdapter):
                 message_list.append({"type": "at", "data": {"qq": "all"}})
 
             for user_info in self._at_user_ids:
-                user_id = user_info["qq"]
-                name = user_info.get("name")
-                at_data = {"qq": user_id}
-                if name:
-                    at_data["name"] = name
+                at_data = {"qq": user_info["qq"]}
+                if user_info.get("name"):
+                    at_data["name"] = user_info["name"]
                 message_list.append({"type": "at", "data": at_data})
 
+            # 消息内容
             if isinstance(message, str):
                 message_list.append({"type": "text", "data": {"text": message}})
             else:
-                for segment in message:
-                    message_list.append(segment)
+                message_list.extend(message)
 
             self._insert_text_separators(message_list)
             return message_list
 
         def _insert_text_separators(self, message_list: List[Dict]):
+            """在 at/text 段之间自动插入空格"""
             result = []
             for i, segment in enumerate(message_list):
                 seg_type = segment.get("type", "")
@@ -115,85 +113,115 @@ class OneBotAdapter(sdk.BaseAdapter):
             message_list.clear()
             message_list.extend(result)
 
-        def _reset_modifiers(self):
-            self._at_user_ids = []
-            self._reply_message_id = None
-            self._at_all = False
-
         # ============ 标准发送方法（委托给 Raw_ob12） ============
 
         def Text(self, text: str):
+            """发送文本消息"""
             return self.Raw_ob12([{"type": "text", "data": {"text": text}}])
 
         def Image(self, file: Union[str, bytes], filename: str = "image.png"):
+            """发送图片消息"""
             return self.Raw_ob12(
                 [{"type": "image", "data": {"file": file, "file_name": filename}}]
             )
 
         def Voice(self, file: Union[str, bytes], filename: str = "voice.amr"):
+            """发送语音消息"""
             return self.Raw_ob12(
                 [{"type": "audio", "data": {"file": file, "file_name": filename}}]
             )
 
         def Video(self, file: Union[str, bytes], filename: str = "video.mp4"):
+            """发送视频消息"""
             return self.Raw_ob12(
                 [{"type": "video", "data": {"file": file, "file_name": filename}}]
             )
 
         def Face(self, id: Union[str, int]):
+            """发送表情消息"""
             return self.Raw_ob12([{"type": "face", "data": {"id": str(id)}}])
 
         def File(self, file: Union[str, bytes], filename: str = "file.dat"):
+            """发送文件消息"""
             return self.Raw_ob12(
                 [{"type": "file", "data": {"file": file, "file_name": filename}}]
             )
 
+        # ============ Raw_ob12（反向转换核心） ============
+
         def Raw_ob12(self, message, **kwargs):
+            """
+            发送 OneBot12 格式消息段，自动转换为 OneBot11 格式
+
+            :param message: OneBot12 消息段（dict 或 list[dict]）
+            :param kwargs: 额外参数
+            :return: asyncio.Task
+            """
             if isinstance(message, dict):
                 message = [message]
 
-            ob11_message = self._convert_ob12_to_ob11(message)
+            # OneBot12 → OneBot11 格式转换
+            ob11_segments = self._convert_ob12_to_ob11(message)
 
-            if self._at_user_ids or self._at_all or self._reply_message_id:
-                ob11_message = self._build_message_array(ob11_message)
+            # 合并修饰器
+            has_modifiers = self._at_user_ids or self._at_all or self._reply_message_id
+            if has_modifiers:
+                ob11_message = self._build_ob11_message(ob11_segments)
             else:
-                self._insert_text_separators(ob11_message)
+                self._insert_text_separators(ob11_segments)
+                ob11_message = ob11_segments
 
             self._reset_modifiers()
 
-            return asyncio.create_task(
-                self._adapter.call_api(
-                    endpoint="send_msg",
-                    account_id=self._account_id,
-                    message_type="private" if self._target_type == "user" else "group",
-                    user_id=self._target_id if self._target_type == "user" else None,
-                    group_id=self._target_id if self._target_type == "group" else None,
-                    message=ob11_message,
-                    **kwargs,
-                )
-            )
+            async def _do_send():
+                params = {
+                    "endpoint": "send_msg",
+                    "account_id": self._account_id,
+                    "message_type": "private"
+                    if self._target_type == "user"
+                    else "group",
+                    "message": ob11_message,
+                }
+                if self._target_type == "user":
+                    params["user_id"] = self._target_id
+                else:
+                    params["group_id"] = self._target_id
+                params.update(kwargs)
+                return await self._adapter.call_api(**params)
+
+            return asyncio.create_task(_do_send())
+
+        # ============ 修饰器方法 ============
 
         def At(self, user_id: Union[str, int], name: str = None):
+            """@指定用户"""
             self._at_user_ids.append({"qq": str(user_id), "name": name})
             return self
 
         def AtAll(self):
+            """@全体成员"""
             self._at_all = True
             return self
 
         def Reply(self, message_id: Union[str, int]):
+            """回复指定消息"""
             self._reply_message_id = str(message_id)
             return self
 
+        # ============ 其他操作方法 ============
+
         def Recall(self, message_id: Union[str, int]):
+            """撤回消息"""
             return asyncio.create_task(
                 self._adapter.call_api(
                     endpoint="delete_msg",
                     account_id=self._account_id,
-                    message_id=message_id,
+                    message_id=str(message_id),
                 )
             )
 
+        # ============ 内部转换方法 ============
+
         def _convert_ob12_to_ob11(self, message: List[Dict]) -> List[Dict]:
             """
             将 OneBot12 消息段数组转换为 OneBot11 格式
@@ -207,28 +235,19 @@ class OneBotAdapter(sdk.BaseAdapter):
                 seg_type = segment.get("type", "")
                 seg_data = segment.get("data", {})
 
-                # 文本消息
                 if seg_type == "text":
                     ob11_message.append(
                         {"type": "text", "data": {"text": seg_data.get("text", "")}}
                     )
-
-                # 图片
                 elif seg_type == "image":
                     file = seg_data.get("file") or seg_data.get("url", "")
                     ob11_message.append({"type": "image", "data": {"file": file}})
-
-                # 语音/音频
-                elif seg_type == "audio" or seg_type == "record":
+                elif seg_type in ("audio", "record"):
                     file = seg_data.get("file") or seg_data.get("url", "")
                     ob11_message.append({"type": "record", "data": {"file": file}})
-
-                # 视频
                 elif seg_type == "video":
                     file = seg_data.get("file") or seg_data.get("url", "")
                     ob11_message.append({"type": "video", "data": {"file": file}})
-
-                # 文件
                 elif seg_type == "file":
                     file = seg_data.get("file") or seg_data.get("url", "")
                     file_name = seg_data.get("file_name", "")
@@ -236,33 +255,84 @@ class OneBotAdapter(sdk.BaseAdapter):
                     if file_name:
                         data["name"] = file_name
                     ob11_message.append({"type": "file", "data": data})
-
-                # 表情
                 elif seg_type == "face":
-                    face_id = seg_data.get("id", "")
-                    ob11_message.append({"type": "face", "data": {"id": face_id}})
-
-                # @用户（mention）
+                    ob11_message.append(
+                        {"type": "face", "data": {"id": seg_data.get("id", "")}}
+                    )
                 elif seg_type == "mention":
-                    user_id = seg_data.get("user_id", "")
-                    ob11_message.append({"type": "at", "data": {"qq": str(user_id)}})
-
-                # 回复
+                    ob11_message.append(
+                        {"type": "at", "data": {"qq": str(seg_data.get("user_id", ""))}}
+                    )
                 elif seg_type == "reply":
-                    msg_id = seg_data.get("message_id", "")
-                    ob11_message.append({"type": "reply", "data": {"id": msg_id}})
-
-                # OneBot11 扩展消息段（直接保留）
+                    ob11_message.append(
+                        {
+                            "type": "reply",
+                            "data": {"id": seg_data.get("message_id", "")},
+                        }
+                    )
                 elif seg_type.startswith("onebot11_"):
-                    cq_type = seg_type[10:]  # 去掉 onebot11_ 前缀
+                    cq_type = seg_type[10:]
                     ob11_message.append({"type": cq_type, "data": seg_data})
-
-                # 其他未知类型，直接保留
                 else:
                     ob11_message.append({"type": seg_type, "data": seg_data})
 
             return ob11_message
 
+    class Request(RequestDSL):
+        """请求操作实现（好友请求、群邀请等）
+
+        {!--< tips >!--}
+        1. 使用 adapter.Request("flag").accept() 同意请求
+        2. 使用 adapter.Request("flag").reject() 拒绝请求
+        3. 通过 event.approve() / event.reject() 便捷操作
+        {!--< /tips >!--}
+        """
+
+        def accept(self, **kwargs):
+            """同意请求"""
+            return self._create_task(self._do_action(approve=True, **kwargs))
+
+        def reject(self, **kwargs):
+            """拒绝请求"""
+            return self._create_task(self._do_action(approve=False, **kwargs))
+
+        async def _do_action(self, approve: bool, **kwargs) -> dict[str, Any]:
+            """
+            执行请求操作
+
+            :param approve: 是否同意
+            :param kwargs: 额外参数（如 comment 备注）
+            :return: 标准响应格式
+            """
+            try:
+                result = await self._adapter.call_api(
+                    endpoint="set_friend_add_request"
+                    if kwargs.get("_request_type") != "group"
+                    else "set_group_add_request",
+                    account_id=self._account_id,
+                    flag=self._request_id,
+                    approve=approve,
+                    **{k: v for k, v in kwargs.items() if not k.startswith("_")},
+                )
+
+                return {
+                    "status": result.get("status", "ok"),
+                    "retcode": result.get("retcode", 0),
+                    "data": result.get("data"),
+                    "message_id": "",
+                    "message": result.get("message", ""),
+                    "onebot11_raw": result.get("onebot11_raw", result),
+                }
+            except Exception as e:
+                return {
+                    "status": "failed",
+                    "retcode": 34000,
+                    "data": None,
+                    "message_id": "",
+                    "message": str(e),
+                    "onebot11_raw": None,
+                }
+
     def __init__(self, sdk):
         super().__init__()
         self.sdk = sdk
@@ -272,6 +342,10 @@ class OneBotAdapter(sdk.BaseAdapter):
         # 加载配置
         self.accounts: Dict[str, OneBotAccountConfig] = self._load_account_configs()
 
+        # 映射: raw self_id (OneBot事件中的真实ID) → account_name
+        # 收到事件时自动填充，call_api 据此解析 account_id
+        self._self_id_map: Dict[str, str] = {}
+
         # 连接池 - 每个账户一个连接
         self._api_response_futures: Dict[str, Dict[str, asyncio.Future]] = {}
         self.sessions: Dict[str, aiohttp.ClientSession] = {}
@@ -287,8 +361,12 @@ class OneBotAdapter(sdk.BaseAdapter):
         self.default_retry_interval = 30
         self.default_timeout = 30
 
+        # 转换器
         self.convert = self._setup_converter()
 
+        # 注册平台事件扩展方法
+        self._register_event_methods()
+
     def _setup_converter(self):
         """设置转换器"""
         from .Converter import OneBot11Converter
@@ -296,6 +374,48 @@ class OneBotAdapter(sdk.BaseAdapter):
         converter = OneBot11Converter()
         return converter.convert
 
+    def _register_event_methods(self):
+        """注册 OneBot11 平台特有的 Event 方法"""
+        try:
+            from ErisPulse.Core.Event import register_event_mixin
+
+            class OneBot11EventMixin:
+                """OneBot11 平台事件扩展方法"""
+
+                def get_raw_self_id(self) -> str:
+                    """获取 OneBot 原始 self_id（机器人真实 QQ 号）"""
+                    return self.get("self", {}).get("user_id", "")
+
+                def get_sender_info(self) -> dict:
+                    """获取完整发送者信息"""
+                    return self.get("onebot11_raw", {}).get("sender", {})
+
+                def get_sender_role(self) -> str:
+                    """获取发送者在群中的角色（owner/admin/member）"""
+                    return (
+                        self.get("onebot11_raw", {}).get("sender", {}).get("role", "")
+                    )
+
+                def get_sender_level(self) -> int:
+                    """获取发送者等级"""
+                    return (
+                        self.get("onebot11_raw", {}).get("sender", {}).get("level", 0)
+                    )
+
+                def get_sender_title(self) -> str:
+                    """获取发送者群头衔"""
+                    return (
+                        self.get("onebot11_raw", {}).get("sender", {}).get("title", "")
+                    )
+
+                def is_system_message(self) -> bool:
+                    """判断是否为系统消息"""
+                    return self.get("sub_type") == "system"
+
+            register_event_mixin("onebot11", OneBot11EventMixin)
+        except Exception as e:
+            self.logger.warning(f"注册 OneBot11 事件扩展方法失败: {e}")
+
     def _load_account_configs(self) -> Dict[str, OneBotAccountConfig]:
         """加载多账户配置"""
         accounts = {}
@@ -354,7 +474,7 @@ class OneBotAdapter(sdk.BaseAdapter):
                 continue
 
             accounts[account_name] = OneBotAccountConfig(
-                bot_id=config["bot_id"],
+                bot_id=str(config["bot_id"]),
                 mode=config.get("mode", "server"),
                 server_path=config.get("server_path", "/"),
                 server_token=config.get("server_token", ""),
@@ -367,32 +487,52 @@ class OneBotAdapter(sdk.BaseAdapter):
         self.logger.info(f"OneBot11适配器初始化完成，加载 {len(accounts)} 个账户")
         return accounts
 
+    def _resolve_account(self, account_id: str = None) -> tuple:
+        """
+        解析账户，返回 (account_config, account_name)
+
+        查找顺序：
+        1. 账户名精确匹配
+        2. self_id 映射匹配（OneBot 事件中的真实 ID）
+        3. bot_id 匹配
+        4. 回退到第一个可用账户（仅当 account_id 为 None 时）
+
+        :param account_id: 账户标识（账户名 / self_id / bot_id）
+        :return: (OneBotAccountConfig, account_name)
+        :raises ValueError: 找不到匹配的账户
+        """
+        if account_id is None:
+            if not self.accounts:
+                raise ValueError("没有配置任何OneBot账户")
+            account_name = next(iter(self.accounts.keys()))
+            return self.accounts[account_name], account_name
+
+        # 1. 账户名精确匹配
+        if account_id in self.accounts:
+            return self.accounts[account_id], account_id
+
+        # 2. self_id 映射匹配
+        if str(account_id) in self._self_id_map:
+            account_name = self._self_id_map[str(account_id)]
+            return self.accounts[account_name], account_name
+
+        # 3. bot_id 匹配
+        for account_name, acc_config in self.accounts.items():
+            if str(acc_config.bot_id) == str(account_id):
+                return acc_config, account_name
+
+        raise ValueError(f"找不到账户 {account_id}")
+
     async def call_api(self, endpoint: str, account_id: str = None, **params):
         """
         调用 OneBot API
 
         :param endpoint: API端点
-        :param account_id: 账户名或bot_id
+        :param account_id: 账户名 / self_id / bot_id（可选）
         :param params: 其他参数
         :return: 标准化响应
         """
-        # 确定使用的账户
-        if account_id is None:
-            if not self.accounts:
-                raise ValueError("没有配置任何OneBot账户")
-            account = next(iter(self.accounts.values()))
-            account_name = next(iter(self.accounts.keys()))
-        else:
-            if account_id in self.accounts:
-                account = self.accounts[account_id]
-                account_name = account_id
-            else:
-                for account_name, acc_config in self.accounts.items():
-                    if acc_config.bot_id == account_id:
-                        account = acc_config
-                        break
-                else:
-                    raise ValueError(f"找不到账户 {account_id}")
+        account, account_name = self._resolve_account(account_id)
 
         if not account.enabled:
             raise ValueError(f"账户 {account_name} 已禁用")
@@ -401,14 +541,14 @@ class OneBotAdapter(sdk.BaseAdapter):
         if not connection:
             raise ConnectionError(f"账户 {account_name} 尚未连接")
 
-        if connection.closed:
+        if hasattr(connection, "closed") and connection.closed:
             raise ConnectionError(f"账户 {account_name} 的连接已关闭")
 
         # 创建响应Future
         if account_name not in self._api_response_futures:
             self._api_response_futures[account_name] = {}
 
-        echo = str(hash((str(params), account_name)))
+        echo = str(hash((str(params), account_name, endpoint)))
         future = asyncio.get_event_loop().create_future()
         self._api_response_futures[account_name][echo] = future
 
@@ -417,14 +557,29 @@ class OneBotAdapter(sdk.BaseAdapter):
         try:
             await connection.send_str(json.dumps(payload))
         except Exception as e:
-            self.logger.error(f"账户 {account_name} 发送请求失败: {str(e)}")
+            self.logger.error(
+                f"账户 {account_name} (bot_id: {account.bot_id}) 发送请求失败: {str(e)}"
+            )
             if echo in self._api_response_futures[account_name]:
                 del self._api_response_futures[account_name][echo]
             raise
 
         try:
+            self.logger.debug(
+                f"账户 {account_name} (bot_id: {account.bot_id}) 请求: {payload}"
+            )
+
             raw_response = await asyncio.wait_for(future, timeout=self.default_timeout)
 
+            self.logger.debug(
+                f"账户 {account_name} (bot_id: {account.bot_id}) 响应: {raw_response}"
+            )
+
+            # 从 data 中提取 message_id（OneBot11 标准）
+            message_id = ""
+            if isinstance(raw_response.get("data"), dict):
+                message_id = str(raw_response["data"].get("message_id", ""))
+
             # 标准化响应
             status = "ok"
             retcode = raw_response.get("retcode", 0)
@@ -435,9 +590,9 @@ class OneBotAdapter(sdk.BaseAdapter):
                 "status": status,
                 "retcode": retcode,
                 "data": raw_response.get("data"),
-                "message_id": str(raw_response.get("message_id", "")),
+                "message_id": message_id,
                 "message": raw_response.get("message", ""),
-                "onebot_raw": raw_response,
+                "onebot11_raw": raw_response,
                 "self": {"user_id": account.bot_id},
             }
 
@@ -447,7 +602,9 @@ class OneBotAdapter(sdk.BaseAdapter):
             return standardized_response
 
         except asyncio.TimeoutError:
-            self.logger.error(f"账户 {account_name} API调用超时: {endpoint}")
+            self.logger.error(
+                f"账户 {account_name} (bot_id: {account.bot_id}) API调用超时: {endpoint}"
+            )
             if not future.done():
                 future.cancel()
 
@@ -456,8 +613,8 @@ class OneBotAdapter(sdk.BaseAdapter):
                 "retcode": 33001,
                 "data": None,
                 "message_id": "",
-                "message": f"账户 {account_name} API调用超时: {endpoint}",
-                "onebot_raw": None,
+                "message": f"账户 {account_name} (bot_id: {account.bot_id}) API调用超时: {endpoint}",
+                "onebot11_raw": None,
                 "self": {"user_id": account.bot_id},
             }
 
@@ -516,7 +673,9 @@ class OneBotAdapter(sdk.BaseAdapter):
                 asyncio.create_task(self._listen(account_name))
                 return
             except Exception as e:
-                self.logger.error(f"账户 {account_name} 连接失败: {str(e)}")
+                self.logger.error(
+                    f"账户 {account_name} (bot_id: {account.bot_id}) 连接失败: {str(e)}"
+                )
                 await asyncio.sleep(retry_interval)
 
     async def _listen(self, account_name: str):
@@ -532,12 +691,18 @@ class OneBotAdapter(sdk.BaseAdapter):
                 if msg.type == aiohttp.WSMsgType.TEXT:
                     asyncio.create_task(self._handle_message(msg.data, account_name))
                 elif msg.type == aiohttp.WSMsgType.CLOSED:
-                    self.logger.info(f"账户 {account_name} 连接已关闭")
+                    self.logger.info(
+                        f"账户 {account_name} (bot_id: {account.bot_id}) 连接已关闭"
+                    )
                     break
                 elif msg.type == aiohttp.WSMsgType.ERROR:
-                    self.logger.error(f"账户 {account_name} WebSocket错误")
+                    self.logger.error(
+                        f"账户 {account_name} (bot_id: {account.bot_id}) WebSocket错误"
+                    )
         except Exception as e:
-            self.logger.error(f"账户 {account_name} 监听异常: {str(e)}")
+            self.logger.error(
+                f"账户 {account_name} (bot_id: {account.bot_id}) 监听异常: {str(e)}"
+            )
         finally:
             try:
                 await self.adapter.emit(
@@ -557,7 +722,9 @@ class OneBotAdapter(sdk.BaseAdapter):
                 del self.connections[account_name]
 
             if self._is_running and account.enabled and account.mode == "client":
-                self.logger.info(f"账户 {account_name} 开始重连...")
+                self.logger.info(
+                    f"账户 {account_name} (bot_id: {account.bot_id}) 开始重连..."
+                )
                 self.reconnect_tasks[account_name] = asyncio.create_task(
                     self.connect(account_name)
                 )
@@ -583,10 +750,13 @@ class OneBotAdapter(sdk.BaseAdapter):
             if hasattr(self.adapter, "emit"):
                 onebot_event = self.convert(data)
                 if onebot_event:
-                    if "self" not in onebot_event or not onebot_event.get(
-                        "self", {}
-                    ).get("user_id"):
-                        onebot_event["self"] = {"user_id": account.bot_id}
+                    # 记录 self_id → account_name 映射（用于 event.reply() 回路）
+                    raw_self_id = onebot_event.get("self", {}).get("user_id", "")
+                    if raw_self_id and str(raw_self_id) not in self._self_id_map:
+                        self._self_id_map[str(raw_self_id)] = account_name
+                        self.logger.info(
+                            f"映射 self_id {raw_self_id} → 账户 {account_name}"
+                        )
                     await self.adapter.emit(onebot_event)
 
         except json.JSONDecodeError:
@@ -621,9 +791,13 @@ class OneBotAdapter(sdk.BaseAdapter):
                 data = await websocket.receive_text()
                 asyncio.create_task(self._handle_message(data, account_name))
         except WebSocketDisconnect:
-            self.logger.info(f"账户 {account_name} 客户端断开连接")
+            self.logger.info(
+                f"账户 {account_name} (bot_id: {account.bot_id}) 客户端断开连接"
+            )
         except Exception as e:
-            self.logger.error(f"账户 {account_name} WebSocket处理异常: {str(e)}")
+            self.logger.error(
+                f"账户 {account_name} (bot_id: {account.bot_id}) WebSocket处理异常: {str(e)}"
+            )
         finally:
             try:
                 await self.adapter.emit(
@@ -658,7 +832,9 @@ class OneBotAdapter(sdk.BaseAdapter):
                 client_token = query.get("token", "")
 
             if client_token != account.server_token:
-                self.logger.warning(f"账户 {account_name} Token无效")
+                self.logger.warning(
+                    f"账户 {account_name} (bot_id: {account.bot_id}) Token无效"
+                )
                 await websocket.close(code=1008)
                 return False
         return True
@@ -687,7 +863,9 @@ class OneBotAdapter(sdk.BaseAdapter):
                     make_ws_handler(account_name),
                     auth_handler=make_auth_handler(account_name),
                 )
-                self.logger.info(f"已注册账户 {account_name} 的Server路由: {path}")
+                self.logger.info(
+                    f"已注册账户 {account_name} (bot_id: {account.bot_id}) 的Server路由: {path}"
+                )
 
     async def start(self):
         """启动适配器"""
@@ -708,6 +886,10 @@ class OneBotAdapter(sdk.BaseAdapter):
             await self.register_websocket()
 
         for account_name in client_accounts:
+            account = self.accounts[account_name]
+            self.logger.info(
+                f"启动Client模式账户: {account_name} (bot_id: {account.bot_id})"
+            )
             self.reconnect_tasks[account_name] = asyncio.create_task(
                 self.connect(account_name)
             )
@@ -719,24 +901,41 @@ class OneBotAdapter(sdk.BaseAdapter):
         """关闭适配器"""
         self._is_running = False
 
+        # 取消重连任务
         for task in self.reconnect_tasks.values():
             if not task.done():
                 task.cancel()
         self.reconnect_tasks.clear()
 
+        # 关闭所有连接
         for account_name, connection in self.connections.items():
+            account = self.accounts.get(account_name)
             try:
-                if not connection.closed:
+                if hasattr(connection, "closed") and not connection.closed:
                     await connection.close()
             except Exception as e:
-                self.logger.error(f"关闭连接失败: {str(e)}")
+                self.logger.error(
+                    f"关闭账户 {account_name} (bot_id: {account.bot_id}) 连接失败: {str(e)}"
+                )
         self.connections.clear()
 
-        for session in self.sessions.values():
+        # 关闭所有 session
+        for account_name, session in self.sessions.items():
+            account = self.accounts.get(account_name)
             try:
                 await session.close()
             except Exception as e:
-                self.logger.error(f"关闭session失败: {str(e)}")
+                self.logger.error(
+                    f"关闭账户 {account_name} (bot_id: {account.bot_id}) session失败: {str(e)}"
+                )
         self.sessions.clear()
 
+        # 清理平台事件方法注册
+        try:
+            from ErisPulse.Core.Event import unregister_platform_event_methods
+
+            unregister_platform_event_methods("onebot11")
+        except Exception:
+            pass
+
         self.logger.info("OneBot11适配器已关闭")

{erispulse_onebot11adapter-3.7.0 → erispulse_onebot11adapter-3.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ErisPulse-OneBot11Adapter
-Version: 3.7.0
+Version: 3.7.1
 Summary: ErisPulse的OneBotV11协议适配模块，异步的OneBot触发器
 Author-email: wsu2059q <wsu2059@qq.com>
 License: MIT License

{erispulse_onebot11adapter-3.7.0 → erispulse_onebot11adapter-3.7.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ErisPulse-OneBot11Adapter"
-version = "3.7.0"
+version = "3.7.1"
 description = "ErisPulse的OneBotV11协议适配模块，异步的OneBot触发器"
 readme = "README.md"
 requires-python = ">=3.10"