@wu529778790/open-im 1.11.1-beta.0 → 1.11.1-beta.2

package/dist/clawbot/client.js

@@ -21,6 +21,7 @@ let channelState = 'disconnected';
 let messageHandler = null;
 let stateChangeHandler = null;
 let reconnectTimer = null;
+let watchdogTimer = null;
 let reconnectAttempt = 0;
 let fatal = false;
 let stopped = false;
@@ -28,6 +29,13 @@ let apiUrl = 'https://ilinkai.weixin.qq.com';
 let apiToken = '';
 /** Opaque cursor for getupdates pagination (replaces numeric offset) */
 let getUpdatesBuf = '';
+/** Timestamp of last successful poll response (for watchdog) */
+let lastResponseAt = 0;
+/** Per-request timeout for long-polling (ms) */
+const POLL_REQUEST_TIMEOUT_MS = 3 * 60 * 1000; // 3 minutes
+/** Watchdog interval: force reconnect if no response for this long (ms) */
+const WATCHDOG_INTERVAL_MS = 60_000; // check every 60s
+const WATCHDOG_STALE_MS = 5 * 60 * 1000; // 5 minutes without response = stale
 export function getChannelState() {
     return channelState;
 }
@@ -58,14 +66,21 @@ function startPolling() {
         return;
     pollController = new AbortController();
     const signal = pollController.signal;
+    // Start watchdog to detect stale connections (e.g. Mac sleep / network drop)
+    startWatchdog();
     (async () => {
         log.info('ClawBot long-polling started');
         while (!stopped && !signal.aborted) {
             try {
+                // Combine the poll controller signal with a per-request timeout
+                const timeoutSignal = AbortSignal.timeout(POLL_REQUEST_TIMEOUT_MS);
+                const combinedSignal = AbortSignal.any([signal, timeoutSignal]);
                 const res = await postApi('/ilink/bot/getupdates', {
                     get_updates_buf: getUpdatesBuf,
                     base_info: BASE_INFO,
-                }, signal);
+                }, combinedSignal);
+                // Record successful response time for watchdog
+                lastResponseAt = Date.now();
                 if (signal.aborted)
                     break;
                 if (!res.ok) {
@@ -168,6 +183,35 @@ function updateState(state) {
     stateChangeHandler?.(state);
     log.debug(`ClawBot state: ${state}`);
 }
+/**
+ * Watchdog: periodically check if the poll loop is alive.
+ * After Mac sleep or network drop, the fetch may hang without throwing.
+ * If no successful response for WATCHDOG_STALE_MS, force a reconnect.
+ */
+function startWatchdog() {
+    stopWatchdog();
+    lastResponseAt = Date.now();
+    watchdogTimer = setInterval(() => {
+        if (stopped)
+            return;
+        const elapsed = Date.now() - lastResponseAt;
+        if (elapsed > WATCHDOG_STALE_MS) {
+            log.warn(`ClawBot watchdog: no response for ${Math.round(elapsed / 1000)}s, forcing reconnect`);
+            if (pollController) {
+                pollController.abort();
+                pollController = null;
+            }
+            updateState('error');
+            scheduleReconnect();
+        }
+    }, WATCHDOG_INTERVAL_MS);
+}
+function stopWatchdog() {
+    if (watchdogTimer) {
+        clearInterval(watchdogTimer);
+        watchdogTimer = null;
+    }
+}
 /**
  * Extract text content from an iLink message's item_list.
  * Returns the first text item found, or a placeholder for media types.
@@ -272,6 +316,7 @@ export function stopClawbot() {
         clearTimeout(reconnectTimer);
         reconnectTimer = null;
     }
+    stopWatchdog();
     messageHandler = null;
     // Don't clear context_token here — it's persisted for startup notifications
     updateState('disconnected');

package/dist/index.js

@@ -35,7 +35,7 @@ import { destroyAllLiveChildren } from "./shared/process-kill.js";
 import { initLogger, createLogger, closeLogger, emitStructuredEvent, shutdownLoggerTelemetry, } from "./logger.js";
 import { APP_HOME, SHUTDOWN_PORT } from "./constants.js";
 import { createRequire } from "node:module";
-import { escapePathForMarkdown } from "./shared/utils.js";
+import { escapePathForMarkdown, getAIToolDisplayName } from "./shared/utils.js";
 import { applyOpenImGitCoauthorToProcessEnv } from "./shared/git-coauthor.js";
 import { emitInterruptedTerminals } from "./shared/task-cleanup.js";
 const require = createRequire(import.meta.url);
@@ -127,6 +127,15 @@ async function sendLifecycleNotification(platform, message) {
     await mod.sendNotification(chatId, message);
     log.info(`[${platform}] Lifecycle notification sent successfully`);
 }
+const PLATFORM_DISPLAY_NAMES = {
+    telegram: 'Telegram',
+    feishu: '飞书',
+    wework: '企业微信',
+    dingtalk: '钉钉',
+    qq: 'QQ',
+    workbuddy: '微信',
+    clawbot: '微信 (ClawBot)',
+};
 function buildStartupMessage(platform, appVersion, aiCommand, defaultWorkDir, sessionManager) {
     let sessionDir;
     // Telegram 私聊、企业微信当前实现里，活跃 chatId 可直接对应到 session userId。
@@ -136,27 +145,23 @@ function buildStartupMessage(platform, appVersion, aiCommand, defaultWorkDir, se
             sessionDir = sessionManager.getWorkDir(activeChatId);
         }
     }
-    const lines = [
-        `**服务已启动**`,
+    const platformName = PLATFORM_DISPLAY_NAMES[platform] ?? platform;
+    const toolName = getAIToolDisplayName(aiCommand);
+    const dir = sessionDir ? escapePathForMarkdown(sessionDir) : '发送 `/pwd` 查看';
+    return [
+        `✅ open-im v${appVersion} 已就绪`,
         "",
-        `- 版本: \`open-im v${appVersion}\``,
-        `- 当前渠道: \`${platform}\``,
-        `- 当前渠道 CLI: \`${aiCommand}\``,
-    ];
-    if (sessionDir) {
-        lines.push(`- 会话目录: ${escapePathForMarkdown(sessionDir)}`);
-    }
-    else {
-        lines.push(`- 会话目录: 发送 \`/pwd\` 查看`);
-    }
-    return lines.join("\n");
+        `📱 平台: ${platformName}`,
+        `🤖 AI: ${toolName}`,
+        `📁 目录: ${dir}`,
+    ].join("\n");
 }
 function buildShutdownMessage(uptimeMinutes) {
+    const uptime = uptimeMinutes < 1 ? '< 1' : String(uptimeMinutes);
     return [
-        `**服务正在关闭**`,
+        `🛑 open-im 正在关闭`,
         "",
-        `- 服务: \`open-im\``,
-        `- 运行时长: \`${uptimeMinutes} 分钟\``,
+        `⏱️ 运行时长: ${uptime} 分钟`,
     ].join("\n");
 }
 export async function main() {

package/package.json

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