rebrowser-playwright-core 1.47.2 → 1.48.2

package/lib/server/recorder.js

@@ -12,6 +12,7 @@ var _browserContext = require("./browserContext");
 var _debugger = require("./debugger");
 var _contextRecorder = require("./recorder/contextRecorder");
 var _recorderUtils = require("./recorder/recorderUtils");
+var _recorderUtils2 = require("../utils/isomorphic/recorderUtils");
 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; }
 /**
@@ -32,26 +33,29 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
 
 const recorderSymbol = Symbol('recorderSymbol');
 class Recorder {
-  static showInspector(context, recorderAppFactory) {
-    const params = {};
+  static async showInspector(context, params, recorderAppFactory) {
     if ((0, _utils.isUnderTest)()) params.language = process.env.TEST_INSPECTOR_LANGUAGE;
-    Recorder.show(context, recorderAppFactory, params).catch(() => {});
+    return await Recorder.show('actions', context, recorderAppFactory, params);
   }
-  static show(context, recorderAppFactory, params = {}) {
+  static showInspectorNoReply(context, recorderAppFactory) {
+    Recorder.showInspector(context, {}, recorderAppFactory).catch(() => {});
+  }
+  static show(codegenMode, context, recorderAppFactory, params) {
     let recorderPromise = context[recorderSymbol];
     if (!recorderPromise) {
-      recorderPromise = Recorder._create(context, recorderAppFactory, params);
+      recorderPromise = Recorder._create(codegenMode, context, recorderAppFactory, params);
       context[recorderSymbol] = recorderPromise;
     }
     return recorderPromise;
   }
-  static async _create(context, recorderAppFactory, params = {}) {
-    const recorder = new Recorder(context, params);
+  static async _create(codegenMode, context, recorderAppFactory, params = {}) {
+    const recorder = new Recorder(codegenMode, context, params);
     const recorderApp = await recorderAppFactory(recorder);
     await recorder._install(recorderApp);
     return recorder;
   }
-  constructor(context, params) {
+  constructor(codegenMode, context, params) {
+    this.handleSIGINT = void 0;
     this._context = void 0;
     this._mode = void 0;
     this._highlightedSelector = '';
@@ -67,7 +71,8 @@ class Recorder {
     this._omitCallTracking = false;
     this._currentLanguage = void 0;
     this._mode = params.mode || 'none';
-    this._contextRecorder = new _contextRecorder.ContextRecorder(context, params, {});
+    this.handleSIGINT = params.handleSIGINT;
+    this._contextRecorder = new _contextRecorder.ContextRecorder(codegenMode, context, params, {});
     this._context = context;
     this._omitCallTracking = !!params.omitCallTracking;
     this._debugger = context.debugger();
@@ -123,10 +128,10 @@ class Recorder {
       (_this$_recorderApp = this._recorderApp) === null || _this$_recorderApp === void 0 || _this$_recorderApp.close().catch(() => {});
     });
     this._contextRecorder.on(_contextRecorder.ContextRecorder.Events.Change, data => {
-      var _this$_recorderApp2;
       this._recorderSources = data.sources;
+      recorderApp.setActions(data.actions, data.sources);
+      recorderApp.setRunningFile(undefined);
       this._pushAllSources();
-      (_this$_recorderApp2 = this._recorderApp) === null || _this$_recorderApp2 === void 0 || _this$_recorderApp2.setFileIfNeeded(data.primaryFileName);
     });
     await this._context.exposeBinding('__pw_recorderState', false, source => {
       let actionSelector = '';
@@ -154,9 +159,9 @@ class Recorder {
     await this._context.exposeBinding('__pw_recorderSetSelector', false, async ({
       frame
     }, selector) => {
-      var _this$_recorderApp3;
+      var _this$_recorderApp2;
       const selectorChain = await (0, _contextRecorder.generateFrameSelector)(frame);
-      await ((_this$_recorderApp3 = this._recorderApp) === null || _this$_recorderApp3 === void 0 ? void 0 : _this$_recorderApp3.setSelector((0, _recorderUtils.buildFullSelector)(selectorChain, selector), true));
+      await ((_this$_recorderApp2 = this._recorderApp) === null || _this$_recorderApp2 === void 0 ? void 0 : _this$_recorderApp2.setSelector((0, _recorderUtils2.buildFullSelector)(selectorChain, selector), true));
     });
     await this._context.exposeBinding('__pw_recorderSetMode', false, async ({
       frame
@@ -180,7 +185,7 @@ class Recorder {
     this._context.recorderAppForTest = this._recorderApp;
   }
   _pausedStateChanged() {
-    var _this$_recorderApp4;
+    var _this$_recorderApp3;
     // If we are called upon page.pause, we don't have metadatas, populate them.
     for (const {
       metadata,
@@ -188,16 +193,16 @@ class Recorder {
     } of this._debugger.pausedDetails()) {
       if (!this._currentCallsMetadata.has(metadata)) this.onBeforeCall(sdkObject, metadata);
     }
-    (_this$_recorderApp4 = this._recorderApp) === null || _this$_recorderApp4 === void 0 || _this$_recorderApp4.setPaused(this._debugger.isPaused());
+    (_this$_recorderApp3 = this._recorderApp) === null || _this$_recorderApp3 === void 0 || _this$_recorderApp3.setPaused(this._debugger.isPaused());
     this._updateUserSources();
     this.updateCallLog([...this._currentCallsMetadata.keys()]);
   }
   setMode(mode) {
-    var _this$_recorderApp5;
+    var _this$_recorderApp4;
     if (this._mode === mode) return;
     this._highlightedSelector = '';
     this._mode = mode;
-    (_this$_recorderApp5 = this._recorderApp) === null || _this$_recorderApp5 === void 0 || _this$_recorderApp5.setMode(this._mode);
+    (_this$_recorderApp4 = this._recorderApp) === null || _this$_recorderApp4 === void 0 || _this$_recorderApp4.setMode(this._mode);
     this._contextRecorder.setEnabled(this._mode === 'recording' || this._mode === 'assertingText' || this._mode === 'assertingVisibility' || this._mode === 'assertingValue');
     this._debugger.setMuted(this._mode === 'recording' || this._mode === 'assertingText' || this._mode === 'assertingVisibility' || this._mode === 'assertingValue');
     if (this._mode !== 'none' && this._mode !== 'standby' && this._context.pages().length === 1) this._context.pages()[0].bringToFront().catch(() => {});
@@ -231,9 +236,9 @@ class Recorder {
     if (isScreenshotCommand(metadata)) {
       this.hideHighlightedSelector();
     } else if (metadata.params && metadata.params.selector) {
-      var _this$_recorderApp6;
+      var _this$_recorderApp5;
       this._highlightedSelector = metadata.params.selector;
-      (_this$_recorderApp6 = this._recorderApp) === null || _this$_recorderApp6 === void 0 || _this$_recorderApp6.setSelector(this._highlightedSelector).catch(() => {});
+      (_this$_recorderApp5 = this._recorderApp) === null || _this$_recorderApp5 === void 0 || _this$_recorderApp5.setSelector(this._highlightedSelector).catch(() => {});
     }
   }
   async onAfterCall(sdkObject, metadata) {
@@ -243,7 +248,7 @@ class Recorder {
     this.updateCallLog([metadata]);
   }
   _updateUserSources() {
-    var _this$_recorderApp7;
+    var _this$_recorderApp6;
     // Remove old decorations.
     for (const source of this._userSources.values()) {
       source.highlight = [];
@@ -281,18 +286,18 @@ class Recorder {
       }
     }
     this._pushAllSources();
-    if (fileToSelect) (_this$_recorderApp7 = this._recorderApp) === null || _this$_recorderApp7 === void 0 || _this$_recorderApp7.setFileIfNeeded(fileToSelect);
+    if (fileToSelect) (_this$_recorderApp6 = this._recorderApp) === null || _this$_recorderApp6 === void 0 || _this$_recorderApp6.setRunningFile(fileToSelect);
   }
   _pushAllSources() {
-    var _this$_recorderApp8;
-    (_this$_recorderApp8 = this._recorderApp) === null || _this$_recorderApp8 === void 0 || _this$_recorderApp8.setSources([...this._recorderSources, ...this._userSources.values()]);
+    var _this$_recorderApp7;
+    (_this$_recorderApp7 = this._recorderApp) === null || _this$_recorderApp7 === void 0 || _this$_recorderApp7.setSources([...this._recorderSources, ...this._userSources.values()]);
   }
   async onBeforeInputAction(sdkObject, metadata) {}
   async onCallLog(sdkObject, metadata, logName, message) {
     this.updateCallLog([metadata]);
   }
   updateCallLog(metadatas) {
-    var _this$_recorderApp9;
+    var _this$_recorderApp8;
     if (this._mode === 'recording' || this._mode === 'assertingText' || this._mode === 'assertingVisibility' || this._mode === 'assertingValue') return;
     const logs = [];
     for (const metadata of metadatas) {
@@ -302,7 +307,7 @@ class Recorder {
       if (this._debugger.isPaused(metadata)) status = 'paused';
       logs.push((0, _recorderUtils.metadataToCallLog)(metadata, status));
     }
-    (_this$_recorderApp9 = this._recorderApp) === null || _this$_recorderApp9 === void 0 || _this$_recorderApp9.updateCallLogs(logs);
+    (_this$_recorderApp8 = this._recorderApp) === null || _this$_recorderApp8 === void 0 || _this$_recorderApp8.updateCallLogs(logs);
   }
   _readSource(fileName) {
     try {

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

@@ -146,7 +146,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();
@@ -374,6 +374,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 +454,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);

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

@@ -461,11 +461,11 @@ class WKPage {
     const frame = this._page._frameManager.frame(contextPayload.frameId);
     if (!frame) return;
     const delegate = new _wkExecutionContext.WKExecutionContext(this._session, contextPayload.id);
-    let worldName;
-    if (contextPayload.type === 'normal') worldName = 'main';else if (contextPayload.type === 'user' && contextPayload.name === UTILITY_WORLD_NAME) worldName = 'utility';else return;
+    let worldName = null;
+    if (contextPayload.type === 'normal') worldName = 'main';else if (contextPayload.type === 'user' && contextPayload.name === UTILITY_WORLD_NAME) worldName = 'utility';
     const context = new dom.FrameExecutionContext(delegate, frame, worldName);
     context[contextDelegateSymbol] = delegate;
-    frame._contextCreated(worldName, context);
+    if (worldName) frame._contextCreated(worldName, context);
     this._contextIdToContext.set(contextPayload.id, context);
   }
   async _onBindingCalled(contextId, argument) {
@@ -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',