message_bus 3.3.8 → 4.2.0

data/spec/lib/message_bus/backend_spec.rb

@@ -3,9 +3,9 @@
 require_relative '../../spec_helper'
 require 'message_bus'
 
-describe PUB_SUB_CLASS do
+describe BACKEND_CLASS do
   before do
-    @bus = PUB_SUB_CLASS.new(test_config_for_backend(CURRENT_BACKEND))
+    @bus = BACKEND_CLASS.new(test_config_for_backend(CURRENT_BACKEND))
   end
 
   after do
@@ -30,7 +30,7 @@ describe PUB_SUB_CLASS do
   end
 
   it "should initialize with max_backlog_size" do
-    PUB_SUB_CLASS.new({}, 2000).max_backlog_size.must_equal 2000
+    BACKEND_CLASS.new({}, 2000).max_backlog_size.must_equal 2000
   end
 
   it "should truncate channels correctly" do
@@ -91,6 +91,22 @@ describe PUB_SUB_CLASS do
     @bus.last_id("/foo").must_equal 1
   end
 
+  it "should allow us to get multiple last_ids" do
+    @bus.last_ids("/foo", "/bar", "/foobar").must_equal [0, 0, 0]
+
+    @bus.publish("/foo", "one")
+    @bus.publish("/foo", "two")
+    @bus.publish("/foobar", "three")
+
+    @bus.last_ids("/foo", "/bar", "/foobar").must_equal(
+      [
+        @bus.last_id("/foo"),
+        @bus.last_id("/bar"),
+        @bus.last_id("/foobar")
+      ]
+    )
+  end
+
   it "can set backlog age" do
     @bus.max_backlog_age = 1
 
@@ -294,8 +310,6 @@ describe PUB_SUB_CLASS do
   end
 
   it "should support clear_every setting" do
-    test_never :redis
-
     @bus.clear_every = 5
     @bus.max_global_backlog_size = 2
     @bus.publish "/foo", "11"

data/spec/lib/message_bus/multi_process_spec.rb

@@ -3,7 +3,7 @@
 require_relative '../../spec_helper'
 require 'message_bus'
 
-describe PUB_SUB_CLASS do
+describe BACKEND_CLASS do
   def self.error!
     @error = true
   end
@@ -13,7 +13,7 @@ describe PUB_SUB_CLASS do
   end
 
   def new_bus
-    PUB_SUB_CLASS.new(test_config_for_backend(CURRENT_BACKEND).merge(db: 10))
+    BACKEND_CLASS.new(test_config_for_backend(CURRENT_BACKEND).merge(db: 10))
   end
 
   def work_it
@@ -91,6 +91,7 @@ describe PUB_SUB_CLASS do
         end
 
         bus.global_unsubscribe
+        bus.reset!
         bus.destroy
       end
     end

data/spec/lib/message_bus/rack/middleware_spec.rb

@@ -142,54 +142,6 @@ describe MessageBus::Rack::Middleware do
     end
   end
 
-  describe "diagnostics" do
-    it "should return a 403 if an unauthorized user attempts to get at the _diagnostics path" do
-      get "/message-bus/_diagnostics"
-      last_response.status.must_equal 403
-    end
-
-    it "should get a 200 with html for an authorized user" do
-      def @bus.is_admin_lookup
-        proc { |_| true }
-      end
-
-      get "/message-bus/_diagnostics"
-      last_response.status.must_equal 200
-    end
-
-    describe "with an altered base_route" do
-      let(:base_route) { "/base/route/" }
-
-      it "should get a 200 with html for an authorized user" do
-        def @bus.is_admin_lookup
-          proc { |_| true }
-        end
-
-        get "/base/route/message-bus/_diagnostics"
-        last_response.status.must_equal 200
-      end
-    end
-
-    it "should get the script it asks for" do
-      def @bus.is_admin_lookup
-        proc { |_| true }
-      end
-
-      get "/message-bus/_diagnostics/assets/message-bus.js"
-      last_response.status.must_equal 200
-      last_response.content_type.must_equal "application/javascript;charset=UTF-8"
-    end
-
-    it "should return 404 for invalid assets path" do
-      def @bus.is_admin_lookup
-        proc { |_| true }
-      end
-
-      get "/message-bus/_diagnostics/assets/../Gemfile"
-      last_response.status.must_equal 404
-    end
-  end
-
   describe "polling" do
     before do
       @bus.long_polling_enabled = false

data/spec/lib/message_bus/timer_thread_spec.rb

