@applitools/core 1.2.8 → 1.2.10

package/dist/classic/open-eyes.js

@@ -32,7 +32,8 @@ const extract_text_1 = require("./extract-text");
 const utils = __importStar(require("@applitools/utils"));
 function makeOpenEyes({ spec, core, logger: defaultLogger, }) {
     return async function openEyes({ target, settings, logger = defaultLogger, }) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e;
+        var _f;
         logger.log(`Command "openEyes" is called with ${(spec === null || spec === void 0 ? void 0 : spec.isDriver(target)) ? 'default driver and' : ''} settings`, settings);
         // TODO driver custom config
         const driver = (spec === null || spec === void 0 ? void 0 : spec.isDriver(target))
@@ -47,8 +48,13 @@ function makeOpenEyes({ spec, core, logger: defaultLogger, }) {
             else {
                 await driver.setViewportSize(settings.environment.viewportSize);
             }
-            if (!settings.environment.userAgent && driver.isWeb) {
-                settings.environment.userAgent = driver.userAgent;
+            if (driver.isWeb) {
+                (_b = (_f = settings.environment).userAgent) !== null && _b !== void 0 ? _b : (_f.userAgent = driver.userAgent);
+                if (driver.isChromium &&
+                    ((driver.isWindows && Number.parseInt(driver.browserVersion) >= 107) ||
+                        (driver.isMac && Number.parseInt(driver.browserVersion) >= 90))) {
+                    settings.environment.os = `${driver.platformName} ${(_c = driver.platformVersion) !== null && _c !== void 0 ? _c : ''}`.trim();
+                }
             }
             if (!settings.environment.deviceName && driver.deviceName) {
                 settings.environment.deviceName = driver.deviceName;
@@ -56,10 +62,10 @@ function makeOpenEyes({ spec, core, logger: defaultLogger, }) {
             if (!settings.environment.os && driver.isNative && driver.platformName) {
                 settings.environment.os = driver.platformName;
                 if (!settings.keepPlatformNameAsIs) {
-                    if ((_b = settings.environment.os) === null || _b === void 0 ? void 0 : _b.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 ((_c = settings.environment.os) === null || _c === void 0 ? void 0 : _c.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)}`;
                     }
                 }

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

@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.takeDomCapture = void 0;
 const dom_capture_1 = require("@applitools/dom-capture");
-const execute_poll_script_1 = require("../../utils/execute-poll-script");
 const req_1 = __importDefault(require("@applitools/req"));
 async function takeDomCapture({ driver, settings, logger, }) {
     var _a;
@@ -15,18 +14,12 @@ async function takeDomCapture({ driver, settings, logger, }) {
         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)),
     };
     const scripts = {
-        main: {
-            script: canExecuteOnlyFunctionScripts
-                ? require('@applitools/dom-capture').captureDomPoll
-                : `return (${isLegacyBrowser ? await (0, dom_capture_1.getCaptureDomPollForIE)() : await (0, dom_capture_1.getCaptureDomPoll)()}).apply(null, arguments);`,
-            args: [arg],
-        },
-        poll: {
-            script: canExecuteOnlyFunctionScripts
-                ? require('@applitools/dom-capture').pollResult
-                : `return (${isLegacyBrowser ? await (0, dom_capture_1.getPollResultForIE)() : await (0, dom_capture_1.getPollResult)()}).apply(null, arguments);`,
-            args: [arg],
-        },
+        main: canExecuteOnlyFunctionScripts
+            ? require('@applitools/dom-capture').captureDomPoll
+            : `return (${isLegacyBrowser ? await (0, dom_capture_1.getCaptureDomPollForIE)() : await (0, dom_capture_1.getCaptureDomPoll)()}).apply(null, arguments);`,
+        poll: canExecuteOnlyFunctionScripts
+            ? require('@applitools/dom-capture').pollResult
+            : `return (${isLegacyBrowser ? await (0, dom_capture_1.getPollResultForIE)() : await (0, dom_capture_1.getPollResult)()}).apply(null, arguments);`,
     };
     const url = await driver.getUrl();
     const dom = await captureContextDom(driver.mainContext);
@@ -34,11 +27,11 @@ async function takeDomCapture({ driver, settings, logger, }) {
     return dom;
     async function captureContextDom(context) {
         var _a, _b;
-        const capture = await (0, execute_poll_script_1.executePollScript)({
-            context,
-            scripts,
-            settings: { executionTimeout: (_a = settings === null || settings === void 0 ? void 0 : settings.executionTimeout) !== null && _a !== void 0 ? _a : 5 * 60 * 1000, pollTimeout: (_b = settings === null || settings === void 0 ? void 0 : settings.pollTimeout) !== null && _b !== void 0 ? _b : 200 },
-            logger,
+        const capture = await context.executePoll(scripts, {
+            main: arg,
+            poll: arg,
+            executionTimeout: (_a = settings === null || settings === void 0 ? void 0 : settings.executionTimeout) !== null && _a !== void 0 ? _a : 5 * 60 * 1000,
+            pollTimeout: (_b = settings === null || settings === void 0 ? void 0 : settings.pollTimeout) !== null && _b !== void 0 ? _b : 200,
         });
         if (!capture)
             return {};

package/dist/close.js

@@ -14,7 +14,23 @@ function makeClose({ eyes, logger: defaultLogger, }) {
                     throw new test_error_1.TestError(result);
             });
         }
-        return results;
+        return results.length > 0
+            ? results
+            : [
+                {
+                    userTestId: eyes.test.userTestId,
+                    name: '',
+                    steps: 0,
+                    matches: 0,
+                    mismatches: 0,
+                    missing: 0,
+                    exactMatches: 0,
+                    strictMatches: 0,
+                    contentMatches: 0,
+                    layoutMatches: 0,
+                    noneMatches: 0,
+                },
+            ];
     };
 }
 exports.makeClose = makeClose;

package/dist/make-manager.js

@@ -30,7 +30,7 @@ const core_2 = require("./ufg/core");
 const open_eyes_1 = require("./open-eyes");
 const close_manager_1 = require("./close-manager");
 const utils = __importStar(require("@applitools/utils"));
-function makeMakeManager({ spec, core, concurrency: defaultConcurrency, agentId: defaultAgentId, cwd = process.cwd(), logger: defaultLogger, }) {
+function makeMakeManager({ spec, core, concurrency: defaultConcurrency = utils.general.getEnvValue('CONCURRENCY', 'number'), agentId: defaultAgentId, cwd = process.cwd(), logger: defaultLogger, }) {
     return async function makeManager({ type, concurrency = defaultConcurrency, legacyConcurrency, agentId = type === 'ufg' ? defaultAgentId === null || defaultAgentId === void 0 ? void 0 : defaultAgentId.replace(/(\/\d)/, '.visualgrid$1') : defaultAgentId, logger = defaultLogger, } = {}) {
         core !== null && core !== void 0 ? core : (core = (0, core_base_1.makeCore)({ agentId, cwd, logger }));
         concurrency !== null && concurrency !== void 0 ? concurrency : (concurrency = utils.types.isInteger(legacyConcurrency) ? legacyConcurrency * 5 : 5);

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

@@ -25,7 +25,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.extractCrossFrames = exports.deserializeDomSnapshot = exports.takeDomSnapshot = void 0;
 const dom_snapshot_1 = require("@applitools/dom-snapshot");
-const execute_poll_script_1 = require("../../utils/execute-poll-script");
 const utils = __importStar(require("@applitools/utils"));
 async function takeDomSnapshot({ context, settings, logger, }) {
     var _a;
@@ -42,18 +41,12 @@ async function takeDomSnapshot({ context, settings, logger, }) {
         showLogs: settings === null || settings === void 0 ? void 0 : settings.showLogs,
     };
     const scripts = {
-        main: {
-            script: canExecuteOnlyFunctionScripts
-                ? require('@applitools/dom-snapshot').processPagePoll
-                : `return (${isLegacyBrowser ? await (0, dom_snapshot_1.getProcessPagePollForIE)() : await (0, dom_snapshot_1.getProcessPagePoll)()}).apply(null, arguments);`,
-            args: [arg],
-        },
-        poll: {
-            script: canExecuteOnlyFunctionScripts
-                ? require('@applitools/dom-snapshot').pollResult
-                : `return (${isLegacyBrowser ? await (0, dom_snapshot_1.getPollResultForIE)() : await (0, dom_snapshot_1.getPollResult)()}).apply(null, arguments);`,
-            args: [arg],
-        },
+        main: canExecuteOnlyFunctionScripts
+            ? require('@applitools/dom-snapshot').processPagePoll
+            : `return (${isLegacyBrowser ? await (0, dom_snapshot_1.getProcessPagePollForIE)() : await (0, dom_snapshot_1.getProcessPagePoll)()}).apply(null, arguments);`,
+        poll: canExecuteOnlyFunctionScripts
+            ? require('@applitools/dom-snapshot').pollResult
+            : `return (${isLegacyBrowser ? await (0, dom_snapshot_1.getPollResultForIE)() : await (0, dom_snapshot_1.getPollResult)()}).apply(null, arguments);`,
     };
     const cookies = driver.features.allCookies ? await driver.getCookies().catch(() => []) : [];
     const snapshot = await takeContextDomSnapshot({ context });
@@ -65,11 +58,11 @@ async function takeDomSnapshot({ context, settings, logger, }) {
         if (!driver.features.allCookies) {
             cookies.push(...(await context.getCookies()));
         }
-        const snapshot = await (0, execute_poll_script_1.executePollScript)({
-            context,
-            scripts,
-            settings: { executionTimeout: (_a = settings === null || settings === void 0 ? void 0 : settings.executionTimeout) !== null && _a !== void 0 ? _a : 5 * 60 * 1000, pollTimeout: (_b = settings === null || settings === void 0 ? void 0 : settings.pollTimeout) !== null && _b !== void 0 ? _b : 200 },
-            logger,
+        const snapshot = await context.executePoll(scripts, {
+            main: arg,
+            poll: arg,
+            executionTimeout: (_a = settings === null || settings === void 0 ? void 0 : settings.executionTimeout) !== null && _a !== void 0 ? _a : 5 * 60 * 1000,
+            pollTimeout: (_b = settings === null || settings === void 0 ? void 0 : settings.pollTimeout) !== null && _b !== void 0 ? _b : 200,
         });
         const crossFrames = extractCrossFrames({ snapshot, logger });
         for (const { reference, parentSnapshot, cdtNode } of crossFrames) {

package/dist/utils/wait-for-lazy-load.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.waitForLazyLoad = void 0;
 const snippets_1 = require("@applitools/snippets");
-const execute_poll_script_1 = require("./execute-poll-script");
 async function waitForLazyLoad({ driver, settings, logger, }) {
     var _a, _b, _c, _d, _e;
     logger.log('lazy loading the page before capturing a screenshot');
@@ -11,15 +10,11 @@ async function waitForLazyLoad({ driver, settings, logger, }) {
         waitingTime: (_b = settings.waitingTime) !== null && _b !== void 0 ? _b : 2000,
         maxAmountToScroll: (_c = settings.maxAmountToScroll) !== null && _c !== void 0 ? _c : 15000,
     };
-    const scripts = {
-        main: { script: snippets_1.lazyLoad, args: [[arg]] },
-        poll: { script: snippets_1.lazyLoad, args: [[]] },
-    };
-    await (0, execute_poll_script_1.executePollScript)({
-        context: driver.currentContext,
-        scripts,
-        settings: { executionTimeout: 5 * 60 * 1000, pollTimeout: (_e = (_d = settings.pollTimeout) !== null && _d !== void 0 ? _d : settings.waitingTime) !== null && _e !== void 0 ? _e : 2000 },
-        logger,
+    await driver.currentContext.executePoll(snippets_1.lazyLoad, {
+        main: [arg],
+        poll: [],
+        executionTimeout: 5 * 60 * 1000,
+        pollTimeout: (_e = (_d = settings.pollTimeout) !== null && _d !== void 0 ? _d : settings.waitingTime) !== null && _e !== void 0 ? _e : 2000,
     });
 }
 exports.waitForLazyLoad = waitForLazyLoad;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/core",
-  "version": "1.2.8",
+  "version": "1.2.10",
   "homepage": "https://applitools.com",
   "bugs": {
     "url": "https://github.com/applitools/eyes.sdk.javascript1/issues"
@@ -61,27 +61,27 @@
     }
   },
   "dependencies": {
-    "@applitools/core-base": "1.1.9",
+    "@applitools/core-base": "1.1.13",
     "@applitools/dom-capture": "11.2.0",
-    "@applitools/dom-snapshot": "4.7.0",
-    "@applitools/driver": "1.11.3",
-    "@applitools/logger": "1.1.28",
-    "@applitools/nml-client": "1.3.7",
-    "@applitools/req": "1.1.13",
-    "@applitools/screenshoter": "3.7.4",
-    "@applitools/snippets": "2.4.6",
-    "@applitools/ufg-client": "1.1.3",
-    "@applitools/utils": "1.3.14",
+    "@applitools/dom-snapshot": "4.7.1",
+    "@applitools/driver": "1.11.6",
+    "@applitools/logger": "1.1.30",
+    "@applitools/nml-client": "1.3.9",
+    "@applitools/req": "1.1.16",
+    "@applitools/screenshoter": "3.7.7",
+    "@applitools/snippets": "2.4.8",
+    "@applitools/ufg-client": "1.1.5",
+    "@applitools/utils": "1.3.16",
     "abort-controller": "3.0.0",
     "throat": "6.0.1"
   },
   "devDependencies": {
     "@applitools/bongo": "^2.2.0",
     "@applitools/sdk-fake-eyes-server": "^2.1.3",
-    "@applitools/spec-driver-puppeteer": "^1.1.20",
-    "@applitools/spec-driver-selenium": "^1.5.6",
-    "@applitools/spec-driver-webdriverio": "^1.4.4",
-    "@applitools/test-server": "^1.1.9",
+    "@applitools/spec-driver-puppeteer": "^1.1.21",
+    "@applitools/spec-driver-selenium": "^1.5.7",
+    "@applitools/spec-driver-webdriverio": "^1.4.5",
+    "@applitools/test-server": "^1.1.10",
     "@applitools/test-utils": "^1.5.2",
     "@types/mocha": "^9.1.1",
     "@types/node": "12",

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

@@ -1,9 +1,10 @@
 import { type Driver } from '@applitools/driver';
 import { type Logger } from '@applitools/logger';
-import { type PollScriptSettings } from '../../utils/execute-poll-script';
 import { type Fetch } from '@applitools/req';
-export declare type DomCaptureSettings = Partial<PollScriptSettings> & {
+export declare type DomCaptureSettings = {
     fetch?: Fetch;
+    executionTimeout?: number;
+    pollTimeout?: number;
     chunkByteLength?: number;
 };
 export declare function takeDomCapture<TDriver extends Driver<unknown, unknown, unknown, unknown>>({ driver, settings, logger, }: {

package/types/ufg/utils/take-dom-snapshot.d.ts

@@ -1,11 +1,12 @@
 import { type Logger } from '@applitools/logger';
 import { type Context } from '@applitools/driver';
 import { type DomSnapshot } from '@applitools/ufg-client';
-import { type PollScriptSettings } from '../../utils/execute-poll-script';
-export declare type DomSnapshotSettings = Partial<PollScriptSettings> & {
+export declare type DomSnapshotSettings = {
     disableBrowserFetching?: boolean;
     skipResources?: string[];
     chunkByteLength?: number;
+    executionTimeout?: number;
+    pollTimeout?: number;
     showLogs?: boolean;
 };
 export declare function takeDomSnapshot<TContext extends Context<unknown, unknown, unknown, unknown>>({ context, settings, logger, }: {

package/types/utils/wait-for-lazy-load.d.ts

@@ -1,10 +1,11 @@
 import { type Logger } from '@applitools/logger';
 import { type Driver } from '@applitools/driver';
-import { type PollScriptSettings } from './execute-poll-script';
-export declare type LazyLoadSettings = Partial<PollScriptSettings> & {
+export declare type LazyLoadSettings = {
     scrollLength?: number;
     waitingTime?: number;
     maxAmountToScroll?: number;
+    executionTimeout?: number;
+    pollTimeout?: number;
 };
 export declare function waitForLazyLoad<TDriver extends Driver<unknown, unknown, unknown, unknown>>({ driver, settings, logger, }: {
     driver: TDriver;

package/dist/utils/execute-poll-script.js

@@ -1,75 +0,0 @@
-"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.executePollScript = void 0;
-const core_base_1 = require("@applitools/core-base");
-const utils = __importStar(require("@applitools/utils"));
-async function executePollScript({ context, scripts, settings, logger, }) {
-    logger.log('Executing poll script');
-    let isExecutionTimedOut = false;
-    const executionTimer = setTimeout(() => (isExecutionTimedOut = true), settings.executionTimeout);
-    try {
-        const { script, args = [] } = scripts.main;
-        let response = deserialize(await context.execute(script, ...args));
-        let chunks = '';
-        while (!isExecutionTimedOut) {
-            if (response.status === 'ERROR') {
-                throw new core_base_1.CoreError(`Error during execute poll script: '${response.error}'`, {
-                    reason: 'poll script',
-                    error: response.error,
-                });
-            }
-            else if (response.status === 'SUCCESS') {
-                return response.value;
-            }
-            else if (response.status === 'SUCCESS_CHUNKED') {
-                chunks += response.value;
-                if (response.done)
-                    return deserialize(chunks);
-            }
-            else if (response.status === 'WIP') {
-                await utils.general.sleep(settings.pollTimeout);
-            }
-            logger.log('Polling...');
-            const { script, args = [] } = scripts.poll;
-            response = deserialize(await context.execute(script, ...args));
-        }
-        throw new core_base_1.CoreError('Poll script execution is timed out', { reason: 'timeout' });
-    }
-    finally {
-        clearTimeout(executionTimer);
-    }
-    function deserialize(json) {
-        try {
-            return JSON.parse(json);
-        }
-        catch (err) {
-            const firstChars = json.slice(0, 100);
-            const lastChars = json.slice(-100);
-            throw new Error(`Response is not a valid JSON string. length: ${json.length}, first 100 chars: "${firstChars}", last 100 chars: "${lastChars}". error: ${err}`);
-        }
-    }
-}
-exports.executePollScript = executePollScript;

package/types/utils/execute-poll-script.d.ts

@@ -1,20 +0,0 @@
-import { type Context } from '@applitools/driver';
-import { type Logger } from '@applitools/logger';
-export declare type PollScriptSettings = {
-    executionTimeout: number;
-    pollTimeout: number;
-};
-declare type Script = {
-    script: string | ((...args: any[]) => any);
-    args: any[];
-};
-export declare function executePollScript<TContext extends Context<unknown, unknown, unknown, unknown>>({ context, scripts, settings, logger, }: {
-    context: TContext;
-    scripts: {
-        main: Script;
-        poll: Script;
-    };
-    settings: PollScriptSettings;
-    logger: Logger;
-}): Promise<any>;
-export {};