fix(e2e): bound bundled runtime HTTP probes

vincentkoc · vincentkoc · commit d88681662bd9 · 2026-05-27T06:30:15.000+02:00
diff --git a/scripts/e2e/lib/bundled-plugin-install-uninstall/runtime-smoke.mjs b/scripts/e2e/lib/bundled-plugin-install-uninstall/runtime-smoke.mjs
@@ -25,6 +25,10 @@ const COMMAND_TIMEOUT_MS = readPositiveInt(
   process.env.OPENCLAW_BUNDLED_PLUGIN_RUNTIME_COMMAND_MS,
   120000,
 );
+const HTTP_PROBE_TIMEOUT_MS = readPositiveInt(
+  process.env.OPENCLAW_BUNDLED_PLUGIN_RUNTIME_HTTP_MS,
+  5000,
+);
 
 function readPositiveInt(raw, fallback) {
   const parsed = Number.parseInt(String(raw || ""), 10);
@@ -279,7 +283,7 @@ async function waitForReady(params) {
       throw new Error(`gateway exited before ready\n${tailFile(params.logPath)}`);
     }
     try {
-      const res = await fetch(`http://127.0.0.1:${params.port}/readyz`);
+      const res = await fetchHttpProbeStatus(params.port, "/readyz");
       if (res.ok) {
         return;
       }
@@ -300,9 +304,31 @@ function logShowsGatewayReady(logPath) {
   return log.includes("[gateway] ready");
 }
 
-async function httpOk(port, pathName) {
+async function fetchHttpProbeStatus(port, pathName, options = {}) {
+  const { timeoutMs = HTTP_PROBE_TIMEOUT_MS } = options;
+  const controller = new AbortController();
+  const clearProbeTimer = timeoutMs
+    ? setTimeout(() => {
+        controller.abort();
+      }, timeoutMs)
+    : undefined;
+  try {
+    const res = await fetch(`http://127.0.0.1:${port}${pathName}`, {
+      signal: controller.signal,
+    });
+    const status = { ok: res.ok, status: res.status };
+    await res.body?.cancel().catch(() => {});
+    return status;
+  } finally {
+    if (clearProbeTimer) {
+      clearTimeout(clearProbeTimer);
+    }
+  }
+}
+
+export async function httpOk(port, pathName, options = {}) {
   try {
-    const res = await fetch(`http://127.0.0.1:${port}${pathName}`);
+    const res = await fetchHttpProbeStatus(port, pathName, options);
     return res.ok;
   } catch {
     return false;
@@ -314,7 +340,7 @@ async function assertHttpOk(port, pathName) {
   let lastError;
   while (Date.now() - started < RPC_READY_TIMEOUT_MS) {
     try {
-      const res = await fetch(`http://127.0.0.1:${port}${pathName}`);
+      const res = await fetchHttpProbeStatus(port, pathName);
       if (res.ok) {
         return;
       }
@@ -332,7 +358,7 @@ async function assertReadyzProbe(options) {
   let lastError;
   while (Date.now() - started < RPC_READY_TIMEOUT_MS) {
     try {
-      const res = await fetch(`http://127.0.0.1:${options.port}/readyz`);
+      const res = await fetchHttpProbeStatus(options.port, "/readyz");
       if (res.ok) {
         return;
       }
diff --git a/test/scripts/bundled-plugin-install-uninstall-probe.test.ts b/test/scripts/bundled-plugin-install-uninstall-probe.test.ts
@@ -1,5 +1,7 @@
 import { spawnSync } from "node:child_process";
 import fs from "node:fs";
+import { createServer as createHttpServer, type Server as HttpServer } from "node:http";
+import { createServer as createNetServer, type Server as NetServer, type Socket } from "node:net";
 import os from "node:os";
 import path from "node:path";
 import { pathToFileURL } from "node:url";
@@ -93,6 +95,37 @@ function runRuntimeSmoke(root: string, args: string[]) {
   });
 }
 
+async function listenOnLoopback(server: HttpServer | NetServer): Promise<number> {
+  return new Promise((resolve, reject) => {
+    const onError = (error: Error) => {
+      server.off("error", onError);
+      reject(error);
+    };
+    server.once("error", onError);
+    server.listen(0, "127.0.0.1", () => {
+      server.off("error", onError);
+      const address = server.address();
+      if (!address || typeof address === "string") {
+        reject(new Error("server did not bind to a TCP port"));
+        return;
+      }
+      resolve(address.port);
+    });
+  });
+}
+
+async function closeServer(server: HttpServer | NetServer): Promise<void> {
+  await new Promise<void>((resolve, reject) => {
+    server.close((error?: Error) => {
+      if (error) {
+        reject(error);
+        return;
+      }
+      resolve();
+    });
+  });
+}
+
 afterEach(() => {
   for (const dir of tempDirs.splice(0)) {
     fs.rmSync(dir, { force: true, recursive: true });
@@ -135,6 +168,47 @@ describe("bundled plugin install/uninstall probe", () => {
     expect(Date.now() - startedAt).toBeLessThan(2_500);
   });
 
+  it("accepts successful runtime HTTP probes", async () => {
+    const runtimeSmoke = await import(pathToFileURL(runtimeSmokePath).href);
+    const server = createHttpServer((_request, response) => {
+      response.writeHead(204);
+      response.end();
+    });
+
+    try {
+      const port = await listenOnLoopback(server);
+
+      await expect(runtimeSmoke.httpOk(port, "/healthz", { timeoutMs: 1000 })).resolves.toBe(true);
+    } finally {
+      await closeServer(server);
+    }
+  });
+
+  it("bounds stalled runtime HTTP probes", async () => {
+    const runtimeSmoke = await import(pathToFileURL(runtimeSmokePath).href);
+    const sockets = new Set<Socket>();
+    const server = createNetServer((socket) => {
+      sockets.add(socket);
+      socket.on("close", () => {
+        sockets.delete(socket);
+      });
+    });
+
+    try {
+      const port = await listenOnLoopback(server);
+      const startedAt = Date.now();
+
+      await expect(runtimeSmoke.httpOk(port, "/healthz", { timeoutMs: 100 })).resolves.toBe(false);
+
+      expect(Date.now() - startedAt).toBeLessThan(2_500);
+    } finally {
+      for (const socket of sockets) {
+        socket.destroy();
+      }
+      await closeServer(server);
+    }
+  });
+
   it("creates runtime smoke state with OPENCLAW_HOME at the test home", async () => {
     const runtimeSmoke = await import(pathToFileURL(runtimeSmokePath).href);
     const env = runtimeSmoke.createIsolatedStateEnv("runtime-env");
