@checkly/playwright-core 1.41.2-beta.0 → 1.41.2-beta.1

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(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 _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; }
 /**
  * Copyright (c) Microsoft Corporation.
  *

package/lib/server/dom.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.NonRecoverableDOMError = exports.FrameExecutionContext = exports.ElementHandle = void 0;
+exports.NonRecoverableDOMError = exports.InjectedScriptPollHandler = 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(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 _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; }
 /**
  * Copyright (c) Microsoft Corporation.
  *
@@ -136,6 +136,17 @@ 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;
@@ -177,19 +188,25 @@ class ElementHandle extends js.JSHandle {
     return await this._page._delegate.scrollRectIntoViewIfNeeded(this, rect);
   }
   async _waitAndScrollIntoViewIfNeeded(progress, waitForVisible) {
-    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));
+    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;
+    }
   }
   async scrollIntoViewIfNeeded(metadata, options = {}) {
     const controller = new _progress.ProgressController(metadata, this);
@@ -244,10 +261,25 @@ class ElementHandle extends js.JSHandle {
       y: box.y + border.top + offset.y
     };
   }
-  async _retryAction(progress, actionName, action, options) {
+  async _retryPointerAction(progress, actionName, waitForEnabled, 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}`);
@@ -260,8 +292,8 @@ class ElementHandle extends js.JSHandle {
       } else {
         progress.log(`attempting ${actionName} action${options.trial ? ' (trial run)' : ''}`);
       }
-      if (!options.skipLocatorHandlersCheckpoint) await this._frame._page.performLocatorHandlersCheckpoint(progress);
-      const result = await action(retry);
+      const forceScrollOptions = scrollOptions[retry % scrollOptions.length];
+      const result = await this._performPointerAction(progress, actionName, waitForEnabled, action, forceScrollOptions, options);
       ++retry;
       if (result === 'error:notvisible') {
         if (options.force) throw new NonRecoverableDOMError('Element is not visible');
@@ -273,47 +305,14 @@ 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,
@@ -341,19 +340,8 @@ class ElementHandle extends js.JSHandle {
       await doScrollIntoView().catch(() => {});
     }
     if (options.__testHookBeforeStable) await options.__testHookBeforeStable();
-    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'}`);
-    }
+    const result = await this._waitForElementStates(progress, waitForEnabled ? ['visible', 'enabled', 'stable'] : ['visible', 'stable'], force);
+    if (result !== 'done') return result;
     if (options.__testHookAfterStable) await options.__testHookAfterStable();
     progress.log('  scrolling into view if needed');
     progress.throwIfAborted(); // Avoid action that has side-effects.
@@ -366,9 +354,7 @@ class ElementHandle extends js.JSHandle {
     progress.metadata.point = point;
     await progress.beforeInputAction(this);
     let hitTargetInterceptionHandle;
-    if (force) {
-      progress.log(`  forcing action`);
-    } else {
+    if (!options.force) {
       if (options.__testHookBeforeHitTarget) await options.__testHookBeforeHitTarget();
       const frameCheckResult = await this._checkFrameIsHitTarget(point);
       if (frameCheckResult === 'error:notconnected' || 'hitTargetDescription' in frameCheckResult) return frameCheckResult;
@@ -410,7 +396,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 || _hitTargetInterceptio.dispose();
+          (_hitTargetInterceptio = hitTargetInterceptionHandle) === null || _hitTargetInterceptio === void 0 ? void 0 : _hitTargetInterceptio.dispose();
         });
         if (!options.noWaitAfter) {
           // When noWaitAfter is passed, we do not want to accidentally stall on
@@ -476,32 +462,22 @@ class ElementHandle extends js.JSHandle {
     }, this._page._timeoutSettings.timeout(options));
   }
   async _selectOption(progress, elements, values, options) {
-    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, {
+    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, {
         optionsToSelect,
         force
       }]) => {
-        if (!force) {
-          const checkResult = await injected.checkElementStates(node, ['visible', 'enabled']);
-          if (checkResult) return checkResult;
-        }
-        return injected.selectOptions(node, optionsToSelect);
+        return injected.waitForElementStatesAndPerformAction(node, ['visible', 'enabled'], force, injected.selectOptions.bind(injected, 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);
@@ -511,51 +487,38 @@ class ElementHandle extends js.JSHandle {
     }, this._page._timeoutSettings.timeout(options));
   }
   async _fill(progress, value, options) {
-    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.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.throwIfAborted(); // Avoid action that has side-effects.
-        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);
+        if (value) await this._page.keyboard.insertText(value);else await this._page.keyboard.press('Delete');
+      } else {
+        assertDone(filled);
+      }
+      return 'done';
+    }, 'input');
   }
   async selectText(metadata, options = {}) {
     const controller = new _progress.ProgressController(metadata, this);
     return controller.run(async progress => {
-      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);
+      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);
       assertDone(throwRetargetableDOMError(result));
     }, this._page._timeoutSettings.timeout(options));
   }
@@ -706,12 +669,10 @@ class ElementHandle extends js.JSHandle {
   async waitForElementState(metadata, state, options = {}) {
     const controller = new _progress.ProgressController(metadata, this);
     return controller.run(async progress => {
-      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);
-      }, {});
+      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);
       assertDone(throwRetargetableDOMError(result));
     }, this._page._timeoutSettings.timeout(options));
   }
@@ -726,6 +687,22 @@ 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 = [];
@@ -774,7 +751,63 @@ 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;
@@ -805,4 +838,8 @@ 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';

package/lib/server/electron/electron.js

@@ -20,10 +20,10 @@ var _progress = require("../progress");
 var _helper = require("../helper");
 var _eventsHelper = require("../../utils/eventsHelper");
 var readline = _interopRequireWildcard(require("readline"));
-var _debugLogger = require("../../utils/debugLogger");
+var _debugLogger = require("../../common/debugLogger");
 var _instrumentation = require("../instrumentation");
-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 _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 _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
  * Copyright (c) Microsoft Corporation.
@@ -133,11 +133,10 @@ class Electron extends _instrumentation.SdkObject {
     controller.setLogName('browser');
     return controller.run(async progress => {
       let app = undefined;
-      // --remote-debugging-port=0 must be the last playwright's argument, loader.ts relies on it.
       const electronArguments = ['--inspect=0', '--remote-debugging-port=0', ...args];
       if (_os.default.platform() === 'linux') {
         const runningAsRoot = process.geteuid && process.geteuid() === 0;
-        if (runningAsRoot && electronArguments.indexOf('--no-sandbox') === -1) electronArguments.unshift('--no-sandbox');
+        if (runningAsRoot && electronArguments.indexOf('--no-sandbox') === -1) electronArguments.push('--no-sandbox');
       }
       const artifactsDir = await _fs.default.promises.mkdtemp(ARTIFACTS_FOLDER);
       const browserLogsCollector = new _debugLogger.RecentLogsCollector();

package/lib/server/electron/loader.js

@@ -23,10 +23,8 @@ const {
   chromiumSwitches
 } = require('../chromium/chromiumSwitches');
 
-// Always pass user arguments first, see https://github.com/microsoft/playwright/issues/16614 and
-// https://github.com/microsoft/playwright/issues/29198.
-// [Electron, -r, loader.js[, --no-sandbox>], --inspect=0, --remote-debugging-port=0, ...args]
-process.argv.splice(1, process.argv.indexOf('--remote-debugging-port=0'));
+// [Electron, -r, loader.js, --inspect=0, --remote-debugging-port=0, ...args]
+process.argv.splice(1, 4);
 for (const arg of chromiumSwitches) {
   const match = arg.match(/--([^=]*)=?(.*)/);
   app.commandLine.appendSwitch(match[1], match[2]);

package/lib/server/fetch.js

@@ -22,8 +22,8 @@ var _progress = require("./progress");
 var _tracing = require("./trace/recorder/tracing");
 var _network = require("./network");
 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 _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; }
 /**
  * Copyright (c) Microsoft Corporation.
  *
@@ -356,8 +356,8 @@ class APIRequestContext extends _instrumentation.SdkObject {
     });
   }
   _getHttpCredentials(url) {
-    var _this$_defaultOptions, _this$_defaultOptions2;
-    if (!((_this$_defaultOptions = this._defaultOptions().httpCredentials) !== null && _this$_defaultOptions !== void 0 && _this$_defaultOptions.origin) || url.origin.toLowerCase() === ((_this$_defaultOptions2 = this._defaultOptions().httpCredentials) === null || _this$_defaultOptions2 === void 0 || (_this$_defaultOptions2 = _this$_defaultOptions2.origin) === null || _this$_defaultOptions2 === void 0 ? void 0 : _this$_defaultOptions2.toLowerCase())) return this._defaultOptions().httpCredentials;
+    var _this$_defaultOptions, _this$_defaultOptions2, _this$_defaultOptions3;
+    if (!((_this$_defaultOptions = this._defaultOptions().httpCredentials) !== null && _this$_defaultOptions !== void 0 && _this$_defaultOptions.origin) || url.origin.toLowerCase() === ((_this$_defaultOptions2 = this._defaultOptions().httpCredentials) === null || _this$_defaultOptions2 === void 0 ? void 0 : (_this$_defaultOptions3 = _this$_defaultOptions2.origin) === null || _this$_defaultOptions3 === void 0 ? void 0 : _this$_defaultOptions3.toLowerCase())) return this._defaultOptions().httpCredentials;
     return undefined;
   }
 }

package/lib/server/firefox/ffBrowser.js

@@ -11,8 +11,8 @@ var _browserContext = require("../browserContext");
 var network = _interopRequireWildcard(require("../network"));
 var _ffConnection = require("./ffConnection");
 var _ffPage = require("./ffPage");
-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 _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; }
 /**
  * Copyright 2018 Google Inc. All rights reserved.
  * Modifications copyright (c) Microsoft Corporation.
@@ -147,7 +147,7 @@ class FFBrowser extends _browser.Browser {
   }
   _onVideoRecordingFinished(payload) {
     var _this$_takeVideo;
-    (_this$_takeVideo = this._takeVideo(payload.screencastId)) === null || _this$_takeVideo === void 0 || _this$_takeVideo.reportFinished();
+    (_this$_takeVideo = this._takeVideo(payload.screencastId)) === null || _this$_takeVideo === void 0 ? void 0 : _this$_takeVideo.reportFinished();
   }
   _onDisconnect() {
     for (const video of this._idToVideo.values()) video.artifact.reportFinished(new _errors.TargetClosedError());

package/lib/server/firefox/ffConnection.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.kBrowserCloseMessageId = exports.FFSession = exports.FFConnection = exports.ConnectionEvents = void 0;
 var _events = require("events");
-var _debugLogger = require("../../utils/debugLogger");
+var _debugLogger = require("../../common/debugLogger");
 var _helper = require("../helper");
 var _protocolError = require("../protocolError");
 /**

package/lib/server/firefox/ffExecutionContext.js

@@ -8,8 +8,8 @@ var js = _interopRequireWildcard(require("../javascript"));
 var _stackTrace = require("../../utils/stackTrace");
 var _utilityScriptSerializers = require("../isomorphic/utilityScriptSerializers");
 var _protocolError = require("../protocolError");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+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; }
 /**
  * Copyright 2019 Google Inc. All rights reserved.
  * Modifications copyright (c) Microsoft Corporation.

package/lib/server/firefox/ffNetworkManager.js

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.FFNetworkManager = void 0;
 var _eventsHelper = require("../../utils/eventsHelper");
 var network = _interopRequireWildcard(require("../network"));
-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 _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; }
 /**
  * Copyright 2019 Google Inc. All rights reserved.
  * Modifications copyright (c) Microsoft Corporation.
@@ -91,11 +91,11 @@ class FFNetworkManager {
       response._serverAddrFinished();
     }
     response._securityDetailsFinished({
-      protocol: event === null || event === void 0 || (_event$securityDetail = event.securityDetails) === null || _event$securityDetail === void 0 ? void 0 : _event$securityDetail.protocol,
-      subjectName: event === null || event === void 0 || (_event$securityDetail2 = event.securityDetails) === null || _event$securityDetail2 === void 0 ? void 0 : _event$securityDetail2.subjectName,
-      issuer: event === null || event === void 0 || (_event$securityDetail3 = event.securityDetails) === null || _event$securityDetail3 === void 0 ? void 0 : _event$securityDetail3.issuer,
-      validFrom: event === null || event === void 0 || (_event$securityDetail4 = event.securityDetails) === null || _event$securityDetail4 === void 0 ? void 0 : _event$securityDetail4.validFrom,
-      validTo: event === null || event === void 0 || (_event$securityDetail5 = event.securityDetails) === null || _event$securityDetail5 === void 0 ? void 0 : _event$securityDetail5.validTo
+      protocol: event === null || event === void 0 ? void 0 : (_event$securityDetail = event.securityDetails) === null || _event$securityDetail === void 0 ? void 0 : _event$securityDetail.protocol,
+      subjectName: event === null || event === void 0 ? void 0 : (_event$securityDetail2 = event.securityDetails) === null || _event$securityDetail2 === void 0 ? void 0 : _event$securityDetail2.subjectName,
+      issuer: event === null || event === void 0 ? void 0 : (_event$securityDetail3 = event.securityDetails) === null || _event$securityDetail3 === void 0 ? void 0 : _event$securityDetail3.issuer,
+      validFrom: event === null || event === void 0 ? void 0 : (_event$securityDetail4 = event.securityDetails) === null || _event$securityDetail4 === void 0 ? void 0 : _event$securityDetail4.validFrom,
+      validTo: event === null || event === void 0 ? void 0 : (_event$securityDetail5 = event.securityDetails) === null || _event$securityDetail5 === void 0 ? void 0 : _event$securityDetail5.validTo
     });
     // "raw" headers are the same as "provisional" headers in Firefox.
     response.setRawResponseHeaders(null);