@applitools/core 2.5.2 → 2.5.3

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## Unreleased
 
+## 2.5.3 - 2023/4/20
+
+### Features
+- Add a timeout and max concurrency for fetching resources
+### Bug fixes
+- Fixed typo in ec custom property
+
 ## 2.5.2 - 2023/4/19
 
 ### Features

package/dist/make-manager.js

@@ -40,7 +40,10 @@ function makeMakeManager({ spec, concurrency: defaultConcurrency = utils.general
         (_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 cores = {
+            ufg: (0, core_2.makeCore)({ spec, base, fetchConcurrency: settings.fetchConcurrency, logger }),
+            classic: (0, core_1.makeCore)({ spec, base, logger }),
+        };
         const storage = [];
         return {
             openEyes: utils.general.wrap((0, open_eyes_1.makeOpenEyes)({ type, batch: settings.batch, spec, core, cores, logger }), async (openEyes, options) => {

package/dist/open-eyes.js

@@ -61,7 +61,7 @@ function makeOpenEyes({ type: defaultType = 'classic', concurrency, batch, core,
         if (account.ecEnabled) {
             const environment = await (driver === null || driver === void 0 ? void 0 : driver.getEnvironment());
             (_r = settings.properties) !== null && _r !== void 0 ? _r : (settings.properties = []);
-            settings.properties.push({ name: 'Execution cloud', value: (environment === null || environment === void 0 ? void 0 : environment.isEC) ? 'Yes' : 'No' });
+            settings.properties.push({ name: 'Execution Cloud', value: (environment === null || environment === void 0 ? void 0 : environment.isEC) ? 'Yes' : 'No' });
         }
         core.logEvent({
             settings: {

package/dist/ufg/core.js

@@ -35,7 +35,7 @@ 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, agentId = 'core-ufg', cwd = process.cwd(), logger: defaultLogger, }) {
+function makeCore({ concurrency, spec, clients, base, fetchConcurrency, agentId = 'core-ufg', cwd = process.cwd(), logger: defaultLogger, }) {
     var _a;
     const logger = (_a = defaultLogger === null || defaultLogger === void 0 ? void 0 : defaultLogger.extend({ label: 'core-ufg' })) !== null && _a !== void 0 ? _a : (0, logger_1.makeLogger)({ label: 'core-ufg' });
     logger.log(`Core ufg is initialized ${base ? 'with' : 'without'} custom base core`);
@@ -49,7 +49,7 @@ function makeCore({ concurrency, spec, clients, base, agentId = 'core-ufg', cwd
             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 }),
-            getUFGClient: (0, get_ufg_client_1.makeGetUFGClient)({ client: clients === null || clients === void 0 ? void 0 : clients.ufg, logger }),
+            getUFGClient: (0, get_ufg_client_1.makeGetUFGClient)({ client: clients === null || clients === void 0 ? void 0 : clients.ufg, fetchConcurrency, 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 }),
         };

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

@@ -26,13 +26,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeGetUFGClient = void 0;
 const ufg_client_1 = require("@applitools/ufg-client");
 const utils = __importStar(require("@applitools/utils"));
-function makeGetUFGClient({ client, logger: defaultLogger }) {
-    const getUFGClientWithCache = utils.general.cachify(getUFGClient, ([options]) => client ? 'default' : [options.config]);
+function makeGetUFGClient({ client, fetchConcurrency, logger: defaultLogger }) {
+    // we are caching by the server config, therefor if the user creates another Runner / manager with the same server config but different
+    // fetchConcurrency, it will not take any affect.
+    const getUFGClientWithCache = utils.general.cachify(getUFGClient, ([options]) => client ? 'default' : [{ ...options.config, fetchConcurrency: undefined }]);
     if (client)
         getUFGClientWithCache.setCachedValue('default', Promise.resolve(client));
     return getUFGClientWithCache;
     async function getUFGClient({ config, logger = defaultLogger }) {
-        return (0, ufg_client_1.makeUFGClient)({ config, logger });
+        return (0, ufg_client_1.makeUFGClient)({ config: { ...config, fetchConcurrency }, logger });
     }
 }
 exports.makeGetUFGClient = makeGetUFGClient;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/core",
-  "version": "2.5.2",
+  "version": "2.5.3",
   "homepage": "https://applitools.com",
   "bugs": {
     "url": "https://github.com/applitools/eyes.sdk.javascript1/issues"
@@ -87,7 +87,7 @@
     "@applitools/snippets": "2.4.19",
     "@applitools/socket": "1.0.10",
     "@applitools/spec-driver-webdriver": "1.0.24",
-    "@applitools/ufg-client": "1.2.9",
+    "@applitools/ufg-client": "1.2.10",
     "@applitools/utils": "1.3.32",
     "@types/ws": "8.5.4",
     "abort-controller": "3.0.0",

package/types/types.d.ts

@@ -99,6 +99,7 @@ export interface Eyes<TSpec extends SpecType, TDefaultType extends 'classic' | '
 }
 export interface ManagerSettings {
     concurrency?: number;
+    fetchConcurrency?: number;
     /** @deprecated */
     legacyConcurrency?: number;
     agentId?: string;

package/types/ufg/core.d.ts

@@ -13,8 +13,9 @@ type Options<TSpec extends SpecType> = {
     base?: BaseCore;
     agentId?: string;
     concurrency?: number;
+    fetchConcurrency?: number;
     cwd?: string;
     logger?: Logger;
 };
-export declare function makeCore<TSpec extends SpecType>({ concurrency, spec, clients, base, agentId, cwd, logger: defaultLogger, }: Options<TSpec>): Core<TSpec>;
+export declare function makeCore<TSpec extends SpecType>({ concurrency, spec, clients, base, fetchConcurrency, agentId, cwd, logger: defaultLogger, }: Options<TSpec>): Core<TSpec>;
 export {};

package/types/ufg/get-ufg-client.d.ts

@@ -1,11 +1,12 @@
 import { type Logger } from '@applitools/logger';
-import { type UFGClient, type UFGRequestsConfig } from '@applitools/ufg-client';
+import { type UFGClient, type UFGClientConfig } from '@applitools/ufg-client';
 type Options = {
     client?: UFGClient;
     logger: Logger;
+    fetchConcurrency?: number;
 };
-export declare function makeGetUFGClient({ client, logger: defaultLogger }: Options): (({ config, logger }: {
-    config: UFGRequestsConfig;
+export declare function makeGetUFGClient({ client, fetchConcurrency, logger: defaultLogger }: Options): (({ config, logger }: {
+    config: UFGClientConfig;
     logger?: Logger | undefined;
 }) => Promise<UFGClient>) & {
     getCachedValues(): Promise<UFGClient>[];