@mablhq/mabl-cli 2.5.0 → 2.5.4

package/browserLauncher/errors.js

@@ -1,17 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RUNNER_ERRORS = exports.TimeoutError = exports.RunnerError = void 0;
+exports.RUNNER_ERRORS = exports.NavigationInterruptedError = exports.TimeoutError = exports.RunnerError = void 0;
 class RunnerError extends Error {
     constructor(message) {
         super(message);
         this.name = this.constructor.name;
         Error.captureStackTrace(this, this.constructor);
     }
+    static isPlaywrightNavigationInterruptedError(error) {
+        const errorString = error.message.toLowerCase();
+        return (errorString.includes('interrupted by another navigation') &&
+            errorString.includes('frame.goto'));
+    }
 }
 exports.RunnerError = RunnerError;
 class TimeoutError extends RunnerError {
 }
 exports.TimeoutError = TimeoutError;
+class NavigationInterruptedError extends RunnerError {
+}
+exports.NavigationInterruptedError = NavigationInterruptedError;
 exports.RUNNER_ERRORS = {
     TimeoutError,
+    NavigationInterruptedError,
 };

package/browserLauncher/playwrightBrowserLauncher/playwrightFrame.js

@@ -142,19 +142,9 @@ class PlaywrightFrame extends browserLauncher_1.Frame {
         return new playwrightDom_1.PlaywrightElementHandle(frameElement, this.parentPage, this.parentPage.delegate.createElementHandleDelegate(frameElement));
     }
     async goto(url, options) {
-        var _a;
         const lifecycleEvent = this.delegate.getLifecycleEventStrategy(options === null || options === void 0 ? void 0 : options.waitUntil);
         try {
-            const response = await this.frame.goto(url, {
-                waitUntil: lifecycleEvent.waitUntil,
-                timeout: options === null || options === void 0 ? void 0 : options.timeout,
-            });
-            if (lifecycleEvent.waitForNetworkIdle) {
-                await this.frame.waitForLoadState(types_1.LifecycleEvent.NetworkIdle, {
-                    timeout: (_a = options === null || options === void 0 ? void 0 : options.timeout) !== null && _a !== void 0 ? _a : types_1.DefaultTimeouts.defaultWaitTimeoutMs,
-                });
-            }
-            return (0, utils_1.mapIfNotNull)(response, (response) => new playwrightHttpResponse_1.PlaywrightHttpResponse(this.parentPage, response));
+            return await this.tryGoto(url, lifecycleEvent, options);
         }
         catch (e) {
             if (e instanceof playwright.errors.TimeoutError) {
@@ -163,6 +153,32 @@ class PlaywrightFrame extends browserLauncher_1.Frame {
             throw new browserLauncher_1.RunnerError(e.message);
         }
     }
+    async tryGoto(url, lifecycleEvent, options) {
+        var _a;
+        const timeout = (_a = options === null || options === void 0 ? void 0 : options.timeout) !== null && _a !== void 0 ? _a : types_1.DefaultTimeouts.defaultWaitTimeoutMs;
+        let response;
+        let responseHasNavigationError = false;
+        try {
+            response = await this.frame.goto(url, {
+                waitUntil: lifecycleEvent.waitUntil,
+                timeout: options === null || options === void 0 ? void 0 : options.timeout,
+            });
+        }
+        catch (e) {
+            if (browserLauncher_1.RunnerError.isPlaywrightNavigationInterruptedError(e)) {
+                responseHasNavigationError = true;
+            }
+            else {
+                throw e;
+            }
+        }
+        if (lifecycleEvent.waitForNetworkIdle || responseHasNavigationError) {
+            await this.frame.waitForLoadState(types_1.LifecycleEvent.NetworkIdle, {
+                timeout,
+            });
+        }
+        return (0, utils_1.mapIfNotNull)(response, (response) => new playwrightHttpResponse_1.PlaywrightHttpResponse(this.parentPage, response));
+    }
     id() {
         return this.frame._guid;
     }