claw-subagent-service 0.0.89 → 0.0.90

package/package.json

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

package/service/modules/openclaw-control.js

@@ -85,31 +85,45 @@ async function manageWithServiceManager(command) {
 
 /**
  * 使用 ScriptExecutor 执行脚本（Docker 模式）
+ * @returns {Object} { result, output }
  */
 async function executeWithScript(command) {
   const executor = getExecutor();
   const scriptName = getScriptName(command);
   
   try {
-    return await executor.executeWithStatus(command, scriptName);
+    const result = await executor.executeWithStatus(command, scriptName);
+    // ScriptExecutor 现在返回 { status, message, output }
+    return { 
+      result: { status: result.status, message: result.message },
+      output: result.output || ''
+    };
   } catch (e) {
     const msg = e instanceof Error ? e.message : String(e);
     console.log(`[OpenClawControl] 脚本执行异常: ${msg}`);
     return {
-      status: OpenClawServiceStatus.ERROR,
-      message: `执行异常: ${msg}`
+      result: {
+        status: OpenClawServiceStatus.ERROR,
+        message: `执行异常: ${msg}`
+      },
+      output: ''
     };
   }
 }
 
 /**
  * 验证命令执行结果
+ * 
+ * 注意：在 Docker 环境中，端口检查可能不可靠（服务可能绑定到特定网络接口）
+ * 因此，如果脚本输出明确指示成功，但端口检查失败，会给出警告但保留脚本结果
  */
-async function verifyCommandResult(command, result) {
+async function verifyCommandResult(command, result, scriptOutput = '') {
   if (result.status === OpenClawServiceStatus.ERROR) {
     return result;
   }
   
+  const outputUpper = (scriptOutput || '').toUpperCase();
+  
   if (command === OpenClawCommandEnum.STOP) {
     // 等待 3 秒后验证端口
     await new Promise(resolve => setTimeout(resolve, 3000));
@@ -117,6 +131,15 @@ async function verifyCommandResult(command, result) {
     console.log(`[OpenClawControl] 停止后端口状态: ${portStatus === 1 ? '运行中' : '未运行'}`);
     
     if (portStatus === 1) {
+      // 端口仍在监听，但检查脚本是否报告已停止
+      if (outputUpper.includes('SUCCESS') || outputUpper.includes('STOPPED')) {
+        console.warn(`[OpenClawControl] 警告: 端口仍在监听，但脚本报告成功。可能是僵尸进程或服务未正确停止。`);
+        // 仍然返回成功，但附带警告信息
+        return {
+          status: result.status,
+          message: result.message + ' (警告: 端口仍在监听)'
+        };
+      }
       return {
         status: OpenClawServiceStatus.ERROR,
         message: '停止失败: 服务仍在运行'
@@ -138,6 +161,15 @@ async function verifyCommandResult(command, result) {
     console.log(`[OpenClawControl] ${getCommandName(command)}后端口状态: ${portStatus === 1 ? '运行中' : '未运行'}`);
     
     if (portStatus === 0) {
+      // 端口未监听，但检查脚本是否报告成功（可能是服务绑定到其他接口）
+      if (outputUpper.includes('SUCCESS') || outputUpper.includes('ALREADY RUNNING')) {
+        console.warn(`[OpenClawControl] 警告: 端口检查失败，但脚本报告成功。服务可能绑定到其他网络接口。`);
+        // 信任脚本结果，但添加警告
+        return {
+          status: result.status,
+          message: result.message + ' (警告: 端口检查可能不准确)'
+        };
+      }
       return {
         status: OpenClawServiceStatus.ERROR,
         message: `${getCommandName(command)}失败: 服务未运行`
@@ -160,12 +192,15 @@ async function executeCommand(command, window, sendResponse) {
   }
   
   // 如果 ServiceManager 失败或不是 Linux/macOS，使用脚本方式
+  let scriptOutput = '';
   if (!result) {
-    result = await executeWithScript(command);
+    const scriptResult = await executeWithScript(command);
+    result = scriptResult.result;
+    scriptOutput = scriptResult.output;
   }
   
-  // 验证结果
-  result = await verifyCommandResult(command, result);
+  // 验证结果（传递脚本输出用于后备检查）
+  result = await verifyCommandResult(command, result, scriptOutput);
 
   // 输出日志
   if (result.status === OpenClawServiceStatus.START_SUCCESS ||

package/service/modules/port-checker.js

@@ -1,6 +1,7 @@
 const net = require('net');
+const os = require('os');
 
-function checkPortListening(port) {
+function checkPortListening(port, host = '127.0.0.1') {
   return new Promise((resolve) => {
     const sock = new net.Socket();
     sock.setTimeout(3000);
@@ -16,16 +17,47 @@ function checkPortListening(port) {
       sock.destroy();
       resolve(false);
     });
-    sock.connect(port, '127.0.0.1');
+    sock.connect(port, host);
   });
 }
 
+/**
+ * 检查端口是否在所有网络接口上监听
+ * Docker 环境中，服务可能绑定到 0.0.0.0 而不是 127.0.0.1
+ */
+async function checkPortOnAllInterfaces(port) {
+  // 先检查 localhost
+  const localhostListening = await checkPortListening(port, '127.0.0.1');
+  if (localhostListening) return true;
+
+  // 再检查 0.0.0.0（所有接口）
+  const allInterfacesListening = await checkPortListening(port, '0.0.0.0');
+  if (allInterfacesListening) return true;
+
+  // 获取所有网络接口并逐一检查
+  const interfaces = os.networkInterfaces();
+  for (const [name, addrs] of Object.entries(interfaces)) {
+    for (const addr of addrs) {
+      if (addr.family === 'IPv4' && !addr.internal) {
+        const listening = await checkPortListening(port, addr.address);
+        if (listening) {
+          console.log(`[PortChecker] 端口 ${port} 在 ${addr.address} (${name}) 上监听`);
+          return true;
+        }
+      }
+    }
+  }
+
+  return false;
+}
+
 async function getOpenClawStatus(port = 18789) {
-  const isListening = await checkPortListening(port);
+  const isListening = await checkPortOnAllInterfaces(port);
   return isListening ? 1 : 0;
 }
 
 module.exports = {
   checkPortListening,
+  checkPortOnAllInterfaces,
   getOpenClawStatus,
 };

package/service/modules/script-executor.js

@@ -103,11 +103,16 @@ class ScriptExecutor {
         console.log(`[ScriptExecutor] 停止脚本退出码非零(${exitCode})，返回错误`);
         return { 
           status: OpenClawServiceStatus.ERROR, 
-          message: `停止失败: 脚本退出码 ${exitCode}` 
+          message: `停止失败: 脚本退出码 ${exitCode}`,
+          output: fullOutput
         };
       }
       
-      return result;
+      // 返回结果时附带原始输出
+      return {
+        ...result,
+        output: fullOutput
+      };
     } catch (e) {
       const msg = e instanceof Error ? e.message : String(e);
       return { status: OpenClawServiceStatus.ERROR, message: `执行异常: ${msg}` };