@checkly/playwright-core 1.41.23 → 1.41.26

package/lib/protocol/validator.js

@@ -429,6 +429,13 @@ _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'])
@@ -812,6 +819,7 @@ _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'])),
@@ -819,8 +827,7 @@ _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)({
@@ -1023,9 +1030,6 @@ _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'])
 });
@@ -1081,16 +1085,6 @@ _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'))
@@ -1106,22 +1100,26 @@ _validatorPrimitives.scheme.PageExpectScreenshotParams = (0, _validatorPrimitive
     frame: (0, _validatorPrimitives.tChannel)(['Frame']),
     selector: _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)
+  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)
+  }))
 });
 _validatorPrimitives.scheme.PageExpectScreenshotResult = (0, _validatorPrimitives.tObject)({
   diff: (0, _validatorPrimitives.tOptional)(_validatorPrimitives.tBinary),
@@ -2301,16 +2299,6 @@ _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'])
 });
@@ -2333,11 +2321,6 @@ _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("../utils/debugLogger");
+var _debugLogger = require("../common/debugLogger");
 /**
  * Copyright (c) Microsoft Corporation.
  *

package/lib/remote/playwrightServer.js

@@ -3,13 +3,14 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.PlaywrightServer = void 0;
+exports.Semaphore = exports.PlaywrightServer = void 0;
+var _utilsBundle = require("../utilsBundle");
 var _playwright = require("../server/playwright");
 var _playwrightConnection = require("./playwrightConnection");
-var _semaphore = require("../utils/semaphore");
-var _debugLogger = require("../utils/debugLogger");
+var _manualPromise = require("../utils/manualPromise");
+var _debugLogger = require("../common/debugLogger");
 var _utils = require("../utils");
-var _wsServer = require("../utils/wsServer");
+var _transport = require("../server/transport");
 /**
  * Copyright (c) Microsoft Corporation.
  *
@@ -26,85 +27,178 @@ var _wsServer = require("../utils/wsServer");
  * limitations under the License.
  */
 
+let lastConnectionId = 0;
+const kConnectionSymbol = Symbol('kConnection');
 class PlaywrightServer {
   constructor(options) {
     this._preLaunchedPlaywright = void 0;
-    this._options = void 0;
     this._wsServer = void 0;
+    this._server = void 0;
+    this._options = void 0;
     this._options = options;
     if (options.preLaunchedBrowser) this._preLaunchedPlaywright = options.preLaunchedBrowser.attribution.playwright;
     if (options.preLaunchedAndroidDevice) this._preLaunchedPlaywright = options.preLaunchedAndroidDevice._android.attribution.playwright;
-    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;
+  }
+  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;
         }
-        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 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 || _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);
+      });
     });
