patchright-core 1.52.5 → 1.55.0

package/lib/server/firefox/ffBrowser.js

@@ -37,9 +37,9 @@ var import_browser = require("../browser");
 var import_browserContext = require("../browserContext");
 var import_errors = require("../errors");
 var network = __toESM(require("../network"));
-var import_page = require("../page");
 var import_ffConnection = require("./ffConnection");
 var import_ffPage = require("./ffPage");
+var import_page = require("../page");
 class FFBrowser extends import_browser.Browser {
   constructor(parent, connection, options) {
     super(parent, options);
@@ -126,7 +126,7 @@ class FFBrowser extends import_browser.Browser {
     const ffPage = this._ffPages.get(payload.pageTargetId);
     if (!ffPage)
       return;
-    ffPage._page._frameManager.frameAbortedNavigation(payload.frameId, "Download is starting");
+    ffPage._page.frameManager.frameAbortedNavigation(payload.frameId, "Download is starting");
     let originPage = ffPage._page.initializedOrUndefined();
     if (!originPage) {
       ffPage._markAsError(new Error("Starting new page download"));
@@ -163,7 +163,6 @@ class FFBrowserContext extends import_browserContext.BrowserContext {
     const browserContextId = this._browserContextId;
     const promises = [
       super._initialize(),
-      this._browser.session.send("Browser.addBinding", { browserContextId: this._browserContextId, name: import_page.PageBinding.kPlaywrightBinding, script: "" }),
       this._updateInitScripts()
     ];
     if (this._options.acceptDownloads !== "internal-browser-default") {
@@ -175,13 +174,7 @@ class FFBrowserContext extends import_browserContext.BrowserContext {
         }
       }));
     }
-    if (this._options.viewport) {
-      const viewport = {
-        viewportSize: { width: this._options.viewport.width, height: this._options.viewport.height },
-        deviceScaleFactor: this._options.deviceScaleFactor || 1
-      };
-      promises.push(this._browser.session.send("Browser.setDefaultViewport", { browserContextId, viewport }));
-    }
+    promises.push(this.doUpdateDefaultViewport());
     if (this._options.hasTouch)
       promises.push(this._browser.session.send("Browser.setTouchOverride", { browserContextId, hasTouch: true }));
     if (this._options.userAgent)
@@ -197,37 +190,14 @@ class FFBrowserContext extends import_browserContext.BrowserContext {
     if (this._options.timezoneId)
       promises.push(this._browser.session.send("Browser.setTimezoneOverride", { browserContextId, timezoneId: this._options.timezoneId }));
     if (this._options.extraHTTPHeaders || this._options.locale)
-      promises.push(this.setExtraHTTPHeaders(this._options.extraHTTPHeaders || []));
+      promises.push(this.doUpdateExtraHTTPHeaders());
     if (this._options.httpCredentials)
       promises.push(this.setHTTPCredentials(this._options.httpCredentials));
     if (this._options.geolocation)
       promises.push(this.setGeolocation(this._options.geolocation));
     if (this._options.offline)
-      promises.push(this.setOffline(this._options.offline));
-    if (this._options.colorScheme !== "no-override") {
-      promises.push(this._browser.session.send("Browser.setColorScheme", {
-        browserContextId,
-        colorScheme: this._options.colorScheme !== void 0 ? this._options.colorScheme : "light"
-      }));
-    }
-    if (this._options.reducedMotion !== "no-override") {
-      promises.push(this._browser.session.send("Browser.setReducedMotion", {
-        browserContextId,
-        reducedMotion: this._options.reducedMotion !== void 0 ? this._options.reducedMotion : "no-preference"
-      }));
-    }
-    if (this._options.forcedColors !== "no-override") {
-      promises.push(this._browser.session.send("Browser.setForcedColors", {
-        browserContextId,
-        forcedColors: this._options.forcedColors !== void 0 ? this._options.forcedColors : "none"
-      }));
-    }
-    if (this._options.contrast !== "no-override") {
-      promises.push(this._browser.session.send("Browser.setContrast", {
-        browserContextId,
-        contrast: this._options.contrast !== void 0 ? this._options.contrast : "no-preference"
-      }));
-    }
+      promises.push(this.doUpdateOffline());
+    promises.push(this.doUpdateDefaultEmulatedMedia());
     if (this._options.recordVideo) {
       promises.push(this._ensureVideosPath().then(() => {
         return this._browser.session.send("Browser.setVideoRecordingOptions", {
@@ -256,7 +226,6 @@ class FFBrowserContext extends import_browserContext.BrowserContext {
     return this._ffPages().map((ffPage) => ffPage._page);
   }
   async doCreateNewPage() {
-    (0, import_browserContext.assertBrowserContextIsNotOwned)(this);
     const { targetId } = await this._browser.session.send("Browser.newPage", {
       browserContextId: this._browserContextId
     }).catch((e) => {
@@ -269,17 +238,34 @@ class FFBrowserContext extends import_browserContext.BrowserContext {
   async doGetCookies(urls) {
     const { cookies } = await this._browser.session.send("Browser.getCookies", { browserContextId: this._browserContextId });
     return network.filterCookies(cookies.map((c) => {
-      const copy = { ...c };
-      delete copy.size;
-      delete copy.session;
-      return copy;
+      const { name, value, domain, path, expires, httpOnly, secure, sameSite } = c;
+      return {
+        name,
+        value,
+        domain,
+        path,
+        expires,
+        httpOnly,
+        secure,
+        sameSite
+      };
     }), urls);
   }
   async addCookies(cookies) {
-    const cc = network.rewriteCookies(cookies).map((c) => ({
-      ...c,
-      expires: c.expires === -1 ? void 0 : c.expires
-    }));
+    const cc = network.rewriteCookies(cookies).map((c) => {
+      const { name, value, url, domain, path, expires, httpOnly, secure, sameSite } = c;
+      return {
+        name,
+        value,
+        url,
+        domain,
+        path,
+        expires: expires === -1 ? void 0 : expires,
+        httpOnly,
+        secure,
+        sameSite
+      };
+    });
     await this._browser.session.send("Browser.setCookies", { browserContextId: this._browserContextId, cookies: cc });
   }
   async doClearCookies() {
@@ -308,9 +294,8 @@ class FFBrowserContext extends import_browserContext.BrowserContext {
     this._options.geolocation = geolocation;
     await this._browser.session.send("Browser.setGeolocationOverride", { browserContextId: this._browserContextId, geolocation: geolocation || null });
   }
-  async setExtraHTTPHeaders(headers) {
-    this._options.extraHTTPHeaders = headers;
-    let allHeaders = this._options.extraHTTPHeaders;
+  async doUpdateExtraHTTPHeaders() {
+    let allHeaders = this._options.extraHTTPHeaders || [];
     if (this._options.locale)
       allHeaders = network.mergeHeaders([allHeaders, network.singleHeader("Accept-Language", this._options.locale)]);
     await this._browser.session.send("Browser.setExtraHTTPHeaders", { browserContextId: this._browserContextId, headers: allHeaders });
@@ -318,9 +303,8 @@ class FFBrowserContext extends import_browserContext.BrowserContext {
   async setUserAgent(userAgent) {
     await this._browser.session.send("Browser.setUserAgentOverride", { browserContextId: this._browserContextId, userAgent: userAgent || null });
   }
-  async setOffline(offline) {
-    this._options.offline = offline;
-    await this._browser.session.send("Browser.setOnlineOverride", { browserContextId: this._browserContextId, override: offline ? "offline" : "online" });
+  async doUpdateOffline() {
+    await this._browser.session.send("Browser.setOnlineOverride", { browserContextId: this._browserContextId, override: this._options.offline ? "offline" : "online" });
   }
   async doSetHTTPCredentials(httpCredentials) {
     this._options.httpCredentials = httpCredentials;
@@ -334,20 +318,60 @@ class FFBrowserContext extends import_browserContext.BrowserContext {
   async doAddInitScript(initScript) {
     await this._updateInitScripts();
   }
-  async doRemoveNonInternalInitScripts() {
+  async doRemoveInitScripts(initScripts) {
     await this._updateInitScripts();
   }
   async _updateInitScripts() {
     const bindingScripts = [...this._pageBindings.values()].map((binding) => binding.initScript.source);
+    if (this.bindingsInitScript)
+      bindingScripts.unshift(this.bindingsInitScript.source);
     const initScripts = this.initScripts.map((script) => script.source);
-    await this._browser.session.send("Browser.setInitScripts", { browserContextId: this._browserContextId, scripts: [import_page.kBuiltinsScript.source, ...bindingScripts, ...initScripts].map((script) => ({ script })) });
+    await this._browser.session.send("Browser.setInitScripts", { browserContextId: this._browserContextId, scripts: [...bindingScripts, ...initScripts].map((script) => ({ script })) });
   }
   async doUpdateRequestInterception() {
     await Promise.all([
-      this._browser.session.send("Browser.setRequestInterception", { browserContextId: this._browserContextId, enabled: !!this._requestInterceptor }),
-      this._browser.session.send("Browser.setCacheDisabled", { browserContextId: this._browserContextId, cacheDisabled: !!this._requestInterceptor })
+      this._browser.session.send("Browser.setRequestInterception", { browserContextId: this._browserContextId, enabled: this.requestInterceptors.length > 0 }),
+      this._browser.session.send("Browser.setCacheDisabled", { browserContextId: this._browserContextId, cacheDisabled: this.requestInterceptors.length > 0 })
     ]);
   }
+  async doUpdateDefaultViewport() {
+    if (!this._options.viewport)
+      return;
+    const viewport = {
+      viewportSize: { width: this._options.viewport.width, height: this._options.viewport.height },
+      deviceScaleFactor: this._options.deviceScaleFactor || 1
+    };
+    await this._browser.session.send("Browser.setDefaultViewport", { browserContextId: this._browserContextId, viewport });
+  }
+  async doUpdateDefaultEmulatedMedia() {
+    if (this._options.colorScheme !== "no-override") {
+      await this._browser.session.send("Browser.setColorScheme", {
+        browserContextId: this._browserContextId,
+        colorScheme: this._options.colorScheme !== void 0 ? this._options.colorScheme : "light"
+      });
+    }
+    if (this._options.reducedMotion !== "no-override") {
+      await this._browser.session.send("Browser.setReducedMotion", {
+        browserContextId: this._browserContextId,
+        reducedMotion: this._options.reducedMotion !== void 0 ? this._options.reducedMotion : "no-preference"
+      });
+    }
+    if (this._options.forcedColors !== "no-override") {
+      await this._browser.session.send("Browser.setForcedColors", {
+        browserContextId: this._browserContextId,
+        forcedColors: this._options.forcedColors !== void 0 ? this._options.forcedColors : "none"
+      });
+    }
+    if (this._options.contrast !== "no-override") {
+      await this._browser.session.send("Browser.setContrast", {
+        browserContextId: this._browserContextId,
+        contrast: this._options.contrast !== void 0 ? this._options.contrast : "no-preference"
+      });
+    }
+  }
+  async doExposePlaywrightBinding() {
+    this._browser.session.send("Browser.addBinding", { browserContextId: this._browserContextId, name: import_page.PageBinding.kBindingName, script: "" });
+  }
   onClosePersistent() {
   }
   async clearCache() {

package/lib/server/firefox/ffExecutionContext.js

@@ -34,6 +34,7 @@ __export(ffExecutionContext_exports, {
 module.exports = __toCommonJS(ffExecutionContext_exports);
 var import_assert = require("../../utils/isomorphic/assert");
 var import_stackTrace = require("../../utils/isomorphic/stackTrace");
+var import_utilityScriptSerializers = require("../../utils/isomorphic/utilityScriptSerializers");
 var js = __toESM(require("../javascript"));
 var dom = __toESM(require("../dom"));
 var import_protocolError = require("../protocolError");
@@ -73,7 +74,7 @@ class FFExecutionContext {
     }).catch(rewriteError);
     checkException(payload.exceptionDetails);
     if (returnByValue)
-      return js.parseEvaluationResultValue(payload.result.value);
+      return (0, import_utilityScriptSerializers.parseEvaluationResultValue)(payload.result.value);
     return createHandle(utilityScript._context, payload.result);
   }
   async getProperties(object) {

package/lib/server/firefox/ffInput.js

@@ -58,12 +58,12 @@ class RawKeyboardImpl {
   constructor(client) {
     this._client = client;
   }
-  async keydown(modifiers, keyName, description, autoRepeat) {
+  async keydown(progress, modifiers, keyName, description, autoRepeat) {
     let text = description.text;
     if (text === "\r")
       text = "";
     const { code, key, location } = description;
-    await this._client.send("Page.dispatchKeyEvent", {
+    await progress.race(this._client.send("Page.dispatchKeyEvent", {
       type: "keydown",
       keyCode: description.keyCodeWithoutLocation,
       code,
@@ -71,39 +71,39 @@ class RawKeyboardImpl {
       repeat: autoRepeat,
       location,
       text
-    });
+    }));
   }
-  async keyup(modifiers, keyName, description) {
+  async keyup(progress, modifiers, keyName, description) {
     const { code, key, location } = description;
-    await this._client.send("Page.dispatchKeyEvent", {
+    await progress.race(this._client.send("Page.dispatchKeyEvent", {
       type: "keyup",
       key,
       keyCode: description.keyCodeWithoutLocation,
       code,
       location,
       repeat: false
-    });
+    }));
   }
-  async sendText(text) {
-    await this._client.send("Page.insertText", { text });
+  async sendText(progress, text) {
+    await progress.race(this._client.send("Page.insertText", { text }));
   }
 }
 class RawMouseImpl {
   constructor(client) {
     this._client = client;
   }
-  async move(x, y, button, buttons, modifiers, forClick) {
-    await this._client.send("Page.dispatchMouseEvent", {
+  async move(progress, x, y, button, buttons, modifiers, forClick) {
+    await progress.race(this._client.send("Page.dispatchMouseEvent", {
       type: "mousemove",
       button: 0,
       buttons: toButtonsMask(buttons),
       x: Math.floor(x),
       y: Math.floor(y),
       modifiers: toModifiersMask(modifiers)
-    });
+    }));
   }
-  async down(x, y, button, buttons, modifiers, clickCount) {
-    await this._client.send("Page.dispatchMouseEvent", {
+  async down(progress, x, y, button, buttons, modifiers, clickCount) {
+    await progress.race(this._client.send("Page.dispatchMouseEvent", {
       type: "mousedown",
       button: toButtonNumber(button),
       buttons: toButtonsMask(buttons),
@@ -111,10 +111,10 @@ class RawMouseImpl {
       y: Math.floor(y),
       modifiers: toModifiersMask(modifiers),
       clickCount
-    });
+    }));
   }
-  async up(x, y, button, buttons, modifiers, clickCount) {
-    await this._client.send("Page.dispatchMouseEvent", {
+  async up(progress, x, y, button, buttons, modifiers, clickCount) {
+    await progress.race(this._client.send("Page.dispatchMouseEvent", {
       type: "mouseup",
       button: toButtonNumber(button),
       buttons: toButtonsMask(buttons),
@@ -122,18 +122,18 @@ class RawMouseImpl {
       y: Math.floor(y),
       modifiers: toModifiersMask(modifiers),
       clickCount
-    });
+    }));
   }
-  async wheel(x, y, buttons, modifiers, deltaX, deltaY) {
+  async wheel(progress, x, y, buttons, modifiers, deltaX, deltaY) {
     await this._page.mainFrame().evaluateExpression(`new Promise(requestAnimationFrame)`, { world: "utility" });
-    await this._client.send("Page.dispatchWheelEvent", {
+    await progress.race(this._client.send("Page.dispatchWheelEvent", {
       deltaX,
       deltaY,
       x: Math.floor(x),
       y: Math.floor(y),
       deltaZ: 0,
       modifiers: toModifiersMask(modifiers)
-    });
+    }));
   }
   setPage(page) {
     this._page = page;
@@ -143,12 +143,12 @@ class RawTouchscreenImpl {
   constructor(client) {
     this._client = client;
   }
-  async tap(x, y, modifiers) {
-    await this._client.send("Page.dispatchTapEvent", {
+  async tap(progress, x, y, modifiers) {
+    await progress.race(this._client.send("Page.dispatchTapEvent", {
       x,
       y,
       modifiers: toModifiersMask(modifiers)
-    });
+    }));
   }
 }
 // Annotate the CommonJS export names for ESM import in node:

package/lib/server/firefox/ffNetworkManager.js

@@ -56,9 +56,11 @@ class FFNetworkManager {
   }
   _onRequestWillBeSent(event) {
     const redirectedFrom = event.redirectedFrom ? this._requests.get(event.redirectedFrom) || null : null;
-    const frame = redirectedFrom ? redirectedFrom.request.frame() : event.frameId ? this._page._frameManager.frame(event.frameId) : null;
+    const frame = redirectedFrom ? redirectedFrom.request.frame() : event.frameId ? this._page.frameManager.frame(event.frameId) : null;
     if (!frame)
       return;
+    if (event.method === "OPTIONS" && !event.isIntercepted)
+      return;
     if (redirectedFrom)
       this._requests.delete(redirectedFrom._id);
     const request = new InterceptableRequest(frame, redirectedFrom, event);
@@ -66,7 +68,7 @@ class FFNetworkManager {
     if (event.isIntercepted)
       route = new FFRouteImpl(this._session, request);
     this._requests.set(request._id, request);
-    this._page._frameManager.requestStarted(request.request, route);
+    this._page.frameManager.requestStarted(request.request, route);
   }
   _onResponseReceived(event) {
     const request = this._requests.get(event.requestId);
@@ -114,7 +116,7 @@ class FFNetworkManager {
     });
     response.setRawResponseHeaders(null);
     response.setResponseHeadersSize(null);
-    this._page._frameManager.requestReceivedResponse(response);
+    this._page.frameManager.requestReceivedResponse(response);
   }
   _onRequestFinished(event) {
     const request = this._requests.get(event.requestId);
@@ -133,7 +135,7 @@ class FFNetworkManager {
     }
     if (event.protocolVersion)
       response._setHttpVersion(event.protocolVersion);
-    this._page._frameManager.reportRequestFinished(request.request, response);
+    this._page.frameManager.reportRequestFinished(request.request, response);
   }
   _onRequestFailed(event) {
     const request = this._requests.get(event.requestId);
@@ -147,7 +149,7 @@ class FFNetworkManager {
       response._requestFinished(-1);
     }
     request.request._setFailureText(event.errorCode);
-    this._page._frameManager.requestFailed(request.request, event.errorCode === "NS_BINDING_ABORTED");
+    this._page.frameManager.requestFailed(request.request, event.errorCode === "NS_BINDING_ABORTED");
   }
 }
 const causeToResourceType = {
@@ -187,7 +189,7 @@ class InterceptableRequest {
     if (payload.postData)
       postDataBuffer = Buffer.from(payload.postData, "base64");
     this.request = new network.Request(
-      frame._page._browserContext,
+      frame._page.browserContext,
       frame,
       null,
       redirectedFrom ? redirectedFrom.request : null,

package/lib/server/firefox/ffPage.js

@@ -98,7 +98,7 @@ class FFPage {
       this._reportedAsNew = true;
       this._page.reportAsNew(this._opener?._page);
     });
-    this.addInitScript(new import_page.InitScript("", true), UTILITY_WORLD_NAME).catch((e) => this._markAsError(e));
+    this.addInitScript(new import_page.InitScript(""), UTILITY_WORLD_NAME).catch((e) => this._markAsError(e));
   }
   async _markAsError(error) {
     if (this._reportedAsNew)
@@ -107,23 +107,23 @@ class FFPage {
     this._page.reportAsNew(this._opener?._page, error);
   }
   _onWebSocketCreated(event) {
-    this._page._frameManager.onWebSocketCreated(webSocketId(event.frameId, event.wsid), event.requestURL);
-    this._page._frameManager.onWebSocketRequest(webSocketId(event.frameId, event.wsid));
+    this._page.frameManager.onWebSocketCreated(webSocketId(event.frameId, event.wsid), event.requestURL);
+    this._page.frameManager.onWebSocketRequest(webSocketId(event.frameId, event.wsid));
   }
   _onWebSocketClosed(event) {
     if (event.error)
-      this._page._frameManager.webSocketError(webSocketId(event.frameId, event.wsid), event.error);
-    this._page._frameManager.webSocketClosed(webSocketId(event.frameId, event.wsid));
+      this._page.frameManager.webSocketError(webSocketId(event.frameId, event.wsid), event.error);
+    this._page.frameManager.webSocketClosed(webSocketId(event.frameId, event.wsid));
   }
   _onWebSocketFrameReceived(event) {
-    this._page._frameManager.webSocketFrameReceived(webSocketId(event.frameId, event.wsid), event.opcode, event.data);
+    this._page.frameManager.webSocketFrameReceived(webSocketId(event.frameId, event.wsid), event.opcode, event.data);
   }
   _onWebSocketFrameSent(event) {
-    this._page._frameManager.onWebSocketFrameSent(webSocketId(event.frameId, event.wsid), event.opcode, event.data);
+    this._page.frameManager.onWebSocketFrameSent(webSocketId(event.frameId, event.wsid), event.opcode, event.data);
   }
   _onExecutionContextCreated(payload) {
     const { executionContextId, auxData } = payload;
-    const frame = this._page._frameManager.frame(auxData.frameId);
+    const frame = this._page.frameManager.frame(auxData.frameId);
     if (!frame)
       return;
     const delegate = new import_ffExecutionContext.FFExecutionContext(this._session, executionContextId);
@@ -157,38 +157,38 @@ class FFPage {
   }
   _onLinkClicked(phase) {
     if (phase === "before")
-      this._page._frameManager.frameWillPotentiallyRequestNavigation();
+      this._page.frameManager.frameWillPotentiallyRequestNavigation();
     else
-      this._page._frameManager.frameDidPotentiallyRequestNavigation();
+      this._page.frameManager.frameDidPotentiallyRequestNavigation();
   }
   _onNavigationStarted(params) {
-    this._page._frameManager.frameRequestedNavigation(params.frameId, params.navigationId);
+    this._page.frameManager.frameRequestedNavigation(params.frameId, params.navigationId);
   }
   _onNavigationAborted(params) {
-    this._page._frameManager.frameAbortedNavigation(params.frameId, params.errorText, params.navigationId);
+    this._page.frameManager.frameAbortedNavigation(params.frameId, params.errorText, params.navigationId);
   }
   _onNavigationCommitted(params) {
     for (const [workerId, worker] of this._workers) {
       if (worker.frameId === params.frameId)
         this._onWorkerDestroyed({ workerId });
     }
-    this._page._frameManager.frameCommittedNewDocumentNavigation(params.frameId, params.url, params.name || "", params.navigationId || "", false);
+    this._page.frameManager.frameCommittedNewDocumentNavigation(params.frameId, params.url, params.name || "", params.navigationId || "", false);
   }
   _onSameDocumentNavigation(params) {
-    this._page._frameManager.frameCommittedSameDocumentNavigation(params.frameId, params.url);
+    this._page.frameManager.frameCommittedSameDocumentNavigation(params.frameId, params.url);
   }
   _onFrameAttached(params) {
-    this._page._frameManager.frameAttached(params.frameId, params.parentFrameId);
+    this._page.frameManager.frameAttached(params.frameId, params.parentFrameId);
   }
   _onFrameDetached(params) {
-    this._page._frameManager.frameDetached(params.frameId);
+    this._page.frameManager.frameDetached(params.frameId);
   }
   _onEventFired(payload) {
     const { frameId, name } = payload;
     if (name === "load")
-      this._page._frameManager.frameLifecycleEvent(frameId, "load");
+      this._page.frameManager.frameLifecycleEvent(frameId, "load");
     if (name === "DOMContentLoaded")
-      this._page._frameManager.frameLifecycleEvent(frameId, "domcontentloaded");
+      this._page.frameManager.frameLifecycleEvent(frameId, "domcontentloaded");
   }
   _onUncaughtError(params) {
     const { name, message } = (0, import_stackTrace.splitErrorMessage)(params.message);
@@ -202,10 +202,10 @@ class FFPage {
     const context = this._contextIdToContext.get(executionContextId);
     if (!context)
       return;
-    this._page._addConsoleMessage(type === "warn" ? "warning" : type, args.map((arg) => (0, import_ffExecutionContext.createHandle)(context, arg)), location);
+    this._page.addConsoleMessage(type === "warn" ? "warning" : type, args.map((arg) => (0, import_ffExecutionContext.createHandle)(context, arg)), location);
   }
   _onDialogOpened(params) {
-    this._page.emitOnContext(import_browserContext.BrowserContext.Events.Dialog, new dialog.Dialog(
+    this._page.browserContext.dialogManager.dialogDidOpen(new dialog.Dialog(
       this._page,
       params.type,
       params.message,
@@ -220,7 +220,7 @@ class FFPage {
     if (!(pageOrError instanceof Error)) {
       const context = this._contextIdToContext.get(event.executionContextId);
       if (context)
-        await this._page._onBindingCalled(event.payload, context);
+        await this._page.onBindingCalled(event.payload, context);
     }
   }
   async _onFileChooserOpened(payload) {
@@ -244,14 +244,14 @@ class FFPage {
       });
     });
     this._workers.set(workerId, { session: workerSession, frameId: event.frameId });
-    this._page._addWorker(workerId, worker);
+    this._page.addWorker(workerId, worker);
     workerSession.once("Runtime.executionContextCreated", (event2) => {
-      worker._createExecutionContext(new import_ffExecutionContext.FFExecutionContext(workerSession, event2.executionContextId));
+      worker.createExecutionContext(new import_ffExecutionContext.FFExecutionContext(workerSession, event2.executionContextId));
     });
     workerSession.on("Runtime.console", (event2) => {
       const { type, args, location } = event2;
-      const context = worker._existingExecutionContext;
-      this._page._addConsoleMessage(type, args.map((arg) => (0, import_ffExecutionContext.createHandle)(context, arg)), location);
+      const context = worker.existingExecutionContext;
+      this._page.addConsoleMessage(type, args.map((arg) => (0, import_ffExecutionContext.createHandle)(context, arg)), location);
     });
   }
   _onWorkerDestroyed(event) {
@@ -261,7 +261,7 @@ class FFPage {
       return;
     worker.session.dispose();
     this._workers.delete(workerId);
-    this._page._removeWorker(workerId);
+    this._page.removeWorker(workerId);
   }
   async _onDispatchMessageFromWorker(event) {
     const worker = this._workers.get(event.workerId);
@@ -291,7 +291,7 @@ class FFPage {
     await this._session.send("Network.setExtraHTTPHeaders", { headers: this._page.extraHTTPHeaders() || [] });
   }
   async updateEmulatedViewportSize() {
-    const viewportSize = this._page.viewportSize();
+    const viewportSize = this._page.emulatedSize()?.viewport ?? null;
     await this._session.send("Page.setViewportSize", { viewportSize });
   }
   async bringToFront() {
@@ -336,10 +336,14 @@ class FFPage {
   }
   async addInitScript(initScript, worldName) {
     this._initScripts.push({ initScript, worldName });
-    await this._session.send("Page.setInitScripts", { scripts: this._initScripts.map((s) => ({ script: s.initScript.source, worldName: s.worldName })) });
+    await this._updateInitScripts();
+  }
+  async removeInitScripts(initScripts) {
+    const set = new Set(initScripts);
+    this._initScripts = this._initScripts.filter((s) => !set.has(s.initScript));
+    await this._updateInitScripts();
   }
-  async removeInitScripts() {
-    this._initScripts = this._initScripts.filter((s) => s.initScript.internal);
+  async _updateInitScripts() {
     await this._session.send("Page.setInitScripts", { scripts: this._initScripts.map((s) => ({ script: s.initScript.source, worldName: s.worldName })) });
   }
   async closePage(runBeforeUnload) {
@@ -359,13 +363,12 @@ class FFPage {
         height: viewportRect.height
       };
     }
-    progress.throwIfAborted();
-    const { data } = await this._session.send("Page.screenshot", {
+    const { data } = await progress.race(this._session.send("Page.screenshot", {
       mimeType: "image/" + format,
       clip: documentRect,
       quality,
       omitDeviceScaleFactor: scale === "css"
-    });
+    }));
     return Buffer.from(data, "base64");
   }
   async getContentFrame(handle) {
@@ -375,7 +378,7 @@ class FFPage {
     });
     if (!contentFrameId)
       return null;
-    return this._page._frameManager.frame(contentFrameId);
+    return this._page.frameManager.frame(contentFrameId);
   }
   async getOwnerFrame(handle) {
     const { ownerFrameId } = await this._session.send("Page.describeNode", {
@@ -471,8 +474,8 @@ class FFPage {
   }
   async inputActionEpilogue() {
   }
-  async resetForReuse() {
-    await this.rawMouse.move(-1, -1, "none", /* @__PURE__ */ new Set(), /* @__PURE__ */ new Set(), false);
+  async resetForReuse(progress) {
+    await this.rawMouse.move(progress, -1, -1, "none", /* @__PURE__ */ new Set(), /* @__PURE__ */ new Set(), false);
   }
   async getFrameElement(frame) {
     const parent = frame.parentFrame();

package/lib/server/firefox/firefox.js

@@ -37,7 +37,7 @@ var import_ffBrowser = require("./ffBrowser");
 var import_ffConnection = require("./ffConnection");
 var import_ascii = require("../utils/ascii");
 var import_browserType = require("../browserType");
-var import_browserType2 = require("../browserType");
+var import_manualPromise = require("../../utils/isomorphic/manualPromise");
 class Firefox extends import_browserType.BrowserType {
   constructor(parent) {
     super(parent, "firefox");
@@ -55,7 +55,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?`);
     if (import_os.default.platform() === "linux") {
@@ -90,14 +90,13 @@ Workaround: Set the HOME=/root environment variable${process.env.GITHUB_ACTION ?
       firefoxArguments.push("-silent");
     return firefoxArguments;
   }
-  readyState(options) {
-    return new JugglerReadyState();
-  }
-}
-class JugglerReadyState extends import_browserType2.BrowserReadyState {
-  onBrowserOutput(message) {
-    if (message.includes("Juggler listening to the pipe"))
-      this._wsEndpoint.resolve(void 0);
+  waitForReadyState(options, browserLogsCollector) {
+    const result = new import_manualPromise.ManualPromise();
+    browserLogsCollector.onMessage((message) => {
+      if (message.includes("Juggler listening to the pipe"))
+        result.resolve({});
+    });
+    return result;
   }
 }
 // Annotate the CommonJS export names for ESM import in node: