easyrouter-config 1.0.3 → 1.0.4

package/dist/index.js

@@ -16,9 +16,11 @@ import {
 import { execa } from "execa";
 import pc from "picocolors";
 import { parseArgs } from "util";
-var VERSION = "0.1.1";
-var CLAUDE_BASE_URL = "https://easyrouter.io";
-var CODEX_BASE_URL = "https://easyrouter.io/v1";
+var VERSION = true ? "1.0.4" : "0.0.0-dev";
+var PRIMARY_HOST = "https://easyrouter.io";
+var FALLBACK_HOSTS = ["https://ezr.sh"];
+var PROBE_TIMEOUT_MS = 5e3;
+var CODEX_DEFAULT_MODEL = "gpt-5-codex";
 function parseCliArgs() {
   try {
     const { values } = parseArgs({
@@ -60,76 +62,100 @@ ${pc.bold("\u53C2\u6570:")}
   -k, --api-key <key>     EasyRouter API Key\uFF08\u53EF\u7701\u7565 sk- \u524D\u7F00\uFF09
       --only <tool>       claude | codex \uFF08\u53EA\u914D\u5176\u4E00\uFF09
       --skip-verify       \u8DF3\u8FC7\u8FDE\u901A\u6027\u9A8C\u8BC1
-  -v, --verbose           \u663E\u793A zcf \u5B50\u8FDB\u7A0B\u8BE6\u7EC6\u8F93\u51FA
+  -v, --verbose           \u663E\u793A\u5E95\u5C42\u7EC6\u8282\uFF08\u5305\u62EC BaseURL \u63A2\u6D4B\u8FC7\u7A0B\uFF09
   -h, --help              \u663E\u793A\u5E2E\u52A9
   -V, --version           \u663E\u793A\u7248\u672C
 
 ${pc.bold("\u5185\u7F6E BaseURL:")}
-  Claude Code \u2192 ${CLAUDE_BASE_URL}
-  Codex       \u2192 ${CODEX_BASE_URL}
+  Claude Code \u2192 ${PRIMARY_HOST}
+  Codex       \u2192 ${PRIMARY_HOST}/v1
 
 ${pc.bold("\u539F\u7406:")}
-  \u672C\u5DE5\u5177\u662F ${pc.underline("zcf")} (https://github.com/UfoMiao/zcf) \u7684\u8584\u5C01\u88C5\u3002
-  \u5B9E\u9645\u5199\u5165\u7684\u914D\u7F6E\u5B8C\u5168\u7531 zcf \u5B8C\u6210\uFF1A
+  Claude Code \u914D\u7F6E\u7531 ${pc.underline("zcf")} (https://github.com/UfoMiao/zcf) \u81EA\u52A8\u5199\u5165
+  Codex \u914D\u7F6E\u7531\u672C\u5DE5\u5177\u76F4\u63A5\u5199\u5165\uFF08\u66F4\u53EF\u63A7\u3001\u66F4\u7A33\u5B9A\uFF09
+
+  \u5B9E\u9645\u5199\u5165\u7684\u6587\u4EF6\uFF1A
     \u2022 Claude Code \u2192 ~/.claude/settings.json
     \u2022 Codex       \u2192 ~/.codex/config.toml + ~/.codex/auth.json
 `);
 }
+async function pickAvailableHost(verbose) {
+  const candidates = [PRIMARY_HOST, ...FALLBACK_HOSTS];
+  for (const host of candidates) {
+    const ok = await probeHost(host);
+    if (verbose) {
+      const tag = ok ? pc.green("\u2713") : pc.red("\u2717");
+      log.info(`${tag} \u63A2\u6D4B ${host} \u2192 ${ok ? "\u53EF\u8FBE" : "\u4E0D\u53EF\u8FBE"}`);
+    }
+    if (ok) return host;
+  }
+  if (verbose) log.warn(`\u6240\u6709\u5019\u9009\u57DF\u540D\u5747\u4E0D\u53EF\u8FBE\uFF0C\u4F7F\u7528\u4E3B\u57DF\u540D ${PRIMARY_HOST}`);
+  return PRIMARY_HOST;
+}
+async function probeHost(host) {
+  const url = host.replace(/\/+$/, "") + "/v1/models";
+  try {
+    const ctrl = new AbortController();
+    const timer = setTimeout(() => ctrl.abort(), PROBE_TIMEOUT_MS);
+    const res = await fetch(url, { method: "HEAD", signal: ctrl.signal });
+    clearTimeout(timer);
+    return res.status > 0;
+  } catch {
+    return false;
+  }
+}
 var IDLE_TIMEOUT_MS = 6e4;
 var HARD_TIMEOUT_MS = 3e5;
-async function runZcf(opts) {
+async function configureViaZcf(opts) {
   const args = [
     "-y",
     "zcf",
     "init",
     "-s",
-    // --skip-prompt
-    "--code-type",
-    opts.codeType,
-    "-p",
-    "custom",
+    // --skip-prompt 非交互模式
+    "-T",
+    opts.target,
+    // 'cc' | 'codex'（用文档推荐的简写 -T）
+    // EasyRouter 是 OpenAI 兼容网关，统一用 api_key（Bearer Authorization）
     "--api-type",
-    "auth_token",
-    // EasyRouter 走 Bearer
-    "-u",
-    opts.baseUrl,
-    "-k",
+    "api_key",
+    "--api-key",
     opts.apiKey,
+    "--api-url",
+    opts.baseUrl,
     "-r",
     "backup",
     // 已有配置自动备份
     "--mcp-services",
     "skip",
-    // 不装额外 MCP，加速
+    // 不装 MCP（即便 zcf 偶尔忽略也无伤）
     "--workflows",
     "skip",
-    // 不装工作流模板
     "--output-styles",
     "skip",
-    // 不装输出样式
     "--install-cometix-line",
     "false"
-    // 不装状态栏
   ];
+  if (opts.target === "codex") {
+    args.push("--api-model", CODEX_DEFAULT_MODEL);
+  }
   const isWin = process.platform === "win32";
   const cmd = isWin ? "npx.cmd" : "npx";
   let capturedOut = "";
   let capturedErr = "";
   let lastDataAt = Date.now();
   let killedReason = null;
+  let lastProgressAt = 0;
+  const PROGRESS_THROTTLE_MS = 200;
   const child = execa(cmd, args, {
     stdio: ["ignore", "pipe", "pipe"],
     env: {
       ...process.env,
       FORCE_COLOR: "0",
-      // 强制无颜色，免得 ANSI 干扰我们的检测
       CI: "1",
-      // 让某些库自动进入"非交互模式"
       npm_config_yes: "true"
-      // npx 自动 yes
     },
     reject: false,
-    // 我们自己处理退出码，避免 throw 时丢失输出
     windowsHide: true
   });
   const handleChunk = (chunk, target) => {
@@ -138,9 +164,13 @@ async function runZcf(opts) {
     else capturedErr += text2;
     lastDataAt = Date.now();
     if (opts.onProgress) {
-      const lines = text2.split(/\r?\n/).map((l) => l.trim()).filter(Boolean);
-      const last = lines[lines.length - 1];
-      if (last) opts.onProgress(last.slice(0, 80));
+      const now = Date.now();
+      if (now - lastProgressAt >= PROGRESS_THROTTLE_MS) {
+        lastProgressAt = now;
+        const lines = text2.replace(/\x1b\[[0-9;]*[a-zA-Z]/g, "").split(/\r?\n/).map((l) => l.trim()).filter(Boolean);
+        const last = lines[lines.length - 1];
+        if (last) opts.onProgress(last.slice(0, 60));
+      }
     }
     if (opts.verbose) {
       process.stderr.write(text2);
@@ -180,7 +210,7 @@ async function runZcf(opts) {
       `zcf \u8C03\u7528\u5931\u8D25\uFF1A${killedReason}
 
 \u5E38\u89C1\u539F\u56E0\uFF1A
-  \u2022 \u6CA1\u88C5\u76EE\u6807\u5BA2\u6237\u7AEF\uFF08zcf \u8BD5\u56FE\u8BE2\u95EE\u662F\u5426\u5B89\u88C5\uFF09
+  \u2022 \u76EE\u6807\u5BA2\u6237\u7AEF\u672A\u5B89\u88C5\uFF08zcf \u8BD5\u56FE\u8BE2\u95EE\u662F\u5426\u5B89\u88C5\uFF09
   \u2022 npm \u955C\u50CF/\u7F51\u7EDC\u6162\uFF0Cnpx \u4E0B\u8F7D zcf \u5305\u5361\u4F4F
   \u2022 \u9632\u706B\u5899\u62E6\u622A\u4E86 registry.npmjs.org
 
@@ -190,7 +220,7 @@ async function runZcf(opts) {
   if (exitCode !== 0 || signal) {
     const detail = (capturedErr || capturedOut || "").slice(-2e3) || `exit ${exitCode}, signal ${signal}`;
     throw new Error(
-      `zcf \u5F02\u5E38\u9000\u51FA\uFF08code-type=${opts.codeType}, exit=${exitCode}\uFF09:
+      `zcf \u5F02\u5E38\u9000\u51FA\uFF08exit=${exitCode}\uFF09:
 ${detail}
 
 \u{1F4A1} \u7528 ${pc.green("--verbose")} \u91CD\u65B0\u8FD0\u884C\u53EF\u770B\u5230\u5B8C\u6574\u65E5\u5FD7`
@@ -200,7 +230,7 @@ ${detail}
   if (/CACError|Unknown option/i.test(combined)) {
     const match = combined.match(/(CACError:.*?)(?:\n|$)/);
     throw new Error(
-      `zcf \u62D2\u7EDD\u4E86\u6211\u4EEC\u4F20\u7684\u53C2\u6570\uFF08code-type=${opts.codeType}\uFF09\uFF1A
+      `zcf \u62D2\u7EDD\u4E86\u6211\u4EEC\u4F20\u7684\u53C2\u6570\uFF1A
   ${match?.[1] || "Unknown option"}
 
 \u8FD9\u901A\u5E38\u610F\u5473\u7740 zcf \u5347\u7EA7\u540E flag \u547D\u540D\u53D8\u4E86\u3002\u8BF7\u8054\u7CFB service@easyrouter.io\u3002`
@@ -248,6 +278,10 @@ async function main() {
   }
   console.log();
   intro(pc.bgCyan(pc.black(" EasyRouter Config ")) + pc.dim(" v" + VERSION));
+  const verbose = !!args.verbose;
+  const selectedHost = await pickAvailableHost(verbose);
+  const claudeBaseUrl = selectedHost;
+  const codexBaseUrl = selectedHost.replace(/\/+$/, "") + "/v1";
   let apiKey;
   if (args.apiKey) {
     apiKey = normalizeApiKey(args.apiKey);
@@ -294,8 +328,8 @@ async function main() {
   note(
     [
       `${pc.bold("\u8BA1\u8D39\u6A21\u5F0F")}    \u6309\u91CF\u4ED8\u8D39`,
-      configClaude ? `${pc.bold("Claude URL")}  ${CLAUDE_BASE_URL}` : null,
-      configCodex ? `${pc.bold("Codex URL")}   ${CODEX_BASE_URL}` : null,
+      configClaude ? `${pc.bold("Claude URL")}  ${PRIMARY_HOST}` : null,
+      configCodex ? `${pc.bold("Codex URL")}   ${PRIMARY_HOST}/v1` : null,
       `${pc.bold("API Key")}     ${maskKey(apiKey)}`,
       `${pc.bold("\u5C06\u914D\u7F6E")}      ${[
         configClaude && "Claude Code",
@@ -311,20 +345,18 @@ async function main() {
       process.exit(0);
     }
   }
-  const verbose = !!args.verbose;
   if (configClaude) {
-    if (verbose) {
-      log.step("\u914D\u7F6E Claude Code\uFF08\u8BE6\u7EC6\u65E5\u5FD7\uFF09");
-    }
-    const s = verbose || !process.stdout.isTTY ? null : spinner();
+    const useSpinner = !verbose && process.stdout.isTTY;
+    const s = useSpinner ? spinner() : null;
     s?.start("\u914D\u7F6E Claude Code");
-    if (!s && !verbose) log.info("\u6B63\u5728\u914D\u7F6E Claude Code\uFF08\u9996\u6B21\u8FD0\u884C\u9700\u4E0B\u8F7D zcf\uFF0C\u7EA6 30~60 \u79D2\uFF09...");
+    if (!s) log.info("\u6B63\u5728\u914D\u7F6E Claude Code\uFF08\u9996\u6B21\u8FD0\u884C\u9700\u4E0B\u8F7D zcf\uFF0C\u7EA6 30~60 \u79D2\uFF09...");
     try {
-      await runZcf({
-        codeType: "cc",
-        baseUrl: CLAUDE_BASE_URL,
+      await configureViaZcf({
+        target: "cc",
+        baseUrl: claudeBaseUrl,
         apiKey,
         verbose,
+        // 节流的进度回调：spinner 不会高频闪烁
         onProgress: (line) => s?.message(`\u914D\u7F6E Claude Code \xB7 ${pc.dim(line)}`)
       });
       s?.stop(pc.green("\u2713 Claude Code \u914D\u7F6E\u5B8C\u6210 ") + pc.dim("\u2192 ~/.claude/settings.json"));
@@ -336,22 +368,20 @@ async function main() {
     }
   }
   if (configCodex) {
-    if (verbose) {
-      log.step("\u914D\u7F6E Codex\uFF08\u8BE6\u7EC6\u65E5\u5FD7\uFF09");
-    }
-    const s = verbose || !process.stdout.isTTY ? null : spinner();
+    const useSpinner = !verbose && process.stdout.isTTY;
+    const s = useSpinner ? spinner() : null;
     s?.start("\u914D\u7F6E Codex");
-    if (!s && !verbose) log.info("\u6B63\u5728\u914D\u7F6E Codex...");
+    if (!s) log.info("\u6B63\u5728\u914D\u7F6E Codex...");
     try {
-      await runZcf({
-        codeType: "cx",
-        baseUrl: CODEX_BASE_URL,
+      await configureViaZcf({
+        target: "codex",
+        baseUrl: codexBaseUrl,
         apiKey,
         verbose,
         onProgress: (line) => s?.message(`\u914D\u7F6E Codex \xB7 ${pc.dim(line)}`)
       });
-      s?.stop(pc.green("\u2713 Codex \u914D\u7F6E\u5B8C\u6210 ") + pc.dim("\u2192 ~/.codex/config.toml"));
-      if (!s) log.success(pc.green("\u2713 Codex \u914D\u7F6E\u5B8C\u6210 \u2192 ~/.codex/config.toml"));
+      s?.stop(pc.green("\u2713 Codex \u914D\u7F6E\u5B8C\u6210 ") + pc.dim("\u2192 ~/.codex/config.toml + auth.json"));
+      if (!s) log.success(pc.green("\u2713 Codex \u914D\u7F6E\u5B8C\u6210 \u2192 ~/.codex/config.toml + auth.json"));
     } catch (err) {
       s?.stop(pc.red("\u2717 Codex \u914D\u7F6E\u5931\u8D25"));
       console.error(err.message);
@@ -359,10 +389,11 @@ async function main() {
     }
   }
   if (!args.skipVerify) {
-    const s = process.stdout.isTTY ? spinner() : null;
+    const useSpinner = process.stdout.isTTY;
+    const s = useSpinner ? spinner() : null;
     s?.start("\u9A8C\u8BC1\u8FDE\u901A\u6027");
     if (!s) log.info("\u6B63\u5728\u9A8C\u8BC1\u8FDE\u901A\u6027...");
-    const result = await verifyConnection(CLAUDE_BASE_URL, apiKey);
+    const result = await verifyConnection(claudeBaseUrl, apiKey);
     if (result.ok) {
       const msg = pc.green("\u2713 \u94FE\u8DEF\u9A8C\u8BC1\u901A\u8FC7");
       s?.stop(msg) ?? log.success(msg);
@@ -378,7 +409,7 @@ async function main() {
   if (configCodex) tips.push(pc.cyan("codex") + pc.dim("   # \u542F\u52A8 Codex"));
   note(tips.join("\n"), "\u{1F389} \u5168\u90E8\u5B8C\u6210\uFF01\u73B0\u5728\u53EF\u4EE5\u8FD0\u884C\uFF1A");
   outro(
-    pc.dim("\u611F\u8C22\u4F7F\u7528 EasyRouter ") + pc.underline(pc.cyan("https://easyrouter.io")) + pc.dim(" \xB7 powered by ") + pc.underline("zcf")
+    pc.dim("\u611F\u8C22\u4F7F\u7528 EasyRouter ") + pc.underline(pc.cyan(PRIMARY_HOST)) + pc.dim("  \xB7  Claude Code auto-configuration is powered by ") + pc.underline("UfoMiao/zcf")
   );
 }
 main().catch((err) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easyrouter-config",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "🚀 一键把 EasyRouter 接入 Claude Code & Codex —— 粘贴 Key 即用",
   "type": "module",
   "bin": {