@mablhq/mabl-cli 1.17.0 → 1.19.3

package/api/basicApiClient.js

@@ -130,7 +130,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/featureSet.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FeatureSet = exports.FindImplementationVersion = void 0;
 const runnerType_1 = require("../browserLauncher/runnerType");
-const PLAYWRIGHT_FEATURE_FLAG = 'nodejs_execution_engine_playwright';
 const SMARTER_WAIT_FEATURE_FLAG = 'smarter_wait';
 var FindImplementationVersion;
 (function (FindImplementationVersion) {
@@ -14,9 +13,7 @@ class FeatureSet {
         this.featureFlags = featureFlags;
     }
     getRunnerType() {
-        return this.featureFlags.has(PLAYWRIGHT_FEATURE_FLAG)
-            ? runnerType_1.RunnerType.Playwright
-            : runnerType_1.RunnerType.Puppeteer;
+        return runnerType_1.RunnerType.Playwright;
     }
     getFindImplementationVersion() {
         return this.featureFlags.has(SMARTER_WAIT_FEATURE_FLAG)

package/api/mablApiClient.js

@@ -303,7 +303,7 @@ class MablApiClient extends basicApiClient_1.BasicApiClient {
             return await this.makeGetRequest(`${env_1.BASE_API_URL}/accounts/${accountId}`);
         }
         catch (error) {
-            throw new ApiError_1.ApiError(`Failed to get account`, error, error.status);
+            throw toApiError(`Failed to get account`, error);
         }
     }
     async getApiKeyDetails() {
@@ -454,10 +454,10 @@ 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 new ApiError_1.ApiError('Failed to create mailbox email address', error);
+            throw toApiError('Failed to create mailbox email address', error);
         }
     }
     async createBranch(workspaceId, branchName) {

package/browserLauncher/browserLauncherFactory.js

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BrowserLauncherFactory = void 0;
-const puppeteerBrowserLauncher_1 = require("./puppeteerBrowserLauncher/puppeteerBrowserLauncher");
 const playwrightBrowserLauncher_1 = require("./playwrightBrowserLauncher/playwrightBrowserLauncher");
 const runnerType_1 = require("./runnerType");
 const logUtils_1 = require("../util/logUtils");
@@ -24,8 +23,8 @@ class BrowserLauncherFactory {
             loggerFunc(chalk_1.default.cyan(`Browser launcher:`, chalk_1.default.magenta('Playwright')));
             return new playwrightBrowserLauncher_1.PlaywrightBrowserLauncher();
         }
-        loggerFunc(chalk_1.default.cyan(`Browser launcher:`, chalk_1.default.magenta('Puppeteer')));
-        return new puppeteerBrowserLauncher_1.PuppeteerBrowserLauncher();
+        loggerFunc(chalk_1.default.red.bold(`Unsupported runner type:`, runner));
+        throw new Error(`Unsupported runner type:[${runner}]`);
     }
 }
 exports.BrowserLauncherFactory = BrowserLauncherFactory;

package/browserLauncher/playwrightBrowserLauncher/playwrightBrowser.js

@@ -128,5 +128,8 @@ class PlaywrightBrowser extends events_1.default {
         await playwrightPage.waitForInitialization();
         return playwrightPage;
     }
+    exposeFunction(name, callback) {
+        return this.defaultContext.exposeFunction(name, callback);
+    }
 }
 exports.PlaywrightBrowser = PlaywrightBrowser;

package/browserLauncher/playwrightBrowserLauncher/playwrightBrowserLauncher.js

