message_bus 4.5.1 → 4.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfc460d9e05c0273fa4136ea6f7756ef7fc262cf9202103f4f24a23c25d77276
-  data.tar.gz: 171e848f636251b6b585de15c2fe869c8d2687380bc2b0965fdc33d8661a0cec
+  metadata.gz: ac878307b45991461b9a20bf6a4f31935c164aa6abce9ba8d931ae291869dbb9
+  data.tar.gz: 201fd5f776e4fb437eb3f2be49961d9469f81745b60b6f84dcccb332212cdd5d
 SHA512:
-  metadata.gz: f9a1d9635fe6b2e9f51a87ce3c9a7e6bc0e1218a349af8e1a8ed62c77f37ebb8a6f89f630e83f6459f41804d442f644366ec44d3bad76e42d09e572510f23614
-  data.tar.gz: e05072c606a9114d6b817c8c6eead0ba2122f291fd251b5e644013246dcc98394ae3153c2e5530bc499c00a3713164d7d432cfee8f4407867b61c2040fb985a0
+  metadata.gz: f54fb643cb48006c33585e2af967b9e0ae9bb69c5c034b3e454cbe82b9330e1fbbfdb3d58bf60cf6056522e67a59c2b519f18dd851d0fe3fe62e4d96dfe559e5
+  data.tar.gz: 9c358176d7f5441931f1d0505b2c9e17c330806af06fa310393ba321e9db0b0041c433cc12c79e5247d85f85983ffc592b45ee8be4cd939297e7e8411360e6ae

data/.github/workflows/ci.yml

@@ -38,10 +38,11 @@ jobs:
 
   test:
     runs-on: ubuntu-latest
-    name: Ruby ${{ matrix.ruby }} (${{ matrix.redis }})
+    name: Ruby ${{ matrix.ruby }} (${{ matrix.redis }}, ${{ matrix.rack }})
     timeout-minutes: 10
 
     env:
+      BUNDLE_GEMFILE: gemfiles/${{ matrix.rack }}.gemfile
       PGHOST: localhost
       PGPASSWORD: postgres
       PGUSER: postgres
@@ -50,7 +51,8 @@ jobs:
       fail-fast: false
       matrix:
         ruby: ["3.2", "3.3", "3.4"]
-        redis: ["redis:5", "redis:6", "valkey/valkey"]
+        rack: ["rack2", "rack3"]
+        redis: ["redis:7.4", "valkey/valkey"]
 
     services:
       postgres:

data/.gitignore

@@ -4,6 +4,7 @@
 .config
 .yardoc
 Gemfile.lock
