@checkly/playwright-core 1.41.21 → 1.41.23

package/lib/server/dispatchers/localUtilsDispatcher.js

@@ -209,7 +209,7 @@ class LocalUtilsDispatcher extends _dispatcher.Dispatcher {
         transport.send(message);
       });
       transport.onclose = () => {
-        socksInterceptor === null || socksInterceptor === void 0 ? void 0 : socksInterceptor.cleanup();
+        socksInterceptor === null || socksInterceptor === void 0 || socksInterceptor.cleanup();
         pipe.wasClosed();
       };
       pipe.on('close', () => transport.close());
@@ -360,7 +360,7 @@ class HarBackend {
   }
   dispose() {
     var _this$_zipFile;
-    (_this$_zipFile = this._zipFile) === null || _this$_zipFile === void 0 ? void 0 : _this$_zipFile.close();
+    (_this$_zipFile = this._zipFile) === null || _this$_zipFile === void 0 || _this$_zipFile.close();
   }
 }
 function countMatchingHeaders(harHeaders, headers) {
@@ -374,7 +374,7 @@ function countMatchingHeaders(harHeaders, headers) {
 async function urlToWSEndpoint(progress, endpointURL) {
   var _progress$timeUntilDe;
   if (endpointURL.startsWith('ws')) return endpointURL;
-  progress === null || progress === void 0 ? void 0 : progress.log(`<ws preparing> retrieving websocket url from ${endpointURL}`);
+  progress === null || progress === void 0 || progress.log(`<ws preparing> retrieving websocket url from ${endpointURL}`);
   const fetchUrl = new URL(endpointURL);
   if (!fetchUrl.pathname.endsWith('/')) fetchUrl.pathname += '/';
   fetchUrl.pathname += 'json';
@@ -388,7 +388,7 @@ async function urlToWSEndpoint(progress, endpointURL) {
   }, async (params, response) => {
     return new Error(`Unexpected status ${response.statusCode} when connecting to ${fetchUrl.toString()}.\n` + `This does not look like a Playwright server, try connecting via ws://.`);
   });
-  progress === null || progress === void 0 ? void 0 : progress.throwIfAborted();
+  progress === null || progress === void 0 || progress.throwIfAborted();
   const wsUrl = new URL(endpointURL);
   let wsEndpointPath = JSON.parse(json).wsEndpointPath;
   if (wsEndpointPath.startsWith('/')) wsEndpointPath = wsEndpointPath.substring(1);

package/lib/server/dispatchers/pageDispatcher.js

@@ -75,6 +75,9 @@ class PageDispatcher extends _dispatcher.Dispatcher {
     }));
     this.addObjectListener(_page.Page.Events.FrameAttached, frame => this._onFrameAttached(frame));
     this.addObjectListener(_page.Page.Events.FrameDetached, frame => this._onFrameDetached(frame));
+    this.addObjectListener(_page.Page.Events.LocatorHandlerTriggered, uid => this._dispatchEvent('locatorHandlerTriggered', {
+      uid
+    }));
     this.addObjectListener(_page.Page.Events.WebSocket, webSocket => this._dispatchEvent('webSocket', {
       webSocket: new _networkDispatchers.WebSocketDispatcher(this, webSocket)
     }));
@@ -130,6 +133,15 @@ class PageDispatcher extends _dispatcher.Dispatcher {
       response: _networkDispatchers.ResponseDispatcher.fromNullable(this.parentScope(), await this._page.goForward(metadata, params))
     };
   }
