playwright-core 1.54.0-alpha-2025-06-15 → 1.54.0-alpha-2025-06-17

package/lib/server/progress.js

@@ -18,20 +18,28 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var progress_exports = {};
 __export(progress_exports, {
-  ProgressController: () => ProgressController
+  ProgressController: () => ProgressController,
+  isAbortError: () => isAbortError
 });
 module.exports = __toCommonJS(progress_exports);
 var import_errors = require("./errors");
 var import_utils = require("../utils");
 var import_manualPromise = require("../utils/isomorphic/manualPromise");
 class ProgressController {
-  constructor(metadata, sdkObject) {
+  constructor(metadata, sdkObject, strictMode) {
     this._forceAbortPromise = new import_manualPromise.ManualPromise();
+    this._donePromise = new import_manualPromise.ManualPromise();
     // Cleanups to be run only in the case of abort.
     this._cleanups = [];
+    // Lenient mode races against the timeout. This guarantees that timeout is respected,
+    // but may have some work being done after the timeout due to parallel control flow.
+    //
+    // Strict mode aborts the progress and requires the code to react to it. This way,
+    // progress only finishes after the inner callback exits, guaranteeing no work after the timeout.
+    this._strictMode = false;
     this._state = "before";
     this._deadline = 0;
-    this._timeout = 0;
+    this._strictMode = strictMode === "strict";
     this.metadata = metadata;
     this.sdkObject = sdkObject;
     this.instrumentation = sdkObject.instrumentation;
@@ -41,14 +49,17 @@ class ProgressController {
   setLogName(logName) {
     this._logName = logName;
   }
-  abort(error) {
-    this._forceAbortPromise.reject(error);
+  async abort(message) {
+    if (this._state === "running") {
+      const error = new AbortedError(message);
+      this._state = { error };
+      this._forceAbortPromise.reject(error);
+    }
+    if (this._strictMode)
+      await this._donePromise;
   }
   async run(task, timeout) {
-    if (timeout) {
-      this._timeout = timeout;
-      this._deadline = timeout ? (0, import_utils.monotonicTime)() + timeout : 0;
-    }
+    this._deadline = timeout ? (0, import_utils.monotonicTime)() + timeout : 0;
     (0, import_utils.assert)(this._state === "before");
     this._state = "running";
     this.sdkObject.attribution.context?._activeProgressControllers.add(this);
@@ -60,7 +71,6 @@ class ProgressController {
       },
       timeUntilDeadline: () => this._deadline ? this._deadline - (0, import_utils.monotonicTime)() : 2147483647,
       // 2^31-1 safe setTimeout in Node.
-      isRunning: () => this._state === "running",
       cleanupWhenAborted: (cleanup) => {
         if (this._state === "running")
           this._cleanups.push(cleanup);
@@ -68,25 +78,46 @@ class ProgressController {
           runCleanup(cleanup);
       },
       throwIfAborted: () => {
-        if (this._state === "aborted")
-          throw new AbortedError();
+        if (typeof this._state === "object")
+          throw this._state.error;
+      },
+      metadata: this.metadata,
+      race: (promise) => {
+        const promises = Array.isArray(promise) ? promise : [promise];
+        return Promise.race([...promises, this._forceAbortPromise]);
       },
-      metadata: this.metadata
+      raceWithCleanup: (promise, cleanup) => {
+        return progress.race(promise.then((result) => {
+          progress.cleanupWhenAborted(() => cleanup(result));
+          return result;
+        }));
+      },
+      wait: async (timeout2) => {
+        let timer2;
+        const promise = new Promise((f) => timer2 = setTimeout(f, timeout2));
+        return progress.race(promise).finally(() => clearTimeout(timer2));
+      }
     };
-    const timeoutError = new import_errors.TimeoutError(`Timeout ${this._timeout}ms exceeded.`);
-    const timer = setTimeout(() => this._forceAbortPromise.reject(timeoutError), progress.timeUntilDeadline());
+    const timeoutError = new import_errors.TimeoutError(`Timeout ${timeout}ms exceeded.`);
+    const timer = setTimeout(() => {
+      if (this._state === "running") {
+        this._state = { error: timeoutError };
+        this._forceAbortPromise.reject(timeoutError);
+      }
+    }, progress.timeUntilDeadline());
     try {
       const promise = task(progress);
-      const result = await Promise.race([promise, this._forceAbortPromise]);
+      const result = this._strictMode ? await promise : await Promise.race([promise, this._forceAbortPromise]);
       this._state = "finished";
       return result;
-    } catch (e) {
-      this._state = "aborted";
+    } catch (error) {
+      this._state = { error };
       await Promise.all(this._cleanups.splice(0).map(runCleanup));
-      throw e;
+      throw error;
     } finally {
       this.sdkObject.attribution.context?._activeProgressControllers.delete(this);
       clearTimeout(timer);
+      this._donePromise.resolve();
     }
   }
 }
@@ -98,7 +129,11 @@ async function runCleanup(cleanup) {
 }
 class AbortedError extends Error {
 }
+function isAbortError(error) {
+  return error instanceof AbortedError || error instanceof import_errors.TimeoutError;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  ProgressController
+  ProgressController,
+  isAbortError
 });

package/lib/server/webkit/wkInput.js

@@ -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,24 +88,21 @@ class RawKeyboardImpl {
       autoRepeat,
       macCommands: commands,
       isKeypad: description.location === input.keypadLocation
-    });
-    progress.throwIfAborted();
+    }));
   }
   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
