patchright-core 1.50.1 → 1.51.1

package/lib/server/registry/dependencies.js

@@ -11,19 +11,19 @@ exports.transformCommandsForRoot = transformCommandsForRoot;
 exports.validateDependenciesLinux = validateDependenciesLinux;
 exports.validateDependenciesWindows = validateDependenciesWindows;
 exports.writeDockerVersion = writeDockerVersion;
+var childProcess = _interopRequireWildcard(require("child_process"));
 var _fs = _interopRequireDefault(require("fs"));
+var _os = _interopRequireDefault(require("os"));
 var _path = _interopRequireDefault(require("path"));
-var os = _interopRequireWildcard(require("os"));
-var _child_process = _interopRequireDefault(require("child_process"));
-var utils = _interopRequireWildcard(require("../../utils"));
-var _spawnAsync = require("../../utils/spawnAsync");
-var _hostPlatform = require("../../utils/hostPlatform");
-var _ = require(".");
 var _nativeDeps = require("./nativeDeps");
-var _userAgent = require("../../utils/userAgent");
+var _ascii = require("../utils/ascii");
+var _hostPlatform = require("../utils/hostPlatform");
+var _spawnAsync = require("../utils/spawnAsync");
+var _userAgent = require("../utils/userAgent");
+var _ = require(".");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 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; }
 /**
  * Copyright (c) Microsoft Corporation.
  *
@@ -73,8 +73,8 @@ const checkExecutable = filePath => {
   return _fs.default.promises.access(filePath, _fs.default.constants.X_OK).then(() => true).catch(() => false);
 };
 function isSupportedWindowsVersion() {
-  if (os.platform() !== 'win32' || os.arch() !== 'x64') return false;
-  const [major, minor] = os.release().split('.').map(token => parseInt(token, 10));
+  if (_os.default.platform() !== 'win32' || _os.default.arch() !== 'x64') return false;
+  const [major, minor] = _os.default.release().split('.').map(token => parseInt(token, 10));
   // This is based on: https://stackoverflow.com/questions/42524606/how-to-get-windows-version-using-node-js/44916050#44916050
   // The table with versions is taken from: https://docs.microsoft.com/en-us/windows/win32/api/winnt/ns-winnt-osversioninfoexw#remarks
   // Windows 7 is not supported and is encoded as `6.1`.
@@ -124,7 +124,7 @@ async function installDependenciesLinux(targets, dryRun) {
     return;
   }
   if (elevatedPermissions) console.log('Switching to root user to install dependencies...'); // eslint-disable-line no-console
-  const child = _child_process.default.spawn(command, args, {
+  const child = childProcess.spawn(command, args, {
     stdio: 'inherit'
   });
   await new Promise((resolve, reject) => {
@@ -192,7 +192,7 @@ async function validateDependenciesLinux(sdkLanguage, linuxLddDirectories, dlOpe
       missingDeps.delete(missingDep);
     }
   }
-  const maybeSudo = (_process$getuid = (_process = process).getuid) !== null && _process$getuid !== void 0 && _process$getuid.call(_process) && os.platform() !== 'win32' ? 'sudo ' : '';
+  const maybeSudo = (_process$getuid = (_process = process).getuid) !== null && _process$getuid !== void 0 && _process$getuid.call(_process) && _os.default.platform() !== 'win32' ? 'sudo ' : '';
   const dockerInfo = readDockerVersionSync();
   const errorLines = [`Host system is missing dependencies to run browsers.`];
   // Ignore patch versions when comparing docker container version and Playwright version:
@@ -213,10 +213,10 @@ async function validateDependenciesLinux(sdkLanguage, linuxLddDirectories, dlOpe
     // Print missing libraries only:
     errorLines.push(...[`Missing libraries:`, ...[...allMissingDeps].map(dep => '    ' + dep)]);
   }
-  throw new Error('\n' + utils.wrapInASCIIBox(errorLines.join('\n'), 1));
+  throw new Error('\n' + (0, _ascii.wrapInASCIIBox)(errorLines.join('\n'), 1));
 }
 function isSharedLib(basename) {
-  switch (os.platform()) {
+  switch (_os.default.platform()) {
     case 'linux':
       return basename.endsWith('.so') || basename.includes('.so.');
     case 'win32':

package/lib/server/registry/index.js

@@ -15,23 +15,24 @@ Object.defineProperty(exports, "writeDockerVersion", {
     return _dependencies.writeDockerVersion;
   }
 });
-var os = _interopRequireWildcard(require("os"));
+var _fs = _interopRequireDefault(require("fs"));
+var _os = _interopRequireDefault(require("os"));
 var _path = _interopRequireDefault(require("path"));
 var util = _interopRequireWildcard(require("util"));
-var fs = _interopRequireWildcard(require("fs"));
-var _utilsBundle = require("../../utilsBundle");
-var _network = require("../../utils/network");
-var _userAgent = require("../../utils/userAgent");
-var _utils = require("../../utils");
-var _fileUtils = require("../../utils/fileUtils");
-var _hostPlatform = require("../../utils/hostPlatform");
-var _spawnAsync = require("../../utils/spawnAsync");
-var _dependencies = require("./dependencies");
 var _browserFetcher = require("./browserFetcher");
-var _debugLogger = require("../../utils/debugLogger");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _dependencies = require("./dependencies");
+var _utils = require("../../utils");
+var _ascii = require("../utils/ascii");
+var _debugLogger = require("../utils/debugLogger");
+var _hostPlatform = require("../utils/hostPlatform");
+var _network = require("../utils/network");
+var _spawnAsync = require("../utils/spawnAsync");
+var _userAgent = require("../utils/userAgent");
+var _utilsBundle = require("../../utilsBundle");
+var _fileUtils = require("../utils/fileUtils");
 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.
@@ -402,7 +403,7 @@ const registryDirectory = exports.registryDirectory = (() => {
     result = envDefined;
   } else {
     let cacheDirectory;
-    if (process.platform === 'linux') cacheDirectory = process.env.XDG_CACHE_HOME || _path.default.join(os.homedir(), '.cache');else if (process.platform === 'darwin') cacheDirectory = _path.default.join(os.homedir(), 'Library', 'Caches');else if (process.platform === 'win32') cacheDirectory = process.env.LOCALAPPDATA || _path.default.join(os.homedir(), 'AppData', 'Local');else throw new Error('Unsupported platform: ' + process.platform);
+    if (process.platform === 'linux') cacheDirectory = process.env.XDG_CACHE_HOME || _path.default.join(_os.default.homedir(), '.cache');else if (process.platform === 'darwin') cacheDirectory = _path.default.join(_os.default.homedir(), 'Library', 'Caches');else if (process.platform === 'win32') cacheDirectory = process.env.LOCALAPPDATA || _path.default.join(_os.default.homedir(), 'AppData', 'Local');else throw new Error('Unsupported platform: ' + process.platform);
     result = _path.default.join(cacheDirectory, 'ms-playwright');
   }
   if (!_path.default.isAbsolute(result)) {
@@ -423,14 +424,7 @@ function isBrowserDirectory(browserDirectory) {
   return false;
 }
 function readDescriptors(browsersJSON) {
-  const headlessShells = [];
-  for (const browserName of ['chromium', 'chromium-tip-of-tree']) {
-    headlessShells.push({
-      ...browsersJSON.browsers.find(browser => browser.name === browserName),
-      name: `${browserName}-headless-shell`
-    });
-  }
-  return [...browsersJSON.browsers, ...headlessShells].map(obj => {
+  return browsersJSON['browsers'].map(obj => {
     const name = obj.name;
     const revisionOverride = (obj.revisionOverrides || {})[_hostPlatform.hostPlatform];
     const revision = revisionOverride || obj.revision;
@@ -470,7 +464,7 @@ class Registry {
         const preferredDockerVersion = currentDockerVersion ? (0, _dependencies.dockerVersion)(currentDockerVersion.dockerImageNameTemplate) : null;
         const isOutdatedDockerImage = currentDockerVersion && preferredDockerVersion && currentDockerVersion.dockerImageName !== preferredDockerVersion.dockerImageName;
         const prettyMessage = isOutdatedDockerImage ? [`Looks like ${sdkLanguage === 'javascript' ? 'Playwright Test or ' : ''}Playwright was just updated to ${preferredDockerVersion.driverVersion}.`, `Please update docker image as well.`, `-  current: ${currentDockerVersion.dockerImageName}`, `- required: ${preferredDockerVersion.dockerImageName}`, ``, `<3 Playwright Team`].join('\n') : [`Looks like ${sdkLanguage === 'javascript' ? 'Playwright Test or ' : ''}Playwright was just installed or updated.`, `Please run the following command to download new browser${installByDefault ? 's' : ''}:`, ``, `    ${installCommand}`, ``, `<3 Playwright Team`].join('\n');
-        throw new Error(`Executable doesn't exist at ${e}\n${(0, _utils.wrapInASCIIBox)(prettyMessage, 1)}`);
+        throw new Error(`Executable doesn't exist at ${e}\n${(0, _ascii.wrapInASCIIBox)(prettyMessage, 1)}`);
       }
       return e;
     };
@@ -797,7 +791,7 @@ class Registry {
       const folder = _path.default.resolve('firefox');
       let channelName = 'stable';
       if (name.includes('beta')) channelName = 'beta';else if (name.includes('nightly')) channelName = 'nightly';
-      const installedVersions = fs.readdirSync(folder);
+      const installedVersions = _fs.default.readdirSync(folder);
       const found = installedVersions.filter(e => e.includes(channelName));
       if (found.length === 1) return _path.default.join(folder, found[0], suffix);
       if (found.length > 1) {
@@ -862,8 +856,8 @@ class Registry {
     return Array.from(new Set(executables));
   }
   async _validateHostRequirements(sdkLanguage, browserDirectory, linuxLddDirectories, dlOpenLibraries, windowsExeAndDllDirectories) {
-    if (os.platform() === 'linux') return await (0, _dependencies.validateDependenciesLinux)(sdkLanguage, linuxLddDirectories.map(d => _path.default.join(browserDirectory, d)), dlOpenLibraries);
-    if (os.platform() === 'win32' && os.arch() === 'x64') return await (0, _dependencies.validateDependenciesWindows)(sdkLanguage, windowsExeAndDllDirectories.map(d => _path.default.join(browserDirectory, d)));
+    if (_os.default.platform() === 'linux') return await (0, _dependencies.validateDependenciesLinux)(sdkLanguage, linuxLddDirectories.map(d => _path.default.join(browserDirectory, d)), dlOpenLibraries);
+    if (_os.default.platform() === 'win32' && _os.default.arch() === 'x64') return await (0, _dependencies.validateDependenciesWindows)(sdkLanguage, windowsExeAndDllDirectories.map(d => _path.default.join(browserDirectory, d)));
   }
   async installDeps(executablesToInstallDeps, dryRun) {
     const executables = this._dedupe(executablesToInstallDeps);
@@ -872,12 +866,12 @@ class Registry {
       if (executable._dependencyGroup) targets.add(executable._dependencyGroup);
     }
     targets.add('tools');
-    if (os.platform() === 'win32') return await (0, _dependencies.installDependenciesWindows)(targets, dryRun);
-    if (os.platform() === 'linux') return await (0, _dependencies.installDependenciesLinux)(targets, dryRun);
+    if (_os.default.platform() === 'win32') return await (0, _dependencies.installDependenciesWindows)(targets, dryRun);
+    if (_os.default.platform() === 'linux') return await (0, _dependencies.installDependenciesLinux)(targets, dryRun);
   }
   async install(executablesToInstall, forceReinstall) {
     const executables = this._dedupe(executablesToInstall);
-    await fs.promises.mkdir(registryDirectory, {
+    await _fs.default.promises.mkdir(registryDirectory, {
       recursive: true
     });
     const lockfilePath = _path.default.join(registryDirectory, '__dirlock');
@@ -898,10 +892,10 @@ class Registry {
         lockfilePath
       });
       // Create a link first, so that cache validation does not remove our own browsers.
-      await fs.promises.mkdir(linksDir, {
+      await _fs.default.promises.mkdir(linksDir, {
         recursive: true
       });
-      await fs.promises.writeFile(_path.default.join(linksDir, (0, _utils.calculateSha1)(PACKAGE_PATH)), PACKAGE_PATH);
+      await _fs.default.promises.writeFile(_path.default.join(linksDir, (0, _utils.calculateSha1)(PACKAGE_PATH)), PACKAGE_PATH);
 
       // Remove stale browsers.
       await this._validateInstallationCache(linksDir);
@@ -914,14 +908,14 @@ class Registry {
         } = (0, _userAgent.getEmbedderName)();
         if (!(0, _utils.getAsBooleanFromENV)('CI') && !executable._isHermeticInstallation && !forceReinstall && executable.executablePath(embedderName)) {
           const command = buildPlaywrightCLICommand(embedderName, 'install --force ' + executable.name);
-          throw new Error('\n' + (0, _utils.wrapInASCIIBox)([`ATTENTION: "${executable.name}" is already installed on the system!`, ``, `"${executable.name}" installation is not hermetic; installing newer version`, `requires *removal* of a current installation first.`, ``, `To *uninstall* current version and re-install latest "${executable.name}":`, ``, `- Close all running instances of "${executable.name}", if any`, `- Use "--force" to install browser:`, ``, `    ${command}`, ``, `<3 Playwright Team`].join('\n'), 1));
+          throw new Error('\n' + (0, _ascii.wrapInASCIIBox)([`ATTENTION: "${executable.name}" is already installed on the system!`, ``, `"${executable.name}" installation is not hermetic; installing newer version`, `requires *removal* of a current installation first.`, ``, `To *uninstall* current version and re-install latest "${executable.name}":`, ``, `- Close all running instances of "${executable.name}", if any`, `- Use "--force" to install browser:`, ``, `    ${command}`, ``, `<3 Playwright Team`].join('\n'), 1));
         }
         await executable._install();
       }
     } catch (e) {
       if (e.code === 'ELOCKED') {
         const rmCommand = process.platform === 'win32' ? 'rm -R' : 'rm -rf';
-        throw new Error('\n' + (0, _utils.wrapInASCIIBox)([`An active lockfile is found at:`, ``, `  ${lockfilePath}`, ``, `Either:`, `- wait a few minutes if other Playwright is installing browsers in parallel`, `- remove lock manually with:`, ``, `    ${rmCommand} ${lockfilePath}`, ``, `<3 Playwright Team`].join('\n'), 1));
+        throw new Error('\n' + (0, _ascii.wrapInASCIIBox)([`An active lockfile is found at:`, ``, `  ${lockfilePath}`, ``, `Either:`, `- wait a few minutes if other Playwright is installing browsers in parallel`, `- remove lock manually with:`, ``, `    ${rmCommand} ${lockfilePath}`, ``, `<3 Playwright Team`].join('\n'), 1));
       } else {
         throw e;
       }
@@ -932,16 +926,16 @@ class Registry {
   async uninstall(all) {
     const linksDir = _path.default.join(registryDirectory, '.links');
     if (all) {
-      const links = await fs.promises.readdir(linksDir).catch(() => []);
-      for (const link of links) await fs.promises.unlink(_path.default.join(linksDir, link));
+      const links = await _fs.default.promises.readdir(linksDir).catch(() => []);
+      for (const link of links) await _fs.default.promises.unlink(_path.default.join(linksDir, link));
     } else {
-      await fs.promises.unlink(_path.default.join(linksDir, (0, _utils.calculateSha1)(PACKAGE_PATH))).catch(() => {});
+      await _fs.default.promises.unlink(_path.default.join(linksDir, (0, _utils.calculateSha1)(PACKAGE_PATH))).catch(() => {});
     }
 
     // Remove stale browsers.
     await this._validateInstallationCache(linksDir);
     return {
-      numberOfBrowsersLeft: (await fs.promises.readdir(registryDirectory).catch(() => [])).filter(browserDirectory => isBrowserDirectory(browserDirectory)).length
+      numberOfBrowsersLeft: (await _fs.default.promises.readdir(registryDirectory).catch(() => [])).filter(browserDirectory => isBrowserDirectory(browserDirectory)).length
     };
   }
   async validateHostRequirementsForExecutablesIfNeeded(executables, sdkLanguage) {
@@ -957,7 +951,7 @@ class Registry {
     if (!executable.directory) return;
     const markerFile = _path.default.join(executable.directory, 'DEPENDENCIES_VALIDATED');
     // Executable is already validated.
-    if (await fs.promises.stat(markerFile).then(stat => Date.now() - stat.mtime.getTime() < kMaximumReValidationPeriod).catch(() => false)) return;
+    if (await _fs.default.promises.stat(markerFile).then(stat => Date.now() - stat.mtime.getTime() < kMaximumReValidationPeriod).catch(() => false)) return;
     _debugLogger.debugLogger.log('install', `validating host requirements for "${executable.name}"`);
     try {
       await executable._validateHostRequirements(sdkLanguage);
@@ -966,7 +960,7 @@ class Registry {
       _debugLogger.debugLogger.log('install', `validation failed for ${executable.name}`);
       throw error;
     }
-    await fs.promises.writeFile(markerFile, '').catch(() => {});
+    await _fs.default.promises.writeFile(markerFile, '').catch(() => {});
   }
   _downloadURLs(descriptor) {
     const paths = DOWNLOAD_PATHS[descriptor.name];
@@ -1063,11 +1057,11 @@ class Registry {
   async _validateInstallationCache(linksDir) {
     // 1. Collect used downloads and package descriptors.
     const usedBrowserPaths = new Set();
-    for (const fileName of await fs.promises.readdir(linksDir)) {
+    for (const fileName of await _fs.default.promises.readdir(linksDir)) {
       const linkPath = _path.default.join(linksDir, fileName);
       let linkTarget = '';
       try {
-        linkTarget = (await fs.promises.readFile(linkPath)).toString();
+        linkTarget = (await _fs.default.promises.readFile(linkPath)).toString();
         const browsersJSON = require(_path.default.join(linkTarget, 'browsers.json'));
         const descriptors = readDescriptors(browsersJSON);
         for (const browserName of allDownloadable) {
@@ -1088,13 +1082,13 @@ class Registry {
           if (!shouldHaveMarkerFile || (await (0, _fileUtils.existsAsync)(browserDirectoryToMarkerFilePath(usedBrowserPath)))) usedBrowserPaths.add(usedBrowserPath);
         }
       } catch (e) {
-        await fs.promises.unlink(linkPath).catch(e => {});
+        await _fs.default.promises.unlink(linkPath).catch(e => {});
       }
     }
 
     // 2. Delete all unused browsers.
     if (!(0, _utils.getAsBooleanFromENV)('PLAYWRIGHT_SKIP_BROWSER_GC')) {
-      let downloadedBrowsers = (await fs.promises.readdir(registryDirectory)).map(file => _path.default.join(registryDirectory, file));
+      let downloadedBrowsers = (await _fs.default.promises.readdir(registryDirectory)).map(file => _path.default.join(registryDirectory, file));
       downloadedBrowsers = downloadedBrowsers.filter(file => isBrowserDirectory(file));
       const directories = new Set(downloadedBrowsers);
       for (const browserDirectory of usedBrowserPaths) directories.delete(browserDirectory);
@@ -1151,7 +1145,7 @@ function findChromiumChannel(sdkLanguage) {
   if (channel === null) {
     const installCommand = buildPlaywrightCLICommand(sdkLanguage, `install chromium`);
     const prettyMessage = [`No chromium-based browser found on the system.`, `Please run the following command to download one:`, ``, `    ${installCommand}`, ``, `<3 Playwright Team`].join('\n');
-    throw new Error('\n' + (0, _utils.wrapInASCIIBox)(prettyMessage, 1));
+    throw new Error('\n' + (0, _ascii.wrapInASCIIBox)(prettyMessage, 1));
   }
   return channel;
 }

package/lib/server/registry/oopDownloadBrowserMain.js

@@ -2,10 +2,10 @@
 
 var _fs = _interopRequireDefault(require("fs"));
 var _path = _interopRequireDefault(require("path"));
-var _network = require("../../utils/network");
-var _manualPromise = require("../../utils/manualPromise");
+var _manualPromise = require("../../utils/isomorphic/manualPromise");
+var _network = require("../utils/network");
 var _zipBundle = require("../../zipBundle");
-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/screenshotter.js

@@ -7,7 +7,7 @@ exports.Screenshotter = void 0;
 exports.validateScreenshotOptions = validateScreenshotOptions;
 var _helper = require("./helper");
 var _utils = require("../utils");
-var _multimap = require("../utils/multimap");
+var _multimap = require("../utils/isomorphic/multimap");
 /**
  * Copyright 2019 Google Inc. All rights reserved.
  * Modifications copyright (c) Microsoft Corporation.

package/lib/server/selectors.js

@@ -4,8 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Selectors = void 0;
+var _crypto = require("./utils/crypto");
 var _selectorParser = require("../utils/isomorphic/selectorParser");
-var _utils = require("../utils");
 /**
  * Copyright (c) Microsoft Corporation.
  *
@@ -27,10 +27,10 @@ class Selectors {
     this._builtinEngines = void 0;
     this._builtinEnginesInMainWorld = void 0;
     this._engines = void 0;
-    this.guid = `selectors@${(0, _utils.createGuid)()}`;
+    this.guid = `selectors@${(0, _crypto.createGuid)()}`;
     this._testIdAttributeName = 'data-testid';
     // Note: keep in sync with InjectedScript class.
-    this._builtinEngines = new Set(['css', 'css:light', 'xpath', 'xpath:light', '_react', '_vue', 'text', 'text:light', 'id', 'id:light', 'data-testid', 'data-testid:light', 'data-test-id', 'data-test-id:light', 'data-test', 'data-test:light', 'nth', 'visible', 'internal:control', 'internal:has', 'internal:has-not', 'internal:has-text', 'internal:has-not-text', 'internal:and', 'internal:or', 'internal:chain', 'role', 'internal:attr', 'internal:label', 'internal:text', 'internal:role', 'internal:testid']);
+    this._builtinEngines = new Set(['css', 'css:light', 'xpath', 'xpath:light', '_react', '_vue', 'text', 'text:light', 'id', 'id:light', 'data-testid', 'data-testid:light', 'data-test-id', 'data-test-id:light', 'data-test', 'data-test:light', 'nth', 'visible', 'internal:control', 'internal:has', 'internal:has-not', 'internal:has-text', 'internal:has-not-text', 'internal:and', 'internal:or', 'internal:chain', 'role', 'internal:attr', 'internal:label', 'internal:text', 'internal:role', 'internal:testid', 'internal:aria-id']);
     this._builtinEnginesInMainWorld = new Set(['_react', '_vue']);
     this._engines = new Map();
   }

package/lib/server/socksClientCertificatesInterceptor.js

@@ -6,18 +6,18 @@ Object.defineProperty(exports, "__esModule", {
 exports.ClientCertificatesProxy = void 0;
 exports.getMatchingTLSOptionsForOrigin = getMatchingTLSOptionsForOrigin;
 exports.rewriteOpenSSLErrorIfNeeded = rewriteOpenSSLErrorIfNeeded;
-var _net = _interopRequireDefault(require("net"));
+var _events = require("events");
 var _http = _interopRequireDefault(require("http2"));
-var _tls = _interopRequireDefault(require("tls"));
+var _net = _interopRequireDefault(require("net"));
 var _stream = _interopRequireDefault(require("stream"));
-var _happyEyeballs = require("../utils/happy-eyeballs");
+var _tls = _interopRequireDefault(require("tls"));
+var _socksProxy = require("./utils/socksProxy");
 var _utils = require("../utils");
-var _socksProxy = require("../common/socksProxy");
-var _debugLogger = require("../utils/debugLogger");
-var _fetch = require("./fetch");
-var _events = require("events");
 var _browserContext = require("./browserContext");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _fetch = require("./fetch");
+var _debugLogger = require("./utils/debugLogger");
+var _happyEyeballs = require("./utils/happyEyeballs");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * Copyright (c) Microsoft Corporation.
  *

package/lib/server/socksInterceptor.js

@@ -4,12 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.SocksInterceptor = void 0;
-var socks = _interopRequireWildcard(require("../common/socksProxy"));
 var _events = _interopRequireDefault(require("events"));
+var socks = _interopRequireWildcard(require("./utils/socksProxy"));
 var _validator = require("../protocol/validator");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _debug = require("./utils/debug");
 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 (c) Microsoft Corporation.
  *
@@ -44,7 +45,8 @@ class SocksInterceptor {
             const validator = (0, _validator.findValidator)('SocksSupport', prop, 'Params');
             params = validator(params, '', {
               tChannelImpl: tChannelForSocks,
-              binary: 'toBase64'
+              binary: 'toBase64',
+              isUnderTest: _debug.isUnderTest
             });
             transport.send({
               id,
@@ -86,7 +88,8 @@ class SocksInterceptor {
       const validator = (0, _validator.findValidator)('SocksSupport', message.method, 'Event');
       const params = validator(message.params, '', {
         tChannelImpl: tChannelForSocks,
-        binary: 'fromBase64'
+        binary: 'fromBase64',
+        isUnderTest: _debug.isUnderTest
       });
       this._channel.emit(message.method, params);
       return true;

package/lib/server/storageScript.js

@@ -0,0 +1,160 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.collect = collect;
+exports.restore = restore;
+/**
+ * Copyright (c) Microsoft Corporation.
+ *
+ * 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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+async function collect(serializers, isFirefox, recordIndexedDB) {
+  async function collectDB(dbInfo) {
+    if (!dbInfo.name) throw new Error('Database name is empty');
+    if (!dbInfo.version) throw new Error('Database version is unset');
+    function idbRequestToPromise(request) {
+      return new Promise((resolve, reject) => {
+        request.addEventListener('success', () => resolve(request.result));
+        request.addEventListener('error', () => reject(request.error));
+      });
+    }
+    function isPlainObject(v) {
+      const ctor = v === null || v === void 0 ? void 0 : v.constructor;
+      if (isFirefox) {
+        const constructorImpl = ctor === null || ctor === void 0 ? void 0 : ctor.toString();
+        if (constructorImpl.startsWith('function Object() {') && constructorImpl.includes('[native code]')) return true;
+      }
+      return ctor === Object;
+    }
+    function trySerialize(value) {
+      let trivial = true;
+      const encoded = serializers.serializeAsCallArgument(value, v => {
+        const isTrivial = isPlainObject(v) || Array.isArray(v) || typeof v === 'string' || typeof v === 'number' || typeof v === 'boolean' || Object.is(v, null);
+        if (!isTrivial) trivial = false;
+        return {
+          fallThrough: v
+        };
+      });
+      if (trivial) return {
+        trivial: value
+      };
+      return {
+        encoded
+      };
+    }
+    const db = await idbRequestToPromise(indexedDB.open(dbInfo.name));
+    const transaction = db.transaction(db.objectStoreNames, 'readonly');
+    const stores = await Promise.all([...db.objectStoreNames].map(async storeName => {
+      const objectStore = transaction.objectStore(storeName);
+      const keys = await idbRequestToPromise(objectStore.getAllKeys());
+      const records = await Promise.all(keys.map(async key => {
+        const record = {};
+        if (objectStore.keyPath === null) {
+          const {
+            encoded,
+            trivial
+          } = trySerialize(key);
+          if (trivial) record.key = trivial;else record.keyEncoded = encoded;
+        }
+        const value = await idbRequestToPromise(objectStore.get(key));
+        const {
+          encoded,
+          trivial
+        } = trySerialize(value);
+        if (trivial) record.value = trivial;else record.valueEncoded = encoded;
+        return record;
+      }));
+      const indexes = [...objectStore.indexNames].map(indexName => {
+        const index = objectStore.index(indexName);
+        return {
+          name: index.name,
+          keyPath: typeof index.keyPath === 'string' ? index.keyPath : undefined,
+          keyPathArray: Array.isArray(index.keyPath) ? index.keyPath : undefined,
+          multiEntry: index.multiEntry,
+          unique: index.unique
+        };
+      });
+      return {
+        name: storeName,
+        records: records,
+        indexes,
+        autoIncrement: objectStore.autoIncrement,
+        keyPath: typeof objectStore.keyPath === 'string' ? objectStore.keyPath : undefined,
+        keyPathArray: Array.isArray(objectStore.keyPath) ? objectStore.keyPath : undefined
+      };
+    }));
+    return {
+      name: dbInfo.name,
+      version: dbInfo.version,
+      stores
+    };
+  }
+  return {
+    localStorage: Object.keys(localStorage).map(name => ({
+      name,
+      value: localStorage.getItem(name)
+    })),
+    indexedDB: recordIndexedDB ? await Promise.all((await indexedDB.databases()).map(collectDB)).catch(e => {
+      throw new Error('Unable to serialize IndexedDB: ' + e.message);
+    }) : undefined
+  };
+}
+async function restore(originState, serializers) {
+  var _originState$indexedD;
+  for (const {
+    name,
+    value
+  } of originState.localStorage || []) localStorage.setItem(name, value);
+  await Promise.all(((_originState$indexedD = originState.indexedDB) !== null && _originState$indexedD !== void 0 ? _originState$indexedD : []).map(async dbInfo => {
+    const openRequest = indexedDB.open(dbInfo.name, dbInfo.version);
+    openRequest.addEventListener('upgradeneeded', () => {
+      const db = openRequest.result;
+      for (const store of dbInfo.stores) {
+        var _store$keyPathArray;
+        const objectStore = db.createObjectStore(store.name, {
+          autoIncrement: store.autoIncrement,
+          keyPath: (_store$keyPathArray = store.keyPathArray) !== null && _store$keyPathArray !== void 0 ? _store$keyPathArray : store.keyPath
+        });
+        for (const index of store.indexes) {
+          var _index$keyPathArray;
+          objectStore.createIndex(index.name, (_index$keyPathArray = index.keyPathArray) !== null && _index$keyPathArray !== void 0 ? _index$keyPathArray : index.keyPath, {
+            unique: index.unique,
+            multiEntry: index.multiEntry
+          });
+        }
+      }
+    });
+    function idbRequestToPromise(request) {
+      return new Promise((resolve, reject) => {
+        request.addEventListener('success', () => resolve(request.result));
+        request.addEventListener('error', () => reject(request.error));
+      });
+    }
+
+    // after `upgradeneeded` finishes, `success` event is fired.
+    const db = await idbRequestToPromise(openRequest);
+    const transaction = db.transaction(db.objectStoreNames, 'readwrite');
+    await Promise.all(dbInfo.stores.map(async store => {
+      const objectStore = transaction.objectStore(store.name);
+      await Promise.all(store.records.map(async record => {
+        var _record$value, _record$key;
+        await idbRequestToPromise(objectStore.add((_record$value = record.value) !== null && _record$value !== void 0 ? _record$value : serializers.parseEvaluationResultValue(record.valueEncoded), (_record$key = record.key) !== null && _record$key !== void 0 ? _record$key : serializers.parseEvaluationResultValue(record.keyEncoded)));
+      }));
+    }));
+  })).catch(e => {
+    throw new Error('Unable to restore IndexedDB: ' + e.message);
+  });
+}

package/lib/{common → server}/timeoutSettings.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.TimeoutSettings = exports.DEFAULT_TIMEOUT = exports.DEFAULT_LAUNCH_TIMEOUT = void 0;
-var _utils = require("../utils");
+var _debug = require("./utils/debug");
 /**
  * Copyright 2019 Google Inc. All rights reserved.
  * Modifications copyright (c) Microsoft Corporation.
@@ -22,6 +22,7 @@ var _utils = require("../utils");
  * limitations under the License.
  */
 
