@applitools/core 2.5.2 → 2.5.3-legacy

package/dist/classic/utils/extract-default-environments.js

@@ -0,0 +1,73 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.extractDefaultEnvironments = void 0;
+const utils = __importStar(require("@applitools/utils"));
+async function extractDefaultEnvironments({ driver, settings, }) {
+    var _a, _b;
+    const environment = { ...settings === null || settings === void 0 ? void 0 : settings.environment };
+    if (!driver)
+        return [environment];
+    const currentContext = driver.currentContext;
+    try {
+        const driverEnvironment = await driver.getEnvironment();
+        const viewport = await driver.getViewport();
+        const size = await driver.getViewportSize();
+        environment.viewportSize = utils.geometry.scale(size, viewport.viewportScale);
+        environment.environmentId = utils.general.guid();
+        if (driverEnvironment.isEC)
+            environment.ecSessionId = (_a = (await driver.getSessionId())) !== null && _a !== void 0 ? _a : undefined;
+        if (driverEnvironment.isWeb)
+            environment.userAgent = await driver.getUserAgentLegacy();
+        if (!environment.deviceName && driverEnvironment.deviceName)
+            environment.deviceName = driverEnvironment.deviceName;
+        if (!environment.os) {
+            if (driverEnvironment.isNative && driverEnvironment.platformName) {
+                environment.os = driverEnvironment.platformName;
+                if (driverEnvironment.platformVersion)
+                    environment.os += ` ${driverEnvironment.platformVersion}`;
+                if (!(settings === null || settings === void 0 ? void 0 : settings.keepPlatformNameAsIs)) {
+                    if (/^android/i.test(environment.os)) {
+                        environment.os = `Android${environment.os.slice(7)}`;
+                    }
+                    if (/^ios/i.test(environment.os)) {
+                        environment.os = `iOS${environment.os.slice(3)}`;
+                    }
+                }
+            }
+            else if (driverEnvironment.isReliable &&
+                driverEnvironment.isChromium &&
+                ((driverEnvironment.isWindows && Number.parseInt(driverEnvironment.browserVersion) >= 107) ||
+                    (driverEnvironment.isMac && Number.parseInt(driverEnvironment.browserVersion) >= 90))) {
+                environment.os = `${driverEnvironment.platformName} ${(_b = driverEnvironment.platformVersion) !== null && _b !== void 0 ? _b : ''}`.trim();
+            }
+        }
+        return [environment];
+    }
+    finally {
+        await currentContext.focus();
+    }
+}
+exports.extractDefaultEnvironments = extractDefaultEnvironments;

package/dist/classic/utils/take-dom-capture.js

