@applitools/core 3.6.2 → 3.6.4

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

@@ -36,8 +36,8 @@ const uniquify_renderers_1 = require("./utils/uniquify-renderers");
 const abort_error_1 = require("../errors/abort-error");
 const utils = __importStar(require("@applitools/utils"));
 const chalk_1 = __importDefault(require("chalk"));
-function makeCheckAndClose({ eyes, target: defaultTarget, spec, signal, logger: mainLogger, }) {
-    return async function checkAndClose({ target = defaultTarget, settings = {}, logger = mainLogger, }) {
+function makeCheckAndClose({ eyes, storage, target: defaultTarget, spec, signal, logger: mainLogger, }) {
+    return async function checkAndClose({ target = defaultTarget, settings = {}, logger = mainLogger, } = {}) {
         var _a, _b, _c, _d, _e, _f, _g, _h;
         logger = logger.extend(mainLogger);
         logger.log('Command "checkAndClose" is called with settings', settings);
@@ -50,8 +50,11 @@ function makeCheckAndClose({ eyes, target: defaultTarget, spec, signal, logger:
         });
         const uniqueRenderers = (0, uniquify_renderers_1.uniquifyRenderers)((_a = settings.renderers) !== null && _a !== void 0 ? _a : []);
         const ufgClient = await eyes.core.getUFGClient({
-            config: { ...eyes.test.ufgServer, eyesServerUrl: eyes.test.server.serverUrl, eyesApiKey: eyes.test.server.apiKey },
-            concurrency: uniqueRenderers.length || 5,
+            settings: {
+                ...eyes.test.ufgServer,
+                eyesServerUrl: eyes.test.eyesServer.eyesServerUrl,
+                apiKey: eyes.test.eyesServer.apiKey,
+            },
             logger,
         });
         let snapshots;
@@ -61,7 +64,9 @@ function makeCheckAndClose({ eyes, target: defaultTarget, spec, signal, logger:
         let regionToTarget;
         let scrollRootSelector;
         let selectorsToCalculate;
-        const driver = spec && (0, driver_1.isDriver)(target, spec) ? await (0, driver_1.makeDriver)({ spec, driver: target, logger }) : null;
+        const driver = spec && (0, driver_1.isDriver)(target, spec)
+            ? await (0, driver_1.makeDriver)({ spec, driver: target, reset: target === defaultTarget, logger })
+            : null;
         if (driver) {
             const environment = await driver.getEnvironment();
             if (uniqueRenderers.length === 0) {
@@ -108,7 +113,7 @@ function makeCheckAndClose({ eyes, target: defaultTarget, spec, signal, logger:
             const currentContext = driver.currentContext;
             const snapshotOptions = {
                 settings: {
-                    ...eyes.test.server,
+                    ...eyes.test.eyesServer,
                     waitBeforeCapture: settings.waitBeforeCapture,
                     disableBrowserFetching: settings.disableBrowserFetching,
                     layoutBreakpoints: settings.layoutBreakpoints,
@@ -135,7 +140,7 @@ function makeCheckAndClose({ eyes, target: defaultTarget, spec, signal, logger:
                 snapshots = await (0, take_dom_snapshots_1.takeDomSnapshots)({ driver, ...snapshotOptions, logger });
             }
             else {
-                const nmlClient = await eyes.core.getNMLClient({ config: eyes.test.server, driver, logger });
+                const nmlClient = await eyes.core.getNMLClient({ config: eyes.test.eyesServer, driver, logger });
                 snapshots = (await nmlClient.takeSnapshots({ ...snapshotOptions, logger }));
             }
             await currentContext.focus();
@@ -164,31 +169,30 @@ function makeCheckAndClose({ eyes, target: defaultTarget, spec, signal, logger:
                     throw new abort_error_1.AbortError('Command "check" was aborted before rendering');
                 }
                 const { cookies, ...snapshot } = snapshots[index];
-                const snapshotType = utils.types.has(snapshot, 'cdt') ? 'web' : 'native';
+                if (utils.types.has(renderer, 'iosDeviceInfo') || utils.types.has(renderer, 'androidDeviceInfo')) {
+                    renderer.type = utils.types.has(snapshot, 'cdt') ? 'web' : 'native';
+                }
                 const renderTargetPromise = ufgClient.createRenderTarget({
                     snapshot,
                     settings: {
                         renderer,
                         referer: snapshotUrl,
                         cookies,
-                        proxy: eyes.test.server.proxy,
+                        proxy: eyes.test.eyesServer.proxy,
                         autProxy: settings.autProxy,
                         userAgent,
                     },
                     logger: rendererLogger,
                 });
-                const [baseEyes] = await eyes.getBaseEyes({
-                    settings: { renderer, type: snapshotType, properties },
-                    logger,
-                });
+                const [baseEyes] = await eyes.getBaseEyes({ settings: { renderer, properties }, logger });
                 try {
                     if (signal === null || signal === void 0 ? void 0 : signal.aborted) {
                         rendererLogger.warn('Command "check" was aborted before rendering');
                         throw new abort_error_1.AbortError('Command "check" was aborted before rendering');
                     }
                     else if (!baseEyes.running) {
-                        rendererLogger.warn(`Renderer with id ${baseEyes.test.rendererId} was aborted during one of the previous steps`);
-                        throw new abort_error_1.AbortError(`Renderer with id "${baseEyes.test.rendererId}" was aborted during one of the previous steps`);
+                        rendererLogger.warn(`Render on environment with id "${baseEyes.test.renderEnvironmentId}" was aborted during one of the previous steps`);
+                        throw new abort_error_1.AbortError(`Render on environment with id "${baseEyes.test.renderEnvironmentId}" was aborted during one of the previous steps`);
                     }
                     const renderTarget = await renderTargetPromise;
                     if (signal === null || signal === void 0 ? void 0 : signal.aborted) {
@@ -196,8 +200,8 @@ function makeCheckAndClose({ eyes, target: defaultTarget, spec, signal, logger:
                         throw new abort_error_1.AbortError('Command "check" was aborted before rendering');
                     }
                     else if (!baseEyes.running) {
-                        rendererLogger.warn(`Renderer with id ${baseEyes.test.rendererId} was aborted during one of the previous steps`);
-                        throw new abort_error_1.AbortError(`Renderer with id "${baseEyes.test.rendererId}" was aborted during one of the previous steps`);
+                        rendererLogger.warn(`Render on environment with id "${baseEyes.test.renderEnvironmentId}" was aborted during one of the previous steps`);
+                        throw new abort_error_1.AbortError(`Render on environment with id "${baseEyes.test.renderEnvironmentId}" was aborted during one of the previous steps`);
                     }
                     const { renderId, selectorRegions, ...baseTarget } = await ufgClient.render({
                         target: renderTarget,
@@ -206,11 +210,11 @@ function makeCheckAndClose({ eyes, target: defaultTarget, spec, signal, logger:
                             region: regionToTarget,
                             scrollRootElement: scrollRootSelector,
                             selectorsToCalculate: selectorsToCalculate.flatMap(({ safeSelector }) => safeSelector !== null && safeSelector !== void 0 ? safeSelector : []),
-                            includeFullPageSize: Boolean(settings.pageId),
-                            type: snapshotType,
+                            includeFullPageSize: !!settings.pageId,
                             renderer,
-                            rendererUniqueId: baseEyes.test.rendererUniqueId,
-                            rendererId: baseEyes.test.rendererId,
+                            renderEnvironmentId: baseEyes.test.renderEnvironmentId,
+                            uploadUrl: baseEyes.test.uploadUrl,
+                            stitchingServiceUrl: baseEyes.test.stitchingServiceUrl,
                         },
                         signal,
                         logger: rendererLogger,
@@ -230,18 +234,18 @@ function makeCheckAndClose({ eyes, target: defaultTarget, spec, signal, logger:
                         throw new abort_error_1.AbortError('Command "check" was aborted after rendering');
                     }
                     else if (!baseEyes.running) {
-                        rendererLogger.warn(`Renderer with id ${baseEyes.test.rendererId} was aborted during one of the previous steps`);
-                        throw new abort_error_1.AbortError(`Renderer with id "${baseEyes.test.rendererId}" was aborted during one of the previous steps`);
+                        rendererLogger.warn(`Render on environment with id "${baseEyes.test.renderEnvironmentId}" was aborted during one of the previous steps`);
+                        throw new abort_error_1.AbortError(`Render on environment with id "${baseEyes.test.renderEnvironmentId}" was aborted during one of the previous steps`);
                     }
-                    const [result] = await baseEyes.checkAndClose({
+                    await baseEyes.checkAndClose({
                         target: { ...baseTarget, isTransformed: true },
                         settings: baseSettings,
                         logger: rendererLogger,
                     });
-                    return { ...result, userTestId: eyes.test.userTestId, eyes: baseEyes, renderer };
+                    return { eyes: baseEyes, renderer };
                 }
                 catch (error) {
-                    rendererLogger.error(`Renderer with id ${baseEyes.test.rendererId} failed due to an error`, error);
+                    rendererLogger.error(`Render on environment with id "${baseEyes.test.renderEnvironmentId}" failed due to an error`, error);
                     await baseEyes.abort({ logger: rendererLogger });
                     error.info = { eyes: baseEyes };
                     throw error;
@@ -253,7 +257,11 @@ function makeCheckAndClose({ eyes, target: defaultTarget, spec, signal, logger:
                 throw error;
             }
         });
-        return Promise.all(promises);
+        uniqueRenderers.forEach((renderer, index) => {
+            var _a;
+            const key = JSON.stringify(renderer);
+            storage.set(key, [...((_a = storage.get(key)) !== null && _a !== void 0 ? _a : []), promises[index]]);
+        });
     };
 }
 exports.makeCheckAndClose = makeCheckAndClose;

package/dist/ufg/check.js

@@ -36,8 +36,8 @@ const uniquify_renderers_1 = require("./utils/uniquify-renderers");
 const abort_error_1 = require("../errors/abort-error");
 const utils = __importStar(require("@applitools/utils"));
 const chalk_1 = __importDefault(require("chalk"));
-function makeCheck({ eyes, target: defaultTarget, spec, signal, logger: mainLogger, }) {
-    return async function check({ target = defaultTarget, settings = {}, logger = mainLogger, }) {
+function makeCheck({ eyes, storage, target: defaultTarget, spec, signal, logger: mainLogger, }) {
+    return async function check({ target = defaultTarget, settings = {}, logger = mainLogger, } = {}) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         logger = logger.extend(mainLogger);
         logger.log('Command "check" is called with settings', settings);
@@ -50,8 +50,11 @@ function makeCheck({ eyes, target: defaultTarget, spec, signal, logger: mainLogg
         });
         const uniqueRenderers = (0, uniquify_renderers_1.uniquifyRenderers)((_a = settings.renderers) !== null && _a !== void 0 ? _a : []);
         const ufgClient = await eyes.core.getUFGClient({
-            config: { ...eyes.test.ufgServer, eyesServerUrl: eyes.test.server.serverUrl, eyesApiKey: eyes.test.server.apiKey },
-            concurrency: uniqueRenderers.length || 5,
+            settings: {
+                ...eyes.test.ufgServer,
+                eyesServerUrl: eyes.test.eyesServer.eyesServerUrl,
+                apiKey: eyes.test.eyesServer.apiKey,
+            },
             logger,
         });
         let snapshots;
@@ -61,7 +64,9 @@ function makeCheck({ eyes, target: defaultTarget, spec, signal, logger: mainLogg
         let regionToTarget;
         let scrollRootSelector;
         let selectorsToCalculate;
-        const driver = spec && (0, driver_1.isDriver)(target, spec) ? await (0, driver_1.makeDriver)({ spec, driver: target, logger }) : null;
+        const driver = spec && (0, driver_1.isDriver)(target, spec)
+            ? await (0, driver_1.makeDriver)({ spec, driver: target, reset: target === defaultTarget, logger })
+            : null;
         if (driver) {
             const environment = await driver.getEnvironment();
             await driver.currentContext.setScrollingElement((_b = settings.scrollRootElement) !== null && _b !== void 0 ? _b : null);
@@ -109,7 +114,7 @@ function makeCheck({ eyes, target: defaultTarget, spec, signal, logger: mainLogg
             const currentContext = driver.currentContext;
             const snapshotOptions = {
                 settings: {
-                    ...eyes.test.server,
+                    ...eyes.test.eyesServer,
                     waitBeforeCapture: settings.waitBeforeCapture,
                     disableBrowserFetching: settings.disableBrowserFetching,
                     layoutBreakpoints: settings.layoutBreakpoints,
@@ -136,7 +141,7 @@ function makeCheck({ eyes, target: defaultTarget, spec, signal, logger: mainLogg
                 snapshots = await (0, take_dom_snapshots_1.takeDomSnapshots)({ driver, ...snapshotOptions, logger });
             }
             else {
-                const nmlClient = await eyes.core.getNMLClient({ config: eyes.test.server, driver, logger });
+                const nmlClient = await eyes.core.getNMLClient({ config: eyes.test.eyesServer, driver, logger });
                 snapshots = (await nmlClient.takeSnapshots({ ...snapshotOptions, logger }));
             }
             await currentContext.focus();
@@ -165,31 +170,30 @@ function makeCheck({ eyes, target: defaultTarget, spec, signal, logger: mainLogg
                     throw new abort_error_1.AbortError('Command "check" was aborted before rendering');
                 }
                 const { cookies, ...snapshot } = snapshots[index];
-                const snapshotType = utils.types.has(snapshot, 'cdt') ? 'web' : 'native';
+                if (utils.types.has(renderer, 'iosDeviceInfo') || utils.types.has(renderer, 'androidDeviceInfo')) {
+                    renderer.type = utils.types.has(snapshot, 'cdt') ? 'web' : 'native';
+                }
                 const renderTargetPromise = ufgClient.createRenderTarget({
                     snapshot,
                     settings: {
                         renderer,
                         referer: snapshotUrl,
                         cookies,
-                        proxy: eyes.test.server.proxy,
+                        proxy: eyes.test.eyesServer.proxy,
                         autProxy: settings.autProxy,
                         userAgent,
                     },
                     logger: rendererLogger,
                 });
-                const [baseEyes] = await eyes.getBaseEyes({
-                    settings: { renderer, type: snapshotType, properties },
-                    logger: rendererLogger,
-                });
+                const [baseEyes] = await eyes.getBaseEyes({ settings: { renderer, properties }, logger: rendererLogger });
                 try {
                     if (signal === null || signal === void 0 ? void 0 : signal.aborted) {
                         rendererLogger.warn('Command "check" was aborted before rendering');
                         throw new abort_error_1.AbortError('Command "check" was aborted before rendering');
                     }
                     else if (!baseEyes.running) {
-                        rendererLogger.warn(`Renderer with id ${baseEyes.test.rendererId} was aborted during one of the previous steps`);
-                        throw new abort_error_1.AbortError(`Renderer with id "${baseEyes.test.rendererId}" was aborted during one of the previous steps`);
+                        rendererLogger.warn(`Render on environment with id "${baseEyes.test.renderEnvironmentId}" was aborted during one of the previous steps`);
+                        throw new abort_error_1.AbortError(`Render on environment with id "${baseEyes.test.renderEnvironmentId}" was aborted during one of the previous steps`);
                     }
                     const renderTarget = await renderTargetPromise;
                     if (signal === null || signal === void 0 ? void 0 : signal.aborted) {
@@ -197,8 +201,8 @@ function makeCheck({ eyes, target: defaultTarget, spec, signal, logger: mainLogg
                         throw new abort_error_1.AbortError('Command "check" was aborted before rendering');
                     }
                     else if (!baseEyes.running) {
-                        rendererLogger.warn(`Renderer with id ${baseEyes.test.rendererId} was aborted during one of the previous steps`);
-                        throw new abort_error_1.AbortError(`Renderer with id "${baseEyes.test.rendererId}" was aborted during one of the previous steps`);
+                        rendererLogger.warn(`Render on environment with id "${baseEyes.test.renderEnvironmentId}" was aborted during one of the previous steps`);
+                        throw new abort_error_1.AbortError(`Render on environment with id "${baseEyes.test.renderEnvironmentId}" was aborted during one of the previous steps`);
                     }
                     const { renderId, selectorRegions, ...baseTarget } = await ufgClient.render({
                         target: renderTarget,
@@ -208,10 +212,10 @@ function makeCheck({ eyes, target: defaultTarget, spec, signal, logger: mainLogg
                             scrollRootElement: scrollRootSelector,
                             selectorsToCalculate: selectorsToCalculate.flatMap(({ safeSelector }) => safeSelector !== null && safeSelector !== void 0 ? safeSelector : []),
                             includeFullPageSize: Boolean(settings.pageId),
-                            type: snapshotType,
                             renderer,
-                            rendererUniqueId: baseEyes.test.rendererUniqueId,
-                            rendererId: baseEyes.test.rendererId,
+                            renderEnvironmentId: baseEyes.test.renderEnvironmentId,
+                            uploadUrl: baseEyes.test.uploadUrl,
+                            stitchingServiceUrl: baseEyes.test.stitchingServiceUrl,
                         },
                         signal,
                         logger: rendererLogger,
@@ -231,22 +235,22 @@ function makeCheck({ eyes, target: defaultTarget, spec, signal, logger: mainLogg
                         throw new abort_error_1.AbortError('Command "check" was aborted after rendering');
                     }
                     else if (!baseEyes.running) {
-                        rendererLogger.warn(`Renderer with id ${baseEyes.test.rendererId} was aborted during one of the previous steps`);
-                        throw new abort_error_1.AbortError(`Renderer with id "${baseEyes.test.rendererId}" was aborted during one of the previous steps`);
+                        rendererLogger.warn(`Render on environment with id "${baseEyes.test.renderEnvironmentId}" was aborted during one of the previous steps`);
+                        throw new abort_error_1.AbortError(`Render on environment with id "${baseEyes.test.renderEnvironmentId}" was aborted during one of the previous steps`);
                     }
-                    const [result] = await baseEyes.check({
+                    await baseEyes.check({
                         target: { ...baseTarget, isTransformed: true },
                         settings: baseSettings,
                         logger: rendererLogger,
                     });
                     if (!baseEyes.running) {
-                        rendererLogger.warn(`Renderer with id ${baseEyes.test.rendererId} was aborted during one of the previous steps`);
-                        throw new abort_error_1.AbortError(`Renderer with id "${baseEyes.test.rendererId}" was aborted during one of the previous steps`);
+                        rendererLogger.warn(`Render on environment with id "${baseEyes.test.renderEnvironmentId}" was aborted during one of the previous steps`);
+                        throw new abort_error_1.AbortError(`Render on environment with id "${baseEyes.test.renderEnvironmentId}" was aborted during one of the previous steps`);
                     }
-                    return { ...result, eyes: baseEyes, renderer };
+                    return { eyes: baseEyes, renderer };
                 }
                 catch (error) {
-                    rendererLogger.error(`Renderer with id ${baseEyes.test.rendererId} failed due to an error`, error);
+                    rendererLogger.error(`Render on environment with id "${baseEyes.test.renderEnvironmentId}" failed due to an error`, error);
                     if (baseEyes.running && !(signal === null || signal === void 0 ? void 0 : signal.aborted))
                         await baseEyes.abort({ logger: rendererLogger });
                     error.info = { eyes: baseEyes };
@@ -259,12 +263,12 @@ function makeCheck({ eyes, target: defaultTarget, spec, signal, logger: mainLogg
                 throw error;
             }
         });
-        return uniqueRenderers.map((renderer, index) => ({
-            asExpected: true,
-            userTestId: eyes.test.userTestId,
-            renderer,
-            promise: promises[index],
-        }));
+        return uniqueRenderers.map((renderer, index) => {
+            var _a;
+            const key = JSON.stringify(renderer);
+            storage.set(key, [...((_a = storage.get(key)) !== null && _a !== void 0 ? _a : []), promises[index]]);
+            return { asExpected: true, userTestId: eyes.test.userTestId, renderer };
+        });
     };
 }
 exports.makeCheck = makeCheck;

package/dist/ufg/get-base-eyes.js

@@ -26,28 +26,28 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeGetBaseEyes = void 0;
 const utils = __importStar(require("@applitools/utils"));
 function makeGetBaseEyes({ settings: defaultSettings, eyes, base, logger: mainLogger, }) {
-    const getBaseEyesWithCache = utils.general.cachify(getBaseEyes, ([options]) => options === null || options === void 0 ? void 0 : options.settings);
+    const getBaseEyesWithCache = utils.general.cachify(getBaseEyes, ([options]) => { var _a; return (_a = options === null || options === void 0 ? void 0 : options.settings) === null || _a === void 0 ? void 0 : _a.renderer; });
     if (base) {
-        base.forEach(baseEyes => getBaseEyesWithCache.setCachedValue(baseEyes.test.rendererInfo, Promise.resolve([baseEyes])));
+        base.forEach(baseEyes => getBaseEyesWithCache.setCachedValue(baseEyes.test.renderer, Promise.resolve([baseEyes])));
     }
     return getBaseEyesWithCache;
     async function getBaseEyes({ settings, logger = mainLogger, } = {}) {
-        var _a, _b;
         logger = logger.extend(mainLogger);
         logger.log(`Command "getBaseEyes" is called with settings`, settings);
         if (!settings)
             throw new Error('');
         const ufgClient = await eyes.core.getUFGClient({
-            config: { ...eyes.test.ufgServer },
+            settings: {
+                ...eyes.test.ufgServer,
+                eyesServerUrl: eyes.test.eyesServer.eyesServerUrl,
+                apiKey: eyes.test.eyesServer.apiKey,
+            },
             logger,
         });
-        const environment = await ufgClient.bookRenderer({ settings, logger });
-        let properties;
-        if (defaultSettings.properties || settings.properties) {
-            properties = ((_a = defaultSettings.properties) !== null && _a !== void 0 ? _a : []).concat((_b = settings.properties) !== null && _b !== void 0 ? _b : []);
-        }
+        const environment = await ufgClient.getRenderEnvironment({ settings, logger });
+        environment.properties = settings.properties;
         const baseEyes = await eyes.core.base.openEyes({
-            settings: { ...defaultSettings, environment: { ...defaultSettings.environment, ...environment }, properties },
+            settings: { ...defaultSettings, environment: { ...defaultSettings.environment, ...environment } },
             logger,
         });
         return [baseEyes];

package/dist/ufg/get-ufg-client.js

@@ -29,13 +29,19 @@ const utils = __importStar(require("@applitools/utils"));
 function makeGetUFGClient({ client, fetchConcurrency, logger: mainLogger }) {
     // we are caching by the server config, therefor if the user creates another Runner / manager with the same server config but different
     // fetchConcurrency, it will not take any affect.
-    const getUFGClientWithCache = utils.general.cachify(getUFGClient, ([options]) => client ? 'default' : [{ ...options.config, fetchConcurrency: undefined }]);
+    const getUFGClientWithCache = utils.general.cachify(getUFGClient, ([options]) => client ? 'default' : [{ ...options.settings, fetchConcurrency: undefined }]);
     if (client)
         getUFGClientWithCache.setCachedValue('default', Promise.resolve(client));
     return getUFGClientWithCache;
-    async function getUFGClient({ config, logger = mainLogger }) {
+    async function getUFGClient({ settings, logger = mainLogger }) {
         logger = logger.extend(mainLogger);
-        return (0, ufg_client_1.makeUFGClient)({ config: { ...config, fetchConcurrency }, logger });
+        const tunnelIds = utils.general.getEnvValue('FETCH_RESOURCE_FROM_TUNNEL', 'boolean')
+            ? utils.general.getEnvValue('TUNNEL_IDS')
+            : undefined;
+        return (0, ufg_client_1.makeUFGClient)({
+            settings: { ...settings, fetchConcurrency, tunnelIds },
+            logger,
+        });
     }
 }
 exports.makeGetUFGClient = makeGetUFGClient;

package/dist/ufg/open-eyes.js

@@ -64,8 +64,10 @@ function makeOpenEyes({ core, spec, logger: mainLogger }) {
                     userTestId: settings.userTestId,
                     batchId: (_a = settings.batch) === null || _a === void 0 ? void 0 : _a.id,
                     keepBatchOpen: settings.keepBatchOpen,
-                    server: account.server,
+                    eyesServer: account.eyesServer,
                     ufgServer: account.ufgServer,
+                    uploadUrl: account.uploadUrl,
+                    stitchingServiceUrl: account.stitchingServiceUrl,
                     account,
                 },
                 get running() {
@@ -73,24 +75,8 @@ function makeOpenEyes({ core, spec, logger: mainLogger }) {
                 },
                 getBaseEyes: (0, get_base_eyes_1.makeGetBaseEyes)({ settings, eyes, base, logger }),
                 // check with indexing and storage
-                check: utils.general.wrap((0, check_1.makeCheck)({ eyes, target: driver, spec, signal: controller.signal, logger }), async (check, options = {}) => {
-                    const results = await check(options);
-                    results.forEach(result => {
-                        var _a;
-                        const key = JSON.stringify(result.renderer);
-                        storage.set(key, [...((_a = storage.get(key)) !== null && _a !== void 0 ? _a : []), result.promise]);
-                    });
-                    return results;
-                }),
-                checkAndClose: utils.general.wrap((0, check_and_close_1.makeCheckAndClose)({ eyes, target: driver, spec, signal: controller.signal, logger }), async (checkAndClose, options = {}) => {
-                    const results = await checkAndClose(options);
-                    results.forEach(result => {
-                        var _a;
-                        const key = JSON.stringify(result.renderer);
-                        storage.set(key, [...((_a = storage.get(key)) !== null && _a !== void 0 ? _a : []), { eyes: result.eyes, renderer: result.renderer }]);
-                    });
-                    return results;
-                }),
+                check: (0, check_1.makeCheck)({ eyes, storage, target: driver, spec, signal: controller.signal, logger }),
+                checkAndClose: (0, check_and_close_1.makeCheckAndClose)({ eyes, storage, target: driver, spec, signal: controller.signal, logger }),
                 close: utils.general.wrap((0, close_1.makeClose)({ storage, target: driver, logger }), async (close, options) => {
                     if (!running)
                         return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/core",
-  "version": "3.6.2",
+  "version": "3.6.4",
   "homepage": "https://applitools.com",
   "bugs": {
     "url": "https://github.com/applitools/eyes.sdk.javascript1/issues"
@@ -68,42 +68,42 @@
     ]
   },
   "dependencies": {
-    "@applitools/core-base": "1.4.1",
+    "@applitools/core-base": "1.4.3",
     "@applitools/dom-capture": "11.2.2",
     "@applitools/dom-snapshot": "4.7.9",
-    "@applitools/driver": "1.13.1",
-    "@applitools/ec-client": "1.7.1",
-    "@applitools/logger": "2.0.5",
-    "@applitools/nml-client": "1.5.3",
-    "@applitools/req": "1.5.0",
-    "@applitools/screenshoter": "3.8.4",
+    "@applitools/driver": "1.13.3",
+    "@applitools/ec-client": "1.7.3",
+    "@applitools/logger": "2.0.7",
+    "@applitools/nml-client": "1.5.5",
+    "@applitools/req": "1.5.2",
+    "@applitools/screenshoter": "3.8.6",
     "@applitools/snippets": "2.4.21",
-    "@applitools/socket": "1.1.5",
-    "@applitools/spec-driver-webdriver": "1.0.38",
-    "@applitools/ufg-client": "1.5.0",
+    "@applitools/socket": "1.1.7",
+    "@applitools/spec-driver-webdriver": "1.0.40",
+    "@applitools/ufg-client": "1.5.2",
     "@applitools/utils": "1.5.0",
     "@types/ws": "8.5.5",
     "abort-controller": "3.0.0",
     "chalk": "4.1.2",
     "node-fetch": "2.6.7",
     "webdriver": "7.30.0",
-    "ws": "8.12.0",
-    "yargs": "^17.7.2"
+    "ws": "8.13.0",
+    "yargs": "17.7.2"
   },
   "devDependencies": {
-    "@applitools/bongo": "^5.0.4",
+    "@applitools/bongo": "^5.1.5",
     "@applitools/sdk-coverage-tests": "^3.1.0",
-    "@applitools/spec-driver-puppeteer": "^1.1.69",
-    "@applitools/spec-driver-selenium": "^1.5.52",
-    "@applitools/spec-driver-webdriverio": "^1.5.7",
+    "@applitools/spec-driver-puppeteer": "^1.1.71",
+    "@applitools/spec-driver-selenium": "^1.5.54",
+    "@applitools/spec-driver-webdriverio": "^1.5.9",
     "@applitools/test-server": "^1.2.2",
     "@applitools/test-utils": "^1.5.17",
-    "@applitools/tunnel-client": "^1.1.1",
+    "@applitools/tunnel-client": "^1.1.3",
     "@types/node": "^12.20.55",
     "@types/selenium-webdriver": "^4.1.2",
     "@types/yargs": "^17.0.22",
-    "chromedriver": "^114.0.1",
-    "nock": "^13.2.8",
+    "chromedriver": "^114.0.3",
+    "nock": "^13.3.2",
     "pkg": "^5.8.0",
     "png-async": "^0.9.4",
     "puppeteer": "^19.11.1",

package/types/automation/types.d.ts

@@ -58,7 +58,7 @@ export interface Eyes<TSpec extends SpecType> extends BaseCore.Eyes {
         target?: Target<TSpec>;
         settings?: CheckSettings<TSpec> & BaseCore.CloseSettings;
         logger?: Logger;
-    }): Promise<BaseCore.TestResult[]>;
+    }): Promise<void>;
 }
 export interface ScreenshotSettings<TSpec extends SpecType> extends BaseCore.ImageSettings<Region | ElementReference<TSpec>> {
     webview?: boolean | string;

package/types/check-and-close.d.ts

@@ -1,4 +1,4 @@
-import type { Target, DriverTarget, Eyes, Config, CheckSettings, CloseSettings, TestResult } from './types';
+import type { Target, DriverTarget, Eyes, Config, CheckSettings, CloseSettings } from './types';
 import { type Logger } from '@applitools/logger';
 import { type SpecType, type SpecDriver } from '@applitools/driver';
 type Options<TSpec extends SpecType, TType extends 'classic' | 'ufg'> = {
@@ -14,5 +14,5 @@ export declare function makeCheckAndClose<TSpec extends SpecType, TDefaultType e
     settings?: (CheckSettings<TSpec, TDefaultType> & CloseSettings<TDefaultType> & CheckSettings<TSpec, TType> & CloseSettings<TType>) | undefined;
     config?: (Config<TSpec, TDefaultType> & Config<TSpec, TType>) | undefined;
     logger?: Logger | undefined;
-}) => Promise<TestResult<TType>[]>;
+}) => Promise<void>;
 export {};

package/types/classic/check-and-close.d.ts

@@ -1,4 +1,4 @@
-import type { Target, DriverTarget, Eyes, CheckSettings, CloseSettings, TestResult } from './types';
+import type { Target, DriverTarget, Eyes, CheckSettings, CloseSettings } from './types';
 import type { CheckSettings as BaseCheckSettings } from '@applitools/core-base';
 import { type Logger } from '@applitools/logger';
 import { type SpecType, type SpecDriver } from '@applitools/driver';
@@ -15,5 +15,5 @@ export declare function makeCheckAndClose<TSpec extends SpecType>({ eyes, target
         retryTimeout?: number | undefined;
     } & CloseSettings) | undefined;
     logger?: Logger | undefined;
-}) => Promise<TestResult[]>;
+}) => Promise<void>;
 export {};

package/types/classic/types.d.ts

@@ -24,7 +24,7 @@ export interface Eyes<TSpec extends SpecType> extends AutomationCore.Eyes<TSpec>
         target?: AutomationCore.Target<TSpec>;
         settings?: CheckSettings<TSpec> & AutomationCore.CloseSettings;
         logger?: Logger;
-    }): Promise<AutomationCore.TestResult[]>;
+    }): Promise<void>;
 }
 export type OpenSettings = AutomationCore.OpenSettings & {
     keepPlatformNameAsIs?: boolean;

package/types/get-account-info.d.ts

@@ -0,0 +1,11 @@
+import type { Core, Account, EyesServerSettings } from './types';
+import { type Logger } from '@applitools/logger';
+type Options = {
+    core: Core<any>;
+    logger: Logger;
+};
+export declare function makeGetAccountInfo({ core, logger: mainLogger }: Options): ({ settings, logger, }: {
+    settings: EyesServerSettings;
+    logger?: Logger | undefined;
+}) => Promise<Account>;
+export {};

package/types/get-typed-eyes.d.ts

@@ -1,6 +1,6 @@
 import type { DriverTarget, TypedCore, TypedEyes, OpenSettings } from './types';
 import { type SpecType } from '@applitools/driver';
-import { type RendererSettings } from '@applitools/ufg-client';
+import { type RenderEnvironmentSettings } from '@applitools/ufg-client';
 import { type Logger } from '@applitools/logger';
 type Options<TSpec extends SpecType, TType extends 'classic' | 'ufg'> = {
     type: TType;
@@ -13,7 +13,7 @@ type Options<TSpec extends SpecType, TType extends 'classic' | 'ufg'> = {
 };
 export declare function makeGetTypedEyes<TSpec extends SpecType, TDefaultType extends 'classic' | 'ufg'>({ type: defaultType, settings: defaultSettings, target, cores, logger: mainLogger, }: Options<TSpec, TDefaultType>): <TType extends "classic" | "ufg" = TDefaultType>({ type, settings, logger, }?: {
     type?: TType | undefined;
-    settings?: RendererSettings[] | undefined;
+    settings?: RenderEnvironmentSettings[] | undefined;
     logger?: Logger | undefined;
 }) => Promise<TypedEyes<TSpec, TType>>;
 export {};

package/types/types.d.ts

@@ -80,7 +80,7 @@ export interface Eyes<TSpec extends SpecType, TDefaultType extends 'classic' | '
         settings?: Partial<CheckSettings<TSpec, TDefaultType> & CloseSettings<TDefaultType> & CheckSettings<TSpec, TType> & CloseSettings<TType>>;
         config?: Config<TSpec, TDefaultType> & Config<TSpec, TType>;
         logger?: Logger;
-    }): Promise<TestResult<TType>[]>;
+    }): Promise<void>;
     close(options?: {
         settings?: Partial<CloseSettings<TDefaultType>>;
         config?: Config<TSpec, TDefaultType>;

package/types/ufg/check-and-close.d.ts

@@ -1,20 +1,26 @@
 import type { Region } from '@applitools/utils';
-import type { DriverTarget, Target, Eyes, CheckSettings, TestResult, CloseSettings } from './types';
+import type { DriverTarget, Target, Eyes, CheckSettings, CloseSettings } from './types';
+import type { Eyes as BaseEyes } from '@applitools/core-base';
+import { type Renderer } from '@applitools/ufg-client';
 import { type AbortSignal } from 'abort-controller';
 import { type Logger } from '@applitools/logger';
 import { type SpecType, type SpecDriver } from '@applitools/driver';
 type Options<TSpec extends SpecType> = {
     eyes: Eyes<TSpec>;
+    storage: Map<string, Promise<{
+        renderer: Renderer;
+        eyes: BaseEyes;
+    }>[]>;
     target?: DriverTarget<TSpec>;
     spec?: SpecDriver<TSpec>;
     signal?: AbortSignal;
     logger: Logger;
 };
-export declare function makeCheckAndClose<TSpec extends SpecType>({ eyes, target: defaultTarget, spec, signal, logger: mainLogger, }: Options<TSpec>): ({ target, settings, logger, }: {
+export declare function makeCheckAndClose<TSpec extends SpecType>({ eyes, storage, target: defaultTarget, spec, signal, logger: mainLogger, }: Options<TSpec>): ({ target, settings, logger, }?: {
     target?: Target<TSpec> | undefined;
     settings?: (import("@applitools/core-base").CheckSettings<Region | import("@applitools/driver").ElementReference<TSpec>> & import("./types").ScreenshotSettings<TSpec> & {
-        renderers?: (import("@applitools/ufg-client").Renderer & {
-            properties?: import("@applitools/core-base/types").CustomProperty[] | undefined;
+        renderers?: (Renderer & {
+            properties?: import("@applitools/core-base").CustomProperty[] | undefined;
         })[] | undefined;
         hooks?: {
             beforeCaptureScreenshot: string;
@@ -31,5 +37,5 @@ export declare function makeCheckAndClose<TSpec extends SpecType>({ eyes, target
         }) | undefined;
     } & CloseSettings) | undefined;
     logger?: Logger | undefined;
-}) => Promise<TestResult[]>;
+}) => Promise<void>;
 export {};