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

package/lib/server/firefox/ffPage.js

@@ -4,22 +4,21 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.UTILITY_WORLD_NAME = exports.FFPage = void 0;
+var _eventsHelper = require("../utils/eventsHelper");
 var dialog = _interopRequireWildcard(require("../dialog"));
 var dom = _interopRequireWildcard(require("../dom"));
-var _eventsHelper = require("../../utils/eventsHelper");
 var _page = require("../page");
 var _ffAccessibility = require("./ffAccessibility");
 var _ffConnection = require("./ffConnection");
 var _ffExecutionContext = require("./ffExecutionContext");
 var _ffInput = require("./ffInput");
 var _ffNetworkManager = require("./ffNetworkManager");
-var _stackTrace = require("../../utils/stackTrace");
-var _debugLogger = require("../../utils/debugLogger");
-var _manualPromise = require("../../utils/manualPromise");
+var _debugLogger = require("../utils/debugLogger");
+var _stackTrace = require("../../utils/isomorphic/stackTrace");
 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); }
-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 2019 Google Inc. All rights reserved.
  * Modifications copyright (c) Microsoft Corporation.
@@ -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);
@@ -124,8 +109,7 @@ class FFPage {
     let worldName;
     if (auxData.name === UTILITY_WORLD_NAME) worldName = 'utility';else if (!auxData.name) worldName = 'main';else return;
     const context = new dom.FrameExecutionContext(delegate, frame, worldName);
-    context[contextDelegateSymbol] = delegate;
-    frame._contextCreated(worldName, context);
+    if (worldName) frame._contextCreated(worldName, context);
     this._contextIdToContext.set(executionContextId, context);
   }
   _onExecutionContextDestroyed(payload) {
@@ -201,7 +185,7 @@ class FFPage {
     const context = this._contextIdToContext.get(executionContextId);
     if (!context) return;
     // Juggler reports 'warn' for some internal messages generated by the browser.
-    this._page._addConsoleMessage(type === 'warn' ? 'warning' : type, args.map(arg => context.createHandle(arg)), location);
+    this._page._addConsoleMessage(type === 'warn' ? 'warning' : type, args.map(arg => (0, _ffExecutionContext.createHandle)(context, arg)), location);
   }
   _onDialogOpened(params) {
     this._page.emitOnContext(_browserContext.BrowserContext.Events.Dialog, new dialog.Dialog(this._page, params.type, params.message, async (accept, promptText) => {
@@ -213,7 +197,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);
@@ -226,7 +210,7 @@ class FFPage {
     } = payload;
     const context = this._contextIdToContext.get(executionContextId);
     if (!context) return;
-    const handle = context.createHandle(element).asElement();
+    const handle = (0, _ffExecutionContext.createHandle)(context, element).asElement();
     await this._page._onFileChooserOpened(handle);
   }
   async _onWorkerCreated(event) {
@@ -264,7 +248,7 @@ class FFPage {
         location
       } = event;
       const context = worker._existingExecutionContext;
-      this._page._addConsoleMessage(type, args.map(arg => context.createHandle(arg)), location);
+      this._page._addConsoleMessage(type, args.map(arg => (0, _ffExecutionContext.createHandle)(context, arg)), location);
     });
     // Note: we receive worker exceptions directly from the page.
   }
@@ -286,7 +270,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());
@@ -324,12 +308,14 @@ class FFPage {
     const colorScheme = emulatedMedia.colorScheme === 'no-override' ? undefined : emulatedMedia.colorScheme;
     const reducedMotion = emulatedMedia.reducedMotion === 'no-override' ? undefined : emulatedMedia.reducedMotion;
     const forcedColors = emulatedMedia.forcedColors === 'no-override' ? undefined : emulatedMedia.forcedColors;
+    const contrast = emulatedMedia.contrast === 'no-override' ? undefined : emulatedMedia.contrast;
     await this._session.send('Page.setEmulatedMedia', {
       // Empty string means reset.
       type: emulatedMedia.media === 'no-override' ? '' : emulatedMedia.media,
       colorScheme,
       reducedMotion,
-      forcedColors
+      forcedColors,
+      contrast
     });
   }
   async updateRequestInterception() {
@@ -435,9 +421,6 @@ class FFPage {
     });
     return ownerFrameId || null;
   }
