@mablhq/mabl-cli 1.21.4 → 1.21.15

package/api/mablApiClientFactory.js

@@ -32,8 +32,8 @@ class MablApiClientFactory {
         });
     }
     static async createApiClient(opts) {
-        const { proxyHost, sslVerify } = (await cliConfigProvider_1.CliConfigProvider.getCliConfig())
-            .http;
+        const { proxyHost, sslVerify } = (await cliConfigProvider_1.CliConfigProvider.getCliConfig()).http
+            .mabl;
         const optsFromCliHttpConfig = {
             proxyUrl: proxyHost,
             sslVerify,
@@ -62,7 +62,7 @@ class MablApiClientFactory {
         return MablApiClientFactory.createApiClient();
     }
     static async createApiClientForAccessToken(accessToken) {
-        const httpConfig = (await cliConfigProvider_1.CliConfigProvider.getCliConfig()).http;
+        const httpConfig = (await cliConfigProvider_1.CliConfigProvider.getCliConfig()).http.mabl;
         return new mablApiClient_1.MablApiClient({
             authType: types_1.AuthType.Bearer,
             token: accessToken,

package/browserLauncher/playwrightBrowserLauncher/playwrightBrowser.js

@@ -35,11 +35,12 @@ const path_1 = __importDefault(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const runnerType_1 = require("../runnerType");
 class PlaywrightBrowser extends events_1.default {
-    constructor(defaultContext, downloadDirectory, browserWSEndpoint) {
+    constructor(defaultContext, downloadDirectory, browserWSEndpoint, disableFocusEmulation) {
         super();
         this.defaultContext = defaultContext;
         this.downloadDirectory = downloadDirectory;
         this.browserWSEndpoint = browserWSEndpoint;
+        this.disableFocusEmulation = disableFocusEmulation;
         this.playwrightPages = new Map();
         const contextImpl = playwright._toImpl(defaultContext);
         this.browser = contextImpl._browser;
@@ -54,8 +55,8 @@ 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);
+    static async create(defaultContext, downloadDirectory, browserWSEndpoint, disableFocusEmulation) {
+        const browser = new PlaywrightBrowser(defaultContext, downloadDirectory, browserWSEndpoint, disableFocusEmulation);
         await browser.setDownloadBehavior();
         return browser;
     }

package/browserLauncher/playwrightBrowserLauncher/playwrightBrowserLauncher.js

@@ -32,11 +32,12 @@ class PlaywrightBrowserLauncher {
             ignoreDefaultArgs: options.ignoreDefaultArgs,
             ignoreHTTPSErrors: true,
             isMobile: (_c = options.defaultDeviceDescriptor) === null || _c === void 0 ? void 0 : _c.isMobile,
+            proxy: options.proxy,
             timeout: BROWSER_LAUNCH_TIMEOUT_MS,
             userAgent: options.userAgent,
             viewport,
         });
-        return playwrightBrowser_1.PlaywrightBrowser.create(defaultContext, options.downloadPath, '');
+        return playwrightBrowser_1.PlaywrightBrowser.create(defaultContext, options.downloadPath, '', options.disableFocusEmulation);
     }
 }
 exports.PlaywrightBrowserLauncher = PlaywrightBrowserLauncher;

package/browserLauncher/playwrightBrowserLauncher/playwrightFrame.js

@@ -196,5 +196,9 @@ class PlaywrightFrame extends browserLauncher_1.Frame {
         }
         return true;
     }
+    async getInjectedScriptInSecondaryWorld() {
+        const context = await this.getFrameImpl()._utilityContext();
+        return new playwrightDom_1.PlaywrightJsHandle(await context.injectedScript(), this.page());
+    }
 }
 exports.PlaywrightFrame = PlaywrightFrame;

package/browserLauncher/playwrightBrowserLauncher/playwrightPage.js

@@ -72,6 +72,11 @@ class PlaywrightPage extends events_1.default {
     async waitForInitialization() {
         this.openerPage = await (0, utils_1.mapIfNotNull)(await this.page.opener(), (page) => this.browser.getOrCreatePage(page));
         this.fallbackCdpSession = await this.createFallbackCdpSession();
+        if (this.browser.disableFocusEmulation) {
+            await this.makeCdpCall('Emulation.setFocusEmulationEnabled', {
+                enabled: false,
+            });
+        }
     }
     on(event, listener) {
         this.wireEvents(event);

package/commands/config/config_cmds/configKeys.js

@@ -1,11 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validConfigKeyChoices = exports.configKeys = void 0;
+exports.isValidProxyMode = exports.proxyModes = 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',
+    proxyMode: 'http.proxyMode',
 });
 exports.validConfigKeyChoices = Object.values(exports.configKeys);
+exports.proxyModes = [
+    'mabl',
+    'test',
+    'all',
+    'none',
+];
+function isValidProxyMode(value) {
+    return exports.proxyModes.indexOf(value) !== -1;
+}
+exports.isValidProxyMode = isValidProxyMode;

package/commands/config/config_cmds/set.js

@@ -49,6 +49,12 @@ async function setConfig(parsed) {
             }
             await cliConfigProvider_1.CliConfigProvider.setConfigProperty(key, value);
             break;
+        case configKeys_1.configKeys.proxyMode:
+            if (!(0, configKeys_1.isValidProxyMode)(value)) {
+                throw new Error(`Invalid proxy mode. The value must be one of ${JSON.stringify(configKeys_1.proxyModes)}`);
+            }
+            await cliConfigProvider_1.CliConfigProvider.setConfigProperty(key, value);
+            break;
         default:
             throw new Error(`<${exports.configKeyCommandArg}> value not one of supported types: ${JSON.stringify(configKeys_1.validConfigKeyChoices)}`);
     }

package/commands/flows/flows_cmds/export.js

@@ -40,7 +40,7 @@ async function pullFlow(parsed) {
     const flowId = parsed.id;
     const format = parsed.format;
     const detailLevel = parsed[constants_1.CommandArgDetailLevel];
-    const apiClient = await mablApiClientFactory_1.MablApiClientFactory.createUserApiClient();
+    const apiClient = await mablApiClientFactory_1.MablApiClientFactory.createApiClient();
     const branchName = (_a = parsed['mabl-branch']) !== null && _a !== void 0 ? _a : constants_1.DefaultBranchName;
     const flow = await apiClient.getFlow(flowId, branchName);
     switch (format) {

package/commands/tests/testsUtil.js

@@ -138,16 +138,27 @@ async function createBrowserWithAuthedExtension(accessToken, browserWidth, brows
 }
 exports.createBrowserWithAuthedExtension = createBrowserWithAuthedExtension;
 async function launchBrowserInstance(chromePath, launchArgs, userDataDir, headless, credentials, options) {
-    const { bypassContentSecurityPolicy, defaultDeviceDescriptor, extraHttpHeaders, ignoreDefaultArgs, runnerType, loggerFunc, userAgent, } = options || {};
+    var _a;
+    const { bypassContentSecurityPolicy, defaultDeviceDescriptor, disableFocusEmulation, extraHttpHeaders, ignoreDefaultArgs, runnerType, loggerFunc, userAgent, } = options || {};
     let browser;
+    const proxyServer = (_a = (await cliConfigProvider_1.CliConfigProvider.getCliConfig()).http.test
+        .proxyHost) === null || _a === void 0 ? void 0 : _a.href;
+    let proxy;
+    if (proxyServer) {
+        proxy = {
+            server: proxyServer,
+        };
+    }
     try {
         browser = await maybeLaunchBrowser(chromePath, launchArgs, userDataDir, headless, credentials, {
             bypassContentSecurityPolicy,
             defaultDeviceDescriptor,
+            disableFocusEmulation,
             extraHttpHeaders,
             ignoreDefaultArgs,
             runnerType,
             loggerFunc,
+            proxy,
             userAgent,
         });
     }
@@ -159,6 +170,7 @@ async function launchBrowserInstance(chromePath, launchArgs, userDataDir, headle
                 bypassContentSecurityPolicy,
                 defaultDeviceDescriptor,
                 ignoreDefaultArgs,
+                proxy,
                 runnerType,
             }).catch((error) => {
                 messaging_1.mablEventEmitter.log('Browser launch failed', Date.now(), logLineMessaging_1.LogLineColor.red);
@@ -171,10 +183,11 @@ async function launchBrowserInstance(chromePath, launchArgs, userDataDir, headle
     return browser;
 }
 function maybeLaunchBrowser(chromePath, launchArgs, userDataDir, headless, credentials, options) {
-    const { bypassContentSecurityPolicy, defaultDeviceDescriptor, extraHttpHeaders, ignoreDefaultArgs, runnerType, loggerFunc, userAgent, } = options || {};
+    const { bypassContentSecurityPolicy, defaultDeviceDescriptor, disableFocusEmulation, extraHttpHeaders, ignoreDefaultArgs, runnerType, loggerFunc, proxy, userAgent, } = options || {};
     return browserLauncher_1.BrowserLauncherFactory.createRunner(runnerType, loggerFunc).launch({
         bypassContentSecurityPolicy,
         defaultDeviceDescriptor,
+        disableFocusEmulation,
         executablePath: chromePath,
         extraHttpHeaders,
         headless,
@@ -183,6 +196,7 @@ function maybeLaunchBrowser(chromePath, launchArgs, userDataDir, headless, crede
         userDataDir,
         downloadPath: createDownloadDirectory(),
         credentials,
+        proxy,
         userAgent,
     });
 }
@@ -208,7 +222,7 @@ function removeTempBrowserPreferencesDirectory(tempDirPath) {
     }
 }
 async function createBrowser(browserWidth, browserHeight, headless, containerTesting, tempBrowserPreferencesDirectory, options) {
-    const { bypassContentSecurityPolicy, credentials, browserPath, disableIsolation, extraHttpHeaders, ignoreCertificateErrors, emulationConfig, enableExtensions, runnerType, loggerFunc, resourcesDirectoryOverride, userAgent, } = options || {};
+    const { bypassContentSecurityPolicy, credentials, browserPath, disableFocusEmulation, disableIsolation, extraHttpHeaders, ignoreCertificateErrors, emulationConfig, enableExtensions, runnerType, loggerFunc, resourcesDirectoryOverride, proxy, userAgent, } = options || {};
     const chromePath = browserPath !== null && browserPath !== void 0 ? browserPath : (await 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'));
@@ -234,10 +248,12 @@ async function createBrowser(browserWidth, browserHeight, headless, containerTes
     const maybeBrowser = await launchBrowserInstance(chromePath, launchArgs, tempBrowserPreferencesDirectory, headless, credentials, {
         bypassContentSecurityPolicy,
         defaultDeviceDescriptor,
+        disableFocusEmulation,
         extraHttpHeaders,
         ignoreDefaultArgs,
         runnerType,
         loggerFunc,
+        proxy,
         userAgent: userAgent !== null && userAgent !== void 0 ? userAgent : emulationConfig === null || emulationConfig === void 0 ? void 0 : emulationConfig.device_config.user_agent,
     });
     if (!maybeBrowser) {

package/commands/tests/tests_cmds/export.js

@@ -49,7 +49,7 @@ async function pullJourney(parsed) {
     const testId = parsed.id;
     const format = parsed.format;
     const detailLevel = parsed[constants_1.CommandArgDetailLevel];
-    const apiClient = await mablApiClientFactory_1.MablApiClientFactory.createUserApiClient();
+    const apiClient = await mablApiClientFactory_1.MablApiClientFactory.createApiClient();
     const branchName = (_a = parsed['mabl-branch']) !== null && _a !== void 0 ? _a : constants_1.DefaultBranchName;
     const journey = await apiClient.getJourney(testId, branchName, format);
     const flowArray = await (0, util_1.getJourneyFlowArray)(journey, apiClient, branchName);