@checkly/playwright-core 1.48.22 → 1.51.11-beta.2

package/lib/server/bidi/bidiPage.js

@@ -4,19 +4,19 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.BidiPage = void 0;
-var _eventsHelper = require("../../utils/eventsHelper");
 var _utils = require("../../utils");
-var dom = _interopRequireWildcard(require("../dom"));
+var _eventsHelper = require("../utils/eventsHelper");
+var _browserContext = require("../browserContext");
 var dialog = _interopRequireWildcard(require("../dialog"));
+var dom = _interopRequireWildcard(require("../dom"));
 var _page = require("../page");
-var _bidiInput = require("./bidiInput");
-var bidi = _interopRequireWildcard(require("./third_party/bidiProtocol"));
 var _bidiExecutionContext = require("./bidiExecutionContext");
+var _bidiInput = require("./bidiInput");
 var _bidiNetworkManager = require("./bidiNetworkManager");
-var _browserContext = require("../browserContext");
 var _bidiPdf = require("./bidiPdf");
+var bidi = _interopRequireWildcard(require("./third_party/bidiProtocol"));
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _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 && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 /**
  * Copyright (c) Microsoft Corporation.
  *
@@ -41,7 +41,6 @@ class BidiPage {
     this.rawKeyboard = void 0;
     this.rawTouchscreen = void 0;
     this._page = void 0;
-    this._pagePromise = void 0;
     this._session = void 0;
     this._opener = void 0;
     this._realmToContext = void 0;
@@ -49,7 +48,6 @@ class BidiPage {
     this._browserContext = void 0;
     this._networkManager = void 0;
     this._pdf = void 0;
-    this._initializedPage = null;
     this._initScriptIds = [];
     this._session = bidiSession;
     this._opener = opener;
@@ -65,15 +63,13 @@ class BidiPage {
     this._sessionListeners = [_eventsHelper.eventsHelper.addEventListener(bidiSession, 'script.realmCreated', this._onRealmCreated.bind(this)), _eventsHelper.eventsHelper.addEventListener(bidiSession, 'script.message', this._onScriptMessage.bind(this)), _eventsHelper.eventsHelper.addEventListener(bidiSession, 'browsingContext.contextDestroyed', this._onBrowsingContextDestroyed.bind(this)), _eventsHelper.eventsHelper.addEventListener(bidiSession, 'browsingContext.navigationStarted', this._onNavigationStarted.bind(this)), _eventsHelper.eventsHelper.addEventListener(bidiSession, 'browsingContext.navigationAborted', this._onNavigationAborted.bind(this)), _eventsHelper.eventsHelper.addEventListener(bidiSession, 'browsingContext.navigationFailed', this._onNavigationFailed.bind(this)), _eventsHelper.eventsHelper.addEventListener(bidiSession, 'browsingContext.fragmentNavigated', this._onFragmentNavigated.bind(this)), _eventsHelper.eventsHelper.addEventListener(bidiSession, 'browsingContext.domContentLoaded', this._onDomContentLoaded.bind(this)), _eventsHelper.eventsHelper.addEventListener(bidiSession, 'browsingContext.load', this._onLoad.bind(this)), _eventsHelper.eventsHelper.addEventListener(bidiSession, 'browsingContext.userPromptOpened', this._onUserPromptOpened.bind(this)), _eventsHelper.eventsHelper.addEventListener(bidiSession, 'log.entryAdded', this._onLogEntryAdded.bind(this))];
 
     // Initialize main frame.
-    this._pagePromise = this._initialize().finally(async () => {
-      await this._page.initOpener(this._opener);
-    }).then(() => {
-      this._initializedPage = this._page;
-      this._page.reportAsNew();
-      return this._page;
-    }).catch(e => {
-      this._page.reportAsNew(e);
-      return e;
+    // TODO: Wait for first execution context to be created and maybe about:blank navigated.
+    this._initialize().then(() => {
+      var _this$_opener;
+      return this._page.reportAsNew((_this$_opener = this._opener) === null || _this$_opener === void 0 ? void 0 : _this$_opener._page);
+    }, error => {
+      var _this$_opener2;
+      return this._page.reportAsNew((_this$_opener2 = this._opener) === null || _this$_opener2 === void 0 ? void 0 : _this$_opener2._page, error);
     });
   }
   async _initialize() {
@@ -84,18 +80,11 @@ class BidiPage {
   async _addAllInitScripts() {
     return Promise.all(this._page.allInitScripts().map(initScript => this.addInitScript(initScript)));
   }
-  potentiallyUninitializedPage() {
-    return this._page;
-  }
   didClose() {
     this._session.dispose();
     _eventsHelper.eventsHelper.removeEventListeners(this._sessionListeners);
     this._page._didClose();
   }
-  async pageOrError() {
-    // TODO: Wait for first execution context to be created and maybe about:blank navigated.
-    return this._pagePromise;
-  }
   _onFrameAttached(frameId, parentFrameId) {
     return this._page._frameManager.frameAttached(frameId, parentFrameId);
   }
@@ -112,7 +101,6 @@ class BidiPage {
     if (realmInfo.type !== 'window') return;
     const frame = this._page._frameManager.frame(realmInfo.context);
     if (!frame) return;
-    const delegate = new _bidiExecutionContext.BidiExecutionContext(this._session, realmInfo);
     let worldName;
     if (!realmInfo.sandbox) {
       worldName = 'main';
@@ -123,8 +111,8 @@ class BidiPage {
     } else {
       return;
     }
+    const delegate = new _bidiExecutionContext.BidiExecutionContext(this._session, realmInfo);
     const context = new dom.FrameExecutionContext(delegate, frame, worldName);
-    context[contextDelegateSymbol] = delegate;
     frame._contextCreated(worldName, context);
     this._realmToContext.set(realmInfo.realm, context);
   }
@@ -213,10 +201,7 @@ class BidiPage {
       lineNumber: 1,
       columnNumber: 1
     };
-    this._page._addConsoleMessage(entry.method, entry.args.map(arg => context.createHandle({
-      objectId: arg.handle,
-      ...arg
-    })), location, params.text || undefined);
+    this._page._addConsoleMessage(entry.method, entry.args.map(arg => (0, _bidiExecutionContext.createHandle)(context, arg)), location, params.text || undefined);
   }
   async navigateFrame(frame, url, referrer) {
     const {
@@ -311,7 +296,7 @@ class BidiPage {
   }
   async _onScriptMessage(event) {
     if (event.channel !== kPlaywrightBindingChannel) return;
-    const pageOrError = await this.pageOrError();
+    const pageOrError = await this._page.waitForInitializedOrError();
     if (pageOrError instanceof Error) return;
     const context = this._realmToContext.get(event.source.realm);
     if (!context) return;
@@ -351,7 +336,7 @@ class BidiPage {
       context: this._session.sessionId,
       format: {
         type: `image/${format === 'png' ? 'png' : 'jpeg'}`,
-        quality: quality || 80
+        quality: quality ? quality / 100 : 0.8
       },
       origin: documentRect ? 'document' : 'viewport',
       clip: {
@@ -363,21 +348,20 @@ class BidiPage {
   }
   async getContentFrame(handle) {
     const executionContext = toBidiExecutionContext(handle._context);
-    const contentWindow = await executionContext.rawCallFunction('e => e.contentWindow', {
-      handle: handle._objectId
-    });
-    if (contentWindow.type === 'window') {
-      const frameId = contentWindow.value.context;
-      const result = this._page._frameManager.frame(frameId);
-      return result;
-    }
-    return null;
+    const frameId = await executionContext.contentFrameIdForFrame(handle);
+    if (!frameId) return null;
+    return this._page._frameManager.frame(frameId);
   }
   async getOwnerFrame(handle) {
-    throw new Error('Method not implemented.');
-  }
-  isElementHandle(remoteObject) {
-    return remoteObject.type === 'node';
+    // TODO: switch to utility world?
+    const windowHandle = await handle.evaluateHandle(node => {
+      var _node$ownerDocument;
+      const doc = (_node$ownerDocument = node.ownerDocument) !== null && _node$ownerDocument !== void 0 ? _node$ownerDocument : node;
+      return doc.defaultView;
+    });
+    if (!windowHandle) return null;
+    const executionContext = toBidiExecutionContext(handle._context);
+    return executionContext.frameIdForWindowHandle(windowHandle);
   }
   async getBoundingBox(handle) {
     const box = await handle.evaluate(element => {
@@ -460,29 +444,19 @@ class BidiPage {
     }));
     return quads;
   }
-  async setInputFiles(handle, files) {
-    throw new Error('Method not implemented.');
-  }
   async setInputFilePaths(handle, paths) {
-    throw new Error('Method not implemented.');
+    const fromContext = toBidiExecutionContext(handle._context);
+    await this._session.send('input.setFiles', {
+      context: this._session.sessionId,
+      element: await fromContext.nodeIdForElementHandle(handle),
+      files: paths
+    });
   }
   async adoptElementHandle(handle, to) {
     const fromContext = toBidiExecutionContext(handle._context);
-    const shared = await fromContext.rawCallFunction('x => x', {
-      handle: handle._objectId
-    });
-    // TODO: store sharedId in the handle.
-    if (!('sharedId' in shared)) throw new Error('Element is not a node');
-    const sharedId = shared.sharedId;
+    const nodeId = await fromContext.nodeIdForElementHandle(handle);
     const executionContext = toBidiExecutionContext(to);
-    const result = await executionContext.rawCallFunction('x => x', {
-      sharedId
-    });
-    if ('handle' in result) return to.createHandle({
-      objectId: result.handle,
-      ...result
-    });
-    throw new Error('Failed to adopt element handle.');
+    return await executionContext.remoteObjectForNodeId(to, nodeId);
   }
   async getAccessibilityTree(needle) {
     throw new Error('Method not implemented.');
@@ -524,6 +498,5 @@ function addMainBinding(callback) {
   globalThis['__playwright__binding__'] = callback;
 }
 function toBidiExecutionContext(executionContext) {
-  return executionContext[contextDelegateSymbol];
-}
-const contextDelegateSymbol = Symbol('delegate');
+  return executionContext.delegate;
+}

package/lib/server/bidi/third_party/bidiKeyboard.js

@@ -13,18 +13,18 @@ exports.getBidiKeyValue = void 0;
 
 /* eslint-disable curly */
 
