codex-slot 0.1.5 → 0.1.7

package/README.md

@@ -71,7 +71,7 @@ codex-slot start --port 4399
 ```
 
 `start` will automatically write the required provider config into `~/.codex/config.toml`.
-It prefers port `4399` by default and will switch to the next available port automatically when `4399` is busy:
+It prefers port `4399` by default and will switch to the next available port automatically when `4399` is busy, then sync that actual port into config:
 Each start also generates a fresh local `api_key` and syncs it into the managed provider config.
 
 ```bash
@@ -140,7 +140,7 @@ Behavior:
 - On `cslot stop`, the original `model_provider` line and original `[model_providers.cslot]` block are restored from the saved snapshot
 - Other providers and settings in `config.toml` are left untouched
 - If you start with `--port`, the port is saved to `~/.cslot/config.yaml`
-- If you start without `--port`, `4399` is preferred first and the next free port is chosen automatically on conflict
+- If you start without `--port`, `4399` is preferred first and the next free port is chosen automatically on conflict, and the actual chosen port is written back to `~/.cslot/config.yaml` and the managed provider block
 - Every `start` rotates the local `api_key`, and the new value is written to both `~/.cslot/config.yaml` and the managed provider block
 
 ## Data Directory

package/dist/app/service-lifecycle-service.js

@@ -10,9 +10,22 @@ const node_fs_1 = __importDefault(require("node:fs"));
 const node_net_1 = __importDefault(require("node:net"));
 const node_path_1 = __importDefault(require("node:path"));
 const node_child_process_1 = require("node:child_process");
+const undici_1 = require("undici");
 const codex_config_1 = require("../codex-config");
 const cli_helpers_1 = require("../cli-helpers");
 const config_1 = require("../config");
