message_bus 1.1.1 → 2.0.0.beta.1

data/spec/lib/{middleware_spec.rb → message_bus/rack/middleware_spec.rb}

@@ -79,51 +79,12 @@ describe MessageBus::Rack::Middleware do
         @bus.long_polling_interval = 10
         s = Time.now.to_f * 1000
         post "/message-bus/ABC", '/foo' => nil
-        (Time.now.to_f * 1000 - s).should < 30
+        # allow for some jitter
+        (Time.now.to_f * 1000 - s).should < 50
       ensure
         @bus.long_polling_interval = 5000
       end
     end
-
-    it "should support batch filtering" do
-      bus = @bus
-      async_middleware = @async_middleware
-
-      bus.user_id_lookup do |env|
-        1
-      end
-
-      bus.around_client_batch("/demo") do |message, user_ids, callback|
-        begin
-          Thread.current["test"] = user_ids
-          callback.call
-        ensure
-          Thread.current["test"] = nil
-        end
-      end
-
-      test = nil
-
-      bus.client_filter("/demo") do |user_id, message|
-        test = Thread.current["test"]
-        message
-      end
-
-      client_id = "ABCD"
-
-      id = bus.publish("/demo", "test")
-
-      Thread.new do
-        wait_for(2000) { async_middleware.in_async? }
-        bus.publish "/demo", "test"
-      end
-
-      post "/message-bus/#{client_id}", {
-        '/demo' => id
-      }
-
-      test.should == [1]
-    end
   end
 
   describe "thin async" do
@@ -304,54 +265,6 @@ describe MessageBus::Rack::Middleware do
       parsed.length.should == 1
     end
 
-
-    it "should filter by client_filter correctly" do
-      id = @bus.publish("/filter", "test")
-      uid = 0
-
-      @bus.user_id_lookup do |env|
-        uid
-      end
-
-      @bus.client_filter("/filter") do |user_id, message|
-        if user_id == 0
-          message = message.dup
-          message.data += "_filter"
-          message
-        elsif user_id == 1
-          message
-        end
-      end
-
-      client_id = "ABCD"
-
-      post "/message-bus/#{client_id}", {
-        '/filter' => id - 1
-      }
-
-      parsed = JSON.parse(last_response.body)
-      parsed[0]['data'].should == "test_filter"
-
-      uid = 1
-
-      post "/message-bus/#{client_id}", {
-        '/filter' => id - 1
-      }
-
-      parsed = JSON.parse(last_response.body)
-      parsed.length.should == 1
-      parsed[0]["data"].should == "test"
-
-      uid = 2
-
-      post "/message-bus/#{client_id}", {
-        '/filter' => id - 1
-      }
-
-      parsed = JSON.parse(last_response.body)
-      parsed.length.should == 0
-    end
-
     it "should filter by group correctly" do
       id =@bus.publish("/foo", "test", group_ids: [3,4,5])
       @bus.group_ids_lookup do |env|

data/spec/lib/{redis → message_bus/redis}/reliable_pub_sub_spec.rb

@@ -13,15 +13,16 @@ describe MessageBus::Redis::ReliablePubSub do
   end
 
   context "readonly" do
-    before do
-      @bus.pub_redis.slaveof "127.0.0.80", "666"
-    end
 
     after do
       @bus.pub_redis.slaveof "no", "one"
     end
 
     it "should be able to store messages in memory for a period while in read only" do
+
+      skip "This spec changes redis behavior that in turn means other specs run slow"
+
+      @bus.pub_redis.slaveof "127.0.0.80", "666"
       @bus.max_in_memory_publish_backlog = 2
 
       3.times do

data/spec/lib/{timer_thread_spec.rb → message_bus/timer_thread_spec.rb}

@@ -33,35 +33,19 @@ describe MessageBus::TimerThread do
   end
 
   it "queues jobs in the correct order" do
-    counter = 0
-    failed = nil
 
-    ready = 0
-
-    items = (0...4).to_a.shuffle
-    items.map do |i|
-      # threading introduces a delay meaning we need to wait a long time
-      Thread.new do
-        ready += 1
-        while ready < 4
-          sleep 0
-        end
-        # on my mbp I measure at least 200ms of schedule jitter for Thread
-        @timer.queue(i/3.0) do
-          #puts "counter #{counter} i #{i}"
-          failed = true if counter != i
-          counter += 1
-        end
-        #puts "\nqueued #{i/200.0} #{i} #{Time.now.to_f}\n"
+    results = []
+    (0..3).to_a.reverse.each do |i|
+      @timer.queue(0.005 * i) do
+        results << i
       end
     end
 
     wait_for(3000) {
-      counter == items.length
+      4 == results.length
     }
 
