playwright-core 1.54.0-alpha-2025-06-11 → 1.54.0-alpha-2025-06-13

package/lib/server/dispatchers/pageDispatcher.js

@@ -34,7 +34,7 @@ var import_networkDispatchers = require("./networkDispatchers");
 var import_networkDispatchers2 = require("./networkDispatchers");
 var import_networkDispatchers3 = require("./networkDispatchers");
 var import_webSocketRouteDispatcher = require("./webSocketRouteDispatcher");
-var import_crypto = require("../utils/crypto");
+var import_instrumentation = require("../instrumentation");
 var import_urlMatch = require("../../utils/isomorphic/urlMatch");
 class PageDispatcher extends import_dispatcher.Dispatcher {
   constructor(parentScope, page) {
@@ -197,7 +197,7 @@ class PageDispatcher extends import_dispatcher.Dispatcher {
   async close(params, metadata) {
     if (!params.runBeforeUnload)
       metadata.potentiallyClosesScope = true;
-    await this._page.close(metadata, params);
+    await this._page.close(params);
   }
   async updateSubscription(params) {
     if (params.event === "fileChooser")
@@ -208,37 +208,42 @@ class PageDispatcher extends import_dispatcher.Dispatcher {
       this._subscriptions.delete(params.event);
   }
   async keyboardDown(params, metadata) {
-    await this._page.keyboard.down(params.key);
+    await this._page.keyboard.down(metadata, params.key);
   }
   async keyboardUp(params, metadata) {
-    await this._page.keyboard.up(params.key);
+    await this._page.keyboard.up(metadata, params.key);
   }
   async keyboardInsertText(params, metadata) {
-    await this._page.keyboard.insertText(params.text);
+    await this._page.keyboard.insertText(metadata, params.text);
   }
   async keyboardType(params, metadata) {
-    await this._page.keyboard.type(params.text, params);
+    await this._page.keyboard.type(metadata, params.text, params);
   }
   async keyboardPress(params, metadata) {
-    await this._page.keyboard.press(params.key, params);
+    await this._page.keyboard.press(metadata, params.key, params);
   }
   async mouseMove(params, metadata) {
-    await this._page.mouse.move(params.x, params.y, params, metadata);
+    metadata.point = { x: params.x, y: params.y };
+    await this._page.mouse.move(metadata, params.x, params.y, params);
   }
   async mouseDown(params, metadata) {
-    await this._page.mouse.down(params, metadata);
+    metadata.point = this._page.mouse.currentPoint();
+    await this._page.mouse.down(metadata, params);
   }
   async mouseUp(params, metadata) {
-    await this._page.mouse.up(params, metadata);
+    metadata.point = this._page.mouse.currentPoint();
+    await this._page.mouse.up(metadata, params);
   }
   async mouseClick(params, metadata) {
-    await this._page.mouse.click(params.x, params.y, params, metadata);
+    metadata.point = { x: params.x, y: params.y };
+    await this._page.mouse.click(metadata, params.x, params.y, params);
   }
   async mouseWheel(params, metadata) {
-    await this._page.mouse.wheel(params.deltaX, params.deltaY);
+    await this._page.mouse.wheel(metadata, params.deltaX, params.deltaY);
   }
   async touchscreenTap(params, metadata) {
-    await this._page.touchscreen.tap(params.x, params.y, metadata);
+    metadata.point = { x: params.x, y: params.y };
+    await this._page.touchscreen.tap(metadata, params.x, params.y);
   }
   async accessibilitySnapshot(params, metadata) {
     const rootAXNode = await this._page.accessibility.snapshot({
@@ -338,7 +343,7 @@ class WorkerDispatcher extends import_dispatcher.Dispatcher {
 class BindingCallDispatcher extends import_dispatcher.Dispatcher {
   constructor(scope, name, needsHandle, source, args) {
     const frameDispatcher = import_frameDispatcher.FrameDispatcher.from(scope.parentScope(), source.frame);
-    super(scope, { guid: "bindingCall@" + (0, import_crypto.createGuid)() }, "BindingCall", {
+    super(scope, new import_instrumentation.SdkObject(scope._object, "bindingCall"), "BindingCall", {
       frame: frameDispatcher,
       name,
       args: needsHandle ? void 0 : args.map(import_jsHandleDispatcher.serializeResult),

package/lib/server/dispatchers/playwrightDispatcher.js

@@ -31,7 +31,7 @@ var import_dispatcher = require("./dispatcher");
 var import_electronDispatcher = require("./electronDispatcher");
 var import_localUtilsDispatcher = require("./localUtilsDispatcher");
 var import_networkDispatchers = require("./networkDispatchers");
-var import_crypto = require("../utils/crypto");
+var import_instrumentation = require("../instrumentation");
 var import_eventsHelper = require("../utils/eventsHelper");
 class PlaywrightDispatcher extends import_dispatcher.Dispatcher {
   constructor(scope, playwright, options = {}) {
@@ -50,7 +50,7 @@ class PlaywrightDispatcher extends import_dispatcher.Dispatcher {
       android,
       electron: new import_electronDispatcher.ElectronDispatcher(scope, playwright.electron),
       utils: playwright.options.isServer ? void 0 : new import_localUtilsDispatcher.LocalUtilsDispatcher(scope, playwright),
-      socksSupport: options.socksProxy ? new SocksSupportDispatcher(scope, options.socksProxy) : void 0
+      socksSupport: options.socksProxy ? new SocksSupportDispatcher(scope, playwright, options.socksProxy) : void 0
     };
     let browserDispatcher;
     if (options.preLaunchedBrowser) {
@@ -92,8 +92,8 @@ class PlaywrightDispatcher extends import_dispatcher.Dispatcher {
   }
 }
 class SocksSupportDispatcher extends import_dispatcher.Dispatcher {
-  constructor(scope, socksProxy) {
-    super(scope, { guid: "socksSupport@" + (0, import_crypto.createGuid)() }, "SocksSupport", {});
+  constructor(scope, parent, socksProxy) {
+    super(scope, new import_instrumentation.SdkObject(parent, "socksSupport"), "SocksSupport", {});
     this._type_SocksSupport = true;
     this._socksProxy = socksProxy;
     this._socksListeners = [

package/lib/server/dispatchers/streamDispatcher.js

@@ -23,10 +23,16 @@ __export(streamDispatcher_exports, {
 module.exports = __toCommonJS(streamDispatcher_exports);
 var import_dispatcher = require("./dispatcher");
 var import_manualPromise = require("../../utils/isomorphic/manualPromise");
-var import_crypto = require("../utils/crypto");
+var import_instrumentation = require("../instrumentation");
+class StreamSdkObject extends import_instrumentation.SdkObject {
+  constructor(parent, stream) {
+    super(parent, "stream");
+    this.stream = stream;
+  }
+}
 class StreamDispatcher extends import_dispatcher.Dispatcher {
   constructor(scope, stream) {
-    super(scope, { guid: "stream@" + (0, import_crypto.createGuid)(), stream }, "Stream", {});
+    super(scope, new StreamSdkObject(scope._object, stream), "Stream", {});
     this._type_Stream = true;
     this._ended = false;
     stream.once("end", () => this._ended = true);

package/lib/server/dispatchers/webSocketRouteDispatcher.js

@@ -35,12 +35,12 @@ var import_page = require("../page");
 var import_dispatcher = require("./dispatcher");
 var import_pageDispatcher = require("./pageDispatcher");
 var rawWebSocketMockSource = __toESM(require("../../generated/webSocketMockSource"));
-var import_crypto = require("../utils/crypto");
+var import_instrumentation = require("../instrumentation");
 var import_urlMatch = require("../../utils/isomorphic/urlMatch");
 var import_eventsHelper = require("../utils/eventsHelper");
 class WebSocketRouteDispatcher extends import_dispatcher.Dispatcher {
   constructor(scope, id, url, frame) {
-    super(scope, { guid: "webSocketRoute@" + (0, import_crypto.createGuid)() }, "WebSocketRoute", { url });
+    super(scope, new import_instrumentation.SdkObject(scope._object, "webSocketRoute"), "WebSocketRoute", { url });
     this._type_WebSocketRoute = true;
     this._id = id;
     this._frame = frame;

package/lib/server/dispatchers/writableStreamDispatcher.js

@@ -33,12 +33,18 @@ __export(writableStreamDispatcher_exports, {
 module.exports = __toCommonJS(writableStreamDispatcher_exports);
 var import_fs = __toESM(require("fs"));
 var import_dispatcher = require("./dispatcher");
-var import_crypto = require("../utils/crypto");
+var import_instrumentation = require("../instrumentation");
+class WritableStreamSdkObject extends import_instrumentation.SdkObject {
+  constructor(parent, streamOrDirectory, lastModifiedMs) {
+    super(parent, "stream");
+    this.streamOrDirectory = streamOrDirectory;
+    this.lastModifiedMs = lastModifiedMs;
+  }
+}
 class WritableStreamDispatcher extends import_dispatcher.Dispatcher {
   constructor(scope, streamOrDirectory, lastModifiedMs) {
-    super(scope, { guid: "writableStream@" + (0, import_crypto.createGuid)(), streamOrDirectory }, "WritableStream", {});
+    super(scope, new WritableStreamSdkObject(scope._object, streamOrDirectory, lastModifiedMs), "WritableStream", {});
     this._type_WritableStream = true;
-    this._lastModifiedMs = lastModifiedMs;
   }
   async write(params) {
     if (typeof this._object.streamOrDirectory === "string")
@@ -58,8 +64,8 @@ class WritableStreamDispatcher extends import_dispatcher.Dispatcher {
       throw new Error("Cannot close a directory");
     const stream = this._object.streamOrDirectory;
     await new Promise((fulfill) => stream.end(fulfill));
-    if (this._lastModifiedMs)
-      await import_fs.default.promises.utimes(this.path(), new Date(this._lastModifiedMs), new Date(this._lastModifiedMs));
+    if (this._object.lastModifiedMs)
+      await import_fs.default.promises.utimes(this.path(), new Date(this._object.lastModifiedMs), new Date(this._object.lastModifiedMs));
   }
   path() {
     if (typeof this._object.streamOrDirectory === "string")

package/lib/server/dom.js

@@ -86,7 +86,6 @@ class FrameExecutionContext extends js.ExecutionContext {
         testIdAttributeName: selectorsRegistry.testIdAttributeName(),
         stableRafCount: this.frame._page.delegate.rafCountForStablePosition(),
         browserName: this.frame._page.browserContext._browser.options.name,
-        inputFileRoleTextbox: process.env.PLAYWRIGHT_INPUT_FILE_TEXTBOX ? true : false,
         customEngines
       };
       const source = `
@@ -430,11 +429,11 @@ class ElementHandle extends js.JSHandle {
       progress.throwIfAborted();
       let restoreModifiers;
       if (options && options.modifiers)
-        restoreModifiers = await this._page.keyboard.ensureModifiers(options.modifiers);
+        restoreModifiers = await this._page.keyboard.ensureModifiers(progress, options.modifiers);
       progress.log(`  performing ${actionName} action`);
       await action(point);
       if (restoreModifiers)
-        await this._page.keyboard.ensureModifiers(restoreModifiers);
+        await this._page.keyboard.ensureModifiers(progress, restoreModifiers);
       if (hitTargetInterceptionHandle) {
         const stopHitTargetInterception = this._frame.raceAgainstEvaluationStallingEvents(() => {
           return hitTargetInterceptionHandle.evaluate((h) => h.stop());
@@ -475,7 +474,7 @@ class ElementHandle extends js.JSHandle {
     }, options.timeout);
   }
   _hover(progress, options) {
-    return this._retryPointerAction(progress, "hover", false, (point) => this._page.mouse.move(point.x, point.y), { ...options, waitAfter: "disabled" });
+    return this._retryPointerAction(progress, "hover", false, (point) => this._page.mouse._move(progress, point.x, point.y), { ...options, waitAfter: "disabled" });
   }
   async click(metadata, options) {
     const controller = new import_progress.ProgressController(metadata, this);
@@ -486,7 +485,7 @@ class ElementHandle extends js.JSHandle {
     }, options.timeout);
   }
   _click(progress, options) {
-    return this._retryPointerAction(progress, "click", true, (point) => this._page.mouse.click(point.x, point.y, options), options);
+    return this._retryPointerAction(progress, "click", true, (point) => this._page.mouse._click(progress, point.x, point.y, options), options);
   }
   async dblclick(metadata, options) {
     const controller = new import_progress.ProgressController(metadata, this);
@@ -497,7 +496,7 @@ class ElementHandle extends js.JSHandle {
     }, options.timeout);
   }
   _dblclick(progress, options) {
-    return this._retryPointerAction(progress, "dblclick", true, (point) => this._page.mouse.dblclick(point.x, point.y, options), { ...options, waitAfter: "disabled" });
+    return this._retryPointerAction(progress, "dblclick", true, (point) => this._page.mouse._click(progress, point.x, point.y, { ...options, clickCount: 2 }), { ...options, waitAfter: "disabled" });
   }
   async tap(metadata, options) {
     const controller = new import_progress.ProgressController(metadata, this);
@@ -508,7 +507,7 @@ class ElementHandle extends js.JSHandle {
     }, options.timeout);
   }
   _tap(progress, options) {
-    return this._retryPointerAction(progress, "tap", true, (point) => this._page.touchscreen.tap(point.x, point.y), { ...options, waitAfter: "disabled" });
+    return this._retryPointerAction(progress, "tap", true, (point) => this._page.touchscreen._tap(progress, point.x, point.y), { ...options, waitAfter: "disabled" });
   }
   async selectOption(metadata, elements, values, options) {
     const controller = new import_progress.ProgressController(metadata, this);
@@ -569,9 +568,9 @@ class ElementHandle extends js.JSHandle {
       progress.throwIfAborted();
       if (result === "needsinput") {
         if (value)
-          await this._page.keyboard.insertText(value);
+          await this._page.keyboard._insertText(progress, value);
         else
-          await this._page.keyboard.press("Delete");
+          await this._page.keyboard._press(progress, "Delete");
         return "done";
       } else {
         return result;
@@ -677,7 +676,7 @@ class ElementHandle extends js.JSHandle {
     if (result !== "done")
       return result;
     progress.throwIfAborted();
-    await this._page.keyboard.type(text, options);
+    await this._page.keyboard._type(progress, text, options);
     return "done";
   }
   async press(metadata, key, options) {
@@ -700,7 +699,7 @@ class ElementHandle extends js.JSHandle {
       if (result !== "done")
         return result;
       progress.throwIfAborted();
-      await this._page.keyboard.press(key, options);
+      await this._page.keyboard._press(progress, key, options);
       return "done";
     });
   }

package/lib/server/electron/electron.js

@@ -203,7 +203,7 @@ class Electron extends import_instrumentation.SdkObject {
       const debuggerDisconnectPromise = waitForLine(progress, launchedProcess, /Waiting for the debugger to disconnect\.\.\./);
       const nodeMatch = await nodeMatchPromise;
       const nodeTransport = await import_transport.WebSocketTransport.connect(progress, nodeMatch[1]);
-      const nodeConnection = new import_crConnection.CRConnection(nodeTransport, import_helper.helper.debugProtocolLogger(), browserLogsCollector);
+      const nodeConnection = new import_crConnection.CRConnection(this, nodeTransport, import_helper.helper.debugProtocolLogger(), browserLogsCollector);
       debuggerDisconnectPromise.then(() => {
         nodeTransport.close();
       }).catch(() => {

package/lib/server/firefox/ffInput.js

@@ -58,7 +58,7 @@ 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 = "";
@@ -72,8 +72,9 @@ class RawKeyboardImpl {
       location,
       text
     });
+    progress.throwIfAborted();
   }
-  async keyup(modifiers, keyName, description) {
+  async keyup(progress, modifiers, keyName, description) {
     const { code, key, location } = description;
     await this._client.send("Page.dispatchKeyEvent", {
       type: "keyup",
@@ -83,16 +84,18 @@ class RawKeyboardImpl {
       location,
       repeat: false
     });
+    progress.throwIfAborted();
   }
-  async sendText(text) {
+  async sendText(progress, text) {
     await this._client.send("Page.insertText", { text });
+    progress.throwIfAborted();
   }
 }
 class RawMouseImpl {
   constructor(client) {
     this._client = client;
   }
-  async move(x, y, button, buttons, modifiers, forClick) {
+  async move(progress, x, y, button, buttons, modifiers, forClick) {
     await this._client.send("Page.dispatchMouseEvent", {
       type: "mousemove",
       button: 0,
@@ -101,8 +104,9 @@ class RawMouseImpl {
       y: Math.floor(y),
       modifiers: toModifiersMask(modifiers)
     });
+    progress.throwIfAborted();
   }
-  async down(x, y, button, buttons, modifiers, clickCount) {
+  async down(progress, x, y, button, buttons, modifiers, clickCount) {
     await this._client.send("Page.dispatchMouseEvent", {
       type: "mousedown",
       button: toButtonNumber(button),
@@ -112,8 +116,9 @@ class RawMouseImpl {
       modifiers: toModifiersMask(modifiers),
       clickCount
     });
+    progress.throwIfAborted();
   }
-  async up(x, y, button, buttons, modifiers, clickCount) {
+  async up(progress, x, y, button, buttons, modifiers, clickCount) {
     await this._client.send("Page.dispatchMouseEvent", {
       type: "mouseup",
       button: toButtonNumber(button),
@@ -123,8 +128,9 @@ class RawMouseImpl {
       modifiers: toModifiersMask(modifiers),
       clickCount
     });
+    progress.throwIfAborted();
   }
-  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", {
       deltaX,
@@ -134,6 +140,7 @@ class RawMouseImpl {
       deltaZ: 0,
       modifiers: toModifiersMask(modifiers)
     });
+    progress.throwIfAborted();
   }
   setPage(page) {
     this._page = page;
@@ -143,12 +150,13 @@ class RawTouchscreenImpl {
   constructor(client) {
     this._client = client;
   }
-  async tap(x, y, modifiers) {
+  async tap(progress, x, y, modifiers) {
     await this._client.send("Page.dispatchTapEvent", {
       x,
       y,
       modifiers: toModifiersMask(modifiers)
     });
+    progress.throwIfAborted();
   }
 }
 // Annotate the CommonJS export names for ESM import in node:

package/lib/server/firefox/ffPage.js

@@ -475,8 +475,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/frames.js

@@ -488,7 +488,7 @@ class Frame extends import_instrumentation.SdkObject {
     const controller = new import_progress.ProgressController((0, import_instrumentation.serverSideCallMetadata)(), this);
     const data = {
       url,
-      gotoPromise: controller.run((progress) => this._gotoAction(progress, url, { referer }), 0)
+      gotoPromise: controller.run((progress) => this.gotoImpl(progress, url, { referer }), 0)
     };
     this._redirectedNavigations.set(documentId, data);
     data.gotoPromise.finally(() => this._redirectedNavigations.delete(documentId));
@@ -497,10 +497,10 @@ class Frame extends import_instrumentation.SdkObject {
     const constructedNavigationURL = (0, import_utils.constructURLBasedOnBaseURL)(this._page.browserContext._options.baseURL, url);
     const controller = new import_progress.ProgressController(metadata, this);
     return controller.run((progress) => {
-      return this.raceNavigationAction(progress, options, async () => this._gotoAction(progress, constructedNavigationURL, options));
+      return this.raceNavigationAction(progress, options, async () => this.gotoImpl(progress, constructedNavigationURL, options));
     }, options.timeout);
   }
-  async _gotoAction(progress, url, options) {
+  async gotoImpl(progress, url, options) {
     const waitUntil = verifyLifecycle("waitUntil", options.waitUntil === void 0 ? "load" : options.waitUntil);
     progress.log(`navigating to "${url}", waiting until "${waitUntil}"`);
     const headers = this._page.extraHTTPHeaders() || [];
@@ -971,8 +971,8 @@ class Frame extends import_instrumentation.SdkObject {
     await controller.run(async (progress) => {
       dom.assertDone(await this._retryWithProgressIfNotConnected(progress, source, options.strict, !options.force, async (handle) => {
         return handle._retryPointerAction(progress, "move and down", false, async (point) => {
-          await this._page.mouse.move(point.x, point.y);
-          await this._page.mouse.down();
+          await this._page.mouse._move(progress, point.x, point.y);
+          await this._page.mouse._down(progress);
         }, {
           ...options,
           waitAfter: "disabled",
@@ -982,8 +982,8 @@ class Frame extends import_instrumentation.SdkObject {
       }));
       dom.assertDone(await this._retryWithProgressIfNotConnected(progress, target, options.strict, false, async (handle) => {
         return handle._retryPointerAction(progress, "move and up", false, async (point) => {
-          await this._page.mouse.move(point.x, point.y);
-          await this._page.mouse.up();
+          await this._page.mouse._move(progress, point.x, point.y);
+          await this._page.mouse._up(progress);
         }, {
           ...options,
           waitAfter: "disabled",