+const STARTUP_POLL_INTERVAL_MS = 100;
+const STARTUP_TIMEOUT_MS = 5000;
+/**
+ * 休眠指定毫秒数，供启动轮询流程复用。
+ *
+ * @param delayMs 等待时长，单位毫秒。
+ * @returns Promise，等待结束后返回。
+ * @throws 无显式抛出。
+ */
+function sleep(delayMs) {
+    return new Promise((resolve) => setTimeout(resolve, delayMs));
+}
 /**
  * 判断后台服务当前是否在运行。
  *
@@ -78,21 +91,93 @@ function isPortAvailable(host, port) {
         server.listen(port, host);
     });
 }
+/**
+ * 通过健康检查探测后台服务是否已经完成启动。
+ *
+ * @param host 本地监听地址。
+ * @param port 期望监听的端口。
+ * @returns Promise，健康检查通过时返回 `true`，否则返回 `false`。
+ * @throws 无显式抛出。
+ */
+async function isManagedServiceHealthy(host, port) {
+    try {
+        const response = await (0, undici_1.request)(`http://${host}:${port}/health`, {
+            method: "GET",
+            headersTimeout: 500,
+            bodyTimeout: 500
+        });
+        if (response.statusCode !== 200) {
+            return false;
+        }
+        const payload = (await response.body.json());
+        return payload.ok === true;
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * 等待后台服务真正进入可用状态，避免“配置已写入但服务未成功启动”的假成功状态。
+ *
+ * @param host 本地监听地址。
+ * @param port 期望监听的端口。
+ * @param pid 子进程 PID。
+ * @param timeoutMs 等待超时时间，单位毫秒。
+ * @returns Promise，健康检查通过时正常返回。
+ * @throws 当子进程提前退出、超时或服务始终未就绪时抛出异常。
+ */
+async function waitForManagedServiceReady(host, port, pid, timeoutMs = STARTUP_TIMEOUT_MS) {
+    const startedAt = Date.now();
+    while (Date.now() - startedAt < timeoutMs) {
+        try {
+            process.kill(pid, 0);
+        }
+        catch {
+            throw new Error(`后台服务启动失败，进程已退出，PID=${pid}`);
+        }
+        // 只有健康检查通过，才认为本地代理已经可安全对外服务。
+        if (await isManagedServiceHealthy(host, port)) {
+            return;
+        }
+        await sleep(STARTUP_POLL_INTERVAL_MS);
+    }
+    throw new Error(`后台服务启动超时，${host}:${port} 未在 ${timeoutMs}ms 内通过健康检查`);
+}
+/**
+ * 在启动失败时终止残留子进程，并恢复启动前的本地配置与 Codex 接管状态。
+ *
+ * @param pid 可能已创建的子进程 PID。
+ * @param previousConfig 启动前的原始配置快照。
+ * @returns 无返回值。
+ * @throws 无显式抛出。
+ */
+function rollbackFailedStart(pid, previousConfig) {
+    if (pid && Number.isInteger(pid) && pid > 0) {
+        try {
+            process.kill(pid, "SIGTERM");
+        }
+        catch {
+            // 子进程可能已经自行退出，此处按幂等清理处理。
+        }
+    }
+    node_fs_1.default.rmSync((0, config_1.getPidPath)(), { force: true });
+    (0, config_1.saveConfig)(previousConfig);
+    (0, codex_config_1.deactivateManagedCodexConfig)();
+}
 /**
  * 为后台服务挑选最终启动端口。
  *
  * 规则：
  * 1. 若用户显式指定 `--port`，则严格使用该端口，冲突时直接报错。
  * 2. 若未显式指定端口，则优先使用 4399。
- * 3. 若默认候选端口冲突，则从候选端口开始向上查找下一个可用端口。
+ * 3. 若默认候选端口冲突，则从 4399 开始向上查找下一个可用端口。
  *
  * @param host 监听地址。
- * @param currentPort 当前配置中的端口。
  * @param portOverride 用户显式指定的端口文本。
  * @returns Promise，成功时返回最终端口与是否发生自动切换。
  * @throws 当显式指定端口冲突或找不到可用端口时抛出异常。
  */
-async function resolveStartPort(host, currentPort, portOverride) {
+async function resolveStartPort(host, portOverride) {
     if (portOverride) {
         const port = (0, cli_helpers_1.parsePort)(portOverride);
         if (!(await isPortAvailable(host, port))) {
@@ -100,7 +185,7 @@ async function resolveStartPort(host, currentPort, portOverride) {
         }
         return { port, autoSwitched: false };
     }
-    const preferredPort = currentPort === 4389 ? 4399 : currentPort;
+    const preferredPort = 4399;
     for (let candidate = preferredPort; candidate < preferredPort + 50; candidate += 1) {
         if (await isPortAvailable(host, candidate)) {
             return {
@@ -120,37 +205,26 @@ async function resolveStartPort(host, currentPort, portOverride) {
  */
 async function startManagedService(portOverride) {
     const config = (0, config_1.loadConfig)();
-    const { port, autoSwitched } = await resolveStartPort(config.server.host, config.server.port, portOverride);
-    const hasExplicitPortOverride = typeof portOverride === "string" && portOverride.length > 0;
+    const previousConfig = structuredClone(config);
+    const { port, autoSwitched } = await resolveStartPort(config.server.host, portOverride);
     const runningPid = getRunningPid();
-    if (runningPid && hasExplicitPortOverride && config.server.port !== port) {
-        config.server.port = port;
-        (0, config_1.saveConfig)(config);
-    }
     if (runningPid) {
         return {
             alreadyRunning: true,
             pid: runningPid,
-            port,
+            port: config.server.port,
             logPath: (0, config_1.getServiceLogPath)(),
             autoSwitched: false,
             apiKeyRotated: false
         };
     }
-    if (hasExplicitPortOverride && config.server.port !== port) {
+    if (config.server.port !== port) {
         config.server.port = port;
         (0, config_1.saveConfig)(config);
     }
     // 每次真正启动服务前都轮换一次本地 api_key，并让受管 config.toml 使用同一新值。
     const persistedConfig = (0, config_1.rotateServerApiKey)(config);
-    const runtimeConfig = {
-        ...persistedConfig,
-        server: {
-            ...persistedConfig.server,
-            port
-        }
-    };
-    (0, codex_config_1.applyManagedCodexConfig)(undefined, { config: runtimeConfig });
+    (0, codex_config_1.applyManagedCodexConfig)(undefined, { config: persistedConfig });
     const logPath = (0, config_1.getServiceLogPath)();
     const logFd = node_fs_1.default.openSync(logPath, "a");
     const serveEntrypoint = resolveServeEntrypoint();
@@ -158,11 +232,25 @@ async function startManagedService(portOverride) {
         detached: true,
         stdio: ["ignore", logFd, logFd]
     });
+    const childPid = child.pid ?? null;
     child.unref();
-    node_fs_1.default.writeFileSync((0, config_1.getPidPath)(), `${child.pid}\n`, "utf8");
+    if (!childPid) {
+        node_fs_1.default.closeSync(logFd);
+        rollbackFailedStart(null, previousConfig);
+        throw new Error("后台服务启动失败，未获取到有效子进程 PID");
+    }
+    node_fs_1.default.writeFileSync((0, config_1.getPidPath)(), `${childPid}\n`, "utf8");
+    node_fs_1.default.closeSync(logFd);
+    try {
+        await waitForManagedServiceReady(config.server.host, port, childPid);
+    }
+    catch (error) {
+        rollbackFailedStart(childPid, previousConfig);
+        throw error;
+    }
     return {
         alreadyRunning: false,
-        pid: child.pid ?? 0,
+        pid: childPid,
         port,
         logPath,
         autoSwitched,

package/dist/codex-config.js

@@ -72,9 +72,7 @@ function buildManagedProviderBlock(eol, config) {
         'name = "cslot"',
         `base_url = "http://${config.server.host}:${config.server.port}/v1"`,
         'wire_api = "responses"',
-        "",
-        "[model_providers.cslot.http_headers]",
-        `Authorization = "Bearer ${config.server.api_key}"`,
+        `http_headers = { Authorization = "Bearer ${config.server.api_key}" }`,
         PROVIDER_BLOCK_END_MARKER
     ].join(eol);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codex-slot",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "本地 Codex 多账号切换与状态管理工具",
   "type": "commonjs",
   "main": "dist/cli.js",
@@ -16,7 +16,8 @@
     "build": "npm run clean && tsc -p tsconfig.json && chmod +x dist/cli.js dist/serve.js",
     "prepublishOnly": "npm run build",
     "dev": "tsx src/cli.ts",
-    "check": "tsc --noEmit -p tsconfig.json"
+    "check": "tsc --noEmit -p tsconfig.json",
+    "test": "npm run build && node --test test/*.test.js"
   },
   "keywords": [
     "codex",