lobster-roundtable 3.0.4 → 3.0.6

package/main.js

@@ -22,6 +22,7 @@ const {
   getOpenClawApiPort,
   getOpenClawApiToken,
 } = require("./src/env.js");
+const { readTextSafe, parseJsonFileFlexible } = require("./src/fileio.js");
 // Node.js 原生 HTTP 请求工具（避免依赖外部命令）
 function httpRequest(urlStr, options = {}) {
   return new Promise((resolve, reject) => {
@@ -60,7 +61,7 @@ try {
 }
 
 const CHANNEL_ID = "lobster-roundtable";
-const PLUGIN_VERSION = "3.0.4";
+const PLUGIN_VERSION = "3.0.6";
 const ENABLE_OPENCLAW_CONFIG_SYNC = isOpenClawConfigSyncEnabled();
 const OPENCLAW_CONFIG_ALLOWED_KEYS = new Set(["url", "token", "ownerToken", "name", "persona", "maxTokens"]);
 
@@ -111,64 +112,6 @@ function ensureDirForFile(filePath) {
   fsModule.mkdirSync(pathModule.dirname(filePath), { recursive: true });
 }
 
-function readTextSafe(filePath) {
-  try {
-    return fsModule.existsSync(filePath) ? String(fsModule.readFileSync(filePath, "utf-8") || "").trim() : "";
-  } catch {
-    return "";
-  }
-}
-
-function decodeFileBuffer(buf) {
-  if (!Buffer.isBuffer(buf) || buf.length === 0) return "";
-  // UTF-8 BOM
-  if (buf.length >= 3 && buf[0] === 0xef && buf[1] === 0xbb && buf[2] === 0xbf) {
-    return buf.slice(3).toString("utf8");
-  }
-  // UTF-16 LE BOM
-  if (buf.length >= 2 && buf[0] === 0xff && buf[1] === 0xfe) {
-    return buf.slice(2).toString("utf16le");
-  }
-  // UTF-16 BE BOM
-  if (buf.length >= 2 && buf[0] === 0xfe && buf[1] === 0xff) {
-    const swapped = Buffer.allocUnsafe(buf.length - 2);
-    for (let i = 2; i + 1 < buf.length; i += 2) {
-      swapped[i - 2] = buf[i + 1];
-      swapped[i - 1] = buf[i];
-    }
-    return swapped.toString("utf16le");
-  }
-  // Heuristic: UTF-16 LE without BOM (lots of NUL bytes in odd positions)
-  const sample = buf.slice(0, Math.min(buf.length, 128));
-  let nulOdd = 0;
-  for (let i = 1; i < sample.length; i += 2) {
-    if (sample[i] === 0) nulOdd++;
-  }
-  if (sample.length > 8 && nulOdd >= sample.length / 6) {
-    return buf.toString("utf16le");
-  }
-  return buf.toString("utf8");
-}
-
-function parseJsonFileFlexible(filePath) {
-  const raw = fsModule.readFileSync(filePath);
-  let text = decodeFileBuffer(raw);
-  if (!text) return {};
-  text = String(text).replace(/^\uFEFF/, "").trim();
-  try {
-    return JSON.parse(text);
-  } catch {
-    // Recover from contaminated files like: log-prefix + {...json...} + log-suffix
-    const first = text.indexOf("{");
-    const last = text.lastIndexOf("}");
-    if (first >= 0 && last > first) {
-      const candidate = text.slice(first, last + 1).trim();
-      return JSON.parse(candidate);
-    }
-    throw new Error("invalid_json");
-  }
-}
-
 function writeJsonUtf8NoBomAtomic(filePath, value) {
   const tmp = `${filePath}.tmp`;
   const out = JSON.stringify(value, null, 2);
@@ -227,21 +170,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 +275,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 +397,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 +439,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;
@@ -619,10 +554,17 @@ function startBot(api, core, cfg, wsUrl, token, persona, maxTokens, tokenCacheFi
     } catch { }
   }
 
-  function safeDiagText(v, max = 280) {
-    const s = String(v || "").trim();
-    return s.length > max ? s.slice(0, max) : s;
-  }
+function safeDiagText(v, max = 280) {
+  const s = String(v || "").trim();
+  return s.length > max ? s.slice(0, max) : s;
+}
+
+function maskTokenForDiag(raw) {
+  const s = String(raw || "").trim();
+  if (!s) return "";
+  if (s.length <= 8) return s;
+  return `${s.slice(0, 6)}...${s.slice(-4)}`;
+}
 
   function reportDiag(event, payload = {}, throttleMs = 8000) {
     if (!event) return;
@@ -647,7 +589,7 @@ function startBot(api, core, cfg, wsUrl, token, persona, maxTokens, tokenCacheFi
       roomMode: currentRoomMode || "",
       wsUrl,
       botName: myName || "",
-      token: token || "",
+      tokenMasked: maskTokenForDiag(token),
       instanceId: instanceId || "",
       sessionId: sessionId || "",
       detail: payload.detail && typeof payload.detail === "object" ? payload.detail : null,
@@ -669,7 +611,7 @@ function startBot(api, core, cfg, wsUrl, token, persona, maxTokens, tokenCacheFi
         roomMode: currentRoomMode || "",
         wsUrl,
         botName: myName || "",
-        token: token || "",
+        tokenMasked: maskTokenForDiag(token),
         instanceId: instanceId || "",
         sessionId: sessionId || "",
         stack: safeDiagText(payload.stack || "", 1200),
@@ -753,6 +695,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 +725,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 +750,7 @@ function startBot(api, core, cfg, wsUrl, token, persona, maxTokens, tokenCacheFi
     };
 
     ws.onclose = (evt) => {
+      clearAckTimer();
       // 断连后立即清理本地 room 状态，避免重连后状态错乱
       currentRoomId = null;
       currentRoomMode = null;
@@ -1600,6 +1546,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 +1930,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.6",
   "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.6",
   "description": "🦞 龙虾圆桌 OpenClaw 标准 Channel 插件 - 让你的 AI 自动参与多智能体圆桌讨论",
   "license": "MIT",
   "private": false,
@@ -41,4 +41,4 @@
       "optional": true
     }
   }
-}
+}

package/src/channel.js

@@ -16,7 +16,22 @@ const CHANNEL_ID = "lobster-roundtable";
 
 function createOutboundMessageId() {
     return `rt-outbound-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
-}
+}
+
+function isExplicitConfigValue(value) {
+    if (value === undefined || value === null) return false;
+    if (typeof value === "string" && value.trim() === "") return false;
+    return true;
+}
+
+function mergeConfigPreferExplicitChannel(pluginEntryConfig, channelConfig) {
+    const merged = { ...(pluginEntryConfig || {}) };
+    for (const [key, value] of Object.entries(channelConfig || {})) {
+        if (!isExplicitConfigValue(value)) continue;
+        merged[key] = value;
+    }
+    return merged;
+}
 
 /**
  * �?ChannelGatewayContext 适配�?main.js 所需�?api 兼容对象
@@ -27,12 +42,12 @@ function createOutboundMessageId() {
  *   - api.runtime         �?ctx.runtime
  *   - api.config          �?ctx.cfg （完�?OpenClawConfig，用�?dispatchReply �?cfg 参数�?
  */
-function buildApiAdapter(ctx) {
-    // 双源读取：channels.<id>（官方标准路径）优先，plugins.entries（兼容现有安装）降级
-    const channelConfig = ctx.cfg?.channels?.[CHANNEL_ID] || {};
-    const pluginEntryConfig = ctx.cfg?.plugins?.entries?.[CHANNEL_ID]?.config || {};
-    // channel 路径覆盖 plugin 路径（向标准迁移�?
-    const pluginConfig = { ...pluginEntryConfig, ...channelConfig };
+function buildApiAdapter(ctx) {
+    // 双源读取：channels.<id>（官方标准路径）优先，plugins.entries（兼容现有安装）降级。
+    // 关键：channels 中空字符串不覆盖 plugins.entries 中已有 token/url，避免“loaded 但离线”。
+    const channelConfig = ctx.cfg?.channels?.[CHANNEL_ID] || {};
+    const pluginEntryConfig = ctx.cfg?.plugins?.entries?.[CHANNEL_ID]?.config || {};
+    const pluginConfig = mergeConfigPreferExplicitChannel(pluginEntryConfig, channelConfig);
 
     return {
         // main.js �?api.logger.info/warn/error
@@ -76,12 +91,14 @@ const roundtablePlugin = {
     reload: { configPrefixes: [`channels.${CHANNEL_ID}`, `plugins.entries.${CHANNEL_ID}`] },
 
     config: {
-        listAccountIds: () => ["default"],
-        resolveAccount: (cfg, accountId) => {
-            const pluginCfg = cfg?.plugins?.entries?.[CHANNEL_ID]?.config || {};
-            return {
-                accountId: accountId || "default",
-                enabled: true,
+        listAccountIds: () => ["default"],
+        resolveAccount: (cfg, accountId) => {
+            const channelConfig = cfg?.channels?.[CHANNEL_ID] || {};
+            const pluginEntryConfig = cfg?.plugins?.entries?.[CHANNEL_ID]?.config || {};
+            const pluginCfg = mergeConfigPreferExplicitChannel(pluginEntryConfig, channelConfig);
+            return {
+                accountId: accountId || "default",
+                enabled: true,
                 // main.js 支持默认 URL + 自动注册，因此始终视�?configured
                 // 不拦截零配置启动，让 main.js 自己处理
                 configured: true,

package/src/fileio.js

@@ -0,0 +1,61 @@
+"use strict";
+
+const fs = require("fs");
+
+function readTextSafe(filePath) {
+  try {
+    return fs.existsSync(filePath) ? String(fs.readFileSync(filePath, "utf-8") || "").trim() : "";
+  } catch {
+    return "";
+  }
+}
+
+function decodeFileBuffer(buf) {
+  if (!Buffer.isBuffer(buf) || buf.length === 0) return "";
+  if (buf.length >= 3 && buf[0] === 0xef && buf[1] === 0xbb && buf[2] === 0xbf) {
+    return buf.slice(3).toString("utf8");
+  }
+  if (buf.length >= 2 && buf[0] === 0xff && buf[1] === 0xfe) {
+    return buf.slice(2).toString("utf16le");
+  }
+  if (buf.length >= 2 && buf[0] === 0xfe && buf[1] === 0xff) {
+    const swapped = Buffer.allocUnsafe(buf.length - 2);
+    for (let i = 2; i + 1 < buf.length; i += 2) {
+      swapped[i - 2] = buf[i + 1];
+      swapped[i - 1] = buf[i];
+    }
+    return swapped.toString("utf16le");
+  }
+  const sample = buf.slice(0, Math.min(buf.length, 128));
+  let nulOdd = 0;
+  for (let i = 1; i < sample.length; i += 2) {
+    if (sample[i] === 0) nulOdd++;
+  }
+  if (sample.length > 8 && nulOdd >= sample.length / 6) {
+    return buf.toString("utf16le");
+  }
+  return buf.toString("utf8");
+}
+
+function parseJsonFileFlexible(filePath) {
+  const raw = fs.readFileSync(filePath);
+  let text = decodeFileBuffer(raw);
+  if (!text) return {};
+  text = String(text).replace(/^\uFEFF/, "").trim();
+  try {
+    return JSON.parse(text);
+  } catch {
+    const first = text.indexOf("{");
+    const last = text.lastIndexOf("}");
+    if (first >= 0 && last > first) {
+      const candidate = text.slice(first, last + 1).trim();
+      return JSON.parse(candidate);
+    }
+    throw new Error("invalid_json");
+  }
+}
+
+module.exports = {
+  readTextSafe,
+  parseJsonFileFlexible,
+};