@@ -52,10 +52,6 @@ describe MessageBus::TimerThread do
   it "should call the error callback if something goes wrong" do
     error = nil
 
-    @timer.queue do
-      boom
-    end
-
     @timer.on_error do |e|
       error = e
     end
@@ -64,7 +60,7 @@ describe MessageBus::TimerThread do
       boom
     end
 
-    wait_for(10) do
+    wait_for(100) do
       error
     end
 

data/spec/lib/message_bus_spec.rb

@@ -37,6 +37,14 @@ describe MessageBus do
     @bus.after_fork
   end
 
+  it "destroying immediately after `after_fork` does not lock" do
+    10.times do
+      @bus.on
+      @bus.after_fork
+      @bus.destroy
+    end
+  end
+
   describe "#base_route=" do
     it "adds leading and trailing slashes" do
       @bus.base_route = "my/base/route"
@@ -107,7 +115,7 @@ describe MessageBus do
     @bus.publish("/chuck", norris: true)
     @bus.publish("/chuck", norris: true)
 
-    @bus.reliable_pub_sub.reset!
+    @bus.backend_instance.reset!
 
     @bus.publish("/chuck", yeager: true)
 
@@ -125,7 +133,7 @@ describe MessageBus do
     @bus.publish("/chuck", norris: true)
     @bus.publish("/chuck", norris: true)
 
-    @bus.reliable_pub_sub.expire_all_backlogs!
+    @bus.backend_instance.expire_all_backlogs!
 
     @bus.publish("/chuck", yeager: true)
 

data/spec/performance/backlog.rb

@@ -0,0 +1,80 @@
+# frozen_string_literal: true
+
+$LOAD_PATH << File.join(File.dirname(__FILE__), '..', '..', 'lib')
+require 'logger'
+require 'benchmark'
+require 'message_bus'
+
+require_relative "../helpers"
+
+backends = ENV['MESSAGE_BUS_BACKENDS'].split(",").map(&:to_sym)
+channel = "/foo"
+iterations = 10_000
+results = []
+
+puts "Running backlog benchmark with #{iterations} iterations on backends: #{backends.inspect}"
+
+run_benchmark = lambda do |bm, backend|
+  bus = MessageBus::Instance.new
+  bus.configure(test_config_for_backend(backend))
+
+  bus.backend_instance.max_backlog_size = 100
+  bus.backend_instance.max_global_backlog_size = 1000
+
+  channel_names = 10.times.map { |i| "channel#{i}" }
+
+  100.times do |i|
+    channel_names.each do |ch|
+      bus.publish(ch, { message_number_is: i })
+    end
+  end
+
+  last_ids = channel_names.map { |ch| [ch, bus.last_id(ch)] }.to_h
+
+  1000.times do
+    # Warmup
+    client = MessageBus::Client.new(message_bus: bus)
+    channel_names.each { |ch| client.subscribe(ch, -1) }
+    client.backlog
+  end
+
+  bm.report("#{backend} - #backlog with no backlogs requested") do
+    iterations.times do
+      client = MessageBus::Client.new(message_bus: bus)
+      channel_names.each { |ch| client.subscribe(ch, -1) }
+      client.backlog
+    end
+  end
+
+  (0..5).each do |ch_i|
+    channels_with_messages = (ch_i) * 2
+
+    bm.report("#{backend} - #backlog when #{channels_with_messages}/10 channels have new messages") do
+      iterations.times do
+        client = MessageBus::Client.new(message_bus: bus)
+        channel_names.each_with_index do |ch, i|
+          client.subscribe(ch, last_ids[ch] + ((i < channels_with_messages) ? -1 : 0))
+        end
+        result = client.backlog
+        if result.length != channels_with_messages
+          raise "Result has #{result.length} messages. Expected #{channels_with_messages}"
+        end
+      end
+    end
+  end
+
+  bus.reset!
+  bus.destroy
+end
+
+puts
+
+Benchmark.benchmark("     duration\n", 60, "%10.2rs\n", "") do |bm|
+  backends.each do |backend|
+    run_benchmark.call(bm, backend)
+  end
+end
+puts
+results.each do |result|
+  puts result
+end

data/spec/performance/publish.rb

@@ -9,7 +9,7 @@ require_relative "../helpers"
 
 backends = ENV['MESSAGE_BUS_BACKENDS'].split(",").map(&:to_sym)
 channel = "/foo"
-iterations = 10_000
+iterations = 100_000
 results = []
 
 puts "Running publication benchmark with #{iterations} iterations on backends: #{backends.inspect}"
