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

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,8 @@ let heartbeatTimer = null;
 let reconnectAttempts = 0;
 let currentToken = null;
 let tokenStoragePath = null;
+let lastServerResponseTime = 0; // 上次收到服务端消息的时间
+let wsConfigRef = null; // 保存配置供心跳重连使用
 // Event handlers
 let messageHandler = null;
 let stateChangeHandler = null;
@@ -92,6 +95,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 +112,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 +195,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 +239,26 @@ function stopHeartbeat() {
 }
 /**
  * Schedule reconnection attempt
+ * 超过 maxAttempts 后自动重置计数器继续重试，避免永久断连
  */
 function scheduleReconnect(config) {
     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);
         }

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.12",
   "description": "Multi-platform IM bridge for AI CLI tools (Claude, Codex, CodeBuddy)",
   "type": "module",
   "main": "dist/index.js",