@applitools/eyes-browser 1.5.19 → 1.5.20

package/CHANGELOG.md

@@ -1,5 +1,52 @@
 # Changelog
 
+## [1.5.20](https://github.com/Applitools-Dev/sdk/compare/js/eyes-browser@1.5.19...js/eyes-browser@1.5.20) (2026-01-11)
+
+
+### Dependencies
+
+* @applitools/driver bumped to 1.24.4
+  #### Bug Fixes
+
+  * scrolling element fallback logic | FLD-3959 ([#3442](https://github.com/Applitools-Dev/sdk/issues/3442)) ([36348b4](https://github.com/Applitools-Dev/sdk/commit/36348b46e6a127c99d4ccfa58bf386a8e414fb40))
+* @applitools/dom-snapshot bumped to 4.15.5
+
+* @applitools/dom-capture bumped to 11.6.8
+  #### Bug Fixes
+
+  * added support for `font-style` attribute | AD-12435 ([#3458](https://github.com/Applitools-Dev/sdk/issues/3458)) ([f121c2a](https://github.com/Applitools-Dev/sdk/commit/f121c2acdea9285b8b53846466dcb4e2c97820e4))
+* @applitools/nml-client bumped to 1.11.14
+  #### Bug Fixes
+
+  * nml broker retry mechanism | FLD-3968 FLD-3963 FLD-3950 ([#3430](https://github.com/Applitools-Dev/sdk/issues/3430)) ([42617e0](https://github.com/Applitools-Dev/sdk/commit/42617e021f43a89f8a8f2cb914f489ac8d215714))
+
+
+
+* @applitools/core bumped to 4.54.2
+  #### Bug Fixes
+
+  * per-API key heartbeat management | FLD-3889 ([#3406](https://github.com/Applitools-Dev/sdk/issues/3406)) ([5d7f380](https://github.com/Applitools-Dev/sdk/commit/5d7f38037f17006dcc923c4a3dc925e8dded25d8))
+  * preserve response body in broker handler ([e1bec23](https://github.com/Applitools-Dev/sdk/commit/e1bec23eabf8e8b73db7ec7cd2febb054047f7a7))
+
+
+
+* @applitools/spec-driver-webdriver bumped to 1.5.4
+
+* @applitools/spec-driver-selenium bumped to 1.7.10
+
+* @applitools/spec-driver-puppeteer bumped to 1.6.10
+
+* @applitools/screenshoter bumped to 3.12.11
+
+* @applitools/core-base bumped to 1.31.1
+  #### Bug Fixes
+
+  * per-API key heartbeat management | FLD-3889 ([#3406](https://github.com/Applitools-Dev/sdk/issues/3406)) ([5d7f380](https://github.com/Applitools-Dev/sdk/commit/5d7f38037f17006dcc923c4a3dc925e8dded25d8))
+* @applitools/ec-client bumped to 1.12.16
+
+* @applitools/eyes bumped to 1.36.20
+
+
 ## [1.5.19](https://github.com/Applitools-Dev/sdk/compare/js/eyes-browser@1.5.18...js/eyes-browser@1.5.19) (2025-12-28)
 
 

package/dist/index.js

@@ -22142,13 +22142,12 @@ var require_requests = __commonJS({
         logger.log('Request "openEyes" called with settings', settings);
         const account = await getAccountInfoWithCache({ settings });
         if (account.processKeepaliveIntervalSec) {
-          settings.processId = heartbeat.acquire({
+          heartbeat.acquire({
             eyesServerUrl: settings.eyesServerUrl,
             apiKey: settings.apiKey,
             proxy: settings.proxy,
             useDnsCache: settings.useDnsCache,
             agentId: settings.agentId,
-            processId: settings.processId,
             interval: (_a = utils34.general.getEnvValue("HEARTBEAT_INTERVAL", "number")) !== null && _a !== void 0 ? _a : account.processKeepaliveIntervalSec * 1e3
           });
         }
@@ -22694,7 +22693,6 @@ var require_requests = __commonJS({
             proxy: settings.proxy,
             useDnsCache: settings.useDnsCache,
             agentId: settings.agentId,
-            processId: settings.processId,
             interval: (_a = utils34.general.getEnvValue("HEARTBEAT_INTERVAL", "number")) !== null && _a !== void 0 ? _a : account.processKeepaliveIntervalSec * 1e3
           });
         }
@@ -66388,7 +66386,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).finally(() => heartbeat === null || heartbeat === void 0 ? void 0 : heartbeat.release());
+        return requests.checkAndClose({ target, settings, logger }).finally(done).finally(() => heartbeat === null || heartbeat === void 0 ? void 0 : heartbeat.release(requests.test.eyesServer.apiKey));
       };
     }
     exports.makeCheckAndClose = makeCheckAndClose;
@@ -66442,7 +66440,7 @@ var require_close = __commonJS({
       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).finally(() => heartbeat === null || heartbeat === void 0 ? void 0 : heartbeat.release());
+        void requests.close({ settings, logger }).finally(done).finally(() => heartbeat === null || heartbeat === void 0 ? void 0 : heartbeat.release(requests.test.eyesServer.apiKey));
       };
     }
     exports.makeClose = makeClose;
@@ -66497,7 +66495,7 @@ var require_abort = __commonJS({
         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).finally(() => heartbeat === null || heartbeat === void 0 ? void 0 : heartbeat.release());
+        void requests.abort({ settings, logger }).finally(done).finally(() => heartbeat === null || heartbeat === void 0 ? void 0 : heartbeat.release(requests.test.eyesServer.apiKey));
       };
     }
     exports.makeAbort = makeAbort;
@@ -66785,7 +66783,7 @@ var require_open_eyes = __commonJS({
         if (!throttle) {
           throttle = (0, throttle_1.getThrottle)(settings.sessionConcurrency);
         }
-        (_a = settings.processId) !== null && _a !== void 0 ? _a : settings.processId = heartbeat.processId;
+        (_a = settings.processId) !== null && _a !== void 0 ? _a : settings.processId = heartbeat.getOrCreateProcessId(settings.apiKey);
         settings.agentId = `${defaultAgentId} ${settings.agentId ? `[${settings.agentId}]` : ""}`.trim();
         logger.log('Command "openEyes" is called with settings', settings);
         return new Promise((resolve, reject) => {
@@ -67325,74 +67323,107 @@ var require_heartbeat = __commonJS({
       return result;
     };
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.makeHeartbeat = void 0;
+    exports.makeHeartbeat = exports.clearAllHeartbeats = void 0;
     var utils34 = __importStar(require_browser3());
-    var processId = utils34.general.guid();
-    var isRunning = false;
-    var intervalId;
-    var refCount = 0;
+    var heartbeats = /* @__PURE__ */ new Map();
+    function clearAllHeartbeats() {
+      for (const [apiKey, state] of heartbeats) {
+        if (state.intervalId) {
+          clearInterval(state.intervalId);
+        }
+        heartbeats.delete(apiKey);
+      }
+    }
+    exports.clearAllHeartbeats = clearAllHeartbeats;
     function makeHeartbeat({ requests, logger: mainLogger }) {
       const logger = mainLogger.extend(mainLogger, { tags: [`heartbeat-base-${utils34.general.shortid()}`] });
-      function stopHeartbeats() {
-        logger.log("Stopping heartbeats");
-        if (intervalId) {
-          clearInterval(intervalId);
-          intervalId = void 0;
-          isRunning = false;
-          processId = utils34.general.guid();
-          logger.log("Generated new processId after expiration:", processId);
-        }
-      }
-      async function startHeartbeats(settings) {
-        await requests.sendHeartbeat({ settings: { ...settings, processId }, logger }).catch((error) => {
+      function stopHeartbeats(apiKey) {
+        const state = heartbeats.get(apiKey);
+        if (!state)
+          return;
+        logger.log("Stopping heartbeats for apiKey:", apiKey);
+        if (state.intervalId) {
+          clearInterval(state.intervalId);
+        }
+        heartbeats.delete(apiKey);
+        logger.log("Heartbeat removed for apiKey:", apiKey);
+      }
+      async function startHeartbeats(apiKey, settings) {
+        const state = heartbeats.get(apiKey);
+        if (!state)
+          return;
+        await requests.sendHeartbeat({ settings: { ...settings, processId: state.processId }, logger }).catch((error) => {
           logger.error("Failed to send heartbeat:", error);
         });
-        intervalId = setIntervalBrowser(async () => {
+        if (!heartbeats.has(apiKey)) {
+          logger.log("Heartbeat state was removed during initial heartbeat for apiKey:", apiKey);
+          return;
+        }
+        state.intervalId = setIntervalBrowser(async () => {
+          const currentState = heartbeats.get(apiKey);
+          if (!currentState) {
+            if (state.intervalId) {
+              clearInterval(state.intervalId);
+              logger.log("Cleared orphaned heartbeat interval for apiKey:", apiKey);
+            }
+            return;
+          }
           try {
-            await requests.sendHeartbeat({ settings: { ...settings, processId }, logger });
+            await requests.sendHeartbeat({ settings: { ...settings, processId: currentState.processId }, logger });
           } catch (error) {
             if (error.message === "This process is expired. All its sessions were abandoned") {
-              logger.log("Heartbeat process expired on server");
-              stopHeartbeats();
+              logger.log("Heartbeat process expired on server for apiKey:", apiKey);
+              stopHeartbeats(apiKey);
             }
           }
         }, settings.interval);
-        intervalId.unref();
+        state.intervalId.unref();
+      }
+      function getOrCreateProcessId(apiKey) {
+        let state = heartbeats.get(apiKey);
+        if (state)
+          return state.processId;
+        const processId = utils34.general.guid();
+        state = {
+          processId,
+          intervalId: void 0,
+          refCount: 0
+        };
+        heartbeats.set(apiKey, state);
+        logger.log("Created processId for apiKey:", apiKey, "processId:", processId);
+        return processId;
       }
       function acquire(settings) {
-        refCount++;
-        logger.log("Heartbeat acquired, refCount:", refCount);
-        if (!isRunning) {
-          if (settings.processId && settings.processId === processId) {
-            logger.log("Starting heartbeats with provided processId:", processId);
-          } else if (!settings.processId || settings.processId !== processId) {
-            if (settings.processId && settings.processId !== processId) {
-              logger.log("Provided processId differs from current, using current processId:", processId);
-            } else {
-              processId = utils34.general.guid();
-              logger.log("Starting heartbeats with new processId:", processId);
-            }
-          }
-          isRunning = true;
-          void startHeartbeats(settings).catch((error) => {
+        const apiKey = settings.apiKey;
+        const state = heartbeats.get(apiKey);
+        if (!state) {
+          throw new Error("Heartbeat state not found. getOrCreateProcessId must be called before acquire.");
+        }
+        const shouldStartHeartbeat = state.refCount === 0;
+        state.refCount++;
+        logger.log("Heartbeat acquired for apiKey:", apiKey, "refCount:", state.refCount);
+        if (shouldStartHeartbeat) {
+          logger.log("Starting heartbeats for apiKey:", apiKey, "with processId:", state.processId);
+          void startHeartbeats(apiKey, settings).catch((error) => {
             logger.error("Failed to start heartbeats:", error);
           });
         }
-        return processId;
+        return state.processId;
       }
-      function release() {
-        if (refCount > 0) {
-          refCount--;
-          logger.log("Heartbeat released, refCount:", refCount);
-          if (refCount === 0) {
-            stopHeartbeats();
-          }
+      function release(apiKey) {
+        const state = heartbeats.get(apiKey);
+        if (!state) {
+          logger.log("Heartbeat release called for unknown apiKey:", apiKey);
+          return;
+        }
+        state.refCount--;
+        logger.log("Heartbeat released for apiKey:", apiKey, "refCount:", state.refCount);
+        if (state.refCount === 0) {
+          stopHeartbeats(apiKey);
         }
       }
       return {
-        get processId() {
-          return processId;
-        },
+        getOrCreateProcessId,
         acquire,
         release
       };
@@ -69998,6 +70029,10 @@ var require_context = __commonJS({
                 this.logger.log(`Using dynamic default scrolling element - "${selector}"`);
               }
               this._scrollingElement = await this.element({ type: "css", selector });
+              if (!this._scrollingElement) {
+                this.logger.warn(`Scrolling element "${selector}" not found, trying with xpath selector`);
+                this._scrollingElement = await this.element({ type: "xpath", selector: `//${selector}` });
+              }
             } else {
               this._scrollingElement = await this.element({ type: "xpath", selector: '//*[@scrollable="true"]' });
             }
@@ -72398,13 +72433,13 @@ var require_get_target = __commonJS({
             const isScrollable = await element.isScrollable();
             returnRegion = isScrollable ? null : await element.getRegion();
             scrollingElement = isScrollable ? element : await elementContext.getScrollingElement();
-            scrollingMode = scrollingMode === "css" && !await scrollingElement.isRoot() ? "mixed+" : scrollingMode;
+            scrollingMode = scrollingMode === "css" && scrollingElement && !await scrollingElement.isRoot() ? "mixed+" : scrollingMode;
           } else {
             scrollingElement = await context.getScrollingElement();
             returnRegion = await element.getRegion();
           }
           const scroller = makeScroller({ element: scrollingElement, scrollingMode, logger });
-          if (returnRegion && !environment.isNative && !await scrollingElement.isRoot()) {
+          if (returnRegion && !environment.isNative && scrollingElement && !await scrollingElement.isRoot()) {
             const scrollerOffset = await scroller.getScrollOffset();
             returnRegion = utils34.geometry.offset(returnRegion, scrollerOffset);
           }
@@ -73877,7 +73912,7 @@ var require_captureDomPollCjs = __commonJS({
             }
           });
           t3.isAccessibleFrame = y.default;
-          var w = { EYES_NAMESPACE: "__EYES__APPLITOOLS__", DOM_CAPTURE_KEY: "domCaptureResult", NODE_TYPES: { ELEMENT: 1, TEXT: 3, DOCUMENT_FRAGMENT: 11 }, DEFAULT_STYLE_PROPS: ["background-repeat", "background-origin", "background-position", "background-color", "background-image", "background-size", "border-width", "border-color", "border-style", "color", "display", "font-size", "font-weight", "font-family", "line-height", "margin", "opacity", "overflow", "padding", "visibility", "text-align", "position", "border-radius", "z-index", "pointer-events", "cursor"], DEFAULT_RECT_PROPS: ["width", "height", "top", "left"], DEFAULT_IGNORED_TAG_NAMES: ["HEAD", "SCRIPT"] };
+          var w = { EYES_NAMESPACE: "__EYES__APPLITOOLS__", DOM_CAPTURE_KEY: "domCaptureResult", NODE_TYPES: { ELEMENT: 1, TEXT: 3, DOCUMENT_FRAGMENT: 11 }, DEFAULT_STYLE_PROPS: ["background-color", "background-image", "background-origin", "background-position", "background-repeat", "background-size", "border-color", "border-radius", "border-style", "border-width", "color", "cursor", "display", "font-family", "font-size", "font-weight", "font-style", "line-height", "margin", "opacity", "overflow", "padding", "pointer-events", "position", "text-align", "visibility", "z-index"], DEFAULT_RECT_PROPS: ["width", "height", "top", "left"], DEFAULT_IGNORED_TAG_NAMES: ["HEAD", "SCRIPT"] };
           const E = /url\((?!['"]?:)['"]?([^'")]*)['"]?\)/;
           const { NODE_TYPES: C } = w;
           function T(e4) {
@@ -74127,7 +74162,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.7";
+            d2(i2.doCaptureDoc), l2(i2.waitForImages), await Promise.all(f2), d2(i2.waitForImages), N2.version = "1.3.0", N2.scriptVersion = "11.6.8";
             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}"` });
@@ -74281,7 +74316,7 @@ var require_pollResultCjs = __commonJS({
             }
           });
           t4.isAccessibleFrame = m.default;
-          const { poll: _ } = t4, { EYES_NAMESPACE: y, DOM_CAPTURE_KEY: b } = { EYES_NAMESPACE: "__EYES__APPLITOOLS__", DOM_CAPTURE_KEY: "domCaptureResult", NODE_TYPES: { ELEMENT: 1, TEXT: 3, DOCUMENT_FRAGMENT: 11 }, DEFAULT_STYLE_PROPS: ["background-repeat", "background-origin", "background-position", "background-color", "background-image", "background-size", "border-width", "border-color", "border-style", "color", "display", "font-size", "font-weight", "font-family", "line-height", "margin", "opacity", "overflow", "padding", "visibility", "text-align", "position", "border-radius", "z-index", "pointer-events", "cursor"], DEFAULT_RECT_PROPS: ["width", "height", "top", "left"], DEFAULT_IGNORED_TAG_NAMES: ["HEAD", "SCRIPT"] };
+          const { poll: _ } = t4, { EYES_NAMESPACE: y, DOM_CAPTURE_KEY: b } = { EYES_NAMESPACE: "__EYES__APPLITOOLS__", DOM_CAPTURE_KEY: "domCaptureResult", NODE_TYPES: { ELEMENT: 1, TEXT: 3, DOCUMENT_FRAGMENT: 11 }, DEFAULT_STYLE_PROPS: ["background-color", "background-image", "background-origin", "background-position", "background-repeat", "background-size", "border-color", "border-radius", "border-style", "border-width", "color", "cursor", "display", "font-family", "font-size", "font-weight", "font-style", "line-height", "margin", "opacity", "overflow", "padding", "pointer-events", "position", "text-align", "visibility", "z-index"], DEFAULT_RECT_PROPS: ["width", "height", "top", "left"], DEFAULT_IGNORED_TAG_NAMES: ["HEAD", "SCRIPT"] };
           return function(t5) {
             return t5 && t5.__esModule && Object.prototype.hasOwnProperty.call(t5, "default") ? t5.default : t5;
           }(function(t5) {
@@ -80606,7 +80641,7 @@ var require_captureDomPollForIE = __commonJS({
               return this.delegate = { iterator: L2(e5), resultName: r4, nextLoc: n4 }, "next" === this.method && (this.arg = t4), g2;
             } }, e4;
           }
-          s0.EYES_NAMESPACE = "__EYES__APPLITOOLS__", s0.DOM_CAPTURE_KEY = "domCaptureResult", s0.NODE_TYPES = { ELEMENT: 1, TEXT: 3, DOCUMENT_FRAGMENT: 11 }, s0.DEFAULT_STYLE_PROPS = ["background-repeat", "background-origin", "background-position", "background-color", "background-image", "background-size", "border-width", "border-color", "border-style", "color", "display", "font-size", "font-weight", "font-family", "line-height", "margin", "opacity", "overflow", "padding", "visibility", "text-align", "position", "border-radius", "z-index", "pointer-events", "cursor"], s0.DEFAULT_RECT_PROPS = ["width", "height", "top", "left"], s0.DEFAULT_IGNORED_TAG_NAMES = ["HEAD", "SCRIPT"];
+          s0.EYES_NAMESPACE = "__EYES__APPLITOOLS__", s0.DOM_CAPTURE_KEY = "domCaptureResult", s0.NODE_TYPES = { ELEMENT: 1, TEXT: 3, DOCUMENT_FRAGMENT: 11 }, s0.DEFAULT_STYLE_PROPS = ["background-color", "background-image", "background-origin", "background-position", "background-repeat", "background-size", "border-color", "border-radius", "border-style", "border-width", "color", "cursor", "display", "font-family", "font-size", "font-weight", "font-style", "line-height", "margin", "opacity", "overflow", "padding", "pointer-events", "position", "text-align", "visibility", "z-index"], s0.DEFAULT_RECT_PROPS = ["width", "height", "top", "left"], s0.DEFAULT_IGNORED_TAG_NAMES = ["HEAD", "SCRIPT"];
           var v0 = /url\((?!['"]?:)['"]?([^'")]*)['"]?\)/, g0 = function(t4) {
             return new Promise(function(e4) {
               setTimeout(e4, t4);
@@ -81008,7 +81043,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.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);
+                      return A2(w2.waitForImages), C2.version = "1.3.0", C2.scriptVersion = "11.6.8", 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();
@@ -87350,6 +87385,21 @@ var require_req_broker = __commonJS({
     exports.makeReqBroker = void 0;
     var req_1 = __importStar((init_dist(), __toCommonJS(dist_exports)));
     var utils34 = __importStar(require_browser3());
+    function isInvalidBrokerMessage(result) {
+      try {
+        const parsedResult = JSON.parse(result);
+        if (Array.isArray(parsedResult) && parsedResult.length === 0)
+          return true;
+        if (parsedResult && typeof parsedResult === "object" && !Array.isArray(parsedResult)) {
+          const { payload } = parsedResult;
+          if (Array.isArray(payload) && payload.length === 0)
+            return true;
+        }
+        return false;
+      } catch {
+        return true;
+      }
+    }
     function makeReqBroker({ settings, logger }) {
       return (0, req_1.makeReq)({
         method: "POST",
@@ -87387,34 +87437,83 @@ var require_req_broker = __commonJS({
         }
       };
     }
+    function makeBufferingFetch() {
+      return async (input, init) => {
+        const response = await (0, req_1.default)(input, init);
+        const bufferedBody = await response.text();
+        const bufferedResponse = new req_1.Response(bufferedBody, {
+          status: response.status,
+          statusText: response.statusText,
+          headers: response.headers
+        });
+        bufferedResponse.text = async () => bufferedBody;
+        bufferedResponse.json = async () => JSON.parse(bufferedBody);
+        const originalClone = bufferedResponse.clone.bind(bufferedResponse);
+        bufferedResponse.clone = () => {
+          const cloned = originalClone();
+          cloned.text = async () => bufferedBody;
+          cloned.json = async () => JSON.parse(bufferedBody);
+          return cloned;
+        };
+        return bufferedResponse;
+      };
+    }
     function handleLongRequests({ req: req2, logger: defaultLogger }) {
       return {
         async afterResponse({ request, response, options }) {
+          var _a;
           if (response.status === 200) {
+            let attemptCount = 0;
+            const MAX_ATTEMPTS = 1500;
+            const logger = (_a = options === null || options === void 0 ? void 0 : options.logger) !== null && _a !== void 0 ? _a : defaultLogger;
+            const bufferingFetch = makeBufferingFetch();
             return req2(request.url + "-response", {
               proxy: options === null || options === void 0 ? void 0 : options.proxy,
-              retry: {
-                // 1500 attempts x 200 ms = 5 minutes
-                limit: 1500,
-                timeout: 200,
-                statuses: [404]
-              },
+              fetch: bufferingFetch,
+              retry: [
+                {
+                  // 1500 attempts x 200 ms = 5 minutes
+                  limit: MAX_ATTEMPTS,
+                  timeout: 200,
+                  statuses: [404]
+                },
+                {
+                  limit: MAX_ATTEMPTS,
+                  timeout: 200,
+                  validate: async ({ response: response2 }) => {
+                    if (!response2 || response2.status !== 200)
+                      return false;
+                    try {
+                      const body = await response2.clone().text();
+                      const isInvalid = isInvalidBrokerMessage(body);
+                      if (isInvalid) {
+                        logger === null || logger === void 0 ? void 0 : logger.log(`Broker polling request "${options === null || options === void 0 ? void 0 : options.name}" received empty response, retrying (attempt ${attemptCount + 1}/${MAX_ATTEMPTS})`);
+                      }
+                      return isInvalid;
+                    } catch (error) {
+                      return false;
+                    }
+                  }
+                }
+              ],
               hooks: [
                 {
                   beforeRequest({ request: request2, options: beforeOptions }) {
-                    var _a;
-                    const logger = (_a = options === null || options === void 0 ? void 0 : options.logger) !== null && _a !== void 0 ? _a : defaultLogger;
-                    logger === null || logger === void 0 ? void 0 : logger.log(`Broker polling request "${options === null || options === void 0 ? void 0 : options.name}" will be sent to the address "[${request2.method}]${request2.url}" with body`, beforeOptions === null || beforeOptions === void 0 ? void 0 : beforeOptions.body);
+                    attemptCount++;
+                    logger === null || logger === void 0 ? void 0 : logger.log(`Broker polling request "${options === null || options === void 0 ? void 0 : options.name}" attempt #${attemptCount}/${MAX_ATTEMPTS} will be sent to the address "[${request2.method}]${request2.url}" with body`, beforeOptions === null || beforeOptions === void 0 ? void 0 : beforeOptions.body);
                   },
                   async afterResponse({ request: request2, response: response2 }) {
-                    var _a;
-                    const logger = (_a = options === null || options === void 0 ? void 0 : options.logger) !== null && _a !== void 0 ? _a : defaultLogger;
-                    logger === null || logger === void 0 ? void 0 : logger.log(`Broker polling request "${options === null || options === void 0 ? void 0 : options.name}" that was sent to the address "[${request2.method}]${request2.url}" respond with ${response2.statusText}(${response2.status})`, response2.status !== 200 ? `and body ${JSON.stringify(await response2.clone().text())}` : "");
+                    try {
+                      const body = await response2.clone().text();
+                      logger === null || logger === void 0 ? void 0 : logger.log(`Broker polling request "${options === null || options === void 0 ? void 0 : options.name}" attempt #${attemptCount}/${MAX_ATTEMPTS} that was sent to the address "[${request2.method}]${request2.url}" respond with ${response2.statusText}(${response2.status}) with body ${JSON.stringify(body)}`);
+                    } catch (error) {
+                      logger === null || logger === void 0 ? void 0 : logger.log(`Broker polling request "${options === null || options === void 0 ? void 0 : options.name}" attempt #${attemptCount}/${MAX_ATTEMPTS} that was sent to the address "[${request2.method}]${request2.url}" respond with ${response2.statusText}(${response2.status})`);
+                    }
                   },
                   afterError({ request: request2, error }) {
-                    var _a;
-                    const logger = (_a = options === null || options === void 0 ? void 0 : options.logger) !== null && _a !== void 0 ? _a : defaultLogger;
-                    logger === null || logger === void 0 ? void 0 : logger.error(`Broker polling request "${options === null || options === void 0 ? void 0 : options.name}" that was sent to the address "[${request2.method}]${request2.url}" failed with error`, error);
+                    var _a2;
+                    const logger2 = (_a2 = options === null || options === void 0 ? void 0 : options.logger) !== null && _a2 !== void 0 ? _a2 : defaultLogger;
+                    logger2 === null || logger2 === void 0 ? void 0 : logger2.error(`Broker polling request "${options === null || options === void 0 ? void 0 : options.name}" attempt #${attemptCount}/${MAX_ATTEMPTS} that was sent to the address "[${request2.method}]${request2.url}" failed with error`, error);
                   }
                 }
               ]
@@ -87428,19 +87527,21 @@ var require_req_broker = __commonJS({
         async afterResponse({ response }) {
           if (response.status !== 200) {
             throw new Error(`Something went wrong when communicating with the mobile application, please try running your test again (error code: ${response.status})`);
-          } else {
-            const body = await response.text();
-            const result = JSON.parse(body);
-            if (result === null || result === void 0 ? void 0 : result.payload) {
-              const error = utils34.types.isArray(result.payload) ? result.payload.find((payload) => payload.error) : result.payload.error;
-              if (error) {
-                const nmlError = new Error(`There was a problem when interacting with the mobile application. The provided error message was "${error.message}" and had a stack trace of "${error.stack}"`);
-                nmlError.nextPath = result.nextPath;
-                throw nmlError;
-              }
+          }
+          const body = await response.clone().text();
+          if (!body) {
+            return response;
+          }
+          const result = JSON.parse(body);
+          if (result === null || result === void 0 ? void 0 : result.payload) {
+            const error = utils34.types.isArray(result.payload) ? result.payload.find((payload) => payload.error) : result.payload.error;
+            if (error) {
+              const nmlError = new Error(`There was a problem when interacting with the mobile application. The provided error message was "${error.message}" and had a stack trace of "${error.stack}"`);
+              nmlError.nextPath = result.nextPath;
+              throw nmlError;
             }
-            return { response, body };
           }
+          return response;
         }
       };
     }
@@ -87629,7 +87730,7 @@ var require_requests2 = __commonJS({
         brokerUrl = result.nextPath;
       }
       async function takeScreenshots({ settings: settings2, logger = mainLogger }) {
-        var _a, _b;
+        var _a;
         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)({
@@ -87662,31 +87763,33 @@ 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);
-            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	")}`;
+            if (localEnvironment) {
+              if (result.payload.result[0].error) {
+                throw new Error(`There was a problem in taking screenshot for local environment ${JSON.stringify(localEnvironment)}. The provided error message was "${result.payload.result[0].error.message}" and had a stack trace of "${result.payload.result[0].error.stack}"`);
               }
-              throw new Error(errMessage);
+              screenshots = [
+                {
+                  image: result.payload.result[0].result.screenshotUrl,
+                  calculateRegions: result.payload.result[0].result.selectorRegions,
+                  dom: result.payload.result[0].result.dom,
+                  environment: localEnvironment
+                }
+              ];
+            } else {
+              screenshots = 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}"`);
+                }
+                return {
+                  image: result.payload.result[index].result.screenshotUrl,
+                  calculateRegions: result.payload.result[index].result.selectorRegions,
+                  dom: result.payload.result[index].result.dom,
+                  environment
+                };
+              });
             }
-            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: 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]];
+            if (localEnvironment && renderEnvironments.length > 0) {
+              logger.warn(`Local environment detected with ${renderEnvironments.length} rendered environment(s). Using local environment and ignoring rendered environments: ${JSON.stringify(renderEnvironments)}. Note - this warning shouldn't appear in normal usage.`);
             }
           } else {
             screenshots = localEnvironment ? [
@@ -95610,7 +95713,7 @@ creating temp style for access.`), r3 = Zh(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.4", e3));
+            }(t3).then((e3) => (h2.log("processPage end"), e3.scriptVersion = "4.15.5", e3));
           }, window[x], "domSnapshotResult");
           return function(e3) {
             try {
@@ -116713,6 +116816,34 @@ var require_chrome_emulation_devices = __commonJS({
           capabilities: ["touch", "mobile"]
         }
       },
+      "Galaxy S25": {
+        portrait: {
+          height: 780,
+          width: 360
+        },
+        landscape: {
+          height: 360,
+          width: 780
+        },
+        metadata: {
+          pixelRatio: 3,
+          capabilities: ["touch", "mobile"]
+        }
+      },
+      "Galaxy S25 Ultra": {
+        portrait: {
+          height: 824,
+          width: 384
+        },
+        landscape: {
+          height: 384,
+          width: 824
+        },
+        metadata: {
+          pixelRatio: 3.75,
+          capabilities: ["touch", "mobile"]
+        }
+      },
       "Laptop with touch": {
         portrait: {
           height: 1280,
@@ -117231,6 +117362,20 @@ var require_chrome_emulation_devices = __commonJS({
           capabilities: ["touch", "mobile"]
         }
       },
+      "Pixel 9": {
+        portrait: {
+          height: 840,
+          width: 390
+        },
+        landscape: {
+          height: 390,
+          width: 840
+        },
+        metadata: {
+          pixelRatio: 2.75,
+          capabilities: ["touch", "mobile"]
+        }
+      },
       "iPad 7th Gen": {
         portrait: {
           height: 1080,
@@ -120982,7 +121127,7 @@ var require_package3 = __commonJS({
   "../core/package.json"(exports, module) {
     module.exports = {
       name: "@applitools/core",
-      version: "4.54.1",
+      version: "4.54.2",
       homepage: "https://applitools.com",
       bugs: {
         url: "https://github.com/applitools/eyes.sdk.javascript1/issues"
@@ -127898,7 +128043,7 @@ var require_package4 = __commonJS({
   "../eyes/package.json"(exports, module) {
     module.exports = {
       name: "@applitools/eyes",
-      version: "1.36.19",
+      version: "1.36.20",
       keywords: [
         "applitools",
         "eyes",
@@ -128091,12 +128236,15 @@ var DeviceNameEnum = /* @__PURE__ */ ((DeviceNameEnum2) => {
   DeviceNameEnum2["Galaxy_Tab_A8"] = "Galaxy Tab A8";
   DeviceNameEnum2["Galaxy_S23"] = "Galaxy S23";
   DeviceNameEnum2["Galaxy_S23_Ultra"] = "Galaxy S23 Ultra";
+  DeviceNameEnum2["Galaxy_S25"] = "Galaxy S25";
+  DeviceNameEnum2["Galaxy_S25_Ultra"] = "Galaxy S25 Ultra";
   DeviceNameEnum2["Galaxy_A52s"] = "Galaxy A52s";
   DeviceNameEnum2["Pixel_3"] = "Pixel 3";
   DeviceNameEnum2["Pixel_3_XL"] = "Pixel 3 XL";
   DeviceNameEnum2["Pixel_4"] = "Pixel 4";
   DeviceNameEnum2["Pixel_4_XL"] = "Pixel 4 XL";
   DeviceNameEnum2["Pixel_5"] = "Pixel 5";
+  DeviceNameEnum2["Pixel_9"] = "Pixel 9";
   DeviceNameEnum2["iPad_7th_Gen"] = "iPad 7th Gen";
   DeviceNameEnum2["OnePlus_7T"] = "OnePlus 7T";
   DeviceNameEnum2["OnePlus_7T_Pro"] = "OnePlus 7T Pro";

package/package.json

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

package/types/enums/DeviceName.d.ts

@@ -78,12 +78,15 @@ export declare enum DeviceNameEnum {
     Galaxy_Tab_A8 = "Galaxy Tab A8",
     Galaxy_S23 = "Galaxy S23",
     Galaxy_S23_Ultra = "Galaxy S23 Ultra",
+    Galaxy_S25 = "Galaxy S25",
+    Galaxy_S25_Ultra = "Galaxy S25 Ultra",
     Galaxy_A52s = "Galaxy A52s",
     Pixel_3 = "Pixel 3",
     Pixel_3_XL = "Pixel 3 XL",
     Pixel_4 = "Pixel 4",
     Pixel_4_XL = "Pixel 4 XL",
     Pixel_5 = "Pixel 5",
+    Pixel_9 = "Pixel 9",
     iPad_7th_Gen = "iPad 7th Gen",
     OnePlus_7T = "OnePlus 7T",
     OnePlus_7T_Pro = "OnePlus 7T Pro",