patchright-core 1.49.2 → 1.50.0

package/lib/server/dispatchers/webSocketRouteDispatcher.js

@@ -28,8 +28,6 @@ var _class;
  */
 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; }
-const kBindingInstalledSymbol = Symbol('webSocketRouteBindingInstalled');
-const kInitScriptInstalledSymbol = Symbol('webSocketRouteInitScriptInstalled');
 class WebSocketRouteDispatcher extends _dispatcher.Dispatcher {
   constructor(scope, id, url, frame) {
     super(scope, {
@@ -55,15 +53,16 @@ class WebSocketRouteDispatcher extends _dispatcher.Dispatcher {
       webSocketRoute: this
     });
   }
-  static async installIfNeeded(contextDispatcher, target) {
+  static async installIfNeeded(target) {
+    const kBindingName = '__pwWebSocketBinding';
     const context = target instanceof _page.Page ? target.context() : target;
-    if (!context[kBindingInstalledSymbol]) {
-      context[kBindingInstalledSymbol] = true;
-      await context.exposeBinding('__pwWebSocketBinding', false, (source, payload) => {
+    if (!context.hasBinding(kBindingName)) {
+      await context.exposeBinding(kBindingName, false, (source, payload) => {
         if (payload.type === 'onCreate') {
-          const pageDispatcher = _pageDispatcher.PageDispatcher.fromNullable(contextDispatcher, source.page);
+          const contextDispatcher = (0, _dispatcher.existingDispatcher)(context);
+          const pageDispatcher = contextDispatcher ? _pageDispatcher.PageDispatcher.fromNullable(contextDispatcher, source.page) : undefined;
           let scope;
-          if (pageDispatcher && matchesPattern(pageDispatcher, context._options.baseURL, payload.url)) scope = pageDispatcher;else if (matchesPattern(contextDispatcher, context._options.baseURL, payload.url)) scope = contextDispatcher;
+          if (pageDispatcher && matchesPattern(pageDispatcher, context._options.baseURL, payload.url)) scope = pageDispatcher;else if (contextDispatcher && matchesPattern(contextDispatcher, context._options.baseURL, payload.url)) scope = contextDispatcher;
           if (scope) {
             new WebSocketRouteDispatcher(scope, payload.id, payload.url, source.frame);
           } else {
@@ -96,15 +95,15 @@ class WebSocketRouteDispatcher extends _dispatcher.Dispatcher {
         });
       });
     }
-    if (!target[kInitScriptInstalledSymbol]) {
-      target[kInitScriptInstalledSymbol] = true;
+    const kInitScriptName = 'webSocketMockSource';
+    if (!target.initScripts.find(s => s.name === kInitScriptName)) {
       await target.addInitScript(`
         (() => {
           const module = {};
           ${webSocketMockSource.source}
           (module.exports.inject())(globalThis);
         })();
-      `);
+      `, kInitScriptName);
     }
   }
   async connect(params) {

package/lib/server/dom.js

@@ -7,6 +7,7 @@ exports.NonRecoverableDOMError = exports.FrameExecutionContext = exports.Element
 exports.assertDone = assertDone;
 exports.isNonRecoverableDOMError = isNonRecoverableDOMError;
 exports.kUnableToAdoptErrorMessage = void 0;
+exports.throwElementIsNotAttached = throwElementIsNotAttached;
 exports.throwRetargetableDOMError = throwRetargetableDOMError;
 var _fs = _interopRequireDefault(require("fs"));
 var injectedScriptSource = _interopRequireWildcard(require("../generated/injectedScriptSource"));
@@ -711,7 +712,8 @@ class ElementHandle extends js.JSHandle {
   async _setChecked(progress, state, options) {
     const isChecked = async () => {
       const result = await this.evaluateInUtility(([injected, node]) => injected.elementState(node, 'checked'), {});
-      return throwRetargetableDOMError(result);
+      if (result === 'error:notconnected' || result.received === 'error:notconnected') throwElementIsNotAttached();
+      return result.matches;
     };
     await this._markAsTargetElement(progress.metadata);
     if ((await isChecked()) === state) return 'done';
@@ -837,9 +839,12 @@ class ElementHandle extends js.JSHandle {
 }
 exports.ElementHandle = ElementHandle;
 function throwRetargetableDOMError(result) {
-  if (result === 'error:notconnected') throw new Error('Element is not attached to the DOM');
+  if (result === 'error:notconnected') throwElementIsNotAttached();
   return result;
 }
+function throwElementIsNotAttached() {
+  throw new Error('Element is not attached to the DOM');
+}
 function assertDone(result) {
   // This function converts 'done' to void and ensures typescript catches unhandled errors.
 }

package/lib/server/firefox/ffBrowser.js

@@ -132,13 +132,13 @@ class FFBrowser extends _browser.Browser {
 
     // Abort the navigation that turned into download.
     ffPage._page._frameManager.frameAbortedNavigation(payload.frameId, 'Download is starting');
-    let originPage = ffPage._initializedPage;
+    let originPage = ffPage._page.initializedOrUndefined();
     // If it's a new window download, report it on the opener page.
     if (!originPage) {
       // Resume the page creation with an error. The page will automatically close right
       // after the download begins.
       ffPage._markAsError(new Error('Starting new page download'));
-      if (ffPage._opener) originPage = ffPage._opener._initializedPage;
+      if (ffPage._opener) originPage = ffPage._opener._page.initializedOrUndefined();
     }
     if (!originPage) return;
     this._downloadCreated(originPage, payload.uuid, payload.url, payload.suggestedFileName);
@@ -268,10 +268,10 @@ class FFBrowserContext extends _browserContext.BrowserContext {
   _ffPages() {
     return Array.from(this._browser._ffPages.values()).filter(ffPage => ffPage._browserContext === this);
   }
-  pages() {
-    return this._ffPages().map(ffPage => ffPage._initializedPage).filter(pageOrNull => !!pageOrNull);
+  possiblyUninitializedPages() {
+    return this._ffPages().map(ffPage => ffPage._page);
   }
-  async newPageDelegate() {
+  async doCreateNewPage() {
     (0, _browserContext.assertBrowserContextIsNotOwned)(this);
     const {
       targetId
@@ -281,7 +281,7 @@ class FFBrowserContext extends _browserContext.BrowserContext {
       if (e.message.includes('Failed to override timezone')) throw new Error(`Invalid timezone ID: ${this._options.timezoneId}`);
       throw e;
     });
-    return this._browser._ffPages.get(targetId);
+    return this._browser._ffPages.get(targetId)._page;
   }
   async doGetCookies(urls) {
     const {

package/lib/server/firefox/ffInput.js

@@ -47,12 +47,18 @@ class RawKeyboardImpl {
     this._client = void 0;
     this._client = client;
   }
-  async keydown(modifiers, code, keyCode, keyCodeWithoutLocation, key, location, autoRepeat, text) {
+  async keydown(modifiers, keyName, description, autoRepeat) {
+    let text = description.text;
     // Firefox will figure out Enter by itself
     if (text === '\r') text = '';
+    const {
+      code,
+      key,
+      location
+    } = description;
     await this._client.send('Page.dispatchKeyEvent', {
       type: 'keydown',
-      keyCode: keyCodeWithoutLocation,
+      keyCode: description.keyCodeWithoutLocation,
       code,
       key,
       repeat: autoRepeat,
@@ -60,11 +66,16 @@ class RawKeyboardImpl {
       text
     });
   }
-  async keyup(modifiers, code, keyCode, keyCodeWithoutLocation, key, location) {
+  async keyup(modifiers, keyName, description) {
+    const {
+      code,
+      key,
+      location
+    } = description;
     await this._client.send('Page.dispatchKeyEvent', {
       type: 'keyup',
       key,
-      keyCode: keyCodeWithoutLocation,
+      keyCode: description.keyCodeWithoutLocation,
       code,
       location,
       repeat: false

package/lib/server/firefox/ffPage.js

@@ -15,7 +15,6 @@ var _ffInput = require("./ffInput");
 var _ffNetworkManager = require("./ffNetworkManager");
 var _stackTrace = require("../../utils/stackTrace");
 var _debugLogger = require("../../utils/debugLogger");
-var _manualPromise = require("../../utils/manualPromise");
 var _browserContext = require("../browserContext");
 var _errors = require("../errors");
 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); }
@@ -48,9 +47,7 @@ class FFPage {
     this._page = void 0;
     this._networkManager = void 0;
     this._browserContext = void 0;
-    this._pagePromise = new _manualPromise.ManualPromise();
-    this._initializedPage = null;
-    this._initializationFailed = false;
+    this._reportedAsNew = false;
     this._opener = void 0;
     this._contextIdToContext = void 0;
     this._eventListeners = void 0;
@@ -70,34 +67,22 @@ class FFPage {
     this._page.on(_page.Page.Events.FrameDetached, frame => this._removeContextsForFrame(frame));
     // TODO: remove Page.willOpenNewWindowAsynchronously from the protocol.
     this._eventListeners = [_eventsHelper.eventsHelper.addEventListener(this._session, 'Page.eventFired', this._onEventFired.bind(this)), _eventsHelper.eventsHelper.addEventListener(this._session, 'Page.frameAttached', this._onFrameAttached.bind(this)), _eventsHelper.eventsHelper.addEventListener(this._session, 'Page.frameDetached', this._onFrameDetached.bind(this)), _eventsHelper.eventsHelper.addEventListener(this._session, 'Page.navigationAborted', this._onNavigationAborted.bind(this)), _eventsHelper.eventsHelper.addEventListener(this._session, 'Page.navigationCommitted', this._onNavigationCommitted.bind(this)), _eventsHelper.eventsHelper.addEventListener(this._session, 'Page.navigationStarted', this._onNavigationStarted.bind(this)), _eventsHelper.eventsHelper.addEventListener(this._session, 'Page.sameDocumentNavigation', this._onSameDocumentNavigation.bind(this)), _eventsHelper.eventsHelper.addEventListener(this._session, 'Runtime.executionContextCreated', this._onExecutionContextCreated.bind(this)), _eventsHelper.eventsHelper.addEventListener(this._session, 'Runtime.executionContextDestroyed', this._onExecutionContextDestroyed.bind(this)), _eventsHelper.eventsHelper.addEventListener(this._session, 'Runtime.executionContextsCleared', this._onExecutionContextsCleared.bind(this)), _eventsHelper.eventsHelper.addEventListener(this._session, 'Page.linkClicked', event => this._onLinkClicked(event.phase)), _eventsHelper.eventsHelper.addEventListener(this._session, 'Page.uncaughtError', this._onUncaughtError.bind(this)), _eventsHelper.eventsHelper.addEventListener(this._session, 'Runtime.console', this._onConsole.bind(this)), _eventsHelper.eventsHelper.addEventListener(this._session, 'Page.dialogOpened', this._onDialogOpened.bind(this)), _eventsHelper.eventsHelper.addEventListener(this._session, 'Page.bindingCalled', this._onBindingCalled.bind(this)), _eventsHelper.eventsHelper.addEventListener(this._session, 'Page.fileChooserOpened', this._onFileChooserOpened.bind(this)), _eventsHelper.eventsHelper.addEventListener(this._session, 'Page.workerCreated', this._onWorkerCreated.bind(this)), _eventsHelper.eventsHelper.addEventListener(this._session, 'Page.workerDestroyed', this._onWorkerDestroyed.bind(this)), _eventsHelper.eventsHelper.addEventListener(this._session, 'Page.dispatchMessageFromWorker', this._onDispatchMessageFromWorker.bind(this)), _eventsHelper.eventsHelper.addEventListener(this._session, 'Page.crashed', this._onCrashed.bind(this)), _eventsHelper.eventsHelper.addEventListener(this._session, 'Page.videoRecordingStarted', this._onVideoRecordingStarted.bind(this)), _eventsHelper.eventsHelper.addEventListener(this._session, 'Page.webSocketCreated', this._onWebSocketCreated.bind(this)), _eventsHelper.eventsHelper.addEventListener(this._session, 'Page.webSocketClosed', this._onWebSocketClosed.bind(this)), _eventsHelper.eventsHelper.addEventListener(this._session, 'Page.webSocketFrameReceived', this._onWebSocketFrameReceived.bind(this)), _eventsHelper.eventsHelper.addEventListener(this._session, 'Page.webSocketFrameSent', this._onWebSocketFrameSent.bind(this)), _eventsHelper.eventsHelper.addEventListener(this._session, 'Page.screencastFrame', this._onScreencastFrame.bind(this))];
-    this._session.once('Page.ready', async () => {
-      await this._page.initOpener(this._opener);
-      if (this._initializationFailed) return;
-      // Note: it is important to call |reportAsNew| before resolving pageOrError promise,
-      // so that anyone who awaits pageOrError got a ready and reported page.
-      this._initializedPage = this._page;
-      this._page.reportAsNew();
-      this._pagePromise.resolve(this._page);
+    this._session.once('Page.ready', () => {
+      var _this$_opener;
+      if (this._reportedAsNew) return;
+      this._reportedAsNew = true;
+      this._page.reportAsNew((_this$_opener = this._opener) === null || _this$_opener === void 0 ? void 0 : _this$_opener._page);
     });
     // Ideally, we somehow ensure that utility world is created before Page.ready arrives, but currently it is racy.
     // Therefore, we can end up with an initialized page without utility world, although very unlikely.
     this.addInitScript(new _page.InitScript('', true), UTILITY_WORLD_NAME).catch(e => this._markAsError(e));
   }
-  potentiallyUninitializedPage() {
-    return this._page;
-  }
   async _markAsError(error) {
-    // Same error may be report twice: channer disconnected and session.send fails.
-    if (this._initializationFailed) return;
-    this._initializationFailed = true;
-    if (!this._initializedPage) {
-      await this._page.initOpener(this._opener);
-      this._page.reportAsNew(error);
-      this._pagePromise.resolve(error);
-    }
-  }
-  async pageOrError() {
-    return this._pagePromise;
+    var _this$_opener2;
+    // Same error may be reported twice: channel disconnected and session.send fails.
+    if (this._reportedAsNew) return;
+    this._reportedAsNew = true;
+    this._page.reportAsNew((_this$_opener2 = this._opener) === null || _this$_opener2 === void 0 ? void 0 : _this$_opener2._page, error);
   }
   _onWebSocketCreated(event) {
     this._page._frameManager.onWebSocketCreated(webSocketId(event.frameId, event.wsid), event.requestURL);
@@ -213,7 +198,7 @@ class FFPage {
     }, params.defaultValue));
   }
   async _onBindingCalled(event) {
-    const pageOrError = await this.pageOrError();
+    const pageOrError = await this._page.waitForInitializedOrError();
     if (!(pageOrError instanceof Error)) {
       const context = this._contextIdToContext.get(event.executionContextId);
       if (context) await this._page._onBindingCalled(event.payload, context);
@@ -286,7 +271,7 @@ class FFPage {
     this._page._didCrash();
   }
   _onVideoRecordingStarted(event) {
-    this._browserContext._browser._videoStarted(this._browserContext, event.screencastId, event.file, this.pageOrError());
+    this._browserContext._browser._videoStarted(this._browserContext, event.screencastId, event.file, this._page.waitForInitializedOrError());
   }
   didClose() {
     this._markAsError(new _errors.TargetClosedError());

package/lib/server/frames.js

@@ -248,9 +248,8 @@ class FrameManager {
       request
     });
     if (request._isFavicon) {
-      route === null || route === void 0 || route.continue({
-        isFallback: true
-      }).catch(() => {});
+      // Abort favicon requests to avoid network access in case of interception.
+      route === null || route === void 0 || route.abort('aborted').catch(() => {});
       return;
     }
     this._page.emitOnContext(_browserContext.BrowserContext.Events.Request, request);
@@ -915,9 +914,9 @@ class Frame extends _instrumentation.SdkObject {
     return this._url;
   }
   origin() {
-    var _network$parsedURL;
+    var _network$parseURL;
     if (!this._url.startsWith('http')) return;
-    return (_network$parsedURL = network.parsedURL(this._url)) === null || _network$parsedURL === void 0 ? void 0 : _network$parsedURL.origin;
+    return (_network$parseURL = network.parseURL(this._url)) === null || _network$parseURL === void 0 ? void 0 : _network$parseURL.origin;
   }
   parentFrame() {
     return this._parentFrame;
@@ -1244,7 +1243,8 @@ class Frame extends _instrumentation.SdkObject {
     }, {
       state
     }, options, scope);
-    return dom.throwRetargetableDOMError(result);
+    if (result.received === 'error:notconnected') dom.throwElementIsNotAttached();
+    return result.matches;
   }
   async isVisible(metadata, selector, options = {}, scope) {
     const controller = new _progress.ProgressController(metadata, this);
@@ -1262,8 +1262,11 @@ class Frame extends _instrumentation.SdkObject {
         root
       }) => {
         const element = injected.querySelector(info.parsed, root || document, info.strict);
-        const state = element ? injected.elementState(element, 'visible') : false;
-        return state === 'error:notconnected' ? false : state;
+        const state = element ? injected.elementState(element, 'visible') : {
+          matches: false,
+          received: 'error:notconnected'
+        };
+        return state.matches;
       }, {
         info: resolved.info,
         root: resolved.frame === this ? scope : undefined
@@ -1719,21 +1722,23 @@ class Frame extends _instrumentation.SdkObject {
     return (0, _utils.asLocator)(this._page.attribution.playwright.options.sdkLanguage, selector);
   }
   async _getFrameMainFrameContextId(client) {
-    var globalDocument = await client._sendMayFail("DOM.getFrameOwner", {
-      frameId: this._id
-    });
-    if (globalDocument && globalDocument.nodeId) {
-      var descibedNode = await client._sendMayFail("DOM.describeNode", {
-        backendNodeId: globalDocument.backendNodeId
+    try {
+      var globalDocument = await client._sendMayFail("DOM.getFrameOwner", {
+        frameId: this._id
       });
-      if (descibedNode) {
-        var resolvedNode = await client._sendMayFail("DOM.resolveNode", {
-          nodeId: descibedNode.node.contentDocument.nodeId
+      if (globalDocument && globalDocument.nodeId) {
+        var describedNode = await client._sendMayFail("DOM.describeNode", {
+          backendNodeId: globalDocument.backendNodeId
         });
-        var _executionContextId = parseInt(resolvedNode.object.objectId.split(".")[1], 10);
-        return _executionContextId;
+        if (describedNode) {
+          var resolvedNode = await client._sendMayFail("DOM.resolveNode", {
+            nodeId: describedNode.node.contentDocument.nodeId
+          });
+          var _executionContextId = parseInt(resolvedNode.object.objectId.split(".")[1], 10);
+          return _executionContextId;
+        }
       }
-    }
+    } catch (e) {}
     return 0;
   }
 }
@@ -1782,16 +1787,6 @@ function verifyLifecycle(name, waitUntil) {
   return waitUntil;
 }
 function renderUnexpectedValue(expression, received) {
-  if (expression === 'to.be.checked') return received ? 'checked' : 'unchecked';
-  if (expression === 'to.be.unchecked') return received ? 'unchecked' : 'checked';
-  if (expression === 'to.be.visible') return received ? 'visible' : 'hidden';
-  if (expression === 'to.be.hidden') return received ? 'hidden' : 'visible';
-  if (expression === 'to.be.enabled') return received ? 'enabled' : 'disabled';
-  if (expression === 'to.be.disabled') return received ? 'disabled' : 'enabled';
-  if (expression === 'to.be.editable') return received ? 'editable' : 'readonly';
-  if (expression === 'to.be.readonly') return received ? 'readonly' : 'editable';
-  if (expression === 'to.be.empty') return received ? 'empty' : 'not empty';
-  if (expression === 'to.be.focused') return received ? 'focused' : 'not focused';
   if (expression === 'to.match.aria') return received ? received.raw : received;
   return received;
 }

package/lib/server/har/harTracer.js

@@ -196,7 +196,7 @@ class HarTracer {
     if (!this._shouldIncludeEntryWithUrl(request.url())) return;
     const page = (_request$frame = request.frame()) === null || _request$frame === void 0 ? void 0 : _request$frame._page;
     if (this._page && page !== this._page) return;
-    const url = network.parsedURL(request.url());
+    const url = network.parseURL(request.url());
     if (!url) return;
     const pageEntry = this._createPageEntryIfNeeded(page);
     const harEntry = createHarEntry(request.method(), url, (_request$frame2 = request.frame()) === null || _request$frame2 === void 0 ? void 0 : _request$frame2.guid, this._options);

package/lib/server/input.js

@@ -40,8 +40,7 @@ class Keyboard {
     const autoRepeat = this._pressedKeys.has(description.code);
     this._pressedKeys.add(description.code);
     if (kModifiers.includes(description.key)) this._pressedModifiers.add(description.key);
-    const text = description.text;
-    await this._raw.keydown(this._pressedModifiers, description.code, description.keyCode, description.keyCodeWithoutLocation, description.key, description.location, autoRepeat, text);
+    await this._raw.keydown(this._pressedModifiers, key, description, autoRepeat);
   }
   _keyDescriptionForString(str) {
     const keyString = resolveSmartModifierString(str);
@@ -61,7 +60,7 @@ class Keyboard {
     const description = this._keyDescriptionForString(key);
     if (kModifiers.includes(description.key)) this._pressedModifiers.delete(description.key);
     this._pressedKeys.delete(description.code);
-    await this._raw.keyup(this._pressedModifiers, description.code, description.keyCode, description.keyCodeWithoutLocation, description.key, description.location);
+    await this._raw.keyup(this._pressedModifiers, key, description);
   }
   async insertText(text) {
     await this._raw.sendText(text);

package/lib/server/network.js

@@ -7,7 +7,7 @@ exports.WebSocket = exports.Route = exports.Response = exports.Request = void 0;
 exports.filterCookies = filterCookies;
 exports.kMaxCookieExpiresDateInSeconds = void 0;
 exports.mergeHeaders = mergeHeaders;
-exports.parsedURL = parsedURL;
+exports.parseURL = parseURL;
 exports.rewriteCookies = rewriteCookies;
 exports.singleHeader = singleHeader;
 exports.statusText = statusText;
@@ -75,7 +75,7 @@ function rewriteCookies(cookies) {
     return copy;
   });
 }
-function parsedURL(url) {
+function parseURL(url) {
   try {
     return new URL(url);
   } catch (e) {

package/lib/server/page.js

@@ -47,7 +47,8 @@ class Page extends _instrumentation.SdkObject {
     super(browserContext, 'page');
     this._closedState = 'open';
     this._closedPromise = new _manualPromise.ManualPromise();
-    this._initialized = false;
+    this._initialized = void 0;
+    this._initializedPromise = new _manualPromise.ManualPromise();
     this._eventsToEmitAfterInitialized = [];
     this._crashed = false;
     this.openScope = new _utils.LongStandingScope();
@@ -72,7 +73,6 @@ class Page extends _instrumentation.SdkObject {
     this._clientRequestInterceptor = void 0;
     this._serverRequestInterceptor = void 0;
     this._ownedContext = void 0;
-    this._pageIsError = void 0;
     this._video = null;
     this._opener = void 0;
     this._isServerSideOnly = false;
@@ -96,19 +96,21 @@ class Page extends _instrumentation.SdkObject {
     if (delegate.pdf) this.pdf = delegate.pdf.bind(delegate);
     this.coverage = delegate.coverage ? delegate.coverage() : null;
   }
-  async initOpener(opener) {
-    if (!opener) return;
-    const openerPage = await opener.pageOrError();
-    if (openerPage instanceof Page && !openerPage.isClosed()) this._opener = openerPage;
+  async reportAsNew(opener, error = undefined, contextEvent = _browserContext.BrowserContext.Events.Page) {
+    if (opener) {
+      const openerPageOrError = await opener.waitForInitializedOrError();
+      if (openerPageOrError instanceof Page && !openerPageOrError.isClosed()) this._opener = openerPageOrError;
+    }
+    this._markInitialized(error, contextEvent);
   }
-  reportAsNew(error = undefined, contextEvent = _browserContext.BrowserContext.Events.Page) {
+  _markInitialized(error = undefined, contextEvent = _browserContext.BrowserContext.Events.Page) {
     if (error) {
       // Initialization error could have happened because of
       // context/browser closure. Just ignore the page.
       if (this._browserContext.isClosingOrClosed()) return;
-      this._setIsError(error);
+      this._frameManager.createDummyMainFrameIfNeeded();
     }
-    this._initialized = true;
+    this._initialized = error || this;
     this.emitOnContext(contextEvent, this);
     for (const {
       event,
@@ -120,10 +122,17 @@ class Page extends _instrumentation.SdkObject {
     // in that case we fire another Close event to ensure that each reported Page will have
     // corresponding Close event after it is reported on the context.
     if (this.isClosed()) this.emit(Page.Events.Close);else this.instrumentation.onPageOpen(this);
+
+    // Note: it is important to resolve _initializedPromise at the end,
+    // so that anyone who awaits waitForInitializedOrError got a ready and reported page.
+    this._initializedPromise.resolve(this._initialized);
   }
   initializedOrUndefined() {
     return this._initialized ? this : undefined;
   }
+  waitForInitializedOrError() {
+    return this._initializedPromise;
+  }
   emitOnContext(event, ...args) {
     if (this._isServerSideOnly) return;
     this._browserContext.emit(event, ...args);
@@ -407,8 +416,8 @@ class Page extends _instrumentation.SdkObject {
   async bringToFront() {
     await this._delegate.bringToFront();
   }
-  async addInitScript(source) {
-    const initScript = new InitScript(source);
+  async addInitScript(source, name) {
+    const initScript = new InitScript(source, false /* internal */, name);
     this.initScripts.push(initScript);
     await this._delegate.addInitScript(initScript);
   }
@@ -532,10 +541,6 @@ class Page extends _instrumentation.SdkObject {
     if (!runBeforeUnload) await this._closedPromise;
     if (this._ownedContext) await this._ownedContext.close(options);
   }
-  _setIsError(error) {
-    this._pageIsError = error;
-    this._frameManager.createDummyMainFrameIfNeeded();
-  }
   isClosed() {
     return this._closedState === 'closed';
   }
@@ -778,12 +783,14 @@ function addPageBinding(bindingName, needsHandle, utilityScriptSerializers) {
   };
 }
 class InitScript {
-  constructor(source, internal) {
+  constructor(source, internal, name) {
     this.source = void 0;
     this.internal = void 0;
+    this.name = void 0;
     const guid = (0, _utils.createGuid)();
     this.source = `(() => { ${source} })();`;
     this.internal = !!internal;
+    this.name = name;
   }
 }
 exports.InitScript = InitScript;