@checkly/playwright-core 1.47.20-alpha → 1.48.20

package/lib/server/registry/index.js

@@ -107,6 +107,8 @@ const DOWNLOAD_PATHS = {
     'mac13-arm64': 'builds/chromium/%s/chromium-mac-arm64.zip',
     'mac14': 'builds/chromium/%s/chromium-mac.zip',
     'mac14-arm64': 'builds/chromium/%s/chromium-mac-arm64.zip',
+    'mac15': 'builds/chromium/%s/chromium-mac.zip',
+    'mac15-arm64': 'builds/chromium/%s/chromium-mac-arm64.zip',
     'win64': 'builds/chromium/%s/chromium-win64.zip'
   },
   'chromium-tip-of-tree': {
@@ -134,6 +136,8 @@ const DOWNLOAD_PATHS = {
     'mac13-arm64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-mac-arm64.zip',
     'mac14': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-mac.zip',
     'mac14-arm64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-mac-arm64.zip',
+    'mac15': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-mac.zip',
+    'mac15-arm64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-mac-arm64.zip',
     'win64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-win64.zip'
   },
   'firefox': {
@@ -161,6 +165,8 @@ const DOWNLOAD_PATHS = {
     'mac13-arm64': 'builds/firefox/%s/firefox-mac-arm64.zip',
     'mac14': 'builds/firefox/%s/firefox-mac.zip',
     'mac14-arm64': 'builds/firefox/%s/firefox-mac-arm64.zip',
+    'mac15': 'builds/firefox/%s/firefox-mac.zip',
+    'mac15-arm64': 'builds/firefox/%s/firefox-mac-arm64.zip',
     'win64': 'builds/firefox/%s/firefox-win64.zip'
   },
   'firefox-beta': {
@@ -188,6 +194,8 @@ const DOWNLOAD_PATHS = {
     'mac13-arm64': 'builds/firefox-beta/%s/firefox-beta-mac-arm64.zip',
     'mac14': 'builds/firefox-beta/%s/firefox-beta-mac.zip',
     'mac14-arm64': 'builds/firefox-beta/%s/firefox-beta-mac-arm64.zip',
+    'mac15': 'builds/firefox-beta/%s/firefox-beta-mac.zip',
+    'mac15-arm64': 'builds/firefox-beta/%s/firefox-beta-mac-arm64.zip',
     'win64': 'builds/firefox-beta/%s/firefox-beta-win64.zip'
   },
   'webkit': {
@@ -215,6 +223,8 @@ const DOWNLOAD_PATHS = {
     'mac13-arm64': 'builds/webkit/%s/webkit-mac-13-arm64.zip',
     'mac14': 'builds/webkit/%s/webkit-mac-14.zip',
     'mac14-arm64': 'builds/webkit/%s/webkit-mac-14-arm64.zip',
+    'mac15': 'builds/webkit/%s/webkit-mac-15.zip',
+    'mac15-arm64': 'builds/webkit/%s/webkit-mac-15-arm64.zip',
     'win64': 'builds/webkit/%s/webkit-win64.zip'
   },
   'ffmpeg': {
@@ -242,6 +252,8 @@ const DOWNLOAD_PATHS = {
     'mac13-arm64': 'builds/ffmpeg/%s/ffmpeg-mac-arm64.zip',
     'mac14': 'builds/ffmpeg/%s/ffmpeg-mac.zip',
     'mac14-arm64': 'builds/ffmpeg/%s/ffmpeg-mac-arm64.zip',
+    'mac15': 'builds/ffmpeg/%s/ffmpeg-mac.zip',
+    'mac15-arm64': 'builds/ffmpeg/%s/ffmpeg-mac-arm64.zip',
     'win64': 'builds/ffmpeg/%s/ffmpeg-win64.zip'
   },
   'android': {
@@ -269,6 +281,8 @@ const DOWNLOAD_PATHS = {
     'mac13-arm64': 'builds/android/%s/android.zip',
     'mac14': 'builds/android/%s/android.zip',
     'mac14-arm64': 'builds/android/%s/android.zip',
+    'mac15': 'builds/android/%s/android.zip',
+    'mac15-arm64': 'builds/android/%s/android.zip',
     'win64': 'builds/android/%s/android.zip'
   },
   // TODO(bidi): implement downloads.
@@ -442,11 +456,46 @@ class Registry {
       'darwin': '/Applications/Microsoft Edge Canary.app/Contents/MacOS/Microsoft Edge Canary',
       'win32': `\\Microsoft\\Edge SxS\\Application\\msedge.exe`
     }));
-    this._executables.push(this._createBidiChannel('bidi-firefox-stable', {
-      'linux': '/usr/bin/firefox',
-      'darwin': '/Applications/Firefox.app/Contents/MacOS/firefox',
-      'win32': '\\Mozilla Firefox\\firefox.exe'
+    this._executables.push(this._createBidiFirefoxChannel('bidi-firefox-stable', {
+      'linux': '/firefox/firefox',
+      'darwin': '/Firefox.app/Contents/MacOS/firefox',
+      'win32': '\\core\\firefox.exe'
     }));
+    this._executables.push(this._createBidiFirefoxChannel('bidi-firefox-beta', {
+      'linux': '/firefox/firefox',
+      'darwin': '/Firefox.app/Contents/MacOS/firefox',
+      'win32': '\\core\\firefox.exe'
+    }));
+    this._executables.push(this._createBidiFirefoxChannel('bidi-firefox-nightly', {
+      'linux': '/firefox/firefox',
+      'darwin': '/Firefox Nightly.app/Contents/MacOS/firefox',
+      'win32': '\\firefox\\firefox.exe'
+    }));
+    this._executables.push(this._createBidiChannel('bidi-chrome-stable', {
+      'linux': '/opt/google/chrome/chrome',
+      'darwin': '/Applications/Google Chrome.app/Contents/MacOS/Google Chrome',
+      'win32': `\\Google\\Chrome\\Application\\chrome.exe`
+    }));
+    this._executables.push(this._createBidiChannel('bidi-chrome-canary', {
+      'linux': '',
+      'darwin': '/Applications/Google Chrome Canary.app/Contents/MacOS/Google Chrome Canary',
+      'win32': `\\Google\\Chrome SxS\\Application\\chrome.exe`
+    }));
+    this._executables.push({
+      type: 'browser',
+      name: 'bidi-chromium',
+      browserName: 'bidi',
+      directory: chromium.dir,
+      executablePath: () => chromiumExecutable,
+      executablePathOrDie: sdkLanguage => executablePathOrDie('chromium', chromiumExecutable, chromium.installByDefault, sdkLanguage),
+      installType: 'download-on-demand',
+      _validateHostRequirements: sdkLanguage => this._validateHostRequirements(sdkLanguage, 'chromium', chromium.dir, ['chrome-linux'], [], ['chrome-win']),
+      downloadURLs: this._downloadURLs(chromium),
+      browserVersion: chromium.browserVersion,
+      _install: () => this._downloadExecutable(chromium, chromiumExecutable),
+      _dependencyGroup: 'chromium',
+      _isHermeticInstallation: true
+    });
     const firefox = descriptors.find(d => d.name === 'firefox');
     const firefoxExecutable = findExecutablePath(firefox.dir, 'firefox');
     this._executables.push({
@@ -575,6 +624,38 @@ class Registry {
       _install: install
     };
   }
+  _createBidiFirefoxChannel(name, lookAt, install) {
+    const executablePath = (sdkLanguage, shouldThrow) => {
+      const suffix = lookAt[process.platform];
+      if (!suffix) {
+        if (shouldThrow) throw new Error(`Firefox distribution '${name}' is not supported on ${process.platform}`);
+        return undefined;
+      }
+      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 found = installedVersions.filter(e => e.includes(channelName));
+      if (found.length === 1) return _path.default.join(folder, found[0], suffix);
+      if (found.length > 1) {
+        if (shouldThrow) throw new Error(`Multiple Firefox installations found for channel '${name}': ${found.join(', ')}`);else return undefined;
+      }
+      if (shouldThrow) throw new Error(`Cannot find Firefox installation for channel '${name}' under ${folder}`);
+      return undefined;
+    };
+    return {
+      type: 'channel',
+      name,
+      browserName: 'bidi',
+      directory: undefined,
+      executablePath: sdkLanguage => executablePath(sdkLanguage, false),
+      executablePathOrDie: sdkLanguage => executablePath(sdkLanguage, true),
+      installType: 'none',
+      _validateHostRequirements: () => Promise.resolve(),
+      _isHermeticInstallation: true,
+      _install: install
+    };
+  }
   _createBidiChannel(name, lookAt, install) {
     const executablePath = (sdkLanguage, shouldThrow) => {
       const suffix = lookAt[process.platform];

package/lib/server/socksClientCertificatesInterceptor.js

@@ -14,6 +14,9 @@ var _happyEyeballs = require("../utils/happy-eyeballs");
 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 }; }
 /**
  * Copyright (c) Microsoft Corporation.
@@ -104,7 +107,11 @@ class SocksProxyConnection {
     };
   }
   async connect() {
-    this.target = await (0, _happyEyeballs.createSocket)(rewriteToLocalhostIfNeeded(this.host), this.port);
+    if (this.socksProxy.proxyAgentFromOptions) this.target = await this.socksProxy.proxyAgentFromOptions.callback(new _events.EventEmitter(), {
+      host: rewriteToLocalhostIfNeeded(this.host),
+      port: this.port,
+      secureEndpoint: false
+    });else this.target = await (0, _happyEyeballs.createSocket)(rewriteToLocalhostIfNeeded(this.host), this.port);
     this.target.once('close', this._targetCloseEventListener);
     this.target.once('error', error => this.socksProxy._socksProxy.sendSocketError({
       uid: this.uid,
@@ -231,8 +238,11 @@ class ClientCertificatesProxy {
     this.ignoreHTTPSErrors = void 0;
     this.secureContextMap = new Map();
     this.alpnCache = void 0;
+    this.proxyAgentFromOptions = void 0;
+    (0, _browserContext.verifyClientCertificates)(contextOptions.clientCertificates);
     this.alpnCache = new ALPNCache();
     this.ignoreHTTPSErrors = contextOptions.ignoreHTTPSErrors;
+    this.proxyAgentFromOptions = contextOptions.proxy ? (0, _fetch.createProxyAgent)(contextOptions.proxy) : undefined;
     this._initSecureContexts(contextOptions.clientCertificates);
     this._socksProxy = new _socksProxy.SocksProxy();
     this._socksProxy.setPattern('*');
@@ -281,7 +291,9 @@ class ClientCertificatesProxy {
   }
   async listen() {
     const port = await this._socksProxy.listen(0, '127.0.0.1');
-    return `socks5://127.0.0.1:${port}`;
+    return {
+      server: `socks5://127.0.0.1:${port}`
+    };
   }
   async close() {
     await this._socksProxy.close();
@@ -323,6 +335,6 @@ function rewriteToLocalhostIfNeeded(host) {
   return host === 'local.playwright' ? 'localhost' : host;
 }
 function rewriteOpenSSLErrorIfNeeded(error) {
-  if (error.message !== 'unsupported') return error;
+  if (error.message !== 'unsupported' && error.code !== 'ERR_CRYPTO_UNSUPPORTED_OPERATION') return error;
   return (0, _utils.rewriteErrorMessage)(error, ['Unsupported TLS certificate.', 'Most likely, the security algorithm of the given certificate was deprecated by OpenSSL.', 'For more details, see https://github.com/openssl/openssl/blob/master/README-PROVIDERS.md#the-legacy-provider', 'You could probably modernize the certificate by following the steps at https://github.com/nodejs/node/issues/40672#issuecomment-1243648223'].join('\n'));
 }

package/lib/server/trace/recorder/snapshotter.js

@@ -111,6 +111,7 @@ class Snapshotter {
         html: data.html,
         viewport: data.viewport,
         timestamp: (0, _utils.monotonicTime)(),
+        wallTime: data.wallTime,
         collectionTime: data.collectionTime,
         resourceOverrides: [],
         isMainFrame: page.mainFrame() === frame

package/lib/server/trace/recorder/snapshotterInjected.js

@@ -467,7 +467,7 @@ function frameSnapshotStreamer(snapshotStreamer, removeNoScript) {
           height: window.innerHeight
         },
         url: location.href,
-        timestamp,
+        wallTime: Date.now(),
         collectionTime: 0
       };
       for (const sheet of this._staleStyleSheets) {
@@ -485,7 +485,7 @@ function frameSnapshotStreamer(snapshotStreamer, removeNoScript) {
           contentType: 'text/css'
         });
       }
-      result.collectionTime = performance.now() - result.timestamp;
+      result.collectionTime = performance.now() - timestamp;
       return result;
     }
   }

package/lib/server/trace/recorder/tracing.js

@@ -18,6 +18,7 @@ var _harTracer = require("../../har/harTracer");
 var _snapshotter = require("./snapshotter");
 var _dispatcher = require("../../dispatchers/dispatcher");
 var _errors = require("../../errors");
+var _secretsFilter = require("../../../checkly/secretsFilter");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
  * Copyright (c) Microsoft Corporation.
@@ -58,8 +59,10 @@ class Tracing extends _instrumentation.SdkObject {
     this._allResources = new Set();
     this._contextCreatedEvent = void 0;
     this._pendingHarEntries = new Set();
+    this._secretsFilter = void 0;
     this._context = context;
     this._precreatedTracesDir = tracesDir;
+    this._secretsFilter = (0, _secretsFilter.secretsFilter)();
     this._harTracer = new _harTracer.HarTracer(context, null, this, {
       content: 'attach',
       includeTraceInfo: true,
@@ -146,7 +149,7 @@ class Tracing extends _instrumentation.SdkObject {
       wallTime: Date.now(),
       monotonicTime: (0, _utils.monotonicTime)()
     };
-    this._fs.appendFile(this._state.traceFile, JSON.stringify(event) + '\n');
+    this._appendTraceEvent(event);
     this._context.instrumentation.addListener(this, this._context);
     this._eventListeners.push(_utils.eventsHelper.addEventListener(this._context, _browserContext.BrowserContext.Events.Console, this._onConsoleMessage.bind(this)), _utils.eventsHelper.addEventListener(this._context, _browserContext.BrowserContext.Events.PageError, this._onPageError.bind(this)));
     if (this._state.options.screenshots) this._startScreencast();
@@ -331,7 +334,8 @@ class Tracing extends _instrumentation.SdkObject {
       snapshot: entry
     };
     const visited = visitTraceEvent(event, this._state.networkSha1s);
-    this._fs.appendFile(this._state.networkFile, JSON.stringify(visited) + '\n', true /* flush */);
+    const harEntryString = this._secretsFilter(JSON.stringify(visited) + '\n');
+    this._fs.appendFile(this._state.networkFile, harEntryString, true /* flush */);
   }
   flushHarEntries() {
     const harLines = [];
@@ -344,7 +348,10 @@ class Tracing extends _instrumentation.SdkObject {
       harLines.push(JSON.stringify(visited));
     }
     this._pendingHarEntries.clear();
-    if (harLines.length) this._fs.appendFile(this._state.networkFile, harLines.join('\n') + '\n', true /* flush */);
+    if (harLines.length) {
+      const harString = this._secretsFilter(harLines.join('\n') + '\n');
+      this._fs.appendFile(this._state.networkFile, harString, true /* flush */);
+    }
   }
   onContentBlob(sha1, buffer) {
     this._appendResource(sha1, buffer);
@@ -374,6 +381,61 @@ class Tracing extends _instrumentation.SdkObject {
     };
     this._appendTraceEvent(event);
   }
+  onDialog(dialog) {
+    const event = {
+      type: 'event',
+      time: (0, _utils.monotonicTime)(),
+      class: 'BrowserContext',
+      method: 'dialog',
+      params: {
+        pageId: dialog.page().guid,
+        type: dialog.type(),
+        message: dialog.message(),
+        defaultValue: dialog.defaultValue()
+      }
+    };
+    this._appendTraceEvent(event);
+  }
+  onDownload(page, download) {
+    const event = {
+      type: 'event',
+      time: (0, _utils.monotonicTime)(),
+      class: 'BrowserContext',
+      method: 'download',
+      params: {
+        pageId: page.guid,
+        url: download.url,
+        suggestedFilename: download.suggestedFilename()
+      }
+    };
+    this._appendTraceEvent(event);
+  }
+  onPageOpen(page) {
+    var _page$opener;
+    const event = {
+      type: 'event',
+      time: (0, _utils.monotonicTime)(),
+      class: 'BrowserContext',
+      method: 'page',
+      params: {
+        pageId: page.guid,
+        openerPageId: (_page$opener = page.opener()) === null || _page$opener === void 0 ? void 0 : _page$opener.guid
+      }
+    };
+    this._appendTraceEvent(event);
+  }
+  onPageClose(page) {
+    const event = {
+      type: 'event',
+      time: (0, _utils.monotonicTime)(),
+      class: 'BrowserContext',
+      method: 'pageClosed',
+      params: {
+        pageId: page.guid
+      }
+    };
+    this._appendTraceEvent(event);
+  }
   _onPageError(error, page) {
     const event = {
       type: 'event',
@@ -399,7 +461,8 @@ class Tracing extends _instrumentation.SdkObject {
         sha1,
         width: params.width,
         height: params.height,
-        timestamp: (0, _utils.monotonicTime)()
+        timestamp: (0, _utils.monotonicTime)(),
+        frameSwapWallTime: params.frameSwapWallTime
       };
       // Make sure to write the screencast frame before adding a reference to it.
       this._appendResource(sha1, params.buffer);
@@ -410,7 +473,9 @@ class Tracing extends _instrumentation.SdkObject {
     const visited = visitTraceEvent(event, this._state.traceSha1s);
     // Do not flush (console) events, they are too noisy, unless we are in ui mode (live).
     const flush = this._state.options.live || event.type !== 'event' && event.type !== 'console' && event.type !== 'log';
-    this._fs.appendFile(this._state.traceFile, JSON.stringify(visited) + '\n', flush);
+    const json = JSON.stringify(visited) + '\n';
+    const filtered = this._secretsFilter(json);
+    this._fs.appendFile(this._state.traceFile, filtered, flush);
   }
   _appendResource(sha1, buffer) {
     if (this._allResources.has(sha1)) return;

package/lib/server/trace/test/inMemorySnapshotter.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.InMemorySnapshotter = void 0;
-var _snapshotStorage = require("../../../../../trace-viewer/src/snapshotStorage");
+var _snapshotStorage = require("../../../../../trace-viewer/src/sw/snapshotStorage");
 var _snapshotter = require("../recorder/snapshotter");
 var _harTracer = require("../../har/harTracer");
 var _utils = require("../../../utils");

package/lib/server/trace/viewer/traceViewer.js

@@ -84,6 +84,7 @@ async function startTraceViewerServer(options) {
 }
 async function installRootRedirect(server, traceUrls, options) {
   const params = new URLSearchParams();
+  if (_path.default.sep !== _path.default.posix.sep) params.set('pathSeparator', _path.default.sep);
   for (const traceUrl of traceUrls) params.append('trace', traceUrl);
   if (server.wsGuid()) params.append('ws', server.wsGuid());
   if (options !== null && options !== void 0 && options.isServer) params.append('isServer', '');
@@ -92,11 +93,6 @@ async function installRootRedirect(server, traceUrls, options) {
   if (options.grep) params.append('grep', options.grep);
   if (options.grepInvert) params.append('grepInvert', options.grepInvert);
   for (const project of options.project || []) params.append('project', project);
-  if (options.workers) params.append('workers', String(options.workers));
-  if (options.timeout) params.append('timeout', String(options.timeout));
-  if (options.headed) params.append('headed', '');
-  if (options.outputDir) params.append('outputDir', options.outputDir);
-  if (options.updateSnapshots) params.append('updateSnapshots', options.updateSnapshots);
   for (const reporter of options.reporter || []) params.append('reporter', reporter);
   const urlPath = `./trace/${options.webApp || 'index.html'}?${params.toString()}`;
   server.routePath('/', (_, response) => {
@@ -172,6 +168,7 @@ class StdinServer {
     });
     process.stdin.on('close', () => (0, _utils.gracefullyProcessExitDoNotHang)(0));
   }
+  onconnect() {}
   async dispatch(method, params) {
     if (method === 'initialize') {
       if (this._traceUrl) this._loadTrace(this._traceUrl);

package/lib/server/webkit/webkit.js

@@ -55,7 +55,6 @@ class WebKit extends _browserType.BrowserType {
   defaultArgs(options, isPersistent, userDataDir) {
     const {
       args = [],
-      proxy,
       headless
     } = options;
     const userDataDirArg = args.find(arg => arg.startsWith('--user-data-dir'));
@@ -65,6 +64,7 @@ class WebKit extends _browserType.BrowserType {
     if (process.platform === 'win32') webkitArguments.push('--disable-accelerated-compositing');
     if (headless) webkitArguments.push('--headless');
     if (isPersistent) webkitArguments.push(`--user-data-dir=${userDataDir}`);else webkitArguments.push(`--no-startup-window`);
+    const proxy = options.proxyOverride || options.proxy;
     if (proxy) {
       if (process.platform === 'darwin') {
         webkitArguments.push(`--proxy=${proxy.server}`);

package/lib/server/webkit/wkBrowser.js

@@ -72,11 +72,12 @@ class WKBrowser extends _browser.Browser {
     this._didClose();
   }
   async doCreateNewContext(options) {
-    const createOptions = options.proxy ? {
-      // Enable socks5 hostname resolution on Windows. Workaround can be removed once fixed upstream.
+    const proxy = options.proxyOverride || options.proxy;
+    const createOptions = proxy ? {
+      // Enable socks5 hostname resolution on Windows.
       // See https://github.com/microsoft/playwright/issues/20451
-      proxyServer: process.platform === 'win32' ? options.proxy.server.replace(/^socks5:\/\//, 'socks5h://') : options.proxy.server,
-      proxyBypassList: options.proxy.bypass
+      proxyServer: process.platform === 'win32' ? proxy.server.replace(/^socks5:\/\//, 'socks5h://') : proxy.server,
+      proxyBypassList: proxy.bypass
     } : undefined;
     const {
       browserContextId
@@ -192,7 +193,7 @@ class WKBrowserContext extends _browserContext.BrowserContext {
       downloadPath: this._browser.options.downloadsPath,
       browserContextId
     }));
-    if (this._options.ignoreHTTPSErrors) promises.push(this._browser._browserSession.send('Playwright.setIgnoreCertificateErrors', {
+    if (this._options.ignoreHTTPSErrors || this._options.internalIgnoreHTTPSErrors) promises.push(this._browser._browserSession.send('Playwright.setIgnoreCertificateErrors', {
       browserContextId,
       ignore: true
     }));

package/lib/server/webkit/wkExecutionContext.js

@@ -116,9 +116,6 @@ class WKExecutionContext {
       objectId
     });
   }
-  objectCount(objectId) {
-    throw new Error('Method not implemented in WebKit.');
-  }
 }
 exports.WKExecutionContext = WKExecutionContext;
 function potentiallyUnserializableValue(remoteObject) {

package/lib/server/webkit/wkPage.js

@@ -746,6 +746,9 @@ class WKPage {
       throw error;
     });
   }
+  async requestGC() {
+    await this._session.send('Heap.gc');
+  }
   async addInitScript(initScript) {
     await this._updateBootstrapScript();
   }
@@ -1070,7 +1073,7 @@ class WKPage {
     this._requestIdToResponseReceivedPayloadEvent.set(event.requestId, event);
     const response = request.createResponse(event.response);
     this._page._frameManager.requestReceivedResponse(response);
-    if (response.status() === 204) {
+    if (response.status() === 204 && request.request.isNavigationRequest()) {
       this._onLoadingFailed(session, {
         requestId: event.requestId,
         errorText: 'Aborted: 204 No Content',

package/lib/utils/happy-eyeballs.js

@@ -7,6 +7,7 @@ exports.createConnectionAsync = createConnectionAsync;
 exports.createSocket = createSocket;
 exports.createTLSSocket = createTLSSocket;
 exports.httpsHappyEyeballsAgent = exports.httpHappyEyeballsTimings = exports.httpHappyEyeballsAgent = void 0;
+exports.timingForSocket = timingForSocket;
 var dns = _interopRequireWildcard(require("dns"));
 var http = _interopRequireWildcard(require("http"));
 var https = _interopRequireWildcard(require("https"));
@@ -14,6 +15,7 @@ var net = _interopRequireWildcard(require("net"));
 var tls = _interopRequireWildcard(require("tls"));
 var _manualPromise = require("./manualPromise");
 var _debug = require("./debug");
+var _time = require("./time");
 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; }
 /**
@@ -46,6 +48,8 @@ const timings = {
   },
   agent: false
 };
+const kDNSLookupAt = Symbol('kDNSLookupAt');
+const kTCPConnectionAt = Symbol('kTCPConnectionAt');
 class HttpHappyEyeballsAgent extends http.Agent {
   createConnection(options, oncreate) {
     // There is no ambiguity in case of IP address.
@@ -113,6 +117,7 @@ async function createConnectionAsync(options, oncreate, useTLS) {
   const lookup = options.__testHookLookup || lookupAddresses;
   const hostname = clientRequestArgsToHostName(options);
   const addresses = await lookup(hostname);
+  const dnsLookupAt = (0, _time.monotonicTime)();
   const sockets = new Set();
   let firstError;
   let errorCount = 0;
@@ -139,10 +144,12 @@ async function createConnectionAsync(options, oncreate, useTLS) {
     });
     // Socket created
     timings.values.socket = performance.now() - timings.values.startTimeNow;
+    socket[kDNSLookupAt] = dnsLookupAt;
 
     // Each socket may fire only one of 'connect', 'timeout' or 'error' events.
     // None of these events are fired after socket.destroy() is called.
     socket.on('connect', () => {
+      socket[kTCPConnectionAt] = (0, _time.monotonicTime)();
       timings.values.connect = performance.now() - timings.values.startTimeNow;
       connected.resolve();
       oncreate === null || oncreate === void 0 || oncreate(null, socket);
@@ -194,4 +201,10 @@ function clientRequestArgsToHostName(options) {
   if (options.hostname) return options.hostname;
   if (options.host) return options.host;
   throw new Error('Either options.hostname or options.host must be provided');
+}
+function timingForSocket(socket) {
+  return {
+    dnsLookupAt: socket[kDNSLookupAt],
+    tcpConnectionAt: socket[kTCPConnectionAt]
+  };
 }

package/lib/utils/hostPlatform.js

@@ -37,9 +37,9 @@ function calculatePlatform() {
       macVersion = 'mac10.15';
     } else {
       // ver[0] >= 20
-      const LAST_STABLE_MAC_MAJOR_VERSION = 14;
+      const LAST_STABLE_MACOS_MAJOR_VERSION = 15;
       // Best-effort support for MacOS beta versions.
-      macVersion = 'mac' + Math.min(ver[0] - 9, LAST_STABLE_MAC_MAJOR_VERSION);
+      macVersion = 'mac' + Math.min(ver[0] - 9, LAST_STABLE_MACOS_MAJOR_VERSION);
       // BigSur is the first version that might run on Apple Silicon.
       if (_os.default.cpus().some(cpu => cpu.model.includes('Apple'))) macVersion += '-arm64';
     }

package/lib/utils/httpServer.js

@@ -76,6 +76,7 @@ class HttpServer {
       path: '/' + this._wsGuid
     });
     wss.on('connection', ws => {
+      transport.onconnect();
       transport.sendEvent = (method, params) => ws.send(JSON.stringify({
         method,
         params

package/lib/utils/isomorphic/locatorGenerators.js

@@ -37,15 +37,6 @@ function asLocators(lang, selector, isFrameLocator = false, maxOutputSize = 20,
 }
 function innerAsLocators(factory, parsed, isFrameLocator = false, maxOutputSize = 20) {
   const parts = [...parsed.parts];
-  // frameLocator('iframe').first is actually "iframe >> nth=0 >> internal:control=enter-frame"
-  // To make it easier to parse, we turn it into "iframe >> internal:control=enter-frame >> nth=0"
-  for (let index = 0; index < parts.length - 1; index++) {
-    if (parts[index].name === 'nth' && parts[index + 1].name === 'internal:control' && parts[index + 1].body === 'enter-frame') {
-      // Swap nth and enter-frame.
-      const [nth] = parts.splice(index, 1);
-      parts.splice(index + 1, 0, nth);
-    }
-  }
   const tokens = [];
   let nextBase = isFrameLocator ? 'frame-locator' : 'page';
   for (let index = 0; index < parts.length; index++) {
@@ -183,13 +174,13 @@ function innerAsLocators(factory, parsed, isFrameLocator = false, maxOutputSize
         continue;
       }
     }
-    let locatorType = 'default';
-    const nextPart = parts[index + 1];
-    if (nextPart && nextPart.name === 'internal:control' && nextPart.body === 'enter-frame') {
-      locatorType = 'frame';
+    if (part.name === 'internal:control' && part.body === 'enter-frame') {
+      tokens.push([factory.generateLocator(base, 'frame', '')]);
       nextBase = 'frame-locator';
-      index++;
+      continue;
     }
+    let locatorType = 'default';
+    const nextPart = parts[index + 1];
     const selectorPart = (0, _selectorParser.stringifySelector)({
       parts: [part]
     });
@@ -277,7 +268,7 @@ class JavaScriptLocatorFactory {
         if (options.hasNotText !== undefined) return `locator(${this.quote(body)}, { hasNotText: ${this.toHasText(options.hasNotText)} })`;
         return `locator(${this.quote(body)})`;
       case 'frame':
-        return `frameLocator(${this.quote(body)})`;
+        return `contentFrame()`;
       case 'nth':
         return `nth(${body})`;
       case 'first':
@@ -360,7 +351,7 @@ class PythonLocatorFactory {
         if (options.hasNotText !== undefined) return `locator(${this.quote(body)}, has_not_text=${this.toHasText(options.hasNotText)})`;
         return `locator(${this.quote(body)})`;
       case 'frame':
-        return `frame_locator(${this.quote(body)})`;
+        return `content_frame`;
       case 'nth':
         return `nth(${body})`;
       case 'first':
@@ -460,7 +451,7 @@ class JavaLocatorFactory {
         if (options.hasNotText !== undefined) return `locator(${this.quote(body)}, new ${clazz}.LocatorOptions().setHasNotText(${this.toHasText(options.hasNotText)}))`;
         return `locator(${this.quote(body)})`;
       case 'frame':
-        return `frameLocator(${this.quote(body)})`;
+        return `contentFrame()`;
       case 'nth':
         return `nth(${body})`;
       case 'first':
@@ -544,7 +535,7 @@ class CSharpLocatorFactory {
         if (options.hasNotText !== undefined) return `Locator(${this.quote(body)}, new() { ${this.toHasNotText(options.hasNotText)} })`;
         return `Locator(${this.quote(body)})`;
       case 'frame':
-        return `FrameLocator(${this.quote(body)})`;
+        return `ContentFrame`;
       case 'nth':
         return `Nth(${body})`;
       case 'first':

package/lib/utils/isomorphic/locatorParser.js

@@ -63,7 +63,7 @@ function parseLocator(locator, testIdAttributeName) {
   }
 
   // Equalize languages.
-  template = template.toLowerCase().replace(/get_by_alt_text/g, 'getbyalttext').replace(/get_by_test_id/g, 'getbytestid').replace(/get_by_([\w]+)/g, 'getby$1').replace(/has_not_text/g, 'hasnottext').replace(/has_text/g, 'hastext').replace(/has_not/g, 'hasnot').replace(/frame_locator/g, 'framelocator').replace(/[{}\s]/g, '').replace(/new\(\)/g, '').replace(/new[\w]+\.[\w]+options\(\)/g, '').replace(/\.set/g, ',set').replace(/\.or_\(/g, 'or(') // Python has "or_" instead of "or".
+  template = template.toLowerCase().replace(/get_by_alt_text/g, 'getbyalttext').replace(/get_by_test_id/g, 'getbytestid').replace(/get_by_([\w]+)/g, 'getby$1').replace(/has_not_text/g, 'hasnottext').replace(/has_text/g, 'hastext').replace(/has_not/g, 'hasnot').replace(/frame_locator/g, 'framelocator').replace(/content_frame/g, 'contentframe').replace(/[{}\s]/g, '').replace(/new\(\)/g, '').replace(/new[\w]+\.[\w]+options\(\)/g, '').replace(/\.set/g, ',set').replace(/\.or_\(/g, 'or(') // Python has "or_" instead of "or".
   .replace(/\.and_\(/g, 'and(') // Python has "and_" instead of "and".
   .replace(/:/g, '=').replace(/,re\.ignorecase/g, 'i').replace(/,pattern.case_insensitive/g, 'i').replace(/,regexoptions.ignorecase/g, 'i').replace(/re.compile\(([^)]+)\)/g, '$1') // Python has regex strings as r"foo"
   .replace(/pattern.compile\(([^)]+)\)/g, 'r$1').replace(/newregex\(([^)]+)\)/g, 'r$1').replace(/string=/g, '=').replace(/regex=/g, '=').replace(/,,/g, ',');
@@ -123,7 +123,7 @@ function transform(template, params, testIdAttributeName) {
   }
 
   // Transform to selector engines.
-  template = template.replace(/\,set([\w]+)\(([^)]+)\)/g, (_, group1, group2) => ',' + group1.toLowerCase() + '=' + group2.toLowerCase()).replace(/framelocator\(([^)]+)\)/g, '$1.internal:control=enter-frame').replace(/locator\(([^)]+),hastext=([^),]+)\)/g, 'locator($1).internal:has-text=$2').replace(/locator\(([^)]+),hasnottext=([^),]+)\)/g, 'locator($1).internal:has-not-text=$2').replace(/locator\(([^)]+),hastext=([^),]+)\)/g, 'locator($1).internal:has-text=$2').replace(/locator\(([^)]+)\)/g, '$1').replace(/getbyrole\(([^)]+)\)/g, 'internal:role=$1').replace(/getbytext\(([^)]+)\)/g, 'internal:text=$1').replace(/getbylabel\(([^)]+)\)/g, 'internal:label=$1').replace(/getbytestid\(([^)]+)\)/g, `internal:testid=[${testIdAttributeName}=$1]`).replace(/getby(placeholder|alt|title)(?:text)?\(([^)]+)\)/g, 'internal:attr=[$1=$2]').replace(/first(\(\))?/g, 'nth=0').replace(/last(\(\))?/g, 'nth=-1').replace(/nth\(([^)]+)\)/g, 'nth=$1').replace(/filter\(,?hastext=([^)]+)\)/g, 'internal:has-text=$1').replace(/filter\(,?hasnottext=([^)]+)\)/g, 'internal:has-not-text=$1').replace(/filter\(,?has2=([^)]+)\)/g, 'internal:has=$1').replace(/filter\(,?hasnot2=([^)]+)\)/g, 'internal:has-not=$1').replace(/,exact=false/g, '').replace(/,exact=true/g, 's').replace(/\,/g, '][');
+  template = template.replace(/\,set([\w]+)\(([^)]+)\)/g, (_, group1, group2) => ',' + group1.toLowerCase() + '=' + group2.toLowerCase()).replace(/framelocator\(([^)]+)\)/g, '$1.internal:control=enter-frame').replace(/contentframe(\(\))?/g, 'internal:control=enter-frame').replace(/locator\(([^)]+),hastext=([^),]+)\)/g, 'locator($1).internal:has-text=$2').replace(/locator\(([^)]+),hasnottext=([^),]+)\)/g, 'locator($1).internal:has-not-text=$2').replace(/locator\(([^)]+),hastext=([^),]+)\)/g, 'locator($1).internal:has-text=$2').replace(/locator\(([^)]+)\)/g, '$1').replace(/getbyrole\(([^)]+)\)/g, 'internal:role=$1').replace(/getbytext\(([^)]+)\)/g, 'internal:text=$1').replace(/getbylabel\(([^)]+)\)/g, 'internal:label=$1').replace(/getbytestid\(([^)]+)\)/g, `internal:testid=[${testIdAttributeName}=$1]`).replace(/getby(placeholder|alt|title)(?:text)?\(([^)]+)\)/g, 'internal:attr=[$1=$2]').replace(/first(\(\))?/g, 'nth=0').replace(/last(\(\))?/g, 'nth=-1').replace(/nth\(([^)]+)\)/g, 'nth=$1').replace(/filter\(,?hastext=([^)]+)\)/g, 'internal:has-text=$1').replace(/filter\(,?hasnottext=([^)]+)\)/g, 'internal:has-not-text=$1').replace(/filter\(,?has2=([^)]+)\)/g, 'internal:has=$1').replace(/filter\(,?hasnot2=([^)]+)\)/g, 'internal:has-not=$1').replace(/,exact=false/g, '').replace(/,exact=true/g, 's').replace(/\,/g, '][');
   const parts = template.split('.');
   // Turn "internal:control=enter-frame >> nth=0" into "nth=0 >> internal:control=enter-frame"
   // because these are swapped in locators vs selectors.