fix(ports): reuse canonical multi-address probe

vincentkoc · vincentkoc · commit 61af76063bf5 · 2026-06-23T23:48:00.000+08:00
diff --git a/src/cli/program.force.test.ts b/src/cli/program.force.test.ts
@@ -9,28 +9,10 @@ vi.mock("node:child_process", async () => {
   };
 });
 
-const tryListenOnPortMock = vi.hoisted(() => vi.fn());
+const probePortUsageMock = vi.hoisted(() => vi.fn());
 
 vi.mock("../infra/ports-probe.js", () => ({
-  tryListenOnPort: (...args: unknown[]) => tryListenOnPortMock(...args),
-  probePortUsage: async (port: number) => {
-    let sawUnknown = false;
-    for (const host of ["127.0.0.1", "0.0.0.0", "::1", "::"]) {
-      try {
-        await tryListenOnPortMock({ port, host, exclusive: true });
-      } catch (err: unknown) {
-        const code = (err as { code?: unknown }).code;
-        if (code === "EADDRINUSE") {
-          return "busy";
-        }
-        if (code === "EADDRNOTAVAIL" || code === "EAFNOSUPPORT") {
-          continue;
-        }
-        sawUnknown = true;
-      }
-    }
-    return sawUnknown ? "unknown" : "free";
-  },
+  probePortUsage: (...args: unknown[]) => probePortUsageMock(...args),
 }));
 
 import { execFileSync } from "node:child_process";
@@ -51,10 +33,8 @@ describe("gateway --force helpers", () => {
     vi.clearAllMocks();
     originalKill = process.kill.bind(process);
     originalPlatform = process.platform;
-    tryListenOnPortMock.mockReset();
-    tryListenOnPortMock.mockRejectedValue(
-      Object.assign(new Error("in use"), { code: "EADDRINUSE" }),
-    );
+    probePortUsageMock.mockReset();
+    probePortUsageMock.mockResolvedValue("busy");
     // Pin to linux so all lsof tests are platform-invariant.
     Object.defineProperty(process, "platform", { value: "linux", configurable: true });
   });
@@ -83,7 +63,7 @@ describe("gateway --force helpers", () => {
   });
 
   it("skips lsof when the port is already bindable", async () => {
-    tryListenOnPortMock.mockResolvedValue(undefined);
+    probePortUsageMock.mockResolvedValue("free");
 
     const result = await forceFreePortAndWait(18789, { timeoutMs: 500, intervalMs: 100 });
 
@@ -217,9 +197,7 @@ describe("gateway --force helpers", () => {
       }
       return "18789/tcp: 4242\n";
     });
-    tryListenOnPortMock
-      .mockRejectedValueOnce(Object.assign(new Error("in use"), { code: "EADDRINUSE" }))
-      .mockResolvedValue(undefined);
+    probePortUsageMock.mockResolvedValueOnce("busy").mockResolvedValue("free");
 
     const result = await forceFreePortAndWait(18789, { timeoutMs: 500, intervalMs: 100 });
 
@@ -249,15 +227,12 @@ describe("gateway --force helpers", () => {
       return "";
     });
 
-    const busyErr = Object.assign(new Error("in use"), { code: "EADDRINUSE" });
-    // Each probePortUsage call probes up to 4 hosts; the last check needs all
-    // hosts free, so use permanent mockResolvedValue instead of once.
-    tryListenOnPortMock
-      .mockRejectedValueOnce(busyErr)
-      .mockRejectedValueOnce(busyErr)
-      .mockRejectedValueOnce(busyErr)
-      .mockRejectedValueOnce(busyErr)
-      .mockResolvedValue(undefined);
+    probePortUsageMock
+      .mockResolvedValueOnce("busy")
+      .mockResolvedValueOnce("busy")
+      .mockResolvedValueOnce("busy")
+      .mockResolvedValueOnce("busy")
+      .mockResolvedValue("free");
 
     const promise = forceFreePortAndWait(18789, {
       timeoutMs: 300,
@@ -279,9 +254,7 @@ describe("gateway --force helpers", () => {
 
   it("throws when lsof is unavailable and fuser is missing", async () => {
     // An inconclusive four-host probe must continue into the cleanup tools.
-    tryListenOnPortMock.mockRejectedValue(
-      Object.assign(new Error("probe failed"), { code: "EIO" }),
-    );
+    probePortUsageMock.mockResolvedValue("unknown");
     (execFileSync as unknown as Mock).mockImplementation((cmd: string) => {
       const err = new Error(`spawnSync ${cmd} ENOENT`) as NodeJS.ErrnoException;
       err.code = "ENOENT";
