claw-subagent-service 0.0.91 → 0.0.93

package/command/linux/restart.sh

@@ -70,7 +70,7 @@ get_openclaw_pid() {
         fi
     fi
     
-    # 方法5: 通过 /proc/net/tcp 查找（不需要外部工具，最可靠）
+    # 方法5: 通过 /proc/net/tcp 查找（不需要外部工具）
     # 端口 18789 的十六进制 = 0x4965
     local hex_port="4965"
     for proc_dir in /proc/[0-9]*; do
@@ -83,6 +83,30 @@ get_openclaw_pid() {
         fi
     done
     
+    # 方法6: 通过进程名查找（当服务未监听预期端口时）
+    if command -v pgrep &>/dev/null; then
+        pid=$(pgrep -f "openclaw" | head -1)
+        if [ -n "$pid" ]; then
+            echo "$pid"
+            return
+        fi
+    fi
+    
+    if command -v pidof &>/dev/null; then
+        pid=$(pidof openclaw | awk '{print $1}')
+        if [ -n "$pid" ]; then
+            echo "$pid"
+            return
+        fi
+    fi
+    
+    # 最后尝试 ps
+    pid=$(ps aux | grep -v grep | grep "openclaw" | head -1 | awk '{print $2}')
+    if [ -n "$pid" ]; then
+        echo "$pid"
+        return
+    fi
+    
     echo ""
 }
 

package/command/linux/start.sh

@@ -70,7 +70,7 @@ get_openclaw_pid() {
         fi
     fi
     
-    # 方法5: 通过 /proc/net/tcp 查找（不需要外部工具，最可靠）
+    # 方法5: 通过 /proc/net/tcp 查找（不需要外部工具）
     # 端口 18789 的十六进制 = 0x4965
     local hex_port="4965"
     for proc_dir in /proc/[0-9]*; do
@@ -83,6 +83,30 @@ get_openclaw_pid() {
         fi
     done
     
+    # 方法6: 通过进程名查找（当服务未监听预期端口时）
+    if command -v pgrep &>/dev/null; then
+        pid=$(pgrep -f "openclaw" | head -1)
+        if [ -n "$pid" ]; then
+            echo "$pid"
+            return
+        fi
+    fi
+    
+    if command -v pidof &>/dev/null; then
+        pid=$(pidof openclaw | awk '{print $1}')
+        if [ -n "$pid" ]; then
+            echo "$pid"
+            return
+        fi
+    fi
+    
+    # 最后尝试 ps
+    pid=$(ps aux | grep -v grep | grep "openclaw" | head -1 | awk '{print $2}')
+    if [ -n "$pid" ]; then
+        echo "$pid"
+        return
+    fi
+    
     echo ""
 }
 

package/command/linux/status.sh

@@ -84,7 +84,7 @@ get_openclaw_pid() {
         fi
     fi
     
-    # 方法5: 通过 /proc/net/tcp 查找（不需要外部工具，最可靠）
+    # 方法5: 通过 /proc/net/tcp 查找（不需要外部工具）
     # 端口 18789 的十六进制 = 0x4965
     local hex_port="4965"
     for proc_dir in /proc/[0-9]*; do
@@ -97,6 +97,30 @@ get_openclaw_pid() {
         fi
     done
     
+    # 方法6: 通过进程名查找（当服务未监听预期端口时）
+    if command -v pgrep &>/dev/null; then
+        pid=$(pgrep -f "openclaw" | head -1)
+        if [ -n "$pid" ]; then
+            echo "$pid"
+            return
+        fi
+    fi
+    
+    if command -v pidof &>/dev/null; then
+        pid=$(pidof openclaw | awk '{print $1}')
+        if [ -n "$pid" ]; then
+            echo "$pid"
+            return
+        fi
+    fi
+    
+    # 最后尝试 ps
+    pid=$(ps aux | grep -v grep | grep "openclaw" | head -1 | awk '{print $2}')
+    if [ -n "$pid" ]; then
+        echo "$pid"
+        return
+    fi
+    
     echo ""
 }
 

package/command/linux/stop.sh

@@ -103,7 +103,7 @@ get_openclaw_pid() {
         fi
     fi
     
-    # 方法5: 通过 /proc/net/tcp 查找（不需要外部工具，最可靠）
+    # 方法5: 通过 /proc/net/tcp 查找（不需要外部工具）
     # 端口 18789 的十六进制 = 0x4965
     local hex_port="4965"
     for proc_dir in /proc/[0-9]*; do
@@ -116,6 +116,31 @@ get_openclaw_pid() {
         fi
     done
     
+    # 方法6: 通过进程名查找（当服务未监听预期端口时）
+    # 使用 pgrep/pidof/ps 查找 openclaw 进程
+    if command -v pgrep &>/dev/null; then
+        pid=$(pgrep -f "openclaw" | head -1)
+        if [ -n "$pid" ]; then
+            echo "$pid"
+            return
+        fi
+    fi
+    
+    if command -v pidof &>/dev/null; then
+        pid=$(pidof openclaw | awk '{print $1}')
+        if [ -n "$pid" ]; then
+            echo "$pid"
+            return
+        fi
+    fi
+    
+    # 最后尝试 ps
+    pid=$(ps aux | grep -v grep | grep "openclaw" | head -1 | awk '{print $2}')
+    if [ -n "$pid" ]; then
+        echo "$pid"
+        return
+    fi
+    
     echo ""
 }
 

package/package.json

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

package/service/modules/openclaw-control.js

@@ -38,9 +38,11 @@ function getScriptName(command) {
     [OpenClawCommandEnum.START]: 'start',
     [OpenClawCommandEnum.STOP]: 'stop',
     [OpenClawCommandEnum.RESTART]: 'restart',
-    [OpenClawCommandEnum.STATUS]: 'status'
+    [OpenClawCommandEnum.STATUS]: 'status',
+    [OpenClawCommandEnum.CONFIG_FIX]: null  // 配置修复不需要脚本
   };
-  return (names[command] || 'unknown') + ext;
+  const name = names[command];
+  return name ? name + ext : null;
 }
 
 function getCommandName(command) {
@@ -48,7 +50,8 @@ function getCommandName(command) {
     [OpenClawCommandEnum.START]: '启动',
     [OpenClawCommandEnum.STOP]: '停止',
     [OpenClawCommandEnum.RESTART]: '重启',
-    [OpenClawCommandEnum.STATUS]: '状态检查'
+    [OpenClawCommandEnum.STATUS]: '状态检查',
+    [OpenClawCommandEnum.CONFIG_FIX]: '配置修复'
   };
   return names[command] || '未知命令';
 }
@@ -73,6 +76,9 @@ async function manageWithServiceManager(command) {
       case OpenClawCommandEnum.STATUS:
         const status = await serviceMgr.status();
         return { status: OpenClawServiceStatus.RUNNING, message: status };
+      case OpenClawCommandEnum.CONFIG_FIX:
+        // 配置修复不通过 ServiceManager，回退到脚本方式
+        return null;
       default:
         return { status: OpenClawServiceStatus.ERROR, message: '未知命令' };
     }
@@ -124,6 +130,11 @@ async function verifyCommandResult(command, result, scriptOutput = '') {
   
   const outputUpper = (scriptOutput || '').toUpperCase();
   
+  // 配置修复命令不需要端口验证
+  if (command === OpenClawCommandEnum.CONFIG_FIX) {
+    return result;
+  }
+  
   if (command === OpenClawCommandEnum.STOP) {
     // 等待 3 秒后验证端口
     await new Promise(resolve => setTimeout(resolve, 3000));
@@ -219,7 +230,8 @@ async function executeCommand(command, window, sendResponse) {
   // 输出日志
   if (result.status === OpenClawServiceStatus.START_SUCCESS ||
       result.status === OpenClawServiceStatus.STOP_SUCCESS ||
-      result.status === OpenClawServiceStatus.RESTART_SUCCESS) {
+      result.status === OpenClawServiceStatus.RESTART_SUCCESS ||
+      result.status === OpenClawServiceStatus.CONFIG_FIX_SUCCESS) {
     console.log(`[OpenClawControl] ${cmdName} 成功: ${result.message}`);
   } else if (result.status === OpenClawServiceStatus.ERROR) {
     console.log(`[OpenClawControl] ${cmdName} 失败: ${result.message}`);

package/service/modules/port-checker.js

@@ -129,10 +129,13 @@ function checkProcessExists() {
 }
 
 async function getOpenClawStatus(port = 18789) {
+  // 核心判断：只有端口在监听才算是真正运行
+  // openclaw gateway 的核心功能就是监听端口提供服务
+
   // 方法1: 通过 net.Socket 检查端口
   const isListening = await checkPortOnAllInterfaces(port);
   if (isListening) {
-    console.log(`[PortChecker] 端口 ${port} 检测为运行中（net.Socket）`);
+    console.log(`[PortChecker] 端口 ${port} 检测为运行中`);
     return 1;
   }
   
@@ -143,12 +146,10 @@ async function getOpenClawStatus(port = 18789) {
     return 1;
   }
   
-  // 方法3: 检查进程是否存在（备选）
+  // 方法3: 检查进程是否存在（仅用于日志，不改变判断结果）
   const processExists = checkProcessExists();
   if (processExists) {
-    console.warn(`[PortChecker] 警告: openclaw 进程存在，但端口 ${port} 未监听。可能绑定到其他端口或地址。`);
-    // 进程存在但端口未监听，返回特殊状态 2
-    return 2;
+    console.warn(`[PortChecker] 警告: openclaw 进程存在，但端口 ${port} 未监听。服务可能未正确启动或已崩溃。`);
   }
   
   console.log(`[PortChecker] 端口 ${port} 检测为未运行`);

package/service/modules/rongyun-message-handler.js

@@ -96,7 +96,7 @@ class RongyunMessageHandler {
   }
 
   async handleCommand(data) {
-    const command = data.command;
+    const command = Number(data.command);  // 确保是数字类型
     const commandId = data.command_id;
     const requestId = data.request_id;
     const sourceId = data.source_im_id;
@@ -106,6 +106,7 @@ class RongyunMessageHandler {
     // 验证命令是否有效
     const validCommands = Object.values(OpenClawCommandEnum);
     if (!validCommands.includes(command)) {
+      this.logError(`[RongyunMessageHandler] 未知命令: ${command}, 有效命令: ${validCommands.join(', ')}`);
       await this.sendResponse(RongyunMessageTypeEnum.COMMAND_RESULT, {
         command,
         command_id: commandId,
@@ -272,11 +273,17 @@ class RongyunMessageHandler {
       let result;
       switch (command) {
         case 'disable': {
-          const svcMgr = new ServiceManager('claw-subagent-service', 'OpenClaw Guard CLI Client', process.argv[1], this.log);
-          await svcMgr.stop();
-          await svcMgr.uninstall();
+          // 先发送响应，再停止服务
           result = { status: 'success', message: '设备服务已禁用' };
-          break;
+          await this.sendDeviceControlResult(targetId, requestId, command, result.status, result.message, result.data);
+          
+          setTimeout(async () => {
+            const svcMgr = new ServiceManager('claw-subagent-service', 'OpenClaw Guard CLI Client', process.argv[1], this.log);
+            try { await svcMgr.stop(); } catch (e) {}
+            try { await svcMgr.uninstall(); } catch (e) {}
+          }, 2000);
+          
+          return;
         }
         case 'enable': {
           const svcMgr = new ServiceManager('claw-subagent-service', 'OpenClaw Guard CLI Client', process.argv[1], this.log);
@@ -285,21 +292,28 @@ class RongyunMessageHandler {
           break;
         }
         case 'delete': {
-          const svcMgr = new ServiceManager('claw-subagent-service', 'OpenClaw Guard CLI Client', process.argv[1], this.log);
-          try { await svcMgr.stop(); } catch (e) {}
-          try { await svcMgr.uninstall(); } catch (e) {}
-          const homeDir = os.homedir();
-          const configPaths = [
-            path.join(homeDir, '.claw-bridge', 'config.json'),
-            path.join(__dirname, '..', '..', 'rongcloud-config.json')
-          ];
-          for (const p of configPaths) {
-            if (fs.existsSync(p)) {
-              fs.unlinkSync(p);
-            }
-          }
+          // 先发送响应，再停止服务（否则服务停止后无法发送响应）
           result = { status: 'success', message: '设备已删除，本地配置已清除' };
-          break;
+          await this.sendDeviceControlResult(targetId, requestId, command, result.status, result.message, result.data);
+          
+          // 延迟执行实际的删除操作
+          setTimeout(async () => {
+            const svcMgr = new ServiceManager('claw-subagent-service', 'OpenClaw Guard CLI Client', process.argv[1], this.log);
+            try { await svcMgr.stop(); } catch (e) {}
+            try { await svcMgr.uninstall(); } catch (e) {}
+            const homeDir = os.homedir();
+            const configPaths = [
+              path.join(homeDir, '.claw-bridge', 'config.json'),
+              path.join(__dirname, '..', '..', 'rongcloud-config.json')
+            ];
+            for (const p of configPaths) {
+              if (fs.existsSync(p)) {
+                fs.unlinkSync(p);
+              }
+            }
+          }, 2000);
+          
+          return; // 已经发送了响应，直接返回
         }
         case 'status': {
           const dashboard = await collectDashboardData();
@@ -327,18 +341,11 @@ class RongyunMessageHandler {
       const openClawStatus = await getOpenClawStatus();
       
       // 构建状态数据
-      // openClawStatus: 1=端口监听正常, 2=进程存在但端口未监听, 0=未运行
-      let statusMessage;
-      if (openClawStatus === 1) {
-        statusMessage = '运行中';
-      } else if (openClawStatus === 2) {
-        statusMessage = '运行中(端口异常)';
-      } else {
-        statusMessage = '未运行';
-      }
+      // openClawStatus: 1=端口监听正常(服务可用), 0=未运行(端口未监听)
+      const statusMessage = openClawStatus === 1 ? '运行中' : '未运行';
       
       const statusData = {
-        open_claw_status: openClawStatus,  // 1=运行中, 2=进程存在但端口未监听, 0=未运行
+        open_claw_status: openClawStatus,  // 1=运行中, 0=未运行
         status_message: statusMessage,
         mac_address: getMacAddress(),
         version: '0.0.20',