yymaxapi 1.0.0 → 1.0.2

package/bin/yymaxapi.js

@@ -1454,10 +1454,25 @@ async function presetClaude(paths, args = {}) {
     console.log(chalk.cyan('📡 开始测速 Claude 节点...\n'));
     const speedResult = await testAllEndpoints(ENDPOINTS, { autoFallback: true });
 
-    if (speedResult.best) {
-      selectedEndpoint = speedResult.best;
+    const sorted = speedResult.ranked || [];
+    if (sorted.length > 0) {
+      const { selectedIndex } = await inquirer.prompt([{
+        type: 'list',
+        name: 'selectedIndex',
+        message: '选择节点:',
+        choices: [
+          { name: `🚀 使用推荐节点 (${sorted[0].name}, ${sorted[0].latency}ms, 评分:${sorted[0].score})`, value: -1 },
+          new inquirer.Separator('--- 或手动选择 ---'),
+          ...sorted.map((e, i) => ({
+            name: `${e.name} - ${e.latency}ms (评分:${e.score})`,
+            value: i
+          }))
+        ]
+      }]);
+      const primaryIndex = selectedIndex === -1 ? 0 : selectedIndex;
+      selectedEndpoint = sorted[primaryIndex];
       if (speedResult.usedFallback) {
-        console.log(chalk.yellow(`\n⚠ 使用备用节点: ${selectedEndpoint.name} (${selectedEndpoint.latency}ms, 评分:${selectedEndpoint.score})\n`));
+        console.log(chalk.yellow(`\n⚠ 当前使用备用节点\n`));
       }
     } else {
       console.log(chalk.red('\n⚠️  所有节点（含备用）均不可达'));
@@ -1633,10 +1648,25 @@ async function presetCodex(paths, args = {}) {
     console.log(chalk.cyan('📡 开始测速 Codex 节点...\n'));
     const speedResult = await testAllEndpoints(ENDPOINTS, { autoFallback: true });
 
-    if (speedResult.best) {
-      selectedEndpoint = speedResult.best;
+    const sorted = speedResult.ranked || [];
+    if (sorted.length > 0) {
+      const { selectedIndex } = await inquirer.prompt([{
+        type: 'list',
+        name: 'selectedIndex',
+        message: '选择节点:',
+        choices: [
+          { name: `🚀 使用推荐节点 (${sorted[0].name}, ${sorted[0].latency}ms, 评分:${sorted[0].score})`, value: -1 },
+          new inquirer.Separator('--- 或手动选择 ---'),
+          ...sorted.map((e, i) => ({
+            name: `${e.name} - ${e.latency}ms (评分:${e.score})`,
+            value: i
+          }))
+        ]
+      }]);
+      const primaryIndex = selectedIndex === -1 ? 0 : selectedIndex;
+      selectedEndpoint = sorted[primaryIndex];
       if (speedResult.usedFallback) {
-        console.log(chalk.yellow(`\n⚠ 使用备用节点: ${selectedEndpoint.name} (${selectedEndpoint.latency}ms, 评分:${selectedEndpoint.score})\n`));
+        console.log(chalk.yellow(`\n⚠ 当前使用备用节点\n`));
       }
     } else {
       console.log(chalk.red('\n⚠️  所有节点（含备用）均不可达'));
@@ -2109,15 +2139,30 @@ async function testConnection(paths, args = {}) {
 
   const allowAutoDaemon = !(args['no-daemon'] || args.noDaemon);
 
+  // 步骤0: 清理可能挂死的 agent 进程
+  try {
+    const { execSync } = require('child_process');
+    const platform = process.platform;
+    if (platform === 'win32') {
+      execSync('taskkill /F /FI "WINDOWTITLE eq openclaw*" /FI "STATUS eq Not Responding" 2>nul', { stdio: 'ignore' });
+    } else {
+      // 杀掉所有挂死的 openclaw agent 子进程（排除 gateway 主进程）
+      execSync("pkill -f 'openclaw.*agent.*yymaxapi-test' 2>/dev/null || true", { stdio: 'ignore' });
+      execSync("pkill -f 'clawdbot.*agent.*yymaxapi-test' 2>/dev/null || true", { stdio: 'ignore' });
+      execSync("pkill -f 'moltbot.*agent.*yymaxapi-test' 2>/dev/null || true", { stdio: 'ignore' });
+    }
+    console.log(chalk.gray('🧹 已清理残留 agent 进程'));
+  } catch { /* ignore */ }
+
   // 步骤1: 先重启 Gateway 使配置生效
   console.log(chalk.cyan('步骤 1/2: 重启 Gateway 使配置生效...'));
   await restartGateway();
 
   // 等待 Gateway 启动
   const gwSpinner = ora({ text: '等待 Gateway 启动...', spinner: 'dots' }).start();
-  await new Promise(resolve => setTimeout(resolve, 2000));
+  await new Promise(resolve => setTimeout(resolve, 3000));
 
-  let gatewayRunning = await waitForGateway(gatewayPort);
+  let gatewayRunning = await waitForGateway(gatewayPort, '127.0.0.1', 15000);
   if (!gatewayRunning) {
     gwSpinner.text = '尝试自动启动 Gateway...';
     const autoResult = await tryAutoStartGateway(gatewayPort, allowAutoDaemon);
@@ -2178,6 +2223,17 @@ async function testConnection(paths, args = {}) {
       }
     }
 
+    // 在 HTTP 测试前重新确认 Gateway 存活（CLI agent 测试可能耗时较长）
+    if (!await isPortOpen(gatewayPort, '127.0.0.1')) {
+      console.log(chalk.yellow('⚠️ Gateway 端口不可达，等待恢复...'));
+      const recovered = await waitForGateway(gatewayPort, '127.0.0.1', 10000);
+      if (!recovered) {
+        console.log(chalk.red('❌ Gateway 在 CLI 测试后不可达，可能已崩溃'));
+        console.log(chalk.gray('   请检查 Gateway 日志或手动重启: openclaw gateway'));
+        return;
+      }
+    }
+
     console.log(chalk.gray(`   端点: http://localhost:${gatewayPort}/v1/responses`));
     const startTime = Date.now();
     let result = await testGatewayApi(gatewayPort, gatewayToken, primary);
@@ -2400,9 +2456,10 @@ function testGatewayViaAgent(model) {
     delete env.OPENAI_API_KEY;
     delete env.OPENCLAW_CODEX_KEY;
     const useNode = nodeInfo && isNodeShebang(cliBinary);
+    const sessionId = `yymaxapi-test-${Date.now()}`;
     const cmd = useNode
-      ? `"${nodeInfo.path}" "${cliBinary}" agent --session-id yymaxapi-test --message "请回复你的模型名称" --json --timeout 120`
-      : `"${cliBinary}" agent --session-id yymaxapi-test --message "请回复你的模型名称" --json --timeout 120`;
+      ? `"${nodeInfo.path}" "${cliBinary}" agent --session-id ${sessionId} --message "请回复你的模型名称" --json --timeout 120`
+      : `"${cliBinary}" agent --session-id ${sessionId} --message "请回复你的模型名称" --json --timeout 120`;
 
     exec(cmd, { timeout: 120000, env }, (error, stdout, stderr) => {
       // 过滤 stderr 中的 Node.js DeprecationWarning 噪音

package/package.json

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