message_bus 4.3.0 → 4.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f725f70ad14bdd643aea469118faba0c666f36c47ec6fc3b33dc3c2db85ee8fb
-  data.tar.gz: faf76a2ef12077e48890250b60572700076d0d9da317df2f91d96d49f514e002
+  metadata.gz: 15a820bf3ce7658e466132cbc2dd41c4f71b5c68db2e993437698192922377b9
+  data.tar.gz: 2c698b0e82d3d17dc3c0aa682e34ffaf32713f47fe207c1e8b1d55d2fb7cbe48
 SHA512:
-  metadata.gz: a73153925e4bd93e5dcc2b8d09c18b944f074bcac7b9de563923e7ac3abd0552951f89418f09d58682fa41748810491cb3e6cfbc24fef1c6f32c7b397724e8a5
-  data.tar.gz: 659ebc5f7c22af1ab1dbd23247896e51511394bdad062816bb25174f1fc5d8d474171fc4d8d2a7e989f2a6eda700e4fe38b8caa7bf575a70319e5d318ee18f9f
+  metadata.gz: 0ea1a5c7a8c80bdddb487eed1442e6364b37518407c1809b0fe76bc3bf5fcba96bb66df04d02d4e491350d415abbae1cd0ecc91ef1079838d6455b6063c0459f
+  data.tar.gz: 981cc3d93b7ca7a3af50179c9450033f4e4566edca5d1269c73d3fd94952f5a77d5ce14b87aa58bc5845e377a2c5c6cbe64cd1dc7905dd7689dfe1295f0668cf

data/.eslintrc.js

@@ -11,4 +11,13 @@ module.exports = {
   },
   rules: {},
   ignorePatterns: ['/vendor', '/doc', '/assets/jquery-1.8.2.js'],
+  overrides: [
+    {
+      // Enable async/await in tests only
+      files: ["spec/**/*"],
+      parserOptions: {
+        ecmaVersion: 2022,
+      },
+    },
+  ],
 };

data/CHANGELOG

@@ -1,5 +1,11 @@
 FUTURE
 
+06-01-2023
+
+- Version 4.2.1
+
+  - FIX: Ensure non-long-polling requests are always spaced out
+
 04-11-2022
 
 - Version 4.2.0

data/assets/message-bus.js

@@ -40,7 +40,7 @@
   var pollTimeout = null;
   var totalAjaxFailures = 0;
   var totalAjaxCalls = 0;
-  var lastAjax;
+  var lastAjaxStartedAt;
 
   var isHidden = (function () {
     var prefixes = ["", "webkit", "ms", "moz"];
@@ -156,11 +156,11 @@
     }
 
     var gotData = false;
-    var aborted = false;
+    var abortedByClient = false;
     var rateLimited = false;
     var rateLimitedSeconds;
 
-    lastAjax = new Date();
+    lastAjaxStartedAt = new Date();
     totalAjaxCalls += 1;
     data.__seq = totalAjaxCalls;
 
@@ -281,7 +281,7 @@
           rateLimitedSeconds = tryAfter;
           rateLimited = true;
         } else if (textStatus === "abort") {
-          aborted = true;
+          abortedByClient = true;
         } else {
           failCount += 1;
           totalAjaxFailures += 1;
@@ -290,27 +290,40 @@
       complete: function () {
         ajaxInProgress = false;
 
-        var interval;
+        var inLongPollingMode = shouldLongPoll();
+        var startNextRequestAfter;
         try {
           if (rateLimited) {
-            interval = Math.max(me.minPollInterval, rateLimitedSeconds * 1000);
-          } else if (gotData || aborted) {
-            interval = me.minPollInterval;
+            // Respect `Retry-After` header
+            startNextRequestAfter = Math.max(
+              me.minPollInterval,
+              rateLimitedSeconds * 1000
+            );
+          } else if (abortedByClient) {
+            // Immediately trigger another poll
+            startNextRequestAfter = me.minPollInterval;
+          } else if (failCount > 2) {
+            // Linear backoff up to maxPollInterval
+            startNextRequestAfter = Math.min(
+              me.callbackInterval * failCount,
+              me.maxPollInterval
+            );
+          } else if (inLongPollingMode && gotData) {
+            // Immediately trigger another poll
+            startNextRequestAfter = me.minPollInterval;
           } else {
-            interval = me.callbackInterval;
-            if (failCount > 2) {
-              interval = interval * failCount;
-            } else if (!shouldLongPoll()) {
-              interval = me.backgroundCallbackInterval;
-            }
-            if (interval > me.maxPollInterval) {
-              interval = me.maxPollInterval;
-            }
+            // Trigger next poll N seconds after the last one **started**
+            var targetRequestInterval = inLongPollingMode
+              ? me.callbackInterval
+              : me.backgroundCallbackInterval;
+
+            var elapsedSinceLastAjaxStarted = new Date() - lastAjaxStartedAt;
 
-            interval -= new Date() - lastAjax;
+            startNextRequestAfter =
+              targetRequestInterval - elapsedSinceLastAjaxStarted;
 
-            if (interval < 100) {
-              interval = 100;
+            if (startNextRequestAfter < 100) {
+              startNextRequestAfter = 100;
             }
           }
         } catch (e) {
@@ -328,7 +341,7 @@
           pollTimeout = setTimeout(function () {
             pollTimeout = null;
             poll();
-          }, interval);
+          }, startNextRequestAfter);
         }
 
         me.longPoll = null;
@@ -367,7 +380,9 @@
           totalAjaxFailures
       );
       console.log(
-        "Last ajax call: " + (new Date() - lastAjax) / 1000 + " seconds ago"
+        "Last ajax call: " +
+          (new Date() - lastAjaxStartedAt) / 1000 +
+          " seconds ago"
       );
     },
 

data/lib/message_bus/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MessageBus
-  VERSION = "4.3.0"
+  VERSION = "4.3.1"
 end