onebot适配器增加web面板注册配置，增加http正反向

Author: lengxi-root

modules/onebot_adapter/adapter.py

@@ -29,6 +29,8 @@
     convert_lifecycle_event,
     convert_message_event,
 )
+from modules.onebot_adapter.lib.http_server import OneBotHTTPServer
+from modules.onebot_adapter.lib.http_webhook import OneBotHTTPWebhook
 from modules.onebot_adapter.lib.id_mapper import IDMapper
 from modules.onebot_adapter.lib.ws_server import OneBotWSServer
 
@@ -62,6 +64,8 @@ class OneBotAdapter:
     cfg: OneBotConfig
     id_mapper: IDMapper | None
     ws_server: OneBotWSServer | None
+    http_server: OneBotHTTPServer | None
+    http_webhook: OneBotHTTPWebhook | None
 
     def __init__(self, module_ctx: ModuleContext) -> None:
         self._mctx = module_ctx  # ModuleContext
@@ -71,6 +75,8 @@ def __init__(self, module_ctx: ModuleContext) -> None:
         # 基础设施
         self.id_mapper: IDMapper | None = None
         self.ws_server: OneBotWSServer | None = None
+        self.http_server: OneBotHTTPServer | None = None
+        self.http_webhook: OneBotHTTPWebhook | None = None
         self._hook_adapter = HookAdapter(self.log)
 
         # Action 上下文 (DI 容器)
@@ -85,12 +91,19 @@ def __init__(self, module_ctx: ModuleContext) -> None:
     # ==================== 生命周期 ====================
 
     async def start(self) -> None:
-        """启动适配器: 配置 → ID 映射 → Hook → WS → Action 路由"""
-
-        # 1. 加载配置
-        raw_config = self._mctx.ensure_config(OneBotConfig.defaults(), comments=OneBotConfig.comments())
+        """启动适配器: 配置 → ID 映射 → Hook → 网络连接 → Action 路由"""
+
+        # 1. 加载配置 (含旧版扁平配置自动迁移)
+        raw_config = self._mctx.read_config()
+        migrated = OneBotConfig.migrate_legacy(raw_config)
+        if migrated is not None:
+            self._mctx.save_config(migrated, comments=OneBotConfig.comments())
+            raw_config = migrated
+            self.log.info('旧版配置已迁移为 connections 列表')
+        else:
+            raw_config = self._mctx.ensure_config(OneBotConfig.defaults(), comments=OneBotConfig.comments())
         self.cfg = OneBotConfig.from_dict(raw_config)
-        self.log.info(f'配置: path={self.cfg.ws_path}, token={"***" if self.cfg.has_token else "(无)"}')
+        self.log.info(f'配置: {len(self.cfg.connections)} 个连接')
 
         # 2. 初始化 ID 映射器
         db_path = self._mctx.get_data_path('id_mapping.db')
@@ -111,24 +124,49 @@ async def start(self) -> None:
         # 6. 构建 Action 注册表 (Command 模式)
         self._action_registry = ActionRegistry.create_default(self._actx)
 
-        # 7. 启动 WebSocket 服务
-        await self._start_ws_server()
+        # 7. 启动网络连接 (WS 正/反 + HTTP 正/反)
+        await self._start_network()
 
     async def stop(self) -> None:
-        """停止适配器: Hook → WS → ID 映射"""
+        """停止适配器: Hook → 网络 → ID 映射"""
         # 1. 卸载 Hook
         self._hook_adapter.uninstall()
 
-        # 2. 停止 WS
-        if self.ws_server:
-            await self.ws_server.stop()
+        # 2. 停止网络连接
+        await self._stop_network()
 
         # 3. 关闭 ID 映射
         if self.id_mapper:
             await self.id_mapper.close()
 
         self.log.info('OneBot 适配器已停止')
 
