@checkly/playwright-core 1.41.21 → 1.41.23

package/lib/outofprocess.js

@@ -9,8 +9,8 @@ var _transport = require("./protocol/transport");
 var childProcess = _interopRequireWildcard(require("child_process"));
 var path = _interopRequireWildcard(require("path"));
 var _manualPromise = require("./utils/manualPromise");
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+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; }
 /**
  * Copyright (c) Microsoft Corporation.
  *
@@ -41,7 +41,7 @@ class PlaywrightClient {
     this._playwright = void 0;
     this._driverProcess = void 0;
     this._closePromise = new _manualPromise.ManualPromise();
-    this._driverProcess = childProcess.fork(path.join(__dirname, 'cli', 'cli.js'), ['run-driver'], {
+    this._driverProcess = childProcess.fork(path.join(__dirname, '..', 'cli.js'), ['run-driver'], {
       stdio: 'pipe',
       detached: true,
       env: {

package/lib/protocol/validator.js

@@ -429,13 +429,6 @@ _validatorPrimitives.scheme.DebugControllerSourceChangedEvent = (0, _validatorPr
 _validatorPrimitives.scheme.DebugControllerPausedEvent = (0, _validatorPrimitives.tObject)({
   paused: _validatorPrimitives.tBoolean
 });
-_validatorPrimitives.scheme.DebugControllerBrowsersChangedEvent = (0, _validatorPrimitives.tObject)({
-  browsers: (0, _validatorPrimitives.tArray)((0, _validatorPrimitives.tObject)({
-    contexts: (0, _validatorPrimitives.tArray)((0, _validatorPrimitives.tObject)({
-      pages: (0, _validatorPrimitives.tArray)(_validatorPrimitives.tString)
-    }))
-  }))
-});
 _validatorPrimitives.scheme.DebugControllerInitializeParams = (0, _validatorPrimitives.tObject)({
   codegenId: _validatorPrimitives.tString,
   sdkLanguage: (0, _validatorPrimitives.tEnum)(['javascript', 'python', 'java', 'csharp'])
@@ -819,7 +812,6 @@ _validatorPrimitives.scheme.BrowserContextBindingCallEvent = (0, _validatorPrimi
   binding: (0, _validatorPrimitives.tChannel)(['BindingCall'])
 });
 _validatorPrimitives.scheme.BrowserContextConsoleEvent = (0, _validatorPrimitives.tObject)({
-  page: (0, _validatorPrimitives.tChannel)(['Page']),
   type: _validatorPrimitives.tString,
   text: _validatorPrimitives.tString,
   args: (0, _validatorPrimitives.tArray)((0, _validatorPrimitives.tChannel)(['ElementHandle', 'JSHandle'])),
@@ -827,7 +819,8 @@ _validatorPrimitives.scheme.BrowserContextConsoleEvent = (0, _validatorPrimitive
     url: _validatorPrimitives.tString,
     lineNumber: _validatorPrimitives.tNumber,
     columnNumber: _validatorPrimitives.tNumber
-  })
+  }),
+  page: (0, _validatorPrimitives.tChannel)(['Page'])
 });
 _validatorPrimitives.scheme.BrowserContextCloseEvent = (0, _validatorPrimitives.tOptional)((0, _validatorPrimitives.tObject)({}));
 _validatorPrimitives.scheme.BrowserContextDialogEvent = (0, _validatorPrimitives.tObject)({
@@ -1030,6 +1023,9 @@ _validatorPrimitives.scheme.PageFrameAttachedEvent = (0, _validatorPrimitives.tO
 _validatorPrimitives.scheme.PageFrameDetachedEvent = (0, _validatorPrimitives.tObject)({
   frame: (0, _validatorPrimitives.tChannel)(['Frame'])
 });
+_validatorPrimitives.scheme.PageLocatorHandlerTriggeredEvent = (0, _validatorPrimitives.tObject)({
+  uid: _validatorPrimitives.tNumber
+});
 _validatorPrimitives.scheme.PageRouteEvent = (0, _validatorPrimitives.tObject)({
   route: (0, _validatorPrimitives.tChannel)(['Route'])
 });
@@ -1085,6 +1081,16 @@ _validatorPrimitives.scheme.PageGoForwardParams = (0, _validatorPrimitives.tObje
 _validatorPrimitives.scheme.PageGoForwardResult = (0, _validatorPrimitives.tObject)({
   response: (0, _validatorPrimitives.tOptional)((0, _validatorPrimitives.tChannel)(['Response']))
 });
+_validatorPrimitives.scheme.PageRegisterLocatorHandlerParams = (0, _validatorPrimitives.tObject)({
+  selector: _validatorPrimitives.tString
+});
+_validatorPrimitives.scheme.PageRegisterLocatorHandlerResult = (0, _validatorPrimitives.tObject)({
+  uid: _validatorPrimitives.tNumber
+});
+_validatorPrimitives.scheme.PageResolveLocatorHandlerNoReplyParams = (0, _validatorPrimitives.tObject)({
+  uid: _validatorPrimitives.tNumber
+});
+_validatorPrimitives.scheme.PageResolveLocatorHandlerNoReplyResult = (0, _validatorPrimitives.tOptional)((0, _validatorPrimitives.tObject)({}));
 _validatorPrimitives.scheme.PageReloadParams = (0, _validatorPrimitives.tObject)({
   timeout: (0, _validatorPrimitives.tOptional)(_validatorPrimitives.tNumber),
   waitUntil: (0, _validatorPrimitives.tOptional)((0, _validatorPrimitives.tType)('LifecycleEvent'))
@@ -1100,26 +1106,22 @@ _validatorPrimitives.scheme.PageExpectScreenshotParams = (0, _validatorPrimitive
     frame: (0, _validatorPrimitives.tChannel)(['Frame']),
     selector: _validatorPrimitives.tString
   })),
-  comparatorOptions: (0, _validatorPrimitives.tOptional)((0, _validatorPrimitives.tObject)({
-    comparator: (0, _validatorPrimitives.tOptional)(_validatorPrimitives.tString),
-    maxDiffPixels: (0, _validatorPrimitives.tOptional)(_validatorPrimitives.tNumber),
-    maxDiffPixelRatio: (0, _validatorPrimitives.tOptional)(_validatorPrimitives.tNumber),
-    threshold: (0, _validatorPrimitives.tOptional)(_validatorPrimitives.tNumber)
-  })),
-  screenshotOptions: (0, _validatorPrimitives.tOptional)((0, _validatorPrimitives.tObject)({
-    fullPage: (0, _validatorPrimitives.tOptional)(_validatorPrimitives.tBoolean),
-    clip: (0, _validatorPrimitives.tOptional)((0, _validatorPrimitives.tType)('Rect')),
-    omitBackground: (0, _validatorPrimitives.tOptional)(_validatorPrimitives.tBoolean),
-    caret: (0, _validatorPrimitives.tOptional)((0, _validatorPrimitives.tEnum)(['hide', 'initial'])),
-    animations: (0, _validatorPrimitives.tOptional)((0, _validatorPrimitives.tEnum)(['disabled', 'allow'])),
-    scale: (0, _validatorPrimitives.tOptional)((0, _validatorPrimitives.tEnum)(['css', 'device'])),
-    mask: (0, _validatorPrimitives.tOptional)((0, _validatorPrimitives.tArray)((0, _validatorPrimitives.tObject)({
-      frame: (0, _validatorPrimitives.tChannel)(['Frame']),
-      selector: _validatorPrimitives.tString
-    }))),
-    maskColor: (0, _validatorPrimitives.tOptional)(_validatorPrimitives.tString),
-    style: (0, _validatorPrimitives.tOptional)(_validatorPrimitives.tString)
-  }))
+  comparator: (0, _validatorPrimitives.tOptional)(_validatorPrimitives.tString),
+  maxDiffPixels: (0, _validatorPrimitives.tOptional)(_validatorPrimitives.tNumber),
+  maxDiffPixelRatio: (0, _validatorPrimitives.tOptional)(_validatorPrimitives.tNumber),
+  threshold: (0, _validatorPrimitives.tOptional)(_validatorPrimitives.tNumber),
+  fullPage: (0, _validatorPrimitives.tOptional)(_validatorPrimitives.tBoolean),
+  clip: (0, _validatorPrimitives.tOptional)((0, _validatorPrimitives.tType)('Rect')),
+  omitBackground: (0, _validatorPrimitives.tOptional)(_validatorPrimitives.tBoolean),
+  caret: (0, _validatorPrimitives.tOptional)((0, _validatorPrimitives.tEnum)(['hide', 'initial'])),
+  animations: (0, _validatorPrimitives.tOptional)((0, _validatorPrimitives.tEnum)(['disabled', 'allow'])),
+  scale: (0, _validatorPrimitives.tOptional)((0, _validatorPrimitives.tEnum)(['css', 'device'])),
+  mask: (0, _validatorPrimitives.tOptional)((0, _validatorPrimitives.tArray)((0, _validatorPrimitives.tObject)({
+    frame: (0, _validatorPrimitives.tChannel)(['Frame']),
+    selector: _validatorPrimitives.tString
+  }))),
+  maskColor: (0, _validatorPrimitives.tOptional)(_validatorPrimitives.tString),
+  style: (0, _validatorPrimitives.tOptional)(_validatorPrimitives.tString)
 });
 _validatorPrimitives.scheme.PageExpectScreenshotResult = (0, _validatorPrimitives.tObject)({
   diff: (0, _validatorPrimitives.tOptional)(_validatorPrimitives.tBinary),
@@ -2299,6 +2301,16 @@ _validatorPrimitives.scheme.ElectronApplicationInitializer = (0, _validatorPrimi
   context: (0, _validatorPrimitives.tChannel)(['BrowserContext'])
 });
 _validatorPrimitives.scheme.ElectronApplicationCloseEvent = (0, _validatorPrimitives.tOptional)((0, _validatorPrimitives.tObject)({}));
+_validatorPrimitives.scheme.ElectronApplicationConsoleEvent = (0, _validatorPrimitives.tObject)({
+  type: _validatorPrimitives.tString,
+  text: _validatorPrimitives.tString,
+  args: (0, _validatorPrimitives.tArray)((0, _validatorPrimitives.tChannel)(['ElementHandle', 'JSHandle'])),
+  location: (0, _validatorPrimitives.tObject)({
+    url: _validatorPrimitives.tString,
+    lineNumber: _validatorPrimitives.tNumber,
+    columnNumber: _validatorPrimitives.tNumber
+  })
+});
 _validatorPrimitives.scheme.ElectronApplicationBrowserWindowParams = (0, _validatorPrimitives.tObject)({
   page: (0, _validatorPrimitives.tChannel)(['Page'])
 });
@@ -2321,6 +2333,11 @@ _validatorPrimitives.scheme.ElectronApplicationEvaluateExpressionHandleParams =
 _validatorPrimitives.scheme.ElectronApplicationEvaluateExpressionHandleResult = (0, _validatorPrimitives.tObject)({
   handle: (0, _validatorPrimitives.tChannel)(['ElementHandle', 'JSHandle'])
 });
+_validatorPrimitives.scheme.ElectronApplicationUpdateSubscriptionParams = (0, _validatorPrimitives.tObject)({
+  event: (0, _validatorPrimitives.tEnum)(['console']),
+  enabled: _validatorPrimitives.tBoolean
+});
+_validatorPrimitives.scheme.ElectronApplicationUpdateSubscriptionResult = (0, _validatorPrimitives.tOptional)((0, _validatorPrimitives.tObject)({}));
 _validatorPrimitives.scheme.ElectronApplicationCloseParams = (0, _validatorPrimitives.tOptional)((0, _validatorPrimitives.tObject)({}));
 _validatorPrimitives.scheme.ElectronApplicationCloseResult = (0, _validatorPrimitives.tOptional)((0, _validatorPrimitives.tObject)({}));
 _validatorPrimitives.scheme.AndroidInitializer = (0, _validatorPrimitives.tOptional)((0, _validatorPrimitives.tObject)({}));

package/lib/remote/playwrightConnection.js

@@ -11,7 +11,7 @@ var _socksProxy = require("../common/socksProxy");
 var _utils = require("../utils");
 var _android = require("../server/android/android");
 var _debugControllerDispatcher = require("../server/dispatchers/debugControllerDispatcher");
-var _debugLogger = require("../common/debugLogger");
+var _debugLogger = require("../utils/debugLogger");
 /**
  * Copyright (c) Microsoft Corporation.
  *
@@ -109,7 +109,7 @@ class PlaywrightConnection {
     const playwright = this._preLaunched.playwright;
 
     // Note: connected client owns the socks proxy and configures the pattern.
-    (_this$_preLaunched$so = this._preLaunched.socksProxy) === null || _this$_preLaunched$so === void 0 ? void 0 : _this$_preLaunched$so.setPattern(this._options.socksProxyPattern);
+    (_this$_preLaunched$so = this._preLaunched.socksProxy) === null || _this$_preLaunched$so === void 0 || _this$_preLaunched$so.setPattern(this._options.socksProxyPattern);
     const browser = this._preLaunched.browser;
     browser.on(_browser.Browser.Events.Disconnected, () => {
       // Underlying browser did close for some reason - force disconnect the client.

package/lib/remote/playwrightServer.js

@@ -3,14 +3,13 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.Semaphore = exports.PlaywrightServer = void 0;
-var _utilsBundle = require("../utilsBundle");
+exports.PlaywrightServer = void 0;
 var _playwright = require("../server/playwright");
 var _playwrightConnection = require("./playwrightConnection");
-var _manualPromise = require("../utils/manualPromise");
-var _debugLogger = require("../common/debugLogger");
+var _semaphore = require("../utils/semaphore");
+var _debugLogger = require("../utils/debugLogger");
 var _utils = require("../utils");
-var _transport = require("../server/transport");
+var _wsServer = require("../utils/wsServer");
 /**
  * Copyright (c) Microsoft Corporation.
  *
@@ -27,178 +26,85 @@ var _transport = require("../server/transport");
  * limitations under the License.
  */
 
