@mablhq/mabl-cli 1.21.22 → 1.25.1

package/browserLauncher/playwrightBrowserLauncher/playwrightDom.js

@@ -131,40 +131,64 @@ class PlaywrightElementHandle extends PlaywrightJsHandle {
     async boundingBox() {
         return (0, utils_1.mapIfNotNull)(await this.element.boundingBox(), (boundingBox) => boundingBox);
     }
-    async click(options) {
-        var _a, _b, _c;
-        const trial = (_a = options === null || options === void 0 ? void 0 : options.trial) !== null && _a !== void 0 ? _a : false;
+    async maybeOverwriteScrollIntoViewDuringAction(action, options) {
+        if (options === null || options === void 0 ? void 0 : options.minimizeScrollIntoView) {
+            await this.overwriteScrollIntoViewFunction();
+        }
         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: this.getActionTimeout(options),
-                trial,
-            });
+            return await action();
+        }
+        catch (e) {
+            throw e;
         }
-        catch (error) {
-            if (error.message.includes(exports.NAVIGATION_ERROR_MESSAGE)) {
-                (0, logUtils_1.logInternal)(`Action timed out due to navigation timeout. ${error.toString()}`);
-                return;
+        finally {
+            if (options === null || options === void 0 ? void 0 : options.minimizeScrollIntoView) {
+                await this.resetScrollIntoViewFunction();
             }
-            throw error;
         }
     }
-    async doubleClick(options) {
-        var _a, _b;
-        try {
+    click(options) {
+        return this.maybeOverwriteScrollIntoViewDuringAction(async () => {
+            var _a, _b, _c;
             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: this.getActionTimeout(options),
-                trial,
-            });
-        }
-        catch (error) {
-            if (error.message.includes(exports.NAVIGATION_ERROR_MESSAGE)) {
-                (0, logUtils_1.logInternal)(`Action timed out due to navigation timeout. ${error.toString()}`);
+            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: this.getActionTimeout(options),
+                    trial,
+                });
             }
-        }
+            catch (error) {
+                if (error.message.includes(exports.NAVIGATION_ERROR_MESSAGE)) {
+                    (0, logUtils_1.logInternal)(`Action timed out due to navigation timeout. ${error.toString()}`);
+                    return;
+                }
+                throw error;
+            }
+        }, {
+            minimizeScrollIntoView: options === null || options === void 0 ? void 0 : options.minimizeScrollIntoView,
+        });
+    }
+    async doubleClick(options) {
+        return this.maybeOverwriteScrollIntoViewDuringAction(async () => {
+            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: this.getActionTimeout(options),
+                    trial,
+                });
+            }
+            catch (error) {
+                if (error.message.includes(exports.NAVIGATION_ERROR_MESSAGE)) {
+                    (0, logUtils_1.logInternal)(`Action timed out due to navigation timeout. ${error.toString()}`);
+                }
+            }
+        }, {
+            minimizeScrollIntoView: options === null || options === void 0 ? void 0 : options.minimizeScrollIntoView,
+        });
     }
     async clickablePoint() {
         var _a;
@@ -190,22 +214,30 @@ class PlaywrightElementHandle extends PlaywrightJsHandle {
     scrollIntoViewIfNeeded() {
         return this.element.scrollIntoViewIfNeeded();
     }
-    select(value) {
-        return this.element.selectOption(value);
+    async select(value, options) {
+        return this.maybeOverwriteScrollIntoViewDuringAction(async () => this.element.selectOption(value), {
+            minimizeScrollIntoView: options === null || options === void 0 ? void 0 : options.minimizeScrollIntoView,
+        });
     }
     async type(text, options) {
-        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,
+        return this.maybeOverwriteScrollIntoViewDuringAction(async () => {
+            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 });
+            }
+            await this.element.type(text, {
+                delay: options === null || options === void 0 ? void 0 : options.delay,
+                timeout: 0,
+            });
+        }, {
+            minimizeScrollIntoView: options === null || options === void 0 ? void 0 : options.minimizeScrollIntoView,
         });
     }
