@seamnet/client 0.13.0 → 0.13.1

package/lib/plugins/im/index.cjs

@@ -136,17 +136,35 @@ function createImPlugin() {
 
   // ===== Supervisor 状态（SDK 僵尸时自动重建 chat 实例）=====
   let credentialsRef = null;
-  let rebuildInProgress = false;
-  let lastRebuildAt = 0;
+  // 状态机：scheduled（待启动）/ rebuilding（进行中）；期间又来信号标记 requestedAgain
+  let rebuildScheduled = false;
+  let rebuilding = false;
+  let rebuildRequestedAgain = false;
+  let lastRebuildSuccessAt = 0;
+  let chatGeneration = 0;  // chat 实例代数，每次 create 递增；listener 校验代数，老代事件忽略
   let keepaliveTimer = null;
   let processRejectionHandler = 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 KEEPALIVE_INTERVAL_MS = 3 * 60 * 1000;
   const KEEPALIVE_TIMEOUT_MS = 10_000;
   // SDK 错误 code 需要触发 rebuild（2801=PING 超时，WebSocket 应用层僵尸）
   const SDK_REBUILD_ERROR_CODES = new Set([2801]);
 
+  function withTimeout(promise, ms, name) {
+    let tid = null;
+    const timeoutP = new Promise((_, reject) => {
+      tid = setTimeout(() => reject(new Error(`${name} timeout ${ms}ms`)), ms);
+    });
+    return Promise.race([promise, timeoutP]).finally(() => {
+      if (tid) clearTimeout(tid);
+    });
+  }
+
   async function prefetchDisplayName(userId) {
     if (!chat || !userId || displayNameCache.has(userId)) return;
     displayNameCache.set(userId, null);
@@ -339,50 +357,62 @@ function createImPlugin() {
     return { ok: true };
   }
 
-  // ===== 事件 handler（独立函数，便于 rebuild 时重新注册）=====
-
-  function onSdkReady() {
-    sdkReady = true;
-    log.info('sdk_ready', { userId: myUserId });
-  }
-
-  function onSdkNotReady() {
-    sdkReady = false;
-    log.warn('sdk_not_ready');
-  }
+  // ===== 事件 handler 工厂（每次 setupAllListeners 时绑定当前 generation）=====
+  // handler 校验 generation，老实例晚到的事件直接忽略，避免污染新状态
 
-  function onSdkError(event) {
-    const err = event?.data || event;
-    const code = err?.code;
-    log.warn('sdk_error', {
-      code,
-      message: err?.message || String(err).slice(0, 200),
-    });
-    if (SDK_REBUILD_ERROR_CODES.has(code)) {
-      scheduleRebuild(`sdk_error:${code}`);
-    }
-  }
-
-  function onKickedOut(event) {
-    log.warn('sdk_kicked_out', {
-      type: event?.data?.type,
-      message: event?.data?.message,
-    });
-    sdkReady = false;
-    scheduleRebuild('kicked_out');
-  }
-
-  function onNetStateChange(event) {
-    log.info('sdk_net_state', { state: event?.data?.state });
-  }
-
-  function onFriendListUpdated() {
-    refreshContactsFromFriendList().catch((err) => {
-      log.warn('refresh_contacts_on_update_failed', { message: err.message });
-    });
+  function makeHandlers(gen) {
+    return {
+      onSdkReady: () => {
+        if (gen !== chatGeneration) return;
+        sdkReady = true;
+        log.info('sdk_ready', { userId: myUserId, gen });
+      },
+      onSdkNotReady: () => {
+        if (gen !== chatGeneration) return;
+        sdkReady = false;
+        log.warn('sdk_not_ready', { gen });
+      },
+      onSdkError: (event) => {
+        if (gen !== chatGeneration) return;
+        const err = event?.data || event;
+        const code = err?.code;
+        log.warn('sdk_error', {
+          code,
+          message: err?.message || String(err).slice(0, 200),
+          gen,
+        });
+        if (SDK_REBUILD_ERROR_CODES.has(code)) {
+          scheduleRebuild(`sdk_error:${code}`);
+        }
+      },
+      onKickedOut: (event) => {
+        if (gen !== chatGeneration) return;
+        log.warn('sdk_kicked_out', {
+          type: event?.data?.type,
+          message: event?.data?.message,
+          gen,
+        });
+        sdkReady = false;
+        scheduleRebuild('kicked_out');
+      },
+      onNetStateChange: (event) => {
+        if (gen !== chatGeneration) return;
+        log.info('sdk_net_state', { state: event?.data?.state, gen });
+      },
+      onFriendListUpdated: () => {
+        if (gen !== chatGeneration) return;
+        refreshContactsFromFriendList().catch((err) => {
+          log.warn('refresh_contacts_on_update_failed', { message: err.message });
+        });
+      },
+      onMessageReceived: (event) => {
+        if (gen !== chatGeneration) return;
+        handleMessageEvent(event);
+      },
+    };
   }
 
-  function onMessageReceived(event) {
+  function handleMessageEvent(event) {
     for (const msg of event.data) {
       if (msg.from === myUserId) continue;
 
@@ -500,14 +530,15 @@ function createImPlugin() {
   }
 
   function setupAllListeners() {
-    chat.on(TencentCloudChat.EVENT.SDK_READY, onSdkReady);
-    chat.on(TencentCloudChat.EVENT.SDK_NOT_READY, onSdkNotReady);
-    chat.on(TencentCloudChat.EVENT.ERROR, onSdkError);
-    chat.on(TencentCloudChat.EVENT.KICKED_OUT, onKickedOut);
-    chat.on(TencentCloudChat.EVENT.NET_STATE_CHANGE, onNetStateChange);
-    chat.on(TencentCloudChat.EVENT.MESSAGE_RECEIVED, onMessageReceived);
+    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);
     try {
-      chat.on(TencentCloudChat.EVENT.FRIEND_LIST_UPDATED, onFriendListUpdated);
+      chat.on(TencentCloudChat.EVENT.FRIEND_LIST_UPDATED, h.onFriendListUpdated);
     } catch (err) {
       log.warn('friend_list_listener_register_failed', { message: err.message });
     }
@@ -516,7 +547,11 @@ function createImPlugin() {
   // ===== 重建 chat 实例（SDK 僵尸时用）=====
 
   async function createAndLoginChat() {
+    // 每次 create 递增 generation，让老实例的 handler 自动失效
+    chatGeneration += 1;
+    // 清理 globals 让 setupSdkGlobals 能重新设置 window 等
     delete global.window;
+    global._imSdkGlobalsSet = false;
     chat = TencentCloudChat.create({ SDKAppID: Number(credentialsRef.sdkAppId) });
     setupSdkGlobals();
     try {
@@ -525,11 +560,12 @@ function createImPlugin() {
     } catch {}
     chat.setLogLevel(4);
     setupAllListeners();
-    await chat.login({
-      userID: myUserId,
-      userSig: credentialsRef.userSig,
-    });
-    // 等 SDK_READY（最多 10s）
+    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);
@@ -539,48 +575,71 @@ function createImPlugin() {
   }
 
   async function rebuildChat(reason) {
-    log.warn('chat_rebuild_start', { reason });
+    log.warn('chat_rebuild_start', { reason, prevGen: chatGeneration });
     sdkReady = false;
-    try { await chat.logout(); } catch {}
-    try { chat.destroy && chat.destroy(); } catch {}
+    // 每步都 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();
     try {
-      await createAndLoginChat();
-      try { await refreshContactsFromFriendList(); } catch {}
-      log.info('chat_rebuild_done', { reason });
+      await withTimeout(refreshContactsFromFriendList(), SDK_CALL_TIMEOUT_MS, 'refresh_contacts');
     } catch (e) {
-      log.error('chat_rebuild_failed', e, { reason });
+      log.warn('refresh_contacts_after_rebuild_timeout', { message: e.message });
+    }
+    log.info('chat_rebuild_done', { reason, newGen: chatGeneration });
+  }
+
+  async function doRebuild(reason) {
+    rebuildScheduled = false;
+    rebuilding = true;
+    try {
+      await withTimeout(rebuildChat(reason), REBUILD_WATCHDOG_MS, 'rebuild_watchdog');
+      lastRebuildSuccessAt = Date.now();
+    } catch (e) {
+      log.error('chat_rebuild_failed', e, { reason, message: e.message });
+      // 注意：lastRebuildSuccessAt 不更新，允许立即重试（不被 cooldown 拦）
+    } finally {
+      rebuilding = false;
+      if (rebuildRequestedAgain) {
+        rebuildRequestedAgain = false;
+        scheduleRebuild('trailing');
+      }
     }
   }
 
   function scheduleRebuild(reason) {
-    if (rebuildInProgress) return;
+    // 已在重建中：标记 trailing，结束后再跑一轮
+    if (rebuilding) {
+      rebuildRequestedAgain = true;
+      log.info('chat_rebuild_queued_trailing', { reason });
+      return;
+    }
+    // 已在等待启动：合并（debounce）
+    if (rebuildScheduled) return;
+    // Cooldown 只针对上次"成功"的重建——失败后允许立即重试
     const now = Date.now();
-    if (now - lastRebuildAt < REBUILD_COOLDOWN_MS) {
+    if (now - lastRebuildSuccessAt < REBUILD_COOLDOWN_MS) {
       log.info('chat_rebuild_skipped_cooldown', { reason });
       return;
     }
-    rebuildInProgress = true;
-    setTimeout(async () => {
-      try {
-        await rebuildChat(reason);
-        lastRebuildAt = Date.now();
-      } finally {
-        rebuildInProgress = false;
-      }
-    }, REBUILD_DEBOUNCE_MS);
+    // 立即降级：阻止发送路径继续用坏 chat
+    sdkReady = false;
+    rebuildScheduled = true;
+    setTimeout(() => { doRebuild(reason).catch(() => {}); }, REBUILD_DEBOUNCE_MS);
   }
 
   function startKeepalive() {
     if (keepaliveTimer) return;
     keepaliveTimer = setInterval(async () => {
-      if (!sdkReady || rebuildInProgress) return;
+      if (!sdkReady || rebuilding || rebuildScheduled) return;
       try {
-        await Promise.race([
-          chat.getMyProfile(),
-          new Promise((_, reject) =>
-            setTimeout(() => reject(new Error('keepalive timeout')), KEEPALIVE_TIMEOUT_MS)
-          ),
-        ]);
+        await withTimeout(chat.getMyProfile(), KEEPALIVE_TIMEOUT_MS, 'keepalive');
       } catch (e) {
         log.warn('keepalive_failed', { message: e.message });
         scheduleRebuild(`keepalive:${e.message}`);
@@ -612,6 +671,7 @@ function createImPlugin() {
     // 先 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 等全局

package/package.json

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