improve unsubscribe

Author: Max Presman

src/core/components/subscription_manager.js

@@ -157,17 +157,35 @@ export default class {
 
   adaptUnsubscribeChange(args: UnsubscribeArgs, isOffline: boolean) {
     const { channels = [], channelGroups = [] } = args;
+    let performUnsubscribe = false;
 
     channels.forEach((channel) => {
-      if (channel in this._channels) delete this._channels[channel];
-      if (channel in this._presenceChannels) delete this._presenceChannels[channel];
+      if (channel in this._channels) {
+        delete this._channels[channel];
+        performUnsubscribe = true;
+      }
+      if (channel in this._presenceChannels) {
+        delete this._presenceChannels[channel];
+        performUnsubscribe = true;
+      }
     });
 
     channelGroups.forEach((channelGroup) => {
-      if (channelGroup in this._channelGroups) delete this._channelGroups[channelGroup];
-      if (channelGroup in this._presenceChannelGroups) delete this._channelGroups[channelGroup];
+      if (channelGroup in this._channelGroups) {
+        delete this._channelGroups[channelGroup];
+        performUnsubscribe = true;
+      }
+      if (channelGroup in this._presenceChannelGroups) {
+        delete this._channelGroups[channelGroup];
+        performUnsubscribe = true;
+      }
     });
 
+    // no-op if there are no channels and cg's to unsubscribe from.
+    if (!performUnsubscribe) {
+      return;
+    }
+
     if (this._config.suppressLeaveEvents === false && !isOffline) {
       this._leaveEndpoint({ channels, channelGroups }, (status) => {
         status.affectedChannels = channels;

src/core/pubnub-common.js

@@ -134,27 +134,27 @@ export default class {
     this.removeListener = listenerManager.removeListener.bind(listenerManager);
     this.removeAllListeners = listenerManager.removeAllListeners.bind(listenerManager);
 
-    /** channel groups **/
+    /* channel groups */
     this.channelGroups = {
       listGroups: endpointCreator.bind(this, modules, listChannelGroupsConfig),
       listChannels: endpointCreator.bind(this, modules, listChannelsInChannelGroupConfig),
       addChannels: endpointCreator.bind(this, modules, addChannelsChannelGroupConfig),
       removeChannels: endpointCreator.bind(this, modules, removeChannelsChannelGroupConfig),
       deleteGroup: endpointCreator.bind(this, modules, deleteChannelGroupConfig)
     };
-    /** push **/
+    /* push */
     this.push = {
       addChannels: endpointCreator.bind(this, modules, addPushChannelsConfig),
       removeChannels: endpointCreator.bind(this, modules, removePushChannelsConfig),
       deleteDevice: endpointCreator.bind(this, modules, removeDevicePushConfig),
       listChannels: endpointCreator.bind(this, modules, listPushChannelsConfig)
     };
-    /** presence **/
+    /* presence */
     this.hereNow = endpointCreator.bind(this, modules, presenceHereNowConfig);
     this.whereNow = endpointCreator.bind(this, modules, presenceWhereNowEndpointConfig);
     this.getState = endpointCreator.bind(this, modules, presenceGetStateConfig);
     this.setState = subscriptionManager.adaptStateChange.bind(subscriptionManager);
-    /** PAM **/
+    /* PAM */
     this.grant = endpointCreator.bind(this, modules, grantEndpointConfig);
     this.audit = endpointCreator.bind(this, modules, auditEndpointConfig);
     //
@@ -195,14 +195,16 @@ export default class {
     this.encrypt = crypto.encrypt.bind(crypto);
     this.decrypt = crypto.decrypt.bind(crypto);
 
-    /** config **/
+    /* config */
     this.getAuthKey = modules.config.getAuthKey.bind(modules.config);
     this.setAuthKey = modules.config.setAuthKey.bind(modules.config);
     this.setCipherKey = modules.config.setCipherKey.bind(modules.config);
     this.getUUID = modules.config.getUUID.bind(modules.config);
     this.setUUID = modules.config.setUUID.bind(modules.config);
     this.getFilterExpression = modules.config.getFilterExpression.bind(modules.config);
     this.setFilterExpression = modules.config.setFilterExpression.bind(modules.config);
+
+    this.setHeartbeatInterval = modules.config.setHeartbeatInterval.bind(modules.config);
   }