@applitools/core 3.9.1 → 3.10.0

package/CHANGELOG.md

@@ -1,5 +1,53 @@
 # Changelog
 
+## [3.10.0](https://github.com/applitools/eyes.sdk.javascript1/compare/js/core@3.9.1...js/core@3.10.0) (2023-08-30)
+
+
+### Features
+
+* allowed running multiple classic test with different devices for applitoolsified native apps  ([#1891](https://github.com/applitools/eyes.sdk.javascript1/issues/1891)) ([a84311f](https://github.com/applitools/eyes.sdk.javascript1/commit/a84311f88e6f532268543a96f841ae5ad87d5659))
+
+
+### Dependencies
+
+* @applitools/utils bumped to 1.5.2
+  #### Bug Fixes
+
+  * fixed some types ([498b1d7](https://github.com/applitools/eyes.sdk.javascript1/commit/498b1d7c547df04773b64b66ee39cccb402c093e))
+* @applitools/nml-client bumped to 1.5.9
+  #### Bug Fixes
+
+  * update broker url when server respond with error ([#1882](https://github.com/applitools/eyes.sdk.javascript1/issues/1882)) ([ab5a6ae](https://github.com/applitools/eyes.sdk.javascript1/commit/ab5a6ae8976b061bda8b56a9cc11c149e47d6dea))
+
+
+
+* @applitools/logger bumped to 2.0.9
+
+* @applitools/socket bumped to 1.1.9
+
+* @applitools/req bumped to 1.5.4
+
+* @applitools/image bumped to 1.1.4
+
+* @applitools/spec-driver-webdriver bumped to 1.0.43
+
+* @applitools/spec-driver-selenium bumped to 1.5.57
+
+* @applitools/spec-driver-puppeteer bumped to 1.1.74
+
+* @applitools/driver bumped to 1.13.6
+
+* @applitools/screenshoter bumped to 3.8.9
+
+* @applitools/tunnel-client bumped to 1.2.1
+
+* @applitools/ufg-client bumped to 1.7.2
+
+* @applitools/ec-client bumped to 1.7.6
+
+* @applitools/core-base bumped to 1.5.2
+
+
 ## [3.9.1](https://github.com/applitools/eyes.sdk.javascript1/compare/js/core@3.9.0...js/core@3.9.1) (2023-08-18)
 
 

package/dist/abort.js

@@ -0,0 +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.makeAbort = void 0;
+const utils = __importStar(require("@applitools/utils"));
+function makeAbort({ eyes, renderers: defaultRenderers, logger: mainLogger, }) {
+    return async function abort({ settings, logger = mainLogger, } = {}) {
+        var _a;
+        logger = logger.extend(mainLogger, { tags: [`abort-${utils.general.shortid()}`] });
+        const typedEyes = await eyes.getTypedEyes({ logger });
+        settings !== null && settings !== void 0 ? settings : (settings = {});
+        if (typedEyes.type === 'classic' && !utils.types.isEmpty(defaultRenderers)) {
+            (_a = settings.renderers) !== null && _a !== void 0 ? _a : (settings.renderers = defaultRenderers);
+        }
+        await typedEyes.abort({ settings, logger });
+    };
+}
+exports.makeAbort = makeAbort;

package/dist/{ufg → automation}/abort.js

@@ -2,10 +2,20 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeAbort = void 0;
 const driver_1 = require("@applitools/driver");
-function makeAbort({ storage, target, spec, controller, logger: mainLogger, }) {
+const uniquify_renderers_1 = require("./utils/uniquify-renderers");
+function makeAbort({ eyes, target, controller, renderers: defaultRenderers, spec, logger: mainLogger, }) {
     return async function abort({ settings, logger = mainLogger, } = {}) {
+        var _a;
         logger = logger.extend(mainLogger);
         logger.log('Command "abort" is called with settings', settings);
+        if (!eyes.running) {
+            logger.log('Command "abort" will be ignored because eyes were already stopped');
+            return;
+        }
+        else {
+            ;
+            eyes.running = false;
+        }
         controller.abort();
         settings !== null && settings !== void 0 ? settings : (settings = {});
         if (!settings.testMetadata && (0, driver_1.isDriver)(target, spec)) {
@@ -17,10 +27,16 @@ function makeAbort({ storage, target, spec, controller, logger: mainLogger, }) {
                 logger.warn('Command "abort" received an error during extracting driver metadata', error);
             }
         }
-        storage.forEach(async (promises) => {
+        (_a = settings.renderers) !== null && _a !== void 0 ? _a : (settings.renderers = defaultRenderers);
+        if (eyes.storage.size === 0 && settings.renderers && settings.renderers.length > 0) {
+            const uniqueRenderers = (0, uniquify_renderers_1.uniquifyRenderers)(settings.renderers);
+            logger.log('Command "abort" starting filler tests for renderers', uniqueRenderers);
+            await Promise.all(uniqueRenderers.map(renderer => eyes.getBaseEyes({ settings: { renderer }, logger })));
+        }
+        eyes.storage.forEach(async (item) => {
             var _a, _b;
             try {
-                const { eyes } = await Promise.race(promises);
+                const eyes = await item.eyes;
                 await eyes.abort({ settings, logger });
             }
             catch (error) {

package/dist/{ufg → automation}/close.js

@@ -2,10 +2,20 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeClose = void 0;
 const driver_1 = require("@applitools/driver");
-function makeClose({ storage, target, spec, logger: mainLogger }) {
+const uniquify_renderers_1 = require("./utils/uniquify-renderers");
+function makeClose({ eyes, target, renderers: defaultRenderers, spec, logger: mainLogger, }) {
     return async function close({ settings, logger = mainLogger, } = {}) {
+        var _a;
         logger = logger.extend(mainLogger);
         logger.log('Command "close" is called with settings', settings);
+        if (!eyes.running) {
+            logger.log('Command "close" will be ignored because eyes were already stopped');
+            return;
+        }
+        else {
+            ;
+            eyes.running = false;
+        }
         settings !== null && settings !== void 0 ? settings : (settings = {});
         if (!settings.testMetadata && (0, driver_1.isDriver)(target, spec)) {
             try {
@@ -16,10 +26,16 @@ function makeClose({ storage, target, spec, logger: mainLogger }) {
                 logger.warn('Command "close" received an error during extracting driver metadata', error);
             }
         }
-        storage.forEach(async (promises) => {
+        (_a = settings.renderers) !== null && _a !== void 0 ? _a : (settings.renderers = defaultRenderers);
+        if (eyes.storage.size === 0 && settings.renderers && settings.renderers.length > 0) {
+            const uniqueRenderers = (0, uniquify_renderers_1.uniquifyRenderers)(settings.renderers);
+            logger.log('Command "close" starting filler tests for renderers', settings.renderers);
+            await Promise.all(uniqueRenderers.map(renderer => eyes.getBaseEyes({ settings: { renderer }, logger })));
+        }
+        eyes.storage.forEach(async (item) => {
             var _a, _b;
             try {
-                const [{ eyes }] = await Promise.all(promises);
+                const [eyes] = await Promise.all([item.eyes, ...item.jobs]);
                 try {
                     await eyes.close({ settings, logger });
                 }

package/dist/automation/get-nml-client.js

@@ -27,16 +27,16 @@ exports.makeGetNMLClient = void 0;
 const nml_client_1 = require("@applitools/nml-client");
 const utils = __importStar(require("@applitools/utils"));
 function makeGetNMLClient({ client, logger: mainLogger }) {
-    const getNMLClientWithCache = utils.general.cachify(getNMLClient, ([options]) => client ? 'default' : [options.driver.guid, options.config]);
+    const getNMLClientWithCache = utils.general.cachify(getNMLClient, ([options]) => client ? 'default' : [options.driver.guid, options.settings]);
     if (client)
         getNMLClientWithCache.setCachedValue('default', Promise.resolve(client));
     return getNMLClientWithCache;
-    async function getNMLClient({ driver, config, logger = mainLogger, }) {
+    async function getNMLClient({ driver, settings, logger = mainLogger, }) {
         logger = logger.extend(mainLogger);
         const brokerUrl = await driver.extractBrokerUrl();
         if (!brokerUrl)
             throw new Error('Unable to extract broker url from the device');
-        return (0, nml_client_1.makeNMLClient)({ config: { brokerUrl, ...config }, logger });
+        return (0, nml_client_1.makeNMLClient)({ settings: { brokerUrl, ...settings }, logger });
     }
 }
 exports.makeGetNMLClient = makeGetNMLClient;

package/dist/{ufg → automation}/get-results.js

@@ -2,16 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeGetResults = void 0;
 const abort_error_1 = require("../errors/abort-error");
-function makeGetResults({ storage, logger: mainLogger }) {
+function makeGetResults({ eyes, logger: mainLogger }) {
     return async function getResults({ settings, logger = mainLogger, } = {}) {
         logger = logger.extend(mainLogger);
         logger.log('Command "getResults" is called with settings', settings);
-        return Promise.all(Array.from(storage.values(), async (promises) => {
+        return Promise.all(Array.from(eyes.storage.values(), async (item) => {
             var _a;
             try {
-                const [{ eyes, renderer }] = await Promise.all(promises);
+                const [eyes] = await Promise.all([item.eyes, ...item.jobs]);
                 const [result] = await eyes.getResults({ settings, logger });
-                return { ...result, renderer };
+                return { ...result, renderer: item.renderer };
             }
             catch (error) {
                 if (error instanceof abort_error_1.AbortError && ((_a = error.info) === null || _a === void 0 ? void 0 : _a.eyes)) {

package/dist/check-and-close.js

@@ -28,21 +28,12 @@ const driver_1 = require("@applitools/driver");
 const utils = __importStar(require("@applitools/utils"));
 function makeCheckAndClose({ type: defaultType = 'classic', eyes, target: defaultTarget, spec, logger: mainLogger, }) {
     return async function checkAndClose({ type = defaultType, target = defaultTarget, settings = {}, config, logger = mainLogger, } = {}) {
-        var _a;
         logger = logger.extend(mainLogger, { tags: [`check-and-close-${type}-${utils.general.shortid()}`] });
         settings = { ...config === null || config === void 0 ? void 0 : config.screenshot, ...config === null || config === void 0 ? void 0 : config.check, ...config === null || config === void 0 ? void 0 : config.close, ...settings };
         const driver = (0, driver_1.isDriver)(target, spec)
             ? await (0, driver_1.makeDriver)({ spec, driver: target, reset: target === defaultTarget, logger })
             : null;
-        const environment = await (driver === null || driver === void 0 ? void 0 : driver.getEnvironment());
-        const typedEyes = await eyes.getTypedEyes({
-            type,
-            settings: (_a = settings.renderers) === null || _a === void 0 ? void 0 : _a.map(renderer => ({
-                type: (environment === null || environment === void 0 ? void 0 : environment.isNative) ? 'native' : 'web',
-                renderer,
-            })),
-            logger,
-        });
+        const typedEyes = await eyes.getTypedEyes({ type, logger });
         await typedEyes.checkAndClose({ target: driver !== null && driver !== void 0 ? driver : target, settings, logger });
     };
 }

package/dist/check.js

@@ -33,8 +33,8 @@ const chalk_1 = __importDefault(require("chalk"));
 function makeCheck({ type: defaultType = 'classic', eyes, target: defaultTarget, spec, logger: mainLogger, }) {
     let stepIndex = 0;
     return async function check({ type = defaultType, target = defaultTarget, settings, config, logger = mainLogger, } = {}) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
-        var _r, _s, _t, _u;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
+        var _q, _r, _s, _t;
         logger = logger.extend(mainLogger, { tags: [`check-${type}-${utils.general.shortid()}`] });
         settings = { ...config === null || config === void 0 ? void 0 : config.screenshot, ...config === null || config === void 0 ? void 0 : config.check, ...settings };
         (_a = settings.fully) !== null && _a !== void 0 ? _a : (settings.fully = !settings.region && (!settings.frames || settings.frames.length === 0));
@@ -47,12 +47,12 @@ function makeCheck({ type: defaultType = 'classic', eyes, target: defaultTarget,
         (_g = settings.sendDom) !== null && _g !== void 0 ? _g : (settings.sendDom = eyes.test.account.rcaEnabled || settings.matchLevel === 'Layout' || settings.enablePatterns || settings.useDom);
         (_h = settings.autProxy) !== null && _h !== void 0 ? _h : (settings.autProxy = eyes.test.eyesServer.proxy);
         (_j = settings.useDom) !== null && _j !== void 0 ? _j : (settings.useDom = false);
-        (_k = (_r = settings).retryTimeout) !== null && _k !== void 0 ? _k : (_r.retryTimeout = 2000);
+        (_k = (_q = settings).retryTimeout) !== null && _k !== void 0 ? _k : (_q.retryTimeout = 2000);
         settings.lazyLoad = settings.lazyLoad === true ? {} : settings.lazyLoad;
         if (settings.lazyLoad) {
-            (_l = (_s = settings.lazyLoad).scrollLength) !== null && _l !== void 0 ? _l : (_s.scrollLength = 300);
-            (_m = (_t = settings.lazyLoad).waitingTime) !== null && _m !== void 0 ? _m : (_t.waitingTime = 2000);
-            (_o = (_u = settings.lazyLoad).maxAmountToScroll) !== null && _o !== void 0 ? _o : (_u.maxAmountToScroll = 15000);
+            (_l = (_r = settings.lazyLoad).scrollLength) !== null && _l !== void 0 ? _l : (_r.scrollLength = 300);
+            (_m = (_s = settings.lazyLoad).waitingTime) !== null && _m !== void 0 ? _m : (_s.waitingTime = 2000);
+            (_o = (_t = settings.lazyLoad).maxAmountToScroll) !== null && _o !== void 0 ? _o : (_t.maxAmountToScroll = 15000);
         }
         settings.stepIndex = stepIndex++;
         (_p = settings.waitBetweenStitches) !== null && _p !== void 0 ? _p : (settings.waitBetweenStitches = utils.types.isObject(settings.lazyLoad) ? settings.lazyLoad.waitingTime : 100);
@@ -62,17 +62,8 @@ function makeCheck({ type: defaultType = 'classic', eyes, target: defaultTarget,
         const driver = (0, driver_1.isDriver)(target, spec)
             ? await (0, driver_1.makeDriver)({ spec, driver: target, reset: target === defaultTarget, logger })
             : null;
-        const environment = await (driver === null || driver === void 0 ? void 0 : driver.getEnvironment());
-        const typedEyes = await eyes.getTypedEyes({
-            type,
-            settings: (_q = settings.renderers) === null || _q === void 0 ? void 0 : _q.map(renderer => ({
-                type: (environment === null || environment === void 0 ? void 0 : environment.isNative) ? 'native' : 'web',
-                renderer,
-            })),
-            logger,
-        });
-        const results = await typedEyes.check({ target: driver !== null && driver !== void 0 ? driver : target, settings, logger });
-        return results;
+        const typedEyes = await eyes.getTypedEyes({ type, logger });
+        return typedEyes.check({ target: driver !== null && driver !== void 0 ? driver : target, settings, logger });
     };
 }
 exports.makeCheck = makeCheck;

package/dist/classic/check-and-close.js

@@ -25,90 +25,132 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeCheckAndClose = void 0;
 const driver_1 = require("@applitools/driver");
-const take_screenshot_1 = require("../automation/utils/take-screenshot");
-const take_dom_capture_1 = require("./utils/take-dom-capture");
+const take_screenshots_1 = require("./utils/take-screenshots");
 const to_base_check_settings_1 = require("../automation/utils/to-base-check-settings");
 const wait_for_lazy_load_1 = require("../automation/utils/wait-for-lazy-load");
+const uniquify_renderers_1 = require("../automation/utils/uniquify-renderers");
+const abort_error_1 = require("../errors/abort-error");
 const utils = __importStar(require("@applitools/utils"));
-function makeCheckAndClose({ eyes, target: defaultTarget, spec, logger: mainLogger, }) {
+function makeCheckAndClose({ eyes, target: defaultTarget, renderers: defaultRenderers = [], spec, signal, logger: mainLogger, }) {
     return async function checkAndClose({ target = defaultTarget, settings = {}, logger = mainLogger, } = {}) {
         var _a, _b;
         logger = logger.extend(mainLogger);
         logger.log('Command "checkAndClose" is called with settings', settings);
         if (!target)
             throw new Error('Method was called with no target');
-        const baseEyes = await eyes.getBaseEyes({ logger });
-        if (!(0, driver_1.isDriver)(target, spec)) {
-            const baseSettings = settings;
-            await Promise.all(baseEyes.map(baseEyes => baseEyes.checkAndClose({ target, settings: baseSettings, logger })));
-            return;
+        if (signal === null || signal === void 0 ? void 0 : signal.aborted) {
+            logger.warn('Command "checkAndClose" was called after test was already aborted');
+            throw new abort_error_1.AbortError('Command "checkAndClose" was called after test was already aborted');
         }
-        const driver = await (0, driver_1.makeDriver)({ spec, driver: target, reset: target === defaultTarget, logger });
-        const environment = await driver.getEnvironment();
-        if (settings.lazyLoad && environment.isWeb) {
-            await (0, wait_for_lazy_load_1.waitForLazyLoad)({
-                context: driver.currentContext,
-                settings: settings.lazyLoad !== true ? settings.lazyLoad : {},
-                logger,
-            });
-        }
-        let baseTarget;
-        let baseSettings;
-        const { elementReferencesToCalculate, getBaseCheckSettings } = (0, to_base_check_settings_1.toBaseCheckSettings)({ settings });
-        if (environment.isWeb ||
-            !environment.isApplitoolsLib ||
-            settings.webview ||
-            settings.screenshotMode === 'default') {
-            const screenshot = await (0, take_screenshot_1.takeScreenshot)({
-                driver,
-                settings: { ...settings, regionsToCalculate: elementReferencesToCalculate },
-                logger,
-            });
-            baseTarget = {
-                name: await driver.getTitle(),
-                source: await driver.getUrl(),
-                image: await screenshot.image.toPng(),
-                locationInViewport: utils.geometry.location(screenshot.region),
-                isTransformed: true,
-            };
-            baseSettings = getBaseCheckSettings({ calculatedRegions: screenshot.calculatedRegions });
-            if (environment.isWeb && settings.sendDom) {
-                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: { proxy: eyes.test.eyesServer.proxy }, logger }).catch(() => undefined);
+        const uniqueRenderers = (0, uniquify_renderers_1.uniquifyRenderers)((_a = settings.renderers) !== null && _a !== void 0 ? _a : defaultRenderers);
+        const baseTargets = [];
+        const baseSettings = [];
+        if ((0, driver_1.isDriver)(target, spec)) {
+            const driver = await (0, driver_1.makeDriver)({ spec, driver: target, reset: target === defaultTarget, logger });
+            await driver.currentContext.setScrollingElement((_b = settings.scrollRootElement) !== null && _b !== void 0 ? _b : null);
+            const environment = await driver.getEnvironment();
+            if (settings.lazyLoad && environment.isWeb) {
+                await (0, wait_for_lazy_load_1.waitForLazyLoad)({
+                    context: driver.currentContext,
+                    settings: settings.lazyLoad !== true ? settings.lazyLoad : {},
+                    logger,
+                });
+            }
+            const { elementReferencesToCalculate, getBaseCheckSettings } = (0, to_base_check_settings_1.toBaseCheckSettings)({ settings });
+            if (environment.isWeb || !environment.isApplitoolsLib || settings.screenshotMode === 'default') {
+                const screenshots = await (0, take_screenshots_1.takeScreenshots)({
+                    driver,
+                    settings: {
+                        ...settings,
+                        renderers: uniqueRenderers,
+                        regionsToCalculate: elementReferencesToCalculate,
+                        calculateView: !!settings.pageId,
+                        domSettings: settings.sendDom ? { proxy: eyes.test.eyesServer.proxy } : undefined,
+                    },
+                    logger,
+                });
+                screenshots.forEach(({ calculatedRegions, ...baseTarget }) => {
+                    baseTargets.push(baseTarget);
+                    baseSettings.push(getBaseCheckSettings({ calculatedRegions }));
+                });
             }
-            if (settings.pageId) {
-                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();
+            else {
+                const nmlClient = await eyes.core.getNMLClient({
+                    driver,
+                    settings: { ...eyes.test.eyesServer, renderEnvironmentsUrl: eyes.test.renderEnvironmentsUrl },
+                    logger,
+                });
+                const screenshots = await nmlClient.takeScreenshots({
+                    settings: {
+                        renderers: uniqueRenderers,
+                        fully: settings.fully,
+                        stitchMode: settings.stitchMode,
+                        hideScrollbars: settings.hideScrollbars,
+                        hideCaret: settings.hideScrollbars,
+                        overlap: settings.overlap,
+                        waitBeforeCapture: settings.waitBeforeCapture,
+                        waitBetweenStitches: settings.waitBetweenStitches,
+                        lazyLoad: settings.lazyLoad,
+                        name: settings.name,
+                    },
+                    logger,
+                });
+                screenshots.forEach(({ calculatedRegions: _calculatedRegions, renderEnvironment, ...baseTarget }, index) => {
+                    uniqueRenderers[index] = { environment: renderEnvironment };
+                    baseTargets.push({ ...baseTarget, isTransformed: true });
+                    baseSettings.push(getBaseCheckSettings({ calculatedRegions: [] }));
+                });
             }
-            await screenshot.restoreState();
         }
         else {
-            const nmlClient = await eyes.core.getNMLClient({ config: eyes.test.eyesServer, driver, logger });
-            const screenshot = await nmlClient.takeScreenshot({
-                settings: {
-                    name: settings.name,
-                    fully: settings.fully,
-                    stitchMode: settings.stitchMode,
-                    hideScrollbars: settings.hideScrollbars,
-                    hideCaret: settings.hideScrollbars,
-                    overlap: settings.overlap,
-                    waitBeforeCapture: settings.waitBeforeCapture,
-                    waitBetweenStitches: settings.waitBetweenStitches,
-                    lazyLoad: settings.lazyLoad,
-                },
-                logger,
-            });
-            baseTarget = { image: screenshot.image, isTransformed: true };
-            baseSettings = getBaseCheckSettings({ calculatedRegions: [] });
+            baseTargets.push(target);
+            baseSettings.push(settings);
         }
-        await Promise.all(baseEyes.map(baseEyes => baseEyes.checkAndClose({ target: baseTarget, settings: baseSettings, logger })));
+        const promises = uniqueRenderers.map(async (renderer, index) => {
+            const rendererLogger = logger.extend({ tags: [`renderer-${utils.general.shortid()}`] });
+            try {
+                if (signal === null || signal === void 0 ? void 0 : signal.aborted) {
+                    rendererLogger.warn('Command "checkAndClose" was aborted before checking');
+                    throw new abort_error_1.AbortError('Command "checkAndClose" was aborted before checking');
+                }
+                const baseEyes = await eyes.getBaseEyes({ settings: { renderer }, logger: rendererLogger });
+                try {
+                    if (signal === null || signal === void 0 ? void 0 : signal.aborted) {
+                        rendererLogger.warn('Command "checkAndClose" was aborted before checking');
+                        throw new abort_error_1.AbortError('Command "checkAndClose" was aborted before checking');
+                    }
+                    else if (!baseEyes.running) {
+                        rendererLogger.warn(`Check on environment with id "${baseEyes.test.renderEnvironmentId}" was aborted during one of the previous steps`);
+                        throw new abort_error_1.AbortError(`Check on environment with id "${baseEyes.test.renderEnvironmentId}" was aborted during one of the previous steps`);
+                    }
+                    await baseEyes.checkAndClose({
+                        target: baseTargets[index],
+                        settings: baseSettings[index],
+                        logger: rendererLogger,
+                    });
+                }
+                catch (error) {
+                    rendererLogger.error(`Check on environment with id "${baseEyes.test.renderEnvironmentId}" failed due to an error`, error);
+                    await baseEyes.abort({ logger: rendererLogger });
+                    error.info = { eyes: baseEyes };
+                    throw error;
+                }
+            }
+            catch (error) {
+                rendererLogger.error(`Check with id ${renderer.id} failed before checking started due to an error`, error);
+                error.info = { ...error.info, userTestId: eyes.test.userTestId, renderer };
+                throw error;
+            }
+        });
+        uniqueRenderers.forEach((renderer, index) => {
+            const key = JSON.stringify(renderer);
+            let item = eyes.storage.get(key);
+            if (!item) {
+                item = { renderer, eyes: null, jobs: [] };
+                eyes.storage.set(key, item);
+            }
+            item.jobs.push(promises[index]);
+        });
     };
 }
 exports.makeCheckAndClose = makeCheckAndClose;