easyrouter-config 1.0.1 → 1.0.3

package/dist/index.js

@@ -5,6 +5,7 @@ import {
   intro,
   outro,
   text,
+  select,
   confirm,
   spinner,
   isCancel,
@@ -15,7 +16,7 @@ import {
 import { execa } from "execa";
 import pc from "picocolors";
 import { parseArgs } from "util";
-var VERSION = "0.1.0";
+var VERSION = "0.1.1";
 var CLAUDE_BASE_URL = "https://easyrouter.io";
 var CODEX_BASE_URL = "https://easyrouter.io/v1";
 function parseCliArgs() {
@@ -74,6 +75,8 @@ ${pc.bold("\u539F\u7406:")}
     \u2022 Codex       \u2192 ~/.codex/config.toml + ~/.codex/auth.json
 `);
 }
+var IDLE_TIMEOUT_MS = 6e4;
+var HARD_TIMEOUT_MS = 3e5;
 async function runZcf(opts) {
   const args = [
     "-y",
@@ -108,27 +111,86 @@ async function runZcf(opts) {
     "false"
     // 不装状态栏
   ];
+  const isWin = process.platform === "win32";
+  const cmd = isWin ? "npx.cmd" : "npx";
   let capturedOut = "";
   let capturedErr = "";
-  try {
-    const child = execa("npx", args, {
-      stdio: opts.verbose ? "inherit" : "pipe",
-      env: { ...process.env, FORCE_COLOR: opts.verbose ? "1" : "0" },
-      reject: true
-    });
-    if (!opts.verbose) {
-      child.stdout?.on("data", (chunk) => {
-        capturedOut += chunk.toString();
-      });
-      child.stderr?.on("data", (chunk) => {
-        capturedErr += chunk.toString();
-      });
+  let lastDataAt = Date.now();
+  let killedReason = null;
+  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) => {
+    const text2 = typeof chunk === "string" ? chunk : chunk.toString("utf8");
+    if (target === "out") capturedOut += text2;
+    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));
     }
-    await child;
-  } catch (err) {
-    const detail = err?.stderr || err?.stdout || err?.message || String(err);
+    if (opts.verbose) {
+      process.stderr.write(text2);
+    }
+  };
+  child.stdout?.on("data", (c) => handleChunk(c, "out"));
+  child.stderr?.on("data", (c) => handleChunk(c, "err"));
+  const idleTimer = setInterval(() => {
+    if (Date.now() - lastDataAt > IDLE_TIMEOUT_MS) {
+      killedReason = `\u5B50\u8FDB\u7A0B\u5DF2 ${Math.floor(IDLE_TIMEOUT_MS / 1e3)} \u79D2\u65E0\u8F93\u51FA\uFF08\u7591\u4F3C\u5361\u5728\u4EA4\u4E92\u5F0F\u63D0\u95EE\u6216\u7F51\u7EDC\u95EE\u9898\uFF09`;
+      child.kill("SIGTERM");
+      setTimeout(() => {
+        try {
+          child.kill("SIGKILL");
+        } catch {
+        }
+      }, 5e3);
+    }
+  }, 5e3);
+  const hardTimer = setTimeout(() => {
+    killedReason = `\u5B50\u8FDB\u7A0B\u8D85\u8FC7 ${Math.floor(HARD_TIMEOUT_MS / 1e3)} \u79D2\u672A\u7ED3\u675F\uFF08\u5F3A\u5236\u8D85\u65F6\uFF09`;
+    child.kill("SIGTERM");
+    setTimeout(() => {
+      try {
+        child.kill("SIGKILL");
+      } catch {
+      }
+    }, 5e3);
+  }, HARD_TIMEOUT_MS);
+  const result = await child.catch((e) => e);
+  clearInterval(idleTimer);
+  clearTimeout(hardTimer);
+  const exitCode = result?.exitCode ?? null;
+  const signal = result?.signal ?? null;
+  if (killedReason) {
     throw new Error(
-      `zcf \u6267\u884C\u5931\u8D25 (code-type=${opts.codeType}):
+      `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 npm \u955C\u50CF/\u7F51\u7EDC\u6162\uFF0Cnpx \u4E0B\u8F7D zcf \u5305\u5361\u4F4F
+  \u2022 \u9632\u706B\u5899\u62E6\u622A\u4E86 registry.npmjs.org
+
+\u5EFA\u8BAE\uFF1A\u7528 ${pc.green("--verbose")} \u91CD\u65B0\u8FD0\u884C\u67E5\u770B\u8BE6\u7EC6\u65E5\u5FD7`
+    );
+  }
+  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:
 ${detail}
 
 \u{1F4A1} \u7528 ${pc.green("--verbose")} \u91CD\u65B0\u8FD0\u884C\u53EF\u770B\u5230\u5B8C\u6574\u65E5\u5FD7`
@@ -212,6 +274,22 @@ async function main() {
     configCodex = false;
   } else if (args.only === "codex") {
     configClaude = false;
+  } else if (!args.apiKey) {
+    const target = await select({
+      message: "\u8BF7\u9009\u62E9\u8981\u914D\u7F6E\u7684\u5BA2\u6237\u7AEF",
+      options: [
+        { value: "both", label: "Claude Code + Codex", hint: "\u4E24\u4E2A\u90FD\u914D\uFF08\u63A8\u8350\uFF09" },
+        { value: "claude", label: "\u4EC5 Claude Code", hint: "\u53EA\u914D ~/.claude/settings.json" },
+        { value: "codex", label: "\u4EC5 Codex", hint: "\u53EA\u914D ~/.codex/config.toml" }
+      ],
+      initialValue: "both"
+    });
+    if (isCancel(target)) {
+      cancel("\u5DF2\u53D6\u6D88");
+      process.exit(0);
+    }
+    if (target === "claude") configCodex = false;
+    else if (target === "codex") configClaude = false;
   }
   note(
     [
@@ -246,7 +324,8 @@ async function main() {
         codeType: "cc",
         baseUrl: CLAUDE_BASE_URL,
         apiKey,
-        verbose
+        verbose,
+        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"));
       if (!s) log.success(pc.green("\u2713 Claude Code \u914D\u7F6E\u5B8C\u6210 \u2192 ~/.claude/settings.json"));
@@ -268,7 +347,8 @@ async function main() {
         codeType: "cx",
         baseUrl: CODEX_BASE_URL,
         apiKey,
-        verbose
+        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"));

package/package.json

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