+  async registerLocatorHandler(params, metadata) {
+    const uid = this._page.registerLocatorHandler(params.selector);
+    return {
+      uid
+    };
+  }
+  async resolveLocatorHandlerNoReply(params, metadata) {
+    this._page.resolveLocatorHandler(params.uid);
+  }
   async emulateMedia(params, metadata) {
     await this._page.emulateMedia({
       media: params.media,
@@ -160,8 +172,7 @@ class PageDispatcher extends _dispatcher.Dispatcher {
     });
   }
   async expectScreenshot(params, metadata) {
-    var _params$screenshotOpt, _params$comparatorOpt;
-    const mask = (((_params$screenshotOpt = params.screenshotOptions) === null || _params$screenshotOpt === void 0 ? void 0 : _params$screenshotOpt.mask) || []).map(({
+    const mask = (params.mask || []).map(({
       frame,
       selector
     }) => ({
@@ -175,14 +186,7 @@ class PageDispatcher extends _dispatcher.Dispatcher {
     return await this._page.expectScreenshot(metadata, {
       ...params,
       locator,
-      comparatorOptions: {
-        ...params.comparatorOptions,
-        _comparator: (_params$comparatorOpt = params.comparatorOptions) === null || _params$comparatorOpt === void 0 ? void 0 : _params$comparatorOpt.comparator
-      },
-      screenshotOptions: {
-        ...params.screenshotOptions,
-        mask
-      }
+      mask
     });
   }
   async screenshot(params, metadata) {

package/lib/server/dispatchers/playwrightDispatcher.js

@@ -81,23 +81,23 @@ class SocksSupportDispatcher extends _dispatcher.Dispatcher {
   }
   async socksConnected(params) {
     var _this$_socksProxy;
-    (_this$_socksProxy = this._socksProxy) === null || _this$_socksProxy === void 0 ? void 0 : _this$_socksProxy.socketConnected(params);
+    (_this$_socksProxy = this._socksProxy) === null || _this$_socksProxy === void 0 || _this$_socksProxy.socketConnected(params);
   }
   async socksFailed(params) {
     var _this$_socksProxy2;
-    (_this$_socksProxy2 = this._socksProxy) === null || _this$_socksProxy2 === void 0 ? void 0 : _this$_socksProxy2.socketFailed(params);
+    (_this$_socksProxy2 = this._socksProxy) === null || _this$_socksProxy2 === void 0 || _this$_socksProxy2.socketFailed(params);
   }
   async socksData(params) {
     var _this$_socksProxy3;
-    (_this$_socksProxy3 = this._socksProxy) === null || _this$_socksProxy3 === void 0 ? void 0 : _this$_socksProxy3.sendSocketData(params);
+    (_this$_socksProxy3 = this._socksProxy) === null || _this$_socksProxy3 === void 0 || _this$_socksProxy3.sendSocketData(params);
   }
   async socksError(params) {
     var _this$_socksProxy4;
-    (_this$_socksProxy4 = this._socksProxy) === null || _this$_socksProxy4 === void 0 ? void 0 : _this$_socksProxy4.sendSocketError(params);
+    (_this$_socksProxy4 = this._socksProxy) === null || _this$_socksProxy4 === void 0 || _this$_socksProxy4.sendSocketError(params);
   }
   async socksEnd(params) {
     var _this$_socksProxy5;
-    (_this$_socksProxy5 = this._socksProxy) === null || _this$_socksProxy5 === void 0 ? void 0 : _this$_socksProxy5.sendSocketEnd(params);
+    (_this$_socksProxy5 = this._socksProxy) === null || _this$_socksProxy5 === void 0 || _this$_socksProxy5.sendSocketEnd(params);
   }
   _onDispose() {
     _eventsHelper.eventsHelper.removeEventListeners(this._socksListeners);

package/lib/server/dispatchers/writableStreamDispatcher.js

@@ -7,8 +7,8 @@ exports.WritableStreamDispatcher = void 0;
 var _dispatcher = require("./dispatcher");
 var fs = _interopRequireWildcard(require("fs"));
 var _utils = require("../../utils");
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+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; }
 /**
  * Copyright (c) Microsoft Corporation.
  *

package/lib/server/dom.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.NonRecoverableDOMError = exports.InjectedScriptPollHandler = exports.FrameExecutionContext = exports.ElementHandle = void 0;
+exports.NonRecoverableDOMError = exports.FrameExecutionContext = exports.ElementHandle = void 0;
 exports.assertDone = assertDone;
 exports.isNonRecoverableDOMError = isNonRecoverableDOMError;
 exports.kUnableToAdoptErrorMessage = void 0;
@@ -14,8 +14,8 @@ var js = _interopRequireWildcard(require("./javascript"));
 var _progress = require("./progress");
 var _utils = require("../utils");
 var _fileUploadUtils = require("./fileUploadUtils");
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+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; }
 /**
  * Copyright (c) Microsoft Corporation.
  *
@@ -136,17 +136,6 @@ class ElementHandle extends js.JSHandle {
       return 'error:notconnected';
     }
   }
-  async evaluatePoll(progress, pageFunction, arg) {
-    try {
-      const utility = await this._frame._utilityContext();
-      const poll = await utility.evaluateHandle(pageFunction, [await utility.injectedScript(), this, arg]);
-      const pollHandler = new InjectedScriptPollHandler(progress, poll);
-      return await pollHandler.finish();
-    } catch (e) {
-      if (js.isJavaScriptErrorInEvaluate(e) || (0, _protocolError.isSessionClosedError)(e)) throw e;
-      return 'error:notconnected';
-    }
-  }
   async ownerFrame() {
     const frameId = await this._page._delegate.getOwnerFrame(this);
     if (!frameId) return null;
@@ -188,25 +177,19 @@ class ElementHandle extends js.JSHandle {
     return await this._page._delegate.scrollRectIntoViewIfNeeded(this, rect);
   }
   async _waitAndScrollIntoViewIfNeeded(progress, waitForVisible) {
-    const timeouts = [0, 50, 100, 250];
-    while (progress.isRunning()) {
-      assertDone(throwRetargetableDOMError(await this._waitForElementStates(progress, waitForVisible ? ['visible', 'stable'] : ['stable'], false /* force */)));
-      progress.throwIfAborted(); // Avoid action that has side-effects.
-      const result = throwRetargetableDOMError(await this._scrollRectIntoViewIfNeeded());
-      if (result === 'error:notvisible') {
-        if (!waitForVisible) {
-          var _timeouts$shift;
-          // Wait for a timeout to avoid retrying too often when not waiting for visible.
-          // If we wait for visible, this should be covered by _waitForElementStates instead.
-          const timeout = (_timeouts$shift = timeouts.shift()) !== null && _timeouts$shift !== void 0 ? _timeouts$shift : 500;
-          progress.log(`  element is not displayed, retrying in ${timeout}ms`);
-          await new Promise(f => setTimeout(f, timeout));
-        }
-        continue;
-      }
-      assertDone(result);
-      return;
-    }
+    const result = await this._retryAction(progress, 'scroll into view', async () => {
+      progress.log(`  waiting for element to be stable`);
+      const waitResult = await this.evaluateInUtility(async ([injected, node, {
+        waitForVisible
+      }]) => {
+        return await injected.checkElementStates(node, waitForVisible ? ['visible', 'stable'] : ['stable']);
+      }, {
+        waitForVisible
+      });
+      if (waitResult) return waitResult;
+      return await this._scrollRectIntoViewIfNeeded();
+    }, {});
+    assertDone(throwRetargetableDOMError(result));
   }
   async scrollIntoViewIfNeeded(metadata, options = {}) {
     const controller = new _progress.ProgressController(metadata, this);
@@ -261,25 +244,10 @@ class ElementHandle extends js.JSHandle {
       y: box.y + border.top + offset.y
     };
   }
-  async _retryPointerAction(progress, actionName, waitForEnabled, action, options) {
+  async _retryAction(progress, actionName, action, options) {
     let retry = 0;
     // We progressively wait longer between retries, up to 500ms.
     const waitTime = [0, 20, 100, 100, 500];
-
-    // By default, we scroll with protocol method to reveal the action point.
-    // However, that might not work to scroll from under position:sticky elements
-    // that overlay the target element. To fight this, we cycle through different
-    // scroll alignments. This works in most scenarios.
-    const scrollOptions = [undefined, {
-      block: 'end',
-      inline: 'end'
-    }, {
-      block: 'center',
-      inline: 'center'
-    }, {
-      block: 'start',
-      inline: 'start'
-    }];
     while (progress.isRunning()) {
       if (retry) {
         progress.log(`retrying ${actionName} action${options.trial ? ' (trial run)' : ''}, attempt #${retry}`);
@@ -292,8 +260,8 @@ class ElementHandle extends js.JSHandle {
       } else {
         progress.log(`attempting ${actionName} action${options.trial ? ' (trial run)' : ''}`);
       }
-      const forceScrollOptions = scrollOptions[retry % scrollOptions.length];
-      const result = await this._performPointerAction(progress, actionName, waitForEnabled, action, forceScrollOptions, options);
+      if (!options.skipLocatorHandlersCheckpoint && !options.force) await this._frame._page.performLocatorHandlersCheckpoint(progress);
+      const result = await action(retry);
       ++retry;
       if (result === 'error:notvisible') {
         if (options.force) throw new NonRecoverableDOMError('Element is not visible');
@@ -305,14 +273,47 @@ class ElementHandle extends js.JSHandle {
         progress.log('  element is outside of the viewport');
         continue;
       }
+      if (result === 'error:optionsnotfound') {
+        progress.log('  did not find some options');
+        continue;
+      }
       if (typeof result === 'object' && 'hitTargetDescription' in result) {
         progress.log(`  ${result.hitTargetDescription} intercepts pointer events`);
         continue;
       }
+      if (typeof result === 'object' && 'missingState' in result) {
+        progress.log(`  element is not ${result.missingState}`);
+        continue;
+      }
       return result;
     }
     return 'done';
   }
+  async _retryPointerAction(progress, actionName, waitForEnabled, action, options) {
+    // Note: do not perform locator handlers checkpoint to avoid moving the mouse in the middle of a drag operation.
+    const skipLocatorHandlersCheckpoint = actionName === 'move and up';
+    return await this._retryAction(progress, actionName, async retry => {
+      // By default, we scroll with protocol method to reveal the action point.
+      // However, that might not work to scroll from under position:sticky elements
+      // that overlay the target element. To fight this, we cycle through different
+      // scroll alignments. This works in most scenarios.
+      const scrollOptions = [undefined, {
+        block: 'end',
+        inline: 'end'
+      }, {
+        block: 'center',
+        inline: 'center'
+      }, {
+        block: 'start',
+        inline: 'start'
+      }];
+      const forceScrollOptions = scrollOptions[retry % scrollOptions.length];
+      return await this._performPointerAction(progress, actionName, waitForEnabled, action, forceScrollOptions, options);
+    }, {
+      ...options,
+      skipLocatorHandlersCheckpoint
+    });
+  }
   async _performPointerAction(progress, actionName, waitForEnabled, action, forceScrollOptions, options) {
     const {
       force = false,
@@ -340,8 +341,19 @@ class ElementHandle extends js.JSHandle {
       await doScrollIntoView().catch(() => {});
     }
     if (options.__testHookBeforeStable) await options.__testHookBeforeStable();
-    const result = await this._waitForElementStates(progress, waitForEnabled ? ['visible', 'enabled', 'stable'] : ['visible', 'stable'], force);
-    if (result !== 'done') return result;
+    if (!force) {
+      const elementStates = waitForEnabled ? ['visible', 'enabled', 'stable'] : ['visible', 'stable'];
+      progress.log(`  waiting for element to be ${waitForEnabled ? 'visible, enabled and stable' : 'visible and stable'}`);
+      const result = await this.evaluateInUtility(async ([injected, node, {
+        elementStates
+      }]) => {
+        return await injected.checkElementStates(node, elementStates);
+      }, {
+        elementStates
+      });
+      if (result) return result;
+      progress.log(`  element is ${waitForEnabled ? 'visible, enabled and stable' : 'visible and stable'}`);
+    }
     if (options.__testHookAfterStable) await options.__testHookAfterStable();
     progress.log('  scrolling into view if needed');
     progress.throwIfAborted(); // Avoid action that has side-effects.
@@ -354,7 +366,9 @@ class ElementHandle extends js.JSHandle {
     progress.metadata.point = point;
     await progress.beforeInputAction(this);
     let hitTargetInterceptionHandle;
-    if (!options.force) {
+    if (force) {
+      progress.log(`  forcing action`);
+    } else {
       if (options.__testHookBeforeHitTarget) await options.__testHookBeforeHitTarget();
       const frameCheckResult = await this._checkFrameIsHitTarget(point);
       if (frameCheckResult === 'error:notconnected' || 'hitTargetDescription' in frameCheckResult) return frameCheckResult;
@@ -396,7 +410,7 @@ class ElementHandle extends js.JSHandle {
       if (hitTargetInterceptionHandle) {
         const stopHitTargetInterception = hitTargetInterceptionHandle.evaluate(h => h.stop()).catch(e => 'done').finally(() => {
           var _hitTargetInterceptio;
-          (_hitTargetInterceptio = hitTargetInterceptionHandle) === null || _hitTargetInterceptio === void 0 ? void 0 : _hitTargetInterceptio.dispose();
+          (_hitTargetInterceptio = hitTargetInterceptionHandle) === null || _hitTargetInterceptio === void 0 || _hitTargetInterceptio.dispose();
         });
         if (!options.noWaitAfter) {
           // When noWaitAfter is passed, we do not want to accidentally stall on
@@ -462,22 +476,32 @@ class ElementHandle extends js.JSHandle {
     }, this._page._timeoutSettings.timeout(options));
   }
   async _selectOption(progress, elements, values, options) {
-    const optionsToSelect = [...elements, ...values];
-    await progress.beforeInputAction(this);
-    return this._page._frameManager.waitForSignalsCreatedBy(progress, options.noWaitAfter, async () => {
-      progress.throwIfAborted(); // Avoid action that has side-effects.
-      progress.log('  selecting specified option(s)');
-      const result = await this.evaluatePoll(progress, ([injected, node, {
+    let resultingOptions = [];
+    await this._retryAction(progress, 'select option', async () => {
+      await progress.beforeInputAction(this);
+      if (!options.force) progress.log(`  waiting for element to be visible and enabled`);
+      const optionsToSelect = [...elements, ...values];
+      const result = await this.evaluateInUtility(async ([injected, node, {
         optionsToSelect,
         force
       }]) => {
-        return injected.waitForElementStatesAndPerformAction(node, ['visible', 'enabled'], force, injected.selectOptions.bind(injected, optionsToSelect));
+        if (!force) {
+          const checkResult = await injected.checkElementStates(node, ['visible', 'enabled']);
+          if (checkResult) return checkResult;
+        }
+        return injected.selectOptions(node, optionsToSelect);
       }, {
         optionsToSelect,
         force: options.force
       });
+      if (Array.isArray(result)) {
+        progress.log('  selected specified option(s)');
+        resultingOptions = result;
+        return 'done';
+      }
       return result;
-    });
+    }, options);
+    return resultingOptions;
   }
   async fill(metadata, value, options = {}) {
     const controller = new _progress.ProgressController(metadata, this);
@@ -487,38 +511,51 @@ class ElementHandle extends js.JSHandle {
     }, this._page._timeoutSettings.timeout(options));
   }
   async _fill(progress, value, options) {
-    progress.log(`elementHandle.fill("${value}")`);
-    await progress.beforeInputAction(this);
-    return this._page._frameManager.waitForSignalsCreatedBy(progress, options.noWaitAfter, async () => {
-      progress.log('  waiting for element to be visible, enabled and editable');
-      const filled = await this.evaluatePoll(progress, ([injected, node, {
-        value,
-        force
-      }]) => {
-        return injected.waitForElementStatesAndPerformAction(node, ['visible', 'enabled', 'editable'], force, injected.fill.bind(injected, value));
-      }, {
-        value,
-        force: options.force
-      });
-      progress.throwIfAborted(); // Avoid action that has side-effects.
-      if (filled === 'error:notconnected') return filled;
-      progress.log('  element is visible, enabled and editable');
-      if (filled === 'needsinput') {
+    progress.log(`  fill("${value}")`);
+    return await this._retryAction(progress, 'fill', async () => {
+      await progress.beforeInputAction(this);
+      return this._page._frameManager.waitForSignalsCreatedBy(progress, options.noWaitAfter, async () => {
+        if (!options.force) progress.log('  waiting for element to be visible, enabled and editable');
+        const result = await this.evaluateInUtility(async ([injected, node, {
+          value,
+          force
+        }]) => {
+          if (!force) {
+            const checkResult = await injected.checkElementStates(node, ['visible', 'enabled', 'editable']);
+            if (checkResult) return checkResult;
+          }
+          return injected.fill(node, value);
+        }, {
+          value,
+          force: options.force
+        });
         progress.throwIfAborted(); // Avoid action that has side-effects.
-        if (value) await this._page.keyboard.insertText(value);else await this._page.keyboard.press('Delete');
-      } else {
-        assertDone(filled);
-      }
-      return 'done';
-    }, 'input');
+        if (result === 'needsinput') {
+          if (value) await this._page.keyboard.insertText(value);else await this._page.keyboard.press('Delete');
+          return 'done';
+        } else {
+          return result;
+        }
+      }, 'input');
+    }, options);
   }
   async selectText(metadata, options = {}) {
     const controller = new _progress.ProgressController(metadata, this);
     return controller.run(async progress => {
-      progress.throwIfAborted(); // Avoid action that has side-effects.
-      const result = await this.evaluatePoll(progress, ([injected, node, force]) => {
-        return injected.waitForElementStatesAndPerformAction(node, ['visible'], force, injected.selectText.bind(injected));
-      }, options.force);
+      const result = await this._retryAction(progress, 'selectText', async () => {
+        if (!options.force) progress.log('  waiting for element to be visible');
+        return await this.evaluateInUtility(async ([injected, node, {
+          force
+        }]) => {
+          if (!force) {
+            const checkResult = await injected.checkElementStates(node, ['visible']);
+            if (checkResult) return checkResult;
+          }
+          return injected.selectText(node);
+        }, {
+          force: options.force
+        });
+      }, options);
       assertDone(throwRetargetableDOMError(result));
     }, this._page._timeoutSettings.timeout(options));
   }
@@ -669,10 +706,12 @@ class ElementHandle extends js.JSHandle {
   async waitForElementState(metadata, state, options = {}) {
     const controller = new _progress.ProgressController(metadata, this);
     return controller.run(async progress => {
-      progress.log(`  waiting for element to be ${state}`);
-      const result = await this.evaluatePoll(progress, ([injected, node, state]) => {
-        return injected.waitForElementStatesAndPerformAction(node, [state], false, () => 'done');
-      }, state);
+      const actionName = `wait for ${state}`;
+      const result = await this._retryAction(progress, actionName, async () => {
+        return await this.evaluateInUtility(async ([injected, node, state]) => {
+          return (await injected.checkElementStates(node, [state])) || 'done';
+        }, state);
+      }, {});
       assertDone(throwRetargetableDOMError(result));
     }, this._page._timeoutSettings.timeout(options));
   }
@@ -687,22 +726,6 @@ class ElementHandle extends js.JSHandle {
     }
     return this;
   }
-  async _waitForElementStates(progress, states, force) {
-    const title = joinWithAnd(states);
-    progress.log(`  waiting for element to be ${title}`);
-    const result = await this.evaluatePoll(progress, ([injected, node, {
-      states,
-      force
-    }]) => {
-      return injected.waitForElementStatesAndPerformAction(node, states, force, () => 'done');
-    }, {
-      states,
-      force
-    });
-    if (result === 'error:notconnected') return result;
-    progress.log(`  element is ${title}`);
-    return result;
-  }
   async _checkFrameIsHitTarget(point) {
     let frame = this._frame;
     const data = [];
@@ -751,63 +774,7 @@ class ElementHandle extends js.JSHandle {
     };
   }
 }
-
-// Handles an InjectedScriptPoll running in injected script:
-// - streams logs into progress;
-// - cancels the poll when progress cancels.
 exports.ElementHandle = ElementHandle;
-class InjectedScriptPollHandler {
-  constructor(progress, poll) {
-    this._progress = void 0;
-    this._poll = void 0;
-    this._progress = progress;
-    this._poll = poll;
-    // Ensure we cancel the poll before progress aborts and returns:
-    //   - no unnecessary work in the page;
-    //   - no possible side effects after progress promise rejects.
-    this._progress.cleanupWhenAborted(() => this.cancel());
-    this._streamLogs();
-  }
-  async _streamLogs() {
-    while (this._poll && this._progress.isRunning()) {
-      const log = await this._poll.evaluate(poll => poll.takeNextLogs()).catch(e => []);
-      if (!this._poll || !this._progress.isRunning()) return;
-      for (const entry of log) this._progress.logEntry(entry);
-    }
-  }
-  async finishHandle() {
-    try {
-      const result = await this._poll.evaluateHandle(poll => poll.run());
-      await this._finishInternal();
-      return result;
-    } finally {
-      await this.cancel();
-    }
-  }
-  async finish() {
-    try {
-      const result = await this._poll.evaluate(poll => poll.run());
-      await this._finishInternal();
-      return result;
-    } finally {
-      await this.cancel();
-    }
-  }
-  async _finishInternal() {
-    if (!this._poll) return;
-    // Retrieve all the logs before continuing.
-    const log = await this._poll.evaluate(poll => poll.takeLastLogs()).catch(e => []);
-    for (const entry of log) this._progress.logEntry(entry);
-  }
-  async cancel() {
-    if (!this._poll) return;
-    const copy = this._poll;
-    this._poll = null;
-    await copy.evaluate(p => p.cancel()).catch(e => {});
-    copy.dispose();
-  }
-}
-exports.InjectedScriptPollHandler = InjectedScriptPollHandler;
 function throwRetargetableDOMError(result) {
   if (result === 'error:notconnected') throw new Error('Element is not attached to the DOM');
   return result;
@@ -838,8 +805,4 @@ function compensateHalfIntegerRoundingError(point) {
   const remainderY = point.y - Math.floor(point.y);
   if (remainderY > 0.49 && remainderY < 0.51) point.y -= 0.02;
 }
-function joinWithAnd(strings) {
-  if (strings.length <= 1) return strings.join('');
-  return strings.slice(0, strings.length - 1).join(', ') + ' and ' + strings[strings.length - 1];
-}
 const kUnableToAdoptErrorMessage = exports.kUnableToAdoptErrorMessage = 'Unable to adopt element handle from a different document';