patchright-core 1.52.5 → 1.55.1

package/lib/server/webkit/wkInput.js

@@ -65,7 +65,7 @@ class RawKeyboardImpl {
   setSession(session) {
     this._session = session;
   }
-  async keydown(modifiers, keyName, description, autoRepeat) {
+  async keydown(progress, modifiers, keyName, description, autoRepeat) {
     const parts = [];
     for (const modifier of ["Shift", "Control", "Alt", "Meta"]) {
       if (modifiers.has(modifier))
@@ -77,7 +77,7 @@ class RawKeyboardImpl {
     let commands = import_macEditingCommands.macEditingCommands[shortcut];
     if ((0, import_utils.isString)(commands))
       commands = [commands];
-    await this._pageProxySession.send("Input.dispatchKeyEvent", {
+    await progress.race(this._pageProxySession.send("Input.dispatchKeyEvent", {
       type: "keyDown",
       modifiers: toModifiersMask(modifiers),
       windowsVirtualKeyCode: keyCode,
@@ -88,21 +88,21 @@ class RawKeyboardImpl {
       autoRepeat,
       macCommands: commands,
       isKeypad: description.location === input.keypadLocation
-    });
+    }));
   }
-  async keyup(modifiers, keyName, description) {
+  async keyup(progress, modifiers, keyName, description) {
     const { code, key } = description;
-    await this._pageProxySession.send("Input.dispatchKeyEvent", {
+    await progress.race(this._pageProxySession.send("Input.dispatchKeyEvent", {
       type: "keyUp",
       modifiers: toModifiersMask(modifiers),
       key,
       windowsVirtualKeyCode: description.keyCode,
       code,
       isKeypad: description.location === input.keypadLocation
-    });
+    }));
   }
-  async sendText(text) {
-    await this._session.send("Page.insertText", { text });
+  async sendText(progress, text) {
+    await progress.race(this._session.send("Page.insertText", { text }));
   }
 }
 class RawMouseImpl {
@@ -112,18 +112,18 @@ class RawMouseImpl {
   setSession(session) {
     this._session = session;
   }
-  async move(x, y, button, buttons, modifiers, forClick) {
-    await this._pageProxySession.send("Input.dispatchMouseEvent", {
+  async move(progress, x, y, button, buttons, modifiers, forClick) {
+    await progress.race(this._pageProxySession.send("Input.dispatchMouseEvent", {
       type: "move",
       button,
       buttons: toButtonsMask(buttons),
       x,
       y,
       modifiers: toModifiersMask(modifiers)
-    });
+    }));
   }
-  async down(x, y, button, buttons, modifiers, clickCount) {
-    await this._pageProxySession.send("Input.dispatchMouseEvent", {
+  async down(progress, x, y, button, buttons, modifiers, clickCount) {
+    await progress.race(this._pageProxySession.send("Input.dispatchMouseEvent", {
       type: "down",
       button,
       buttons: toButtonsMask(buttons),
@@ -131,10 +131,10 @@ class RawMouseImpl {
       y,
       modifiers: toModifiersMask(modifiers),
       clickCount
-    });
+    }));
   }
-  async up(x, y, button, buttons, modifiers, clickCount) {
-    await this._pageProxySession.send("Input.dispatchMouseEvent", {
+  async up(progress, x, y, button, buttons, modifiers, clickCount) {
+    await progress.race(this._pageProxySession.send("Input.dispatchMouseEvent", {
       type: "up",
       button,
       buttons: toButtonsMask(buttons),
@@ -142,20 +142,20 @@ class RawMouseImpl {
       y,
       modifiers: toModifiersMask(modifiers),
       clickCount
-    });
+    }));
   }
-  async wheel(x, y, buttons, modifiers, deltaX, deltaY) {
-    if (this._page?._browserContext._options.isMobile)
+  async wheel(progress, x, y, buttons, modifiers, deltaX, deltaY) {
+    if (this._page?.browserContext._options.isMobile)
       throw new Error("Mouse wheel is not supported in mobile WebKit");
     await this._session.send("Page.updateScrollingState");
-    await this._page.mainFrame().evaluateExpression(`new Promise(requestAnimationFrame)`, { world: "utility" });
-    await this._pageProxySession.send("Input.dispatchWheelEvent", {
+    await progress.race(this._page.mainFrame().evaluateExpression(`new Promise(requestAnimationFrame)`, { world: "utility" }));
+    await progress.race(this._pageProxySession.send("Input.dispatchWheelEvent", {
       x,
       y,
       deltaX,
       deltaY,
       modifiers: toModifiersMask(modifiers)
-    });
+    }));
   }
   setPage(page) {
     this._page = page;
@@ -165,12 +165,12 @@ class RawTouchscreenImpl {
   constructor(session) {
     this._pageProxySession = session;
   }
-  async tap(x, y, modifiers) {
-    await this._pageProxySession.send("Input.dispatchTapEvent", {
+  async tap(progress, x, y, modifiers) {
+    await progress.race(this._pageProxySession.send("Input.dispatchTapEvent", {
       x,
       y,
       modifiers: toModifiersMask(modifiers)
-    });
+    }));
   }
 }
 // Annotate the CommonJS export names for ESM import in node:

package/lib/server/webkit/wkInterceptableRequest.js

@@ -61,7 +61,7 @@ class WKInterceptableRequest {
     if (event.request.postData)
       postDataBuffer = Buffer.from(event.request.postData, "base64");
     this.request = new network.Request(
-      frame._page._browserContext,
+      frame._page.browserContext,
       frame,
       null,
       redirectedFrom?.request || null,

package/lib/server/webkit/wkPage.js

@@ -46,7 +46,6 @@ var import_errors = require("../errors");
 var import_helper = require("../helper");
 var network = __toESM(require("../network"));
 var import_page = require("../page");
-var import_page2 = require("../page");
 var import_wkAccessibility = require("./wkAccessibility");
 var import_wkConnection = require("./wkConnection");
 var import_wkExecutionContext = require("./wkExecutionContext");
@@ -76,12 +75,12 @@ class WKPage {
     this.rawMouse = new import_wkInput.RawMouseImpl(pageProxySession);
     this.rawTouchscreen = new import_wkInput.RawTouchscreenImpl(pageProxySession);
     this._contextIdToContext = /* @__PURE__ */ new Map();
-    this._page = new import_page2.Page(this, browserContext);
+    this._page = new import_page.Page(this, browserContext);
     this.rawMouse.setPage(this._page);
     this._workers = new import_wkWorkers.WKWorkers(this._page);
     this._session = void 0;
     this._browserContext = browserContext;
-    this._page.on(import_page2.Page.Events.FrameDetached, (frame) => this._removeContextsForFrame(frame, false));
+    this._page.on(import_page.Page.Events.FrameDetached, (frame) => this._removeContextsForFrame(frame, false));
     this._eventListeners = [
       import_eventsHelper.eventsHelper.addEventListener(this._pageProxySession, "Target.targetCreated", this._onTargetCreated.bind(this)),
       import_eventsHelper.eventsHelper.addEventListener(this._pageProxySession, "Target.targetDestroyed", this._onTargetDestroyed.bind(this)),
@@ -93,15 +92,17 @@ class WKPage {
       this._firstNonInitialNavigationCommittedFulfill = f;
       this._firstNonInitialNavigationCommittedReject = r;
     });
+    this._firstNonInitialNavigationCommittedPromise.catch(() => {
+    });
     if (opener && !browserContext._options.noDefaultViewport && opener._nextWindowOpenPopupFeatures) {
       const viewportSize = import_helper.helper.getViewportSizeFromWindowFeatures(opener._nextWindowOpenPopupFeatures);
       opener._nextWindowOpenPopupFeatures = void 0;
       if (viewportSize)
-        this._page._emulatedSize = { viewport: viewportSize, screen: viewportSize };
+        this._page.setEmulatedSizeFromWindowOpen({ viewport: viewportSize, screen: viewportSize });
     }
   }
   async _initializePageProxySession() {
-    if (this._page._browserContext.isSettingStorageState())
+    if (this._page.isStorageStatePage)
       return;
     const promises = [
       this._pageProxySession.send("Dialog.enable"),
@@ -156,7 +157,6 @@ class WKPage {
     const promises = [
       // Resource tree should be received before first execution context.
       session.send("Runtime.enable"),
-      session.send("Runtime.addBinding", { name: import_page.PageBinding.kPlaywrightBinding }),
       session.send("Page.createUserWorld", { name: UTILITY_WORLD_NAME }).catch((_) => {
       }),
       // Worlds are per-process
@@ -164,12 +164,14 @@ class WKPage {
       session.send("Network.enable"),
       this._workers.initializeSession(session)
     ];
+    if (this._page.browserContext.needsPlaywrightBinding())
+      promises.push(session.send("Runtime.addBinding", { name: import_page.PageBinding.kBindingName }));
     if (this._page.needsRequestInterception()) {
       promises.push(session.send("Network.setInterceptionEnabled", { enabled: true }));
       promises.push(session.send("Network.setResourceCachingDisabled", { disabled: true }));
       promises.push(session.send("Network.addInterception", { url: ".*", stage: "request", isRegex: true }));
     }
-    if (this._page._browserContext.isSettingStorageState()) {
+    if (this._page.isStorageStatePage) {
       await Promise.all(promises);
       return;
     }
@@ -272,7 +274,7 @@ class WKPage {
     let errorText = event.error;
     if (errorText.includes("cancelled"))
       errorText += "; maybe frame was detached?";
-    this._page._frameManager.frameAbortedNavigation(this._page.mainFrame()._id, errorText, event.loaderId);
+    this._page.frameManager.frameAbortedNavigation(this._page.mainFrame()._id, errorText, event.loaderId);
   }
   handleWindowOpen(event) {
     this._nextWindowOpenPopupFeatures = event.windowFeatures;
@@ -303,17 +305,14 @@ class WKPage {
       }
       if (targetInfo.isPaused)
         this._pageProxySession.sendMayFail("Target.resume", { targetId: targetInfo.targetId });
-      if (pageOrError instanceof import_page2.Page && this._page.mainFrame().url() === "") {
+      if (pageOrError instanceof import_page.Page && this._page.mainFrame().url() === "") {
         try {
           await this._firstNonInitialNavigationCommittedPromise;
         } catch (e) {
           pageOrError = e;
         }
-      } else {
-        this._firstNonInitialNavigationCommittedPromise.catch(() => {
-        });
       }
-      this._page.reportAsNew(this._opener?._page, pageOrError instanceof import_page2.Page ? void 0 : pageOrError);
+      this._page.reportAsNew(this._opener?._page, pageOrError instanceof import_page.Page ? void 0 : pageOrError);
     } else {
       (0, import_utils.assert)(targetInfo.isProvisional);
       (0, import_utils.assert)(!this._provisionalPage);
@@ -343,8 +342,8 @@ class WKPage {
       import_eventsHelper.eventsHelper.addEventListener(this._session, "Page.willCheckNavigationPolicy", (event) => this._onWillCheckNavigationPolicy(event.frameId)),
       import_eventsHelper.eventsHelper.addEventListener(this._session, "Page.didCheckNavigationPolicy", (event) => this._onDidCheckNavigationPolicy(event.frameId, event.cancel)),
       import_eventsHelper.eventsHelper.addEventListener(this._session, "Page.frameScheduledNavigation", (event) => this._onFrameScheduledNavigation(event.frameId, event.delay, event.targetIsCurrentFrame)),
-      import_eventsHelper.eventsHelper.addEventListener(this._session, "Page.loadEventFired", (event) => this._page._frameManager.frameLifecycleEvent(event.frameId, "load")),
-      import_eventsHelper.eventsHelper.addEventListener(this._session, "Page.domContentEventFired", (event) => this._page._frameManager.frameLifecycleEvent(event.frameId, "domcontentloaded")),
+      import_eventsHelper.eventsHelper.addEventListener(this._session, "Page.loadEventFired", (event) => this._page.frameManager.frameLifecycleEvent(event.frameId, "load")),
+      import_eventsHelper.eventsHelper.addEventListener(this._session, "Page.domContentEventFired", (event) => this._page.frameManager.frameLifecycleEvent(event.frameId, "domcontentloaded")),
       import_eventsHelper.eventsHelper.addEventListener(this._session, "Runtime.executionContextCreated", (event) => this._onExecutionContextCreated(event.context)),
       import_eventsHelper.eventsHelper.addEventListener(this._session, "Runtime.bindingCalled", (event) => this._onBindingCalled(event.contextId, event.argument)),
       import_eventsHelper.eventsHelper.addEventListener(this._session, "Console.messageAdded", (event) => this._onConsoleMessage(event)),
@@ -356,13 +355,13 @@ class WKPage {
       import_eventsHelper.eventsHelper.addEventListener(this._session, "Network.responseReceived", (e) => this._onResponseReceived(this._session, e)),
       import_eventsHelper.eventsHelper.addEventListener(this._session, "Network.loadingFinished", (e) => this._onLoadingFinished(e)),
       import_eventsHelper.eventsHelper.addEventListener(this._session, "Network.loadingFailed", (e) => this._onLoadingFailed(this._session, e)),
-      import_eventsHelper.eventsHelper.addEventListener(this._session, "Network.webSocketCreated", (e) => this._page._frameManager.onWebSocketCreated(e.requestId, e.url)),
-      import_eventsHelper.eventsHelper.addEventListener(this._session, "Network.webSocketWillSendHandshakeRequest", (e) => this._page._frameManager.onWebSocketRequest(e.requestId)),
-      import_eventsHelper.eventsHelper.addEventListener(this._session, "Network.webSocketHandshakeResponseReceived", (e) => this._page._frameManager.onWebSocketResponse(e.requestId, e.response.status, e.response.statusText)),
-      import_eventsHelper.eventsHelper.addEventListener(this._session, "Network.webSocketFrameSent", (e) => e.response.payloadData && this._page._frameManager.onWebSocketFrameSent(e.requestId, e.response.opcode, e.response.payloadData)),
-      import_eventsHelper.eventsHelper.addEventListener(this._session, "Network.webSocketFrameReceived", (e) => e.response.payloadData && this._page._frameManager.webSocketFrameReceived(e.requestId, e.response.opcode, e.response.payloadData)),
-      import_eventsHelper.eventsHelper.addEventListener(this._session, "Network.webSocketClosed", (e) => this._page._frameManager.webSocketClosed(e.requestId)),
-      import_eventsHelper.eventsHelper.addEventListener(this._session, "Network.webSocketFrameError", (e) => this._page._frameManager.webSocketError(e.requestId, e.errorMessage))
+      import_eventsHelper.eventsHelper.addEventListener(this._session, "Network.webSocketCreated", (e) => this._page.frameManager.onWebSocketCreated(e.requestId, e.url)),
+      import_eventsHelper.eventsHelper.addEventListener(this._session, "Network.webSocketWillSendHandshakeRequest", (e) => this._page.frameManager.onWebSocketRequest(e.requestId)),
+      import_eventsHelper.eventsHelper.addEventListener(this._session, "Network.webSocketHandshakeResponseReceived", (e) => this._page.frameManager.onWebSocketResponse(e.requestId, e.response.status, e.response.statusText)),
+      import_eventsHelper.eventsHelper.addEventListener(this._session, "Network.webSocketFrameSent", (e) => e.response.payloadData && this._page.frameManager.onWebSocketFrameSent(e.requestId, e.response.opcode, e.response.payloadData)),
+      import_eventsHelper.eventsHelper.addEventListener(this._session, "Network.webSocketFrameReceived", (e) => e.response.payloadData && this._page.frameManager.webSocketFrameReceived(e.requestId, e.response.opcode, e.response.payloadData)),
+      import_eventsHelper.eventsHelper.addEventListener(this._session, "Network.webSocketClosed", (e) => this._page.frameManager.webSocketClosed(e.requestId)),
+      import_eventsHelper.eventsHelper.addEventListener(this._session, "Network.webSocketFrameError", (e) => this._page.frameManager.webSocketError(e.requestId, e.errorMessage))
     ];
   }
   async _updateState(method, params) {
@@ -380,47 +379,47 @@ class WKPage {
   _onWillCheckNavigationPolicy(frameId) {
     if (this._provisionalPage)
       return;
-    this._page._frameManager.frameRequestedNavigation(frameId);
+    this._page.frameManager.frameRequestedNavigation(frameId);
   }
   _onDidCheckNavigationPolicy(frameId, cancel) {
     if (!cancel)
       return;
     if (this._provisionalPage)
       return;
-    this._page._frameManager.frameAbortedNavigation(frameId, "Navigation canceled by policy check");
+    this._page.frameManager.frameAbortedNavigation(frameId, "Navigation canceled by policy check");
   }
   _onFrameScheduledNavigation(frameId, delay, targetIsCurrentFrame) {
     if (targetIsCurrentFrame)
-      this._page._frameManager.frameRequestedNavigation(frameId);
+      this._page.frameManager.frameRequestedNavigation(frameId);
   }
   _handleFrameTree(frameTree) {
     this._onFrameAttached(frameTree.frame.id, frameTree.frame.parentId || null);
     this._onFrameNavigated(frameTree.frame, true);
-    this._page._frameManager.frameLifecycleEvent(frameTree.frame.id, "domcontentloaded");
-    this._page._frameManager.frameLifecycleEvent(frameTree.frame.id, "load");
+    this._page.frameManager.frameLifecycleEvent(frameTree.frame.id, "domcontentloaded");
+    this._page.frameManager.frameLifecycleEvent(frameTree.frame.id, "load");
     if (!frameTree.childFrames)
       return;
     for (const child of frameTree.childFrames)
       this._handleFrameTree(child);
   }
   _onFrameAttached(frameId, parentFrameId) {
-    return this._page._frameManager.frameAttached(frameId, parentFrameId);
+    return this._page.frameManager.frameAttached(frameId, parentFrameId);
   }
   _onFrameNavigated(framePayload, initial) {
-    const frame = this._page._frameManager.frame(framePayload.id);
+    const frame = this._page.frameManager.frame(framePayload.id);
     (0, import_utils.assert)(frame);
     this._removeContextsForFrame(frame, true);
     if (!framePayload.parentId)
       this._workers.clear();
-    this._page._frameManager.frameCommittedNewDocumentNavigation(framePayload.id, framePayload.url, framePayload.name || "", framePayload.loaderId, initial);
+    this._page.frameManager.frameCommittedNewDocumentNavigation(framePayload.id, framePayload.url, framePayload.name || "", framePayload.loaderId, initial);
     if (!initial)
       this._firstNonInitialNavigationCommittedFulfill();
   }
   _onFrameNavigatedWithinDocument(frameId, url) {
-    this._page._frameManager.frameCommittedSameDocumentNavigation(frameId, url);
+    this._page.frameManager.frameCommittedSameDocumentNavigation(frameId, url);
   }
   _onFrameDetached(frameId) {
-    this._page._frameManager.frameDetached(frameId);
+    this._page.frameManager.frameDetached(frameId);
   }
   _removeContextsForFrame(frame, notifyFrame) {
     for (const [contextId, context] of this._contextIdToContext) {
@@ -434,7 +433,7 @@ class WKPage {
   _onExecutionContextCreated(contextPayload) {
     if (this._contextIdToContext.has(contextPayload.id))
       return;
-    const frame = this._page._frameManager.frame(contextPayload.frameId);
+    const frame = this._page.frameManager.frame(contextPayload.frameId);
     if (!frame)
       return;
     const delegate = new import_wkExecutionContext.WKExecutionContext(this._session, contextPayload.id);
@@ -453,7 +452,7 @@ class WKPage {
     if (!(pageOrError instanceof Error)) {
       const context = this._contextIdToContext.get(contextId);
       if (context)
-        await this._page._onBindingCalled(argument, context);
+        await this._page.onBindingCalled(argument, context);
     }
   }
   async navigateFrame(frame, url, referrer) {
@@ -523,18 +522,18 @@ class WKPage {
         location
       } = this._lastConsoleMessage;
       for (let i = count; i < event.count; ++i)
-        this._page._addConsoleMessage(derivedType, handles, location, handles.length ? void 0 : text);
+        this._page.addConsoleMessage(derivedType, handles, location, handles.length ? void 0 : text);
       this._lastConsoleMessage.count = event.count;
     }
   }
   _onDialog(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,
       async (accept, promptText) => {
         if (event.type === "beforeunload" && !accept)
-          this._page._frameManager.frameAbortedNavigation(this._page.mainFrame()._id, "navigation cancelled by beforeunload dialog");
+          this._page.frameManager.frameAbortedNavigation(this._page.mainFrame()._id, "navigation cancelled by beforeunload dialog");
         await this._pageProxySession.send("Dialog.handleJavaScriptDialog", { accept, promptText });
       },
       event.defaultPrompt
@@ -543,7 +542,7 @@ class WKPage {
   async _onFileChooserOpened(event) {
     let handle;
     try {
-      const context = await this._page._frameManager.frame(event.frameId)._mainContext();
+      const context = await this._page.frameManager.frame(event.frameId)._mainContext();
       handle = (0, import_wkExecutionContext.createHandle)(context, event.element).asElement();
     } catch (e) {
       return;
@@ -632,7 +631,7 @@ class WKPage {
     await this._forAllSessions((session) => WKPage._setEmulateMedia(session, emulatedMedia.media, colorScheme, reducedMotion, forcedColors, contrast));
   }
   async updateEmulatedViewportSize() {
-    this._browserContext._validateEmulatedViewport(this._page.viewportSize());
+    this._browserContext._validateEmulatedViewport(this._page.emulatedSize()?.viewport);
     await this._updateViewport();
   }
   async updateUserAgent() {
@@ -646,11 +645,11 @@ class WKPage {
   }
   async _updateViewport() {
     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 screenSize = deviceSize.screen;
+    const viewportSize = emulatedSize.viewport;
+    const screenSize = emulatedSize.screen;
     const promises = [
       this._pageProxySession.send("Emulation.setDeviceMetricsOverride", {
         width: viewportSize.width,
@@ -668,6 +667,8 @@ class WKPage {
       promises.push(this._pageProxySession.send("Emulation.setOrientationOverride", { angle }));
     }
     await Promise.all(promises);
+    if (!this._browserContext._browser?.options.headful && (import_hostPlatform.hostPlatform === "ubuntu22.04-x64" || import_hostPlatform.hostPlatform.startsWith("debian12")))
+      await new Promise((r) => setTimeout(r, 500));
   }
   async updateRequestInterception() {
     const enabled = this._page.needsRequestInterception();
@@ -712,21 +713,41 @@ class WKPage {
   async addInitScript(initScript) {
     await this._updateBootstrapScript();
   }
-  async removeInitScripts() {
+  async removeInitScripts(initScripts) {
     await this._updateBootstrapScript();
   }
+  async exposePlaywrightBinding() {
+    await this._updateState("Runtime.addBinding", { name: import_page.PageBinding.kBindingName });
+  }
   _calculateBootstrapScript() {
     const scripts = [];
-    if (!this._page.context()._options.isMobile) {
+    if (!this._page.browserContext._options.isMobile) {
       scripts.push("delete window.orientation");
       scripts.push("delete window.ondevicemotion");
       scripts.push("delete window.ondeviceorientation");
     }
     scripts.push('if (!window.safari) window.safari = { pushNotification: { toString() { return "[object SafariRemoteNotification]"; } } };');
     scripts.push("if (!window.GestureEvent) window.GestureEvent = function GestureEvent() {};");
+    scripts.push(this._publicKeyCredentialScript());
     scripts.push(...this._page.allInitScripts().map((script) => script.source));
     return scripts.join(";\n");
   }
+  _publicKeyCredentialScript() {
+    function polyfill() {
+      window.PublicKeyCredential ??= {
+        async getClientCapabilities() {
+          return {};
+        },
+        async isConditionalMediationAvailable() {
+          return false;
+        },
+        async isUserVerifyingPlatformAuthenticatorAvailable() {
+          return false;
+        }
+      };
+    }
+    return `(${polyfill.toString()})();`;
+  }
   async _updateBootstrapScript() {
     await this._updateState("Page.setBootstrapScript", { source: this._calculateBootstrapScript() });
   }
@@ -741,7 +762,7 @@ class WKPage {
     await this._session.send("Page.setDefaultBackgroundColorOverride", { color });
   }
   _toolbarHeight() {
-    if (this._page._browserContext._browser?.options.headful)
+    if (this._page.browserContext._browser?.options.headful)
       return import_hostPlatform.hostPlatform === "mac10.15" ? 55 : 59;
     return 0;
   }
@@ -765,8 +786,8 @@ class WKPage {
   validateScreenshotDimension(side, omitDeviceScaleFactor) {
     if (process.platform === "darwin")
       return;
-    if (!omitDeviceScaleFactor && this._page._browserContext._options.deviceScaleFactor)
-      side = Math.ceil(side * this._page._browserContext._options.deviceScaleFactor);
+    if (!omitDeviceScaleFactor && this._page.browserContext._options.deviceScaleFactor)
+      side = Math.ceil(side * this._page.browserContext._options.deviceScaleFactor);
     if (side > 32767)
       throw new Error("Cannot take screenshot larger than 32767 pixels on any dimension");
   }
@@ -775,7 +796,7 @@ class WKPage {
     const omitDeviceScaleFactor = scale === "css";
     this.validateScreenshotDimension(rect.width, omitDeviceScaleFactor);
     this.validateScreenshotDimension(rect.height, omitDeviceScaleFactor);
-    const result = await this._session.send("Page.snapshotRect", { ...rect, coordinateSystem: documentRect ? "Page" : "Viewport", omitDeviceScaleFactor });
+    const result = await progress.race(this._session.send("Page.snapshotRect", { ...rect, coordinateSystem: documentRect ? "Page" : "Viewport", omitDeviceScaleFactor }));
     const prefix = "data:image/png;base64,";
     let buffer = Buffer.from(result.dataURL.substr(prefix.length), "base64");
     if (format === "jpeg")
@@ -788,7 +809,7 @@ class WKPage {
     });
     if (!nodeInfo.contentFrameId)
       return null;
-    return this._page._frameManager.frame(nodeInfo.contentFrameId);
+    return this._page.frameManager.frame(nodeInfo.contentFrameId);
   }
   async getOwnerFrame(handle) {
     if (!handle._objectId)
@@ -843,7 +864,7 @@ class WKPage {
       this._pageProxySession.send("Screencast.screencastFrameAck", { generation }).catch((e) => import_debugLogger.debugLogger.log("error", e));
     });
     const buffer = Buffer.from(event.data, "base64");
-    this._page.emit(import_page2.Page.Events.ScreencastFrame, {
+    this._page.emit(import_page.Page.Events.ScreencastFrame, {
       buffer,
       width: event.deviceWidth,
       height: event.deviceHeight
@@ -887,7 +908,7 @@ class WKPage {
   }
   async inputActionEpilogue() {
   }
-  async resetForReuse() {
+  async resetForReuse(progress) {
   }
   async getFrameElement(frame) {
     const parent = frame.parentFrame();
@@ -945,7 +966,7 @@ class WKPage {
         redirectedFrom = request2;
       }
     }
-    const frame = redirectedFrom ? redirectedFrom.request.frame() : this._page._frameManager.frame(event.frameId);
+    const frame = redirectedFrom ? redirectedFrom.request.frame() : this._page.frameManager.frame(event.frameId);
     if (!frame)
       return;
     const isNavigationRequest = event.type === "Document";
@@ -957,7 +978,7 @@ class WKPage {
       request.request.setRawRequestHeaders(null);
     }
     this._requestIdToRequest.set(event.requestId, request);
-    this._page._frameManager.requestStarted(request.request, route);
+    this._page.frameManager.requestStarted(request.request, route);
   }
   _handleRequestRedirect(request, requestId, responsePayload, timestamp) {
     const response = request.createResponse(responsePayload);
@@ -967,8 +988,8 @@ class WKPage {
     response.setEncodedBodySize(null);
     response._requestFinished(responsePayload.timing ? import_helper.helper.secondsToRoundishMillis(timestamp - request._timestamp) : -1);
     this._requestIdToRequest.delete(requestId);
-    this._page._frameManager.requestReceivedResponse(response);
-    this._page._frameManager.reportRequestFinished(request.request, response);
+    this._page.frameManager.requestReceivedResponse(response);
+    this._page.frameManager.reportRequestFinished(request.request, response);
   }
   _onRequestIntercepted(session, event) {
     const requestWillBeSentEvent = this._requestIdToRequestWillBeSentEvent.get(event.requestId);
@@ -990,7 +1011,7 @@ class WKPage {
       return;
     this._requestIdToResponseReceivedPayloadEvent.set(event.requestId, event);
     const response = request.createResponse(event.response);
-    this._page._frameManager.requestReceivedResponse(response);
+    this._page.frameManager.requestReceivedResponse(response);
     if (response.status() === 204 && request.request.isNavigationRequest()) {
       this._onLoadingFailed(session, {
         requestId: event.requestId,
@@ -1023,7 +1044,7 @@ class WKPage {
     }
     this._requestIdToResponseReceivedPayloadEvent.delete(event.requestId);
     this._requestIdToRequest.delete(event.requestId);
-    this._page._frameManager.reportRequestFinished(request.request, response);
+    this._page.frameManager.reportRequestFinished(request.request, response);
   }
   _onLoadingFailed(session, event) {
     const requestWillBeSentEvent = this._requestIdToRequestWillBeSentEvent.get(event.requestId);
@@ -1046,7 +1067,7 @@ class WKPage {
     }
     this._requestIdToRequest.delete(event.requestId);
     request.request._setFailureText(event.errorText);
-    this._page._frameManager.requestFailed(request.request, event.errorText.includes("cancelled"));
+    this._page.frameManager.requestFailed(request.request, event.errorText.includes("cancelled"));
   }
   async _grantPermissions(origin, permissions) {
     const webPermissionToProtocol = /* @__PURE__ */ new Map([

package/lib/server/webkit/wkProvisionalPage.js

@@ -33,7 +33,7 @@ class WKProvisionalPage {
     const overrideFrameId = (handler) => {
       return (payload) => {
         if (payload.frameId)
-          payload.frameId = this._wkPage._page._frameManager.mainFrame()._id;
+          payload.frameId = this._wkPage._page.frameManager.mainFrame()._id;
         handler(payload);
       };
     };

package/lib/server/webkit/wkWorkers.js

@@ -46,15 +46,15 @@ class WKWorkers {
           });
         });
         this._workerSessions.set(event.workerId, workerSession);
-        worker._createExecutionContext(new import_wkExecutionContext.WKExecutionContext(workerSession, void 0));
-        this._page._addWorker(event.workerId, worker);
+        worker.createExecutionContext(new import_wkExecutionContext.WKExecutionContext(workerSession, void 0));
+        this._page.addWorker(event.workerId, worker);
         workerSession.on("Console.messageAdded", (event2) => this._onConsoleMessage(worker, event2));
         Promise.all([
           workerSession.send("Runtime.enable"),
           workerSession.send("Console.enable"),
           session.send("Worker.initialized", { workerId: event.workerId })
         ]).catch((e) => {
-          this._page._removeWorker(event.workerId);
+          this._page.removeWorker(event.workerId);
         });
       }),
       import_eventsHelper.eventsHelper.addEventListener(session, "Worker.dispatchMessageFromWorker", (event) => {
@@ -69,12 +69,12 @@ class WKWorkers {
           return;
         workerSession.dispose();
         this._workerSessions.delete(event.workerId);
-        this._page._removeWorker(event.workerId);
+        this._page.removeWorker(event.workerId);
       })
     ];
   }
   clear() {
-    this._page._clearWorkers();
+    this._page.clearWorkers();
     this._workerSessions.clear();
   }
   async initializeSession(session) {
@@ -88,14 +88,14 @@ class WKWorkers {
     else if (type === "timing")
       derivedType = "timeEnd";
     const handles = (parameters || []).map((p) => {
-      return (0, import_wkExecutionContext.createHandle)(worker._existingExecutionContext, p);
+      return (0, import_wkExecutionContext.createHandle)(worker.existingExecutionContext, p);
     });
     const location = {
       url: url || "",
       lineNumber: (lineNumber || 1) - 1,
       columnNumber: (columnNumber || 1) - 1
     };
-    this._page._addConsoleMessage(derivedType, handles, location, handles.length ? void 0 : text);
+    this._page.addConsoleMessage(derivedType, handles, location, handles.length ? void 0 : text);
   }
 }
 // Annotate the CommonJS export names for ESM import in node: