yingclaw 1.7.1 → 1.7.4

package/README.md

@@ -35,6 +35,8 @@ claw setup
 
 工具会根据 Base URL 自动尝试获取模型列表；如果获取失败，则手动输入主模型和快速模型。
 
+注意：模型列表能获取不代表一定可用于 Claude Code。自定义接口还必须支持 Anthropic `/v1/messages`，否则 Claude Code 请求会被网关拒绝。
+
 **第三步：以后直接用**
 ```bash
 claude

package/bin/cli.js

@@ -10,13 +10,13 @@ const {
   fetchModelsFromBaseUrl,
   resetConfig,
   validateConfig,
+  normalizeAnthropicBaseUrl,
   resolveFastModel,
   buildClaudeEnv,
   classifyValidationStatus,
   PROVIDERS,
 } = require('../lib/config');
 const { execSync, spawn, spawnSync } = require('child_process');
-const https = require('https');
 const pkg = require('../package.json');
 const { buildMenuStatusLines, buildStatusView } = require('../lib/panel');
 const { buildClaudeInstallCommand } = require('../lib/install');
@@ -36,37 +36,39 @@ async function getBanner() {
 }
 
 async function validateKey(config) {
-  return new Promise((resolve) => {
-    let url;
-    try {
-      url = new URL(config.baseUrl + '/v1/messages');
-    } catch {
-      return resolve(null);
-    }
-    const body = Buffer.from(JSON.stringify({
-      model: config.model,
-      max_tokens: 1,
-      messages: [{ role: 'user', content: 'hi' }],
-    }));
-    const req = https.request({
-      hostname: url.hostname,
-      path: url.pathname,
+  let url;
+  try {
+    url = `${normalizeAnthropicBaseUrl(config.baseUrl)}/v1/messages`;
+    new URL(url);
+  } catch {
+    return null;
+  }
+
+  const controller = new AbortController();
+  const timeout = setTimeout(() => controller.abort(), 8000);
+
+  try {
+    const res = await fetch(url, {
       method: 'POST',
-      timeout: 8000,
+      signal: controller.signal,
       headers: {
         'content-type': 'application/json',
+        authorization: `Bearer ${config.apiKey}`,
         'x-api-key': config.apiKey,
         'anthropic-version': '2023-06-01',
-        'content-length': body.length,
       },
-    }, (res) => {
-      resolve(classifyValidationStatus(res.statusCode));
+      body: JSON.stringify({
+      model: config.model,
+      max_tokens: 1,
+      messages: [{ role: 'user', content: 'hi' }],
+      }),
     });
-    req.on('error', () => resolve(null));
-    req.on('timeout', () => { req.destroy(); resolve(null); });
-    req.write(body);
-    req.end();
-  });
+    return classifyValidationStatus(res.status);
+  } catch {
+    return null;
+  } finally {
+    clearTimeout(timeout);
+  }
 }
 
 function getConfigValidationMessage(config) {
@@ -123,7 +125,7 @@ async function configureCustomProvider({ chalk, ora, existingConfig }) {
     message: chalk.cyan('Anthropic Base URL'),
     default: existingConfig?.provider === 'custom' ? existingConfig.baseUrl : undefined,
     validate: (v) => v.trim().length > 0 && isValidUrl(v.trim()) ? true : '请输入有效 URL',
-  }).then(v => v.trim().replace(/\/+$/, ''));
+  }).then(v => normalizeAnthropicBaseUrl(v.trim()));
 
   let apiKey = existingConfig?.provider === 'custom' ? existingConfig.apiKey : '';
   if (apiKey) {

package/lib/config.js

@@ -1,7 +1,6 @@
 const fs = require('fs');
 const path = require('path');
 const os = require('os');
-const https = require('https');
 
 const CONFIG_FILE = path.join(os.homedir(), '.clawai.json');
 
@@ -80,9 +79,26 @@ function parseModelIdsResponse(providerKey, data) {
   return normalizeModelIds(providerKey, ids);
 }
 
+function normalizeAnthropicBaseUrl(baseUrl) {
+  let url;
+  try { url = new URL(baseUrl); } catch { return baseUrl; }
+
+  const parts = url.pathname.split('/').filter(Boolean);
+  if (parts.at(-1) === 'messages' && parts.at(-2) === 'v1') {
+    parts.splice(-2, 2);
+  } else if (parts.at(-1) === 'v1') {
+    parts.pop();
+  }
+
+  url.pathname = parts.length > 0 ? `/${parts.join('/')}` : '/';
+  url.search = '';
+  url.hash = '';
+  return url.toString().replace(/\/+$/, '');
+}
+
 function buildModelUrlCandidates(baseUrl) {
   let url;
-  try { url = new URL(baseUrl); } catch { return []; }
+  try { url = new URL(normalizeAnthropicBaseUrl(baseUrl)); } catch { return []; }
 
   const pathname = url.pathname.replace(/\/+$/, '');
   const candidates = [];
@@ -118,41 +134,38 @@ async function fetchModelsFromBaseUrl(providerKey, apiKey, baseUrl, fetcher = fe
 }
 
 // 联网拉取厂商支持的模型列表，失败返回 null
-function fetchModels(providerKey, apiKey, modelsUrlOverride) {
-  return new Promise((resolve) => {
-    const provider = PROVIDERS[providerKey];
-    const modelsUrl = modelsUrlOverride || provider?.modelsUrl;
-    if (!modelsUrl) return resolve(null);
-
-    let url;
-    try { url = new URL(modelsUrl); } catch { return resolve(null); }
-
-    const req = https.request({
-      hostname: url.hostname,
-      path: url.pathname + url.search,
+async function fetchModels(providerKey, apiKey, modelsUrlOverride) {
+  const provider = PROVIDERS[providerKey];
+  const modelsUrl = modelsUrlOverride || provider?.modelsUrl;
+  if (!modelsUrl) return null;
+
+  try {
+    new URL(modelsUrl);
+  } catch {
+    return null;
+  }
+
+  const controller = new AbortController();
+  const timeout = setTimeout(() => controller.abort(), 6000);
+
+  try {
+    const res = await fetch(modelsUrl, {
       method: 'GET',
-      timeout: 6000,
+      signal: controller.signal,
       headers: {
-        'authorization': `Bearer ${apiKey}`,
+        authorization: `Bearer ${apiKey}`,
         'api-key': apiKey, // MiMo 用这个 header
       },
-    }, (res) => {
-      let data = '';
-      res.on('data', (c) => data += c);
-      res.on('end', () => {
-        try {
-          const ids = parseModelIdsResponse(providerKey, data);
-          if (ids.length === 0) return resolve(null);
-          resolve(ids);
-        } catch {
-          resolve(null);
-        }
-      });
     });
-    req.on('error', () => resolve(null));
-    req.on('timeout', () => { req.destroy(); resolve(null); });
-    req.end();
-  });
+    if (!res.ok) return null;
+
+    const ids = parseModelIdsResponse(providerKey, await res.text());
+    return ids.length > 0 ? ids : null;
+  } catch {
+    return null;
+  } finally {
+    clearTimeout(timeout);
+  }
 }
 
 function loadConfig() {
@@ -303,6 +316,7 @@ module.exports = {
   resetConfig,
   validateConfig,
   normalizeModelIds,
+  normalizeAnthropicBaseUrl,
   parseModelIdsResponse,
   buildModelUrlCandidates,
   fetchModelsFromBaseUrl,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yingclaw",
-  "version": "1.7.1",
+  "version": "1.7.4",
   "description": "Claude Code × 国产大模型一键接入：DeepSeek、Qwen、MiniMax、GLM、MiMo",
   "main": "index.js",
   "bin": {