@mablhq/mabl-cli 1.18.3 → 1.20.9

package/api/basicApiClient.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BasicApiClient = exports.AuthType = void 0;
+exports.BasicApiClient = void 0;
 const ApiError_1 = require("./ApiError");
 const httpUtil_1 = require("../util/httpUtil");
 const axios_1 = __importDefault(require("axios"));
@@ -34,6 +34,7 @@ const os = __importStar(require("os"));
 const async_retry_1 = __importDefault(require("async-retry"));
 const logUtils_1 = require("../util/logUtils");
 const asyncUtil_1 = require("../util/asyncUtil");
+const types_1 = require("./types");
 const MABL_ENTITY_VERSION_HEADER = 'x-mabl-entity-version';
 const DEFAULT_RETRYABLE_REQUEST_TIMEOUT_MILLISECONDS = 60000;
 const DEFAULT_RETRIES = 10;
@@ -47,30 +48,27 @@ const RETRYABLE_NODEJS_ERRORS = [
     'ENOTFOUND',
     'ENETUNREACH',
     'ETIMEOUT',
+    'ETIMEDOUT',
     'ECONNABORTED',
 ];
-var AuthType;
-(function (AuthType) {
-    AuthType[AuthType["Bearer"] = 0] = "Bearer";
-    AuthType[AuthType["ApiKey"] = 1] = "ApiKey";
-})(AuthType = exports.AuthType || (exports.AuthType = {}));
+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 AuthType.ApiKey:
+            case types_1.AuthType.ApiKey:
                 config.auth = {
                     username: 'key',
                     password: options.token,
                 };
                 break;
-            case AuthType.Bearer:
+            case types_1.AuthType.Bearer:
                 config.headers.authorization = `Bearer ${options.token}`;
                 break;
             default:
