claw-subagent-service 0.0.88 → 0.0.90

package/command/linux/stop.sh

@@ -208,6 +208,7 @@ stop_docker() {
         log_info "OpenClaw 服务已停止。"
         log_info "服务已成功停止。"
         log_info "Success"
+        exit 0
     elif check_port "$PORT"; then
         log_error "OpenClaw 服务停止失败！端口 $PORT 仍在监听。"
         exit 1
@@ -215,6 +216,7 @@ stop_docker() {
         log_info "OpenClaw 服务已停止（端口已关闭）。"
         log_info "服务已成功停止。"
         log_info "Success"
+        exit 0
     fi
 }
 

package/package.json

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

package/service/modules/openclaw-control.js

@@ -4,11 +4,10 @@
  * 执行 start/stop/restart/status 命令
  * 基于 nodejs_client/src/main/openclaw-control.ts
  */
-const { spawn } = require('child_process');
 const path = require('path');
-const os = require('os');
 const { OpenClawCommandEnum, OpenClawServiceStatus, getServiceStatusMessage } = require('./openclaw-enum');
 const { ScriptExecutor } = require('./script-executor');
+const { ServiceManager } = require('./service-manager');
 const { getOpenClawStatus } = require('./port-checker');
 
 let globalExecutor = null;
@@ -54,71 +53,183 @@ function getCommandName(command) {
   return names[command] || '未知命令';
 }
 
-async function executeCommand(command, window, sendResponse) {
-  const cmdName = getCommandName(command);
-  console.log(`[OpenClawControl] ${cmdName} OpenClaw...`);
+/**
+ * 使用 ServiceManager 管理服务（systemd 模式）
+ */
+async function manageWithServiceManager(command) {
+  const serviceMgr = new ServiceManager('openclaw-gateway', 'OpenClaw Gateway');
+  
+  try {
+    switch (command) {
+      case OpenClawCommandEnum.STOP:
+        await serviceMgr.stop();
+        return { status: OpenClawServiceStatus.STOP_SUCCESS, message: '服务已停止' };
+      case OpenClawCommandEnum.START:
+        await serviceMgr.start();
+        return { status: OpenClawServiceStatus.START_SUCCESS, message: '服务已启动' };
+      case OpenClawCommandEnum.RESTART:
+        await serviceMgr.restart();
+        return { status: OpenClawServiceStatus.RESTART_SUCCESS, message: '服务已重启' };
+      case OpenClawCommandEnum.STATUS:
+        const status = await serviceMgr.status();
+        return { status: OpenClawServiceStatus.RUNNING, message: status };
+      default:
+        return { status: OpenClawServiceStatus.ERROR, message: '未知命令' };
+    }
+  } catch (err) {
+    // ServiceManager 失败，返回 null 让上层回退到脚本方式
+    console.log(`[OpenClawControl] ServiceManager 失败: ${err.message}`);
+    return null;
+  }
+}
 
+/**
+ * 使用 ScriptExecutor 执行脚本（Docker 模式）
+ * @returns {Object} { result, output }
+ */
+async function executeWithScript(command) {
   const executor = getExecutor();
   const scriptName = getScriptName(command);
-
+  
   try {
     const result = await executor.executeWithStatus(command, scriptName);
-
-    if (
-      result.status === OpenClawServiceStatus.START_SUCCESS ||
-      result.status === OpenClawServiceStatus.STOP_SUCCESS ||
-      result.status === OpenClawServiceStatus.RESTART_SUCCESS
-    ) {
-      console.log(`[OpenClawControl] ${cmdName} 成功: ${result.message}`);
-      // 延迟更新状态
-      setTimeout(async () => {
-        const portStatus = await getOpenClawStatus(18789);
-        console.log(`[OpenClawControl] 状态已更新: ${portStatus === 1 ? '运行中' : '未运行'}`);
-      }, 2000);
-    } else if (result.status === OpenClawServiceStatus.ERROR) {
-      console.log(`[OpenClawControl] ${cmdName} 失败: ${result.message}`);
-    } else if (result.status === OpenClawServiceStatus.NOT_INSTALL) {
-      console.log(`[OpenClawControl] ${cmdName}: OpenClaw未安装`);
-    } else {
-      console.log(`[OpenClawControl] ${cmdName} 状态: ${result.message}`);
-      setTimeout(async () => {
-        const portStatus = await getOpenClawStatus(18789);
-        console.log(`[OpenClawControl] 状态: ${portStatus}`);
-      }, 2000);
-    }
-
-    if (sendResponse) {
-      let httpStatus = 'success';
-      if (result.status === OpenClawServiceStatus.ERROR) httpStatus = 'error';
-      sendResponse({
-        type: 'command_result',
-        command,
-        status: httpStatus,
-        message: result.message,
-        service_status: result.status
-      });
-    }
-
-    return result;
+    // 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] ${cmdName} 执行异常: ${msg}`);
-    if (sendResponse) {
-      sendResponse({
-        type: 'command_result',
-        command,
-        status: 'error',
-        message: msg,
-        service_status: OpenClawServiceStatus.ERROR
-      });
-    }
+    console.log(`[OpenClawControl] 脚本执行异常: ${msg}`);
     return {
-      status: OpenClawServiceStatus.ERROR,
-      message: msg
+      result: {
+        status: OpenClawServiceStatus.ERROR,
+        message: `执行异常: ${msg}`
+      },
+      output: ''
     };
   }
 }
 
+/**
+ * 验证命令执行结果
+ * 
+ * 注意：在 Docker 环境中，端口检查可能不可靠（服务可能绑定到特定网络接口）
+ * 因此，如果脚本输出明确指示成功，但端口检查失败，会给出警告但保留脚本结果
+ */
+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));
+    const portStatus = await getOpenClawStatus(18789);
+    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: '停止失败: 服务仍在运行'
+      };
+    }
+  } else if (command === OpenClawCommandEnum.START || command === OpenClawCommandEnum.RESTART) {
+    // 等待服务启动
+    const maxWait = command === OpenClawCommandEnum.START ? 30 : 60;
+    let attempts = 0;
+    let portStatus = 0;
+    
+    while (attempts < maxWait) {
+      await new Promise(resolve => setTimeout(resolve, 2000));
+      portStatus = await getOpenClawStatus(18789);
+      if (portStatus === 1) break;
+      attempts++;
+    }
+    
+    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)}失败: 服务未运行`
+      };
+    }
+  }
+  
+  return result;
+}
+
+async function executeCommand(command, window, sendResponse) {
+  const cmdName = getCommandName(command);
+  console.log(`[OpenClawControl] ${cmdName} OpenClaw...`);
+
+  let result;
+
+  // 优先尝试 ServiceManager（systemd 模式）
+  if (process.platform === 'linux' || process.platform === 'darwin') {
+    result = await manageWithServiceManager(command);
+  }
+  
+  // 如果 ServiceManager 失败或不是 Linux/macOS，使用脚本方式
+  let scriptOutput = '';
+  if (!result) {
+    const scriptResult = await executeWithScript(command);
+    result = scriptResult.result;
+    scriptOutput = scriptResult.output;
+  }
+  
+  // 验证结果（传递脚本输出用于后备检查）
+  result = await verifyCommandResult(command, result, scriptOutput);
+
+  // 输出日志
+  if (result.status === OpenClawServiceStatus.START_SUCCESS ||
+      result.status === OpenClawServiceStatus.STOP_SUCCESS ||
+      result.status === OpenClawServiceStatus.RESTART_SUCCESS) {
+    console.log(`[OpenClawControl] ${cmdName} 成功: ${result.message}`);
+  } else if (result.status === OpenClawServiceStatus.ERROR) {
+    console.log(`[OpenClawControl] ${cmdName} 失败: ${result.message}`);
+  } else if (result.status === OpenClawServiceStatus.NOT_INSTALL) {
+    console.log(`[OpenClawControl] ${cmdName}: OpenClaw未安装`);
+  } else {
+    console.log(`[OpenClawControl] ${cmdName} 状态: ${result.message}`);
+  }
+
+  if (sendResponse) {
+    let httpStatus = 'success';
+    if (result.status === OpenClawServiceStatus.ERROR) httpStatus = 'error';
+    sendResponse({
+      type: 'command_result',
+      command,
+      status: httpStatus,
+      message: result.message,
+      service_status: result.status
+    });
+  }
+
+  return result;
+}
+
 module.exports = {
   executeCommand,
   getScriptName,

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

@@ -88,14 +88,31 @@ class ScriptExecutor {
     const scriptPath = path.join(this.scriptDir, scriptName);
 
     try {
-      const { stdout, stderr } = await this.runScript(scriptPath);
+      const { stdout, stderr, exitCode } = await this.runScript(scriptPath);
       const fullOutput = stdout + stderr;
       
       // 调试日志：记录脚本实际输出
       console.log(`[ScriptExecutor] 执行脚本: ${scriptPath}`);
       console.log(`[ScriptExecutor] ${scriptName} 输出:\n${fullOutput}`);
+      console.log(`[ScriptExecutor] ${scriptName} 退出码: ${exitCode}`);
+      
+      const result = this.parseStatus(command, fullOutput);
       
-      return this.parseStatus(command, fullOutput);
+      // 对于 STOP 命令，如果脚本退出码非零，强制返回错误
+      if (command === OpenClawCommandEnum.STOP && exitCode !== 0) {
+        console.log(`[ScriptExecutor] 停止脚本退出码非零(${exitCode})，返回错误`);
+        return { 
+          status: OpenClawServiceStatus.ERROR, 
+          message: `停止失败: 脚本退出码 ${exitCode}`,
+          output: fullOutput
+        };
+      }
+      
+      // 返回结果时附带原始输出
+      return {
+        ...result,
+        output: fullOutput
+      };
     } catch (e) {
       const msg = e instanceof Error ? e.message : String(e);
       return { status: OpenClawServiceStatus.ERROR, message: `执行异常: ${msg}` };
@@ -239,7 +256,7 @@ class ScriptExecutor {
             killed = true;
             clearTimeout(timer);
             this.killProcessTree(child);
-            resolve({ stdout, stderr });
+            resolve({ stdout, stderr, exitCode: 0 });
           }
         }
       });
@@ -252,7 +269,7 @@ class ScriptExecutor {
             killed = true;
             clearTimeout(timer);
             this.killProcessTree(child);
-            resolve({ stdout, stderr });
+            resolve({ stdout, stderr, exitCode: 0 });
           }
         }
       });
@@ -271,7 +288,7 @@ class ScriptExecutor {
           killed = true;
           clearTimeout(timer);
           console.log(`[ScriptExecutor] 脚本退出，code=${code}, stdout长度=${stdout.length}`);
-          resolve({ stdout, stderr });
+          resolve({ stdout, stderr, exitCode: code });
         }
       });
       
@@ -281,7 +298,7 @@ class ScriptExecutor {
           killed = true;
           clearTimeout(timer);
           console.log(`[ScriptExecutor] 脚本关闭，code=${code}, stdout长度=${stdout.length}`);
-          resolve({ stdout, stderr });
+          resolve({ stdout, stderr, exitCode: code });
         }
       });