refactor(test): reuse withGatewayServer in auth/http suites

src/gateway/openai-http.e2e.test.ts

@@ -2,7 +2,13 @@ import { afterAll, beforeAll, describe, expect, it } from "vitest";
 import { HISTORY_CONTEXT_MARKER } from "../auto-reply/reply/history.js";
 import { CURRENT_MESSAGE_MARKER } from "../auto-reply/reply/mentions.js";
 import { emitAgentEvent } from "../infra/agent-events.js";
-import { agentCommand, getFreePort, installGatewayTestHooks, testState } from "./test-helpers.js";
+import {
+  agentCommand,
+  getFreePort,
+  installGatewayTestHooks,
+  testState,
+  withGatewayServer,
+} from "./test-helpers.js";
 
 installGatewayTestHooks({ scope: "suite" });
 
@@ -345,20 +351,14 @@ describe("OpenAI-compatible HTTP API (e2e)", () => {
   });
 
   it("returns 429 for repeated failed auth when gateway.auth.rateLimit is configured", async () => {
-    const { startGatewayServer } = await import("./server.js");
     testState.gatewayAuth = {
       mode: "token",
       token: "secret",
       rateLimit: { maxAttempts: 1, windowMs: 60_000, lockoutMs: 60_000, exemptLoopback: false },
       // oxlint-disable-next-line typescript/no-explicit-any
     } as any;
-    const port = await getFreePort();
+    await withGatewayServer(
-    const server = await startGatewayServer(port, {
+      async ({ port }) => {
-      host: "127.0.0.1",
-      controlUiEnabled: false,
-      openAiChatCompletionsEnabled: true,
-    });
-    try {
         const headers = {
           "content-type": "application/json",
           authorization: "Bearer wrong",
@@ -382,9 +382,15 @@ describe("OpenAI-compatible HTTP API (e2e)", () => {
         });
         expect(second.status).toBe(429);
         expect(second.headers.get("retry-after")).toBeTruthy();
-    } finally {
+      },
-      await server.close({ reason: "rate-limit auth test done" });
+      {
-    }
+        serverOptions: {
+          host: "127.0.0.1",
+          controlUiEnabled: false,
+          openAiChatCompletionsEnabled: true,
+        },
+      },
+    );
   });
 
   it("streams SSE chunks when stream=true", async () => {

src/gateway/server.auth.e2e.test.ts

@@ -14,6 +14,7 @@ import {
   startServerWithClient,
   testTailscaleWhois,
   testState,
+  withGatewayServer,
 } from "./test-helpers.js";
 
 installGatewayTestHooks({ scope: "suite" });
@@ -596,8 +597,8 @@ describe("gateway server auth/connect", () => {
     } as any);
     const prevToken = process.env.OPENCLAW_GATEWAY_TOKEN;
     process.env.OPENCLAW_GATEWAY_TOKEN = "secret";
-    const port = await getFreePort();
+    try {
-    const server = await startGatewayServer(port);
+      await withGatewayServer(async ({ port }) => {
         const ws = new WebSocket(`ws://127.0.0.1:${port}`, {
           headers: {
             origin: "https://localhost",
@@ -647,12 +648,14 @@ describe("gateway server auth/connect", () => {
         });
         expect(res.ok).toBe(true);
         ws.close();
-    await server.close();
+      });
+    } finally {
       if (prevToken === undefined) {
         delete process.env.OPENCLAW_GATEWAY_TOKEN;
       } else {
         process.env.OPENCLAW_GATEWAY_TOKEN = prevToken;
       }
+    }
   });
 
   test("allows control ui with stale device identity when device auth is disabled", async () => {
@@ -660,8 +663,8 @@ describe("gateway server auth/connect", () => {
     testState.gatewayAuth = { mode: "token", token: "secret" };
     const prevToken = process.env.OPENCLAW_GATEWAY_TOKEN;
     process.env.OPENCLAW_GATEWAY_TOKEN = "secret";
-    const port = await getFreePort();
+    try {
-    const server = await startGatewayServer(port);
+      await withGatewayServer(async ({ port }) => {
         const ws = await openWs(port, { origin: originForPort(port) });
         const { loadOrCreateDeviceIdentity, publicKeyRawBase64UrlFromPem, signDevicePayload } =
           await import("../infra/device-identity.js");
@@ -695,12 +698,14 @@ describe("gateway server auth/connect", () => {
         expect(res.ok).toBe(true);
         expect((res.payload as { auth?: unknown } | undefined)?.auth).toBeUndefined();
         ws.close();
-    await server.close();
+      });
+    } finally {
       if (prevToken === undefined) {
         delete process.env.OPENCLAW_GATEWAY_TOKEN;
       } else {
         process.env.OPENCLAW_GATEWAY_TOKEN = prevToken;
       }
+    }
   });
 
   test("accepts device token auth for paired device", async () => {