patchright-core 1.50.0 → 1.51.0

package/lib/protocol/validatorPrimitives.js

@@ -8,7 +8,6 @@ exports.createMetadataValidator = createMetadataValidator;
 exports.findValidator = findValidator;
 exports.maybeFindValidator = maybeFindValidator;
 exports.tUndefined = exports.tType = exports.tString = exports.tOptional = exports.tObject = exports.tNumber = exports.tEnum = exports.tChannel = exports.tBoolean = exports.tBinary = exports.tArray = exports.tAny = exports.scheme = void 0;
-var _utils = require("../utils");
 /**
  * Copyright (c) Microsoft Corporation.
  *
@@ -107,7 +106,7 @@ const tObject = s => {
       const value = v(arg[key], path ? path + '.' + key : key, context);
       if (!Object.is(value, undefined)) result[key] = value;
     }
-    if ((0, _utils.isUnderTest)()) {
+    if (context.isUnderTest()) {
       for (const [key, value] of Object.entries(arg)) {
         if (key.startsWith('__testHook')) result[key] = value;
       }

package/lib/remote/playwrightConnection.js

@@ -4,14 +4,17 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.PlaywrightConnection = void 0;
+var _socksProxy = require("../server/utils/socksProxy");
 var _server = require("../server");
+var _android = require("../server/android/android");
 var _browser = require("../server/browser");
+var _debugControllerDispatcher = require("../server/dispatchers/debugControllerDispatcher");
 var _instrumentation = require("../server/instrumentation");
-var _socksProxy = require("../common/socksProxy");
+var _assert = require("../utils/isomorphic/assert");
+var _debug = require("../server/utils/debug");
+var _profiler = require("../server/utils/profiler");
 var _utils = require("../utils");
-var _android = require("../server/android/android");
-var _debugControllerDispatcher = require("../server/dispatchers/debugControllerDispatcher");
-var _debugLogger = require("../utils/debugLogger");
+var _debugLogger = require("../server/utils/debugLogger");
 /**
  * Copyright (c) Microsoft Corporation.
  *
@@ -44,8 +47,8 @@ class PlaywrightConnection {
     this._preLaunched = preLaunched;
     this._options = options;
     options.launchOptions = filterLaunchOptions(options.launchOptions, options.allowFSPaths);
-    if (clientType === 'reuse-browser' || clientType === 'pre-launched-browser-or-android') (0, _utils.assert)(preLaunched.playwright);
-    if (clientType === 'pre-launched-browser-or-android') (0, _utils.assert)(preLaunched.browser || preLaunched.androidDevice);
+    if (clientType === 'reuse-browser' || clientType === 'pre-launched-browser-or-android') (0, _assert.assert)(preLaunched.playwright);
+    if (clientType === 'pre-launched-browser-or-android') (0, _assert.assert)(preLaunched.browser || preLaunched.androidDevice);
     this._onClose = onClose;
     this._id = id;
     this._profileName = `${new Date().toISOString()}-${clientType}`;
@@ -74,7 +77,7 @@ class PlaywrightConnection {
       return;
     }
     this._root = new _server.RootDispatcher(this._dispatcherConnection, async (scope, options) => {
-      await (0, _utils.startProfiling)();
+      await (0, _profiler.startProfiling)();
       if (clientType === 'reuse-browser') return await this._initReuseBrowsersMode(scope);
       if (clientType === 'pre-launched-browser-or-android') return this._preLaunched.browser ? await this._initPreLaunchedBrowserMode(scope) : await this._initPreLaunchedAndroidMode(scope);
       if (clientType === 'launch-browser') return await this._initLaunchBrowserMode(scope, options);
@@ -88,7 +91,12 @@ class PlaywrightConnection {
       isServer: true
     });
     const ownedSocksProxy = await this._createOwnedSocksProxy(playwright);
-    const browser = await playwright[this._options.browserName].launch((0, _instrumentation.serverSideCallMetadata)(), this._options.launchOptions);
+    let browserName = this._options.browserName;
+    if ('bidi' === browserName) {
+      var _this$_options$launch;
+      if ((_this$_options$launch = this._options.launchOptions) !== null && _this$_options$launch !== void 0 && (_this$_options$launch = _this$_options$launch.channel) !== null && _this$_options$launch !== void 0 && _this$_options$launch.toLocaleLowerCase().includes('firefox')) browserName = 'bidiFirefox';else browserName = 'bidiChromium';
+    }
+    const browser = await playwright[browserName].launch((0, _instrumentation.serverSideCallMetadata)(), this._options.launchOptions);
     this._cleanups.push(async () => {
       for (const browser of playwright.allBrowsers()) await browser.close({
         reason: 'Connection terminated'
@@ -214,7 +222,7 @@ class PlaywrightConnection {
     this._root._dispose();
     _debugLogger.debugLogger.log('server', `[${this._id}] starting cleanup`);
     for (const cleanup of this._cleanups) await cleanup().catch(() => {});
-    await (0, _utils.stopProfiling)(this._profileName);
+    await (0, _profiler.stopProfiling)(this._profileName);
     this._onClose();
     _debugLogger.debugLogger.log('server', `[${this._id}] finished cleanup`);
   }
@@ -260,7 +268,7 @@ function filterLaunchOptions(options, allowFSPaths) {
     chromiumSandbox: options.chromiumSandbox,
     firefoxUserPrefs: options.firefoxUserPrefs,
     slowMo: options.slowMo,
-    executablePath: (0, _utils.isUnderTest)() || allowFSPaths ? options.executablePath : undefined,
+    executablePath: (0, _debug.isUnderTest)() || allowFSPaths ? options.executablePath : undefined,
     downloadsPath: allowFSPaths ? options.downloadsPath : undefined
   };
 }

package/lib/remote/playwrightServer.js

@@ -4,12 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.PlaywrightServer = void 0;
-var _playwright = require("../server/playwright");
 var _playwrightConnection = require("./playwrightConnection");
-var _semaphore = require("../utils/semaphore");
-var _debugLogger = require("../utils/debugLogger");
-var _utils = require("../utils");
-var _wsServer = require("../utils/wsServer");
+var _playwright = require("../server/playwright");
+var _debugLogger = require("../server/utils/debugLogger");
+var _semaphore = require("../utils/isomorphic/semaphore");
+var _wsServer = require("../server/utils/wsServer");
+var _ascii = require("../server/utils/ascii");
+var _userAgent = require("../server/utils/userAgent");
 /**
  * Copyright (c) Microsoft Corporation.
  *
@@ -39,7 +40,7 @@ class PlaywrightServer {
     const reuseBrowserSemaphore = new _semaphore.Semaphore(1);
     this._wsServer = new _wsServer.WSServer({
       onUpgrade: (request, socket) => {
-        const uaError = (0, _utils.userAgentVersionMatchesErrorMessage)(request.headers['user-agent'] || '');
+        const uaError = userAgentVersionMatchesErrorMessage(request.headers['user-agent'] || '');
         if (uaError) return {
           error: `HTTP/${request.httpVersion} 428 Precondition Required\r\n\r\n${uaError}`
         };
@@ -108,4 +109,16 @@ class PlaywrightServer {
     await this._wsServer.close();
   }
 }
-exports.PlaywrightServer = PlaywrightServer;
+exports.PlaywrightServer = PlaywrightServer;
+function userAgentVersionMatchesErrorMessage(userAgent) {
+  const match = userAgent.match(/^Playwright\/(\d+\.\d+\.\d+)/);
+  if (!match) {
+    // Cannot parse user agent - be lax.
+    return;
+  }
+  const received = match[1].split('.').slice(0, 2).join('.');
+  const expected = (0, _userAgent.getPlaywrightVersion)(true);
+  if (received !== expected) {
+    return (0, _ascii.wrapInASCIIBox)([`Playwright version mismatch:`, `  - server version: v${expected}`, `  - client version: v${received}`, ``, `If you are using VSCode extension, restart VSCode.`, ``, `If you are connecting to a remote service,`, `keep your local Playwright version in sync`, `with the remote service version.`, ``, `<3 Playwright Team`].join('\n'), 1);
+  }
+}

package/lib/server/android/android.js

@@ -4,25 +4,28 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.AndroidDevice = exports.Android = void 0;
-var _utilsBundle = require("../../utilsBundle");
 var _events = require("events");
 var _fs = _interopRequireDefault(require("fs"));
 var _os = _interopRequireDefault(require("os"));
 var _path = _interopRequireDefault(require("path"));
-var _utils = require("../../utils");
-var _fileUtils = require("../../utils/fileUtils");
+var _timeoutSettings = require("../timeoutSettings");
+var _pipeTransport = require("../utils/pipeTransport");
+var _crypto = require("../utils/crypto");
+var _debug = require("../utils/debug");
+var _env = require("../utils/env");
+var _task = require("../utils/task");
+var _debugLogger = require("../utils/debugLogger");
+var _utilsBundle = require("../../utilsBundle");
 var _browserContext = require("../browserContext");
-var _progress = require("../progress");
+var _chromiumSwitches = require("../chromium/chromiumSwitches");
 var _crBrowser = require("../chromium/crBrowser");
+var _fileUtils = require("../utils/fileUtils");
 var _helper = require("../helper");
-var _transport = require("../../protocol/transport");
-var _debugLogger = require("../../utils/debugLogger");
-var _processLauncher = require("../../utils/processLauncher");
-var _timeoutSettings = require("../../common/timeoutSettings");
 var _instrumentation = require("../instrumentation");
-var _chromiumSwitches = require("../chromium/chromiumSwitches");
+var _processLauncher = require("../utils/processLauncher");
+var _progress = require("../progress");
 var _registry = require("../registry");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * Copyright Microsoft Corporation. All rights reserved.
  *
@@ -140,7 +143,7 @@ class AndroidDevice extends _instrumentation.SdkObject {
       await this.shell(`cmd package uninstall com.microsoft.playwright.androiddriver.test`);
       (0, _utilsBundle.debug)('pw:android')('Installing the new driver');
       const executable = _registry.registry.findExecutable('android');
-      const packageManagerCommand = (0, _utils.getPackageManagerExecCommand)();
+      const packageManagerCommand = (0, _env.getPackageManagerExecCommand)();
       for (const file of ['android-driver.apk', 'android-driver-target.apk']) {
         const fullName = _path.default.join(executable.directory, file);
         if (!_fs.default.existsSync(fullName)) throw new Error(`Please install Android driver apk using '${packageManagerCommand} playwright install android'`);
@@ -152,7 +155,7 @@ class AndroidDevice extends _instrumentation.SdkObject {
     (0, _utilsBundle.debug)('pw:android')('Starting the new driver');
     this.shell('am instrument -w com.microsoft.playwright.androiddriver.test/androidx.test.runner.AndroidJUnitRunner').catch(e => (0, _utilsBundle.debug)('pw:android')(e));
     const socket = await this._waitForLocalAbstract('playwright_android_driver_socket');
-    const transport = new _transport.PipeTransport(socket, socket, socket, 'be');
+    const transport = new _pipeTransport.PipeTransport(socket, socket, socket, 'be');
     transport.onmessage = message => {
       const response = JSON.parse(message);
       const {
@@ -213,7 +216,7 @@ class AndroidDevice extends _instrumentation.SdkObject {
   async launchBrowser(pkg = 'com.android.chrome', options) {
     (0, _utilsBundle.debug)('pw:android')('Force-stopping', pkg);
     await this._backend.runCommand(`shell:am force-stop ${pkg}`);
-    const socketName = (0, _utils.isUnderTest)() ? 'webview_devtools_remote_playwright_test' : 'playwright_' + (0, _utils.createGuid)() + '_devtools_remote';
+    const socketName = (0, _debug.isUnderTest)() ? 'webview_devtools_remote_playwright_test' : 'playwright_' + (0, _crypto.createGuid)() + '_devtools_remote';
     const commandLine = this._defaultArgs(options, socketName).join(' ');
     (0, _utilsBundle.debug)('pw:android')('Starting', pkg, commandLine);
     // encode commandLine to base64 to avoid issues (bash encoding) with special characters
@@ -381,7 +384,7 @@ class AndroidBrowser extends _events.EventEmitter {
     this.device = void 0;
     this._socket = void 0;
     this._receiver = void 0;
-    this._waitForNextTask = (0, _utils.makeWaitForNextTask)();
+    this._waitForNextTask = (0, _task.makeWaitForNextTask)();
     this.onmessage = void 0;
     this.onclose = void 0;
     this.setMaxListeners(0);

package/lib/server/android/backendAdb.js

@@ -4,12 +4,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.AdbBackend = void 0;
-var _utilsBundle = require("../../utilsBundle");
-var net = _interopRequireWildcard(require("net"));
 var _events = require("events");
-var _utils = require("../../utils");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+var _net = _interopRequireDefault(require("net"));
+var _assert = require("../../utils/isomorphic/assert");
+var _crypto = require("../utils/crypto");
+var _utilsBundle = require("../../utilsBundle");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * Copyright Microsoft Corporation. All rights reserved.
  *
@@ -66,7 +66,7 @@ class AdbDevice {
 }
 async function runCommand(command, host = '127.0.0.1', port = 5037, serial) {
   (0, _utilsBundle.debug)('pw:adb:runCommand')(command, serial);
-  const socket = new BufferedSocketWrapper(command, net.createConnection({
+  const socket = new BufferedSocketWrapper(command, _net.default.createConnection({
     host,
     port
   }));
@@ -74,11 +74,11 @@ async function runCommand(command, host = '127.0.0.1', port = 5037, serial) {
     if (serial) {
       await socket.write(encodeMessage(`host:transport:${serial}`));
       const status = await socket.read(4);
-      (0, _utils.assert)(status.toString() === 'OKAY', status.toString());
+      (0, _assert.assert)(status.toString() === 'OKAY', status.toString());
     }
     await socket.write(encodeMessage(command));
     const status = await socket.read(4);
-    (0, _utils.assert)(status.toString() === 'OKAY', status.toString());
+    (0, _assert.assert)(status.toString() === 'OKAY', status.toString());
     let commandOutput;
     if (!command.startsWith('shell:')) {
       const remainingLength = parseInt((await socket.read(4)).toString(), 16);
@@ -92,18 +92,18 @@ async function runCommand(command, host = '127.0.0.1', port = 5037, serial) {
   }
 }
 async function open(command, host = '127.0.0.1', port = 5037, serial) {
-  const socket = new BufferedSocketWrapper(command, net.createConnection({
+  const socket = new BufferedSocketWrapper(command, _net.default.createConnection({
     host,
     port
   }));
   if (serial) {
     await socket.write(encodeMessage(`host:transport:${serial}`));
     const status = await socket.read(4);
-    (0, _utils.assert)(status.toString() === 'OKAY', status.toString());
+    (0, _assert.assert)(status.toString() === 'OKAY', status.toString());
   }
   await socket.write(encodeMessage(command));
   const status = await socket.read(4);
-  (0, _utils.assert)(status.toString() === 'OKAY', status.toString());
+  (0, _assert.assert)(status.toString() === 'OKAY', status.toString());
   return socket;
 }
 function encodeMessage(message) {
@@ -114,7 +114,7 @@ function encodeMessage(message) {
 class BufferedSocketWrapper extends _events.EventEmitter {
   constructor(command, socket) {
     super();
-    this.guid = (0, _utils.createGuid)();
+    this.guid = (0, _crypto.createGuid)();
     this._socket = void 0;
     this._buffer = Buffer.from([]);
     this._isSocket = false;
@@ -154,7 +154,7 @@ class BufferedSocketWrapper extends _events.EventEmitter {
   }
   async read(length) {
     await this._connectPromise;
-    (0, _utils.assert)(!this._isSocket, 'Can not read by length in socket mode');
+    (0, _assert.assert)(!this._isSocket, 'Can not read by length in socket mode');
     while (this._buffer.length < length) await new Promise(f => this._notifyReader = f);
     const result = this._buffer.slice(0, length);
     this._buffer = this._buffer.slice(length);
@@ -166,7 +166,7 @@ class BufferedSocketWrapper extends _events.EventEmitter {
     return this._buffer;
   }
   becomeSocket() {
-    (0, _utils.assert)(!this._buffer.length);
+    (0, _assert.assert)(!this._buffer.length);
     this._isSocket = true;
   }
 }

package/lib/server/artifact.js

@@ -6,10 +6,10 @@ Object.defineProperty(exports, "__esModule", {
 exports.Artifact = void 0;
 var _fs = _interopRequireDefault(require("fs"));
 var _utils = require("../utils");
-var _manualPromise = require("../utils/manualPromise");
-var _instrumentation = require("./instrumentation");
 var _errors = require("./errors");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _instrumentation = require("./instrumentation");
+var _manualPromise = require("../utils/isomorphic/manualPromise");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * Copyright (c) Microsoft Corporation.
  *

package/lib/server/bidi/bidiBrowser.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Network = exports.BidiBrowserContext = exports.BidiBrowser = void 0;
-var _eventsHelper = require("../../utils/eventsHelper");
+var _eventsHelper = require("../utils/eventsHelper");
 var _browser = require("../browser");
 var _browserContext = require("../browserContext");
 var network = _interopRequireWildcard(require("../network"));
@@ -13,7 +13,7 @@ var _bidiNetworkManager = require("./bidiNetworkManager");
 var _bidiPage = require("./bidiPage");
 var bidi = _interopRequireWildcard(require("./third_party/bidiProtocol"));
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 /**
  * Copyright (c) Microsoft Corporation.
  *

package/lib/server/bidi/bidiChromium.js

@@ -6,11 +6,12 @@ Object.defineProperty(exports, "__esModule", {
 exports.BidiChromium = void 0;
 var _os = _interopRequireDefault(require("os"));
 var _utils = require("../../utils");
+var _ascii = require("../utils/ascii");
 var _browserType = require("../browserType");
-var _chromiumSwitches = require("../chromium/chromiumSwitches");
 var _bidiBrowser = require("./bidiBrowser");
 var _bidiConnection = require("./bidiConnection");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _chromiumSwitches = require("../chromium/chromiumSwitches");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * Copyright (c) Microsoft Corporation.
  *
@@ -42,7 +43,7 @@ class BidiChromium extends _browserType.BrowserType {
   }
   doRewriteStartupLog(error) {
     if (!error.logs) return error;
-    if (error.logs.includes('Missing X server')) error.logs = '\n' + (0, _utils.wrapInASCIIBox)(_browserType.kNoXServerRunningError, 1);
+    if (error.logs.includes('Missing X server')) error.logs = '\n' + (0, _ascii.wrapInASCIIBox)(_browserType.kNoXServerRunningError, 1);
     // These error messages are taken from Chromium source code as of July, 2020:
     // https://github.com/chromium/chromium/blob/70565f67e79f79e17663ad1337dc6e63ee207ce9/content/browser/zygote_host/zygote_host_impl_linux.cc
     if (!error.logs.includes('crbug.com/357670') && !error.logs.includes('No usable sandbox!') && !error.logs.includes('crbug.com/638180')) return error;

package/lib/server/bidi/bidiConnection.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.kBrowserCloseMessageId = exports.BidiSession = exports.BidiConnection = void 0;
 var _events = require("events");
-var _debugLogger = require("../../utils/debugLogger");
+var _debugLogger = require("../utils/debugLogger");
 var _helper = require("../helper");
 var _protocolError = require("../protocolError");
 /**

package/lib/server/bidi/bidiExecutionContext.js

@@ -4,13 +4,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.BidiExecutionContext = void 0;
+exports.createHandle = createHandle;
+var _utils = require("../../utils");
 var _utilityScriptSerializers = require("../isomorphic/utilityScriptSerializers");
 var js = _interopRequireWildcard(require("../javascript"));
+var dom = _interopRequireWildcard(require("../dom"));
 var _bidiDeserializer = require("./third_party/bidiDeserializer");
 var bidi = _interopRequireWildcard(require("./third_party/bidiProtocol"));
 var _bidiSerializer = require("./third_party/bidiSerializer");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 /**
  * Copyright (c) Microsoft Corporation.
  *
@@ -59,7 +62,7 @@ class BidiExecutionContext {
     if (response.type === 'exception') throw new js.JavaScriptErrorInEvaluate(response.exceptionDetails.text + '\nFull val: ' + JSON.stringify(response.exceptionDetails));
     throw new js.JavaScriptErrorInEvaluate('Unexpected response type: ' + JSON.stringify(response));
   }
-  async rawEvaluateHandle(expression) {
+  async rawEvaluateHandle(context, expression) {
     const response = await this._session.send('script.evaluate', {
       expression,
       target: this._target,
@@ -73,20 +76,20 @@ class BidiExecutionContext {
       userActivation: true
     });
     if (response.type === 'success') {
-      if ('handle' in response.result) return response.result.handle;
+      if ('handle' in response.result) return createHandle(context, response.result);
       throw new js.JavaScriptErrorInEvaluate('Cannot get handle: ' + JSON.stringify(response.result));
     }
     if (response.type === 'exception') throw new js.JavaScriptErrorInEvaluate(response.exceptionDetails.text + '\nFull val: ' + JSON.stringify(response.exceptionDetails));
     throw new js.JavaScriptErrorInEvaluate('Unexpected response type: ' + JSON.stringify(response));
   }
-  async evaluateWithArguments(functionDeclaration, returnByValue, utilityScript, values, objectIds) {
+  async evaluateWithArguments(functionDeclaration, returnByValue, utilityScript, values, handles) {
     const response = await this._session.send('script.callFunction', {
       functionDeclaration,
       target: this._target,
       arguments: [{
         handle: utilityScript._objectId
-      }, ...values.map(_bidiSerializer.BidiSerializer.serialize), ...objectIds.map(handle => ({
-        handle
+      }, ...values.map(_bidiSerializer.BidiSerializer.serialize), ...handles.map(handle => ({
+        handle: handle._objectId
       }))],
       resultOwnership: returnByValue ? undefined : bidi.Script.ResultOwnership.Root,
       // Necessary for the handle to be returned.
@@ -100,53 +103,72 @@ class BidiExecutionContext {
     if (response.type === 'exception') throw new js.JavaScriptErrorInEvaluate(response.exceptionDetails.text + '\nFull val: ' + JSON.stringify(response.exceptionDetails));
     if (response.type === 'success') {
       if (returnByValue) return (0, _utilityScriptSerializers.parseEvaluationResultValue)(_bidiDeserializer.BidiDeserializer.deserialize(response.result));
-      const objectId = 'handle' in response.result ? response.result.handle : undefined;
-      return utilityScript._context.createHandle({
-        objectId,
-        ...response.result
-      });
+      return createHandle(utilityScript._context, response.result);
     }
     throw new js.JavaScriptErrorInEvaluate('Unexpected response type: ' + JSON.stringify(response));
   }
-  async getProperties(context, objectId) {
-    const handle = this.createHandle(context, {
-      objectId
+  async getProperties(handle) {
+    const names = await handle.evaluate(object => {
+      const names = [];
+      const descriptors = Object.getOwnPropertyDescriptors(object);
+      for (const name in descriptors) {
+        var _descriptors$name;
+        if ((_descriptors$name = descriptors[name]) !== null && _descriptors$name !== void 0 && _descriptors$name.enumerable) names.push(name);
+      }
+      return names;
     });
-    try {
-      const names = await handle.evaluate(object => {
-        const names = [];
-        const descriptors = Object.getOwnPropertyDescriptors(object);
-        for (const name in descriptors) {
-          var _descriptors$name;
-          if ((_descriptors$name = descriptors[name]) !== null && _descriptors$name !== void 0 && _descriptors$name.enumerable) names.push(name);
-        }
-        return names;
-      });
-      const values = await Promise.all(names.map(name => handle.evaluateHandle((object, name) => object[name], name)));
-      const map = new Map();
-      for (let i = 0; i < names.length; i++) map.set(names[i], values[i]);
-      return map;
-    } finally {
-      handle.dispose();
-    }
-  }
-  createHandle(context, jsRemoteObject) {
-    const remoteObject = jsRemoteObject;
-    return new js.JSHandle(context, remoteObject.type, renderPreview(remoteObject), jsRemoteObject.objectId, remoteObjectValue(remoteObject));
+    const values = await Promise.all(names.map(name => handle.evaluateHandle((object, name) => object[name], name)));
+    const map = new Map();
+    for (let i = 0; i < names.length; i++) map.set(names[i], values[i]);
+    return map;
   }
-  async releaseHandle(objectId) {
+  async releaseHandle(handle) {
+    if (!handle._objectId) return;
     await this._session.send('script.disown', {
       target: this._target,
-      handles: [objectId]
+      handles: [handle._objectId]
+    });
+  }
+  async nodeIdForElementHandle(handle) {
+    const shared = await this._remoteValueForReference({
+      handle: handle._objectId
+    });
+    // TODO: store sharedId in the handle.
+    if (!('sharedId' in shared)) throw new Error('Element is not a node');
+    return {
+      sharedId: shared.sharedId
+    };
+  }
+  async remoteObjectForNodeId(context, nodeId) {
+    const result = await this._remoteValueForReference(nodeId, true);
+    if (!('handle' in result)) throw new Error('Can\'t get remote object for nodeId');
+    return createHandle(context, result);
+  }
+  async contentFrameIdForFrame(handle) {
+    const contentWindow = await this._rawCallFunction('e => e.contentWindow', {
+      handle: handle._objectId
     });
+    if ((contentWindow === null || contentWindow === void 0 ? void 0 : contentWindow.type) === 'window') return contentWindow.value.context;
+    return null;
   }
-  async rawCallFunction(functionDeclaration, arg) {
+  async frameIdForWindowHandle(handle) {
+    if (!handle._objectId) throw new Error('JSHandle is not a DOM node handle');
+    const contentWindow = await this._remoteValueForReference({
+      handle: handle._objectId
+    });
+    if (contentWindow.type === 'window') return contentWindow.value.context;
+    return null;
+  }
+  async _remoteValueForReference(reference, createHandle) {
+    return await this._rawCallFunction('e => e', reference, createHandle);
+  }
+  async _rawCallFunction(functionDeclaration, arg, createHandle) {
     const response = await this._session.send('script.callFunction', {
       functionDeclaration,
       target: this._target,
       arguments: [arg],
-      resultOwnership: bidi.Script.ResultOwnership.Root,
-      // Necessary for the handle to be returned.
+      // "Root" is necessary for the handle to be returned.
+      resultOwnership: createHandle ? bidi.Script.ResultOwnership.Root : bidi.Script.ResultOwnership.None,
       serializationOptions: {
         maxObjectDepth: 0,
         maxDomDepth: 0
@@ -172,4 +194,12 @@ function remoteObjectValue(remoteObject) {
   if (remoteObject.type === 'number' && typeof remoteObject.value === 'string') return js.parseUnserializableValue(remoteObject.value);
   if ('value' in remoteObject) return remoteObject.value;
   return undefined;
+}
+function createHandle(context, remoteObject) {
+  if (remoteObject.type === 'node') {
+    (0, _utils.assert)(context instanceof dom.FrameExecutionContext);
+    return new dom.ElementHandle(context, remoteObject.handle);
+  }
+  const objectId = 'handle' in remoteObject ? remoteObject.handle : undefined;
+  return new js.JSHandle(context, remoteObject.type, renderPreview(remoteObject), objectId, remoteObjectValue(remoteObject));
 }

package/lib/server/bidi/bidiFirefox.js

@@ -7,11 +7,12 @@ exports.BidiFirefox = void 0;
 var _os = _interopRequireDefault(require("os"));
 var _path = _interopRequireDefault(require("path"));
 var _utils = require("../../utils");
+var _ascii = require("../utils/ascii");
 var _browserType = require("../browserType");
 var _bidiBrowser = require("./bidiBrowser");
 var _bidiConnection = require("./bidiConnection");
 var _firefoxPrefs = require("./third_party/firefoxPrefs");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * Copyright (c) Microsoft Corporation.
  *
@@ -39,8 +40,8 @@ class BidiFirefox extends _browserType.BrowserType {
   doRewriteStartupLog(error) {
     if (!error.logs) return error;
     // https://github.com/microsoft/playwright/issues/6500
-    if (error.logs.includes(`as root in a regular user's session is not supported.`)) error.logs = '\n' + (0, _utils.wrapInASCIIBox)(`Firefox is unable to launch if the $HOME folder isn't owned by the current user.\nWorkaround: Set the HOME=/root environment variable${process.env.GITHUB_ACTION ? ' in your GitHub Actions workflow file' : ''} when running Playwright.`, 1);
-    if (error.logs.includes('no DISPLAY environment variable specified')) error.logs = '\n' + (0, _utils.wrapInASCIIBox)(_browserType.kNoXServerRunningError, 1);
+    if (error.logs.includes(`as root in a regular user's session is not supported.`)) error.logs = '\n' + (0, _ascii.wrapInASCIIBox)(`Firefox is unable to launch if the $HOME folder isn't owned by the current user.\nWorkaround: Set the HOME=/root environment variable${process.env.GITHUB_ACTION ? ' in your GitHub Actions workflow file' : ''} when running Playwright.`, 1);
+    if (error.logs.includes('no DISPLAY environment variable specified')) error.logs = '\n' + (0, _ascii.wrapInASCIIBox)(_browserType.kNoXServerRunningError, 1);
     return error;
   }
   amendEnvironment(env, userDataDir, executable, browserArguments) {

package/lib/server/bidi/bidiInput.js

@@ -4,11 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.RawTouchscreenImpl = exports.RawMouseImpl = exports.RawKeyboardImpl = void 0;
-var bidi = _interopRequireWildcard(require("./third_party/bidiProtocol"));
-var _bidiKeyboard = require("./third_party/bidiKeyboard");
 var _input = require("../input");
+var _bidiKeyboard = require("./third_party/bidiKeyboard");
+var bidi = _interopRequireWildcard(require("./third_party/bidiProtocol"));
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 /**
  * Copyright (c) Microsoft Corporation.
  *
@@ -84,9 +84,6 @@ class RawMouseImpl {
     this._session = session;
   }
   async move(x, y, button, buttons, modifiers, forClick) {
-    // Bidi throws when x/y are not integers.
-    x = Math.round(x);
-    y = Math.round(y);
     await this._performActions([{
       type: 'pointerMove',
       x,
@@ -107,8 +104,8 @@ class RawMouseImpl {
   }
   async wheel(x, y, buttons, modifiers, deltaX, deltaY) {
     // Bidi throws when x/y are not integers.
-    x = Math.round(x);
-    y = Math.round(y);
+    x = Math.floor(x);
+    y = Math.floor(y);
     await this._session.send('input.performActions', {
       context: this._session.sessionId,
       actions: [{

package/lib/server/bidi/bidiNetworkManager.js

@@ -5,12 +5,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.BidiNetworkManager = void 0;
 exports.bidiBytesValueToString = bidiBytesValueToString;
-var _eventsHelper = require("../../utils/eventsHelper");
+var _eventsHelper = require("../utils/eventsHelper");
+var _cookieStore = require("../cookieStore");
 var network = _interopRequireWildcard(require("../network"));
 var bidi = _interopRequireWildcard(require("./third_party/bidiProtocol"));
-var _cookieStore = require("../cookieStore");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 /**
  * Copyright (c) Microsoft Corporation.
  *