@applitools/eyes-browser 1.4.15 → 1.4.17

package/dist/index.js

@@ -10303,6 +10303,47 @@ var require_streams = __commonJS({
   }
 });
 
+// ../utils/dist/browser-process.js
+var require_browser_process = __commonJS({
+  "../utils/dist/browser-process.js"(exports) {
+    "use strict";
+    init_process();
+    init_setImmediate();
+    init_buffer();
+    init_setInterval();
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.sh = exports.executeProcess = exports.executeAndControlProcess = exports.execute = void 0;
+    var executionOutput = {
+      stdout: "",
+      stderr: "process execution is not supported in browser environment",
+      code: 1
+    };
+    async function execute(command, options) {
+      console.log("execute", { command, options });
+      return executionOutput;
+    }
+    exports.execute = execute;
+    async function executeAndControlProcess(command, args = [], options) {
+      console.log("executeAndControlProcess", { command, args, options });
+      return {
+        subProcess: void 0,
+        exitPromise: Promise.resolve(executionOutput)
+      };
+    }
+    exports.executeAndControlProcess = executeAndControlProcess;
+    async function executeProcess(command, args = [], options) {
+      console.log("executeProcess", { command, args, options });
+      return executionOutput;
+    }
+    exports.executeProcess = executeProcess;
+    async function sh(command, options) {
+      console.log("sh", { command, options });
+      return executionOutput;
+    }
+    exports.sh = sh;
+  }
+});
+
 // ../utils/dist/browser.js
 var require_browser3 = __commonJS({
   "../utils/dist/browser.js"(exports) {
@@ -10349,7 +10390,7 @@ var require_browser3 = __commonJS({
       return result;
     };
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.streams = exports.math = exports.queues = exports.promises = exports.geometry = exports.general = exports.guard = exports.types = void 0;
+    exports.process = exports.streams = exports.math = exports.queues = exports.promises = exports.geometry = exports.general = exports.guard = exports.types = void 0;
     __exportStar(require_utility_types(), exports);
     exports.types = __importStar(require_types());
     exports.guard = __importStar(require_guard());
@@ -10359,6 +10400,7 @@ var require_browser3 = __commonJS({
     exports.queues = __importStar(require_queues());
     exports.math = __importStar(require_math());
     exports.streams = __importStar(require_streams());
+    exports.process = __importStar(require_browser_process());
   }
 });
 
@@ -11958,10 +12000,11 @@ var require_formatter = __commonJS({
         fatal: ["bgRed", "white"]
       }
     };
-    function formatter(chunks, { prelude = true, label, timestamp = /* @__PURE__ */ new Date(), level = "info", tags, colors } = {}) {
-      var _a;
+    function formatter(chunks, { prelude = true, label, timestamp = /* @__PURE__ */ new Date(), level = "info", tags, colors, masks, maskLog } = {}) {
+      var _a, _b;
       if (utils34.types.isBoolean(colors))
         colors = colors ? defaultColorTheme : void 0;
+      const shouldMaskMessage = (_a = utils34.general.getEnvValue("MASK_LOG", "boolean")) !== null && _a !== void 0 ? _a : maskLog;
       const message = [];
       if (prelude) {
         if (label) {
@@ -11985,14 +12028,20 @@ var require_formatter = __commonJS({
         }
         if (level) {
           const text = level.toUpperCase().padEnd(5);
-          const color = (_a = colors === null || colors === void 0 ? void 0 : colors.level) === null || _a === void 0 ? void 0 : _a[level];
+          const color = (_b = colors === null || colors === void 0 ? void 0 : colors.level) === null || _b === void 0 ? void 0 : _b[level];
           message.push(color ? (0, colorize_1.colorize)(` ${text} `, { color }) : `[${text}]`);
         }
       }
       if (chunks && chunks.length > 0) {
         const color = colors === null || colors === void 0 ? void 0 : colors.message;
         const strings = chunks.map((chunk) => {
-          return utils34.types.isString(chunk) ? (0, colorize_1.colorize)(chunk, { color }) : util_1.inspect === null || util_1.inspect === void 0 ? void 0 : (0, util_1.inspect)(chunk, { colors: Boolean(colors), compact: 5, depth: 5 });
+          let text = utils34.types.isString(chunk) ? (0, colorize_1.colorize)(chunk, { color }) : util_1.inspect === null || util_1.inspect === void 0 ? void 0 : (0, util_1.inspect)(chunk, { colors: Boolean(colors), compact: 5, depth: 5 });
+          if (shouldMaskMessage) {
+            masks === null || masks === void 0 ? void 0 : masks.forEach((mask) => {
+              text = text.replaceAll(mask, "***");
+            });
+          }
+          return text;
         });
         message.push(strings.join(" "));
       }
@@ -12572,26 +12621,26 @@ var require_printer = __commonJS({
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.makePrinter = void 0;
     var log_level_1 = require_log_level();
-    function makePrinter({ handler, level = log_level_1.LogLevel.silent, format }) {
+    function makePrinter({ handler, level = log_level_1.LogLevel.silent, format, masks, maskLog }) {
       var _a;
       const formatter = (_a = format === null || format === void 0 ? void 0 : format.formatter) !== null && _a !== void 0 ? _a : (chunks, options) => ({ chunks, options, isRaw: true });
       return { debug, log, info: log, warn, error, fatal, verbose: log };
       function debug(...messages) {
         if (level < log_level_1.LogLevel.debug)
           return;
-        const options = { ...format, level: "debug" };
+        const options = { ...format, level: "debug", masks, maskLog };
         handler.log(formatter(messages, options));
       }
       function log(...messages) {
         if (level < log_level_1.LogLevel.info)
           return;
-        const options = { ...format, level: "info" };
+        const options = { ...format, level: "info", masks, maskLog };
         handler.log(formatter(messages, options));
       }
       function warn(...messages) {
         if (level < log_level_1.LogLevel.warn)
           return;
-        const options = { ...format, level: "warn" };
+        const options = { ...format, level: "warn", masks, maskLog };
         if (handler.warn)
           handler.warn(formatter(messages, options));
         else
@@ -12600,7 +12649,7 @@ var require_printer = __commonJS({
       function error(...messages) {
         if (level < log_level_1.LogLevel.error)
           return;
-        const options = { ...format, level: "error" };
+        const options = { ...format, level: "error", masks, maskLog };
         if (handler.error)
           handler.error(formatter(messages, options));
         else
@@ -12609,7 +12658,7 @@ var require_printer = __commonJS({
       function fatal(...messages) {
         if (level < log_level_1.LogLevel.fatal)
           return;
-        const options = { ...format, level: "fatal" };
+        const options = { ...format, level: "fatal", masks, maskLog };
         if (handler.fatal)
           handler.fatal(formatter(messages, options));
         else if (handler.error)
@@ -12673,15 +12722,19 @@ var require_logger = __commonJS({
     var colorize_1 = require_colorize();
     var formatter_1 = require_formatter();
     var utils34 = __importStar(require_browser3());
+    var masks = /* @__PURE__ */ new Set();
     function makeLogger2({ logger: baseLogger, ...options } = {}) {
-      var _a, _b, _c, _d, _e, _f;
-      var _g, _h;
+      var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+      var _k, _l;
       if (baseLogger)
-        return baseLogger.extend({ level: options.level, ...options.format });
+        return baseLogger.extend({ level: options.level, ...options.format, maskLog: options.maskLog });
       (_a = options.console) !== null && _a !== void 0 ? _a : options.console = true;
       (_b = options.format) !== null && _b !== void 0 ? _b : options.format = {};
-      (_c = (_g = options.format).formatter) !== null && _c !== void 0 ? _c : _g.formatter = formatter_1.formatter;
-      (_d = (_h = options.format).colors) !== null && _d !== void 0 ? _d : _h.colors = utils34.general.getEnvValue("LOG_COLORS", "boolean");
+      (_c = (_k = options.format).formatter) !== null && _c !== void 0 ? _c : _k.formatter = formatter_1.formatter;
+      (_d = (_l = options.format).colors) !== null && _d !== void 0 ? _d : _l.colors = utils34.general.getEnvValue("LOG_COLORS", "boolean");
+      (_e = options.maskLog) !== null && _e !== void 0 ? _e : options.maskLog = utils34.general.getEnvValue("MASK_LOG", "boolean");
+      const userMaskValues = (_g = (_f = utils34.general.getEnvValue("MASK_VALUES")) === null || _f === void 0 ? void 0 : _f.split(/(?<!\\),/)) !== null && _g !== void 0 ? _g : [];
+      userMaskValues.forEach((value) => masks.add(value.replace("\\,", ",")));
       let forceInitHandler;
       if (!options.handler) {
         if (process.env.APPLITOOLS_LOG_FILE) {
@@ -12701,7 +12754,7 @@ var require_logger = __commonJS({
         }
       }
       if (!utils34.types.isNumber(options.level)) {
-        (_e = options.level) !== null && _e !== void 0 ? _e : options.level = (_f = utils34.general.getEnvValue("LOG_LEVEL")) !== null && _f !== void 0 ? _f : utils34.general.getEnvValue("SHOW_LOGS", "boolean") ? "all" : void 0;
+        (_h = options.level) !== null && _h !== void 0 ? _h : options.level = (_j = utils34.general.getEnvValue("LOG_LEVEL")) !== null && _j !== void 0 ? _j : utils34.general.getEnvValue("SHOW_LOGS", "boolean") ? "all" : void 0;
         options.level = log_level_1.LogLevel[options.level];
       }
       if (utils34.types.has(options.handler, "type")) {
@@ -12723,21 +12776,46 @@ var require_logger = __commonJS({
       const logger = {
         isLogger: true,
         options,
-        console: (0, printer_1.makePrinter)({ handler: options.console, level: log_level_1.LogLevel.all, format: { ...options.format, prelude: false } }),
-        ...(0, printer_1.makePrinter)({ handler: options.handler, level: options.level, format: options.format }),
+        console: (0, printer_1.makePrinter)({
+          handler: options.console,
+          level: log_level_1.LogLevel.all,
+          format: { ...options.format, prelude: false },
+          maskLog: options.maskLog,
+          masks
+        }),
+        ...(0, printer_1.makePrinter)({
+          handler: options.handler,
+          level: options.level,
+          format: options.format,
+          maskLog: options.maskLog,
+          masks
+        }),
         extend(optionsOrLogger, extraOptions) {
+          var _a2, _b2, _c2;
           const extendOptions = [options];
           if (utils34.types.has(optionsOrLogger, "isLogger")) {
             if (optionsOrLogger !== logger)
               extendOptions.push({
                 console: optionsOrLogger.options.console,
                 level: optionsOrLogger.options.level,
-                format: optionsOrLogger.options.format
+                format: optionsOrLogger.options.format,
+                maskLog: (_a2 = optionsOrLogger.options.maskLog) !== null && _a2 !== void 0 ? _a2 : options.maskLog
               });
-            if (extraOptions)
-              extendOptions.push({ console: extraOptions.console, level: extraOptions.level, format: extraOptions });
+            if (extraOptions) {
+              extendOptions.push({
+                console: extraOptions.console,
+                level: extraOptions.level,
+                maskLog: (_b2 = extraOptions.maskLog) !== null && _b2 !== void 0 ? _b2 : options.maskLog,
+                format: extraOptions
+              });
+            }
           } else if (optionsOrLogger) {
-            extendOptions.push({ console: optionsOrLogger.console, level: optionsOrLogger.level, format: optionsOrLogger });
+            extendOptions.push({
+              console: optionsOrLogger.console,
+              level: optionsOrLogger.level,
+              maskLog: (_c2 = optionsOrLogger.maskLog) !== null && _c2 !== void 0 ? _c2 : options.maskLog,
+              format: optionsOrLogger
+            });
           }
           const extendedOptions = mergeOptions2(...extendOptions);
           if (forceInitHandler && extendedOptions.handler === options.handler) {
@@ -12755,6 +12833,9 @@ var require_logger = __commonJS({
           var _a2, _b2;
           if (!options.extended)
             (_b2 = (_a2 = options.handler).close) === null || _b2 === void 0 ? void 0 : _b2.call(_a2);
+        },
+        mask(value) {
+          masks.add(value);
         }
       };
       return logger;
@@ -12778,15 +12859,16 @@ var require_logger = __commonJS({
     exports.mergeLoggers = mergeLoggers;
     function mergeOptions2(...options) {
       return options.reduce((baseOptions, currentOptions) => {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f;
         return {
           ...baseOptions,
           ...currentOptions,
           level: (_a = currentOptions.level) !== null && _a !== void 0 ? _a : baseOptions.level,
+          maskLog: (_b = currentOptions.maskLog) !== null && _b !== void 0 ? _b : baseOptions.maskLog,
           format: {
             ...baseOptions.format,
             ...currentOptions.format,
-            tags: mergeTags((_c = (_b = baseOptions.format) === null || _b === void 0 ? void 0 : _b.tags) !== null && _c !== void 0 ? _c : [], (_e = (_d = currentOptions.format) === null || _d === void 0 ? void 0 : _d.tags) !== null && _e !== void 0 ? _e : [])
+            tags: mergeTags((_d = (_c = baseOptions.format) === null || _c === void 0 ? void 0 : _c.tags) !== null && _d !== void 0 ? _d : [], (_f = (_e = currentOptions.format) === null || _e === void 0 ? void 0 : _e.tags) !== null && _f !== void 0 ? _f : [])
           }
         };
       }, {});
@@ -21121,8 +21203,9 @@ var require_server_region_converter = __commonJS({
           options.maxLeftOffset = offset.left;
           options.maxRightOffset = offset.right;
         }
-        region = utils34.geometry.round(utils34.geometry.padding(region.region, (_a = region.padding) !== null && _a !== void 0 ? _a : 0));
+        region = utils34.geometry.padding(region.region, (_a = region.padding) !== null && _a !== void 0 ? _a : 0);
       }
+      region = utils34.geometry.round(region);
       return { left: region.x, top: region.y, width: region.width, height: region.height, ...options };
     }
     function regionSort(region1, region2) {
@@ -21619,6 +21702,7 @@ var require_requests = __commonJS({
           uploadUrl,
           ...rest
         };
+        logger.mask(result.ufgServer.accessToken);
         logger.log('Request "getAccountInfo" finished successfully with body', result);
         async function getServiceUrl(settings2, logger2) {
           const serviceUrlNew = await checkServiceUrl(settings2.ufgServerUrlNew, settings2.eyesServer, logger2);
@@ -21924,6 +22008,7 @@ var require_requests = __commonJS({
           return await test.results;
         test.results = response.json().then((result) => {
           var _a;
+          logger.mask(result.secretToken);
           result.userTestId = test.userTestId;
           result.url = test.resultsUrl;
           result.isNew = test.isNew;
@@ -22027,6 +22112,7 @@ var require_requests = __commonJS({
         }
         const response = await resultResponsePromise;
         const results = await response.json().then((result) => {
+          logger.mask(result.secretToken);
           result.userTestId = test.userTestId;
           result.url = test.resultsUrl;
           result.initializedAt = test.initializedAt;
@@ -44377,12 +44463,12 @@ var require_requests_offline = __commonJS({
         logger = logger.extend(mainLogger, { tags: [`core-request-offline-${utils34.general.shortid()}`] });
         logger.log('Offline request "openEyes" called with settings', settings);
         let resultResponsePromise;
-        const testFolderPath = await createTestFolder(folderPath, settings);
-        logger.log("testFolderPath", testFolderPath);
         const settingsToSave = { ...settings };
         delete settingsToSave.processId;
         delete settingsToSave.userTestId;
         (_a = settingsToSave.environment) === null || _a === void 0 ? true : delete _a.environmentId;
+        const testFolderPath = await createTestFolder(folderPath, settingsToSave);
+        logger.log("testFolderPath", testFolderPath);
         await fs_1.default.promises.writeFile(path_1.default.resolve(testFolderPath, "settings.json"), JSON.stringify(settingsToSave, null, 2));
         const account = await getAccountInfo();
         const initializedAt = "dummy initialized at";
@@ -44486,6 +44572,30 @@ var require_requests_offline = __commonJS({
         }
         async function report() {
         }
+        function createTestFolder(basePath, settings2) {
+          const testFolderPath2 = path_1.default.resolve(basePath, getNameForFolder(settings2));
+          if (fs_1.default.existsSync(testFolderPath2)) {
+            logger.log(`removing already existing folder: ${testFolderPath2}`);
+            fs_1.default.rmdirSync(testFolderPath2);
+          }
+          fs_1.default.mkdirSync(testFolderPath2, { recursive: true });
+          return testFolderPath2;
+        }
+        function getNameForFolder(settings2) {
+          const nameBeforeHash = JSON.stringify({
+            testName: settings2.testName,
+            environment: settings2.environment,
+            appName: settings2.appName
+          });
+          const nameAfterHash = crypto_1.default.createHash("md5").update(nameBeforeHash).digest("hex");
+          logger.log(`name for folder before hash: ${nameBeforeHash} and after hash: ${nameAfterHash}`);
+          return `test-${nameAfterHash}`;
+        }
+        function createCheckFolder(testFolderPath2, settings2) {
+          const checkFolderPath = path_1.default.resolve(testFolderPath2, `check-${settings2.stepIndex ? settings2.stepIndex + 1 : 0}`);
+          fs_1.default.mkdirSync(checkFolderPath, { recursive: true });
+          return checkFolderPath;
+        }
       }
       async function openFunctionalSession() {
         throw new Error("not implemented");
@@ -44517,22 +44627,6 @@ var require_requests_offline = __commonJS({
         throw new Error("not implemented");
       }
     }
-    function createTestFolder(basePath, settings) {
-      const testFolderPath = path_1.default.resolve(basePath, getNameForFolder(settings));
-      if (fs_1.default.existsSync(testFolderPath)) {
-        fs_1.default.rmdirSync(testFolderPath);
-      }
-      fs_1.default.mkdirSync(testFolderPath, { recursive: true });
-      return testFolderPath;
-    }
-    function getNameForFolder(settings) {
-      return `test-${crypto_1.default.createHash("md5").update(JSON.stringify({ testName: settings.testName, environment: settings.environment, appName: settings.appName })).digest("hex")}`;
-    }
-    function createCheckFolder(testFolderPath, settings) {
-      const checkFolderPath = path_1.default.resolve(testFolderPath, `check-${settings.stepIndex ? settings.stepIndex + 1 : 0}`);
-      fs_1.default.mkdirSync(checkFolderPath, { recursive: true });
-      return checkFolderPath;
-    }
   }
 });
 
@@ -51500,8 +51594,8 @@ var require_core = __commonJS({
     var get_account_info_1 = require_get_account_info();
     var heartbeat_1 = require_heartbeat();
     var open_check_and_close_1 = require_open_check_and_close();
-    function makeCore({ agentId = "core-base", concurrency, logger: defaultLogger, offlineLocationPath }) {
-      const logger = (0, logger_1.makeLogger)({ logger: defaultLogger, format: { label: "core-base" } });
+    function makeCore({ agentId = "core-base", concurrency, maskLog, logger: defaultLogger, offlineLocationPath }) {
+      const logger = (0, logger_1.makeLogger)({ logger: defaultLogger, format: { label: "core-base" }, maskLog });
       logger.log(`Core is initialized for agent ${agentId}`);
       const requests = offlineLocationPath ? (0, requests_offline_1.makeCoreRequestsOfflineWithCache)({ folderPath: offlineLocationPath, logger }) : (0, requests_1.makeCoreRequestsWithCache)({ logger });
       const heartbeat = (0, heartbeat_1.makeHeartbeat)({ requests, logger });
@@ -52456,33 +52550,33 @@ var require_dist3 = __commonJS({
         return refer.ref(function(arg2) {
           var s = function() {
             "use strict";
-            function t(t2) {
-              return t2 && t2.__esModule && Object.prototype.hasOwnProperty.call(t2, "default") ? t2.default : t2;
+            function n(n2) {
+              return n2 && n2.__esModule && Object.prototype.hasOwnProperty.call(n2, "default") ? n2.default : n2;
             }
-            function n() {
-              return n = Object.assign ? Object.assign.bind() : function(t2) {
-                for (var n2 = 1; n2 < arguments.length; n2++) {
-                  var r2 = arguments[n2];
+            function t() {
+              return t = Object.assign ? Object.assign.bind() : function(n2) {
+                for (var t2 = 1; t2 < arguments.length; t2++) {
+                  var r2 = arguments[t2];
                   for (var e2 in r2)
-                    Object.prototype.hasOwnProperty.call(r2, e2) && (t2[e2] = r2[e2]);
+                    ({}).hasOwnProperty.call(r2, e2) && (n2[e2] = r2[e2]);
                 }
-                return t2;
-              }, n.apply(this, arguments);
+                return n2;
+              }, t.apply(null, arguments);
             }
             var r = "__EYES__APPLITOOLS__", e = "userAgent";
-            return window[r] = window[r] || {}, t(function() {
+            return window[r] = window[r] || {}, n(function() {
               try {
                 if (window[r][e]) {
-                  var t2 = window[r][e];
-                  return "WIP" !== t2.status && delete window[r][e], JSON.stringify(t2);
+                  var n2 = window[r][e];
+                  return "WIP" !== n2.status && delete window[r][e], JSON.stringify(n2);
                 }
-                return window.navigator.userAgentData ? (window[r][e] = { status: "WIP" }, window.navigator.userAgentData.getHighEntropyValues(["brands", "platform", "platformVersion", "model"]).then(function(t3) {
-                  window[r][e] = { status: "SUCCESS", value: n({ legacy: window.navigator.userAgent }, t3) };
-                }).catch(function(t3) {
-                  window[r][e] = { status: "ERROR", error: t3.message };
+                return window.navigator.userAgentData ? (window[r][e] = { status: "WIP" }, window.navigator.userAgentData.getHighEntropyValues(["brands", "platform", "platformVersion", "model"]).then(function(n3) {
+                  window[r][e] = { status: "SUCCESS", value: t({ legacy: window.navigator.userAgent }, n3) };
+                }).catch(function(n3) {
+                  window[r][e] = { status: "ERROR", error: n3.message };
                 })) : window[r][e] = { status: "SUCCESS", value: window.navigator.userAgent }, JSON.stringify(window[r][e]);
-              } catch (t3) {
-                return window[r][e] = { status: "ERROR", error: t3.message }, JSON.stringify(window[r][e]);
+              } catch (n3) {
+                return window[r][e] = { status: "ERROR", error: n3.message }, JSON.stringify(window[r][e]);
               }
             });
           }();
@@ -57897,7 +57991,7 @@ ${l2}`}`, { bundledCss: i2, unfetchedResources: u2 };
                 return d4 && (N3.shadowRoot = d4), N3;
               }
             }(t4);
-            d2(i2.doCaptureDoc), l2(i2.waitForImages), await Promise.all(f2), d2(i2.waitForImages), N2.version = "1.3.0", N2.scriptVersion = "11.5.2";
+            d2(i2.doCaptureDoc), l2(i2.waitForImages), await Promise.all(f2), d2(i2.waitForImages), N2.version = "1.3.0", N2.scriptVersion = "11.5.4";
             const S2 = h2.length ? `${h2.join("\n")}
 ` : "", A2 = m2.size ? `${Array.from(m2).join("\n")}
 ` : "", Y2 = JSON.stringify({ separator: y2, cssStartToken: g2, cssEndToken: g2, iframeStartToken: `"${p2}`, iframeEndToken: `${p2}"` });
@@ -60389,10 +60483,10 @@ var require_core2 = __commonJS({
     var get_nml_client_1 = require_get_nml_client();
     var open_eyes_1 = require_open_eyes2();
     var utils34 = __importStar(require_browser3());
-    function makeCore({ spec, clients, base: defaultBase, concurrency, agentId = "core-classic", logger: defaultLogger, offlineLocationPath }) {
-      const logger = (0, logger_1.makeLogger)({ logger: defaultLogger, format: { label: "core-classic" } });
+    function makeCore({ spec, clients, base: defaultBase, concurrency, agentId = "core-classic", logger: defaultLogger, maskLog, offlineLocationPath }) {
+      const logger = (0, logger_1.makeLogger)({ logger: defaultLogger, format: { label: "core-classic" }, maskLog });
       logger.log(`Core classic is initialized ${defaultBase ? "with" : "without"} custom base core`);
-      const base = defaultBase !== null && defaultBase !== void 0 ? defaultBase : (0, core_base_1.makeCore)({ agentId, concurrency, logger, offlineLocationPath });
+      const base = defaultBase !== null && defaultBase !== void 0 ? defaultBase : (0, core_base_1.makeCore)({ agentId, concurrency, logger, offlineLocationPath, maskLog });
       return utils34.general.extend(base, (core) => {
         return {
           type: "classic",
@@ -60933,10 +61027,10 @@ var require_processPagePollCjs = __commonJS({
                   for (var t6 = 1; t6 < arguments.length; t6++) {
                     var n4 = arguments[t6];
                     for (var r2 in n4)
-                      Object.prototype.hasOwnProperty.call(n4, r2) && (e6[r2] = n4[r2]);
+                      ({}).hasOwnProperty.call(n4, r2) && (e6[r2] = n4[r2]);
                   }
                   return e6;
-                }, e5.apply(this, arguments);
+                }, e5.apply(null, arguments);
               }
               var t5 = "__EYES__APPLITOOLS__", n3 = "userAgent";
               return window[t5] = window[t5] || {}, function(e6) {
@@ -62593,7 +62687,7 @@ var require_processPagePollCjs = __commonJS({
               }(e4) && Jt(e4, 1, false) ? n3 + 1 : 0 : Qt(r2, n3, t4);
             }
             return e4.type === Gt.Dimension ? Qt(Jt(e4, 1, true), ++n3, t4) : 0;
-          }, rn = y, on = k, an = O, sn = ["calc(", "-moz-calc(", "-webkit-calc("], ln = /* @__PURE__ */ new Map([[rn.Function, rn.RightParenthesis], [rn.LeftParenthesis, rn.RightParenthesis], [rn.LeftSquareBracket, rn.RightSquareBracket], [rn.LeftCurlyBracket, rn.RightCurlyBracket]]);
+          }, rn = k, on = y, an = O, sn = ["calc(", "-moz-calc(", "-webkit-calc("], ln = /* @__PURE__ */ new Map([[on.Function, on.RightParenthesis], [on.LeftParenthesis, on.RightParenthesis], [on.LeftSquareBracket, on.RightSquareBracket], [on.LeftCurlyBracket, on.RightCurlyBracket]]);
           function cn(e4, t4) {
             return t4 < e4.length ? e4.charCodeAt(t4) : 0;
           }
@@ -62607,7 +62701,7 @@ var require_processPagePollCjs = __commonJS({
             return false;
           }
           function dn(e4, t4) {
-            return t4 === e4.length - 2 && 92 === cn(e4, t4) && on.isDigit(cn(e4, t4 + 1));
+            return t4 === e4.length - 2 && 92 === cn(e4, t4) && rn.isDigit(cn(e4, t4 + 1));
           }
           function pn(e4, t4, n3) {
             if (e4 && "Range" === e4.type) {
@@ -62623,14 +62717,14 @@ var require_processPagePollCjs = __commonJS({
           }
           function mn(e4) {
             return function(t4, n3, r2) {
-              return null === t4 ? 0 : t4.type === rn.Function && hn(t4.value, sn) ? function(e5, t5) {
+              return null === t4 ? 0 : t4.type === on.Function && hn(t4.value, sn) ? function(e5, t5) {
                 let n4 = 0, r3 = [], o2 = 0;
                 e:
                   do {
                     switch (e5.type) {
-                      case rn.RightCurlyBracket:
-                      case rn.RightParenthesis:
-                      case rn.RightSquareBracket:
+                      case on.RightCurlyBracket:
+                      case on.RightParenthesis:
+                      case on.RightSquareBracket:
                         if (e5.type !== n4)
                           break e;
                         if (n4 = r3.pop(), 0 === r3.length) {
@@ -62638,10 +62732,10 @@ var require_processPagePollCjs = __commonJS({
                           break e;
                         }
                         break;
-                      case rn.Function:
-                      case rn.LeftParenthesis:
-                      case rn.LeftSquareBracket:
-                      case rn.LeftCurlyBracket:
+                      case on.Function:
+                      case on.LeftParenthesis:
+                      case on.LeftSquareBracket:
+                      case on.LeftCurlyBracket:
                         r3.push(n4), n4 = ln.get(e5.type);
                     }
                     o2++;
@@ -62656,11 +62750,11 @@ var require_processPagePollCjs = __commonJS({
             };
           }
           function gn(e4) {
-            return null === e4 || e4.type !== rn.Ident || 45 !== cn(e4.value, 0) || 45 !== cn(e4.value, 1) ? 0 : 1;
+            return null === e4 || e4.type !== on.Ident || 45 !== cn(e4.value, 0) || 45 !== cn(e4.value, 1) ? 0 : 1;
           }
           function bn(e4) {
             return e4 && (e4 = new Set(e4)), function(t4, n3, r2) {
-              if (null === t4 || t4.type !== rn.Dimension)
+              if (null === t4 || t4.type !== on.Dimension)
                 return 0;
               const o2 = an.consumeNumber(t4.value, 0);
               if (null !== e4) {
@@ -62675,43 +62769,43 @@ var require_processPagePollCjs = __commonJS({
             return "function" != typeof e4 && (e4 = function() {
               return 0;
             }), function(t4, n3, r2) {
-              return null !== t4 && t4.type === rn.Number && 0 === Number(t4.value) ? 1 : e4(t4, n3, r2);
+              return null !== t4 && t4.type === on.Number && 0 === Number(t4.value) ? 1 : e4(t4, n3, r2);
             };
           }
-          const kn = { "ident-token": fn(rn.Ident), "function-token": fn(rn.Function), "at-keyword-token": fn(rn.AtKeyword), "hash-token": fn(rn.Hash), "string-token": fn(rn.String), "bad-string-token": fn(rn.BadString), "url-token": fn(rn.Url), "bad-url-token": fn(rn.BadUrl), "delim-token": fn(rn.Delim), "number-token": fn(rn.Number), "percentage-token": fn(rn.Percentage), "dimension-token": fn(rn.Dimension), "whitespace-token": fn(rn.WhiteSpace), "CDO-token": fn(rn.CDO), "CDC-token": fn(rn.CDC), "colon-token": fn(rn.Colon), "semicolon-token": fn(rn.Semicolon), "comma-token": fn(rn.Comma), "[-token": fn(rn.LeftSquareBracket), "]-token": fn(rn.RightSquareBracket), "(-token": fn(rn.LeftParenthesis), ")-token": fn(rn.RightParenthesis), "{-token": fn(rn.LeftCurlyBracket), "}-token": fn(rn.RightCurlyBracket) }, wn = { string: fn(rn.String), ident: fn(rn.Ident), percentage: mn(function(e4, t4, n3) {
-            return null === e4 || e4.type !== rn.Percentage || pn(n3, e4.value, e4.value.length - 1) ? 0 : 1;
+          const kn = { "ident-token": fn(on.Ident), "function-token": fn(on.Function), "at-keyword-token": fn(on.AtKeyword), "hash-token": fn(on.Hash), "string-token": fn(on.String), "bad-string-token": fn(on.BadString), "url-token": fn(on.Url), "bad-url-token": fn(on.BadUrl), "delim-token": fn(on.Delim), "number-token": fn(on.Number), "percentage-token": fn(on.Percentage), "dimension-token": fn(on.Dimension), "whitespace-token": fn(on.WhiteSpace), "CDO-token": fn(on.CDO), "CDC-token": fn(on.CDC), "colon-token": fn(on.Colon), "semicolon-token": fn(on.Semicolon), "comma-token": fn(on.Comma), "[-token": fn(on.LeftSquareBracket), "]-token": fn(on.RightSquareBracket), "(-token": fn(on.LeftParenthesis), ")-token": fn(on.RightParenthesis), "{-token": fn(on.LeftCurlyBracket), "}-token": fn(on.RightCurlyBracket) }, wn = { string: fn(on.String), ident: fn(on.Ident), percentage: mn(function(e4, t4, n3) {
+            return null === e4 || e4.type !== on.Percentage || pn(n3, e4.value, e4.value.length - 1) ? 0 : 1;
           }), zero: yn(), number: mn(function(e4, t4, n3) {
             if (null === e4)
               return 0;
             const r2 = an.consumeNumber(e4.value, 0);
             return r2 === e4.value.length || dn(e4.value, r2) ? pn(n3, e4.value, r2) ? 0 : 1 : 0;
           }), integer: mn(function(e4, t4, n3) {
-            if (null === e4 || e4.type !== rn.Number)
+            if (null === e4 || e4.type !== on.Number)
               return 0;
             let r2 = 43 === cn(e4.value, 0) || 45 === cn(e4.value, 0) ? 1 : 0;
             for (; r2 < e4.value.length; r2++)
-              if (!on.isDigit(cn(e4.value, r2)))
+              if (!rn.isDigit(cn(e4.value, r2)))
                 return 0;
             return pn(n3, e4.value, r2) ? 0 : 1;
           }), "custom-ident": function(e4) {
-            if (null === e4 || e4.type !== rn.Ident)
+            if (null === e4 || e4.type !== on.Ident)
               return 0;
             const t4 = e4.value.toLowerCase();
             return hn(t4, en.cssWideKeywords) || un(t4, "default") ? 0 : 1;
           }, "dashed-ident": gn, "custom-property-name": function(e4) {
             return gn(e4) ? "--" === e4.value ? 0 : 1 : 0;
           }, "hex-color": function(e4) {
-            if (null === e4 || e4.type !== rn.Hash)
+            if (null === e4 || e4.type !== on.Hash)
               return 0;
             const t4 = e4.value.length;
             if (4 !== t4 && 5 !== t4 && 7 !== t4 && 9 !== t4)
               return 0;
             for (let n3 = 1; n3 < t4; n3++)
-              if (!on.isHexDigit(cn(e4.value, n3)))
+              if (!rn.isHexDigit(cn(e4.value, n3)))
                 return 0;
             return 1;
           }, "id-selector": function(e4) {
-            return null === e4 || e4.type !== rn.Hash ? 0 : on.isIdentifierStart(cn(e4.value, 1), cn(e4.value, 2), cn(e4.value, 3)) ? 1 : 0;
+            return null === e4 || e4.type !== on.Hash ? 0 : rn.isIdentifierStart(cn(e4.value, 1), cn(e4.value, 2), cn(e4.value, 3)) ? 1 : 0;
           }, "an-plus-b": tn, urange: nn, "declaration-value": function(e4, t4) {
             if (!e4)
               return 0;
@@ -62719,28 +62813,28 @@ var require_processPagePollCjs = __commonJS({
             e:
               do {
                 switch (e4.type) {
-                  case rn.BadString:
-                  case rn.BadUrl:
+                  case on.BadString:
+                  case on.BadUrl:
                     break e;
-                  case rn.RightCurlyBracket:
-                  case rn.RightParenthesis:
-                  case rn.RightSquareBracket:
+                  case on.RightCurlyBracket:
+                  case on.RightParenthesis:
+                  case on.RightSquareBracket:
                     if (e4.type !== n3)
                       break e;
                     n3 = r2.pop();
                     break;
-                  case rn.Semicolon:
+                  case on.Semicolon:
                     if (0 === n3)
                       break e;
                     break;
-                  case rn.Delim:
+                  case on.Delim:
                     if (0 === n3 && "!" === e4.value)
                       break e;
                     break;
-                  case rn.Function:
-                  case rn.LeftParenthesis:
-                  case rn.LeftSquareBracket:
-                  case rn.LeftCurlyBracket:
+                  case on.Function:
+                  case on.LeftParenthesis:
+                  case on.LeftSquareBracket:
+                  case on.LeftCurlyBracket:
                     r2.push(n3), n3 = ln.get(e4.type);
                 }
                 o2++;
@@ -62753,20 +62847,20 @@ var require_processPagePollCjs = __commonJS({
             e:
               do {
                 switch (e4.type) {
-                  case rn.BadString:
-                  case rn.BadUrl:
+                  case on.BadString:
+                  case on.BadUrl:
                     break e;
-                  case rn.RightCurlyBracket:
-                  case rn.RightParenthesis:
-                  case rn.RightSquareBracket:
+                  case on.RightCurlyBracket:
+                  case on.RightParenthesis:
+                  case on.RightSquareBracket:
                     if (e4.type !== n3)
                       break e;
                     n3 = r2.pop();
                     break;
-                  case rn.Function:
-                  case rn.LeftParenthesis:
-                  case rn.LeftSquareBracket:
-                  case rn.LeftCurlyBracket:
+                  case on.Function:
+                  case on.LeftParenthesis:
+                  case on.LeftSquareBracket:
+                  case on.LeftCurlyBracket:
                     r2.push(n3), n3 = ln.get(e4.type);
                 }
                 o2++;
@@ -66724,7 +66818,7 @@ var require_processPagePollCjs = __commonJS({
                     return [t5].concat(n4 ? df(hf(n4.map(e6))) : []);
                   }(u2);
                   c2("doProcessResource from sessionStorage", u2, "deps:", e5.slice(1)), a2[u2] = Promise.resolve({ resourceUrls: e5 });
-                } else if (m2 && m2.indexOf(u2) > -1 || /https:\/\/fonts.googleapis.com/.test(u2))
+                } else if (m2 && m2.indexOf(u2) > -1 || /https:\/\/fonts\.googleapis\.com/.test(u2))
                   c2("not processing resource from skip list (or google font):", u2), a2[u2] = Promise.resolve({ resourceUrls: [u2] });
                 else {
                   const g2 = Date.now();
@@ -66944,7 +67038,7 @@ creating temp style for access.`), r2 = Sf(e4);
               function R2(e5) {
                 return t5.defaultView && t5.defaultView.frameElement && t5.defaultView.frameElement.getAttribute(e5);
               }
-            }(t4).then((e4) => (h2("processPage end"), e4.scriptVersion = "4.11.12", e4));
+            }(t4).then((e4) => (h2("processPage end"), e4.scriptVersion = "4.11.14", e4));
           };
           window[cg] = window[cg] || {};
           const dg = lg(hg, window[cg], ug);
@@ -67184,10 +67278,10 @@ var require_take_dom_snapshot = __commonJS({
       for (const elementReference of (_b = settings === null || settings === void 0 ? void 0 : settings.elementReferences) !== null && _b !== void 0 ? _b : []) {
         elements.push(await context.elements(elementReference));
       }
-      const snapshot = transformRawDomSnapshot(await takeContextDomSnapshot({ context }), elements);
+      const snapshot = transformRawDomSnapshot(await takeContextDomSnapshot({ context, isRootFrame: true }), elements);
       snapshot.cookies = features.allCookies ? await driver.getCookies().catch(() => []) : cookies;
       return snapshot;
-      async function takeContextDomSnapshot({ context: context2 }) {
+      async function takeContextDomSnapshot({ context: context2, isRootFrame }) {
         var _a2, _b2, _c;
         const arg = {
           dontFetchResources: settings === null || settings === void 0 ? void 0 : settings.disableBrowserFetching,
@@ -67197,7 +67291,7 @@ var require_take_dom_snapshot = __commonJS({
           serializeResources: true,
           compressResources: false,
           showLogs: settings === null || settings === void 0 ? void 0 : settings.showLogs,
-          elements
+          elements: isRootFrame ? elements : []
         };
         const scripts = {
           main: features.canExecuteOnlyFunctionScripts ? require_dom_snapshot().processPagePoll : `return (${await getProcessPagePoll()}).apply(null, arguments);`,
@@ -67221,7 +67315,11 @@ var require_take_dom_snapshot = __commonJS({
             logger.log(`could not switch to frame during takeDomSnapshot. Path to frame: ${JSON.stringify(reference)}`, err);
           });
           if (frameContext) {
-            const frameSnapshot = await takeContextDomSnapshot({ context: frameContext });
+            const frameSnapshot = await takeContextDomSnapshot({
+              context: frameContext,
+              isRootFrame: false
+              // when we're diving into a frame, it's not the root frame anymore and we shouldn't pass the elements
+            });
             let url = new URL(frameSnapshot.url);
             if (url.protocol === "data:")
               url = new URL(`http://data-url-frame${url.search}`);
@@ -68356,7 +68454,7 @@ var require_resource = __commonJS({
     var crypto_1 = require_crypto_browserify();
     var utils34 = __importStar(require_browser3());
     var UFG_MAX_RESOURCE_SIZE = 34.5 * 1024 * 1024;
-    function makeResource(resource) {
+    function makeResource(resource, beforeSetResourceValue) {
       var _a, _b, _c;
       if (utils34.types.has(resource, "errorStatusCode")) {
         const failedResource = {
@@ -68369,7 +68467,7 @@ var require_resource = __commonJS({
         const contentfulResource = {
           id: (_a = resource.id) !== null && _a !== void 0 ? _a : resource.url,
           url: resource.url,
-          value: getResourceValue(resource.value),
+          value: getResourceValue(resource.value, beforeSetResourceValue),
           contentType: resource.contentType || "application/x-applitools-unknown",
           dependencies: resource.dependencies
         };
@@ -68408,7 +68506,7 @@ var require_resource = __commonJS({
       ].includes(resource.contentType);
     }
     function isEnvironmentDependantResource({ url }) {
-      return /https:\/\/fonts.googleapis.com/.test(url);
+      return /https:\/\/fonts\.googleapis\.com/.test(url);
     }
     function extractEnvironmentName({ environment }) {
       if (!utils34.types.has(environment, "name"))
@@ -68416,8 +68514,9 @@ var require_resource = __commonJS({
       const [browserName] = environment.name.split(/[-\d]/, 1);
       return browserName;
     }
-    function getResourceValue(value) {
-      return value ? utils34.types.isString(value) ? buffer_1.Buffer.from(value, "base64") : value : new Uint8Array(0);
+    function getResourceValue(value, beforeSetResourceValue) {
+      const returnValue = value ? utils34.types.isString(value) ? buffer_1.Buffer.from(value, "base64") : value : new Uint8Array(0);
+      return beforeSetResourceValue ? beforeSetResourceValue(returnValue) : returnValue;
     }
   }
 });
@@ -68515,15 +68614,45 @@ var require_create_render_target = __commonJS({
     var resource_dom_1 = require_resource_dom();
     var resource_vhs_1 = require_resource_vhs();
     var utils34 = __importStar(require_browser3());
-    function makeCreateRenderTarget({ processResources, logger: mainLogger }) {
+    var buffer_1 = require_buffer();
+    function getSnapshotOrigin(url) {
+      if (!url)
+        return url;
+      return new URL(url).origin;
+    }
+    function replaceResourceUrlIfNeeded(url, replaceResourceUrlsSettings) {
+      if (!url || !replaceResourceUrlsSettings)
+        return url;
+      return url.replace(replaceResourceUrlsSettings.from, replaceResourceUrlsSettings.to);
+    }
+    function replaceUrlInContentIfNeeded(obj, replaceResourceUrlsSettings) {
+      if (!replaceResourceUrlsSettings)
+        return obj;
+      return JSON.parse(JSON.stringify(obj).replace(new RegExp(replaceResourceUrlsSettings.from, "g"), replaceResourceUrlsSettings.to));
+    }
+    function makeReplaceUrlInBase64ContentIfNeeded(replaceResourceUrlsSettings) {
+      if (!replaceResourceUrlsSettings)
+        return void 0;
+      return function replaceUrlInBase64ContentIfNeeded(obj) {
+        if (obj.toString("utf-8").search(new RegExp(replaceResourceUrlsSettings.from, "g")) === -1)
+          return obj;
+        const resourceData = obj.toString("utf-8").replace(new RegExp(replaceResourceUrlsSettings.from, "g"), replaceResourceUrlsSettings.to);
+        return buffer_1.Buffer.from(resourceData, "utf-8");
+      };
+    }
+    function makeCreateRenderTarget({ processResources, logger: mainLogger, replaceResourceUrl }) {
       return async function createRenderTarget({ snapshot, settings, logger = mainLogger }) {
         logger = logger.extend(mainLogger, { tags: [`render-target-${utils34.general.shortid()}`] });
         const processedSnapshotResources = await processSnapshotResources({ snapshot, settings, logger });
         const resources = await processedSnapshotResources.promise;
+        const sortedResources = replaceResourceUrl ? Object.entries(resources).sort(([url1], [url2]) => url1.localeCompare(url2)).reduce((mapping, [url, resource]) => {
+          mapping[url] = resource;
+          return mapping;
+        }, {}) : resources;
         if (utils34.types.has(snapshot, "cdt")) {
-          const snapshotResource = resources[snapshot.url];
-          delete resources[snapshot.url];
-          return { snapshot: snapshotResource, resources, source: snapshot.url };
+          const snapshotResource = sortedResources[snapshot.url];
+          delete sortedResources[snapshot.url];
+          return { snapshot: snapshotResource, resources: sortedResources, source: snapshot.url };
         } else {
           const snapshotResource = resources.vhs;
           return utils34.types.has(snapshot, "vhsType") ? { snapshot: snapshotResource, resources, vhsType: snapshot.vhsType } : { snapshot: snapshotResource, resources, vhsCompatibilityParams: snapshot.vhsCompatibilityParams };
@@ -68531,13 +68660,18 @@ var require_create_render_target = __commonJS({
       };
       async function processSnapshotResources({ snapshot, settings, logger }) {
         var _a, _b, _c;
+        const replaceResourceUrlsSettings = replaceResourceUrl ? { from: getSnapshotOrigin(snapshot.url), to: replaceResourceUrl } : void 0;
         const [snapshotResources, ...frameResources] = await Promise.all([
           processResources({
             resources: Object.fromEntries([
               ...((_a = snapshot.resourceUrls) !== null && _a !== void 0 ? _a : []).map((url) => {
+                url = replaceResourceUrlIfNeeded(url, replaceResourceUrlsSettings);
                 return [url, (0, resource_1.makeResource)({ url, environment: settings === null || settings === void 0 ? void 0 : settings.environment })];
               }),
               ...Object.entries((_b = snapshot.resourceContents) !== null && _b !== void 0 ? _b : {}).map(([url, resource]) => {
+                url = replaceResourceUrlIfNeeded(url, replaceResourceUrlsSettings);
+                if (utils34.types.has(resource, "url"))
+                  resource.url = replaceResourceUrlIfNeeded(resource.url, replaceResourceUrlsSettings);
                 return [
                   url,
                   utils34.types.has(resource, "errorStatusCode") ? (0, resource_1.makeResource)({ id: url, errorStatusCode: resource.errorStatusCode }) : (0, resource_1.makeResource)({
@@ -68545,7 +68679,7 @@ var require_create_render_target = __commonJS({
                     value: resource.value,
                     contentType: resource.type,
                     dependencies: resource.dependencies
-                  })
+                  }, makeReplaceUrlInBase64ContentIfNeeded(replaceResourceUrlsSettings))
                 ];
               })
             ]),
@@ -68560,13 +68694,15 @@ var require_create_render_target = __commonJS({
           })
         ]);
         const frameDomResourceMapping = frameResources.reduce((mapping, resources, index) => {
-          const frameUrl = snapshot.frames[index].url;
+          const frameUrl = replaceResourceUrlIfNeeded(snapshot.frames[index].url, replaceResourceUrlsSettings);
           return Object.assign(mapping, { [frameUrl]: resources.mapping[frameUrl] });
         }, {});
         const resourceMappingWithoutDom = { ...snapshotResources.mapping, ...frameDomResourceMapping };
+        if (utils34.types.has(snapshot, "url"))
+          snapshot.url = replaceResourceUrlIfNeeded(snapshot.url, replaceResourceUrlsSettings);
         const domResource = utils34.types.has(snapshot, "cdt") ? {
           [snapshot.url]: (0, resource_dom_1.makeResourceDom)({
-            cdt: snapshot.cdt,
+            cdt: replaceUrlInContentIfNeeded(snapshot.cdt, replaceResourceUrlsSettings),
             resources: resourceMappingWithoutDom
           })
         } : {
@@ -72717,8 +72853,8 @@ var require_generic = __commonJS({
     var genericConst = require_generic_const();
     var genericAnPlusB = require_generic_an_plus_b();
     var genericUrange = require_generic_urange();
-    var types20 = require_types8();
     var charCodeDefinitions = require_char_code_definitions();
+    var types20 = require_types8();
     var utils34 = require_utils5();
     var calcFunctionNames = ["calc(", "-moz-calc(", "-webkit-calc("];
     var balancePair = /* @__PURE__ */ new Map([
@@ -88386,7 +88522,7 @@ var require_client_offline = __commonJS({
       const getAndroidDevices = async () => ({});
       const getIOSDevices = async () => ios_devices_1.iosDevices;
       return {
-        createRenderTarget: (0, create_render_target_1.makeCreateRenderTarget)({ processResources, logger }),
+        createRenderTarget: (0, create_render_target_1.makeCreateRenderTarget)({ processResources, logger, replaceResourceUrl: "http://offline" }),
         render,
         startRenders: async () => {
           throw new Error("not implemented");
@@ -89321,10 +89457,10 @@ var require_core3 = __commonJS({
     var get_ufg_client_1 = require_get_ufg_client();
     var open_eyes_1 = require_open_eyes3();
     var utils34 = __importStar(require_browser3());
-    function makeCore({ spec, clients, base: defaultBase, asyncCache, concurrency, offlineLocationPath, fetchConcurrency, agentId = "core-ufg", logger: defaultLogger }) {
-      const logger = (0, logger_1.makeLogger)({ logger: defaultLogger, format: { label: "core-ufg" } });
+    function makeCore({ spec, clients, base: defaultBase, asyncCache, concurrency, offlineLocationPath, fetchConcurrency, agentId = "core-ufg", logger: defaultLogger, maskLog }) {
+      const logger = (0, logger_1.makeLogger)({ logger: defaultLogger, format: { label: "core-ufg" }, maskLog });
       logger.log(`Core ufg is initialized ${defaultBase ? "with" : "without"} custom base core`);
-      const base = defaultBase !== null && defaultBase !== void 0 ? defaultBase : (0, core_base_1.makeCore)({ agentId, concurrency, logger, offlineLocationPath });
+      const base = defaultBase !== null && defaultBase !== void 0 ? defaultBase : (0, core_base_1.makeCore)({ agentId, concurrency, logger, offlineLocationPath, maskLog });
       const ufgClient = clients === null || clients === void 0 ? void 0 : clients.ufg;
       return utils34.general.extend(base, (core) => {
         return {
@@ -89577,6 +89713,8 @@ var require_locate3 = __commonJS({
         logger = logger.extend(mainLogger, { tags: [`locate-${utils34.general.shortid()}`] });
         settings = { ...config === null || config === void 0 ? void 0 : config.open, ...config === null || config === void 0 ? void 0 : config.screenshot, ...settings };
         (0, populate_eyes_server_settings_1.populateEyesServerSettings)(settings);
+        logger.mask(settings.apiKey);
+        logger.mask(settings.eyesServerUrl);
         const classicCore = (0, core_1.makeCore)({ spec, base: core.base, logger });
         const results = await classicCore.locate({ target, settings, logger });
         return results;
@@ -89636,6 +89774,8 @@ var require_locate_text3 = __commonJS({
         logger = logger.extend(mainLogger, { tags: [`locate-text-${utils34.general.shortid()}`] });
         settings = { ...config === null || config === void 0 ? void 0 : config.open, ...config === null || config === void 0 ? void 0 : config.screenshot, ...settings };
         (0, populate_eyes_server_settings_1.populateEyesServerSettings)(settings);
+        logger.mask(settings.apiKey);
+        logger.mask(settings.eyesServerUrl);
         const classicCore = (0, core_1.makeCore)({ spec, base: core.base, logger });
         const results = await classicCore.locateText({ target, settings, logger });
         return results;
@@ -89699,6 +89839,8 @@ var require_extract_text3 = __commonJS({
           settings2 = { ...config === null || config === void 0 ? void 0 : config.open, ...config === null || config === void 0 ? void 0 : config.screenshot, ...settings2 };
           (_a = settings2.userCommandId) !== null && _a !== void 0 ? _a : settings2.userCommandId = `extract-text--${utils34.general.guid()}`;
           (0, populate_eyes_server_settings_1.populateEyesServerSettings)(settings2);
+          logger.mask(settings2.apiKey);
+          logger.mask(settings2.eyesServerUrl);
           return settings2;
         });
         const classicCore = (0, core_1.makeCore)({ spec, base: core.base, logger });
@@ -90172,7 +90314,7 @@ var require_extract_git_info = __commonJS({
           logger.log(`Error during extracting commit information from git`, result.stderr);
         } else {
           const [timestamp, sha] = result.stdout.trim().split(" ");
-          if (isISODate(timestamp)) {
+          if (isISODate2(timestamp)) {
             return { sha, timestamp };
           } else {
             logger.log(`latestCommitInfo.timestamp is an invalid ISO date string: ${timestamp}`);
@@ -90262,7 +90404,7 @@ var require_extract_git_info = __commonJS({
         result = await executeWithLog(`git fetch origin --unshallow && ${command}`, { execOptions, logger });
       }
       const timestamp = result.stdout.replace(/\s/g, "");
-      if (isISODate(timestamp)) {
+      if (isISODate2(timestamp)) {
         logger.log("git branching timestamp successfully extracted", timestamp);
         return timestamp;
       } else {
@@ -90280,10 +90422,10 @@ var require_extract_git_info = __commonJS({
       }
       return result;
     }
-    function isISODate(str) {
+    function isISODate2(str) {
       return /\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\+\d{2}:\d{2})?/.test(str);
     }
-    exports.isISODate = isISODate;
+    exports.isISODate = isISODate2;
   }
 });
 
@@ -90349,6 +90491,8 @@ var require_open_eyes4 = __commonJS({
         logger = logger.extend(mainLogger, { tags: [`eyes-${type}-${utils34.general.shortid()}`] });
         const settings = { ...config === null || config === void 0 ? void 0 : config.open, ...openSettings };
         const eyesServerSettings = (0, populate_eyes_server_settings_1.populateEyesServerSettings)(settings);
+        logger.mask(eyesServerSettings.apiKey);
+        logger.mask(eyesServerSettings.eyesServerUrl);
         (_a = settings.userTestId) !== null && _a !== void 0 ? _a : settings.userTestId = `${settings.testName}--${utils34.general.guid()}`;
         settings.batch = { ...batch, ...settings.batch };
         (_b = (_w = settings.batch).id) !== null && _b !== void 0 ? _b : _w.id = (_c = utils34.general.getEnvValue("BATCH_ID")) !== null && _c !== void 0 ? _c : `generated-${utils34.general.guid()}`;
@@ -90793,11 +90937,11 @@ 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, core, base: defaultBase, agentId: defaultAgentId, environment, cwd = process.cwd(), logger: mainLogger, asyncCache, offlineLocationPath }) {
+    function makeMakeManager({ spec, clients, core, base: defaultBase, agentId: defaultAgentId, environment, cwd = process.cwd(), logger: mainLogger, asyncCache, offlineLocationPath, maskLog }) {
       return async function makeManager({ type = "classic", settings, logger = mainLogger } = {}) {
         var _a, _b, _c, _d, _e, _f, _g;
         var _h, _j;
-        logger = logger.extend(mainLogger, { tags: [`manager-${type}-${utils34.general.shortid()}`] });
+        logger = logger.extend(mainLogger, { tags: [`manager-${type}-${utils34.general.shortid()}`], maskLog });
         settings !== null && settings !== void 0 ? settings : settings = {};
         (_a = settings.concurrency) !== null && _a !== void 0 ? _a : settings.concurrency = (_b = utils34.general.getEnvValue("CONCURRENCY", "number")) !== null && _b !== void 0 ? _b : utils34.types.isInteger(settings.legacyConcurrency) ? settings.legacyConcurrency * 5 : 100;
         (_c = settings.batch) !== null && _c !== void 0 ? _c : settings.batch = {};
@@ -90805,11 +90949,11 @@ var require_make_manager = __commonJS({
         (_f = (_j = settings.batch).buildId) !== null && _f !== void 0 ? _f : _j.buildId = utils34.general.getEnvValue("BATCH_BUILD_ID");
         (_g = settings.agentId) !== null && _g !== void 0 ? _g : 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);
-        const base = defaultBase !== null && defaultBase !== void 0 ? defaultBase : (0, core_base_1.makeCore)({ agentId: settings.agentId, concurrency: settings.concurrency, logger, offlineLocationPath });
+        const base = defaultBase !== null && defaultBase !== void 0 ? defaultBase : (0, core_base_1.makeCore)({ agentId: settings.agentId, concurrency: settings.concurrency, logger, offlineLocationPath, maskLog });
         const fetchConcurrency = settings.fetchConcurrency;
         const cores = {
-          ufg: (0, core_2.makeCore)({ spec, clients, base, fetchConcurrency, asyncCache, logger, offlineLocationPath }),
-          classic: (0, core_1.makeCore)({ spec, clients, base, logger })
+          ufg: (0, core_2.makeCore)({ spec, clients, base, fetchConcurrency, asyncCache, logger, offlineLocationPath, maskLog }),
+          classic: (0, core_1.makeCore)({ spec, clients, base, logger, maskLog })
         };
         const storage = [];
         return {
@@ -90891,6 +91035,8 @@ var require_close_batch2 = __commonJS({
         logger = logger.extend(mainLogger, { tags: [`close-batch-${utils34.general.shortid()}`] });
         (utils34.types.isArray(settings) ? settings : [settings]).forEach((settings2) => {
           (0, populate_eyes_server_settings_1.populateEyesServerSettings)(settings2);
+          logger.mask(settings2.apiKey);
+          logger.mask(settings2.eyesServerUrl);
         });
         return core.base.closeBatch({ settings, logger });
       };
@@ -90948,6 +91094,9 @@ var require_delete_test2 = __commonJS({
         logger = logger.extend(mainLogger, { tags: [`delete-test-${utils34.general.shortid()}`] });
         (utils34.types.isArray(settings) ? settings : [settings]).forEach((settings2) => {
           (0, populate_eyes_server_settings_1.populateEyesServerSettings)(settings2);
+          logger.mask(settings2.apiKey);
+          logger.mask(settings2.eyesServerUrl);
+          logger.mask(settings2.secretToken);
         });
         return core.base.deleteTest({ settings, logger });
       };
@@ -91020,7 +91169,7 @@ var require_package2 = __commonJS({
   "../core/package.json"(exports, module) {
     module.exports = {
       name: "@applitools/core",
-      version: "4.27.0",
+      version: "4.29.0",
       homepage: "https://applitools.com",
       bugs: {
         url: "https://github.com/applitools/eyes.sdk.javascript1/issues"
@@ -91539,18 +91688,18 @@ var require_core4 = __commonJS({
     var validate_sdk_version_1 = require_validate_sdk_version();
     var memory_usage_logging_1 = require_memory_usage_logging();
     var take_snapshots_1 = require_take_snapshots2();
-    function makeCore({ spec, clients, base: defaultBase, concurrency = utils34.general.getEnvValue("CONCURRENCY", "number"), environment: defaultEnvironment, agentId = "core", cwd = process.cwd(), logger: defaultLogger, asyncCache } = {}) {
-      const logger = (0, logger_1.makeLogger)({ logger: defaultLogger, format: { label: "core" } });
+    function makeCore({ spec, clients, base: defaultBase, concurrency = utils34.general.getEnvValue("CONCURRENCY", "number"), environment: defaultEnvironment, agentId = "core", cwd = process.cwd(), maskLog = false, logger: defaultLogger, asyncCache } = {}) {
+      const logger = (0, logger_1.makeLogger)({ logger: defaultLogger, format: { label: "core" }, maskLog });
       (0, memory_usage_logging_1.startMemoryUsageLogging)({ logger });
       const environment = (0, extract_test_environment_1.extractTestEnvironment)(defaultEnvironment);
       const offlineLocationPath = (0, ensure_offline_folder_1.ensureOfflineFolder)();
       logger.log(`[pid=${process.pid} Core is initialized ${defaultBase ? "with" : "without"} custom base core ${offlineLocationPath ? `and offline location ${offlineLocationPath} ` : ""}and environment `, environment);
       if (environment.sdk)
         void (0, validate_sdk_version_1.validateSdkVersion)(environment.sdk, { logger });
-      const base = defaultBase !== null && defaultBase !== void 0 ? defaultBase : (0, core_base_1.makeCore)({ agentId, concurrency, logger, offlineLocationPath });
+      const base = defaultBase !== null && defaultBase !== void 0 ? defaultBase : (0, core_base_1.makeCore)({ agentId, concurrency, logger, offlineLocationPath, maskLog });
       const cores = {
-        ufg: (0, core_2.makeCore)({ spec, clients, base, asyncCache, logger, offlineLocationPath }),
-        classic: (0, core_1.makeCore)({ spec, clients, base, logger, offlineLocationPath })
+        ufg: (0, core_2.makeCore)({ spec, clients, base, asyncCache, logger, offlineLocationPath, maskLog }),
+        classic: (0, core_1.makeCore)({ spec, clients, base, logger, offlineLocationPath, maskLog })
       };
       return utils34.general.extend(base, (core) => {
         return {
@@ -91572,7 +91721,8 @@ var require_core4 = __commonJS({
             environment,
             asyncCache,
             logger,
-            offlineLocationPath
+            offlineLocationPath,
+            maskLog
           }),
           locate: (0, locate_1.makeLocate)({ spec, core, logger }),
           locateText: (0, locate_text_1.makeLocateText)({ spec, core, logger }),
@@ -93871,7 +94021,8 @@ var require_ws_server = __commonJS({
           response.end();
         }
       });
-      http.listen(port, "localhost");
+      const hostName = process.env.APPLITOOLS_UNIVERSAL_HOST_NAME || "localhost";
+      http.listen(port, hostName);
       return new Promise((resolve, reject) => {
         http.on("listening", () => {
           const ws = new ws_1.Server({ server: http, path: "/eyes", maxPayload: 256 * 1024 * 1024 });
@@ -94012,7 +94163,8 @@ var require_history = __commonJS({
       const history = {
         managers: /* @__PURE__ */ new Map(),
         eyes: /* @__PURE__ */ new Map(),
-        startedAt: (/* @__PURE__ */ new Date()).toISOString()
+        startedAt: (/* @__PURE__ */ new Date()).toISOString(),
+        unknownEvents: []
       };
       const originalCommand = socket.command;
       socket.command = function command(name, fn) {
@@ -94061,6 +94213,8 @@ var require_history = __commonJS({
                   eyesHistory.result = error !== null && error !== void 0 ? error : result;
                 }
               }
+            } else {
+              history.unknownEvents.push({ name, payload });
             }
           }
         });
@@ -94117,6 +94271,7 @@ var require_core_server = __commonJS({
       // 15min
       printStdout = false,
       isProcess = false,
+      maskLog = false,
       ...handlerOptions
     } = {}) {
       var _a, _b;
@@ -94124,7 +94279,8 @@ var require_core_server = __commonJS({
       const baseLogger = (0, logger_1.makeLogger)({
         handler: { type: "rolling file", name: "universal", dirname: logDirname },
         level: "info",
-        format: { label: "core-universal", colors: false }
+        format: { label: "core-universal", colors: false },
+        maskLog
       });
       baseLogger.log("Core universal is going to be initialized with options", {
         debug,
@@ -94183,7 +94339,8 @@ var require_core_server = __commonJS({
             warn: (message) => socket.emit("Logger.log", { level: "warn", message }),
             error: (message) => socket.emit("Logger.log", { level: "error", message }),
             fatal: (message) => socket.emit("Logger.log", { level: "fatal", message })
-          }
+          },
+          maskLog
         });
         logger.console.log(`Logs saved in: ${logDirname}`);
         const corePromise = socket.wait("Core.makeCore", ({ spec, agentId, environment, cwd }) => {
@@ -94197,7 +94354,8 @@ var require_core_server = __commonJS({
               versions: { ...defaultEnvironment === null || defaultEnvironment === void 0 ? void 0 : defaultEnvironment.versions, ...environment === null || environment === void 0 ? void 0 : environment.versions },
               universal: true
             },
-            logger
+            logger,
+            maskLog
           });
         });
         socket.command("Core.getAccountInfo", async (options) => {
@@ -94282,7 +94440,20 @@ var require_core_server = __commonJS({
           return (_a2 = refer2.deref(eyes)) === null || _a2 === void 0 ? void 0 : _a2.getResults(options);
         });
         socket.command("Debug.getHistory", async () => {
-          return getHistory();
+          return {
+            ...getHistory(),
+            initialArgs: {
+              environment: defaultEnvironment,
+              agentIdPrefix,
+              debug,
+              shutdownMode,
+              idleTimeout,
+              printStdout,
+              isProcess,
+              maskLog,
+              ...handlerOptions
+            }
+          };
         });
       });
       process.on("unhandledRejection", (error) => {
@@ -94619,6 +94790,8 @@ var require_open_eyes5 = __commonJS({
     function makeOpenEyes({ core, logger: defaultLogger }) {
       return async function openEyes({ settings, logger = defaultLogger }) {
         (0, populate_eyes_server_settings_1.populateEyesServerSettings)(settings);
+        logger.mask(settings.apiKey);
+        logger.mask(settings.eyesServerUrl);
         return core.base.openEyes({ settings, logger });
       };
     }
@@ -95300,14 +95473,15 @@ var require_run_offline_snapshots = __commonJS({
     var chalk_1 = __importDefault(require_source());
     var utils34 = __importStar(require_browser3());
     var merge_configs_1 = require_merge_configs();
+    var format_results_1 = require_format_results();
     async function runOfflineSnapshots(options) {
-      var _a, _b;
+      var _a;
       if (!options.offlineLocationPath)
         throw new Error("offlineLocationPath is required");
       const offlineLocationPath = path_1.default.resolve(options.offlineLocationPath);
       const startTime = Date.now();
       const logger = (_a = options.logger) !== null && _a !== void 0 ? _a : (0, logger_1.makeLogger)({ format: { label: "offline-exec" } });
-      const eyesServerSettings = { ...(_b = options.config) === null || _b === void 0 ? void 0 : _b.open, ...options };
+      const eyesServerSettings = { ...options.config.open, ...options };
       const core = (0, core_1.makeCore)();
       const account = await core.getAccountInfo({ settings: eyesServerSettings });
       const ufgClient = await (0, get_ufg_client_1.makeGetUFGClient)({ logger })({
@@ -95325,7 +95499,11 @@ var require_run_offline_snapshots = __commonJS({
         throw new Error(`Unable to find offline executions in ${offlineLocationPath}`);
       }
       const allTestResults = await runTests(testFolders);
-      const { isSuccess, outputStr } = processResults({ testResults: allTestResults, totalTime: Date.now() - startTime });
+      const { isSuccess, outputStr } = processResults({
+        testResults: allTestResults,
+        totalTime: Date.now() - startTime,
+        jsonFilePath: options.jsonFilePath
+      });
       if (!isSuccess && options.failOnDiff) {
         throw new Error(outputStr);
       } else {
@@ -95345,7 +95523,10 @@ var require_run_offline_snapshots = __commonJS({
         const batchIds = [...new Set(results.map((t) => t.batchId))];
         const allTestResults2 = results.map((t) => t.results);
         logger.log("done running all tests", allTestResults2);
-        await core.closeBatch({ settings: batchIds.map((batchId) => ({ batchId, ...account.eyesServer })) });
+        const keepBatchOpen = utils34.general.getEnvValue("DONT_CLOSE_BATCHES", "boolean") || options.config.open.keepBatchOpen;
+        if (!keepBatchOpen) {
+          await core.closeBatch({ settings: batchIds.map((batchId) => ({ batchId, ...account.eyesServer })) });
+        }
         logger.log("done closing batches");
         return allTestResults2;
       }
@@ -95449,7 +95630,7 @@ var require_run_offline_snapshots = __commonJS({
     function uniq(arr) {
       return [...new Set(arr)];
     }
-    function processResults({ testResults, totalTime, saveNewTests = true, failOnDiff = true }) {
+    function processResults({ testResults, totalTime, saveNewTests = true, failOnDiff = true, jsonFilePath }) {
       let outputStr = "\n";
       const pluralize = utils34.general.pluralize;
       const testResultsWithErrors = testResults.filter((r) => r && r.reason);
@@ -95527,6 +95708,10 @@ A total of ${unresolvedOrFailed.length} difference${pluralize(unresolvedOrFailed
         outputStr += chalk_1.default.green(`
 No differences were found!`);
       }
+      if (jsonFilePath) {
+        outputStr += "\n\nWriting test results to " + jsonFilePath + "\n";
+        fs_1.default.writeFileSync(jsonFilePath, (0, format_results_1.toJsonOutput)(testResults));
+      }
       if (hasResults) {
         outputStr += `
 ${seeDetailsStr}
@@ -95660,7 +95845,7 @@ var require_package3 = __commonJS({
   "../eyes/package.json"(exports, module) {
     module.exports = {
       name: "@applitools/eyes",
-      version: "1.29.3",
+      version: "1.31.0",
       keywords: [
         "applitools",
         "eyes",
@@ -98782,6 +98967,25 @@ var ConfigurationData = class {
     this.gitMergeBaseTimestamp = gitMergeBaseTimestamp;
     return this;
   }
+  get latestCommitInfo() {
+    return this._config.latestCommitInfo;
+  }
+  set latestCommitInfo(latestCommitInfo) {
+    if (latestCommitInfo) {
+      utils20.guard.isString(latestCommitInfo.sha, { name: "latestCommitInfo.sha" });
+      utils20.guard.custom(latestCommitInfo.timestamp, (timestamp) => isISODate(timestamp), {
+        name: "latestCommitInfo.timestamp"
+      });
+    }
+    this._config.latestCommitInfo = latestCommitInfo;
+  }
+  getLatestCommitInfo() {
+    return this.latestCommitInfo;
+  }
+  setLatestCommitInfo(latestCommitInfo) {
+    this.latestCommitInfo = latestCommitInfo;
+    return this;
+  }
   get hideCaret() {
     return this._config.hideCaret;
   }
@@ -99346,7 +99550,10 @@ var ConfigurationData = class {
           os: this.hostOS,
           displayOs: this.hostOSInfo,
           deviceName: this.deviceInfo,
-          viewportSize: this.viewportSize
+          viewportSize: this.viewportSize && {
+            width: this.viewportSize.width,
+            height: this.viewportSize.height
+          }
         }),
         branchName: this.branchName,
         parentBranchName: this.parentBranchName,
@@ -99355,6 +99562,7 @@ var ConfigurationData = class {
         ignoreBaseline: this.ignoreBaseline,
         gitBranchingTimestamp: this.gitMergeBaseTimestamp,
         ignoreGitBranching: this.ignoreGitMergeBase,
+        latestCommitInfo: this.latestCommitInfo,
         saveDiffs: this.saveDiffs,
         keepBatchOpen: this.dontCloseBatches,
         disableBrokerUrlCache: this.disableNMLUrlCache
@@ -99418,6 +99626,9 @@ var ConfigurationData = class {
     return utils20.general.toString(this);
   }
 };
+function isISODate(str) {
+  return /\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\+\d{2}:\d{2})?/.test(str);
+}
 
 // ../eyes/src/input/CutProvider.ts
 init_process();
@@ -100039,7 +100250,9 @@ init_buffer();
 init_setInterval();
 var import_core = __toESM(require_dist9());
 var utils29 = __toESM(require_browser3());
-function initSDK(options) {
+function initSDK(options, maskLog) {
+  if (options)
+    options.maskLog = maskLog;
   return {
     core: getCoreWithCache(options),
     spec: options == null ? void 0 : options.spec
@@ -100219,6 +100432,8 @@ var EyesRunner = class {
     this._managerSettings = {};
     /** @internal */
     this._getResultsSettings = {};
+    var _a;
+    this._maskLog = (_a = options == null ? void 0 : options.maskLog) != null ? _a : false;
     if (options) {
       this._managerSettings = {
         concurrency: options.testConcurrency,
@@ -100308,7 +100523,8 @@ var Eyes = class {
     this._state = {};
     this._events = /* @__PURE__ */ new Map();
     this._handlers = new SessionEventHandlers();
-    const sdk = initSDK(this._sdk);
+    const maskLog = utils32.types.instanceOf(runnerOrConfig, EyesRunner) ? runnerOrConfig._maskLog : void 0;
+    const sdk = initSDK(this._sdk, maskLog);
     this._spec = sdk.spec;
     this._core = sdk.core;
     if (utils32.types.instanceOf(runnerOrConfig, EyesRunner)) {
@@ -100326,7 +100542,7 @@ var Eyes = class {
     return this.constructor._sdk;
   }
   static async getExecutionCloudUrl(config) {
-    const { core } = initSDK(this._sdk);
+    const { core } = initSDK(this._sdk, config == null ? void 0 : config.maskLog);
     const client = await core.getECClient({
       settings: {
         proxy: config == null ? void 0 : config.proxy,
@@ -100338,8 +100554,8 @@ var Eyes = class {
   }
   static async setViewportSize(driver, size) {
     var _a;
-    const { core } = initSDK(this._sdk);
-    await ((_a = core.setViewportSize) == null ? void 0 : _a.call(core, { target: driver, size }));
+    const { core } = initSDK(this._sdk, true);
+    await ((_a = core.setViewportSize) == null ? void 0 : _a.call(core, { target: driver, size: { width: size.width, height: size.height } }));
   }
   static setMobileCapabilities(capabilities, config) {
     var _a, _b;
@@ -100461,7 +100677,10 @@ var Eyes = class {
       config.open.testName = testNameOrViewportSize;
     if (utils32.types.has(viewportSizeOrSessionType, ["width", "height"])) {
       (_f = (_e = config.open).environment) != null ? _f : _e.environment = {};
-      config.open.environment.viewportSize = viewportSizeOrSessionType;
+      config.open.environment.viewportSize = {
+        width: viewportSizeOrSessionType.width,
+        height: viewportSizeOrSessionType.height
+      };
     }
     if (utils32.types.isEnumValue(sessionType, SessionTypeEnum))
       config.open.sessionType = sessionType;
@@ -100692,6 +100911,7 @@ var Eyes = class {
   async setViewportSize(size) {
     var _a, _b;
     utils32.guard.notNull(size, { name: "size" });
+    size = { width: size.width, height: size.height };
     if (!this._driver) {
       this._config.setViewportSize(size);
     } else {