message_bus 3.3.6 → 4.0.0

data/spec/lib/message_bus_spec.rb

@@ -2,7 +2,6 @@
 
 require_relative '../spec_helper'
 require 'message_bus'
-require 'redis'
 
 describe MessageBus do
   before do
@@ -10,7 +9,7 @@ describe MessageBus do
     @bus.site_id_lookup do
       "magic"
     end
-    @bus.configure(MESSAGE_BUS_CONFIG)
+    @bus.configure(test_config_for_backend(CURRENT_BACKEND))
   end
 
   after do
@@ -24,7 +23,8 @@ describe MessageBus do
     @bus.off?.must_equal true
   end
 
-  it "can call destroy twice" do
+  it "can call destroy multiple times" do
+    @bus.destroy
     @bus.destroy
     @bus.destroy
   end
@@ -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"
@@ -98,7 +106,7 @@ describe MessageBus do
     client_ids.must_equal ['a', 'b']
   end
 
-  it "should recover from a redis flush" do
+  it "should recover from a reset" do
     data = nil
     @bus.subscribe("/chuck") do |msg|
       data = msg.data
@@ -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)
 
@@ -307,7 +315,7 @@ describe MessageBus do
     end
   end
 
-  it "should support forking properly do" do
+  it "should support forking properly" do
     test_never :memory
 
     data = []
@@ -316,7 +324,7 @@ describe MessageBus do
     end
 
     @bus.publish("/hello", "pre-fork")
-    wait_for(2000) { data.length > 0 }
+    wait_for(2000) { data.length == 1 }
 
     if child = Process.fork
       # The child was forked and we received its PID
@@ -328,6 +336,7 @@ describe MessageBus do
     else
       begin
         @bus.after_fork
+        GC.start
         @bus.publish("/hello", "from-fork")
       ensure
         exit!(0)
@@ -336,7 +345,11 @@ describe MessageBus do
 
     wait_for(2000) { data.length == 3 }
 
-    data.must_equal(["pre-fork", "from-fork", "continuation"])
+    @bus.publish("/hello", "after-fork")
+
+    wait_for(2000) { data.length == 4 }
+
+    data.must_equal(["pre-fork", "from-fork", "continuation", "after-fork"])
   end
 
   describe '#register_client_message_filter' do

data/spec/performance/publish.rb

@@ -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,8 @@ 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

data/spec/spec_helper.rb

@@ -11,18 +11,17 @@ require 'minitest/global_expectations'
 
 require_relative "helpers"
 
-backend = (ENV['MESSAGE_BUS_BACKEND'] || :redis).to_sym
-MESSAGE_BUS_CONFIG = test_config_for_backend(backend)
-require "message_bus/backends/#{backend}"
-PUB_SUB_CLASS = MessageBus::BACKENDS.fetch(backend)
-puts "Running with backend: #{backend}"
+CURRENT_BACKEND = (ENV['MESSAGE_BUS_BACKEND'] || :redis).to_sym
+
+require "message_bus/backends/#{CURRENT_BACKEND}"
+BACKEND_CLASS = MessageBus::BACKENDS.fetch(CURRENT_BACKEND)
+
+puts "Running with backend: #{CURRENT_BACKEND}"
 
 def test_only(*backends)
-  backend = MESSAGE_BUS_CONFIG[:backend]
-  skip "Test doesn't apply to #{backend}" unless backends.include?(backend)
+  skip "Test doesn't apply to #{CURRENT_BACKEND}" unless backends.include?(CURRENT_BACKEND)
 end
 
 def test_never(*backends)
-  backend = MESSAGE_BUS_CONFIG[:backend]
-  skip "Test doesn't apply to #{backend}" if backends.include?(backend)
+  skip "Test doesn't apply to #{CURRENT_BACKEND}" if backends.include?(CURRENT_BACKEND)
 end

data/spec/support/jasmine-browser.json

@@ -0,0 +1,16 @@
+{
+  "srcDir": "assets",
+  "srcFiles": [
+    "message-bus.js",
+    "message-bus-ajax.js"
+  ],
+  "specDir": "spec/assets",
+  "specFiles": [
+    "message-bus.spec.js"
+  ],
+  "helpers": [
+    "SpecHelper.js"
+  ],
+  "random": true,
+  "browser": "headlessChrome"
+}

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

@@ -2,7 +2,7 @@
 // as a fallback if jQuery is not present
 //
 // Only implements methods & options used by MessageBus
-(function(global, undefined) {
+(function(global) {
   'use strict';
   if (!global.MessageBus){
       throw new Error("MessageBus must be loaded before the ajax adapter");
@@ -16,7 +16,7 @@
     for (var name in options.headers){
       xhr.setRequestHeader(name, options.headers[name]);
     }
-    xhr.setRequestHeader('Content-Type', 'application/json');
+    xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
     if (options.messageBus.chunked){
       options.messageBus.onProgressListener(xhr);
     }
@@ -31,7 +31,7 @@
         options.complete();
       }
     }
-    xhr.send(JSON.stringify(options.data));
+    xhr.send(new URLSearchParams(options.data).toString());
     return xhr;
   };
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: message_bus
 version: !ruby/object:Gem::Version
-  version: 3.3.6
+  version: 4.0.0
 platform: ruby
 authors:
 - Sam Saffron
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-31 00:00:00.000000000 Z
+date: 2022-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -52,6 +52,216 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-hooks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-global_expectations
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: http_parser.rb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: thin
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: puma
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: m
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: oj
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-discourse
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A message bus for rack
 email:
 - sam.saffron@gmail.com
@@ -62,6 +272,7 @@ files:
 - ".eslintrc.js"
 - ".github/workflows/ci.yml"
 - ".gitignore"
+- ".prettierrc"
 - ".rubocop.yml"
 - CHANGELOG
 - DEV.md
@@ -71,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
@@ -95,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
@@ -110,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
@@ -127,8 +330,6 @@ files:
 - package.json
 - spec/assets/SpecHelper.js
 - spec/assets/message-bus.spec.js
-- spec/assets/support/jasmine.yml
-- spec/assets/support/jasmine_helper.rb
 - spec/fixtures/test/Gemfile
 - spec/fixtures/test/config.ru
 - spec/helpers.rb
@@ -145,14 +346,15 @@ files:
 - spec/lib/message_bus_spec.rb
 - spec/performance/publish.rb
 - spec/spec_helper.rb
+- spec/support/jasmine-browser.json
 - vendor/assets/javascripts/.gitignore
 - vendor/assets/javascripts/message-bus-ajax.js
 - vendor/assets/javascripts/message-bus.js
-homepage: https://github.com/SamSaffron/message_bus
+homepage: https://github.com/discourse/message_bus
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -160,7 +362,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -168,14 +370,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.6
-signing_key:
+signing_key: 
 specification_version: 4
 summary: ''
 test_files:
 - spec/assets/SpecHelper.js
 - spec/assets/message-bus.spec.js
-- spec/assets/support/jasmine.yml
-- spec/assets/support/jasmine_helper.rb
 - spec/fixtures/test/Gemfile
 - spec/fixtures/test/config.ru
 - spec/helpers.rb
@@ -192,3 +392,4 @@ test_files:
 - spec/lib/message_bus_spec.rb
 - spec/performance/publish.rb
 - spec/spec_helper.rb
+- spec/support/jasmine-browser.json

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')
-);