playwright-core 1.54.0-alpha-2025-06-12 → 1.54.0-alpha-2025-06-14

package/lib/server/bidi/bidiInput.js

@@ -43,28 +43,28 @@ 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) {
+  async _performActions(progress, actions) {
     await this._session.send("input.performActions", {
       context: this._session.sessionId,
       actions: [
@@ -75,22 +75,23 @@ class RawKeyboardImpl {
         }
       ]
     });
+    progress.throwIfAborted();
   }
 }
 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", {
@@ -103,8 +104,9 @@ class RawMouseImpl {
         }
       ]
     });
+    progress.throwIfAborted();
   }
-  async _performActions(actions) {
+  async _performActions(progress, actions) {
     await this._session.send("input.performActions", {
       context: this._session.sessionId,
       actions: [
@@ -118,13 +120,14 @@ class RawMouseImpl {
         }
       ]
     });
+    progress.throwIfAborted();
   }
 }
 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/bidiPage.js

@@ -458,7 +458,7 @@ class BidiPage {
   }
   async inputActionEpilogue() {
   }
-  async resetForReuse() {
+  async resetForReuse(progress) {
   }
   async pdf(options) {
     return this._pdf.generate(options);

package/lib/server/browserContext.js

@@ -55,6 +55,7 @@ var import_recorderApp = require("./recorder/recorderApp");
 var import_selectors = require("./selectors");
 var import_tracing = require("./trace/recorder/tracing");
 var rawStorageSource = __toESM(require("../generated/storageScriptSource"));
+var import_progress = require("./progress");
 class BrowserContext extends import_instrumentation.SdkObject {
   constructor(browser, options, browserContextId) {
     super(browser, "browser-context");
@@ -160,6 +161,10 @@ if (navigator.serviceWorker) navigator.serviceWorker.register = async () => { co
     return JSON.stringify(paramsCopy);
   }
   async resetForReuse(metadata, params) {
+    const controller = new import_progress.ProgressController(metadata, this);
+    return controller.run((progress) => this.resetForReuseImpl(progress, params));
+  }
+  async resetForReuseImpl(progress, params) {
     await this.tracing.resetForReuse();
     if (params) {
       for (const key of paramsThatAllowContextReuse)
@@ -170,12 +175,12 @@ if (navigator.serviceWorker) navigator.serviceWorker.register = async () => { co
     let page = this.pages()[0];
     const [, ...otherPages] = this.pages();
     for (const p of otherPages)
-      await p.close(metadata);
+      await p.close();
     if (page && page.hasCrashed()) {
-      await page.close(metadata);
+      await page.close();
       page = void 0;
     }
-    await page?.mainFrame().goto(metadata, "about:blank", { timeout: 0 });
+    await page?.mainFrame().gotoImpl(progress, "about:blank", {});
     await this._resetStorage();
     await this.clock.resetForReuse();
     if (this._options.permissions)
@@ -188,7 +193,7 @@ if (navigator.serviceWorker) navigator.serviceWorker.register = async () => { co
     await this.setUserAgent(this._options.userAgent);
     await this.clearCache();
     await this._resetCookies();
-    await page?.resetForReuse(metadata);
+    await page?.resetForReuse(progress);
   }
   _browserClosed() {
     for (const page of this.pages())
@@ -312,7 +317,7 @@ if (navigator.serviceWorker) navigator.serviceWorker.register = async () => { co
     const browserName = this._browser.options.name;
     if (this._options.isMobile && browserName === "chromium" || this._options.locale && browserName === "webkit") {
       await this.newPage(progress.metadata);
-      await defaultPage.close(progress.metadata);
+      await defaultPage.close();
     }
   }
   _authenticateProxyViaHeader() {
@@ -449,7 +454,7 @@ if (navigator.serviceWorker) navigator.serviceWorker.register = async () => { co
         if (storage.localStorage.length || storage.indexedDB?.length)
           result.origins.push({ origin, localStorage: storage.localStorage, indexedDB: storage.indexedDB });
       }
-      await page.close(internalMetadata);
+      await page.close();
     }
     return result;
   }
@@ -510,7 +515,7 @@ if (navigator.serviceWorker) navigator.serviceWorker.register = async () => { co
           })()`;
           await frame.evaluateExpression(restoreScript, { world: "utility" });
         }
-        await page.close(internalMetadata);
+        await page.close();
       }
     } finally {
       this._settingStorageState = false;

package/lib/server/chromium/crBrowser.js

@@ -398,7 +398,8 @@ class CRBrowserContext extends import_browserContext.BrowserContext {
       ["payment-handler", "paymentHandler"],
       // chrome-specific permissions we have.
       ["midi-sysex", "midiSysex"],
-      ["storage-access", "storageAccess"]
+      ["storage-access", "storageAccess"],
+      ["local-fonts", "localFonts"]
     ]);
     const filtered = permissions.map((permission) => {
       const protocolPermission = webPermissionToProtocol.get(permission);

package/lib/server/chromium/crDragDrop.js

@@ -44,7 +44,7 @@ class DragManager {
     this._dragState = null;
     return true;
   }
-  async interceptDragCausedByMove(x, y, button, buttons, modifiers, moveCallback) {
+  async interceptDragCausedByMove(progress, x, y, button, buttons, modifiers, moveCallback) {
     this._lastPosition = { x, y };
     if (this._dragState) {
       await this._crPage._mainFrameSession._client.send("Input.dispatchDragEvent", {
@@ -54,6 +54,7 @@ class DragManager {
         data: this._dragState,
         modifiers: (0, import_crProtocolHelper.toModifiersMask)(modifiers)
       });
+      progress.throwIfAborted();
       return;
     }
     if (button !== "left")
@@ -81,6 +82,7 @@ class DragManager {
       };
     }
     await this._crPage._page.safeNonStallingEvaluateInAllFrames(`(${setupDragListeners.toString()})()`, "utility");
+    progress.cleanupWhenAborted(() => this._crPage._page.safeNonStallingEvaluateInAllFrames("window.__cleanupDrag && window.__cleanupDrag()", "utility"));
     client.on("Input.dragIntercepted", onDragIntercepted);
     try {
       await client.send("Input.setInterceptDrags", { enabled: true });
@@ -95,6 +97,7 @@ class DragManager {
     this._dragState = expectingDrag ? (await dragInterceptedPromise).data : null;
     client.off("Input.dragIntercepted", onDragIntercepted);
     await client.send("Input.setInterceptDrags", { enabled: false });
+    progress.throwIfAborted();
     if (this._dragState) {
       await this._crPage._mainFrameSession._client.send("Input.dispatchDragEvent", {
         type: "dragEnter",
@@ -103,12 +106,13 @@ class DragManager {
         data: this._dragState,
         modifiers: (0, import_crProtocolHelper.toModifiersMask)(modifiers)
       });
+      progress.throwIfAborted();
     }
   }
   isDragging() {
     return !!this._dragState;
   }
-  async drop(x, y, modifiers) {
+  async drop(progress, x, y, modifiers) {
     (0, import_utils.assert)(this._dragState, "missing drag state");
     await this._crPage._mainFrameSession._client.send("Input.dispatchDragEvent", {
       type: "drop",
@@ -118,6 +122,7 @@ class DragManager {
       modifiers: (0, import_crProtocolHelper.toModifiersMask)(modifiers)
     });
     this._dragState = null;
+    progress.throwIfAborted();
   }
 }
 // Annotate the CommonJS export names for ESM import in node:

package/lib/server/chromium/crInput.js

@@ -59,10 +59,11 @@ class RawKeyboardImpl {
     commands = commands.filter((x) => !x.startsWith("insert"));
     return commands.map((c) => c.substring(0, c.length - 1));
   }
-  async keydown(modifiers, keyName, description, autoRepeat) {
+  async keydown(progress, modifiers, keyName, description, autoRepeat) {
     const { code, key, location, text } = description;
     if (code === "Escape" && await this._dragManger.cancelDrag())
       return;
+    progress.throwIfAborted();
     const commands = this._commandsForCode(code, modifiers);
     await this._client.send("Input.dispatchKeyEvent", {
       type: text ? "keyDown" : "rawKeyDown",
@@ -77,8 +78,9 @@ class RawKeyboardImpl {
       location,
       isKeypad: location === input.keypadLocation
     });
+    progress.throwIfAborted();
   }
-  async keyup(modifiers, keyName, description) {
+  async keyup(progress, modifiers, keyName, description) {
     const { code, key, location } = description;
     await this._client.send("Input.dispatchKeyEvent", {
       type: "keyUp",
@@ -88,9 +90,11 @@ class RawKeyboardImpl {
       code,
       location
     });
+    progress.throwIfAborted();
   }
-  async sendText(text) {
+  async sendText(progress, text) {
     await this._client.send("Input.insertText", { text });
+    progress.throwIfAborted();
   }
 }
 class RawMouseImpl {
@@ -99,7 +103,7 @@ class RawMouseImpl {
     this._client = client;
     this._dragManager = dragManager;
   }
-  async move(x, y, button, buttons, modifiers, forClick) {
+  async move(progress, x, y, button, buttons, modifiers, forClick) {
     const actualMove = async () => {
       await this._client.send("Input.dispatchMouseEvent", {
         type: "mouseMoved",
@@ -112,11 +116,13 @@ class RawMouseImpl {
       });
     };
     if (forClick) {
-      return actualMove();
+      await actualMove();
+      progress.throwIfAborted();
+      return;
     }
-    await this._dragManager.interceptDragCausedByMove(x, y, button, buttons, modifiers, actualMove);
+    await this._dragManager.interceptDragCausedByMove(progress, x, y, button, buttons, modifiers, actualMove);
   }
-  async down(x, y, button, buttons, modifiers, clickCount) {
+  async down(progress, x, y, button, buttons, modifiers, clickCount) {
     if (this._dragManager.isDragging())
       return;
     await this._client.send("Input.dispatchMouseEvent", {
@@ -129,10 +135,11 @@ class RawMouseImpl {
       clickCount,
       force: buttons.size > 0 ? 0.5 : 0
     });
+    progress.throwIfAborted();
   }
-  async up(x, y, button, buttons, modifiers, clickCount) {
+  async up(progress, x, y, button, buttons, modifiers, clickCount) {
     if (this._dragManager.isDragging()) {
-      await this._dragManager.drop(x, y, modifiers);
+      await this._dragManager.drop(progress, x, y, modifiers);
       return;
     }
     await this._client.send("Input.dispatchMouseEvent", {
@@ -144,8 +151,9 @@ class RawMouseImpl {
       modifiers: (0, import_crProtocolHelper.toModifiersMask)(modifiers),
       clickCount
     });
+    progress.throwIfAborted();
   }
-  async wheel(x, y, buttons, modifiers, deltaX, deltaY) {
+  async wheel(progress, x, y, buttons, modifiers, deltaX, deltaY) {
     await this._client.send("Input.dispatchMouseEvent", {
       type: "mouseWheel",
       x,
@@ -154,13 +162,14 @@ class RawMouseImpl {
       deltaX,
       deltaY
     });
+    progress.throwIfAborted();
   }
 }
 class RawTouchscreenImpl {
   constructor(client) {
     this._client = client;
   }
-  async tap(x, y, modifiers) {
+  async tap(progress, x, y, modifiers) {
     await Promise.all([
       this._client.send("Input.dispatchTouchEvent", {
         type: "touchStart",
@@ -176,6 +185,7 @@ class RawTouchscreenImpl {
         touchPoints: []
       })
     ]);
+    progress.throwIfAborted();
   }
 }
 // Annotate the CommonJS export names for ESM import in node:

package/lib/server/chromium/crPage.js

@@ -280,8 +280,8 @@ class CRPage {
     await this._mainFrameSession._client.send("Page.enable").catch((e) => {
     });
   }
-  async resetForReuse() {
-    await this.rawMouse.move(-1, -1, "none", /* @__PURE__ */ new Set(), /* @__PURE__ */ new Set(), true);
+  async resetForReuse(progress) {
+    await this.rawMouse.move(progress, -1, -1, "none", /* @__PURE__ */ new Set(), /* @__PURE__ */ new Set(), true);
   }
   async pdf(options) {
     return this._pdf.generate(options);