-    });
-    progress.throwIfAborted();
+    }));
   }
   async sendText(progress, text) {
-    await this._session.send("Page.insertText", { text });
-    progress.throwIfAborted();
+    await progress.race(this._session.send("Page.insertText", { text }));
   }
 }
 class RawMouseImpl {
@@ -116,18 +113,17 @@ class RawMouseImpl {
     this._session = session;
   }
   async move(progress, x, y, button, buttons, modifiers, forClick) {
-    await this._pageProxySession.send("Input.dispatchMouseEvent", {
+    await progress.race(this._pageProxySession.send("Input.dispatchMouseEvent", {
       type: "move",
       button,
       buttons: toButtonsMask(buttons),
       x,
       y,
       modifiers: toModifiersMask(modifiers)
-    });
-    progress.throwIfAborted();
+    }));
   }
   async down(progress, x, y, button, buttons, modifiers, clickCount) {
-    await this._pageProxySession.send("Input.dispatchMouseEvent", {
+    await progress.race(this._pageProxySession.send("Input.dispatchMouseEvent", {
       type: "down",
       button,
       buttons: toButtonsMask(buttons),
@@ -135,11 +131,10 @@ class RawMouseImpl {
       y,
       modifiers: toModifiersMask(modifiers),
       clickCount
-    });
-    progress.throwIfAborted();
+    }));
   }
   async up(progress, x, y, button, buttons, modifiers, clickCount) {
-    await this._pageProxySession.send("Input.dispatchMouseEvent", {
+    await progress.race(this._pageProxySession.send("Input.dispatchMouseEvent", {
       type: "up",
       button,
       buttons: toButtonsMask(buttons),
@@ -147,23 +142,20 @@ class RawMouseImpl {
       y,
       modifiers: toModifiersMask(modifiers),
       clickCount
-    });
-    progress.throwIfAborted();
+    }));
   }
   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" });
-    progress.throwIfAborted();
-    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)
-    });
-    progress.throwIfAborted();
+    }));
   }
   setPage(page) {
     this._page = page;
@@ -174,12 +166,11 @@ class RawTouchscreenImpl {
     this._pageProxySession = session;
   }
   async tap(progress, x, y, modifiers) {
-    await this._pageProxySession.send("Input.dispatchTapEvent", {
+    await progress.race(this._pageProxySession.send("Input.dispatchTapEvent", {
       x,
       y,
       modifiers: toModifiersMask(modifiers)
-    });
-    progress.throwIfAborted();
+    }));
   }
 }
 // Annotate the CommonJS export names for ESM import in node: