@roxybrowser/playwright 2.0.2-beta.1 → 2.0.2-beta.4

package/dist/mcp/connectedBrowser.js

@@ -4,6 +4,7 @@ import * as cdpModule from "chrome-remote-interface";
 import { normalizeAriaSnapshotOptions, retryUntilReady } from "../ariaSnapshot.js";
 import { PLAYWRIGHT_ARIA_SNAPSHOT_EVALUATE_SOURCE as ARIA_SNAPSHOT_EVALUATE_SOURCE } from "../vendor/playwright/ariaSnapshotEvaluate.js";
 import { getBidiClientFactory } from "../protocol/bidi/client.js";
+import { parseSerializedEvaluationResult, wrapWithSerializedEvaluationResult } from "../protocol/evaluationSerializer.js";
 import { McpToolError } from "./errors.js";
 import { ACTION_POINT_EVALUATE_SOURCE, ACTION_POINT_BY_SELECTOR_SOURCE } from "./snapshot.js";
 function delay(ms) {
@@ -351,7 +352,7 @@ async function evaluateBiDi(client, contextId, functionSource, arg) {
         ? `(${functionSource})()`
         : `(${functionSource})(${JSON.stringify(arg)})`;
     const response = (await client.scriptEvaluate({
-        expression,
+        expression: wrapWithSerializedEvaluationResult(expression),
         target: {
             context: contextId
         },
@@ -361,7 +362,7 @@ async function evaluateBiDi(client, contextId, functionSource, arg) {
     if (response.type === "exception") {
         throw new Error(response.exceptionDetails?.text || "BiDi runtime evaluation failed.");
     }
-    return response.result?.value;
+    return parseSerializedEvaluationResult(extractBiDiValue(response.result));
 }
 async function evaluateBiDiRef(client, contextId, functionSource, arg) {
     const expression = arg === undefined
@@ -389,6 +390,22 @@ async function evaluateBiDiRef(client, contextId, functionSource, arg) {
         ...(response.result?.value?.handle !== undefined ? { handle: response.result.value.handle } : {})
     };
 }
+function extractBiDiValue(value) {
+    if (!value) {
+        return undefined;
+    }
+    if (value.type === "array" && Array.isArray(value.value)) {
+        return value.value.map((entry) => extractBiDiValue(entry));
+    }
+    if (value.type === "object" && Array.isArray(value.value)) {
+        const obj = {};
+        for (const [key, val] of value.value) {
+            obj[key] = extractBiDiValue(val);
+        }
+        return obj;
+    }
+    return value.value;
+}
 function toAriaSnapshotPayload(request = {}) {
     return {
         options: normalizeAriaSnapshotOptions({
@@ -432,6 +449,7 @@ class CdpConnectedBrowserSession {
     pageConsoleStates = new Map();
     pageNetworkStates = new Map();
     pageDialogStates = new Map();
+    dialogWaiters = new Map();
     activeTabId;
     versionString = "Chromium/unknown";
     constructor(browserClient, connection) {
@@ -452,10 +470,7 @@ class CdpConnectedBrowserSession {
         });
         const session = new CdpConnectedBrowserSession(browserClient, connection);
         session.versionString = version.Browser;
-        const tabs = await session.refreshTabs();
-        if (tabs.length === 0) {
-            await session.newTab();
-        }
+        await session.refreshTabs();
         await session.getActivePageClient().catch(() => undefined);
         return session;
     }
@@ -519,6 +534,7 @@ class CdpConnectedBrowserSession {
     async click(target, options) {
         const pageClient = await this.getActivePageClient();
         const contextId = await this.getActiveUtilityContextId(pageClient);
+        const tabId = await this.getActiveTabId();
         const source = "nodeToken" in target ? ACTION_POINT_EVALUATE_SOURCE : ACTION_POINT_BY_SELECTOR_SOURCE;
         const arg = "nodeToken" in target ? { nodeToken: target.nodeToken } : { selector: target.selector };
         const point = await evaluateCdp(pageClient, source, arg, contextId);
@@ -552,7 +568,7 @@ class CdpConnectedBrowserSession {
                 modifiers: modifiersMask
             });
             await delay(options.clickHoldMs);
-            await pageClient.Input.dispatchMouseEvent({
+            const releasePromise = pageClient.Input.dispatchMouseEvent({
                 type: "mouseReleased",
                 x: point.x,
                 y: point.y,
@@ -560,6 +576,10 @@ class CdpConnectedBrowserSession {
                 clickCount,
                 modifiers: modifiersMask
             });
+            await Promise.race([
+                releasePromise,
+                this.waitForDialog(tabId, options.clickHoldMs + 1000)
+            ]);
         }
     }
     async drag(start, end, options) {
@@ -816,26 +836,105 @@ class CdpConnectedBrowserSession {
         }
     }
     async handleDialog(accept, promptText) {
-        const tabId = await this.getActiveTabId();
+        const tabId = this.dialogTabId();
         if (!this.pageDialogStates.has(tabId)) {
             throw new McpToolError("no_dialog", "No dialog visible.");
         }
-        const pageClient = await this.getActivePageClient();
+        const pageClient = this.pageClients.get(tabId) ?? await this.getActivePageClient();
         this.pageDialogStates.delete(tabId);
         await pageClient.Page.handleJavaScriptDialog({
             accept,
             ...(promptText !== undefined ? { promptText } : {})
         });
     }
+    async hasDialog() {
+        return this.pageDialogStates.size > 0;
+    }
+    waitForDialog(tabId, timeoutMs) {
+        if (this.pageDialogStates.has(tabId)) {
+            return Promise.resolve();
+        }
+        return new Promise((resolve) => {
+            const waiter = {
+                resolve: () => {
+                    if (waiter.timer) {
+                        clearTimeout(waiter.timer);
+                    }
+                    this.removeDialogWaiter(tabId, waiter);
+                    resolve();
+                }
+            };
+            waiter.timer = setTimeout(() => waiter.resolve(), timeoutMs);
+            const waiters = this.dialogWaiters.get(tabId) ?? new Set();
+            waiters.add(waiter);
+            this.dialogWaiters.set(tabId, waiters);
+        });
+    }
+    resolveDialogWaiters(tabId) {
+        const waiters = this.dialogWaiters.get(tabId);
+        if (!waiters) {
+            return;
+        }
+        this.dialogWaiters.delete(tabId);
+        for (const waiter of waiters) {
+            waiter.resolve();
+        }
+    }
+    removeDialogWaiter(tabId, waiter) {
+        const waiters = this.dialogWaiters.get(tabId);
+        if (!waiters) {
+            return;
+        }
+        waiters.delete(waiter);
+        if (waiters.size === 0) {
+            this.dialogWaiters.delete(tabId);
+        }
+    }
     async networkRequests() {
         const tabId = await this.getActiveTabId();
+        await this.hydratePerformanceResourceRequests(tabId);
         return this.ensureNetworkState(tabId).requests.map(cloneNetworkRequest);
     }
     async networkRequest(index) {
         const tabId = await this.getActiveTabId();
+        await this.hydratePerformanceResourceRequests(tabId);
         const request = this.ensureNetworkState(tabId).requests[index - 1];
         return request ? cloneNetworkRequest(request) : undefined;
     }
+    async fetchResponseBody(index) {
+        const tabId = await this.getActiveTabId();
+        const state = this.ensureNetworkState(tabId);
+        const request = state.requests[index - 1];
+        if (!request || !request.requestId) {
+            return request?.responseBody;
+        }
+        if (!canReadResponseBody(request)) {
+            return undefined;
+        }
+        if (request.responseBody !== undefined) {
+            return request.responseBody;
+        }
+        await waitForLoadingDone(state, request.requestId, 5_000).catch(() => undefined);
+        if (request.responseBody !== undefined) {
+            return request.responseBody;
+        }
+        if (state.bodyRead.has(request.requestId)) {
+            return undefined;
+        }
+        state.bodyRead.add(request.requestId);
+        const pageClient = this.pageClients.get(tabId) ?? await this.getActivePageClient();
+        const clientNetwork = pageClient.Network;
+        if (!clientNetwork) {
+            return undefined;
+        }
+        const body = await clientNetwork.getResponseBody({ requestId: request.requestId }).catch(() => undefined);
+        if (body) {
+            request.responseBody = body.base64Encoded
+                ? Buffer.from(body.body, "base64").toString("utf8")
+                : body.body;
+        }
+        return request.responseBody;
+    }
     async runCodeUnsafe(code) {
         const pageClient = await this.getActivePageClient();
         const contextId = await this.getActiveUtilityContextId(pageClient);
@@ -905,6 +1004,16 @@ class CdpConnectedBrowserSession {
         }
         return activeTab.id;
     }
+    dialogTabId() {
+        if (this.activeTabId && this.pageDialogStates.has(this.activeTabId)) {
+            return this.activeTabId;
+        }
+        const tabId = this.pageDialogStates.keys().next().value;
+        if (!tabId) {
+            throw new McpToolError("no_dialog", "No dialog visible.");
+        }
+        return tabId;
+    }
     async getActivePageClient() {
         const tabs = await this.refreshTabs();
         const activeTab = tabs.find((tab) => tab.active);
@@ -999,6 +1108,7 @@ class CdpConnectedBrowserSession {
                 ...(event.defaultPrompt !== undefined ? { defaultPrompt: event.defaultPrompt } : {}),
                 ...(event.url !== undefined ? { url: event.url } : {})
             });
+            this.resolveDialogWaiters(tabId);
         });
         this.installNetworkCollection(tabId, client);
     }
@@ -1046,13 +1156,15 @@ class CdpConnectedBrowserSession {
         client.Network.loadingFinished(async (event) => {
             const request = state.byRequestId.get(event.requestId);
             if (!request) {
+                resolveLoadingDone(state, event.requestId, true);
                 return;
             }
             const startedAt = state.startedAt.get(event.requestId);
             if (startedAt !== undefined && event.timestamp !== undefined) {
                 request.durationMs = Math.round(event.timestamp * 1000 - startedAt);
             }
-            if (canReadResponseBody(request)) {
+            if (canReadResponseBody(request) && !state.bodyRead.has(event.requestId)) {
+                state.bodyRead.add(event.requestId);
                 const clientNetwork = client.Network;
                 const body = await clientNetwork?.getResponseBody({ requestId: event.requestId }).catch(() => undefined);
                 if (body) {
@@ -1061,10 +1173,12 @@ class CdpConnectedBrowserSession {
                         : body.body;
                 }
             }
+            resolveLoadingDone(state, event.requestId, true);
         });
         client.Network.loadingFailed((event) => {
             const request = state.byRequestId.get(event.requestId);
             if (!request) {
+                resolveLoadingDone(state, event.requestId, false);
                 return;
             }
             request.failureText = event.errorText ?? "Unknown error";
@@ -1072,6 +1186,7 @@ class CdpConnectedBrowserSession {
             if (startedAt !== undefined && event.timestamp !== undefined) {
                 request.durationMs = Math.round(event.timestamp * 1000 - startedAt);
             }
+            resolveLoadingDone(state, event.requestId, false);
         });
     }
     ensureConsoleState(tabId) {
@@ -1093,7 +1208,10 @@ class CdpConnectedBrowserSession {
             state = {
                 requests: [],
                 byRequestId: new Map(),
-                startedAt: new Map()
+                startedAt: new Map(),
+                hydratedPerformanceResources: false,
+                loadingDone: new Map(),
+                bodyRead: new Set()
             };
             this.pageNetworkStates.set(tabId, state);
         }
@@ -1109,10 +1227,82 @@ class CdpConnectedBrowserSession {
         this.pageNetworkStates.set(tabId, {
             requests: [],
             byRequestId: new Map(),
-            startedAt: new Map()
+            startedAt: new Map(),
+            hydratedPerformanceResources: false,
+            loadingDone: new Map(),
+            bodyRead: new Set()
         });
         this.pageDialogStates.delete(tabId);
     }
+    async hydratePerformanceResourceRequests(tabId) {
+        const state = this.ensureNetworkState(tabId);
+        if (state.hydratedPerformanceResources) {
+            return;
+        }
+        state.hydratedPerformanceResources = true;
+        const pageClient = await this.getActivePageClient();
+        const contextId = await this.getActiveUtilityContextId(pageClient);
+        const documentRequest = await evaluateCdp(pageClient, String.raw `() => {
+        const navigation = performance.getEntriesByType("navigation")[0];
+        return {
+          url: String(location.href || ""),
+          duration: navigation ? Math.round(Number(navigation.duration || 0)) : undefined
+        };
+      }`, undefined, contextId).catch(() => undefined);
+        if (documentRequest?.url && !Array.from(state.byRequestId.values()).some((request) => request.url === documentRequest.url)) {
+            const requestId = `performance:navigation:${documentRequest.url}`;
+            const request = {
+                index: state.requests.length + 1,
+                requestId,
+                method: "GET",
+                url: documentRequest.url,
+                resourceType: "document",
+                requestHeaders: {},
+                status: 200,
+                statusText: "OK",
+                ...(documentRequest.duration !== undefined ? { durationMs: documentRequest.duration } : {})
+            };
+            state.requests.push(request);
+            state.byRequestId.set(requestId, request);
+        }
+        const resources = await evaluateCdp(pageClient, String.raw `() => performance.getEntriesByType("resource").map((entry) => ({
+        name: String(entry.name || ""),
+        initiatorType: String(entry.initiatorType || "other"),
+        duration: Math.round(Number(entry.duration || 0)),
+        responseStatus: typeof entry.responseStatus === "number" ? entry.responseStatus : undefined
+      }))`, undefined, contextId).catch(() => []);
+        for (const resource of resources) {
+            if (!resource.name || Array.from(state.byRequestId.values()).some((request) => request.url === resource.name)) {
+                continue;
+            }
+            const status = resource.responseStatus && resource.responseStatus > 0
+                ? resource.responseStatus
+                : await this.probeResourceStatus(pageClient, contextId, resource.name);
+            const requestId = `performance:${resource.name}`;
+            const request = {
+                index: state.requests.length + 1,
+                requestId,
+                method: "GET",
+                url: resource.name,
+                resourceType: normalizeResourceType(resource.initiatorType),
+                requestHeaders: {},
+                ...(status !== undefined ? { status, statusText: statusTextForStatus(status) } : {}),
+                ...(resource.duration !== undefined ? { durationMs: resource.duration } : {})
+            };
+            state.requests.push(request);
+            state.byRequestId.set(requestId, request);
+        }
+    }
+    async probeResourceStatus(pageClient, contextId, url) {
+        return evaluateCdp(pageClient, String.raw `async (url) => {
+        try {
+          const response = await fetch(url, { method: "HEAD", cache: "no-store" });
+          return response.status;
+        } catch {
+          return undefined;
+        }
+      }`, url, contextId).catch(() => undefined);
+    }
     addConsoleMessage(tabId, message) {
         const state = this.ensureConsoleState(tabId);
         if (!shouldIncludeConsoleMessage(message.type)) {
@@ -1282,6 +1472,59 @@ function canReadResponseBody(request) {
     }
     return request.status !== 204 && request.status !== 304 && !(request.status >= 100 && request.status < 200);
 }
+function loadingDoneEntry(state, requestId) {
+    let entry = state.loadingDone.get(requestId);
+    if (!entry) {
+        let resolve;
+        let reject;
+        const promise = new Promise((res, rej) => {
+            resolve = res;
+            reject = rej;
+        });
+        entry = { promise, resolve, reject };
+        state.loadingDone.set(requestId, entry);
+    }
+    return entry;
+}
+function resolveLoadingDone(state, requestId, success) {
+    const entry = state.loadingDone.get(requestId);
+    if (!entry) {
+        return;
+    }
+    state.loadingDone.delete(requestId);
+    if (success) {
+        entry.resolve();
+    }
+    else {
+        entry.reject(new Error("Request failed before the response body was available."));
+    }
+}
+async function waitForLoadingDone(state, requestId, timeoutMs) {
+    const entry = loadingDoneEntry(state, requestId);
+    await Promise.race([
+        entry.promise,
+        new Promise((resolve) => setTimeout(resolve, timeoutMs))
+    ]);
+}
+function statusTextForStatus(status) {
+    if (status === 200)
+        return "OK";
+    if (status === 204)
+        return "No Content";
+    if (status === 304)
+        return "Not Modified";
+    if (status === 400)
+        return "Bad Request";
+    if (status === 401)
+        return "Unauthorized";
+    if (status === 403)
+        return "Forbidden";
+    if (status === 404)
+        return "Not Found";
+    if (status === 500)
+        return "Internal Server Error";
+    return "";
+}
 function cloneNetworkRequest(request) {
     return {
         ...request,
@@ -1381,6 +1624,7 @@ class BidiConnectedBrowserSession {
     pageConsoleStates = new Map();
     pageNetworkStates = new Map();
     pageDialogStates = new Map();
+    dialogWaiters = new Map();
     bidiListeners = new Map();
     responseDataCollector;
     activeTabId;
@@ -1398,15 +1642,12 @@ class BidiConnectedBrowserSession {
         }
         const client = await getBidiClientFactory()({
             browserName: "firefox",
-            webSocketUrl: normalizeFirefoxBidiEndpoint(args.endpoint)
+            webSocketUrl: normalizeFirefoxBidiEndpoint(args.endpoint, args.sessionId)
         });
         const session = new BidiConnectedBrowserSession(client);
-        session.ownsSession = await ensureMcpBiDiSession(client, args.endpoint);
+        session.ownsSession = await ensureMcpBiDiSession(client, args.endpoint, args.sessionId);
         await session.initialize();
-        const tabs = await session.refreshTabs();
-        if (tabs.length === 0) {
-            await session.newTab();
-        }
+        await session.refreshTabs();
         return session;
     }
     async version() {
@@ -1465,10 +1706,14 @@ class BidiConnectedBrowserSession {
     async snapshot(request = {}) {
         const tabId = await this.getActiveTabId();
         const result = await retryUntilReady(() => evaluateBiDi(this.client, tabId, ARIA_SNAPSHOT_EVALUATE_SOURCE, toAriaSnapshotPayload(request)));
-        return toBrowserSnapshot(result, request, {
+        const snapshot = toBrowserSnapshot(result, request, {
             console: this.consoleSummary(tabId),
             consoleLink: await this.takeConsoleLink(tabId)
         });
+        return {
+            ...snapshot,
+            retryable: true
+        };
     }
     async consoleMessages(level = "info", all = false) {
         const activeTabId = await this.getActiveTabId();
@@ -1812,7 +2057,7 @@ class BidiConnectedBrowserSession {
         }
     }
     async handleDialog(accept, promptText) {
-        const tabId = await this.getActiveTabId();
+        const tabId = this.dialogTabId();
         if (!this.pageDialogStates.has(tabId)) {
             throw new McpToolError("no_dialog", "No dialog visible.");
         }
@@ -1823,6 +2068,9 @@ class BidiConnectedBrowserSession {
             ...(promptText !== undefined ? { userText: promptText } : {})
         });
     }
+    async hasDialog() {
+        return this.pageDialogStates.size > 0;
+    }
     async networkRequests() {
         const tabId = await this.getActiveTabId();
         return this.ensureNetworkState(tabId).requests.map(cloneNetworkRequest);
@@ -1832,6 +2080,21 @@ class BidiConnectedBrowserSession {
         const request = this.ensureNetworkState(tabId).requests[index - 1];
         return request ? cloneNetworkRequest(request) : undefined;
     }
+    async fetchResponseBody(index) {
+        const tabId = await this.getActiveTabId();
+        const request = this.ensureNetworkState(tabId).requests[index - 1];
+        if (!request || !request.requestId) {
+            return request?.responseBody;
+        }
+        if (request.responseBody !== undefined) {
+            return request.responseBody;
+        }
+        const body = await this.getResponseBody(request.requestId).catch(() => undefined);
+        if (body !== undefined) {
+            request.responseBody = body;
+        }
+        return request.responseBody;
+    }
     async runCodeUnsafe(code) {
         return this.evaluate(`async () => {
       const fn = eval(${JSON.stringify(`(${code})`)});
@@ -1904,6 +2167,63 @@ class BidiConnectedBrowserSession {
     targetArg(target) {
         return "nodeToken" in target ? { nodeToken: target.nodeToken } : { selector: target.selector };
     }
+    dialogTabId() {
+        if (this.activeTabId && this.pageDialogStates.has(this.activeTabId)) {
+            return this.activeTabId;
+        }
+        const tabId = this.pageDialogStates.keys().next().value;
+        if (!tabId) {
+            throw new McpToolError("no_dialog", "No dialog visible.");
+        }
+        return tabId;
+    }
+    waitForDialog(tabId, timeoutMs) {
+        if (this.pageDialogStates.has(tabId)) {
+            return Promise.resolve();
+        }
+        return new Promise((resolve, reject) => {
+            const waiter = {
+                resolve: () => {
+                    if (waiter.timer) {
+                        clearTimeout(waiter.timer);
+                    }
+                    this.removeDialogWaiter(tabId, waiter);
+                    resolve();
+                },
+                reject: (error) => {
+                    if (waiter.timer) {
+                        clearTimeout(waiter.timer);
+                    }
+                    this.removeDialogWaiter(tabId, waiter);
+                    reject(error);
+                }
+            };
+            waiter.timer = setTimeout(() => waiter.reject?.(new Error("Timed out waiting for dialog.")), timeoutMs);
+            const waiters = this.dialogWaiters.get(tabId) ?? new Set();
+            waiters.add(waiter);
+            this.dialogWaiters.set(tabId, waiters);
+        });
+    }
+    resolveDialogWaiters(tabId) {
+        const waiters = this.dialogWaiters.get(tabId);
+        if (!waiters) {
+            return;
+        }
+        this.dialogWaiters.delete(tabId);
+        for (const waiter of waiters) {
+            waiter.resolve();
+        }
+    }
+    removeDialogWaiter(tabId, waiter) {
+        const waiters = this.dialogWaiters.get(tabId);
+        if (!waiters) {
+            return;
+        }
+        waiters.delete(waiter);
+        if (waiters.size === 0) {
+            this.dialogWaiters.delete(tabId);
+        }
+    }
     async actionPoint(tabId, target) {
         const source = "nodeToken" in target ? ACTION_POINT_EVALUATE_SOURCE : ACTION_POINT_BY_SELECTOR_SOURCE;
         const point = await evaluateBiDi(this.client, tabId, source, this.targetArg(target));
@@ -2086,7 +2406,10 @@ class BidiConnectedBrowserSession {
             state = {
                 requests: [],
                 byRequestId: new Map(),
-                startedAt: new Map()
+                startedAt: new Map(),
+                hydratedPerformanceResources: false,
+                loadingDone: new Map(),
+                bodyRead: new Set()
             };
             this.pageNetworkStates.set(tabId, state);
         }
@@ -2102,7 +2425,10 @@ class BidiConnectedBrowserSession {
         this.pageNetworkStates.set(tabId, {
             requests: [],
             byRequestId: new Map(),
-            startedAt: new Map()
+            startedAt: new Map(),
+            hydratedPerformanceResources: false,
+            loadingDone: new Map(),
+            bodyRead: new Set()
         });
         this.pageDialogStates.delete(tabId);
     }
@@ -2148,16 +2474,20 @@ class BidiConnectedBrowserSession {
         return `${relativePath}${lineRange}`;
     }
 }
-function normalizeFirefoxBidiEndpoint(endpoint) {
+function normalizeFirefoxBidiEndpoint(endpoint, sessionId) {
     const url = new URL(endpoint);
+    if (sessionId) {
+        url.pathname = `/session/${sessionId}`;
+        return url.toString();
+    }
     if (url.pathname === "/" || url.pathname === "") {
         url.pathname = "/session";
     }
     return url.toString();
 }
-async function ensureMcpBiDiSession(client, endpoint) {
+async function ensureMcpBiDiSession(client, endpoint, sessionId) {
     await client.sessionStatus({});
-    if (isSessionSpecificFirefoxBidiEndpoint(endpoint)) {
+    if (sessionId || isSessionSpecificFirefoxBidiEndpoint(endpoint)) {
         return false;
     }
     try {