codex-endpoint-switcher 1.6.2 → 1.6.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codex-endpoint-switcher",
-  "version": "1.6.2",
+  "version": "1.6.3",
   "description": "用于切换 Codex URL 和 Key 的本地网页控制台与 npm CLI",
   "main": "src/main/main.js",
   "bin": {

package/src/main/auto-update-runner.js

@@ -3,6 +3,8 @@ const { spawn } = require("node:child_process");
 
 const WAIT_PARENT_EXIT_TIMEOUT_MS = 20000;
 const WAIT_PARENT_POLL_MS = 400;
+const INSTALL_RETRY_TIMES = 3;
+const INSTALL_RETRY_BASE_DELAY_MS = 1500;
 
 function sleep(timeoutMs) {
   return new Promise((resolve) => {
@@ -38,9 +40,10 @@ function runProcess(command, args, options = {}) {
       stderr += chunk.toString("utf8");
     });
 
-    child.on("exit", (code) => {
+    child.on("exit", (code, signal) => {
       resolve({
-        code: Number(code || 0),
+        code: normalizeExitCode(code),
+        signal: signal || "",
         stdout,
         stderr,
       });
@@ -56,6 +59,78 @@ function runProcess(command, args, options = {}) {
   });
 }
 
+function normalizeExitCode(code) {
+  const safeCode = Number(code || 0);
+  if (!Number.isFinite(safeCode)) {
+    return 0;
+  }
+
+  if (safeCode > 0x7fffffff) {
+    return safeCode - 0x100000000;
+  }
+
+  return safeCode;
+}
+
+function isBusyInstallFailure(result) {
+  const combined = `${result.stdout || ""}\n${result.stderr || ""}`.toUpperCase();
+  return (
+    result.code === -4082 ||
+    combined.includes("EBUSY") ||
+    combined.includes("RESOURCE BUSY OR LOCKED") ||
+    combined.includes("EPERM") ||
+    combined.includes("OPERATION NOT PERMITTED")
+  );
+}
+
+async function installLatestPackage(payload) {
+  let lastResult = null;
+
+  for (let attempt = 1; attempt <= INSTALL_RETRY_TIMES; attempt += 1) {
+    if (attempt > 1) {
+      await appendLog(
+        payload.logPath,
+        `[${new Date().toISOString()}] 检测到文件占用，开始第 ${attempt} 次重试安装。\n`,
+      );
+      await sleep(INSTALL_RETRY_BASE_DELAY_MS * attempt);
+    }
+
+    const result = await runProcess(
+      payload.nodePath,
+      [payload.npmCliPath, "install", "-g", `${payload.packageName}@latest`],
+      {
+        cwd: process.cwd(),
+        env: process.env,
+      },
+    );
+
+    if (result.stdout) {
+      await appendLog(payload.logPath, result.stdout);
+    }
+    if (result.stderr) {
+      await appendLog(payload.logPath, result.stderr);
+    }
+
+    lastResult = result;
+    if (result.code === 0) {
+      return result;
+    }
+
+    if (!isBusyInstallFailure(result) || attempt >= INSTALL_RETRY_TIMES) {
+      return result;
+    }
+  }
+
+  return (
+    lastResult || {
+      code: 1,
+      signal: "",
+      stdout: "",
+      stderr: "自动更新安装没有返回结果。",
+    }
+  );
+}
+
 function isProcessAlive(pid) {
   try {
     process.kill(pid, 0);
@@ -145,25 +220,13 @@ async function main() {
   await sleep(Number(payload.waitSeconds || 3) * 1000);
   await waitForProcessExit(Number(payload.parentPid || 0), payload.logPath);
 
-  const installResult = await runProcess(
-    payload.nodePath,
-    [payload.npmCliPath, "install", "-g", `${payload.packageName}@latest`],
-    {
-      cwd: process.cwd(),
-      env: process.env,
-    },
-  );
-
-  if (installResult.stdout) {
-    await appendLog(payload.logPath, installResult.stdout);
-  }
-  if (installResult.stderr) {
-    await appendLog(payload.logPath, installResult.stderr);
-  }
+  const installResult = await installLatestPackage(payload);
 
   if (installResult.code !== 0) {
     const finishedAt = new Date().toISOString();
-    const errorMessage = `npm 安装失败，退出码：${installResult.code}`;
+    const errorMessage = isBusyInstallFailure(installResult)
+      ? `npm 安装失败：文件仍被占用，请稍后重试或先手动关闭占用进程。退出码：${installResult.code}`
+      : `npm 安装失败，退出码：${installResult.code}`;
     await appendLog(payload.logPath, `[${finishedAt}] ${errorMessage}\n`);
     await writeState(payload.statePath, {
       status: "failed",

package/src/main/update-service.js

@@ -26,6 +26,36 @@ function getAutoUpdateStatePath() {
   return path.join(stateDir, "codex-switcher-auto-update.json");
 }
 
+function getAutoUpdateRuntimeDir() {
+  const runtimeDir = path.join(os.homedir(), ".codex", "runtime");
+  fs.mkdirSync(runtimeDir, { recursive: true });
+  return runtimeDir;
+}
+
+function cleanupStagedAutoUpdateRunners(runtimeDir) {
+  const staleBeforeMs = Date.now() - 24 * 60 * 60 * 1000;
+
+  for (const entry of fs.readdirSync(runtimeDir, { withFileTypes: true })) {
+    if (
+      !entry.isFile() ||
+      !entry.name.startsWith("codex-switcher-auto-update-runner-") ||
+      !entry.name.endsWith(".js")
+    ) {
+      continue;
+    }
+
+    const fullPath = path.join(runtimeDir, entry.name);
+    try {
+      const stats = fs.statSync(fullPath);
+      if (stats.mtimeMs < staleBeforeMs) {
+        fs.unlinkSync(fullPath);
+      }
+    } catch {
+      // 文件被占用或刚被其他进程删除时忽略。
+    }
+  }
+}
+
 function readAutoUpdateState() {
   try {
     const content = fs.readFileSync(getAutoUpdateStatePath(), "utf8");
@@ -100,6 +130,17 @@ function resolveRuntimePaths() {
   };
 }
 
+function stageAutoUpdateRunner() {
+  const runtimeDir = getAutoUpdateRuntimeDir();
+  cleanupStagedAutoUpdateRunners(runtimeDir);
+  const stagedRunnerPath = path.join(
+    runtimeDir,
+    `codex-switcher-auto-update-runner-${Date.now()}.js`,
+  );
+  fs.copyFileSync(runnerEntryPath, stagedRunnerPath);
+  return stagedRunnerPath;
+}
+
 function sleep(timeoutMs) {
   return new Promise((resolve) => {
     setTimeout(resolve, timeoutMs);
@@ -217,6 +258,7 @@ function scheduleAutoUpdate(options = {}) {
   const logPath = getAutoUpdateLogPath();
   const statePath = getAutoUpdateStatePath();
   const runtimePaths = resolveRuntimePaths();
+  const stagedRunnerPath = stageAutoUpdateRunner();
 
   writeAutoUpdateState({
     status: "scheduled",
@@ -246,7 +288,7 @@ function scheduleAutoUpdate(options = {}) {
     "utf8",
   ).toString("base64url");
 
-  const child = spawn(process.execPath, [runnerEntryPath, payload], {
+  const child = spawn(process.execPath, [stagedRunnerPath, payload], {
     cwd: os.homedir(),
     detached: true,
     stdio: "ignore",