@seamnet/client 0.13.1 → 0.13.2

package/lib/plugins/im/index.cjs

@@ -144,14 +144,20 @@ function createImPlugin() {
   let chatGeneration = 0;  // chat 实例代数，每次 create 递增；listener 校验代数，老代事件忽略
   let keepaliveTimer = null;
   let processRejectionHandler = null;
+  // 重建失败后自驱重试：指数退避 + jitter；成功后重置
+  let rebuildRetryAttempt = 0;
+  let rebuildRetryTimer = null;
   const REBUILD_COOLDOWN_MS = 10_000;
   const REBUILD_DEBOUNCE_MS = 3_000;
   const REBUILD_WATCHDOG_MS = 30_000;      // 整个重建最多 30s，超时强制失败
   const SDK_CALL_TIMEOUT_MS = 10_000;      // 单个 SDK 调用超时
   const LOGOUT_TIMEOUT_MS = 5_000;
   const LOGIN_TIMEOUT_MS = 15_000;
+  const SDK_READY_TIMEOUT_MS = 10_000;     // 等 SDK_READY 最长 10s，超时 reject
   const KEEPALIVE_INTERVAL_MS = 3 * 60 * 1000;
   const KEEPALIVE_TIMEOUT_MS = 10_000;
+  // 重建失败退避表（最后一档持续）
+  const REBUILD_RETRY_BACKOFF_MS = [3_000, 10_000, 30_000, 60_000];
   // SDK 错误 code 需要触发 rebuild（2801=PING 超时，WebSocket 应用层僵尸）
   const SDK_REBUILD_ERROR_CODES = new Set([2801]);
 
@@ -357,14 +363,14 @@ function createImPlugin() {
     return { ok: true };
   }
 
-  // ===== 事件 handler 工厂（每次 setupAllListeners 时绑定当前 generation）=====
+  // ===== 事件 handler 工厂（每次 attachListenersTo 时绑定当前 generation）=====
   // handler 校验 generation，老实例晚到的事件直接忽略，避免污染新状态
 
   function makeHandlers(gen) {
     return {
       onSdkReady: () => {
         if (gen !== chatGeneration) return;
-        sdkReady = true;
+        // sdkReady 的置 true 统一在 rebuildChat/init 成功 swap 后做，handler 只记录
         log.info('sdk_ready', { userId: myUserId, gen });
       },
       onSdkNotReady: () => {
@@ -529,70 +535,110 @@ function createImPlugin() {
     }
   }
 
-  function setupAllListeners() {
-    const h = makeHandlers(chatGeneration);
-    chat.on(TencentCloudChat.EVENT.SDK_READY, h.onSdkReady);
-    chat.on(TencentCloudChat.EVENT.SDK_NOT_READY, h.onSdkNotReady);
-    chat.on(TencentCloudChat.EVENT.ERROR, h.onSdkError);
-    chat.on(TencentCloudChat.EVENT.KICKED_OUT, h.onKickedOut);
-    chat.on(TencentCloudChat.EVENT.NET_STATE_CHANGE, h.onNetStateChange);
-    chat.on(TencentCloudChat.EVENT.MESSAGE_RECEIVED, h.onMessageReceived);
+  function attachListenersTo(chatInstance, gen) {
+    const h = makeHandlers(gen);
+    chatInstance.on(TencentCloudChat.EVENT.SDK_READY, h.onSdkReady);
+    chatInstance.on(TencentCloudChat.EVENT.SDK_NOT_READY, h.onSdkNotReady);
+    chatInstance.on(TencentCloudChat.EVENT.ERROR, h.onSdkError);
+    chatInstance.on(TencentCloudChat.EVENT.KICKED_OUT, h.onKickedOut);
+    chatInstance.on(TencentCloudChat.EVENT.NET_STATE_CHANGE, h.onNetStateChange);
+    chatInstance.on(TencentCloudChat.EVENT.MESSAGE_RECEIVED, h.onMessageReceived);
     try {
-      chat.on(TencentCloudChat.EVENT.FRIEND_LIST_UPDATED, h.onFriendListUpdated);
+      chatInstance.on(TencentCloudChat.EVENT.FRIEND_LIST_UPDATED, h.onFriendListUpdated);
     } catch (err) {
       log.warn('friend_list_listener_register_failed', { message: err.message });
     }
   }
 
-  // ===== 重建 chat 实例（SDK 僵尸时用）=====
+  function waitForSdkReadyStrict(chatInstance, ms) {
+    return new Promise((resolve, reject) => {
+      const timer = setTimeout(
+        () => reject(new Error(`SDK_READY timeout ${ms}ms`)),
+        ms
+      );
+      chatInstance.on(TencentCloudChat.EVENT.SDK_READY, () => {
+        clearTimeout(timer);
+        resolve();
+      });
+    });
+  }
 
-  async function createAndLoginChat() {
-    // 每次 create 递增 generation，让老实例的 handler 自动失效
-    chatGeneration += 1;
-    // 清理 globals 让 setupSdkGlobals 能重新设置 window 等
+  // ===== 候选模式构建新 chat（失败则隔离销毁，不污染 active chat）=====
+  async function buildChatCandidate() {
+    const myGen = ++chatGeneration;
+    // 清 globals，让 setupSdkGlobals 重新铺 window 等
     delete global.window;
     global._imSdkGlobalsSet = false;
-    chat = TencentCloudChat.create({ SDKAppID: Number(credentialsRef.sdkAppId) });
+    const nextChat = TencentCloudChat.create({ SDKAppID: Number(credentialsRef.sdkAppId) });
     setupSdkGlobals();
     try {
       const TIMUploadPlugin = require('tim-upload-plugin');
-      chat.registerPlugin({ 'tim-upload-plugin': TIMUploadPlugin });
+      nextChat.registerPlugin({ 'tim-upload-plugin': TIMUploadPlugin });
     } catch {}
-    chat.setLogLevel(4);
-    setupAllListeners();
-    await withTimeout(
-      chat.login({ userID: myUserId, userSig: credentialsRef.userSig }),
-      LOGIN_TIMEOUT_MS,
-      'chat.login'
-    );
-    // 等 SDK_READY（最多 10s）——sdkReady 可能已被 handler 置 true
-    await new Promise((resolve) => {
-      if (sdkReady) return resolve();
-      const timer = setTimeout(() => resolve(), 10000);
-      const once = () => { clearTimeout(timer); resolve(); };
-      chat.on(TencentCloudChat.EVENT.SDK_READY, once);
-    });
+    nextChat.setLogLevel(4);
+    attachListenersTo(nextChat, myGen);
+    try {
+      await withTimeout(
+        nextChat.login({ userID: myUserId, userSig: credentialsRef.userSig }),
+        LOGIN_TIMEOUT_MS,
+        'chat.login'
+      );
+      // 严格等 SDK_READY：超时 reject，不再假成功
+      await waitForSdkReadyStrict(nextChat, SDK_READY_TIMEOUT_MS);
+    } catch (err) {
+      // 失败的 candidate 必须隔离销毁，避免 late event 污染新状态
+      try {
+        await withTimeout(
+          (nextChat.logout && nextChat.logout().catch(() => {})) || Promise.resolve(),
+          LOGOUT_TIMEOUT_MS,
+          'cand_logout'
+        );
+      } catch {}
+      try { nextChat.destroy && nextChat.destroy(); } catch {}
+      throw err;
+    }
+    return { nextChat, gen: myGen };
   }
 
+  // ===== 重建 chat 实例（SDK 僵尸时用）=====
   async function rebuildChat(reason) {
     log.warn('chat_rebuild_start', { reason, prevGen: chatGeneration });
     sdkReady = false;
-    // 每步都 timeout：老 chat 僵尸可能让 logout 永不 resolve
     const oldChat = chat;
-    try {
-      await withTimeout(oldChat.logout().catch(() => {}), LOGOUT_TIMEOUT_MS, 'logout');
-    } catch (e) {
-      log.warn('logout_timeout', { message: e.message });
-    }
-    try { oldChat.destroy && oldChat.destroy(); } catch {}
-    // createAndLoginChat 自身会递增 chatGeneration，老 listener 自动失效
-    await createAndLoginChat();
+
+    // 候选模式：先把新 chat 完整拉起来（login + SDK_READY），失败则 throw，老 chat 保持不变
+    const { nextChat, gen: newGen } = await buildChatCandidate();
+
+    // 成功：swap 到新 chat；sdkReady 只在 swap 完成后置 true
+    chat = nextChat;
+    sdkReady = true;
+    log.info('chat_rebuild_done', { reason, newGen });
+
+    // 老 chat 后台销毁，不阻塞新 chat 服务
+    (async () => {
+      try {
+        if (oldChat && oldChat.logout) {
+          await withTimeout(oldChat.logout().catch(() => {}), LOGOUT_TIMEOUT_MS, 'old_logout');
+        }
+      } catch (e) {
+        log.warn('old_logout_timeout', { message: e.message });
+      }
+      try { oldChat && oldChat.destroy && oldChat.destroy(); } catch {}
+    })();
+
     try {
       await withTimeout(refreshContactsFromFriendList(), SDK_CALL_TIMEOUT_MS, 'refresh_contacts');
     } catch (e) {
       log.warn('refresh_contacts_after_rebuild_timeout', { message: e.message });
     }
-    log.info('chat_rebuild_done', { reason, newGen: chatGeneration });
+  }
+
+  function scheduleRebuildRetry(reason, delayMs) {
+    if (rebuildRetryTimer) clearTimeout(rebuildRetryTimer);
+    rebuildRetryTimer = setTimeout(() => {
+      rebuildRetryTimer = null;
+      scheduleRebuild(reason);
+    }, delayMs);
   }
 
   async function doRebuild(reason) {
@@ -601,9 +647,18 @@ function createImPlugin() {
     try {
       await withTimeout(rebuildChat(reason), REBUILD_WATCHDOG_MS, 'rebuild_watchdog');
       lastRebuildSuccessAt = Date.now();
+      rebuildRetryAttempt = 0;
+      if (rebuildRetryTimer) { clearTimeout(rebuildRetryTimer); rebuildRetryTimer = null; }
     } catch (e) {
-      log.error('chat_rebuild_failed', e, { reason, message: e.message });
-      // 注意：lastRebuildSuccessAt 不更新，允许立即重试（不被 cooldown 拦）
+      log.error('chat_rebuild_failed', e, { reason, message: e.message, attempt: rebuildRetryAttempt });
+      // 自驱重试：指数退避 + jitter；不依赖外部信号
+      const idx = Math.min(rebuildRetryAttempt, REBUILD_RETRY_BACKOFF_MS.length - 1);
+      const base = REBUILD_RETRY_BACKOFF_MS[idx];
+      const jitter = Math.floor(Math.random() * 1000);
+      const delay = base + jitter;
+      rebuildRetryAttempt += 1;
+      log.info('chat_rebuild_retry_scheduled', { attempt: rebuildRetryAttempt, delayMs: delay });
+      scheduleRebuildRetry(`auto_retry:${reason}`, delay);
     } finally {
       rebuilding = false;
       if (rebuildRequestedAgain) {
@@ -668,55 +723,26 @@ function createImPlugin() {
     myUserId = credentials.userId;
     credentialsRef = credentials;
 
-    // 先 delete window 让 SDK 走 node 路径
-    delete global.window;
     TencentCloudChat = require('@tencentcloud/chat');
-    chatGeneration += 1;  // 首次也是 gen 1（listener 校验需要）
-    chat = TencentCloudChat.create({ SDKAppID: Number(credentials.sdkAppId) });
-
-    // 然后补上 SDK 运行所需的 window/document 等全局
-    setupSdkGlobals();
 
+    // 首次走 candidate 模式：严格 login + SDK_READY，失败直接 throw
     try {
-      const TIMUploadPlugin = require('tim-upload-plugin');
-      chat.registerPlugin({ 'tim-upload-plugin': TIMUploadPlugin });
+      const built = await buildChatCandidate();
+      chat = built.nextChat;
+      sdkReady = true;
+      log.info('login_ok', { userId: myUserId, gen: built.gen });
       log.info('upload_plugin_registered');
-    } catch (e) {
-      log.warn('upload_plugin_unavailable', { message: e.message });
-    }
-
-    chat.setLogLevel(4);
-
-    // 所有事件监听通过 setupAllListeners 统一注册（便于 rebuild 时重注册）
-    setupAllListeners();
-
-    try {
-      await chat.login({ userID: myUserId, userSig: credentials.userSig });
-      log.info('login_ok', { userId: myUserId });
     } catch (err) {
       log.error('login_failed', err);
       throw wrap(err, {
         code: 'IM_LOGIN_FAILED',
-        hint: '检查 userSig 是否过期、sdkAppId 是否正确',
+        hint: '检查 userSig 是否过期、sdkAppId 是否正确、网络到 my-imcloud.com',
         docs: 'docs/maintainer-guide.md#IM_LOGIN_FAILED',
       });
     }
 
-    // 等 SDK_READY（最多 10s）
-    await new Promise((resolve) => {
-      if (sdkReady) return resolve();
-      const timer = setTimeout(() => {
-        log.warn('sdk_ready_wait_timeout');
-        resolve();
-      }, 10000);
-      chat.on(TencentCloudChat.EVENT.SDK_READY, () => {
-        clearTimeout(timer);
-        resolve();
-      });
-    });
-
     // 拉一次好友列表建立关系表 contacts.json
-    // FRIEND_LIST_UPDATED 监听已在 setupAllListeners 里注册
+    // FRIEND_LIST_UPDATED 监听已在 buildChatCandidate 里注册
     seedDisplayNameFromContacts();
     await refreshContactsFromFriendList();
 
@@ -790,17 +816,23 @@ function createImPlugin() {
       clearInterval(keepaliveTimer);
       keepaliveTimer = null;
     }
+    if (rebuildRetryTimer) {
+      clearTimeout(rebuildRetryTimer);
+      rebuildRetryTimer = null;
+    }
     if (processRejectionHandler) {
       try { process.off('unhandledRejection', processRejectionHandler); } catch {}
       processRejectionHandler = null;
     }
     if (chat) {
       try {
-        await chat.logout();
+        await withTimeout(chat.logout().catch(() => {}), LOGOUT_TIMEOUT_MS, 'destroy_logout');
         if (log) log.info('logged_out');
       } catch (e) {
         if (log) log.warn('logout_failed', { message: e.message });
       }
+      try { chat.destroy && chat.destroy(); } catch {}
+      chat = null;
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seamnet/client",
-  "version": "0.13.1",
+  "version": "0.13.2",
   "description": "One command to join Seam — the network where people and AI stay in sync.",
   "bin": {
     "seam-client": "bin/cli.js",