codex-endpoint-switcher 1.6.0 → 1.6.1

package/package.json

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

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

@@ -1,6 +1,9 @@
 const fs = require("node:fs/promises");
 const { spawn } = require("node:child_process");
 
+const WAIT_PARENT_EXIT_TIMEOUT_MS = 20000;
+const WAIT_PARENT_POLL_MS = 400;
+
 function sleep(timeoutMs) {
   return new Promise((resolve) => {
     setTimeout(resolve, timeoutMs);
@@ -53,6 +56,55 @@ function runProcess(command, args, options = {}) {
   });
 }
 
+function isProcessAlive(pid) {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+async function forceTerminateProcess(pid) {
+  if (!pid || pid <= 0) {
+    return;
+  }
+
+  if (process.platform === "win32") {
+    await runProcess("cmd.exe", ["/d", "/s", "/c", `taskkill /PID ${pid} /F`]);
+    return;
+  }
+
+  try {
+    process.kill(pid, "SIGTERM");
+  } catch {
+    // 进程已结束时忽略。
+  }
+}
+
+async function waitForProcessExit(pid, logPath) {
+  if (!pid || pid <= 0) {
+    return;
+  }
+
+  const startedAt = Date.now();
+  while (Date.now() - startedAt < WAIT_PARENT_EXIT_TIMEOUT_MS) {
+    if (!isProcessAlive(pid)) {
+      await appendLog(logPath, `[${new Date().toISOString()}] 旧进程已退出：${pid}\n`);
+      return;
+    }
+
+    await sleep(WAIT_PARENT_POLL_MS);
+  }
+
+  await appendLog(
+    logPath,
+    `[${new Date().toISOString()}] 旧进程超时未退出，开始强制结束：${pid}\n`,
+  );
+  await forceTerminateProcess(pid);
+  await sleep(1200);
+}
+
 async function reopenConsole(payload) {
   return runProcess(
     payload.nodePath,
@@ -91,6 +143,7 @@ async function main() {
   });
 
   await sleep(Number(payload.waitSeconds || 3) * 1000);
+  await waitForProcessExit(Number(payload.parentPid || 0), payload.logPath);
 
   const installResult = await runProcess(
     payload.nodePath,

package/src/main/update-service.js

@@ -205,6 +205,7 @@ function scheduleAutoUpdate(options = {}) {
     JSON.stringify({
       packageName: packageInfo.name,
       currentVersion: packageInfo.version,
+      parentPid: process.pid,
       waitSeconds: AUTO_UPDATE_WAIT_SECONDS,
       logPath,
       statePath,

package/src/renderer/renderer.js

@@ -836,7 +836,8 @@ async function handleAutoUpdate() {
     summary.textContent = `正在自动更新到 ${update.latestVersion}...`;
   }
   if (detail) {
-    detail.textContent = "程序会先关闭，再自动安装最新 npm 包并重新打开控制台。";
+    detail.textContent =
+      "程序会先关闭，再自动安装最新 npm 包并重新打开控制台。若 10 秒内没有自动关闭，请查看本地更新日志。";
   }
   if (checkButton) {
     checkButton.disabled = true;

package/src/web/server.js

@@ -312,7 +312,14 @@ function startServer(options = {}) {
 
   process.removeAllListeners("codex-switcher:shutdown");
   process.on("codex-switcher:shutdown", () => {
+    const forceExitTimer = setTimeout(() => {
+      webServer.closeAllConnections?.();
+      proxyServer.closeAllConnections?.();
+      process.exit(0);
+    }, 2500);
+
     controller.close(() => {
+      clearTimeout(forceExitTimer);
       process.exit(0);
     });
   });