yymaxapi 1.0.28 → 1.0.31

package/bin/yymaxapi.js

@@ -841,20 +841,27 @@ async function selectDockerContainer() {
 // 在 Docker 容器内执行命令
 function execInDocker(containerId, cmd, options = {}) {
   const escaped = cmd.replace(/'/g, "'\\''");
+  // 尝试 sh -c，fallback bash -lc
+  const r = safeExec(dockerCmd(`exec ${containerId} sh -c '${escaped}'`), { timeout: 30000, ...options });
+  if (r.ok) return r;
   return safeExec(dockerCmd(`exec ${containerId} bash -lc '${escaped}'`), { timeout: 30000, ...options });
 }
 
 // 在 Docker 容器内异步执行命令（后台启动 gateway 等）
-function spawnDetachedInDocker(containerId, cmd, env = {}) {
+// shell 参数: 'sh -c' | 'bash -lc' | 'bash -c'
+function spawnDetachedInDocker(containerId, cmd, shell = 'sh -c') {
   try {
+    const shellParts = shell.split(' ');
+    const shellBin = shellParts[0];
+    const shellFlag = shellParts.slice(1).join(' ');
     const prefix = _dockerNeedsSudo ? 'sudo' : 'docker';
     const args = _dockerNeedsSudo
-      ? ['-n', 'docker', 'exec', '-d', containerId, 'bash', '-lc', cmd]
-      : ['exec', '-d', containerId, 'bash', '-lc', cmd];
-    const child = spawn(prefix, args, {
+      ? ['-n', 'docker', 'exec', '-d', containerId, shellBin, shellFlag, cmd]
+      : ['exec', '-d', containerId, shellBin, shellFlag, cmd];
+    const child = spawn(prefix, args.filter(Boolean), {
       detached: true,
       stdio: 'ignore',
-      env: { ...process.env, ...env }
+      env: { ...process.env }
     });
     child.unref();
     return true;
@@ -1058,7 +1065,7 @@ function cleanupAgentProcesses() {
     if (detectGatewayEnv() === 'docker' && _selectedDockerContainer) {
       try {
         for (const name of ['openclaw', 'clawdbot', 'moltbot']) {
-          safeExec(dockerCmd(`exec ${_selectedDockerContainer.id} bash -c "pkill -f '${name}.*agent' 2>/dev/null || true"`), { timeout: 10000 });
+          safeExec(dockerCmd(`exec ${_selectedDockerContainer.id} sh -c "pkill -f '${name}.*agent' 2>/dev/null || true"`), { timeout: 10000 });
         }
       } catch { /* ignore */ }
     }
@@ -1703,6 +1710,7 @@ async function tryAutoStartGateway(port, allowAutoDaemon) {
     if (container.cli === 'node') {
       dockerCmds.push(`node ${container.cliPath} gateway`);
     } else {
+      if (container.cliPath) dockerCmds.push(`${container.cliPath} gateway`);
       dockerCmds.push(`${container.cli} gateway`);
     }
     for (const name of ['openclaw', 'clawdbot', 'moltbot']) {
@@ -1711,10 +1719,13 @@ async function tryAutoStartGateway(port, allowAutoDaemon) {
 
     for (const cmd of [...new Set(dockerCmds)].filter(Boolean)) {
       console.log(chalk.yellow(`⚠️ 尝试在容器内启动 Gateway: ${cmd}`));
-      if (spawnDetachedInDocker(container.id, cmd)) {
-        if (await waitForGateway(port, '127.0.0.1', 15000)) {
-          console.log(chalk.green(`✅ Gateway 已在 Docker 容器 ${container.name} 内启动`));
-          return { started: true, method: 'docker', container: container.name };
+      // 尝试多种 shell
+      for (const shell of ['sh -c', 'bash -lc', 'bash -c']) {
+        if (spawnDetachedInDocker(container.id, cmd, shell)) {
+          if (await waitForGateway(port, '127.0.0.1', 15000)) {
+            console.log(chalk.green(`✅ Gateway 已在 Docker 容器 ${container.name} 内启动`));
+            return { started: true, method: 'docker', container: container.name };
+          }
         }
       }
     }
@@ -2892,9 +2903,21 @@ async function testConnection(paths, args = {}) {
 
   // 等待 Gateway 启动
   const gwSpinner = ora({ text: '等待 Gateway 启动...', spinner: 'dots' }).start();
-  await new Promise(resolve => setTimeout(resolve, 3000));
 
-  let gatewayRunning = await waitForGateway(gatewayPort, '127.0.0.1', 15000);
+  let gatewayRunning = false;
+
+  if (restartOk) {
+    // restartGateway 内部已经验证过端口可达，只需短暂确认
+    await new Promise(resolve => setTimeout(resolve, 1000));
+    gatewayRunning = await waitForGateway(gatewayPort, '127.0.0.1', 5000);
+  }
+
+  if (!gatewayRunning) {
+    // restart 失败或未就绪，先等待更长时间（macOS LaunchAgent 启动较慢）
+    await new Promise(resolve => setTimeout(resolve, 3000));
+    gatewayRunning = await waitForGateway(gatewayPort, '127.0.0.1', 20000);
+  }
+
   if (!gatewayRunning) {
     gwSpinner.text = '尝试自动启动 Gateway...';
     const autoResult = await tryAutoStartGateway(gatewayPort, allowAutoDaemon);
@@ -3055,26 +3078,34 @@ async function restartGateway() {
 
     const dockerCmds = [];
     if (container.cli === 'node') {
-      // 脚本路径模式（如 /opt/moltbot/moltbot.mjs）
       dockerCmds.push(`node ${container.cliPath} gateway restart`);
     } else {
+      if (container.cliPath) dockerCmds.push(`${container.cliPath} gateway restart`);
       dockerCmds.push(`${container.cli} gateway restart`);
     }
-    // 通用回退
     for (const name of ['openclaw', 'clawdbot', 'moltbot']) {
       dockerCmds.push(`${name} gateway restart`);
     }
 
+    // 每个命令尝试多种 shell（sh -c / bash -lc / bash -c）
+    const shellVariants = ['sh -c', 'bash -lc', 'bash -c'];
+
     return new Promise((resolve) => {
+      // 展开为 [cmd1+sh, cmd1+bash-lc, cmd1+bash-c, cmd2+sh, ...]
+      const allAttempts = [];
+      for (const cmd of [...new Set(dockerCmds)].filter(Boolean)) {
+        for (const shell of shellVariants) {
+          allAttempts.push(dockerCmd(`exec ${container.id} ${shell} "${cmd}"`));
+        }
+      }
       let tried = 0;
       const tryNext = () => {
-        if (tried >= dockerCmds.length) {
+        if (tried >= allAttempts.length) {
           console.log(chalk.yellow('Docker 容器内 Gateway 重启失败，尝试本地重启...'));
           restartGatewayNative().then(resolve);
           return;
         }
-        const cmd = dockerCmds[tried++];
-        const fullCmd = dockerCmd(`exec ${container.id} bash -lc "${cmd}"`);
+        const fullCmd = allAttempts[tried++];
         exec(fullCmd, { timeout: 30000 }, (error) => {
           if (error) {
             tryNext();
@@ -3140,9 +3171,9 @@ async function forceRestartGateway(resolved, nodeInfo, useNode, env, gatewayPort
     // 1. 杀掉容器内旧 Gateway 进程
     try {
       for (const name of ['openclaw', 'clawdbot', 'moltbot']) {
-        safeExec(dockerCmd(`exec ${cid} bash -c "pkill -f '${name}.*gateway' 2>/dev/null || true"`), { timeout: 5000 });
+        safeExec(dockerCmd(`exec ${cid} sh -c "pkill -f '${name}.*gateway' 2>/dev/null || true"`), { timeout: 5000 });
       }
-      safeExec(dockerCmd(`exec ${cid} bash -c "lsof -ti :${gatewayPort} 2>/dev/null | xargs -r kill -9 2>/dev/null || true"`), { timeout: 5000 });
+      safeExec(dockerCmd(`exec ${cid} sh -c "lsof -ti :${gatewayPort} 2>/dev/null | xargs -r kill -9 2>/dev/null || true"`), { timeout: 5000 });
       console.log(chalk.gray('   已尝试清理容器内旧 Gateway 进程'));
     } catch { /* ignore */ }
 
@@ -3153,6 +3184,7 @@ async function forceRestartGateway(resolved, nodeInfo, useNode, env, gatewayPort
     if (_selectedDockerContainer.cli === 'node') {
       dockerCmds.push(`node ${_selectedDockerContainer.cliPath} gateway`);
     } else {
+      if (_selectedDockerContainer.cliPath) dockerCmds.push(`${_selectedDockerContainer.cliPath} gateway`);
       dockerCmds.push(`${_selectedDockerContainer.cli} gateway`);
     }
     for (const name of ['openclaw', 'clawdbot', 'moltbot']) {
@@ -3161,10 +3193,12 @@ async function forceRestartGateway(resolved, nodeInfo, useNode, env, gatewayPort
 
     for (const cmd of [...new Set(dockerCmds)].filter(Boolean)) {
       console.log(chalk.gray(`   尝试在容器内启动: ${cmd}`));
-      if (spawnDetachedInDocker(cid, cmd)) {
-        if (await waitForGateway(gatewayPort, '127.0.0.1', 12000)) {
-          console.log(chalk.green(`✅ Gateway 已在 Docker 容器 ${cName} 内强制重启成功`));
-          return true;
+      for (const shell of ['sh -c', 'bash -lc', 'bash -c']) {
+        if (spawnDetachedInDocker(cid, cmd, shell)) {
+          if (await waitForGateway(gatewayPort, '127.0.0.1', 12000)) {
+            console.log(chalk.green(`✅ Gateway 已在 Docker 容器 ${cName} 内强制重启成功`));
+            return true;
+          }
         }
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yymaxapi",
-  "version": "1.0.28",
+  "version": "1.0.31",
   "description": "跨平台 OpenClaw/Clawdbot 配置管理工具 - 管理中转地址、模型切换、API Keys、测速优化",
   "main": "bin/yymaxapi.js",
   "bin": {