-const getBidiKeyValue = key => {
-  switch (key) {
+const getBidiKeyValue = keyName => {
+  switch (keyName) {
     case '\r':
     case '\n':
-      key = 'Enter';
+      keyName = 'Enter';
       break;
   }
   // Measures the number of code points rather than UTF-16 code units.
-  if ([...key].length === 1) {
-    return key;
+  if ([...keyName].length === 1) {
+    return keyName;
   }
-  switch (key) {
+  switch (keyName) {
     case 'Cancel':
       return '\uE001';
     case 'Help':
@@ -137,6 +137,8 @@ const getBidiKeyValue = key => {
       return '\uE052';
     case 'MetaRight':
       return '\uE053';
+    case 'Space':
+      return ' ';
     case 'Digit0':
       return '0';
     case 'Digit1':
@@ -232,7 +234,7 @@ const getBidiKeyValue = key => {
     case 'Quote':
       return '"';
     default:
-      throw new Error(`Unknown key: "${key}"`);
+      throw new Error(`Unknown key: "${keyName}"`);
   }
 };
 exports.getBidiKeyValue = getBidiKeyValue;

package/lib/server/bidi/third_party/firefoxPrefs.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.createProfile = createProfile;
 var _fs = _interopRequireDefault(require("fs"));
 var _path = _interopRequireDefault(require("path"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * @license
  * Copyright 2023 Google Inc.
@@ -47,6 +47,13 @@ function defaultProfilePreferences(extraPrefs) {
     // console
     // https://bugzilla.mozilla.org/show_bug.cgi?id=1543115
     'browser.dom.window.dump.enabled': true,
+    // Make sure newtab weather doesn't hit the network to retrieve weather data.
+    'browser.newtabpage.activity-stream.discoverystream.region-weather-config': '',
+    // Make sure newtab wallpapers don't hit the network to retrieve wallpaper data.
+    'browser.newtabpage.activity-stream.newtabWallpapers.enabled': false,
+    'browser.newtabpage.activity-stream.newtabWallpapers.v2.enabled': false,
+    // Make sure Topsites doesn't hit the network to retrieve sponsored tiles.
+    'browser.newtabpage.activity-stream.showSponsoredTopSites': false,
     // Disable topstories
     'browser.newtabpage.activity-stream.feeds.system.topstories': false,
     // Always display a blank page
@@ -112,6 +119,13 @@ function defaultProfilePreferences(extraPrefs) {
     // Disable slow script dialogues
     'dom.max_chrome_script_run_time': 0,
     'dom.max_script_run_time': 0,
+    // Disable background timer throttling to allow tests to run in parallel
+    // without a decrease in performance.
+    'dom.min_background_timeout_value': 0,
+    'dom.min_background_timeout_value_without_budget_throttling': 0,
+    'dom.timeout.enable_budget_timer_throttling': false,
+    // Disable HTTPS-First upgrades
+    'dom.security.https_first': false,
     // Only load extensions from the application and user profile
     // AddonManager.SCOPE_PROFILE + AddonManager.SCOPE_APPLICATION
     'extensions.autoDisableScopes': 0,
@@ -141,10 +155,14 @@ function defaultProfilePreferences(extraPrefs) {
     'hangmonitor.timeout': 0,
     // Show chrome errors and warnings in the error console
     'javascript.options.showInConsole': true,
+    // Do not throttle rendering (requestAnimationFrame) in background tabs
+    'layout.testing.top-level-always-active': true,
     // Disable download and usage of OpenH264: and Widevine plugins
     'media.gmp-manager.updateEnabled': false,
     // Disable the GFX sanity window
     'media.sanity-test.disabled': true,
+    // Disable connectivity service pings
+    'network.connectivity-service.enabled': false,
     // Disable experimental feature that is only available in Nightly
     'network.cookie.sameSite.laxByDefault': false,
     // Do not prompt for temporary redirects
@@ -169,8 +187,6 @@ function defaultProfilePreferences(extraPrefs) {
     'security.fileuri.strict_origin_policy': false,
     // Do not wait for the notification button security delay
     'security.notification_enable_delay': 0,
-    // Ensure blocklist updates do not hit the network
-    'services.settings.server': `http://${server}/dummy/blocklist/`,
     // Do not automatically fill sign-in forms with known usernames and
     // passwords
     'signon.autofillForms': false,

package/lib/server/browser.js

@@ -4,11 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Browser = void 0;
+var _artifact = require("./artifact");
 var _browserContext = require("./browserContext");
-var _page = require("./page");
 var _download = require("./download");
 var _instrumentation = require("./instrumentation");
-var _artifact = require("./artifact");
+var _page = require("./page");
 var _socksClientCertificatesInterceptor = require("./socksClientCertificatesInterceptor");
 /**
  * Copyright (c) Microsoft Corporation.

package/lib/server/browserContext.js

@@ -9,26 +9,29 @@ exports.normalizeProxySettings = normalizeProxySettings;
 exports.validateBrowserContextOptions = validateBrowserContextOptions;
 exports.verifyClientCertificates = verifyClientCertificates;
 exports.verifyGeolocation = verifyGeolocation;
-var _timeoutSettings = require("../common/timeoutSettings");
-var _utils = require("../utils");
-var _fileUtils = require("../utils/fileUtils");
-var _helper = require("./helper");
-var network = _interopRequireWildcard(require("./network"));
-var _page6 = require("./page");
-var _path = _interopRequireDefault(require("path"));
 var _fs = _interopRequireDefault(require("fs"));
-var _instrumentation = require("./instrumentation");
+var _path = _interopRequireDefault(require("path"));
+var _timeoutSettings = require("./timeoutSettings");
+var _crypto = require("./utils/crypto");
+var _debug = require("./utils/debug");
+var _clock = require("./clock");
 var _debugger = require("./debugger");
-var _tracing = require("./trace/recorder/tracing");
+var _fetch = require("./fetch");
+var _fileUtils = require("./utils/fileUtils");
 var _harRecorder = require("./har/harRecorder");
+var _helper = require("./helper");
+var _instrumentation = require("./instrumentation");
+var utilityScriptSerializers = _interopRequireWildcard(require("./isomorphic/utilityScriptSerializers"));
+var network = _interopRequireWildcard(require("./network"));
+var _page6 = require("./page");
 var _recorder = require("./recorder");
-var consoleApiSource = _interopRequireWildcard(require("../generated/consoleApiSource"));
-var _fetch = require("./fetch");
-var _clock = require("./clock");
 var _recorderApp = require("./recorder/recorderApp");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var storageScript = _interopRequireWildcard(require("./storageScript"));
+var consoleApiSource = _interopRequireWildcard(require("../generated/consoleApiSource"));
+var _tracing = require("./trace/recorder/tracing");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _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 && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * Copyright 2017 Google Inc. All rights reserved.
  * Modifications copyright (c) Microsoft Corporation.
@@ -102,7 +105,7 @@ 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('actions', this, _recorderApp.RecorderApp.factory(this), {
+    if ((0, _debug.debugMode)() === 'inspector') await _recorder.Recorder.show(this, _recorderApp.RecorderApp.factory(this), {
       pauseOnNextStatement: true
     });
 
@@ -111,7 +114,7 @@ class BrowserContext extends _instrumentation.SdkObject {
     this._debugger.on(_debugger.Debugger.Events.PausedStateChanged, () => {
       if (this._debugger.isPaused()) _recorder.Recorder.showInspectorNoReply(this, _recorderApp.RecorderApp.factory(this));
     });
-    if ((0, _utils.debugMode)() === 'console') await this.extendInjectedScript(consoleApiSource.source);
+    if ((0, _debug.debugMode)() === 'console') await this.extendInjectedScript(consoleApiSource.source);
     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);
   }
@@ -201,6 +204,9 @@ class BrowserContext extends _instrumentation.SdkObject {
     this._closePromiseFulfill(new Error('Context closed'));
     this.emit(BrowserContext.Events.Close);
   }
+  pages() {
+    return this.possiblyUninitializedPages().filter(page => page.initializedOrUndefined());
+  }
 
   // BrowserContext methods.
 
@@ -227,6 +233,9 @@ class BrowserContext extends _instrumentation.SdkObject {
   setHTTPCredentials(httpCredentials) {
     return this.doSetHTTPCredentials(httpCredentials);
   }
+  hasBinding(name) {
+    return this._pageBindings.has(name);
+  }
   async exposeBinding(name, needsHandle, playwrightBinding) {
     if (this._pageBindings.has(name)) throw new Error(`Function "${name}" has been already registered`);
     for (const page of this.pages()) {
@@ -266,27 +275,29 @@ class BrowserContext extends _instrumentation.SdkObject {
     this._timeoutSettings.setDefaultTimeout(timeout);
   }
   async _loadDefaultContextAsIs(progress) {
-    if (!this.pages().length) {
+    if (!this.possiblyUninitializedPages().length) {
       const waitForEvent = _helper.helper.waitForEvent(progress, this, BrowserContext.Events.Page);
       progress.cleanupWhenAborted(() => waitForEvent.dispose);
-      const page = await waitForEvent.promise;
-      if (page._pageIsError) throw page._pageIsError;
+      // Race against BrowserContext.close
+      await Promise.race([waitForEvent.promise, this._closePromise]);
     }
-    const pages = this.pages();
-    if (pages[0]._pageIsError) throw pages[0]._pageIsError;
-    await pages[0].mainFrame()._waitForLoadState(progress, 'load');
-    return pages;
+    const page = this.possiblyUninitializedPages()[0];
+    if (!page) return;
+    const pageOrError = await page.waitForInitializedOrError();
+    if (pageOrError instanceof Error) throw pageOrError;
+    await page.mainFrame()._waitForLoadState(progress, 'load');
+    return page;
   }
   async _loadDefaultContext(progress) {
-    const pages = await this._loadDefaultContextAsIs(progress);
+    const defaultPage = await this._loadDefaultContextAsIs(progress);
+    if (!defaultPage) return;
     const browserName = this._browser.options.name;
     if (this._options.isMobile && browserName === 'chromium' || this._options.locale && browserName === 'webkit') {
       // Workaround for:
       // - chromium fails to change isMobile for existing page;
       // - webkit fails to change locale for existing page.
-      const oldPage = pages[0];
       await this.newPage(progress.metadata);
-      await oldPage.close(progress.metadata);
+      await defaultPage.close(progress.metadata);
     }
   }
   _authenticateProxyViaHeader() {
@@ -319,8 +330,8 @@ class BrowserContext extends _instrumentation.SdkObject {
       password: password || ''
     };
   }
-  async addInitScript(source) {
-    const initScript = new _page6.InitScript(source);
+  async addInitScript(source, name) {
+    const initScript = new _page6.InitScript(source, false /* internal */, name);
     this.initScripts.push(initScript);
     await this.doAddInitScript(initScript);
   }
@@ -380,9 +391,9 @@ class BrowserContext extends _instrumentation.SdkObject {
     await this._closePromise;
   }
   async newPage(metadata) {
-    const pageDelegate = await this.newPageDelegate();
-    if (metadata.isServerSide) pageDelegate.potentiallyUninitializedPage().markAsServerSideOnly();
-    const pageOrError = await pageDelegate.pageOrError();
+    const page = await this.doCreateNewPage();
+    if (metadata.isServerSide) page.markAsServerSideOnly();
+    const pageOrError = await page.waitForInitializedOrError();
     if (pageOrError instanceof _page6.Page) {
       if (pageOrError.isClosed()) throw new Error('Page has been closed.');
       return pageOrError;
@@ -392,24 +403,25 @@ class BrowserContext extends _instrumentation.SdkObject {
   addVisitedOrigin(origin) {
     this._origins.add(origin);
   }
-  async storageState() {
+  async storageState(indexedDB = false) {
     const result = {
       cookies: await this.cookies(),
       origins: []
     };
     const originsToSave = new Set(this._origins);
+    const collectScript = `(${storageScript.collect})((${utilityScriptSerializers.source})(), ${this._browser.options.name === 'firefox'}, ${indexedDB})`;
 
     // 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({
+        var _storage$indexedDB;
+        const storage = await page.mainFrame().nonStallingEvaluateInExistingContext(collectScript, 'utility');
+        if (storage.localStorage.length || (_storage$indexedDB = storage.indexedDB) !== null && _storage$indexedDB !== void 0 && _storage$indexedDB.length) result.origins.push({
           origin,
-          localStorage: storage.localStorage
+          localStorage: storage.localStorage,
+          indexedDB: storage.indexedDB
         });
         originsToSave.delete(origin);
       } catch {
@@ -428,19 +440,17 @@ class BrowserContext extends _instrumentation.SdkObject {
         return true;
       });
       for (const origin of originsToSave) {
-        const originStorage = {
-          origin,
-          localStorage: []
-        };
+        var _storage$indexedDB2;
         const frame = page.mainFrame();
         await frame.goto(internalMetadata, origin);
-        const storage = await frame.evaluateExpression(`({
-          localStorage: Object.keys(localStorage).map(name => ({ name, value: localStorage.getItem(name) })),
-        })`, {
+        const storage = await frame.evaluateExpression(collectScript, {
           world: 'utility'
         });
-        originStorage.localStorage = storage.localStorage;
-        if (storage.localStorage.length) result.origins.push(originStorage);
+        if (storage.localStorage.length || (_storage$indexedDB2 = storage.indexedDB) !== null && _storage$indexedDB2 !== void 0 && _storage$indexedDB2.length) result.origins.push({
+          origin,
+          localStorage: storage.localStorage,
+          indexedDB: storage.indexedDB
+        });
       }
       await page.close(internalMetadata);
     }
@@ -498,14 +508,9 @@ class BrowserContext extends _instrumentation.SdkObject {
         for (const originState of state.origins) {
           const frame = page.mainFrame();
           await frame.goto(metadata, originState.origin);
-          await frame.evaluateExpression(`
-            originState => {
-              for (const { name, value } of (originState.localStorage || []))
-                localStorage.setItem(name, value);
-            }`, {
-            isFunction: true,
+          await frame.evaluateExpression(`(${storageScript.restore})(${JSON.stringify(originState)}, (${utilityScriptSerializers.source})())`, {
             world: 'utility'
-          }, originState);
+          });
         }
         await page.close(internalMetadata);
       }
@@ -526,7 +531,7 @@ class BrowserContext extends _instrumentation.SdkObject {
     await Promise.all(this.pages().map(page => page.safeNonStallingEvaluateInAllFrames(expression, world, options)));
   }
   async _harStart(page, options) {
-    const harId = (0, _utils.createGuid)();
+    const harId = (0, _crypto.createGuid)();
     this._harRecorders.set(harId, new _harRecorder.HarRecorder(this, page, options));
     return harId;
   }
@@ -651,7 +656,7 @@ function normalizeProxySettings(proxy) {
     bypass
   };
 }
-const paramsThatAllowContextReuse = ['colorScheme', 'forcedColors', 'reducedMotion', 'screen', 'userAgent', 'viewport'];
+const paramsThatAllowContextReuse = ['colorScheme', 'forcedColors', 'reducedMotion', 'contrast', 'screen', 'userAgent', 'viewport'];
 const defaultNewContextParamValues = {
   noDefaultViewport: false,
   ignoreHTTPSErrors: false,