claw-subagent-service 0.0.127 → 0.0.128

package/command/linux/start.sh

@@ -17,6 +17,14 @@ log_info() { echo -e "${GREEN}[INFO]${NC} $1"; }
 log_warn() { echo -e "${YELLOW}[WARN]${NC} $1"; }
 log_error() { echo -e "${RED}[ERROR]${NC} $1"; }
 
+# 调试模式：如果 DEBUG=1，输出更多日志
+DEBUG="${DEBUG:-0}"
+debug_log() {
+    if [ "$DEBUG" = "1" ]; then
+        echo -e "${YELLOW}[DEBUG]${NC} $1"
+    fi
+}
+
 SERVICE_NAME="openclaw-gateway.service"
 MAX_WAIT=300  # 最长等待5分钟
 PORT="18789"
@@ -187,10 +195,13 @@ start_docker() {
     fi
     
     # 检查 openclaw 命令是否存在
+    debug_log "检查 openclaw 命令..."
     if ! command -v openclaw &>/dev/null; then
         log_error "openclaw 命令未找到，请先安装 OpenClaw。"
+        log_error "PATH: $PATH"
         exit 1
     fi
+    debug_log "openclaw 命令存在: $(which openclaw)"
     
     # 确保日志目录存在
     local log_dir="/tmp/openclaw"
@@ -201,8 +212,18 @@ start_docker() {
     
     log_info "正在启动 OpenClaw 服务..."
     
-    # 使用 nohup 后台启动
-    nohup openclaw gateway --port "$PORT" > "$log_file" 2>&1 &
+    # 使用 nohup 后台启动，指定 host 为 0.0.0.0（Docker 环境需要）
+    # 注意：openclaw gateway 可能需要不同的参数格式
+    log_info "执行命令: nohup openclaw gateway --port $PORT --host 0.0.0.0"
+    debug_log "当前工作目录: $(pwd)"
+    debug_log "当前用户: $(whoami)"
+    debug_log "环境变量 PATH: $PATH"
+    
+    # 先检查 openclaw 版本
+    debug_log "openclaw 版本信息:"
+    openclaw --version 2>&1 | head -5 || true
+    
+    nohup openclaw gateway --port "$PORT" --host 0.0.0.0 > "$log_file" 2>&1 &
     
     log_info "OpenClaw 服务启动命令已发送（PID: $!）"
     log_info "日志文件: $log_file"

package/package.json

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

package/service/modules/openclaw-control.js

@@ -181,25 +181,40 @@ async function verifyCommandResult(command, result, scriptOutput = '') {
 
 async function executeCommand(command, window, sendResponse) {
   const cmdName = getCommandName(command);
-  console.log(`[OpenClawControl] ${cmdName} OpenClaw...`);
+  console.log(`[OpenClawControl] ====== 开始执行 ${cmdName} 命令 ======`);
+  console.log(`[OpenClawControl] 命令代码: ${command}`);
+  console.log(`[OpenClawControl] 平台: ${process.platform}`);
 
   let result;
 
   // 优先尝试 ServiceManager（systemd 模式）
   if (process.platform === 'linux' || process.platform === 'darwin') {
+    console.log(`[OpenClawControl] 尝试使用 ServiceManager...`);
     result = await manageWithServiceManager(command);
+    if (result) {
+      console.log(`[OpenClawControl] ServiceManager 结果: ${result.status} - ${result.message}`);
+    } else {
+      console.log(`[OpenClawControl] ServiceManager 不可用，回退到脚本方式`);
+    }
   }
   
   // 如果 ServiceManager 失败或不是 Linux/macOS，使用脚本方式
   let scriptOutput = '';
   if (!result) {
+    console.log(`[OpenClawControl] 使用脚本方式执行...`);
     const scriptResult = await executeWithScript(command);
     result = scriptResult.result;
     scriptOutput = scriptResult.output;
+    console.log(`[OpenClawControl] 脚本执行结果: ${result.status} - ${result.message}`);
+    if (scriptOutput) {
+      console.log(`[OpenClawControl] 脚本输出长度: ${scriptOutput.length}`);
+    }
   }
   
   // 验证结果（传递脚本输出用于后备检查）
+  console.log(`[OpenClawControl] 开始验证命令结果...`);
   result = await verifyCommandResult(command, result, scriptOutput);
+  console.log(`[OpenClawControl] 验证后结果: ${result.status} - ${result.message}`);
 
   // 输出日志
   if (result.status === OpenClawServiceStatus.START_SUCCESS ||
@@ -221,33 +236,41 @@ async function executeCommand(command, window, sendResponse) {
     
     // 获取操作后的真实状态
     let realStatus = result.status;
+    let realMessage = result.message;
     if (command === OpenClawCommandEnum.STOP || command === OpenClawCommandEnum.START || command === OpenClawCommandEnum.RESTART) {
       try {
+        console.log(`[OpenClawControl] 检测操作后的真实状态...`);
         const { getOpenClawStatus } = require('./port-checker');
         const portStatus = await getOpenClawStatus(18789);
+        console.log(`[OpenClawControl] 端口状态: ${portStatus}`);
         // 更新真实状态
         if (command === OpenClawCommandEnum.STOP) {
           realStatus = portStatus === 1 ? OpenClawServiceStatus.RUNNING : OpenClawServiceStatus.STOP_SUCCESS;
+          realMessage = portStatus === 1 ? '停止失败: 服务仍在运行' : '服务已停止';
         } else if (command === OpenClawCommandEnum.START) {
           realStatus = portStatus === 1 ? OpenClawServiceStatus.START_SUCCESS : OpenClawServiceStatus.ERROR;
+          realMessage = portStatus === 1 ? '服务已启动' : '启动失败: 服务未运行';
         } else if (command === OpenClawCommandEnum.RESTART) {
           realStatus = portStatus === 1 ? OpenClawServiceStatus.RESTART_SUCCESS : OpenClawServiceStatus.ERROR;
+          realMessage = portStatus === 1 ? '服务已重启' : '重启失败: 服务未运行';
         }
-        console.log(`[OpenClawControl] 操作后真实状态检测: portStatus=${portStatus}, realStatus=${realStatus}`);
+        console.log(`[OpenClawControl] 操作后真实状态: portStatus=${portStatus}, realStatus=${realStatus}, message=${realMessage}`);
       } catch (e) {
         console.error(`[OpenClawControl] 真实状态检测失败: ${e.message}`);
       }
     }
     
+    console.log(`[OpenClawControl] 发送响应: status=${httpStatus}, message=${realMessage}`);
     sendResponse({
       type: 'command_result',
       command,
       status: httpStatus,
-      message: result.message,
+      message: realMessage,
       service_status: realStatus
     });
   }
 
+  console.log(`[OpenClawControl] ====== ${cmdName} 命令执行完成 ======`);
   return result;
 }
 

package/service/modules/port-checker.js

@@ -27,7 +27,13 @@ function checkPortListening(port, host = '127.0.0.1') {
       resolve(false);
     });
     
-    sock.connect(port, host);
+    try {
+      sock.connect(port, host);
+    } catch (err) {
+      console.error(`[PortChecker] 连接异常: ${err.message}`);
+      sock.destroy();
+      resolve(false);
+    }
   });
 }
 

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

