patchright-core 1.52.5 → 1.55.0

package/lib/server/bidi/bidiChromium.js

@@ -32,21 +32,29 @@ __export(bidiChromium_exports, {
 });
 module.exports = __toCommonJS(bidiChromium_exports);
 var import_os = __toESM(require("os"));
-var import_utils = require("../../utils");
 var import_ascii = require("../utils/ascii");
 var import_browserType = require("../browserType");
 var import_bidiBrowser = require("./bidiBrowser");
 var import_bidiConnection = require("./bidiConnection");
 var import_chromiumSwitches = require("../chromium/chromiumSwitches");
+var import_chromium = require("../chromium/chromium");
 class BidiChromium extends import_browserType.BrowserType {
   constructor(parent) {
-    super(parent, "bidi");
-    this._useBidi = true;
+    super(parent, "_bidiChromium");
   }
-  async connectToTransport(transport, options) {
+  async connectToTransport(transport, options, browserLogsCollector) {
     const bidiTransport = await require("./bidiOverCdp").connectBidiOverCdp(transport);
     transport[kBidiOverCdpWrapper] = bidiTransport;
-    return import_bidiBrowser.BidiBrowser.connect(this.attribution.playwright, bidiTransport, options);
+    try {
+      return import_bidiBrowser.BidiBrowser.connect(this.attribution.playwright, bidiTransport, options);
+    } catch (e) {
+      if (browserLogsCollector.recentLogs().some((log) => log.includes("Failed to create a ProcessSingleton for your profile directory."))) {
+        throw new Error(
+          "Failed to create a ProcessSingleton for your profile directory. This usually means that the profile is already in use by another instance of Chromium."
+        );
+      }
+      throw e;
+    }
   }
   doRewriteStartupLog(error) {
     if (!error.logs)
@@ -66,7 +74,7 @@ class BidiChromium extends import_browserType.BrowserType {
     ].join("\n");
     return error;
   }
-  amendEnvironment(env, userDataDir, executable, browserArguments) {
+  amendEnvironment(env) {
     return env;
   }
   attemptToGracefullyCloseBrowser(transport) {
@@ -75,6 +83,9 @@ class BidiChromium extends import_browserType.BrowserType {
       transport = bidiTransport;
     transport.send({ method: "browser.close", params: {}, id: import_bidiConnection.kBrowserCloseMessageId });
   }
+  supportsPipeTransport() {
+    return false;
+  }
   defaultArgs(options, isPersistent, userDataDir) {
     const chromeArguments = this._innerDefaultArgs(options);
     chromeArguments.push(`--user-data-dir=${userDataDir}`);
@@ -85,9 +96,8 @@ class BidiChromium extends import_browserType.BrowserType {
       chromeArguments.push("--no-startup-window");
     return chromeArguments;
   }
-  readyState(options) {
-    (0, import_utils.assert)(options.useWebSocket);
-    return new ChromiumReadyState();
+  async waitForReadyState(options, browserLogsCollector) {
+    return (0, import_chromium.waitForReadyState)({ ...options, cdpPort: 0 }, browserLogsCollector);
   }
   _innerDefaultArgs(options) {
     const { args = [] } = options;
@@ -98,11 +108,9 @@ class BidiChromium extends import_browserType.BrowserType {
       throw new Error("Playwright manages remote debugging connection itself.");
     if (args.find((arg) => !arg.startsWith("-")))
       throw new Error("Arguments can not specify page to be opened");
-    const chromeArguments = [...import_chromiumSwitches.chromiumSwitches];
+    const chromeArguments = [...(0, import_chromiumSwitches.chromiumSwitches)(options.assistantMode)];
     if (import_os.default.platform() === "darwin") {
-      chromeArguments.push("--enable-use-zoom-for-dsf=false");
-      if (options.headless)
-        chromeArguments.push("--use-angle");
+      chromeArguments.push("--enable-unsafe-swiftshader");
     }
     if (options.devtools)
       chromeArguments.push("--auto-open-devtools-for-tabs");
@@ -120,12 +128,12 @@ class BidiChromium extends import_browserType.BrowserType {
     if (proxy) {
       const proxyURL = new URL(proxy.server);
       const isSocks = proxyURL.protocol === "socks5:";
-      if (isSocks && !this.attribution.playwright.options.socksProxyPort) {
+      if (isSocks && !options.socksProxyPort) {
         chromeArguments.push(`--host-resolver-rules="MAP * ~NOTFOUND , EXCLUDE ${proxyURL.hostname}"`);
       }
       chromeArguments.push(`--proxy-server=${proxy.server}`);
       const proxyBypassRules = [];
-      if (this.attribution.playwright.options.socksProxyPort)
+      if (options.socksProxyPort)
         proxyBypassRules.push("<-loopback>");
       if (proxy.bypass)
         proxyBypassRules.push(...proxy.bypass.split(",").map((t) => t.trim()).map((t) => t.startsWith(".") ? "*" + t : t));
@@ -138,13 +146,6 @@ class BidiChromium extends import_browserType.BrowserType {
     return chromeArguments;
   }
 }
-class ChromiumReadyState extends import_browserType.BrowserReadyState {
-  onBrowserOutput(message) {
-    const match = message.match(/DevTools listening on (.*)/);
-    if (match)
-      this._wsEndpoint.resolve(match[1]);
-  }
-}
 const kBidiOverCdpWrapper = Symbol("kBidiConnectionWrapper");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/server/bidi/bidiExecutionContext.js

@@ -33,6 +33,7 @@ __export(bidiExecutionContext_exports, {
 });
 module.exports = __toCommonJS(bidiExecutionContext_exports);
 var import_utils = require("../../utils");
+var import_utilityScriptSerializers = require("../../utils/isomorphic/utilityScriptSerializers");
 var js = __toESM(require("../javascript"));
 var dom = __toESM(require("../dom"));
 var import_bidiDeserializer = require("./third_party/bidiDeserializer");
@@ -107,7 +108,7 @@ class BidiExecutionContext {
       throw new js.JavaScriptErrorInEvaluate(response.exceptionDetails.text + "\nFull val: " + JSON.stringify(response.exceptionDetails));
     if (response.type === "success") {
       if (returnByValue)
-        return js.parseEvaluationResultValue(import_bidiDeserializer.BidiDeserializer.deserialize(response.result));
+        return (0, import_utilityScriptSerializers.parseEvaluationResultValue)(import_bidiDeserializer.BidiDeserializer.deserialize(response.result));
       return createHandle(utilityScript._context, response.result);
     }
     throw new js.JavaScriptErrorInEvaluate("Unexpected response type: " + JSON.stringify(response));

package/lib/server/bidi/bidiFirefox.js

@@ -33,16 +33,18 @@ __export(bidiFirefox_exports, {
 module.exports = __toCommonJS(bidiFirefox_exports);
 var import_os = __toESM(require("os"));
 var import_path = __toESM(require("path"));
-var import_utils = require("../../utils");
 var import_ascii = require("../utils/ascii");
 var import_browserType = require("../browserType");
 var import_bidiBrowser = require("./bidiBrowser");
 var import_bidiConnection = require("./bidiConnection");
 var import_firefoxPrefs = require("./third_party/firefoxPrefs");
+var import_manualPromise = require("../../utils/isomorphic/manualPromise");
 class BidiFirefox extends import_browserType.BrowserType {
   constructor(parent) {
-    super(parent, "bidi");
-    this._useBidi = true;
+    super(parent, "_bidiFirefox");
+  }
+  executablePath() {
+    return "";
   }
   async connectToTransport(transport, options) {
     return import_bidiBrowser.BidiBrowser.connect(this.attribution.playwright, transport, options);
@@ -57,7 +59,7 @@ Workaround: Set the HOME=/root environment variable${process.env.GITHUB_ACTION ?
       error.logs = "\n" + (0, import_ascii.wrapInASCIIBox)(import_browserType.kNoXServerRunningError, 1);
     return error;
   }
-  amendEnvironment(env, userDataDir, executable, browserArguments) {
+  amendEnvironment(env) {
     if (!import_path.default.isAbsolute(import_os.default.homedir()))
       throw new Error(`Cannot launch Firefox with relative home directory. Did you set ${import_os.default.platform() === "win32" ? "USERPROFILE" : "HOME"} to a relative path?`);
     env = {
@@ -74,6 +76,9 @@ Workaround: Set the HOME=/root environment variable${process.env.GITHUB_ACTION ?
   attemptToGracefullyCloseBrowser(transport) {
     transport.send({ method: "browser.close", params: {}, id: import_bidiConnection.kBrowserCloseMessageId });
   }
+  supportsPipeTransport() {
+    return false;
+  }
   async prepareUserDataDir(options, userDataDir) {
     await (0, import_firefoxPrefs.createProfile)({
       path: userDataDir,
@@ -94,16 +99,14 @@ Workaround: Set the HOME=/root environment variable${process.env.GITHUB_ACTION ?
     firefoxArguments.push(...args);
     return firefoxArguments;
   }
-  readyState(options) {
-    (0, import_utils.assert)(options.useWebSocket);
-    return new FirefoxReadyState();
-  }
-}
-class FirefoxReadyState extends import_browserType.BrowserReadyState {
-  onBrowserOutput(message) {
-    const match = message.match(/WebDriver BiDi listening on (ws:\/\/.*)$/);
-    if (match)
-      this._wsEndpoint.resolve(match[1] + "/session");
+  async waitForReadyState(options, browserLogsCollector) {
+    const result = new import_manualPromise.ManualPromise();
+    browserLogsCollector.onMessage((message) => {
+      const match = message.match(/WebDriver BiDi listening on (ws:\/\/.*)$/);
+      if (match)
+        result.resolve({ wsEndpoint: match[1] + "/session" });
+    });
+    return result;
   }
 }
 // Annotate the CommonJS export names for ESM import in node:

package/lib/server/bidi/bidiInput.js

@@ -43,29 +43,29 @@ class RawKeyboardImpl {
   setSession(session) {
     this._session = session;
   }
-  async keydown(modifiers, keyName, description, autoRepeat) {
+  async keydown(progress, modifiers, keyName, description, autoRepeat) {
     keyName = (0, import_input.resolveSmartModifierString)(keyName);
     const actions = [];
     actions.push({ type: "keyDown", value: (0, import_bidiKeyboard.getBidiKeyValue)(keyName) });
-    await this._performActions(actions);
+    await this._performActions(progress, actions);
   }
-  async keyup(modifiers, keyName, description) {
+  async keyup(progress, modifiers, keyName, description) {
     keyName = (0, import_input.resolveSmartModifierString)(keyName);
     const actions = [];
     actions.push({ type: "keyUp", value: (0, import_bidiKeyboard.getBidiKeyValue)(keyName) });
-    await this._performActions(actions);
+    await this._performActions(progress, actions);
   }
-  async sendText(text) {
+  async sendText(progress, text) {
     const actions = [];
     for (const char of text) {
       const value = (0, import_bidiKeyboard.getBidiKeyValue)(char);
       actions.push({ type: "keyDown", value });
       actions.push({ type: "keyUp", value });
     }
-    await this._performActions(actions);
+    await this._performActions(progress, actions);
   }
-  async _performActions(actions) {
-    await this._session.send("input.performActions", {
+  async _performActions(progress, actions) {
+    await progress.race(this._session.send("input.performActions", {
       context: this._session.sessionId,
       actions: [
         {
@@ -74,26 +74,26 @@ class RawKeyboardImpl {
           actions
         }
       ]
-    });
+    }));
   }
 }
 class RawMouseImpl {
   constructor(session) {
     this._session = session;
   }
-  async move(x, y, button, buttons, modifiers, forClick) {
-    await this._performActions([{ type: "pointerMove", x, y }]);
+  async move(progress, x, y, button, buttons, modifiers, forClick) {
+    await this._performActions(progress, [{ type: "pointerMove", x, y }]);
   }
-  async down(x, y, button, buttons, modifiers, clickCount) {
-    await this._performActions([{ type: "pointerDown", button: toBidiButton(button) }]);
+  async down(progress, x, y, button, buttons, modifiers, clickCount) {
+    await this._performActions(progress, [{ type: "pointerDown", button: toBidiButton(button) }]);
   }
-  async up(x, y, button, buttons, modifiers, clickCount) {
-    await this._performActions([{ type: "pointerUp", button: toBidiButton(button) }]);
+  async up(progress, x, y, button, buttons, modifiers, clickCount) {
+    await this._performActions(progress, [{ type: "pointerUp", button: toBidiButton(button) }]);
   }
-  async wheel(x, y, buttons, modifiers, deltaX, deltaY) {
+  async wheel(progress, x, y, buttons, modifiers, deltaX, deltaY) {
     x = Math.floor(x);
     y = Math.floor(y);
-    await this._session.send("input.performActions", {
+    await progress.race(this._session.send("input.performActions", {
       context: this._session.sessionId,
       actions: [
         {
@@ -102,10 +102,10 @@ class RawMouseImpl {
           actions: [{ type: "scroll", x, y, deltaX, deltaY }]
         }
       ]
-    });
+    }));
   }
-  async _performActions(actions) {
-    await this._session.send("input.performActions", {
+  async _performActions(progress, actions) {
+    await progress.race(this._session.send("input.performActions", {
       context: this._session.sessionId,
       actions: [
         {
@@ -117,14 +117,14 @@ class RawMouseImpl {
           actions
         }
       ]
-    });
+    }));
   }
 }
 class RawTouchscreenImpl {
   constructor(session) {
     this._session = session;
   }
-  async tap(x, y, modifiers) {
+  async tap(progress, x, y, modifiers) {
   }
 }
 function toBidiButton(button) {

package/lib/server/bidi/bidiNetworkManager.js

@@ -37,13 +37,12 @@ var import_cookieStore = require("../cookieStore");
 var network = __toESM(require("../network"));
 var bidi = __toESM(require("./third_party/bidiProtocol"));
 class BidiNetworkManager {
-  constructor(bidiSession, page, onNavigationResponseStarted) {
+  constructor(bidiSession, page) {
     this._userRequestInterceptionEnabled = false;
     this._protocolRequestInterceptionEnabled = false;
     this._session = bidiSession;
     this._requests = /* @__PURE__ */ new Map();
     this._page = page;
-    this._onNavigationResponseStarted = onNavigationResponseStarted;
     this._eventListeners = [
       import_eventsHelper.eventsHelper.addEventListener(bidiSession, "network.beforeRequestSent", this._onBeforeRequestSent.bind(this)),
       import_eventsHelper.eventsHelper.addEventListener(bidiSession, "network.responseStarted", this._onResponseStarted.bind(this)),
@@ -59,7 +58,7 @@ class BidiNetworkManager {
     if (param.request.url.startsWith("data:"))
       return;
     const redirectedFrom = param.redirectCount ? this._requests.get(param.request.request) || null : null;
-    const frame = redirectedFrom ? redirectedFrom.request.frame() : param.context ? this._page._frameManager.frame(param.context) : null;
+    const frame = redirectedFrom ? redirectedFrom.request.frame() : param.context ? this._page.frameManager.frame(param.context) : null;
     if (!frame)
       return;
     if (redirectedFrom)
@@ -80,7 +79,7 @@ class BidiNetworkManager {
     }
     const request = new BidiRequest(frame, redirectedFrom, param, route);
     this._requests.set(request._id, request);
-    this._page._frameManager.requestStarted(request.request, route);
+    this._page.frameManager.requestStarted(request.request, route);
   }
   _onResponseStarted(params) {
     const request = this._requests.get(params.request.request);
@@ -111,9 +110,7 @@ class BidiNetworkManager {
     response._securityDetailsFinished();
     response.setRawResponseHeaders(null);
     response.setResponseHeadersSize(params.response.headersSize);
-    this._page._frameManager.requestReceivedResponse(response);
-    if (params.navigation)
-      this._onNavigationResponseStarted(params);
+    this._page.frameManager.requestReceivedResponse(response);
   }
   _onResponseCompleted(params) {
     const request = this._requests.get(params.request.request);
@@ -131,7 +128,7 @@ class BidiNetworkManager {
       response._requestFinished(responseEndTime);
     }
     response._setHttpVersion(params.response.protocol);
-    this._page._frameManager.reportRequestFinished(request.request, response);
+    this._page.frameManager.reportRequestFinished(request.request, response);
   }
   _onFetchError(params) {
     const request = this._requests.get(params.request.request);
@@ -145,11 +142,11 @@ class BidiNetworkManager {
       response._requestFinished(-1);
     }
     request.request._setFailureText(params.errorText);
-    this._page._frameManager.requestFailed(request.request, params.errorText === "NS_BINDING_ABORTED");
+    this._page.frameManager.requestFailed(request.request, params.errorText === "NS_BINDING_ABORTED");
   }
   _onAuthRequired(params) {
     const isBasic = params.response.authChallenges?.some((challenge) => challenge.scheme.startsWith("Basic"));
-    const credentials = this._page._browserContext._options.httpCredentials;
+    const credentials = this._page.browserContext._options.httpCredentials;
     if (isBasic && credentials) {
       this._session.sendMayFail("network.continueWithAuth", {
         request: params.request.request,
@@ -206,7 +203,7 @@ class BidiRequest {
       redirectedFrom._redirectedTo = this;
     const postDataBuffer = null;
     this.request = new network.Request(
-      frame._page._browserContext,
+      frame._page.browserContext,
       frame,
       null,
       redirectedFrom ? redirectedFrom.request : null,

package/lib/server/bidi/bidiPage.js

@@ -29,13 +29,10 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var bidiPage_exports = {};
 __export(bidiPage_exports, {
   BidiPage: () => BidiPage,
-  addMainBinding: () => addMainBinding,
   kPlaywrightBindingChannel: () => kPlaywrightBindingChannel
 });
 module.exports = __toCommonJS(bidiPage_exports);
-var import_utils = require("../../utils");
 var import_eventsHelper = require("../utils/eventsHelper");
-var import_browserContext = require("../browserContext");
 var dialog = __toESM(require("../dialog"));
 var dom = __toESM(require("../dom"));
 var import_page = require("../page");
@@ -49,7 +46,7 @@ const kPlaywrightBindingChannel = "playwrightChannel";
 class BidiPage {
   constructor(browserContext, bidiSession, opener) {
     this._sessionListeners = [];
-    this._initScriptIds = [];
+    this._initScriptIds = /* @__PURE__ */ new Map();
     this._session = bidiSession;
     this._opener = opener;
     this.rawKeyboard = new import_bidiInput.RawKeyboardImpl(bidiSession);
@@ -58,7 +55,7 @@ class BidiPage {
     this._realmToContext = /* @__PURE__ */ new Map();
     this._page = new import_page.Page(this, browserContext);
     this._browserContext = browserContext;
-    this._networkManager = new import_bidiNetworkManager.BidiNetworkManager(this._session, this._page, this._onNavigationResponseStarted.bind(this));
+    this._networkManager = new import_bidiNetworkManager.BidiNetworkManager(this._session, this._page);
     this._pdf = new import_bidiPdf.BidiPDF(this._session);
     this._page.on(import_page.Page.Events.FrameDetached, (frame) => this._removeContextsForFrame(frame, false));
     this._sessionListeners = [
@@ -66,9 +63,11 @@ class BidiPage {
       import_eventsHelper.eventsHelper.addEventListener(bidiSession, "script.message", this._onScriptMessage.bind(this)),
       import_eventsHelper.eventsHelper.addEventListener(bidiSession, "browsingContext.contextDestroyed", this._onBrowsingContextDestroyed.bind(this)),
       import_eventsHelper.eventsHelper.addEventListener(bidiSession, "browsingContext.navigationStarted", this._onNavigationStarted.bind(this)),
+      import_eventsHelper.eventsHelper.addEventListener(bidiSession, "browsingContext.navigationCommitted", this._onNavigationCommitted.bind(this)),
       import_eventsHelper.eventsHelper.addEventListener(bidiSession, "browsingContext.navigationAborted", this._onNavigationAborted.bind(this)),
       import_eventsHelper.eventsHelper.addEventListener(bidiSession, "browsingContext.navigationFailed", this._onNavigationFailed.bind(this)),
       import_eventsHelper.eventsHelper.addEventListener(bidiSession, "browsingContext.fragmentNavigated", this._onFragmentNavigated.bind(this)),
+      import_eventsHelper.eventsHelper.addEventListener(bidiSession, "browsingContext.historyUpdated", this._onHistoryUpdated.bind(this)),
       import_eventsHelper.eventsHelper.addEventListener(bidiSession, "browsingContext.domContentLoaded", this._onDomContentLoaded.bind(this)),
       import_eventsHelper.eventsHelper.addEventListener(bidiSession, "browsingContext.load", this._onLoad.bind(this)),
       import_eventsHelper.eventsHelper.addEventListener(bidiSession, "browsingContext.userPromptOpened", this._onUserPromptOpened.bind(this)),
@@ -83,21 +82,18 @@ class BidiPage {
     this._onFrameAttached(this._session.sessionId, null);
     await Promise.all([
       this.updateHttpCredentials(),
-      this.updateRequestInterception(),
-      this._installMainBinding(),
-      this._addAllInitScripts()
+      this.updateRequestInterception()
+      // If the page is created by the Playwright client's call, some initialization
+      // may be pending. Wait for it to complete before reporting the page as new.
     ]);
   }
-  async _addAllInitScripts() {
-    return Promise.all(this._page.allInitScripts().map((initScript) => this.addInitScript(initScript)));
-  }
   didClose() {
     this._session.dispose();
     import_eventsHelper.eventsHelper.removeEventListeners(this._sessionListeners);
     this._page._didClose();
   }
   _onFrameAttached(frameId, parentFrameId) {
-    return this._page._frameManager.frameAttached(frameId, parentFrameId);
+    return this._page.frameManager.frameAttached(frameId, parentFrameId);
   }
   _removeContextsForFrame(frame, notifyFrame) {
     for (const [contextId, context] of this._realmToContext) {
@@ -113,7 +109,7 @@ class BidiPage {
       return;
     if (realmInfo.type !== "window")
       return;
-    const frame = this._page._frameManager.frame(realmInfo.context);
+    const frame = this._page.frameManager.frame(realmInfo.context);
     if (!frame)
       return;
     let worldName;
@@ -159,29 +155,13 @@ class BidiPage {
   }
   _onNavigationStarted(params) {
     const frameId = params.context;
-    this._page._frameManager.frameRequestedNavigation(frameId, params.navigation);
-    const url = params.url.toLowerCase();
-    if (url.startsWith("file:") || url.startsWith("data:") || url === "about:blank") {
-      const frame = this._page._frameManager.frame(frameId);
-      if (frame)
-        this._page._frameManager.frameCommittedNewDocumentNavigation(
-          frameId,
-          params.url,
-          "",
-          params.navigation,
-          /* initial */
-          false
-        );
-    }
+    this._page.frameManager.frameRequestedNavigation(frameId, params.navigation);
   }
-  // TODO: there is no separate event for committed navigation, so we approximate it with responseStarted.
-  _onNavigationResponseStarted(params) {
+  _onNavigationCommitted(params) {
     const frameId = params.context;
-    const frame = this._page._frameManager.frame(frameId);
-    (0, import_utils.assert)(frame);
-    this._page._frameManager.frameCommittedNewDocumentNavigation(
+    this._page.frameManager.frameCommittedNewDocumentNavigation(
       frameId,
-      params.response.url,
+      params.url,
       "",
       params.navigation,
       /* initial */
@@ -190,22 +170,25 @@ class BidiPage {
   }
   _onDomContentLoaded(params) {
     const frameId = params.context;
-    this._page._frameManager.frameLifecycleEvent(frameId, "domcontentloaded");
+    this._page.frameManager.frameLifecycleEvent(frameId, "domcontentloaded");
   }
   _onLoad(params) {
-    this._page._frameManager.frameLifecycleEvent(params.context, "load");
+    this._page.frameManager.frameLifecycleEvent(params.context, "load");
   }
   _onNavigationAborted(params) {
-    this._page._frameManager.frameAbortedNavigation(params.context, "Navigation aborted", params.navigation || void 0);
+    this._page.frameManager.frameAbortedNavigation(params.context, "Navigation aborted", params.navigation || void 0);
   }
   _onNavigationFailed(params) {
-    this._page._frameManager.frameAbortedNavigation(params.context, "Navigation failed", params.navigation || void 0);
+    this._page.frameManager.frameAbortedNavigation(params.context, "Navigation failed", params.navigation || void 0);
   }
   _onFragmentNavigated(params) {
-    this._page._frameManager.frameCommittedSameDocumentNavigation(params.context, params.url);
+    this._page.frameManager.frameCommittedSameDocumentNavigation(params.context, params.url);
+  }
+  _onHistoryUpdated(params) {
+    this._page.frameManager.frameCommittedSameDocumentNavigation(params.context, params.url);
   }
   _onUserPromptOpened(event) {
-    this._page.emitOnContext(import_browserContext.BrowserContext.Events.Dialog, new dialog.Dialog(
+    this._page.browserContext.dialogManager.dialogDidOpen(new dialog.Dialog(
       this._page,
       event.type,
       event.message,
@@ -224,7 +207,7 @@ class BidiPage {
       return;
     const callFrame = params.stackTrace?.callFrames[0];
     const location = callFrame ?? { url: "", lineNumber: 1, columnNumber: 1 };
-    this._page._addConsoleMessage(entry.method, entry.args.map((arg) => (0, import_bidiExecutionContext.createHandle)(context, arg)), location, params.text || void 0);
+    this._page.addConsoleMessage(entry.method, entry.args.map((arg) => (0, import_bidiExecutionContext.createHandle)(context, arg)), location, params.text || void 0);
   }
   async navigateFrame(frame, url, referrer) {
     const { navigation } = await this._session.send("browsingContext.navigate", {
@@ -246,10 +229,10 @@ class BidiPage {
   }
   async updateEmulatedViewportSize() {
     const options = this._browserContext._options;
-    const deviceSize = this._page.emulatedSize();
-    if (deviceSize === null)
+    const emulatedSize = this._page.emulatedSize();
+    if (!emulatedSize)
       return;
-    const viewportSize = deviceSize.viewport;
+    const viewportSize = emulatedSize.viewport;
     await this._session.send("browsingContext.setViewport", {
       context: this._session.sessionId,
       viewport: {
@@ -291,33 +274,6 @@ class BidiPage {
   async requestGC() {
     throw new Error("Method not implemented.");
   }
-  // TODO: consider calling this only when bindings are added.
-  // TODO: delete this method once we can add preload script for persistent context.
-  async _installMainBinding() {
-    if (this._browserContext._browserContextId)
-      return;
-    const functionDeclaration = addMainBinding.toString();
-    const args = [{
-      type: "channel",
-      value: {
-        channel: kPlaywrightBindingChannel,
-        ownership: bidi.Script.ResultOwnership.Root
-      }
-    }];
-    const promises = [];
-    promises.push(this._session.send("script.addPreloadScript", {
-      functionDeclaration,
-      arguments: args
-    }));
-    promises.push(this._session.send("script.callFunction", {
-      functionDeclaration,
-      arguments: args,
-      target: toBidiExecutionContext(await this._page.mainFrame()._mainContext())._target,
-      awaitPromise: false,
-      userActivation: false
-    }));
-    await Promise.all(promises);
-  }
   async _onScriptMessage(event) {
     if (event.channel !== kPlaywrightBindingChannel)
       return;
@@ -329,7 +285,7 @@ class BidiPage {
       return;
     if (event.data.type !== "string")
       return;
-    await this._page._onBindingCalled(event.data.value, context);
+    await this._page.onBindingCalled(event.data.value, context);
   }
   async addInitScript(initScript) {
     const { script } = await this._session.send("script.addPreloadScript", {
@@ -338,13 +294,17 @@ class BidiPage {
       // TODO: push to iframes?
       contexts: [this._session.sessionId]
     });
-    if (!initScript.internal)
-      this._initScriptIds.push(script);
-  }
-  async removeInitScripts() {
-    const promises = this._initScriptIds.map((script) => this._session.send("script.removePreloadScript", { script }));
-    this._initScriptIds = [];
-    await Promise.all(promises);
+    this._initScriptIds.set(initScript, script);
+  }
+  async removeInitScripts(initScripts) {
+    const ids = [];
+    for (const script of initScripts) {
+      const id = this._initScriptIds.get(script);
+      if (id)
+        ids.push(id);
+      this._initScriptIds.delete(script);
+    }
+    await Promise.all(ids.map((script) => this._session.send("script.removePreloadScript", { script })));
   }
   async closePage(runBeforeUnload) {
     await this._session.send("browsingContext.close", {
@@ -356,7 +316,7 @@ class BidiPage {
   }
   async takeScreenshot(progress, format, documentRect, viewportRect, quality, fitsViewport, scale) {
     const rect = documentRect || viewportRect;
-    const { data } = await this._session.send("browsingContext.captureScreenshot", {
+    const { data } = await progress.race(this._session.send("browsingContext.captureScreenshot", {
       context: this._session.sessionId,
       format: {
         type: `image/${format === "png" ? "png" : "jpeg"}`,
@@ -367,7 +327,7 @@ class BidiPage {
         type: "box",
         ...rect
       }
-    });
+    }));
     return Buffer.from(data, "base64");
   }
   async getContentFrame(handle) {
@@ -375,7 +335,7 @@ class BidiPage {
     const frameId = await executionContext.contentFrameIdForFrame(handle);
     if (!frameId)
       return null;
-    return this._page._frameManager.frame(frameId);
+    return this._page.frameManager.frame(frameId);
   }
   async getOwnerFrame(handle) {
     const windowHandle = await handle.evaluateHandle((node) => {
@@ -482,7 +442,7 @@ class BidiPage {
   }
   async inputActionEpilogue() {
   }
-  async resetForReuse() {
+  async resetForReuse(progress) {
   }
   async pdf(options) {
     return this._pdf.generate(options);
@@ -516,15 +476,11 @@ class BidiPage {
     return true;
   }
 }
-function addMainBinding(callback) {
-  globalThis["__playwright__binding__"] = callback;
-}
 function toBidiExecutionContext(executionContext) {
   return executionContext.delegate;
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   BidiPage,
-  addMainBinding,
   kPlaywrightBindingChannel
 });