-    press(key) {
-        return this.element.press(key);
+    press(key, options) {
+        return this.maybeOverwriteScrollIntoViewDuringAction(async () => this.element.press(key), {
+            minimizeScrollIntoView: options === null || options === void 0 ? void 0 : options.minimizeScrollIntoView,
+        });
     }
     getRemoteObjectId() {
         var _a, _b, _c;
@@ -283,5 +315,25 @@ class PlaywrightElementHandle extends PlaywrightJsHandle {
             : types_1.DefaultTimeouts.defaultActionTimeoutMs;
         return (_a = options === null || options === void 0 ? void 0 : options.timeout) !== null && _a !== void 0 ? _a : defaultTimeout;
     }
+    async overwriteScrollIntoViewFunction() {
+        var _a;
+        await ((_a = this.elementImpl) === null || _a === void 0 ? void 0 : _a.evaluateInUtility(([, node]) => {
+            const element = node;
+            if (!element.__mablOriginalScrollIntoView) {
+                element.__mablOriginalScrollIntoView = element.scrollIntoView;
+            }
+            element.scrollIntoView = () => element.scrollIntoViewIfNeeded();
+        }, []));
+    }
+    async resetScrollIntoViewFunction() {
+        var _a;
+        await ((_a = this.elementImpl) === null || _a === void 0 ? void 0 : _a.evaluateInUtility(([, node]) => {
+            const element = node;
+            const originalFunction = element.__mablOriginalScrollIntoView;
+            if (originalFunction) {
+                element.scrollIntoView = originalFunction;
+            }
+        }, []));
+    }
 }
 exports.PlaywrightElementHandle = PlaywrightElementHandle;

package/commands/constants.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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;
+exports.CommandArgUrlApp = exports.CommandArgUrl = exports.CommandArgTrainerVersion = exports.CommandArgTo = exports.CommandArgSilent = exports.CommandArgRevision = exports.CommandArgMaxHeartbeatAge = 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 = exports.CommandArgUrlApi = void 0;
 const browserTypes_1 = require("./browserTypes");
 exports.CommandArgApiKey = 'api-key';
 exports.CommandArgApplicationId = 'application-id';
@@ -46,6 +46,7 @@ exports.CommandArgOutputFilePath = 'file';
 exports.CommandArgPreview = 'preview';
 exports.CommandArgContentTypes = 'types';
 exports.CommandArgPlanId = 'plan-id';
+exports.CommandArgMaxHeartbeatAge = 'max-heartbeat-age';
 exports.CommandArgRevision = 'revision';
 exports.CommandArgSilent = 'silent';
 exports.CommandArgTo = 'to';

package/commands/link-agents/link-agents_cmds/list.js

@@ -0,0 +1,131 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const cli_table3_1 = __importDefault(require("cli-table3"));
+const moment = require("moment");
+const mablApiClientFactory_1 = require("../../../api/mablApiClientFactory");
+const util_1 = require("../../commandUtil/util");
+const constants_1 = require("../../constants");
+const loggingProvider_1 = require("../../../providers/logging/loggingProvider");
+const js_yaml_1 = require("js-yaml");
+exports.command = 'list';
+exports.describe = 'List link agents';
+exports.builder = (yargs) => {
+    yargs
+        .option(constants_1.CommandArgWorkspaceId, {
+        alias: constants_1.CommandArgAliases.WorkspaceId,
+        describe: 'Workspace for which to list link agents',
+        nargs: 1,
+        type: 'string',
+    })
+        .option(constants_1.CommandArgOutput, {
+        alias: constants_1.CommandArgAliases.OutputType,
+        default: constants_1.OutputFormats.Table,
+        describe: 'Specify result output format',
+        nargs: 1,
+        choices: [...constants_1.DefaultOutputFormatChoices, constants_1.OutputFormats.Table],
+    })
+        .option(constants_1.CommandArgLimitOutput, {
+        alias: constants_1.CommandArgAliases.LimitOutput,
+        describe: 'The number of link agents to return',
+        default: 10,
+        nargs: 1,
+        type: 'number',
+    })
+        .option(constants_1.CommandArgMaxHeartbeatAge, {
+        describe: 'Only returns link agents that have sent a heartbeat within this number of seconds',
+        default: 300,
+        nargs: 1,
+        type: 'number',
+    });
+};
+exports.handler = (0, util_1.failWrapper)(listLinkAgents);
+async function listLinkAgents(parsed) {
+    const limit = parsed.limit;
+    const maxHeartbeatAgeSeconds = parsed[constants_1.CommandArgMaxHeartbeatAge];
+    const workspaceId = await (0, util_1.getWorkspaceId)(parsed);
+    const output = parsed[constants_1.CommandArgOutput];
+    const apiClient = await mablApiClientFactory_1.MablApiClientFactory.createApiClient();
+    const linkAgents = (await apiClient.getLinkAgentsWithRecentHeartbeats(workspaceId, limit, maxHeartbeatAgeSeconds)).map((linkAgent) => ({
+        address: linkAgent.address,
+        created_time: linkAgent.created_time,
+        hostname: linkAgent.hostname,
+        id: linkAgent.id,
+        is_connected: linkAgent.is_connected,
+        java_version: linkAgent.java_version,
+        last_heartbeat_time: linkAgent.last_heartbeat_time,
+        name: linkAgent.label,
+        operating_system_architecture: linkAgent.operating_system_architecture,
+        operating_system_name: linkAgent.operating_system_name,
+        operating_system_version: linkAgent.operating_system_version,
+        status: linkAgent.status,
+        version: linkAgent.version,
+    }));
+    switch (output) {
+        case constants_1.OutputFormats.Json:
+            loggingProvider_1.logger.info(JSON.stringify(linkAgents, null, 2));
+            break;
+        case constants_1.OutputFormats.Yaml:
+            loggingProvider_1.logger.info((0, js_yaml_1.dump)(linkAgents));
+            break;
+        case constants_1.OutputFormats.Table:
+        default:
+            printLinkAgentsAsTable(linkAgents);
+            loggingProvider_1.logger.info(`${linkAgents.length} link agents returned`);
+            if (linkAgents.length === limit) {
+                loggingProvider_1.logger.info(`... use the --limit flag to return a larger set`);
+            }
+            break;
+    }
+    return linkAgents.length;
+}
+function printLinkAgentsAsTable(linkAgents) {
+    const table = new cli_table3_1.default({
+        head: [
+            'ID',
+            'Name',
+            'Connected',
+            'Status',
+            'Host',
+            'OS',
+            'Java',
+            'Created',
+            'Heartbeat',
+            'Version',
+        ],
+        wordWrap: true,
+    });
+    linkAgents.forEach((agent) => {
+        table.push([
+            { rowSpan: 1, content: agent.id, vAlign: 'center' },
+            { rowSpan: 1, content: agent.name, vAlign: 'center' },
+            { rowSpan: 1, content: agent.is_connected, vAlign: 'center' },
+            { rowSpan: 1, content: agent.status, vAlign: 'center' },
+            {
+                rowSpan: 1,
+                content: `${agent.hostname} (${agent.address})`,
+                vAlign: 'center',
+            },
+            {
+                rowSpan: 1,
+                content: `${agent.operating_system_name} ${agent.operating_system_version} (${agent.operating_system_architecture})`,
+                vAlign: 'center',
+            },
+            { rowSpan: 1, content: agent.java_version, vAlign: 'center' },
+            {
+                rowSpan: 1,
+                content: moment.utc(agent.created_time).format(constants_1.ListTimeFormat),
+                vAlign: 'center',
+            },
+            {
+                rowSpan: 1,
+                content: moment.utc(agent.last_heartbeat_time).format(constants_1.ListTimeFormat),
+                vAlign: 'center',
+            },
+            { rowSpan: 1, content: agent.version, vAlign: 'center' },
+        ]);
+    });
+    loggingProvider_1.logger.info(table.toString());
+}

package/commands/link-agents/link-agents_cmds/terminate.js

@@ -0,0 +1,31 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const mablApiClientFactory_1 = require("../../../api/mablApiClientFactory");
+const constants_1 = require("../../constants");
+const util_1 = require("../../commandUtil/util");
+const chalk_1 = __importDefault(require("chalk"));
+const loggingProvider_1 = require("../../../providers/logging/loggingProvider");
+exports.command = `terminate <${constants_1.CommandArgId}>`;
+exports.describe = 'Sends a shutdown signal to a specific Link Agent.';
+exports.builder = (yargs) => {
+    yargs.positional(constants_1.CommandArgId, {
+        describe: 'id of the link agent to terminate',
+        type: 'string',
+    });
+};
+exports.handler = (0, util_1.failWrapper)(terminateLinkAgent);
+async function terminateLinkAgent(parsed) {
+    try {
+        const apiClient = await mablApiClientFactory_1.MablApiClientFactory.createApiClient();
+        const linkAgentId = parsed[constants_1.CommandArgId];
+        await apiClient.terminateLinkAgent(linkAgentId);
+        loggingProvider_1.logger.info(chalk_1.default.green(`Link agent ${chalk_1.default.bold(linkAgentId)} terminated`));
+        return linkAgentId;
+    }
+    catch (error) {
+        throw new Error(`Error terminating link agent: ${error}`);
+    }
+}

package/commands/tests/testsUtil.js

@@ -26,9 +26,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toBasicHttpAuthenticationCredentials = exports.generateChromiumPreferencesFile = exports.logTestInfoIfPresent = exports.milliSecondsToSeconds = exports.calculateTotalTimeSeconds = exports.extractTestRunConfig = exports.pullDownTestRunConfig = exports.validateRunCommandWithLabels = exports.validateRunEditCommand = exports.downloadUploadFile = exports.sleep = exports.editTheTest = exports.runTheTest = exports.prepareTrainerForSplitPlayback = exports.createTrainingSession = exports.cleanUpInitialPages = exports.getExtensionBackgroundPageWithCliTool = exports.setUpAuthTokenForExtension = exports.createBrowserForExecutionEngine = exports.addExecutionEngineLaunchArgs = exports.createBrowser = exports.prepareChromePreferencesDirectory = exports.createBrowserWithAuthedExtension = exports.findChrome = exports.searchForChrome = exports.getFinalUrl = exports.getTempChromePrefDirectory = void 0;
+exports.toBasicHttpAuthenticationCredentials = exports.generateChromiumPreferencesFile = exports.logTestInfoIfPresent = exports.milliSecondsToSeconds = exports.calculateTotalTimeSeconds = exports.extractTestRunConfig = exports.pullDownTestRunConfig = exports.validateRunCommandWithLabels = exports.validateRunEditCommand = exports.downloadUploadFile = exports.sleep = exports.editTheTest = exports.runTheTest = exports.prepareTrainerForSplitPlayback = exports.createTrainingSession = exports.cleanUpInitialPages = exports.getExtensionBackgroundPageWithCliTool = exports.createBrowserForExecutionEngine = exports.addExecutionEngineLaunchArgs = exports.createBrowser = exports.prepareChromePreferencesDirectory = exports.findChrome = exports.searchForChrome = exports.getFinalUrl = exports.getTempChromePrefDirectory = void 0;
 const os = __importStar(require("os"));
-const trainerUtil_1 = require("./tests_cmds/trainer_cmds/trainerUtil");
 const fs = __importStar(require("fs-extra"));
 const path = __importStar(require("path"));
 const constants_1 = require("../constants");
@@ -47,6 +46,7 @@ const resourceUtil_1 = require("../../util/resourceUtil");
 const mobileEmulationUtil_1 = require("./mobileEmulationUtil");
 const browserLauncher_1 = require("../../browserLauncher/browserLauncher");
 const stream_1 = require("stream");
+const trainerUtil_1 = require("./tests_cmds/trainerUtil");
 const chalk = require('chalk');
 const chromeFinder = require('chrome-launcher/dist/chrome-finder');
 const launchUtils = require('chrome-launcher/dist/utils');
@@ -105,38 +105,6 @@ async function findChrome() {
     return chromePath;
 }
 exports.findChrome = findChrome;
-async function createBrowserWithAuthedExtension(accessToken, browserWidth, browserHeight, tempBrowserPreferencesDirectory, options) {
-    const { credentials, disableIsolation, ignoreCertificateErrors, runnerType, loggerFunc, } = options;
-    const pathToExtension = await (0, trainerUtil_1.getMablTrainerExtensionPath)();
-    const chromePath = 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'));
-        throw new Error('Chrome not found error');
-    }
-    messaging_1.mablEventEmitter.log(`Using Chrome at the following path: ${chromePath}`);
-    const launchArgs = [
-        `--disable-extensions-except=${pathToExtension}`,
-        `--load-extension=${pathToExtension}`,
-        `--window-size=${browserWidth},${browserHeight}`,
-    ];
-    if (ignoreCertificateErrors) {
-        launchArgs.push('--ignore-certificate-errors');
-    }
-    if (disableIsolation) {
-        launchArgs.push('--disable-features=IsolateOrigins,site-per-process');
-    }
-    const maybeBrowser = await launchBrowserInstance(chromePath, launchArgs, tempBrowserPreferencesDirectory, false, credentials, {
-        runnerType,
-        loggerFunc,
-    });
-    if (!maybeBrowser) {
-        throw new Error('Unable to start Chrome session');
-    }
-    await setUpAuthTokenForExtension(maybeBrowser, accessToken);
-    maybeBrowser.on(browserLauncher_1.BrowserEvent.BrowserDestroyed, () => removeTempBrowserPreferencesDirectory(tempBrowserPreferencesDirectory));
-    return maybeBrowser;
-}
-exports.createBrowserWithAuthedExtension = createBrowserWithAuthedExtension;
 async function launchBrowserInstance(chromePath, launchArgs, userDataDir, headless, credentials, options) {
     var _a;
     const { bypassContentSecurityPolicy, defaultDeviceDescriptor, disableFocusEmulation, extraHttpHeaders, ignoreDefaultArgs, runnerType, loggerFunc, userAgent, } = options || {};
@@ -312,15 +280,6 @@ async function createBrowserForExecutionEngine(browserWidth, browserHeight, head
     return maybeBrowser;
 }
 exports.createBrowserForExecutionEngine = createBrowserForExecutionEngine;
-async function setUpAuthTokenForExtension(browser, accessToken) {
-    const backgroundPage = await browser.getExtensionBackgroundPage((0, trainerUtil_1.getTrainerId)());
-    await backgroundPage.evaluate((token) => {
-        localStorage.setItem('authResult', JSON.stringify({ idToken: token }));
-        localStorage.setItem('trainerWorld', 'mablCLI');
-    }, accessToken);
-    return;
-}
-exports.setUpAuthTokenForExtension = setUpAuthTokenForExtension;
 async function getExtensionBackgroundPageWithCliTool(browser) {
     const backgroundPage = await browser.getExtensionBackgroundPage((0, trainerUtil_1.getTrainerId)());
     if (backgroundPage) {
@@ -634,28 +593,29 @@ function validateRunCommandWithLabels(testId, suppliedLabelsInclude, suppliedLab
 }
 exports.validateRunCommandWithLabels = validateRunCommandWithLabels;
 async function pullDownTestRunConfig(testRunId, apiClient) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
     const journeyRun = await apiClient.getTestRun(testRunId);
     const planRun = await apiClient.getPlanRun(journeyRun.parent_execution);
     return {
-        environmentId: (_b = (_a = journeyRun.journey_parameters) === null || _a === void 0 ? void 0 : _a.deployment) === null || _b === void 0 ? void 0 : _b.environment_id,
+        basicAuthCredentialsId: ((_a = planRun === null || planRun === void 0 ? void 0 : planRun.run_policy) === null || _a === void 0 ? void 0 : _a.http_auth_credentials_required)
+            ? (_b = planRun === null || planRun === void 0 ? void 0 : planRun.run_policy) === null || _b === void 0 ? void 0 : _b.http_auth_credentials_id
+            : undefined,
         branchName: (_c = journeyRun.journey_parameters) === null || _c === void 0 ? void 0 : _c.source_control_tag,
         credentialsId: (_d = planRun.run_policy) === null || _d === void 0 ? void 0 : _d.credentials_id,
+        dataTableVariables: (_e = journeyRun.journey_parameters) === null || _e === void 0 ? void 0 : _e.user_variables,
+        deviceEmulation: (_f = journeyRun.journey_parameters) === null || _f === void 0 ? void 0 : _f.device_emulation,
+        environmentId: (_h = (_g = journeyRun.journey_parameters) === null || _g === void 0 ? void 0 : _g.deployment) === null || _h === void 0 ? void 0 : _h.environment_id,
         filterHttpRequests: false,
-        testId: (_e = journeyRun.journey) === null || _e === void 0 ? void 0 : _e.invariant_id,
-        url: (_g = (_f = journeyRun.journey_parameters) === null || _f === void 0 ? void 0 : _f.deployment) === null || _g === void 0 ? void 0 : _g.uri,
-        basicAuthCredentialsId: ((_h = planRun === null || planRun === void 0 ? void 0 : planRun.run_policy) === null || _h === void 0 ? void 0 : _h.http_auth_credentials_required)
-            ? (_j = planRun === null || planRun === void 0 ? void 0 : planRun.run_policy) === null || _j === void 0 ? void 0 : _j.http_auth_credentials_id
-            : undefined,
-        dataTableVariables: (_k = journeyRun.journey_parameters) === null || _k === void 0 ? void 0 : _k.user_variables,
-        deviceEmulation: (_l = journeyRun.journey_parameters) === null || _l === void 0 ? void 0 : _l.device_emulation,
-        importedVariables: (_m = journeyRun.journey_parameters) === null || _m === void 0 ? void 0 : _m.imported_variables,
-        pageLoadWait: (_o = journeyRun.journey_parameters) === null || _o === void 0 ? void 0 : _o.page_load_wait,
+        journeyUserDefinedVariables: (_k = (_j = journeyRun.journey) === null || _j === void 0 ? void 0 : _j.variables) === null || _k === void 0 ? void 0 : _k.inputs,
+        importedVariables: (_l = journeyRun.journey_parameters) === null || _l === void 0 ? void 0 : _l.imported_variables,
+        pageLoadWait: (_m = journeyRun.journey_parameters) === null || _m === void 0 ? void 0 : _m.page_load_wait,
+        testId: (_o = journeyRun.journey) === null || _o === void 0 ? void 0 : _o.invariant_id,
+        url: (_q = (_p = journeyRun.journey_parameters) === null || _p === void 0 ? void 0 : _p.deployment) === null || _q === void 0 ? void 0 : _q.uri,
     };
 }
 exports.pullDownTestRunConfig = pullDownTestRunConfig;
 async function extractTestRunConfig(executionMessage, apiClient) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
     const journeyRun = (_a = executionMessage.journey_run) !== null && _a !== void 0 ? _a : (await apiClient.getTestRun(executionMessage.journey_run_id));
     const planRun = executionMessage.plan_run;
     const maybeRunnerType = ((_b = planRun === null || planRun === void 0 ? void 0 : planRun.run_policy) === null || _b === void 0 ? void 0 : _b.nodejs_runtime_variant)
@@ -663,17 +623,18 @@ async function extractTestRunConfig(executionMessage, apiClient) {
             (_c = planRun === null || planRun === void 0 ? void 0 : planRun.run_policy) === null || _c === void 0 ? void 0 : _c.nodejs_runtime_variant
         : undefined;
     return {
-        environmentId: (_e = (_d = journeyRun === null || journeyRun === void 0 ? void 0 : journeyRun.journey_parameters) === null || _d === void 0 ? void 0 : _d.deployment) === null || _e === void 0 ? void 0 : _e.environment_id,
-        branchName: (_f = journeyRun === null || journeyRun === void 0 ? void 0 : journeyRun.journey_parameters) === null || _f === void 0 ? void 0 : _f.source_control_tag,
-        credentialsId: (_g = planRun === null || planRun === void 0 ? void 0 : planRun.run_policy) === null || _g === void 0 ? void 0 : _g.credentials_id,
+        branchName: (_d = journeyRun === null || journeyRun === void 0 ? void 0 : journeyRun.journey_parameters) === null || _d === void 0 ? void 0 : _d.source_control_tag,
+        credentialsId: (_e = planRun === null || planRun === void 0 ? void 0 : planRun.run_policy) === null || _e === void 0 ? void 0 : _e.credentials_id,
+        dataTableVariables: (_f = journeyRun === null || journeyRun === void 0 ? void 0 : journeyRun.journey_parameters) === null || _f === void 0 ? void 0 : _f.user_variables,
+        deviceEmulation: (_g = journeyRun === null || journeyRun === void 0 ? void 0 : journeyRun.journey_parameters) === null || _g === void 0 ? void 0 : _g.device_emulation,
+        environmentId: (_j = (_h = journeyRun === null || journeyRun === void 0 ? void 0 : journeyRun.journey_parameters) === null || _h === void 0 ? void 0 : _h.deployment) === null || _j === void 0 ? void 0 : _j.environment_id,
         filterHttpRequests: true,
-        testId: (_h = journeyRun === null || journeyRun === void 0 ? void 0 : journeyRun.journey) === null || _h === void 0 ? void 0 : _h.invariant_id,
-        url: (_k = (_j = journeyRun === null || journeyRun === void 0 ? void 0 : journeyRun.journey_parameters) === null || _j === void 0 ? void 0 : _j.deployment) === null || _k === void 0 ? void 0 : _k.uri,
-        dataTableVariables: (_l = journeyRun === null || journeyRun === void 0 ? void 0 : journeyRun.journey_parameters) === null || _l === void 0 ? void 0 : _l.user_variables,
-        deviceEmulation: (_m = journeyRun === null || journeyRun === void 0 ? void 0 : journeyRun.journey_parameters) === null || _m === void 0 ? void 0 : _m.device_emulation,
-        importedVariables: (_o = journeyRun.journey_parameters) === null || _o === void 0 ? void 0 : _o.imported_variables,
-        pageLoadWait: (_p = journeyRun.journey_parameters) === null || _p === void 0 ? void 0 : _p.page_load_wait,
+        importedVariables: (_k = journeyRun.journey_parameters) === null || _k === void 0 ? void 0 : _k.imported_variables,
+        journeyUserDefinedVariables: (_m = (_l = journeyRun.journey) === null || _l === void 0 ? void 0 : _l.variables) === null || _m === void 0 ? void 0 : _m.inputs,
+        pageLoadWait: (_o = journeyRun.journey_parameters) === null || _o === void 0 ? void 0 : _o.page_load_wait,
         runnerType: maybeRunnerType,
+        testId: (_p = journeyRun === null || journeyRun === void 0 ? void 0 : journeyRun.journey) === null || _p === void 0 ? void 0 : _p.invariant_id,
+        url: (_r = (_q = journeyRun === null || journeyRun === void 0 ? void 0 : journeyRun.journey_parameters) === null || _q === void 0 ? void 0 : _q.deployment) === null || _r === void 0 ? void 0 : _r.uri,
     };
 }
 exports.extractTestRunConfig = extractTestRunConfig;

package/commands/tests/tests_cmds/run.js

@@ -186,27 +186,27 @@ async function run(parsed) {
     });
     const testRunnerConfig = {
         _cliCreated: true,
-        branchName: parsed['mabl-branch'],
         basicAuthCredentialsId: parsed[constants_1.CommandArgBasicAuthCredentials],
+        branchName: parsed['mabl-branch'],
         credentialsId: parsed['credentials-id'],
         disableIsolation: parsed[constants_1.CommandArgBrowserDisableIsolation],
+        enableExtensions: parsed[constants_1.CommandArgBrowserEnableExtensions],
         enableLink: parsed[constants_1.CommandArgEnableLink],
         environmentId: parsed[constants_1.CommandArgEnvironmentId],
+        extraHttpHeaders,
         filterHttpRequests: false,
+        fromPlanId: parsed['from-plan-id'],
         headless: parsed.headless,
         height: parsed.height,
         highlights: parsed.highlights,
         ignoreCertificateErrors: parsed[constants_1.CommandArgBrowserIgnoreCertificateErrors],
         interactionSpeed: parsed[constants_1.CommandArgTestInteractionSpeed],
-        enableExtensions: parsed[constants_1.CommandArgBrowserEnableExtensions],
-        extraHttpHeaders,
         keepBrowserOpen: parsed['keep-browser-open'],
         labelsExclude: parsed['exclude-labels'],
         labelsInclude: parsed.labels,
-        fromPlanId: parsed['from-plan-id'],
-        testId: parsed.id,
-        testFile: parsed[constants_1.CommandArgTestFile],
         runId: parsed['run-id'],
+        testFile: parsed[constants_1.CommandArgTestFile],
+        testId: parsed.id,
         url: parsed.url,
         userAgent: parsed[constants_1.CommandArgUserAgent],
         width: parsed.width,

package/commands/tests/tests_cmds/trainerUtil.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getTrainerId = exports.LOCAL_TRAINER_ID = void 0;
+const env_1 = require("../../../env/env");
+exports.LOCAL_TRAINER_ID = 'jmeffipchlcmnkllcolcbmneknjckcpp';
+function getTrainerId() {
+    if (env_1.LOCAL_TRAINER_PATH) {
+        return env_1.EXTENSION_ID;
+    }
+    return exports.LOCAL_TRAINER_ID;
+}
+exports.getTrainerId = getTrainerId;

package/core/messaging/messaging.js

@@ -1,7 +1,7 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDefaultLogMetadataForInfo = exports.MablCoreProcessAction = exports.MablCoreAction = exports.ExecutionPhase = exports.EventChannelMessageType = exports.getEmitter = exports.mablEventEmitter = exports.MablCoreEventEmitter = void 0;
+exports.getDefaultLogMetadataForInfo = exports.MablCoreProcessAction = exports.MablCoreAction = exports.ObservationErrorSeverity = exports.ObservationErrorCode = exports.ExecutionPhase = exports.EventChannelMessageType = exports.getEmitter = exports.mablEventEmitter = exports.MablCoreEventEmitter = void 0;
 const events_1 = require("events");
 const loggingProvider_1 = require("../../providers/logging/loggingProvider");
 const NO_ID_PLACEHOLDER = 'NO_ID_PROVIDED';
@@ -68,6 +68,16 @@ var ExecutionPhase;
     ExecutionPhase["DURING_ACTION"] = "DURING_ACTION";
     ExecutionPhase["SKIP_ACTION"] = "SKIP_ACTION";
 })(ExecutionPhase = exports.ExecutionPhase || (exports.ExecutionPhase = {}));
+var ObservationErrorCode;
+(function (ObservationErrorCode) {
+    ObservationErrorCode["ILLEGAL_URL_ERROR"] = "ILLEGAL_URL_ERROR";
+    ObservationErrorCode["PAGE_LOAD_FAILURE"] = "PAGE_LOAD_FAILURE";
+})(ObservationErrorCode = exports.ObservationErrorCode || (exports.ObservationErrorCode = {}));
+var ObservationErrorSeverity;
+(function (ObservationErrorSeverity) {
+    ObservationErrorSeverity["ERROR"] = "ERROR";
+    ObservationErrorSeverity["WARN"] = "WARN";
+})(ObservationErrorSeverity = exports.ObservationErrorSeverity || (exports.ObservationErrorSeverity = {}));
 class MablCoreAction {
     constructor(type, payload, timestamp = Date.now()) {
         this.type = type;