@mablhq/mabl-cli 1.20.1 → 1.20.17

package/api/basicApiClient.js

@@ -48,17 +48,19 @@ const RETRYABLE_NODEJS_ERRORS = [
     'ENOTFOUND',
     'ENETUNREACH',
     'ETIMEOUT',
+    'ETIMEDOUT',
     'ECONNABORTED',
 ];
+const DEFAULT_SSL_VERIFY = false;
 class BasicApiClient {
     constructor(options) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         const config = (0, httpUtil_1.axiosProxyConfig)({
-            sslVerify: options.sslVerify,
+            sslVerify: (_a = options.sslVerify) !== null && _a !== void 0 ? _a : DEFAULT_SSL_VERIFY,
             proxyHost: options.proxyUrl,
         });
         config.timeout =
-            (_c = (_a = options.requestTimeoutMillis) !== null && _a !== void 0 ? _a : (_b = options.retryConfig) === null || _b === void 0 ? void 0 : _b.requestTimeoutMillis) !== null && _c !== void 0 ? _c : DEFAULT_RETRYABLE_REQUEST_TIMEOUT_MILLISECONDS;
+            (_d = (_b = options.requestTimeoutMillis) !== null && _b !== void 0 ? _b : (_c = options.retryConfig) === null || _c === void 0 ? void 0 : _c.requestTimeoutMillis) !== null && _d !== void 0 ? _d : DEFAULT_RETRYABLE_REQUEST_TIMEOUT_MILLISECONDS;
         switch (options.authType) {
             case types_1.AuthType.ApiKey:
                 config.auth = {
@@ -86,7 +88,7 @@ class BasicApiClient {
         this.httpRequestConfig = config;
         this.httpClient = axios_1.default.create(config);
         this.retryConfig = options.retryConfig;
-        this.debugLogger = (_d = options.debugLogger) !== null && _d !== void 0 ? _d : logUtils_1.logInternal;
+        this.debugLogger = (_e = options.debugLogger) !== null && _e !== void 0 ? _e : logUtils_1.logInternal;
     }
     getNonRetryableRequestConfig(override) {
         const overrideWithTimeout = { ...(override !== null && override !== void 0 ? override : {}) };
@@ -145,7 +147,7 @@ class BasicApiClient {
         return this.retryWrappedRequest(`makeDeleteRequest('${path}')`, () => this.deleteRequest(path, this.getRetryableRequestConfig(retryConfig)), retryConfig);
     }
     async deleteRequest(path, config) {
-        const response = await this.debugRequest('DELETE', path, () => this.deleteRequest(path, config));
+        const response = await this.debugRequest('DELETE', path, () => this.httpClient.delete(path, config));
         BasicApiClient.checkResponseStatusCode(response);
         return response.data;
     }

package/api/mablApiClient.js

@@ -31,6 +31,10 @@ const cliConfigProvider_1 = require("../providers/cliConfigProvider");
 const basicApiClient_1 = require("./basicApiClient");
 const queryString = __importStar(require("query-string"));
 const featureSet_1 = require("./featureSet");
+const DEPLOYMENT_EVENT_RETRY_CONFIG = {
+    requestTimeoutMillis: 0,
+    maxRetryTimeMillis: 1000 * 60 * 60,
+};
 class MablApiClient extends basicApiClient_1.BasicApiClient {
     constructor(options) {
         super(options);
@@ -129,7 +133,7 @@ class MablApiClient extends basicApiClient_1.BasicApiClient {
     }
     async createDeployment(deployment) {
         try {
-            return await this.makePostRequest(`${env_1.BASE_API_URL}/deployments`, deployment, { timeout: 0 });
+            return await this.makePostRequest(`${env_1.BASE_API_URL}/deployments`, deployment);
         }
         catch (error) {
             throw toApiError(`Failed to create deployment`, error);
@@ -231,7 +235,7 @@ class MablApiClient extends basicApiClient_1.BasicApiClient {
     }
     async getDeploymentResults(deploymentEventId) {
         try {
-            return await this.makeGetRequest(`${env_1.BASE_API_URL}/execution/result/event/${deploymentEventId}`, { requestTimeoutMillis: 600000, maxRetryTimeMillis: 900000 });
+            return await this.makeGetRequest(`${env_1.BASE_API_URL}/execution/result/event/${deploymentEventId}`, DEPLOYMENT_EVENT_RETRY_CONFIG);
         }
         catch (error) {
             throw toApiError(`Failed to get deployment results`, error);
@@ -501,7 +505,7 @@ class MablApiClient extends basicApiClient_1.BasicApiClient {
     async postDeploymentEvent(options) {
         try {
             const requestBody = this.buildDeploymentRequestBody(options);
-            return await this.makePostRequest(`${env_1.BASE_API_URL}/events/deployment/`, requestBody);
+            return await this.makePostRequestWithRetries(`${env_1.BASE_API_URL}/events/deployment/`, requestBody, DEPLOYMENT_EVENT_RETRY_CONFIG);
         }
         catch (error) {
             throw toApiError(`Failed to create deployment`, error);

package/api/mablApiClientFactory.js

@@ -14,7 +14,7 @@ class MablApiClientFactory {
         if (apiKey) {
             return MablApiClientFactory.createApiClient({
                 authType: types_1.AuthType.ApiKey,
-                authToken: apiKey,
+                token: apiKey,
             });
         }
         return MablApiClientFactory.createApiClient();
@@ -22,34 +22,35 @@ class MablApiClientFactory {
     static createApiClientFromApiKey(apiKey) {
         return MablApiClientFactory.createApiClient({
             authType: types_1.AuthType.ApiKey,
-            authToken: apiKey,
+            token: apiKey,
         });
     }
     static createApiClientFromBearerToken(bearerToken) {
         return MablApiClientFactory.createApiClient({
             authType: types_1.AuthType.Bearer,
-            authToken: bearerToken,
+            token: bearerToken,
         });
     }
     static async createApiClient(opts) {
-        const httpConfig = (await cliConfigProvider_1.CliConfigProvider.getCliConfig()).http;
+        const { proxyHost, sslVerify } = (await cliConfigProvider_1.CliConfigProvider.getCliConfig())
+            .http;
+        const optsFromCliHttpConfig = {
+            proxyUrl: proxyHost,
+            sslVerify,
+        };
         if (opts) {
             return new mablApiClient_1.MablApiClient({
-                authType: opts.authType,
-                token: opts.authToken,
-                proxyUrl: httpConfig.proxyHost,
-                sslVerify: httpConfig.sslVerify,
-                userAgentOverride: opts.userAgentOverride,
+                ...optsFromCliHttpConfig,
+                ...opts,
             });
         }
         const authProvider = new authenticationProvider_1.AuthenticationProvider();
         const authConfig = await authProvider.getAuthConfigWithAutoRenew();
         if (authConfig === null || authConfig === void 0 ? void 0 : authConfig.accessToken) {
             return new mablApiClient_1.MablApiClient({
+                ...optsFromCliHttpConfig,
                 authType: authConfig.authType,
                 token: authConfig.accessToken,
-                proxyUrl: httpConfig.proxyHost,
-                sslVerify: httpConfig.sslVerify,
             });
         }
         throw new Error('Please supply an API key or authenticate the mabl CLI tool');

package/browserLauncher/playwrightBrowserLauncher/playwrightBrowser.js

@@ -54,6 +54,11 @@ class PlaywrightBrowser extends events_1.default {
             fs_extra_1.default.mkdirSync(path_1.default.join(this.downloadDirectory));
         }
     }
+    static async create(defaultContext, downloadDirectory, browserWSEndpoint) {
+        const browser = new PlaywrightBrowser(defaultContext, downloadDirectory, browserWSEndpoint);
+        await browser.setDownloadBehavior();
+        return browser;
+    }
     getRunnerType() {
         return runnerType_1.RunnerType.Playwright;
     }
@@ -114,6 +119,13 @@ class PlaywrightBrowser extends events_1.default {
     getDefaultContext() {
         return this.defaultContext;
     }
+    async setDownloadBehavior() {
+        await this.cdpSession.send('Browser.setDownloadBehavior', {
+            behavior: 'allow',
+            downloadPath: this.downloadDirectory,
+            eventsEnabled: true,
+        });
+    }
     onPageClose(page) {
         this.playwrightPages.delete(page.getPageId());
         this.emit(browserLauncher_1.BrowserEvent.PageDestroyed, page);

package/browserLauncher/playwrightBrowserLauncher/playwrightBrowserLauncher.js

@@ -1,17 +1,13 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PlaywrightBrowserLauncher = void 0;
 const test_1 = require("@playwright/test");
-const path_1 = __importDefault(require("path"));
 const playwrightBrowser_1 = require("./playwrightBrowser");
 const BROWSER_LAUNCH_TIMEOUT_MS = 60000;
 class PlaywrightBrowserLauncher {
     async connect(options, currentDownloadPath) {
         const browser = await test_1.chromium.connect(options.browserWSEndpoint);
-        return new playwrightBrowser_1.PlaywrightBrowser(browser.contexts()[0], currentDownloadPath, options.browserWSEndpoint);
+        return playwrightBrowser_1.PlaywrightBrowser.create(browser.contexts()[0], currentDownloadPath, options.browserWSEndpoint);
     }
     async launch(options) {
         var _a, _b, _c;
@@ -40,7 +36,7 @@ class PlaywrightBrowserLauncher {
             userAgent: options.userAgent,
             viewport,
         });
-        return new playwrightBrowser_1.PlaywrightBrowser(defaultContext, path_1.default.join(options.downloadPath, 'final'), '');
+        return playwrightBrowser_1.PlaywrightBrowser.create(defaultContext, options.downloadPath, '');
     }
 }
 exports.PlaywrightBrowserLauncher = PlaywrightBrowserLauncher;

package/browserLauncher/playwrightBrowserLauncher/playwrightDom.js

@@ -194,8 +194,11 @@ class PlaywrightElementHandle extends PlaywrightJsHandle {
         return this.element.selectOption(value);
     }
     async type(text, options) {
-        await this.element.focus();
-        await this.element.selectText({ force: true });
+        var _a;
+        const selectText = (_a = options === null || options === void 0 ? void 0 : options.selectText) !== null && _a !== void 0 ? _a : true;
+        if (selectText) {
+            await this.element.selectText({ force: true });
+        }
         return this.element.type(text, {
             delay: options === null || options === void 0 ? void 0 : options.delay,
             timeout: 0,

package/browserLauncher/playwrightBrowserLauncher/playwrightFrame.js

@@ -129,7 +129,7 @@ class PlaywrightFrame extends browserLauncher_1.Frame {
             const response = await this.frame.goto(url, options);
             if (waitForNetworkIdle) {
                 await this.frame.waitForLoadState('networkidle', {
-                    timeout: types_1.DefaultTimeouts.defaultActionTimeoutMs,
+                    timeout: types_1.DefaultTimeouts.defaultWaitTimeoutMs,
                 });
             }
             return (0, utils_1.mapIfNotNull)(response, (response) => new playwrightHttpResponse_1.PlaywrightHttpResponse(this.parentPage, response));

package/browserLauncher/playwrightBrowserLauncher/playwrightPage.js

@@ -36,7 +36,6 @@ const playwrightFrame_1 = require("./playwrightFrame");
 const playwrightDom_1 = require("./playwrightDom");
 const utils_1 = require("../utils");
 const wrappers_1 = require("./wrappers");
-const path_1 = __importDefault(require("path"));
 const logUtils_1 = require("../../util/logUtils");
 const uuid = __importStar(require("uuid"));
 class PlaywrightPage extends events_1.default {
@@ -57,7 +56,6 @@ class PlaywrightPage extends events_1.default {
             var _a, _b;
             const guid = uuid.v4();
             const downloadSize = (_b = (_a = (await download.createReadStream())) === null || _a === void 0 ? void 0 : _a.readableLength) !== null && _b !== void 0 ? _b : 0;
-            await download.saveAs(path_1.default.join(this.browser.getDownloadDirectory(), download.suggestedFilename()));
             browser.emit(browserLauncher_1.BrowserEvent.DownloadWillBegin, {
                 guid,
                 suggestedFilename: download.suggestedFilename(),

package/browserLauncher/types.js

@@ -5,6 +5,7 @@ class DefaultTimeouts {
 }
 exports.DefaultTimeouts = DefaultTimeouts;
 DefaultTimeouts.defaultTrialTimeoutMs = 5000;
+DefaultTimeouts.defaultWaitTimeoutMs = 5000;
 DefaultTimeouts.defaultActionTimeoutMs = 0;
 var LifecycleEvent;
 (function (LifecycleEvent) {