@nvae/llmswitch 0.2.0 → 0.4.0

package/dist/utils/fetch-models.js

@@ -1,6 +1,5 @@
-import { emptyProxy } from "../types.js";
+import { requestWithNodeTransport } from "../bridge/transport.js";
 import { normalizeBaseUrlForFormat } from "./base-url.js";
-import { buildProxyEnv } from "./proxy.js";
 /**
  * Derive the API base URL from a successful .../models endpoint.
  */
@@ -45,20 +44,28 @@ export function modelListEndpoints(baseUrl) {
     }
     return endpoints;
 }
-export function buildModelsRequestHeaders(apiFormat, apiKey) {
+export function buildModelsRequestHeaders(apiFormat, apiKey, customHeaders = {}) {
     const headers = {
         Accept: "application/json",
     };
-    if (!apiKey)
-        return headers;
-    if (apiFormat === "anthropic") {
-        headers["x-api-key"] = apiKey;
-        headers["anthropic-version"] = "2023-06-01";
-        // Some gateways also accept Bearer
-        headers.Authorization = `Bearer ${apiKey}`;
+    if (apiKey) {
+        if (apiFormat === "anthropic") {
+            headers["x-api-key"] = apiKey;
+            headers["anthropic-version"] = "2023-06-01";
+            headers.Authorization = `Bearer ${apiKey}`;
+        }
+        else {
+            headers.Authorization = `Bearer ${apiKey}`;
+        }
     }
-    else {
-        headers.Authorization = `Bearer ${apiKey}`;
+    for (const [name, value] of Object.entries(customHeaders)) {
+        if (/[\r\n]/.test(name) || /[\r\n]/.test(value)) {
+            throw new Error(`无效的模型请求 header: ${name}`);
+        }
+        const existing = Object.keys(headers).find((key) => key.toLowerCase() === name.toLowerCase());
+        if (existing)
+            delete headers[existing];
+        headers[name] = value;
     }
     return headers;
 }
@@ -93,7 +100,7 @@ export function parseModelIds(payload) {
  * Tries several common /models paths; uses proxy env when configured.
  */
 export async function fetchModelList(options) {
-    const { baseUrl, apiKey, apiFormat, proxy, timeoutMs = 20_000 } = options;
+    const { baseUrl, apiKey, apiFormat, proxy, headers: customHeaders, timeoutMs = 20_000, } = options;
     if (!baseUrl?.trim()) {
         throw new Error("Base URL 为空，无法拉取模型列表");
     }
@@ -102,42 +109,43 @@ export async function fetchModelList(options) {
     }
     const effectiveBaseUrl = normalizeBaseUrlForFormat(apiFormat, baseUrl);
     const endpoints = modelListEndpoints(effectiveBaseUrl);
-    const headers = buildModelsRequestHeaders(apiFormat, apiKey.trim());
-    const restore = applyProxyEnv(proxy);
+    const headers = buildModelsRequestHeaders(apiFormat, apiKey.trim(), customHeaders);
     const errors = [];
-    try {
-        for (const endpoint of endpoints) {
-            try {
-                const models = await requestModels(endpoint, headers, timeoutMs);
-                if (models.length > 0) {
-                    const resolvedBaseUrl = baseUrlFromModelsEndpoint(endpoint) || effectiveBaseUrl;
-                    return {
-                        models,
-                        endpoint,
-                        resolvedBaseUrl: normalizeBaseUrlForFormat(apiFormat, resolvedBaseUrl),
-                    };
-                }
-                errors.push(`${endpoint} → 返回空列表`);
-            }
-            catch (err) {
-                const msg = err instanceof Error ? err.message : String(err);
-                errors.push(`${endpoint} → ${msg}`);
+    for (const endpoint of endpoints) {
+        try {
+            const models = await requestModels(endpoint, headers, timeoutMs, proxy);
+            if (models.length > 0) {
+                // Anthropic Messages base URLs are not implied by a sibling /v1/models
+                // endpoint; keep the operator-provided base for those.
+                const resolvedBaseUrl = apiFormat === "anthropic"
+                    ? effectiveBaseUrl
+                    : baseUrlFromModelsEndpoint(endpoint) || effectiveBaseUrl;
+                return {
+                    models,
+                    endpoint,
+                    resolvedBaseUrl: normalizeBaseUrlForFormat(apiFormat, resolvedBaseUrl),
+                };
             }
+            errors.push(`${endpoint} → 返回空列表`);
+        }
+        catch (err) {
+            const msg = err instanceof Error ? err.message : String(err);
+            errors.push(`${endpoint} → ${msg}`);
         }
-    }
-    finally {
-        restore();
     }
     throw new Error(`无法从接口拉取模型列表。\n${errors.map((e) => `  - ${e}`).join("\n")}`);
 }
-async function requestModels(endpoint, headers, timeoutMs) {
+async function requestModels(endpoint, headers, timeoutMs, proxy) {
     const controller = new AbortController();
     const timer = setTimeout(() => controller.abort(), timeoutMs);
     try {
-        const res = await fetch(endpoint, {
+        const res = await requestWithNodeTransport({
+            url: endpoint,
             method: "GET",
             headers,
+            proxy,
             signal: controller.signal,
+            totalTimeoutMs: timeoutMs,
         });
         if (!res.ok) {
             const body = (await res.text().catch(() => "")).slice(0, 200);
@@ -156,22 +164,3 @@ async function requestModels(endpoint, headers, timeoutMs) {
         clearTimeout(timer);
     }
 }
-function applyProxyEnv(proxy) {
-    if (emptyProxy(proxy))
-        return () => undefined;
-    const next = buildProxyEnv(proxy);
-    const keys = Object.keys(next);
-    const backup = new Map();
-    for (const key of keys) {
-        backup.set(key, process.env[key]);
-        process.env[key] = next[key];
-    }
-    return () => {
-        for (const [key, value] of backup) {
-            if (value === undefined)
-                delete process.env[key];
-            else
-                process.env[key] = value;
-        }
-    };
-}

package/dist/utils/proxy.js

@@ -8,39 +8,23 @@ export const PROXY_ENV_KEYS = [
     "all_proxy",
 ];
 /**
- * Build proxy env vars for injection into tool configs.
- * Prefer explicit http/https; when only `all` is set (e.g. socks5h),
- * set ALL_PROXY (and lowercase) and also mirror to HTTP(S)_PROXY
- * so runtimes that only read those still attempt the proxy URL.
+ * Build proxy env vars for injection into tool configs. A single proxy URL is
+ * applied to all traffic, so HTTP_PROXY, HTTPS_PROXY and ALL_PROXY (plus their
+ * lowercase forms) are all set to that URL. SOCKS URLs are honored by runtimes
+ * that read these variables.
  */
 export function buildProxyEnv(proxy) {
     if (emptyProxy(proxy))
         return {};
-    const env = {};
-    const http = proxy.http?.trim();
-    const https = proxy.https?.trim();
-    const all = proxy.all?.trim();
-    if (all) {
-        env.ALL_PROXY = all;
-        env.all_proxy = all;
-    }
-    if (http) {
-        env.HTTP_PROXY = http;
-        env.http_proxy = http;
-    }
-    else if (all) {
-        env.HTTP_PROXY = all;
-        env.http_proxy = all;
-    }
-    if (https) {
-        env.HTTPS_PROXY = https;
-        env.https_proxy = https;
-    }
-    else if (all) {
-        env.HTTPS_PROXY = all;
-        env.https_proxy = all;
-    }
-    return env;
+    const url = proxy.trim();
+    return {
+        HTTP_PROXY: url,
+        HTTPS_PROXY: url,
+        ALL_PROXY: url,
+        http_proxy: url,
+        https_proxy: url,
+        all_proxy: url,
+    };
 }
 export function clearProxyEnvKeys(env) {
     for (const key of PROXY_ENV_KEYS) {
@@ -57,12 +41,5 @@ export function applyProxyToEnvRecord(env, proxy) {
 export function formatProxySummary(proxy) {
     if (emptyProxy(proxy))
         return "(none)";
-    const parts = [];
-    if (proxy?.http)
-        parts.push(`http=${proxy.http}`);
-    if (proxy?.https)
-        parts.push(`https=${proxy.https}`);
-    if (proxy?.all)
-        parts.push(`all=${proxy.all}`);
-    return parts.join(", ");
+    return proxy.trim();
 }

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@nvae/llmswitch",
-  "version": "0.2.0",
+  "version": "0.4.0",
   "description": "CLI to switch LLM providers and models for Claude Code, Codex, and OpenCode",
   "type": "module",
   "bin": {
     "llms": "dist/index.js",
-    "llm-switch": "dist/index.js"
+    "llmswitch": "dist/index.js"
   },
   "files": [
     "dist",
@@ -39,7 +39,9 @@
   "dependencies": {
     "@clack/prompts": "^0.11.0",
     "commander": "^14.0.0",
-    "smol-toml": "^1.4.2"
+    "https-proxy-agent": "7.0.6",
+    "smol-toml": "^1.4.2",
+    "socks-proxy-agent": "8.0.5"
   },
   "devDependencies": {
     "@types/bun": "^1.2.19",