@@ -23,20 +23,22 @@ class PlaywrightBrowserLauncher {
             :
                 null;
         const defaultContext = await test_1.chromium.launchPersistentContext(options.userDataDir, {
-            ignoreHTTPSErrors: true,
-            headless: options.headless,
+            acceptDownloads: true,
             args: options.args,
-            ignoreDefaultArgs: options.ignoreDefaultArgs,
+            bypassCSP: options.bypassContentSecurityPolicy,
+            deviceScaleFactor: (_a = options.defaultDeviceDescriptor) === null || _a === void 0 ? void 0 : _a.deviceScaleFactor,
             downloadsPath: options.downloadPath,
             executablePath: options.executablePath,
-            viewport,
-            acceptDownloads: true,
-            httpCredentials: options.credentials,
             extraHTTPHeaders: options.extraHttpHeaders,
-            isMobile: (_a = options.defaultDeviceDescriptor) === null || _a === void 0 ? void 0 : _a.isMobile,
-            deviceScaleFactor: (_b = options.defaultDeviceDescriptor) === null || _b === void 0 ? void 0 : _b.deviceScaleFactor,
-            hasTouch: (_c = options.defaultDeviceDescriptor) === null || _c === void 0 ? void 0 : _c.hasTouch,
+            hasTouch: (_b = options.defaultDeviceDescriptor) === null || _b === void 0 ? void 0 : _b.hasTouch,
+            headless: options.headless,
+            httpCredentials: options.credentials,
+            ignoreDefaultArgs: options.ignoreDefaultArgs,
+            ignoreHTTPSErrors: true,
+            isMobile: (_c = options.defaultDeviceDescriptor) === null || _c === void 0 ? void 0 : _c.isMobile,
             timeout: BROWSER_LAUNCH_TIMEOUT_MS,
+            userAgent: options.userAgent,
+            viewport,
         });
         return new playwrightBrowser_1.PlaywrightBrowser(defaultContext, path_1.default.join(options.downloadPath, 'final'), '');
     }

package/browserLauncher/playwrightBrowserLauncher/playwrightDom.js

@@ -194,23 +194,13 @@ class PlaywrightElementHandle extends PlaywrightJsHandle {
         return this.element.selectOption(value);
     }
     async type(text, options) {
-        const timeout = PlaywrightElementHandle.getTypeTimeout(text, options);
         await this.element.focus();
         await this.element.selectText({ force: true });
         return this.element.type(text, {
             delay: options === null || options === void 0 ? void 0 : options.delay,
-            timeout,
+            timeout: 0,
         });
     }
-    static getTypeTimeout(text, options) {
-        var _a;
-        let timeout;
-        const newTimeout = text.length * ((_a = options === null || options === void 0 ? void 0 : options.delay) !== null && _a !== void 0 ? _a : 1) * 2;
-        if (newTimeout > types_1.DefaultTimeouts.defaultTextInputTimeoutMs) {
-            timeout = newTimeout;
-        }
-        return timeout;
-    }
     press(key) {
         return this.element.press(key);
     }

package/browserLauncher/playwrightBrowserLauncher/playwrightFrame.js

@@ -178,5 +178,23 @@ class PlaywrightFrame extends browserLauncher_1.Frame {
         }
         return this.frameImpl;
     }
+    async initializeExposedFunctionInSecondaryWorld(functionName) {
+        var _a;
+        try {
+            const pageImpl = this.parentPage.getPageImpl();
+            if (!pageImpl) {
+                return false;
+            }
+            const binding = (_a = pageImpl._pageBindings.get(functionName)) !== null && _a !== void 0 ? _a : pageImpl._browserContext._pageBindings.get(functionName);
+            if (!binding) {
+                return false;
+            }
+            await this.evaluateCodeInSecondaryWorld(binding.source, {});
+        }
+        catch (e) {
+            return false;
+        }
+        return true;
+    }
 }
 exports.PlaywrightFrame = PlaywrightFrame;

package/browserLauncher/runnerType.js

@@ -4,5 +4,4 @@ exports.RunnerType = void 0;
 var RunnerType;
 (function (RunnerType) {
     RunnerType["Playwright"] = "playwright";
-    RunnerType["Puppeteer"] = "puppeteer";
 })(RunnerType = exports.RunnerType || (exports.RunnerType = {}));

