@mablhq/mabl-cli 1.61.3 → 1.61.8

package/browserLauncher/playwrightBrowserLauncher/playwrightApiResponse.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PlaywrightApiResponse = void 0;
+class PlaywrightApiResponse {
+    constructor(response) {
+        this.response = response;
+    }
+    headers() {
+        return this.response.headersArray();
+    }
+    status() {
+        return this.response.status();
+    }
+    url() {
+        return this.response.url();
+    }
+}
+exports.PlaywrightApiResponse = PlaywrightApiResponse;

package/browserLauncher/playwrightBrowserLauncher/playwrightBrowser.js

@@ -37,6 +37,9 @@ const fs_extra_1 = __importDefault(require("fs-extra"));
 const firefoxBrowserDelegate_1 = require("./firefox/firefoxBrowserDelegate");
 const chromiumBrowserDelegate_1 = require("./chromium/chromiumBrowserDelegate");
 const webkitBrowserDelegate_1 = require("./webkit/webkitBrowserDelegate");
+const loggingProvider_1 = require("../../providers/logging/loggingProvider");
+const playwrightApiResponse_1 = require("./playwrightApiResponse");
+const httpUtil_1 = require("../../http/httpUtil");
 class PlaywrightBrowser extends events_1.default {
     constructor(defaultContext, downloadDirectory, browserWSEndpoint, browserDelegate, preferenceDirectory, disableFocusEmulation) {
         super();
@@ -173,6 +176,51 @@ class PlaywrightBrowser extends events_1.default {
             this.defaultViewportSize = viewport;
         }
     }
+    async makeApiRequest(url, options) {
+        const { discardRequestBody, method, maxRedirects, runInNewContext, timeout } = options !== null && options !== void 0 ? options : {};
+        try {
+            const requestContext = runInNewContext
+                ? await this.createNewRequestContext()
+                : this.defaultContext.request;
+            const response = await requestContext.fetch(url, {
+                method,
+                ignoreHTTPSErrors: true,
+                maxRedirects: maxRedirects !== null && maxRedirects !== void 0 ? maxRedirects : types_1.DefaultApiRequestSettings.defaultMaxRedirects,
+                timeout: timeout !== null && timeout !== void 0 ? timeout : types_1.DefaultApiRequestSettings.defaultApiRequestTimeout,
+            });
+            return new playwrightApiResponse_1.PlaywrightApiResponse(response);
+        }
+        catch (error) {
+            loggingProvider_1.logger.error(`Failed to make API request against ${url}`, error);
+            throw error;
+        }
+        finally {
+            if (discardRequestBody) {
+                try {
+                    await this.defaultContext.request.dispose();
+                }
+                catch (error) {
+                    loggingProvider_1.logger.warn(`Error caught while attempting to dispose of API requests stored in memory: ${error === null || error === void 0 ? void 0 : error.message}`, error);
+                }
+            }
+        }
+    }
+    setApiProxy(httpProxy) {
+        this.apiProxy = httpProxy;
+    }
+    async createNewRequestContext() {
+        const proxy = this.apiProxy ? { server: this.apiProxy } : undefined;
+        const headers = {
+            'Content-Type': 'text/plain;charset=UTF-8',
+            [httpUtil_1.USER_AGENT_HEADER]: httpUtil_1.USER_AGENT,
+        };
+        return playwright.request.newContext({
+            ignoreHTTPSErrors: true,
+            extraHTTPHeaders: headers,
+            timeout: types_1.DefaultApiRequestSettings.defaultApiRequestTimeout,
+            proxy,
+        });
+    }
 }
 exports.PlaywrightBrowser = PlaywrightBrowser;
 function getBrowserDelegate(browserType, browserContext) {

package/browserLauncher/types.js

@@ -1,12 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WaitForOptions = exports.LifecycleEvent = exports.RunnerType = exports.DefaultTimeouts = void 0;
+exports.WaitForOptions = exports.LifecycleEvent = exports.RunnerType = exports.DefaultApiRequestSettings = exports.DefaultTimeouts = void 0;
 class DefaultTimeouts {
 }
 exports.DefaultTimeouts = DefaultTimeouts;
 DefaultTimeouts.defaultTrialTimeoutMs = 5000;
 DefaultTimeouts.defaultWaitTimeoutMs = 5000;
 DefaultTimeouts.defaultActionTimeoutMs = 0;
+class DefaultApiRequestSettings {
+}
+exports.DefaultApiRequestSettings = DefaultApiRequestSettings;
+DefaultApiRequestSettings.defaultApiRequestTimeout = 2 * 60 * 1000;
+DefaultApiRequestSettings.defaultMaxRedirects = 5;
+DefaultApiRequestSettings.verifyUrlBatchSize = 20;
 var RunnerType;
 (function (RunnerType) {
     RunnerType["Playwright"] = "playwright";

package/commands/constants.js

@@ -124,8 +124,6 @@ exports.BrowserTypeSelections = [
     browserTypes_1.BrowserType.Chrome,
     browserTypes_1.BrowserType.Edge,
     browserTypes_1.BrowserType.Firefox,
-    'internet_explorer',
-    'safari',
     browserTypes_1.BrowserType.Webkit,
 ].map((browser) => browser.toString());
 exports.ValidBrowserTypesForLocalRuns = [

package/commands/tests/testsUtil.js

@@ -141,6 +141,8 @@ async function createBrowserForExecutionEngine(engine, proxyInfo, options) {
     if (!maybeBrowser) {
         throw new Error('Unable to start browser session');
     }
+    (0, logUtils_1.logCliOutput)(loggingProvider_1.LogLevel.Info, `Setting apiProxy server [${proxyInfo.httpProxy}]`);
+    maybeBrowser.setApiProxy(proxyInfo.httpProxy);
     return maybeBrowser;
 }
 exports.createBrowserForExecutionEngine = createBrowserForExecutionEngine;

package/commands/tests/tests_cmds/run.js

@@ -189,8 +189,10 @@ exports.builder = (yargs) => {
     })
         .check((argv) => {
         (0, testsUtil_1.validateRunCommandWithLabels)(argv[constants_1.CommandArgId], argv[constants_1.CommandArgLabelsInclude], argv[constants_1.CommandArgLabelsExclude], argv[constants_1.CommandArgTestRunId], argv[constants_1.CommandArgFromPlanId], true, argv[constants_1.CommandArgTestFile]);
-        if (argv[constants_1.CommandArgDataTableId] && !argv[constants_1.CommandArgId]) {
-            throw new Error(`The ${constants_1.CommandArgDataTableId} option can only be used with the ${constants_1.CommandArgId} option`);
+        if (argv[constants_1.CommandArgDataTableId] &&
+            !argv[constants_1.CommandArgId] &&
+            !argv[constants_1.CommandArgFromPlanId]) {
+            throw new Error(`The ${constants_1.CommandArgDataTableId} option can only be used with the ${constants_1.CommandArgId} or the ${constants_1.CommandArgFromPlanId} option`);
         }
         if (argv[constants_1.CommandArgDataTableId] && argv[constants_1.CommandArgScenarioId]) {
             throw new Error(`The ${constants_1.CommandArgScenarioId} option cannot be used with the ${constants_1.CommandArgDataTableId} option`);