@@ -90,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 : {}) };
@@ -130,7 +128,13 @@ class BasicApiClient {
         return { ...result, entity_version: versionHeader };
     }
     async makePostRequest(path, requestBody, requestConfig) {
-        const response = await this.debugRequest('POST', path, () => this.httpClient.post(path, requestBody, this.getNonRetryableRequestConfig(requestConfig)));
+        return this.postRequest(path, requestBody, this.getNonRetryableRequestConfig(requestConfig));
+    }
+    async makePostRequestWithRetries(path, requestBody, config) {
+        return this.retryWrappedRequest(`makePostRequestWithRetries('${path}')`, () => this.postRequest(path, requestBody, this.getRetryableRequestConfig(config)), config);
+    }
+    async postRequest(path, requestBody, config) {
+        const response = await this.debugRequest('POST', path, () => this.httpClient.post(path, requestBody, 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);
@@ -319,13 +323,13 @@ class MablApiClient extends basicApiClient_1.BasicApiClient {
         try {
             const selfInfo = await this.makeGetRequest(`${env_1.BASE_API_URL}/self`);
             if (((_a = selfInfo.preferences) === null || _a === void 0 ? void 0 : _a.default_workspace_id) &&
-                !cliConfigProvider_1.CliConfigProvider.getWorkspace()) {
+                !(await cliConfigProvider_1.CliConfigProvider.getWorkspace())) {
                 const workspace = await this.getWorkspace(selfInfo.preferences.default_workspace_id);
-                cliConfigProvider_1.CliConfigProvider.setWorkspace(workspace);
+                await cliConfigProvider_1.CliConfigProvider.setWorkspace(workspace);
             }
             else if (((_b = selfInfo.roles) === null || _b === void 0 ? void 0 : _b.length) === 1) {
                 const workspace = await this.getWorkspace(selfInfo.roles[0].organization_id);
-                cliConfigProvider_1.CliConfigProvider.setWorkspace(workspace);
+                await cliConfigProvider_1.CliConfigProvider.setWorkspace(workspace);
             }
             return selfInfo;
         }
@@ -454,7 +458,7 @@ class MablApiClient extends basicApiClient_1.BasicApiClient {
                 context_id: contextId,
                 workspace_id: workspaceId,
             };
-            return await this.makePostRequest(`${env_1.BASE_API_URL}/mailbox/address`, body);
+            return await this.makePostRequestWithRetries(`${env_1.BASE_API_URL}/mailbox/address`, body);
         }
         catch (error) {
             throw toApiError('Failed to create mailbox email address', 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

@@ -7,63 +7,64 @@ exports.MablApiClientFactory = void 0;
 const mablApiClient_1 = require("./mablApiClient");
 const authenticationProvider_1 = require("../providers/authenticationProvider");
 const cliConfigProvider_1 = require("../providers/cliConfigProvider");
-const basicApiClient_1 = require("./basicApiClient");
+const types_1 = require("./types");
 const chalk_1 = __importDefault(require("chalk"));
 class MablApiClientFactory {
     static createApiClientFromOptionalApiKey(apiKey) {
         if (apiKey) {
             return MablApiClientFactory.createApiClient({
-                authType: basicApiClient_1.AuthType.ApiKey,
-                authToken: apiKey,
+                authType: types_1.AuthType.ApiKey,
+                token: apiKey,
             });
         }
         return MablApiClientFactory.createApiClient();
     }
     static createApiClientFromApiKey(apiKey) {
         return MablApiClientFactory.createApiClient({
-            authType: basicApiClient_1.AuthType.ApiKey,
-            authToken: apiKey,
+            authType: types_1.AuthType.ApiKey,
+            token: apiKey,
         });
     }
     static createApiClientFromBearerToken(bearerToken) {
         return MablApiClientFactory.createApiClient({
-            authType: basicApiClient_1.AuthType.Bearer,
-            authToken: bearerToken,
+            authType: types_1.AuthType.Bearer,
+            token: bearerToken,
         });
     }
     static async createApiClient(opts) {
-        const httpConfig = 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');
     }
     static async createUserApiClient() {
-        if (authenticationProvider_1.AuthenticationProvider.getAuthType() !== basicApiClient_1.AuthType.Bearer) {
+        if ((await authenticationProvider_1.AuthenticationProvider.getAuthType()) !== types_1.AuthType.Bearer) {
             MablApiClientFactory.throwUserAuthTypeError();
         }
         return MablApiClientFactory.createApiClient();
     }
-    static createApiClientForAccessToken(accessToken) {
-        const httpConfig = cliConfigProvider_1.CliConfigProvider.getCliConfig().http;
+    static async createApiClientForAccessToken(accessToken) {
+        const httpConfig = (await cliConfigProvider_1.CliConfigProvider.getCliConfig()).http;
         return new mablApiClient_1.MablApiClient({
-            authType: basicApiClient_1.AuthType.Bearer,
+            authType: types_1.AuthType.Bearer,
             token: accessToken,
             proxyUrl: httpConfig.proxyHost,
             sslVerify: httpConfig.sslVerify,

package/api/types.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AuthType = void 0;
+var AuthType;
+(function (AuthType) {
+    AuthType[AuthType["Bearer"] = 0] = "Bearer";
+    AuthType[AuthType["ApiKey"] = 1] = "ApiKey";
+})(AuthType = exports.AuthType || (exports.AuthType = {}));

package/auth/AuthClient.js

@@ -28,6 +28,7 @@ class AuthClient {
         const loginQueryString = query_string_1.default.stringify({
             codeChallenge,
             redirectUri,
+            includeRefreshToken: true,
         });
         return idpType
             ? `${env_1.BASE_APP_URL}/authorize/social/${idpType.toLowerCase()}?${loginQueryString}`

package/auth/OktaClient.js

@@ -1,10 +1,16 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OktaClient = void 0;
 const env_1 = require("../env/env");
+const axios_1 = __importDefault(require("axios"));
 const authenticationProvider_1 = require("../providers/authenticationProvider");
-const basicApiClient_1 = require("../api/basicApiClient");
+const types_1 = require("../providers/types");
+const types_2 = require("../api/types");
 const AuthClient_1 = require("./AuthClient");
+const loggingProvider_1 = require("../providers/logging/loggingProvider");
 const queryString = require('query-string');
 class OktaClient extends AuthClient_1.AuthClient {
     constructor(httpClient) {
@@ -12,41 +18,80 @@ class OktaClient extends AuthClient_1.AuthClient {
         this.httpClient = httpClient;
     }
     async validateAuthCode(code, codeVerifier, redirectUri) {
-        const url = `${env_1.OKTA_URL}/oauth2/default/v1/token`;
-        const requestOptions = {
-            method: 'POST',
-            headers: { 'content-type': 'application/x-www-form-urlencoded' },
-        };
-        const data = queryString.stringify({
+        return this.getBearerAuthInfo(queryString.stringify({
             grant_type: 'authorization_code',
             client_id: env_1.OKTA_CLIENT_ID,
             code_verifier: codeVerifier,
             code,
             redirect_uri: redirectUri,
-        });
-        const response = await this.httpClient.post(url, data, requestOptions);
-        const authInfo = response.data;
-        authInfo.auth_provider = authenticationProvider_1.AuthProviderType.Okta;
-        authInfo.auth_type = basicApiClient_1.AuthType.Bearer;
-        return authInfo;
+        }));
     }
-    async exchangeRefreshTokenForAccessToken(refreshToken) {
-        const url = `${env_1.OKTA_URL}/oauth2/default/v1/token`;
+    async getRefreshTokenExpiration(refreshToken) {
+        if (!refreshToken) {
+            return;
+        }
+        const url = `${env_1.OKTA_URL}/oauth2/v1/introspect`;
         const requestOptions = {
             method: 'POST',
             headers: { 'content-type': 'application/x-www-form-urlencoded' },
         };
         const data = queryString.stringify({
-            grant_type: 'refresh_token',
             client_id: env_1.OKTA_CLIENT_ID,
-            refresh_token: refreshToken,
-            scope: 'openid profile email offline_access',
+            token_type_hint: 'refresh_token',
+            token: refreshToken,
         });
-        const response = await this.httpClient.post(url, data, requestOptions);
+        try {
+            const response = await this.httpClient.post(url, data, requestOptions);
+            return response.data.exp;
+        }
+        catch (error) {
+            loggingProvider_1.logger.info(`Couldn't get refresh token expiration. Will re-use previous lifetime.`);
+            return;
+        }
+    }
+    async getBearerAuthInfo(queryStringData) {
+        const url = `${env_1.OKTA_URL}/oauth2/default/v1/token`;
+        const requestOptions = {
+            method: 'POST',
+            headers: { 'content-type': 'application/x-www-form-urlencoded' },
+        };
+        const response = await this.httpClient.post(url, queryStringData, requestOptions);
         const authInfo = response.data;
-        authInfo.auth_provider = authenticationProvider_1.AuthProviderType.Okta;
-        authInfo.auth_type = basicApiClient_1.AuthType.Bearer;
+        const refreshTokenExpiresAt = await this.getRefreshTokenExpiration(authInfo.refresh_token);
+        authInfo.auth_provider = types_1.AuthProviderType.Okta;
+        authInfo.auth_type = types_2.AuthType.Bearer;
+        authInfo.refresh_token_expires_at = refreshTokenExpiresAt;
         return authInfo;
     }
+    exchangeRefreshTokenForAccessToken(refreshToken) {
+        var _a;
+        try {
+            return this.getBearerAuthInfo(queryString.stringify({
+                grant_type: 'refresh_token',
+                client_id: env_1.OKTA_CLIENT_ID,
+                refresh_token: refreshToken,
+                scope: 'openid profile email offline_access',
+            }));
+        }
+        catch (error) {
+            if (!axios_1.default.isAxiosError(error)) {
+                throw error;
+            }
+            const data = (_a = error.response) === null || _a === void 0 ? void 0 : _a.data;
+            if (!(0, authenticationProvider_1.isOidcError)(data)) {
+                throw error;
+            }
+            return Promise.resolve({
+                auth_provider: types_1.AuthProviderType.Okta,
+                auth_type: types_2.AuthType.Bearer,
+                access_token: '',
+                id_token: '',
+                token_type: '',
+                expires_in: 0,
+                error: data.error,
+                error_description: data.error_description,
+            });
+        }
+    }
 }
 exports.OktaClient = OktaClient;

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

@@ -132,13 +132,13 @@ class PlaywrightElementHandle extends PlaywrightJsHandle {
         return (0, utils_1.mapIfNotNull)(await this.element.boundingBox(), (boundingBox) => boundingBox);
     }
     async click(options) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         const trial = (_a = options === null || options === void 0 ? void 0 : options.trial) !== null && _a !== void 0 ? _a : false;
         try {
             await this.element.click({
                 clickCount: (_b = options === null || options === void 0 ? void 0 : options.clickCount) !== null && _b !== void 0 ? _b : 1,
                 force: (_c = options === null || options === void 0 ? void 0 : options.force) !== null && _c !== void 0 ? _c : !trial,
-                timeout: (_d = options === null || options === void 0 ? void 0 : options.timeout) !== null && _d !== void 0 ? _d : types_1.DefaultTimeouts.quickActionTimeoutMs,
+                timeout: this.getActionTimeout(options),
                 trial,
             });
         }
@@ -151,12 +151,12 @@ class PlaywrightElementHandle extends PlaywrightJsHandle {
         }
     }
     async doubleClick(options) {
-        var _a, _b, _c;
+        var _a, _b;
         try {
             const trial = (_a = options === null || options === void 0 ? void 0 : options.trial) !== null && _a !== void 0 ? _a : false;
             return this.element.dblclick({
                 force: (_b = options === null || options === void 0 ? void 0 : options.force) !== null && _b !== void 0 ? _b : !trial,
-                timeout: (_c = options === null || options === void 0 ? void 0 : options.timeout) !== null && _c !== void 0 ? _c : types_1.DefaultTimeouts.quickActionTimeoutMs,
+                timeout: this.getActionTimeout(options),
                 trial,
             });
         }
@@ -273,5 +273,12 @@ class PlaywrightElementHandle extends PlaywrightJsHandle {
         const result = await this.element.evaluate((el) => el.innerText);
         return (0, pureUtil_1.isNullish)(result) ? undefined : result;
     }
+    getActionTimeout(options) {
+        var _a;
+        const defaultTimeout = (options === null || options === void 0 ? void 0 : options.trial)
+            ? types_1.DefaultTimeouts.defaultTrialTimeoutMs
+            : types_1.DefaultTimeouts.defaultActionTimeoutMs;
+        return (_a = options === null || options === void 0 ? void 0 : options.timeout) !== null && _a !== void 0 ? _a : defaultTimeout;
+    }
 }
 exports.PlaywrightElementHandle = PlaywrightElementHandle;

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.quickActionTimeoutMs,
+                    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

@@ -4,8 +4,9 @@ exports.WaitForOptions = exports.LifecycleEvent = exports.DefaultTimeouts = void
 class DefaultTimeouts {
 }
 exports.DefaultTimeouts = DefaultTimeouts;
-DefaultTimeouts.quickActionTimeoutMs = 5000;
-DefaultTimeouts.defaultTextInputTimeoutMs = 30000;
+DefaultTimeouts.defaultTrialTimeoutMs = 5000;
+DefaultTimeouts.defaultWaitTimeoutMs = 5000;
+DefaultTimeouts.defaultActionTimeoutMs = 0;
 var LifecycleEvent;
 (function (LifecycleEvent) {
     LifecycleEvent["DomContentLoaded"] = "domcontentloaded";

package/cli.js

@@ -85,9 +85,7 @@ yargs
         catch (_) {
         }
     },
-    (argv) => {
-        (0, analytics_1.trackCliEvent)(argv._, (0, pureUtil_1.extractKeyCountsFromArgs)(argv));
-    },
+    async (argv) => (0, analytics_1.trackCliEvent)(argv._, (0, pureUtil_1.extractKeyCountsFromArgs)(argv)),
     () => {
         updateNotifier({
             pkg: cliPackage,

package/commands/applications/applications_cmds/list.js

@@ -18,7 +18,7 @@ exports.handler = (0, util_1.failWrapper)(listApplications);
 async function listApplications(parsed) {
     const output = parsed.output;
     const limit = parsed.limit;
-    const workspaceId = (0, util_1.getWorkspaceId)(parsed);
+    const workspaceId = await (0, util_1.getWorkspaceId)(parsed);
     const apiClient = await mablApiClientFactory_1.MablApiClientFactory.createApiClient();
     const applications = await apiClient.getApplications(workspaceId, limit);
     printApplications(applications, output);

package/commands/auth/auth_cmds/activate-key.js

@@ -24,6 +24,6 @@ async function activateApiKey(parsed) {
     const mablApi = await mablApiClientFactory_1.MablApiClientFactory.createApiClientFromApiKey(cleanApiKey);
     const apiKeyDetails = await mablApi.getApiKeyDetails();
     const apiKeyWorkspace = await mablApi.getWorkspace(apiKeyDetails.workspace_id);
-    cliConfigProvider_1.CliConfigProvider.setWorkspace(apiKeyWorkspace);
-    auth.activateApiKey(cleanApiKey);
+    await cliConfigProvider_1.CliConfigProvider.setWorkspace(apiKeyWorkspace);
+    return auth.activateApiKey(cleanApiKey);
 }

package/commands/auth/auth_cmds/clear.js

@@ -6,5 +6,5 @@ exports.describe = 'Clear logged in user';
 exports.builder = {};
 exports.handler = exports.handler = () => {
     const auth = new authenticationProvider_1.AuthenticationProvider();
-    auth.clearAuthentication();
+    return auth.clearAuthentication();
 };

package/commands/auth/auth_cmds/info.js

@@ -6,5 +6,5 @@ exports.describe = 'Display logged in user';
 exports.builder = {};
 exports.handler = () => {
     const auth = new authenticationProvider_1.AuthenticationProvider();
-    auth.displayInfo();
+    return auth.displayInfo();
 };

package/commands/branches/branches_cmds/create.js

@@ -39,7 +39,7 @@ exports.builder = (yargs) => {
 exports.handler = (0, util_1.failWrapper)(createBranch);
 async function createBranch(parsed) {
     const apiClient = await mablApiClientFactory_1.MablApiClientFactory.createApiClient();
-    const workspaceId = (0, util_1.getWorkspaceId)(parsed);
+    const workspaceId = await (0, util_1.getWorkspaceId)(parsed);
     const branchName = parsed.name;
     loggingProvider_1.logger.info(`Creating Branch [${branchName}]`);
     try {

package/commands/branches/branches_cmds/describe.js

@@ -39,7 +39,7 @@ async function getBranch(parsed) {
     const apiClient = await mablApiClientFactory_1.MablApiClientFactory.createApiClient();
     let branch;
     if (lookupByName) {
-        const workspaceId = (0, util_1.getWorkspaceId)(parsed);
+        const workspaceId = await (0, util_1.getWorkspaceId)(parsed);
         branch = await apiClient.getBranchByName(workspaceId, branchIdentifier);
     }
     else {

package/commands/branches/branches_cmds/list.js

@@ -43,7 +43,7 @@ async function listBranches(parsed) {
     const output = parsed.output;
     const limit = parsed.limit;
     const statusFilter = parsed.status;
-    const workspaceId = (0, util_1.getWorkspaceId)(parsed);
+    const workspaceId = await (0, util_1.getWorkspaceId)(parsed);
     const apiClient = await mablApiClientFactory_1.MablApiClientFactory.createApiClient();
     const branches = await apiClient.getBranches(workspaceId, limit, statusFilter);
     printBranches(branches, output);

package/commands/branches/branches_cmds/merge.js

@@ -47,7 +47,7 @@ exports.builder = (yargs) => {
 exports.handler = (0, util_1.failWrapper)(mergeBranch);
 async function mergeBranch(parsed) {
     const apiClient = await mablApiClientFactory_1.MablApiClientFactory.createApiClient();
-    const workspaceId = (0, util_1.getWorkspaceId)(parsed);
+    const workspaceId = await (0, util_1.getWorkspaceId)(parsed);
     const fromBranchName = parsed.from;
     const toBranchName = parsed.to;
     const branch = await apiClient.mergeBranch(workspaceId, fromBranchName, toBranchName);

package/commands/commandUtil/util.js

@@ -24,12 +24,12 @@ function failWrapper(func, exitCodeOnError = 1) {
     });
 }
 exports.failWrapper = failWrapper;
-function getWorkspaceId(parsed) {
-    const workspaceId = parsed['workspace-id'];
+async function getWorkspaceId(parsed) {
+    const workspaceId = parsed[constants_1.CommandArgWorkspaceId];
     if (workspaceId) {
         return workspaceId;
     }
-    const configuredWorkspace = cliConfigProvider_1.CliConfigProvider.getWorkspace();
+    const configuredWorkspace = await cliConfigProvider_1.CliConfigProvider.getWorkspace();
     if (configuredWorkspace === null || configuredWorkspace === void 0 ? void 0 : configuredWorkspace.id) {
         return configuredWorkspace.id;
     }

package/commands/config/config_cmds/configKeys.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validConfigKeyChoices = exports.configKeys = void 0;
+exports.configKeys = Object.freeze({
+    browserPath: 'browser.path',
+    enableSourceControlMetadataCollection: 'alpha.scm_metadata.enable',
+    defaultWorkspaceId: 'workspace',
+    proxy: 'http.proxy',
+    sslVerify: 'http.sslVerify',
+});
+exports.validConfigKeyChoices = Object.values(exports.configKeys);