@@ -164,9 +164,27 @@ class RongyunMessageHandler {
         // 异步命令不在这里响应，因为已经提前响应了
         // 但我们可以在这里记录执行结果
         this.logInfo(`[RongyunMessageHandler] 命令执行完成: command=${command}, status=${response.status}, message=${response.message}`);
+      }).then(() => {
+        // 命令执行完成后，立即释放锁
+        this.commandLock = false;
+        if (this.commandLockTimer) {
+          clearTimeout(this.commandLockTimer);
+          this.commandLockTimer = null;
+        }
       }).catch(err => {
         this.logError(`[RongyunMessageHandler] 命令执行失败: ${err.message}`);
+        // 执行失败后也要释放锁
+        this.commandLock = false;
+        if (this.commandLockTimer) {
+          clearTimeout(this.commandLockTimer);
+          this.commandLockTimer = null;
+        }
       });
+      
+      // 异步命令立即返回，不等待执行完成
+      if (isAsyncCommand) {
+        return;
+      }
     } catch (e) {
       const msg = e instanceof Error ? e.message : String(e);
       this.logError(`命令执行异常: ${msg}`);
@@ -176,7 +194,7 @@ class RongyunMessageHandler {
         status: 'error',
         message: msg
       }, requestId, sourceId);
-    } finally {
+      // 同步命令执行异常时释放锁
       this.commandLock = false;
       if (this.commandLockTimer) {
         clearTimeout(this.commandLockTimer);

package/service/modules/script-executor.js

@@ -88,15 +88,22 @@ class ScriptExecutor {
     const scriptPath = path.join(this.scriptDir, scriptName);
 
     try {
+      console.log(`[ScriptExecutor] 开始执行脚本: ${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] 执行脚本完成: ${scriptPath}`);
       console.log(`[ScriptExecutor] ${scriptName} 退出码: ${exitCode}`);
+      console.log(`[ScriptExecutor] ${scriptName} 输出长度: ${fullOutput.length}`);
+      if (fullOutput.length > 0) {
+        console.log(`[ScriptExecutor] ${scriptName} 输出:\n${fullOutput}`);
+      } else {
+        console.log(`[ScriptExecutor] ${scriptName} 无输出`);
+      }
       
       const result = this.parseStatus(command, fullOutput);
+      console.log(`[ScriptExecutor] ${scriptName} 解析结果: status=${result.status}, message=${result.message}`);
       
       // 对于 STOP 命令，如果脚本退出码非零，强制返回错误
       if (command === OpenClawCommandEnum.STOP && exitCode !== 0) {
@@ -115,6 +122,7 @@ class ScriptExecutor {
       };
     } catch (e) {
       const msg = e instanceof Error ? e.message : String(e);
+      console.error(`[ScriptExecutor] 执行脚本异常: ${msg}`);
       return { status: OpenClawServiceStatus.ERROR, message: `执行异常: ${msg}` };
     }
   }