@cendarsoss/pusher-js 8.4.16 → 8.4.18

package/dist/node/pusher.js

@@ -4,6 +4,7 @@ const base64 = require("@stablelib/base64");
 const fayeWebsocket = require("faye-websocket");
 const xmlhttprequest = require("xmlhttprequest");
 const crypto = require("crypto");
+const lruCache = require("lru-cache");
 const fossilDelta = require("fossil-delta");
 const vcdiffDecoder = require("@ably/vcdiff-decoder");
 function encode(s) {
@@ -840,8 +841,8 @@ const Protocol = {
       if (messageData.user_id) {
         pusherEvent.user_id = messageData.user_id;
       }
-      const sequence = messageData.__delta_seq ?? messageData.sequence;
-      const conflationKey = messageData.__conflation_key ?? messageData.conflation_key;
+      const sequence = messageData.seq;
+      const conflationKey = messageData.conflation_key;
       if (typeof sequence === "number") {
         pusherEvent.sequence = sequence;
       }
@@ -3545,12 +3546,15 @@ class UserFacade extends Dispatcher {
     this._signinDoneResolve = resolve;
   }
 }
+const MAX_CONFLATION_CACHE_KEYS = 2e3;
 class ChannelState {
   constructor(channelName) {
     this.channelName = channelName;
     this.conflationKey = null;
     this.maxMessagesPerKey = 30;
-    this.conflationCaches = /* @__PURE__ */ new Map();
+    this.conflationCaches = new lruCache.LRUCache({
+      max: MAX_CONFLATION_CACHE_KEYS
+    });
     this.baseMessage = null;
     this.baseSequence = null;
     this.lastSequence = null;
@@ -3591,7 +3595,7 @@ class ChannelState {
       return this.baseMessage;
     }
     const key = conflationKeyValue || "";
-    const cache = this.conflationCaches.get(key);
+    const cache = this.conflationCaches.peek(key);
     if (!cache || baseIndex === void 0) {
       console.error("[ChannelState] No cache or baseIndex undefined", {
         hasCache: !!cache,
@@ -3611,6 +3615,7 @@ class ChannelState {
       });
       return null;
     }
+    this.conflationCaches.get(key);
     return message.content;
   }
   /**
@@ -3618,10 +3623,9 @@ class ChannelState {
    */
   updateConflationCache(conflationKeyValue, message, sequence) {
     const key = conflationKeyValue || "";
-    let cache = this.conflationCaches.get(key);
+    let cache = this.conflationCaches.peek(key);
     if (!cache) {
       cache = [];
-      this.conflationCaches.set(key, cache);
     }
     if (cache.length > 0) {
       const lastCacheItem = cache[cache.length - 1];
@@ -3633,6 +3637,7 @@ class ChannelState {
     while (cache.length > this.maxMessagesPerKey) {
       cache.shift();
     }
+    this.conflationCaches.set(key, cache);
   }
   /**
    * Check if we have a valid base
@@ -3959,27 +3964,24 @@ class DeltaCompressionManager {
         deltaSize: deltaBytes.length,
         compressionRatio: (deltaBytes.length / reconstructedMessage.length * 100).toFixed(1) + "%"
       });
+      let reconstructedData;
       try {
-        const parsedMessage = JSON.parse(reconstructedMessage);
-        let data = parsedMessage.data || parsedMessage;
-        if (typeof data === "string") {
-          try {
-            data = JSON.parse(data);
-          } catch (e) {
-          }
-        }
-        return {
-          event,
+        reconstructedData = JSON.parse(JSON.parse(reconstructedMessage));
+      } catch (parseError) {
+        this.error("Failed to parse reconstructed message as JSON", {
           channel,
-          data
-        };
-      } catch (e) {
-        return {
           event,
-          channel,
-          data: reconstructedMessage
-        };
+          sequence,
+          parseError: parseError.message,
+          reconstructedMessageLength: reconstructedMessage.length
+        });
+        reconstructedData = reconstructedMessage;
       }
+      return {
+        event,
+        channel,
+        data: reconstructedData
+      };
     } catch (error) {
       this.error("Delta decode failed", {
         channel,
@@ -4000,10 +4002,19 @@ class DeltaCompressionManager {
    * Handle regular (full) message with delta sequence markers
    */
   handleFullMessage(channel, rawMessage, sequence, conflationKey) {
+    let parsedMessage;
+    try {
+      parsedMessage = JSON.parse(rawMessage);
+    } catch (e) {
+      this.log("handleFullMessage parse failed", {
+        channel,
+        hasSequence: sequence === 0 || !!sequence
+      });
+      return;
+    }
     if (!sequence && sequence !== 0) {
       try {
-        const parsed = JSON.parse(rawMessage);
-        const candidate = typeof parsed.data === "string" ? JSON.parse(parsed.data).__delta_seq ?? parsed.__delta_seq : parsed.data?.__delta_seq ?? parsed.__delta_seq;
+        const candidate = typeof parsedMessage.data === "string" ? JSON.parse(parsedMessage.data).__delta_seq ?? parsedMessage.__delta_seq : parsedMessage.data?.__delta_seq ?? parsedMessage.__delta_seq;
         if (candidate === 0 || candidate) {
           sequence = candidate;
         } else {
@@ -4021,7 +4032,22 @@ class DeltaCompressionManager {
         return;
       }
     }
-    const messageSize = rawMessage.length;
+    if (parsedMessage?.data === void 0) {
+      this.log("handleFullMessage missing data field, skipping", {
+        channel,
+        hasSequence: sequence === 0 || !!sequence
+      });
+      return;
+    }
+    const baseMessage = JSON.stringify(parsedMessage.data);
+    if (typeof baseMessage !== "string") {
+      this.log("handleFullMessage base serialization failed, skipping", {
+        channel,
+        hasSequence: sequence === 0 || !!sequence
+      });
+      return;
+    }
+    const messageSize = baseMessage.length;
     let channelState = this.channelStates.get(channel);
     if (!channelState) {
       channelState = new ChannelState(channel);
@@ -4034,8 +4060,7 @@ class DeltaCompressionManager {
     if (channelState.conflationKey && finalConflationKey !== void 0) {
       channelState.updateConflationCache(
         finalConflationKey,
-        rawMessage,
-        // Store raw message directly
+        baseMessage,
         sequence
       );
       this.log("Stored full message (conflation)", {
@@ -4045,7 +4070,7 @@ class DeltaCompressionManager {
         size: messageSize
       });
     } else {
-      channelState.setBase(rawMessage, sequence);
+      channelState.setBase(baseMessage, sequence);
       this.log("Stored full message", {
         channel,
         sequence,
@@ -4287,22 +4312,10 @@ class Pusher {
           if (typeof event.conflation_key === "string") {
             conflationKey = event.conflation_key;
           }
-          let fullMessage = event.rawMessage || "";
-          if (fullMessage && sequence !== void 0) {
-            fullMessage = fullMessage.replace(/,"__delta_seq":\d+/g, "");
-            fullMessage = fullMessage.replace(/"__delta_seq":\d+,/g, "");
-            fullMessage = fullMessage.replace(
-              /,"__conflation_key":"[^"]*"/g,
-              ""
-            );
-            fullMessage = fullMessage.replace(
-              /"__conflation_key":"[^"]*",/g,
-              ""
-            );
-          }
+          const rawMessage = event.rawMessage || "";
           this.deltaCompression.handleFullMessage(
             event.channel,
-            fullMessage,
+            rawMessage,
             sequence,
             conflationKey
           );