+gemfiles/*.gemfile.lock
 InstalledFiles
 _yardoc
 coverage

data/CHANGELOG

@@ -1,3 +1,22 @@
+03-08-2026
+
+- Version 4.6.0
+
+  - DEV: Export the JavaScript client as a CommonJS/ES module so it can be imported directly by bundlers and ESM projects, while still assigning the `MessageBus` global for existing consumers
+
+13-02-2026
+
+- Version 4.5.2
+
+  - FIX: Use consistent casing for headers
+  - DEV: Test against both Rack 2 and Rack 3 in CI
+
+10-02-2026
+
+- Version 4.5.1
+
+  - DEV: Allow 2.x rack dependency
+
 10-02-2026
 
 - Version 4.5.0

data/assets/message-bus.js

@@ -1,4 +1,4 @@
-/*global define, jQuery*/
+/*global define, jQuery, module*/
 
 (function (root, factory) {
   if (typeof define === "function" && define.amd) {
@@ -9,6 +9,11 @@
       // a global even when an AMD loader is in use.
       return (root.MessageBus = factory());
     });
+  } else if (typeof module === "object" && module.exports) {
+    module.exports = factory();
+    if (typeof self !== "undefined") {
+      self.MessageBus = module.exports;
+    }
   } else {
     // Browser globals
     root.MessageBus = factory();

data/gemfiles/rack2.gemfile

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+eval_gemfile "../Gemfile"
+
+gem "rack", "~> 2.0"

data/gemfiles/rack3.gemfile

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+eval_gemfile "../Gemfile"
+
+gem "rack", "~> 3.0"

data/lib/message_bus/client.rb

@@ -144,9 +144,7 @@ class MessageBus::Client
     end
 
     if has_groups
-      group_allowed = (
-        msg.group_ids - (self.group_ids || [])
-      ).length < msg.group_ids.length
+      group_allowed = msg.group_ids.intersect?(self.group_ids || [])
     end
 
     has_permission = client_allowed && (user_allowed || group_allowed || (!has_users && !has_groups))
@@ -228,18 +226,18 @@ class MessageBus::Client
   NEWLINE = "\r\n".freeze
   COLON_SPACE = ": ".freeze
   HTTP_11 = "HTTP/1.1 200 OK\r\n".freeze
-  CONTENT_LENGTH = "Content-Length: ".freeze
-  CONNECTION_CLOSE = "Connection: close\r\n".freeze
-  CHUNKED_ENCODING = "Transfer-Encoding: chunked\r\n".freeze
-  NO_SNIFF = "X-Content-Type-Options: nosniff\r\n".freeze
+  CONTENT_LENGTH = "content-length: ".freeze
+  CONNECTION_CLOSE = "connection: close\r\n".freeze
+  CHUNKED_ENCODING = "transfer-encoding: chunked\r\n".freeze
+  NO_SNIFF = "x-content-type-options: nosniff\r\n".freeze
 
-  TYPE_TEXT = "Content-Type: text/plain; charset=utf-8\r\n".freeze
-  TYPE_JSON = "Content-Type: application/json; charset=utf-8\r\n".freeze
+  TYPE_TEXT = "content-type: text/plain; charset=utf-8\r\n".freeze
+  TYPE_JSON = "content-type: application/json; charset=utf-8\r\n".freeze
 
   def write_headers
     @io.write(HTTP_11)
     @headers.each do |k, v|
-      next if k == "Content-Type"
+      next if k == "content-type"
 
       @io.write(k)
       @io.write(COLON_SPACE)

data/lib/message_bus/message.rb

@@ -1,8 +1,16 @@
 # frozen_string_literal: true
 
 # Represents a published message and its encoding for persistence.
-class MessageBus::Message < Struct.new(:global_id, :message_id, :channel, :data)
-  attr_accessor :site_id, :user_ids, :group_ids, :client_ids
+class MessageBus::Message
+  attr_accessor :global_id, :message_id, :channel, :data,
+                :site_id, :user_ids, :group_ids, :client_ids
+
+  def initialize(global_id, message_id, channel, data)
+    @global_id = global_id
+    @message_id = message_id
+    @channel = channel
+    @data = data
+  end
 
   def self.decode(encoded)
     s1 = encoded.index("|")
@@ -15,7 +23,7 @@ class MessageBus::Message < Struct.new(:global_id, :message_id, :channel, :data)
     channel.gsub!("$$123$$", "|")
     data = encoded[(s3 + 1), encoded.size]
 
-    MessageBus::Message.new(global_id, message_id, channel, data)
+    new(global_id, message_id, channel, data)
   end
 
   # only tricky thing to encode is pipes in a channel name ... do a straight replace
@@ -26,4 +34,12 @@ class MessageBus::Message < Struct.new(:global_id, :message_id, :channel, :data)
   def encode_without_ids
     "#{channel.gsub("|", "$$123$$")}|#{data}"
   end
+
+  def ==(other)
+    other.is_a?(self.class) &&
+      self.global_id == other.global_id &&
+      self.message_id == other.message_id &&
+      self.channel == other.channel &&
+      self.data == other.data
+  end
 end

data/lib/message_bus/rack/middleware.rb

@@ -75,7 +75,7 @@ class MessageBus::Rack::Middleware
     if @bus.allow_broadcast? && env['PATH_INFO'] == @broadcast_route
       parsed = Rack::Request.new(env)
       @bus.publish parsed["channel"], parsed["data"]
-      return [200, { "Content-Type" => "text/html" }, ["sent"]]
+      return [200, { "content-type" => "text/html" }, ["sent"]]
     end
 
     client_id = env['PATH_INFO'][@base_route_length..-1].split("/")[0]
@@ -169,9 +169,9 @@ class MessageBus::Rack::Middleware
       end
 
       if allow_chunked
-        response.headers["X-Content-Type-Options"] = "nosniff"
-        response.headers["Transfer-Encoding"] = "chunked"
-        response.headers["Content-Type"] = "text/plain; charset=utf-8"
+        response.headers["x-content-type-options"] = "nosniff"
+        response.headers["transfer-encoding"] = "chunked"
+        response.headers["content-type"] = "text/plain; charset=utf-8"
       end
 
       response.status = 200

data/lib/message_bus/version.rb

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

data/message_bus.gemspec

@@ -14,9 +14,10 @@ Gem::Specification.new do |gem|
   gem.name          = "message_bus"
   gem.require_paths = ["lib"]
   gem.version       = MessageBus::VERSION
-  gem.required_ruby_version = ">= 2.6.0"
+  gem.required_ruby_version = ">= 3.2.0"
 
   gem.add_runtime_dependency 'rack', '> 2', '< 4'
+  gem.add_runtime_dependency 'logger'
 
   # Optional runtime dependencies
   gem.add_development_dependency 'redis'
@@ -37,7 +38,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'oj'
   gem.add_development_dependency 'yard'
 
-  if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.7.0')
-    gem.add_development_dependency 'rubocop-discourse', '3.8.1'
-  end
+  gem.add_development_dependency 'rubocop-discourse', '3.8.1'
 end

data/package.json

@@ -10,8 +10,6 @@
   "files": [
     "assets/message-bus.js"
   ],
-  "jsnext:main": "assets/message-bus.js",
-  "module": "assets/message-bus.js",
   "repository": "https://github.com/discourse/message_bus",
   "author": "Sam Saffron, Robin Ward",
   "license": "MIT",

data/spec/lib/message_bus/client_spec.rb

@@ -32,6 +32,8 @@ describe MessageBus::Client do
         break if line == ""
 
         name, val = line.split(": ")
+        name = name.downcase
+        raise "duplicate header: #{name}" if headers.key?(name)
         headers[name] = val
       end
 
@@ -67,7 +69,7 @@ describe MessageBus::Client do
 
       status, headers, chunks = http_parse(lines)
 
-      headers["Content-Type"].must_equal "text/plain; charset=utf-8"
+      headers["content-type"].must_equal "text/plain; charset=utf-8"
       status.must_equal "200"
       chunks.length.must_equal 2
 

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

@@ -21,7 +21,7 @@ describe MessageBus::Rack::Middleware do
       use FakeAsyncMiddleware, message_bus: bus
       use e_m if e_m
       use MessageBus::Rack::Middleware, message_bus: bus
-      run lambda { |_env| [500, { 'Content-Type' => 'text/html' }, 'should not be called'] }
+      run lambda { |_env| [500, { 'content-type' => 'text/html' }, 'should not be called'] }
     }
 
     @async_middleware = builder.to_app

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

@@ -1,4 +1,4 @@
-/*global define, jQuery*/
+/*global define, jQuery, module*/
 
 (function (root, factory) {
   if (typeof define === "function" && define.amd) {
@@ -9,6 +9,11 @@
       // a global even when an AMD loader is in use.
       return (root.MessageBus = factory());
     });
+  } else if (typeof module === "object" && module.exports) {
+    module.exports = factory();
+    if (typeof self !== "undefined") {
+      self.MessageBus = module.exports;
+    }
   } else {
     // Browser globals
     root.MessageBus = factory();

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: message_bus
 version: !ruby/object:Gem::Version
-  version: 4.5.1
+  version: 4.6.0
 platform: ruby
 authors:
 - Sam Saffron
@@ -29,6 +29,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '4'
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -308,6 +322,8 @@ files:
 - examples/chat/docker_container/update_chat
 - examples/minimal/Gemfile
 - examples/minimal/config.ru
+- gemfiles/rack2.gemfile
+- gemfiles/rack3.gemfile
 - lib/message_bus.rb
 - lib/message_bus/backends.rb
 - lib/message_bus/backends/base.rb
@@ -366,7 +382,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="