@checkly/playwright-core 1.48.22 → 1.51.11-beta.2

package/lib/server/registry/browserFetcher.js

@@ -5,17 +5,19 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.downloadBrowserWithProgressBar = downloadBrowserWithProgressBar;
 exports.logPolitely = logPolitely;
+var childProcess = _interopRequireWildcard(require("child_process"));
 var _fs = _interopRequireDefault(require("fs"));
 var _os = _interopRequireDefault(require("os"));
 var _path = _interopRequireDefault(require("path"));
-var _child_process = _interopRequireDefault(require("child_process"));
-var _fileUtils = require("../../utils/fileUtils");
-var _debugLogger = require("../../utils/debugLogger");
-var _manualPromise = require("../../utils/manualPromise");
+var _debugLogger = require("../utils/debugLogger");
+var _manualPromise = require("../../utils/isomorphic/manualPromise");
+var _userAgent = require("../utils/userAgent");
 var _utilsBundle = require("../../utilsBundle");
+var _fileUtils = require("../utils/fileUtils");
 var _ = require(".");
-var _userAgent = require("../../utils/userAgent");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+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 && {}.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.
@@ -41,7 +43,7 @@ async function downloadBrowserWithProgressBar(title, browserDirectory, executabl
   }
   const zipPath = _path.default.join(_os.default.tmpdir(), downloadFileName);
   try {
-    const retryCount = 3;
+    const retryCount = 5;
     for (let attempt = 1; attempt <= retryCount; ++attempt) {
       _debugLogger.debugLogger.log('install', `downloading ${title} - attempt #${attempt}`);
       const url = downloadURLs[(attempt - 1) % downloadURLs.length];
@@ -78,7 +80,7 @@ async function downloadBrowserWithProgressBar(title, browserDirectory, executabl
  * https://github.com/microsoft/playwright/issues/17394
  */
 function downloadBrowserWithProgressBarOutOfProcess(title, browserDirectory, url, zipPath, executablePath, connectionTimeout) {
-  const cp = _child_process.default.fork(_path.default.join(__dirname, 'oopDownloadBrowserMain.js'));
+  const cp = childProcess.fork(_path.default.join(__dirname, 'oopDownloadBrowserMain.js'));
   const promise = new _manualPromise.ManualPromise();
   const progress = getDownloadProgress();
   cp.on('message', message => {

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`.
@@ -104,7 +104,7 @@ async function installDependenciesLinux(targets, dryRun) {
   for (const target of targets) {
     const info = _nativeDeps.deps[platform];
     if (!info) {
-      console.warn(`Cannot install dependencies for ${platform}!`); // eslint-disable-line no-console
+      console.warn(`Cannot install dependencies for ${platform} with Playwright ${(0, _userAgent.getPlaywrightVersion)()}!`); // eslint-disable-line no-console
       return;
     }
     libraries.push(...info[target]);
@@ -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) => {
@@ -132,11 +132,11 @@ async function installDependenciesLinux(targets, dryRun) {
     child.on('error', reject);
   });
 }
-async function validateDependenciesWindows(windowsExeAndDllDirectories) {
+async function validateDependenciesWindows(sdkLanguage, windowsExeAndDllDirectories) {
   const directoryPaths = windowsExeAndDllDirectories;
   const lddPaths = [];
   for (const directoryPath of directoryPaths) lddPaths.push(...(await executablesOrSharedLibraries(directoryPath)));
-  const allMissingDeps = await Promise.all(lddPaths.map(lddPath => missingFileDependenciesWindows(lddPath)));
+  const allMissingDeps = await Promise.all(lddPaths.map(lddPath => missingFileDependenciesWindows(sdkLanguage, lddPath)));
   const missingDeps = new Set();
   for (const deps of allMissingDeps) {
     for (const dep of deps) missingDeps.add(dep);
@@ -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':
@@ -238,8 +238,8 @@ async function executablesOrSharedLibraries(directoryPath) {
   }))).filter(Boolean);
   return executablersOrLibraries;
 }
-async function missingFileDependenciesWindows(filePath) {
-  const executable = _path.default.join(__dirname, '..', '..', '..', 'bin', 'PrintDeps.exe');
+async function missingFileDependenciesWindows(sdkLanguage, filePath) {
+  const executable = _.registry.findExecutable('winldd').executablePathOrDie(sdkLanguage);
   const dirname = _path.default.dirname(filePath);
   const {
     stdout,