fix(ssh-tunnel): avoid failed-spawn cleanup delay

vincentkoc · web-flow · commit 1f8149cf92da · 2026-07-03T22:32:57.000-07:00
diff --git a/src/infra/ssh-tunnel.test.ts b/src/infra/ssh-tunnel.test.ts
@@ -65,6 +65,7 @@ describe("startSshPortForward", () => {
   const openServers: net.Server[] = [];
 
   afterEach(async () => {
+    vi.useRealTimers();
     while (openServers.length > 0) {
       const server = openServers.pop();
       await new Promise<void>((resolve) => {
@@ -165,37 +166,43 @@ describe("startSshPortForward", () => {
   });
 
   it("rejects with the spawn error when ssh binary is missing", async () => {
+    vi.useFakeTimers();
     const spawnError = new Error("ENOENT: no such file or directory, spawn /usr/bin/ssh");
     (spawnError as NodeJS.ErrnoException).code = "ENOENT";
+    const kill = vi.fn(() => false);
     mocks.spawn.mockImplementation(() => {
       const child = new EventEmitter() as EventEmitter & {
         killed: boolean;
-        pid: number;
+        pid?: number;
         stderr: EventEmitter & { setEncoding: (enc: string) => void };
         kill: (signal?: string) => boolean;
       };
       child.killed = false;
-      child.pid = 0;
       const stderr = new EventEmitter() as EventEmitter & { setEncoding: (enc: string) => void };
       stderr.setEncoding = () => {};
       child.stderr = stderr;
-      child.kill = () => {
-        child.killed = true;
-        queueMicrotask(() => child.emit("exit", null, "SIGTERM"));
-        return true;
-      };
-      // Emit the error asynchronously, matching real spawn behavior
-      queueMicrotask(() => child.emit("error", spawnError));
+      child.kill = kill;
+      queueMicrotask(() => {
+        child.emit("error", spawnError);
+        child.emit("close", -2, null);
+      });
       return child;
     });
 
-    await expect(
-      startSshPortForward({
-        target: "me@example.com:2222",
-        localPortPreferred: 43210,
-        remotePort: 18789,
-        timeoutMs: 500,
-      }),
-    ).rejects.toThrow("ENOENT");
+    const forwarding = startSshPortForward({
+      target: "me@example.com:2222",
+      localPortPreferred: 43210,
+      remotePort: 18789,
+      timeoutMs: 500,
+    });
+    const rejection = expect(forwarding).rejects.toMatchObject({
+      message: expect.stringContaining("ENOENT"),
+      cause: spawnError,
+    });
+
+    await vi.advanceTimersByTimeAsync(0);
+    expect(vi.getTimerCount()).toBe(0);
+    await rejection;
+    expect(kill).toHaveBeenCalledWith("SIGTERM");
   });
 });
diff --git a/src/infra/ssh-tunnel.ts b/src/infra/ssh-tunnel.ts
@@ -172,10 +172,9 @@ export async function startSshPortForward(opts: {
   });
 
   const stop = async () => {
-    if (child.killed) {
+    if (child.killed || !child.kill("SIGTERM")) {
       return;
     }
-    child.kill("SIGTERM");
     await new Promise<void>((resolve) => {
       const t = setTimeout(() => {
         try {
