patchright-core 1.50.1 → 1.51.1

package/lib/server/browserContext.js

@@ -9,26 +9,29 @@ exports.normalizeProxySettings = normalizeProxySettings;
 exports.validateBrowserContextOptions = validateBrowserContextOptions;
 exports.verifyClientCertificates = verifyClientCertificates;
 exports.verifyGeolocation = verifyGeolocation;
-var _timeoutSettings = require("../common/timeoutSettings");
-var _utils = require("../utils");
-var _fileUtils = require("../utils/fileUtils");
-var _helper = require("./helper");
-var network = _interopRequireWildcard(require("./network"));
-var _page6 = require("./page");
-var _path = _interopRequireDefault(require("path"));
 var _fs = _interopRequireDefault(require("fs"));
-var _instrumentation = require("./instrumentation");
+var _path = _interopRequireDefault(require("path"));
+var _timeoutSettings = require("./timeoutSettings");
+var _crypto = require("./utils/crypto");
+var _debug = require("./utils/debug");
+var _clock = require("./clock");
 var _debugger = require("./debugger");
-var _tracing = require("./trace/recorder/tracing");
+var _fetch = require("./fetch");
+var _fileUtils = require("./utils/fileUtils");
 var _harRecorder = require("./har/harRecorder");
+var _helper = require("./helper");
+var _instrumentation = require("./instrumentation");
+var utilityScriptSerializers = _interopRequireWildcard(require("./isomorphic/utilityScriptSerializers"));
+var network = _interopRequireWildcard(require("./network"));
+var _page6 = require("./page");
 var _recorder = require("./recorder");
-var consoleApiSource = _interopRequireWildcard(require("../generated/consoleApiSource"));
-var _fetch = require("./fetch");
-var _clock = require("./clock");
 var _recorderApp = require("./recorder/recorderApp");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var storageScript = _interopRequireWildcard(require("./storageScript"));
+var consoleApiSource = _interopRequireWildcard(require("../generated/consoleApiSource"));
+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 && 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; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * Copyright 2017 Google Inc. All rights reserved.
  * Modifications copyright (c) Microsoft Corporation.
