@applitools/eyes-browser 1.5.15 → 1.5.16

package/dist/index.js

@@ -13585,7 +13585,7 @@ var init_agent_browser = __esm({
 });
 
 // ../req/dist/req-errors.js
-var AbortCode, RequestTimeoutError, ConnectionTimeoutError;
+var AbortCode, RequestTimeoutError, ConnectionTimeoutError, RetryTimeoutError;
 var init_req_errors = __esm({
   "../req/dist/req-errors.js"() {
     "use strict";
@@ -13596,6 +13596,7 @@ var init_req_errors = __esm({
     (function(AbortCode2) {
       AbortCode2["requestTimeout"] = "STUCK_REQUEST";
       AbortCode2["connectionTimeout"] = "MAX_TIMEOUT_REACHED";
+      AbortCode2["retryTimeout"] = "RETRY_DURATION_EXCEEDED";
     })(AbortCode || (AbortCode = {}));
     RequestTimeoutError = class extends Error {
       constructor() {
@@ -13611,6 +13612,13 @@ var init_req_errors = __esm({
         this.name = "ConnectionTimeoutError";
       }
     };
+    RetryTimeoutError = class extends Error {
+      constructor(timeout) {
+        super(`Retry duration of ${timeout} ms was exceeded.`);
+        this.code = AbortCode.retryTimeout;
+        this.name = "RetryTimeoutError";
+      }
+    };
   }
 });
 
@@ -13621,6 +13629,7 @@ function makeReq(baseOptions) {
 async function req(input, ...requestOptions) {
   const options = mergeOptions({}, ...requestOptions);
   let abortCode;
+  let retryStartTime = null;
   if (options.baseUrl && !options.baseUrl.endsWith("/"))
     options.baseUrl += "/";
   if (options.headers)
@@ -13649,121 +13658,189 @@ async function req(input, ...requestOptions) {
     if (connectionTimer)
       clearTimeout(connectionTimer);
   }
-  async function singleReq(input2, options2) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
-    const url = new URL(String((_a = input2.url) !== null && _a !== void 0 ? _a : input2), options2.baseUrl);
-    const fetch2 = (_b = options2.fetch) !== null && _b !== void 0 ? _b : fetch_browser_default;
-    let optionsFallbacks = [];
-    if (options2.fallbacks)
-      optionsFallbacks = utils28.types.isArray(options2.fallbacks) ? options2.fallbacks : [options2.fallbacks];
-    const fb = optionsFallbacks.find((fallback) => {
-      var _a2;
-      return (_a2 = fallback.cache) === null || _a2 === void 0 ? void 0 : _a2.get(url.origin);
-    });
-    if (fb === null || fb === void 0 ? void 0 : fb.updateOptions)
-      options2 = await fb.updateOptions({ options: options2 });
+  function setupRequestController(opts) {
     const requestController = new AbortController2();
-    const timeout = calculateTimeout(options2.requestTimeout, options2.body, options2);
+    const timeout = calculateTimeout(opts.requestTimeout, opts.body, opts);
     const requestTimer = timeout ? setTimeout(() => {
       abortCode !== null && abortCode !== void 0 ? abortCode : abortCode = AbortCode.requestTimeout;
       requestController.abort();
     }, timeout) : null;
+    const abortHandler = () => requestController.abort();
     if (connectionController.signal.aborted)
       requestController.abort();
-    connectionController.signal.onabort = () => requestController.abort();
-    if (options2.signal) {
-      if (options2.signal.aborted)
+    connectionController.signal.addEventListener("abort", abortHandler);
+    if (opts.signal) {
+      if (opts.signal.aborted)
         requestController.abort();
-      options2.signal.onabort = () => requestController.abort();
+      opts.signal.addEventListener("abort", abortHandler);
     }
-    if (options2.query) {
-      Object.entries(options2.query).forEach(([key, value]) => {
+    return { requestController, requestTimer, abortHandler };
+  }
+  async function buildRequest(input2, opts, requestController) {
+    var _a, _b, _c, _d, _e;
+    const url = new URL(String((_a = input2.url) !== null && _a !== void 0 ? _a : input2), opts.baseUrl);
+    if (opts.query) {
+      Object.entries(opts.query).forEach(([key, value]) => {
         if (!utils28.types.isNull(value))
           url.searchParams.set(key, String(value));
       });
     }
     const extraHeaders = {};
-    if (utils28.types.isPlainObject(options2.body) || utils28.types.isArray(options2.body) || options2.body === null) {
-      options2.body = JSON.stringify(options2.body);
+    if (utils28.types.isPlainObject(opts.body) || utils28.types.isArray(opts.body) || opts.body === null) {
+      opts.body = JSON.stringify(opts.body);
       extraHeaders["content-type"] = "application/json";
     }
     let request = new Request(url, {
-      method: (_c = options2.method) !== null && _c !== void 0 ? _c : input2.method,
+      method: (_b = opts.method) !== null && _b !== void 0 ? _b : input2.method,
       headers: {
         ...extraHeaders,
-        ...Object.fromEntries((_e = (_d = input2.headers) === null || _d === void 0 ? void 0 : _d.entries()) !== null && _e !== void 0 ? _e : []),
-        ...Object.fromEntries(new Headers(options2.headers).entries())
+        ...Object.fromEntries((_d = (_c = input2.headers) === null || _c === void 0 ? void 0 : _c.entries()) !== null && _d !== void 0 ? _d : []),
+        ...Object.fromEntries(new Headers(opts.headers).entries())
       },
-      body: (_f = options2.body) !== null && _f !== void 0 ? _f : input2.body,
+      body: (_e = opts.body) !== null && _e !== void 0 ? _e : input2.body,
       highWaterMark: 1024 * 1024 * 100 + 1,
       agent: makeAgent({
-        proxy: options2.proxy,
-        useDnsCache: options2.useDnsCache,
-        keepAliveOptions: options2.keepAliveOptions
+        proxy: opts.proxy,
+        useDnsCache: opts.useDnsCache,
+        keepAliveOptions: opts.keepAliveOptions
       }),
       signal: requestController.signal
     });
-    request = await beforeRequest({ request, options: options2 });
-    try {
-      let response = await fetch2(request);
-      if (!response.ok && optionsFallbacks.length > 0) {
-        const fallbackStrategy = optionsFallbacks[0];
-        const shouldFallback = await fallbackStrategy.shouldFallbackCondition({ request, response });
-        const fallbackOptions = shouldFallback && await ((_g = fallbackStrategy === null || fallbackStrategy === void 0 ? void 0 : fallbackStrategy.updateOptions) === null || _g === void 0 ? void 0 : _g.call(fallbackStrategy, {
-          options: { ...options2, fallbacks: optionsFallbacks.slice(1) }
-        }));
-        if (fallbackOptions) {
-          const fallbackStrategyResponse = await singleReq(request, fallbackOptions);
-          (_h = fallbackStrategy.cache) !== null && _h !== void 0 ? _h : fallbackStrategy.cache = /* @__PURE__ */ new Map();
-          fallbackStrategy.cache.set(new URL(request.url).origin, fallbackStrategyResponse.ok);
-          return fallbackStrategyResponse;
-        }
-      }
-      const retry = await ((_j = options2.retry) === null || _j === void 0 ? void 0 : _j.reduce(async (prev, retry2) => {
-        var _a2, _b2;
+    request = await beforeRequest({ request, options: opts });
+    return request;
+  }
+  async function tryFallback(request, response, opts, optionsFallbacks) {
+    var _a, _b;
+    if (response.ok || optionsFallbacks.length === 0)
+      return null;
+    const fallbackStrategy = optionsFallbacks[0];
+    const shouldFallback = await fallbackStrategy.shouldFallbackCondition({ request, response });
+    const fallbackOptions = shouldFallback && await ((_a = fallbackStrategy === null || fallbackStrategy === void 0 ? void 0 : fallbackStrategy.updateOptions) === null || _a === void 0 ? void 0 : _a.call(fallbackStrategy, {
+      options: { ...opts, fallbacks: optionsFallbacks.slice(1) }
+    }));
+    if (fallbackOptions) {
+      const fallbackStrategyResponse = await singleReq(request, fallbackOptions);
+      (_b = fallbackStrategy.cache) !== null && _b !== void 0 ? _b : fallbackStrategy.cache = /* @__PURE__ */ new Map();
+      fallbackStrategy.cache.set(new URL(request.url).origin, fallbackStrategyResponse.ok);
+      return fallbackStrategyResponse;
+    }
+    return null;
+  }
+  async function findApplicableRetry(opts, context) {
+    const retries = opts.retry;
+    if (!retries)
+      return null;
+    if (context.response) {
+      return await retries.reduce(async (prev, retry) => {
+        var _a, _b;
         const result = await prev;
-        return result !== null && result !== void 0 ? result : (((_a2 = retry2.statuses) === null || _a2 === void 0 ? void 0 : _a2.includes(response.status)) || await ((_b2 = retry2.validate) === null || _b2 === void 0 ? void 0 : _b2.call(retry2, { response }))) && (!retry2.limit || !retry2.attempt || retry2.attempt < retry2.limit) ? retry2 : null;
-      }, Promise.resolve(null)));
-      if (retry) {
-        (_k = retry.attempt) !== null && _k !== void 0 ? _k : retry.attempt = 0;
-        const delay = response.headers.has("Retry-After") ? Number(response.headers.get("Retry-After")) * 1e3 : utils28.types.isArray(retry.timeout) ? retry.timeout[Math.min(retry.attempt, retry.timeout.length - 1)] : (_l = retry.timeout) !== null && _l !== void 0 ? _l : 0;
-        await utils28.general.sleep(delay);
-        retry.attempt += 1;
-        const retryRequest = await beforeRetry({ request, response, attempt: retry.attempt, stop, options: options2 });
-        if (retryRequest !== stop) {
-          return singleReq(retryRequest, options2);
-        }
-      }
-      response = await afterResponse({ request, response, options: options2 });
-      return response;
-    } catch (error) {
-      if (abortCode === AbortCode.requestTimeout)
-        error = new RequestTimeoutError();
-      else if (abortCode === AbortCode.connectionTimeout)
-        error = new ConnectionTimeoutError();
-      const retry = await ((_m = options2.retry) === null || _m === void 0 ? void 0 : _m.reduce((prev, retry2) => {
+        return result !== null && result !== void 0 ? result : (((_a = retry.statuses) === null || _a === void 0 ? void 0 : _a.includes(context.response.status)) || await ((_b = retry.validate) === null || _b === void 0 ? void 0 : _b.call(retry, { response: context.response }))) && (!retry.limit || !retry.attempt || retry.attempt < retry.limit) ? retry : null;
+      }, Promise.resolve(null));
+    }
+    if (context.error) {
+      return await retries.reduce((prev, retry) => {
         return prev.then(async (result) => {
-          var _a2, _b2;
-          return (result !== null && result !== void 0 ? result : (((_a2 = retry2.codes) === null || _a2 === void 0 ? void 0 : _a2.includes(error.code)) || await ((_b2 = retry2.validate) === null || _b2 === void 0 ? void 0 : _b2.call(retry2, { error }))) && (!retry2.limit || !retry2.attempt || retry2.attempt < retry2.limit)) ? retry2 : null;
+          var _a, _b;
+          return (result !== null && result !== void 0 ? result : (((_a = retry.codes) === null || _a === void 0 ? void 0 : _a.includes(context.error.code)) || await ((_b = retry.validate) === null || _b === void 0 ? void 0 : _b.call(retry, { error: context.error }))) && (!retry.limit || !retry.attempt || retry.attempt < retry.limit)) ? retry : null;
         });
-      }, Promise.resolve(null)));
-      if (retry) {
-        (_o = retry.attempt) !== null && _o !== void 0 ? _o : retry.attempt = 0;
-        const delay = utils28.types.isArray(retry.timeout) ? retry.timeout[Math.min(retry.attempt, retry.timeout.length)] : (_p = retry.timeout) !== null && _p !== void 0 ? _p : 0;
-        await utils28.general.sleep(delay);
-        retry.attempt = retry.attempt + 1;
-        const retryRequest = await beforeRetry({ request, error, attempt: retry.attempt, stop, options: options2 });
-        if (retryRequest !== stop) {
-          return singleReq(retryRequest, options2);
-        }
-      }
-      error = await afterError({ request, error, options: options2 });
-      throw error;
-    } finally {
-      if (options2.signal)
-        options2.signal.onabort = null;
-      if (requestTimer)
-        clearTimeout(requestTimer);
+      }, Promise.resolve(null));
+    }
+    return null;
+  }
+  function calculateRetryDelay(retry, response) {
+    var _a, _b;
+    if (response === null || response === void 0 ? void 0 : response.headers.has("Retry-After")) {
+      return Number(response.headers.get("Retry-After")) * 1e3;
+    }
+    if (utils28.types.isArray(retry.timeout)) {
+      return retry.timeout[Math.min((_a = retry.attempt) !== null && _a !== void 0 ? _a : 0, retry.timeout.length - 1)];
+    }
+    return (_b = retry.timeout) !== null && _b !== void 0 ? _b : 0;
+  }
+  function checkRetryTimeout() {
+    if (options.retryTimeout && retryStartTime && Date.now() - retryStartTime >= options.retryTimeout) {
+      throw new RetryTimeoutError(options.retryTimeout);
+    }
+  }
+  async function handleRetry(request, retry, context, opts) {
+    var _a;
+    (_a = retry.attempt) !== null && _a !== void 0 ? _a : retry.attempt = 0;
+    retryStartTime !== null && retryStartTime !== void 0 ? retryStartTime : retryStartTime = Date.now();
+    checkRetryTimeout();
+    const delay = calculateRetryDelay(retry, context.response);
+    await utils28.general.sleep(delay);
+    retry.attempt += 1;
+    return await beforeRetry({
+      request,
+      ...context,
+      attempt: retry.attempt,
+      stop,
+      options: opts
+    });
+  }
+  function normalizeAbortError(error) {
+    if (abortCode === AbortCode.requestTimeout)
+      return new RequestTimeoutError();
+    if (abortCode === AbortCode.connectionTimeout)
+      return new ConnectionTimeoutError();
+    return error;
+  }
+  function cleanupRequest(opts, requestTimer, abortHandler) {
+    if (requestTimer)
+      clearTimeout(requestTimer);
+    connectionController.signal.removeEventListener("abort", abortHandler);
+    if (opts.signal) {
+      opts.signal.removeEventListener("abort", abortHandler);
+    }
+  }
+  async function singleReq(input2, options2) {
+    var _a, _b;
+    const fetch2 = (_a = options2.fetch) !== null && _a !== void 0 ? _a : fetch_browser_default;
+    let optionsFallbacks = [];
+    if (options2.fallbacks)
+      optionsFallbacks = utils28.types.isArray(options2.fallbacks) ? options2.fallbacks : [options2.fallbacks];
+    const url = new URL(String((_b = input2.url) !== null && _b !== void 0 ? _b : input2), options2.baseUrl);
+    const fb = optionsFallbacks.find((fallback) => {
+      var _a2;
+      return (_a2 = fallback.cache) === null || _a2 === void 0 ? void 0 : _a2.get(url.origin);
+    });
+    if (fb === null || fb === void 0 ? void 0 : fb.updateOptions)
+      options2 = await fb.updateOptions({ options: options2 });
+    while (true) {
+      const { requestController, requestTimer, abortHandler } = setupRequestController(options2);
+      const request = await buildRequest(input2, options2, requestController);
+      try {
+        let response = await fetch2(request);
+        const fallbackResponse = await tryFallback(request, response, options2, optionsFallbacks);
+        if (fallbackResponse)
+          return fallbackResponse;
+        const retry = await findApplicableRetry(options2, { response });
+        if (retry) {
+          const retryRequest = await handleRetry(request, retry, { response }, options2);
+          if (retryRequest !== stop) {
+            cleanupRequest(options2, requestTimer, abortHandler);
+            input2 = retryRequest;
+            continue;
+          }
+        }
+        response = await afterResponse({ request, response, options: options2 });
+        return response;
+      } catch (error) {
+        error = normalizeAbortError(error);
+        const retry = await findApplicableRetry(options2, { error });
+        if (retry) {
+          const retryRequest = await handleRetry(request, retry, { error }, options2);
+          if (retryRequest !== stop) {
+            cleanupRequest(options2, requestTimer, abortHandler);
+            input2 = retryRequest;
+            continue;
+          }
+        }
+        error = await afterError({ request, error, options: options2 });
+        throw error;
+      } finally {
+        cleanupRequest(options2, requestTimer, abortHandler);
+      }
     }
   }
 }
@@ -13868,7 +13945,7 @@ function calculateTimeout(requestTimeout, body, options) {
       return base + perByte * body.byteLength;
     if (global.Blob && utils28.types.instanceOf(body, Blob))
       return base + perByte * body.size;
-    if (global.Buffer && utils28.types.instanceOf(body, import_buffer64.Buffer))
+    if (global.Buffer && utils28.types.instanceOf(body, import_buffer68.Buffer))
       return base + perByte * body.byteLength;
     const allHooks = (_a = options === null || options === void 0 ? void 0 : options.hooks) !== null && _a !== void 0 ? _a : [];
     allHooks.forEach((hooks) => {
@@ -13879,7 +13956,7 @@ function calculateTimeout(requestTimeout, body, options) {
   }
   return requestTimeout;
 }
-var utils28, import_buffer64, disableHttpAgentReuse;
+var utils28, import_buffer68, disableHttpAgentReuse;
 var init_req = __esm({
   "../req/dist/req.js"() {
     "use strict";
@@ -13893,7 +13970,7 @@ var init_req = __esm({
     init_req_errors();
     init_fetch_browser();
     utils28 = __toESM(require_browser3(), 1);
-    import_buffer64 = __toESM(require_buffer(), 1);
+    import_buffer68 = __toESM(require_buffer(), 1);
     disableHttpAgentReuse = process.env.APPLITOOLS_DISABLE_AGENT_CACHIFY;
   }
 });
@@ -13901,9 +13978,12 @@ var init_req = __esm({
 // ../req/dist/index.js
 var dist_exports = {};
 __export(dist_exports, {
+  ConnectionTimeoutError: () => ConnectionTimeoutError,
   Headers: () => Headers,
   Request: () => Request,
+  RequestTimeoutError: () => RequestTimeoutError,
   Response: () => Response,
+  RetryTimeoutError: () => RetryTimeoutError,
   default: () => req,
   makeReq: () => makeReq,
   req: () => req,
@@ -13919,6 +13999,7 @@ var init_dist = __esm({
     init_fetch_browser();
     init_req();
     init_req();
+    init_req_errors();
   }
 });
 
@@ -14461,6 +14542,24 @@ var require_mask = __commonJS({
   }
 });
 
+// ../core-base/dist/utils/addRetryTimeout.js
+var require_addRetryTimeout = __commonJS({
+  "../core-base/dist/utils/addRetryTimeout.js"(exports) {
+    "use strict";
+    init_process();
+    init_setImmediate();
+    init_buffer();
+    init_setInterval();
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.addRetryTimeout = void 0;
+    var DEFAULT_RETRY_TIMEOUT_MINUTES = 60;
+    function addRetryTimeout(retryTimeout) {
+      return retryTimeout !== void 0 ? { retryTimeout } : { retryTimeout: DEFAULT_RETRY_TIMEOUT_MINUTES * 60 * 1e3 };
+    }
+    exports.addRetryTimeout = addRetryTimeout;
+  }
+});
+
 // ../core-base/dist/server/req-eyes.js
 var require_req_eyes = __commonJS({
   "../core-base/dist/server/req-eyes.js"(exports) {
@@ -14509,10 +14608,41 @@ var require_req_eyes = __commonJS({
     var missingApiKeyError_1 = require_missingApiKeyError();
     var invalidApiKeyError_1 = require_invalidApiKeyError();
     var mask_1 = require_mask();
+    var addRetryTimeout_1 = require_addRetryTimeout();
+    var backoffDelays = [
+      1e3,
+      1150,
+      1300,
+      1500,
+      1700,
+      2e3,
+      2300,
+      2700,
+      3100,
+      3500,
+      4e3,
+      4700,
+      5400,
+      6200,
+      7100,
+      8100,
+      9400,
+      10800,
+      12400,
+      14200,
+      16400,
+      18800,
+      18800,
+      21600,
+      24900,
+      28600,
+      3e4
+    ];
     function makeReqEyes({ settings, fetch: fetch2, logger }) {
-      var _a, _b, _c;
+      var _a, _b, _c, _d;
       const retryLimit = process.env.EYES_NETWORK_RETRY_LIMIT ? Number(process.env.EYES_NETWORK_RETRY_LIMIT) : 5;
       const retryTimeout = process.env.EYES_NETWORK_RETRY_TIMEOUT ? Number(process.env.EYES_NETWORK_RETRY_TIMEOUT) : 200;
+      const retryDuration = process.env.EYES_NETWORK_RETRY_DURATION ? Number(process.env.EYES_NETWORK_RETRY_DURATION) : void 0;
       return (0, req_1.makeReq)({
         baseUrl: settings.eyesServerUrl,
         query: { removeSession: settings.removeSession },
@@ -14527,7 +14657,8 @@ var require_req_eyes = __commonJS({
         useDnsCache: settings.useDnsCache,
         connectionTimeout: (_a = settings.connectionTimeout) !== null && _a !== void 0 ? _a : 3e5,
         requestTimeout: (_b = settings.requestTimeout) !== null && _b !== void 0 ? _b : 3e4,
-        retry: (_c = settings.retry) !== null && _c !== void 0 ? _c : [
+        retryTimeout: (_c = settings.retryTimeout) !== null && _c !== void 0 ? _c : retryDuration,
+        retry: (_d = settings.retry) !== null && _d !== void 0 ? _d : [
           // retry on network issues
           {
             limit: retryLimit,
@@ -14543,8 +14674,8 @@ var require_req_eyes = __commonJS({
               "ENOMEM"
             ],
             validate(options) {
-              var _a2, _b2, _c2, _d;
-              return [404, 502, 503, 504, 500].includes((_b2 = (_a2 = options === null || options === void 0 ? void 0 : options.response) === null || _a2 === void 0 ? void 0 : _a2.status) !== null && _b2 !== void 0 ? _b2 : 0) && !((_d = (_c2 = options === null || options === void 0 ? void 0 : options.response) === null || _c2 === void 0 ? void 0 : _c2.headers) === null || _d === void 0 ? void 0 : _d.get("x-applitools-dont-retry"));
+              var _a2, _b2, _c2, _d2;
+              return [404, 502, 503, 504, 500].includes((_b2 = (_a2 = options === null || options === void 0 ? void 0 : options.response) === null || _a2 === void 0 ? void 0 : _a2.status) !== null && _b2 !== void 0 ? _b2 : 0) && !((_d2 = (_c2 = options === null || options === void 0 ? void 0 : options.response) === null || _c2 === void 0 ? void 0 : _c2.headers) === null || _d2 === void 0 ? void 0 : _d2.get("x-applitools-dont-retry"));
             }
           }
         ],
@@ -14622,6 +14753,7 @@ var require_req_eyes = __commonJS({
           request.headers.set("Eyes-Date", (/* @__PURE__ */ new Date()).toUTCString());
         },
         async afterResponse({ response, options }) {
+          var _a;
           const logger = options.logger;
           logger === null || logger === void 0 ? void 0 : logger.log(`Location header: ${response.headers.has("Location") ? response.headers.get("Location") : "not found"}`);
           if (response.status === 202 && response.headers.has("Location")) {
@@ -14629,16 +14761,18 @@ var require_req_eyes = __commonJS({
               await utils34.general.sleep(Number(response.headers.get("Retry-After")) * 1e3);
             }
             const resultUrl = updateOriginAndPath(response.headers.get("Location"), settings.eyesServerUrl);
-            logger === null || logger === void 0 ? void 0 : logger.log(`Polling started for location: ${resultUrl}`);
+            const currentRetryTimeout = (_a = options === null || options === void 0 ? void 0 : options.retryTimeout) !== null && _a !== void 0 ? _a : settings.retryTimeout;
+            logger === null || logger === void 0 ? void 0 : logger.log(`Polling started for location: ${resultUrl}, with retryTimeout: ${currentRetryTimeout}`);
             const pollResponse = await req2(resultUrl, options !== null && options !== void 0 ? options : {}, {
               method: "GET",
               body: void 0,
+              ...(0, addRetryTimeout_1.addRetryTimeout)(currentRetryTimeout),
               expected: [200, 201, 202, 203, 204, 205, 206, 207, 208, 502, 503, 504],
               retry: {
-                timeout: [...Array(5).fill(1e3), ...Array(5).fill(2e3), 5e3],
+                timeout: backoffDelays,
                 validate: async ({ response: response2 }) => {
-                  var _a;
-                  return !(response2 === null || response2 === void 0 ? void 0 : response2.headers.get("x-applitools-dont-retry")) && ![400, 401, 403, 500].includes((_a = response2 === null || response2 === void 0 ? void 0 : response2.status) !== null && _a !== void 0 ? _a : 400);
+                  var _a2;
+                  return !(response2 === null || response2 === void 0 ? void 0 : response2.headers.get("x-applitools-dont-retry")) && ![400, 401, 403, 500].includes((_a2 = response2 === null || response2 === void 0 ? void 0 : response2.status) !== null && _a2 !== void 0 ? _a2 : 400);
                 }
               },
               connectionTimeout: 0,
@@ -21807,7 +21941,7 @@ var require_server_region_converter = __commonJS({
     function toAccessibilityRegions(regions) {
       return regions === null || regions === void 0 ? void 0 : regions.map((region) => {
         const serverRegion = toServerRegion(region);
-        if (utils34.types.has(region, "type")) {
+        if (utils34.types.has(region, "type") && region.type !== void 0) {
           serverRegion.type = region.type;
         }
         return serverRegion;
@@ -21816,7 +21950,7 @@ var require_server_region_converter = __commonJS({
     function toDynamicRegions(regions) {
       return regions === null || regions === void 0 ? void 0 : regions.map((region) => {
         const serverRegion = toServerRegion(region);
-        if (utils34.types.has(region, "type")) {
+        if (utils34.types.has(region, "type") && region.type !== void 0) {
           serverRegion.dynamicSettings = {
             ignorePatterns: utils34.types.isArray(region.type) ? region.type : [region.type]
           };
@@ -21828,7 +21962,9 @@ var require_server_region_converter = __commonJS({
       var _a;
       const options = {};
       if (utils34.types.has(region, "region")) {
-        options.regionId = region.regionId;
+        if (region.regionId !== void 0) {
+          options.regionId = region.regionId;
+        }
         if (utils34.types.has(region, "offset")) {
           const offset = region.offset;
           options.maxUpOffset = offset.top;
@@ -21970,6 +22106,7 @@ var require_requests = __commonJS({
     var mask_1 = require_mask();
     var chalk_1 = __importDefault(require_source());
     var server_concurrency_converter_1 = require_server_concurrency_converter();
+    var addRetryTimeout_1 = require_addRetryTimeout();
     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" } });
@@ -22005,7 +22142,7 @@ var require_requests = __commonJS({
         logger.log('Request "openEyes" called with settings', settings);
         const account = await getAccountInfoWithCache({ settings });
         if (account.processKeepaliveIntervalSec) {
-          heartbeat.startPeriodicHeartbeatMessaging({
+          heartbeat.acquire({
             eyesServerUrl: settings.eyesServerUrl,
             apiKey: settings.apiKey,
             proxy: settings.proxy,
@@ -22062,7 +22199,7 @@ var require_requests = __commonJS({
         return makeEyesRequests({ core, test, req: req2, logger });
       }
       async function openFunctionalSession({ settings, logger = mainLogger }) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _f;
         logger = logger.extend(mainLogger, { tags: [`core-request-${utils34.general.shortid()}`] });
         const req2 = (0, req_eyes_1.makeReqEyes)({ settings, fetch: fetch2, logger });
         logger.log('Request "openFunctionalSession" called with settings', settings);
@@ -22090,7 +22227,7 @@ var require_requests = __commonJS({
                 properties: settings.batch.properties,
                 buildId: settings.batch.buildId
               },
-              egSessionId: (_e = (_d = settings.environment) === null || _d === void 0 ? void 0 : _d.ecSessionId) !== null && _e !== void 0 ? _e : null,
+              egSessionId: (_f = (_d = settings.environment) === null || _d === void 0 ? void 0 : _d.ecSessionId) !== null && _f !== void 0 ? _f : null,
               environment: settings.environment && (settings.environment.rawEnvironment ? {
                 ...settings.environment.rawEnvironment,
                 os: settings.environment.os,
@@ -22135,7 +22272,7 @@ var require_requests = __commonJS({
         return makeFunctionalSessionRequests({ core, test, req: req2, logger });
       }
       async function openCheckAndClose({ target, settings, logger = mainLogger }) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        var _a, _b, _c, _d, _f, _g, _h, _j, _k;
         const req2 = (0, req_eyes_1.makeReqEyes)({ settings, fetch: fetch2, logger });
         logger.log('Request "openCheckAndClose" called with settings', settings);
         const account = await getAccountInfoWithCache({ settings, logger });
@@ -22171,13 +22308,13 @@ var require_requests = __commonJS({
                 properties: settings.batch.properties,
                 buildId: settings.batch.buildId
               },
-              egSessionId: (_e = (_d = settings.environment) === null || _d === void 0 ? void 0 : _d.ecSessionId) !== null && _e !== void 0 ? _e : null,
+              egSessionId: (_f = (_d = settings.environment) === null || _d === void 0 ? void 0 : _d.ecSessionId) !== null && _f !== void 0 ? _f : null,
               environment: settings.environment && (settings.environment.rawEnvironment ? {
                 ...settings.environment.rawEnvironment,
-                os: (_f = settings.environment.os) !== null && _f !== void 0 ? _f : settings.environment.rawEnvironment.os,
-                osInfo: (_g = settings.environment.displayOs) !== null && _g !== void 0 ? _g : settings.environment.rawEnvironment.osInfo,
-                hostingApp: (_h = settings.environment.hostingApp) !== null && _h !== void 0 ? _h : settings.environment.rawEnvironment.hostingApp,
-                hostingAppInfo: (_j = settings.environment.displayHostingApp) !== null && _j !== void 0 ? _j : settings.environment.rawEnvironment.hostingAppInfo
+                os: (_g = settings.environment.os) !== null && _g !== void 0 ? _g : settings.environment.rawEnvironment.os,
+                osInfo: (_h = settings.environment.displayOs) !== null && _h !== void 0 ? _h : settings.environment.rawEnvironment.osInfo,
+                hostingApp: (_j = settings.environment.hostingApp) !== null && _j !== void 0 ? _j : settings.environment.rawEnvironment.hostingApp,
+                hostingAppInfo: (_k = settings.environment.displayHostingApp) !== null && _k !== void 0 ? _k : settings.environment.rawEnvironment.hostingAppInfo
               } : {
                 deviceInfo: settings.environment.deviceName,
                 os: settings.environment.os,
@@ -22213,6 +22350,7 @@ var require_requests = __commonJS({
             updateBaselineIfDifferent: settings.updateBaselineIfDifferent
           },
           expected: [200, 201],
+          ...(0, addRetryTimeout_1.addRetryTimeout)(settings.retryTimeout),
           logger
         });
         return openCheckAndCloseResponse.then(() => {
@@ -22473,6 +22611,7 @@ var require_requests = __commonJS({
             accessToken: settings.secretToken
           },
           expected: 200,
+          ...(0, addRetryTimeout_1.addRetryTimeout)(settings.retryTimeout),
           logger
         });
         logger.log('Request "deleteTest" finished successfully');
@@ -22545,7 +22684,7 @@ var require_requests = __commonJS({
         logger.log('Request "openCheckAndClose" called for target', target, "with settings", settings);
         const account = await getAccountInfoWithCache({ settings });
         if (account.processKeepaliveIntervalSec) {
-          heartbeat.startPeriodicHeartbeatMessaging({
+          heartbeat.acquire({
             eyesServerUrl: settings.eyesServerUrl,
             apiKey: settings.apiKey,
             proxy: settings.proxy,
@@ -22588,6 +22727,7 @@ var require_requests = __commonJS({
             }
           },
           expected: [200, 404],
+          ...(0, addRetryTimeout_1.addRetryTimeout)(settings.retryTimeout),
           logger
         }).then(async (response) => {
           if (response.status === 404) {
@@ -22639,7 +22779,7 @@ var require_requests = __commonJS({
       let resultResponsePromise;
       let supportsCheckAndClose = true;
       let abortReason;
-      const req2 = defaultReq !== null && defaultReq !== void 0 ? defaultReq : (0, req_eyes_1.makeReqEyes)({ settings: test.eyesServer, fetch: fetch2, logger: mainLogger });
+      const req2 = defaultReq !== null && defaultReq !== void 0 ? defaultReq : (0, req_eyes_1.makeReqEyes)({ settings: { ...test.eyesServer }, fetch: fetch2, logger: mainLogger });
       const upload = (0, upload_1.makeUpload)({
         settings: { uploadUrl: test.account.uploadUrl, proxy: test.eyesServer.proxy },
         logger: mainLogger
@@ -22668,6 +22808,7 @@ var require_requests = __commonJS({
         ]);
         const response = await req2(`./api/sessions/running/${encodeURIComponent(test.testId)}`, {
           name: "check",
+          ...(0, addRetryTimeout_1.addRetryTimeout)(settings.retryTimeout),
           method: "POST",
           body: toServerMatchOptions({ target, settings }),
           expected: 200,
@@ -22697,6 +22838,7 @@ var require_requests = __commonJS({
         resultResponsePromise = req2(`./api/sessions/running/${encodeURIComponent(test.testId)}/matchandend`, {
           name: "checkAndClose",
           method: "POST",
+          ...(0, addRetryTimeout_1.addRetryTimeout)(settings.retryTimeout),
           body: {
             ...matchOptions,
             options: {
@@ -22735,6 +22877,7 @@ var require_requests = __commonJS({
         resultResponsePromise = report({ settings, logger }).then(() => req2(`./api/sessions/running/${encodeURIComponent(test.testId)}`, {
           name: "close",
           method: "DELETE",
+          ...(0, addRetryTimeout_1.addRetryTimeout)(settings === null || settings === void 0 ? void 0 : settings.retryTimeout),
           query: {
             aborted: false,
             updateBaseline: test.isNew ? settings === null || settings === void 0 ? void 0 : settings.updateBaselineIfNew : settings === null || settings === void 0 ? void 0 : settings.updateBaselineIfDifferent
@@ -22744,7 +22887,7 @@ var require_requests = __commonJS({
         }));
         return resultResponsePromise.then(() => {
           logger.log('Request "close" finished successfully');
-        }).catch(() => void 0);
+        }).catch((_e) => void 0);
       }
       async function abort({ settings, logger = mainLogger } = {}) {
         logger = logger.extend(mainLogger, { tags: [`core-request-${utils34.general.shortid()}`] });
@@ -22760,6 +22903,7 @@ var require_requests = __commonJS({
           query: {
             aborted: true
           },
+          ...(0, addRetryTimeout_1.addRetryTimeout)(settings === null || settings === void 0 ? void 0 : settings.retryTimeout),
           expected: 200,
           logger
         }));
@@ -22845,6 +22989,7 @@ var require_requests = __commonJS({
           return req2(`./api/sessions/running/${encodeURIComponent(test.testId)}`, {
             name: "close",
             method: "DELETE",
+            ...(0, addRetryTimeout_1.addRetryTimeout)(settings === null || settings === void 0 ? void 0 : settings.retryTimeout),
             query: { aborted: false, nonVisualStatus: (_a = settings === null || settings === void 0 ? void 0 : settings.status) !== null && _a !== void 0 ? _a : "Completed" },
             expected: 200,
             logger
@@ -22864,6 +23009,7 @@ var require_requests = __commonJS({
         resultResponsePromise = report({ settings, logger }).then(() => req2(`./api/sessions/running/${encodeURIComponent(test.testId)}`, {
           name: "abort",
           method: "DELETE",
+          ...(0, addRetryTimeout_1.addRetryTimeout)(settings === null || settings === void 0 ? void 0 : settings.retryTimeout),
           query: {
             aborted: true
           },
@@ -22918,7 +23064,7 @@ var require_requests = __commonJS({
     }
     exports.makeFunctionalSessionRequests = makeFunctionalSessionRequests;
     function toStartInfo({ settings }) {
-      var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+      var _a, _b, _c, _d, _f, _g, _h, _j, _k;
       return {
         agentId: settings.agentId,
         agentSessionId: settings.userTestId,
@@ -22937,13 +23083,13 @@ var require_requests = __commonJS({
           properties: settings.batch.properties,
           buildId: settings.batch.buildId
         },
-        egSessionId: (_e = (_d = settings.environment) === null || _d === void 0 ? void 0 : _d.ecSessionId) !== null && _e !== void 0 ? _e : null,
+        egSessionId: (_f = (_d = settings.environment) === null || _d === void 0 ? void 0 : _d.ecSessionId) !== null && _f !== void 0 ? _f : null,
         environment: settings.environment && (settings.environment.rawEnvironment ? {
           ...settings.environment.rawEnvironment,
-          os: (_f = settings.environment.os) !== null && _f !== void 0 ? _f : settings.environment.rawEnvironment.os,
-          osInfo: (_g = settings.environment.displayOs) !== null && _g !== void 0 ? _g : settings.environment.rawEnvironment.osInfo,
-          hostingApp: (_h = settings.environment.hostingApp) !== null && _h !== void 0 ? _h : settings.environment.rawEnvironment.hostingApp,
-          hostingAppInfo: (_j = settings.environment.displayHostingApp) !== null && _j !== void 0 ? _j : settings.environment.rawEnvironment.hostingAppInfo
+          os: (_g = settings.environment.os) !== null && _g !== void 0 ? _g : settings.environment.rawEnvironment.os,
+          osInfo: (_h = settings.environment.displayOs) !== null && _h !== void 0 ? _h : settings.environment.rawEnvironment.osInfo,
+          hostingApp: (_j = settings.environment.hostingApp) !== null && _j !== void 0 ? _j : settings.environment.rawEnvironment.hostingApp,
+          hostingAppInfo: (_k = settings.environment.displayHostingApp) !== null && _k !== void 0 ? _k : settings.environment.rawEnvironment.hostingAppInfo
         } : {
           deviceInfo: settings.environment.deviceName,
           os: settings.environment.os,
@@ -66217,7 +66363,7 @@ var require_check_and_close = __commonJS({
     var transform_target_1 = require_transform_target();
     var transform_dom_mapping_1 = require_transform_dom_mapping();
     var utils34 = __importStar(require_browser3());
-    function makeCheckAndClose({ requests, done, signal, logger: mainLogger }) {
+    function makeCheckAndClose({ requests, done, signal, heartbeat, logger: mainLogger }) {
       return async function checkAndClose({ target, settings, logger = mainLogger }) {
         var _a, _b, _c, _d, _e;
         logger = logger.extend(mainLogger, { tags: [`check-and-close-base-${utils34.general.shortid()}`] });
@@ -66233,7 +66379,7 @@ var require_check_and_close = __commonJS({
         if (signal.aborted) {
           throw new Error('Command "checkAndClose" was aborted');
         }
-        return requests.checkAndClose({ target, settings, logger }).finally(done);
+        return requests.checkAndClose({ target, settings, logger }).finally(done).finally(() => heartbeat === null || heartbeat === void 0 ? void 0 : heartbeat.release());
       };
     }
     exports.makeCheckAndClose = makeCheckAndClose;
@@ -66283,11 +66429,11 @@ var require_close = __commonJS({
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.makeClose = void 0;
     var utils34 = __importStar(require_browser3());
-    function makeClose({ requests, done, logger: mainLogger }) {
+    function makeClose({ requests, done, heartbeat, logger: mainLogger }) {
       return async function close({ settings, logger = mainLogger } = {}) {
         logger = logger.extend(mainLogger, { tags: [`close-base-${utils34.general.shortid()}`] });
         logger.log('Command "close" is called with settings', settings);
-        void requests.close({ settings, logger }).finally(done);
+        void requests.close({ settings, logger }).finally(done).finally(() => heartbeat === null || heartbeat === void 0 ? void 0 : heartbeat.release());
       };
     }
     exports.makeClose = makeClose;
@@ -66337,12 +66483,12 @@ var require_abort = __commonJS({
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.makeAbort = void 0;
     var utils34 = __importStar(require_browser3());
-    function makeAbort({ requests, done, controller, logger: mainLogger }) {
+    function makeAbort({ requests, done, controller, heartbeat, logger: mainLogger }) {
       return async function abort({ settings, logger = mainLogger } = {}) {
         logger = logger.extend(mainLogger, { tags: [`abort-base-${utils34.general.shortid()}`] });
         logger.log('Command "abort" is called with settings', settings);
         controller.abort();
-        void requests.abort({ settings, logger }).finally(done);
+        void requests.abort({ settings, logger }).finally(done).finally(() => heartbeat === null || heartbeat === void 0 ? void 0 : heartbeat.release());
       };
     }
     exports.makeAbort = makeAbort;
@@ -66646,9 +66792,10 @@ var require_open_eyes = __commonJS({
                 };
                 resolve(utils34.general.extend(eyesRequests, {
                   check: (0, check_1.makeCheck)({ requests: eyesRequests, signal: controller.signal, logger }),
-                  checkAndClose: (0, check_and_close_1.makeCheckAndClose)({ requests: eyesRequests, done, signal: controller.signal, logger }),
-                  close: (0, close_1.makeClose)({ requests: eyesRequests, done, logger }),
-                  abort: (0, abort_1.makeAbort)({ requests: eyesRequests, done, controller, logger }),
+                  // eslint-disable-next-line prettier/prettier
+                  checkAndClose: (0, check_and_close_1.makeCheckAndClose)({ requests: eyesRequests, done, signal: controller.signal, heartbeat, logger }),
+                  close: (0, close_1.makeClose)({ requests: eyesRequests, done, heartbeat, logger }),
+                  abort: (0, abort_1.makeAbort)({ requests: eyesRequests, done, controller, heartbeat, logger }),
                   getResults: (0, get_results_1.makeGetResults)({ requests: eyesRequests, logger })
                 }));
               } catch (error) {
@@ -67172,33 +67319,61 @@ var require_heartbeat = __commonJS({
     exports.makeHeartbeat = void 0;
     var utils34 = __importStar(require_browser3());
     var processId = utils34.general.guid();
-    var isStarted = false;
+    var isRunning = false;
     var intervalId;
+    var refCount = 0;
     function makeHeartbeat({ requests, logger: mainLogger }) {
       const logger = mainLogger.extend(mainLogger, { tags: [`heartbeat-base-${utils34.general.shortid()}`] });
-      async function startPeriodicHeartbeatMessaging(settings) {
-        if (!isStarted) {
-          isStarted = true;
-          await requests.sendHeartbeat({ settings: { ...settings, processId }, logger });
+      function stopHeartbeats() {
+        logger.log("Stopping heartbeats");
+        isRunning = false;
+        if (intervalId) {
+          clearInterval(intervalId);
+          intervalId = void 0;
+        }
+      }
+      async function startHeartbeats(settings) {
+        if (!isRunning) {
+          processId = utils34.general.guid();
+          isRunning = true;
+          logger.log("Starting heartbeats with new processId:", processId);
+          await requests.sendHeartbeat({ settings: { ...settings, processId }, logger }).catch((error) => {
+            logger.error("Failed to send heartbeat:", error);
+          });
           intervalId = setIntervalBrowser(async () => {
             try {
               await requests.sendHeartbeat({ settings: { ...settings, processId }, logger });
             } catch (error) {
               if (error.message === "This process is expired. All its sessions were abandoned") {
-                isStarted = false;
-                processId = utils34.general.guid();
-                clearInterval(intervalId);
+                stopHeartbeats();
               }
             }
           }, settings.interval);
           intervalId.unref();
         }
       }
+      function acquire(settings) {
+        refCount++;
+        logger.log("Heartbeat acquired, refCount:", refCount);
+        void startHeartbeats(settings).catch((error) => {
+          logger.error("Failed to start heartbeats:", error);
+        });
+      }
+      function release() {
+        if (refCount > 0) {
+          refCount--;
+          logger.log("Heartbeat released, refCount:", refCount);
+          if (refCount === 0) {
+            stopHeartbeats();
+          }
+        }
+      }
       return {
         get processId() {
           return processId;
         },
-        startPeriodicHeartbeatMessaging
+        acquire,
+        release
       };
     }
     exports.makeHeartbeat = makeHeartbeat;
@@ -73931,7 +74106,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.6.6";
+            d2(i2.doCaptureDoc), l2(i2.waitForImages), await Promise.all(f2), d2(i2.waitForImages), N2.version = "1.3.0", N2.scriptVersion = "11.6.7";
             const S2 = h2.length ? `${h2.join("\n")}
 ` : "", A2 = m2.size ? `${Array.from(m2).join("\n")}
 ` : "", _2 = JSON.stringify({ separator: y2, cssStartToken: g2, cssEndToken: g2, iframeStartToken: `"${p2}`, iframeEndToken: `${p2}"` });
@@ -80812,7 +80987,7 @@ var require_captureDomPollForIE = __commonJS({
                     case 23:
                       return I2 = e5.sent, A2(w2.prefetchCss), L2 = N0({ parseCss: U0, CSSImportRule, getCssFromCache: I2, absolutizeUrl: L0, unfetchedToken: R2 }), j2 = B0({ getCssFromCache: I2, absolutizeUrl: L0 }), k2 = z0({ extractCssFromNode: j2, getBundledCssFromCssText: L2, unfetchedToken: R2 }), E2(w2.doCaptureDoc), C2 = V2(i3), A2(w2.doCaptureDoc), E2(w2.waitForImages), e5.next = 34, Promise.all(S2);
                     case 34:
-                      return A2(w2.waitForImages), C2.version = "1.3.0", C2.scriptVersion = "11.6.6", M2 = x2.length ? x2.join("\n") + "\n" : "", N2 = O2.size ? Array.from(O2).join("\n") + "\n" : "", U2 = JSON.stringify({ separator: _2, cssStartToken: R2, cssEndToken: R2, iframeStartToken: '"' + T2, iframeEndToken: T2 + '"' }), A2(w2.total), F2 = U2 + "\n" + N2 + _2 + "\n" + M2 + _2 + "\n" + JSON.stringify(C2) + D2(), console.log("[captureFrame]", JSON.stringify(w2)), e5.abrupt("return", F2);
+                      return A2(w2.waitForImages), C2.version = "1.3.0", C2.scriptVersion = "11.6.7", M2 = x2.length ? x2.join("\n") + "\n" : "", N2 = O2.size ? Array.from(O2).join("\n") + "\n" : "", U2 = JSON.stringify({ separator: _2, cssStartToken: R2, cssEndToken: R2, iframeStartToken: '"' + T2, iframeEndToken: T2 + '"' }), A2(w2.total), F2 = U2 + "\n" + N2 + _2 + "\n" + M2 + _2 + "\n" + JSON.stringify(C2) + D2(), console.log("[captureFrame]", JSON.stringify(w2)), e5.abrupt("return", F2);
                     case 44:
                     case "end":
                       return e5.stop();
@@ -87433,7 +87608,7 @@ var require_requests2 = __commonJS({
         brokerUrl = result.nextPath;
       }
       async function takeScreenshots({ settings: settings2, logger = mainLogger }) {
-        var _a;
+        var _a, _b;
         logger = logger.extend(mainLogger, { tags: [`nml-request-${utils34.general.shortid()}`] });
         logger.log('Request "takeScreenshots" called with settings', settings2);
         const { localEnvironment, renderEnvironments, environmentSettings } = await (0, get_environments_info_1.getNMLEnvironmentsInfo)({
@@ -87466,24 +87641,32 @@ var require_requests2 = __commonJS({
           let screenshots;
           if (Number(result.protocolVersion) >= 2) {
             logger.log(`Request "takeScreenshots" was performed on applitools lib v${result.nmlVersion} through protocol v${result.protocolVersion} on device`, result.payload.debugInfo);
-            screenshots = localEnvironment ? [
-              {
-                image: result.payload.result[0].result.screenshotUrl,
-                environment: localEnvironment,
-                calculateRegions: result.payload.result[0].result.selectorRegions,
-                dom: result.payload.result[0].result.dom
-              }
-            ] : renderEnvironments.map((environment, index) => {
-              if (result.payload.result[index].error) {
-                throw new Error(`There was a problem in taking screenshot for environment ${JSON.stringify(environment)}. The provided error message was "${result.payload.result[index].error.message}" and had a stack trace of "${result.payload.result[index].error.stack}"`);
+            if ((_b = result.payload.result) === null || _b === void 0 ? void 0 : _b.some((res) => res.error)) {
+              const errors = result.payload.result.filter((res) => res.error);
+              let errMessage = "There were problems in taking screenshots for";
+              if (localEnvironment) {
+                errMessage += ` local environment ${JSON.stringify(localEnvironment)}:
+`;
+                errMessage += `	 ${JSON.stringify(errors)}`;
+              } else {
+                errMessage += " environments:";
+                errMessage += ` 
+	 ${errors.map((err, index) => `Environment ${JSON.stringify(renderEnvironments[index])}: ${JSON.stringify(err)}`).join("\n	")}`;
               }
+              throw new Error(errMessage);
+            }
+            screenshots = renderEnvironments.map((environment, index) => {
               return {
                 image: result.payload.result[index].result.screenshotUrl,
                 calculateRegions: result.payload.result[index].result.selectorRegions,
                 dom: result.payload.result[index].result.dom,
-                environment
+                environment: localEnvironment || environment
               };
             });
+            if (localEnvironment && renderEnvironments.length > 1) {
+              logger.warn(`Local environment detected with ${renderEnvironments.length} rendered environment(s). Using local environment ${JSON.stringify(localEnvironment)} and ignoring rendered environments: ${JSON.stringify(renderEnvironments)}. Note - this warning shouldn't appear in normal usage.`);
+              screenshots = [screenshots[0]];
+            }
           } else {
             screenshots = localEnvironment ? [
               {
@@ -88342,13 +88525,13 @@ var require_check2 = __commonJS({
         let driver = void 0;
         if ((0, driver_1.isDriver)(target, spec)) {
           driver = await (0, driver_1.makeDriver)({ spec, driver: target, reset: target === defaultTarget, logger });
-          if (settings.retryTimeout) {
-            logger.log(`Retry timeout is set to ${settings.retryTimeout}ms - will retry checking until it passes or timeout is reached`);
+          if (settings.matchTimeout) {
+            logger.log(`Match timeout is set to ${settings.matchTimeout}ms - will retry checking until it passes or timeout is reached`);
             const start = Date.now();
             const environmentLogger = logger.extend({ tags: [`environment-${utils34.general.shortid()}`] });
             const baseEyes = await Promise.all(uniqueEnvironments.map((environment) => getBaseEyes({ environment, driver, logger: environmentLogger })));
             if (baseEyes.map((baseEye) => baseEye.test.isNew).some((isNew) => isNew)) {
-              await new Promise((resolve) => setTimeout(resolve, settings.retryTimeout));
+              await new Promise((resolve) => setTimeout(resolve, settings.matchTimeout));
             }
             let asExpected = false, retries = 0;
             do {
@@ -88375,7 +88558,7 @@ var require_check2 = __commonJS({
                   putInStorage(exactEnvironment, eyes, Promise.resolve());
                 });
               }
-            } while (!asExpected && Date.now() - start < settings.retryTimeout);
+            } while (!asExpected && Date.now() - start < settings.matchTimeout);
           } else {
             const baseScreenshotsAndSettings = await generateBaseScreenshotsAndSettings(settings, uniqueEnvironments, eyes, logger, driver);
             baseScreenshotsAndSettings.forEach(({ exactEnvironment: environment, baseSetting, baseTarget }) => {
@@ -95358,7 +95541,7 @@ creating temp style for access.`), r3 = $h(e3);
               function B2(e3) {
                 return n4.defaultView && n4.defaultView.frameElement && n4.defaultView.frameElement.getAttribute(e3);
               }
-            }(t3).then((e3) => (h2.log("processPage end"), e3.scriptVersion = "4.15.0", e3));
+            }(t3).then((e3) => (h2.log("processPage end"), e3.scriptVersion = "4.15.1", e3));
           }, window[x], "domSnapshotResult");
           return function(e3) {
             try {
@@ -119051,7 +119234,7 @@ var require_check4 = __commonJS({
         (_g = settings.sendDom) !== null && _g !== void 0 ? _g : settings.sendDom = eyes.test.account.rcaEnabled || settings.matchLevel === "Layout" || settings.matchLevel === "Dynamic" || settings.enablePatterns || settings.useDom || !utils34.types.isEmpty(settings.dynamicRegions) || !utils34.types.isEmpty(settings.layoutRegions) || !utils34.types.isEmpty(settings.accessibilitySettings);
         (_h = settings.autProxy) !== null && _h !== void 0 ? _h : settings.autProxy = eyes.test.eyesServer.proxy;
         (_j = settings.useDom) !== null && _j !== void 0 ? _j : settings.useDom = false;
-        (_k = (_r = settings).retryTimeout) !== null && _k !== void 0 ? _k : _r.retryTimeout = 0;
+        (_k = (_r = settings).matchTimeout) !== null && _k !== void 0 ? _k : _r.matchTimeout = 0;
         settings.lazyLoad = settings.lazyLoad === true ? {} : settings.lazyLoad;
         if (settings.lazyLoad) {
           (_l = (_s = settings.lazyLoad).scrollLength) !== null && _l !== void 0 ? _l : _s.scrollLength = defaults_1.DEFAULT_LAZY_LOAD.scrollLength;
@@ -120279,7 +120462,7 @@ var require_package3 = __commonJS({
   "../core/package.json"(exports, module) {
     module.exports = {
       name: "@applitools/core",
-      version: "4.52.0",
+      version: "4.53.0",
       homepage: "https://applitools.com",
       bugs: {
         url: "https://github.com/applitools/eyes.sdk.javascript1/issues"
@@ -127189,7 +127372,7 @@ var require_package4 = __commonJS({
   "../eyes/package.json"(exports, module) {
     module.exports = {
       name: "@applitools/eyes",
-      version: "1.36.15",
+      version: "1.36.16",
       keywords: [
         "applitools",
         "eyes",
@@ -127426,10 +127609,15 @@ var IosDeviceNameEnum = /* @__PURE__ */ ((IosDeviceNameEnum2) => {
   IosDeviceNameEnum2["iPad_10"] = "iPad (10th generation)";
   IosDeviceNameEnum2["iPad_mini_6"] = "iPad mini (6th generation)";
   IosDeviceNameEnum2["iPad_Air_4"] = "iPad Air (4th generation)";
+  IosDeviceNameEnum2["iPad_Air_11_inch_M3"] = "iPad Air 11-inch (M3)";
+  IosDeviceNameEnum2["iPad_Air_13_inch_M3"] = "iPad Air 13-inch (M3)";
+  IosDeviceNameEnum2["iPad_A16"] = "iPad (A16)";
   IosDeviceNameEnum2["iPad_Pro_3"] = "iPad Pro (12.9-inch) (3rd generation)";
-  IosDeviceNameEnum2["iPad_Pro_12_9_inch_3"] = "iPad Pro (12.9-inch) (3rd generation)";
   IosDeviceNameEnum2["iPad_Pro_4"] = "iPad Pro (11-inch) (4th generation)";
   IosDeviceNameEnum2["iPad_Pro_11_inch_4"] = "iPad Pro (11-inch) (4th generation)";
+  IosDeviceNameEnum2["iPad_Pro_11_inch_M5"] = "iPad Pro 11-inch (M5)";
+  IosDeviceNameEnum2["iPad_Pro_13_inch_M5"] = "iPad Pro 13-inch (M5)";
+  IosDeviceNameEnum2["iPad_Pro_12_9_inch_3"] = "iPad Pro (12.9-inch) (3rd generation)";
   IosDeviceNameEnum2["iPhone_SE_2"] = "iPhone SE (2nd generation)";
   IosDeviceNameEnum2["iPhone_SE_3"] = "iPhone SE (3rd generation)";
   IosDeviceNameEnum2["iPhone_XR"] = "iPhone XR";
@@ -127458,9 +127646,259 @@ var IosDeviceNameEnum = /* @__PURE__ */ ((IosDeviceNameEnum2) => {
   IosDeviceNameEnum2["iPhone_16_Pro_Max"] = "iPhone 16 Pro Max";
   IosDeviceNameEnum2["iPhone_16_Pro"] = "iPhone 16 Pro";
   IosDeviceNameEnum2["iPhone_16_Plus"] = "iPhone 16 Plus";
+  IosDeviceNameEnum2["iPhone_17"] = "iPhone 17";
+  IosDeviceNameEnum2["iPhone_17_Pro"] = "iPhone 17 Pro";
+  IosDeviceNameEnum2["iPhone_17_Pro_Max"] = "iPhone 17 Pro Max";
+  IosDeviceNameEnum2["iPhone_Air"] = "iPhone Air";
   return IosDeviceNameEnum2;
 })(IosDeviceNameEnum || {});
 
+// ../eyes/src/enums/IosMultiDeviceTarget.ts
+init_process();
+init_setImmediate();
+init_buffer();
+init_setInterval();
+
+// ../eyes/src/input/IosDeviceTarget.ts
+init_process();
+init_setImmediate();
+init_buffer();
+init_setInterval();
+
+// ../eyes/src/enums/ScreenOrientation.ts
+init_process();
+init_setImmediate();
+init_buffer();
+init_setInterval();
+var ScreenOrientationEnum = /* @__PURE__ */ ((ScreenOrientationEnum2) => {
+  ScreenOrientationEnum2["PORTRAIT"] = "portrait";
+  ScreenOrientationEnum2["LANDSCAPE"] = "landscape";
+  return ScreenOrientationEnum2;
+})(ScreenOrientationEnum || {});
+
+// ../eyes/src/input/IosDeviceTarget.ts
+var IosDeviceTarget = class {
+  constructor(deviceName) {
+    this.deviceName = deviceName;
+  }
+  /**
+   * Sets the device orientation to landscape.
+   * @returns this instance for method chaining
+   */
+  landscape() {
+    this.screenOrientation = "landscape" /* LANDSCAPE */;
+    return this;
+  }
+  /**
+   * Sets the device orientation to portrait.
+   * @returns this instance for method chaining
+   */
+  portrait() {
+    this.screenOrientation = "portrait" /* PORTRAIT */;
+    return this;
+  }
+  /**
+   * Gets the configured orientation for this device target.
+   * @returns the screen orientation, or undefined if not set
+   */
+  getOrientation() {
+    return this.screenOrientation;
+  }
+  /**
+   * Gets the device name.
+   * @returns the device name string
+   */
+  getDeviceName() {
+    return this.deviceName;
+  }
+  /**
+   * String representation of this device target.
+   * @returns the device name
+   */
+  toString() {
+    return this.deviceName;
+  }
+};
+
+// ../eyes/src/enums/IosMultiDeviceTarget.ts
+var IosMultiDeviceTarget = {
+  get iPhone_SE_1() {
+    return new IosDeviceTarget("iPhone SE (1st generation)");
+  },
+  get iPhone_SE_2() {
+    return new IosDeviceTarget("iPhone SE (2nd generation)");
+  },
+  get iPhone_SE_3() {
+    return new IosDeviceTarget("iPhone SE (3rd generation)");
+  },
+  get iPhone_6() {
+    return new IosDeviceTarget("iPhone 6");
+  },
+  get iPhone_6_Plus() {
+    return new IosDeviceTarget("iPhone 6 Plus");
+  },
+  get iPhone_7() {
+    return new IosDeviceTarget("iPhone 7");
+  },
+  get iPhone_7_Plus() {
+    return new IosDeviceTarget("iPhone 7 Plus");
+  },
+  get iPhone_8() {
+    return new IosDeviceTarget("iPhone 8");
+  },
+  get iPhone_8_Plus() {
+    return new IosDeviceTarget("iPhone 8 Plus");
+  },
+  get iPhone_X() {
+    return new IosDeviceTarget("iPhone X");
+  },
+  get iPhone_XR() {
+    return new IosDeviceTarget("iPhone XR");
+  },
+  get iPhone_Xs() {
+    return new IosDeviceTarget("iPhone Xs");
+  },
+  get iPhone_Xs_Max() {
+    return new IosDeviceTarget("iPhone Xs Max");
+  },
+  get iPhone_11() {
+    return new IosDeviceTarget("iPhone 11");
+  },
+  get iPhone_11_Pro() {
+    return new IosDeviceTarget("iPhone 11 Pro");
+  },
+  get iPhone_11_Pro_Max() {
+    return new IosDeviceTarget("iPhone 11 Pro Max");
+  },
+  get iPhone_12() {
+    return new IosDeviceTarget("iPhone 12");
+  },
+  get iPhone_12_mini() {
+    return new IosDeviceTarget("iPhone 12 mini");
+  },
+  get iPhone_12_Pro() {
+    return new IosDeviceTarget("iPhone 12 Pro");
+  },
+  get iPhone_12_Pro_Max() {
+    return new IosDeviceTarget("iPhone 12 Pro Max");
+  },
+  get iPhone_13() {
+    return new IosDeviceTarget("iPhone 13");
+  },
+  get iPhone_13_mini() {
+    return new IosDeviceTarget("iPhone 13 mini");
+  },
+  get iPhone_13_Pro() {
+    return new IosDeviceTarget("iPhone 13 Pro");
+  },
+  get iPhone_13_Pro_Max() {
+    return new IosDeviceTarget("iPhone 13 Pro Max");
+  },
+  get iPhone_14() {
+    return new IosDeviceTarget("iPhone 14");
+  },
+  get iPhone_14_Pro() {
+    return new IosDeviceTarget("iPhone 14 Pro");
+  },
+  get iPhone_14_Plus() {
+    return new IosDeviceTarget("iPhone 14 Plus");
+  },
+  get iPhone_14_Pro_Max() {
+    return new IosDeviceTarget("iPhone 14 Pro Max");
+  },
+  get iPhone_15() {
+    return new IosDeviceTarget("iPhone 15");
+  },
+  get iPhone_15_Pro() {
+    return new IosDeviceTarget("iPhone 15 Pro");
+  },
+  get iPhone_15_Plus() {
+    return new IosDeviceTarget("iPhone 15 Plus");
+  },
+  get iPhone_15_Pro_Max() {
+    return new IosDeviceTarget("iPhone 15 Pro Max");
+  },
+  get iPhone_16() {
+    return new IosDeviceTarget("iPhone 16");
+  },
+  get iPhone_16_Pro() {
+    return new IosDeviceTarget("iPhone 16 Pro");
+  },
+  get iPhone_16_Plus() {
+    return new IosDeviceTarget("iPhone 16 Plus");
+  },
+  get iPhone_16_Pro_Max() {
+    return new IosDeviceTarget("iPhone 16 Pro Max");
+  }
+};
+
+// ../eyes/src/enums/AndroidMultiDeviceTarget.ts
+init_process();
+init_setImmediate();
+init_buffer();
+init_setInterval();
+
+// ../eyes/src/input/AndroidDeviceTarget.ts
+init_process();
+init_setImmediate();
+init_buffer();
+init_setInterval();
+var AndroidDeviceTarget = class {
+  constructor(deviceName) {
+    this.deviceName = deviceName;
+  }
+  /**
+   * Sets the device orientation to landscape.
+   * @returns this instance for method chaining
+   */
+  landscape() {
+    this.screenOrientation = "landscape" /* LANDSCAPE */;
+    return this;
+  }
+  /**
+   * Sets the device orientation to portrait.
+   * @returns this instance for method chaining
+   */
+  portrait() {
+    this.screenOrientation = "portrait" /* PORTRAIT */;
+    return this;
+  }
+  /**
+   * Gets the configured orientation for this device target.
+   * @returns the screen orientation, or undefined if not set
+   */
+  getOrientation() {
+    return this.screenOrientation;
+  }
+  /**
+   * Gets the device name.
+   * @returns the device name string
+   */
+  getDeviceName() {
+    return this.deviceName;
+  }
+  /**
+   * String representation of this device target.
+   * @returns the device name
+   */
+  toString() {
+    return this.deviceName;
+  }
+};
+
+// ../eyes/src/enums/AndroidMultiDeviceTarget.ts
+var AndroidMultiDeviceTarget = {
+  get Galaxy_S25() {
+    return new AndroidDeviceTarget("Galaxy S25");
+  },
+  get Galaxy_S25_Ultra() {
+    return new AndroidDeviceTarget("Galaxy S25 Ultra");
+  },
+  get Pixel_9() {
+    return new AndroidDeviceTarget("Pixel 9");
+  }
+};
+
 // ../eyes/src/enums/IosVersion.ts
 init_process();
 init_setImmediate();
@@ -127491,17 +127929,6 @@ var MatchLevelEnum = /* @__PURE__ */ ((MatchLevelEnum2) => {
   return MatchLevelEnum2;
 })(MatchLevelEnum || {});
 
-// ../eyes/src/enums/ScreenOrientation.ts
-init_process();
-init_setImmediate();
-init_buffer();
-init_setInterval();
-var ScreenOrientationEnum = /* @__PURE__ */ ((ScreenOrientationEnum2) => {
-  ScreenOrientationEnum2["PORTRAIT"] = "portrait";
-  ScreenOrientationEnum2["LANDSCAPE"] = "landscape";
-  return ScreenOrientationEnum2;
-})(ScreenOrientationEnum || {});
-
 // ../eyes/src/enums/SessionType.ts
 init_process();
 init_setImmediate();
@@ -129306,7 +129733,7 @@ var CheckSettingsAutomationFluent = class extends CheckSettingsBaseFluent {
         pageId: this._settings.pageId,
         lazyLoad: this._settings.lazyLoad,
         waitBeforeCapture: this._settings.waitBeforeCapture,
-        retryTimeout: this._settings.timeout,
+        matchTimeout: this._settings.timeout,
         userCommandId: this._settings.variationGroupId,
         densityMetrics: this._settings.densityMetrics,
         assumesMutability: this.assumesMutability(),
@@ -130100,12 +130527,79 @@ var ConfigurationData = class {
     this.browsersInfo.push({ chromeEmulationInfo: { deviceName, screenOrientation } });
     return this;
   }
-  addMultiDeviceTarget(deviceName) {
+  /**
+   * Add iOS and/or Android devices for multi-device testing.
+   *
+   * @param devices - Device targets. Supports three formats:
+   *   - Plain strings: `'iPhone 13'`, `'Galaxy S25'`
+   *   - Enum values: `IosMultiDeviceTarget.iPhone_13`, `AndroidMultiDeviceTarget.Galaxy_S25`
+   *   - Fluent API: `IosMultiDeviceTarget.iPhone_13.landscape()`, `AndroidMultiDeviceTarget.Galaxy_S25.portrait()`
+   *
+   * @example
+   * ```typescript
+   * // Plain strings (backward compatible)
+   * config.addMultiDeviceTarget('iPhone 13', 'Galaxy S25')
+   *
+   * // Enum values
+   * config.addMultiDeviceTarget(IosMultiDeviceTarget.iPhone_13, AndroidMultiDeviceTargetEnum.Galaxy_S25)
+   *
+   * // Fluent API with orientation
+   * config.addMultiDeviceTarget(
+   *   IosMultiDeviceTarget.iPhone_13.landscape(),
+   *   AndroidMultiDeviceTarget.Galaxy_S25.portrait()
+   * )
+   *
+   * // Mix all three styles
+   * config.addMultiDeviceTarget(
+   *   'iPhone 14',
+   *   IosMultiDeviceTarget.iPhone_15,
+   *   IosMultiDeviceTarget.iPhone_16.landscape()
+   * )
+   * ```
+   */
+  addMultiDeviceTarget(...devices) {
     if (!this.browsersInfo)
       this.browsersInfo = [];
-    this.browsersInfo.push({ iosDeviceInfo: { deviceName } });
+    for (const device of devices) {
+      if (device instanceof IosDeviceTarget || device instanceof AndroidDeviceTarget) {
+        const deviceName = device.getDeviceName();
+        const screenOrientation = device.getOrientation();
+        if (device instanceof IosDeviceTarget || this._isIosDevice(deviceName)) {
+          this.browsersInfo.push({
+            iosDeviceInfo: {
+              deviceName,
+              ...screenOrientation && { screenOrientation }
+            }
+          });
+        } else {
+          this.browsersInfo.push({
+            androidDeviceInfo: {
+              deviceName,
+              ...screenOrientation && { screenOrientation }
+            }
+          });
+        }
+      } else {
+        const deviceName = device;
+        if (this._isIosDevice(deviceName)) {
+          this.browsersInfo.push({ iosDeviceInfo: { deviceName } });
+        } else if (this._isAndroidDevice(deviceName)) {
+          this.browsersInfo.push({ androidDeviceInfo: { deviceName } });
+        } else {
+          throw new Error(
+            `Invalid device name: "${deviceName}". Supported iOS devices: ${Object.values(IosMultiDeviceTarget).map((d) => d.getDeviceName()).join(", ")}. Supported Android devices: ${Object.values(AndroidMultiDeviceTarget).map((d) => d.getDeviceName()).join(", ")}.`
+          );
+        }
+      }
+    }
     return this;
   }
+  _isIosDevice(deviceName) {
+    return Object.values(IosMultiDeviceTarget).map((target) => target.getDeviceName()).includes(deviceName);
+  }
+  _isAndroidDevice(deviceName) {
+    return Object.values(AndroidMultiDeviceTarget).map((target) => target.getDeviceName()).includes(deviceName);
+  }
   get captureStatusBar() {
     return this._config.captureStatusBar;
   }
@@ -131007,7 +131501,7 @@ var ConfigurationData = class {
         disableBrowserFetching: this.disableBrowserFetching,
         autProxy: this.autProxy,
         sendDom: this.sendDom,
-        retryTimeout: this.matchTimeout,
+        matchTimeout: this.matchTimeout,
         matchLevel: (_e = this.defaultMatchSettings) == null ? void 0 : _e.matchLevel,
         ignoreCaret: (_f = this.defaultMatchSettings) == null ? void 0 : _f.ignoreCaret,
         ignoreDisplacements: (_g = this.defaultMatchSettings) == null ? void 0 : _g.ignoreDisplacements,
@@ -132681,6 +133175,8 @@ export {
   AccessibilityMatchSettingsData as AccessibilityMatchSettings,
   AccessibilityRegionTypeEnum as AccessibilityRegionType,
   AccessibilityStatusEnum as AccessibilityStatus,
+  AndroidDeviceTarget,
+  AndroidMultiDeviceTarget,
   ApiUrlsData as ApiUrls,
   AppUrlsData as AppUrls,
   BatchClose,
@@ -132707,6 +133203,8 @@ export {
   ImageMatchSettingsData as ImageMatchSettings,
   ImageRotationData as ImageRotation,
   IosDeviceNameEnum as IosDeviceName,
+  IosDeviceTarget,
+  IosMultiDeviceTarget,
   IosVersionEnum as IosVersion,
   LocationData as Location,
   LogHandlerData as LogHandler,