@cendarsoss/pusher-js 8.4.15 → 8.4.17

package/dist/node/pusher.js

@@ -840,8 +840,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;
       }
@@ -3959,20 +3959,24 @@ class DeltaCompressionManager {
         deltaSize: deltaBytes.length,
         compressionRatio: (deltaBytes.length / reconstructedMessage.length * 100).toFixed(1) + "%"
       });
+      let reconstructedData;
       try {
-        const parsedMessage = JSON.parse(reconstructedMessage);
-        return {
-          event,
+        reconstructedData = JSON.parse(JSON.parse(reconstructedMessage));
+      } catch (parseError) {
+        this.error("Failed to parse reconstructed message as JSON", {
           channel,
-          data: parsedMessage.data || parsedMessage
-        };
-      } 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,
@@ -3993,10 +3997,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 {
@@ -4014,7 +4027,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);
@@ -4027,8 +4055,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)", {
@@ -4038,7 +4065,7 @@ class DeltaCompressionManager {
         size: messageSize
       });
     } else {
-      channelState.setBase(rawMessage, sequence);
+      channelState.setBase(baseMessage, sequence);
       this.log("Stored full message", {
         channel,
         sequence,
@@ -4280,22 +4307,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
           );