-let lastConnectionId = 0;
-const kConnectionSymbol = Symbol('kConnection');
 class PlaywrightServer {
   constructor(options) {
     this._preLaunchedPlaywright = void 0;
-    this._wsServer = void 0;
-    this._server = void 0;
     this._options = void 0;
+    this._wsServer = void 0;
     this._options = options;
     if (options.preLaunchedBrowser) this._preLaunchedPlaywright = options.preLaunchedBrowser.attribution.playwright;
     if (options.preLaunchedAndroidDevice) this._preLaunchedPlaywright = options.preLaunchedAndroidDevice._android.attribution.playwright;
-  }
-  async listen(port = 0, hostname) {
-    _debugLogger.debugLogger.log('server', `Server started at ${new Date()}`);
-    const server = (0, _utils.createHttpServer)((request, response) => {
-      if (request.method === 'GET' && request.url === '/json') {
-        response.setHeader('Content-Type', 'application/json');
-        response.end(JSON.stringify({
-          wsEndpointPath: this._options.path
-        }));
-        return;
-      }
-      response.end('Running');
-    });
-    server.on('error', error => _debugLogger.debugLogger.log('server', String(error)));
-    this._server = server;
-    const wsEndpoint = await new Promise((resolve, reject) => {
-      server.listen(port, hostname, () => {
-        const address = server.address();
-        if (!address) {
-          reject(new Error('Could not bind server socket'));
-          return;
-        }
-        const wsEndpoint = typeof address === 'string' ? `${address}${this._options.path}` : `ws://${hostname || 'localhost'}:${address.port}${this._options.path}`;
-        resolve(wsEndpoint);
-      }).on('error', reject);
-    });
-    _debugLogger.debugLogger.log('server', 'Listening at ' + wsEndpoint);
-    this._wsServer = new _utilsBundle.wsServer({
-      noServer: true,
-      perMessageDeflate: _transport.perMessageDeflate
-    });
-    const browserSemaphore = new Semaphore(this._options.maxConnections);
-    const controllerSemaphore = new Semaphore(1);
-    const reuseBrowserSemaphore = new Semaphore(1);
-    if (process.env.PWTEST_SERVER_WS_HEADERS) {
-      this._wsServer.on('headers', (headers, request) => {
-        headers.push(process.env.PWTEST_SERVER_WS_HEADERS);
-      });
-    }
-    server.on('upgrade', (request, socket, head) => {
-      var _this$_wsServer;
-      const pathname = new URL('http://localhost' + request.url).pathname;
-      if (pathname !== this._options.path) {
-        socket.write(`HTTP/${request.httpVersion} 400 Bad Request\r\n\r\n`);
-        socket.destroy();
-        return;
-      }
-      const uaError = (0, _utils.userAgentVersionMatchesErrorMessage)(request.headers['user-agent'] || '');
-      if (uaError) {
-        socket.write(`HTTP/${request.httpVersion} 428 Precondition Required\r\n\r\n${uaError}`);
-        socket.destroy();
-        return;
-      }
-      (_this$_wsServer = this._wsServer) === null || _this$_wsServer === void 0 ? void 0 : _this$_wsServer.handleUpgrade(request, socket, head, ws => {
-        var _this$_wsServer2;
-        return (_this$_wsServer2 = this._wsServer) === null || _this$_wsServer2 === void 0 ? void 0 : _this$_wsServer2.emit('connection', ws, request);
-      });
-    });
-    this._wsServer.on('connection', (ws, request) => {
-      _debugLogger.debugLogger.log('server', 'Connected client ws.extension=' + ws.extensions);
-      const url = new URL('http://localhost' + (request.url || ''));
-      const browserHeader = request.headers['x-playwright-browser'];
-      const browserName = url.searchParams.get('browser') || (Array.isArray(browserHeader) ? browserHeader[0] : browserHeader) || null;
-      const proxyHeader = request.headers['x-playwright-proxy'];
-      const proxyValue = url.searchParams.get('proxy') || (Array.isArray(proxyHeader) ? proxyHeader[0] : proxyHeader);
-      const launchOptionsHeader = request.headers['x-playwright-launch-options'] || '';
-      const launchOptionsHeaderValue = Array.isArray(launchOptionsHeader) ? launchOptionsHeader[0] : launchOptionsHeader;
-      const launchOptionsParam = url.searchParams.get('launch-options');
-      let launchOptions = {};
-      try {
-        launchOptions = JSON.parse(launchOptionsParam || launchOptionsHeaderValue);
-      } catch (e) {}
-      const id = String(++lastConnectionId);
-      _debugLogger.debugLogger.log('server', `[${id}] serving connection: ${request.url}`);
+    const browserSemaphore = new _semaphore.Semaphore(this._options.maxConnections);
+    const controllerSemaphore = new _semaphore.Semaphore(1);
+    const reuseBrowserSemaphore = new _semaphore.Semaphore(1);
+    this._wsServer = new _wsServer.WSServer({
+      onUpgrade: (request, socket) => {
+        const uaError = (0, _utils.userAgentVersionMatchesErrorMessage)(request.headers['user-agent'] || '');
+        if (uaError) return {
+          error: `HTTP/${request.httpVersion} 428 Precondition Required\r\n\r\n${uaError}`
+        };
+      },
+      onHeaders: headers => {
+        if (process.env.PWTEST_SERVER_WS_HEADERS) headers.push(process.env.PWTEST_SERVER_WS_HEADERS);
+      },
+      onConnection: (request, url, ws, id) => {
+        const browserHeader = request.headers['x-playwright-browser'];
+        const browserName = url.searchParams.get('browser') || (Array.isArray(browserHeader) ? browserHeader[0] : browserHeader) || null;
+        const proxyHeader = request.headers['x-playwright-proxy'];
+        const proxyValue = url.searchParams.get('proxy') || (Array.isArray(proxyHeader) ? proxyHeader[0] : proxyHeader);
+        const launchOptionsHeader = request.headers['x-playwright-launch-options'] || '';
+        const launchOptionsHeaderValue = Array.isArray(launchOptionsHeader) ? launchOptionsHeader[0] : launchOptionsHeader;
+        const launchOptionsParam = url.searchParams.get('launch-options');
+        let launchOptions = {};
+        try {
+          launchOptions = JSON.parse(launchOptionsParam || launchOptionsHeaderValue);
+        } catch (e) {}
 
-      // Instantiate playwright for the extension modes.
-      const isExtension = this._options.mode === 'extension';
-      if (isExtension) {
-        if (!this._preLaunchedPlaywright) this._preLaunchedPlaywright = (0, _playwright.createPlaywright)({
-          sdkLanguage: 'javascript',
-          isServer: true
-        });
-      }
-      let clientType = 'launch-browser';
-      let semaphore = browserSemaphore;
-      if (isExtension && url.searchParams.has('debug-controller')) {
-        clientType = 'controller';
-        semaphore = controllerSemaphore;
-      } else if (isExtension) {
-        clientType = 'reuse-browser';
-        semaphore = reuseBrowserSemaphore;
-      } else if (this._options.mode === 'launchServer') {
-        clientType = 'pre-launched-browser-or-android';
-        semaphore = browserSemaphore;
+        // Instantiate playwright for the extension modes.
+        const isExtension = this._options.mode === 'extension';
+        if (isExtension) {
+          if (!this._preLaunchedPlaywright) this._preLaunchedPlaywright = (0, _playwright.createPlaywright)({
+            sdkLanguage: 'javascript',
+            isServer: true
+          });
+        }
+        let clientType = 'launch-browser';
+        let semaphore = browserSemaphore;
+        if (isExtension && url.searchParams.has('debug-controller')) {
+          clientType = 'controller';
+          semaphore = controllerSemaphore;
+        } else if (isExtension) {
+          clientType = 'reuse-browser';
+          semaphore = reuseBrowserSemaphore;
+        } else if (this._options.mode === 'launchServer') {
+          clientType = 'pre-launched-browser-or-android';
+          semaphore = browserSemaphore;
+        }
+        return new _playwrightConnection.PlaywrightConnection(semaphore.acquire(), clientType, ws, {
+          socksProxyPattern: proxyValue,
+          browserName,
+          launchOptions
+        }, {
+          playwright: this._preLaunchedPlaywright,
+          browser: this._options.preLaunchedBrowser,
+          androidDevice: this._options.preLaunchedAndroidDevice,
+          socksProxy: this._options.preLaunchedSocksProxy
+        }, id, () => semaphore.release());
+      },
+      onClose: async () => {
+        _debugLogger.debugLogger.log('server', 'closing browsers');
+        if (this._preLaunchedPlaywright) await Promise.all(this._preLaunchedPlaywright.allBrowsers().map(browser => browser.close({
+          reason: 'Playwright Server stopped'
+        })));
+        _debugLogger.debugLogger.log('server', 'closed browsers');
       }
-      const connection = new _playwrightConnection.PlaywrightConnection(semaphore.acquire(), clientType, ws, {
-        socksProxyPattern: proxyValue,
-        browserName,
-        launchOptions
-      }, {
-        playwright: this._preLaunchedPlaywright,
-        browser: this._options.preLaunchedBrowser,
-        androidDevice: this._options.preLaunchedAndroidDevice,
-        socksProxy: this._options.preLaunchedSocksProxy
-      }, id, () => semaphore.release());
-      ws[kConnectionSymbol] = connection;
     });
-    return wsEndpoint;
   }
-  async close() {
-    const server = this._wsServer;
-    if (!server) return;
-    _debugLogger.debugLogger.log('server', 'closing websocket server');
-    const waitForClose = new Promise(f => server.close(f));
-    // First disconnect all remaining clients.
-    await Promise.all(Array.from(server.clients).map(async ws => {
-      const connection = ws[kConnectionSymbol];
-      if (connection) await connection.close();
-      try {
-        ws.terminate();
-      } catch (e) {}
-    }));
-    await waitForClose;
-    _debugLogger.debugLogger.log('server', 'closing http server');
-    if (this._server) await new Promise(f => this._server.close(f));
-    this._wsServer = undefined;
-    this._server = undefined;
-    _debugLogger.debugLogger.log('server', 'closed server');
-    _debugLogger.debugLogger.log('server', 'closing browsers');
-    if (this._preLaunchedPlaywright) await Promise.all(this._preLaunchedPlaywright.allBrowsers().map(browser => browser.close({
-      reason: 'Playwright Server stopped'
-    })));
-    _debugLogger.debugLogger.log('server', 'closed browsers');
-  }
-}
-exports.PlaywrightServer = PlaywrightServer;
-class Semaphore {
-  constructor(max) {
-    this._max = void 0;
-    this._acquired = 0;
-    this._queue = [];
-    this._max = max;
-  }
-  setMax(max) {
-    this._max = max;
-  }
-  acquire() {
-    const lock = new _manualPromise.ManualPromise();
-    this._queue.push(lock);
-    this._flush();
-    return lock;
-  }
-  release() {
-    --this._acquired;
-    this._flush();
+  async listen(port = 0, hostname) {
+    return this._wsServer.listen(port, hostname, this._options.path);
   }
-  _flush() {
-    while (this._acquired < this._max && this._queue.length) {
-      ++this._acquired;
-      this._queue.shift().resolve();
-    }
+  async close() {
+    await this._wsServer.close();
   }
 }
-exports.Semaphore = Semaphore;
+exports.PlaywrightServer = PlaywrightServer;

package/lib/server/android/android.js

@@ -16,7 +16,7 @@ var _progress = require("../progress");
 var _crBrowser = require("../chromium/crBrowser");
 var _helper = require("../helper");
 var _transport = require("../../protocol/transport");
-var _debugLogger = require("../../common/debugLogger");
+var _debugLogger = require("../../utils/debugLogger");
 var _processLauncher = require("../../utils/processLauncher");
 var _timeoutSettings = require("../../common/timeoutSettings");
 var _instrumentation = require("../instrumentation");
@@ -204,7 +204,7 @@ class AndroidDevice extends _instrumentation.SdkObject {
     for (const connection of this._browserConnections) await connection.close();
     if (this._driverPromise) {
       const driver = await this._driver();
-      driver === null || driver === void 0 ? void 0 : driver.close();
+      driver === null || driver === void 0 || driver.close();
     }
     await this._backend.close();
     this._android._deviceClosed(this);

package/lib/server/android/backendAdb.js

@@ -8,8 +8,8 @@ var _utilsBundle = require("../../utilsBundle");
 var net = _interopRequireWildcard(require("net"));
 var _events = require("events");
 var _utils = require("../../utils");
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+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; }
 /**
  * Copyright Microsoft Corporation. All rights reserved.
  *

package/lib/server/browser.js

@@ -68,8 +68,8 @@ class Browser extends _instrumentation.SdkObject {
     };
   }
   async stopPendingOperations(reason) {
-    var _this$_contextForReus, _this$_contextForReus2;
-    await ((_this$_contextForReus = this._contextForReuse) === null || _this$_contextForReus === void 0 ? void 0 : (_this$_contextForReus2 = _this$_contextForReus.context) === null || _this$_contextForReus2 === void 0 ? void 0 : _this$_contextForReus2.stopPendingOperations(reason));
+    var _this$_contextForReus;
+    await ((_this$_contextForReus = this._contextForReuse) === null || _this$_contextForReus === void 0 || (_this$_contextForReus = _this$_contextForReus.context) === null || _this$_contextForReus === void 0 ? void 0 : _this$_contextForReus.stopPendingOperations(reason));
   }
   _downloadCreated(page, uuid, url, suggestedFilename) {
     const download = new _download.Download(page, this.options.downloadsPath || '', uuid, url, suggestedFilename);

package/lib/server/browserContext.js

@@ -25,8 +25,8 @@ var _recorder = require("./recorder");
 var consoleApiSource = _interopRequireWildcard(require("../generated/consoleApiSource"));
 var _fetch = require("./fetch");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+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; }
 /**
  * Copyright 2017 Google Inc. All rights reserved.
  * Modifications copyright (c) Microsoft Corporation.
@@ -158,13 +158,13 @@ class BrowserContext extends _instrumentation.SdkObject {
     }
 
     // Unless dialogs are dismissed, setting extra http headers below does not respond.
-    (_page = page) === null || _page === void 0 ? void 0 : _page._frameManager.setCloseAllOpeningDialogs(true);
+    (_page = page) === null || _page === void 0 || _page._frameManager.setCloseAllOpeningDialogs(true);
     await ((_page2 = page) === null || _page2 === void 0 ? void 0 : _page2._frameManager.closeOpenDialogs());
     // Navigate to about:blank first to ensure no page scripts are running after this point.
     await ((_page3 = page) === null || _page3 === void 0 ? void 0 : _page3.mainFrame().goto(metadata, 'about:blank', {
       timeout: 0
     }));
-    (_page4 = page) === null || _page4 === void 0 ? void 0 : _page4._frameManager.setCloseAllOpeningDialogs(false);
+    (_page4 = page) === null || _page4 === void 0 || _page4._frameManager.setCloseAllOpeningDialogs(false);
     await this._resetStorage();
     await this._removeExposedBindings();
     await this._removeInitScripts();
@@ -401,9 +401,9 @@ class BrowserContext extends _instrumentation.SdkObject {
     return result;
   }
   async _resetStorage() {
-    var _this$_options$storag, _this$_options$storag2;
+    var _this$_options$storag;
     const oldOrigins = this._origins;
-    const newOrigins = new Map(((_this$_options$storag = this._options.storageState) === null || _this$_options$storag === void 0 ? void 0 : (_this$_options$storag2 = _this$_options$storag.origins) === null || _this$_options$storag2 === void 0 ? void 0 : _this$_options$storag2.map(p => [p.origin, p])) || []);
+    const newOrigins = new Map(((_this$_options$storag = this._options.storageState) === null || _this$_options$storag === void 0 || (_this$_options$storag = _this$_options$storag.origins) === null || _this$_options$storag === void 0 ? void 0 : _this$_options$storag.map(p => [p.origin, p])) || []);
     if (!oldOrigins.size && !newOrigins.size) return;
     let page = this.pages()[0];
     const internalMetadata = (0, _instrumentation.serverSideCallMetadata)();
@@ -429,11 +429,10 @@ class BrowserContext extends _instrumentation.SdkObject {
     this._origins = new Set([...newOrigins.keys()]);
     // It is safe to not restore the URL to about:blank since we are doing it in Page::resetForReuse.
   }
-
   async _resetCookies() {
-    var _this$_options$storag3, _this$_options$storag4;
+    var _this$_options$storag2, _this$_options$storag3;
     await this.clearCookies();
-    if ((_this$_options$storag3 = this._options.storageState) !== null && _this$_options$storag3 !== void 0 && _this$_options$storag3.cookies) await this.addCookies((_this$_options$storag4 = this._options.storageState) === null || _this$_options$storag4 === void 0 ? void 0 : _this$_options$storag4.cookies);
+    if ((_this$_options$storag2 = this._options.storageState) !== null && _this$_options$storag2 !== void 0 && _this$_options$storag2.cookies) await this.addCookies((_this$_options$storag3 = this._options.storageState) === null || _this$_options$storag3 === void 0 ? void 0 : _this$_options$storag3.cookies);
   }
   isSettingStorageState() {
     return this._settingStorageState;

package/lib/server/browserType.js

@@ -17,12 +17,12 @@ var _timeoutSettings = require("../common/timeoutSettings");
 var _utils = require("../utils");
 var _fileUtils = require("../utils/fileUtils");
 var _helper = require("./helper");
-var _debugLogger = require("../common/debugLogger");
+var _debugLogger = require("../utils/debugLogger");
 var _instrumentation = require("./instrumentation");
 var _manualPromise = require("../utils/manualPromise");
 var _protocolError = require("./protocolError");
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+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 }; }
 /**
  * Copyright (c) Microsoft Corporation.
@@ -164,7 +164,7 @@ class BrowserType extends _instrumentation.SdkObject {
       const registryExecutable = _registry.registry.findExecutable(options.channel || this._name);
       if (!registryExecutable || registryExecutable.browserName !== this._name) throw new Error(`Unsupported ${this._name} channel "${options.channel}"`);
       executable = registryExecutable.executablePathOrDie(this.attribution.playwright.options.sdkLanguage);
-      await registryExecutable.validateHostRequirements(this.attribution.playwright.options.sdkLanguage);
+      await _registry.registry.validateHostRequirementsForExecutablesIfNeeded([registryExecutable], this.attribution.playwright.options.sdkLanguage);
     }
     const waitForWSEndpoint = options.useWebSocket || (_options$args = options.args) !== null && _options$args !== void 0 && _options$args.some(a => a.startsWith('--remote-debugging-port')) ? new _manualPromise.ManualPromise() : undefined;
     const waitForJuggler = this._name === 'firefox' ? new _manualPromise.ManualPromise() : undefined;
@@ -203,7 +203,7 @@ class BrowserType extends _instrumentation.SdkObject {
       },
       onExit: (exitCode, signal) => {
         // Unblock launch when browser prematurely exits.
-        waitForJuggler === null || waitForJuggler === void 0 ? void 0 : waitForJuggler.resolve();
+        waitForJuggler === null || waitForJuggler === void 0 || waitForJuggler.resolve();
         if (browserProcess && browserProcess.onclose) browserProcess.onclose(exitCode, signal);
       }
     });

package/lib/server/chromium/chromium.js

@@ -19,7 +19,7 @@ var _userAgent = require("../../utils/userAgent");
 var _ascii = require("../../utils/ascii");
 var _utils = require("../../utils");
 var _fileUtils = require("../../utils/fileUtils");
-var _debugLogger = require("../../common/debugLogger");
+var _debugLogger = require("../../utils/debugLogger");
 var _progress = require("../progress");
 var _timeoutSettings = require("../../common/timeoutSettings");
 var _helper = require("../helper");
@@ -68,7 +68,7 @@ class Chromium extends _browserType.BrowserType {
       'User-Agent': (0, _userAgent.getUserAgent)()
     };else if (headersMap && !Object.keys(headersMap).some(key => key.toLowerCase() === 'user-agent')) headersMap['User-Agent'] = (0, _userAgent.getUserAgent)();
     const artifactsDir = await _fs.default.promises.mkdtemp(ARTIFACTS_FOLDER);
-    const wsEndpoint = await urlToWSEndpoint(progress, endpointURL);
+    const wsEndpoint = await urlToWSEndpoint(progress, endpointURL, headersMap);
     progress.throwIfAborted();
     const chromeTransport = await _transport.WebSocketTransport.connect(progress, wsEndpoint, headersMap);
     const cleanedUp = new _manualPromise.ManualPromise();
@@ -305,12 +305,13 @@ class Chromium extends _browserType.BrowserType {
   }
 }
 exports.Chromium = Chromium;
-async function urlToWSEndpoint(progress, endpointURL) {
+async function urlToWSEndpoint(progress, endpointURL, headers) {
   if (endpointURL.startsWith('ws')) return endpointURL;
   progress.log(`<ws preparing> retrieving websocket url from ${endpointURL}`);
   const httpURL = endpointURL.endsWith('/') ? `${endpointURL}json/version/` : `${endpointURL}/json/version/`;
   const json = await (0, _network.fetchData)({
-    url: httpURL
+    url: httpURL,
+    headers
   }, async (_, resp) => new Error(`Unexpected status ${resp.statusCode} when connecting to ${httpURL}.\n` + `This does not look like a DevTools server, try connecting via ws://.`));
   return JSON.parse(json).webSocketDebuggerUrl;
 }