@applitools/core 1.4.6 → 2.0.0

package/dist/close.js

@@ -1,37 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeClose = void 0;
-const test_error_1 = require("./errors/test-error");
 function makeClose({ eyes, logger: defaultLogger, }) {
     return async function close({ settings, config, logger = defaultLogger, } = {}) {
         var _a;
         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 });
-        const results = await typedEyes.close({ settings, logger });
-        if (settings.throwErr) {
-            results.forEach(result => {
-                if (result.status !== 'Passed')
-                    throw new test_error_1.TestError(result);
-            });
-        }
-        return results.length > 0
-            ? results
-            : [
-                {
-                    userTestId: eyes.test.userTestId,
-                    name: '',
-                    steps: 0,
-                    matches: 0,
-                    mismatches: 0,
-                    missing: 0,
-                    exactMatches: 0,
-                    strictMatches: 0,
-                    contentMatches: 0,
-                    layoutMatches: 0,
-                    noneMatches: 0,
-                },
-            ];
+        await typedEyes.close({ settings, logger });
     };
 }
 exports.makeClose = makeClose;

package/dist/core.js

@@ -29,6 +29,8 @@ const core_base_1 = require("@applitools/core-base");
 const get_viewport_size_1 = require("./automation/get-viewport-size");
 const set_viewport_size_1 = require("./automation/set-viewport-size");
 const locate_1 = require("./locate");
+const locate_text_1 = require("./locate-text");
+const extract_text_1 = require("./extract-text");
 const open_eyes_1 = require("./open-eyes");
 const make_manager_1 = require("./make-manager");
 const close_batch_1 = require("./close-batch");
