@applitools/core 3.6.2 → 3.6.4

package/CHANGELOG.md

@@ -2,6 +2,157 @@
 
 ## Unreleased
 
+## [3.6.4](https://github.com/applitools/eyes.sdk.javascript1/compare/js/core@3.6.3...js/core@3.6.4) (2023-07-21)
+
+
+### Bug Fixes
+
+* fix workspace dependencies ([2a3856f](https://github.com/applitools/eyes.sdk.javascript1/commit/2a3856f3ce3bcf1407f59c676653b6f218556760))
+
+
+### Dependencies
+
+* @applitools/core-base bumped to 1.4.3
+  #### Bug Fixes
+
+  * fix workspace dependencies ([2a3856f](https://github.com/applitools/eyes.sdk.javascript1/commit/2a3856f3ce3bcf1407f59c676653b6f218556760))
+
+
+
+* @applitools/image bumped to 1.1.2
+  #### Bug Fixes
+
+  * fix workspace dependencies ([2a3856f](https://github.com/applitools/eyes.sdk.javascript1/commit/2a3856f3ce3bcf1407f59c676653b6f218556760))
+* @applitools/logger bumped to 2.0.7
+  #### Bug Fixes
+
+  * fix workspace dependencies ([2a3856f](https://github.com/applitools/eyes.sdk.javascript1/commit/2a3856f3ce3bcf1407f59c676653b6f218556760))
+* @applitools/req bumped to 1.5.2
+  #### Bug Fixes
+
+  * fix workspace dependencies ([2a3856f](https://github.com/applitools/eyes.sdk.javascript1/commit/2a3856f3ce3bcf1407f59c676653b6f218556760))
+* @applitools/driver bumped to 1.13.3
+  #### Bug Fixes
+
+  * fix workspace dependencies ([2a3856f](https://github.com/applitools/eyes.sdk.javascript1/commit/2a3856f3ce3bcf1407f59c676653b6f218556760))
+
+
+
+* @applitools/ec-client bumped to 1.7.3
+  #### Bug Fixes
+
+  * fix workspace dependencies ([2a3856f](https://github.com/applitools/eyes.sdk.javascript1/commit/2a3856f3ce3bcf1407f59c676653b6f218556760))
+
+
+
+* @applitools/socket bumped to 1.1.7
+  #### Bug Fixes
+
+  * fix workspace dependencies ([2a3856f](https://github.com/applitools/eyes.sdk.javascript1/commit/2a3856f3ce3bcf1407f59c676653b6f218556760))
+
+
+
+* @applitools/spec-driver-webdriver bumped to 1.0.40
+  #### Bug Fixes
+
+  * fix workspace dependencies ([2a3856f](https://github.com/applitools/eyes.sdk.javascript1/commit/2a3856f3ce3bcf1407f59c676653b6f218556760))
+
+
+
+* @applitools/tunnel-client bumped to 1.1.3
+  #### Bug Fixes
+
+  * fix workspace dependencies ([2a3856f](https://github.com/applitools/eyes.sdk.javascript1/commit/2a3856f3ce3bcf1407f59c676653b6f218556760))
+
+
+
+* @applitools/nml-client bumped to 1.5.5
+  #### Bug Fixes
+
+  * fix workspace dependencies ([2a3856f](https://github.com/applitools/eyes.sdk.javascript1/commit/2a3856f3ce3bcf1407f59c676653b6f218556760))
+
+
+
+* @applitools/spec-driver-webdriverio bumped to 1.5.9
+  #### Bug Fixes
+
+  * fix workspace dependencies ([2a3856f](https://github.com/applitools/eyes.sdk.javascript1/commit/2a3856f3ce3bcf1407f59c676653b6f218556760))
+
+
+
+* @applitools/screenshoter bumped to 3.8.6
+  #### Bug Fixes
+
+  * fix workspace dependencies ([2a3856f](https://github.com/applitools/eyes.sdk.javascript1/commit/2a3856f3ce3bcf1407f59c676653b6f218556760))
+
+
+
+* @applitools/ufg-client bumped to 1.5.2
+  #### Bug Fixes
+
+  * fix workspace dependencies ([2a3856f](https://github.com/applitools/eyes.sdk.javascript1/commit/2a3856f3ce3bcf1407f59c676653b6f218556760))
+
+
+
+* @applitools/spec-driver-puppeteer bumped to 1.1.71
+  #### Bug Fixes
+
+  * fix workspace dependencies ([2a3856f](https://github.com/applitools/eyes.sdk.javascript1/commit/2a3856f3ce3bcf1407f59c676653b6f218556760))
+
+
+
+* @applitools/spec-driver-selenium bumped to 1.5.54
+  #### Bug Fixes
+
+  * fix workspace dependencies ([2a3856f](https://github.com/applitools/eyes.sdk.javascript1/commit/2a3856f3ce3bcf1407f59c676653b6f218556760))
+
+
+
+
+## [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)
 
 

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/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 });