@wu529778790/open-im 1.8.1-beta.11 → 1.8.1-beta.13

package/dist/adapters/claude-sdk-adapter.js

@@ -103,6 +103,7 @@ export class ClaudeSDKAdapter {
         const abortController = new AbortController();
         let streamClosed = false;
         let actualSessionId;
+        let pendingTempId; // 记录临时 ID，用于 abort 时清理
         let runSettled = false;
         let timeoutId = null;
         const timeoutMs = options?.timeoutMs ?? 600_000;
@@ -139,7 +140,10 @@ export class ClaudeSDKAdapter {
                 log.info(`[V2] Session: ${sessionId ?? 'new'}, prompt="${prompt.slice(0, 50)}..."`);
                 log.info(`[V2] model param=${String(options?.model ?? '')} baseUrl=${process.env.ANTHROPIC_BASE_URL ?? '(default)'}`);
                 // 获取或创建会话
-                const { session } = await getOrCreateSession(sessionId, workDir, options?.model, permissionMode);
+                const { session, sessionId: returnedId } = await getOrCreateSession(sessionId, workDir, options?.model, permissionMode);
+                if (returnedId.startsWith('pending-')) {
+                    pendingTempId = returnedId;
+                }
                 // 发送用户消息
                 await session.send(prompt);
                 // 获取响应流
@@ -263,10 +267,11 @@ export class ClaudeSDKAdapter {
                 if (abortController.signal.aborted) {
                     log.info('Session run aborted');
                     clearRunTimeout();
-                    // 清理 pending tempId
-                    if (actualSessionId?.startsWith('pending-')) {
-                        activeSessions.delete(actualSessionId);
-                        log.info(`Cleaned up pending session: ${actualSessionId}`);
+                    // 清理 pending tempId（abort 可能在 init 消息之前发生）
+                    const idToClean = actualSessionId ?? pendingTempId;
+                    if (idToClean?.startsWith('pending-')) {
+                        activeSessions.delete(idToClean);
+                        log.info(`Cleaned up pending session: ${idToClean}`);
                     }
                     return;
                 }
@@ -279,9 +284,10 @@ export class ClaudeSDKAdapter {
                     log.error(`Error stack: ${errorObj.stack}`);
                 }
                 // 清理 pending tempId（session 在获取真实 ID 前就失败了）
-                if (actualSessionId?.startsWith('pending-')) {
-                    activeSessions.delete(actualSessionId);
-                    log.info(`Cleaned up pending session after error: ${actualSessionId}`);
+                const errIdToClean = actualSessionId ?? pendingTempId;
+                if (errIdToClean?.startsWith('pending-')) {
+                    activeSessions.delete(errIdToClean);
+                    log.info(`Cleaned up pending session after error: ${errIdToClean}`);
                 }
                 callbacks.onError(msg);
             }

package/dist/dingtalk/client.js

@@ -7,7 +7,9 @@ const TEXT_MSG_KEY = 'sampleText';
 const DINGTALK_STREAM_HOST = 'wss-open-connection.dingtalk.com';
 let client = null;
 let messageHandler = null;
+// sessionWebhook 有过期时间（约 2 小时），需要记录时间戳
 const sessionWebhookByChat = new Map();
+const WEBHOOK_TTL_MS = 90 * 60 * 1000; // 90 分钟后视为过期
 const unionIdByUserId = new Map();
 let dingtalkWarnFilterInstalled = false;
 export function shouldSuppressDingTalkSocketWarn(args) {
@@ -44,13 +46,19 @@ function getClient() {
 export function registerSessionWebhook(chatId, sessionWebhook) {
     if (!chatId || !sessionWebhook)
         return;
-    sessionWebhookByChat.set(chatId, sessionWebhook);
+    sessionWebhookByChat.set(chatId, { webhook: sessionWebhook, registeredAt: Date.now() });
 }
 async function sendByWebhook(chatId, body) {
-    const sessionWebhook = sessionWebhookByChat.get(chatId);
-    if (!sessionWebhook) {
+    const entry = sessionWebhookByChat.get(chatId);
+    if (!entry) {
         throw new Error(`DingTalk sessionWebhook unavailable for chat ${chatId}`);
     }
+    // 检查 webhook 是否过期
+    if (Date.now() - entry.registeredAt > WEBHOOK_TTL_MS) {
+        sessionWebhookByChat.delete(chatId);
+        throw new Error(`DingTalk sessionWebhook expired for chat ${chatId}`);
+    }
+    const sessionWebhook = entry.webhook;
     const accessToken = await getClient().getAccessToken();
     const res = await fetch(sessionWebhook, {
         method: 'POST',

package/dist/qq/client.js

@@ -17,6 +17,7 @@ let stopped = false;
 let seq = null;
 let sessionId = null;
 let reconnectAttempt = 0;
+let connecting = false; // 防止并发 connectWebSocket
 let currentConfig = null;
 let currentHandler = null;
 let tokenState = null;
@@ -147,99 +148,116 @@ function startHeartbeat(intervalMs) {
     }, intervalMs);
 }
 async function connectWebSocket(config, handler) {
-    const gatewayUrl = await getGatewayUrl(config);
-    const token = await fetchAccessToken(config);
-    await new Promise((resolve, reject) => {
-        const socket = new WebSocket(gatewayUrl);
-        ws = socket;
-        let settled = false;
-        const settle = (fn) => {
-            if (settled)
-                return;
-            settled = true;
-            fn();
-        };
-        socket.on("open", () => {
-            log.info("QQ gateway connected");
-            reconnectAttempt = 0;
-        });
-        socket.on("message", async (raw) => {
-            try {
-                const payload = JSON.parse(raw.toString());
-                if (typeof payload.s === "number")
-                    seq = payload.s;
-                if (payload.op === 10) {
-                    const heartbeatInterval = Number(payload.d?.heartbeat_interval ?? 30000);
-                    startHeartbeat(heartbeatInterval);
-                    socket.send(JSON.stringify({
-                        op: sessionId ? 6 : 2,
-                        d: sessionId
-                            ? {
-                                token: `QQBot ${token}`,
-                                session_id: sessionId,
-                                seq,
-                            }
-                            : {
-                                token: `QQBot ${token}`,
-                                intents: INTENTS.GROUP_AND_C2C |
-                                    INTENTS.DIRECT_MESSAGE |
-                                    INTENTS.PUBLIC_GUILD_MESSAGES,
-                                properties: {
-                                    os: process.platform,
-                                    browser: "open-im",
-                                    device: "open-im",
-                                },
-                            },
-                    }));
-                    return;
-                }
-                if (payload.op === 0 && payload.t === "READY") {
-                    sessionId = String(payload.d?.session_id ?? "");
-                    settle(resolve);
+    // 防止并发连接
+    if (connecting) {
+        log.warn("QQ gateway connection already in progress");
+        return;
+    }
+    connecting = true;
+    try {
+        const gatewayUrl = await getGatewayUrl(config);
+        const token = await fetchAccessToken(config);
+        await new Promise((resolve, reject) => {
+            const socket = new WebSocket(gatewayUrl);
+            ws = socket;
+            let settled = false;
+            let readyTimeoutId = setTimeout(() => {
+                readyTimeoutId = null;
+                settle(() => reject(new Error("QQ gateway ready timeout")));
+            }, 15000);
+            const settle = (fn) => {
+                if (settled)
                     return;
+                settled = true;
+                if (readyTimeoutId) {
+                    clearTimeout(readyTimeoutId);
+                    readyTimeoutId = null;
                 }
-                if (payload.op === 0 && payload.t === "RESUMED") {
-                    settle(resolve);
-                    return;
+                fn();
+            };
+            socket.on("open", () => {
+                log.info("QQ gateway connected");
+                reconnectAttempt = 0;
+            });
+            socket.on("message", async (raw) => {
+                try {
+                    const payload = JSON.parse(raw.toString());
+                    if (typeof payload.s === "number")
+                        seq = payload.s;
+                    if (payload.op === 10) {
+                        const heartbeatInterval = Number(payload.d?.heartbeat_interval ?? 30000);
+                        startHeartbeat(heartbeatInterval);
+                        socket.send(JSON.stringify({
+                            op: sessionId ? 6 : 2,
+                            d: sessionId
+                                ? {
+                                    token: `QQBot ${token}`,
+                                    session_id: sessionId,
+                                    seq,
+                                }
+                                : {
+                                    token: `QQBot ${token}`,
+                                    intents: INTENTS.GROUP_AND_C2C |
+                                        INTENTS.DIRECT_MESSAGE |
+                                        INTENTS.PUBLIC_GUILD_MESSAGES,
+                                    properties: {
+                                        os: process.platform,
+                                        browser: "open-im",
+                                        device: "open-im",
+                                    },
+                                },
+                        }));
+                        return;
+                    }
+                    if (payload.op === 0 && payload.t === "READY") {
+                        sessionId = String(payload.d?.session_id ?? "");
+                        settle(resolve);
+                        return;
+                    }
+                    if (payload.op === 0 && payload.t === "RESUMED") {
+                        settle(resolve);
+                        return;
+                    }
+                    const event = normalizeInboundEvent(payload);
+                    if (event && (event.content || (event.attachments?.length ?? 0) > 0)) {
+                        await handler(event);
+                    }
                 }
-                const event = normalizeInboundEvent(payload);
-                if (event && (event.content || (event.attachments?.length ?? 0) > 0)) {
-                    await handler(event);
+                catch (error) {
+                    log.error("Failed to handle QQ gateway payload:", error);
                 }
-            }
-            catch (error) {
-                log.error("Failed to handle QQ gateway payload:", error);
-            }
-        });
-        socket.on("error", (error) => {
-            log.error("QQ gateway error:", error);
-            settle(() => reject(error));
-        });
-        socket.on("close", (code, reason) => {
-            clearTimers();
-            ws = null;
-            log.info(`QQ gateway closed: ${code} ${reason.toString()}`);
-            if (stopped)
-                return;
-            if (code === 4004 || code === 4006 || code === 4007 || code === 4009) {
-                tokenState = null;
-                sessionId = null;
-                seq = null;
-            }
-            const delay = RECONNECT_DELAYS_MS[Math.min(reconnectAttempt, RECONNECT_DELAYS_MS.length - 1)];
-            reconnectAttempt += 1;
-            reconnectTimer = setTimeout(() => {
-                if (currentConfig && currentHandler) {
-                    connectWebSocket(currentConfig, currentHandler).catch((err) => {
-                        log.error("QQ reconnect failed:", err);
-                    });
+            });
+            socket.on("error", (error) => {
+                log.error("QQ gateway error:", error);
+                settle(() => reject(error));
+            });
+            socket.on("close", (code, reason) => {
+                settle(() => { }); // 清理 ready timeout
+                clearTimers();
+                ws = null;
+                log.info(`QQ gateway closed: ${code} ${reason.toString()}`);
+                if (stopped)
+                    return;
+                if (code === 4004 || code === 4006 || code === 4007 || code === 4009) {
+                    tokenState = null;
+                    sessionId = null;
+                    seq = null;
                 }
-            }, delay);
+                const delay = RECONNECT_DELAYS_MS[Math.min(reconnectAttempt, RECONNECT_DELAYS_MS.length - 1)];
+                reconnectAttempt += 1;
+                reconnectTimer = setTimeout(() => {
+                    if (currentConfig && currentHandler) {
+                        connectWebSocket(currentConfig, currentHandler).catch((err) => {
+                            log.error("QQ reconnect failed:", err);
+                        });
+                    }
+                }, delay);
+            });
         });
-        setTimeout(() => {
-            settle(() => reject(new Error("QQ gateway ready timeout")));
-        }, 15000);
-    });
+    }
+    finally {
+        connecting = false;
+    }
 }
 export function getQQBot() {
     if (!client || !currentConfig) {

package/dist/wechat/client.js

@@ -8,6 +8,7 @@ import { createLogger } from '../logger.js';
 const log = createLogger('WeChat');
 const TOKEN_FILE = 'wechat-token.json';
 const DEFAULT_WECHAT_WS_URL = 'wss://openclau-wechat.henryxiaoyang.workers.dev';
+const PONG_TIMEOUT_FACTOR = 3; // 3倍心跳间隔无响应则判定连接死亡
 // Global state
 let ws = null;
 let channelState = 'disconnected';
@@ -16,6 +17,9 @@ let heartbeatTimer = null;
 let reconnectAttempts = 0;
 let currentToken = null;
 let tokenStoragePath = null;
+let lastServerResponseTime = 0; // 上次收到服务端消息的时间
+let wsConfigRef = null; // 保存配置供心跳重连使用
+let isStopping = false; // 防止 stop 后重连定时器继续触发
 // Event handlers
 let messageHandler = null;
 let stateChangeHandler = null;
@@ -70,6 +74,7 @@ export async function initWeChat(config, eventHandler, onStateChange) {
     }
     messageHandler = eventHandler;
     stateChangeHandler = onStateChange ?? null;
+    isStopping = false;
     // Set up token storage path
     const baseDir = config.logDir ?? join(process.env.HOME ?? '', '.open-im');
     tokenStoragePath = join(baseDir, 'data');
@@ -92,6 +97,7 @@ export async function initWeChat(config, eventHandler, onStateChange) {
  * Connect to AGP WebSocket server
  */
 async function connectWebSocket(config) {
+    wsConfigRef = config;
     if (channelState === 'connecting') {
         log.warn('WebSocket connection already in progress');
         return;
@@ -108,6 +114,7 @@ async function connectWebSocket(config) {
                 resolve();
             });
             ws.on('message', async (data) => {
+                lastServerResponseTime = Date.now();
                 try {
                     const envelope = JSON.parse(data.toString());
                     log.debug('Received AGP message:', envelope.method);
@@ -190,11 +197,35 @@ function updateState(state) {
 }
 /**
  * Start heartbeat to keep connection alive
+ * 同时检测服务端是否响应，超时无响应则主动断开触发重连
  */
 function startHeartbeat(interval) {
     stopHeartbeat();
+    lastServerResponseTime = Date.now();
     heartbeatTimer = setInterval(() => {
         if (channelState === 'connected') {
+            // 检测连接是否已死：长时间未收到任何服务端响应
+            const elapsed = Date.now() - lastServerResponseTime;
+            const pongTimeout = interval * PONG_TIMEOUT_FACTOR;
+            if (lastServerResponseTime > 0 && elapsed > pongTimeout) {
+                log.warn(`No server response for ${Math.round(elapsed / 1000)}s, forcing reconnect`);
+                stopHeartbeat();
+                if (ws) {
+                    try {
+                        ws.removeAllListeners();
+                        ws.close();
+                    }
+                    catch {
+                        /* ignore */
+                    }
+                    ws = null;
+                }
+                updateState('disconnected');
+                if (wsConfigRef) {
+                    scheduleReconnect(wsConfigRef);
+                }
+                return;
+            }
             sendAGPMessage('ping', { timestamp: Date.now() });
         }
     }, interval);
@@ -210,17 +241,28 @@ function stopHeartbeat() {
 }
 /**
  * Schedule reconnection attempt
+ * 超过 maxAttempts 后自动重置计数器继续重试，避免永久断连
  */
 function scheduleReconnect(config) {
+    if (isStopping)
+        return;
     const maxAttempts = config.maxReconnectAttempts ?? 10;
-    if (reconnectAttempts >= maxAttempts) {
-        log.error('Max reconnect attempts reached');
+    if (reconnectTimer) {
         return;
     }
-    const interval = config.reconnectInterval ?? 5000;
+    // 超过最大重试次数后重置计数器，降低频率继续重试
+    if (reconnectAttempts >= maxAttempts) {
+        log.warn(`Max reconnect attempts (${maxAttempts}) reached, resetting counter and retrying at lower frequency`);
+        reconnectAttempts = 0;
+    }
+    const baseInterval = config.reconnectInterval ?? 5000;
+    // 超过一半次数后逐渐增加间隔，最大 60 秒
+    const backoff = Math.min(baseInterval * Math.pow(1.5, Math.floor(reconnectAttempts / 3)), 60000);
+    const interval = Math.round(backoff);
     reconnectTimer = setTimeout(async () => {
+        reconnectTimer = null;
         reconnectAttempts++;
-        log.info(`Reconnecting... Attempt ${reconnectAttempts}/${maxAttempts}`);
+        log.info(`Reconnecting... Attempt ${reconnectAttempts}/${maxAttempts} (interval: ${interval}ms)`);
         try {
             await connectWebSocket(config);
         }
@@ -274,6 +316,7 @@ function saveToken() {
  * Stop WeChat client
  */
 export function stopWeChat() {
+    isStopping = true;
     stopHeartbeat();
     if (reconnectTimer) {
         clearTimeout(reconnectTimer);

package/dist/wework/client.js

@@ -13,6 +13,7 @@ import { createLogger } from '../logger.js';
 const log = createLogger('WeWork');
 const DEFAULT_WS_URL = 'wss://openws.work.weixin.qq.com';
 const HEARTBEAT_INTERVAL = 30000; // 30秒
+const PONG_TIMEOUT = HEARTBEAT_INTERVAL * 3; // 90秒无任何服务端响应则判定连接死亡
 const MAX_RECONNECT_ATTEMPTS = 100;
 // Global state
 let ws = null;
@@ -22,6 +23,7 @@ let heartbeatTimer = null;
 let reconnectAttempts = 0;
 let shouldReconnect = false;
 let isStopping = false;
+let lastServerResponseTime = 0; // 上次收到服务端消息的时间
 // Event handlers
 let messageHandler = null;
 let stateChangeHandler = null;
@@ -173,6 +175,7 @@ async function connectWebSocket() {
                 }
             });
             ws.on('message', async (data) => {
+                lastServerResponseTime = Date.now();
                 try {
                     const message = JSON.parse(data.toString());
                     await handleMessage(message);
@@ -326,11 +329,30 @@ function updateState(state) {
 }
 /**
  * Start heartbeat to keep connection alive
+ * 同时检测服务端是否响应，超时无响应则主动断开触发重连
  */
 function startHeartbeat() {
     stopHeartbeat();
+    lastServerResponseTime = Date.now();
     heartbeatTimer = setInterval(() => {
         if (connectionState === 'connected' && ws) {
+            // 检测连接是否已死：长时间未收到任何服务端响应
+            const elapsed = Date.now() - lastServerResponseTime;
+            if (lastServerResponseTime > 0 && elapsed > PONG_TIMEOUT) {
+                log.warn(`No server response for ${Math.round(elapsed / 1000)}s, forcing reconnect`);
+                stopHeartbeat();
+                try {
+                    ws.removeAllListeners();
+                    ws.close();
+                }
+                catch {
+                    /* ignore */
+                }
+                ws = null;
+                updateState('disconnected');
+                scheduleReconnect();
+                return;
+            }
             const pingMessage = {
                 cmd: "ping" /* WeWorkCommand.PING */,
                 headers: {
@@ -359,23 +381,27 @@ function stopHeartbeat() {
 }
 /**
  * Schedule reconnection attempt
+ * 超过 MAX_RECONNECT_ATTEMPTS 后自动重置计数器继续重试，避免永久断连
  */
 function scheduleReconnect() {
     if (isStopping || !shouldReconnect) {
         return;
     }
-    if (reconnectAttempts >= MAX_RECONNECT_ATTEMPTS) {
-        log.error('Max reconnect attempts reached');
-        return;
-    }
-    const interval = 5000; // 5秒后重连
     if (reconnectTimer) {
         return;
     }
+    // 超过最大重试次数后重置计数器，降低频率继续重试
+    if (reconnectAttempts >= MAX_RECONNECT_ATTEMPTS) {
+        log.warn(`Max reconnect attempts (${MAX_RECONNECT_ATTEMPTS}) reached, resetting counter and retrying at lower frequency`);
+        reconnectAttempts = 0;
+    }
+    // 逐步增加间隔，5s → 7.5s → 11s → ... 最大 60s
+    const backoff = Math.min(5000 * Math.pow(1.5, Math.floor(reconnectAttempts / 5)), 60000);
+    const interval = Math.round(backoff);
     reconnectTimer = setTimeout(async () => {
         reconnectTimer = null;
         reconnectAttempts++;
-        log.info(`Reconnecting... Attempt ${reconnectAttempts}/${MAX_RECONNECT_ATTEMPTS}`);
+        log.info(`Reconnecting... Attempt ${reconnectAttempts}/${MAX_RECONNECT_ATTEMPTS} (interval: ${interval}ms)`);
         try {
             await connectWebSocket();
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wu529778790/open-im",
-  "version": "1.8.1-beta.11",
+  "version": "1.8.1-beta.13",
   "description": "Multi-platform IM bridge for AI CLI tools (Claude, Codex, CodeBuddy)",
   "type": "module",
   "main": "dist/index.js",