@applitools/core 3.3.1 → 3.5.0

package/CHANGELOG.md

@@ -2,6 +2,92 @@
 
 ## Unreleased
 
+## [3.5.0](https://github.com/applitools/eyes.sdk.javascript1/compare/js/core@3.4.0...js/core@3.5.0) (2023-07-05)
+
+
+### Features
+
+* added auto applitools lib detection ([#1707](https://github.com/applitools/eyes.sdk.javascript1/issues/1707)) ([7d439b5](https://github.com/applitools/eyes.sdk.javascript1/commit/7d439b52af55f3b0596c9d35d6ba85c717448023))
+* support dns caching ([#1680](https://github.com/applitools/eyes.sdk.javascript1/issues/1680)) ([9bbff34](https://github.com/applitools/eyes.sdk.javascript1/commit/9bbff34f50c9d18758b55a6bcb45571ca1148180))
+
+
+### Bug Fixes
+
+* some fix ([660a137](https://github.com/applitools/eyes.sdk.javascript1/commit/660a1376a49dd28f8f399690502cd3d1f77665fa))
+
+
+### Dependencies
+
+* @applitools/core-base bumped from 1.2.1 to 1.3.0
+  #### Features
+
+  * support dns caching ([#1680](https://github.com/applitools/eyes.sdk.javascript1/issues/1680)) ([9bbff34](https://github.com/applitools/eyes.sdk.javascript1/commit/9bbff34f50c9d18758b55a6bcb45571ca1148180))
+
+
+
+* @applitools/req bumped from 1.3.3 to 1.4.0
+  #### Features
+
+  * support dns caching ([#1680](https://github.com/applitools/eyes.sdk.javascript1/issues/1680)) ([9bbff34](https://github.com/applitools/eyes.sdk.javascript1/commit/9bbff34f50c9d18758b55a6bcb45571ca1148180))
+* @applitools/driver bumped from 1.12.4 to 1.13.0
+  #### Features
+
+  * added auto applitools lib detection ([#1707](https://github.com/applitools/eyes.sdk.javascript1/issues/1707)) ([7d439b5](https://github.com/applitools/eyes.sdk.javascript1/commit/7d439b52af55f3b0596c9d35d6ba85c717448023))
+* @applitools/ec-client bumped from 1.5.0 to 1.6.0
+  #### Features
+
+  * added support of regional execution cloud servers ([#1711](https://github.com/applitools/eyes.sdk.javascript1/issues/1711)) ([2e26c69](https://github.com/applitools/eyes.sdk.javascript1/commit/2e26c6944bb15f6121fb37c1dba95aba162c1f6a))
+  * support dns caching ([#1680](https://github.com/applitools/eyes.sdk.javascript1/issues/1680)) ([9bbff34](https://github.com/applitools/eyes.sdk.javascript1/commit/9bbff34f50c9d18758b55a6bcb45571ca1148180))
+
+
+  #### Bug Fixes
+
+  * fixed auto tunnel cleanup after unexpected end of the process ([3c1ad08](https://github.com/applitools/eyes.sdk.javascript1/commit/3c1ad0837d2d3560becc6d89370aa878becb3270))
+
+
+
+* @applitools/tunnel-client bumped from 0.1.1 to 1.0.0
+  #### Features
+
+  * added binaries and made them available in jfrog ([92033fe](https://github.com/applitools/eyes.sdk.javascript1/commit/92033fed7edc58bbc4a4e37269068418fe3afc3d))
+  * release as 1.0.0 ([93bf312](https://github.com/applitools/eyes.sdk.javascript1/commit/93bf31205b07d19bc2cb4f50b974c7bad0f49cea))
+
+
+
+* @applitools/ufg-client bumped from 1.2.22 to 1.3.0
+  #### Features
+
+  * support dns caching ([#1680](https://github.com/applitools/eyes.sdk.javascript1/issues/1680)) ([9bbff34](https://github.com/applitools/eyes.sdk.javascript1/commit/9bbff34f50c9d18758b55a6bcb45571ca1148180))
+
+
+
+* @applitools/spec-driver-webdriver bumped from 1.0.36 to 1.0.37
+
+* @applitools/nml-client bumped from 1.5.0 to 1.5.1
+
+* @applitools/screenshoter bumped from 3.8.1 to 3.8.2
+
+
+## [3.4.0](https://github.com/applitools/eyes.sdk.javascript1/compare/js/core@3.3.1...js/core@3.4.0) (2023-06-29)
+
+
+### Features
+
+* added a new mode for taking native app screenshots ([#1682](https://github.com/applitools/eyes.sdk.javascript1/issues/1682)) ([0ab7d96](https://github.com/applitools/eyes.sdk.javascript1/commit/0ab7d96164c89ec65b87654fb271d4404bbf70e5))
+
+
+### Bug Fixes
+
+* apply default scrolling mode ([f35aba4](https://github.com/applitools/eyes.sdk.javascript1/commit/f35aba454a344c8f0cf787afa2120ce57d91e307))
+
+
+### Dependencies
+
+* @applitools/nml-client bumped from 1.4.0 to 1.5.0
+  #### Features
+
+  * added a new mode for taking native app screenshots ([#1682](https://github.com/applitools/eyes.sdk.javascript1/issues/1682)) ([0ab7d96](https://github.com/applitools/eyes.sdk.javascript1/commit/0ab7d96164c89ec65b87654fb271d4404bbf70e5))
+
 ## [3.3.1](https://github.com/applitools/eyes.sdk.javascript1/compare/js/core@3.3.0...js/core@3.3.1) (2023-06-28)
 
 

package/dist/automation/utils/take-screenshot.js

@@ -27,7 +27,7 @@ exports.takeScreenshot = void 0;
 const utils = __importStar(require("@applitools/utils"));
 const { takeScreenshot: legacyTakeScreenshot } = require('@applitools/screenshoter');
 async function takeScreenshot({ driver, settings, logger, }) {
-    var _a, _b;
+    var _a, _b, _c;
     const environment = await driver.getEnvironment();
     return legacyTakeScreenshot({
         driver,
@@ -41,7 +41,7 @@ async function takeScreenshot({ driver, settings, logger, }) {
         fully: settings.fully,
         hideScrollbars: settings.hideScrollbars,
         hideCaret: settings.hideCaret,
-        scrollingMode: (_b = settings.stitchMode) === null || _b === void 0 ? void 0 : _b.toLowerCase(),
+        scrollingMode: (_c = (_b = settings.stitchMode) === null || _b === void 0 ? void 0 : _b.toLowerCase()) !== null && _c !== void 0 ? _c : 'scroll',
         overlap: settings.overlap,
         wait: settings.waitBeforeCapture,
         framed: environment.isNative,

package/dist/check.js

@@ -33,30 +33,29 @@ const chalk_1 = __importDefault(require("chalk"));
 function makeCheck({ type: defaultType = 'classic', eyes, target: defaultTarget, spec, logger: mainLogger, }) {
     let stepIndex = 0;
     return async function check({ type = defaultType, target = defaultTarget, settings, config, logger = mainLogger, } = {}) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
-        var _s, _t, _u, _v;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
+        var _r, _s, _t, _u;
         logger = logger.extend(mainLogger, { tags: [`check-${type}-${utils.general.shortid()}`] });
         settings = { ...config === null || config === void 0 ? void 0 : config.screenshot, ...config === null || config === void 0 ? void 0 : config.check, ...settings };
         (_a = settings.fully) !== null && _a !== void 0 ? _a : (settings.fully = !settings.region && (!settings.frames || settings.frames.length === 0));
         (_b = settings.waitBeforeCapture) !== null && _b !== void 0 ? _b : (settings.waitBeforeCapture = 100);
-        (_c = settings.stitchMode) !== null && _c !== void 0 ? _c : (settings.stitchMode = 'Scroll');
-        (_d = settings.hideScrollbars) !== null && _d !== void 0 ? _d : (settings.hideScrollbars = true);
-        (_e = settings.hideCaret) !== null && _e !== void 0 ? _e : (settings.hideCaret = true);
+        (_c = settings.hideScrollbars) !== null && _c !== void 0 ? _c : (settings.hideScrollbars = true);
+        (_d = settings.hideCaret) !== null && _d !== void 0 ? _d : (settings.hideCaret = true);
         settings.overlap = { top: 10, bottom: 50, ...settings === null || settings === void 0 ? void 0 : settings.overlap };
-        (_f = settings.matchLevel) !== null && _f !== void 0 ? _f : (settings.matchLevel = 'Strict');
-        (_g = settings.ignoreCaret) !== null && _g !== void 0 ? _g : (settings.ignoreCaret = true);
-        (_h = settings.sendDom) !== null && _h !== void 0 ? _h : (settings.sendDom = eyes.test.account.rcaEnabled || settings.matchLevel === 'Layout' || settings.enablePatterns || settings.useDom);
-        (_j = settings.autProxy) !== null && _j !== void 0 ? _j : (settings.autProxy = eyes.test.server.proxy);
-        (_k = settings.useDom) !== null && _k !== void 0 ? _k : (settings.useDom = false);
-        (_l = (_s = settings).retryTimeout) !== null && _l !== void 0 ? _l : (_s.retryTimeout = 2000);
+        (_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);
+        (_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;
         if (settings.lazyLoad) {
-            (_m = (_t = settings.lazyLoad).scrollLength) !== null && _m !== void 0 ? _m : (_t.scrollLength = 300);
-            (_o = (_u = settings.lazyLoad).waitingTime) !== null && _o !== void 0 ? _o : (_u.waitingTime = 2000);
-            (_p = (_v = settings.lazyLoad).maxAmountToScroll) !== null && _p !== void 0 ? _p : (_v.maxAmountToScroll = 15000);
+            (_l = (_s = settings.lazyLoad).scrollLength) !== null && _l !== void 0 ? _l : (_s.scrollLength = 300);
+            (_m = (_t = settings.lazyLoad).waitingTime) !== null && _m !== void 0 ? _m : (_t.waitingTime = 2000);
+            (_o = (_u = settings.lazyLoad).maxAmountToScroll) !== null && _o !== void 0 ? _o : (_u.maxAmountToScroll = 15000);
         }
         settings.stepIndex = stepIndex++;
-        (_q = settings.waitBetweenStitches) !== null && _q !== void 0 ? _q : (settings.waitBetweenStitches = utils.types.isObject(settings.lazyLoad) ? settings.lazyLoad.waitingTime : 100);
+        (_p = settings.waitBetweenStitches) !== null && _p !== void 0 ? _p : (settings.waitBetweenStitches = utils.types.isObject(settings.lazyLoad) ? settings.lazyLoad.waitingTime : 100);
         if (settings.matchLevel === 'Content') {
             logger.console.log(chalk_1.default.yellow(`The "Content" match level value has been deprecated, use "IgnoreColors" instead.`));
         }
@@ -64,7 +63,7 @@ function makeCheck({ type: defaultType = 'classic', eyes, target: defaultTarget,
         const environment = await (driver === null || driver === void 0 ? void 0 : driver.getEnvironment());
         const typedEyes = await eyes.getTypedEyes({
             type,
-            settings: (_r = settings.renderers) === null || _r === void 0 ? void 0 : _r.map(renderer => ({
+            settings: (_q = settings.renderers) === null || _q === void 0 ? void 0 : _q.map(renderer => ({
                 type: (environment === null || environment === void 0 ? void 0 : environment.isNative) ? 'native' : 'web',
                 renderer,
             })),

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

@@ -32,7 +32,7 @@ const wait_for_lazy_load_1 = require("../automation/utils/wait-for-lazy-load");
 const utils = __importStar(require("@applitools/utils"));
 function makeCheckAndClose({ eyes, target: defaultTarget, spec, logger: mainLogger, }) {
     return async function checkAndClose({ target = defaultTarget, settings = {}, logger = mainLogger, } = {}) {
-        var _a;
+        var _a, _b;
         logger = logger.extend(mainLogger);
         logger.log('Command "checkAndClose" is called with settings', settings);
         if (!target)
@@ -51,36 +51,52 @@ function makeCheckAndClose({ eyes, target: defaultTarget, spec, logger: mainLogg
                 logger,
             });
         }
+        let baseTarget;
+        let baseSettings;
         const { elementReferencesToCalculate, getBaseCheckSettings } = (0, to_base_check_settings_1.toBaseCheckSettings)({ settings });
-        const screenshot = await (0, take_screenshot_1.takeScreenshot)({
-            driver,
-            settings: { ...settings, regionsToCalculate: elementReferencesToCalculate },
-            logger,
-        });
-        const baseTarget = {
-            name: await driver.getTitle(),
-            source: await driver.getUrl(),
-            image: await screenshot.image.toPng(),
-            locationInViewport: utils.geometry.location(screenshot.region),
-            isTransformed: true,
-        };
-        const baseSettings = getBaseCheckSettings({ calculatedRegions: screenshot.calculatedRegions });
-        if (environment.isWeb && settings.sendDom) {
-            if (settings.fully)
-                await screenshot.scrollingElement.setAttribute('data-applitools-scroll', 'true');
-            else
-                await ((_a = screenshot.element) === null || _a === void 0 ? void 0 : _a.setAttribute('data-applitools-scroll', 'true'));
-            baseTarget.dom = await (0, take_dom_capture_1.takeDomCapture)({ driver, settings: { proxy: eyes.test.server.proxy }, logger }).catch(() => undefined);
+        if (environment.isWeb ||
+            !environment.isApplitoolsLib ||
+            settings.webview ||
+            settings.screenshotMode === 'default') {
+            const screenshot = await (0, take_screenshot_1.takeScreenshot)({
+                driver,
+                settings: { ...settings, regionsToCalculate: elementReferencesToCalculate },
+                logger,
+            });
+            baseTarget = {
+                name: await driver.getTitle(),
+                source: await driver.getUrl(),
+                image: await screenshot.image.toPng(),
+                locationInViewport: utils.geometry.location(screenshot.region),
+                isTransformed: true,
+            };
+            baseSettings = getBaseCheckSettings({ calculatedRegions: screenshot.calculatedRegions });
+            if (environment.isWeb && settings.sendDom) {
+                if (settings.fully)
+                    await ((_a = screenshot.scrollingElement) === null || _a === void 0 ? void 0 : _a.setAttribute('data-applitools-scroll', 'true'));
+                else
+                    await ((_b = screenshot.element) === null || _b === void 0 ? void 0 : _b.setAttribute('data-applitools-scroll', 'true'));
+                baseTarget.dom = await (0, take_dom_capture_1.takeDomCapture)({ driver, settings: { proxy: eyes.test.server.proxy }, logger }).catch(() => undefined);
+            }
+            if (settings.pageId) {
+                const scrollingElement = await driver.mainContext.getScrollingElement();
+                const scrollingOffset = !scrollingElement || environment.isNative ? { x: 0, y: 0 } : await scrollingElement.getScrollOffset();
+                baseTarget.locationInView = utils.geometry.offset(scrollingOffset, screenshot.region);
+                baseTarget.fullViewSize = scrollingElement
+                    ? await scrollingElement.getContentSize()
+                    : await driver.getViewportSize();
+            }
+            await screenshot.restoreState();
         }
-        if (settings.pageId) {
-            const scrollingElement = await driver.mainContext.getScrollingElement();
-            const scrollingOffset = !scrollingElement || environment.isNative ? { x: 0, y: 0 } : await scrollingElement.getScrollOffset();
-            baseTarget.locationInView = utils.geometry.offset(scrollingOffset, screenshot.region);
-            baseTarget.fullViewSize = scrollingElement
-                ? await scrollingElement.getContentSize()
-                : await driver.getViewportSize();
+        else {
+            const nmlClient = await eyes.core.getNMLClient({ config: eyes.test.server, driver, logger });
+            const screenshot = await nmlClient.takeScreenshot({
+                settings: { name: settings.name, waitBeforeCapture: settings.waitBeforeCapture, fully: settings.fully },
+                logger,
+            });
+            baseTarget = { image: screenshot.image, isTransformed: true };
+            baseSettings = getBaseCheckSettings({ calculatedRegions: [] });
         }
-        await screenshot.restoreState();
         return (await Promise.all(baseEyes.map(baseEyes => baseEyes.checkAndClose({ target: baseTarget, settings: baseSettings, logger })))).flat();
     };
 }

package/dist/classic/check.js

@@ -32,7 +32,7 @@ const wait_for_lazy_load_1 = require("../automation/utils/wait-for-lazy-load");
 const utils = __importStar(require("@applitools/utils"));
 function makeCheck({ eyes, target: defaultTarget, spec, logger: mainLogger, }) {
     return async function check({ target = defaultTarget, settings = {}, logger = mainLogger, } = {}) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         logger = logger.extend(mainLogger);
         logger.log('Command "check" is called with settings', settings);
         if (!target)
@@ -61,35 +61,49 @@ function makeCheck({ eyes, target: defaultTarget, spec, logger: mainLogger, }) {
         let results;
         const { elementReferencesToCalculate, getBaseCheckSettings } = (0, to_base_check_settings_1.toBaseCheckSettings)({ settings });
         do {
-            const screenshot = await (0, take_screenshot_1.takeScreenshot)({
-                driver,
-                settings: { ...settings, regionsToCalculate: elementReferencesToCalculate },
-                logger,
-            });
-            baseTarget = {
-                name: await driver.getTitle(),
-                source: await driver.getUrl(),
-                image: await screenshot.image.toPng(),
-                locationInViewport: utils.geometry.location(screenshot.region),
-                isTransformed: true,
-            };
-            baseSettings = getBaseCheckSettings({ calculatedRegions: screenshot.calculatedRegions });
-            if (environment.isWeb && settings.sendDom) {
-                if (settings.fully)
-                    await screenshot.scrollingElement.setAttribute('data-applitools-scroll', 'true');
-                else
-                    await ((_c = screenshot.element) === null || _c === void 0 ? void 0 : _c.setAttribute('data-applitools-scroll', 'true'));
-                baseTarget.dom = await (0, take_dom_capture_1.takeDomCapture)({ driver, settings: { proxy: eyes.test.server.proxy }, logger }).catch(() => undefined);
+            if (environment.isWeb ||
+                !environment.isApplitoolsLib ||
+                settings.webview ||
+                settings.screenshotMode === 'default') {
+                const screenshot = await (0, take_screenshot_1.takeScreenshot)({
+                    driver,
+                    settings: { ...settings, regionsToCalculate: elementReferencesToCalculate },
+                    logger,
+                });
+                baseTarget = {
+                    name: await driver.getTitle(),
+                    source: await driver.getUrl(),
+                    image: await screenshot.image.toPng(),
+                    locationInViewport: utils.geometry.location(screenshot.region),
+                    isTransformed: true,
+                };
+                baseSettings = getBaseCheckSettings({ calculatedRegions: screenshot.calculatedRegions });
+                if (environment.isWeb && settings.sendDom) {
+                    if (settings.fully)
+                        await ((_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);
+                }
+                if (settings.pageId) {
+                    const scrollingElement = await driver.mainContext.getScrollingElement();
+                    const scrollingOffset = !scrollingElement || environment.isNative ? { x: 0, y: 0 } : await scrollingElement.getScrollOffset();
+                    baseTarget.locationInView = utils.geometry.offset(scrollingOffset, screenshot.region);
+                    baseTarget.fullViewSize = scrollingElement
+                        ? await scrollingElement.getContentSize()
+                        : await driver.getViewportSize();
+                }
+                await screenshot.restoreState();
             }
-            if (settings.pageId) {
-                const scrollingElement = await driver.mainContext.getScrollingElement();
-                const scrollingOffset = !scrollingElement || environment.isNative ? { x: 0, y: 0 } : await scrollingElement.getScrollOffset();
-                baseTarget.locationInView = utils.geometry.offset(scrollingOffset, screenshot.region);
-                baseTarget.fullViewSize = scrollingElement
-                    ? await scrollingElement.getContentSize()
-                    : await driver.getViewportSize();
+            else {
+                const nmlClient = await eyes.core.getNMLClient({ config: eyes.test.server, driver, logger });
+                const screenshot = await nmlClient.takeScreenshot({
+                    settings: { name: settings.name, waitBeforeCapture: settings.waitBeforeCapture, fully: settings.fully },
+                    logger,
+                });
+                baseTarget = { image: screenshot.image, isTransformed: true };
+                baseSettings = getBaseCheckSettings({ calculatedRegions: [] });
             }
-            await screenshot.restoreState();
             baseSettings.ignoreMismatch = !shouldRunOnce;
             results = (await Promise.all(baseEyes.map(baseEyes => baseEyes.check({ target: baseTarget, settings: baseSettings, logger })))).flat();
         } while (!shouldRunOnce && !results.some(result => result.asExpected) && Date.now() < finishAt);

package/dist/classic/core.js

@@ -31,9 +31,10 @@ const set_viewport_size_1 = require("../automation/set-viewport-size");
 const locate_1 = require("../automation/locate");
 const locate_text_1 = require("../automation/locate-text");
 const extract_text_1 = require("../automation/extract-text");
+const get_nml_client_1 = require("../automation/get-nml-client");
 const open_eyes_1 = require("./open-eyes");
 const utils = __importStar(require("@applitools/utils"));
-function makeCore({ spec, base, agentId = 'core-classic', cwd = process.cwd(), logger: defaultLogger, }) {
+function makeCore({ spec, clients, base, agentId = 'core-classic', cwd = process.cwd(), logger: defaultLogger, }) {
     const logger = (0, logger_1.makeLogger)({ logger: defaultLogger, format: { label: 'core-classic' } });
     logger.log(`Core classic is initialized ${base ? 'with' : 'without'} custom base core`);
     base !== null && base !== void 0 ? base : (base = (0, core_base_1.makeCore)({ agentId, cwd, logger }));
@@ -43,10 +44,11 @@ function makeCore({ spec, base, agentId = 'core-classic', cwd = process.cwd(), l
             base: base,
             getViewportSize: spec && (0, get_viewport_size_1.makeGetViewportSize)({ spec, logger }),
             setViewportSize: spec && (0, set_viewport_size_1.makeSetViewportSize)({ spec, logger }),
+            getNMLClient: (0, get_nml_client_1.makeGetNMLClient)({ client: clients === null || clients === void 0 ? void 0 : clients.nml, logger }),
+            openEyes: (0, open_eyes_1.makeOpenEyes)({ spec, core, logger }),
             locate: (0, locate_1.makeLocate)({ spec, core, logger }),
             locateText: (0, locate_text_1.makeLocateText)({ spec, core, logger }),
             extractText: (0, extract_text_1.makeExtractText)({ spec, core, logger }),
-            openEyes: (0, open_eyes_1.makeOpenEyes)({ spec, core, logger }),
         };
     });
 }

package/dist/core.js

@@ -28,6 +28,7 @@ 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_nml_client_1 = require("./automation/get-nml-client");
 const locate_1 = require("./locate");
 const locate_text_1 = require("./locate-text");
 const extract_text_1 = require("./extract-text");
@@ -46,6 +47,7 @@ function makeCore({ spec, concurrency, base: defaultBase, agentId = 'core', cwd
             base: base,
             getViewportSize: spec && (0, get_viewport_size_1.makeGetViewportSize)({ spec, logger }),
             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 }),
             makeManager: (0, make_manager_1.makeMakeManager)({ spec, concurrency, core, base: defaultBase, agentId, logger }),
             locate: (0, locate_1.makeLocate)({ spec, core, logger }),

package/dist/open-eyes.js

@@ -36,24 +36,25 @@ 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;
-        var _u, _v, _w, _x;
+        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;
         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'));
         settings.batch = { ...batch, ...settings.batch };
-        (_e = (_u = settings.batch).id) !== null && _e !== void 0 ? _e : (_u.id = (_f = utils.general.getEnvValue('BATCH_ID')) !== null && _f !== void 0 ? _f : `generated-${utils.general.guid()}`);
-        (_g = (_v = settings.batch).name) !== null && _g !== void 0 ? _g : (_v.name = utils.general.getEnvValue('BATCH_NAME'));
-        (_h = (_w = settings.batch).sequenceName) !== null && _h !== void 0 ? _h : (_w.sequenceName = utils.general.getEnvValue('BATCH_SEQUENCE'));
-        (_j = (_x = settings.batch).notifyOnCompletion) !== null && _j !== void 0 ? _j : (_x.notifyOnCompletion = utils.general.getEnvValue('BATCH_NOTIFY', 'boolean'));
+        (_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'));
         const driver = target && (await (0, driver_1.makeDriver)({ spec, driver: target, logger, customConfig: settings }));
         core.logEvent({
             settings: {
@@ -61,11 +62,12 @@ function makeOpenEyes({ type: defaultType = 'classic', concurrency, batch, core,
                 apiKey: settings.apiKey,
                 proxy: settings.proxy,
                 agentId: settings.agentId,
+                useDnsCache: settings.useDnsCache,
                 level: 'Notice',
                 event: {
                     type: 'runnerStarted',
                     testConcurrency: concurrency,
-                    concurrentRendersPerTest: (_t = (_s = (_r = config === null || config === void 0 ? void 0 : config.check) === null || _r === void 0 ? void 0 : _r.renderers) === null || _s === void 0 ? void 0 : _s.length) !== null && _t !== void 0 ? _t : 1,
+                    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,
                     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/ufg/core.js

@@ -31,8 +31,8 @@ const set_viewport_size_1 = require("../automation/set-viewport-size");
 const locate_1 = require("../automation/locate");
 const locate_text_1 = require("../automation/locate-text");
 const extract_text_1 = require("../automation/extract-text");
+const get_nml_client_1 = require("../automation/get-nml-client");
 const get_ufg_client_1 = require("./get-ufg-client");
-const get_nml_client_1 = require("./get-nml-client");
 const open_eyes_1 = require("./open-eyes");
 const utils = __importStar(require("@applitools/utils"));
 function makeCore({ concurrency, spec, clients, base, fetchConcurrency, agentId = 'core-ufg', cwd = process.cwd(), logger: defaultLogger, }) {

package/dist/universal/core.js

@@ -45,6 +45,14 @@ function makeCore(options) {
             const socket = await socketPromise;
             return socket.request('Core.setViewportSize', options);
         },
+        async getNMLClient(_options) {
+            // TODO
+            return null;
+        },
+        async getECClient(options) {
+            const socket = await socketPromise;
+            return socket.request('Core.makeECClient', options);
+        },
         async locate(options) {
             const socket = await socketPromise;
             return socket.request('Core.locate', options);
@@ -71,10 +79,6 @@ function makeCore(options) {
             const managerRef = await socket.request('Core.makeManager', options);
             return makeManager({ socket, core, managerRef });
         },
-        async getECClient(options) {
-            const socket = await socketPromise;
-            return socket.request('Core.makeECClient', options);
-        },
         async closeBatch(options) {
             const socket = await socketPromise;
             return socket.request('Core.closeBatch', options);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/core",
-  "version": "3.3.1",
+  "version": "3.5.0",
   "homepage": "https://applitools.com",
   "bugs": {
     "url": "https://github.com/applitools/eyes.sdk.javascript1/issues"
@@ -57,10 +57,8 @@
     "test:e2e": "MOCHA_GROUP=e2e run --top-level mocha './test/e2e/**/*.spec.ts' --parallel --jobs ${MOCHA_JOBS:-15} --exit",
     "test:it": "MOCHA_GROUP=it run --top-level mocha './test/it/**/*.spec.ts'",
     "test:unit": "MOCHA_GROUP=unit run --top-level mocha './test/unit/**/*.spec.ts'",
-    "setup": "run --top-level browsers:setup",
-    "report": "bongo report --name 'core' --group 'core' --result-path './logs'"
+    "setup": "run --top-level browsers:setup"
   },
-  "notificationName": "core",
   "pkg": {
     "scripts": "./dist/cli/cli.js",
     "outputPath": "./bin",
@@ -70,19 +68,19 @@
     ]
   },
   "dependencies": {
-    "@applitools/core-base": "1.2.1",
+    "@applitools/core-base": "1.3.0",
     "@applitools/dom-capture": "11.2.2",
     "@applitools/dom-snapshot": "4.7.9",
-    "@applitools/driver": "1.12.4",
-    "@applitools/ec-client": "1.5.0",
+    "@applitools/driver": "1.13.0",
+    "@applitools/ec-client": "1.6.0",
     "@applitools/logger": "2.0.5",
-    "@applitools/nml-client": "1.4.0",
-    "@applitools/req": "1.3.3",
-    "@applitools/screenshoter": "3.8.1",
+    "@applitools/nml-client": "1.5.1",
+    "@applitools/req": "1.4.0",
+    "@applitools/screenshoter": "3.8.2",
     "@applitools/snippets": "2.4.21",
     "@applitools/socket": "1.1.5",
-    "@applitools/spec-driver-webdriver": "1.0.36",
-    "@applitools/ufg-client": "1.2.22",
+    "@applitools/spec-driver-webdriver": "1.0.37",
+    "@applitools/ufg-client": "1.3.0",
     "@applitools/utils": "1.5.0",
     "@types/ws": "8.5.5",
     "abort-controller": "3.0.0",
@@ -95,9 +93,9 @@
   "devDependencies": {
     "@applitools/bongo": "^4.0.0",
     "@applitools/sdk-coverage-tests": "^3.0.2",
-    "@applitools/spec-driver-puppeteer": "^1.1.67",
-    "@applitools/spec-driver-selenium": "^1.5.50",
-    "@applitools/spec-driver-webdriverio": "^1.5.5",
+    "@applitools/spec-driver-puppeteer": "^1.1.68",
+    "@applitools/spec-driver-selenium": "^1.5.51",
+    "@applitools/spec-driver-webdriverio": "^1.5.6",
     "@applitools/test-server": "^1.2.2",
     "@applitools/test-utils": "^1.5.17",
     "@types/node": "^12.20.55",

package/types/automation/types.d.ts

@@ -2,6 +2,7 @@ import type { MaybeArray, Size, Region } from '@applitools/utils';
 import type * as BaseCore from '@applitools/core-base/types';
 import { type SpecType, type Driver, type ElementReference, type ContextReference } from '@applitools/driver';
 import { type Logger } from '@applitools/logger';
+import { type NMLClient, type NMLRequestsConfig } from '@applitools/nml-client';
 export type * from '@applitools/core-base/types';
 export type DriverTarget<TSpec extends SpecType> = TSpec['driver'] | Driver<TSpec>;
 export type Target<TSpec extends SpecType> = DriverTarget<TSpec> | BaseCore.Target;
@@ -16,6 +17,11 @@ export interface Core<TSpec extends SpecType> extends BaseCore.Core {
         size: Size;
         logger?: Logger;
     }): Promise<void>;
+    getNMLClient(options: {
+        config: Omit<NMLRequestsConfig, 'brokerUrl'>;
+        driver: Driver<TSpec>;
+        logger?: Logger;
+    }): Promise<NMLClient>;
     openEyes(options: {
         target?: DriverTarget<TSpec>;
         settings: BaseCore.OpenSettings;
@@ -55,6 +61,7 @@ export interface Eyes<TSpec extends SpecType> extends BaseCore.Eyes {
     }): Promise<BaseCore.TestResult[]>;
 }
 export interface ScreenshotSettings<TSpec extends SpecType> extends BaseCore.ImageSettings<Region | ElementReference<TSpec>> {
+    webview?: boolean | string;
     frames?: (ContextReference<TSpec> | {
         frame: ContextReference<TSpec>;
         scrollRootElement?: ElementReference<TSpec>;
@@ -62,6 +69,7 @@ export interface ScreenshotSettings<TSpec extends SpecType> extends BaseCore.Ima
     fully?: boolean;
     scrollRootElement?: ElementReference<TSpec>;
     stitchMode?: 'Scroll' | 'CSS' | 'Resize';
+    screenshotMode?: 'default' | 'applitools-lib';
     hideScrollbars?: boolean;
     hideCaret?: boolean;
     overlap?: {
@@ -75,7 +83,6 @@ export interface ScreenshotSettings<TSpec extends SpecType> extends BaseCore.Ima
         waitingTime?: number;
         maxAmountToScroll?: number;
     };
-    webview?: boolean | string;
 }
 export type LocateSettings<TLocator extends string, TSpec extends SpecType> = BaseCore.LocateSettings<TLocator, Region | ElementReference<TSpec>> & ScreenshotSettings<TSpec>;
 export type LocateTextSettings<TPattern extends string, TSpec extends SpecType> = BaseCore.LocateTextSettings<TPattern, Region | ElementReference<TSpec>> & ScreenshotSettings<TSpec>;

package/types/automation/utils/take-screenshot.d.ts

@@ -1,14 +1,17 @@
 import type { Region } from '@applitools/utils';
 import type { ScreenshotSettings } from '../../classic/types';
 import { type Logger } from '@applitools/logger';
-import { type Driver, type Element, type ElementReference, type SpecType } from '@applitools/driver';
+import { type Driver, type Element, type ElementReference, type Selector, type SpecType } from '@applitools/driver';
 export type Screenshot<TSpec extends SpecType> = {
     image: any;
     region: Region;
     element: Element<TSpec>;
     scrollingElement: Element<TSpec>;
     restoreState(): Promise<void>;
-    calculatedRegions: [];
+    calculatedRegions: {
+        selector?: Selector;
+        regions: Region[];
+    }[];
 };
 export declare function takeScreenshot<TSpec extends SpecType>({ driver, settings, logger, }: {
     driver: Driver<TSpec>;

package/types/classic/core.d.ts

@@ -1,13 +1,17 @@
 import type { Core } from './types';
+import { type NMLClient } from '@applitools/nml-client';
 import { type SpecType, type SpecDriver } from '@applitools/driver';
 import { type Logger } from '@applitools/logger';
 import { type Core as BaseCore } from '@applitools/core-base';
 type Options<TSpec extends SpecType> = {
     spec?: SpecDriver<TSpec>;
+    clients?: {
+        nml?: NMLClient;
+    };
     base?: BaseCore;
     agentId?: string;
     cwd?: string;
     logger?: Logger;
 };
-export declare function makeCore<TSpec extends SpecType>({ spec, base, agentId, cwd, logger: defaultLogger, }: Options<TSpec>): Core<TSpec>;
+export declare function makeCore<TSpec extends SpecType>({ spec, clients, base, agentId, cwd, logger: defaultLogger, }: Options<TSpec>): Core<TSpec>;
 export {};

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

@@ -23,7 +23,6 @@ export declare function makeCheckAndClose<TSpec extends SpecType>({ eyes, target
             reload?: boolean | undefined;
         } | undefined;
         ufgOptions?: Record<string, any> | undefined;
-        nmgOptions?: Record<string, any> | undefined;
         autProxy?: (import("@applitools/req").Proxy & {
             mode?: "Allow" | "Block" | undefined;
             domains?: string[] | undefined;

package/types/ufg/types.d.ts

@@ -1,11 +1,10 @@
 import type { MaybeArray } from '@applitools/utils';
 import type * as BaseCore from '@applitools/core-base/types';
 import type * as AutomationCore from '../automation/types';
-import { type SpecType, type Driver } from '@applitools/driver';
+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 } from '@applitools/ufg-client';
-import { type NMLClient, type NMLRequestsConfig } from '@applitools/nml-client';
 export * from '../automation/types';
 export type SnapshotTarget = MaybeArray<DomSnapshot> | MaybeArray<AndroidSnapshot> | MaybeArray<IOSSnapshot>;
 export type Target<TSpec extends SpecType> = SnapshotTarget | AutomationCore.Target<TSpec>;
@@ -16,11 +15,6 @@ export interface Core<TSpec extends SpecType> extends AutomationCore.Core<TSpec>
         concurrency?: number;
         logger?: Logger;
     }): Promise<UFGClient>;
-    getNMLClient(options: {
-        config: Omit<NMLRequestsConfig, 'brokerUrl'>;
-        driver: Driver<TSpec>;
-        logger?: Logger;
-    }): Promise<NMLClient>;
     openEyes(options: {
         target?: AutomationCore.DriverTarget<TSpec>;
         settings: AutomationCore.OpenSettings;
@@ -64,7 +58,6 @@ export type CheckSettings<TSpec extends SpecType> = AutomationCore.CheckSettings
         reload?: boolean;
     };
     ufgOptions?: Record<string, any>;
-    nmgOptions?: Record<string, any>;
     autProxy?: Proxy & {
         mode?: 'Allow' | 'Block';
         domains?: string[];