lobster-roundtable 3.0.2 → 3.0.3

package/index.js

@@ -8,8 +8,8 @@
  */
 
 const fs = require("fs");
-const os = require("os");
 const path = require("path");
+const { getOpenClawDir } = require("./src/env.js");
 
 const PLUGIN_ID = "lobster-roundtable";
 const PLUGIN_NAME = "龙虾圆桌";
@@ -19,7 +19,7 @@ const PLUGIN_NAME = "龙虾圆桌";
  */
 function cleanLegacyInstanceIdFromConfig(logger) {
   try {
-    const ocDir = process.env.OPENCLAW_DIR || path.join(os.homedir(), ".openclaw");
+    const ocDir = getOpenClawDir();
     const configPath = path.join(ocDir, "openclaw.json");
     if (!fs.existsSync(configPath)) return false;
     const raw = fs.readFileSync(configPath, "utf-8");

package/main.js

@@ -16,7 +16,13 @@ const httpModule = require("http");
 const httpsModule = require("https");
 const fsModule = require("fs");
 const cryptoModule = require("crypto");
-// Node.js 原生 HTTP 请求工具（替代 curl，避免 child_process 安全警告）
+const {
+  getOpenClawDir,
+  isOpenClawConfigSyncEnabled,
+  getOpenClawApiPort,
+  getOpenClawApiToken,
+} = require("./src/env.js");
+// Node.js 原生 HTTP 请求工具（避免依赖外部命令）
 function httpRequest(urlStr, options = {}) {
   return new Promise((resolve, reject) => {
     const url = new URL(urlStr);
@@ -46,7 +52,7 @@ try {
   WebSocket = require("ws");
 } catch {
   try {
-    const ocDir = process.env.OPENCLAW_DIR || os.homedir() + "/.openclaw";
+    const ocDir = getOpenClawDir();
     WebSocket = require(pathModule.join(ocDir, "node_modules", "ws"));
   } catch {
     // 最后的后备
@@ -54,8 +60,8 @@ try {
 }
 
 const CHANNEL_ID = "lobster-roundtable";
-const PLUGIN_VERSION = "3.0.2";
-const ENABLE_OPENCLAW_CONFIG_SYNC = String(process.env.LOBSTER_RT_SYNC_OPENCLAW || "").trim() === "1";
+const PLUGIN_VERSION = "3.0.3";
+const ENABLE_OPENCLAW_CONFIG_SYNC = isOpenClawConfigSyncEnabled();
 const OPENCLAW_CONFIG_ALLOWED_KEYS = new Set(["url", "token", "ownerToken", "name", "persona", "maxTokens"]);
 
 function normalizeIdentityId(raw, max = 96) {
@@ -65,7 +71,7 @@ function normalizeIdentityId(raw, max = 96) {
 }
 
 function buildOpenClawHome() {
-  return process.env.OPENCLAW_DIR || pathModule.join(os.homedir(), ".openclaw");
+  return getOpenClawDir();
 }
 
 function sanitizeSkillDirName(name) {
@@ -2031,8 +2037,8 @@ function parseContext(context) {
  */
 function callAIViaHTTP(prompt, maxTokens = 500, timeoutMs = 45000) {
   return new Promise((resolve, reject) => {
-    const OC_PORT = parseInt(process.env.OPENCLAW_PORT || '18789', 10);
-    const OC_TOKEN = String(process.env.OPENCLAW_API_TOKEN || process.env.OPENCLAW_TOKEN || '').trim();
+    const OC_PORT = getOpenClawApiPort();
+    const OC_TOKEN = getOpenClawApiToken();
     const body = JSON.stringify({
       model: 'default',
       messages: [{ role: 'user', content: String(prompt || '') }],

package/openclaw.plugin.json

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

package/package.json

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

package/src/channel.js

@@ -146,79 +146,81 @@ const roundtablePlugin = {
          *   - 必须保持 Promise 挂起，直�?abortSignal 触发�?resolve
          *   - 参照 nextcloud-talk/src/channel.ts L337 的做�?
          */
-        startAccount: (ctx) => {
-            return new Promise((resolve, reject) => {
-                let bot = null;
-
-                try {
-                    const initRoundtable = require("../main.js");
-                    const apiAdapter = buildApiAdapter(ctx);
-                    const core = ctx.runtime;
-
-                    const hasRuntimeAPI = !!(
-                        core?.channel?.reply?.finalizeInboundContext &&
-                        core?.channel?.reply?.dispatchReplyWithBufferedBlockDispatcher
-                    );
-
-                    if (!hasRuntimeAPI) {
-                        ctx.log?.info?.(
-                            "[roundtable] runtime API 不可用，将使�?Gateway HTTP API 调用 AI（兼容模式）"
-                        );
-                    }
-
-                    ctx.log?.info?.("[roundtable] Gateway 正在启动龙虾圆桌...");
-
-                    bot = await initRoundtable(apiAdapter, core, hasRuntimeAPI);
-
-                    if (!bot || typeof bot.stop !== "function") {
-                        const err = new Error("[roundtable] initRoundtable 未返回有效的 { stop } 对象");
-                        ctx.setStatus?.({
-                            accountId: ctx.accountId || "default",
-                            running: false,
-                            lastError: err.message,
-                        });
-                        reject(err);
-                        return;
-                    }
-
-                    ctx.setStatus?.({
-                        accountId: ctx.accountId || "default",
-                        running: true,
-                        lastStartAt: Date.now(),
-                    });
-
-                } catch (err) {
-                    ctx.log?.error?.(`[roundtable] 启动失败: ${err.message}`);
-                    ctx.setStatus?.({
-                        accountId: ctx.accountId || "default",
-                        running: false,
-                        lastError: err.message,
-                    });
-                    reject(err);
-                    return;
-                }
-
-                // 核心：Promise 保持 pending，直�?abortSignal 触发�?resolve
-                // 这样 Gateway 不会认为通道退出并触发重启循环
-                const onAbort = () => {
-                    ctx.log?.info?.("[roundtable] 收到 Gateway abortSignal，正在停�?..");
-                    if (bot) bot.stop();
-                    ctx.setStatus?.({
-                        accountId: ctx.accountId || "default",
-                        running: false,
-                        lastStopAt: Date.now(),
-                    });
-                    resolve({ stop: () => { } }); // resolve �?通道正常退�?
-                };
-
-                if (ctx.abortSignal?.aborted) {
-                    onAbort();
-                } else if (ctx.abortSignal) {
-                    ctx.abortSignal.addEventListener("abort", onAbort, { once: true });
-                }
-                // 如果没有 abortSignal，Promise 永远 pending �?通道永远运行（符合预期）
-            });
-        },
+        startAccount: async (ctx) => {
+            let bot = null;
+
+            try {
+                const initRoundtable = require("../main.js");
+                const apiAdapter = buildApiAdapter(ctx);
+                const core = ctx.runtime;
+
+                const hasRuntimeAPI = !!(
+                    core?.channel?.reply?.finalizeInboundContext &&
+                    core?.channel?.reply?.dispatchReplyWithBufferedBlockDispatcher
+                );
+
+                if (!hasRuntimeAPI) {
+                    ctx.log?.info?.(
+                        "[roundtable] runtime API 不可用，将使�?Gateway HTTP API 调用 AI（兼容模式）"
+                    );
+                }
+
+                ctx.log?.info?.("[roundtable] Gateway 正在启动龙虾圆桌...");
+
+                bot = await initRoundtable(apiAdapter, core, hasRuntimeAPI);
+
+                if (!bot || typeof bot.stop !== "function") {
+                    throw new Error("[roundtable] initRoundtable 未返回有效的 { stop } 对象");
+                }
+
+                ctx.setStatus?.({
+                    accountId: ctx.accountId || "default",
+                    running: true,
+                    lastStartAt: Date.now(),
+                });
+            } catch (err) {
+                ctx.log?.error?.(`[roundtable] 启动失败: ${err.message}`);
+                ctx.setStatus?.({
+                    accountId: ctx.accountId || "default",
+                    running: false,
+                    lastError: err.message,
+                });
+                throw err;
+            }
+
+            // 核心：Promise 保持 pending，直�?abortSignal 触发后 resolve
+            // 这样 Gateway 不会认为通道退出并触发重启循环
+            await new Promise((resolve) => {
+                const onAbort = () => {
+                    ctx.log?.info?.("[roundtable] 收到 Gateway abortSignal，正在停�?..");
+                    try {
+                        bot?.stop?.();
+                    } catch (err) {
+                        ctx.log?.warn?.(`[roundtable] 停止 bot 时出现错误: ${err.message}`);
+                    }
+                    ctx.setStatus?.({
+                        accountId: ctx.accountId || "default",
+                        running: false,
+                        lastStopAt: Date.now(),
+                    });
+                    resolve();
+                };
+
+                if (ctx.abortSignal?.aborted) {
+                    onAbort();
+                    return;
+                }
+
+                if (ctx.abortSignal) {
+                    ctx.abortSignal.addEventListener("abort", onAbort, { once: true });
+                    return;
+                }
+
+                // 如果没有 abortSignal，保持 pending：通道保持运行态
+            });
+
+            return { stop: () => { } };
+        },
     },
 };
 

package/src/env.js

@@ -0,0 +1,33 @@
+"use strict";
+
+const os = require("os");
+const path = require("path");
+
+function readEnv(name) {
+  if (!name) return "";
+  return String(process.env[name] || "");
+}
+
+function getOpenClawDir() {
+  return readEnv("OPENCLAW_DIR") || path.join(os.homedir(), ".openclaw");
+}
+
+function isOpenClawConfigSyncEnabled() {
+  return readEnv("LOBSTER_RT_SYNC_OPENCLAW").trim() === "1";
+}
+
+function getOpenClawApiPort() {
+  const parsed = parseInt(readEnv("OPENCLAW_PORT") || "18789", 10);
+  return Number.isFinite(parsed) && parsed > 0 ? parsed : 18789;
+}
+
+function getOpenClawApiToken() {
+  return (readEnv("OPENCLAW_API_TOKEN") || readEnv("OPENCLAW_TOKEN")).trim();
+}
+
+module.exports = {
+  getOpenClawDir,
+  isOpenClawConfigSyncEnabled,
+  getOpenClawApiPort,
+  getOpenClawApiToken,
+};