@@ -11,6 +11,7 @@ async function takeDomCapture({ driver, settings, logger, }) {
     const arg = {
         chunkByteLength: (_a = settings === null || settings === void 0 ? void 0 : settings.chunkByteLength) !== null && _a !== void 0 ? _a : (Number(process.env.APPLITOOLS_SCRIPT_RESULT_MAX_BYTE_LENGTH) ||
             (environment.isIOS ? 100000 : 250 * 1024 * 1024)),
+        ...settings === null || settings === void 0 ? void 0 : settings.domCaptureArgs,
     };
     const scripts = {
         main: features.canExecuteOnlyFunctionScripts
@@ -70,7 +71,7 @@ async function takeDomCapture({ driver, settings, logger, }) {
         logger.log(`Request to download css will be sent to the address "[GET]${url}"`);
         try {
             const response = await (0, req_1.req)(url, {
-                timeout: (_a = settings === null || settings === void 0 ? void 0 : settings.fetchTimeout) !== null && _a !== void 0 ? _a : 60000,
+                connectionTimeout: (_a = settings === null || settings === void 0 ? void 0 : settings.fetchTimeout) !== null && _a !== void 0 ? _a : 60000,
                 retry: {
                     limit: 1,
                     validate: ({ response, error }) => !!error || !response.ok,

package/dist/classic/utils/take-screenshots.js

@@ -0,0 +1,63 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.takeScreenshots = void 0;
+const take_dom_capture_1 = require("./take-dom-capture");
+const take_screenshot_1 = require("../../automation/utils/take-screenshot");
+const utils = __importStar(require("@applitools/utils"));
+async function takeScreenshots({ driver, settings, logger, }) {
+    var _a, _b;
+    const screenshot = await (0, take_screenshot_1.takeScreenshot)({ driver, settings, logger });
+    const baseTarget = {
+        name: await driver.getTitle(),
+        source: await driver.getUrl(),
+        image: await screenshot.image.toPng(),
+        locationInViewport: utils.geometry.location(screenshot.region),
+        calculatedRegions: screenshot.calculatedRegions,
+        isTransformed: true,
+    };
+    const environment = await driver.getEnvironment();
+    if (environment.isWeb && settings.domSettings) {
+        if (settings.fully)
+            await ((_a = screenshot.scrollingElement) === null || _a === void 0 ? void 0 : _a.setAttribute('data-applitools-scroll', 'true'));
+        else
+            await ((_b = screenshot.element) === null || _b === void 0 ? void 0 : _b.setAttribute('data-applitools-scroll', 'true'));
+        baseTarget.dom = await (0, take_dom_capture_1.takeDomCapture)({ driver, settings: settings.domSettings, logger }).catch(error => {
+            logger.error('failed to capture DOM', error);
+            return undefined;
+        });
+    }
+    if (settings.calculateView) {
+        const scrollingElement = await driver.mainContext.getScrollingElement();
+        const scrollingOffset = !scrollingElement || environment.isNative ? { x: 0, y: 0 } : await scrollingElement.getScrollOffset();
+        baseTarget.locationInView = utils.geometry.offset(scrollingOffset, screenshot.region);
+        baseTarget.fullViewSize = scrollingElement
+            ? await scrollingElement.getContentSize()
+            : await driver.getViewportSize();
+    }
+    await screenshot.restoreState();
+    return new Array(settings.environments.length).fill(baseTarget);
+}
+exports.takeScreenshots = takeScreenshots;

package/dist/cli/cli.js

@@ -1,13 +1,42 @@
 #!/usr/bin/env node
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+/* eslint no-console: off */
 const core_server_1 = require("../universal/core-server");
 const core_server_process_1 = require("../universal/core-server-process");
+const logs_1 = require("../troubleshoot/logs");
+const check_network_1 = require("../troubleshoot/check-network");
+const run_offline_snapshots_1 = require("../run-offline-snapshots");
 const yargs_1 = __importDefault(require("yargs"));
-yargs_1.default
+const utils = __importStar(require("@applitools/utils"));
+const fs_1 = __importDefault(require("fs"));
+void yargs_1.default
     .example([
     ['eyes universal', 'Run Eyes Universal server on default port (21077)'],
     ['eyes universal --fork', 'Run Eyes Universal server in a forked process'],
@@ -16,6 +45,7 @@ yargs_1.default
     ['eyes universal --shutdown-mode stdin', 'Run Eyes Universal server which will close once stdin stream will end'],
     ['eyes check-network', ''],
 ])
+    .version(JSON.parse(fs_1.default.readFileSync(require.resolve('../../package.json'), 'utf-8')).version)
     .command({
     command: 'universal',
     builder: yargs => yargs.options({
@@ -74,16 +104,82 @@ yargs_1.default
             type: 'string',
             coerce: JSON.parse,
         },
+        maskLog: {
+            description: 'mask sensitive information in the log',
+            type: 'boolean',
+            default: false,
+        },
     }),
     handler: async (args) => {
         if (args.fork) {
-            const { port } = await (0, core_server_process_1.makeCoreServerProcess)({ ...args, fork: false });
+            const { port } = await (0, core_server_process_1.makeCoreServerProcess)({ ...args, fork: false, isProcess: true });
             // eslint-disable-next-line no-console
             console.log(port); // NOTE: this is a part of the generic protocol
         }
         else {
-            (0, core_server_1.makeCoreServer)({ ...args, ...args.config });
+            void (0, core_server_1.makeCoreServer)({ ...args, ...args.config, isProcess: true });
+        }
+    },
+})
+    .command({
+    command: 'logs [input]',
+    builder: yargs => yargs.options({
+        input: {
+            description: 'log input to process',
+            type: 'string',
+        },
+        structure: {
+            description: 'group logs by tag names',
+            type: 'boolean',
+        },
+        analyze: {
+            description: 'group logs by tag names',
+            type: 'boolean',
+        },
+    }),
+    handler: async (args) => {
+        var _a;
+        const input = (_a = args.input) !== null && _a !== void 0 ? _a : (await utils.streams.toBuffer(process.stdin)).toString('utf8');
+        const logs = (0, logs_1.parseLogs)(input);
+        if (args.analyze) {
+            console.log(JSON.stringify((0, logs_1.analyzeLogs)((0, logs_1.structureLogs)(logs)), null, 2));
+        }
+        else if (args.structure) {
+            console.log(JSON.stringify((0, logs_1.structureLogs)(logs), null, 2));
+        }
+        else {
+            console.log(JSON.stringify(logs, null, 2));
         }
     },
+})
+    .command({
+    command: 'check-network',
+    handler: async () => {
+        await (0, check_network_1.checkNetwork)();
+    },
+})
+    .command({
+    command: 'run-offline-snapshots',
+    builder: yargs => yargs
+        .options({
+        offlineLocationPath: {
+            description: 'path to offline snapshots folder',
+            type: 'string',
+        },
+        failOnDiff: {
+            description: 'should exit process with non-zero exit code, thereby failing the CI job',
+            type: 'boolean',
+            default: false,
+        },
+    })
+        .fail((_msg, err, _yargs) => {
+        if (err) {
+            console.error(err.message);
+            process.exit(1);
+        }
+    }),
+    handler: async (args) => {
+        await (0, run_offline_snapshots_1.runOfflineSnapshots)(args);
+    },
 })
     .wrap(yargs_1.default.terminalWidth()).argv;

package/dist/close-batch.js

@@ -24,16 +24,17 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeCloseBatch = void 0;
+const populate_eyes_server_settings_1 = require("./utils/populate-eyes-server-settings");
 const utils = __importStar(require("@applitools/utils"));
-function makeCloseBatch({ core, logger: defaultLogger }) {
-    return async function closeBatch({ settings, logger = defaultLogger, }) {
-        ;
+function makeCloseBatch({ core, logger: mainLogger }) {
+    return async function closeBatch({ settings, logger = mainLogger, }) {
+        logger = logger.extend(mainLogger, { tags: [`close-batch-${utils.general.shortid()}`] });
         (utils.types.isArray(settings) ? settings : [settings]).forEach(settings => {
-            var _a, _b, _c;
-            (_a = settings.serverUrl) !== null && _a !== void 0 ? _a : (settings.serverUrl = (_b = utils.general.getEnvValue('SERVER_URL')) !== null && _b !== void 0 ? _b : 'https://eyesapi.applitools.com');
-            (_c = settings.apiKey) !== null && _c !== void 0 ? _c : (settings.apiKey = utils.general.getEnvValue('API_KEY'));
+            (0, populate_eyes_server_settings_1.populateEyesServerSettings)(settings);
+            logger.mask(settings.apiKey);
+            logger.mask(settings.eyesServerUrl);
         });
-        await core.base.closeBatch({ settings, logger });
+        return core.base.closeBatch({ settings, logger });
     };
 }
 exports.makeCloseBatch = makeCloseBatch;

package/dist/close.js

@@ -1,12 +1,40 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeClose = void 0;
-function makeClose({ eyes, logger: defaultLogger, }) {
-    return async function close({ settings, config, logger = defaultLogger, } = {}) {
-        var _a;
+const utils = __importStar(require("@applitools/utils"));
+function makeClose({ eyes, environments: defaultEnvironments, logger: mainLogger, }) {
+    return async function close({ settings, config, logger = mainLogger, } = {}) {
+        var _a, _b;
+        logger = logger.extend(mainLogger, { tags: [`close-${utils.general.shortid()}`] });
+        const typedEyes = await eyes.getTypedEyes({ logger });
         settings = { ...config === null || config === void 0 ? void 0 : config.close, ...settings };
         (_a = settings.updateBaselineIfNew) !== null && _a !== void 0 ? _a : (settings.updateBaselineIfNew = true);
-        const typedEyes = await eyes.getTypedEyes({ logger });
+        if (typedEyes.type === 'classic' && !utils.types.isEmpty(defaultEnvironments)) {
+            (_b = settings.environments) !== null && _b !== void 0 ? _b : (settings.environments = defaultEnvironments);
+        }
         await typedEyes.close({ settings, logger });
     };
 }

package/dist/core.js

@@ -24,10 +24,16 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeCore = void 0;
+const utils = __importStar(require("@applitools/utils"));
 const logger_1 = require("@applitools/logger");
 const core_base_1 = require("@applitools/core-base");
+const core_1 = require("./classic/core");
+const core_2 = require("./ufg/core");
 const get_viewport_size_1 = require("./automation/get-viewport-size");
 const set_viewport_size_1 = require("./automation/set-viewport-size");
+const get_account_info_1 = require("./get-account-info");
+const get_nml_client_1 = require("./automation/get-nml-client");
+const get_ec_client_1 = require("./get-ec-client");
 const locate_1 = require("./locate");
 const locate_text_1 = require("./locate-text");
 const extract_text_1 = require("./extract-text");
@@ -35,26 +41,54 @@ const open_eyes_1 = require("./open-eyes");
 const make_manager_1 = require("./make-manager");
 const close_batch_1 = require("./close-batch");
 const delete_test_1 = require("./delete-test");
-const get_ec_client_1 = require("./get-ec-client");
-const utils = __importStar(require("@applitools/utils"));
-function makeCore({ spec, concurrency, base: defaultBase, agentId = 'core', cwd = process.cwd(), logger: defaultLogger, } = {}) {
-    var _a;
-    const logger = (_a = defaultLogger === null || defaultLogger === void 0 ? void 0 : defaultLogger.extend({ label: 'core' })) !== null && _a !== void 0 ? _a : (0, logger_1.makeLogger)({ label: 'core' });
-    logger.log(`Core is initialized ${defaultBase ? 'with' : 'without'} custom base core`);
-    const base = defaultBase !== null && defaultBase !== void 0 ? defaultBase : (0, core_base_1.makeCore)({ agentId, cwd, logger });
+const extract_test_environment_1 = require("./utils/extract-test-environment");
+const ensure_offline_folder_1 = require("./utils/ensure-offline-folder");
+const validate_sdk_version_1 = require("./utils/validate-sdk-version");
+const memory_usage_logging_1 = require("./utils/memory-usage-logging");
+const take_snapshots_1 = require("./ufg/take-snapshots");
+function makeCore({ spec, clients, base: defaultBase, concurrency = utils.general.getEnvValue('CONCURRENCY', 'number'), environment: defaultEnvironment, agentId = 'core', cwd = process.cwd(), maskLog = false, logger: defaultLogger, asyncCache, } = {}) {
+    const logger = (0, logger_1.makeLogger)({ logger: defaultLogger, format: { label: 'core' }, maskLog });
+    (0, memory_usage_logging_1.startMemoryUsageLogging)({ logger });
+    const environment = (0, extract_test_environment_1.extractTestEnvironment)(defaultEnvironment);
+    const offlineLocationPath = (0, ensure_offline_folder_1.ensureOfflineFolder)();
+    logger.log(`[pid=${process.pid} Core is initialized ${defaultBase ? 'with' : 'without'} custom base core ${offlineLocationPath ? `and offline location ${offlineLocationPath} ` : ''}and environment `, environment);
+    if (environment.sdk)
+        void (0, validate_sdk_version_1.validateSdkVersion)(environment.sdk, { logger });
+    const base = defaultBase !== null && defaultBase !== void 0 ? defaultBase : (0, core_base_1.makeCore)({ agentId, concurrency, logger, offlineLocationPath, maskLog });
+    const cores = {
+        ufg: (0, core_2.makeCore)({ spec, clients, base, asyncCache, logger, offlineLocationPath, maskLog }),
+        classic: (0, core_1.makeCore)({ spec, clients, base, logger, offlineLocationPath, maskLog }),
+    };
     return utils.general.extend(base, core => {
         return {
             base: base,
             getViewportSize: spec && (0, get_viewport_size_1.makeGetViewportSize)({ spec, logger }),
             setViewportSize: spec && (0, set_viewport_size_1.makeSetViewportSize)({ spec, logger }),
+            ...(0, get_nml_client_1.makeGetNMLClient)({ client: clients === null || clients === void 0 ? void 0 : clients.nml, logger }),
             getECClient: (0, get_ec_client_1.makeGetECClient)({ logger }),
-            makeManager: (0, make_manager_1.makeMakeManager)({ spec, concurrency, core, base: defaultBase, agentId, logger }),
+            getAccountInfo: (0, get_account_info_1.makeGetAccountInfo)({ core, logger }),
+            // Note: `defaultBase` is passesd for `base`, and `cores` is not passed here on purpose, so that a manager will create its own base, which would apply the correct concurrency value that was passed to the manager.
+            // `defaultBase` is here for testing purposes
+            makeManager: (0, make_manager_1.makeMakeManager)({
+                spec,
+                clients,
+                core,
+                base: defaultBase,
+                agentId,
+                cwd,
+                environment,
+                asyncCache,
+                logger,
+                offlineLocationPath,
+                maskLog,
+            }),
             locate: (0, locate_1.makeLocate)({ spec, core, logger }),
             locateText: (0, locate_text_1.makeLocateText)({ spec, core, logger }),
             extractText: (0, extract_text_1.makeExtractText)({ spec, core, logger }),
-            openEyes: (0, open_eyes_1.makeOpenEyes)({ spec, core, concurrency, logger }),
+            openEyes: (0, open_eyes_1.makeOpenEyes)({ spec, clients, core, cores, environment, asyncCache, cwd, logger }),
             closeBatch: (0, close_batch_1.makeCloseBatch)({ core, logger }),
             deleteTest: (0, delete_test_1.makeDeleteTest)({ core, logger }),
+            takeSnapshots: spec && (0, take_snapshots_1.makeTakeSnapshots)({ spec, core: cores.ufg, logger }),
         };
     });
 }

package/dist/delete-test.js

@@ -24,16 +24,18 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeDeleteTest = void 0;
+const populate_eyes_server_settings_1 = require("./utils/populate-eyes-server-settings");
 const utils = __importStar(require("@applitools/utils"));
-function makeDeleteTest({ core, logger: defaultLogger }) {
-    return async function deleteTest({ settings, logger = defaultLogger, }) {
-        ;
+function makeDeleteTest({ core, logger: mainLogger }) {
+    return async function deleteTest({ settings, logger = mainLogger, }) {
+        logger = logger.extend(mainLogger, { tags: [`delete-test-${utils.general.shortid()}`] });
         (utils.types.isArray(settings) ? settings : [settings]).forEach(settings => {
-            var _a, _b, _c;
-            (_a = settings.serverUrl) !== null && _a !== void 0 ? _a : (settings.serverUrl = (_b = utils.general.getEnvValue('SERVER_URL')) !== null && _b !== void 0 ? _b : 'https://eyesapi.applitools.com');
-            (_c = settings.apiKey) !== null && _c !== void 0 ? _c : (settings.apiKey = utils.general.getEnvValue('API_KEY'));
+            (0, populate_eyes_server_settings_1.populateEyesServerSettings)(settings);
+            logger.mask(settings.apiKey);
+            logger.mask(settings.eyesServerUrl);
+            logger.mask(settings.secretToken);
         });
-        await core.base.deleteTest({ settings, logger });
+        return core.base.deleteTest({ settings, logger });
     };
 }
 exports.makeDeleteTest = makeDeleteTest;

package/dist/extract-text.js

@@ -25,15 +25,19 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeExtractText = void 0;
 const core_1 = require("./classic/core");
+const populate_eyes_server_settings_1 = require("./utils/populate-eyes-server-settings");
 const utils = __importStar(require("@applitools/utils"));
-function makeExtractText({ spec, core, logger: defaultLogger }) {
-    return async function extractText({ target, settings, config, logger = defaultLogger, }) {
+function makeExtractText({ spec, core, logger: mainLogger }) {
+    return async function extractText({ target, settings, config, logger = mainLogger, }) {
+        logger = logger.extend(mainLogger, { tags: [`extract-text-${utils.general.shortid()}`] });
         settings = utils.types.isArray(settings) ? settings : [settings];
         settings = settings.map(settings => {
-            var _a, _b, _c;
+            var _a;
             settings = { ...config === null || config === void 0 ? void 0 : config.open, ...config === null || config === void 0 ? void 0 : config.screenshot, ...settings };
-            (_a = settings.serverUrl) !== null && _a !== void 0 ? _a : (settings.serverUrl = (_b = utils.general.getEnvValue('SERVER_URL')) !== null && _b !== void 0 ? _b : 'https://eyesapi.applitools.com');
-            (_c = settings.apiKey) !== null && _c !== void 0 ? _c : (settings.apiKey = utils.general.getEnvValue('API_KEY'));
+            (_a = settings.userCommandId) !== null && _a !== void 0 ? _a : (settings.userCommandId = `extract-text--${utils.general.guid()}`);
+            (0, populate_eyes_server_settings_1.populateEyesServerSettings)(settings);
+            logger.mask(settings.apiKey);
+            logger.mask(settings.eyesServerUrl);
             return settings;
         });
         const classicCore = (0, core_1.makeCore)({ spec, base: core.base, logger });

package/dist/get-account-info.js

@@ -0,0 +1,36 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeGetAccountInfo = void 0;
+const populate_eyes_server_settings_1 = require("./utils/populate-eyes-server-settings");
+const utils = __importStar(require("@applitools/utils"));
+function makeGetAccountInfo({ core, logger: mainLogger }) {
+    return async function getAccountInfo({ settings, logger = mainLogger, }) {
+        logger = logger.extend(mainLogger, { tags: [`get-account-info-${utils.general.shortid()}`] });
+        (0, populate_eyes_server_settings_1.populateEyesServerSettings)(settings);
+        return core.base.getAccountInfo({ settings, logger });
+    };
+}
+exports.makeGetAccountInfo = makeGetAccountInfo;

package/dist/get-ec-client.js

@@ -26,9 +26,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeGetECClient = void 0;
 const ec_client_1 = require("@applitools/ec-client");
 const utils = __importStar(require("@applitools/utils"));
-function makeGetECClient({ logger: defaultLogger }) {
+function makeGetECClient({ logger: mainLogger }) {
     return utils.general.cachify(getECClient, ([options]) => [options === null || options === void 0 ? void 0 : options.settings]);
-    async function getECClient({ settings, logger = defaultLogger, } = {}) {
+    async function getECClient({ settings, logger = mainLogger, } = {}) {
+        logger = logger.extend(mainLogger);
         const client = await (0, ec_client_1.makeECClient)({ settings, logger });
         return client;
     }

package/dist/get-eyes-results.js

@@ -1,15 +1,41 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeGetEyesResults = void 0;
 const test_error_1 = require("./errors/test-error");
-function makeGetEyesResults({ eyes, logger: defaultLogger, }) {
-    return async function getEyesResults({ settings, logger = defaultLogger, } = {}) {
+const utils = __importStar(require("@applitools/utils"));
+function makeGetEyesResults({ eyes, logger: mainLogger, }) {
+    return async function getEyesResults({ settings, logger = mainLogger, } = {}) {
+        logger = logger.extend(mainLogger, { tags: [`get-eyes-results-${utils.general.shortid()}`] });
         const typedEyes = await eyes.getTypedEyes({ logger });
         const results = await typedEyes.getResults({ settings, logger });
         if (settings === null || settings === void 0 ? void 0 : settings.throwErr) {
             results.forEach(result => {
+                var _a;
                 if (result.status !== 'Passed')
-                    throw new test_error_1.TestError(result);
+                    throw (_a = result === null || result === void 0 ? void 0 : result.reason) !== null && _a !== void 0 ? _a : new test_error_1.TestError(result);
             });
         }
         return results;