message_bus 4.3.1 → 4.3.3

data/spec/assets/SpecHelper.js

@@ -34,8 +34,23 @@ beforeEach(function () {
     this.readyState = 4
     this.responseText = encodeChunks(this, spec.responseChunks);
     this.status = spec.responseStatus;
-    if (this.onprogress){ this.onprogress(); }
-    this.onreadystatechange()
+
+    spec.requestStarted?.();
+
+    const complete = () => {
+      if(this.statusText === "abort"){
+        return;
+      }
+      this.onprogress?.();
+      this.onreadystatechange();
+    }
+
+    if(spec.delayResponsePromise){
+      spec.delayResponsePromise.then(() => complete())
+      spec.delayResponsePromise = null;
+    }else{
+      complete();
+    }
   }
 
   MockedXMLHttpRequest.prototype.open              = function(){ }
@@ -43,8 +58,8 @@ beforeEach(function () {
   MockedXMLHttpRequest.prototype.abort             = function(){
     this.readyState = 4
     this.responseText = '';
-    this.statusText = '';
-    this.status = 400;
+    this.statusText = 'abort';
+    this.status = 0;
     this.onreadystatechange()
   }
 
@@ -68,6 +83,10 @@ beforeEach(function () {
     "Content-Type": 'text/plain; charset=utf-8',
   };
 
+  MessageBus.enableChunkedEncoding = true;
+  MessageBus.firstChunkTimeout = 3000;
+  MessageBus.retryChunkedAfterRequests = 1;
+
   MessageBus.start();
 });
 
@@ -75,7 +94,6 @@ afterEach(function(){
   MessageBus.stop()
   MessageBus.callbacks.splice(0, MessageBus.callbacks.length)
   MessageBus.shouldLongPollCallback = null;
-  MessageBus.enableChunkedEncoding = true;
 });
 
 window.testMB = function(description, testFn, path, data){

data/spec/assets/message-bus.spec.js

@@ -166,4 +166,63 @@ describe("Messagebus", function () {
     const nextPollScheduledIn = window.setTimeout.calls.mostRecent().args[1];
     expect(nextPollScheduledIn).toEqual(MessageBus.minPollInterval);
   });
+
+  it("enters don't-chunk-mode if first chunk times out", async function () {
+    spyOn(this.MockedXMLHttpRequest.prototype, "send").and.callThrough();
+    spyOn(
+      this.MockedXMLHttpRequest.prototype,
+      "setRequestHeader"
+    ).and.callThrough();
+
+    let resolveFirstResponse;
+    this.delayResponsePromise = new Promise(
+      (resolve) => (resolveFirstResponse = resolve)
+    );
+    MessageBus.firstChunkTimeout = 50;
+
+    await new Promise((resolve) => MessageBus.subscribe("/test", resolve));
+    resolveFirstResponse();
+
+    const calls =
+      this.MockedXMLHttpRequest.prototype.setRequestHeader.calls.all();
+
+    const dontChunkCalls = calls.filter((c) => c.args[0] === "Dont-Chunk");
+    expect(dontChunkCalls.length).toEqual(1);
+  });
+
+  it("doesn't enter don't-chunk-mode if aborted before first chunk", async function () {
+    spyOn(
+      this.MockedXMLHttpRequest.prototype,
+      "setRequestHeader"
+    ).and.callThrough();
+
+    this.delayResponsePromise = new Promise(() => {});
+    MessageBus.firstChunkTimeout = 300;
+
+    const requestWasStarted = new Promise(
+      (resolve) => (this.requestStarted = resolve)
+    );
+
+    // Trigger request
+    const subscribedPromise = new Promise((resolve) =>
+      MessageBus.subscribe("/test", resolve)
+    );
+
+    await requestWasStarted;
+
+    // Change subscription (triggers an abort and re-poll)
+    MessageBus.subscribe("/test2", () => {});
+
+    // Wait for stuff to settle
+    await subscribedPromise;
+
+    // Wait 300ms to ensure dontChunk timeout has passed
+    await new Promise((resolve) => setTimeout(resolve, 300));
+
+    const calls =
+      this.MockedXMLHttpRequest.prototype.setRequestHeader.calls.all();
+
+    const dontChunkCalls = calls.filter((c) => c.args[0] === "Dont-Chunk");
+    expect(dontChunkCalls.length).toEqual(0);
+  });
 });

data/spec/lib/message_bus/client_spec.rb

@@ -99,6 +99,12 @@ describe MessageBus::Client do
       chunk2.length.must_equal 0
     end
 
+    it "does not raise an error when trying to write a message to a closed client using chunked encoding" do
+      @client.use_chunked = true
+      assert(@client.closed?)
+      @client << MessageBus::Message.new(1, 1, "/test", "test")
+    end
+
     it "does not bleed data across sites" do
       @client.site_id = "test"
 

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

@@ -205,10 +205,11 @@
       return handle_progress(payload, endChunk + separator.length);
     };
 
+    var chunkedTimeout;
     var disableChunked = function () {
       if (me.longPoll) {
         me.longPoll.abort();
-        chunkedBackoff = 30;
+        chunkedBackoff = me.retryChunkedAfterRequests;
       }
     };
 
@@ -235,9 +236,9 @@
         chunked: chunked,
         onProgressListener: function (xhr) {
           var position = 0;
-          // if it takes longer than 3000 ms to get first chunk, we have some proxy
-          // this is messing with us, so just backoff from using chunked for now
-          var chunkedTimeout = setTimeout(disableChunked, 3000);
+          // if it takes longer than firstChunkTimeout to get first chunk, there may be a proxy
+          // buffering the response. Switch to non-chunked long-polling mode.
+          chunkedTimeout = setTimeout(disableChunked, me.firstChunkTimeout);
           return (xhr.onprogress = function () {
             clearTimeout(chunkedTimeout);
             if (
@@ -269,6 +270,7 @@
         }
       },
       error: function (xhr, textStatus) {
+        clearTimeout(chunkedTimeout);
         if (xhr.status === 429) {
           var tryAfter =
             parseInt(
@@ -364,6 +366,8 @@
     clientId: clientId,
     alwaysLongPoll: false,
     shouldLongPollCallback: undefined,
+    firstChunkTimeout: 3000,
+    retryChunkedAfterRequests: 30,
     baseUrl: baseUrl,
     headers: {},
     ajax: typeof jQuery !== "undefined" && jQuery.ajax,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: message_bus
 version: !ruby/object:Gem::Version
-  version: 4.3.1
+  version: 4.3.3
 platform: ruby
 authors:
 - Sam Saffron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-06 00:00:00.000000000 Z
+date: 2023-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack