yymaxapi 1.0.27 → 1.0.29

package/bin/yymaxapi.js

@@ -721,46 +721,87 @@ let _selectedDockerContainer = null;
 
 function isDockerAvailable() {
   if (_dockerAvailCache !== null) return _dockerAvailCache;
-  const r = safeExec('docker info', { timeout: 5000 });
-  _dockerAvailCache = r.ok;
+  // 优先用 docker ps（权限要求更低），fallback 到 docker info
+  const r = safeExec('docker ps --no-trunc -q', { timeout: 8000 });
+  if (r.ok) { _dockerAvailCache = true; return true; }
+  const r2 = safeExec('docker info', { timeout: 8000 });
+  if (r2.ok) { _dockerAvailCache = true; return true; }
+  // 可能需要 sudo
+  const r3 = safeExec('sudo -n docker ps -q', { timeout: 8000 });
+  _dockerAvailCache = r3.ok;
   return _dockerAvailCache;
 }
 
+// 封装 docker 命令（自动处理 sudo）
+let _dockerNeedsSudo = null;
+function dockerCmd(cmd) {
+  if (_dockerNeedsSudo === null) {
+    const test = safeExec('docker ps -q', { timeout: 5000 });
+    _dockerNeedsSudo = !test.ok;
+  }
+  return _dockerNeedsSudo ? `sudo -n docker ${cmd}` : `docker ${cmd}`;
+}
+
 // 查找包含 openclaw/clawdbot/moltbot 的运行中容器
 function findOpenclawDockerContainers() {
   if (_dockerContainerCache !== null) return _dockerContainerCache;
   if (!isDockerAvailable()) { _dockerContainerCache = []; return []; }
 
-  const ps = safeExec('docker ps --format "{{.ID}}\\t{{.Names}}\\t{{.Image}}\\t{{.Status}}"', { timeout: 10000 });
+  const ps = safeExec(dockerCmd('ps --format "{{.ID}}\t{{.Names}}\t{{.Image}}\t{{.Status}}"'), { timeout: 10000 });
   if (!ps.ok || !ps.output) { _dockerContainerCache = []; return []; }
 
   const containers = [];
   const lines = ps.output.split('\n').filter(Boolean);
 
   for (const line of lines) {
-    const [id, name, image, ...statusParts] = line.split('\t');
-    const status = statusParts.join('\t');
+    // 兼容 tab 分隔和空格分隔
+    const parts = line.includes('\t') ? line.split('\t') : line.split(/\s{2,}/);
+    const [id, name, image, ...statusParts] = parts;
+    const status = statusParts.join(' ');
     if (!id) continue;
 
-    // 检查容器内是否有 openclaw/clawdbot/moltbot
+    // 检查容器内是否有 openclaw/clawdbot/moltbot（用 command -v 代替 which，兼容精简镜像）
     for (const cli of ['openclaw', 'clawdbot', 'moltbot']) {
-      const check = safeExec(`docker exec ${id} which ${cli} 2>/dev/null`, { timeout: 5000 });
-      if (check.ok && check.output) {
+      const check = safeExec(dockerCmd(`exec ${id} sh -c "command -v ${cli} 2>/dev/null || which ${cli} 2>/dev/null"`), { timeout: 8000 });
+      if (check.ok && check.output && check.output.trim()) {
         containers.push({ id, name, image, status, cli, cliPath: check.output.trim() });
-        break; // 一个容器只记录一次
+        break;
       }
     }
 
-    // 也检查 /opt/moltbot 等常见路径
+    // 也检查常见路径（不依赖 which/command -v）
     if (!containers.find(c => c.id === id)) {
-      for (const p of ['/opt/moltbot/moltbot.mjs', '/opt/moltbot/bin/moltbot.mjs']) {
-        const check = safeExec(`docker exec ${id} test -f ${p} && echo found`, { timeout: 5000 });
-        if (check.ok && check.output && check.output.includes('found')) {
-          containers.push({ id, name, image, status, cli: 'node', cliPath: p });
+      const knownPaths = [
+        '/opt/moltbot/moltbot.mjs',
+        '/opt/moltbot/bin/moltbot.mjs',
+        '/opt/moltbot/bin/moltbot.js',
+        '/opt/moltbot/src/moltbot.mjs',
+        '/usr/local/bin/openclaw',
+        '/usr/local/bin/clawdbot',
+        '/usr/local/bin/moltbot',
+      ];
+      for (const p of knownPaths) {
+        const check = safeExec(dockerCmd(`exec ${id} sh -c "test -f '${p}' && echo '${p}'"`), { timeout: 5000 });
+        if (check.ok && check.output && check.output.trim()) {
+          const isMjs = p.endsWith('.mjs') || p.endsWith('.js');
+          const cliName = isMjs ? 'node' : path.basename(p);
+          containers.push({ id, name, image, status, cli: cliName, cliPath: p });
           break;
         }
       }
     }
+
+    // 最后检查容器镜像名/容器名是否包含关键字（即使内部 CLI 路径未知）
+    if (!containers.find(c => c.id === id)) {
+      const combined = `${name} ${image}`.toLowerCase();
+      if (/openclaw|clawdbot|moltbot/.test(combined)) {
+        // 尝试在容器内找任何 node 进程带 gateway 关键字
+        const findProc = safeExec(dockerCmd(`exec ${id} sh -c "ps aux 2>/dev/null | grep -E 'openclaw|clawdbot|moltbot' | grep -v grep | head -1"`), { timeout: 5000 });
+        if (findProc.ok && findProc.output && findProc.output.trim()) {
+          containers.push({ id, name, image, status, cli: 'unknown', cliPath: '' });
+        }
+      }
+    }
   }
 
   _dockerContainerCache = containers;
@@ -800,16 +841,27 @@ async function selectDockerContainer() {
 // 在 Docker 容器内执行命令
 function execInDocker(containerId, cmd, options = {}) {
   const escaped = cmd.replace(/'/g, "'\\''");
-  return safeExec(`docker exec ${containerId} bash -lc '${escaped}'`, { timeout: 30000, ...options });
+  // 尝试 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 child = spawn('docker', ['exec', '-d', containerId, 'bash', '-lc', cmd], {
+    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, 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;
@@ -835,8 +887,8 @@ function syncConfigToDocker(localConfigPath, containerId) {
     // 先确定容器内哪个配置目录存在
     for (const target of targets) {
       const dir = path.posix.dirname(target);
-      safeExec(`docker exec ${containerId} mkdir -p "${dir}"`, { timeout: 5000 });
-      const cp = safeExec(`docker cp "${localConfigPath}" ${containerId}:${target}`, { timeout: 10000 });
+      safeExec(dockerCmd(`exec ${containerId} mkdir -p "${dir}"`), { timeout: 5000 });
+      const cp = safeExec(dockerCmd(`cp "${localConfigPath}" ${containerId}:${target}`), { timeout: 10000 });
       if (cp.ok) {
         console.log(chalk.gray(`   已同步配置到 Docker 容器: ${target}`));
         return;
@@ -966,7 +1018,7 @@ function execAsyncInGatewayEnv(cmd, options = {}) {
   }
   if (detectGatewayEnv() === 'docker' && _selectedDockerContainer) {
     const escaped = cmd.replace(/'/g, "'\\''");
-    return { cmd: `docker exec ${_selectedDockerContainer.id} bash -lc '${escaped}'`, options };
+    return { cmd: dockerCmd(`exec ${_selectedDockerContainer.id} bash -lc '${escaped}'`), options };
   }
   return { cmd, options };
 }
@@ -1013,7 +1065,7 @@ function cleanupAgentProcesses() {
     if (detectGatewayEnv() === 'docker' && _selectedDockerContainer) {
       try {
         for (const name of ['openclaw', 'clawdbot', 'moltbot']) {
-          safeExec(`docker 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 */ }
     }
@@ -1658,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']) {
@@ -1666,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 };
+          }
         }
       }
     }
@@ -3010,26 +3066,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 = `docker exec ${container.id} bash -lc "${cmd}"`;
+        const fullCmd = allAttempts[tried++];
         exec(fullCmd, { timeout: 30000 }, (error) => {
           if (error) {
             tryNext();
@@ -3095,9 +3159,9 @@ async function forceRestartGateway(resolved, nodeInfo, useNode, env, gatewayPort
     // 1. 杀掉容器内旧 Gateway 进程
     try {
       for (const name of ['openclaw', 'clawdbot', 'moltbot']) {
-        safeExec(`docker 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(`docker 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 */ }
 
@@ -3108,6 +3172,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']) {
@@ -3116,10 +3181,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;
+          }
         }
       }
     }
@@ -3259,12 +3326,12 @@ async function restartGatewayNative() {
     const dockerContainers = findOpenclawDockerContainers();
     for (const c of dockerContainers) {
       if (c.cli === 'node') {
-        commands.push(`docker exec ${c.id} bash -lc "node ${c.cliPath} gateway restart"`);
-      } else {
-        commands.push(`docker exec ${c.id} bash -lc "${c.cli} gateway restart"`);
+        commands.push(dockerCmd(`exec ${c.id} bash -lc "node ${c.cliPath} gateway restart"`));
+      } else if (c.cli !== 'unknown') {
+        commands.push(dockerCmd(`exec ${c.id} bash -lc "${c.cli} gateway restart"`));
       }
       for (const name of ['openclaw', 'clawdbot', 'moltbot']) {
-        commands.push(`docker exec ${c.id} bash -lc "${name} gateway restart"`);
+        commands.push(dockerCmd(`exec ${c.id} bash -lc "${name} gateway restart"`));
       }
     }
   }

package/package.json

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