claw-subagent-service 0.0.60 → 0.0.61

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claw-subagent-service",
-  "version": "0.0.60",
+  "version": "0.0.61",
   "description": "虾说智能助手",
   "main": "cli.js",
   "bin": {

package/service/modules/config.js

@@ -60,6 +60,18 @@ function loadConfig() {
     }
   }
 
+  // 计算 apiBaseUrl：环境变量 > 配置文件 > 推导值 > 默认值
+  let apiBaseUrl = process.env.API_BASE_URL || localConfig.apiBaseUrl || clawBridgeConfig.apiBaseUrl;
+  if (!apiBaseUrl) {
+    const serverUrl = process.env.DM_SERVER_URL || 'https://newsradar.dreamdt.cn/im';
+    try {
+      const url = new URL(serverUrl);
+      apiBaseUrl = `${url.protocol}//${url.host}`;
+    } catch {
+      apiBaseUrl = 'http://127.0.0.1:5000';
+    }
+  }
+
   return {
     appKey: process.env.DM_APP_KEY || localConfig.appKey || 'bmdehs6pbyyks',
     token: localConfig.token || clawBridgeConfig.token,
@@ -73,7 +85,7 @@ function loadConfig() {
     scriptTimeout: localConfig.scriptTimeout || 180,
     successKeyword: localConfig.successKeyword || 'Success',
     chatTimeout: localConfig.chatTimeout || 600,
-    apiBaseUrl: process.env.API_BASE_URL || localConfig.apiBaseUrl || clawBridgeConfig.apiBaseUrl || 'http://127.0.0.1:5000'
+    apiBaseUrl
   };
 }
 

package/service/rongcloud/openclaw-client.js

@@ -311,8 +311,35 @@ class OpenClawClient {
 
     const gatewayToken = getGatewayToken();
     const sessionId = `clawmessenger-${fromUser}`;
-    const apiUrl = 'http://127.0.0.1:18789/v1/chat/completions';
 
+    // 尝试多个可能的 SSE 端点，兼容不同版本 OpenClaw Gateway
+    const endpoints = [
+      'http://127.0.0.1:18789/v1/chat/completions',
+      'http://127.0.0.1:18789/v1/responses'
+    ];
+
+    for (let i = 0; i < endpoints.length; i++) {
+      const apiUrl = endpoints[i];
+      try {
+        await this._doChatStream(apiUrl, gatewayToken, sessionId, message, onDelta, onDone);
+        return; // 成功则直接返回
+      } catch (err) {
+        const is404 = err.response?.status === 404;
+        const isLast = i === endpoints.length - 1;
+
+        if (is404 && !isLast) {
+          this.log?.warn(`[OpenClawClient] SSE 端点 ${apiUrl} 返回 404，尝试备用端点`);
+          continue;
+        }
+
+        this.log?.error(`[OpenClawClient] SSE 请求失败: ${err.message}`);
+        onError?.(err);
+        return;
+      }
+    }
+  }
+
+  async _doChatStream(apiUrl, gatewayToken, sessionId, message, onDelta, onDone) {
     const headers = {
       'Content-Type': 'application/json',
       'Accept': 'text/event-stream'
@@ -333,13 +360,13 @@ class OpenClawClient {
     let fullText = '';
     let buffer = '';
 
-    try {
-      const response = await axios.post(apiUrl, payload, {
-        headers,
-        responseType: 'stream',
-        timeout: 600000 // 10 分钟
-      });
+    const response = await axios.post(apiUrl, payload, {
+      headers,
+      responseType: 'stream',
+      timeout: 600000 // 10 分钟
+    });
 
+    return new Promise((resolve, reject) => {
       response.data.on('data', (chunk) => {
         buffer += chunk.toString();
         const lines = buffer.split('\n');
@@ -365,23 +392,17 @@ class OpenClawClient {
         }
       });
 
-      return new Promise((resolve, reject) => {
-        response.data.on('end', () => {
-          this.log?.info(`[OpenClawClient] SSE 流结束，总长度: ${fullText.length}`);
-          onDone?.(fullText);
-          resolve();
-        });
-
-        response.data.on('error', (err) => {
-          this.log?.error(`[OpenClawClient] SSE 流错误: ${err.message}`);
-          onError?.(err);
-          reject(err);
-        });
+      response.data.on('end', () => {
+        this.log?.info(`[OpenClawClient] SSE 流结束，总长度: ${fullText.length}`);
+        onDone?.(fullText);
+        resolve();
       });
-    } catch (err) {
-      this.log?.error(`[OpenClawClient] SSE 请求失败: ${err.message}`);
-      onError?.(err);
-    }
+
+      response.data.on('error', (err) => {
+        this.log?.error(`[OpenClawClient] SSE 流错误: ${err.message}`);
+        reject(err);
+      });
+    });
   }
 
   async chatViaCLI(message, fromUser) {

package/service/worker.js

@@ -184,6 +184,7 @@ function loadRongCloudConfig() {
       config.token = clawConfig.token;
       config.accountId = clawConfig.nodeId;
       config.nodeName = clawConfig.nodeName;
+      if (clawConfig.apiBaseUrl) config.apiBaseUrl = clawConfig.apiBaseUrl;
       log.info(`[WORKER] 从 claw-bridge 加载配置: nodeId=${clawConfig.nodeId}, nodeName=${clawConfig.nodeName}`);
     } else {
       log.warn(`[WORKER] 未找到 ${clawBridgeConfigPath}`);
@@ -199,6 +200,7 @@ function loadRongCloudConfig() {
       if (localConfig.token) config.token = localConfig.token;
       if (localConfig.accountId) config.accountId = localConfig.accountId;
       if (localConfig.appSecret) config.appSecret = localConfig.appSecret;
+      if (localConfig.apiBaseUrl) config.apiBaseUrl = localConfig.apiBaseUrl;
       log.info(`[WORKER] 从本地配置加载: appKey=${config.appKey?.substring(0, 8)}...`);
     }
   } catch (err) {
@@ -206,7 +208,19 @@ function loadRongCloudConfig() {
   }
 
   // 加载 apiBaseUrl（Python 后端地址，用于代理发送流式消息）
-  config.apiBaseUrl = process.env.API_BASE_URL || config.apiBaseUrl || 'http://127.0.0.1:5000';
+  // 优先级：环境变量 > 配置文件 > 推导值(DM_SERVER_URL) > 默认值
+  config.apiBaseUrl = process.env.API_BASE_URL || config.apiBaseUrl;
+
+  if (!config.apiBaseUrl) {
+    const serverUrl = process.env.DM_SERVER_URL || 'https://newsradar.dreamdt.cn/im';
+    try {
+      const url = new URL(serverUrl);
+      config.apiBaseUrl = `${url.protocol}//${url.host}`;
+      log.info(`[WORKER] 从 serverUrl 推导 apiBaseUrl: ${config.apiBaseUrl}`);
+    } catch {
+      config.apiBaseUrl = 'http://127.0.0.1:5000';
+    }
+  }
 
   if (!config.appKey) {
     config.appKey = process.env.DM_APP_KEY || 'bmdehs6pbyyks';