From 049027a48f5d10652e39924546cf7f3d3132af82 Mon Sep 17 00:00:00 2001 From: UnCLAS-Prommer Date: Thu, 5 Feb 2026 16:53:48 +0800 Subject: [PATCH] =?UTF-8?q?maim=5Fmessage=E5=BC=BA=E5=88=B6=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E8=A6=81=E6=B1=82=EF=BC=9B=E5=BF=BD=E7=95=A5APIServer?= =?UTF-8?q?=E4=B8=8B=E4=B9=B1=E4=B8=83=E5=85=AB=E7=B3=9F=E7=9A=84=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E6=B3=A8=E8=A7=A3=E5=92=8CPatch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../message_receive/uni_message_sender.py | 2 +- .../{message => message_server}/__init__.py | 6 +- src/common/{message => message_server}/api.py | 113 +++++++----------- src/common/{ => message_server}/server.py | 0 src/main.py | 2 +- 5 files changed, 50 insertions(+), 73 deletions(-) rename src/common/{message => message_server}/__init__.py (59%) rename src/common/{message => message_server}/api.py (68%) rename src/common/{ => message_server}/server.py (100%) diff --git a/src/chat/message_receive/uni_message_sender.py b/src/chat/message_receive/uni_message_sender.py index b8e139fe..9d939395 100644 --- a/src/chat/message_receive/uni_message_sender.py +++ b/src/chat/message_receive/uni_message_sender.py @@ -4,7 +4,7 @@ import traceback from rich.traceback import install from maim_message import Seg -from src.common.message.api import get_global_api +from src.common.message_server.api import get_global_api from src.common.logger import get_logger from src.chat.message_receive.message import MessageSending from src.chat.message_receive.storage import MessageStorage diff --git a/src/common/message/__init__.py b/src/common/message_server/__init__.py similarity index 59% rename from src/common/message/__init__.py rename to src/common/message_server/__init__.py index 160456b0..2e041c95 100644 --- a/src/common/message/__init__.py +++ b/src/common/message_server/__init__.py @@ -1,10 +1,8 @@ """Maim Message - A message handling library""" -__version__ = "0.1.0" +__version__ = "0.2.0" from .api import get_global_api -__all__ = [ - "get_global_api", -] +__all__ = ["get_global_api"] diff --git a/src/common/message/api.py b/src/common/message_server/api.py similarity index 68% rename from src/common/message/api.py rename to src/common/message_server/api.py index 3a7193a6..67816d81 100644 --- a/src/common/message/api.py +++ b/src/common/message_server/api.py @@ -1,63 +1,51 @@ -from src.common.server import get_global_server -import os -import importlib.metadata from maim_message import MessageServer + +import traceback +import importlib.metadata + from src.common.logger import get_logger from src.config.config import global_config +from .server import get_global_server global_api = None - def get_global_api() -> MessageServer: # sourcery skip: extract-method """获取全局MessageServer实例""" global global_api if global_api is None: # 检查maim_message版本 - try: - maim_message_version = importlib.metadata.version("maim_message") - version_int = [int(x) for x in maim_message_version.split(".")] - version_compatible = version_int >= [0, 3, 3] - # Check for API Server feature (>= 0.6.0) - has_api_server_feature = version_int >= [0, 6, 2] - except (importlib.metadata.PackageNotFoundError, ValueError): - version_compatible = False - has_api_server_feature = False - + maim_message_version = importlib.metadata.version("maim_message") + version_int = [int(x) for x in maim_message_version.split(".")] + if version_int < [0, 6, 2]: + raise RuntimeError("maim_message 版本过低，请升级到 0.6.2 或更高版本。") # 读取配置项 maim_message_config = global_config.maim_message # 设置基本参数 (Legacy Server Mode) kwargs = { - "host": os.environ["HOST"], - "port": int(os.environ["PORT"]), + "host": maim_message_config.ws_server_host, + "port": maim_message_config.ws_server_port, "app": get_global_server().get_app(), + "custom_logger": get_logger("maim_message"), + "enable_custom_uvicorn_logger": False, } - # 只有在版本 >= 0.3.0 时才使用高级特性 - if version_compatible: - # 添加自定义logger - maim_message_logger = get_logger("maim_message") - kwargs["custom_logger"] = maim_message_logger - - # 添加token认证 - if maim_message_config.auth_token and len(maim_message_config.auth_token) > 0: - kwargs["enable_token"] = True - - # Removed legacy custom config block (use_custom) as requested. - kwargs["enable_custom_uvicorn_logger"] = False + # 添加token认证 + if maim_message_config.auth_token and len(maim_message_config.auth_token) > 0: + kwargs["enable_token"] = True global_api = MessageServer(**kwargs) - if version_compatible and maim_message_config.auth_token: + if maim_message_config.auth_token: for token in maim_message_config.auth_token: global_api.add_valid_token(token) # --------------------------------------------------------------------- - # Additional API Server Configuration (maim_message >= 6.0) + # Additional API Server Configuration # --------------------------------------------------------------------- enable_api_server = maim_message_config.enable_api_server - - # 如果版本支持且启用了API Server，则初始化额外服务器 - if has_api_server_feature and enable_api_server: + + # 如果启用了API Server，则初始化额外服务器 + if enable_api_server: try: from maim_message.server import WebSocketServer, ServerConfig from maim_message.message import APIMessageBase @@ -75,7 +63,7 @@ def get_global_api() -> MessageServer: # sourcery skip: extract-method ssl_enabled=use_wss, ssl_certfile=maim_message_config.api_server_cert_file if use_wss else None, ssl_keyfile=maim_message_config.api_server_key_file if use_wss else None, - custom_logger=api_logger # 传入自定义logger + custom_logger=api_logger, # 传入自定义logger ) # 2. Setup Auth Handler @@ -84,44 +72,33 @@ def get_global_api() -> MessageServer: # sourcery skip: extract-method # If list is empty/None, allow all (default behavior of returning True) if not allowed_keys: return True - + api_key = metadata.get("api_key") if api_key in allowed_keys: return True - + api_logger.warning(f"Rejected connection with invalid API Key: {api_key}") return False - server_config.on_auth = auth_handler + server_config.on_auth = auth_handler # type: ignore # maim_message库写错类型了 # 3. Setup Message Bridge # Initialize refined route map if not exists if not hasattr(global_api, "platform_map"): - global_api.platform_map = {} + global_api.platform_map = {} # type: ignore # 不知道这是什么神奇写法 async def bridge_message_handler(message: APIMessageBase, metadata: dict): # 使用 MessageConverter 转换 APIMessageBase 到 Legacy MessageBase # 接收场景：收到从 Adapter 转发的外部消息 # sender_info 包含消息发送者信息，需要提取到 group_info/user_info from maim_message import MessageConverter - + legacy_message = MessageConverter.from_api_receive(message) msg_dict = legacy_message.to_dict() - + # Compatibility Layer: Ensure format_info exists with defaults - # MaiMBot's check_types() accesses format_info.accept_format without None check if "message_info" in msg_dict: msg_info = msg_dict["message_info"] - - if "format_info" not in msg_info or msg_info["format_info"] is None: - msg_info["format_info"] = { - "content_format": ["text", "image", "emoji", "voice"], - "accept_format": [ - "text", "image", "emoji", "reply", "voice", "command", - "voiceurl", "music", "videourl", "file", "imageurl", "forward", "video" - ] - } - # Route Caching Logic: Map platform to API Key (or connection uuid as fallback) # This allows us to send messages back to the correct API client for this platform try: @@ -129,9 +106,9 @@ def get_global_api() -> MessageServer: # sourcery skip: extract-method api_key = metadata.get("api_key") or metadata.get("uuid") or "unknown" platform = msg_info.get("platform") api_logger.debug(f"Bridge received: api_key='{api_key}', platform='{platform}'") - + if platform: - global_api.platform_map[platform] = api_key + global_api.platform_map[platform] = api_key # type: ignore api_logger.info(f"Updated platform_map: {platform} -> {api_key}") except Exception as e: api_logger.warning(f"Failed to update platform map: {e}") @@ -139,22 +116,22 @@ def get_global_api() -> MessageServer: # sourcery skip: extract-method # Compatibility Layer: Ensure raw_message exists (even if None) as it's part of MessageBase if "raw_message" not in msg_dict: msg_dict["raw_message"] = None - - await global_api.process_message(msg_dict) - server_config.on_message = bridge_message_handler + await global_api.process_message(msg_dict) # type: ignore + + server_config.on_message = bridge_message_handler # type: ignore # maim_message库写错类型了 # 3.5. Register custom message handlers (bridge to Legacy handlers) # message_id_echo: handles message ID echo from adapters # 兼容新旧两个版本的 maim_message: # - 旧版: handler(payload) # - 新版: handler(payload, metadata) - async def custom_message_id_echo_handler(payload: dict, metadata: dict = None): + async def custom_message_id_echo_handler(payload: dict, metadata: dict = None): # type: ignore # Bridge to the Legacy custom handler registered in main.py try: # The Legacy handler expects the payload format directly - if hasattr(global_api, '_custom_message_handlers'): - handler = global_api._custom_message_handlers.get("message_id_echo") + if hasattr(global_api, "_custom_message_handlers"): + handler = global_api._custom_message_handlers.get("message_id_echo") # type: ignore # 已经不知道这是什么了 if handler: await handler(payload) api_logger.debug(f"Processed message_id_echo: {payload}") @@ -163,17 +140,19 @@ def get_global_api() -> MessageServer: # sourcery skip: extract-method except Exception as e: api_logger.warning(f"Failed to process message_id_echo: {e}") - server_config.register_custom_handler("message_id_echo", custom_message_id_echo_handler) + server_config.register_custom_handler("message_id_echo", custom_message_id_echo_handler) # type: ignore # maim_message库写错类型了 # 4. Initialize Server extra_server = WebSocketServer(config=server_config) - + # 5. Patch global_api lifecycle methods to manage both servers original_run = global_api.run original_stop = global_api.stop async def patched_run(): - api_logger.info(f"Starting Additional API Server on {api_server_host}:{api_server_port} (WSS: {use_wss})") + api_logger.info( + f"Starting Additional API Server on {api_server_host}:{api_server_port} (WSS: {use_wss})" + ) # Start the extra server (non-blocking start) await extra_server.start() # Run the original legacy server (this usually keeps running) @@ -186,16 +165,16 @@ def get_global_api() -> MessageServer: # sourcery skip: extract-method global_api.run = patched_run global_api.stop = patched_stop - + # Attach for reference - global_api.extra_server = extra_server + global_api.extra_server = extra_server # type: ignore # 这是什么 except ImportError: - get_logger("maim_message").error("Cannot import maim_message.server components. Is maim_message >= 0.6.0 installed?") + get_logger("maim_message").error( + "Cannot import maim_message.server components. Is maim_message >= 0.6.0 installed?" + ) except Exception as e: get_logger("maim_message").error(f"Failed to initialize Additional API Server: {e}") - import traceback get_logger("maim_message").debug(traceback.format_exc()) return global_api - diff --git a/src/common/server.py b/src/common/message_server/server.py similarity index 100% rename from src/common/server.py rename to src/common/message_server/server.py diff --git a/src/main.py b/src/main.py index 8abb34c6..0f6532f5 100644 --- a/src/main.py +++ b/src/main.py @@ -22,7 +22,7 @@ from rich.traceback import install from src.plugin_system.core.plugin_manager import plugin_manager # 导入消息API和traceback模块 -from src.common.message import get_global_api +from src.common.message_server import get_global_api from src.dream.dream_agent import start_dream_scheduler from src.bw_learner.expression_auto_check_task import ExpressionAutoCheckTask