lobster-roundtable 3.0.4 → 3.0.5

package/main.js

@@ -60,7 +60,7 @@ try {
 }
 
 const CHANNEL_ID = "lobster-roundtable";
-const PLUGIN_VERSION = "3.0.4";
+const PLUGIN_VERSION = "3.0.5";
 const ENABLE_OPENCLAW_CONFIG_SYNC = isOpenClawConfigSyncEnabled();
 const OPENCLAW_CONFIG_ALLOWED_KEYS = new Set(["url", "token", "ownerToken", "name", "persona", "maxTokens"]);
 
@@ -227,21 +227,6 @@ async function requestAutoRegister(httpBase, payload) {
   }
 }
 
-async function requestTokenInfo(httpBase, token) {
-  const safeToken = String(token || "").trim();
-  if (!safeToken) return null;
-  try {
-    const res = await httpRequest(`${httpBase}/api/tokens/${encodeURIComponent(safeToken)}`, {
-      timeout: 12000,
-    });
-    const parsed = JSON.parse(String(res.data || "{}"));
-    if (parsed && typeof parsed === "object") return parsed;
-    return null;
-  } catch {
-    return null;
-  }
-}
-
 function upsertOpenClawPluginConfig(ocHome, wsUrl, updates, logger) {
   const ocConfigPath = pathModule.join(ocHome, "openclaw.json");
   if (!fsModule.existsSync(ocConfigPath)) return;
@@ -347,43 +332,25 @@ module.exports = async function initRoundtable(api, core, hasRuntimeAPI) {
   writeTextSafe(instanceIdFile, instanceId);
 
   const cachedToken = String(readTextSafe(tokenCacheFile) || "").trim();
-  if (cachedToken && token && token !== cachedToken) {
-    let useConfiguredToken = false;
-    let decisionReason = "";
-    if (ownerToken) {
-      useConfiguredToken = true;
-      decisionReason = "配置携带 ownerToken（视为新的安装绑定）";
-    } else {
-      try {
-        const info = await requestTokenInfo(httpBase, token);
-        if (info?.token && String(info.token).trim() === token) {
-          useConfiguredToken = true;
-          decisionReason = "配置 token 在服务端存在（视为新安装）";
-        }
-      } catch {
-        // 服务端不可达时保持缓存优先，避免旧配置回滚
-      }
-    }
-
-    if (useConfiguredToken) {
-      api.logger.warn(`[roundtable] 🔁 检测到新 token，采用配置 token（${decisionReason}）`);
-      writeTextSafe(tokenCacheFile, token);
-    } else {
-      api.logger.warn("[roundtable] ⚠️ 检测到配置 token 与本地缓存不一致，优先使用缓存 token");
-      token = cachedToken;
-      tokenSource = 'cache';
+  if (token) {
+    if (cachedToken && token !== cachedToken) {
+      api.logger.warn("[roundtable] 🔁 检测到配置 token 与本地缓存不一致，按配置 token 启动并覆盖缓存");
+    } else if (cachedToken && token === cachedToken) {
+      tokenSource = 'config+cache';
+      api.logger.info("[roundtable] 📦 命中本地 token 缓存");
     }
-  } else if (cachedToken && !token) {
+    writeTextSafe(tokenCacheFile, token);
+  } else if (cachedToken) {
     api.logger.info("[roundtable] 📦 从本地缓存加载 token");
     token = cachedToken;
     tokenSource = 'cache';
-  } else if (cachedToken && token === cachedToken) {
-    api.logger.info("[roundtable] 📦 命中本地 token 缓存");
-    tokenSource = 'config+cache';
   }
 
   const cachedOwnerToken = normalizeIdentityId(readTextSafe(ownerTokenCacheFile), 128);
-  if (!ownerToken && cachedOwnerToken) {
+  if (ownerToken && cachedOwnerToken && ownerToken !== cachedOwnerToken) {
+    api.logger.warn("[roundtable] 🔁 检测到配置 ownerToken 与缓存不一致，按配置 ownerToken 覆盖缓存");
+    writeTextSafe(ownerTokenCacheFile, ownerToken);
+  } else if (!ownerToken && cachedOwnerToken) {
     ownerToken = cachedOwnerToken;
     api.logger.info("[roundtable] 🔗 从本地缓存恢复 ownerToken");
   }
@@ -487,6 +454,8 @@ function startBot(api, core, cfg, wsUrl, token, persona, maxTokens, tokenCacheFi
   const sessionId = normalizeIdentityId(identityCtx.sessionId, 120) || cryptoModule.randomBytes(12).toString("hex");
   const tokenSource = identityCtx.tokenSource || 'unknown';
   let recoveringToken = false;
+  let ackReceivedForSocket = false;
+  let awaitingAckTimer = null;
 
   // Token 冲突熔断器：防止无限重试导致日志爆炸和 CPU 空转
   const conflictBreaker = {
@@ -527,6 +496,29 @@ function startBot(api, core, cfg, wsUrl, token, persona, maxTokens, tokenCacheFi
     if (ownerToken) writeTextSafe(ownerTokenCacheFile, ownerToken);
   }
 
+  function clearAckTimer() {
+    if (awaitingAckTimer) {
+      clearTimeout(awaitingAckTimer);
+      awaitingAckTimer = null;
+    }
+  }
+
+  function armAckTimer() {
+    clearAckTimer();
+    if (!token || !ws || ws.readyState !== WebSocket.OPEN) return;
+    awaitingAckTimer = setTimeout(() => {
+      if (stopping || !ws || ws.readyState !== WebSocket.OPEN || ackReceivedForSocket) return;
+      api.logger.warn("[roundtable] ⚠️ 已连接 WS 但未收到 bot_ack，主动重连");
+      reportDiag("bot_ack_timeout", {
+        level: "warn",
+        message: "websocket open but bot_ack not received in time",
+        detail: { timeoutMs: 12000, tokenSource },
+      }, 0);
+      try { ws.close(4000, "bot-ack-timeout"); } catch { }
+    }, 12000);
+    if (awaitingAckTimer.unref) awaitingAckTimer.unref();
+  }
+
   function nextReconnectDelayMs() {
     const base = Math.min(30000, Math.round(2500 * Math.pow(1.6, reconnectAttempts)));
     reconnectAttempts += 1;
@@ -753,6 +745,8 @@ function startBot(api, core, cfg, wsUrl, token, persona, maxTokens, tokenCacheFi
 
     ws.onopen = () => {
       reconnectAttempts = 0;
+      ackReceivedForSocket = false;
+      clearAckTimer();
       reportDiag("ws_open", {
         message: token ? "connected with token" : "connected in observe mode",
         detail: { instanceId, sessionId },
@@ -781,6 +775,7 @@ function startBot(api, core, cfg, wsUrl, token, persona, maxTokens, tokenCacheFi
         pluginVersion: PLUGIN_VERSION,
         tokenSource: tokenSource || 'unknown',
       });
+      armAckTimer();
       api.logger.info(`[roundtable] 🔗 bot_connect 已发送 (token=${token.slice(0, 8)}... source=${tokenSource || 'unknown'})`);
     };
 
@@ -805,6 +800,7 @@ function startBot(api, core, cfg, wsUrl, token, persona, maxTokens, tokenCacheFi
     };
 
     ws.onclose = (evt) => {
+      clearAckTimer();
       // 断连后立即清理本地 room 状态，避免重连后状态错乱
       currentRoomId = null;
       currentRoomMode = null;
@@ -1600,6 +1596,8 @@ function startBot(api, core, cfg, wsUrl, token, persona, maxTokens, tokenCacheFi
 
     switch (msg.type) {
       case "bot_ack":
+        ackReceivedForSocket = true;
+        clearAckTimer();
         // 在大厅待机中
         if (msg.status === 'lobby') {
           myName = msg.name || myName;
@@ -1982,6 +1980,7 @@ function startBot(api, core, cfg, wsUrl, token, persona, maxTokens, tokenCacheFi
       if (heartbeatTimer) { clearInterval(heartbeatTimer); }
       // 停止重连
       if (reconnectTimer) { clearTimeout(reconnectTimer); reconnectTimer = null; }
+      clearAckTimer();
       // 关闭 WS
       if (ws) {
         try { ws.close(1000, "shutdown"); } catch { }

package/openclaw.plugin.json

@@ -5,7 +5,7 @@
     "lobster-roundtable"
   ],
   "description": "Connect OpenClaw to the Lobster Roundtable service.",
-  "version": "3.0.4",
+  "version": "3.0.5",
   "configSchema": {
     "type": "object",
     "additionalProperties": false,
@@ -67,4 +67,4 @@
       "placeholder": "龙虾"
     }
   }
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lobster-roundtable",
-  "version": "3.0.4",
+  "version": "3.0.5",
   "description": "🦞 龙虾圆桌 OpenClaw 标准 Channel 插件 - 让你的 AI 自动参与多智能体圆桌讨论",
   "license": "MIT",
   "private": false,
@@ -41,4 +41,4 @@
       "optional": true
     }
   }
-}
+}