refactor(shared-worker): re-adjust "backup" timer on early heartbeat

Re-adjust "backup" heartbeat timer when one of the clients request sent too early after previous
request.

Author: parfeon

dist/web/pubnub.js

@@ -10800,7 +10800,6 @@
 	            return;
 	        if (this.parentSetsCount > 0) {
 	            // Creating from whole payload (not only for published messages).
-	            console.dir(event.data);
 	            const fingerprint = messageFingerprint(event.data);
 	            if (this.handledUpdates.includes(fingerprint)) {
 	                this.state.client.logger.trace(this.subscriptionType, `Message (${fingerprint}) already handled by ${this.id}. Ignoring.`);

dist/web/pubnub.min.js

@@ -934,13 +934,12 @@
             if (!outOfOrder && !failedPreviousRequest && currentTimestamp < expectedTimestamp) {
                 // Check whether it is too soon to send request or not.
                 const leeway = minimumHeartbeatInterval * 0.05 * 1000;
-                if (minimumHeartbeatInterval - leeway <= 3) {
-                    // Leeway can't be applied if actual interval between heartbeat requests is smaller
-                    // than 3 seconds which derived from the server's threshold.
+                // Leeway can't be applied if actual interval between heartbeat requests is smaller
+                // than 3 seconds which derived from the server's threshold.
+                if (minimumHeartbeatInterval - leeway <= 3 || expectedTimestamp - currentTimestamp > leeway) {
+                    startHeartbeatTimer(client, true);
                     return undefined;
                 }
-                else if (expectedTimestamp - currentTimestamp > leeway)
-                    return undefined;
             }
         }
         delete hbRequestsBySubscriptionKey[heartbeatRequestKey].response;
@@ -1684,10 +1683,12 @@
         if (adjust && !heartbeat.loop)
             return;
         let targetInterval = heartbeatInterval;
-        if (adjust && heartbeat.loop && targetInterval !== heartbeat.loop.heartbeatInterval) {
+        if (adjust && heartbeat.loop) {
             const activeTime = (Date.now() - heartbeat.loop.startTimestamp) / 1000;
             if (activeTime < targetInterval)
                 targetInterval -= activeTime;
+            if (targetInterval === heartbeat.loop.heartbeatInterval)
+                targetInterval += 0.05;
         }
         stopHeartbeatTimer(client);
         if (targetInterval <= 0)

dist/web/pubnub.worker.js

@@ -143,7 +143,6 @@ export class Subscription extends SubscriptionBase {
 
     if (this.parentSetsCount > 0) {
       // Creating from whole payload (not only for published messages).
-      console.dir(event.data);
       const fingerprint = messageFingerprint(event.data);
       if (this.handledUpdates.includes(fingerprint)) {
         this.state.client.logger.trace(

dist/web/pubnub.worker.min.js

@@ -1548,11 +1548,12 @@ const heartbeatTransportRequestFromEvent = (
       // Check whether it is too soon to send request or not.
       const leeway = minimumHeartbeatInterval * 0.05 * 1000;
 
-      if (minimumHeartbeatInterval - leeway <= 3) {
-        // Leeway can't be applied if actual interval between heartbeat requests is smaller
-        // than 3 seconds which derived from the server's threshold.
+      // Leeway can't be applied if actual interval between heartbeat requests is smaller
+      // than 3 seconds which derived from the server's threshold.
+      if (minimumHeartbeatInterval - leeway <= 3 || expectedTimestamp - currentTimestamp > leeway) {
+        startHeartbeatTimer(client, true);
         return undefined;
-      } else if (expectedTimestamp - currentTimestamp > leeway) return undefined;
+      }
     }
   }
 
@@ -2394,9 +2395,10 @@ const startHeartbeatTimer = (client: PubNubClientState, adjust: boolean = false)
   if (adjust && !heartbeat.loop) return;
 
   let targetInterval = heartbeatInterval;
-  if (adjust && heartbeat.loop && targetInterval !== heartbeat.loop.heartbeatInterval) {
+  if (adjust && heartbeat.loop) {
     const activeTime = (Date.now() - heartbeat.loop.startTimestamp) / 1000;
     if (activeTime < targetInterval) targetInterval -= activeTime;
+    if (targetInterval === heartbeat.loop.heartbeatInterval) targetInterval += 0.05;
   }
 
   stopHeartbeatTimer(client);