+    async def apply_config(self, raw_config: dict) -> None:
+        """保存并应用新配置 (Web 面板调用): 重启网络连接层"""
+        self.cfg = OneBotConfig.from_dict(raw_config)
+        self._mctx.save_config(
+            {
+                'connections': self.cfg.connections,
+                'heartbeat_interval': self.cfg.heartbeat_interval,
+                'debug': self.cfg.debug,
+            },
+            comments=OneBotConfig.comments(),
+        )
+        await self._stop_network()
+        await self._start_network()
+        self.log.info('网络配置已重新应用')
+
+    def network_status(self) -> dict:
+        """汇总各连接状态 (供 Web 面板展示)"""
+        ws_st = self.ws_server.status() if self.ws_server else {'forward': {}, 'reverse': {}}
+        return {
+            'ws_server': ws_st.get('forward', {}),
+            'ws_reverse': ws_st.get('reverse', {}),
+            'http_server': self.http_server.status() if self.http_server else {},
+            'http_webhook': self.http_webhook.status() if self.http_webhook else {},
+            'port': self._get_framework_port(),
+        }
+
     # ==================== 配置辅助 ====================
 
     def _build_qq_map(self) -> None:
@@ -199,56 +237,114 @@ def _get_framework_port() -> int:
         except Exception:
             return 5001
 
-    # ==================== WebSocket 服务 ====================
+    # ==================== 网络连接 (WS 正/反 + HTTP 正/反) ====================
 
-    async def _start_ws_server(self) -> None:
-        """创建并启动 WebSocket 服务 (正向 + 反向 + 心跳)"""
+    async def _start_network(self) -> None:
+        """按 connections 配置启动所有网络连接"""
+        port = self._get_framework_port()
 
