yymaxapi 1.0.49 → 1.0.50

package/bin/yymaxapi.js

@@ -138,6 +138,10 @@ const DEFAULT_API_CONFIG = {
   }
 };
 
+const SKIP_API_VALIDATION = false;
+
+const SKIP_API_VALIDATION = false;
+
 function normalizeEndpoints(raw, fallback) {
   if (!Array.isArray(raw)) return fallback;
   const normalized = raw
@@ -371,6 +375,9 @@ function httpGetJson(url, headers = {}, timeout = 10000) {
 }
 
 async function validateApiKey(nodeUrl, apiKey) {
+  if (SKIP_API_VALIDATION) {
+    return { valid: true, skipped: true };
+  }
   const verifyUrl = `${nodeUrl.replace(/\/+$/, '')}/user/api/v1/me`;
   const maxRetries = 3;
   const spinner = ora({ text: '正在验证 API Key...', spinner: 'dots' }).start();
@@ -2782,7 +2789,7 @@ async function autoActivate(paths, args = {}) {
   const gwToken = config.gateway?.auth?.token;
   if (gwToken) {
     console.log(chalk.green(`\n🌐 Web Dashboard:`));
-    console.log(chalk.cyan(`   http://localhost:${gwPort}/?token=${gwToken}`));
+    console.log(chalk.cyan(`   http://127.0.0.1:${gwPort}/?token=${gwToken}`));
   }
 
   // ---- 测试连接 ----
@@ -3567,7 +3574,7 @@ async function switchModel(paths) {
 
   if (gwToken) {
     console.log(chalk.green(`\n🌐 Web Dashboard:`));
-    console.log(chalk.cyan(`   http://localhost:${gwPort}/?token=${gwToken}`));
+    console.log(chalk.cyan(`   http://127.0.0.1:${gwPort}/?token=${gwToken}`));
   }
 }
 // ============ 权限管理 (tools.profile) ============
@@ -3695,7 +3702,7 @@ async function testConnection(paths, args = {}) {
   console.log(chalk.gray(`当前激活: ${typeLabel}`));
   console.log(chalk.gray(`中转节点: ${provider.baseUrl}`));
   console.log(chalk.gray(`模型: ${primary}`));
-  console.log(chalk.gray(`Gateway: http://localhost:${gatewayPort}\n`));
+  console.log(chalk.gray(`Gateway: http://127.0.0.1:${gatewayPort}\n`));
   // 获取 Gateway token
   const gatewayToken = config.gateway?.auth?.token;
   if (!gatewayToken) {
@@ -3819,7 +3826,7 @@ async function testConnection(paths, args = {}) {
       }
     }
 
-    console.log(chalk.gray(`   端点: http://localhost:${gatewayPort}/v1/responses`));
+    console.log(chalk.gray(`   端点: http://127.0.0.1:${gatewayPort}/v1/responses`));
     const startTime = Date.now();
     let result = await testGatewayApi(gatewayPort, gatewayToken, primary);
     const latency = Date.now() - startTime;
@@ -4017,15 +4024,11 @@ async function restartGatewayNative(silent = false) {
   const gwConfig = readConfig(configPaths.openclawConfig);
   const gatewayPort = gwConfig?.gateway?.port || 18789;
 
-  // 策略 A：先尝试 exec "gateway restart"（给 8s 超时——足够杀旧进程）
-  // 注意：该命令通常会启动前台 daemon 不退出，超时是正常的
+  // 策略 A：尝试 exec "gateway restart"（短超时），然后端口探测
   const restartCmds = buildGatewayCommands(resolved, nodeInfo, useNode, 'restart');
-
-  let execAttempted = false;
-  for (const cmd of restartCmds) {
-    execAttempted = true;
-    const result = safeExec(cmd, { timeout: 8000, env });
-    // 不管是否 "成功"（通常会超时），检查端口是否可达
+  if (restartCmds.length > 0) {
+    // 只尝试第一条（最精确的路径），避免逐条超时累积
+    safeExec(restartCmds[0], { timeout: 8000, env });
     if (await waitForGateway(gatewayPort, '127.0.0.1', 5000)) {
       if (!silent) console.log(chalk.green(`✅ Gateway 已重启`));
       return true;
@@ -4035,29 +4038,34 @@ async function restartGatewayNative(silent = false) {
   // 策略 B：杀旧进程 → spawn 后台启动新 Gateway → 端口探测
   if (!silent) console.log(chalk.gray('   常规重启未生效，尝试杀进程后重新启动...'));
   await killGatewayProcesses(gatewayPort);
-  await new Promise(resolve => setTimeout(resolve, 1500));
+  await new Promise(resolve => setTimeout(resolve, 1000));
 
   const startCmds = buildGatewayCommands(resolved, nodeInfo, useNode, 'start');
   for (const cmd of startCmds) {
     if (spawnDetached(cmd, env)) {
-      if (await waitForGateway(gatewayPort, '127.0.0.1', 12000)) {
+      if (await waitForGateway(gatewayPort, '127.0.0.1', 10000)) {
         if (!silent) console.log(chalk.green('✅ Gateway 已重启'));
         return true;
       }
+      break; // spawn 成功但端口未通，不再逐条重试
     }
   }
 
   // 策略 C：用 login shell 启动（加载 nvm/fnm 等 PATH）
   if (process.platform !== 'win32') {
     if (!silent) console.log(chalk.gray('   尝试通过 login shell 启动...'));
+    let launched = false;
     for (const name of ['openclaw', 'clawdbot', 'moltbot']) {
+      if (launched) break;
       for (const sh of ['/bin/zsh', '/bin/bash']) {
         if (!fs.existsSync(sh)) continue;
         if (spawnDetached(`${sh} -lc '${name} gateway'`, env)) {
-          if (await waitForGateway(gatewayPort, '127.0.0.1', 12000)) {
+          launched = true;
+          if (await waitForGateway(gatewayPort, '127.0.0.1', 10000)) {
             if (!silent) console.log(chalk.green('✅ Gateway 已重启 (login shell)'));
             return true;
           }
+          break;
         }
       }
     }
@@ -4087,30 +4095,7 @@ function buildGatewayCommands(resolved, nodeInfo, useNode, action) {
   }
 
   const names = ['openclaw', 'clawdbot', 'moltbot'];
-  if (process.platform === 'win32') {
-    for (const name of names) commands.push(`${name} ${verb}`);
-    if (isWslAvailable()) {
-      const wslCli = getWslCliBinary();
-      if (wslCli) commands.push(`wsl -- bash -lc "${wslCli} ${verb}"`);
-      for (const name of names) commands.push(`wsl -- bash -lc "${name} ${verb}"`);
-    }
-  } else {
-    for (const name of names) commands.push(`${name} ${verb}`);
-  }
-
-  if (isDockerAvailable()) {
-    const containers = findOpenclawDockerContainers();
-    for (const c of containers) {
-      if (c.cli === 'node') {
-        commands.push(dockerCmd(`exec ${c.id} bash -lc "node ${c.cliPath} ${verb}"`));
-      } else if (c.cli !== 'unknown') {
-        commands.push(dockerCmd(`exec ${c.id} bash -lc "${c.cli} ${verb}"`));
-      }
-      for (const name of names) {
-        commands.push(dockerCmd(`exec ${c.id} bash -lc "${name} ${verb}"`));
-      }
-    }
-  }
+  for (const name of names) commands.push(`${name} ${verb}`);
 
   return [...new Set(commands)].filter(Boolean);
 }

package/package.json

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