mirror of
https://github.com/software-mansion/argent.git
synced 2026-09-14 19:27:14 +08:00
13f43bd0cd
Follow-up to #709, which merged while this was still under review. #709 landed the port fix; these are the two gaps a review pass over it turned up, both in the same two files. ## The ports-file guard was pinned by nothing #714 added `vi.mock("../src/utils/chromium-discovery", …)` to `boot-electron-spawn-error.test.ts` so a completed boot stops persisting its port into the developer's real `~/.argent/chromium-cdp-ports.json`. Nothing asserted it still worked. Measured, on the pre-change file: deleting the mock leaves the suite **green at 9/9** while `$HOME/.argent/chromium-cdp-ports.json` is created containing a live ephemeral port. Replacing it with a call-through variant — the shape `list-devices.test.ts:76-81` already uses on this same module — does the same: ```ts vi.mock("../src/utils/chromium-discovery", async () => { const actual = await vi.importActual<...>("../src/utils/chromium-discovery"); return { ...actual, trackChromiumPort: vi.fn(actual.trackChromiumPort), untrackChromiumPort: vi.fn(actual.untrackChromiumPort) }; }); ``` → `Tests 9 passed (9)`, and the ports file contains `[55770]`. That is how the file accumulated entries before #714, so the guard rotting back is not hypothetical. Each file now scopes `HOME` with #714's own `scopeTempHome()` helper and asserts, after a completed boot, that no ports file exists. Both mutations now fail. **All three files that carry this mock are fixed, not just the one.** `boot-electron-kill.test.ts` and `boot-electron-ready-race.test.ts` hold the byte-identical mock — under a comment naming each other — and each completes a real boot. Measured before this change: deleting the mock left `kill` green at **15/15** while eleven live ports, one per boot, were written; the call-through variant did the same to `ready-race` **while still satisfying its own `expect(trackChromiumPort).toHaveBeenCalledWith(port)` at line 175**, which is precisely why the absence assertion is the right shape. Asserting the absence rather than `expect(trackChromiumPort).toHaveBeenCalledWith(port)` is deliberate: the call is already pinned by `boot-electron-ready-race.test.ts:175`, and a spy assertion only proves the export *is* a spy — the call-through mutation satisfies it while still writing. ## The readiness timeout was pinned by its wording, not its code The catch-path test matched `/CDP never became reachable/`. `FAILURE_CODES.CHROMIUM_ELECTRON_CDP_TIMEOUT` had **no assertion anywhere in the repo** — `grep -rn CHROMIUM_ELECTRON_CDP_TIMEOUT packages/ --include=*.ts` outside `dist/` hits only the throw site and the enum. Swapping the throw site to `CHROMIUM_ELECTRON_SPAWN_FAILED` left `boot-electron-spawn-error` + `-kill` + `-ready-race` + `failure-classification` + `chromium-discovery` at **60/60 passed**. So the half agents and telemetry bucket on was free to change, while a harmless reword would have broken the test. Now pinned by code via `getFailureSignal`, matching how `boot-electron-ready-race.test.ts:137` pins its own failure path. It still discriminates the vacuity the message match was added for: a nonexistent `appPath` yields `CHROMIUM_ELECTRON_APP_PATH_INVALID` and fails. `failure_stage` is pinned alongside it, as `ready-race` already does for its own path — `electron_cdp_ready` likewise had no assertion anywhere. ## Two rationales corrected - The catch-path comment blamed "no HTTP server on the port" for the probe failing. `fetch` declines port 1 as a WHATWG bad port *before it dials* — verified with `net.connect` hooked: **0 sockets opened** for port 1, 2 sockets for ports 2, 1023 and 19222. No listener is involved either way, and the file's own constant JSDoc says so. - The `chromium-discovery.test.ts` constant pointed at "a `listen(0)` fake CDP server **in a sibling test file**", when the server that makes the point is `startFakeCdpServer` in this same file, above the constant. - It also credited "anything in the unprivileged range" with being bindable by `listen(0)`. `listen(0)` draws from the kernel's *ephemeral* range — `net.inet.ip.portrange` 49152-65535 on macOS, `ip_local_port_range` 32768-60999 on the Ubuntu runner. That narrower range is what put the old `43211` at risk; calling it "unprivileged" also revives the privilege reasoning the sibling constant explicitly disowns. ## `chromium-discovery.test.ts` gets a second layer too It is the one file here that drives the **real** `persistPorts`, and its only guard was a single `beforeAll` line setting `ARGENT_CHROMIUM_PORTS_FILE`. That line is pinned — deleting it fails 3 tests — but the write lands before the detection, and `persistPorts` merges rather than replaces, so on a real machine the test ports would be appended for `list-devices` to probe afterwards. It now scopes `HOME` as well, so a lapsed redirect falls back somewhere disposable. Measured with a pre-seeded `$HOME/.argent/chromium-cdp-ports.json` = `[9222]`: deleting the redirect still fails 3 tests, and the seeded file comes back **unchanged**. ## Verification | mutation | before | after | |---|---|---| | delete the module mock | 9/9 pass, ports file written | fails | | call-through `vi.fn(actual.trackChromiumPort)` | 9/9 pass, ports file written | fails | | swap `CHROMIUM_ELECTRON_CDP_TIMEOUT` at the throw site | 60/60 pass | fails | | nonexistent `appPath` in the catch-path test | — | fails (`APP_PATH_INVALID`) | | swap `failure_stage` at the throw site | — | fails | | delete / call-through mock in `boot-electron-kill` | 15/15 pass, 11 ports written | 11 failed \| 4 passed | | call-through mock in `boot-electron-ready-race` | 2/2 pass | 1 failed \| 1 passed | Full `packages/tool-server` in 6 shards: 4303 passed, 1 skipped, every shard exit 0, and no `.argent` directory created under a redirected `HOME`. `eslint` 0, `prettier --check` 0, `tsc --build` 0, `tsc -p tsconfig.test.json` 0, `knip` 0 — exit codes read directly.
193 lines
7.5 KiB
TypeScript
193 lines
7.5 KiB
TypeScript
/**
|
|
* Regression tests for the ready-vs-exit race in `bootElectronApp`: a second
|
|
* instance losing Electron's single-instance lock opens its
|
|
* --remote-debugging-port listener during startup and only then quits, so the
|
|
* CDP readiness probe can answer a beat before the child's exit event lands.
|
|
* Boot must hold success for a short confirmation window and convert an exit
|
|
* arriving inside it into the early-exit failure — never report a dead
|
|
* instance as booted, tracked, or handle-registered.
|
|
*/
|
|
|
|
import { describe, it, expect, vi, beforeEach, beforeAll, afterAll } from "vitest";
|
|
import { EventEmitter } from "node:events";
|
|
import * as fs from "node:fs";
|
|
import * as http from "node:http";
|
|
import * as os from "node:os";
|
|
import * as path from "node:path";
|
|
import { scopeTempHome } from "./helpers/temp-home";
|
|
import { FAILURE_CODES, getFailureSignal } from "@argent/registry";
|
|
|
|
scopeTempHome("argent-boot-electron-race-home-");
|
|
|
|
const spawnMock = vi.fn();
|
|
|
|
vi.mock("node:child_process", async () => {
|
|
const actual = await vi.importActual<typeof import("node:child_process")>("node:child_process");
|
|
return {
|
|
...actual,
|
|
spawn: (cmd: string, args: string[], opts: unknown) => spawnMock(cmd, args, opts),
|
|
};
|
|
});
|
|
// Keep trackChromiumPort from persisting booted ports to on-disk state, and
|
|
// make "the dead instance was never tracked" assertable.
|
|
vi.mock("../src/utils/chromium-discovery", () => ({
|
|
trackChromiumPort: vi.fn(),
|
|
untrackChromiumPort: vi.fn(),
|
|
}));
|
|
|
|
import { bootElectronApp, killChromiumByPort } from "../src/tools/devices/boot-electron";
|
|
import { trackChromiumPort } from "../src/utils/chromium-discovery";
|
|
|
|
const FAKE_PID = 4242;
|
|
|
|
/** Boot pays the confirmation window on every success — mirror of the source constant. */
|
|
const BOOT_CONFIRM_WINDOW_MS = 300;
|
|
|
|
interface FakeChild extends EventEmitter {
|
|
pid: number | undefined;
|
|
stderr: EventEmitter;
|
|
unref: () => void;
|
|
kill: ReturnType<typeof vi.fn>;
|
|
exitCode: number | null;
|
|
signalCode: NodeJS.Signals | null;
|
|
}
|
|
|
|
function makeFakeChild(): FakeChild {
|
|
const ee = new EventEmitter() as FakeChild;
|
|
ee.pid = FAKE_PID;
|
|
ee.stderr = new EventEmitter();
|
|
ee.unref = () => {};
|
|
ee.kill = vi.fn(() => true);
|
|
ee.exitCode = null;
|
|
ee.signalCode = null;
|
|
return ee;
|
|
}
|
|
|
|
let appDir: string;
|
|
beforeAll(() => {
|
|
// resolveLauncher() fs-checks the app path before spawn, so the test needs
|
|
// a real directory on disk. The spawn itself is mocked, so the contents
|
|
// don't matter — only the path's existence.
|
|
appDir = fs.mkdtempSync(path.join(os.tmpdir(), "argent-boot-electron-race-test-"));
|
|
fs.writeFileSync(
|
|
path.join(appDir, "package.json"),
|
|
JSON.stringify({ name: "fake-electron-app", main: "main.js" })
|
|
);
|
|
fs.writeFileSync(path.join(appDir, "main.js"), "// fake\n");
|
|
});
|
|
afterAll(() => {
|
|
if (appDir) fs.rmSync(appDir, { recursive: true, force: true });
|
|
});
|
|
|
|
// The confirmed-exit path runs killChildEscalating against a fake child
|
|
// carrying a stand-in pid, and its group sweep signals through process.kill —
|
|
// real signals must never escape onto whatever owns that pid. Never restored:
|
|
// the unref'd 2s escalation timer can fire after the test that armed it.
|
|
vi.spyOn(process, "kill").mockImplementation(() => true);
|
|
|
|
beforeEach(() => {
|
|
spawnMock.mockReset();
|
|
vi.mocked(trackChromiumPort).mockClear();
|
|
});
|
|
|
|
/**
|
|
* Minimal CDP stub: only /json/version, which is all waitForCdpReady probes.
|
|
* `served` resolves once the first probe has been answered, so a test can
|
|
* sequence "CDP reported ready" against the child's exit.
|
|
*/
|
|
async function startCdpStub(): Promise<{ port: number; served: Promise<void>; close: () => void }> {
|
|
let markServed!: () => void;
|
|
const served = new Promise<void>((resolve) => (markServed = resolve));
|
|
const srv = http.createServer((req, res) => {
|
|
res.setHeader("content-type", "application/json");
|
|
if (req.url === "/json/version") {
|
|
res.end(JSON.stringify({ "Browser": "Chrome/Test", "Protocol-Version": "1.3" }));
|
|
markServed();
|
|
return;
|
|
}
|
|
res.statusCode = 404;
|
|
res.end();
|
|
});
|
|
await new Promise<void>((resolve) => srv.listen(0, "127.0.0.1", resolve));
|
|
const { port } = srv.address() as { port: number };
|
|
return { port, served, close: () => srv.close() };
|
|
}
|
|
|
|
describe("bootElectronApp — ready-vs-exit confirmation window", () => {
|
|
it("rejects with the early-exit failure when the child exits just after CDP first answers (single-instance-lock quit)", async () => {
|
|
const child = makeFakeChild();
|
|
spawnMock.mockReturnValue(child);
|
|
const { port, served, close } = await startCdpStub();
|
|
|
|
let unhandled = 0;
|
|
const onUnhandled = () => unhandled++;
|
|
process.on("unhandledRejection", onUnhandled);
|
|
try {
|
|
const promise = bootElectronApp({ appPath: appDir, port, readyTimeoutMs: 5000 });
|
|
promise.catch(() => {}); // observed via the assertions below
|
|
|
|
// Let the probe response reach the client and settle the readiness race
|
|
// on the success side — 50ms is loopback-safe and far inside the window.
|
|
await served;
|
|
await new Promise((r) => setTimeout(r, 50));
|
|
|
|
// The lock-losing instance closes its listener and quits.
|
|
child.exitCode = 0; // Node sets these synchronously before emitting 'exit'
|
|
child.emit("exit", 0, null);
|
|
|
|
await expect(promise).rejects.toThrow(/exited with code 0 before CDP was ready/);
|
|
const signal = getFailureSignal(await promise.catch((e: unknown) => e));
|
|
expect(signal?.error_code).toBe(FAILURE_CODES.CHROMIUM_ELECTRON_EXITED_BEFORE_READY);
|
|
expect(signal?.failure_stage).toBe("electron_early_exit");
|
|
|
|
// The dead instance must leave no trace of a successful boot: the port
|
|
// is never tracked, and the cleanup SIGTERM comes from the catch path.
|
|
expect(trackChromiumPort).not.toHaveBeenCalled();
|
|
expect(child.kill).toHaveBeenCalledWith("SIGTERM");
|
|
|
|
// No handle was retained either — a teardown on this port must take the
|
|
// raw-pid fallback instead of killing through the stale ChildProcess.
|
|
const killsAfterCleanup = child.kill.mock.calls.length;
|
|
killChromiumByPort(port, FAKE_PID);
|
|
expect(child.kill.mock.calls.length).toBe(killsAfterCleanup);
|
|
|
|
await new Promise((r) => setImmediate(r));
|
|
expect(unhandled).toBe(0);
|
|
} finally {
|
|
process.off("unhandledRejection", onUnhandled);
|
|
close();
|
|
}
|
|
});
|
|
|
|
it("still boots — after paying exactly the confirmation window — when no exit arrives inside it", async () => {
|
|
const child = makeFakeChild();
|
|
spawnMock.mockReturnValue(child);
|
|
const { port, served, close } = await startCdpStub();
|
|
|
|
try {
|
|
const promise = bootElectronApp({ appPath: appDir, port, readyTimeoutMs: 5000 });
|
|
await served;
|
|
const readyAt = Date.now();
|
|
|
|
const result = await promise;
|
|
// Small epsilon: setTimeout can fire ~1ms shy of nominal.
|
|
expect(Date.now() - readyAt).toBeGreaterThanOrEqual(BOOT_CONFIRM_WINDOW_MS - 5);
|
|
expect(result.booted).toBe(true);
|
|
expect(result.port).toBe(port);
|
|
expect(result.pid).toBe(FAKE_PID);
|
|
expect(trackChromiumPort).toHaveBeenCalledWith(port);
|
|
// ...through the mock, and no further: one that calls through satisfies
|
|
// the line above while still persisting the port for real.
|
|
expect(fs.existsSync(path.join(os.homedir(), ".argent", "chromium-cdp-ports.json"))).toBe(
|
|
false
|
|
);
|
|
|
|
// The handle was retained: teardown kills through it, not the raw pid.
|
|
killChromiumByPort(port, FAKE_PID);
|
|
expect(child.kill).toHaveBeenCalledWith("SIGTERM");
|
|
} finally {
|
|
close();
|
|
}
|
|
});
|
|
});
|