chore: format sources and update protocol outputs

2026-01-15 05:17:03 +00:00
parent 2d066b8715
commit 139f80a291
33 changed files with 186 additions and 223 deletions
--- a/src/browser/cdp.ts
+++ b/src/browser/cdp.ts
@@ -159,10 +159,7 @@ function axValue(v: unknown): string {
  return "";
 }

-export function formatAriaSnapshot(
-  nodes: RawAXNode[],
-  limit: number,
-): AriaSnapshotNode[] {
+export function formatAriaSnapshot(nodes: RawAXNode[], limit: number): AriaSnapshotNode[] {
  const byId = new Map<string, RawAXNode>();
  for (const n of nodes) {
    if (n.nodeId) byId.set(n.nodeId, n);
--- a/src/browser/client-fetch.ts
+++ b/src/browser/client-fetch.ts
@@ -72,14 +72,11 @@ export async function fetchBrowserJson<T>(
      }
      return h;
    })();
-    res = await fetch(
-      url,
-      {
-        ...init,
-        ...(mergedHeaders ? { headers: mergedHeaders } : {}),
-        signal: ctrl.signal,
-      } as RequestInit,
-    );
+    res = await fetch(url, {
+      ...init,
+      ...(mergedHeaders ? { headers: mergedHeaders } : {}),
+      signal: ctrl.signal,
+    } as RequestInit);
  } catch (err) {
    throw enhanceBrowserFetchError(url, err, timeoutMs);
  } finally {
--- a/src/browser/client.ts
+++ b/src/browser/client.ts
@@ -159,20 +159,17 @@ export async function browserCreateProfile(
    driver?: "clawd" | "extension";
  },
 ): Promise<BrowserCreateProfileResult> {
-  return await fetchBrowserJson<BrowserCreateProfileResult>(
-    `${baseUrl}/profiles/create`,
-    {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({
-        name: opts.name,
-        color: opts.color,
-        cdpUrl: opts.cdpUrl,
-        driver: opts.driver,
-      }),
-      timeoutMs: 10000,
-    },
-  );
+  return await fetchBrowserJson<BrowserCreateProfileResult>(`${baseUrl}/profiles/create`, {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({
+      name: opts.name,
+      color: opts.color,
+      cdpUrl: opts.cdpUrl,
+      driver: opts.driver,
+    }),
+    timeoutMs: 10000,
+  });
 }

 export type BrowserDeleteProfileResult = {
--- a/src/browser/extension-relay.test.ts
+++ b/src/browser/extension-relay.test.ts
@@ -105,9 +105,7 @@ describe("chrome extension relay server", () => {
    cdpUrl = `http://127.0.0.1:${port}`;
    await ensureChromeExtensionRelayServer({ cdpUrl });

-    const v1 = (await fetch(`${cdpUrl}/json/version`).then((r) =>
-      r.json(),
-    )) as {
+    const v1 = (await fetch(`${cdpUrl}/json/version`).then((r) => r.json())) as {
      webSocketDebuggerUrl?: string;
    };
    expect(v1.webSocketDebuggerUrl).toBeUndefined();
@@ -115,9 +113,7 @@ describe("chrome extension relay server", () => {
    const ext = new WebSocket(`ws://127.0.0.1:${port}/extension`);
    await waitForOpen(ext);

-    const v2 = (await fetch(`${cdpUrl}/json/version`).then((r) =>
-      r.json(),
-    )) as {
+    const v2 = (await fetch(`${cdpUrl}/json/version`).then((r) => r.json())) as {
      webSocketDebuggerUrl?: string;
    };
    expect(String(v2.webSocketDebuggerUrl ?? "")).toContain(`/cdp`);
@@ -153,15 +149,11 @@ describe("chrome extension relay server", () => {
      }),
    );

-    const list = (await fetch(`${cdpUrl}/json/list`).then((r) =>
-      r.json(),
-    )) as Array<{
+    const list = (await fetch(`${cdpUrl}/json/list`).then((r) => r.json())) as Array<{
      id?: string;
      url?: string;
    }>;
-    expect(
-      list.some((t) => t.id === "t1" && t.url === "https://example.com"),
-    ).toBe(true);
+    expect(list.some((t) => t.id === "t1" && t.url === "https://example.com")).toBe(true);

    const cdp = new WebSocket(`ws://127.0.0.1:${port}/cdp`);
    await waitForOpen(cdp);
--- a/src/browser/extension-relay.ts
+++ b/src/browser/extension-relay.ts
@@ -114,21 +114,13 @@ function parseBaseUrl(raw: string): {
 } {
  const parsed = new URL(raw.trim().replace(/\/$/, ""));
  if (parsed.protocol !== "http:" && parsed.protocol !== "https:") {
-    throw new Error(
-      `extension relay cdpUrl must be http(s), got ${parsed.protocol}`,
-    );
+    throw new Error(`extension relay cdpUrl must be http(s), got ${parsed.protocol}`);
  }
  const host = parsed.hostname;
  const port =
-    parsed.port?.trim() !== ""
-      ? Number(parsed.port)
-      : parsed.protocol === "https:"
-        ? 443
-        : 80;
+    parsed.port?.trim() !== "" ? Number(parsed.port) : parsed.protocol === "https:" ? 443 : 80;
  if (!Number.isFinite(port) || port <= 0 || port > 65535) {
-    throw new Error(
-      `extension relay cdpUrl has invalid port: ${parsed.port || "(empty)"}`,
-    );
+    throw new Error(`extension relay cdpUrl has invalid port: ${parsed.port || "(empty)"}`);
  }
  return { host, port, baseUrl: parsed.toString().replace(/\/$/, "") };
 }
@@ -162,9 +154,7 @@ export async function ensureChromeExtensionRelayServer(opts: {
 }): Promise<ChromeExtensionRelayServer> {
  const info = parseBaseUrl(opts.cdpUrl);
  if (!isLoopbackHost(info.host)) {
-    throw new Error(
-      `extension relay requires loopback cdpUrl host (got ${info.host})`,
-    );
+    throw new Error(`extension relay requires loopback cdpUrl host (got ${info.host})`);
  }

  const existing = serversByPort.get(info.port);
@@ -184,9 +174,7 @@ export async function ensureChromeExtensionRelayServer(opts: {
  >();
  let nextExtensionId = 1;

-  const sendToExtension = async (
-    payload: ExtensionForwardCommandMessage,
-  ): Promise<unknown> => {
+  const sendToExtension = async (payload: ExtensionForwardCommandMessage): Promise<unknown> => {
    const ws = extensionWs;
    if (!ws || ws.readyState !== WebSocket.OPEN) {
      throw new Error("Chrome extension not connected");
@@ -195,9 +183,7 @@ export async function ensureChromeExtensionRelayServer(opts: {
    return await new Promise<unknown>((resolve, reject) => {
      const timer = setTimeout(() => {
        pendingExtension.delete(payload.id);
-        reject(
-          new Error(`extension request timeout: ${payload.params.method}`),
-        );
+        reject(new Error(`extension request timeout: ${payload.params.method}`));
      }, 30_000);
      pendingExtension.set(payload.id, { resolve, reject, timer });
    });
@@ -216,10 +202,7 @@ export async function ensureChromeExtensionRelayServer(opts: {
    ws.send(JSON.stringify(res));
  };

-  const ensureTargetEventsForClient = (
-    ws: WebSocket,
-    mode: "autoAttach" | "discover",
-  ) => {
+  const ensureTargetEventsForClient = (ws: WebSocket, mode: "autoAttach" | "discover") => {
    for (const target of connectedTargets.values()) {
      if (mode === "autoAttach") {
        ws.send(
@@ -267,8 +250,7 @@ export async function ensureChromeExtensionRelayServer(opts: {
        };
      case "Target.getTargetInfo": {
        const params = (cmd.params ?? {}) as { targetId?: string };
-        const targetId =
-          typeof params.targetId === "string" ? params.targetId : undefined;
+        const targetId = typeof params.targetId === "string" ? params.targetId : undefined;
        if (targetId) {
          for (const t of connectedTargets.values()) {
            if (t.targetId === targetId) return { targetInfo: t.targetInfo };
@@ -283,8 +265,7 @@ export async function ensureChromeExtensionRelayServer(opts: {
      }
      case "Target.attachToTarget": {
        const params = (cmd.params ?? {}) as { targetId?: string };
-        const targetId =
-          typeof params.targetId === "string" ? params.targetId : undefined;
+        const targetId = typeof params.targetId === "string" ? params.targetId : undefined;
        if (!targetId) throw new Error("targetId required");
        for (const t of connectedTargets.values()) {
          if (t.targetId === targetId) return { sessionId: t.sessionId };
@@ -458,9 +439,7 @@ export async function ensureChromeExtensionRelayServer(opts: {

    const ping = setInterval(() => {
      if (ws.readyState !== WebSocket.OPEN) return;
-      ws.send(
-        JSON.stringify({ method: "ping" } satisfies ExtensionPingMessage),
-      );
+      ws.send(JSON.stringify({ method: "ping" } satisfies ExtensionPingMessage));
    }, 5000);

    ws.on("message", (data) => {
@@ -471,21 +450,12 @@ export async function ensureChromeExtensionRelayServer(opts: {
        return;
      }

-      if (
-        parsed &&
-        typeof parsed === "object" &&
-        "id" in parsed &&
-        typeof parsed.id === "number"
-      ) {
+      if (parsed && typeof parsed === "object" && "id" in parsed && typeof parsed.id === "number") {
        const pending = pendingExtension.get(parsed.id);
        if (!pending) return;
        pendingExtension.delete(parsed.id);
        clearTimeout(pending.timer);
-        if (
-          "error" in parsed &&
-          typeof parsed.error === "string" &&
-          parsed.error.trim()
-        ) {
+        if ("error" in parsed && typeof parsed.error === "string" && parsed.error.trim()) {
          pending.reject(new Error(parsed.error));
        } else {
          pending.resolve((parsed as ExtensionResponseMessage).result);
@@ -495,10 +465,7 @@ export async function ensureChromeExtensionRelayServer(opts: {

      if (parsed && typeof parsed === "object" && "method" in parsed) {
        if ((parsed as ExtensionPongMessage).method === "pong") return;
-        if (
-          (parsed as ExtensionForwardEventMessage).method !== "forwardCDPEvent"
-        )
-          return;
+        if ((parsed as ExtensionForwardEventMessage).method !== "forwardCDPEvent") return;
        const evt = parsed as ExtensionForwardEventMessage;
        const method = evt.params?.method;
        const params = evt.params?.params;
@@ -591,8 +558,7 @@ export async function ensureChromeExtensionRelayServer(opts: {
        }
        if (cmd.method === "Target.attachToTarget") {
          const params = (cmd.params ?? {}) as { targetId?: string };
-          const targetId =
-            typeof params.targetId === "string" ? params.targetId : undefined;
+          const targetId = typeof params.targetId === "string" ? params.targetId : undefined;
          if (targetId) {
            const target = Array.from(connectedTargets.values()).find(
              (t) => t.targetId === targetId,
@@ -669,9 +635,7 @@ export async function ensureChromeExtensionRelayServer(opts: {
  return relay;
 }

-export async function stopChromeExtensionRelayServer(opts: {
-  cdpUrl: string;
-}): Promise<boolean> {
+export async function stopChromeExtensionRelayServer(opts: { cdpUrl: string }): Promise<boolean> {
  const info = parseBaseUrl(opts.cdpUrl);
  const existing = serversByPort.get(info.port);
  if (!existing) return false;
--- a/src/browser/routes/basic.ts
+++ b/src/browser/routes/basic.ts
@@ -111,9 +111,10 @@ export function registerBrowserBasicRoutes(app: express.Express, ctx: BrowserRou
    const name = toStringOrEmpty((req.body as { name?: unknown })?.name);
    const color = toStringOrEmpty((req.body as { color?: unknown })?.color);
    const cdpUrl = toStringOrEmpty((req.body as { cdpUrl?: unknown })?.cdpUrl);
-    const driver = toStringOrEmpty(
-      (req.body as { driver?: unknown })?.driver,
-    ) as "clawd" | "extension" | "";
+    const driver = toStringOrEmpty((req.body as { driver?: unknown })?.driver) as
+      | "clawd"
+      | "extension"
+      | "";

    if (!name) return jsonError(res, 400, "name is required");

--- a/src/browser/server-context.ts
+++ b/src/browser/server-context.ts
@@ -342,9 +342,7 @@ function createProfileContext(

  const resetProfile = async () => {
    if (profile.driver === "extension") {
-      await stopChromeExtensionRelayServer({ cdpUrl: profile.cdpUrl }).catch(
-        () => {},
-      );
+      await stopChromeExtensionRelayServer({ cdpUrl: profile.cdpUrl }).catch(() => {});
      return { moved: false, from: profile.cdpUrl };
    }
    if (!profile.cdpIsLoopback) {
--- a/src/browser/server.ts
+++ b/src/browser/server.ts
@@ -3,11 +3,7 @@ import express from "express";

 import { loadConfig } from "../config/config.js";
 import { createSubsystemLogger } from "../logging.js";
-import {
-  resolveBrowserConfig,
-  resolveProfile,
-  shouldStartLocalBrowserServer,
-} from "./config.js";
+import { resolveBrowserConfig, resolveProfile, shouldStartLocalBrowserServer } from "./config.js";
 import { ensureChromeExtensionRelayServer } from "./extension-relay.js";
 import { registerBrowserRoutes } from "./routes/index.js";
 import { type BrowserServerState, createBrowserRouteContext } from "./server-context.js";
@@ -61,13 +57,9 @@ export async function startBrowserControlServerFromConfig(): Promise<BrowserServ
  for (const name of Object.keys(resolved.profiles)) {
    const profile = resolveProfile(resolved, name);
    if (!profile || profile.driver !== "extension") continue;
-    await ensureChromeExtensionRelayServer({ cdpUrl: profile.cdpUrl }).catch(
-      (err) => {
-        logServer.warn(
-          `Chrome extension relay init failed for profile "${name}": ${String(err)}`,
-        );
-      },
-    );
+    await ensureChromeExtensionRelayServer({ cdpUrl: profile.cdpUrl }).catch((err) => {
+      logServer.warn(`Chrome extension relay init failed for profile "${name}": ${String(err)}`);
+    });
  }

  logServer.info(`Browser control listening on http://127.0.0.1:${port}/`);