@@ -41,12 +43,14 @@ function makeCore({ spec, concurrency, core, agentId = 'core', cwd = process.cwd
     logger.log(`Core is initialized ${core ? 'with' : 'without'} custom base core`);
     core !== null && core !== void 0 ? core : (core = (0, core_base_1.makeCore)({ agentId, cwd, logger }));
     return utils.general.extend(core, {
-        isDriver: spec === null || spec === void 0 ? void 0 : spec.isDriver,
-        isElement: spec === null || spec === void 0 ? void 0 : spec.isElement,
-        isSelector: spec === null || spec === void 0 ? void 0 : spec.isSelector,
-        getViewportSize: (0, get_viewport_size_1.makeGetViewportSize)({ spec, logger }),
-        setViewportSize: (0, set_viewport_size_1.makeSetViewportSize)({ spec, logger }),
+        isDriver: spec && spec.isDriver,
+        isElement: spec && spec.isElement,
+        isSelector: spec && spec.isSelector,
+        getViewportSize: spec && (0, get_viewport_size_1.makeGetViewportSize)({ spec, logger }),
+        setViewportSize: spec && (0, set_viewport_size_1.makeSetViewportSize)({ spec, logger }),
         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 }),
         makeManager: (0, make_manager_1.makeMakeManager)({ spec, concurrency, agentId, logger }),
         closeBatch: (0, close_batch_1.makeCloseBatch)({ core, logger }),

package/dist/errors/abort-error.js

@@ -1,6 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AbortError = void 0;
-class AbortError extends Error {
+const core_base_1 = require("@applitools/core-base");
+class AbortError extends core_base_1.CoreError {
+    constructor(message, info) {
+        super(message, { reason: 'abort', ...info });
+    }
 }
 exports.AbortError = AbortError;

package/dist/extract-text.js

@@ -24,24 +24,20 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeExtractText = void 0;
+const core_1 = require("./classic/core");
 const utils = __importStar(require("@applitools/utils"));
-function makeExtractText({ eyes, target: defaultTarget, logger: defaultLogger, }) {
-    return async function extractText({ target = defaultTarget, settings, config, logger = defaultLogger, }) {
-        var _a;
-        if (utils.types.isArray(settings)) {
-            settings = settings.map(settings => {
-                var _a;
-                settings = { ...config === null || config === void 0 ? void 0 : config.screenshot, ...settings };
-                (_a = settings.autProxy) !== null && _a !== void 0 ? _a : (settings.autProxy = eyes.test.server.proxy);
-                return settings;
-            });
-        }
-        else {
-            settings = { ...config === null || config === void 0 ? void 0 : config.screenshot, ...settings };
-            (_a = settings.autProxy) !== null && _a !== void 0 ? _a : (settings.autProxy = eyes.test.server.proxy);
-        }
-        const classicEyes = await eyes.getTypedEyes({ type: 'classic', logger });
-        const results = await classicEyes.extractText({ target, settings, logger });
+function makeExtractText({ spec, core, logger: defaultLogger }) {
+    return async function extractText({ target, settings, config, logger = defaultLogger, }) {
+        settings = utils.types.isArray(settings) ? settings : [settings];
+        settings = settings.map(settings => {
+            var _a, _b, _c;
+            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'));
+            return settings;
+        });
+        const classicCore = (0, core_1.makeCore)({ spec, core, logger });
+        const results = await classicCore.extractText({ target, settings, logger });
         return results;
     };
 }

package/dist/get-eyes-results.js

@@ -0,0 +1,18 @@
+"use strict";
+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 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 => {
+                if (result.status !== 'Passed')
+                    throw new test_error_1.TestError(result);
+            });
+        }
+        return results;
+    };
+}
+exports.makeGetEyesResults = makeGetEyesResults;

package/dist/{close-manager.js → get-manager-results.js}

@@ -1,15 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeCloseManager = void 0;
+exports.makeGetManagerResults = void 0;
 const test_error_1 = require("./errors/test-error");
 const internal_error_1 = require("./errors/internal-error");
-function makeCloseManager({ core, storage, logger: defaultLogger, }) {
-    return async function closeManager({ settings, logger = defaultLogger, } = {}) {
-        const containers = await Promise.all(storage.map(async ({ eyes, promise }) => {
-            if (!promise)
-                logger.warn(`The eyes with id "${eyes.test.userTestId}" are going to be auto aborted`);
+function makeGetManagerResults({ core, storage, logger: defaultLogger, }) {
+    return async function getManagerResults({ settings, logger = defaultLogger, } = {}) {
+        var _a, _b, _c;
+        const containers = await Promise.all(storage.map(async (eyes) => {
             try {
-                const results = await (promise !== null && promise !== void 0 ? promise : eyes.abort({ logger }));
+                const results = await eyes.getResults({ settings, logger });
                 return results.map(result => {
                     return {
                         result,
@@ -23,7 +22,7 @@ function makeCloseManager({ core, storage, logger: defaultLogger, }) {
                 return [{ error: new internal_error_1.InternalError(error), ...error.info }];
             }
         }));
-        const batches = storage.reduce((batches, { eyes }) => {
+        const batches = storage.reduce((batches, eyes) => {
             if (!eyes.test.keepBatchOpen) {
                 const settings = { ...eyes.test.server, batchId: eyes.test.batchId };
                 batches[`${settings.serverUrl}:${settings.apiKey}:${settings.batchId}`] = settings;
@@ -54,12 +53,12 @@ function makeCloseManager({ core, storage, logger: defaultLogger, }) {
                     summary.passed += 1;
                 else if (container.result.status === 'Unresolved')
                     summary.unresolved += 1;
-                summary.matches += container.result.matches;
-                summary.missing += container.result.missing;
-                summary.mismatches += container.result.mismatches;
+                summary.matches += (_a = container.result.matches) !== null && _a !== void 0 ? _a : 0;
+                summary.missing += (_b = container.result.missing) !== null && _b !== void 0 ? _b : 0;
+                summary.mismatches += (_c = container.result.mismatches) !== null && _c !== void 0 ? _c : 0;
             }
         }
         return summary;
     };
 }
-exports.makeCloseManager = makeCloseManager;
+exports.makeGetManagerResults = makeGetManagerResults;

package/dist/get-typed-eyes.js

@@ -5,10 +5,7 @@ function makeGetTypedEyes({ type: defaultType, settings: defaultSettings, target
     let eyes;
     return async function getTypesEyes({ type = defaultType, settings, logger = defaultLogger, } = {}) {
         if (!eyes) {
-            eyes =
-                type === 'ufg'
-                    ? await cores.ufg.openEyes({ target, settings: defaultSettings, logger })
-                    : await cores.classic.openEyes({ target, settings: defaultSettings, logger });
+            eyes = await cores[type].openEyes({ target, settings: defaultSettings, logger });
             return eyes;
         }
         else if (eyes.type === type) {
@@ -16,11 +13,13 @@ function makeGetTypedEyes({ type: defaultType, settings: defaultSettings, target
         }
         else if (type === 'ufg') {
             const baseEyes = await eyes.getBaseEyes();
-            return cores.ufg.openEyes({ target, settings: defaultSettings, eyes: baseEyes, logger });
+            const typedEyes = await cores.ufg.openEyes({ target, settings: defaultSettings, eyes: baseEyes, logger });
+            return typedEyes;
         }
         else {
             const baseEyes = (await Promise.all(settings.renderers.map(renderer => eyes.getBaseEyes({ settings: { type: settings.type, renderer } })))).flat();
-            return cores.classic.openEyes({ target, settings: defaultSettings, eyes: baseEyes, logger });
+            const typedEyes = await cores.classic.openEyes({ target, settings: defaultSettings, eyes: baseEyes, logger });
+            return typedEyes;
         }
     };
 }

package/dist/index.js

@@ -26,10 +26,10 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatters = exports.takeDomSnapshots = void 0;
+exports.takeDomSnapshots = exports.formatters = void 0;
 __exportStar(require("./types"), exports);
 __exportStar(require("./core"), exports);
+__exportStar(require("@applitools/driver/dist/debug"), exports);
+exports.formatters = __importStar(require("./utils/format-results"));
 var take_dom_snapshots_1 = require("./ufg/utils/take-dom-snapshots");
 Object.defineProperty(exports, "takeDomSnapshots", { enumerable: true, get: function () { return take_dom_snapshots_1.takeDomSnapshots; } });
-exports.formatters = __importStar(require("./utils/format-results"));
-__exportStar(require("@applitools/driver/dist/debug"), exports);

package/dist/locate-text.js

@@ -1,13 +1,39 @@
 "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.makeLocateText = void 0;
-function makeLocateText({ eyes, target: defaultTarget, logger: defaultLogger, }) {
-    return async function locateText({ target = defaultTarget, settings, config, logger = defaultLogger, }) {
-        var _a;
-        settings = { ...config === null || config === void 0 ? void 0 : config.screenshot, ...settings };
-        (_a = settings.autProxy) !== null && _a !== void 0 ? _a : (settings.autProxy = eyes.test.server.proxy);
-        const classicEyes = await eyes.getTypedEyes({ type: 'classic', logger });
-        const results = await classicEyes.locateText({ target, settings, logger });
+const core_1 = require("./classic/core");
+const utils = __importStar(require("@applitools/utils"));
+function makeLocateText({ spec, core, logger: defaultLogger }) {
+    return async function locateText({ target, settings, config, logger = defaultLogger, }) {
+        var _a, _b, _c;
+        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'));
+        const classicCore = (0, core_1.makeCore)({ spec, core, logger });
+        const results = await classicCore.locateText({ target, settings, logger });
         return results;
     };
 }

package/dist/locate.js

@@ -26,7 +26,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeLocate = void 0;
 const core_1 = require("./classic/core");
 const utils = __importStar(require("@applitools/utils"));
-function makeLocate({ spec, core, logger: defaultLogger, }) {
+function makeLocate({ spec, core, logger: defaultLogger }) {
     return async function locate({ target, settings, config, logger = defaultLogger, }) {
         var _a, _b, _c;
         settings = { ...config === null || config === void 0 ? void 0 : config.open, ...config === null || config === void 0 ? void 0 : config.screenshot, ...settings };

package/dist/make-ec-client.js

@@ -25,18 +25,10 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeMakeECClient = void 0;
 const utils = __importStar(require("@applitools/utils"));
-function makeMakeECClient({ core, logger: defaultLogger }) {
+function makeMakeECClient({ logger: defaultLogger }) {
     return utils.general.cachify(makeECClient, ([options]) => options === null || options === void 0 ? void 0 : options.settings);
     async function makeECClient({ settings, logger = defaultLogger, } = {}) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
-        var _j, _k;
         const { makeECClient } = require('@applitools/ec-client');
-        const serverUrl = (_c = (_b = (_a = settings.capabilities.eyesServerUrl) !== null && _a !== void 0 ? _a : utils.general.getEnvValue('EYES_SERVER_URL')) !== null && _b !== void 0 ? _b : utils.general.getEnvValue('SERVER_URL')) !== null && _c !== void 0 ? _c : 'https://eyesapi.applitools.com';
-        const apiKey = ((_d = (_j = settings.capabilities).apiKey) !== null && _d !== void 0 ? _d : (_j.apiKey = utils.general.getEnvValue('API_KEY')));
-        const proxy = (_e = settings.proxy) !== null && _e !== void 0 ? _e : (utils.general.getEnvValue('PROXY_URL') && { url: utils.general.getEnvValue('PROXY_URL') });
-        const account = await core.getAccountInfo({ settings: { serverUrl, apiKey, proxy }, logger });
-        (_f = settings.capabilities) !== null && _f !== void 0 ? _f : (settings.capabilities = {});
-        (_g = (_k = settings.capabilities).useSelfHealing) !== null && _g !== void 0 ? _g : (_k.useSelfHealing = (_h = utils.general.getEnvValue('USE_SELF_HEALING', 'boolean')) !== null && _h !== void 0 ? _h : account.selfHealingEnabled);
         const client = await makeECClient({ settings, logger });
         return client;
     }

package/dist/make-manager.js

@@ -28,7 +28,7 @@ const core_base_1 = require("@applitools/core-base");
 const core_1 = require("./classic/core");
 const core_2 = require("./ufg/core");
 const open_eyes_1 = require("./open-eyes");
-const close_manager_1 = require("./close-manager");
+const get_manager_results_1 = require("./get-manager-results");
 const utils = __importStar(require("@applitools/utils"));
 function makeMakeManager({ spec, core, concurrency: defaultConcurrency = utils.general.getEnvValue('CONCURRENCY', 'number'), agentId: defaultAgentId, cwd = process.cwd(), logger: defaultLogger, }) {
     return async function makeManager({ type = 'classic', concurrency = defaultConcurrency, legacyConcurrency, batch, agentId = type === 'ufg' ? defaultAgentId === null || defaultAgentId === void 0 ? void 0 : defaultAgentId.replace(/(\/\d)/, '.visualgrid$1') : defaultAgentId, logger = defaultLogger, } = {}) {
@@ -37,40 +37,15 @@ function makeMakeManager({ spec, core, concurrency: defaultConcurrency = utils.g
         batch !== null && batch !== void 0 ? batch : (batch = {});
         (_a = batch.id) !== null && _a !== void 0 ? _a : (batch.id = `generated-${utils.general.guid()}`);
         core !== null && core !== void 0 ? core : (core = (0, core_base_1.makeCore)({ agentId, cwd, logger }));
-        const cores = {
-            ufg: (0, core_2.makeCore)({ spec, core, concurrency, logger }),
-            classic: (0, core_1.makeCore)({ spec, core, logger }),
-        };
+        const cores = { ufg: (0, core_2.makeCore)({ spec, core, concurrency, logger }), classic: (0, core_1.makeCore)({ spec, core, logger }) };
         const storage = [];
-        // open eyes with result storage
-        const openEyes = utils.general.wrap((0, open_eyes_1.makeOpenEyes)({ type, batch, spec, core, cores, logger }), async (openEyes, options) => {
-            const eyes = await openEyes(options);
-            const item = { eyes };
-            storage.push(item);
-            return utils.general.extend(eyes, {
-                close(options) {
-                    var _a;
-                    const promise = eyes.close(options);
-                    (_a = item.promise) !== null && _a !== void 0 ? _a : (item.promise = promise);
-                    return promise;
-                },
-                checkAndClose(options) {
-                    var _a;
-                    const promise = eyes.checkAndClose(options);
-                    (_a = item.promise) !== null && _a !== void 0 ? _a : (item.promise = promise);
-                    return promise;
-                },
-                abort(options) {
-                    var _a;
-                    const promise = eyes.abort(options);
-                    (_a = item.promise) !== null && _a !== void 0 ? _a : (item.promise = promise);
-                    return promise;
-                },
-            });
-        });
         return {
-            openEyes,
-            closeManager: (0, close_manager_1.makeCloseManager)({ core, storage, logger }),
+            openEyes: utils.general.wrap((0, open_eyes_1.makeOpenEyes)({ type, batch, spec, core, cores, logger }), async (openEyes, options) => {
+                const eyes = await openEyes(options);
+                storage.push(eyes);
+                return eyes;
+            }),
+            getResults: (0, get_manager_results_1.makeGetManagerResults)({ core, storage, logger }),
         };
     };
 }

package/dist/open-eyes.js

@@ -30,9 +30,8 @@ const core_2 = require("./ufg/core");
 const get_typed_eyes_1 = require("./get-typed-eyes");
 const check_1 = require("./check");
 const check_and_close_1 = require("./check-and-close");
-const locate_text_1 = require("./locate-text");
-const extract_text_1 = require("./extract-text");
 const close_1 = require("./close");
+const get_eyes_results_1 = require("./get-eyes-results");
 const extract_ci_provider_1 = require("./utils/extract-ci-provider");
 const utils = __importStar(require("@applitools/utils"));
 function makeOpenEyes({ type: defaultType = 'classic', concurrency, batch, core, cores, spec, logger: defaultLogger, }) {
@@ -97,10 +96,9 @@ function makeOpenEyes({ type: defaultType = 'classic', concurrency, batch, core,
             getTypedEyes,
             check: (0, check_1.makeCheck)({ type, eyes, target: driver, spec, logger }),
             checkAndClose: (0, check_and_close_1.makeCheckAndClose)({ type, eyes, target: driver, spec, logger }),
-            locateText: (0, locate_text_1.makeLocateText)({ eyes, target: driver, logger }),
-            extractText: (0, extract_text_1.makeExtractText)({ eyes, target: driver, logger }),
             close: (0, close_1.makeClose)({ eyes, logger }),
-        }));
+            getResults: (0, get_eyes_results_1.makeGetEyesResults)({ eyes, logger }),
+        })); // TODO solve the types issue
     };
 }
 exports.makeOpenEyes = makeOpenEyes;

package/dist/troubleshoot/check-network.js

@@ -29,46 +29,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkNetwork = void 0;
 const chalk_1 = __importDefault(require("chalk"));
-const utils_1 = require("./utils");
 const eyes_1 = __importDefault(require("./eyes"));
 const ufg_1 = __importDefault(require("./ufg"));
 const utils = __importStar(require("@applitools/utils"));
 const TIMEOUT = 15000;
 const config = utils.config.getConfig({ params: ['apiKey', 'serverUrl', 'proxy'] });
 async function checkNetwork({ stream = process.stdout, eyes = eyes_1.default, ufg = ufg_1.default } = {}) {
-    const hasClearLine = stream.clearLine && stream.cursorTo;
-    async function doTest(func, name) {
-        const delimiterLength = 30 - name.length;
-        const delimiter = new Array(delimiterLength).join(' ');
-        hasClearLine && printSuccess(name, delimiter, '[ ?  ]');
-        const start = Date.now();
-        const funcWithTimeout = (0, utils_1.ptimeoutWithError)(func(), TIMEOUT, new Error('request timeout!'));
-        const [err] = await (0, utils_1.presult)(funcWithTimeout);
-        const end = (Date.now() - start) / 1000;
-        clearLine();
-        if (err) {
-            printErr(name, delimiter, `[ X  ]  +${end}`, err.message, err.message[err.message.length - 1] !== '\n' ? '\n' : '');
-        }
-        else {
-            printSuccess(name, delimiter, `[ OK ]  +${end}`, '\n');
-        }
-        return !!err;
-    }
-    function print(...msg) {
-        stream.write((0, chalk_1.default)(...msg));
-    }
-    function printErr(...msg) {
-        stream.write(chalk_1.default.red(...msg));
-    }
-    function printSuccess(...msg) {
-        stream.write(chalk_1.default.green(...msg));
-    }
-    function clearLine() {
-        if (hasClearLine) {
-            stream.clearLine(0);
-            stream.cursorTo(0);
-        }
-    }
+    const hasClearLine = !!stream.clearLine && !!stream.cursorTo;
     if (!config.apiKey) {
         printErr('Missing "apiKey". Add APPLITOOLS_API_KEY as an env variable or add "apiKey" in applitools.config.js\n');
         return;
@@ -102,6 +69,46 @@ async function checkNetwork({ stream = process.stdout, eyes = eyes_1.default, uf
     else if (curlVgErr) {
         printErr(proxyMsg, '\n', await ufg.getCmd());
     }
+    async function doTest(func, name) {
+        const delimiterLength = 30 - name.length;
+        const delimiter = new Array(delimiterLength).join(' ');
+        hasClearLine && printSuccess(name, delimiter, '[ ?  ]');
+        const start = Date.now();
+        const [err] = await ptimeoutWithError(func(), TIMEOUT, new Error('request timeout!'));
+        const end = (Date.now() - start) / 1000;
+        clearLine();
+        if (err) {
+            printErr(name, delimiter, `[ X  ]  +${end}`, err.message, err.message[err.message.length - 1] !== '\n' ? '\n' : '');
+        }
+        else {
+            printSuccess(name, delimiter, `[ OK ]  +${end}`, '\n');
+        }
+        return !!err;
+    }
+    function print(...msg) {
+        stream.write((0, chalk_1.default)(...msg));
+    }
+    function printErr(...msg) {
+        stream.write(chalk_1.default.red(...msg));
+    }
+    function printSuccess(...msg) {
+        stream.write(chalk_1.default.green(...msg));
+    }
+    function clearLine() {
+        if (hasClearLine) {
+            stream.clearLine(0);
+            stream.cursorTo(0);
+        }
+    }
+    async function ptimeoutWithError(promise, timeout, err) {
+        let timer;
+        return Promise.race([
+            promise.then(v => (timer && clearTimeout(timer), [undefined, v]), err => (timer && clearTimeout(timer), [err])),
+            new Promise(res => {
+                timer = setTimeout(() => res([err]), timeout);
+            }),
+        ]);
+    }
 }
 exports.checkNetwork = checkNetwork;
 checkNetwork();

package/dist/troubleshoot/eyes.js

@@ -34,12 +34,12 @@ const utils = __importStar(require("@applitools/utils"));
 const node_fetch_1 = __importDefault(require("node-fetch"));
 exports.RENDER_INFO_URL = `${utils_1.config.serverUrl}/api/sessions/renderinfo?apiKey=${utils_1.config.apiKey}`;
 exports.CURL_CMD = `curl ${exports.RENDER_INFO_URL} ${(0, utils_1.getProxyCurlArg)()}`;
-const validateRawAccountInfo = res => {
+const validateRawAccountInfo = (res) => {
     if (!res || !res.accessToken || !res.resultsUrl) {
         throw new Error(`bad render info result ${JSON.stringify(res)}`);
     }
 };
-const validateAccountInfo = res => {
+const validateAccountInfo = (res) => {
     if (!res || !res.ufg || !res.ufg.accessToken || !res.uploadUrl) {
         throw new Error(`bad render info result ${JSON.stringify(res)}`);
     }

package/dist/troubleshoot/ufg.js

@@ -29,9 +29,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCmd = void 0;
 const https_1 = require("https");
 const crypto_1 = require("crypto");
-const eyes_1 = require("./eyes");
+const logger_1 = require("@applitools/logger");
 const ufg_client_1 = require("@applitools/ufg-client");
 const utils_1 = require("./utils");
+const eyes_1 = require("./eyes");
 const utils = __importStar(require("@applitools/utils"));
 const node_fetch_1 = __importDefault(require("node-fetch"));
 const value = Buffer.from(JSON.stringify({ resources: {}, domNodes: [] }));
@@ -91,7 +92,7 @@ exports.default = {
         const url = new URL(UFG_PUT_RESOURCE_URL);
         const requests = (0, ufg_client_1.makeUFGRequests)({
             config: { serverUrl: url.origin, accessToken: await accessTokenPromise, uploadUrl: '', stitchingServiceUrl: '' },
-            logger: null,
+            logger: (0, logger_1.makeLogger)(),
         });
         await requests.uploadResource({ resource });
     },

package/dist/troubleshoot/utils.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ptimeoutWithError = exports.presult = exports.getProxyCurlArg = exports.config = void 0;
+exports.getProxyCurlArg = exports.config = void 0;
 const utils = __importStar(require("@applitools/utils"));
 exports.config = {
     serverUrl: 'https://eyesapi.applitools.com',
@@ -42,27 +42,3 @@ function getProxyCurlArg() {
     return proxyUrl ? `-x ${proxyUrl.href}` : '';
 }
 exports.getProxyCurlArg = getProxyCurlArg;
-function presult(promise) {
-    return promise.then(v => [undefined, v], err => [err]);
-}
-exports.presult = presult;
-async function ptimeoutWithError(promiseOrPromiseFunc, timeout, err) {
-    let promiseResolved = false;
-    const hasAborted = () => promiseResolved;
-    const promise = promiseOrPromiseFunc.then ? promiseOrPromiseFunc : promiseOrPromiseFunc(hasAborted);
-    let cancel;
-    const v = await Promise.race([
-        promise.then(v => ((promiseResolved = true), cancel && clearTimeout(cancel), v), err => ((promiseResolved = true), cancel && clearTimeout(cancel), Promise.reject(err))),
-        new Promise(res => (cancel = setTimeout(() => {
-            if (promiseResolved)
-                res(undefined);
-            else {
-                cancel = undefined;
-                promiseResolved = true;
-                res(Promise.reject(err));
-            }
-        }, timeout))),
-    ]);
-    return v;
-}
-exports.ptimeoutWithError = ptimeoutWithError;

package/dist/types.js

@@ -14,5 +14,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("@applitools/core-base/types"), exports);
 __exportStar(require("./automation/types"), exports);

package/dist/ufg/abort.js

@@ -1,37 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeAbort = void 0;
-const abort_error_1 = require("../errors/abort-error");
 const driver_1 = require("@applitools/driver");
 function makeAbort({ storage, target, spec, controller, logger: defaultLogger, }) {
-    return async function ({ settings, logger = defaultLogger, } = {}) {
+    return async function abort({ settings, logger = defaultLogger, } = {}) {
+        logger.log('Command "abort" is called with settings', settings);
         controller.abort();
-        const tests = storage.reduce((tests, { renderer, promise }) => {
-            const key = JSON.stringify(renderer);
-            return tests.set(key, promise);
-        }, new Map());
-        return Promise.all(Array.from(tests.values(), async (promise) => {
-            let eyes, renderer;
+        const driver = (0, driver_1.isDriver)(target, spec) ? await (0, driver_1.makeDriver)({ spec, driver: target, logger }) : null;
+        const testMetadata = await (driver === null || driver === void 0 ? void 0 : driver.getSessionMetadata());
+        storage.forEach(async (promises) => {
+            var _a, _b;
             try {
-                const value = await promise;
-                eyes = value.eyes;
-                renderer = value.renderer;
+                const { eyes } = await Promise.race(promises);
+                await eyes.abort({ settings: { ...settings, testMetadata }, logger });
             }
             catch (error) {
-                eyes = error.info.eyes;
-                renderer = error.info.renderer;
-                if (!eyes) {
-                    if (error instanceof abort_error_1.AbortError)
-                        return error.info;
-                    else
-                        throw error;
-                }
+                logger.warn('Command "abort" received an error during waiting for eyes instances in background', error);
+                await ((_b = (_a = error === null || error === void 0 ? void 0 : error.info) === null || _a === void 0 ? void 0 : _a.eyes) === null || _b === void 0 ? void 0 : _b.abort({ settings: { ...settings, testMetadata }, logger }));
             }
-            const driver = (0, driver_1.isDriver)(target, spec) ? await (0, driver_1.makeDriver)({ spec, driver: target, logger }) : null;
-            const testMetadata = await (driver === null || driver === void 0 ? void 0 : driver.getSessionMetadata());
-            const [result] = await eyes.abort({ settings: { ...settings, testMetadata }, logger });
-            return { ...result, renderer };
-        }));
+        });
     };
 }
 exports.makeAbort = makeAbort;