revert changes for unsubscribe

Author: Mohit Tejani

dist/web/pubnub.js

@@ -7045,10 +7045,16 @@
 	        return subscriptionTimetokenFromReference(this.currentTimetoken, (_a = this.referenceTimetoken) !== null && _a !== void 0 ? _a : '0');
 	    }
 	    get subscribedChannels() {
-	        return Object.keys(this.channels);
+	        const regularChannels = Object.keys(this.channels);
+	        const presenceChannels = Object.keys(this.presenceChannels).map(channel => `${channel}-pnpres`);
+	        // Return both regular channels and presence channels
+	        return [...regularChannels, ...presenceChannels];
 	    }
 	    get subscribedChannelGroups() {
-	        return Object.keys(this.channelGroups);
+	        const regularChannelGroups = Object.keys(this.channelGroups);
+	        const presenceChannelGroups = Object.keys(this.presenceChannelGroups).map(group => `${group}-pnpres`);
+	        // Return both regular channel groups and presence channel groups
+	        return [...regularChannelGroups, ...presenceChannelGroups];
 	    }
 	    get abort() {
 	        return this._subscribeAbort;
@@ -7119,6 +7125,10 @@
 	                actualChannels.add(channel);
 	                if (channel in this.heartbeatChannels)
 	                    delete this.heartbeatChannels[channel];
+	                // Auto-remove corresponding presence channel when unsubscribing from regular channel
+	                if (channel in this.presenceChannels) {
+	                    delete this.presenceChannels[channel];
+	                }
 	            }
 	            if (channel in this.presenceState)
 	                delete this.presenceState[channel];
@@ -7133,6 +7143,10 @@
 	                actualChannelGroups.add(group);
 	                if (group in this.heartbeatChannelGroups)
 	                    delete this.heartbeatChannelGroups[group];
+	                // Auto-remove corresponding presence channel group when unsubscribing from regular channel group
+	                if (group in this.presenceChannelGroups) {
+	                    delete this.presenceChannelGroups[group];
+	                }
 	            }
 	            if (group in this.presenceState)
 	                delete this.presenceState[group];
@@ -16102,6 +16116,13 @@
 	                message: Object.assign({}, parameters),
 	                details: 'Subscribe with parameters:',
 	            }));
+	            // For legacy subscribe/unsubscribe API, go directly to the subscription manager
+	            // to handle individual channel management properly
+	            if (this.subscriptionManager) {
+	                this.subscriptionManager.subscribe(parameters);
+	                return;
+	            }
+	            // Fallback to global subscription set logic for event engine or other modes
 	            // The addition of a new subscription set into the subscribed global subscription set will update the active
 	            // subscription loop with new channels and groups.
 	            const subscriptionSet = this.subscriptionSet(Object.assign(Object.assign({}, parameters), { subscriptionOptions: { receivePresenceEvents: parameters.withPresence } }));
@@ -16156,6 +16177,13 @@
 	                message: Object.assign({}, parameters),
 	                details: 'Unsubscribe with parameters:',
 	            }));
+	            // For legacy subscribe/unsubscribe API, bypass the global subscription set
+	            // and go directly to the subscription manager to handle individual channel removal
+	            if (this.subscriptionManager) {
+	                this.subscriptionManager.unsubscribe(parameters);
+	                return;
+	            }
+	            // Fallback to global subscription set logic for event engine or other modes
 	            if (!this._globalSubscriptionSet) {
 	                this.logger.debug('PubNub', 'There are no active subscriptions. Ignore.');
 	                return;
@@ -16165,12 +16193,14 @@
 	                const subscriptionInput = subscription.subscriptionInput(false);
 	                if (subscriptionInput.isEmpty)
 	                    return false;
+	                // For non-legacy API, we need to check if ANY of the channels/groups match
 	                for (const channel of (_a = parameters.channels) !== null && _a !== void 0 ? _a : [])
 	                    if (subscriptionInput.contains(channel))
 	                        return true;
 	                for (const group of (_b = parameters.channelGroups) !== null && _b !== void 0 ? _b : [])
 	                    if (subscriptionInput.contains(group))
 	                        return true;
+	                return false;
 	            });
 	            // Removal from the active subscription also will cause `unsubscribe`.
 	            if (subscriptions.length > 0)