-  isElementHandle(remoteObject) {
-    return remoteObject.subtype === 'node';
-  }
   async getBoundingBox(handle) {
     const quads = await this.getContentQuads(handle);
     if (!quads || !quads.length) return null;
@@ -507,9 +490,6 @@ class FFPage {
     if (!result) return null;
     return result.quads.map(quad => [quad.p1, quad.p2, quad.p3, quad.p4]);
   }
-  async setInputFiles(handle, files) {
-    await handle.evaluateInUtility(([injected, node, files]) => injected.setInputFiles(node, files), files);
-  }
   async setInputFilePaths(handle, files) {
     await this._session.send('Page.setFileInputFiles', {
       frameId: handle._context.frame._id,
@@ -521,10 +501,10 @@ class FFPage {
     const result = await this._session.send('Page.adoptNode', {
       frameId: handle._context.frame._id,
       objectId: handle._objectId,
-      executionContextId: to[contextDelegateSymbol]._executionContextId
+      executionContextId: to.delegate._executionContextId
     });
     if (!result.remoteObject) throw new Error(dom.kUnableToAdoptErrorMessage);
-    return to.createHandle(result.remoteObject);
+    return (0, _ffExecutionContext.createHandle)(to, result.remoteObject);
   }
   async getAccessibilityTree(needle) {
     return (0, _ffAccessibility.getAccessibilityTree)(this._session, needle);
@@ -543,10 +523,10 @@ class FFPage {
     const context = await parent._mainContext();
     const result = await this._session.send('Page.adoptNode', {
       frameId: frame._id,
-      executionContextId: context[contextDelegateSymbol]._executionContextId
+      executionContextId: context.delegate._executionContextId
     });
     if (!result.remoteObject) throw new Error('Frame has been detached.');
-    return context.createHandle(result.remoteObject);
+    return (0, _ffExecutionContext.createHandle)(context, result.remoteObject);
   }
   shouldToggleStyleSheetToSyncAnimations() {
     return false;
@@ -555,5 +535,4 @@ class FFPage {
 exports.FFPage = FFPage;
 function webSocketId(frameId, wsid) {
   return `${frameId}---${wsid}`;
-}
-const contextDelegateSymbol = Symbol('delegate');
+}

package/lib/server/firefox/firefox.js

@@ -4,15 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Firefox = void 0;
-var os = _interopRequireWildcard(require("os"));
+var _os = _interopRequireDefault(require("os"));
 var _path = _interopRequireDefault(require("path"));
 var _ffBrowser = require("./ffBrowser");
 var _ffConnection = require("./ffConnection");
+var _ascii = require("../utils/ascii");
 var _browserType = require("../browserType");
-var _utils = require("../../utils");
-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; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * Copyright 2017 Google Inc. All rights reserved.
  * Modifications copyright (c) Microsoft Corporation.
@@ -40,13 +38,13 @@ class Firefox extends _browserType.BrowserType {
   doRewriteStartupLog(error) {
     if (!error.logs) return error;
     // https://github.com/microsoft/playwright/issues/6500
-    if (error.logs.includes(`as root in a regular user's session is not supported.`)) error.logs = '\n' + (0, _utils.wrapInASCIIBox)(`Firefox is unable to launch if the $HOME folder isn't owned by the current user.\nWorkaround: Set the HOME=/root environment variable${process.env.GITHUB_ACTION ? ' in your GitHub Actions workflow file' : ''} when running Playwright.`, 1);
-    if (error.logs.includes('no DISPLAY environment variable specified')) error.logs = '\n' + (0, _utils.wrapInASCIIBox)(_browserType.kNoXServerRunningError, 1);
+    if (error.logs.includes(`as root in a regular user's session is not supported.`)) error.logs = '\n' + (0, _ascii.wrapInASCIIBox)(`Firefox is unable to launch if the $HOME folder isn't owned by the current user.\nWorkaround: Set the HOME=/root environment variable${process.env.GITHUB_ACTION ? ' in your GitHub Actions workflow file' : ''} when running Playwright.`, 1);
+    if (error.logs.includes('no DISPLAY environment variable specified')) error.logs = '\n' + (0, _ascii.wrapInASCIIBox)(_browserType.kNoXServerRunningError, 1);
     return error;
   }
   amendEnvironment(env, userDataDir, executable, browserArguments) {
-    if (!_path.default.isAbsolute(os.homedir())) throw new Error(`Cannot launch Firefox with relative home directory. Did you set ${os.platform() === 'win32' ? 'USERPROFILE' : 'HOME'} to a relative path?`);
-    if (os.platform() === 'linux') {
+    if (!_path.default.isAbsolute(_os.default.homedir())) throw new Error(`Cannot launch Firefox with relative home directory. Did you set ${_os.default.platform() === 'win32' ? 'USERPROFILE' : 'HOME'} to a relative path?`);
+    if (_os.default.platform() === 'linux') {
       // Always remove SNAP_NAME and SNAP_INSTANCE_NAME env variables since they
       // confuse Firefox: in our case, builds never come from SNAP.
       // See https://github.com/microsoft/playwright/issues/20555

package/lib/server/frameSelectors.js

@@ -4,8 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.FrameSelectors = void 0;
-var _selectorParser = require("../utils/isomorphic/selectorParser");
 var _utils = require("../utils");
+var _selectorParser = require("../utils/isomorphic/selectorParser");
 /**
  * Copyright (c) Microsoft Corporation.
  *

package/lib/server/frames.js

@@ -4,26 +4,27 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.NavigationAbortedError = exports.FrameManager = exports.Frame = void 0;
+var _browserContext = require("./browserContext");
 var dom = _interopRequireWildcard(require("./dom"));
+var _errors = require("./errors");
+var _fileUploadUtils = require("./fileUploadUtils");
+var _frameSelectors = require("./frameSelectors");
 var _helper = require("./helper");
-var _eventsHelper = require("../utils/eventsHelper");
+var _instrumentation = require("./instrumentation");
 var js = _interopRequireWildcard(require("./javascript"));
 var network = _interopRequireWildcard(require("./network"));
 var _page = require("./page");
-var types = _interopRequireWildcard(require("./types"));
-var _browserContext = require("./browserContext");
 var _progress = require("./progress");
+var types = _interopRequireWildcard(require("./types"));
 var _utils = require("../utils");
-var _manualPromise = require("../utils/manualPromise");
-var _debugLogger = require("../utils/debugLogger");
-var _instrumentation = require("./instrumentation");
 var _protocolError = require("./protocolError");
+var _debugLogger = require("./utils/debugLogger");
+var _eventsHelper = require("./utils/eventsHelper");
 var _selectorParser = require("../utils/isomorphic/selectorParser");
-var _frameSelectors = require("./frameSelectors");
-var _errors = require("./errors");
-var _fileUploadUtils = require("./fileUploadUtils");
+var _manualPromise = require("../utils/isomorphic/manualPromise");
+var _callLog = require("./callLog");
 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 2017 Google Inc. All rights reserved.
  * Modifications copyright (c) Microsoft Corporation.
@@ -195,6 +196,11 @@ class FrameManager {
   frameCommittedSameDocumentNavigation(frameId, url) {
     const frame = this._frames.get(frameId);
     if (!frame) return;
+    const pending = frame.pendingDocument();
+    if (pending && pending.documentId === undefined && pending.request === undefined) {
+      // WebKit has notified about the same-document navigation being requested, so clear it.
+      frame.setPendingDocument(undefined);
+    }
     frame._url = url;
     const navigationEvent = {
       url,
@@ -237,9 +243,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);
@@ -626,12 +631,12 @@ class Frame extends _instrumentation.SdkObject {
       return await this.waitForSelectorInternal(progress, selector, true, options, scope);
     }, this._page._timeoutSettings.timeout(options));
   }
-  async waitForSelectorInternal(progress, selector, performLocatorHandlersCheckpoint, options, scope) {
+  async waitForSelectorInternal(progress, selector, performActionPreChecks, options, scope) {
     const {
       state = 'visible'
     } = options;
     const promise = this.retryWithProgressAndTimeouts(progress, [0, 20, 50, 100, 100, 500], async continuePolling => {
-      if (performLocatorHandlersCheckpoint) await this._page.performLocatorHandlersCheckpoint(progress);
+      if (performActionPreChecks) await this._page.performActionPreChecks(progress);
       const resolved = await this.selectors.resolveInjectedForSelector(selector, options, scope);
       progress.throwIfAborted();
       if (!resolved) {
@@ -642,6 +647,7 @@ class Frame extends _instrumentation.SdkObject {
         info,
         root
       }) => {
+        if (root && !root.isConnected) throw injected.createStacklessError('Element is not attached to the DOM');
         const elements = injected.querySelectorAll(info.parsed, root || document);
         const element = elements[0];
         const visible = element ? injected.utils.isElementVisible(element) : false;
@@ -801,9 +807,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;
@@ -948,19 +954,21 @@ class Frame extends _instrumentation.SdkObject {
     // Retry upon all other errors.
     return false;
   }
-  async _retryWithProgressIfNotConnected(progress, selector, strict, performLocatorHandlersCheckpoint, action) {
+  async _retryWithProgressIfNotConnected(progress, selector, strict, performActionPreChecks, action) {
     progress.log(`waiting for ${this._asLocator(selector)}`);
     return this.retryWithProgressAndTimeouts(progress, [0, 20, 50, 100, 100, 500], async continuePolling => {
-      if (performLocatorHandlersCheckpoint) await this._page.performLocatorHandlersCheckpoint(progress);
+      if (performActionPreChecks) await this._page.performActionPreChecks(progress);
       const resolved = await this.selectors.resolveInjectedForSelector(selector, {
         strict
       });
       progress.throwIfAborted();
       if (!resolved) return continuePolling;
       const result = await resolved.injected.evaluateHandle((injected, {
-        info
+        info,
+        callId
       }) => {
         const elements = injected.querySelectorAll(info.parsed, document);
+        if (callId) injected.markTargetElements(new Set(elements), callId);
         const element = elements[0];
         let log = '';
         if (elements.length > 1) {
@@ -975,7 +983,8 @@ class Frame extends _instrumentation.SdkObject {
           element
         };
       }, {
-        info: resolved.info
+        info: resolved.info,
+        callId: progress.metadata.id
       });
       const {
         log,
@@ -1004,7 +1013,7 @@ class Frame extends _instrumentation.SdkObject {
     });
   }
   async rafrafTimeoutScreenshotElementWithProgress(progress, selector, timeout, options) {
-    return await this._retryWithProgressIfNotConnected(progress, selector, true /* strict */, true /* performLocatorHandlersCheckpoint */, async handle => {
+    return await this._retryWithProgressIfNotConnected(progress, selector, true /* strict */, true /* performActionPreChecks */, async handle => {
       await handle._frame.rafrafTimeout(timeout);
       return await this._page._screenshotter.screenshotElement(progress, handle, options);
     });
@@ -1012,7 +1021,7 @@ class Frame extends _instrumentation.SdkObject {
   async click(metadata, selector, options) {
     const controller = new _progress.ProgressController(metadata, this);
     return controller.run(async progress => {
-      return dom.assertDone(await this._retryWithProgressIfNotConnected(progress, selector, options.strict, !options.force /* performLocatorHandlersCheckpoint */, handle => handle._click(progress, {
+      return dom.assertDone(await this._retryWithProgressIfNotConnected(progress, selector, options.strict, !options.force /* performActionPreChecks */, handle => handle._click(progress, {
         ...options,
         waitAfter: !options.noWaitAfter
       })));
@@ -1021,13 +1030,13 @@ class Frame extends _instrumentation.SdkObject {
   async dblclick(metadata, selector, options = {}) {
     const controller = new _progress.ProgressController(metadata, this);
     return controller.run(async progress => {
-      return dom.assertDone(await this._retryWithProgressIfNotConnected(progress, selector, options.strict, !options.force /* performLocatorHandlersCheckpoint */, handle => handle._dblclick(progress, options)));
+      return dom.assertDone(await this._retryWithProgressIfNotConnected(progress, selector, options.strict, !options.force /* performActionPreChecks */, handle => handle._dblclick(progress, options)));
     }, this._page._timeoutSettings.timeout(options));
   }
   async dragAndDrop(metadata, source, target, options = {}) {
     const controller = new _progress.ProgressController(metadata, this);
     await controller.run(async progress => {
-      dom.assertDone(await this._retryWithProgressIfNotConnected(progress, source, options.strict, !options.force /* performLocatorHandlersCheckpoint */, async handle => {
+      dom.assertDone(await this._retryWithProgressIfNotConnected(progress, source, options.strict, !options.force /* performActionPreChecks */, async handle => {
         return handle._retryPointerAction(progress, 'move and down', false, async point => {
           await this._page.mouse.move(point.x, point.y);
           await this._page.mouse.down();
@@ -1039,7 +1048,7 @@ class Frame extends _instrumentation.SdkObject {
         });
       }));
       // Note: do not perform locator handlers checkpoint to avoid moving the mouse in the middle of a drag operation.
-      dom.assertDone(await this._retryWithProgressIfNotConnected(progress, target, options.strict, false /* performLocatorHandlersCheckpoint */, async handle => {
+      dom.assertDone(await this._retryWithProgressIfNotConnected(progress, target, options.strict, false /* performActionPreChecks */, async handle => {
         return handle._retryPointerAction(progress, 'move and up', false, async point => {
           await this._page.mouse.move(point.x, point.y);
           await this._page.mouse.up();
@@ -1056,25 +1065,25 @@ class Frame extends _instrumentation.SdkObject {
     if (!this._page._browserContext._options.hasTouch) throw new Error('The page does not support tap. Use hasTouch context option to enable touch support.');
     const controller = new _progress.ProgressController(metadata, this);
     return controller.run(async progress => {
-      return dom.assertDone(await this._retryWithProgressIfNotConnected(progress, selector, options.strict, !options.force /* performLocatorHandlersCheckpoint */, handle => handle._tap(progress, options)));
+      return dom.assertDone(await this._retryWithProgressIfNotConnected(progress, selector, options.strict, !options.force /* performActionPreChecks */, handle => handle._tap(progress, options)));
     }, this._page._timeoutSettings.timeout(options));
   }
   async fill(metadata, selector, value, options) {
     const controller = new _progress.ProgressController(metadata, this);
     return controller.run(async progress => {
-      return dom.assertDone(await this._retryWithProgressIfNotConnected(progress, selector, options.strict, !options.force /* performLocatorHandlersCheckpoint */, handle => handle._fill(progress, value, options)));
+      return dom.assertDone(await this._retryWithProgressIfNotConnected(progress, selector, options.strict, !options.force /* performActionPreChecks */, handle => handle._fill(progress, value, options)));
     }, this._page._timeoutSettings.timeout(options));
   }
   async focus(metadata, selector, options = {}) {
     const controller = new _progress.ProgressController(metadata, this);
     await controller.run(async progress => {
-      dom.assertDone(await this._retryWithProgressIfNotConnected(progress, selector, options.strict, true /* performLocatorHandlersCheckpoint */, handle => handle._focus(progress)));
+      dom.assertDone(await this._retryWithProgressIfNotConnected(progress, selector, options.strict, true /* performActionPreChecks */, handle => handle._focus(progress)));
     }, this._page._timeoutSettings.timeout(options));
   }
   async blur(metadata, selector, options = {}) {
     const controller = new _progress.ProgressController(metadata, this);
     await controller.run(async progress => {
-      dom.assertDone(await this._retryWithProgressIfNotConnected(progress, selector, options.strict, true /* performLocatorHandlersCheckpoint */, handle => handle._blur(progress)));
+      dom.assertDone(await this._retryWithProgressIfNotConnected(progress, selector, options.strict, true /* performActionPreChecks */, handle => handle._blur(progress)));
     }, this._page._timeoutSettings.timeout(options));
   }
   async textContent(metadata, selector, options = {}, scope) {
@@ -1127,7 +1136,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);
@@ -1145,8 +1155,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
@@ -1174,44 +1187,44 @@ class Frame extends _instrumentation.SdkObject {
   async hover(metadata, selector, options = {}) {
     const controller = new _progress.ProgressController(metadata, this);
     return controller.run(async progress => {
-      return dom.assertDone(await this._retryWithProgressIfNotConnected(progress, selector, options.strict, !options.force /* performLocatorHandlersCheckpoint */, handle => handle._hover(progress, options)));
+      return dom.assertDone(await this._retryWithProgressIfNotConnected(progress, selector, options.strict, !options.force /* performActionPreChecks */, handle => handle._hover(progress, options)));
     }, this._page._timeoutSettings.timeout(options));
   }
   async selectOption(metadata, selector, elements, values, options = {}) {
     const controller = new _progress.ProgressController(metadata, this);
     return controller.run(async progress => {
-      return await this._retryWithProgressIfNotConnected(progress, selector, options.strict, !options.force /* performLocatorHandlersCheckpoint */, handle => handle._selectOption(progress, elements, values, options));
+      return await this._retryWithProgressIfNotConnected(progress, selector, options.strict, !options.force /* performActionPreChecks */, handle => handle._selectOption(progress, elements, values, options));
     }, this._page._timeoutSettings.timeout(options));
   }
   async setInputFiles(metadata, selector, params) {
     const inputFileItems = await (0, _fileUploadUtils.prepareFilesForUpload)(this, params);
     const controller = new _progress.ProgressController(metadata, this);
     return controller.run(async progress => {
-      return dom.assertDone(await this._retryWithProgressIfNotConnected(progress, selector, params.strict, true /* performLocatorHandlersCheckpoint */, handle => handle._setInputFiles(progress, inputFileItems)));
+      return dom.assertDone(await this._retryWithProgressIfNotConnected(progress, selector, params.strict, true /* performActionPreChecks */, handle => handle._setInputFiles(progress, inputFileItems)));
     }, this._page._timeoutSettings.timeout(params));
   }
   async type(metadata, selector, text, options = {}) {
     const controller = new _progress.ProgressController(metadata, this);
     return controller.run(async progress => {
-      return dom.assertDone(await this._retryWithProgressIfNotConnected(progress, selector, options.strict, true /* performLocatorHandlersCheckpoint */, handle => handle._type(progress, text, options)));
+      return dom.assertDone(await this._retryWithProgressIfNotConnected(progress, selector, options.strict, true /* performActionPreChecks */, handle => handle._type(progress, text, options)));
     }, this._page._timeoutSettings.timeout(options));
   }
   async press(metadata, selector, key, options = {}) {
     const controller = new _progress.ProgressController(metadata, this);
     return controller.run(async progress => {
-      return dom.assertDone(await this._retryWithProgressIfNotConnected(progress, selector, options.strict, true /* performLocatorHandlersCheckpoint */, handle => handle._press(progress, key, options)));
+      return dom.assertDone(await this._retryWithProgressIfNotConnected(progress, selector, options.strict, true /* performActionPreChecks */, handle => handle._press(progress, key, options)));
     }, this._page._timeoutSettings.timeout(options));
   }
   async check(metadata, selector, options = {}) {
     const controller = new _progress.ProgressController(metadata, this);
     return controller.run(async progress => {
-      return dom.assertDone(await this._retryWithProgressIfNotConnected(progress, selector, options.strict, !options.force /* performLocatorHandlersCheckpoint */, handle => handle._setChecked(progress, true, options)));
+      return dom.assertDone(await this._retryWithProgressIfNotConnected(progress, selector, options.strict, !options.force /* performActionPreChecks */, handle => handle._setChecked(progress, true, options)));
     }, this._page._timeoutSettings.timeout(options));
   }
   async uncheck(metadata, selector, options = {}) {
     const controller = new _progress.ProgressController(metadata, this);
     return controller.run(async progress => {
-      return dom.assertDone(await this._retryWithProgressIfNotConnected(progress, selector, options.strict, !options.force /* performLocatorHandlersCheckpoint */, handle => handle._setChecked(progress, false, options)));
+      return dom.assertDone(await this._retryWithProgressIfNotConnected(progress, selector, options.strict, !options.force /* performActionPreChecks */, handle => handle._setChecked(progress, false, options)));
     }, this._page._timeoutSettings.timeout(options));
   }
   async waitForTimeout(metadata, timeout) {
@@ -1220,6 +1233,12 @@ class Frame extends _instrumentation.SdkObject {
       await new Promise(resolve => setTimeout(resolve, timeout));
     });
   }
+  async ariaSnapshot(metadata, selector, options = {}) {
+    const controller = new _progress.ProgressController(metadata, this);
+    return controller.run(async progress => {
+      return await this._retryWithProgressIfNotConnected(progress, selector, true /* strict */, true /* performActionPreChecks */, handle => handle.ariaSnapshot(options));
+    }, this._page._timeoutSettings.timeout(options));
+  }
   async expect(metadata, selector, options) {
     const result = await this._expectImpl(metadata, selector, options);
     // Library mode special case for the expect errors which are return values, not exceptions.
@@ -1243,7 +1262,7 @@ class Frame extends _instrumentation.SdkObject {
       await new _progress.ProgressController(metadata, this).run(async progress => {
         progress.log(`${metadata.apiName}${timeout ? ` with timeout ${timeout}ms` : ''}`);
         progress.log(`waiting for ${this._asLocator(selector)}`);
-        await this._page.performLocatorHandlersCheckpoint(progress);
+        await this._page.performActionPreChecks(progress);
       }, timeout);
 
       // Step 2: perform one-shot expect check without a timeout.
@@ -1264,7 +1283,7 @@ class Frame extends _instrumentation.SdkObject {
       }
       if (timeout < 0) return {
         matches: options.isNot,
-        log: metadata.log,
+        log: (0, _callLog.compressCallLog)(metadata.log),
         timedOut: true,
         received: lastIntermediateResult.received
       };
@@ -1272,7 +1291,7 @@ class Frame extends _instrumentation.SdkObject {
       // Step 3: auto-retry expect with increasing timeouts. Bounded by the total remaining time.
       return await new _progress.ProgressController(metadata, this).run(async progress => {
         return await this.retryWithProgressAndTimeouts(progress, [100, 250, 500, 1000], async continuePolling => {
-          await this._page.performLocatorHandlersCheckpoint(progress);
+          await this._page.performActionPreChecks(progress);
           const {
             matches,
             received
@@ -1295,7 +1314,7 @@ class Frame extends _instrumentation.SdkObject {
       if (js.isJavaScriptErrorInEvaluate(e) || (0, _selectorParser.isInvalidSelectorError)(e)) throw e;
       const result = {
         matches: options.isNot,
-        log: metadata.log
+        log: (0, _callLog.compressCallLog)(metadata.log)
       };
       if (lastIntermediateResult.isSet) result.received = lastIntermediateResult.received;
       if (e instanceof _errors.TimeoutError) result.timedOut = true;
@@ -1330,10 +1349,10 @@ class Frame extends _instrumentation.SdkObject {
       callId
     }) => {
       const elements = info ? injected.querySelectorAll(info.parsed, document) : [];
+      if (callId) injected.markTargetElements(new Set(elements), callId);
       const isArray = options.expression === 'to.have.count' || options.expression.endsWith('.array');
       let log = '';
       if (isArray) log = `  locator resolved to ${elements.length} element${elements.length === 1 ? '' : 's'}`;else if (elements.length > 1) throw injected.strictModeViolationError(info.parsed, elements);else if (elements.length) log = `  locator resolved to ${injected.previewNode(elements[0])}`;
-      if (callId) injected.markTargetElements(new Set(elements), callId);
       return {
         log,
         ...(await injected.expect(elements[0], options, elements))
@@ -1641,15 +1660,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;
 }