-    counter.should == items.length
-    failed.should == nil
+    results.should == [0,1,2,3]
   end
 
   it "should call the error callback if something goes wrong" do

data/spec/spec_helper.rb

@@ -11,7 +11,12 @@ RSpec.configure do |config|
 
   # to debug hanging tests
   # config.before :each do |x|
-  #   p x.metadata[:location]
+  #   $start = Time.now
+  #   puts "Start: #{x.metadata[:location]}"
+  # end
+  #
+  # config.after :each do |x|
+  #   puts "#{x.metadata[:location]} #{Time.now - $start}"
   # end
 end
 

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

@@ -1,12 +1,6 @@
 /*jshint bitwise: false*/
+"use strict;"
 
-/**
-  Message Bus functionality.
-
-  @class MessageBus
-  @namespace Discourse
-  @module Discourse
-**/
 window.MessageBus = (function() {
   // http://stackoverflow.com/questions/105034/how-to-create-a-guid-uuid-in-javascript
   var callbacks, clientId, failCount, shouldLongPoll, queue, responseCallbacks, uniqueId, baseUrl;
@@ -30,12 +24,13 @@ window.MessageBus = (function() {
   baseUrl = "/";
   paused = false;
   later = [];
+  chunkedBackoff = 0;
 
   var hiddenProperty;
 
 
   (function(){
-    var prefixes = ["","webkit","ms","moz","ms"];
+    var prefixes = ["","webkit","ms","moz"];
     for(var i=0; i<prefixes.length; i++) {
       var prefix = prefixes[i];
       var check = prefix + (prefix === "" ? "hidden" : "Hidden");
@@ -53,6 +48,11 @@ window.MessageBus = (function() {
     }
   };
 
+  var hasonprogress = (new XMLHttpRequest()).onprogress === null;
+  var allowChunked = function(){
+    return me.enableChunkedEncoding && hasonprogress;
+  };
+
   shouldLongPoll = function() {
     return me.alwaysLongPoll || !isHidden();
   };
@@ -65,7 +65,6 @@ window.MessageBus = (function() {
     var gotData = false;
     if (!messages) return false; // server unexpectedly closed connection
 
-
     for (var i=0; i<messages.length; i++) {
       var message = messages[i];
       gotData = true;
@@ -93,6 +92,20 @@ window.MessageBus = (function() {
     return gotData;
   };
 
+  var reqSuccess = function(messages) {
+    failCount = 0;
+    if (paused) {
+      if (messages) {
+        for (var i=0; i<messages.length; i++) {
+          later.push(messages[i]);
+        }
+      }
+    } else {
+      return processMessages(messages);
+    }
+    return false;
+  };
+
   longPoller = function(poll,data){
     var gotData = false;
     var aborted = false;
@@ -100,27 +113,97 @@ window.MessageBus = (function() {
     totalAjaxCalls += 1;
     data.__seq = totalAjaxCalls;
 
-    return me.ajax({
-      url: me.baseUrl + "message-bus/" + me.clientId + "/poll?" + (!shouldLongPoll() || !me.enableLongPolling ? "dlp=t" : ""),
+    var longPoll = shouldLongPoll() && me.enableLongPolling;
+    var chunked = longPoll && allowChunked();
+    if (chunkedBackoff > 0) {
+      chunkedBackoff--;
+      chunked = false;
+    }
+
+    var headers = {
+      'X-SILENCE-LOGGER': 'true'
+    };
+
+    if (!chunked){
+      headers["Dont-Chunk"] = 'true';
+    }
+
+    var dataType = chunked ? "text" : "json";
+
+    var handle_progress = function(payload, position) {
+
+      var separator = "\r\n|\r\n";
+      var endChunk = payload.indexOf(separator, position);
+
+      if (endChunk === -1) {
+        return position;
+      }
+
+      var chunk = payload.substring(position, endChunk);
+      chunk = chunk.replace(/\r\n\|\|\r\n/g, separator);
+
+      try {
+        console.log(chunk);
+        reqSuccess(JSON.parse(chunk));
+      } catch(e) {
+        if (console.log) {
+          console.log("FAILED TO PARSE CHUNKED REPLY");
+          console.log(data);
+        }
+      }
+
+      return handle_progress(payload, endChunk + separator.length);
+    }
+
+    var disableChunked = function(){
+      if (me.longPoll) {
+        me.longPoll.abort();
+        chunkedBackoff = 30;
+      }
+    };
+
+    var req = me.ajax({
+      url: me.baseUrl + "message-bus/" + me.clientId + "/poll?" + (!longPoll ? "dlp=t" : ""),
       data: data,
       cache: false,
-      dataType: 'json',
+      dataType: dataType,
       type: 'POST',
-      headers: {
-        'X-SILENCE-LOGGER': 'true'
+      headers: headers,
+      xhr: function() {
+         var xhr = jQuery.ajaxSettings.xhr();
+
+         if (!chunked) {
+            return 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);
+
+         xhr.onprogress = function () {
+           clearTimeout(chunkedTimeout);
+
+           if(xhr.getResponseHeader('Content-Type') === 'application/json; charset=utf-8') {
+             // not chunked we are sending json back
+             chunked = false;
+             return;
+           }
+           position = handle_progress(xhr.responseText, position);
+         }
+
+         return xhr;
       },
       success: function(messages) {
-        failCount = 0;
-        if (paused) {
-          if (messages) {
-            for (var i=0; i<messages.length; i++) {
-              later.push(messages[i]);
-            }
-          }
-        } else {
-          gotData = processMessages(messages);
-        }
-      },
+         if (!chunked) {
+           // we may have requested text so jQuery will not parse
+           if (typeof(messages) === "string") {
+             messages = JSON.parse(messages);
+           }
+           gotData = reqSuccess(messages);
+         }
+       },
       error: function(xhr, textStatus, err) {
         if(textStatus === "abort") {
           aborted = true;
@@ -161,9 +244,12 @@ window.MessageBus = (function() {
         me.longPoll = null;
       }
     });
+
+    return req;
   };
 
   me = {
+    enableChunkedEncoding: true,
     enableLongPolling: true,
     callbackInterval: 15000,
     backgroundCallbackInterval: 60000,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: message_bus
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 2.0.0.beta.1
 platform: ruby
 authors:
 - Sam Saffron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-09 00:00:00.000000000 Z
+date: 2016-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -76,7 +76,6 @@ files:
 - lib/message_bus/diagnostics.rb
 - lib/message_bus/em_ext.rb
 - lib/message_bus/message.rb
-- lib/message_bus/message_handler.rb
 - lib/message_bus/rack/diagnostics.rb
 - lib/message_bus/rack/middleware.rb
 - lib/message_bus/rack/thin_ext.rb
@@ -85,17 +84,15 @@ files:
 - lib/message_bus/timer_thread.rb
 - lib/message_bus/version.rb
 - message_bus.gemspec
-- spec/lib/assets/asset_encoding_spec.rb
-- spec/lib/client_spec.rb
-- spec/lib/connection_manager_spec.rb
 - spec/lib/fake_async_middleware.rb
-- spec/lib/handlers/demo_message_handler.rb
+- spec/lib/message_bus/assets/asset_encoding_spec.rb
+- spec/lib/message_bus/client_spec.rb
+- spec/lib/message_bus/connection_manager_spec.rb
+- spec/lib/message_bus/multi_process_spec.rb
+- spec/lib/message_bus/rack/middleware_spec.rb
+- spec/lib/message_bus/redis/reliable_pub_sub_spec.rb
+- spec/lib/message_bus/timer_thread_spec.rb
 - spec/lib/message_bus_spec.rb
-- spec/lib/message_handler_spec.rb
-- spec/lib/middleware_spec.rb
-- spec/lib/multi_process_spec.rb
-- spec/lib/redis/reliable_pub_sub_spec.rb
-- spec/lib/timer_thread_spec.rb
 - spec/spec_helper.rb
 - vendor/assets/javascripts/message-bus.js
 homepage: https://github.com/SamSaffron/message_bus
@@ -113,25 +110,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: ''
 test_files:
-- spec/lib/assets/asset_encoding_spec.rb
-- spec/lib/client_spec.rb
-- spec/lib/connection_manager_spec.rb
 - spec/lib/fake_async_middleware.rb
-- spec/lib/handlers/demo_message_handler.rb
+- spec/lib/message_bus/assets/asset_encoding_spec.rb
+- spec/lib/message_bus/client_spec.rb
+- spec/lib/message_bus/connection_manager_spec.rb
+- spec/lib/message_bus/multi_process_spec.rb
+- spec/lib/message_bus/rack/middleware_spec.rb
+- spec/lib/message_bus/redis/reliable_pub_sub_spec.rb
+- spec/lib/message_bus/timer_thread_spec.rb
 - spec/lib/message_bus_spec.rb
-- spec/lib/message_handler_spec.rb
-- spec/lib/middleware_spec.rb
-- spec/lib/multi_process_spec.rb
-- spec/lib/redis/reliable_pub_sub_spec.rb
-- spec/lib/timer_thread_spec.rb
 - spec/spec_helper.rb