@@ -18093,9 +18123,7 @@
 	                        userId: clientConfiguration.getUserId(),
 	                        workerUrl: configurationCopy.subscriptionWorkerUrl,
 	                        sdkVersion: clientConfiguration.getVersion(),
-	                        // TODO: USE NEXT LINE INSTEAD
-	                        // heartbeatInterval: clientConfiguration.getHeartbeatInterval(),
-	                        heartbeatInterval: 10,
+	                        heartbeatInterval: clientConfiguration.getHeartbeatInterval(),
 	                        announceSuccessfulHeartbeats: clientConfiguration.announceSuccessfulHeartbeats,
 	                        announceFailedHeartbeats: clientConfiguration.announceFailedHeartbeats,
 	                        workerOfflineClientsCheckInterval: platformConfiguration.subscriptionWorkerOfflineClientsCheckInterval,

dist/web/pubnub.min.js

@@ -435,7 +435,8 @@
                 hbRequests.response = response;
             // Notify each PubNub client which awaited for response.
             notifyRequestProcessingResult(clients, fetchRequest, response, event.request);
-            if (response[0].status >= 400)
+            // Stop heartbeat timer on client error status codes.
+            if (response[0].status >= 400 && response[0].status < 500)
                 stopHeartbeatTimer(client);
         }, (clients, fetchRequest, error) => {
             // Notify each PubNub client which awaited for response.

dist/web/pubnub.worker.js

@@ -272,6 +272,11 @@ export class SubscriptionManager {
         actualChannels.add(channel);
 
         if (channel in this.heartbeatChannels) delete this.heartbeatChannels[channel];
+        
+        // Auto-remove corresponding presence channel when unsubscribing from regular channel
+        if (channel in this.presenceChannels) {
+          delete this.presenceChannels[channel];
+        }
       }
 
       if (channel in this.presenceState) delete this.presenceState[channel];
@@ -287,6 +292,11 @@ export class SubscriptionManager {
         actualChannelGroups.add(group);
 
         if (group in this.heartbeatChannelGroups) delete this.heartbeatChannelGroups[group];
+        
+        // Auto-remove corresponding presence channel group when unsubscribing from regular channel group
+        if (group in this.presenceChannelGroups) {
+          delete this.presenceChannelGroups[group];
+        }
       }
 
       if (group in this.presenceState) delete this.presenceState[group];

dist/web/pubnub.worker.min.js

@@ -1624,6 +1624,14 @@ export class PubNubCore<
         details: 'Subscribe with parameters:',
       }));
 
+      // For legacy subscribe/unsubscribe API, go directly to the subscription manager
+      // to handle individual channel management properly
+      if (this.subscriptionManager) {
+        this.subscriptionManager.subscribe(parameters);
+        return;
+      }
+
+      // Fallback to global subscription set logic for event engine or other modes
       // The addition of a new subscription set into the subscribed global subscription set will update the active
       // subscription loop with new channels and groups.
       const subscriptionSet = this.subscriptionSet({
@@ -1696,6 +1704,14 @@ export class PubNubCore<
         details: 'Unsubscribe with parameters:',
       }));
 
+      // For legacy subscribe/unsubscribe API, bypass the global subscription set
+      // and go directly to the subscription manager to handle individual channel removal
+      if (this.subscriptionManager) {
+        this.subscriptionManager.unsubscribe(parameters);
+        return;
+      }
+
+      // Fallback to global subscription set logic for event engine or other modes
       if (!this._globalSubscriptionSet) {
         this.logger.debug('PubNub', 'There are no active subscriptions. Ignore.');
         return;
@@ -1705,8 +1721,11 @@ export class PubNubCore<
         const subscriptionInput = subscription.subscriptionInput(false);
         if (subscriptionInput.isEmpty) return false;
 
+        // For non-legacy API, we need to check if ANY of the channels/groups match
         for (const channel of parameters.channels ?? []) if (subscriptionInput.contains(channel)) return true;
         for (const group of parameters.channelGroups ?? []) if (subscriptionInput.contains(group)) return true;
+        
+        return false;
       });
 
       // Removal from the active subscription also will cause `unsubscribe`.