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

package/dist/config-web.js

@@ -117,6 +117,7 @@ export function getHealthPlatformSnapshot(file, env = process.env) {
     const fileQQ = file.platforms?.qq;
     const fileWework = file.platforms?.wework;
     const fileDingtalk = file.platforms?.dingtalk;
+    const fileWorkbuddy = file.platforms?.workbuddy;
     const telegramBotToken = env.TELEGRAM_BOT_TOKEN ?? fileTelegram?.botToken ?? file.telegramBotToken;
     const feishuAppId = env.FEISHU_APP_ID ?? fileFeishu?.appId ?? file.feishuAppId;
     const feishuAppSecret = env.FEISHU_APP_SECRET ?? fileFeishu?.appSecret ?? file.feishuAppSecret;
@@ -126,6 +127,9 @@ export function getHealthPlatformSnapshot(file, env = process.env) {
     const weworkSecret = env.WEWORK_SECRET ?? fileWework?.secret;
     const dingtalkClientId = env.DINGTALK_CLIENT_ID ?? fileDingtalk?.clientId;
     const dingtalkClientSecret = env.DINGTALK_CLIENT_SECRET ?? fileDingtalk?.clientSecret;
+    const workbuddyAccessToken = fileWorkbuddy?.accessToken;
+    const workbuddyRefreshToken = fileWorkbuddy?.refreshToken;
+    const workbuddyUserId = fileWorkbuddy?.userId;
     return {
         telegram: {
             configured: !!telegramBotToken,
@@ -157,6 +161,12 @@ export function getHealthPlatformSnapshot(file, env = process.env) {
             healthy: !!(dingtalkClientId && dingtalkClientSecret),
             message: dingtalkClientId && dingtalkClientSecret ? "Client ID and Secret configured" : "Missing credentials",
         },
+        workbuddy: {
+            configured: !!(workbuddyAccessToken && workbuddyRefreshToken && workbuddyUserId),
+            enabled: !!(workbuddyAccessToken && workbuddyRefreshToken && workbuddyUserId) && fileWorkbuddy?.enabled !== false,
+            healthy: !!(workbuddyAccessToken && workbuddyRefreshToken && workbuddyUserId),
+            message: workbuddyAccessToken && workbuddyRefreshToken && workbuddyUserId ? "OAuth credentials configured" : "Missing credentials",
+        },
     };
 }
 function splitCsv(value) {
@@ -231,6 +241,15 @@ function buildInitialPayload(file) {
                 cardTemplateId: file.platforms?.dingtalk?.cardTemplateId ?? "",
                 allowedUserIds: (file.platforms?.dingtalk?.allowedUserIds ?? []).join(", "),
             },
+            workbuddy: {
+                enabled: file.platforms?.workbuddy?.enabled ?? Boolean(file.platforms?.workbuddy?.accessToken && file.platforms?.workbuddy?.refreshToken && file.platforms?.workbuddy?.userId),
+                aiCommand: file.platforms?.workbuddy?.aiCommand ?? "",
+                accessToken: file.platforms?.workbuddy?.accessToken ?? "",
+                refreshToken: file.platforms?.workbuddy?.refreshToken ?? "",
+                userId: file.platforms?.workbuddy?.userId ?? "",
+                baseUrl: file.platforms?.workbuddy?.baseUrl ?? "",
+                allowedUserIds: (file.platforms?.workbuddy?.allowedUserIds ?? []).join(", "),
+            },
         },
         ai: {
             aiCommand: file.aiCommand ?? "claude",
@@ -276,6 +295,12 @@ function validatePayload(payload) {
         errors.push("DingTalk client ID is required.");
     if (payload.platforms.dingtalk.enabled && !clean(payload.platforms.dingtalk.clientSecret))
         errors.push("DingTalk client secret is required.");
+    if (payload.platforms.workbuddy.enabled && !clean(payload.platforms.workbuddy.accessToken))
+        errors.push("WorkBuddy access token is required.");
+    if (payload.platforms.workbuddy.enabled && !clean(payload.platforms.workbuddy.refreshToken))
+        errors.push("WorkBuddy refresh token is required.");
+    if (payload.platforms.workbuddy.enabled && !clean(payload.platforms.workbuddy.userId))
+        errors.push("WorkBuddy user ID is required.");
     if (!clean(payload.ai.claudeWorkDir))
         errors.push("Default work directory is required.");
     if (!Number.isFinite(payload.ai.claudeTimeoutMs) || payload.ai.claudeTimeoutMs <= 0)
@@ -330,6 +355,17 @@ function validateConfigForPlatform(platform, config) {
                 errors.push("DingTalk client secret is required and must be a non-empty string.");
             }
             break;
+        case "workbuddy":
+            if (!c.accessToken || typeof c.accessToken !== "string" || !clean(c.accessToken)) {
+                errors.push("WorkBuddy access token is required and must be a non-empty string.");
+            }
+            if (!c.refreshToken || typeof c.refreshToken !== "string" || !clean(c.refreshToken)) {
+                errors.push("WorkBuddy refresh token is required and must be a non-empty string.");
+            }
+            if (!c.userId || typeof c.userId !== "string" || !clean(c.userId)) {
+                errors.push("WorkBuddy user ID is required and must be a non-empty string.");
+            }
+            break;
         default:
             errors.push(`Unknown platform: ${platform}`);
     }
@@ -455,6 +491,34 @@ async function probeDingTalk(config) {
     }
     return "DingTalk credentials are valid.";
 }
+async function probeWorkBuddy(config) {
+    const accessToken = clean(String(config.accessToken ?? ""));
+    const refreshToken = clean(String(config.refreshToken ?? ""));
+    const userId = clean(String(config.userId ?? ""));
+    if (!accessToken || !refreshToken || !userId)
+        throw new Error("WorkBuddy access token, refresh token, and user ID are required.");
+    const baseUrl = clean(String(config.baseUrl ?? "")) || "https://copilot.tencent.com";
+    // Validate credentials by attempting to register workspace
+    const response = await fetch(`${baseUrl}/api/copilot/workspace/register`, {
+        method: "POST",
+        headers: {
+            "content-type": "application/json",
+            "authorization": `Bearer ${accessToken}`,
+        },
+        body: JSON.stringify({
+            userId,
+            hostId: "open-im-test",
+            workspaceId: "open-im-test-workspace",
+            workspaceName: "OpenIM Test Workspace",
+        }),
+        signal: AbortSignal.timeout(TEST_TIMEOUT_MS),
+    });
+    if (!response.ok) {
+        const body = await response.text();
+        throw new Error(`WorkBuddy authentication failed: ${body.slice(0, 200) || `HTTP ${response.status}`}`);
+    }
+    return "WorkBuddy credentials are valid.";
+}
 export async function testPlatformConfig(platform, config) {
     const errors = validateConfigForPlatform(platform, config);
     if (errors.length > 0) {
@@ -471,6 +535,8 @@ export async function testPlatformConfig(platform, config) {
             return probeWeWork(config);
         case "dingtalk":
             return probeDingTalk(config);
+        case "workbuddy":
+            return probeWorkBuddy(config);
         default:
             throw new Error(`Unknown platform: ${platform}`);
     }
@@ -557,6 +623,16 @@ function toFileConfig(payload, existing) {
                 cardTemplateId: clean(payload.platforms.dingtalk.cardTemplateId),
                 allowedUserIds: splitCsv(payload.platforms.dingtalk.allowedUserIds),
             },
+            workbuddy: {
+                ...existing.platforms?.workbuddy,
+                enabled: payload.platforms.workbuddy.enabled,
+                aiCommand: clean(payload.platforms.workbuddy.aiCommand),
+                accessToken: clean(payload.platforms.workbuddy.accessToken),
+                refreshToken: clean(payload.platforms.workbuddy.refreshToken),
+                userId: clean(payload.platforms.workbuddy.userId),
+                baseUrl: clean(payload.platforms.workbuddy.baseUrl),
+                allowedUserIds: splitCsv(payload.platforms.workbuddy.allowedUserIds),
+            },
         },
     };
 }
@@ -812,6 +888,7 @@ export async function startWebConfigServer(options) {
             const fileQQ = file.platforms?.qq;
             const fileWework = file.platforms?.wework;
             const fileDingtalk = file.platforms?.dingtalk;
+            const fileWorkbuddy = file.platforms?.workbuddy;
             const telegramBotToken = process.env.TELEGRAM_BOT_TOKEN ?? fileTelegram?.botToken ?? file.telegramBotToken;
             const feishuAppId = process.env.FEISHU_APP_ID ?? fileFeishu?.appId ?? file.feishuAppId;
             const feishuAppSecret = process.env.FEISHU_APP_SECRET ?? fileFeishu?.appSecret ?? file.feishuAppSecret;
@@ -821,6 +898,9 @@ export async function startWebConfigServer(options) {
             const weworkSecret = process.env.WEWORK_SECRET ?? fileWework?.secret;
             const dingtalkClientId = process.env.DINGTALK_CLIENT_ID ?? fileDingtalk?.clientId;
             const dingtalkClientSecret = process.env.DINGTALK_CLIENT_SECRET ?? fileDingtalk?.clientSecret;
+            const workbuddyAccessToken = fileWorkbuddy?.accessToken;
+            const workbuddyRefreshToken = fileWorkbuddy?.refreshToken;
+            const workbuddyUserId = fileWorkbuddy?.userId;
             const platforms = {};
             // 检查 Telegram
             platforms.telegram = {
@@ -857,6 +937,13 @@ export async function startWebConfigServer(options) {
                 healthy: !!(dingtalkClientId && dingtalkClientSecret),
                 message: (dingtalkClientId && dingtalkClientSecret) ? "Client ID and Secret configured" : "Missing credentials"
             };
+            // 检查 WorkBuddy
+            platforms.workbuddy = {
+                configured: !!(workbuddyAccessToken && workbuddyRefreshToken && workbuddyUserId),
+                enabled: !!(workbuddyAccessToken && workbuddyRefreshToken && workbuddyUserId) && fileWorkbuddy?.enabled !== false,
+                healthy: !!(workbuddyAccessToken && workbuddyRefreshToken && workbuddyUserId),
+                message: (workbuddyAccessToken && workbuddyRefreshToken && workbuddyUserId) ? "OAuth credentials configured" : "Missing credentials"
+            };
             json(response, 200, { platforms, serviceStatus: getServiceStatus() });
             return;
         }

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