@checkly/playwright-core 1.42.18 → 1.47.20-alpha

package/lib/server/browserContext.js

@@ -5,10 +5,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.BrowserContext = void 0;
 exports.assertBrowserContextIsNotOwned = assertBrowserContextIsNotOwned;
+exports.createClientCertificatesProxyIfNeeded = createClientCertificatesProxyIfNeeded;
 exports.normalizeProxySettings = normalizeProxySettings;
 exports.validateBrowserContextOptions = validateBrowserContextOptions;
+exports.verifyClientCertificates = verifyClientCertificates;
 exports.verifyGeolocation = verifyGeolocation;
-var os = _interopRequireWildcard(require("os"));
 var _timeoutSettings = require("../common/timeoutSettings");
 var _utils = require("../utils");
 var _fileUtils = require("../utils/fileUtils");
@@ -24,6 +25,9 @@ var _harRecorder = require("./har/harRecorder");
 var _recorder = require("./recorder");
 var consoleApiSource = _interopRequireWildcard(require("../generated/consoleApiSource"));
 var _fetch = require("./fetch");
+var _clock = require("./clock");
+var _socksClientCertificatesInterceptor = require("./socksClientCertificatesInterceptor");
+var _recorderApp = require("./recorder/recorderApp");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 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; }
@@ -72,6 +76,8 @@ class BrowserContext extends _instrumentation.SdkObject {
     this._routesInFlight = new Set();
     this._debugger = void 0;
     this._closeReason = void 0;
+    this.clock = void 0;
+    this._clientCertificatesProxy = void 0;
     this.attribution.context = this;
     this._browser = browser;
     this._options = options;
@@ -81,6 +87,7 @@ class BrowserContext extends _instrumentation.SdkObject {
     this.fetchRequest = new _fetch.BrowserContextAPIRequestContext(this);
     if (this._options.recordHar) this._harRecorders.set('', new _harRecorder.HarRecorder(this, null, this._options.recordHar));
     this.tracing = new _tracing.Tracing(this, browser.options.tracesDir);
+    this.clock = new _clock.Clock(this);
   }
   isPersistentContext() {
     return this._isPersistentContext;
@@ -97,17 +104,17 @@ class BrowserContext extends _instrumentation.SdkObject {
     this._debugger = new _debugger.Debugger(this);
 
     // When PWDEBUG=1, show inspector for each context.
-    if ((0, _utils.debugMode)() === 'inspector') await _recorder.Recorder.show(this, {
+    if ((0, _utils.debugMode)() === 'inspector') await _recorder.Recorder.show(this, _recorderApp.RecorderApp.factory(this), {
       pauseOnNextStatement: true
     });
 
     // When paused, show inspector.
-    if (this._debugger.isPaused()) _recorder.Recorder.showInspector(this);
+    if (this._debugger.isPaused()) _recorder.Recorder.showInspector(this, _recorderApp.RecorderApp.factory(this));
     this._debugger.on(_debugger.Debugger.Events.PausedStateChanged, () => {
-      _recorder.Recorder.showInspector(this);
+      if (this._debugger.isPaused()) _recorder.Recorder.showInspector(this, _recorderApp.RecorderApp.factory(this));
     });
     if ((0, _utils.debugMode)() === 'console') await this.extendInjectedScript(consoleApiSource.source);
-    if (this._options.serviceWorkers === 'block') await this.addInitScript(`\nnavigator.serviceWorker.register = async () => { console.warn('Service Worker registration blocked by Playwright'); };\n`);
+    if (this._options.serviceWorkers === 'block') await this.addInitScript(`\nif (navigator.serviceWorker) navigator.serviceWorker.register = async () => { console.warn('Service Worker registration blocked by Playwright'); };\n`);
     if (this._options.permissions) await this.grantPermissions(this._options.permissions);
   }
   debugger() {
@@ -168,6 +175,7 @@ class BrowserContext extends _instrumentation.SdkObject {
     await this._resetStorage();
     await this._removeExposedBindings();
     await this._removeInitScripts();
+    this.clock.markAsUninstalled();
     // TODO: following can be optimized to not perform noops.
     if (this._options.permissions) await this.grantPermissions(this._options.permissions);else await this.clearPermissions();
     await this.setExtraHTTPHeaders(this._options.extraHTTPHeaders || []);
@@ -183,11 +191,13 @@ class BrowserContext extends _instrumentation.SdkObject {
     this._didCloseInternal();
   }
   _didCloseInternal() {
+    var _this$_clientCertific;
     if (this._closedStatus === 'closed') {
       // We can come here twice if we close browser context and browser
       // at the same time.
       return;
     }
+    (_this$_clientCertific = this._clientCertificatesProxy) === null || _this$_clientCertific === void 0 || _this$_clientCertific.close().catch(() => {});
     this.tracing.abort();
     if (this._isPersistentContext) this.onClosePersistent();
     this._closePromiseFulfill(new Error('Context closed'));
@@ -200,6 +210,22 @@ class BrowserContext extends _instrumentation.SdkObject {
     if (urls && !Array.isArray(urls)) urls = [urls];
     return await this.doGetCookies(urls);
   }
+  async clearCookies(options) {
+    const currentCookies = await this.cookies();
+    await this.doClearCookies();
+    const matches = (cookie, prop, value) => {
+      if (!value) return true;
+      if (value instanceof RegExp) {
+        value.lastIndex = 0;
+        return value.test(cookie[prop]);
+      }
+      return cookie[prop] === value;
+    };
+    const cookiesToReadd = currentCookies.filter(cookie => {
+      return !matches(cookie, 'name', options.name) || !matches(cookie, 'domain', options.domain) || !matches(cookie, 'path', options.path);
+    });
+    await this.addCookies(cookiesToReadd);
+  }
   setHTTPCredentials(httpCredentials) {
     return this.doSetHTTPCredentials(httpCredentials);
   }
@@ -210,13 +236,14 @@ class BrowserContext extends _instrumentation.SdkObject {
     }
     const binding = new _page6.PageBinding(name, playwrightBinding, needsHandle);
     this._pageBindings.set(name, binding);
-    await this.doExposeBinding(binding);
+    await this.doAddInitScript(binding.initScript);
+    const frames = this.pages().map(page => page.frames()).flat();
+    await Promise.all(frames.map(frame => frame.evaluateExpression(binding.initScript.source).catch(e => {})));
   }
   async _removeExposedBindings() {
-    for (const key of this._pageBindings.keys()) {
-      if (!key.startsWith('__pw')) this._pageBindings.delete(key);
+    for (const [key, binding] of this._pageBindings) {
+      if (!binding.internal) this._pageBindings.delete(key);
     }
-    await this.doRemoveExposedBindings();
   }
   async grantPermissions(permissions, origin) {
     let resolvedOrigin = '*';
@@ -294,13 +321,14 @@ class BrowserContext extends _instrumentation.SdkObject {
       password: password || ''
     };
   }
-  async addInitScript(script) {
-    this.initScripts.push(script);
-    await this.doAddInitScript(script);
+  async addInitScript(source) {
+    const initScript = new _page6.InitScript(source);
+    this.initScripts.push(initScript);
+    await this.doAddInitScript(initScript);
   }
   async _removeInitScripts() {
-    this.initScripts.splice(0, this.initScripts.length);
-    await this.doRemoveInitScripts();
+    this.initScripts = this.initScripts.filter(script => script.internal);
+    await this.doRemoveNonInternalInitScripts();
   }
   async setRequestInterceptor(handler) {
     this._requestInterceptor = handler;
@@ -371,7 +399,28 @@ class BrowserContext extends _instrumentation.SdkObject {
       cookies: await this.cookies(),
       origins: []
     };
-    if (this._origins.size) {
+    const originsToSave = new Set(this._origins);
+
+    // First try collecting storage stage from existing pages.
+    for (const page of this.pages()) {
+      const origin = page.mainFrame().origin();
+      if (!origin || !originsToSave.has(origin)) continue;
+      try {
+        const storage = await page.mainFrame().nonStallingEvaluateInExistingContext(`({
+          localStorage: Object.keys(localStorage).map(name => ({ name, value: localStorage.getItem(name) })),
+        })`, 'utility');
+        if (storage.localStorage.length) result.origins.push({
+          origin,
+          localStorage: storage.localStorage
+        });
+        originsToSave.delete(origin);
+      } catch {
+        // When failed on the live page, we'll retry on the blank page below.
+      }
+    }
+
+    // If there are still origins to save, create a blank page to iterate over origins.
+    if (originsToSave.size) {
       const internalMetadata = (0, _instrumentation.serverSideCallMetadata)();
       const page = await this.newPage(internalMetadata);
       await page._setServerRequestInterceptor(handler => {
@@ -381,7 +430,7 @@ class BrowserContext extends _instrumentation.SdkObject {
         }).catch(() => {});
         return true;
       });
-      for (const origin of this._origins) {
+      for (const origin of originsToSave) {
         const originStorage = {
           origin,
           localStorage: []
@@ -431,7 +480,7 @@ class BrowserContext extends _instrumentation.SdkObject {
   }
   async _resetCookies() {
     var _this$_options$storag2, _this$_options$storag3;
-    await this.clearCookies();
+    await this.doClearCookies();
     if ((_this$_options$storag2 = this._options.storageState) !== null && _this$_options$storag2 !== void 0 && _this$_options$storag2.cookies) await this.addCookies((_this$_options$storag3 = this._options.storageState) === null || _this$_options$storag3 === void 0 ? void 0 : _this$_options$storag3.cookies);
   }
   isSettingStorageState() {
@@ -478,6 +527,9 @@ class BrowserContext extends _instrumentation.SdkObject {
     this.on(BrowserContext.Events.Page, installInPage);
     return Promise.all(this.pages().map(installInPage));
   }
+  async safeNonStallingEvaluateInAllFrames(expression, world, options = {}) {
+    await Promise.all(this.pages().map(page => page.safeNonStallingEvaluateInAllFrames(expression, world, options)));
+  }
   async _harStart(page, options) {
     const harId = (0, _utils.createGuid)();
     this._harRecorders.set(harId, new _harRecorder.HarRecorder(this, page, options));
@@ -522,10 +574,26 @@ function assertBrowserContextIsNotOwned(context) {
     if (page._ownedContext) throw new Error('Please use browser.newContext() for multi-page scripts that share the context.');
   }
 }
+async function createClientCertificatesProxyIfNeeded(options, browserOptions) {
+  var _options$clientCertif, _options$proxy, _options$proxy2, _browserOptions$proxy, _browserOptions$proxy2;
+  if (!((_options$clientCertif = options.clientCertificates) !== null && _options$clientCertif !== void 0 && _options$clientCertif.length)) return;
+  if ((_options$proxy = options.proxy) !== null && _options$proxy !== void 0 && _options$proxy.server && ((_options$proxy2 = options.proxy) === null || _options$proxy2 === void 0 ? void 0 : _options$proxy2.server) !== 'per-context' || browserOptions !== null && browserOptions !== void 0 && (_browserOptions$proxy = browserOptions.proxy) !== null && _browserOptions$proxy !== void 0 && _browserOptions$proxy.server && (browserOptions === null || browserOptions === void 0 || (_browserOptions$proxy2 = browserOptions.proxy) === null || _browserOptions$proxy2 === void 0 ? void 0 : _browserOptions$proxy2.server) !== 'http://per-context') throw new Error('Cannot specify both proxy and clientCertificates');
+  verifyClientCertificates(options.clientCertificates);
+  const clientCertificatesProxy = new _socksClientCertificatesInterceptor.ClientCertificatesProxy(options);
+  options.proxy = {
+    server: await clientCertificatesProxy.listen()
+  };
+  options.ignoreHTTPSErrors = true;
+  return clientCertificatesProxy;
+}
 function validateBrowserContextOptions(options, browserOptions) {
   if (options.noDefaultViewport && options.deviceScaleFactor !== undefined) throw new Error(`"deviceScaleFactor" option is not supported with null "viewport"`);
   if (options.noDefaultViewport && !!options.isMobile) throw new Error(`"isMobile" option is not supported with null "viewport"`);
-  if (options.acceptDownloads === undefined) options.acceptDownloads = 'accept';
+  if (options.acceptDownloads === undefined && browserOptions.name !== 'electron') options.acceptDownloads = 'accept';
+  // Electron requires explicit acceptDownloads: true since we wait for
+  // https://github.com/electron/electron/pull/41718 to be widely shipped.
+  // In 6-12 months, we can remove this check.
+  else if (options.acceptDownloads === undefined && browserOptions.name === 'electron') options.acceptDownloads = 'internal-browser-default';
   if (!options.viewport && !options.noDefaultViewport) options.viewport = {
     width: 1280,
     height: 720
@@ -550,10 +618,7 @@ function validateBrowserContextOptions(options, browserOptions) {
     options.recordVideo.size.width &= ~1;
     options.recordVideo.size.height &= ~1;
   }
-  if (options.proxy) {
-    if (!browserOptions.proxy && browserOptions.isChromium && os.platform() === 'win32') throw new Error(`Browser needs to be launched with the global proxy. If all contexts override the proxy, global proxy will be never used and can be any string, for example "launch({ proxy: { server: 'http://per-context' } })"`);
-    options.proxy = normalizeProxySettings(options.proxy);
-  }
+  if (options.proxy) options.proxy = normalizeProxySettings(options.proxy);
   verifyGeolocation(options.geolocation);
 }
 function verifyGeolocation(geolocation) {
@@ -568,6 +633,16 @@ function verifyGeolocation(geolocation) {
   if (latitude < -90 || latitude > 90) throw new Error(`geolocation.latitude: precondition -90 <= LATITUDE <= 90 failed.`);
   if (accuracy < 0) throw new Error(`geolocation.accuracy: precondition 0 <= ACCURACY failed.`);
 }
+function verifyClientCertificates(clientCertificates) {
+  if (!clientCertificates) return;
+  for (const cert of clientCertificates) {
+    if (!cert.origin) throw new Error(`clientCertificates.origin is required`);
+    if (!cert.cert && !cert.key && !cert.passphrase && !cert.pfx) throw new Error('None of cert, key, passphrase or pfx is specified');
+    if (cert.cert && !cert.key) throw new Error('cert is specified without key');
+    if (!cert.cert && cert.key) throw new Error('key is specified without cert');
+    if (cert.pfx && (cert.cert || cert.key)) throw new Error('pfx is specified together with cert, key or passphrase');
+  }
+}
 function normalizeProxySettings(proxy) {
   let {
     server,

package/lib/server/browserType.js

@@ -19,7 +19,6 @@ var _fileUtils = require("../utils/fileUtils");
 var _helper = require("./helper");
 var _debugLogger = require("../utils/debugLogger");
 var _instrumentation = require("./instrumentation");
-var _manualPromise = require("../utils/manualPromise");
 var _protocolError = require("./protocolError");
 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; }
@@ -45,6 +44,7 @@ class BrowserType extends _instrumentation.SdkObject {
   constructor(parent, browserName) {
     super(parent, 'browser-type');
     this._name = void 0;
+    this._useBidi = false;
     this.attribution.browserType = this;
     this._name = browserName;
   }
@@ -56,6 +56,7 @@ class BrowserType extends _instrumentation.SdkObject {
   }
   async launch(metadata, options, protocolLogger) {
     options = this._validateLaunchOptions(options);
+    if (this._useBidi) options.useWebSocket = true;
     const controller = new _progress.ProgressController(metadata, this);
     controller.setLogName('browser');
     const browser = await controller.run(progress => {
@@ -69,13 +70,22 @@ class BrowserType extends _instrumentation.SdkObject {
   }
   async launchPersistentContext(metadata, userDataDir, options) {
     options = this._validateLaunchOptions(options);
+    if (this._useBidi) options.useWebSocket = true;
     const controller = new _progress.ProgressController(metadata, this);
-    const persistent = options;
+    const persistent = {
+      ...options
+    };
     controller.setLogName('browser');
-    const browser = await controller.run(progress => {
-      return this._innerLaunchWithRetries(progress, options, persistent, _helper.helper.debugProtocolLogger(), userDataDir).catch(e => {
+    const browser = await controller.run(async progress => {
+      // Note: Any initial TLS requests will fail since we rely on the Page/Frames initialize which sets ignoreHTTPSErrors.
+      const clientCertificatesProxy = await (0, _browserContext.createClientCertificatesProxyIfNeeded)(persistent);
+      if (clientCertificatesProxy) options.proxy = persistent.proxy;
+      progress.cleanupWhenAborted(() => clientCertificatesProxy === null || clientCertificatesProxy === void 0 ? void 0 : clientCertificatesProxy.close());
+      const browser = await this._innerLaunchWithRetries(progress, options, persistent, _helper.helper.debugProtocolLogger(), userDataDir).catch(e => {
         throw this._rewriteStartupLog(e);
       });
+      browser._defaultContext._clientCertificatesProxy = clientCertificatesProxy;
+      return browser;
     }, _timeoutSettings.TimeoutSettings.launchTimeout(options));
     return browser._defaultContext;
   }
@@ -122,14 +132,14 @@ class BrowserType extends _instrumentation.SdkObject {
     };
     if (persistent) (0, _browserContext.validateBrowserContextOptions)(persistent, browserOptions);
     copyTestHooks(options, browserOptions);
-    const browser = await this._connectToTransport(transport, browserOptions);
+    const browser = await this.connectToTransport(transport, browserOptions);
     browser._userDataDirForTest = userDataDir;
     // We assume no control when using custom arguments, and do not prepare the default context in that case.
     if (persistent && !options.ignoreAllDefaultArgs) await browser._defaultContext._loadDefaultContext(progress);
     return browser;
   }
   async _launchProcess(progress, options, isPersistent, browserLogsCollector, userDataDir) {
-    var _options$args;
+    var _await$readyState$wai;
     const {
       ignoreDefaultArgs,
       ignoreAllDefaultArgs,
@@ -155,7 +165,7 @@ class BrowserType extends _instrumentation.SdkObject {
       tempDirectories.push(userDataDir);
     }
     const browserArguments = [];
-    if (ignoreAllDefaultArgs) browserArguments.push(...args);else if (ignoreDefaultArgs) browserArguments.push(...this._defaultArgs(options, isPersistent, userDataDir).filter(arg => ignoreDefaultArgs.indexOf(arg) === -1));else browserArguments.push(...this._defaultArgs(options, isPersistent, userDataDir));
+    if (ignoreAllDefaultArgs) browserArguments.push(...args);else if (ignoreDefaultArgs) browserArguments.push(...this.defaultArgs(options, isPersistent, userDataDir).filter(arg => ignoreDefaultArgs.indexOf(arg) === -1));else browserArguments.push(...this.defaultArgs(options, isPersistent, userDataDir));
     let executable;
     if (executablePath) {
       if (!(await (0, _fileUtils.existsAsync)(executablePath))) throw new Error(`Failed to launch ${this._name} because executable doesn't exist at ${executablePath}`);
@@ -166,8 +176,7 @@ class BrowserType extends _instrumentation.SdkObject {
       executable = registryExecutable.executablePathOrDie(this.attribution.playwright.options.sdkLanguage);
       await _registry.registry.validateHostRequirementsForExecutablesIfNeeded([registryExecutable], this.attribution.playwright.options.sdkLanguage);
     }
-    const waitForWSEndpoint = options.useWebSocket || (_options$args = options.args) !== null && _options$args !== void 0 && _options$args.some(a => a.startsWith('--remote-debugging-port')) ? new _manualPromise.ManualPromise() : undefined;
-    const waitForJuggler = this._name === 'firefox' ? new _manualPromise.ManualPromise() : undefined;
+    const readyState = this.readyState(options);
     // Note: it is important to define these variables before launchProcess, so that we don't get
     // "Cannot access 'browserServer' before initialization" if something went wrong.
     let transport = undefined;
@@ -179,16 +188,12 @@ class BrowserType extends _instrumentation.SdkObject {
     } = await (0, _processLauncher.launchProcess)({
       command: executable,
       args: browserArguments,
-      env: this._amendEnvironment(env, userDataDir, executable, browserArguments),
+      env: this.amendEnvironment(env, userDataDir, executable, browserArguments),
       handleSIGINT,
       handleSIGTERM,
       handleSIGHUP,
       log: message => {
-        if (waitForWSEndpoint) {
-          const match = message.match(/DevTools listening on (.*)/);
-          if (match) waitForWSEndpoint.resolve(match[1]);
-        }
-        if (waitForJuggler && message.includes('Juggler listening to the pipe')) waitForJuggler.resolve();
+        readyState === null || readyState === void 0 || readyState.onBrowserOutput(message);
         progress.log(message);
         browserLogsCollector.log(message);
       },
@@ -199,11 +204,11 @@ class BrowserType extends _instrumentation.SdkObject {
         // We try to gracefully close to prevent crash reporting and core dumps.
         // Note that it's fine to reuse the pipe transport, since
         // our connection ignores kBrowserCloseMessageId.
-        this._attemptToGracefullyCloseBrowser(transport);
+        this.attemptToGracefullyCloseBrowser(transport);
       },
       onExit: (exitCode, signal) => {
         // Unblock launch when browser prematurely exits.
-        waitForJuggler === null || waitForJuggler === void 0 || waitForJuggler.resolve();
+        readyState === null || readyState === void 0 || readyState.onBrowserExit();
         if (browserProcess && browserProcess.onclose) browserProcess.onclose(exitCode, signal);
       }
     });
@@ -224,8 +229,7 @@ class BrowserType extends _instrumentation.SdkObject {
       kill
     };
     progress.cleanupWhenAborted(() => closeOrKill(progress.timeUntilDeadline()));
-    const wsEndpoint = await waitForWSEndpoint;
-    await waitForJuggler;
+    const wsEndpoint = (_await$readyState$wai = await (readyState === null || readyState === void 0 ? void 0 : readyState.waitUntilReady())) === null || _await$readyState$wai === void 0 ? void 0 : _await$readyState$wai.wsEndpoint;
     if (options.useWebSocket) {
       transport = await _transport.WebSocketTransport.connect(progress, wsEndpoint);
     } else {
@@ -289,7 +293,10 @@ class BrowserType extends _instrumentation.SdkObject {
   }
   _rewriteStartupLog(error) {
     if (!(0, _protocolError.isProtocolError)(error)) return error;
-    return this._doRewriteStartupLog(error);
+    return this.doRewriteStartupLog(error);
+  }
+  readyState(options) {
+    return undefined;
   }
 }
 exports.BrowserType = BrowserType;

package/lib/server/chromium/chromium.js

@@ -99,14 +99,6 @@ class Chromium extends _browserType.BrowserType {
       artifactsDir,
       downloadsPath: options.downloadsPath || artifactsDir,
       tracesDir: options.tracesDir || artifactsDir,
-      // On Windows context level proxies only work, if there isn't a global proxy
-      // set. This is currently a bug in the CR/Windows networking stack. By
-      // passing an arbitrary value we disable the check in PW land which warns
-      // users in normal (launch/launchServer) mode since otherwise connectOverCDP
-      // does not work at all with proxies on Windows.
-      proxy: {
-        server: 'per-context'
-      },
       originalLaunchOptions: {}
     };
     (0, _browserContext.validateBrowserContextOptions)(persistent, browserOptions);
@@ -121,7 +113,7 @@ class Chromium extends _browserType.BrowserType {
     const directory = _registry.registry.findExecutable('chromium').directory;
     return directory ? new _crDevTools.CRDevTools(_path.default.join(directory, 'devtools-preferences.json')) : undefined;
   }
-  async _connectToTransport(transport, options) {
+  async connectToTransport(transport, options) {
     let devtools = this._devtools;
     if (options.__testHookForDevTools) {
       devtools = this._createDevTools();
@@ -129,19 +121,19 @@ class Chromium extends _browserType.BrowserType {
     }
     return _crBrowser.CRBrowser.connect(this.attribution.playwright, transport, options, devtools);
   }
-  _doRewriteStartupLog(error) {
+  doRewriteStartupLog(error) {
     if (!error.logs) return error;
     if (error.logs.includes('Missing X server')) error.logs = '\n' + (0, _ascii.wrapInASCIIBox)(_browserType.kNoXServerRunningError, 1);
     // These error messages are taken from Chromium source code as of July, 2020:
     // https://github.com/chromium/chromium/blob/70565f67e79f79e17663ad1337dc6e63ee207ce9/content/browser/zygote_host/zygote_host_impl_linux.cc
     if (!error.logs.includes('crbug.com/357670') && !error.logs.includes('No usable sandbox!') && !error.logs.includes('crbug.com/638180')) return error;
-    error.logs = [`Chromium sandboxing failed!`, `================================`, `To workaround sandboxing issues, do either of the following:`, `  - (preferred): Configure environment to support sandboxing: https://playwright.dev/docs/troubleshooting`, `  - (alternative): Launch Chromium without sandbox using 'chromiumSandbox: false' option`, `================================`, ``].join('\n');
+    error.logs = [`Chromium sandboxing failed!`, `================================`, `To avoid the sandboxing issue, do either of the following:`, `  - (preferred): Configure your environment to support sandboxing`, `  - (alternative): Launch Chromium without sandbox using 'chromiumSandbox: false' option`, `================================`, ``].join('\n');
     return error;
   }
-  _amendEnvironment(env, userDataDir, executable, browserArguments) {
+  amendEnvironment(env, userDataDir, executable, browserArguments) {
     return env;
   }
-  _attemptToGracefullyCloseBrowser(transport) {
+  attemptToGracefullyCloseBrowser(transport) {
     const message = {
       method: 'Browser.close',
       id: _crConnection.kBrowserCloseMessageId,
@@ -255,7 +247,7 @@ class Chromium extends _browserType.BrowserType {
       throw e;
     }
   }
-  _defaultArgs(options, isPersistent, userDataDir) {
+  defaultArgs(options, isPersistent, userDataDir) {
     const chromeArguments = this._innerDefaultArgs(options);
     chromeArguments.push(`--user-data-dir=${userDataDir}`);
     if (options.useWebSocket) chromeArguments.push('--remote-debugging-port=0');else chromeArguments.push('--remote-debugging-pipe');
@@ -280,7 +272,7 @@ class Chromium extends _browserType.BrowserType {
     }
     if (options.devtools) chromeArguments.push('--auto-open-devtools-for-tabs');
     if (options.headless) {
-      if (process.env.PLAYWRIGHT_CHROMIUM_USE_HEADLESS_NEW) chromeArguments.push('--headless=new');else chromeArguments.push('--headless');
+      if (process.env.PLAYWRIGHT_CHROMIUM_USE_HEADLESS_NEW) chromeArguments.push('--headless=new');else chromeArguments.push('--headless=old');
       chromeArguments.push('--hide-scrollbars', '--mute-audio', '--blink-settings=primaryHoverType=2,availableHoverTypes=2,primaryPointerType=4,availablePointerTypes=4');
     }
     if (options.chromiumSandbox !== true) chromeArguments.push('--no-sandbox');
@@ -303,8 +295,31 @@ class Chromium extends _browserType.BrowserType {
     chromeArguments.push(...args);
     return chromeArguments;
   }
+  readyState(options) {
+    var _options$args;
+    if (options.useWebSocket || (_options$args = options.args) !== null && _options$args !== void 0 && _options$args.some(a => a.startsWith('--remote-debugging-port'))) return new ChromiumReadyState();
+    return undefined;
+  }
 }
 exports.Chromium = Chromium;
+class ChromiumReadyState {
+  constructor() {
+    this._wsEndpoint = new _manualPromise.ManualPromise();
+  }
+  onBrowserOutput(message) {
+    const match = message.match(/DevTools listening on (.*)/);
+    if (match) this._wsEndpoint.resolve(match[1]);
+  }
+  onBrowserExit() {
+    this._wsEndpoint.resolve(undefined);
+  }
+  async waitUntilReady() {
+    const wsEndpoint = await this._wsEndpoint;
+    return {
+      wsEndpoint
+    };
+  }
+}
 async function urlToWSEndpoint(progress, endpointURL, headers) {
   if (endpointURL.startsWith('ws')) return endpointURL;
   progress.log(`<ws preparing> retrieving websocket url from ${endpointURL}`);

package/lib/server/chromium/chromiumSwitches.js

@@ -25,7 +25,7 @@ exports.chromiumSwitches = void 0;
 
 const chromiumSwitches = exports.chromiumSwitches = ['--disable-field-trial-config',
 // https://source.chromium.org/chromium/chromium/src/+/main:testing/variations/README.md
-'--disable-background-networking', '--enable-features=NetworkService,NetworkServiceInProcess', '--disable-background-timer-throttling', '--disable-backgrounding-occluded-windows', '--disable-back-forward-cache',
+'--disable-background-networking', '--disable-background-timer-throttling', '--disable-backgrounding-occluded-windows', '--disable-back-forward-cache',
 // Avoids surprises like main request not being intercepted during page.goBack().
 '--disable-breakpad', '--disable-client-side-phishing-detection', '--disable-component-extensions-with-background-pages', '--disable-component-update',
 // Avoids unneeded network activity after startup.
@@ -34,8 +34,11 @@ const chromiumSwitches = exports.chromiumSwitches = ['--disable-field-trial-conf
 // Translate - https://github.com/microsoft/playwright/issues/16126
 // HttpsUpgrades - https://github.com/microsoft/playwright/pull/27605
 // PaintHolding - https://github.com/microsoft/playwright/issues/28023
-'--disable-features=ImprovedCookieControls,LazyFrameLoading,GlobalMediaControls,DestroyProfileOnBrowserClose,MediaRouter,DialMediaRouteProvider,AcceptCHFrame,AutoExpandDetailsElement,CertificateTransparencyComponentUpdater,AvoidUnnecessaryBeforeUnloadCheckSync,Translate,HttpsUpgrades,PaintHolding', '--allow-pre-commit-input', '--disable-hang-monitor', '--disable-ipc-flooding-protection', '--disable-popup-blocking', '--disable-prompt-on-repost', '--disable-renderer-backgrounding', '--force-color-profile=srgb', '--metrics-recording-only', '--no-first-run', '--enable-automation', '--password-store=basic', '--use-mock-keychain',
+// PlzDedicatedWorker - https://github.com/microsoft/playwright/issues/31747
+'--disable-features=ImprovedCookieControls,LazyFrameLoading,GlobalMediaControls,DestroyProfileOnBrowserClose,MediaRouter,DialMediaRouteProvider,AcceptCHFrame,AutoExpandDetailsElement,CertificateTransparencyComponentUpdater,AvoidUnnecessaryBeforeUnloadCheckSync,Translate,HttpsUpgrades,PaintHolding,PlzDedicatedWorker', '--allow-pre-commit-input', '--disable-hang-monitor', '--disable-ipc-flooding-protection', '--disable-popup-blocking', '--disable-prompt-on-repost', '--disable-renderer-backgrounding', '--force-color-profile=srgb', '--metrics-recording-only', '--no-first-run', '--enable-automation', '--password-store=basic', '--use-mock-keychain',
 // See https://chromium-review.googlesource.com/c/chromium/src/+/2436773
 '--no-service-autorun', '--export-tagged-pdf',
 // https://chromium-review.googlesource.com/c/chromium/src/+/4853540
-'--disable-search-engine-choice-screen'];
+'--disable-search-engine-choice-screen',
+// https://issues.chromium.org/41491762
+'--unsafely-disable-devtools-self-xss-warnings'];

package/lib/server/chromium/crBrowser.js

@@ -298,7 +298,7 @@ class CRBrowserContext extends _browserContext.BrowserContext {
   async _initialize() {
     (0, _utils.assert)(!Array.from(this._browser._crPages.values()).some(page => page._browserContext === this));
     const promises = [super._initialize()];
-    if (this._browser.options.name !== 'electron' && this._browser.options.name !== 'clank' && this._options.acceptDownloads !== 'internal-browser-default') {
+    if (this._browser.options.name !== 'clank' && this._options.acceptDownloads !== 'internal-browser-default') {
       promises.push(this._browser._session.send('Browser.setDownloadBehavior', {
         behavior: this._options.acceptDownloads === 'accept' ? 'allowAndName' : 'deny',
         browserContextId: this._browserContextId,
@@ -365,7 +365,7 @@ class CRBrowserContext extends _browserContext.BrowserContext {
       browserContextId: this._browserContextId
     });
   }
-  async clearCookies() {
+  async doClearCookies() {
     await this._browser._session.send('Storage.clearCookies', {
       browserContextId: this._browserContextId
     });
@@ -373,7 +373,7 @@ class CRBrowserContext extends _browserContext.BrowserContext {
   async doGrantPermissions(origin, permissions) {
     const webPermissionToProtocol = new Map([['geolocation', 'geolocation'], ['midi', 'midi'], ['notifications', 'notifications'], ['camera', 'videoCapture'], ['microphone', 'audioCapture'], ['background-sync', 'backgroundSync'], ['ambient-light-sensor', 'sensors'], ['accelerometer', 'sensors'], ['gyroscope', 'sensors'], ['magnetometer', 'sensors'], ['accessibility-events', 'accessibilityEvents'], ['clipboard-read', 'clipboardReadWrite'], ['clipboard-write', 'clipboardSanitizedWrite'], ['payment-handler', 'paymentHandler'],
     // chrome-specific permissions we have.
-    ['midi-sysex', 'midiSysex']]);
+    ['midi-sysex', 'midiSysex'], ['storage-access', 'storageAccess']]);
     const filtered = permissions.map(permission => {
       const protocolPermission = webPermissionToProtocol.get(permission);
       if (!protocolPermission) throw new Error('Unknown permission: ' + permission);
@@ -398,7 +398,7 @@ class CRBrowserContext extends _browserContext.BrowserContext {
   async setExtraHTTPHeaders(headers) {
     this._options.extraHTTPHeaders = headers;
     for (const page of this.pages()) await page._delegate.updateExtraHTTPHeaders();
-    for (const sw of this.serviceWorkers()) await sw.updateExtraHTTPHeaders(false);
+    for (const sw of this.serviceWorkers()) await sw.updateExtraHTTPHeaders();
   }
   async setUserAgent(userAgent) {
     this._options.userAgent = userAgent;
@@ -408,24 +408,18 @@ class CRBrowserContext extends _browserContext.BrowserContext {
   async setOffline(offline) {
     this._options.offline = offline;
     for (const page of this.pages()) await page._delegate.updateOffline();
-    for (const sw of this.serviceWorkers()) await sw.updateOffline(false);
+    for (const sw of this.serviceWorkers()) await sw.updateOffline();
   }
   async doSetHTTPCredentials(httpCredentials) {
     this._options.httpCredentials = httpCredentials;
     for (const page of this.pages()) await page._delegate.updateHttpCredentials();
-    for (const sw of this.serviceWorkers()) await sw.updateHttpCredentials(false);
+    for (const sw of this.serviceWorkers()) await sw.updateHttpCredentials();
   }
-  async doAddInitScript(source) {
-    for (const page of this.pages()) await page._delegate.addInitScript(source);
+  async doAddInitScript(initScript) {
+    for (const page of this.pages()) await page._delegate.addInitScript(initScript);
   }
-  async doRemoveInitScripts() {
-    for (const page of this.pages()) await page._delegate.removeInitScripts();
-  }
-  async doExposeBinding(binding) {
-    for (const page of this.pages()) await page._delegate.exposeBinding(binding);
-  }
-  async doRemoveExposedBindings() {
-    for (const page of this.pages()) await page._delegate.removeExposedBindings();
+  async doRemoveNonInternalInitScripts() {
+    for (const page of this.pages()) await page._delegate.removeNonInternalInitScripts();
   }
   async doUpdateRequestInterception() {
     for (const page of this.pages()) await page._delegate.updateRequestInterception();
@@ -478,7 +472,7 @@ class CRBrowserContext extends _browserContext.BrowserContext {
     }
   }
   async clearCache() {
-    for (const page of this._crPages()) await page._mainFrameSession._networkManager.clearCache();
+    for (const page of this._crPages()) await page._networkManager.clearCache();
   }
   async cancelDownload(guid) {
     // The upstream CDP method is implemented in a way that no explicit error would be given

package/lib/server/chromium/crConnection.js

@@ -72,11 +72,11 @@ class CRConnection extends _events.EventEmitter {
     const session = this._sessions.get(message.sessionId || '');
     if (session) session._onMessage(message);
   }
-  _onClose() {
+  _onClose(reason) {
     this._closed = true;
     this._transport.onmessage = undefined;
     this._transport.onclose = undefined;
-    this._browserDisconnectedLogs = _helper.helper.formatBrowserLogs(this._browserLogsCollector.recentLogs());
+    this._browserDisconnectedLogs = _helper.helper.formatBrowserLogs(this._browserLogsCollector.recentLogs(), reason);
     this.rootSession.dispose();
     Promise.resolve().then(() => this.emit(ConnectionEvents.Disconnected));
   }