@flrande/browserctl 0.1.0 → 0.2.0-dev.12.1

package/apps/browserd/src/main.test.ts

@@ -1,9 +1,10 @@
-import { describe, expect, it } from "vitest";
+import { beforeEach, describe, expect, it } from "vitest";
 import { PassThrough } from "node:stream";
 import { createConnection } from "node:net";
 
 import { createContainer, loadBrowserdConfig } from "./container";
 import { bootstrapBrowserd } from "./bootstrap";
+import { reserveLoopbackPort } from "./test-port";
 
 function waitForNextJsonLine(stream: PassThrough): Promise<Record<string, unknown>> {
   return new Promise((resolve, reject) => {
@@ -78,11 +79,33 @@ function sendTcpToolRequest(
   });
 }
 
+let testRelayPort = 0;
+let testTcpPort = 0;
+
+beforeEach(async () => {
+  testRelayPort = await reserveLoopbackPort();
+  testTcpPort = await reserveLoopbackPort();
+  while (testTcpPort === testRelayPort) {
+    testTcpPort = await reserveLoopbackPort();
+  }
+});
+
+function createTestEnv(
+  overrides: Record<string, string | undefined> = {}
+): Record<string, string | undefined> {
+  return {
+    BROWSERD_CHROME_RELAY_URL: `http://127.0.0.1:${testRelayPort}`,
+    ...overrides
+  };
+}
+
 describe("browserd container", () => {
   it("uses secure defaults for new security config fields", () => {
     const config = loadBrowserdConfig({});
 
-    expect(config.defaultDriver).toBe("managed-local");
+    expect(config.defaultDriver).toBe("chrome-relay");
+    expect(config.chromeRelayMode).toBe("extension");
+    expect(config.chromeRelayExtensionToken).toBe("browserctl-relay");
     expect(config.managedLocalEnabled).toBe(true);
     expect(config.uploadRoot).toBeUndefined();
     expect(config.downloadRoot).toBeUndefined();
@@ -91,12 +114,13 @@ describe("browserd container", () => {
   });
 
   it("registers managed-local, managed, chrome-relay, and remote-cdp drivers by default", () => {
-    const c = createContainer();
+    const c = createContainer(loadBrowserdConfig(createTestEnv()));
 
     expect(c.drivers.has("managed-local")).toBe(true);
     expect(c.drivers.has("managed")).toBe(true);
     expect(c.drivers.has("chrome-relay")).toBe(true);
     expect(c.drivers.has("remote-cdp")).toBe(true);
+    c.close();
   });
 
   it("uses env override in loadBrowserdConfig", () => {
@@ -110,7 +134,7 @@ describe("browserd container", () => {
 
     expect(config.remoteCdpUrl).toBe("http://127.0.0.1:9333/devtools/browser/override");
     expect(config.chromeRelayUrl).toBe("http://127.0.0.1:9223");
-    expect(config.defaultDriver).toBe("managed-local");
+    expect(config.defaultDriver).toBe("chrome-relay");
     expect(config.managedLocalEnabled).toBe(true);
     expect(config.uploadRoot).toBe("C:\\safe\\uploads");
     expect(config.downloadRoot).toBe("C:\\safe\\downloads");
@@ -132,31 +156,42 @@ describe("browserd container", () => {
     expect(config.chromeRelayExtensionRequestTimeoutMs).toBe(7000);
   });
 
-  it("requires extension relay token when extension mode is enabled", () => {
-    expect(() =>
-      loadBrowserdConfig({
-        BROWSERD_CHROME_RELAY_MODE: "extension"
-      })
-    ).toThrow("BROWSERD_CHROME_RELAY_EXTENSION_TOKEN");
+  it("respects explicit cdp relay mode override", () => {
+    const config = loadBrowserdConfig({
+      BROWSERD_CHROME_RELAY_MODE: "cdp"
+    });
+
+    expect(config.chromeRelayMode).toBe("cdp");
+  });
+
+  it("uses default extension relay token when extension mode is enabled", () => {
+    const config = loadBrowserdConfig({
+      BROWSERD_CHROME_RELAY_MODE: "extension"
+    });
+
+    expect(config.chromeRelayMode).toBe("extension");
+    expect(config.chromeRelayExtensionToken).toBe("browserctl-relay");
   });
 
-  it("defaults to managed when managed-local is explicitly disabled", () => {
+  it("keeps chrome-relay as default when managed-local is explicitly disabled", () => {
     const config = loadBrowserdConfig({
       BROWSERD_MANAGED_LOCAL_ENABLED: "false"
     });
 
     expect(config.managedLocalEnabled).toBe(false);
-    expect(config.defaultDriver).toBe("managed");
+    expect(config.defaultDriver).toBe("chrome-relay");
   });
 
   it("does not register managed-local driver when explicitly disabled", () => {
     const c = createContainer(
       loadBrowserdConfig({
+        ...createTestEnv(),
         BROWSERD_MANAGED_LOCAL_ENABLED: "false"
       })
     );
 
     expect(c.drivers.has("managed-local")).toBe(false);
+    c.close();
   });
 });
 
@@ -165,7 +200,7 @@ describe("browserd bootstrap", () => {
     const input = new PassThrough();
     const output = new PassThrough();
 
-    const runtime = bootstrapBrowserd({ input, output });
+    const runtime = bootstrapBrowserd({ env: createTestEnv(), input, output });
 
     expect(runtime.mcpStdioStarted).toBe(true);
     expect(runtime.container.drivers.has("managed")).toBe(true);
@@ -179,13 +214,13 @@ describe("browserd bootstrap", () => {
   });
 
   it("supports tcp transport mode for persistent daemon use", async () => {
-    const port = 41419;
+    const port = testTcpPort;
     const runtime = bootstrapBrowserd({
-      env: {
+      env: createTestEnv({
         BROWSERD_TRANSPORT: "tcp",
         BROWSERD_PORT: String(port),
         BROWSERD_AUTH_TOKEN: "tcp-token"
-      }
+      })
     });
 
     const response = await sendTcpToolRequest(port, {
@@ -215,10 +250,10 @@ describe("browserd bootstrap", () => {
     try {
       expect(() => {
         runtime = bootstrapBrowserd({
-          env: {
+          env: createTestEnv({
             BROWSERD_TRANSPORT: "tcp",
-            BROWSERD_PORT: "41420"
-          }
+            BROWSERD_PORT: String(testTcpPort)
+          })
         });
       }).toThrow("BROWSERD_AUTH_TOKEN");
     } finally {
@@ -229,7 +264,7 @@ describe("browserd bootstrap", () => {
   it("processes line-delimited requests and writes response with id", async () => {
     const input = new PassThrough();
     const output = new PassThrough();
-    const runtime = bootstrapBrowserd({ input, output, stdioProtocol: "legacy" });
+    const runtime = bootstrapBrowserd({ env: createTestEnv(), input, output, stdioProtocol: "legacy" });
 
     const response = await sendToolRequest(input, output, {
       id: "request-1",
@@ -247,7 +282,7 @@ describe("browserd bootstrap", () => {
     expect(response.data).toMatchObject({
       kind: "browserd",
       ready: true,
-      driver: "managed-local"
+      driver: "chrome-relay"
     });
 
     runtime.close();
@@ -259,10 +294,10 @@ describe("browserd bootstrap", () => {
     const input = new PassThrough();
     const output = new PassThrough();
     const runtime = bootstrapBrowserd({
-      env: {
+      env: createTestEnv({
         BROWSERD_MANAGED_LOCAL_ENABLED: "true",
         BROWSERD_DEFAULT_DRIVER: "managed-local"
-      },
+      }),
       input,
       output,
       stdioProtocol: "legacy"
@@ -297,10 +332,10 @@ describe("browserd bootstrap", () => {
     const input = new PassThrough();
     const output = new PassThrough();
     const runtime = bootstrapBrowserd({
-      env: {
+      env: createTestEnv({
         BROWSERD_DEFAULT_DRIVER: "managed-local",
         BROWSERD_MANAGED_LOCAL_ENABLED: "false"
-      },
+      }),
       input,
       output,
       stdioProtocol: "legacy"
@@ -331,9 +366,9 @@ describe("browserd bootstrap", () => {
     const input = new PassThrough();
     const output = new PassThrough();
     const runtime = bootstrapBrowserd({
-      env: {
+      env: createTestEnv({
         BROWSERD_AUTH_TOKEN: "secret-token"
-      },
+      }),
       input,
       output,
       stdioProtocol: "legacy"
@@ -362,9 +397,9 @@ describe("browserd bootstrap", () => {
     const input = new PassThrough();
     const output = new PassThrough();
     const runtime = bootstrapBrowserd({
-      env: {
+      env: createTestEnv({
         BROWSERD_AUTH_TOKEN: "secret-token"
-      },
+      }),
       input,
       output,
       stdioProtocol: "legacy"
@@ -394,11 +429,11 @@ describe("browserd bootstrap", () => {
     const input = new PassThrough();
     const output = new PassThrough();
     const runtime = bootstrapBrowserd({
-      env: {
+      env: createTestEnv({
         BROWSERD_DEFAULT_DRIVER: "managed",
         BROWSERD_AUTH_TOKEN: "secret-token",
         BROWSERD_AUTH_SCOPES: "read"
-      },
+      }),
       input,
       output,
       stdioProtocol: "legacy"
@@ -429,11 +464,11 @@ describe("browserd bootstrap", () => {
     const input = new PassThrough();
     const output = new PassThrough();
     const runtime = bootstrapBrowserd({
-      env: {
+      env: createTestEnv({
         BROWSERD_DEFAULT_DRIVER: "managed",
         BROWSERD_AUTH_TOKEN: "secret-token",
         BROWSERD_AUTH_SCOPES: "read,act"
-      },
+      }),
       input,
       output,
       stdioProtocol: "legacy"
@@ -494,10 +529,10 @@ describe("browserd bootstrap", () => {
     const input = new PassThrough();
     const output = new PassThrough();
     const runtime = bootstrapBrowserd({
-      env: {
+      env: createTestEnv({
         BROWSERD_DEFAULT_DRIVER: "managed",
         BROWSERD_UPLOAD_ROOT: "C:\\allowed\\uploads"
-      },
+      }),
       input,
       output,
       stdioProtocol: "legacy"
@@ -539,9 +574,9 @@ describe("browserd bootstrap", () => {
     const input = new PassThrough();
     const output = new PassThrough();
     const runtime = bootstrapBrowserd({
-      env: {
+      env: createTestEnv({
         BROWSERD_DEFAULT_DRIVER: "managed"
-      },
+      }),
       input,
       output,
       stdioProtocol: "legacy"
@@ -584,10 +619,10 @@ describe("browserd bootstrap", () => {
     const input = new PassThrough();
     const output = new PassThrough();
     const runtime = bootstrapBrowserd({
-      env: {
+      env: createTestEnv({
         BROWSERD_DEFAULT_DRIVER: "managed",
         BROWSERD_DOWNLOAD_ROOT: "C:\\allowed\\downloads"
-      },
+      }),
       input,
       output,
       stdioProtocol: "legacy"
@@ -646,9 +681,9 @@ describe("browserd bootstrap", () => {
     const input = new PassThrough();
     const output = new PassThrough();
     const runtime = bootstrapBrowserd({
-      env: {
+      env: createTestEnv({
         BROWSERD_DEFAULT_DRIVER: "managed"
-      },
+      }),
       input,
       output,
       stdioProtocol: "legacy"
@@ -690,9 +725,9 @@ describe("browserd bootstrap", () => {
     const input = new PassThrough();
     const output = new PassThrough();
     const runtime = bootstrapBrowserd({
-      env: {
+      env: createTestEnv({
         BROWSERD_DEFAULT_DRIVER: "managed"
-      },
+      }),
       input,
       output,
       stdioProtocol: "legacy"
@@ -739,9 +774,9 @@ describe("browserd bootstrap", () => {
     const input = new PassThrough();
     const output = new PassThrough();
     const runtime = bootstrapBrowserd({
-      env: {
+      env: createTestEnv({
         BROWSERD_DEFAULT_DRIVER: "managed"
-      },
+      }),
       input,
       output,
       stdioProtocol: "legacy"
@@ -819,7 +854,7 @@ describe("browserd bootstrap", () => {
   it("preserves id and trace/session metadata when queue-level error handling runs", async () => {
     const input = new PassThrough();
     const output = new PassThrough();
-    const runtime = bootstrapBrowserd({ input, output, stdioProtocol: "legacy" });
+    const runtime = bootstrapBrowserd({ env: createTestEnv(), input, output, stdioProtocol: "legacy" });
 
     const originalWrite = output.write.bind(output);
     let shouldThrow = true;

package/apps/browserd/src/test-port.ts

@@ -0,0 +1,26 @@
+import { createServer } from "node:net";
+
+export async function reserveLoopbackPort(): Promise<number> {
+  return await new Promise<number>((resolve, reject) => {
+    const server = createServer();
+
+    server.once("error", reject);
+    server.listen(0, "127.0.0.1", () => {
+      const address = server.address();
+      if (typeof address !== "object" || address === null) {
+        server.close(() => reject(new Error("Failed to reserve loopback port.")));
+        return;
+      }
+
+      const port = address.port;
+      server.close((error) => {
+        if (error !== undefined) {
+          reject(error);
+          return;
+        }
+
+        resolve(port);
+      });
+    });
+  });
+}