package/commands/constants.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CommandArgVariables = exports.CommandArgUrlApi = exports.CommandArgUrlApp = exports.CommandArgUrl = exports.CommandArgTrainerVersion = exports.CommandArgTo = exports.CommandArgSilent = exports.CommandArgRevision = exports.CommandArgPlanId = exports.CommandArgContentTypes = exports.CommandArgPreview = exports.CommandArgOutputFilePath = exports.CommandArgOutput = exports.CommandArgNoPrompt = exports.CommandArgPrompt = exports.CommandArgPortNumber = exports.CommandArgName = exports.CommandArgMablBranchChangesOnly = exports.CommandArgMablBranch = exports.CommandArgMablAutoLogin = exports.CommandArgMablAutoBranch = exports.CommandArgLinkBypass = exports.CommandArgLinkLabel = exports.CommandArgLimitOutput = exports.CommandArgLabels = exports.CommandArgLabelsInclude = exports.CommandArgLabelsExclude = exports.CommandArgTestInteractionSpeed = exports.CommandArgTestRunId = exports.CommandArgTestFile = exports.CommandArgId = exports.CommandArgHttpHeaders = exports.CommandArgHelp = exports.CommandArgFromPlanId = exports.CommandArgFrom = exports.CommandArgFormat = exports.CommandArgFastFailure = exports.CommandArgOverrideEnvironmentId = exports.CommandArgEnvironmentId = exports.CommandArgEnableLink = exports.CommandArgDetailLevel = exports.CommandArgDescription = exports.CommandArgDeploymentId = exports.CommandArgDecrypt = exports.CommandArgDataTables = exports.CommandArgCredentials = exports.CommandArgBasicAuthCredentials = exports.CommandArgBrowsers = exports.CommandArgApplicationId = exports.CommandArgApiKey = void 0;
-exports.BrowserTypeSelections = exports.DefaultBrowserType = exports.DefaultBranchName = exports.DefaultOutputFormatChoices = exports.DetailLevelFormats = exports.ReporterOptions = exports.OutputFormats = exports.CommandArgAliases = exports.CommandArgBrowserEnableExtensions = exports.CommandArgBrowserIgnoreCertificateErrors = exports.CommandArgBrowserDisableIsolation = exports.ListTimeFormat = exports.CommandArgReporterOptions = exports.CommandArgReporter = exports.CommandArgWorkspaceId = exports.CommandArgVersion = void 0;
+exports.CommandArgUrlApi = exports.CommandArgUrlApp = exports.CommandArgUrl = exports.CommandArgTrainerVersion = exports.CommandArgTo = exports.CommandArgSilent = exports.CommandArgRevision = exports.CommandArgPlanId = exports.CommandArgContentTypes = exports.CommandArgPreview = exports.CommandArgOutputFilePath = exports.CommandArgOutput = exports.CommandArgNoPrompt = exports.CommandArgPrompt = exports.CommandArgPortNumber = exports.CommandArgName = exports.CommandArgMablBranchChangesOnly = exports.CommandArgMablBranch = exports.CommandArgMablAutoLogin = exports.CommandArgMablAutoBranch = exports.CommandArgLinkBypass = exports.CommandArgLinkLabel = exports.CommandArgLimitOutput = exports.CommandArgLabels = exports.CommandArgLabelsInclude = exports.CommandArgLabelsExclude = exports.CommandArgTestInteractionSpeed = exports.CommandArgTestRunId = exports.CommandArgTestFile = exports.CommandArgId = exports.CommandArgUserAgent = exports.CommandArgHttpHeaders = exports.CommandArgHelp = exports.CommandArgFromPlanId = exports.CommandArgFrom = exports.CommandArgFormat = exports.CommandArgFastFailure = exports.CommandArgOverrideEnvironmentId = exports.CommandArgEnvironmentId = exports.CommandArgEnableLink = exports.CommandArgDetailLevel = exports.CommandArgDescription = exports.CommandArgDeploymentId = exports.CommandArgDecrypt = exports.CommandArgDataTables = exports.CommandArgCredentials = exports.CommandArgBasicAuthCredentials = exports.CommandArgBrowsers = exports.CommandArgApplicationId = exports.CommandArgApiKey = void 0;
+exports.BrowserTypeSelections = exports.DefaultBrowserType = exports.DefaultBranchName = exports.DefaultOutputFormatChoices = exports.DetailLevelFormats = exports.ReporterOptions = exports.OutputFormats = exports.CommandArgAliases = exports.CommandArgBrowserEnableExtensions = exports.CommandArgBrowserIgnoreCertificateErrors = exports.CommandArgBrowserDisableIsolation = exports.ListTimeFormat = exports.CommandArgReporterOptions = exports.CommandArgReporter = exports.CommandArgWorkspaceId = exports.CommandArgVersion = exports.CommandArgVariables = void 0;
 const browserTypes_1 = require("./browserTypes");
 exports.CommandArgApiKey = 'api-key';
 exports.CommandArgApplicationId = 'application-id';