-        # 解析反向 WS 配置
-        reverse_entries = [
-            {'url': str(e.get('url', '')), 'appid': str(e.get('appid', ''))}
-            for e in (self.cfg.reverse_ws_urls or [])
-            if isinstance(e, dict) and str(e.get('url', '')).strip()
+        # 正向 WS (服务端)
+        ws_forward_entries = [
+            {'name': c['name'], 'path': c['path'], 'token': c['access_token'], 'appid': c['appid'], 'enable': True} for c in self.cfg.by_type('ws_server')
+        ]
+        # 反向 WS (客户端)
+        ws_reverse_entries = [
+            {
+                'name': c['name'],
+                'url': c['url'],
+                'appid': c['appid'],
+                'token': c['access_token'],
+                'reconnect_interval': c['reconnect_interval'],
+            }
+            for c in self.cfg.by_type('ws_reverse')
+            if c['url'].strip()
         ]
 
         self.ws_server = OneBotWSServer(
-            access_token=self.cfg.access_token,
             heartbeat_interval=self.cfg.heartbeat_interval,
             on_action=self._handle_action,
             default_qq=self._actx.default_qq,
             qq_map=self._actx.qq_map,
             log=self.log,
-            ws_path=self.cfg.ws_path,
-            reverse_entries=reverse_entries,
-            reconnect_interval=self.cfg.reconnect_interval,
+            forward_entries=ws_forward_entries,
+            reverse_entries=ws_reverse_entries,
             debug=self.cfg.debug,
         )
 
-        # 正向 WS: 挂载到框架 aiohttp app
         app = self._get_framework_app()
         if app:
-            self.ws_server.attach(app)
-            port = self._get_framework_port()
-            self.log.info(f'正向 WS 已挂载: ws://0.0.0.0:{port}{self.cfg.ws_path}')
-        else:
+            for path in self.ws_server.attach(app):
+                self.log.info(f'正向 WS 已挂载: ws://0.0.0.0:{port}{path}')
+        elif ws_forward_entries:
             self.log.warning('无法获取框架 aiohttp app, 正向 WS 未挂载')
 
-        # 反向 WS: 主动连接外部服务器
         await self.ws_server.start_reverse()
-        if reverse_entries:
-            self.log.info(f'反向 WS 已启动: {len(reverse_entries)} 个连接')
+        if ws_reverse_entries:
+            self.log.info(f'反向 WS 已启动: {len(ws_reverse_entries)} 个连接')
 
-        # 心跳
         self.ws_server.start_heartbeat()
 
+        # 正向 HTTP (OneBot HTTP API)
+        http_entries = [
+            {'name': c['name'], 'path': c['path'], 'token': c['access_token'], 'appid': c['appid'], 'enable': True} for c in self.cfg.by_type('http_server')
+        ]
+        self.http_server = OneBotHTTPServer(
+            entries=http_entries,
+            on_action=self._handle_action,
+            log=self.log,
+            debug=self.cfg.debug,
+        )
+        if app:
+            for path in self.http_server.attach(app):
+                self.log.info(f'正向 HTTP 已挂载: http://0.0.0.0:{port}{path}')
+        elif http_entries:
+            self.log.warning('无法获取框架 aiohttp app, 正向 HTTP 未挂载')
+
+        # 反向 HTTP (事件 POST 上报)
+        webhook_entries = [
+            {
+                'name': c['name'],
+                'url': c['url'],
+                'appid': c['appid'],
+                'token': c['access_token'],
+                'secret': c['secret'],
+                'timeout': c['timeout'],
+            }
+            for c in self.cfg.by_type('http_webhook')
+            if c['url'].strip()
+        ]
+        self.http_webhook = OneBotHTTPWebhook(
+            entries=webhook_entries,
+            on_action=self._handle_action,
+            log=self.log,
+            debug=self.cfg.debug,
+        )
+        await self.http_webhook.start()
+        if webhook_entries:
+            self.log.info(f'HTTP 上报已启动: {len(webhook_entries)} 个目标')
+
+    async def _stop_network(self) -> None:
+        """停止所有网络连接"""
+        if self.ws_server:
+            await self.ws_server.stop()
+            self.ws_server = None
+        if self.http_server:
+            self.http_server.detach()
+            self.http_server = None
+        if self.http_webhook:
+            await self.http_webhook.stop()
+            self.http_webhook = None
+
     # ==================== 事件处理 (Observer) ====================
 
     async def _on_raw_event(self, event: Event, bot: Any) -> None:
         """on_raw_event 回调 — 将事件转为 OneBot 格式推送到 WS 客户端
 
         同时动态更新 ActionContext 中的 senders / log_services / qq_map。
         """
-        if not self.ws_server or not self.ws_server.has_clients:
+        has_ws = self.ws_server is not None and self.ws_server.has_clients
+        has_webhook = self.http_webhook is not None and self.http_webhook.has_targets
+        if not has_ws and not has_webhook:
             return
 
         appid = event.appid
@@ -267,10 +363,12 @@ async def _on_raw_event(self, event: Event, bot: Any) -> None:
             rq = getattr(bot, 'robot_qq', '') or ''
             if rq:
                 self._actx.qq_map[aid] = int(rq)
-                self.ws_server.qq_map = self._actx.qq_map
+                if self.ws_server:
+                    self.ws_server.qq_map = self._actx.qq_map
                 if not self._actx.default_qq:
                     self._actx.default_qq = int(rq)
-                    self.ws_server._default_qq = self._actx.default_qq
+                    if self.ws_server:
+                        self.ws_server._default_qq = self._actx.default_qq
 
         self_qq = self._actx.qq_map.get(aid, self._actx.default_qq) or self._actx.default_qq
 
@@ -285,7 +383,10 @@ async def _on_raw_event(self, event: Event, bot: Any) -> None:
             ob_event = await convert_message_event(event, self.id_mapper, self_qq)
 
         if ob_event:
-            await self.ws_server.broadcast(ob_event, appid=aid)
+            if has_ws:
+                await self.ws_server.broadcast(ob_event, appid=aid)
+            if has_webhook:
+                self.http_webhook.push(ob_event, appid=aid)
 
     def _cache_msg_id(self, event: Event, appid: int) -> None:
         """缓存消息 ID 用于后续回复"""