claw-subagent-service 0.0.25 → 0.0.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claw-subagent-service",
-  "version": "0.0.25",
+  "version": "0.0.26",
   "description": "虾说静态服务",
   "main": "cli.js",
   "bin": {

package/service/rongcloud/openclaw-client.js

@@ -3,6 +3,7 @@ const net = require('net');
 const os = require('os');
 const fs = require('fs');
 const path = require('path');
+const axios = require('axios');
 
 /**
  * 获取实际用户主目录（SYSTEM 账户下 os.homedir() 返回 systemprofile）
@@ -159,6 +160,47 @@ class OpenClawClient {
 
     this.log?.info(`[OpenClawClient] 准备发送消息到 OpenClaw，from=${fromUser}, message=${message.substring(0, 50)}`);
 
+    const gatewayUrl = 'http://127.0.0.1:5678';
+
+    try {
+      const response = await axios.post(
+        `${gatewayUrl}/v1/chat/completions`,
+        {
+          model: 'claw-local',
+          messages: [
+            { role: 'user', content: message }
+          ],
+          stream: false
+        },
+        {
+          headers: { 'Content-Type': 'application/json' },
+          timeout: 120000
+        }
+      );
+
+      if (response.status === 200 && response.data) {
+        const result = response.data;
+        const aiMessage = result.choices?.[0]?.message;
+        const content = aiMessage?.content;
+        if (content) {
+          this.log?.info(`[OpenClawClient] AI 回复: ${content.substring(0, 50)}...`);
+          return content;
+        }
+        this.log?.warn('[OpenClawClient] OpenClaw 返回了空响应');
+        return 'OpenClaw 未返回有效响应';
+      } else {
+        this.log?.error(`[OpenClawClient] OpenClaw 返回错误: ${response.status}`);
+        return `OpenClaw 返回错误: ${response.status}`;
+      }
+    } catch (err) {
+      this.log?.error(`[OpenClawClient] HTTP 调用失败: ${err.message}`);
+      // fallback 到 CLI 调用
+      this.log?.info('[OpenClawClient] HTTP 失败，尝试 CLI fallback');
+      return this.chatViaCLI(message, fromUser);
+    }
+  }
+
+  async chatViaCLI(message, fromUser) {
     const sessionId = `clawmessenger-${fromUser}`;
     const escapedMessage = message
       .replace(/\\/g, '\\\\')
@@ -190,7 +232,6 @@ class OpenClawClient {
         },
       });
 
-      // 流式收集输出，无 maxBuffer 限制
       child.stdout.on('data', (chunk) => {
         stdout += chunk.toString();
       });
@@ -198,20 +239,19 @@ class OpenClawClient {
         stderr += chunk.toString();
       });
 
-      // 超时兜底（20 分钟）
       const timeout = setTimeout(() => {
         killed = true;
         child.kill('SIGTERM');
-        this.log?.error('[OpenClawClient] 执行超时，强制终止');
+        this.log?.error('[OpenClawClient] CLI 执行超时，强制终止');
       }, 1200000);
 
       child.on('error', (err) => {
         clearTimeout(timeout);
-        this.log?.error(`[OpenClawClient] 子进程错误: ${err.message}`);
+        this.log?.error(`[OpenClawClient] CLI 子进程错误: ${err.message}`);
         if (err.code === 'ENOENT') {
           resolve('找不到 openclaw 命令');
         } else {
-          resolve(`OpenClaw 调用失败: ${err.message}`);
+          resolve(`OpenClaw CLI 调用失败: ${err.message}`);
         }
       });
 
@@ -219,17 +259,17 @@ class OpenClawClient {
         clearTimeout(timeout);
 
         if (killed) {
-          resolve('OpenClaw 响应超时');
+          resolve('OpenClaw CLI 响应超时');
           return;
         }
 
-        this.log?.info(`[OpenClawClient] 进程退出 code=${code}`);
+        this.log?.info(`[OpenClawClient] CLI 进程退出 code=${code}`);
         this.log?.info(`[OpenClawClient] stdout 长度: ${stdout.length}, stderr 长度: ${stderr.length}`);
 
         if (code !== 0) {
           const errOutput = stderr || stdout || '';
-          this.log?.error(`[OpenClawClient] 错误输出: ${errOutput.substring(0, 500)}`);
-          resolve(`OpenClaw 调用失败: ${errOutput.substring(0, 200)}`);
+          this.log?.error(`[OpenClawClient] CLI 错误输出: ${errOutput.substring(0, 500)}`);
+          resolve(`OpenClaw CLI 调用失败: ${errOutput.substring(0, 200)}`);
           return;
         }