message_bus 2.1.3 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2c8ffc1228b2e50751a6671ce91e12239e22cf3
-  data.tar.gz: 76b8c24586fa1781acd95dd352b269cf4a21bf99
+  metadata.gz: ab4e02e88e557c6eeeedbe109bdcde769d139ea8
+  data.tar.gz: 39009dd918e0218b44817bcbe76af71f7dc756d4
 SHA512:
-  metadata.gz: 2f17a8234add27233c63619a73bf214b38c53cb5e4938f61b7b13a1d3fd605f20bb335d213f5c0202a4f6358d0dfd982bf38a8079571e77ffce3fb67eb0d7245
-  data.tar.gz: 5815b33e4f0cce2de16ac2bd6836bbb2eb1d115fb87818e00a35cc571841fdcff36125453d9c24bab725004941c9ef861aaa683d5c5c728edd18fff50c3fc34b
+  metadata.gz: cbf23d9b541c1045074433945d9cccf10c0b40f445ac5f4692a6d3308dfc21d60f70f70cf4d5a93d83e653f570c7966ce1384def2c1b569daa49c9dd89b872c1
+  data.tar.gz: 3bf340e084d49dfeb09a07e80b23e2dc9698f2863feb579e668c449891c9bc7dec2f67b52dc891e7f1c772ecd0ce9f9b33f00b7fb9f34d1014d9dc6942496d0f

data/CHANGELOG

@@ -1,8 +1,9 @@
 20-04-2018
 
-- Version 2.1.3
+- Version 2.1.4
 
 - FIX: Subtle issue where poll timeout may not be cleared causing multiple concurrent polls
+- FIX: Add extra protection for poller to ensure there is never a case where multiple ajax happens concurrently
 
 09-01-2018
 

data/assets/message-bus.js

@@ -7,6 +7,8 @@
   var callbacks, clientId, failCount, shouldLongPoll, queue, responseCallbacks, uniqueId, baseUrl;
   var me, started, stopped, longPoller, pollTimeout, paused, later, jQuery, interval, chunkedBackoff;
 
+  var ajaxInProgress = false;
+
   uniqueId = function() {
     return 'xxxxxxxxxxxx4xxxyxxxxxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
       var r, v;
@@ -132,7 +134,13 @@
     return false;
   };
 
-  longPoller = function(poll,data){
+  longPoller = function(poll, data) {
+
+    if (ajaxInProgress) {
+      // never allow concurrent ajax reqs
+      return;
+    }
+
     var gotData = false;
     var aborted = false;
     lastAjax = new Date();
@@ -211,6 +219,7 @@
 
     updateLastAjax();
 
+    ajaxInProgress = true;
     var req = me.ajax({
       url: me.baseUrl + "message-bus/" + me.clientId + "/poll" + (!longPoll ? "?dlp=t" : ""),
       data: data,
@@ -262,6 +271,9 @@
         }
       },
       complete: function() {
+
+        ajaxInProgress = false;
+
         var interval;
         try {
           if (gotData || aborted) {
@@ -362,7 +374,8 @@
         if (callbacks.length === 0 || hiddenTabShouldWait()) {
           if(!delayPollTimeout) {
             delayPollTimeout = setTimeout(function() {
-              delayPollTimeout = null; poll();
+              delayPollTimeout = null;
+              poll();
             }, parseInt(500 + Math.random() * 500));
           }
           return;
@@ -373,7 +386,7 @@
           data[callbacks[i].channel] = callbacks[i].last_id;
         }
 
-        me.longPoll = longPoller(poll,data);
+        me.longPoll = longPoller(poll, data);
       };
 
 
@@ -381,7 +394,11 @@
       if(document.addEventListener && 'hidden' in document){
         me.visibilityEvent = global.document.addEventListener('visibilitychange', function(){
           if(!document.hidden && !me.longPoll && pollTimeout){
+
             clearTimeout(pollTimeout);
+            clearTimeout(delayPollTimeout);
+
+            delayPollTimeout = null;
             pollTimeout = null;
             poll();
           }

data/lib/message_bus/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module MessageBus
-  VERSION = "2.1.3"
+  VERSION = "2.1.4"
 end

data/vendor/assets/javascripts/message-bus.js

@@ -7,6 +7,8 @@
   var callbacks, clientId, failCount, shouldLongPoll, queue, responseCallbacks, uniqueId, baseUrl;
   var me, started, stopped, longPoller, pollTimeout, paused, later, jQuery, interval, chunkedBackoff;
 
+  var ajaxInProgress = false;
+
   uniqueId = function() {
     return 'xxxxxxxxxxxx4xxxyxxxxxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
       var r, v;
@@ -132,7 +134,13 @@
     return false;
   };
 
-  longPoller = function(poll,data){
+  longPoller = function(poll, data) {
+
+    if (ajaxInProgress) {
+      // never allow concurrent ajax reqs
+      return;
+    }
+
     var gotData = false;
     var aborted = false;
     lastAjax = new Date();
@@ -211,6 +219,7 @@
 
     updateLastAjax();
 
+    ajaxInProgress = true;
     var req = me.ajax({
       url: me.baseUrl + "message-bus/" + me.clientId + "/poll" + (!longPoll ? "?dlp=t" : ""),
       data: data,
@@ -262,6 +271,9 @@
         }
       },
       complete: function() {
+
+        ajaxInProgress = false;
+
         var interval;
         try {
           if (gotData || aborted) {
@@ -362,7 +374,8 @@
         if (callbacks.length === 0 || hiddenTabShouldWait()) {
           if(!delayPollTimeout) {
             delayPollTimeout = setTimeout(function() {
-              delayPollTimeout = null; poll();
+              delayPollTimeout = null;
+              poll();
             }, parseInt(500 + Math.random() * 500));
           }
           return;
@@ -373,7 +386,7 @@
           data[callbacks[i].channel] = callbacks[i].last_id;
         }
 
-        me.longPoll = longPoller(poll,data);
+        me.longPoll = longPoller(poll, data);
       };
 
 
@@ -381,7 +394,11 @@
       if(document.addEventListener && 'hidden' in document){
         me.visibilityEvent = global.document.addEventListener('visibilitychange', function(){
           if(!document.hidden && !me.longPoll && pollTimeout){
+
             clearTimeout(pollTimeout);
+            clearTimeout(delayPollTimeout);
+
+            delayPollTimeout = null;
             pollTimeout = null;
             poll();
           }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: message_bus
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.4
 platform: ruby
 authors:
 - Sam Saffron