@@ -102,7 +105,7 @@ class BrowserContext extends _instrumentation.SdkObject {
     this._debugger = new _debugger.Debugger(this);
 
     // When PWDEBUG=1, show inspector for each context.
-    if ((0, _utils.debugMode)() === 'inspector') await _recorder.Recorder.show(this, _recorderApp.RecorderApp.factory(this), {
+    if ((0, _debug.debugMode)() === 'inspector') await _recorder.Recorder.show(this, _recorderApp.RecorderApp.factory(this), {
       pauseOnNextStatement: true
     });
 
@@ -111,7 +114,7 @@ class BrowserContext extends _instrumentation.SdkObject {
     this._debugger.on(_debugger.Debugger.Events.PausedStateChanged, () => {
       if (this._debugger.isPaused()) _recorder.Recorder.showInspectorNoReply(this, _recorderApp.RecorderApp.factory(this));
     });
-    if ((0, _utils.debugMode)() === 'console') await this.extendInjectedScript(consoleApiSource.source);
+    if ((0, _debug.debugMode)() === 'console') await this.extendInjectedScript(consoleApiSource.source);
     if (this._options.serviceWorkers === 'block') await this.addInitScript(`navigator.serviceWorker.register = async () => { };`);
     if (this._options.permissions) await this.grantPermissions(this._options.permissions);
   }
@@ -399,24 +402,25 @@ class BrowserContext extends _instrumentation.SdkObject {
   addVisitedOrigin(origin) {
     this._origins.add(origin);
   }
-  async storageState() {
+  async storageState(indexedDB = false) {
     const result = {
       cookies: await this.cookies(),
       origins: []
     };
     const originsToSave = new Set(this._origins);
+    const collectScript = `(${storageScript.collect})((${utilityScriptSerializers.source})(), ${this._browser.options.name === 'firefox'}, ${indexedDB})`;
 
     // First try collecting storage stage from existing pages.
     for (const page of this.pages()) {
       const origin = page.mainFrame().origin();
       if (!origin || !originsToSave.has(origin)) continue;
       try {
-        const storage = await page.mainFrame().nonStallingEvaluateInExistingContext(`({
-          localStorage: Object.keys(localStorage).map(name => ({ name, value: localStorage.getItem(name) })),
-        })`, 'utility');
-        if (storage.localStorage.length) result.origins.push({
+        var _storage$indexedDB;
+        const storage = await page.mainFrame().nonStallingEvaluateInExistingContext(collectScript, 'utility');
+        if (storage.localStorage.length || (_storage$indexedDB = storage.indexedDB) !== null && _storage$indexedDB !== void 0 && _storage$indexedDB.length) result.origins.push({
           origin,
-          localStorage: storage.localStorage
+          localStorage: storage.localStorage,
+          indexedDB: storage.indexedDB
         });
         originsToSave.delete(origin);
       } catch {
@@ -435,19 +439,17 @@ class BrowserContext extends _instrumentation.SdkObject {
         return true;
       });
       for (const origin of originsToSave) {
-        const originStorage = {
-          origin,
-          localStorage: []
-        };
+        var _storage$indexedDB2;
         const frame = page.mainFrame();
         await frame.goto(internalMetadata, origin);
-        const storage = await frame.evaluateExpression(`({
-          localStorage: Object.keys(localStorage).map(name => ({ name, value: localStorage.getItem(name) })),
-        })`, {
+        const storage = await frame.evaluateExpression(collectScript, {
           world: 'utility'
         });
-        originStorage.localStorage = storage.localStorage;
-        if (storage.localStorage.length) result.origins.push(originStorage);
+        if (storage.localStorage.length || (_storage$indexedDB2 = storage.indexedDB) !== null && _storage$indexedDB2 !== void 0 && _storage$indexedDB2.length) result.origins.push({
+          origin,
+          localStorage: storage.localStorage,
+          indexedDB: storage.indexedDB
+        });
       }
       await page.close(internalMetadata);
     }
@@ -505,14 +507,9 @@ class BrowserContext extends _instrumentation.SdkObject {
         for (const originState of state.origins) {
           const frame = page.mainFrame();
           await frame.goto(metadata, originState.origin);
-          await frame.evaluateExpression(`
-            originState => {
-              for (const { name, value } of (originState.localStorage || []))
-                localStorage.setItem(name, value);
-            }`, {
-            isFunction: true,
+          await frame.evaluateExpression(`(${storageScript.restore})(${JSON.stringify(originState)}, (${utilityScriptSerializers.source})())`, {
             world: 'utility'
-          }, originState);
+          });
         }
         await page.close(internalMetadata);
       }
@@ -533,7 +530,7 @@ class BrowserContext extends _instrumentation.SdkObject {
     await Promise.all(this.pages().map(page => page.safeNonStallingEvaluateInAllFrames(expression, world, options)));
   }
   async _harStart(page, options) {
-    const harId = (0, _utils.createGuid)();
+    const harId = (0, _crypto.createGuid)();
     this._harRecorders.set(harId, new _harRecorder.HarRecorder(this, page, options));
     return harId;
   }
@@ -658,7 +655,7 @@ function normalizeProxySettings(proxy) {
     bypass
   };
 }
-const paramsThatAllowContextReuse = ['colorScheme', 'forcedColors', 'reducedMotion', 'screen', 'userAgent', 'viewport'];
+const paramsThatAllowContextReuse = ['colorScheme', 'forcedColors', 'reducedMotion', 'contrast', 'screen', 'userAgent', 'viewport'];
 const defaultNewContextParamValues = {
   noDefaultViewport: false,
   ignoreHTTPSErrors: false,

package/lib/server/browserType.js

@@ -5,25 +5,25 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.kNoXServerRunningError = exports.BrowserType = exports.BrowserReadyState = void 0;
 var _fs = _interopRequireDefault(require("fs"));
-var os = _interopRequireWildcard(require("os"));
+var _os = _interopRequireDefault(require("os"));
 var _path = _interopRequireDefault(require("path"));
 var _browserContext = require("./browserContext");
-var _registry = require("./registry");
-var _transport = require("./transport");
-var _processLauncher = require("../utils/processLauncher");
-var _pipeTransport = require("./pipeTransport");
-var _progress = require("./progress");
-var _timeoutSettings = require("../common/timeoutSettings");
-var _utils = require("../utils");
-var _fileUtils = require("../utils/fileUtils");
+var _timeoutSettings = require("./timeoutSettings");
+var _debug = require("./utils/debug");
+var _assert = require("../utils/isomorphic/assert");
+var _manualPromise = require("../utils/isomorphic/manualPromise");
+var _fileUtils = require("./utils/fileUtils");
 var _helper = require("./helper");
-var _debugLogger = require("../utils/debugLogger");
 var _instrumentation = require("./instrumentation");
+var _pipeTransport = require("./pipeTransport");
+var _processLauncher = require("./utils/processLauncher");
+var _progress = require("./progress");
 var _protocolError = require("./protocolError");
+var _registry = require("./registry");
 var _socksClientCertificatesInterceptor = require("./socksClientCertificatesInterceptor");
-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 }; }
+var _transport = require("./transport");
+var _debugLogger = require("./utils/debugLogger");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * Copyright (c) Microsoft Corporation.
  *
@@ -43,7 +43,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 const kNoXServerRunningError = exports.kNoXServerRunningError = 'Looks like you launched a headed browser without having a XServer running.\n' + 'Set either \'headless: true\' or use \'xvfb-run <your-playwright-app>\' before running Playwright.\n\n<3 Playwright Team';
 class BrowserReadyState {
   constructor() {
-    this._wsEndpoint = new _utils.ManualPromise();
+    this._wsEndpoint = new _manualPromise.ManualPromise();
   }
   onBrowserExit() {
     // Unblock launch when browser prematurely exits.
@@ -178,16 +178,17 @@ class BrowserType extends _instrumentation.SdkObject {
     const env = options.env ? (0, _processLauncher.envArrayToObject)(options.env) : process.env;
     await this._createArtifactDirs(options);
     const tempDirectories = [];
-    const artifactsDir = await _fs.default.promises.mkdtemp(_path.default.join(os.tmpdir(), 'playwright-artifacts-'));
+    const artifactsDir = await _fs.default.promises.mkdtemp(_path.default.join(_os.default.tmpdir(), 'playwright-artifacts-'));
     tempDirectories.push(artifactsDir);
     if (userDataDir) {
+      (0, _assert.assert)(_path.default.isAbsolute(userDataDir), 'userDataDir must be an absolute path');
       // Firefox bails if the profile directory does not exist, Chrome creates it. We ensure consistent behavior here.
       if (!(await (0, _fileUtils.existsAsync)(userDataDir))) await _fs.default.promises.mkdir(userDataDir, {
         recursive: true,
         mode: 0o700
       });
     } else {
-      userDataDir = await _fs.default.promises.mkdtemp(_path.default.join(os.tmpdir(), `playwright_${this._name}dev_profile-`));
+      userDataDir = await _fs.default.promises.mkdtemp(_path.default.join(_os.default.tmpdir(), `playwright_${this._name}dev_profile-`));
       tempDirectories.push(userDataDir);
     }
     await this.prepareUserDataDir(options, userDataDir);
@@ -293,7 +294,7 @@ class BrowserType extends _instrumentation.SdkObject {
       downloadsPath,
       proxy
     } = options;
-    if ((0, _utils.debugMode)()) headless = false;
+    if ((0, _debug.debugMode)()) headless = false;
     if (downloadsPath && !_path.default.isAbsolute(downloadsPath)) downloadsPath = _path.default.join(process.cwd(), downloadsPath);
     if (this.attribution.playwright.options.socksProxyPort) proxy = {
       server: `socks5://127.0.0.1:${this.attribution.playwright.options.socksProxyPort}`

package/lib/{utils/sequence.js → server/callLog.js}

@@ -3,11 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.findRepeatedSubsequences = findRepeatedSubsequences;
+exports.compressCallLog = compressCallLog;
+exports.findRepeatedSubsequencesForTest = void 0;
 /**
  * Copyright (c) Microsoft Corporation.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed under the Apache License, Version 2.0 (the 'License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
@@ -20,6 +21,19 @@ exports.findRepeatedSubsequences = findRepeatedSubsequences;
  * limitations under the License.
  */
 
+function compressCallLog(log) {
+  const lines = [];
+  for (const block of findRepeatedSubsequences(log)) {
+    for (let i = 0; i < block.sequence.length; i++) {
+      const line = block.sequence[i];
+      const leadingWhitespace = line.match(/^\s*/);
+      const whitespacePrefix = '  ' + (leadingWhitespace === null || leadingWhitespace === void 0 ? void 0 : leadingWhitespace[0]) || '';
+      const countPrefix = `${block.count} × `;
+      if (block.count > 1 && i === 0) lines.push(whitespacePrefix + countPrefix + line.trim());else if (block.count > 1) lines.push(whitespacePrefix + ' '.repeat(countPrefix.length - 2) + '- ' + line.trim());else lines.push(whitespacePrefix + '- ' + line.trim());
+    }
+  }
+  return lines;
+}
 function findRepeatedSubsequences(s) {
   const n = s.length;
   const result = [];
@@ -61,4 +75,5 @@ function findRepeatedSubsequences(s) {
     i += maxRepeatLength * maxRepeatCount; // Move index forward
   }
   return result;
-}
+}
+const findRepeatedSubsequencesForTest = exports.findRepeatedSubsequencesForTest = findRepeatedSubsequences;

package/lib/server/chromium/chromium.js

@@ -7,27 +7,27 @@ exports.Chromium = void 0;
 var _fs = _interopRequireDefault(require("fs"));
 var _os = _interopRequireDefault(require("os"));
 var _path = _interopRequireDefault(require("path"));
+var _chromiumSwitches = require("./chromiumSwitches");
 var _crBrowser = require("./crBrowser");
-var _processLauncher = require("../../utils/processLauncher");
 var _crConnection = require("./crConnection");
+var _timeoutSettings = require("../timeoutSettings");
+var _utils = require("../../utils");
+var _ascii = require("../utils/ascii");
+var _debugLogger = require("../utils/debugLogger");
+var _manualPromise = require("../../utils/isomorphic/manualPromise");
+var _network = require("../utils/network");
+var _userAgent = require("../utils/userAgent");
+var _browserContext = require("../browserContext");
 var _browserType = require("../browserType");
+var _helper = require("../helper");
+var _registry = require("../registry");
 var _transport = require("../transport");
 var _crDevTools = require("./crDevTools");
 var _browser = require("../browser");
-var _network = require("../../utils/network");
-var _userAgent = require("../../utils/userAgent");
-var _ascii = require("../../utils/ascii");
-var _utils = require("../../utils");
-var _fileUtils = require("../../utils/fileUtils");
-var _debugLogger = require("../../utils/debugLogger");
+var _fileUtils = require("../utils/fileUtils");
+var _processLauncher = require("../utils/processLauncher");
 var _progress = require("../progress");
-var _timeoutSettings = require("../../common/timeoutSettings");
-var _helper = require("../helper");
-var _registry = require("../registry");
-var _manualPromise = require("../../utils/manualPromise");
-var _browserContext = require("../browserContext");
-var _chromiumSwitches = require("./chromiumSwitches");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * Copyright 2017 Google Inc. All rights reserved.
  * Modifications copyright (c) Microsoft Corporation.

package/lib/server/chromium/chromiumSwitches.js

@@ -23,13 +23,44 @@ exports.chromiumSwitches = void 0;
 
 // No dependencies as it is used from the Electron loader.
 
+const disabledFeatures = [
+// See https://github.com/microsoft/playwright/pull/10380
+'AcceptCHFrame',
+// See https://github.com/microsoft/playwright/pull/10679
+'AutoExpandDetailsElement',
+// See https://github.com/microsoft/playwright/issues/14047
+'AvoidUnnecessaryBeforeUnloadCheckSync',
+// See https://github.com/microsoft/playwright/pull/12992
+'CertificateTransparencyComponentUpdater',
+// This makes Page.frameScheduledNavigation arrive much later after a click,
+// making our navigation auto-wait after click not working.
+// Can be removed once we deperecate noWaitAfter.
+// See https://github.com/microsoft/playwright/pull/34372.
+'DeferRendererTasksAfterInput', 'DestroyProfileOnBrowserClose',
+// See https://github.com/microsoft/playwright/pull/13854
+'DialMediaRouteProvider',
+// Chromium is disabling manifest version 2. Allow testing it as long as Chromium can actually run it.
+// Disabled in https://chromium-review.googlesource.com/c/chromium/src/+/6265903.
+'ExtensionManifestV2Disabled', 'GlobalMediaControls',
+// See https://github.com/microsoft/playwright/pull/27605
+'HttpsUpgrades', 'ImprovedCookieControls', 'LazyFrameLoading',
+// Hides the Lens feature in the URL address bar. Its not working in unofficial builds.
+'LensOverlay',
+// See https://github.com/microsoft/playwright/pull/8162
+'MediaRouter',
+// See https://github.com/microsoft/playwright/issues/28023
+'PaintHolding',
+// See https://github.com/microsoft/playwright/issues/32230
+'ThirdPartyStoragePartitioning',
+// See https://github.com/microsoft/playwright/issues/16126
+'Translate'];
 const chromiumSwitches = exports.chromiumSwitches = ['--disable-field-trial-config',
 // https://source.chromium.org/chromium/chromium/src/+/main:testing/variations/README.md
 '--disable-background-networking', '--disable-background-timer-throttling', '--disable-backgrounding-occluded-windows',
 // Avoids surprises like main request not being intercepted during page.goBack().
 '--disable-breakpad',
 // Avoids unneeded network activity after startup.
-'--no-default-browser-check', '--disable-dev-shm-usage', '--disable-hang-monitor', '--disable-prompt-on-repost', '--disable-renderer-backgrounding', '--force-color-profile=srgb', '--no-first-run', '--password-store=basic', '--use-mock-keychain',
+'--no-default-browser-check', '--disable-dev-shm-usage', '--disable-features=' + disabledFeatures.join(','), '--disable-hang-monitor', '--disable-prompt-on-repost', '--disable-renderer-backgrounding', '--force-color-profile=srgb', '--no-first-run', '--password-store=basic', '--use-mock-keychain',
 // See https://chromium-review.googlesource.com/c/chromium/src/+/2436773
 '--no-service-autorun', '--export-tagged-pdf',
 // https://chromium-review.googlesource.com/c/chromium/src/+/4853540

package/lib/server/chromium/crBrowser.js

@@ -5,20 +5,21 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.CRBrowserContext = exports.CRBrowser = void 0;
 var _path = _interopRequireDefault(require("path"));
+var _assert = require("../../utils/isomorphic/assert");
+var _crypto = require("../utils/crypto");
+var _artifact = require("../artifact");
 var _browser = require("../browser");
 var _browserContext = require("../browserContext");
-var _utils = require("../../utils");
+var _frames = require("../frames");
 var network = _interopRequireWildcard(require("../network"));
 var _page = require("../page");
-var _frames = require("../frames");
 var _crConnection = require("./crConnection");
 var _crPage = require("./crPage");
 var _crProtocolHelper = require("./crProtocolHelper");
 var _crServiceWorker = require("./crServiceWorker");
-var _artifact = require("../artifact");
 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 2017 Google Inc. All rights reserved.
  * Modifications copyright (c) Microsoft Corporation.
@@ -143,7 +144,7 @@ class CRBrowser extends _browser.Browser {
   }) {
     if (targetInfo.type === 'browser') return;
     const session = this._session.createChildSession(sessionId);
-    (0, _utils.assert)(targetInfo.browserContextId, 'targetInfo: ' + JSON.stringify(targetInfo, null, 2));
+    (0, _assert.assert)(targetInfo.browserContextId, 'targetInfo: ' + JSON.stringify(targetInfo, null, 2));
     let context = this._contexts.get(targetInfo.browserContextId) || null;
     if (!context) {
       // TODO: auto attach only to pages from our contexts.
@@ -159,9 +160,9 @@ class CRBrowser extends _browser.Browser {
       session.detach().catch(() => {});
       return;
     }
-    (0, _utils.assert)(!this._crPages.has(targetInfo.targetId), 'Duplicate target ' + targetInfo.targetId);
-    (0, _utils.assert)(!this._backgroundPages.has(targetInfo.targetId), 'Duplicate target ' + targetInfo.targetId);
-    (0, _utils.assert)(!this._serviceWorkers.has(targetInfo.targetId), 'Duplicate target ' + targetInfo.targetId);
+    (0, _assert.assert)(!this._crPages.has(targetInfo.targetId), 'Duplicate target ' + targetInfo.targetId);
+    (0, _assert.assert)(!this._backgroundPages.has(targetInfo.targetId), 'Duplicate target ' + targetInfo.targetId);
+    (0, _assert.assert)(!this._serviceWorkers.has(targetInfo.targetId), 'Duplicate target ' + targetInfo.targetId);
     if (targetInfo.type === 'background_page') {
       const backgroundPage = new _crPage.CRPage(session, targetInfo.targetId, context, null, {
         hasUIWindow: false,
@@ -258,7 +259,7 @@ class CRBrowser extends _browser.Browser {
     return await this._connection.createBrowserSession();
   }
   async startTracing(page, options = {}) {
-    (0, _utils.assert)(!this._tracingRecording, 'Cannot start recording trace while already recording trace.');
+    (0, _assert.assert)(!this._tracingRecording, 'Cannot start recording trace while already recording trace.');
     this._tracingClient = page ? page._delegate._mainFrameSession._client : this._session;
     const defaultCategories = ['-*', 'devtools.timeline', 'v8.execute', 'disabled-by-default-devtools.timeline', 'disabled-by-default-devtools.timeline.frame', 'toplevel', 'blink.console', 'blink.user_timing', 'latencyInfo', 'disabled-by-default-devtools.timeline.stack', 'disabled-by-default-v8.cpu_profiler', 'disabled-by-default-v8.cpu_profiler.hires'];
     const {
@@ -273,9 +274,9 @@ class CRBrowser extends _browser.Browser {
     });
   }
   async stopTracing() {
-    (0, _utils.assert)(this._tracingClient, 'Tracing was not started.');
+    (0, _assert.assert)(this._tracingClient, 'Tracing was not started.');
     const [event] = await Promise.all([new Promise(f => this._tracingClient.once('Tracing.tracingComplete', f)), this._tracingClient.send('Tracing.end')]);
-    const tracingPath = _path.default.join(this.options.artifactsDir, (0, _utils.createGuid)() + '.crtrace');
+    const tracingPath = _path.default.join(this.options.artifactsDir, (0, _crypto.createGuid)() + '.crtrace');
     await (0, _crProtocolHelper.saveProtocolStream)(this._tracingClient, event.stream, tracingPath);
     this._tracingRecording = false;
     const artifact = new _artifact.Artifact(this, tracingPath);
@@ -297,7 +298,7 @@ class CRBrowserContext extends _browserContext.BrowserContext {
     this._authenticateProxyViaCredentials();
   }
   async _initialize() {
-    (0, _utils.assert)(!Array.from(this._browser._crPages.values()).some(page => page._browserContext === this));
+    (0, _assert.assert)(!Array.from(this._browser._crPages.values()).some(page => page._browserContext === this));
     const promises = [super._initialize()];
     if (this._browser.options.name !== 'clank' && this._options.acceptDownloads !== 'internal-browser-default') {
       promises.push(this._browser._session.send('Browser.setDownloadBehavior', {
@@ -335,7 +336,7 @@ class CRBrowserContext extends _browserContext.BrowserContext {
         const page = this._browser._crPages.get(key);
         if (page._opener) newKeys.delete(key);
       }
-      (0, _utils.assert)(newKeys.size === 1);
+      (0, _assert.assert)(newKeys.size === 1);
       [targetId] = [...newKeys];
     }
     return this._browser._crPages.get(targetId)._page;

package/lib/server/chromium/crConnection.js

@@ -4,9 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.kBrowserCloseMessageId = exports.ConnectionEvents = exports.CRSession = exports.CRConnection = exports.CDPSession = void 0;
-var _utils = require("../../utils");
 var _events = require("events");
-var _debugLogger = require("../../utils/debugLogger");
+var _utils = require("../../utils");
+var _debugLogger = require("../utils/debugLogger");
 var _helper = require("../helper");
 var _protocolError = require("../protocolError");
 /**

package/lib/server/chromium/crCoverage.js

@@ -4,8 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.CRCoverage = void 0;
-var _eventsHelper = require("../../utils/eventsHelper");
 var _utils = require("../../utils");
+var _eventsHelper = require("../utils/eventsHelper");
 /**
  * Copyright 2017 Google Inc. All rights reserved.
  * Modifications copyright (c) Microsoft Corporation.

package/lib/server/chromium/crDevTools.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.CRDevTools = void 0;
 var _fs = _interopRequireDefault(require("fs"));
-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/chromium/crDragDrop.js

@@ -4,8 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.DragManager = void 0;
-var _utils = require("../../utils");
 var _crProtocolHelper = require("./crProtocolHelper");
+var _utils = require("../../utils");
 /**
  * Copyright (c) Microsoft Corporation.
  *

package/lib/server/chromium/crExecutionContext.js

@@ -4,13 +4,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.CRExecutionContext = void 0;
+exports.createHandle = createHandle;
+var _assert = require("../../utils/isomorphic/assert");
 var _crProtocolHelper = require("./crProtocolHelper");
-var js = _interopRequireWildcard(require("../javascript"));
-var _stackTrace = require("../../utils/stackTrace");
+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 2017 Google Inc. All rights reserved.
  * Modifications copyright (c) Microsoft Corporation.
@@ -47,7 +50,7 @@ class CRExecutionContext {
     if (exceptionDetails) throw new js.JavaScriptErrorInEvaluate((0, _crProtocolHelper.getExceptionMessage)(exceptionDetails));
     return remoteObject.value;
   }
-  async rawEvaluateHandle(expression) {
+  async rawEvaluateHandle(context, expression) {
     const {
       exceptionDetails,
       result: remoteObject
@@ -56,9 +59,9 @@ class CRExecutionContext {
       contextId: this._contextId
     }).catch(rewriteError);
     if (exceptionDetails) throw new js.JavaScriptErrorInEvaluate((0, _crProtocolHelper.getExceptionMessage)(exceptionDetails));
-    return remoteObject.objectId;
+    return createHandle(context, remoteObject);
   }
-  async evaluateWithArguments(expression, returnByValue, utilityScript, values, objectIds) {
+  async evaluateWithArguments(expression, returnByValue, utilityScript, values, handles) {
     const {
       exceptionDetails,
       result: remoteObject
@@ -69,33 +72,31 @@ class CRExecutionContext {
         objectId: utilityScript._objectId
       }, ...values.map(value => ({
         value
-      })), ...objectIds.map(objectId => ({
-        objectId
+      })), ...handles.map(handle => ({
+        objectId: handle._objectId
       }))],
       returnByValue,
       awaitPromise: true,
       userGesture: true
     }).catch(rewriteError);
     if (exceptionDetails) throw new js.JavaScriptErrorInEvaluate((0, _crProtocolHelper.getExceptionMessage)(exceptionDetails));
-    return returnByValue ? (0, _utilityScriptSerializers.parseEvaluationResultValue)(remoteObject.value) : utilityScript._context.createHandle(remoteObject);
+    return returnByValue ? (0, _utilityScriptSerializers.parseEvaluationResultValue)(remoteObject.value) : createHandle(utilityScript._context, remoteObject);
   }
-  async getProperties(context, objectId) {
+  async getProperties(object) {
     const response = await this._client.send('Runtime.getProperties', {
-      objectId,
+      objectId: object._objectId,
       ownProperties: true
     });
     const result = new Map();
     for (const property of response.result) {
       if (!property.enumerable || !property.value) continue;
-      result.set(property.name, context.createHandle(property.value));
+      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) {
-    await (0, _crProtocolHelper.releaseObject)(this._client, objectId);
+  async releaseHandle(handle) {
+    if (!handle._objectId) return;
+    await (0, _crProtocolHelper.releaseObject)(this._client, handle._objectId);
   }
 }
 exports.CRExecutionContext = CRExecutionContext;
@@ -129,4 +130,11 @@ function renderPreview(object) {
   }
   if (object.subtype === 'array' && object.preview) return js.sparseArrayToString(object.preview.properties);
   return object.description;
+}
+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/chromium/crInput.js

@@ -4,12 +4,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.RawTouchscreenImpl = exports.RawMouseImpl = exports.RawKeyboardImpl = void 0;
+var _utils = require("../../utils");
 var input = _interopRequireWildcard(require("../input"));
 var _macEditingCommands = require("../macEditingCommands");
-var _utils = require("../../utils");
 var _crProtocolHelper = require("./crProtocolHelper");
 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 2017 Google Inc. All rights reserved.
  * Modifications copyright (c) Microsoft Corporation.