-  }
-  async listen(port = 0, hostname) {
-    return this._wsServer.listen(port, hostname, this._options.path);
+    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}`);
+
+      // 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;
+      }
+      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() {
-    await this._wsServer.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();
+  }
+  _flush() {
+    while (this._acquired < this._max && this._queue.length) {
+      ++this._acquired;
+      this._queue.shift().resolve();
+    }
   }
 }
-exports.PlaywrightServer = PlaywrightServer;
+exports.Semaphore = Semaphore;

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("../../utils/debugLogger");
+var _debugLogger = require("../../common/debugLogger");
 var _processLauncher = require("../../utils/processLauncher");
 var _timeoutSettings = require("../../common/timeoutSettings");
 var _instrumentation = require("../instrumentation");

package/lib/server/browserType.js

@@ -17,7 +17,7 @@ var _timeoutSettings = require("../common/timeoutSettings");
 var _utils = require("../utils");
 var _fileUtils = require("../utils/fileUtils");
 var _helper = require("./helper");
-var _debugLogger = require("../utils/debugLogger");
+var _debugLogger = require("../common/debugLogger");
 var _instrumentation = require("./instrumentation");
 var _manualPromise = require("../utils/manualPromise");
 var _protocolError = require("./protocolError");
@@ -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 _registry.registry.validateHostRequirementsForExecutablesIfNeeded([registryExecutable], this.attribution.playwright.options.sdkLanguage);
+      await registryExecutable.validateHostRequirements(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;

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("../../utils/debugLogger");
+var _debugLogger = require("../../common/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, headersMap);
+    const wsEndpoint = await urlToWSEndpoint(progress, endpointURL);
     progress.throwIfAborted();
     const chromeTransport = await _transport.WebSocketTransport.connect(progress, wsEndpoint, headersMap);
     const cleanedUp = new _manualPromise.ManualPromise();
@@ -305,13 +305,12 @@ class Chromium extends _browserType.BrowserType {
   }
 }
 exports.Chromium = Chromium;
-async function urlToWSEndpoint(progress, endpointURL, headers) {
+async function urlToWSEndpoint(progress, endpointURL) {
   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,
-    headers
+    url: httpURL
   }, 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;
 }

package/lib/server/chromium/crConnection.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 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 _debugLogger = require("../../common/debugLogger");
 var _helper = require("../helper");
 var _protocolError = require("../protocolError");
 /**

package/lib/server/chromium/crPage.js

@@ -970,8 +970,7 @@ class FrameSession {
     const options = this._crPage._browserContext._options;
     await this._client.send('Emulation.setUserAgentOverride', {
       userAgent: options.userAgent || '',
-      acceptLanguage: options.locale,
-      userAgentMetadata: calculateUserAgentMetadata(options)
+      acceptLanguage: options.locale
     });
   }
   async _setDefaultFontFamilies(session) {
@@ -1128,46 +1127,4 @@ async function emulateTimezone(session, timezoneId) {
     throw exception;
   }
 }
-const contextDelegateSymbol = Symbol('delegate');
-
-// Chromium reference: https://source.chromium.org/chromium/chromium/src/+/main:components/embedder_support/user_agent_utils.cc;l=434;drc=70a6711e08e9f9e0d8e4c48e9ba5cab62eb010c2
-function calculateUserAgentMetadata(options) {
-  const ua = options.userAgent;
-  if (!ua) return undefined;
-  const metadata = {
-    mobile: !!options.isMobile,
-    model: '',
-    architecture: 'x64',
-    platform: 'Windows',
-    platformVersion: ''
-  };
-  const androidMatch = ua.match(/Android (\d+(\.\d+)?(\.\d+)?)/);
-  const iPhoneMatch = ua.match(/iPhone OS (\d+(_\d+)?)/);
-  const iPadMatch = ua.match(/iPad; CPU OS (\d+(_\d+)?)/);
-  const macOSMatch = ua.match(/Mac OS X (\d+(_\d+)?(_\d+)?)/);
-  const windowsMatch = ua.match(/Windows\D+(\d+(\.\d+)?(\.\d+)?)/);
-  if (androidMatch) {
-    metadata.platform = 'Android';
-    metadata.platformVersion = androidMatch[1];
-    metadata.architecture = 'arm';
-  } else if (iPhoneMatch) {
-    metadata.platform = 'iOS';
-    metadata.platformVersion = iPhoneMatch[1];
-    metadata.architecture = 'arm';
-  } else if (iPadMatch) {
-    metadata.platform = 'iOS';
-    metadata.platformVersion = iPadMatch[1];
-    metadata.architecture = 'arm';
-  } else if (macOSMatch) {
-    metadata.platform = 'macOS';
-    metadata.platformVersion = macOSMatch[1];
-    if (!ua.includes('Intel')) metadata.architecture = 'arm';
-  } else if (windowsMatch) {
-    metadata.platform = 'Windows';
-    metadata.platformVersion = windowsMatch[1];
-  } else if (ua.toLowerCase().includes('linux')) {
-    metadata.platform = 'Linux';
-  }
-  if (ua.includes('ARM')) metadata.architecture = 'arm';
-  return metadata;
-}
+const contextDelegateSymbol = Symbol('delegate');

package/lib/server/console.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ConsoleMessage = void 0;
+var _instrumentation = require("./instrumentation");
 /**
  * Copyright (c) Microsoft Corporation.
  *
@@ -20,8 +21,9 @@ exports.ConsoleMessage = void 0;
  * limitations under the License.
  */
 
-class ConsoleMessage {
+class ConsoleMessage extends _instrumentation.SdkObject {
   constructor(page, type, text, args, location) {
+    super(page, 'console-message');
     this._type = void 0;
     this._text = void 0;
     this._args = void 0;

package/lib/server/debugController.js

@@ -160,6 +160,8 @@ class DebugController extends _instrumentation.SdkObject {
         pageCount += context.pages().length;
       }
     }
+    // TODO: browsers is deprecated, remove it.
+    this.emit(DebugController.Events.BrowsersChanged, browsers);
     this.emit(DebugController.Events.StateChanged, {
       pageCount
     });
@@ -187,6 +189,7 @@ class DebugController extends _instrumentation.SdkObject {
 }
 exports.DebugController = DebugController;
 DebugController.Events = {
+  BrowsersChanged: 'browsersChanged',
   StateChanged: 'stateChanged',
   InspectRequested: 'inspectRequested',
   SourceChanged: 'sourceChanged',