@applitools/core 2.4.5 → 2.4.6

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## Unreleased
 
+## 2.4.6 - 2023/4/4
+
+### Features
+### Bug fixes
+- Fixed relative url resolution in css files
+- Added timeout to css fetching during preparing dom capture
+
 ## 2.4.5 - 2023/3/31
 
 ### Features

package/dist/automation/extract-text.js

@@ -37,6 +37,7 @@ function makeExtractText({ core, spec, logger: defaultLogger }) {
         }
         settings = utils.types.isArray(settings) ? settings : [settings];
         const driver = await (0, driver_1.makeDriver)({ spec, driver: target, logger });
+        const environment = await driver.getEnvironment();
         const results = await settings.reduce(async (prev, settings) => {
             var _a;
             const steps = await prev;
@@ -54,7 +55,7 @@ function makeExtractText({ core, spec, logger: defaultLogger }) {
                 size: utils.geometry.size(screenshot.region),
                 locationInViewport: utils.geometry.location(screenshot.region),
             };
-            if (driver.isWeb) {
+            if (environment.isWeb) {
                 if (settings.fully)
                     await screenshot.scrollingElement.setAttribute('data-applitools-scroll', 'true');
                 else

package/dist/automation/locate-text.js

@@ -35,12 +35,13 @@ function makeLocateText({ core, spec, logger: defaultLogger }) {
             return core.base.locateText({ target, settings: settings, logger });
         }
         const driver = await (0, driver_1.makeDriver)({ spec, driver: target, logger });
+        const environment = await driver.getEnvironment();
         const screenshot = await (0, take_screenshot_1.takeScreenshot)({ driver, settings, logger });
         const baseTarget = {
             image: await screenshot.image.toPng(),
             locationInViewport: utils.geometry.location(screenshot.region),
         };
-        if (driver.isWeb) {
+        if (environment.isWeb) {
             // if (settings.fully) await screenshot.scrollingElement.setAttribute('data-applitools-scroll', 'true')
             // else await screenshot.element?.setAttribute('data-applitools-scroll', 'true')
             // baseTarget.dom = await takeDomCapture({driver, logger}).catch(() => null)

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

@@ -28,6 +28,7 @@ const utils = __importStar(require("@applitools/utils"));
 const { takeScreenshot: legacyTakeScreenshot } = require('@applitools/screenshoter');
 async function takeScreenshot({ driver, settings, logger, }) {
     var _a, _b;
+    const environment = await driver.getEnvironment();
     return legacyTakeScreenshot({
         driver,
         frames: (_a = settings.frames) === null || _a === void 0 ? void 0 : _a.map(frame => {
@@ -43,7 +44,7 @@ async function takeScreenshot({ driver, settings, logger, }) {
         scrollingMode: (_b = settings.stitchMode) === null || _b === void 0 ? void 0 : _b.toLowerCase(),
         overlap: settings.overlap,
         wait: settings.waitBeforeCapture,
-        framed: driver.isNative,
+        framed: environment.isNative,
         lazyLoad: settings.lazyLoad,
         stabilization: settings.normalization && {
             crop: settings.normalization.cut,

package/dist/check-and-close.js

@@ -7,10 +7,11 @@ function makeCheckAndClose({ type: defaultType = 'classic', eyes, target: defaul
         var _a;
         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 environment = await (driver === null || driver === void 0 ? void 0 : driver.getEnvironment());
         const typedEyes = await eyes.getTypedEyes({
             type,
             settings: (_a = settings.renderers) === null || _a === void 0 ? void 0 : _a.map(renderer => ({
-                type: (driver === null || driver === void 0 ? void 0 : driver.isNative) ? 'native' : 'web',
+                type: (environment === null || environment === void 0 ? void 0 : environment.isNative) ? 'native' : 'web',
                 renderer,
             })),
             logger,

package/dist/check.js

@@ -60,10 +60,11 @@ function makeCheck({ type: defaultType = 'classic', eyes, target: defaultTarget,
             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 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 => ({
-                type: (driver === null || driver === void 0 ? void 0 : driver.isNative) ? 'native' : 'web',
+                type: (environment === null || environment === void 0 ? void 0 : environment.isNative) ? 'native' : 'web',
                 renderer,
             })),
             logger,

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

@@ -42,7 +42,8 @@ function makeCheckAndClose({ eyes, target: defaultTarget, spec, logger: defaultL
             return (await Promise.all(baseEyes.map(baseEyes => baseEyes.checkAndClose({ target, settings: baseSettings, logger })))).flat();
         }
         const driver = await (0, driver_1.makeDriver)({ spec, driver: target, logger });
-        if (settings.lazyLoad && driver.isWeb) {
+        const environment = await driver.getEnvironment();
+        if (settings.lazyLoad && environment.isWeb) {
             await (0, wait_for_lazy_load_1.waitForLazyLoad)({
                 context: driver.currentContext,
                 settings: settings.lazyLoad !== true ? settings.lazyLoad : {},
@@ -63,7 +64,7 @@ function makeCheckAndClose({ eyes, target: defaultTarget, spec, logger: defaultL
             isTransformed: true,
         };
         const baseSettings = getBaseCheckSettings({ calculatedRegions: screenshot.calculatedRegions });
-        if (driver.isWeb && settings.sendDom) {
+        if (environment.isWeb && settings.sendDom) {
             if (settings.fully)
                 await screenshot.scrollingElement.setAttribute('data-applitools-scroll', 'true');
             else
@@ -72,7 +73,7 @@ function makeCheckAndClose({ eyes, target: defaultTarget, spec, logger: defaultL
         }
         if (settings.pageId) {
             const scrollingElement = await driver.mainContext.getScrollingElement();
-            const scrollingOffset = !scrollingElement || driver.isNative ? { x: 0, y: 0 } : await scrollingElement.getScrollOffset();
+            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()

package/dist/classic/check.js

@@ -41,9 +41,9 @@ function makeCheck({ eyes, target: defaultTarget, spec, logger: defaultLogger, }
             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 });
-        await driver.refreshContexts();
+        const environment = await driver.getEnvironment();
         await driver.currentContext.setScrollingElement((_a = settings.scrollRootElement) !== null && _a !== void 0 ? _a : null);
-        if (settings.lazyLoad && driver.isWeb) {
+        if (settings.lazyLoad && environment.isWeb) {
             if (settings.lazyLoad) {
                 await (0, wait_for_lazy_load_1.waitForLazyLoad)({
                     context: driver.currentContext,
@@ -73,7 +73,7 @@ function makeCheck({ eyes, target: defaultTarget, spec, logger: defaultLogger, }
                 isTransformed: true,
             };
             baseSettings = getBaseCheckSettings({ calculatedRegions: screenshot.calculatedRegions });
-            if (driver.isWeb && settings.sendDom) {
+            if (environment.isWeb && settings.sendDom) {
                 if (settings.fully)
                     await screenshot.scrollingElement.setAttribute('data-applitools-scroll', 'true');
                 else
@@ -82,7 +82,7 @@ function makeCheck({ eyes, target: defaultTarget, spec, logger: defaultLogger, }
             }
             if (settings.pageId) {
                 const scrollingElement = await driver.mainContext.getScrollingElement();
-                const scrollingOffset = !scrollingElement || driver.isNative ? { x: 0, y: 0 } : await scrollingElement.getScrollOffset();
+                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()

package/dist/classic/open-eyes.js

@@ -33,46 +33,48 @@ const abort_1 = require("./abort");
 const utils = __importStar(require("@applitools/utils"));
 function makeOpenEyes({ core, spec, logger: defaultLogger }) {
     return async function openEyes({ target, settings, base, logger = defaultLogger, }) {
-        var _a, _b, _c, _d, _e;
-        var _f;
+        var _a, _b, _c, _d, _e, _f;
+        var _g;
         logger.log(`Command "openEyes" is called with ${target ? 'default driver and' : ''}`, ...(settings ? ['settings', settings] : []), base ? 'predefined eyes' : '');
         const driver = target && (await (0, driver_1.makeDriver)({ spec, driver: target, logger, customConfig: settings }));
         if (driver && !base) {
+            const environment = await driver.getEnvironment();
             const currentContext = driver.currentContext;
             (_a = settings.environment) !== null && _a !== void 0 ? _a : (settings.environment = {});
-            if (driver.isEC) {
-                settings.environment.ecSessionId = driver.sessionId;
+            if (environment.isEC) {
+                settings.environment.ecSessionId = (await driver.getSessionId());
             }
-            if (driver.isWeb) {
-                (_b = (_f = settings.environment).userAgent) !== null && _b !== void 0 ? _b : (_f.userAgent = driver.userAgent);
+            if (environment.isWeb) {
+                (_b = (_g = settings.environment).userAgent) !== null && _b !== void 0 ? _b : (_g.userAgent = (_c = (await driver.getUserAgentLegacy())) !== null && _c !== void 0 ? _c : undefined);
             }
-            if (!settings.environment.deviceName && driver.deviceName) {
-                settings.environment.deviceName = driver.deviceName;
+            if (!settings.environment.deviceName && environment.deviceName) {
+                settings.environment.deviceName = environment.deviceName;
             }
             if (!settings.environment.os) {
-                if (driver.isNative && driver.platformName) {
-                    settings.environment.os = driver.platformName;
+                if (environment.isNative && environment.platformName) {
+                    settings.environment.os = environment.platformName;
                     if (!settings.keepPlatformNameAsIs) {
-                        if ((_c = settings.environment.os) === null || _c === void 0 ? void 0 : _c.startsWith('android')) {
+                        if ((_d = settings.environment.os) === null || _d === void 0 ? void 0 : _d.startsWith('android')) {
                             settings.environment.os = `Android${settings.environment.os.slice(7)}`;
                         }
-                        if ((_d = settings.environment.os) === null || _d === void 0 ? void 0 : _d.startsWith('ios')) {
+                        if ((_e = settings.environment.os) === null || _e === void 0 ? void 0 : _e.startsWith('ios')) {
                             settings.environment.os = `iOS${settings.environment.os.slice(3)}`;
                         }
                     }
-                    if (driver.platformVersion) {
-                        settings.environment.os += ` ${driver.platformVersion}`;
+                    if (environment.platformVersion) {
+                        settings.environment.os += ` ${environment.platformVersion}`;
                     }
                 }
-                else if (driver.isChromium &&
-                    ((driver.isWindows && Number.parseInt(driver.browserVersion) >= 107) ||
-                        (driver.isMac && Number.parseInt(driver.browserVersion) >= 90))) {
-                    settings.environment.os = `${driver.platformName} ${(_e = driver.platformVersion) !== null && _e !== void 0 ? _e : ''}`.trim();
+                else if (environment.isChromium &&
+                    ((environment.isWindows && Number.parseInt(environment.browserVersion) >= 107) ||
+                        (environment.isMac && Number.parseInt(environment.browserVersion) >= 90))) {
+                    settings.environment.os = `${environment.platformName} ${(_f = environment.platformVersion) !== null && _f !== void 0 ? _f : ''}`.trim();
                 }
             }
-            if (!settings.environment.viewportSize || driver.isMobile) {
+            if (!settings.environment.viewportSize || environment.isMobile) {
+                const viewport = await driver.getViewport();
                 const size = await driver.getViewportSize();
-                settings.environment.viewportSize = utils.geometry.scale(size, driver.viewportScale);
+                settings.environment.viewportSize = utils.geometry.scale(size, viewport.viewportScale);
             }
             else {
                 await driver.setViewportSize(settings.environment.viewportSize);

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

@@ -4,16 +4,19 @@ exports.takeDomCapture = void 0;
 const req_1 = require("@applitools/req");
 const { getCaptureDomPoll, getPollResult, getCaptureDomPollForIE, getPollResultForIE, } = require('@applitools/dom-capture');
 async function takeDomCapture({ driver, settings, logger, }) {
-    var _a, _b, _c;
-    const isLegacyBrowser = driver.isIE || driver.isEdgeLegacy;
+    var _a;
+    const environment = await driver.getEnvironment();
+    const features = await driver.getFeatures();
+    const isLegacyBrowser = environment.isIE || environment.isEdgeLegacy;
     const arg = {
-        chunkByteLength: (_a = settings === null || settings === void 0 ? void 0 : settings.chunkByteLength) !== null && _a !== void 0 ? _a : (Number(process.env.APPLITOOLS_SCRIPT_RESULT_MAX_BYTE_LENGTH) || (driver.isIOS ? 100000 : 250 * 1024 * 1024)),
+        chunkByteLength: (_a = settings === null || settings === void 0 ? void 0 : settings.chunkByteLength) !== null && _a !== void 0 ? _a : (Number(process.env.APPLITOOLS_SCRIPT_RESULT_MAX_BYTE_LENGTH) ||
+            (environment.isIOS ? 100000 : 250 * 1024 * 1024)),
     };
     const scripts = {
-        main: ((_b = driver.features) === null || _b === void 0 ? void 0 : _b.canExecuteOnlyFunctionScripts)
+        main: features.canExecuteOnlyFunctionScripts
             ? require('@applitools/dom-capture').captureDomPoll
             : `return (${isLegacyBrowser ? await getCaptureDomPollForIE() : await getCaptureDomPoll()}).apply(null, arguments);`,
-        poll: ((_c = driver.features) === null || _c === void 0 ? void 0 : _c.canExecuteOnlyFunctionScripts)
+        poll: features.canExecuteOnlyFunctionScripts
             ? require('@applitools/dom-capture').pollResult
             : `return (${isLegacyBrowser ? await getPollResultForIE() : await getPollResult()}).apply(null, arguments);`,
     };
@@ -63,12 +66,14 @@ async function takeDomCapture({ driver, settings, logger, }) {
         return dom;
     }
     async function fetchCssResource(url) {
+        var _a;
         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,
                 retry: {
                     limit: 1,
-                    validate: ({ response, error }) => Boolean(error) || !response.ok,
+                    validate: ({ response, error }) => !!error || !response.ok,
                 },
                 fetch: settings === null || settings === void 0 ? void 0 : settings.fetch,
             });

package/dist/get-manager-results.js

@@ -30,7 +30,6 @@ function makeGetManagerResults({ core, storage, logger: defaultLogger, }) {
             if (!duplicateContainers.length)
                 logger.log('No duplicate tests found.');
             else {
-                logger.log(`Duplicates found (${duplicateContainers.length} in total), cleaning them up...`);
                 await Promise.all(duplicateContainers.map(async (container) => {
                     if (container.result) {
                         await core.deleteTest({

package/dist/open-eyes.js

@@ -54,7 +54,8 @@ function makeOpenEyes({ type: defaultType = 'classic', concurrency, batch, core,
         (_p = settings.ignoreBaseline) !== null && _p !== void 0 ? _p : (settings.ignoreBaseline = false);
         (_q = settings.compareWithParentBranch) !== null && _q !== void 0 ? _q : (settings.compareWithParentBranch = false);
         const driver = target && (await (0, driver_1.makeDriver)({ spec, driver: target, logger, customConfig: settings }));
-        if (driver === null || driver === void 0 ? void 0 : driver.isEC) {
+        const environment = await (driver === null || driver === void 0 ? void 0 : driver.getEnvironment());
+        if (environment === null || environment === void 0 ? void 0 : environment.isEC) {
             (_r = settings.properties) !== null && _r !== void 0 ? _r : (settings.properties = []);
             settings.properties.push({ name: 'Running platform', value: 'Execution cloud' });
         }
@@ -70,7 +71,7 @@ function makeOpenEyes({ type: defaultType = 'classic', concurrency, batch, core,
                     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,
                     node: { version: process.version, platform: process.platform, arch: process.arch },
-                    driverUrl: driver === null || driver === void 0 ? void 0 : driver.remoteHostname,
+                    driverUrl: await (driver === null || driver === void 0 ? void 0 : driver.getDriverUrl()),
                     extractedCIProvider: (0, extract_ci_provider_1.extractCIProvider)(),
                 },
             },

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

@@ -39,7 +39,7 @@ const utils = __importStar(require("@applitools/utils"));
 const chalk_1 = __importDefault(require("chalk"));
 function makeCheckAndClose({ eyes, target: defaultTarget, spec, signal, logger: defaultLogger, }) {
     return async function checkAndClose({ target = defaultTarget, settings = {}, logger = defaultLogger, }) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         logger.log('Command "checkAndClose" is called with settings', settings);
         if (signal === null || signal === void 0 ? void 0 : signal.aborted) {
             logger.warn('Command "checkAndClose" was called after test was already aborted');
@@ -63,8 +63,9 @@ function makeCheckAndClose({ eyes, target: defaultTarget, spec, signal, logger:
         let selectorsToCalculate;
         const driver = spec && (0, driver_1.isDriver)(target, spec) ? await (0, driver_1.makeDriver)({ spec, driver: target, logger }) : null;
         if (driver) {
+            const environment = await driver.getEnvironment();
             if (uniqueRenderers.length === 0) {
-                if (driver.isWeb) {
+                if (environment.isWeb) {
                     const viewportSize = await driver.getViewportSize();
                     uniqueRenderers.push({ name: 'chrome', ...viewportSize });
                 }
@@ -73,8 +74,8 @@ function makeCheckAndClose({ eyes, target: defaultTarget, spec, signal, logger:
                 }
             }
             let cleanupGeneratedSelectors;
-            if (driver.isWeb) {
-                userAgent = driver.userAgent;
+            if (environment.isWeb) {
+                userAgent = (_b = (await driver.getUserAgentLegacy())) !== null && _b !== void 0 ? _b : undefined;
                 const generated = await (0, generate_safe_selectors_1.generateSafeSelectors)({
                     context: driver.currentContext,
                     elementReferences: [
@@ -86,22 +87,22 @@ function makeCheckAndClose({ eyes, target: defaultTarget, spec, signal, logger:
                 cleanupGeneratedSelectors = generated.cleanupGeneratedSelectors;
                 selectorsToCalculate = generated.selectors;
                 if (elementReferenceToTarget) {
-                    if (!((_b = selectorsToCalculate[0]) === null || _b === void 0 ? void 0 : _b.safeSelector))
+                    if (!((_c = selectorsToCalculate[0]) === null || _c === void 0 ? void 0 : _c.safeSelector))
                         throw new Error('Target element not found');
                     regionToTarget = selectorsToCalculate[0].safeSelector;
                     selectorsToCalculate = selectorsToCalculate.slice(1);
                 }
                 if (settings.scrollRootElement) {
-                    scrollRootSelector = (_c = selectorsToCalculate[0].safeSelector) !== null && _c !== void 0 ? _c : undefined;
+                    scrollRootSelector = (_d = selectorsToCalculate[0].safeSelector) !== null && _d !== void 0 ? _d : undefined;
                     selectorsToCalculate = selectorsToCalculate.slice(1);
                 }
             }
             else {
                 regionToTarget = (0, driver_1.isSelector)(elementReferenceToTarget)
-                    ? (_e = (_d = spec === null || spec === void 0 ? void 0 : spec.untransformSelector) === null || _d === void 0 ? void 0 : _d.call(spec, settings.scrollRootElement)) !== null && _e !== void 0 ? _e : undefined
+                    ? (_f = (_e = spec === null || spec === void 0 ? void 0 : spec.untransformSelector) === null || _e === void 0 ? void 0 : _e.call(spec, settings.scrollRootElement)) !== null && _f !== void 0 ? _f : undefined
                     : undefined;
                 scrollRootSelector = (0, driver_1.isSelector)(settings.scrollRootElement)
-                    ? (_g = (_f = spec === null || spec === void 0 ? void 0 : spec.untransformSelector) === null || _f === void 0 ? void 0 : _f.call(spec, settings.scrollRootElement)) !== null && _g !== void 0 ? _g : undefined
+                    ? (_h = (_g = spec === null || spec === void 0 ? void 0 : spec.untransformSelector) === null || _g === void 0 ? void 0 : _g.call(spec, settings.scrollRootElement)) !== null && _h !== void 0 ? _h : undefined
                     : undefined;
             }
             const currentContext = driver.currentContext;
@@ -116,7 +117,7 @@ function makeCheckAndClose({ eyes, target: defaultTarget, spec, signal, logger:
                 },
                 hooks: {
                     async beforeSnapshots() {
-                        if (settings.lazyLoad && driver.isWeb) {
+                        if (settings.lazyLoad && environment.isWeb) {
                             await (0, wait_for_lazy_load_1.waitForLazyLoad)({
                                 context: driver.currentContext,
                                 settings: settings.lazyLoad !== true ? settings.lazyLoad : {},
@@ -130,7 +131,7 @@ function makeCheckAndClose({ eyes, target: defaultTarget, spec, signal, logger:
                     getIOSDevices: ufgClient.getIOSDevices,
                 },
             };
-            if (driver.isWeb) {
+            if (environment.isWeb) {
                 snapshots = await (0, take_dom_snapshots_1.takeDomSnapshots)({ driver, ...snapshotOptions, logger });
             }
             else {
@@ -151,7 +152,7 @@ function makeCheckAndClose({ eyes, target: defaultTarget, spec, signal, logger:
             snapshots = !utils.types.isArray(target) ? Array(uniqueRenderers.length).fill(target) : target;
             snapshotUrl = utils.types.has(snapshots[0], 'url') ? snapshots[0].url : undefined;
         }
-        regionToTarget !== null && regionToTarget !== void 0 ? regionToTarget : (regionToTarget = (_h = elementReferenceToTarget) !== null && _h !== void 0 ? _h : settings.region);
+        regionToTarget !== null && regionToTarget !== void 0 ? regionToTarget : (regionToTarget = (_j = elementReferenceToTarget) !== null && _j !== void 0 ? _j : settings.region);
         selectorsToCalculate !== null && selectorsToCalculate !== void 0 ? selectorsToCalculate : (selectorsToCalculate = elementReferencesToCalculate.map(selector => ({
             originalSelector: selector,
             safeSelector: selector,

package/dist/ufg/check.js

@@ -39,7 +39,7 @@ const utils = __importStar(require("@applitools/utils"));
 const chalk_1 = __importDefault(require("chalk"));
 function makeCheck({ eyes, target: defaultTarget, spec, signal, logger: defaultLogger, }) {
     return async function check({ target = defaultTarget, settings = {}, logger = defaultLogger, }) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         logger.log('Command "check" is called with settings', settings);
         if (signal === null || signal === void 0 ? void 0 : signal.aborted) {
             logger.warn('Command "check" was called after test was already aborted');
@@ -63,9 +63,10 @@ function makeCheck({ eyes, target: defaultTarget, spec, signal, logger: defaultL
         let selectorsToCalculate;
         const driver = spec && (0, driver_1.isDriver)(target, spec) ? await (0, driver_1.makeDriver)({ spec, driver: target, logger }) : null;
         if (driver) {
+            const environment = await driver.getEnvironment();
             await driver.currentContext.setScrollingElement((_b = settings.scrollRootElement) !== null && _b !== void 0 ? _b : null);
             if (uniqueRenderers.length === 0) {
-                if (driver.isWeb) {
+                if (environment.isWeb) {
                     const viewportSize = await driver.getViewportSize();
                     uniqueRenderers.push({ name: 'chrome', ...viewportSize });
                 }
@@ -74,8 +75,8 @@ function makeCheck({ eyes, target: defaultTarget, spec, signal, logger: defaultL
                 }
             }
             let cleanupGeneratedSelectors;
-            if (driver.isWeb) {
-                userAgent = driver.userAgent;
+            if (environment.isWeb) {
+                userAgent = (_c = (await driver.getUserAgentLegacy())) !== null && _c !== void 0 ? _c : undefined;
                 const generated = await (0, generate_safe_selectors_1.generateSafeSelectors)({
                     context: driver.currentContext,
                     elementReferences: [
@@ -87,22 +88,22 @@ function makeCheck({ eyes, target: defaultTarget, spec, signal, logger: defaultL
                 cleanupGeneratedSelectors = generated.cleanupGeneratedSelectors;
                 selectorsToCalculate = generated.selectors;
                 if (elementReferenceToTarget) {
-                    if (!((_c = selectorsToCalculate[0]) === null || _c === void 0 ? void 0 : _c.safeSelector))
+                    if (!((_d = selectorsToCalculate[0]) === null || _d === void 0 ? void 0 : _d.safeSelector))
                         throw new Error('Target element not found');
                     regionToTarget = selectorsToCalculate[0].safeSelector;
                     selectorsToCalculate = selectorsToCalculate.slice(1);
                 }
                 if (settings.scrollRootElement) {
-                    scrollRootSelector = (_d = selectorsToCalculate[0].safeSelector) !== null && _d !== void 0 ? _d : undefined;
+                    scrollRootSelector = (_e = selectorsToCalculate[0].safeSelector) !== null && _e !== void 0 ? _e : undefined;
                     selectorsToCalculate = selectorsToCalculate.slice(1);
                 }
             }
             else {
                 regionToTarget = (0, driver_1.isSelector)(elementReferenceToTarget)
-                    ? (_f = (_e = spec === null || spec === void 0 ? void 0 : spec.untransformSelector) === null || _e === void 0 ? void 0 : _e.call(spec, settings.scrollRootElement)) !== null && _f !== void 0 ? _f : undefined
+                    ? (_g = (_f = spec === null || spec === void 0 ? void 0 : spec.untransformSelector) === null || _f === void 0 ? void 0 : _f.call(spec, settings.scrollRootElement)) !== null && _g !== void 0 ? _g : undefined
                     : undefined;
                 scrollRootSelector = (0, driver_1.isSelector)(settings.scrollRootElement)
-                    ? (_h = (_g = spec === null || spec === void 0 ? void 0 : spec.untransformSelector) === null || _g === void 0 ? void 0 : _g.call(spec, settings.scrollRootElement)) !== null && _h !== void 0 ? _h : undefined
+                    ? (_j = (_h = spec === null || spec === void 0 ? void 0 : spec.untransformSelector) === null || _h === void 0 ? void 0 : _h.call(spec, settings.scrollRootElement)) !== null && _j !== void 0 ? _j : undefined
                     : undefined;
             }
             const currentContext = driver.currentContext;
@@ -117,7 +118,7 @@ function makeCheck({ eyes, target: defaultTarget, spec, signal, logger: defaultL
                 },
                 hooks: {
                     async beforeSnapshots() {
-                        if (settings.lazyLoad && driver.isWeb) {
+                        if (settings.lazyLoad && environment.isWeb) {
                             await (0, wait_for_lazy_load_1.waitForLazyLoad)({
                                 context: driver.currentContext,
                                 settings: settings.lazyLoad !== true ? settings.lazyLoad : {},
@@ -131,7 +132,7 @@ function makeCheck({ eyes, target: defaultTarget, spec, signal, logger: defaultL
                     getIOSDevices: ufgClient.getIOSDevices,
                 },
             };
-            if (driver.isWeb) {
+            if (environment.isWeb) {
                 snapshots = await (0, take_dom_snapshots_1.takeDomSnapshots)({ driver, ...snapshotOptions, logger });
             }
             else {
@@ -152,7 +153,7 @@ function makeCheck({ eyes, target: defaultTarget, spec, signal, logger: defaultL
             snapshots = !utils.types.isArray(target) ? Array(uniqueRenderers.length).fill(target) : target;
             snapshotUrl = utils.types.has(snapshots[0], 'url') ? snapshots[0].url : undefined;
         }
-        regionToTarget !== null && regionToTarget !== void 0 ? regionToTarget : (regionToTarget = (_j = elementReferenceToTarget) !== null && _j !== void 0 ? _j : settings.region);
+        regionToTarget !== null && regionToTarget !== void 0 ? regionToTarget : (regionToTarget = (_k = elementReferenceToTarget) !== null && _k !== void 0 ? _k : settings.region);
         selectorsToCalculate !== null && selectorsToCalculate !== void 0 ? selectorsToCalculate : (selectorsToCalculate = elementReferencesToCalculate.map(selector => ({
             originalSelector: selector,
             safeSelector: selector,

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

@@ -27,7 +27,7 @@ exports.makeGetNMLClient = void 0;
 const nml_client_1 = require("@applitools/nml-client");
 const utils = __importStar(require("@applitools/utils"));
 function makeGetNMLClient({ client, logger: defaultLogger }) {
-    const getNMLClientWithCache = utils.general.cachify(getNMLClient, ([options]) => client ? 'default' : [options.driver.sessionId, options.config]);
+    const getNMLClientWithCache = utils.general.cachify(getNMLClient, ([options]) => client ? 'default' : [options.driver.guid, options.config]);
     if (client)
         getNMLClientWithCache.setCachedValue('default', Promise.resolve(client));
     return getNMLClientWithCache;

package/dist/ufg/open-eyes.js

@@ -35,14 +35,15 @@ const abort_controller_1 = require("abort-controller");
 const utils = __importStar(require("@applitools/utils"));
 function makeOpenEyes({ core, spec, logger: defaultLogger }) {
     return async function openEyes({ target, settings, base, logger = defaultLogger, }) {
-        var _a;
+        var _a, _b;
         logger.log(`Command "openEyes" is called with ${target ? 'default driver and' : ''}`, ...(settings ? ['settings', settings] : []), base ? 'predefined eyes' : '');
         const driver = target && (await (0, driver_1.makeDriver)({ spec, driver: target, logger }));
         if (driver && !base) {
+            const environment = await (driver === null || driver === void 0 ? void 0 : driver.getEnvironment());
             const currentContext = driver.currentContext;
             (_a = settings.environment) !== null && _a !== void 0 ? _a : (settings.environment = {});
-            if (driver.isEC) {
-                settings.environment.ecSessionId = driver.sessionId;
+            if (environment.isEC) {
+                settings.environment.ecSessionId = (_b = (await driver.getSessionId())) !== null && _b !== void 0 ? _b : undefined;
             }
             if (settings.environment.viewportSize) {
                 await driver.setViewportSize(settings.environment.viewportSize);

package/dist/ufg/utils/take-dom-snapshot.js

@@ -27,41 +27,43 @@ exports.extractCrossFrames = exports.deserializeDomSnapshot = exports.takeDomSna
 const utils = __importStar(require("@applitools/utils"));
 const { getProcessPagePoll, getPollResult, getProcessPagePollForIE, getPollResultForIE, } = require('@applitools/dom-snapshot');
 async function takeDomSnapshot({ context, settings, logger, }) {
-    var _a;
     const driver = context.driver;
-    const cookies = ((_a = driver.features) === null || _a === void 0 ? void 0 : _a.allCookies) ? await driver.getCookies().catch(() => []) : [];
+    const environment = await driver.getEnvironment();
+    const features = await driver.getFeatures();
+    const cookies = features.allCookies ? await driver.getCookies().catch(() => []) : [];
     const snapshot = deserializeDomSnapshot({ snapshot: await takeContextDomSnapshot({ context }) });
     snapshot.cookies = cookies;
     return snapshot;
     async function takeContextDomSnapshot({ context }) {
         // logger.log(`taking dom snapshot. ${context._reference ? `context referece: ${JSON.stringify(context._reference)}` : ''}`)
-        var _a, _b, _c, _d, _e, _f;
-        if (!((_a = driver.features) === null || _a === void 0 ? void 0 : _a.allCookies)) {
+        var _a, _b, _c;
+        if (!features.allCookies) {
             cookies.push(...(await context.getCookies()));
         }
-        const isLegacyBrowser = driver.isIE || driver.isEdgeLegacy;
+        const isLegacyBrowser = environment.isIE || environment.isEdgeLegacy;
         const arg = {
             dontFetchResources: settings === null || settings === void 0 ? void 0 : settings.disableBrowserFetching,
             skipResources: settings === null || settings === void 0 ? void 0 : settings.skipResources,
             removeReverseProxyURLPrefixes: Boolean(process.env.APPLITOOLS_SCRIPT_REMOVE_REVERSE_PROXY_URL_PREFIXES),
-            chunkByteLength: (_b = settings === null || settings === void 0 ? void 0 : settings.chunkByteLength) !== null && _b !== void 0 ? _b : (Number(process.env.APPLITOOLS_SCRIPT_RESULT_MAX_BYTE_LENGTH) || (driver.isIOS ? 100000 : 250 * 1024 * 1024)),
+            chunkByteLength: (_a = settings === null || settings === void 0 ? void 0 : settings.chunkByteLength) !== null && _a !== void 0 ? _a : (Number(process.env.APPLITOOLS_SCRIPT_RESULT_MAX_BYTE_LENGTH) ||
+                (environment.isIOS ? 100000 : 250 * 1024 * 1024)),
             serializeResources: true,
             compressResources: false,
             showLogs: settings === null || settings === void 0 ? void 0 : settings.showLogs,
         };
         const scripts = {
-            main: ((_c = driver.features) === null || _c === void 0 ? void 0 : _c.canExecuteOnlyFunctionScripts)
+            main: features.canExecuteOnlyFunctionScripts
                 ? require('@applitools/dom-snapshot').processPagePoll
                 : `return (${isLegacyBrowser ? await getProcessPagePollForIE() : await getProcessPagePoll()}).apply(null, arguments);`,
-            poll: ((_d = driver.features) === null || _d === void 0 ? void 0 : _d.canExecuteOnlyFunctionScripts)
+            poll: features.canExecuteOnlyFunctionScripts
                 ? require('@applitools/dom-snapshot').pollResult
                 : `return (${isLegacyBrowser ? await getPollResultForIE() : await getPollResult()}).apply(null, arguments);`,
         };
         const snapshot = await context.executePoll(scripts, {
             main: arg,
             poll: arg,
-            executionTimeout: (_e = settings === null || settings === void 0 ? void 0 : settings.executionTimeout) !== null && _e !== void 0 ? _e : 5 * 60 * 1000,
-            pollTimeout: (_f = settings === null || settings === void 0 ? void 0 : settings.pollTimeout) !== null && _f !== void 0 ? _f : 200,
+            executionTimeout: (_b = settings === null || settings === void 0 ? void 0 : settings.executionTimeout) !== null && _b !== void 0 ? _b : 5 * 60 * 1000,
+            pollTimeout: (_c = settings === null || settings === void 0 ? void 0 : settings.pollTimeout) !== null && _c !== void 0 ? _c : 200,
         });
         const crossFrames = extractCrossFrames({ snapshot, logger });
         for (const { reference, parentSnapshot, cdtNode } of crossFrames) {

package/dist/ufg/utils/take-vhses.js

@@ -4,16 +4,17 @@ exports.takeVHSes = void 0;
 async function takeVHSes({ driver, settings, hooks, logger, }) {
     var _a;
     logger.log('taking VHS');
-    if (!driver.isAndroid && !driver.isIOS) {
+    const environment = await driver.getEnvironment();
+    if (!environment.isAndroid && !environment.isIOS) {
         throw new Error('cannot take VHS on mobile device other than iOS or Android');
     }
     await ((_a = hooks === null || hooks === void 0 ? void 0 : hooks.beforeSnapshots) === null || _a === void 0 ? void 0 : _a.call(hooks));
-    const trigger = await driver.waitFor(driver.isAndroid
+    const trigger = await driver.waitFor(environment.isAndroid
         ? { type: 'xpath', selector: `//android.widget.Button[@content-desc="UFG_TriggerArea"]` }
         : { type: 'accessibility id', selector: 'UFG_TriggerArea' }, { timeout: 30000 });
     if (!trigger)
         throw new Error('Trigger element could not be found');
-    if (driver.isAndroid) {
+    if (environment.isAndroid) {
         const apiKeyInput = await driver.element({
             type: 'xpath',
             selector: `//android.widget.EditText[@content-desc="UFG_Apikey"]`,
@@ -41,14 +42,14 @@ async function takeVHSes({ driver, settings, hooks, logger, }) {
         }
     }
     await trigger.click(); // TODO handle stale element exception and then find the trigger again and click it
-    let label = await driver.waitFor(driver.isAndroid
+    let label = await driver.waitFor(environment.isAndroid
         ? { type: 'xpath', selector: `//android.widget.TextView[@content-desc="UFG_SecondaryLabel"]` }
         : { type: 'accessibility id', selector: 'UFG_SecondaryLabel' }, { timeout: 10000 });
     if (!label) {
         // This might happen if the tap on the trigger area didn't happen due to Appium bug. So we try to find the trigger again and if it's present, we'll tap it.
         // If the trigger area is not present, then we're probably at the middle of taking the VHS - give it 50 seconds more until we give up
         logger.log('UFG_SecondaryLabel was not found after 10 seconds, trying to click UFG_TriggerArea again');
-        const triggerRetry = await driver.waitFor(driver.isAndroid
+        const triggerRetry = await driver.waitFor(environment.isAndroid
             ? { type: 'xpath', selector: `//android.widget.Button[@content-desc="UFG_TriggerArea"]` }
             : { type: 'accessibility id', selector: 'UFG_TriggerArea' }, { timeout: 30000 });
         if (triggerRetry) {
@@ -58,7 +59,7 @@ async function takeVHSes({ driver, settings, hooks, logger, }) {
         else {
             logger.log('UFG_TriggerArea was NOT found on retry. Probably VHS is being taken.');
         }
-        label = await driver.waitFor(driver.isAndroid
+        label = await driver.waitFor(environment.isAndroid
             ? { type: 'xpath', selector: `//android.widget.TextView[@content-desc="UFG_SecondaryLabel"]` }
             : { type: 'accessibility id', selector: 'UFG_SecondaryLabel' }, { timeout: 50000 });
         if (!label) {
@@ -71,7 +72,7 @@ async function takeVHSes({ driver, settings, hooks, logger, }) {
     if (info.error)
         throw new Error(`Error while taking VHS - ${info.error}`);
     let vhs = '';
-    if (driver.isIOS) {
+    if (environment.isIOS) {
         const label = await driver.element({ type: 'accessibility id', selector: 'UFG_Label' });
         if (!label)
             throw new Error('VHS label element could not be found');
@@ -99,14 +100,14 @@ async function takeVHSes({ driver, settings, hooks, logger, }) {
     else {
         throw new Error(`unknown mode for android: ${info.mode}`);
     }
-    const clear = await driver.waitFor(driver.isAndroid
+    const clear = await driver.waitFor(environment.isAndroid
         ? { type: 'xpath', selector: `//android.widget.Button[@content-desc="UFG_ClearArea"]` }
         : { type: 'accessibility id', selector: 'UFG_ClearArea' }, { timeout: 30000 });
     if (!clear)
         throw new Error('Clear element could not be found');
     await clear.click();
     let snapshot;
-    if (driver.isAndroid) {
+    if (environment.isAndroid) {
         snapshot = {
             platformName: 'android',
             vhsType: info.flavorName,

package/dist/utils/separate-duplicate-results.js

@@ -2,27 +2,25 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.separateDuplicateResults = void 0;
 function separateDuplicateResults(containers) {
-    var _a;
     const containerByBaselineId = new Map();
     const duplicates = [];
     const possibleDuplicateContainers = containers.filter(container => { var _a; return !((_a = container.result) === null || _a === void 0 ? void 0 : _a.keepIfDuplicate); });
     for (const container of possibleDuplicateContainers) {
-        const baselineId = (_a = container.result) === null || _a === void 0 ? void 0 : _a.baselineId;
-        if (baselineId) {
-            const containerForThisBaseline = containerByBaselineId.get(baselineId);
-            if (containerForThisBaseline) {
-                const startedAt1 = Date.parse(containerForThisBaseline.result.startedAt);
-                const startedAt2 = Date.parse(container.result.startedAt);
-                if (startedAt2 > startedAt1) {
+        if (container.result) {
+            const containerForThisBaseline = containerByBaselineId.get(container.result.baselineId);
+            if (containerForThisBaseline === null || containerForThisBaseline === void 0 ? void 0 : containerForThisBaseline.result) {
+                const initializedAt1 = Date.parse(containerForThisBaseline.result.initializedAt);
+                const initializedAt2 = Date.parse(container.result.initializedAt);
+                if (initializedAt2 > initializedAt1) {
                     duplicates.push(containerForThisBaseline);
-                    containerByBaselineId.set(baselineId, container);
+                    containerByBaselineId.set(container.result.baselineId, container);
                 }
                 else {
                     duplicates.push(container);
                 }
             }
             else {
-                containerByBaselineId.set(baselineId, container);
+                containerByBaselineId.set(container.result.baselineId, container);
             }
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/core",
-  "version": "2.4.5",
+  "version": "2.4.6",
   "homepage": "https://applitools.com",
   "bugs": {
     "url": "https://github.com/applitools/eyes.sdk.javascript1/issues"
@@ -75,19 +75,19 @@
     ]
   },
   "dependencies": {
-    "@applitools/core-base": "1.1.44",
+    "@applitools/core-base": "1.1.45",
     "@applitools/dom-capture": "11.2.1",
     "@applitools/dom-snapshot": "4.7.7",
-    "@applitools/driver": "1.11.37",
-    "@applitools/ec-client": "1.2.18",
+    "@applitools/driver": "1.11.38",
+    "@applitools/ec-client": "1.2.19",
     "@applitools/logger": "1.1.48",
-    "@applitools/nml-client": "1.3.42",
+    "@applitools/nml-client": "1.3.43",
     "@applitools/req": "1.1.33",
-    "@applitools/screenshoter": "3.7.32",
-    "@applitools/snippets": "2.4.17",
+    "@applitools/screenshoter": "3.7.33",
+    "@applitools/snippets": "2.4.18",
     "@applitools/socket": "1.0.10",
-    "@applitools/spec-driver-webdriver": "1.0.18",
-    "@applitools/ufg-client": "1.2.5",
+    "@applitools/spec-driver-webdriver": "1.0.19",
+    "@applitools/ufg-client": "1.2.6",
     "@applitools/utils": "1.3.32",
     "@types/ws": "8.5.4",
     "abort-controller": "3.0.0",
@@ -100,9 +100,9 @@
   "devDependencies": {
     "@applitools/bongo": "^3.0.3",
     "@applitools/sdk-coverage-tests": "^3.0.0",
-    "@applitools/spec-driver-puppeteer": "^1.1.50",
-    "@applitools/spec-driver-selenium": "^1.5.35",
-    "@applitools/spec-driver-webdriverio": "^1.4.33",
+    "@applitools/spec-driver-puppeteer": "^1.1.51",
+    "@applitools/spec-driver-selenium": "^1.5.36",
+    "@applitools/spec-driver-webdriverio": "^1.4.34",
     "@applitools/test-server": "^1.1.28",
     "@applitools/test-utils": "^1.5.15",
     "@types/node": "^12.20.55",

package/types/classic/utils/take-dom-capture.d.ts

@@ -3,6 +3,7 @@ import { type Logger } from '@applitools/logger';
 import { type Fetch } from '@applitools/req';
 export type DomCaptureSettings = {
     fetch?: Fetch;
+    fetchTimeout?: number;
     executionTimeout?: number;
     pollTimeout?: number;
     chunkByteLength?: number;