openclawapi 1.3.9 → 1.3.11

package/cli.js

@@ -381,7 +381,7 @@ async function activate(paths, type) {
 
 // ============ 测试连接 ============
 async function testConnection(paths) {
-  console.log(chalk.cyan('🧪 测试 API 连接\n'));
+  console.log(chalk.cyan('🧪 测试 OpenClaw Gateway 连接\n'));
 
   const config = readConfig(paths.openclawConfig);
 
@@ -415,68 +415,31 @@ async function testConnection(paths) {
     return;
   }
 
+  // 获取 Gateway 配置
+  const gatewayPort = config.gateway?.port || 18789;
+  const gatewayToken = config.gateway?.auth?.token || '';
+
   console.log(chalk.gray(`当前激活: ${typeLabel}`));
-  console.log(chalk.gray(`节点: ${provider.baseUrl}`));
-  console.log(chalk.gray(`模型: ${provider.models?.[0]?.id || 'N/A'}\n`));
+  console.log(chalk.gray(`中转节点: ${provider.baseUrl}`));
+  console.log(chalk.gray(`模型: ${primary}`));
+  console.log(chalk.gray(`Gateway: http://localhost:${gatewayPort}\n`));
 
-  // 直接测试中转 API
-  console.log(chalk.cyan(`正在测试 ${typeLabel} API...`));
+  // 通过本地 Gateway 端口测试
+  console.log(chalk.cyan(`正在通过 Gateway 测试 ${typeLabel}...`));
 
   try {
     const startTime = Date.now();
+    const result = await testGatewayApi(gatewayPort, gatewayToken, primary);
+    const latency = Date.now() - startTime;
 
-    if (type === 'claude') {
-      const result = await testClaudeApi(provider.baseUrl, provider.apiKey, provider.models?.[0]?.id);
-      const latency = Date.now() - startTime;
-
-      if (result.success) {
-        console.log(chalk.green(`\n✅ ${typeLabel} API 连接成功！`));
-        console.log(chalk.cyan(`   响应时间: ${latency}ms`));
-        console.log(chalk.yellow(`   模型回复: ${result.message}`));
-
-        // 询问是否重启 gateway
-        const { restart } = await inquirer.prompt([{
-          type: 'confirm',
-          name: 'restart',
-          message: '是否重启 OpenClaw Gateway 使配置生效？',
-          default: true
-        }]);
-
-        if (restart) {
-          await restartGateway();
-        } else {
-          console.log(chalk.gray(`\n💡 稍后可手动运行: openclaw gateway restart`));
-        }
-      } else {
-        console.log(chalk.red(`\n❌ ${typeLabel} API 连接失败`));
-        console.log(chalk.red(`   错误: ${result.error}`));
-      }
+    if (result.success) {
+      console.log(chalk.green(`\n✅ Gateway 连接成功！配置已生效`));
+      console.log(chalk.cyan(`   响应时间: ${latency}ms`));
+      console.log(chalk.yellow(`   模型回复: ${result.message}`));
     } else {
-      const result = await testCodexApi(provider.baseUrl, provider.apiKey, provider.models?.[0]?.id);
-      const latency = Date.now() - startTime;
-
-      if (result.success) {
-        console.log(chalk.green(`\n✅ ${typeLabel} API 连接成功！`));
-        console.log(chalk.cyan(`   响应时间: ${latency}ms`));
-        console.log(chalk.yellow(`   模型回复: ${result.message}`));
-
-        // 询问是否重启 gateway
-        const { restart } = await inquirer.prompt([{
-          type: 'confirm',
-          name: 'restart',
-          message: '是否重启 OpenClaw Gateway 使配置生效？',
-          default: true
-        }]);
-
-        if (restart) {
-          await restartGateway();
-        } else {
-          console.log(chalk.gray(`\n💡 稍后可手动运行: openclaw gateway restart`));
-        }
-      } else {
-        console.log(chalk.red(`\n❌ ${typeLabel} API 连接失败`));
-        console.log(chalk.red(`   错误: ${result.error}`));
-      }
+      console.log(chalk.red(`\n❌ Gateway 连接失败`));
+      console.log(chalk.red(`   错误: ${result.error}`));
+      console.log(chalk.gray(`\n💡 请确保 Gateway 正在运行: openclaw gateway`));
     }
   } catch (error) {
     console.log(chalk.red(`❌ 测试失败: ${error.message}`));
@@ -489,21 +452,104 @@ async function restartGateway() {
 
   const { exec } = require('child_process');
 
+  // 尝试多种命令
+  const commands = [
+    'openclaw gateway restart',
+    'clawdbot gateway restart',
+    'npx openclaw gateway restart',
+    'npx clawdbot gateway restart'
+  ];
+
   return new Promise((resolve) => {
-    exec('openclaw gateway restart', { timeout: 30000 }, (error, stdout, stderr) => {
-      if (error) {
-        console.log(chalk.red(`❌ 重启失败: ${error.message}`));
+    let tried = 0;
+
+    const tryNext = () => {
+      if (tried >= commands.length) {
+        console.log(chalk.red(`❌ 重启失败: 找不到 openclaw/clawdbot 命令`));
         console.log(chalk.gray(`   请手动运行: openclaw gateway restart`));
+        console.log(chalk.gray(`   或: clawdbot gateway restart`));
+        resolve();
+        return;
+      }
+
+      const cmd = commands[tried];
+      tried++;
+
+      exec(cmd, { timeout: 30000 }, (error) => {
+        if (error) {
+          tryNext();
+        } else {
+          console.log(chalk.green(`✅ Gateway 已重启`));
+          console.log(chalk.gray(`   现在可以在 Web/Telegram/Discord 等渠道测试对话了`));
+          resolve();
+        }
+      });
+    };
+
+    tryNext();
+  });
+}
+
+// Gateway API 测试 - 通过本地 Gateway 端口测试
+function testGatewayApi(port, token, model) {
+  return new Promise((resolve) => {
+    const postData = JSON.stringify({
+      model: model,
+      messages: [{ role: 'user', content: '你是什么模型？' }]
+    });
+
+    const options = {
+      hostname: '127.0.0.1',
+      port: port,
+      path: '/v1/chat/completions',
+      method: 'POST',
+      timeout: 60000,
+      headers: {
+        'Content-Type': 'application/json',
+        'Authorization': `Bearer ${token}`,
+        'Content-Length': Buffer.byteLength(postData)
+      }
+    };
+
+    const req = http.request(options, (res) => {
+      let data = '';
+      res.on('data', chunk => data += chunk);
+      res.on('end', () => {
+        try {
+          const json = JSON.parse(data);
+          // OpenAI 格式响应
+          if (json.choices && json.choices[0]?.message?.content) {
+            resolve({ success: true, message: json.choices[0].message.content });
+          } else if (json.error) {
+            resolve({ success: false, error: json.error.message || JSON.stringify(json.error) });
+          } else {
+            resolve({ success: false, error: `HTTP ${res.statusCode}: ${data.substring(0, 300)}` });
+          }
+        } catch {
+          resolve({ success: false, error: `HTTP ${res.statusCode}: ${data.substring(0, 300)}` });
+        }
+      });
+    });
+
+    req.on('timeout', () => {
+      req.destroy();
+      resolve({ success: false, error: '请求超时 (60s)' });
+    });
+
+    req.on('error', (e) => {
+      if (e.code === 'ECONNREFUSED') {
+        resolve({ success: false, error: 'Gateway 未运行，请先启动: openclaw gateway' });
       } else {
-        console.log(chalk.green(`✅ Gateway 已重启`));
-        console.log(chalk.gray(`   现在可以在 Web/Telegram/Discord 等渠道测试对话了`));
+        resolve({ success: false, error: e.message });
       }
-      resolve();
     });
+
+    req.write(postData);
+    req.end();
   });
 }
 
-// Claude API 测试
+// Claude API 测试 (直接测试中转，备用)
 function testClaudeApi(baseUrl, apiKey, model) {
   return new Promise((resolve) => {
     const urlObj = new URL(baseUrl);
@@ -511,8 +557,8 @@ function testClaudeApi(baseUrl, apiKey, model) {
 
     const postData = JSON.stringify({
       model: model || 'claude-sonnet-4-5',
-      max_tokens: 100,
-      messages: [{ role: 'user', content: '你是什么模型？请简短回答。' }]
+      max_tokens: 150,
+      messages: [{ role: 'user', content: '你是哪个模型？请用一句话回答你的模型名称和版本。' }]
     });
 
     const options = {
@@ -571,7 +617,7 @@ function testCodexApi(baseUrl, apiKey, model) {
 
     const postData = JSON.stringify({
       model: model || 'gpt-5.2',
-      input: '你是什么模型？请简短回答。'
+      input: '你是哪个模型？请用一句话回答你的模型名称和版本。'
     });
 
     const options = {

package/package.json

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