@applitools/core 2.4.2 → 2.4.3

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## Unreleased
 
+## 2.4.3 - 2023/3/22
+
+### Features
+- Changed `makeManager` api to accept `settings`
+### Bug fixes
+- Fixed retry interval during poll requests to eyes back-end
+
 ## 2.4.2 - 2023/3/17
 
 ### Features

package/dist/make-manager.js

@@ -31,16 +31,19 @@ const open_eyes_1 = require("./open-eyes");
 const get_manager_results_1 = require("./get-manager-results");
 const utils = __importStar(require("@applitools/utils"));
 function makeMakeManager({ spec, concurrency: defaultConcurrency = utils.general.getEnvValue('CONCURRENCY', 'number'), core, base, agentId: defaultAgentId, cwd = process.cwd(), logger: defaultLogger, }) {
-    return async function makeManager({ type = 'classic', concurrency = defaultConcurrency, legacyConcurrency, batch, agentId = type === 'ufg' ? defaultAgentId === null || defaultAgentId === void 0 ? void 0 : defaultAgentId.replace(/(\/\d)/, '.visualgrid$1') : defaultAgentId, logger = defaultLogger, } = {}) {
-        var _a, _b;
-        concurrency !== null && concurrency !== void 0 ? concurrency : (concurrency = utils.types.isInteger(legacyConcurrency) ? legacyConcurrency * 5 : 5);
-        batch !== null && batch !== void 0 ? batch : (batch = {});
-        (_a = batch.id) !== null && _a !== void 0 ? _a : (batch.id = (_b = utils.general.getEnvValue('BATCH_ID')) !== null && _b !== void 0 ? _b : `generated-${utils.general.guid()}`);
-        base !== null && base !== void 0 ? base : (base = (0, core_base_1.makeCore)({ agentId, concurrency, cwd, logger }));
+    return async function makeManager({ type = 'classic', settings, logger = defaultLogger, } = {}) {
+        var _a, _b, _c, _d, _e;
+        var _f;
+        settings !== null && settings !== void 0 ? settings : (settings = {});
+        (_a = settings.concurrency) !== null && _a !== void 0 ? _a : (settings.concurrency = defaultConcurrency !== null && defaultConcurrency !== void 0 ? defaultConcurrency : (utils.types.isInteger(settings.legacyConcurrency) ? settings.legacyConcurrency * 5 : 5));
+        (_b = settings.batch) !== null && _b !== void 0 ? _b : (settings.batch = {});
+        (_c = (_f = settings.batch).id) !== null && _c !== void 0 ? _c : (_f.id = (_d = utils.general.getEnvValue('BATCH_ID')) !== null && _d !== void 0 ? _d : `generated-${utils.general.guid()}`);
+        (_e = settings.agentId) !== null && _e !== void 0 ? _e : (settings.agentId = type === 'ufg' ? defaultAgentId === null || defaultAgentId === void 0 ? void 0 : defaultAgentId.replace(/(\/\d)/, '.visualgrid$1') : defaultAgentId);
+        base !== null && base !== void 0 ? base : (base = (0, core_base_1.makeCore)({ agentId: settings.agentId, concurrency: settings.concurrency, cwd, logger }));
         const cores = { ufg: (0, core_2.makeCore)({ spec, base, logger }), classic: (0, core_1.makeCore)({ spec, base, logger }) };
         const storage = [];
         return {
-            openEyes: utils.general.wrap((0, open_eyes_1.makeOpenEyes)({ type, batch, spec, core, cores, logger }), async (openEyes, options) => {
+            openEyes: utils.general.wrap((0, open_eyes_1.makeOpenEyes)({ type, batch: settings.batch, spec, core, cores, logger }), async (openEyes, options) => {
                 const eyes = await openEyes(options);
                 storage.push(eyes);
                 return eyes;

package/dist/universal/core-server.js

@@ -125,14 +125,25 @@ printStdout = false, ...handlerOptions } = {}) {
             const core = await corePromise;
             return core.extractText(options);
         });
-        // TODO rename to getECClient
+        socket.command('Core.getECClient', async (options) => {
+            const core = await corePromise;
+            const client = await core.getECClient(options);
+            return { url: client.url };
+        });
+        // TODO remove
         socket.command('Core.makeECClient', async (options) => {
             const core = await corePromise;
             const client = await core.getECClient(options);
             return { url: client.url };
         });
         socket.command('Core.makeManager', async (options) => {
+            var _a, _b, _c, _d;
+            var _e, _f, _g;
             const core = await corePromise;
+            (_a = options.settings) !== null && _a !== void 0 ? _a : (options.settings = {});
+            (_b = (_e = options.settings).concurrency) !== null && _b !== void 0 ? _b : (_e.concurrency = options.concurrency);
+            (_c = (_f = options.settings).legacyConcurrency) !== null && _c !== void 0 ? _c : (_f.legacyConcurrency = options.legacyConcurrency);
+            (_d = (_g = options.settings).agentId) !== null && _d !== void 0 ? _d : (_g.agentId = options.agentId);
             return refer.ref(await core.makeManager(options));
         });
         socket.command('EyesManager.openEyes', async ({ manager, ...options }) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/core",
-  "version": "2.4.2",
+  "version": "2.4.3",
   "homepage": "https://applitools.com",
   "bugs": {
     "url": "https://github.com/applitools/eyes.sdk.javascript1/issues"
@@ -75,19 +75,19 @@
     ]
   },
   "dependencies": {
-    "@applitools/core-base": "1.1.42",
+    "@applitools/core-base": "1.1.43",
     "@applitools/dom-capture": "11.2.1",
     "@applitools/dom-snapshot": "4.7.6",
     "@applitools/driver": "1.11.37",
-    "@applitools/ec-client": "1.2.16",
+    "@applitools/ec-client": "1.2.17",
     "@applitools/logger": "1.1.48",
-    "@applitools/nml-client": "1.3.40",
-    "@applitools/req": "1.1.32",
+    "@applitools/nml-client": "1.3.41",
+    "@applitools/req": "1.1.33",
     "@applitools/screenshoter": "3.7.31",
     "@applitools/snippets": "2.4.17",
     "@applitools/socket": "1.0.10",
     "@applitools/spec-driver-webdriver": "1.0.17",
-    "@applitools/ufg-client": "1.2.3",
+    "@applitools/ufg-client": "1.2.4",
     "@applitools/utils": "1.3.32",
     "@types/ws": "8.5.4",
     "abort-controller": "3.0.0",
@@ -98,7 +98,7 @@
     "yargs": "17.6.2"
   },
   "devDependencies": {
-    "@applitools/bongo": "^3.0.1",
+    "@applitools/bongo": "^3.0.2",
     "@applitools/sdk-coverage-tests": "^3.0.0",
     "@applitools/spec-driver-puppeteer": "^1.1.49",
     "@applitools/spec-driver-selenium": "^1.5.34",

package/types/make-manager.d.ts

@@ -1,4 +1,4 @@
-import type { Core, EyesManager, Batch } from './types';
+import type { Core, EyesManager, EyesManagerSettings } from './types';
 import type { Core as BaseCore } from '@applitools/core-base';
 import { type Logger } from '@applitools/logger';
 import { type SpecType, type SpecDriver } from '@applitools/driver';
@@ -11,13 +11,9 @@ type Options<TSpec extends SpecType> = {
     cwd?: string;
     logger: Logger;
 };
-export declare function makeMakeManager<TSpec extends SpecType>({ spec, concurrency: defaultConcurrency, core, base, agentId: defaultAgentId, cwd, logger: defaultLogger, }: Options<TSpec>): <TType extends "classic" | "ufg" = "classic">({ type, concurrency, legacyConcurrency, batch, agentId, logger, }?: {
+export declare function makeMakeManager<TSpec extends SpecType>({ spec, concurrency: defaultConcurrency, core, base, agentId: defaultAgentId, cwd, logger: defaultLogger, }: Options<TSpec>): <TType extends "classic" | "ufg" = "classic">({ type, settings, logger, }?: {
     type?: TType | undefined;
-    concurrency?: number | undefined;
-    /** @deprecated */
-    legacyConcurrency?: number | undefined;
-    batch?: Batch | undefined;
-    agentId?: string | undefined;
+    settings?: EyesManagerSettings | undefined;
     logger?: Logger | undefined;
 }) => Promise<EyesManager<TSpec, TType>>;
 export {};

package/types/types.d.ts

@@ -18,8 +18,7 @@ export interface Core<TSpec extends SpecType, TDefaultType extends 'classic' | '
     }): Promise<ECClient>;
     makeManager<TType extends 'classic' | 'ufg' = TDefaultType>(options?: {
         type: TType;
-        concurrency?: TType extends 'ufg' ? number : never;
-        agentId?: string;
+        settings?: EyesManagerSettings;
         logger?: Logger;
     }): Promise<EyesManager<TSpec, TType>>;
     openEyes<TType extends 'classic' | 'ufg' = TDefaultType>(options: {
@@ -98,6 +97,13 @@ export interface Eyes<TSpec extends SpecType, TDefaultType extends 'classic' | '
         logger?: Logger;
     }): Promise<TestResult<TDefaultType>[]>;
 }
+export interface EyesManagerSettings {
+    concurrency?: number;
+    /** @deprecated */
+    legacyConcurrency?: number;
+    agentId?: string;
+    batch?: AutomationCore.Batch;
+}
 export type Config<TSpec extends SpecType, TType extends 'classic' | 'ufg'> = {
     open: Partial<Omit<OpenSettings<TType>, 'userCommandId'>>;
     screenshot: Partial<Omit<ClassicCore.ScreenshotSettings<TSpec>, 'userCommandId'>>;