heartbeat fix

Author: Devendra

core/pubnub-common.js

@@ -301,10 +301,14 @@ function PN_API(setup) {
     ,   SUB_ERROR     = function(){}
     ,   STATE         = {}
     ,   PRESENCE_HB_TIMEOUT  = null
+    /*
     ,   PRESENCE_HB          = validate_presence_heartbeat(
         setup['heartbeat'] || setup['pnexpires'] || 0, setup['error']
     )
     ,   PRESENCE_HB_INTERVAL = setup['heartbeat_interval'] || PRESENCE_HB - 3
+    */
+    ,   PRESENCE_HB          = 0
+    ,   PRESENCE_HB_INTERVAL = 0
     ,   PRESENCE_HB_RUNNING  = false
     ,   NO_WAIT_FOR_PENDING  = setup['no_wait_for_pending']
     ,   COMPATIBLE_35 = setup['compatible_3.5']  || false
@@ -359,6 +363,10 @@ function PN_API(setup) {
     function validate_presence_heartbeat(heartbeat, cur_heartbeat, error) {
         var err = false;
 
+        if (typeof heartbeat === 'undefined') {
+            return cur_heartbeat;
+        }
+
         if (typeof heartbeat === 'number') {
             if (heartbeat > PRESENCE_HB_THRESHOLD || heartbeat == 0)
                 err = false;
@@ -641,9 +649,12 @@ function PN_API(setup) {
         'get_heartbeat' : function() {
             return PRESENCE_HB;
         },
-        'set_heartbeat' : function(heartbeat) {
-            PRESENCE_HB = validate_presence_heartbeat(heartbeat, PRESENCE_HB_INTERVAL, error);
-            PRESENCE_HB_INTERVAL = (PRESENCE_HB - 3 >= 1)?PRESENCE_HB - 3:1;
+        'set_heartbeat' : function(heartbeat, heartbeat_interval) {
+            PRESENCE_HB = validate_presence_heartbeat(heartbeat, PRESENCE_HB, error);
+            PRESENCE_HB_INTERVAL = heartbeat_interval || (PRESENCE_HB / 2) - 1;
+            if (PRESENCE_HB == 2) {
+                PRESENCE_HB_INTERVAL = 1;
+            }
             CONNECT();
             _presence_heartbeat();
         },
@@ -1096,6 +1107,7 @@ function PN_API(setup) {
             ,   windowing       = args['windowing']   || SUB_WINDOWING
             ,   state           = args['state']
             ,   heartbeat       = args['heartbeat'] || args['pnexpires']
+            ,   heartbeat_interval = args['heartbeat_interval']
             ,   restore         = args['restore'] || SUB_RESTORE;
 
             // Restore Enabled?
@@ -1112,8 +1124,8 @@ function PN_API(setup) {
             if (!callback)      return error('Missing Callback');
             if (!SUBSCRIBE_KEY) return error('Missing Subscribe Key');
 
-            if (heartbeat || heartbeat === 0) {
-                SELF['set_heartbeat'](heartbeat);
+            if (heartbeat || heartbeat === 0 || heartbeat_interval || heartbeat_interval === 0) {
+                SELF['set_heartbeat'](heartbeat, heartbeat_interval);
             }
 
             // Setup Channel(s)

modern/pubnub.js

@@ -302,10 +302,14 @@ function PN_API(setup) {
     ,   SUB_ERROR     = function(){}
     ,   STATE         = {}
     ,   PRESENCE_HB_TIMEOUT  = null
+    /*
     ,   PRESENCE_HB          = validate_presence_heartbeat(
         setup['heartbeat'] || setup['pnexpires'] || 0, setup['error']
     )
     ,   PRESENCE_HB_INTERVAL = setup['heartbeat_interval'] || PRESENCE_HB - 3
+    */
+    ,   PRESENCE_HB          = 0
+    ,   PRESENCE_HB_INTERVAL = 0
     ,   PRESENCE_HB_RUNNING  = false
     ,   NO_WAIT_FOR_PENDING  = setup['no_wait_for_pending']
     ,   COMPATIBLE_35 = setup['compatible_3.5']  || false
@@ -360,6 +364,10 @@ function PN_API(setup) {
     function validate_presence_heartbeat(heartbeat, cur_heartbeat, error) {
         var err = false;
 
+        if (typeof heartbeat === 'undefined') {
+            return cur_heartbeat;
+        }
+
         if (typeof heartbeat === 'number') {
             if (heartbeat > PRESENCE_HB_THRESHOLD || heartbeat == 0)
                 err = false;
@@ -642,9 +650,12 @@ function PN_API(setup) {
         'get_heartbeat' : function() {
             return PRESENCE_HB;
         },
-        'set_heartbeat' : function(heartbeat) {
-            PRESENCE_HB = validate_presence_heartbeat(heartbeat, PRESENCE_HB_INTERVAL, error);
-            PRESENCE_HB_INTERVAL = (PRESENCE_HB - 3 >= 1)?PRESENCE_HB - 3:1;
+        'set_heartbeat' : function(heartbeat, heartbeat_interval) {
+            PRESENCE_HB = validate_presence_heartbeat(heartbeat, PRESENCE_HB, error);
+            PRESENCE_HB_INTERVAL = heartbeat_interval || (PRESENCE_HB / 2) - 1;
+            if (PRESENCE_HB == 2) {
+                PRESENCE_HB_INTERVAL = 1;
+            }
             CONNECT();
             _presence_heartbeat();
         },
@@ -1097,6 +1108,7 @@ function PN_API(setup) {
             ,   windowing       = args['windowing']   || SUB_WINDOWING
             ,   state           = args['state']
             ,   heartbeat       = args['heartbeat'] || args['pnexpires']
+            ,   heartbeat_interval = args['heartbeat_interval']
             ,   restore         = args['restore'] || SUB_RESTORE;
 
             // Restore Enabled?
@@ -1113,8 +1125,8 @@ function PN_API(setup) {
             if (!callback)      return error('Missing Callback');
             if (!SUBSCRIBE_KEY) return error('Missing Subscribe Key');
 
-            if (heartbeat || heartbeat === 0) {
-                SELF['set_heartbeat'](heartbeat);
+            if (heartbeat || heartbeat === 0 || heartbeat_interval || heartbeat_interval === 0) {
+                SELF['set_heartbeat'](heartbeat, heartbeat_interval);
             }
 
             // Setup Channel(s)