@@ -22,6 +22,7 @@ exports.CommandArgFrom = 'from';
 exports.CommandArgFromPlanId = 'from-plan-id';
 exports.CommandArgHelp = 'help';
 exports.CommandArgHttpHeaders = 'http-headers';
+exports.CommandArgUserAgent = 'user-agent';
 exports.CommandArgId = 'id';
 exports.CommandArgTestFile = 'test-file';
 exports.CommandArgTestRunId = 'run-id';

package/commands/tests/testsUtil.js

@@ -138,15 +138,17 @@ async function createBrowserWithAuthedExtension(accessToken, browserWidth, brows
 }
 exports.createBrowserWithAuthedExtension = createBrowserWithAuthedExtension;
 async function launchBrowserInstance(chromePath, launchArgs, userDataDir, headless, credentials, options) {
-    const { defaultDeviceDescriptor, extraHttpHeaders, ignoreDefaultArgs, runnerType, loggerFunc, } = options || {};
+    const { bypassContentSecurityPolicy, defaultDeviceDescriptor, extraHttpHeaders, ignoreDefaultArgs, runnerType, loggerFunc, userAgent, } = options || {};
     let browser;
     try {
         browser = await maybeLaunchBrowser(chromePath, launchArgs, userDataDir, headless, credentials, {
+            bypassContentSecurityPolicy,
             defaultDeviceDescriptor,
             extraHttpHeaders,
             ignoreDefaultArgs,
             runnerType,
             loggerFunc,
+            userAgent,
         });
     }
     catch (error) {
@@ -154,6 +156,7 @@ async function launchBrowserInstance(chromePath, launchArgs, userDataDir, headle
             launchArgs.push('--no-sandbox');
             messaging_1.mablEventEmitter.log('Unable to initialize browser with standard settings, attempting to run with --no-sandbox setting', Date.now(), logLineMessaging_1.LogLineColor.yellow);
             return maybeLaunchBrowser(chromePath, launchArgs, userDataDir, headless, credentials, {
+                bypassContentSecurityPolicy,
                 defaultDeviceDescriptor,
                 ignoreDefaultArgs,
                 runnerType,
@@ -168,8 +171,9 @@ async function launchBrowserInstance(chromePath, launchArgs, userDataDir, headle
     return browser;
 }
 function maybeLaunchBrowser(chromePath, launchArgs, userDataDir, headless, credentials, options) {
-    const { defaultDeviceDescriptor, extraHttpHeaders, ignoreDefaultArgs, runnerType, loggerFunc, } = options || {};
+    const { bypassContentSecurityPolicy, defaultDeviceDescriptor, extraHttpHeaders, ignoreDefaultArgs, runnerType, loggerFunc, userAgent, } = options || {};
     return browserLauncher_1.BrowserLauncherFactory.createRunner(runnerType, loggerFunc).launch({
+        bypassContentSecurityPolicy,
         defaultDeviceDescriptor,
         executablePath: chromePath,
         extraHttpHeaders,
@@ -179,6 +183,7 @@ function maybeLaunchBrowser(chromePath, launchArgs, userDataDir, headless, crede
         userDataDir,
         downloadPath: createDownloadDirectory(),
         credentials,
+        userAgent,
     });
 }
 async function prepareChromePreferencesDirectory(browserPreferences) {
@@ -203,7 +208,7 @@ function removeTempBrowserPreferencesDirectory(tempDirPath) {
     }
 }
 async function createBrowser(browserWidth, browserHeight, headless, containerTesting, tempBrowserPreferencesDirectory, options) {
-    const { credentials, browserPath, disableIsolation, extraHttpHeaders, ignoreCertificateErrors, emulationConfig, enableExtensions, runnerType, loggerFunc, resourcesDirectoryOverride, } = options || {};
+    const { bypassContentSecurityPolicy, credentials, browserPath, disableIsolation, extraHttpHeaders, ignoreCertificateErrors, emulationConfig, enableExtensions, runnerType, loggerFunc, resourcesDirectoryOverride, userAgent, } = options || {};
     const chromePath = browserPath !== null && browserPath !== void 0 ? browserPath : findChrome();
     if (!chromePath.length) {
         messaging_1.mablEventEmitter.log(chalk.yellow('Could not find a local install of Chrome to use, please ensure you have it installed and try again'));
@@ -227,11 +232,13 @@ async function createBrowser(browserWidth, browserHeight, headless, containerTes
         ignoreDefaultArgs = ['--disable-extensions'];
     }
     const maybeBrowser = await launchBrowserInstance(chromePath, launchArgs, tempBrowserPreferencesDirectory, headless, credentials, {
+        bypassContentSecurityPolicy,
         defaultDeviceDescriptor,
         extraHttpHeaders,
         ignoreDefaultArgs,
         runnerType,
         loggerFunc,
+        userAgent: userAgent !== null && userAgent !== void 0 ? userAgent : emulationConfig === null || emulationConfig === void 0 ? void 0 : emulationConfig.device_config.user_agent,
     });
     if (!maybeBrowser) {
         throw new Error('Unable to start Chrome session');
@@ -244,9 +251,6 @@ function addLaunchArgs(launchArgs, browserWidth, browserHeight, fakeMicrophoneMe
     var _a, _b;
     const defaultDeviceDescriptor = (0, mobileEmulationUtil_1.getDeviceDescriptorForEmulation)(emulationConfig);
     launchArgs.push(`--window-size=${(_a = defaultDeviceDescriptor === null || defaultDeviceDescriptor === void 0 ? void 0 : defaultDeviceDescriptor.width) !== null && _a !== void 0 ? _a : browserWidth},${(_b = defaultDeviceDescriptor === null || defaultDeviceDescriptor === void 0 ? void 0 : defaultDeviceDescriptor.height) !== null && _b !== void 0 ? _b : browserHeight}`);
-    if (emulationConfig === null || emulationConfig === void 0 ? void 0 : emulationConfig.device_config.user_agent) {
-        launchArgs.push(`--user-agent=${emulationConfig === null || emulationConfig === void 0 ? void 0 : emulationConfig.device_config.user_agent}`);
-    }
     launchArgs.push('--use-fake-ui-for-media-stream');
     launchArgs.push('--use-fake-device-for-media-stream');
     launchArgs.push(`--use-file-for-fake-audio-capture=${fakeMicrophoneMediaPath}`);
@@ -281,6 +285,7 @@ async function createBrowserForExecutionEngine(browserWidth, browserHeight, head
         defaultDeviceDescriptor,
         runnerType,
         loggerFunc,
+        userAgent: emulationConfig === null || emulationConfig === void 0 ? void 0 : emulationConfig.device_config.user_agent,
     });
     if (!maybeBrowser) {
         throw new Error('Unable to start Chrome session');

package/commands/tests/tests_cmds/run.js

@@ -149,6 +149,10 @@ exports.builder = (yargs) => {
         .option(constants_1.CommandArgHttpHeaders, {
         describe: 'Space delimited HTTP headers added to browser requests (e.g. "x-header:foo")',
         type: 'array',
+    })
+        .option(constants_1.CommandArgUserAgent, {
+        describe: 'Emulates a custom user-agent (e.g. "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4651.0 Safari/537.36")',
+        type: 'string',
     })
         .option(constants_1.CommandArgTestInteractionSpeed, {
         describe: 'Set the speed that mabl interacts with webpages. Overrides test run settings if specified.',
@@ -200,6 +204,7 @@ async function run(parsed) {
         testFile: parsed[constants_1.CommandArgTestFile],
         runId: parsed['run-id'],
         url: parsed.url,
+        userAgent: parsed[constants_1.CommandArgUserAgent],
         width: parsed.width,
         workspaceId,
     };