@@ -32,8 +32,8 @@ benchmark_subscription_no_trimming = lambda do |bm, backend|
   bus = MessageBus::Instance.new
   bus.configure(test_config_for_backend(backend))
 
-  bus.reliable_pub_sub.max_backlog_size = iterations
-  bus.reliable_pub_sub.max_global_backlog_size = iterations
+  bus.backend_instance.max_backlog_size = iterations
+  bus.backend_instance.max_global_backlog_size = iterations
 
   messages_received = 0
   bus.after_fork
@@ -58,8 +58,35 @@ benchmark_subscription_with_trimming = lambda do |bm, backend|
   bus = MessageBus::Instance.new
   bus.configure(test_config_for_backend(backend))
 
-  bus.reliable_pub_sub.max_backlog_size = (iterations / 10)
-  bus.reliable_pub_sub.max_global_backlog_size = (iterations / 10)
+  bus.backend_instance.max_backlog_size = (iterations / 10)
+  bus.backend_instance.max_global_backlog_size = (iterations / 10)
+
+  messages_received = 0
+  bus.after_fork
+  bus.subscribe(channel) do |_message|
+    messages_received += 1
+  end
+
+  bm.report(test_title) do
+    iterations.times { bus.publish(channel, "Hello world") }
+    wait_for(60000) { messages_received == iterations }
+  end
+
+  results << "[#{test_title}]: #{iterations} messages sent, #{messages_received} received, rate of #{(messages_received.to_f / iterations.to_f) * 100}%"
+
+  bus.reset!
+  bus.destroy
+end
+
+benchmark_subscription_with_trimming_and_clear_every = lambda do |bm, backend|
+  test_title = "#{backend} - subscription with trimming and clear_every=50"
+
+  bus = MessageBus::Instance.new
+  bus.configure(test_config_for_backend(backend))
+
+  bus.backend_instance.max_backlog_size = (iterations / 10)
+  bus.backend_instance.max_global_backlog_size = (iterations / 10)
+  bus.backend_instance.clear_every = 50
 
   messages_received = 0
   bus.after_fork
@@ -96,6 +123,10 @@ Benchmark.bm(60) do |bm|
   backends.each do |backend|
     benchmark_subscription_with_trimming.call(bm, backend)
   end
+
+  backends.each do |backend|
+    benchmark_subscription_with_trimming_and_clear_every.call(bm, backend)
+  end
 end
 puts
 

data/spec/spec_helper.rb

@@ -14,7 +14,7 @@ require_relative "helpers"
 CURRENT_BACKEND = (ENV['MESSAGE_BUS_BACKEND'] || :redis).to_sym
 
 require "message_bus/backends/#{CURRENT_BACKEND}"
-PUB_SUB_CLASS = MessageBus::BACKENDS.fetch(CURRENT_BACKEND)
+BACKEND_CLASS = MessageBus::BACKENDS.fetch(CURRENT_BACKEND)
 
 puts "Running with backend: #{CURRENT_BACKEND}"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: message_bus
 version: !ruby/object:Gem::Version
-  version: 3.3.8
+  version: 4.2.0
 platform: ruby
 authors:
 - Sam Saffron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-20 00:00:00.000000000 Z
+date: 2022-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -282,13 +282,9 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- assets/application.jsx
-- assets/babel.min.js
 - assets/jquery-1.8.2.js
 - assets/message-bus-ajax.js
 - assets/message-bus.js
-- assets/react-dom.js
-- assets/react.js
 - bench/codecs/all_codecs.rb
 - bench/codecs/marshal.rb
 - bench/codecs/packed_string.rb
@@ -306,8 +302,6 @@ files:
 - examples/chat/config.ru
 - examples/chat/docker_container/chat.yml
 - examples/chat/docker_container/update_chat
-- examples/diagnostics/Gemfile
-- examples/diagnostics/config.ru
 - examples/minimal/Gemfile
 - examples/minimal/config.ru
 - lib/message_bus.rb
@@ -321,13 +315,11 @@ files:
 - lib/message_bus/codec/json.rb
 - lib/message_bus/codec/oj.rb
 - lib/message_bus/connection_manager.rb
-- lib/message_bus/diagnostics.rb
 - lib/message_bus/distributed_cache.rb
 - lib/message_bus/http_client.rb
 - lib/message_bus/http_client/channel.rb
 - lib/message_bus/http_client/version.rb
 - lib/message_bus/message.rb
