patchright-core 1.50.1 → 1.51.1

package/lib/server/dom.js

@@ -10,15 +10,15 @@ exports.kUnableToAdoptErrorMessage = void 0;
 exports.throwElementIsNotAttached = throwElementIsNotAttached;
 exports.throwRetargetableDOMError = throwRetargetableDOMError;
 var _fs = _interopRequireDefault(require("fs"));
-var injectedScriptSource = _interopRequireWildcard(require("../generated/injectedScriptSource"));
-var _protocolError = require("./protocolError");
 var js = _interopRequireWildcard(require("./javascript"));
 var _progress = require("./progress");
 var _utils = require("../utils");
 var _fileUploadUtils = require("./fileUploadUtils");
+var _protocolError = require("./protocolError");
+var injectedScriptSource = _interopRequireWildcard(require("../generated/injectedScriptSource"));
 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 _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+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; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * Copyright (c) Microsoft Corporation.
  *
@@ -71,10 +71,6 @@ class FrameExecutionContext extends js.ExecutionContext {
       returnByValue: false
     }, arg);
   }
-  createHandle(remoteObject) {
-    if (this.frame._page._delegate.isElementHandle(remoteObject)) return new ElementHandle(this, remoteObject.objectId);
-    return super.createHandle(remoteObject);
-  }
   injectedScript() {
     if (!this._injectedScriptPromise) {
       const custom = [];
@@ -98,7 +94,10 @@ class FrameExecutionContext extends js.ExecutionContext {
         );
         })();
       `;
-      this._injectedScriptPromise = this.rawEvaluateHandle(source).then(objectId => new js.JSHandle(this, 'object', 'InjectedScript', objectId));
+      this._injectedScriptPromise = this.rawEvaluateHandle(source).then(handle => {
+        handle._setPreview('InjectedScript');
+        return handle;
+      });
     }
     return this._injectedScriptPromise;
   }
@@ -158,6 +157,13 @@ class ElementHandle extends js.JSHandle {
     if (!isFrameElement) return null;
     return this._page._delegate.getContentFrame(this);
   }
+  async generateLocatorString() {
+    const selector = await this.evaluateInUtility(async ([injected, node]) => {
+      return injected.generateSelectorSimple(node);
+    }, {});
+    if (selector === 'error:notconnected') return;
+    return (0, _utils.asLocator)('javascript', selector);
+  }
   async getAttribute(metadata, name) {
     return this._frame.getAttribute(metadata, ':scope', name, {}, this);
   }
@@ -639,7 +645,7 @@ class ElementHandle extends js.JSHandle {
       await this._page._delegate.setInputFilePaths(retargeted, localPathsOrDirectory);
       await waitForInputEvent;
     } else {
-      await this._page._delegate.setInputFiles(retargeted, filePayloads);
+      await retargeted.evaluateInUtility(([injected, node, files]) => injected.setInputFiles(node, files), filePayloads);
     }
     return 'done';
   }
@@ -729,8 +735,8 @@ class ElementHandle extends js.JSHandle {
   async boundingBox() {
     return this._page._delegate.getBoundingBox(this);
   }
-  async ariaSnapshot() {
-    return await this.evaluateInUtility(([injected, element]) => injected.ariaSnapshot(element), {});
+  async ariaSnapshot(options) {
+    return await this.evaluateInUtility(([injected, element, options]) => injected.ariaSnapshot(element, options), options);
   }
   async screenshot(metadata, options = {}) {
     const controller = new _progress.ProgressController(metadata, this);

package/lib/server/download.js

@@ -8,7 +8,7 @@ var _path = _interopRequireDefault(require("path"));
 var _page = require("./page");
 var _utils = require("../utils");
 var _artifact = require("./artifact");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * Copyright (c) Microsoft Corporation.
  *

package/lib/server/electron/electron.js

@@ -7,26 +7,27 @@ exports.ElectronApplication = exports.Electron = void 0;
 var _fs = _interopRequireDefault(require("fs"));
 var _os = _interopRequireDefault(require("os"));
 var _path = _interopRequireDefault(require("path"));
+var readline = _interopRequireWildcard(require("readline"));
+var _timeoutSettings = require("../timeoutSettings");
+var _utils = require("../../utils");
+var _ascii = require("../utils/ascii");
+var _debugLogger = require("../utils/debugLogger");
+var _eventsHelper = require("../utils/eventsHelper");
+var _browserContext = require("../browserContext");
 var _crBrowser = require("../chromium/crBrowser");
 var _crConnection = require("../chromium/crConnection");
 var _crExecutionContext = require("../chromium/crExecutionContext");
-var js = _interopRequireWildcard(require("../javascript"));
-var _timeoutSettings = require("../../common/timeoutSettings");
-var _utils = require("../../utils");
-var _transport = require("../transport");
-var _processLauncher = require("../../utils/processLauncher");
-var _browserContext = require("../browserContext");
-var _progress = require("../progress");
-var _helper = require("../helper");
-var _eventsHelper = require("../../utils/eventsHelper");
-var readline = _interopRequireWildcard(require("readline"));
-var _debugLogger = require("../../utils/debugLogger");
-var _instrumentation = require("../instrumentation");
 var _crProtocolHelper = require("../chromium/crProtocolHelper");
 var _console = require("../console");
+var _helper = require("../helper");
+var _instrumentation = require("../instrumentation");
+var js = _interopRequireWildcard(require("../javascript"));
+var _processLauncher = require("../utils/processLauncher");
+var _progress = require("../progress");
+var _transport = require("../transport");
 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 _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+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; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * Copyright (c) Microsoft Corporation.
  *
@@ -102,7 +103,7 @@ class ElectronApplication extends _instrumentation.SdkObject {
       return;
     }
     if (!this._nodeExecutionContext) return;
-    const args = event.args.map(arg => this._nodeExecutionContext.createHandle(arg));
+    const args = event.args.map(arg => (0, _crExecutionContext.createHandle)(this._nodeExecutionContext, arg));
     const message = new _console.ConsoleMessage(null, event.type, undefined, args, (0, _crProtocolHelper.toConsoleMessageLocation)(event.stackTrace));
     this.emit(ElectronApplication.Events.Console, message);
   }
@@ -174,7 +175,7 @@ class Electron extends _instrumentation.SdkObject {
           command = require('electron/index.js');
         } catch (error) {
           if ((error === null || error === void 0 ? void 0 : error.code) === 'MODULE_NOT_FOUND') {
-            throw new Error('\n' + (0, _utils.wrapInASCIIBox)(['Electron executablePath not found!', 'Please install it using `npm install -D electron` or set the executablePath to your Electron executable.'].join('\n'), 1));
+            throw new Error('\n' + (0, _ascii.wrapInASCIIBox)(['Electron executablePath not found!', 'Please install it using `npm install -D electron` or set the executablePath to your Electron executable.'].join('\n'), 1));
           }
           throw error;
         }

package/lib/server/errors.js

@@ -7,8 +7,8 @@ exports.TimeoutError = exports.TargetClosedError = void 0;
 exports.isTargetClosedError = isTargetClosedError;
 exports.parseError = parseError;
 exports.serializeError = serializeError;
-var _utils = require("../utils");
 var _serializers = require("../protocol/serializers");
+var _utils = require("../utils");
 /**
  * Copyright (c) Microsoft Corporation.
  *

package/lib/server/fetch.js

@@ -8,22 +8,25 @@ exports.createProxyAgent = createProxyAgent;
 var _http = _interopRequireDefault(require("http"));
 var _https = _interopRequireDefault(require("https"));
 var _stream = require("stream");
+var _tls = require("tls");
 var _url = _interopRequireDefault(require("url"));
-var _zlib = _interopRequireDefault(require("zlib"));
-var _timeoutSettings = require("../common/timeoutSettings");
-var _userAgent = require("../utils/userAgent");
+var zlib = _interopRequireWildcard(require("zlib"));
+var _timeoutSettings = require("./timeoutSettings");
 var _utils = require("../utils");
+var _crypto = require("./utils/crypto");
+var _userAgent = require("./utils/userAgent");
 var _utilsBundle = require("../utilsBundle");
 var _browserContext = require("./browserContext");
 var _cookieStore = require("./cookieStore");
 var _formData = require("./formData");
-var _happyEyeballs = require("../utils/happy-eyeballs");
 var _instrumentation = require("./instrumentation");
 var _progress = require("./progress");
-var _tracing = require("./trace/recorder/tracing");
 var _socksClientCertificatesInterceptor = require("./socksClientCertificatesInterceptor");
-var _tls = require("tls");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _happyEyeballs = require("./utils/happyEyeballs");
+var _tracing = require("./trace/recorder/tracing");
+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 && {}.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 _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * Copyright (c) Microsoft Corporation.
  *
@@ -67,7 +70,7 @@ class APIRequestContext extends _instrumentation.SdkObject {
     this.fetchLog.delete(fetchUid);
   }
   _storeResponseBody(body) {
-    const uid = (0, _utils.createGuid)();
+    const uid = (0, _crypto.createGuid)();
     this.fetchResponses.set(uid, body);
     return uid;
   }
@@ -130,7 +133,8 @@ class APIRequestContext extends _instrumentation.SdkObject {
     });
     const fetchUid = this._storeResponseBody(fetchResponse.body);
     this.fetchLog.set(fetchUid, controller.metadata.log);
-    if (params.failOnStatusCode && (fetchResponse.status < 200 || fetchResponse.status >= 400)) {
+    const failOnStatusCode = params.failOnStatusCode !== undefined ? params.failOnStatusCode : !!defaults.failOnStatusCode;
+    if (failOnStatusCode && (fetchResponse.status < 200 || fetchResponse.status >= 400)) {
       let responseText = '';
       if (fetchResponse.body.byteLength) {
         let text = fetchResponse.body.toString('utf8');
@@ -172,8 +176,7 @@ class APIRequestContext extends _instrumentation.SdkObject {
     }
   }
   async _sendRequestWithRetries(progress, url, options, postData, maxRetries) {
-    var _maxRetries;
-    (_maxRetries = maxRetries) !== null && _maxRetries !== void 0 ? _maxRetries : maxRetries = 0;
+    maxRetries !== null && maxRetries !== void 0 ? maxRetries : maxRetries = 0;
     let backoff = 250;
     for (let i = 0; i <= maxRetries; i++) {
       try {
@@ -230,10 +233,9 @@ class APIRequestContext extends _instrumentation.SdkObject {
       const request = requestConstructor(url, requestOptions, async response => {
         const responseAt = (0, _utils.monotonicTime)();
         const notifyRequestFinished = body => {
-          var _tlsHandshakeAt;
           const endAt = (0, _utils.monotonicTime)();
           // spec: http://www.softwareishard.com/blog/har-12-spec/#timings
-          const connectEnd = (_tlsHandshakeAt = tlsHandshakeAt) !== null && _tlsHandshakeAt !== void 0 ? _tlsHandshakeAt : tcpConnectionAt;
+          const connectEnd = tlsHandshakeAt !== null && tlsHandshakeAt !== void 0 ? tlsHandshakeAt : tcpConnectionAt;
           const timings = {
             send: requestFinishAt - startAt,
             wait: responseAt - requestFinishAt,
@@ -357,17 +359,17 @@ class APIRequestContext extends _instrumentation.SdkObject {
         let transform;
         const encoding = response.headers['content-encoding'];
         if (encoding === 'gzip' || encoding === 'x-gzip') {
-          transform = _zlib.default.createGunzip({
-            flush: _zlib.default.constants.Z_SYNC_FLUSH,
-            finishFlush: _zlib.default.constants.Z_SYNC_FLUSH
+          transform = zlib.createGunzip({
+            flush: zlib.constants.Z_SYNC_FLUSH,
+            finishFlush: zlib.constants.Z_SYNC_FLUSH
           });
         } else if (encoding === 'br') {
-          transform = _zlib.default.createBrotliDecompress({
-            flush: _zlib.default.constants.BROTLI_OPERATION_FLUSH,
-            finishFlush: _zlib.default.constants.BROTLI_OPERATION_FLUSH
+          transform = zlib.createBrotliDecompress({
+            flush: zlib.constants.BROTLI_OPERATION_FLUSH,
+            finishFlush: zlib.constants.BROTLI_OPERATION_FLUSH
           });
         } else if (encoding === 'deflate') {
-          transform = _zlib.default.createInflate();
+          transform = zlib.createInflate();
         }
         if (transform) {
           // Brotli and deflate decompressors throw if the input stream is empty.
@@ -490,6 +492,7 @@ class BrowserContextAPIRequestContext extends APIRequestContext {
     return {
       userAgent: this._context._options.userAgent || this._context._browser.userAgent(),
       extraHTTPHeaders: this._context._options.extraHTTPHeaders,
+      failOnStatusCode: undefined,
       httpCredentials: this._context._options.httpCredentials,
       proxy: this._context._options.proxy || this._context._browser.options.proxy,
       timeoutSettings: this._context._timeoutSettings,
@@ -504,8 +507,8 @@ class BrowserContextAPIRequestContext extends APIRequestContext {
   async _cookies(url) {
     return await this._context.cookies(url.toString());
   }
-  async storageState() {
-    return this._context.storageState();
+  async storageState(indexedDB) {
+    return this._context.storageState(indexedDB);
   }
 }
 exports.BrowserContextAPIRequestContext = BrowserContextAPIRequestContext;
@@ -526,7 +529,11 @@ class GlobalAPIRequestContext extends APIRequestContext {
       proxy.server = url;
     }
     if (options.storageState) {
-      this._origins = options.storageState.origins;
+      var _options$storageState;
+      this._origins = (_options$storageState = options.storageState.origins) === null || _options$storageState === void 0 ? void 0 : _options$storageState.map(origin => ({
+        indexedDB: [],
+        ...origin
+      }));
       this._cookieStore.addCookies(options.storageState.cookies || []);
     }
     (0, _browserContext.verifyClientCertificates)(options.clientCertificates);
@@ -534,6 +541,7 @@ class GlobalAPIRequestContext extends APIRequestContext {
       baseURL: options.baseURL,
       userAgent: options.userAgent || (0, _userAgent.getUserAgent)(),
       extraHTTPHeaders: options.extraHTTPHeaders,
+      failOnStatusCode: !!options.failOnStatusCode,
       ignoreHTTPSErrors: !!options.ignoreHTTPSErrors,
       httpCredentials: options.httpCredentials,
       clientCertificates: options.clientCertificates,
@@ -560,10 +568,13 @@ class GlobalAPIRequestContext extends APIRequestContext {
   async _cookies(url) {
     return this._cookieStore.cookies(url);
   }
-  async storageState() {
+  async storageState(indexedDB = false) {
     return {
       cookies: this._cookieStore.allCookies(),
-      origins: this._origins || []
+      origins: (this._origins || []).map(origin => ({
+        ...origin,
+        indexedDB: indexedDB ? origin.indexedDB : []
+      }))
     };
   }
 }

package/lib/server/fileUploadUtils.js

@@ -3,12 +3,13 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.fileUploadSizeLimit = void 0;
 exports.prepareFilesForUpload = prepareFilesForUpload;
 var _fs = _interopRequireDefault(require("fs"));
 var _path = _interopRequireDefault(require("path"));
-var _utils = require("../utils");
+var _assert = require("../utils/isomorphic/assert");
 var _utilsBundle = require("../utilsBundle");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * Copyright (c) Microsoft Corporation.
  *
@@ -25,9 +26,11 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  * limitations under the License.
  */
 
+// Keep in sync with the client.
+const fileUploadSizeLimit = exports.fileUploadSizeLimit = 50 * 1024 * 1024;
 async function filesExceedUploadLimit(files) {
   const sizes = await Promise.all(files.map(async file => (await _fs.default.promises.stat(file)).size));
-  return sizes.reduce((total, size) => total + size, 0) >= _utils.fileUploadSizeLimit;
+  return sizes.reduce((total, size) => total + size, 0) >= fileUploadSizeLimit;
 }
 async function prepareFilesForUpload(frame, params) {
   var _fileBuffers;
@@ -44,7 +47,7 @@ async function prepareFilesForUpload(frame, params) {
   if (streams) localPaths = streams.map(c => c.path());
   if (directoryStream) localDirectory = directoryStream.path();
   if (localPaths) {
-    for (const p of localPaths) (0, _utils.assert)(_path.default.isAbsolute(p) && _path.default.resolve(p) === p, 'Paths provided to localPaths must be absolute and fully resolved.');
+    for (const p of localPaths) (0, _assert.assert)(_path.default.isAbsolute(p) && _path.default.resolve(p) === p, 'Paths provided to localPaths must be absolute and fully resolved.');
   }
   let fileBuffers = payloads;
   if (!frame._page._browserContext._browser._isCollocatedWithServer) {

package/lib/server/firefox/ffBrowser.js

@@ -4,16 +4,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.FFBrowserContext = exports.FFBrowser = void 0;
-var _errors = require("../errors");
 var _utils = require("../../utils");
 var _browser = require("../browser");
 var _browserContext = require("../browserContext");
+var _errors = require("../errors");
 var network = _interopRequireWildcard(require("../network"));
 var _page = require("../page");
 var _ffConnection = require("./ffConnection");
 var _ffPage = require("./ffPage");
 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 2018 Google Inc. All rights reserved.
  * Modifications copyright (c) Microsoft Corporation.
@@ -244,6 +244,12 @@ class FFBrowserContext extends _browserContext.BrowserContext {
         forcedColors: this._options.forcedColors !== undefined ? this._options.forcedColors : 'none'
       }));
     }
+    if (this._options.contrast !== 'no-override') {
+      promises.push(this._browser.session.send('Browser.setContrast', {
+        browserContextId,
+        contrast: this._options.contrast !== undefined ? this._options.contrast : 'no-preference'
+      }));
+    }
     if (this._options.recordVideo) {
       promises.push(this._ensureVideosPath().then(() => {
         return this._browser.session.send('Browser.setVideoRecordingOptions', {

package/lib/server/firefox/ffConnection.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.kBrowserCloseMessageId = exports.FFSession = exports.FFConnection = exports.ConnectionEvents = 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/firefox/ffExecutionContext.js

@@ -4,12 +4,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.FFExecutionContext = void 0;
-var js = _interopRequireWildcard(require("../javascript"));
-var _stackTrace = require("../../utils/stackTrace");
+exports.createHandle = createHandle;
+var _assert = require("../../utils/isomorphic/assert");
+var _stackTrace = require("../../utils/isomorphic/stackTrace");
 var _utilityScriptSerializers = require("../isomorphic/utilityScriptSerializers");
+var js = _interopRequireWildcard(require("../javascript"));
+var dom = _interopRequireWildcard(require("../dom"));
 var _protocolError = require("../protocolError");
 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 2019 Google Inc. All rights reserved.
  * Modifications copyright (c) Microsoft Corporation.
@@ -43,16 +46,16 @@ class FFExecutionContext {
     checkException(payload.exceptionDetails);
     return payload.result.value;
   }
-  async rawEvaluateHandle(expression) {
+  async rawEvaluateHandle(context, expression) {
     const payload = await this._session.send('Runtime.evaluate', {
       expression,
       returnByValue: false,
       executionContextId: this._executionContextId
     }).catch(rewriteError);
     checkException(payload.exceptionDetails);
-    return payload.result.objectId;
+    return createHandle(context, payload.result);
   }
-  async evaluateWithArguments(expression, returnByValue, utilityScript, values, objectIds) {
+  async evaluateWithArguments(expression, returnByValue, utilityScript, values, handles) {
     const payload = await this._session.send('Runtime.callFunction', {
       functionDeclaration: expression,
       args: [{
@@ -60,8 +63,8 @@ class FFExecutionContext {
         value: undefined
       }, ...values.map(value => ({
         value
-      })), ...objectIds.map(objectId => ({
-        objectId,
+      })), ...handles.map(handle => ({
+        objectId: handle._objectId,
         value: undefined
       }))],
       returnByValue,
@@ -69,24 +72,22 @@ class FFExecutionContext {
     }).catch(rewriteError);
     checkException(payload.exceptionDetails);
     if (returnByValue) return (0, _utilityScriptSerializers.parseEvaluationResultValue)(payload.result.value);
-    return utilityScript._context.createHandle(payload.result);
+    return createHandle(utilityScript._context, payload.result);
   }
-  async getProperties(context, objectId) {
+  async getProperties(object) {
     const response = await this._session.send('Runtime.getObjectProperties', {
       executionContextId: this._executionContextId,
-      objectId
+      objectId: object._objectId
     });
     const result = new Map();
-    for (const property of response.properties) result.set(property.name, context.createHandle(property.value));
+    for (const property of response.properties) result.set(property.name, createHandle(object._context, property.value));
     return result;
   }
-  createHandle(context, remoteObject) {
-    return new js.JSHandle(context, remoteObject.subtype || remoteObject.type || '', renderPreview(remoteObject), remoteObject.objectId, potentiallyUnserializableValue(remoteObject));
-  }
-  async releaseHandle(objectId) {
+  async releaseHandle(handle) {
+    if (!handle._objectId) return;
     await this._session.send('Runtime.disposeObject', {
       executionContextId: this._executionContextId,
-      objectId
+      objectId: handle._objectId
     });
   }
 }
@@ -120,4 +121,11 @@ function renderPreview(object) {
   if (object.subtype === 'weakset') return 'WeakSet';
   if (object.subtype) return object.subtype[0].toUpperCase() + object.subtype.slice(1);
   if ('value' in object) return String(object.value);
+}
+function createHandle(context, remoteObject) {
+  if (remoteObject.subtype === 'node') {
+    (0, _assert.assert)(context instanceof dom.FrameExecutionContext);
+    return new dom.ElementHandle(context, remoteObject.objectId);
+  }
+  return new js.JSHandle(context, remoteObject.subtype || remoteObject.type || '', renderPreview(remoteObject), remoteObject.objectId, potentiallyUnserializableValue(remoteObject));
 }

package/lib/server/firefox/ffNetworkManager.js

@@ -4,10 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.FFNetworkManager = void 0;
-var _eventsHelper = require("../../utils/eventsHelper");
+var _eventsHelper = require("../utils/eventsHelper");
 var network = _interopRequireWildcard(require("../network"));
 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 2019 Google Inc. All rights reserved.
  * Modifications copyright (c) Microsoft Corporation.

package/lib/server/firefox/ffPage.js

@@ -4,21 +4,21 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.UTILITY_WORLD_NAME = exports.FFPage = void 0;
+var _eventsHelper = require("../utils/eventsHelper");
 var dialog = _interopRequireWildcard(require("../dialog"));
 var dom = _interopRequireWildcard(require("../dom"));
-var _eventsHelper = require("../../utils/eventsHelper");
 var _page = require("../page");
 var _ffAccessibility = require("./ffAccessibility");
 var _ffConnection = require("./ffConnection");
 var _ffExecutionContext = require("./ffExecutionContext");
 var _ffInput = require("./ffInput");
 var _ffNetworkManager = require("./ffNetworkManager");
-var _stackTrace = require("../../utils/stackTrace");
-var _debugLogger = require("../../utils/debugLogger");
+var _debugLogger = require("../utils/debugLogger");
+var _stackTrace = require("../../utils/isomorphic/stackTrace");
 var _browserContext = require("../browserContext");
 var _errors = require("../errors");
 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 2019 Google Inc. All rights reserved.
  * Modifications copyright (c) Microsoft Corporation.
@@ -109,7 +109,6 @@ class FFPage {
     let worldName = null;
     if (auxData.name === UTILITY_WORLD_NAME) worldName = 'utility';else if (!auxData.name) worldName = 'main';
     const context = new dom.FrameExecutionContext(delegate, frame, worldName);
-    context[contextDelegateSymbol] = delegate;
     if (worldName) frame._contextCreated(worldName, context);
     this._contextIdToContext.set(executionContextId, context);
   }
@@ -186,7 +185,7 @@ class FFPage {
     const context = this._contextIdToContext.get(executionContextId);
     if (!context) return;
     // Juggler reports 'warn' for some internal messages generated by the browser.
-    this._page._addConsoleMessage(type === 'warn' ? 'warning' : type, args.map(arg => context.createHandle(arg)), location);
+    this._page._addConsoleMessage(type === 'warn' ? 'warning' : type, args.map(arg => (0, _ffExecutionContext.createHandle)(context, arg)), location);
   }
   _onDialogOpened(params) {
     this._page.emitOnContext(_browserContext.BrowserContext.Events.Dialog, new dialog.Dialog(this._page, params.type, params.message, async (accept, promptText) => {
@@ -211,7 +210,7 @@ class FFPage {
     } = payload;
     const context = this._contextIdToContext.get(executionContextId);
     if (!context) return;
-    const handle = context.createHandle(element).asElement();
+    const handle = (0, _ffExecutionContext.createHandle)(context, element).asElement();
     await this._page._onFileChooserOpened(handle);
   }
   async _onWorkerCreated(event) {
@@ -249,7 +248,7 @@ class FFPage {
         location
       } = event;
       const context = worker._existingExecutionContext;
-      this._page._addConsoleMessage(type, args.map(arg => context.createHandle(arg)), location);
+      this._page._addConsoleMessage(type, args.map(arg => (0, _ffExecutionContext.createHandle)(context, arg)), location);
     });
     // Note: we receive worker exceptions directly from the page.
   }
@@ -309,12 +308,14 @@ class FFPage {
     const colorScheme = emulatedMedia.colorScheme === 'no-override' ? undefined : emulatedMedia.colorScheme;
     const reducedMotion = emulatedMedia.reducedMotion === 'no-override' ? undefined : emulatedMedia.reducedMotion;
     const forcedColors = emulatedMedia.forcedColors === 'no-override' ? undefined : emulatedMedia.forcedColors;
+    const contrast = emulatedMedia.contrast === 'no-override' ? undefined : emulatedMedia.contrast;
     await this._session.send('Page.setEmulatedMedia', {
       // Empty string means reset.
       type: emulatedMedia.media === 'no-override' ? '' : emulatedMedia.media,
       colorScheme,
       reducedMotion,
-      forcedColors
+      forcedColors,
+      contrast
     });
   }
   async updateRequestInterception() {
@@ -420,9 +421,6 @@ class FFPage {
     });
     return ownerFrameId || null;
   }
-  isElementHandle(remoteObject) {
-    return remoteObject.subtype === 'node';
-  }
   async getBoundingBox(handle) {
     const quads = await this.getContentQuads(handle);
     if (!quads || !quads.length) return null;
@@ -492,9 +490,6 @@ class FFPage {
     if (!result) return null;
     return result.quads.map(quad => [quad.p1, quad.p2, quad.p3, quad.p4]);
   }
-  async setInputFiles(handle, files) {
-    await handle.evaluateInUtility(([injected, node, files]) => injected.setInputFiles(node, files), files);
-  }
   async setInputFilePaths(handle, files) {
     await this._session.send('Page.setFileInputFiles', {
       frameId: handle._context.frame._id,
@@ -506,10 +501,10 @@ class FFPage {
     const result = await this._session.send('Page.adoptNode', {
       frameId: handle._context.frame._id,
       objectId: handle._objectId,
-      executionContextId: to[contextDelegateSymbol]._executionContextId
+      executionContextId: to.delegate._executionContextId
     });
     if (!result.remoteObject) throw new Error(dom.kUnableToAdoptErrorMessage);
-    return to.createHandle(result.remoteObject);
+    return (0, _ffExecutionContext.createHandle)(to, result.remoteObject);
   }
   async getAccessibilityTree(needle) {
     return (0, _ffAccessibility.getAccessibilityTree)(this._session, needle);
@@ -528,10 +523,10 @@ class FFPage {
     const context = await parent._mainContext();
     const result = await this._session.send('Page.adoptNode', {
       frameId: frame._id,
-      executionContextId: context[contextDelegateSymbol]._executionContextId
+      executionContextId: context.delegate._executionContextId
     });
     if (!result.remoteObject) throw new Error('Frame has been detached.');
-    return context.createHandle(result.remoteObject);
+    return (0, _ffExecutionContext.createHandle)(context, result.remoteObject);
   }
   shouldToggleStyleSheetToSyncAnimations() {
     return false;
@@ -540,5 +535,4 @@ class FFPage {
 exports.FFPage = FFPage;
 function webSocketId(frameId, wsid) {
   return `${frameId}---${wsid}`;
-}
-const contextDelegateSymbol = Symbol('delegate');
+}