claw-subagent-service 0.0.60 → 0.0.62

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claw-subagent-service",
-  "version": "0.0.60",
+  "version": "0.0.62",
   "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/message-handler.js

@@ -97,9 +97,16 @@ class MessageHandler {
       } else {
         // 如果配置了代理地址，使用流式处理
         if (this.isStreamingEnabled) {
-          this.handleNormalMessageStream(msg).catch(err => {
-            this.log?.error(`[MessageHandler] 流式处理异常: ${err.message}`);
-          });
+          try {
+            await this.handleNormalMessageStream(msg);
+          } catch (err) {
+            this.log?.error(`[MessageHandler] 流式处理失败，回退到非流式: ${err.message}`);
+            const reply = await this.handleNormalMessage(msg);
+            if (reply) {
+              const targetId = this.getReplyTarget(msg);
+              await this.sendFn(targetId, reply, msg.conversationType);
+            }
+          }
         } else {
           // 降级到非流式处理
           const reply = await this.handleNormalMessage(msg);
@@ -164,9 +171,22 @@ class MessageHandler {
 
     // 如果配置了代理地址，使用流式处理
     if (this.isStreamingEnabled) {
-      this.handleNormalMessageStream(msg).catch(err => {
-        this.log?.error(`[MessageHandler] 流式处理异常: ${err.message}`);
-      });
+      try {
+        await this.handleNormalMessageStream(msg);
+      } catch (err) {
+        this.log?.error(`[MessageHandler] 流式处理失败，回退到 CLI: ${err.message}`);
+        // 回退到非流式 CLI 调用
+        try {
+          const reply = await this.openclawClient.chat(msg.content, msg.senderUserId);
+          if (reply) {
+            this.log?.info(`[MessageHandler] AI 回复: ${reply.substring(0, 50)}...`);
+            await this.sendFn(targetId, reply, msg.conversationType);
+          }
+        } catch (cliErr) {
+          this.log?.error(`[MessageHandler] CLI 回退也失败: ${cliErr.message}`);
+          await this.sendFn(targetId, `❌ 处理失败: ${cliErr.message}`, msg.conversationType);
+        }
+      }
       return;
     }
 
@@ -199,36 +219,48 @@ class MessageHandler {
     this.log?.info(`[MessageHandler] 开始流式处理，streamId=${streamId}`);
 
     // 2. 调用 OpenClaw SSE
-    return this.openclawClient.chatStream(
-      msg.content,
-      msg.senderUserId,
-      async (delta) => {
-        buffer += delta;
-        // 策略：每 30 个字符或遇到句末标点发送一次片段
-        if (buffer.length >= 30 || /[。！？.!?\n]$/.test(delta)) {
-          await this._sendStreamChunk(fromUserId, targetId, conversationType, buffer, streamId, isFirstChunk, false);
-          isFirstChunk = false;
-          buffer = '';
-        }
-      },
-      async (fullText) => {
-        // 发送剩余缓冲区和结束标记
-        if (buffer.trim()) {
-          await this._sendStreamChunk(fromUserId, targetId, conversationType, buffer, streamId, isFirstChunk, true);
-        } else if (!isFirstChunk) {
-          // 已经发送过内容，单独发送结束标记
-          await this._sendStreamChunk(fromUserId, targetId, conversationType, '', streamId, false, true);
-        } else {
-          // 完全没有收到内容，发送错误提示
-          await this._sendStreamChunk(fromUserId, targetId, conversationType, '抱歉，AI 暂时没有回复内容。', streamId, true, true);
+    let hasSentChunk = false;
+    try {
+      await this.openclawClient.chatStream(
+        msg.content,
+        msg.senderUserId,
+        async (delta) => {
+          buffer += delta;
+          // 策略：每 30 个字符或遇到句末标点发送一次片段
+          if (buffer.length >= 30 || /[。！？.!?\n]$/.test(delta)) {
+            await this._sendStreamChunk(fromUserId, targetId, conversationType, buffer, streamId, isFirstChunk, false);
+            isFirstChunk = false;
+            hasSentChunk = true;
+            buffer = '';
+          }
+        },
+        async (fullText) => {
+          // 发送剩余缓冲区和结束标记
+          if (buffer.trim()) {
+            await this._sendStreamChunk(fromUserId, targetId, conversationType, buffer, streamId, isFirstChunk, true);
+            hasSentChunk = true;
+          } else if (!isFirstChunk) {
+            // 已经发送过内容，单独发送结束标记
+            await this._sendStreamChunk(fromUserId, targetId, conversationType, '', streamId, false, true);
+            hasSentChunk = true;
+          } else {
+            // 完全没有收到内容，发送错误提示
+            await this._sendStreamChunk(fromUserId, targetId, conversationType, '抱歉，AI 暂时没有回复内容。', streamId, true, true);
+            hasSentChunk = true;
+          }
+
+          if (!hasSentChunk) {
+            throw new Error('流式消息发送失败，没有任何片段成功送达');
+          }
+
+          this.log?.info(`[MessageHandler] 流式消息完成，streamId=${streamId}, 总长度: ${fullText.length}`);
         }
-        this.log?.info(`[MessageHandler] 流式消息完成，streamId=${streamId}, 总长度: ${fullText.length}`);
-      },
-      async (err) => {
-        this.log?.error(`[MessageHandler] 流式处理错误: ${err.message}`);
-        await this._sendStreamChunk(fromUserId, targetId, conversationType, '抱歉，AI 响应出现错误，请稍后重试。', streamId, isFirstChunk, true);
-      }
-    );
+      );
+    } catch (err) {
+      this.log?.error(`[MessageHandler] 流式处理错误: ${err.message}`);
+      await this._sendStreamChunk(fromUserId, targetId, conversationType, '抱歉，AI 响应出现错误，请稍后重试。', streamId, isFirstChunk, true);
+      throw err;
+    }
   }
 
   /**
@@ -248,7 +280,9 @@ class MessageHandler {
       );
       this.log?.info(`[MessageHandler] typing 状态已发送: ${fromUserId} -> ${targetId}`);
     } catch (err) {
-      this.log?.warn(`[MessageHandler] 发送 typing 状态失败: ${err.message}`);
+      const url = `${this.config.apiBaseUrl}/im/api/proxy/stream/typing`;
+      const status = err.response?.status;
+      this.log?.warn(`[MessageHandler] 发送 typing 状态失败: ${err.message}, url=${url}, status=${status || 'N/A'}`);
     }
   }
 
@@ -272,7 +306,9 @@ class MessageHandler {
         { timeout: 10000 }
       );
     } catch (err) {
-      this.log?.warn(`[MessageHandler] 发送流式消息失败: ${err.message}`);
+      const url = `${this.config.apiBaseUrl}/im/api/proxy/stream/publish`;
+      const status = err.response?.status;
+      this.log?.warn(`[MessageHandler] 发送流式消息失败: ${err.message}, url=${url}, status=${status || 'N/A'}`);
     }
   }
 

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，让错误通过 Promise reject 向上传播，便于调用方回退
+        throw err;
+      }
+    }
+  }
+
+  async _doChatStream(apiUrl, gatewayToken, sessionId, message, onDelta, onDone) {
     const headers = {
       'Content-Type': 'application/json',
       'Accept': 'text/event-stream'
@@ -333,14 +360,14 @@ 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 分钟
+    });
 
-      response.data.on('data', (chunk) => {
+    return new Promise((resolve, reject) => {
+      response.data.on('data', async (chunk) => {
         buffer += chunk.toString();
         const lines = buffer.split('\n');
         buffer = lines.pop(); // 保留未完整的最后一行
@@ -357,7 +384,12 @@ class OpenClawClient {
             const delta = data.choices?.[0]?.delta?.content;
             if (delta) {
               fullText += delta;
-              onDelta?.(delta);
+              try {
+                await onDelta?.(delta);
+              } catch (err) {
+                reject(err);
+                return;
+              }
             }
           } catch {
             // 忽略无法解析的 JSON 行
@@ -365,23 +397,21 @@ class OpenClawClient {
         }
       });
 
-      return new Promise((resolve, reject) => {
-        response.data.on('end', () => {
-          this.log?.info(`[OpenClawClient] SSE 流结束，总长度: ${fullText.length}`);
-          onDone?.(fullText);
+      response.data.on('end', async () => {
+        this.log?.info(`[OpenClawClient] SSE 流结束，总长度: ${fullText.length}`);
+        try {
+          await onDone?.(fullText);
           resolve();
-        });
-
-        response.data.on('error', (err) => {
-          this.log?.error(`[OpenClawClient] SSE 流错误: ${err.message}`);
-          onError?.(err);
+        } catch (err) {
           reject(err);
-        });
+        }
       });
-    } 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';
@@ -218,6 +232,8 @@ function loadRongCloudConfig() {
     config.heartbeatInterval = 20;
   }
 
+  log.info(`[WORKER] 最终 apiBaseUrl: ${config.apiBaseUrl}`);
+
   if (config.token && config.accountId) {
     return config;
   }