@cendarsoss/pusher-js 8.4.13 → 8.4.15

package/interactive/public/delta-compression.js

@@ -132,7 +132,7 @@
     constructor(channelName) {
       this.channelName = channelName;
       this.conflationKey = null; // e.g., "asset", "device_id"
-      this.maxMessagesPerKey = 10;
+      this.maxMessagesPerKey = 30; // Increased from 10 to 30 to prevent base eviction
 
       // Conflation key caches: Map<conflationKeyValue, Array<CachedMessage>>
       // e.g., { "BTC": [{content: {...}, seq: 1}, ...], "ETH": [...] }
@@ -153,7 +153,9 @@
      */
     initializeFromCacheSync(data) {
       this.conflationKey = data.conflation_key || null;
-      this.maxMessagesPerKey = data.max_messages_per_key || 10;
+      // Force at least 30 to safely handle server's full_message_interval=10 + deltas
+      // The server sends 10 by default, which causes race conditions with eviction
+      this.maxMessagesPerKey = Math.max(data.max_messages_per_key || 10, 30);
       this.conflationCaches.clear();
 
       // Load all conflation group caches
@@ -178,7 +180,7 @@
     }
 
     /**
-     * Get base message for a conflation key at specific index
+     * Get base message for a conflation key at specific sequence (base_index is actually sequence number)
      */
     getBaseMessage(conflationKeyValue, baseIndex) {
       if (!this.conflationKey) {
@@ -189,11 +191,26 @@
       const key = conflationKeyValue || "";
       const cache = this.conflationCaches.get(key);
 
-      if (!cache || baseIndex >= cache.length) {
+      if (!cache || cache.length === 0) {
+        console.warn("[ChannelState] No cache for conflation key:", key);
         return null;
       }
 
-      return cache[baseIndex].content;
+      // baseIndex is actually the sequence number from the server
+      // Search for the message with matching sequence
+      const msg = cache.find((m) => m.sequence === baseIndex);
+      if (msg) {
+        return msg.content;
+      }
+
+      // If not found by sequence, log debug info
+      console.warn("[ChannelState] Could not find message with sequence", {
+        searchingFor: baseIndex,
+        cacheSize: cache.length,
+        cacheSequences: cache.map((m) => m.sequence),
+        key: key,
+      });
+      return null;
     }
 
     /**
@@ -877,26 +894,13 @@
         const sequence = data.__delta_seq;
         const conflationKey = data.__conflation_key;
 
-        // Find which channel this message belongs to by checking all subscribed channels
-        let targetChannelName = null;
-        for (const channelName of this.channelStates.keys()) {
-          const channel = this.pusher.channel(channelName);
-          if (channel && channel.subscribed) {
-            targetChannelName = channelName;
-            break;
-          }
-        }
-
-        // If no existing channel state, assume it's for the first subscribed channel
-        if (!targetChannelName) {
-          const allChannels = this.pusher.allChannels();
-          if (allChannels.length > 0) {
-            targetChannelName = allChannels[0].name;
-          }
-        }
+        // Use the channel name passed to this function directly
+        // Previously this code incorrectly searched through channelStates.keys()
+        // instead of using the provided parameter, causing state mismatch
+        const targetChannelName = channelName;
 
         if (!targetChannelName) {
-          this._log("Cannot determine channel for message", {
+          this._log("No channel name provided for message", {
             eventName,
             sequence,
           });
@@ -912,6 +916,16 @@
           this.channelStates.set(targetChannelName, channelState);
         }
 
+        // If we receive a conflation key in the message and haven't set one yet, set it now
+        // This is important for newly created ChannelStates after resync
+        if (conflationKey !== undefined && !channelState.conflationKey) {
+          channelState.conflationKey = "token_address"; // Use a marker to indicate conflation mode
+          this._log("Initialized conflation mode for channel", {
+            channel: targetChannelName,
+            firstConflationKey: conflationKey,
+          });
+        }
+
         // Update cache
         if (channelState.conflationKey && conflationKey !== undefined) {
           // Conflation mode: update specific conflation group cache
@@ -983,9 +997,9 @@
         const bandwidthSavedPercent =
           this.stats.totalBytesWithoutCompression > 0
             ? (
-                (bandwidthSaved / this.stats.totalBytesWithoutCompression) *
-                100
-              ).toFixed(1)
+              (bandwidthSaved / this.stats.totalBytesWithoutCompression) *
+              100
+            ).toFixed(1)
             : 0;
 
         this.options.onStats({
@@ -1006,9 +1020,9 @@
       const bandwidthSavedPercent =
         this.stats.totalBytesWithoutCompression > 0
           ? (
-              (bandwidthSaved / this.stats.totalBytesWithoutCompression) *
-              100
-            ).toFixed(1)
+            (bandwidthSaved / this.stats.totalBytesWithoutCompression) *
+            100
+          ).toFixed(1)
           : 0;
 
       // Get per-channel statistics

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cendarsoss/pusher-js",
-  "version": "8.4.13",
+  "version": "8.4.15",
   "description": "Pusher Channels JavaScript library for browsers, React Native, NodeJS and web workers",
   "types": "index.d.ts",
   "main": "dist/node/pusher.js",

package/src/core/delta/channel_state.ts

@@ -22,7 +22,7 @@ export default class ChannelState {
   constructor(channelName: string) {
     this.channelName = channelName;
     this.conflationKey = null;
-    this.maxMessagesPerKey = 10;
+    this.maxMessagesPerKey = 30; // Increased to 30 to prevent base eviction
     this.conflationCaches = new Map();
 
     this.baseMessage = null;
@@ -38,7 +38,8 @@ export default class ChannelState {
    */
   initializeFromCacheSync(data: CacheSyncData): void {
     this.conflationKey = data.conflation_key || null;
-    this.maxMessagesPerKey = data.max_messages_per_key || 10;
+    // Force at least 30 to safely handle server's full_message_interval=10 + deltas
+    this.maxMessagesPerKey = Math.max(data.max_messages_per_key || 10, 30);
     this.conflationCaches.clear();
 
     if (data.states) {

package/src/core/delta/manager.ts

@@ -33,6 +33,7 @@ export default class DeltaCompressionManager {
   };
   private availableAlgorithms: DeltaAlgorithm[];
   private sendEventCallback: (event: string, data: any) => boolean;
+  private defaultAlgorithm: DeltaAlgorithm = 'fossil';
 
   constructor(
     options: DeltaOptions = {},
@@ -63,7 +64,7 @@ export default class DeltaCompressionManager {
     if (this.availableAlgorithms.length === 0) {
       Logger.warn(
         '[DeltaCompression] No delta algorithms available. ' +
-          'Please include fossil-delta or vcdiff-decoder libraries.',
+        'Please include fossil-delta or vcdiff-decoder libraries.',
       );
     }
   }
@@ -133,6 +134,9 @@ export default class DeltaCompressionManager {
    */
   handleEnabled(data: any): void {
     this.enabled = data.enabled || true;
+    if (data.algorithm) {
+      this.defaultAlgorithm = data.algorithm;
+    }
     this.log('Delta compression enabled', data);
   }
 
@@ -169,7 +173,7 @@ export default class DeltaCompressionManager {
       const event = deltaData.event;
       const delta = deltaData.delta;
       const sequence = deltaData.seq;
-      const algorithm = deltaData.algorithm || 'fossil';
+      const algorithm = deltaData.algorithm || this.defaultAlgorithm || 'fossil';
       const conflationKey = deltaData.conflation_key;
       const baseIndex = deltaData.base_index;
 
@@ -198,43 +202,30 @@ export default class DeltaCompressionManager {
         baseMessage = channelState.getBaseMessage(conflationKey, baseIndex);
         if (!baseMessage) {
           this.error(
-            `No base message (conflation path) for channel ${channel}`,
-            {
-              path: 'conflation',
+            `No base message for channel ${channel}, key ${conflationKey}, index ${baseIndex}`,
+          );
+          if (this.options.debug) {
+            this.log('Current conflation cache snapshot', {
               channel,
-              deltaConflationKey: conflationKey,
-              deltaBaseIndex: baseIndex,
-              deltaSeq: sequence,
-              channelStateConflationKey: channelState.conflationKey,
-              channelStateBaseMessage: channelState.baseMessage ? 'exists' : null,
-              channelStateBaseSequence: channelState.baseSequence,
-              channelStateLastSequence: channelState.lastSequence,
-              conflationCacheKeys: Array.from(channelState.conflationCaches.keys()),
-              conflationCacheSizes: Array.from(
+              conflationKey: channelState.conflationKey,
+              cacheSizes: Array.from(
                 channelState.conflationCaches.entries(),
               ).map(([key, cache]) => ({ key, size: cache.length })),
-            },
-          );
+            });
+          }
           this.requestResync(channel);
           return null;
         }
       } else {
         baseMessage = channelState.baseMessage;
         if (!baseMessage) {
-          this.error(
-            `No base message (legacy path) for channel ${channel}`,
-            {
-              path: 'legacy',
+          this.error(`No base message for channel ${channel}`);
+          if (this.options.debug) {
+            this.log('Channel state missing base', {
               channel,
-              deltaConflationKey: conflationKey,
-              deltaBaseIndex: baseIndex,
-              deltaSeq: sequence,
-              channelStateConflationKey: channelState.conflationKey,
-              channelStateBaseMessage: null,
-              channelStateBaseSequence: channelState.baseSequence,
-              channelStateLastSequence: channelState.lastSequence,
-            },
-          );
+              lastSequence: channelState.lastSequence,
+            });
+          }
           this.requestResync(channel);
           return null;
         }
@@ -297,20 +288,10 @@ export default class DeltaCompressionManager {
       // Parse and return the reconstructed event
       try {
         const parsedMessage = JSON.parse(reconstructedMessage);
-        let data = parsedMessage.data || parsedMessage;
-        // Try to parse data if it's a string (Pusher protocol double-encodes data)
-        // This matches the behavior in protocol.ts decodeMessage
-        if (typeof data === 'string') {
-          try {
-            data = JSON.parse(data);
-          } catch (e) {
-            // Keep as string if not valid JSON
-          }
-        }
         return {
           event: event,
           channel: channel,
-          data: data,
+          data: parsedMessage.data || parsedMessage,
         };
       } catch (e) {
         // If not JSON, return as-is