@applitools/core 3.6.1 → 3.6.3

package/CHANGELOG.md

@@ -2,6 +2,75 @@
 
 ## Unreleased
 
+## [3.6.3](https://github.com/applitools/eyes.sdk.javascript1/compare/js/core@3.6.2...js/core@3.6.3) (2023-07-21)
+
+
+### Bug Fixes
+
+* improve performance by not resetting the environment ([#1779](https://github.com/applitools/eyes.sdk.javascript1/issues/1779)) ([8178978](https://github.com/applitools/eyes.sdk.javascript1/commit/8178978e9443e60f3e8b10693395e4c80cb9e02f))
+
+
+### Code Refactoring
+
+* ufg client ([#1780](https://github.com/applitools/eyes.sdk.javascript1/issues/1780)) ([d60cf16](https://github.com/applitools/eyes.sdk.javascript1/commit/d60cf1616741a96b152a1548760bb98116e5c3f9))
+
+
+### Dependencies
+
+* @applitools/spec-driver-puppeteer bumped to 1.1.70
+  #### Code Refactoring
+
+  * ufg client ([#1780](https://github.com/applitools/eyes.sdk.javascript1/issues/1780)) ([d60cf16](https://github.com/applitools/eyes.sdk.javascript1/commit/d60cf1616741a96b152a1548760bb98116e5c3f9))
+
+
+
+* @applitools/spec-driver-selenium bumped to 1.5.53
+  #### Code Refactoring
+
+  * ufg client ([#1780](https://github.com/applitools/eyes.sdk.javascript1/issues/1780)) ([d60cf16](https://github.com/applitools/eyes.sdk.javascript1/commit/d60cf1616741a96b152a1548760bb98116e5c3f9))
+
+
+
+* @applitools/spec-driver-webdriverio bumped to 1.5.8
+  #### Code Refactoring
+
+  * ufg client ([#1780](https://github.com/applitools/eyes.sdk.javascript1/issues/1780)) ([d60cf16](https://github.com/applitools/eyes.sdk.javascript1/commit/d60cf1616741a96b152a1548760bb98116e5c3f9))
+
+
+
+* @applitools/tunnel-client bumped to 1.1.2
+  #### Code Refactoring
+
+  * ufg client ([#1780](https://github.com/applitools/eyes.sdk.javascript1/issues/1780)) ([d60cf16](https://github.com/applitools/eyes.sdk.javascript1/commit/d60cf1616741a96b152a1548760bb98116e5c3f9))
+
+
+
+
+## [3.6.2](https://github.com/applitools/eyes.sdk.javascript1/compare/js/core@3.6.1...js/core@3.6.2) (2023-07-18)
+
+
+### Dependencies
+
+* @applitools/req bumped from 1.4.0 to 1.5.0
+  #### Features
+
+  * support retries on stuck requests ([be673bb](https://github.com/applitools/eyes.sdk.javascript1/commit/be673bb505c9b21d6aea37d86e88513e95e3cb02))
+* @applitools/ufg-client bumped from 1.4.1 to 1.5.0
+  #### Features
+
+  * support retries on stuck requests ([be673bb](https://github.com/applitools/eyes.sdk.javascript1/commit/be673bb505c9b21d6aea37d86e88513e95e3cb02))
+
+
+
+* @applitools/core-base bumped from 1.4.0 to 1.4.1
+
+* @applitools/ec-client bumped from 1.7.0 to 1.7.1
+
+* @applitools/tunnel-client bumped from 1.1.0 to 1.1.1
+
+* @applitools/nml-client bumped from 1.5.2 to 1.5.3
+
+
 ## [3.6.1](https://github.com/applitools/eyes.sdk.javascript1/compare/js/core@3.6.0...js/core@3.6.1) (2023-07-13)
 
 

package/dist/check-and-close.js

@@ -31,7 +31,9 @@ function makeCheckAndClose({ type: defaultType = 'classic', eyes, target: defaul
         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, logger }) : null;
+        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,
@@ -41,8 +43,7 @@ function makeCheckAndClose({ type: defaultType = 'classic', eyes, target: defaul
             })),
             logger,
         });
-        const results = await typedEyes.checkAndClose({ target: driver !== null && driver !== void 0 ? driver : target, settings, logger });
-        return results;
+        await typedEyes.checkAndClose({ target: driver !== null && driver !== void 0 ? driver : target, settings, logger });
     };
 }
 exports.makeCheckAndClose = makeCheckAndClose;

package/dist/check.js

@@ -45,7 +45,7 @@ function makeCheck({ type: defaultType = 'classic', eyes, target: defaultTarget,
         (_e = settings.matchLevel) !== null && _e !== void 0 ? _e : (settings.matchLevel = 'Strict');
         (_f = settings.ignoreCaret) !== null && _f !== void 0 ? _f : (settings.ignoreCaret = true);
         (_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.server.proxy);
+        (_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);
         settings.lazyLoad = settings.lazyLoad === true ? {} : settings.lazyLoad;
@@ -59,7 +59,9 @@ function makeCheck({ type: defaultType = 'classic', eyes, target: defaultTarget,
         if (settings.matchLevel === 'Content') {
             logger.console.log(chalk_1.default.yellow(`The "Content" match level value has been deprecated, use "IgnoreColors" instead.`));
         }
-        const driver = (0, driver_1.isDriver)(target, spec) ? await (0, driver_1.makeDriver)({ spec, driver: target, logger }) : null;
+        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,

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

@@ -40,9 +40,10 @@ function makeCheckAndClose({ eyes, target: defaultTarget, spec, logger: mainLogg
         const baseEyes = await eyes.getBaseEyes({ logger });
         if (!(0, driver_1.isDriver)(target, spec)) {
             const baseSettings = settings;
-            return (await Promise.all(baseEyes.map(baseEyes => baseEyes.checkAndClose({ target, settings: baseSettings, logger })))).flat();
+            await Promise.all(baseEyes.map(baseEyes => baseEyes.checkAndClose({ target, settings: baseSettings, logger })));
+            return;
         }
-        const driver = await (0, driver_1.makeDriver)({ spec, driver: target, logger });
+        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)({
@@ -76,7 +77,7 @@ function makeCheckAndClose({ eyes, target: defaultTarget, spec, logger: mainLogg
                     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.server.proxy }, logger }).catch(() => undefined);
+                baseTarget.dom = await (0, take_dom_capture_1.takeDomCapture)({ driver, settings: { proxy: eyes.test.eyesServer.proxy }, logger }).catch(() => undefined);
             }
             if (settings.pageId) {
                 const scrollingElement = await driver.mainContext.getScrollingElement();
@@ -89,7 +90,7 @@ function makeCheckAndClose({ eyes, target: defaultTarget, spec, logger: mainLogg
             await screenshot.restoreState();
         }
         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 });
             const screenshot = await nmlClient.takeScreenshot({
                 settings: { name: settings.name, waitBeforeCapture: settings.waitBeforeCapture, fully: settings.fully },
                 logger,
@@ -97,7 +98,7 @@ function makeCheckAndClose({ eyes, target: defaultTarget, spec, logger: mainLogg
             baseTarget = { image: screenshot.image, isTransformed: true };
             baseSettings = getBaseCheckSettings({ calculatedRegions: [] });
         }
-        return (await Promise.all(baseEyes.map(baseEyes => baseEyes.checkAndClose({ target: baseTarget, settings: baseSettings, logger })))).flat();
+        await Promise.all(baseEyes.map(baseEyes => baseEyes.checkAndClose({ target: baseTarget, settings: baseSettings, logger })));
     };
 }
 exports.makeCheckAndClose = makeCheckAndClose;

package/dist/classic/check.js

@@ -41,7 +41,7 @@ function makeCheck({ eyes, target: defaultTarget, spec, logger: mainLogger, }) {
         if (!(0, driver_1.isDriver)(target, spec)) {
             return (await Promise.all(baseEyes.map(baseEyes => baseEyes.check({ target, settings: settings, logger })))).flat();
         }
-        const driver = await (0, driver_1.makeDriver)({ spec, driver: target, logger });
+        const driver = await (0, driver_1.makeDriver)({ spec, driver: target, reset: target === defaultTarget, logger });
         const environment = await driver.getEnvironment();
         await driver.currentContext.setScrollingElement((_a = settings.scrollRootElement) !== null && _a !== void 0 ? _a : null);
         if (settings.lazyLoad && environment.isWeb) {
@@ -83,7 +83,7 @@ function makeCheck({ eyes, target: defaultTarget, spec, logger: mainLogger, }) {
                         await ((_c = screenshot.scrollingElement) === null || _c === void 0 ? void 0 : _c.setAttribute('data-applitools-scroll', 'true'));
                     else
                         await ((_d = screenshot.element) === null || _d === void 0 ? void 0 : _d.setAttribute('data-applitools-scroll', 'true'));
-                    baseTarget.dom = await (0, take_dom_capture_1.takeDomCapture)({ driver, settings: { proxy: eyes.test.server.proxy }, logger }).catch(() => undefined);
+                    baseTarget.dom = await (0, take_dom_capture_1.takeDomCapture)({ driver, settings: { proxy: eyes.test.eyesServer.proxy }, logger }).catch(() => undefined);
                 }
                 if (settings.pageId) {
                     const scrollingElement = await driver.mainContext.getScrollingElement();
@@ -96,7 +96,7 @@ function makeCheck({ eyes, target: defaultTarget, spec, logger: mainLogger, }) {
                 await screenshot.restoreState();
             }
             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 });
                 const screenshot = await nmlClient.takeScreenshot({
                     settings: { name: settings.name, waitBeforeCapture: settings.waitBeforeCapture, fully: settings.fully },
                     logger,

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

@@ -70,7 +70,7 @@ async function takeDomCapture({ driver, settings, logger, }) {
         logger.log(`Request to download css will be sent to the address "[GET]${url}"`);
         try {
             const response = await (0, req_1.req)(url, {
-                timeout: (_a = settings === null || settings === void 0 ? void 0 : settings.fetchTimeout) !== null && _a !== void 0 ? _a : 60000,
+                connectionTimeout: (_a = settings === null || settings === void 0 ? void 0 : settings.fetchTimeout) !== null && _a !== void 0 ? _a : 60000,
                 retry: {
                     limit: 1,
                     validate: ({ response, error }) => !!error || !response.ok,

package/dist/close-batch.js

@@ -29,9 +29,9 @@ function makeCloseBatch({ core, logger: mainLogger }) {
     return async function closeBatch({ settings, logger = mainLogger, }) {
         logger = logger.extend(mainLogger, { tags: [`close-batch-${utils.general.shortid()}`] });
         (utils.types.isArray(settings) ? settings : [settings]).forEach(settings => {
-            var _a, _b, _c;
-            (_a = settings.serverUrl) !== null && _a !== void 0 ? _a : (settings.serverUrl = (_b = utils.general.getEnvValue('SERVER_URL')) !== null && _b !== void 0 ? _b : 'https://eyesapi.applitools.com');
-            (_c = settings.apiKey) !== null && _c !== void 0 ? _c : (settings.apiKey = utils.general.getEnvValue('API_KEY'));
+            var _a, _b, _c, _d, _e;
+            (_a = settings.eyesServerUrl) !== null && _a !== void 0 ? _a : (settings.eyesServerUrl = (_d = (_c = (_b = settings.serverUrl) !== null && _b !== void 0 ? _b : utils.general.getEnvValue('EYES_SERVER_URL')) !== null && _c !== void 0 ? _c : utils.general.getEnvValue('SERVER_URL')) !== null && _d !== void 0 ? _d : 'https://eyesapi.applitools.com');
+            (_e = settings.apiKey) !== null && _e !== void 0 ? _e : (settings.apiKey = utils.general.getEnvValue('API_KEY'));
         });
         await core.base.closeBatch({ settings, logger });
     };

package/dist/core.js

@@ -28,7 +28,9 @@ const logger_1 = require("@applitools/logger");
 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 get_account_info_1 = require("./get-account-info");
 const get_nml_client_1 = require("./automation/get-nml-client");
+const get_ec_client_1 = require("./get-ec-client");
 const locate_1 = require("./locate");
 const locate_text_1 = require("./locate-text");
 const extract_text_1 = require("./extract-text");
@@ -36,7 +38,6 @@ const open_eyes_1 = require("./open-eyes");
 const make_manager_1 = require("./make-manager");
 const close_batch_1 = require("./close-batch");
 const delete_test_1 = require("./delete-test");
-const get_ec_client_1 = require("./get-ec-client");
 const utils = __importStar(require("@applitools/utils"));
 function makeCore({ spec, concurrency, base: defaultBase, agentId = 'core', cwd = process.cwd(), logger: defaultLogger, } = {}) {
     const logger = (0, logger_1.makeLogger)({ logger: defaultLogger, format: { label: 'core' } });
@@ -49,6 +50,7 @@ function makeCore({ spec, concurrency, base: defaultBase, agentId = 'core', cwd
             setViewportSize: spec && (0, set_viewport_size_1.makeSetViewportSize)({ spec, logger }),
             getNMLClient: (0, get_nml_client_1.makeGetNMLClient)({ logger }),
             getECClient: (0, get_ec_client_1.makeGetECClient)({ logger }),
+            getAccountInfo: (0, get_account_info_1.makeGetAccountInfo)({ core, logger }),
             makeManager: (0, make_manager_1.makeMakeManager)({ spec, concurrency, core, base: defaultBase, agentId, logger }),
             locate: (0, locate_1.makeLocate)({ spec, core, logger }),
             locateText: (0, locate_text_1.makeLocateText)({ spec, core, logger }),

package/dist/delete-test.js

@@ -29,9 +29,9 @@ function makeDeleteTest({ core, logger: mainLogger }) {
     return async function deleteTest({ settings, logger = mainLogger, }) {
         logger = logger.extend(mainLogger, { tags: [`delete-test-${utils.general.shortid()}`] });
         (utils.types.isArray(settings) ? settings : [settings]).forEach(settings => {
-            var _a, _b, _c;
-            (_a = settings.serverUrl) !== null && _a !== void 0 ? _a : (settings.serverUrl = (_b = utils.general.getEnvValue('SERVER_URL')) !== null && _b !== void 0 ? _b : 'https://eyesapi.applitools.com');
-            (_c = settings.apiKey) !== null && _c !== void 0 ? _c : (settings.apiKey = utils.general.getEnvValue('API_KEY'));
+            var _a, _b, _c, _d, _e;
+            (_a = settings.eyesServerUrl) !== null && _a !== void 0 ? _a : (settings.eyesServerUrl = (_d = (_c = (_b = settings.serverUrl) !== null && _b !== void 0 ? _b : utils.general.getEnvValue('EYES_SERVER_URL')) !== null && _c !== void 0 ? _c : utils.general.getEnvValue('SERVER_URL')) !== null && _d !== void 0 ? _d : 'https://eyesapi.applitools.com');
+            (_e = settings.apiKey) !== null && _e !== void 0 ? _e : (settings.apiKey = utils.general.getEnvValue('API_KEY'));
         });
         await core.base.deleteTest({ settings, logger });
     };

package/dist/extract-text.js

@@ -31,11 +31,11 @@ function makeExtractText({ spec, core, logger: mainLogger }) {
         logger = logger.extend(mainLogger, { tags: [`extract-text-${utils.general.shortid()}`] });
         settings = utils.types.isArray(settings) ? settings : [settings];
         settings = settings.map(settings => {
-            var _a, _b, _c, _d;
+            var _a, _b, _c, _d, _e, _f;
             settings = { ...config === null || config === void 0 ? void 0 : config.open, ...config === null || config === void 0 ? void 0 : config.screenshot, ...settings };
             (_a = settings.userCommandId) !== null && _a !== void 0 ? _a : (settings.userCommandId = `extract-text--${utils.general.guid()}`);
-            (_b = settings.serverUrl) !== null && _b !== void 0 ? _b : (settings.serverUrl = (_c = utils.general.getEnvValue('SERVER_URL')) !== null && _c !== void 0 ? _c : 'https://eyesapi.applitools.com');
-            (_d = settings.apiKey) !== null && _d !== void 0 ? _d : (settings.apiKey = utils.general.getEnvValue('API_KEY'));
+            (_b = settings.eyesServerUrl) !== null && _b !== void 0 ? _b : (settings.eyesServerUrl = (_e = (_d = (_c = settings.serverUrl) !== null && _c !== void 0 ? _c : utils.general.getEnvValue('EYES_SERVER_URL')) !== null && _d !== void 0 ? _d : utils.general.getEnvValue('SERVER_URL')) !== null && _e !== void 0 ? _e : 'https://eyesapi.applitools.com');
+            (_f = settings.apiKey) !== null && _f !== void 0 ? _f : (settings.apiKey = utils.general.getEnvValue('API_KEY'));
             return settings;
         });
         const classicCore = (0, core_1.makeCore)({ spec, base: core.base, logger });

package/dist/get-account-info.js

@@ -0,0 +1,37 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeGetAccountInfo = void 0;
+const utils = __importStar(require("@applitools/utils"));
+function makeGetAccountInfo({ core, logger: mainLogger }) {
+    return async function getAccountInfo({ settings, logger = mainLogger, }) {
+        var _a, _b, _c, _d, _e;
+        logger = logger.extend(mainLogger, { tags: [`get-account-info-${utils.general.shortid()}`] });
+        (_a = settings.eyesServerUrl) !== null && _a !== void 0 ? _a : (settings.eyesServerUrl = (_d = (_c = (_b = settings.serverUrl) !== null && _b !== void 0 ? _b : utils.general.getEnvValue('EYES_SERVER_URL')) !== null && _c !== void 0 ? _c : utils.general.getEnvValue('SERVER_URL')) !== null && _d !== void 0 ? _d : 'https://eyesapi.applitools.com');
+        (_e = settings.apiKey) !== null && _e !== void 0 ? _e : (settings.apiKey = utils.general.getEnvValue('API_KEY'));
+        return core.base.getAccountInfo({ settings, logger });
+    };
+}
+exports.makeGetAccountInfo = makeGetAccountInfo;

package/dist/get-manager-results.js

@@ -31,7 +31,7 @@ const utils = __importStar(require("@applitools/utils"));
 function makeGetManagerResults({ core, storage, logger: mainLogger, }) {
     return async function getManagerResults({ settings, logger = mainLogger, } = {}) {
         var _a, _b, _c;
-        logger = logger.extend(mainLogger, { tags: [`get-eyes-manager-${utils.general.shortid()}`] });
+        logger = logger.extend(mainLogger, { tags: [`get-manager-results-${utils.general.shortid()}`] });
         let containers = await storage.reduce(async (promise, eyes) => {
             try {
                 const results = await eyes.getResults({ settings: { ...settings, throwErr: false }, logger });
@@ -59,7 +59,7 @@ function makeGetManagerResults({ core, storage, logger: mainLogger, }) {
                     if (container.result) {
                         await core.deleteTest({
                             settings: {
-                                ...container.result.server,
+                                ...container.result.eyesServer,
                                 testId: container.result.id,
                                 batchId: container.result.batchId,
                                 secretToken: container.result.secretToken,
@@ -72,8 +72,8 @@ function makeGetManagerResults({ core, storage, logger: mainLogger, }) {
         }
         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;
+                const settings = { ...eyes.test.eyesServer, batchId: eyes.test.batchId };
+                batches[`${settings.eyesServerUrl}:${settings.apiKey}:${settings.batchId}`] = settings;
             }
             return batches;
         }, {});

package/dist/locate-text.js

@@ -28,11 +28,11 @@ const core_1 = require("./classic/core");
 const utils = __importStar(require("@applitools/utils"));
 function makeLocateText({ spec, core, logger: mainLogger }) {
     return async function locateText({ target, settings, config, logger = mainLogger, }) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e;
         logger = logger.extend(mainLogger, { tags: [`locate-text-${utils.general.shortid()}`] });
         settings = { ...config === null || config === void 0 ? void 0 : config.open, ...config === null || config === void 0 ? void 0 : config.screenshot, ...settings };
-        (_a = settings.serverUrl) !== null && _a !== void 0 ? _a : (settings.serverUrl = (_b = utils.general.getEnvValue('SERVER_URL')) !== null && _b !== void 0 ? _b : 'https://eyesapi.applitools.com');
-        (_c = settings.apiKey) !== null && _c !== void 0 ? _c : (settings.apiKey = utils.general.getEnvValue('API_KEY'));
+        (_a = settings.eyesServerUrl) !== null && _a !== void 0 ? _a : (settings.eyesServerUrl = (_d = (_c = (_b = settings.serverUrl) !== null && _b !== void 0 ? _b : utils.general.getEnvValue('EYES_SERVER_URL')) !== null && _c !== void 0 ? _c : utils.general.getEnvValue('SERVER_URL')) !== null && _d !== void 0 ? _d : 'https://eyesapi.applitools.com');
+        (_e = settings.apiKey) !== null && _e !== void 0 ? _e : (settings.apiKey = utils.general.getEnvValue('API_KEY'));
         const classicCore = (0, core_1.makeCore)({ spec, base: core.base, logger });
         const results = await classicCore.locateText({ target, settings, logger });
         return results;

package/dist/locate.js

@@ -28,11 +28,11 @@ const core_1 = require("./classic/core");
 const utils = __importStar(require("@applitools/utils"));
 function makeLocate({ spec, core, logger: mainLogger }) {
     return async function locate({ target, settings, config, logger = mainLogger, }) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e;
         logger = logger.extend(mainLogger, { tags: [`locate-${utils.general.shortid()}`] });
         settings = { ...config === null || config === void 0 ? void 0 : config.open, ...config === null || config === void 0 ? void 0 : config.screenshot, ...settings };
-        (_a = settings.serverUrl) !== null && _a !== void 0 ? _a : (settings.serverUrl = (_b = utils.general.getEnvValue('SERVER_URL')) !== null && _b !== void 0 ? _b : 'https://eyesapi.applitools.com');
-        (_c = settings.apiKey) !== null && _c !== void 0 ? _c : (settings.apiKey = utils.general.getEnvValue('API_KEY'));
+        (_a = settings.eyesServerUrl) !== null && _a !== void 0 ? _a : (settings.eyesServerUrl = (_d = (_c = (_b = settings.serverUrl) !== null && _b !== void 0 ? _b : utils.general.getEnvValue('EYES_SERVER_URL')) !== null && _c !== void 0 ? _c : utils.general.getEnvValue('SERVER_URL')) !== null && _d !== void 0 ? _d : 'https://eyesapi.applitools.com');
+        (_e = settings.apiKey) !== null && _e !== void 0 ? _e : (settings.apiKey = utils.general.getEnvValue('API_KEY'));
         const classicCore = (0, core_1.makeCore)({ spec, base: core.base, logger });
         const results = await classicCore.locate({ target, settings, logger });
         return results;

package/dist/open-eyes.js

@@ -36,29 +36,29 @@ 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: mainLogger, }) {
     return async function openEyes({ type = defaultType, settings, config, target, logger = mainLogger, }) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
-        var _v, _w, _x, _y;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w;
+        var _x, _y, _z, _0;
         logger = logger.extend(mainLogger, { tags: [`eyes-${type}-${utils.general.shortid()}`] });
         settings = { ...config === null || config === void 0 ? void 0 : config.open, ...settings };
         (_a = settings.userTestId) !== null && _a !== void 0 ? _a : (settings.userTestId = `${settings.testName}--${utils.general.guid()}`);
-        (_b = settings.serverUrl) !== null && _b !== void 0 ? _b : (settings.serverUrl = (_c = utils.general.getEnvValue('SERVER_URL')) !== null && _c !== void 0 ? _c : 'https://eyesapi.applitools.com');
-        (_d = settings.apiKey) !== null && _d !== void 0 ? _d : (settings.apiKey = utils.general.getEnvValue('API_KEY'));
+        (_b = settings.eyesServerUrl) !== null && _b !== void 0 ? _b : (settings.eyesServerUrl = (_e = (_d = (_c = settings.serverUrl) !== null && _c !== void 0 ? _c : utils.general.getEnvValue('EYES_SERVER_URL')) !== null && _d !== void 0 ? _d : utils.general.getEnvValue('SERVER_URL')) !== null && _e !== void 0 ? _e : 'https://eyesapi.applitools.com');
+        (_f = settings.apiKey) !== null && _f !== void 0 ? _f : (settings.apiKey = utils.general.getEnvValue('API_KEY'));
+        (_g = settings.useDnsCache) !== null && _g !== void 0 ? _g : (settings.useDnsCache = utils.general.getEnvValue('USE_DNS_CACHE', 'boolean'));
         settings.batch = { ...batch, ...settings.batch };
-        (_e = (_v = settings.batch).id) !== null && _e !== void 0 ? _e : (_v.id = (_f = utils.general.getEnvValue('BATCH_ID')) !== null && _f !== void 0 ? _f : `generated-${utils.general.guid()}`);
-        (_g = (_w = settings.batch).name) !== null && _g !== void 0 ? _g : (_w.name = utils.general.getEnvValue('BATCH_NAME'));
-        (_h = (_x = settings.batch).sequenceName) !== null && _h !== void 0 ? _h : (_x.sequenceName = utils.general.getEnvValue('BATCH_SEQUENCE'));
-        (_j = (_y = settings.batch).notifyOnCompletion) !== null && _j !== void 0 ? _j : (_y.notifyOnCompletion = utils.general.getEnvValue('BATCH_NOTIFY', 'boolean'));
-        (_k = settings.keepBatchOpen) !== null && _k !== void 0 ? _k : (settings.keepBatchOpen = utils.general.getEnvValue('DONT_CLOSE_BATCHES', 'boolean'));
-        (_l = settings.branchName) !== null && _l !== void 0 ? _l : (settings.branchName = utils.general.getEnvValue('BRANCH'));
-        (_m = settings.parentBranchName) !== null && _m !== void 0 ? _m : (settings.parentBranchName = utils.general.getEnvValue('PARENT_BRANCH'));
-        (_o = settings.baselineBranchName) !== null && _o !== void 0 ? _o : (settings.baselineBranchName = utils.general.getEnvValue('BASELINE_BRANCH'));
-        (_p = settings.ignoreBaseline) !== null && _p !== void 0 ? _p : (settings.ignoreBaseline = false);
-        (_q = settings.compareWithParentBranch) !== null && _q !== void 0 ? _q : (settings.compareWithParentBranch = false);
-        (_r = settings.useDnsCache) !== null && _r !== void 0 ? _r : (settings.useDnsCache = utils.general.getEnvValue('USE_DNS_CACHE', 'boolean'));
+        (_h = (_x = settings.batch).id) !== null && _h !== void 0 ? _h : (_x.id = (_j = utils.general.getEnvValue('BATCH_ID')) !== null && _j !== void 0 ? _j : `generated-${utils.general.guid()}`);
+        (_k = (_y = settings.batch).name) !== null && _k !== void 0 ? _k : (_y.name = utils.general.getEnvValue('BATCH_NAME'));
+        (_l = (_z = settings.batch).sequenceName) !== null && _l !== void 0 ? _l : (_z.sequenceName = utils.general.getEnvValue('BATCH_SEQUENCE'));
+        (_m = (_0 = settings.batch).notifyOnCompletion) !== null && _m !== void 0 ? _m : (_0.notifyOnCompletion = utils.general.getEnvValue('BATCH_NOTIFY', 'boolean'));
+        (_o = settings.keepBatchOpen) !== null && _o !== void 0 ? _o : (settings.keepBatchOpen = utils.general.getEnvValue('DONT_CLOSE_BATCHES', 'boolean'));
+        (_p = settings.branchName) !== null && _p !== void 0 ? _p : (settings.branchName = utils.general.getEnvValue('BRANCH'));
+        (_q = settings.parentBranchName) !== null && _q !== void 0 ? _q : (settings.parentBranchName = utils.general.getEnvValue('PARENT_BRANCH'));
+        (_r = settings.baselineBranchName) !== null && _r !== void 0 ? _r : (settings.baselineBranchName = utils.general.getEnvValue('BASELINE_BRANCH'));
+        (_s = settings.ignoreBaseline) !== null && _s !== void 0 ? _s : (settings.ignoreBaseline = false);
+        (_t = settings.compareWithParentBranch) !== null && _t !== void 0 ? _t : (settings.compareWithParentBranch = false);
         const driver = target && (await (0, driver_1.makeDriver)({ spec, driver: target, logger, customConfig: settings }));
         core.logEvent({
             settings: {
-                serverUrl: settings.serverUrl,
+                eyesServerUrl: settings.eyesServerUrl,
                 apiKey: settings.apiKey,
                 proxy: settings.proxy,
                 agentId: settings.agentId,
@@ -67,7 +67,7 @@ function makeOpenEyes({ type: defaultType = 'classic', concurrency, batch, core,
                 event: {
                     type: 'runnerStarted',
                     testConcurrency: concurrency,
-                    concurrentRendersPerTest: (_u = (_t = (_s = config === null || config === void 0 ? void 0 : config.check) === null || _s === void 0 ? void 0 : _s.renderers) === null || _t === void 0 ? void 0 : _t.length) !== null && _u !== void 0 ? _u : 1,
+                    concurrentRendersPerTest: (_w = (_v = (_u = config === null || config === void 0 ? void 0 : config.check) === null || _u === void 0 ? void 0 : _u.renderers) === null || _v === void 0 ? void 0 : _v.length) !== null && _w !== void 0 ? _w : 1,
                     node: { version: process.version, platform: process.platform, arch: process.arch },
                     driverUrl: await (driver === null || driver === void 0 ? void 0 : driver.getDriverUrl()),
                     extractedCIProvider: (0, extract_ci_provider_1.extractCIProvider)(),

package/dist/troubleshoot/ufg.js

@@ -91,7 +91,7 @@ exports.default = {
     testServer: async () => {
         const url = new URL(UFG_PUT_RESOURCE_URL);
         const requests = (0, ufg_client_1.makeUFGRequests)({
-            config: { serverUrl: url.origin, accessToken: await accessTokenPromise, uploadUrl: '', stitchingServiceUrl: '' },
+            settings: { ufgServerUrl: url.origin, accessToken: await accessTokenPromise },
             logger: (0, logger_1.makeLogger)(),
         });
         await requests.uploadResource({ resource });

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.1",
+  "version": "3.6.3",
   "homepage": "https://applitools.com",
   "bugs": {
     "url": "https://github.com/applitools/eyes.sdk.javascript1/issues"
@@ -68,42 +68,42 @@
     ]
   },
   "dependencies": {
-    "@applitools/core-base": "1.4.0",
+    "@applitools/core-base": "1.4.2",
     "@applitools/dom-capture": "11.2.2",
     "@applitools/dom-snapshot": "4.7.9",
-    "@applitools/driver": "1.13.1",
-    "@applitools/ec-client": "1.7.0",
-    "@applitools/logger": "2.0.5",
-    "@applitools/nml-client": "1.5.2",
-    "@applitools/req": "1.4.0",
-    "@applitools/screenshoter": "3.8.4",
-    "@applitools/snippets": "2.4.21",
-    "@applitools/socket": "1.1.5",
-    "@applitools/spec-driver-webdriver": "1.0.38",
-    "@applitools/ufg-client": "1.4.1",
-    "@applitools/utils": "1.5.0",
+    "@applitools/driver": "1.13.2",
+    "@applitools/ec-client": "1.7.2",
+    "@applitools/logger": "2.0.6",
+    "@applitools/nml-client": "1.5.4",
+    "@applitools/req": "1.5.1",
+    "@applitools/screenshoter": "3.8.5",
+    "@applitools/snippets": "",
+    "@applitools/socket": "1.1.6",
+    "@applitools/spec-driver-webdriver": "1.0.39",
+    "@applitools/ufg-client": "1.5.1",
+    "@applitools/utils": "",
     "@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.4",
     "@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.70",
+    "@applitools/spec-driver-selenium": "^1.5.53",
+    "@applitools/spec-driver-webdriverio": "^1.5.8",
     "@applitools/test-server": "^1.2.2",
     "@applitools/test-utils": "^1.5.17",
-    "@applitools/tunnel-client": "^1.1.0",
+    "@applitools/tunnel-client": "^1.1.2",
     "@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 {};

package/types/ufg/check.d.ts

@@ -1,15 +1,21 @@
 import type { DriverTarget, Target, Eyes, CheckSettings, CheckResult } 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 makeCheck<TSpec extends SpecType>({ eyes, target: defaultTarget, spec, signal, logger: mainLogger, }: Options<TSpec>): ({ target, settings, logger, }: {
+export declare function makeCheck<TSpec extends SpecType>({ eyes, storage, target: defaultTarget, spec, signal, logger: mainLogger, }: Options<TSpec>): ({ target, settings, logger, }?: {
     settings?: CheckSettings<TSpec> | undefined;
     target?: Target<TSpec> | undefined;
     logger?: Logger | undefined;

package/types/ufg/get-ufg-client.d.ts

@@ -1,12 +1,12 @@
 import { type Logger } from '@applitools/logger';
-import { type UFGClient, type UFGClientConfig } from '@applitools/ufg-client';
+import { type UFGClient, type UFGClientSettings } from '@applitools/ufg-client';
 type Options = {
     client?: UFGClient;
-    logger: Logger;
     fetchConcurrency?: number;
+    logger: Logger;
 };
-export declare function makeGetUFGClient({ client, fetchConcurrency, logger: mainLogger }: Options): (({ config, logger }: {
-    config: UFGClientConfig;
+export declare function makeGetUFGClient({ client, fetchConcurrency, logger: mainLogger }: Options): (({ settings, logger }: {
+    settings: UFGClientSettings;
     logger?: Logger | undefined;
 }) => Promise<UFGClient>) & {
     getCachedValues(): Promise<UFGClient>[];

package/types/ufg/types.d.ts

@@ -4,18 +4,14 @@ import type * as AutomationCore from '../automation/types';
 import { type SpecType } from '@applitools/driver';
 import { type Logger } from '@applitools/logger';
 import { type Proxy } from '@applitools/req';
-import { type UFGClient, type UFGRequestsConfig, type Renderer, type DomSnapshot, type AndroidSnapshot, type IOSSnapshot, RendererSettings } from '@applitools/ufg-client';
+import { type UFGClient, type UFGClientSettings, type RenderEnvironmentSettings, type Renderer, type DomSnapshot, type AndroidSnapshot, type IOSSnapshot } from '@applitools/ufg-client';
 export * from '../automation/types';
 export type SnapshotTarget = MaybeArray<DomSnapshot> | MaybeArray<AndroidSnapshot> | MaybeArray<IOSSnapshot>;
 export type Target<TSpec extends SpecType> = SnapshotTarget | AutomationCore.Target<TSpec>;
-export type GetBaseEyesSettings = RendererSettings & {
-    properties?: BaseCore.CustomProperty[];
-};
 export interface Core<TSpec extends SpecType> extends AutomationCore.Core<TSpec> {
     readonly type: 'ufg';
     getUFGClient(options?: {
-        config: UFGRequestsConfig;
-        concurrency?: number;
+        settings: UFGClientSettings;
         logger?: Logger;
     }): Promise<UFGClient>;
     openEyes(options: {
@@ -41,12 +37,15 @@ export interface Eyes<TSpec extends SpecType> extends AutomationCore.Eyes<TSpec>
         target?: Target<TSpec>;
         settings?: CheckSettings<TSpec> & AutomationCore.CloseSettings;
         logger?: Logger;
-    }): Promise<TestResult[]>;
+    }): Promise<void>;
     getResults(options?: {
         settings?: AutomationCore.GetResultsSettings;
         logger?: Logger;
     }): Promise<TestResult[]>;
 }
+export type GetBaseEyesSettings = RenderEnvironmentSettings & {
+    properties?: BaseCore.CustomProperty[];
+};
 export type CheckSettings<TSpec extends SpecType> = AutomationCore.CheckSettings<TSpec> & {
     renderers?: (Renderer & {
         properties?: BaseCore.CustomProperty[];
@@ -67,12 +66,7 @@ export type CheckSettings<TSpec extends SpecType> = AutomationCore.CheckSettings
 };
 export type CheckResult = AutomationCore.CheckResult & {
     readonly renderer: Renderer;
-    readonly promise: Promise<Omit<CheckResult, 'promise'> & {
-        eyes: BaseCore.Eyes;
-    }>;
 };
 export type TestResult = AutomationCore.TestResult & {
     readonly renderer: Renderer;
-} & {
-    eyes: BaseCore.Eyes;
 };