-- lib/message_bus/rack/diagnostics.rb
 - lib/message_bus/rack/middleware.rb
 - lib/message_bus/rack/thin_ext.rb
 - lib/message_bus/rails/railtie.rb
@@ -352,6 +344,7 @@ files:
 - spec/lib/message_bus/rack/middleware_spec.rb
 - spec/lib/message_bus/timer_thread_spec.rb
 - spec/lib/message_bus_spec.rb
+- spec/performance/backlog.rb
 - spec/performance/publish.rb
 - spec/spec_helper.rb
 - spec/support/jasmine-browser.json
@@ -381,23 +374,4 @@ rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: ''
-test_files:
-- spec/assets/SpecHelper.js
-- spec/assets/message-bus.spec.js
-- spec/fixtures/test/Gemfile
-- spec/fixtures/test/config.ru
-- spec/helpers.rb
-- spec/integration/http_client_spec.rb
-- spec/lib/fake_async_middleware.rb
-- spec/lib/message_bus/assets/asset_encoding_spec.rb
-- spec/lib/message_bus/backend_spec.rb
-- spec/lib/message_bus/client_spec.rb
-- spec/lib/message_bus/connection_manager_spec.rb
-- spec/lib/message_bus/distributed_cache_spec.rb
-- spec/lib/message_bus/multi_process_spec.rb
-- spec/lib/message_bus/rack/middleware_spec.rb
-- spec/lib/message_bus/timer_thread_spec.rb
-- spec/lib/message_bus_spec.rb
-- spec/performance/publish.rb
-- spec/spec_helper.rb
-- spec/support/jasmine-browser.json
+test_files: []

data/assets/application.jsx

@@ -1,121 +0,0 @@
-'use strict';
-
-class Process extends React.Component {
-  hup() {
-    fetch(
-      `/message-bus/_diagnostics/hup/${this.props.hostname}/${this.props.pid}`,
-      {
-        method: 'POST'
-      }
-    );
-  }
-
-  render() {
-    return (
-      <tr>
-        <td>{this.props.pid}</td>
-        <td>{this.props.full_path}</td>
-        <td>{this.props.hostname}</td>
-        <td>{this.props.uptime} secs</td>
-        <td><button onClick={this.hup.bind(this)}>HUP</button></td>
-      </tr>
-    );
-  }
-};
-
-class DiagnosticsApp extends React.Component {
-  constructor(props) {
-    super(props);
-    this.state = {processes: []};
-  }
-
-  componentDidMount() {
-    MessageBus.start();
-    this.ensureSubscribed();
-  }
-
-  discover() {
-    this.ensureSubscribed();
-
-    this.setState({discovering: true});
-
-    var _this = this;
-    fetch(
-      "/message-bus/_diagnostics/discover",
-      {
-        method: "POST"
-      }
-    ).then(function() {
-      _this.setState({discovering: false})
-    });
-  }
-
-  ensureSubscribed() {
-    if (this.state.subscribed) { return; }
-
-    MessageBus.callbackInterval = 500;
-
-    MessageBus.subscribe(
-      "/_diagnostics/process-discovery",
-      this.updateProcess.bind(this)
-    );
-
-    this.setState({subscribed: true});
-  }
-
-  updateProcess(data) {
-    const _this = this;
-    const processes = this.state.processes.filter(function(process) {
-      return _this.processUniqueId(process) !== _this.processUniqueId(data);
-    });
-    this.setState({processes: processes.concat([data])});
-  }
-
-  processUniqueId(process) {
-    return process.hostname + process.pid;
-  }
-
-  render() {
-    let disabled = this.state.discovering ? "disabled" : null;
-
-    let _this = this;
-    let processes = this.state.processes.sort(function(a,b) {
-      return _this.processUniqueId(a) < _this.processUniqueId(b) ? -1 : 1;
-    });
-
-    return (
-      <div>
-        <header>
-          <h2>Message Bus Diagnostics</h2>
-        </header>
-
-        <div>
-          <button onClick={this.discover.bind(this)} disabled={disabled}>Discover Processes</button>
-
-          <table>
-            <thead>
-              <tr>
-                <td>pid</td>
-                <td>full_path</td>
-                <td>hostname</td>
-                <td>uptime</td>
-                <td></td>
-              </tr>
-            </thead>
-
-            <tbody>
-              {processes.map(function(process, index){
-                return <Process key={index} {...process} />;
-              })}
-            </tbody>
-          </table>
-        </div>
-      </div>
-    );
-  }
-}
-
-ReactDOM.render(
-  <DiagnosticsApp />,
-  document.getElementById('app')
-);