fogact 1.1.5 → 1.1.7

package/lib/index.js

@@ -1,5 +1,7 @@
 "use strict";
 
+const https = require("https");
+const { spawnSync } = require("child_process");
 const { Command } = require("commander");
 const prompts = require("prompts");
 const packageJson = require("../package.json");
@@ -8,51 +10,243 @@ const { runTestCommand } = require("./commands/test");
 const { runRestoreCommand } = require("./commands/restore");
 const { runActivationWizard } = require("./services/activation-orchestrator");
 
-function printBanner() {
-  const version = packageJson.version;
-  const title = `FogAct 激活器 v${version}`;
-  const displayWidth = (value) => Array.from(value).reduce((width, char) => {
+const MENU_CHOICES = [
+  { title: "1. 激活服务", value: "activate" },
+  { title: "2. 测试节点", value: "test" },
+  { title: "3. 恢复备份", value: "restore" },
+  { title: "4. 退出", value: "exit" },
+];
+
+const UPDATE_TIMEOUT_MS = 2500;
+
+function parseVersion(version) {
+  return String(version || "")
+    .split("-")[0]
+    .split(".")
+    .map((part) => Number.parseInt(part, 10) || 0);
+}
+
+function isNewerVersion(latest, current) {
+  const latestParts = parseVersion(latest);
+  const currentParts = parseVersion(current);
+  const length = Math.max(latestParts.length, currentParts.length);
+  for (let index = 0; index < length; index += 1) {
+    const latestPart = latestParts[index] || 0;
+    const currentPart = currentParts[index] || 0;
+    if (latestPart > currentPart) return true;
+    if (latestPart < currentPart) return false;
+  }
+  return false;
+}
+
+function fetchLatestVersion() {
+  return new Promise((resolve) => {
+    const request = https.get(
+      "https://registry.npmjs.org/fogact/latest",
+      {
+        timeout: UPDATE_TIMEOUT_MS,
+        headers: {
+          Accept: "application/json",
+          "User-Agent": `fogact/${packageJson.version}`,
+        },
+      },
+      (response) => {
+        if (response.statusCode !== 200) {
+          response.resume();
+          resolve(null);
+          return;
+        }
+
+        let body = "";
+        response.setEncoding("utf8");
+        response.on("data", (chunk) => {
+          body += chunk;
+        });
+        response.on("end", () => {
+          try {
+            const metadata = JSON.parse(body);
+            resolve(metadata.version || null);
+          } catch (_error) {
+            resolve(null);
+          }
+        });
+      }
+    );
+
+    request.on("timeout", () => {
+      request.destroy();
+      resolve(null);
+    });
+    request.on("error", () => resolve(null));
+  });
+}
+
+function isNpmExecRun() {
+  const argvPath = process.argv[1] || "";
+  const npmCommand = process.env.npm_command || "";
+  const npmExecPath = process.env.npm_execpath || "";
+  return argvPath.includes("/_npx/") || npmCommand === "exec" || npmCommand === "x" || npmExecPath.includes("npx-cli");
+}
+
+function runLatestWithNpmExec(latestVersion, args, env) {
+  return spawnSync(
+    "npm",
+    ["exec", "--yes", "--package", `fogact@${latestVersion}`, "--", "fogact", ...args],
+    { stdio: "inherit", env }
+  );
+}
+
+async function ensureLatestVersion(argv = process.argv) {
+  if (process.env.FOGACT_SKIP_UPDATE === "1" || process.env.FOGACT_NO_UPDATE === "1") {
+    return false;
+  }
+
+  const latestVersion = await fetchLatestVersion();
+  if (!latestVersion || !isNewerVersion(latestVersion, packageJson.version)) {
+    return false;
+  }
+
+  const args = argv.slice(2);
+  const env = { ...process.env, FOGACT_SKIP_UPDATE: "1" };
+  console.log(`检测到新版本 v${latestVersion}，正在自动更新...`);
+
+  if (isNpmExecRun()) {
+    const result = runLatestWithNpmExec(latestVersion, args, env);
+    process.exit(result.status === null ? 1 : result.status);
+  }
+
+  const update = spawnSync("npm", ["install", "-g", `fogact@${latestVersion}`], {
+    stdio: "inherit",
+    env,
+  });
+
+  if (update.status === 0) {
+    console.log("更新完成，正在重新启动...");
+    const restart = spawnSync(process.execPath, argv.slice(1), { stdio: "inherit", env });
+    process.exit(restart.status === null ? 1 : restart.status);
+  }
+
+  console.log("自动更新失败，正在尝试直接运行最新版...");
+  const result = runLatestWithNpmExec(latestVersion, args, env);
+  process.exit(result.status === null ? 1 : result.status);
+}
+
+function displayWidth(value) {
+  return Array.from(value).reduce((width, char) => {
     return width + (char.charCodeAt(0) > 0xff ? 2 : 1);
   }, 0);
-  const padLine = (value, width) => {
-    const padding = Math.max(0, width - displayWidth(value));
-    const left = Math.floor(padding / 2);
-    const right = padding - left;
-    return `${" ".repeat(left)}${value}${" ".repeat(right)}`;
-  };
-  console.log("");
-  console.log("  ╭─────────────────────────────────────╮");
-  console.log(`  │${padLine(title, 37)}│`);
-  console.log("  │    Claude Code / Codex 配置工具     │");
-  console.log("  ╰─────────────────────────────────────╯");
-  console.log("");
+}
+
+function padLine(value, width) {
+  const padding = Math.max(0, width - displayWidth(value));
+  const left = Math.floor(padding / 2);
+  const right = padding - left;
+  return `${" ".repeat(left)}${value}${" ".repeat(right)}`;
+}
+
+function renderMenu(cursor = 0) {
+  const version = packageJson.version;
+  const title = `FogAct 激活器 v${version}`;
+  const lines = [
+    "",
+    "  ╭─────────────────────────────────────╮",
+    `  │${padLine(title, 37)}│`,
+    "  │    Claude Code / Codex 配置工具     │",
+    "  ╰─────────────────────────────────────╯",
+    "",
+    "? 请选择操作:",
+  ];
+
+  MENU_CHOICES.forEach((choice, index) => {
+    lines.push(`${index === cursor ? "❯" : " "} ${choice.title}`);
+  });
+
+  lines.push("");
+  lines.push("↑↓ navigate • ⏎ select");
+  return lines.join("\n");
+}
+
+function printBanner() {
+  console.log(renderMenu(0));
 }
 
 async function runInteractiveMenu() {
   await runActivationWizard();
 }
 
+function selectMenuAction() {
+  if (!process.stdin.isTTY || !process.stdout.isTTY) {
+    printBanner();
+    return Promise.resolve(null);
+  }
+
+  return new Promise((resolve) => {
+    let cursor = 0;
+    let renderedLines = 0;
+    const stdin = process.stdin;
+
+    const render = () => {
+      if (renderedLines > 0) {
+        process.stdout.write(`\x1b[${renderedLines}A`);
+        process.stdout.write("\x1b[J");
+      }
+      const output = renderMenu(cursor);
+      renderedLines = output.split("\n").length;
+      process.stdout.write(output);
+    };
+
+    const cleanup = () => {
+      stdin.off("data", onData);
+      if (stdin.isRaw) stdin.setRawMode(false);
+      stdin.pause();
+      process.stdout.write("\x1b[?25h\n");
+    };
+
+    const submit = () => {
+      const choice = MENU_CHOICES[cursor];
+      cleanup();
+      resolve(choice.value);
+    };
+
+    const cancel = () => {
+      cleanup();
+      resolve("exit");
+    };
+
+    const onData = (data) => {
+      const key = data.toString("utf8");
+      if (key === "\u0003" || key === "\u001b") {
+        cancel();
+        return;
+      }
+      if (key === "\r" || key === "\n") {
+        submit();
+        return;
+      }
+      if (key === "\u001b[A") {
+        cursor = cursor === 0 ? MENU_CHOICES.length - 1 : cursor - 1;
+        render();
+        return;
+      }
+      if (key === "\u001b[B") {
+        cursor = cursor === MENU_CHOICES.length - 1 ? 0 : cursor + 1;
+        render();
+      }
+    };
+
+    process.stdout.write("\x1b[?25l");
+    render();
+    stdin.resume();
+    stdin.setEncoding("utf8");
+    stdin.setRawMode(true);
+    stdin.on("data", onData);
+  });
+}
+
 async function runToolsMenu() {
-  printBanner();
-
-  const response = await prompts(
-    {
-      type: "select",
-      name: "action",
-      message: "请选择操作:",
-      hint: "↑↓ 选择，回车确认",
-      choices: [
-        { title: "1. 激活服务", value: "activate" },
-        { title: "2. 测试节点", value: "test" },
-        { title: "3. 恢复备份", value: "restore" },
-        { title: "4. 退出", value: "exit" },
-      ],
-      initial: 0,
-    },
-    { onCancel: () => false }
-  );
+  const action = await selectMenuAction();
 
-  switch (response.action) {
+  switch (action) {
     case "activate":
       await runActivationWizard();
       break;
@@ -152,6 +346,8 @@ function buildProgram() {
 }
 
 async function runCli(argv = process.argv) {
+  await ensureLatestVersion(argv);
+
   const args = argv.slice(2).filter((arg) => arg !== "--help" && arg !== "-h");
 
   if (args.length === 0) {
@@ -165,6 +361,8 @@ async function runCli(argv = process.argv) {
 
 module.exports = {
   buildProgram,
+  ensureLatestVersion,
+  isNewerVersion,
   runCli,
   runInteractiveMenu,
   runToolsMenu,

package/lib/services/cliproxy-api.js

@@ -19,7 +19,7 @@ function makeRequest(path, options = {}) {
       method: options.method || "GET",
       headers: {
         "Content-Type": "application/json",
-        "User-Agent": "fogact/1.1.5",
+        "User-Agent": "fogact/1.1.7",
         ...options.headers,
       },
     };

package/lib/services/newapi.js

@@ -58,7 +58,7 @@ async function verifyNewApiKey(config, apiKey) {
     headers: {
       Authorization: `Bearer ${apiKey}`,
       Accept: "application/json",
-      "User-Agent": "fogact/1.1.5",
+      "User-Agent": "fogact/1.1.7",
     },
   });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fogact",
-  "version": "1.1.5",
+  "version": "1.1.7",
   "description": "FogAct activation helper for Claude Code and Codex",
   "keywords": [
     "fogact",