+// Keep in sync with client.
 const DEFAULT_TIMEOUT = exports.DEFAULT_TIMEOUT = 30000;
 const DEFAULT_LAUNCH_TIMEOUT = exports.DEFAULT_LAUNCH_TIMEOUT = 3 * 60 * 1000; // 3 minutes
 
@@ -47,26 +48,26 @@ class TimeoutSettings {
   navigationTimeout(options) {
     if (typeof options.timeout === 'number') return options.timeout;
     if (this._defaultNavigationTimeout !== undefined) return this._defaultNavigationTimeout;
-    if ((0, _utils.debugMode)()) return 0;
+    if ((0, _debug.debugMode)()) return 0;
     if (this._defaultTimeout !== undefined) return this._defaultTimeout;
     if (this._parent) return this._parent.navigationTimeout(options);
     return DEFAULT_TIMEOUT;
   }
   timeout(options) {
     if (typeof options.timeout === 'number') return options.timeout;
-    if ((0, _utils.debugMode)()) return 0;
+    if ((0, _debug.debugMode)()) return 0;
     if (this._defaultTimeout !== undefined) return this._defaultTimeout;
     if (this._parent) return this._parent.timeout(options);
     return DEFAULT_TIMEOUT;
   }
   static timeout(options) {
     if (typeof options.timeout === 'number') return options.timeout;
-    if ((0, _utils.debugMode)()) return 0;
+    if ((0, _debug.debugMode)()) return 0;
     return DEFAULT_TIMEOUT;
   }
   static launchTimeout(options) {
     if (typeof options.timeout === 'number') return options.timeout;
-    if ((0, _utils.debugMode)()) return 0;
+    if ((0, _debug.debugMode)()) return 0;
     return DEFAULT_LAUNCH_TIMEOUT;
   }
 }