@applitools/eyes-browser 1.0.2 → 1.0.3

package/CHANGELOG.md

@@ -1,5 +1,52 @@
 # Changelog
 
+## [1.0.3](https://github.com/applitools/eyes.sdk.javascript1/compare/js/eyes-browser@1.0.2...js/eyes-browser@1.0.3) (2023-12-19)
+
+
+### Dependencies
+
+* @applitools/spec-driver-webdriver bumped to 1.0.54
+  #### Bug Fixes
+
+  * fixed extraction of the driver server url ([ddc6449](https://github.com/applitools/eyes.sdk.javascript1/commit/ddc6449fc72166ab26c99e9ba7bb83c05fd591d6))
+
+
+
+* @applitools/spec-driver-selenium bumped to 1.5.68
+
+* @applitools/spec-driver-puppeteer bumped to 1.3.4
+
+* @applitools/driver bumped to 1.16.1
+  #### Bug Fixes
+
+  * fixed bug with screenshot not being properly scaled on ios devices with appium 2 ([#2092](https://github.com/applitools/eyes.sdk.javascript1/issues/2092)) ([26678bf](https://github.com/applitools/eyes.sdk.javascript1/commit/26678bfe254def506ea82e6a645519d6567fb3fd))
+  * fixed extraction of the driver server url ([ddc6449](https://github.com/applitools/eyes.sdk.javascript1/commit/ddc6449fc72166ab26c99e9ba7bb83c05fd591d6))
+  * fixed infinite loop that may appear during attribute extraction ([#2102](https://github.com/applitools/eyes.sdk.javascript1/issues/2102)) ([6bef680](https://github.com/applitools/eyes.sdk.javascript1/commit/6bef680fbd2d5c26a46cf2a4f00bd083d1d02109))
+* @applitools/screenshoter bumped to 3.8.20
+  #### Bug Fixes
+
+  * fixed bug with screenshot not being properly scaled on ios devices with appium 2 ([#2092](https://github.com/applitools/eyes.sdk.javascript1/issues/2092)) ([26678bf](https://github.com/applitools/eyes.sdk.javascript1/commit/26678bfe254def506ea82e6a645519d6567fb3fd))
+
+
+
+* @applitools/nml-client bumped to 1.6.2
+
+* @applitools/ec-client bumped to 1.7.20
+
+* @applitools/core-base bumped to 1.7.5
+  #### Bug Fixes
+
+  * avoid caching concurrency ([#2103](https://github.com/applitools/eyes.sdk.javascript1/issues/2103)) ([34db2e9](https://github.com/applitools/eyes.sdk.javascript1/commit/34db2e9c554b0851b18b514b1a8a82b83ff310cd))
+* @applitools/core bumped to 4.5.1
+  #### Bug Fixes
+
+  * avoid caching concurrency ([#2103](https://github.com/applitools/eyes.sdk.javascript1/issues/2103)) ([34db2e9](https://github.com/applitools/eyes.sdk.javascript1/commit/34db2e9c554b0851b18b514b1a8a82b83ff310cd))
+
+
+
+* @applitools/eyes bumped to 1.13.3
+
+
 ## [1.0.2](https://github.com/applitools/eyes.sdk.javascript1/compare/js/eyes-browser@1.0.1...js/eyes-browser@1.0.2) (2023-12-18)
 
 

package/dist/index.js

@@ -20284,18 +20284,19 @@ var require_requests = __commonJS({
       return result;
     };
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.makeFunctionalSessionRequests = exports.makeEyesRequests = exports.makeCoreRequests = void 0;
+    exports.makeCoreRequestsWithCache = void 0;
     var logger_1 = require_browser6();
     var req_eyes_1 = require_req_eyes();
     var upload_1 = require_upload();
     var utils34 = __importStar(require_browser3());
-    function makeCoreRequests({ agentId: defaultAgentId, fetch: fetch2, logger: defaultLogger }) {
+    exports.makeCoreRequestsWithCache = utils34.general.cachify(makeCoreRequests, () => "default");
+    function makeCoreRequests({ fetch: fetch2, logger: defaultLogger } = {}) {
       const mainLogger = (0, logger_1.makeLogger)({ logger: defaultLogger, format: { label: "core-requests" } });
       const getAccountInfoWithCache = utils34.general.cachify(getAccountInfo, ([{ settings }]) => {
-        return [settings.eyesServerUrl, settings.apiKey];
+        return [settings.eyesServerUrl, settings.apiKey, settings.proxy];
       });
       const getBatchBranchesWithCache = utils34.general.cachify(getBatchBranches, ([{ settings }]) => {
-        return [settings.batchId, settings.eyesServerUrl, settings.apiKey];
+        return [settings.batchId, settings.eyesServerUrl, settings.apiKey, settings.proxy];
       });
       const core = {
         getAccountInfo: getAccountInfoWithCache,
@@ -20313,8 +20314,7 @@ var require_requests = __commonJS({
       async function openEyes({ settings, logger = mainLogger }) {
         var _a, _b, _c, _d, _e, _f;
         logger = logger.extend(mainLogger, { tags: [`core-request-${utils34.general.shortid()}`] });
-        const agentId = `${defaultAgentId} ${settings.agentId ? `[${settings.agentId}]` : ""}`.trim();
-        const req2 = (0, req_eyes_1.makeReqEyes)({ settings: { ...settings, agentId }, fetch: fetch2, logger });
+        const req2 = (0, req_eyes_1.makeReqEyes)({ settings, fetch: fetch2, logger });
         logger.log('Request "openEyes" called with settings', settings);
         const accountPromise = getAccountInfoWithCache({ settings });
         const initializedAt = (/* @__PURE__ */ new Date()).toISOString();
@@ -20323,7 +20323,7 @@ var require_requests = __commonJS({
           method: "POST",
           body: {
             startInfo: {
-              agentId,
+              agentId: settings.agentId,
               agentSessionId: settings.userTestId,
               agentRunId: settings.userTestId,
               sessionType: settings.sessionType,
@@ -20398,8 +20398,7 @@ var require_requests = __commonJS({
       async function openFunctionalSession({ settings, logger = mainLogger }) {
         var _a, _b, _c, _d, _e, _f;
         logger = logger.extend(mainLogger, { tags: [`core-request-${utils34.general.shortid()}`] });
-        const agentId = `${defaultAgentId} ${settings.agentId ? `[${settings.agentId}]` : ""}`.trim();
-        const req2 = (0, req_eyes_1.makeReqEyes)({ settings: { ...settings, agentId }, fetch: fetch2, logger });
+        const req2 = (0, req_eyes_1.makeReqEyes)({ settings, fetch: fetch2, logger });
         logger.log('Request "openFunctionalSession" called with settings', settings);
         const accountPromise = getAccountInfoWithCache({ settings });
         const initializedAt = (/* @__PURE__ */ new Date()).toISOString();
@@ -20408,7 +20407,7 @@ var require_requests = __commonJS({
           method: "POST",
           body: {
             startInfo: {
-              agentId,
+              agentId: settings.agentId,
               agentSessionId: settings.userTestId,
               agentRunId: settings.userTestId,
               sessionType: settings.sessionType,
@@ -20464,8 +20463,7 @@ var require_requests = __commonJS({
       }
       async function locate({ target, settings, logger = mainLogger }) {
         logger = logger.extend(mainLogger, { tags: [`core-request-${utils34.general.shortid()}`] });
-        const agentId = `${defaultAgentId} ${settings.agentId ? `[${settings.agentId}]` : ""}`.trim();
-        const req2 = (0, req_eyes_1.makeReqEyes)({ settings: { ...settings, agentId }, fetch: fetch2, logger });
+        const req2 = (0, req_eyes_1.makeReqEyes)({ settings, fetch: fetch2, logger });
         logger.log('Request "locate" called for target', target, "with settings", settings);
         const account = await getAccountInfoWithCache({ settings });
         const upload = (0, upload_1.makeUpload)({ settings: { uploadUrl: account.uploadUrl, proxy: settings.proxy }, logger });
@@ -20494,8 +20492,7 @@ var require_requests = __commonJS({
       }
       async function locateText({ target, settings, logger = mainLogger }) {
         logger = logger.extend(mainLogger, { tags: [`core-request-${utils34.general.shortid()}`] });
-        const agentId = `${defaultAgentId} ${settings.agentId ? `[${settings.agentId}]` : ""}`.trim();
-        const req2 = (0, req_eyes_1.makeReqEyes)({ settings: { ...settings, agentId }, fetch: fetch2, logger });
+        const req2 = (0, req_eyes_1.makeReqEyes)({ settings, fetch: fetch2, logger });
         logger.log('Request "locateText" called for target', target, "with settings", settings);
         const account = await getAccountInfoWithCache({ settings });
         const upload = (0, upload_1.makeUpload)({ settings: { uploadUrl: account.uploadUrl, proxy: settings.proxy }, logger });
@@ -20526,8 +20523,7 @@ var require_requests = __commonJS({
       }
       async function extractText({ target, settings, logger = mainLogger }) {
         logger = logger.extend(mainLogger, { tags: [`core-request-${utils34.general.shortid()}`] });
-        const agentId = `${defaultAgentId} ${settings.agentId ? `[${settings.agentId}]` : ""}`.trim();
-        const req2 = (0, req_eyes_1.makeReqEyes)({ settings: { ...settings, agentId }, fetch: fetch2, logger });
+        const req2 = (0, req_eyes_1.makeReqEyes)({ settings, fetch: fetch2, logger });
         logger.log('Request "extractText" called for target', target, "with settings", settings);
         const account = await getAccountInfoWithCache({ settings });
         const upload = (0, upload_1.makeUpload)({ settings: { uploadUrl: account.uploadUrl, proxy: settings.proxy }, logger });
@@ -20557,8 +20553,7 @@ var require_requests = __commonJS({
       }
       async function getAccountInfo({ settings, logger = mainLogger }) {
         logger = logger.extend(mainLogger, { tags: [`core-request-${utils34.general.shortid()}`] });
-        const agentId = `${defaultAgentId} ${settings.agentId ? `[${settings.agentId}]` : ""}`.trim();
-        const req2 = (0, req_eyes_1.makeReqEyes)({ settings: { ...settings, agentId }, fetch: fetch2, logger });
+        const req2 = (0, req_eyes_1.makeReqEyes)({ settings, fetch: fetch2, logger });
         logger.log('Request "getAccountInfo" called with settings', settings);
         const response = await req2("/api/sessions/renderinfo", {
           name: "getAccountInfo",
@@ -20572,14 +20567,14 @@ var require_requests = __commonJS({
             eyesServer: {
               eyesServerUrl: settings.eyesServerUrl,
               apiKey: settings.apiKey,
-              agentId,
+              agentId: settings.agentId,
               proxy: settings.proxy,
               useDnsCache: settings.useDnsCache
             },
             ufgServer: {
               ufgServerUrl,
               accessToken,
-              agentId,
+              agentId: settings.agentId,
               proxy: settings.proxy,
               useDnsCache: settings.useDnsCache
             },
@@ -20593,8 +20588,7 @@ var require_requests = __commonJS({
       }
       async function getBatchBranches({ settings, logger = mainLogger }) {
         logger = logger.extend(mainLogger, { tags: [`core-request-${utils34.general.shortid()}`] });
-        const agentId = `${defaultAgentId} ${settings.agentId ? `[${settings.agentId}]` : ""}`.trim();
-        const req2 = (0, req_eyes_1.makeReqEyes)({ settings: { ...settings, agentId }, fetch: fetch2, logger });
+        const req2 = (0, req_eyes_1.makeReqEyes)({ settings, fetch: fetch2, logger });
         logger.log('Request "getBatchBranches" called with settings', settings);
         const response = await req2(`/api/sessions/batches/${settings.batchId}/config/bypointerId`, {
           name: "getBatchBranches",
@@ -20609,8 +20603,7 @@ var require_requests = __commonJS({
       }
       async function closeBatch2({ settings, logger = mainLogger }) {
         logger = logger.extend(mainLogger, { tags: [`core-request-${utils34.general.shortid()}`] });
-        const agentId = `${defaultAgentId} ${settings.agentId ? `[${settings.agentId}]` : ""}`.trim();
-        const req2 = (0, req_eyes_1.makeReqEyes)({ settings: { ...settings, agentId }, fetch: fetch2, logger });
+        const req2 = (0, req_eyes_1.makeReqEyes)({ settings, fetch: fetch2, logger });
         logger.log('Request "closeBatch" called with settings', settings);
         await req2(`/api/sessions/batches/${settings.batchId}/close/bypointerId`, {
           name: "closeBatch",
@@ -20622,8 +20615,7 @@ var require_requests = __commonJS({
       }
       async function deleteTest({ settings, logger = mainLogger }) {
         logger = logger.extend(mainLogger, { tags: [`core-request-${utils34.general.shortid()}`] });
-        const agentId = `${defaultAgentId} ${settings.agentId ? `[${settings.agentId}]` : ""}`.trim();
-        const req2 = (0, req_eyes_1.makeReqEyes)({ settings: { ...settings, agentId }, fetch: fetch2, logger });
+        const req2 = (0, req_eyes_1.makeReqEyes)({ settings, fetch: fetch2, logger });
         logger.log('Request "deleteTest" called with settings', settings);
         await req2(`/api/sessions/batches/${settings.batchId}/${settings.testId}`, {
           name: "deleteTest",
@@ -20639,8 +20631,7 @@ var require_requests = __commonJS({
       async function logEvent({ settings, logger = mainLogger }) {
         logger = logger.extend(mainLogger, { tags: [`core-request-${utils34.general.shortid()}`] });
         settings = utils34.types.isArray(settings) ? settings : [settings];
-        const agentId = `${defaultAgentId} ${settings[0].agentId ? `[${settings[0].agentId}]` : ""}`.trim();
-        const req2 = (0, req_eyes_1.makeReqEyes)({ settings: { ...settings[0], agentId }, fetch: fetch2, logger });
+        const req2 = (0, req_eyes_1.makeReqEyes)({ settings: settings[0], fetch: fetch2, logger });
         logger.log('Request "logEvent" called with settings', settings);
         await req2(`/api/sessions/log`, {
           name: "logEvent",
@@ -20661,7 +20652,6 @@ var require_requests = __commonJS({
         logger.log('Request "logEvent" finished successfully');
       }
     }
-    exports.makeCoreRequests = makeCoreRequests;
     function makeEyesRequests({ core, test, req: req2, upload, logger: mainLogger }) {
       let resultResponsePromise;
       let supportsCheckAndClose = true;
@@ -20834,7 +20824,6 @@ var require_requests = __commonJS({
         }
       }
     }
-    exports.makeEyesRequests = makeEyesRequests;
     function makeFunctionalSessionRequests({ core, test, req: req2, logger: mainLogger }) {
       let resultResponsePromise;
       const functionalSession = {
@@ -20931,7 +20920,6 @@ var require_requests = __commonJS({
         }
       }
     }
-    exports.makeFunctionalSessionRequests = makeFunctionalSessionRequests;
     function transformCheckOptions({ target, settings }) {
       var _a, _b;
       return {
@@ -27798,12 +27786,11 @@ var require_open_eyes = __commonJS({
     var get_results_1 = require_get_results();
     var throat_1 = __importDefault(require_throat());
     var utils34 = __importStar(require_browser3());
-    function makeOpenEyes({ requests, concurrency, cwd = process.cwd(), logger: mainLogger }) {
+    function makeOpenEyes({ requests, agentId: defaultAgentId, concurrency, cwd = process.cwd(), logger: mainLogger }) {
       const throttle = concurrency ? (0, throat_1.default)(concurrency) : (fn) => fn();
       return async function openEyes({ settings, logger = mainLogger }) {
         var _a;
         logger = logger.extend(mainLogger, { tags: [`eyes-base-${utils34.general.shortid()}`] });
-        logger.log('Command "openEyes" is called with settings', settings);
         if (!settings.ignoreGitBranching && !settings.gitBranchingTimestamp) {
           let branchName = settings.branchName;
           let parentBranchName = settings.parentBranchName;
@@ -27823,6 +27810,8 @@ var require_open_eyes = __commonJS({
         } else {
           settings.gitBranchingTimestamp = void 0;
         }
+        settings.agentId = `${defaultAgentId} ${settings.agentId ? `[${settings.agentId}]` : ""}`.trim();
+        logger.log('Command "openEyes" is called with settings', settings);
         return new Promise((resolve, reject) => {
           throttle(() => {
             return new Promise(async (done) => {
@@ -27899,10 +27888,11 @@ var require_open_functional_session = __commonJS({
     var get_results_1 = require_get_results();
     var throat_1 = __importDefault(require_throat());
     var utils34 = __importStar(require_browser3());
-    function makeOpenFunctionalSession({ requests, concurrency, logger: mainLogger }) {
+    function makeOpenFunctionalSession({ requests, agentId: defaultAgentId, concurrency, logger: mainLogger }) {
       const throttle = concurrency ? (0, throat_1.default)(concurrency) : (fn) => fn();
       return async function openFunctionalSession({ settings, logger = mainLogger }) {
         logger = logger.extend(mainLogger, { tags: [`functional-session-base-${utils34.general.shortid()}`] });
+        settings.agentId = `${defaultAgentId} ${settings.agentId ? `[${settings.agentId}]` : ""}`.trim();
         logger.log('Command "openFunctionalSession" is called with settings', settings);
         return new Promise((resolve, reject) => {
           throttle(() => {
@@ -27971,7 +27961,7 @@ var require_locate = __commonJS({
     exports.makeLocate = void 0;
     var transform_target_1 = require_transform_target();
     var utils34 = __importStar(require_browser3());
-    function makeLocate({ requests, logger: mainLogger }) {
+    function makeLocate({ requests, agentId: defaultAgentId, logger: mainLogger }) {
       return async function locate({ target, settings, logger = mainLogger }) {
         var _a, _b, _c, _d, _e;
         logger = logger.extend(mainLogger, { tags: [`locate-base-${utils34.general.shortid()}`] });
@@ -27981,6 +27971,7 @@ var require_locate = __commonJS({
           maxImageHeight: Math.min((_c = (_b = settings.normalization.limit) === null || _b === void 0 ? void 0 : _b.maxImageHeight) !== null && _c !== void 0 ? _c : Infinity, account.maxImageHeight),
           maxImageArea: Math.min((_e = (_d = settings.normalization.limit) === null || _d === void 0 ? void 0 : _d.maxImageArea) !== null && _e !== void 0 ? _e : Infinity, account.maxImageArea)
         };
+        settings.agentId = `${defaultAgentId} ${settings.agentId ? `[${settings.agentId}]` : ""}`.trim();
         logger.log('Command "locate" is called with settings', settings);
         target = await (0, transform_target_1.transformTarget)({ target, settings });
         const results = await requests.locate({ target, settings, logger });
@@ -28034,7 +28025,7 @@ var require_locate_text = __commonJS({
     exports.makeLocateText = void 0;
     var transform_target_1 = require_transform_target();
     var utils34 = __importStar(require_browser3());
-    function makeLocateText({ requests, logger: mainLogger }) {
+    function makeLocateText({ requests, agentId: defaultAgentId, logger: mainLogger }) {
       return async function locateText({ target, settings, logger = mainLogger }) {
         var _a, _b, _c, _d, _e;
         logger = logger.extend(mainLogger, { tags: [`locate-text-base-${utils34.general.shortid()}`] });
@@ -28044,6 +28035,7 @@ var require_locate_text = __commonJS({
           maxImageHeight: Math.min((_c = (_b = settings.normalization.limit) === null || _b === void 0 ? void 0 : _b.maxImageHeight) !== null && _c !== void 0 ? _c : Infinity, account.maxImageHeight),
           maxImageArea: Math.min((_e = (_d = settings.normalization.limit) === null || _d === void 0 ? void 0 : _d.maxImageArea) !== null && _e !== void 0 ? _e : Infinity, account.maxImageArea)
         };
+        settings.agentId = `${defaultAgentId} ${settings.agentId ? `[${settings.agentId}]` : ""}`.trim();
         logger.log('Command "locateText" is called with settings', settings);
         target = await (0, transform_target_1.transformTarget)({ target, settings });
         const results = await requests.locateText({ target, settings, logger });
@@ -28097,12 +28089,10 @@ var require_extract_text = __commonJS({
     exports.makeExtractText = void 0;
     var transform_target_1 = require_transform_target();
     var utils34 = __importStar(require_browser3());
-    function makeExtractText({ requests, logger: mainLogger }) {
+    function makeExtractText({ requests, agentId: defaultAgentId, logger: mainLogger }) {
       return async function extractText({ target, settings, logger = mainLogger }) {
         logger = logger.extend(mainLogger, { tags: [`extract-text-base-${utils34.general.shortid()}`] });
-        logger.log('Command "extractText" is called with settings', settings);
-        settings = utils34.types.isArray(settings) ? settings : [settings];
-        const results = await Promise.all(settings.map(async (settings2) => {
+        settings = await Promise.all((utils34.types.isArray(settings) ? settings : [settings]).map(async (settings2) => {
           var _a, _b, _c, _d, _e;
           const account = await requests.getAccountInfo({ settings: settings2, logger });
           (_a = settings2.normalization) !== null && _a !== void 0 ? _a : settings2.normalization = {};
@@ -28110,6 +28100,11 @@ var require_extract_text = __commonJS({
             maxImageHeight: Math.min((_c = (_b = settings2.normalization.limit) === null || _b === void 0 ? void 0 : _b.maxImageHeight) !== null && _c !== void 0 ? _c : Infinity, account.maxImageHeight),
             maxImageArea: Math.min((_e = (_d = settings2.normalization.limit) === null || _d === void 0 ? void 0 : _d.maxImageArea) !== null && _e !== void 0 ? _e : Infinity, account.maxImageArea)
           };
+          settings2.agentId = `${defaultAgentId} ${settings2.agentId ? `[${settings2.agentId}]` : ""}`.trim();
+          return settings2;
+        }));
+        logger.log('Command "extractText" is called with settings', settings);
+        const results = await Promise.all(settings.map(async (settings2) => {
           target = await (0, transform_target_1.transformTarget)({ target, settings: settings2 });
           return requests.extractText({ target, settings: settings2, logger });
         }));
@@ -28162,11 +28157,14 @@ var require_close_batch = __commonJS({
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.makeCloseBatch = void 0;
     var utils34 = __importStar(require_browser3());
-    function makeCloseBatch({ requests, logger: mainLogger }) {
+    function makeCloseBatch({ requests, agentId: defaultAgentId, logger: mainLogger }) {
       return async function closeBatch2({ settings, logger = mainLogger }) {
         logger = logger.extend(mainLogger, { tags: [`close-batch-base-${utils34.general.shortid()}`] });
+        settings = (utils34.types.isArray(settings) ? settings : [settings]).map((settings2) => {
+          settings2.agentId = `${defaultAgentId} ${settings2.agentId ? `[${settings2.agentId}]` : ""}`.trim();
+          return settings2;
+        });
         logger.log('Command "closeBatch" is called with settings', settings);
-        settings = utils34.types.isArray(settings) ? settings : [settings];
         const results = await Promise.allSettled(settings.map((settings2) => settings2.batchId ? requests.closeBatch({ settings: settings2, logger }) : null));
         const error = results.find(({ status }) => status === "rejected");
         if (error)
@@ -28219,11 +28217,14 @@ var require_delete_test = __commonJS({
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.makeDeleteTest = void 0;
     var utils34 = __importStar(require_browser3());
-    function makeDeleteTest({ requests, logger: mainLogger }) {
+    function makeDeleteTest({ requests, agentId: defaultAgentId, logger: mainLogger }) {
       return async function deleteTest({ settings, logger = mainLogger }) {
         logger = logger.extend(mainLogger, { tags: [`delete-test-base-${utils34.general.shortid()}`] });
+        settings = (utils34.types.isArray(settings) ? settings : [settings]).map((settings2) => {
+          settings2.agentId = `${defaultAgentId} ${settings2.agentId ? `[${settings2.agentId}]` : ""}`.trim();
+          return settings2;
+        });
         logger.log('Command "deleteTest" is called with settings', settings);
-        settings = utils34.types.isArray(settings) ? settings : [settings];
         const results = await Promise.allSettled(settings.map((settings2) => requests.deleteTest({ settings: settings2, logger })));
         const error = results.find(({ status }) => status === "rejected");
         if (error)
@@ -28234,6 +28235,66 @@ var require_delete_test = __commonJS({
   }
 });
 
+// ../core-base/dist/get-account-info.js
+var require_get_account_info = __commonJS({
+  "../core-base/dist/get-account-info.js"(exports) {
+    "use strict";
+    init_process();
+    init_setImmediate();
+    init_buffer();
+    var __createBinding = exports && exports.__createBinding || (Object.create ? function(o, m, k, k2) {
+      if (k2 === void 0)
+        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 === void 0)
+        k2 = k;
+      o[k2] = m[k];
+    });
+    var __setModuleDefault = exports && exports.__setModuleDefault || (Object.create ? function(o, v) {
+      Object.defineProperty(o, "default", { enumerable: true, value: v });
+    } : function(o, v) {
+      o["default"] = v;
+    });
+    var __importStar = exports && exports.__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.makeGetAccountInfo = void 0;
+    var utils34 = __importStar(require_browser3());
+    function makeGetAccountInfo({ requests, agentId: defaultAgentId, logger: mainLogger }) {
+      return async function getAccountInfo({ settings, logger = mainLogger }) {
+        logger = logger.extend(mainLogger, { tags: [`get-account-base-${utils34.general.shortid()}`] });
+        settings = { ...settings };
+        settings.agentId = `${defaultAgentId} ${settings.agentId ? `[${settings.agentId}]` : ""}`.trim();
+        logger.log('Command "getAccountInfo" is called with settings', settings);
+        const account = await requests.getAccountInfo({ settings, logger });
+        return {
+          ...account,
+          eyesServer: { ...account.eyesServer, agentId: settings.agentId },
+          ufgServer: { ...account.ufgServer, agentId: settings.agentId }
+        };
+      };
+    }
+    exports.makeGetAccountInfo = makeGetAccountInfo;
+  }
+});
+
 // ../core-base/dist/core.js
 var require_core = __commonJS({
   "../core-base/dist/core.js"(exports) {
@@ -28252,20 +28313,21 @@ var require_core = __commonJS({
     var extract_text_1 = require_extract_text();
     var close_batch_1 = require_close_batch();
     var delete_test_1 = require_delete_test();
+    var get_account_info_1 = require_get_account_info();
     function makeCore({ agentId = "core-base", concurrency, cwd = process.cwd(), logger: defaultLogger }) {
       const logger = (0, logger_1.makeLogger)({ logger: defaultLogger, format: { label: "core-base" } });
       logger.log(`Core is initialized in directory ${cwd} for agent ${agentId}`);
-      const coreRequests = (0, requests_1.makeCoreRequests)({ agentId, logger });
+      const requests = (0, requests_1.makeCoreRequestsWithCache)({ logger });
       return {
-        openEyes: (0, open_eyes_1.makeOpenEyes)({ requests: coreRequests, concurrency, cwd, logger }),
-        openFunctionalSession: (0, open_functional_session_1.makeOpenFunctionalSession)({ requests: coreRequests, concurrency, cwd, logger }),
-        locate: (0, locate_1.makeLocate)({ requests: coreRequests, logger }),
-        locateText: (0, locate_text_1.makeLocateText)({ requests: coreRequests, logger }),
-        extractText: (0, extract_text_1.makeExtractText)({ requests: coreRequests, logger }),
-        closeBatch: (0, close_batch_1.makeCloseBatch)({ requests: coreRequests, logger }),
-        deleteTest: (0, delete_test_1.makeDeleteTest)({ requests: coreRequests, logger }),
-        getAccountInfo: coreRequests.getAccountInfo,
-        logEvent: coreRequests.logEvent
+        openEyes: (0, open_eyes_1.makeOpenEyes)({ requests, agentId, concurrency, cwd, logger }),
+        openFunctionalSession: (0, open_functional_session_1.makeOpenFunctionalSession)({ requests, agentId, concurrency, cwd, logger }),
+        locate: (0, locate_1.makeLocate)({ requests, agentId, logger }),
+        locateText: (0, locate_text_1.makeLocateText)({ requests, agentId, logger }),
+        extractText: (0, extract_text_1.makeExtractText)({ requests, agentId, logger }),
+        closeBatch: (0, close_batch_1.makeCloseBatch)({ requests, agentId, logger }),
+        deleteTest: (0, delete_test_1.makeDeleteTest)({ requests, agentId, logger }),
+        getAccountInfo: (0, get_account_info_1.makeGetAccountInfo)({ requests, agentId, logger }),
+        logEvent: requests.logEvent
       };
     }
     exports.makeCore = makeCore;
@@ -29537,12 +29599,14 @@ var require_element = __commonJS({
         if (!contentRegion || !environment.isAndroid) {
           let attrContentRegion = null;
           try {
-            const size = JSON.parse(await this.getAttribute("contentSize"));
+            const { left, top, width, height, scrollableOffset } = JSON.parse(await this.getAttribute("contentSize"));
+            if ([left, top, width, height, scrollableOffset].some((value) => !utils34.types.isNumber(value)))
+              throw new Error("Invalid contentSize");
             attrContentRegion = {
-              x: size.left,
-              y: size.top,
-              width: size.width,
-              height: environment.isIOS ? Math.max(size.height, size.scrollableOffset) : size.height + size.scrollableOffset
+              x: left,
+              y: top,
+              width,
+              height: environment.isIOS ? Math.max(height, scrollableOffset) : height + scrollableOffset
             };
           } catch (err) {
             this.logger.warn(`Unable to get the attribute 'contentSize' due to the following error: '${err.message}'`);
@@ -29702,14 +29766,13 @@ var require_element = __commonJS({
         return text;
       }
       async getAttribute(name) {
-        var _a;
-        if ((_a = this._state.attributes) === null || _a === void 0 ? void 0 : _a[name]) {
+        if (utils34.types.has(this._state.attributes, name)) {
           if (this._state.attributes[name] instanceof Error)
             throw this._state.attributes[name];
           return this._state.attributes[name];
         }
         const value = await this.withRefresh(async () => {
-          var _a2;
+          var _a;
           var _b;
           const environment = await this.driver.getEnvironment();
           if (environment.isWeb) {
@@ -29717,7 +29780,7 @@ var require_element = __commonJS({
             return properties[name];
           } else {
             this.logger.log(`Extracting "${name}" attribute of native element with selector`, this.selector);
-            (_a2 = (_b = this._state).attributes) !== null && _a2 !== void 0 ? _a2 : _b.attributes = {};
+            (_a = (_b = this._state).attributes) !== null && _a !== void 0 ? _a : _b.attributes = {};
             try {
               this._state.attributes[name] = await this._spec.getElementAttribute(this.driver.target, this.target, name);
               return this._state.attributes[name];
@@ -30624,7 +30687,12 @@ var require_helper_ios = __commonJS({
       }
       async getContentRegion(element) {
         var _a, _b;
-        await this._element.click();
+        const { x, y } = await this._spec.getElementRegion(this._driver.target, this._element.target);
+        await this._spec.performAction(this._driver.target, [
+          { action: "press", x, y },
+          { action: "wait", ms: 300 },
+          { action: "release" }
+        ]);
         const sizeLabel = await this._driver.element({ type: "name", selector: "applitools_content_size_label" });
         const sizeString = await (sizeLabel === null || sizeLabel === void 0 ? void 0 : sizeLabel.getText());
         if (!sizeString)
@@ -30636,8 +30704,8 @@ var require_helper_ios = __commonJS({
         const paddingLabel = await this._driver.element({ type: "name", selector: "applitools_content_offset_label" });
         const paddingString = await (paddingLabel === null || paddingLabel === void 0 ? void 0 : paddingLabel.getText());
         if (paddingString) {
-          const [, x, y] = paddingString.match(/\{(-?\d+(?:\.\d+)?),\s?(-?\d+(?:\.\d+)?)\}/);
-          const contentOffset = { x: Number(x), y: Number(y) };
+          const [, x2, y2] = paddingString.match(/\{(-?\d+(?:\.\d+)?),\s?(-?\d+(?:\.\d+)?)\}/);
+          const contentOffset = { x: Number(x2), y: Number(y2) };
           if (!Number.isNaN(contentOffset.x))
             contentSize.width -= contentOffset.x;
           if (!Number.isNaN(contentOffset.y))
@@ -31887,8 +31955,8 @@ var require_driver = __commonJS({
         return this._environment;
       }
       async getViewport() {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
-        var _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0;
+        var _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15;
         if (!this._viewport) {
           const environment = await this.getEnvironment();
           const driverInfo = await this.getDriverInfo();
@@ -31905,13 +31973,13 @@ var require_driver = __commonJS({
             const capabilitiesViewport = capabilities ? (0, capabilities_1.extractCapabilitiesViewport)(capabilities) : null;
             this._logger.log("Extracted capabilities viewport", capabilitiesViewport);
             this._viewport = { ...capabilitiesViewport, ...this._viewport };
-            (_a = (_y = this._viewport).pixelRatio) !== null && _a !== void 0 ? _a : _y.pixelRatio = 1;
             let windowSize = await this._spec.getWindowSize(this.target);
-            (_b = (_z = this._viewport).displaySize) !== null && _b !== void 0 ? _b : _z.displaySize = windowSize;
-            if (((_c = this._viewport.orientation) === null || _c === void 0 ? void 0 : _c.startsWith("landscape")) && this._viewport.displaySize.height > this._viewport.displaySize.width) {
+            (_a = (_1 = this._viewport).displaySize) !== null && _a !== void 0 ? _a : _1.displaySize = windowSize;
+            if (((_b = this._viewport.orientation) === null || _b === void 0 ? void 0 : _b.startsWith("landscape")) && this._viewport.displaySize.height > this._viewport.displaySize.width) {
               this._viewport.displaySize = utils34.geometry.rotate(this._viewport.displaySize, 90);
             }
             if (environment.isAndroid) {
+              (_c = (_2 = this._viewport).pixelRatio) !== null && _c !== void 0 ? _c : _2.pixelRatio = 1;
               const { statusBar, navigationBar } = (_f = await ((_e = (_d = this._spec).getSystemBars) === null || _e === void 0 ? void 0 : _e.call(_d, this.target).catch(() => void 0))) !== null && _f !== void 0 ? _f : {};
               if (statusBar === null || statusBar === void 0 ? void 0 : statusBar.visible) {
                 this._logger.log("Driver status bar", statusBar);
@@ -31931,25 +31999,31 @@ var require_driver = __commonJS({
                   this._viewport.navigationBarSize = 0;
                 }
               }
-              (_0 = this._viewport).statusBarSize && (_0.statusBarSize = this._viewport.statusBarSize / this._viewport.pixelRatio);
-              (_1 = this._viewport).navigationBarSize && (_1.navigationBarSize = this._viewport.navigationBarSize / this._viewport.pixelRatio);
+              (_3 = this._viewport).statusBarSize && (_3.statusBarSize = this._viewport.statusBarSize / this._viewport.pixelRatio);
+              (_4 = this._viewport).navigationBarSize && (_4.navigationBarSize = this._viewport.navigationBarSize / this._viewport.pixelRatio);
               windowSize = utils34.geometry.scale(windowSize, 1 / this._viewport.pixelRatio);
-              (_2 = this._viewport).displaySize && (_2.displaySize = utils34.geometry.scale(this._viewport.displaySize, 1 / this._viewport.pixelRatio));
-              (_l = (_3 = this._viewport).navigationBarSize) !== null && _l !== void 0 ? _l : _3.navigationBarSize = 0;
+              (_5 = this._viewport).displaySize && (_5.displaySize = utils34.geometry.scale(this._viewport.displaySize, 1 / this._viewport.pixelRatio));
+              (_l = (_6 = this._viewport).navigationBarSize) !== null && _l !== void 0 ? _l : _6.navigationBarSize = 0;
             } else if (environment.isIOS) {
-              if ((_m = this._viewport.orientation) === null || _m === void 0 ? void 0 : _m.startsWith("landscape"))
+              if (!this._viewport.pixelRatio || !this._viewport.statusBarSize) {
+                const screen = await this.execute("mobile:deviceScreenInfo");
+                this._viewport.pixelRatio = (_m = screen.scale) !== null && _m !== void 0 ? _m : 0;
+                this._viewport.statusBarSize = (_o = screen.statusBarSize) === null || _o === void 0 ? void 0 : _o.height;
+              }
+              if ((_p = this._viewport.orientation) === null || _p === void 0 ? void 0 : _p.startsWith("landscape"))
                 this._viewport.statusBarSize = 0;
             }
-            (_o = (_4 = this._viewport).statusBarSize) !== null && _o !== void 0 ? _o : _4.statusBarSize = 0;
-            (_p = (_5 = this._viewport).viewportLocation) !== null && _p !== void 0 ? _p : _5.viewportLocation = {
-              x: this._viewport.orientation === "landscape" ? (_q = this._viewport.navigationBarSize) !== null && _q !== void 0 ? _q : 0 : 0,
+            (_q = (_7 = this._viewport).pixelRatio) !== null && _q !== void 0 ? _q : _7.pixelRatio = 1;
+            (_r = (_8 = this._viewport).statusBarSize) !== null && _r !== void 0 ? _r : _8.statusBarSize = 0;
+            (_s = (_9 = this._viewport).viewportLocation) !== null && _s !== void 0 ? _s : _9.viewportLocation = {
+              x: this._viewport.orientation === "landscape" ? (_t = this._viewport.navigationBarSize) !== null && _t !== void 0 ? _t : 0 : 0,
               y: this._viewport.statusBarSize
             };
             if (!this._viewport.viewportSize) {
               this._viewport.viewportSize = { ...this._viewport.displaySize };
               this._viewport.viewportSize.height -= this._viewport.statusBarSize;
               if (environment.isAndroid) {
-                this._viewport.viewportSize[((_r = this._viewport.orientation) === null || _r === void 0 ? void 0 : _r.startsWith("landscape")) ? "width" : "height"] -= this._viewport.navigationBarSize;
+                this._viewport.viewportSize[((_u = this._viewport.orientation) === null || _u === void 0 ? void 0 : _u.startsWith("landscape")) ? "width" : "height"] -= this._viewport.navigationBarSize;
               }
             }
             if (!environment.isWeb && environment.isIOS && !this._viewport.safeArea) {
@@ -31977,13 +32051,13 @@ var require_driver = __commonJS({
           }
           if (environment.isWeb) {
             const browserViewport = await this.execute(snippets.getViewport);
-            (_s = (_6 = this._viewport).viewportSize) !== null && _s !== void 0 ? _s : _6.viewportSize = browserViewport.viewportSize;
-            (_t = (_7 = this._viewport).pixelRatio) !== null && _t !== void 0 ? _t : _7.pixelRatio = browserViewport.pixelRatio;
-            (_u = (_8 = this._viewport).viewportScale) !== null && _u !== void 0 ? _u : _8.viewportScale = browserViewport.viewportScale;
-            (_v = (_9 = this._viewport).orientation) !== null && _v !== void 0 ? _v : _9.orientation = browserViewport.orientation;
+            (_v = (_10 = this._viewport).viewportSize) !== null && _v !== void 0 ? _v : _10.viewportSize = browserViewport.viewportSize;
+            (_w = (_11 = this._viewport).pixelRatio) !== null && _w !== void 0 ? _w : _11.pixelRatio = browserViewport.pixelRatio;
+            (_x = (_12 = this._viewport).viewportScale) !== null && _x !== void 0 ? _x : _12.viewportScale = browserViewport.viewportScale;
+            (_y = (_13 = this._viewport).orientation) !== null && _y !== void 0 ? _y : _13.orientation = browserViewport.orientation;
           }
-          (_w = (_10 = this._viewport).pixelRatio) !== null && _w !== void 0 ? _w : _10.pixelRatio = 1;
-          (_x = (_11 = this._viewport).viewportScale) !== null && _x !== void 0 ? _x : _11.viewportScale = 1;
+          (_z = (_14 = this._viewport).pixelRatio) !== null && _z !== void 0 ? _z : _14.pixelRatio = 1;
+          (_0 = (_15 = this._viewport).viewportScale) !== null && _0 !== void 0 ? _0 : _15.viewportScale = 1;
           this._logger.log("Extracted viewport", this._viewport);
         }
         return this._viewport;
@@ -32008,7 +32082,7 @@ var require_driver = __commonJS({
       async getDriverUrl() {
         var _a;
         const driverInfo = await this.getDriverInfo();
-        return (_a = driverInfo.remoteHostname) !== null && _a !== void 0 ? _a : null;
+        return (_a = driverInfo.driverServerUrl) !== null && _a !== void 0 ? _a : null;
       }
       async getHelper() {
         var _a, _b, _c;
@@ -32529,7 +32603,7 @@ var require_set_viewport_size = __commonJS({
 });
 
 // ../core/dist/get-account-info.js
-var require_get_account_info = __commonJS({
+var require_get_account_info2 = __commonJS({
   "../core/dist/get-account-info.js"(exports) {
     "use strict";
     init_process();
@@ -84083,7 +84157,7 @@ var require_make_manager = __commonJS({
     var open_eyes_1 = require_open_eyes4();
     var get_manager_results_1 = require_get_manager_results();
     var utils34 = __importStar(require_browser3());
-    function makeMakeManager({ spec, clients, concurrency: defaultConcurrency = utils34.general.getEnvValue("CONCURRENCY", "number"), core, base, agentId: defaultAgentId, environment, cwd = process.cwd(), logger: mainLogger, asyncCache }) {
+    function makeMakeManager({ spec, clients, concurrency: defaultConcurrency = utils34.general.getEnvValue("CONCURRENCY", "number"), core, base: defaultBase, agentId: defaultAgentId, environment, cwd = process.cwd(), logger: mainLogger, asyncCache }) {
       return async function makeManager({ type = "classic", settings, logger = mainLogger } = {}) {
         var _a, _b, _c, _d, _e;
         var _f;
@@ -84094,7 +84168,7 @@ var require_make_manager = __commonJS({
         (_c = (_f = settings.batch).id) !== null && _c !== void 0 ? _c : _f.id = (_d = utils34.general.getEnvValue("BATCH_ID")) !== null && _d !== void 0 ? _d : `generated-${utils34.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;
         logger.log('Command "makeManager" is called with settings', settings);
-        base !== null && base !== void 0 ? base : base = (0, core_base_1.makeCore)({ agentId: settings.agentId, concurrency: settings.concurrency, cwd, logger });
+        const base = defaultBase !== null && defaultBase !== void 0 ? defaultBase : (0, core_base_1.makeCore)({ agentId: settings.agentId, concurrency: settings.concurrency, cwd, logger });
         const cores = {
           ufg: (0, core_2.makeCore)({ spec, base, fetchConcurrency: settings.fetchConcurrency, asyncCache, logger }),
           classic: (0, core_1.makeCore)({ spec, base, logger })
@@ -84291,7 +84365,7 @@ var require_package2 = __commonJS({
   "../core/package.json"(exports, module) {
     module.exports = {
       name: "@applitools/core",
-      version: "4.5.0",
+      version: "4.5.1",
       homepage: "https://applitools.com",
       bugs: {
         url: "https://github.com/applitools/eyes.sdk.javascript1/issues"
@@ -84728,7 +84802,7 @@ var require_core4 = __commonJS({
     var core_base_1 = require_dist2();
     var get_viewport_size_1 = require_get_viewport_size();
     var set_viewport_size_1 = require_set_viewport_size();
-    var get_account_info_1 = require_get_account_info();
+    var get_account_info_1 = require_get_account_info2();
     var get_nml_client_1 = require_get_nml_client();
     var get_ec_client_1 = require_get_ec_client();
     var locate_1 = require_locate3();
@@ -84749,7 +84823,7 @@ var require_core4 = __commonJS({
       logger.log(`Core is initialized ${defaultBase ? "with" : "without"} custom base core and environment`, environment);
       if (environment.sdk)
         (0, validate_sdk_version_1.validateSdkVersion)(environment.sdk, { logger });
-      const base = defaultBase !== null && defaultBase !== void 0 ? defaultBase : (0, core_base_1.makeCore)({ agentId, cwd, logger });
+      const base = defaultBase !== null && defaultBase !== void 0 ? defaultBase : (0, core_base_1.makeCore)({ agentId, concurrency, cwd, logger });
       return utils34.general.extend(base, (core) => {
         return {
           base,
@@ -84765,6 +84839,7 @@ var require_core4 = __commonJS({
             core,
             base: defaultBase,
             agentId,
+            cwd,
             environment,
             asyncCache,
             logger
@@ -86581,7 +86656,9 @@ var require_spec_driver2 = __commonJS({
     }
     exports.childContext = childContext;
     async function getDriverInfo(driver) {
-      return { sessionId: driver.sessionId };
+      var _a;
+      const driverServerUrl = `${driver.options.protocol}://${driver.options.hostname}${driver.options.port ? `:${driver.options.port}` : ""}${(_a = driver.options.path) !== null && _a !== void 0 ? _a : ""}`;
+      return { sessionId: driver.sessionId, driverServerUrl };
     }
     exports.getDriverInfo = getDriverInfo;
     async function getCapabilities(driver) {
@@ -88040,7 +88117,7 @@ var require_package3 = __commonJS({
   "../eyes/package.json"(exports, module) {
     module.exports = {
       name: "@applitools/eyes",
-      version: "1.13.2",
+      version: "1.13.3",
       keywords: [
         "applitools",
         "eyes",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/eyes-browser",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "keywords": [
     "applitools",
     "browser",
@@ -48,7 +48,7 @@
     "test": "run --top-level mocha './test/**/*.spec.ts'"
   },
   "dependencies": {
-    "@applitools/eyes": "1.13.2"
+    "@applitools/eyes": "1.13.3"
   },
   "devDependencies": {
     "@types/node": "^12.20.55",