@vrs-soft/wecom-aibot-mcp 2.6.0 → 3.1.0

package/dist/http-server.d.ts

@@ -63,6 +63,12 @@ export declare function getCCRegistryEntry(ccId: string): CCRegistryEntry | null
 export declare function getCCCount(): number;
 export declare function getCCCountByRobot(robotName: string): number;
 export declare function getOnlineCcIds(): string[];
+/** 当前是否存在某个 ccId 的活跃 SSE 客户端 */
+export declare function hasActiveSseFor(ccId: string): boolean;
+/** 把 cc 消息存进 pending queue（目标无 SSE 时使用） */
+export declare function enqueueCcPending(msg: import('./message-bus.js').CcMessage): void;
+/** 取出指定 ccId 的所有未过期 pending 消息，并清空队列 */
+export declare function drainCcPending(ccId: string): import('./message-bus.js').CcMessage[];
 export declare function startHttpServer(_server: McpServer, port?: number, httpsConfig?: {
     certPath: string;
     keyPath: string;

package/dist/http-server.js

@@ -210,6 +210,46 @@ export function getOnlineCcIds() {
 const pendingApprovals = new Map();
 const transports = new Map();
 const sseClients = new Map(); // clientId -> SSEClient
+const ccPendingQueue = new Map();
+const CC_PENDING_TTL_MS = 5 * 60 * 1000;
+const CC_PENDING_MAX_PER_CC = 100;
+/** 当前是否存在某个 ccId 的活跃 SSE 客户端 */
+export function hasActiveSseFor(ccId) {
+    for (const [, client] of sseClients) {
+        if (client.ccId === ccId)
+            return true;
+    }
+    return false;
+}
+/** 把 cc 消息存进 pending queue（目标无 SSE 时使用） */
+export function enqueueCcPending(msg) {
+    const list = ccPendingQueue.get(msg.toCc) || [];
+    list.push({ msg, enqueuedAt: Date.now() });
+    while (list.length > CC_PENDING_MAX_PER_CC)
+        list.shift();
+    ccPendingQueue.set(msg.toCc, list);
+    logger.info('cc_message queued', { to: msg.toCc, from: msg.fromCc, msgId: msg.msgId, depth: list.length });
+}
+/** 取出指定 ccId 的所有未过期 pending 消息，并清空队列 */
+export function drainCcPending(ccId) {
+    const list = ccPendingQueue.get(ccId);
+    if (!list || list.length === 0)
+        return [];
+    ccPendingQueue.delete(ccId);
+    const now = Date.now();
+    return list.filter(item => now - item.enqueuedAt < CC_PENDING_TTL_MS).map(item => item.msg);
+}
+// 周期性清理过期项
+setInterval(() => {
+    const now = Date.now();
+    for (const [ccId, list] of ccPendingQueue) {
+        const kept = list.filter(item => now - item.enqueuedAt < CC_PENDING_TTL_MS);
+        if (kept.length === 0)
+            ccPendingQueue.delete(ccId);
+        else if (kept.length !== list.length)
+            ccPendingQueue.set(ccId, kept);
+    }
+}, 60 * 1000).unref?.();
 // 初始化 MCP Server（不再全局连接）
 function initMcpServer() {
     // 订阅消息总线，实现 SSE 推送
@@ -1176,6 +1216,8 @@ function handleSSEConnect(req, res, _url) {
         logger.log(`[http] SSE 心跳发送: clientId=${clientId}`);
     }, 15000);
     // 订阅发往当前 ccId 的 CC 间消息，转发为 cc_message SSE event
+    // 注意 ordering：先 subscribe（捕获后续到达的消息）→ sseClients.set 已经在前面完成
+    // （所以 send_to_cc 的 hasActiveSseFor 检测已开始返 true）→ 再 drain pending（不漏）
     const ccSub = subscribeCcMessageByTarget(targetCcId, (msg) => {
         try {
             const data = JSON.stringify(msg);
@@ -1186,6 +1228,20 @@ function handleSSEConnect(req, res, _url) {
             logger.error(`[http] cc_message 推送失败 clientId=${clientId}:`, err);
         }
     });
+    // 把目标离线期间堆积的 cc_message 直接 flush 给当前连接（v2.6.1+）
+    const pending = drainCcPending(targetCcId);
+    if (pending.length > 0) {
+        for (const msg of pending) {
+            try {
+                const data = JSON.stringify(msg);
+                res.write(`event: cc_message\ndata: ${data}\n\n`);
+            }
+            catch (err) {
+                logger.error(`[http] cc_message flush 失败 clientId=${clientId}:`, err);
+            }
+        }
+        logger.info('cc_message flushed pending', { ccId: targetCcId, count: pending.length });
+    }
     // 处理客户端断开
     req.on('close', () => {
         clearInterval(heartbeatInterval);

package/dist/index.d.ts

@@ -1,18 +1,8 @@
 /**
- * MCP Server 模块入口
+ * wecom-aibot-mcp 公共 API
  *
- * 可作为库导入使用
- *
- * v2.0 架构变更：
- * - 使用 Session 管理
- * - 不再使用 projectDir
- * - robotName 作为连接索引
+ * 客户端模块入口（channel-server + config）
  */
-export { WecomClient, initClient } from './client.js';
-export { connectRobot, disconnectRobot, getClient, getConnectionState, getAllConnectionStates, } from './connection-manager.js';
-export { startHttpServer, stopHttpServer, HTTP_PORT, } from './http-server.js';
-export type { ApprovalRequest } from './http-server.js';
-export { PERMISSION_HOOK_SCRIPT_PATH, STOP_HOOK_SCRIPT_PATH, } from './project-config.js';
-export { PERMISSION_HOOK_SCRIPT_PATH as HOOK_SCRIPT_PATH } from './project-config.js';
-export { registerTools } from './tools/index.js';
-export { listAllRobots, runConfigWizard } from './config-wizard.js';
+export { startChannelServer } from './channel-server.js';
+export { VERSION, runRemoteInstallWizard, uninstall, getInstalledMode } from './config-wizard.js';
+export { logger } from './logger.js';

package/dist/index.js

@@ -1,24 +1,8 @@
 /**
- * MCP Server 模块入口
+ * wecom-aibot-mcp 公共 API
  *
- * 可作为库导入使用
- *
- * v2.0 架构变更：
- * - 使用 Session 管理
- * - 不再使用 projectDir
- * - robotName 作为连接索引
+ * 客户端模块入口（channel-server + config）
  */
-// Client 模块
-export { WecomClient, initClient } from './client.js';
-// 连接管理模块
-export { connectRobot, disconnectRobot, getClient, getConnectionState, getAllConnectionStates, } from './connection-manager.js';
-// HTTP 服务模块
-export { startHttpServer, stopHttpServer, HTTP_PORT, } from './http-server.js';
-// Hook 脚本路径（统一从 project-config.ts 导出）
-export { PERMISSION_HOOK_SCRIPT_PATH, STOP_HOOK_SCRIPT_PATH, } from './project-config.js';
-// 向后兼容别名
-export { PERMISSION_HOOK_SCRIPT_PATH as HOOK_SCRIPT_PATH } from './project-config.js';
-// 工具注册
-export { registerTools } from './tools/index.js';
-// 配置向导
-export { listAllRobots, runConfigWizard } from './config-wizard.js';
+export { startChannelServer } from './channel-server.js';
+export { VERSION, runRemoteInstallWizard, uninstall, getInstalledMode } from './config-wizard.js';
+export { logger } from './logger.js';

package/dist/tools/index.js

@@ -3,7 +3,7 @@ import { z } from 'zod';
 import { listAllRobots, getDocMcpUrl, installSkill, VERSION } from '../config-wizard.js';
 import { callDocTool } from '../doc-proxy.js';
 import { connectRobot, disconnectRobot, getClient, getConnectionState, getAllConnectionStates, } from '../connection-manager.js';
-import { registerCcId, unregisterCcId, getRobotByCcId, getProjectDirByCcId, generateCcId, getOnlineCcIds, getCCRegistryEntry, } from '../http-server.js';
+import { registerCcId, unregisterCcId, getRobotByCcId, getProjectDirByCcId, generateCcId, getOnlineCcIds, getCCRegistryEntry, hasActiveSseFor, enqueueCcPending, } from '../http-server.js';
 import { subscribeWecomMessageByCcId, publishCcMessage } from '../message-bus.js';
 import { randomBytes } from 'crypto';
 import { updateWechatModeConfig, loadWechatModeConfig, addPermissionHook, removePermissionHook, addStopHook, removeStopHook, registerActiveProject, unregisterActiveProject } from '../project-config.js';
@@ -145,7 +145,7 @@ export function registerTools(server) {
             return { content: [{ type: 'text', text: JSON.stringify({ delivered: false, reason: 'target offline', to_cc }) }] };
         }
         const msgId = `cc_${Date.now()}_${randomBytes(4).toString('hex')}`;
-        publishCcMessage({
+        const msg = {
             msgId,
             fromCc: cc_id,
             toCc: to_cc,
@@ -154,11 +154,21 @@ export function registerTools(server) {
             replyTo: reply_to,
             hopCount: 0,
             timestamp: Date.now(),
-        });
+        };
+        // 目标当前是否有活跃 SSE 客户端？有 → 立即推送；无 → 入 pending queue（v2.6.1+）
+        // 解决：目标 CC 睡眠 / NAT 闭合 / channel-server 在 reconnect 窗口里时，
+        // publish 到 RxJS Subject 没有订阅者会蒸发的问题。
+        const live = hasActiveSseFor(to_cc);
+        if (live) {
+            publishCcMessage(msg);
+        }
+        else {
+            enqueueCcPending(msg);
+        }
         return {
             content: [{
                     type: 'text',
-                    text: JSON.stringify({ delivered: true, msgId, to_cc, kind }),
+                    text: JSON.stringify({ delivered: true, msgId, to_cc, kind, state: live ? 'live' : 'queued' }),
                 }],
         };
     });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vrs-soft/wecom-aibot-mcp",
-  "version": "2.6.0",
-  "description": "企业微信智能机器人 MCP 服务 - Claude Code 审批通道",
+  "version": "3.1.0",
+  "description": "企业微信智能机器人 MCP 客户端 - 连接 wecom-aibot-server daemon",
   "type": "module",
   "main": "dist/index.js",
   "bin": {
@@ -19,8 +19,7 @@
     "prepublishOnly": "npm run build",
     "test": "vitest run",
     "test:watch": "vitest",
-    "test:coverage": "vitest run --coverage",
-    "test:e2e": "vitest run tests/e2e"
+    "test:coverage": "vitest run --coverage"
   },
   "keywords": [
     "wecom",
@@ -38,9 +37,7 @@
   },
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.0.0",
-    "@wecom/aibot-node-sdk": "^1.0.4",
-    "dotenv": "^16.4.5",
-    "rxjs": "^7.8.2"
+    "dotenv": "^16.4.5"
   },
   "devDependencies": {
     "@types/node": "^20.11.0",