message_bus 4.4.1 → 4.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4a55e419b6f5807f46429d27360a776c8c8057d663188f1911aca78cb6198fc
-  data.tar.gz: dd96e8f87e10aca16262ca540997011871f0ba809a1153eb330aa82d8683267d
+  metadata.gz: e0f8dcac413e4d7ebfd5518440b1bae9311dfee8395d13b9c9a137aed8048689
+  data.tar.gz: dd16dc24af70834d8d62ecbc5f570e7790e00c78f876eee3c3b35483e7e576ab
 SHA512:
-  metadata.gz: b62eacf519bc544cde94ac05683938c2ca4c98bfaeaefd79e99ac012864d4c0ac20412ccc9fd0910cdf122b2883841af24339d299101b35e7296c0faa60c103f
-  data.tar.gz: 44fb3cda5e137b61f35d5b0f1be204ab179594df59423948946ad4790b5b9bf3d8087be3aa55f819dfe9df6b65d3a30138312cc69a0726711bd65821789f459c
+  metadata.gz: a48f71540d916776ee00ea49d651b1e5463ce15c1f4c97b7188550896908a6d67cb90d0e165ea6a607b8e5ef6909f3aa53aa0b06772233b80f1656c79f750f18
+  data.tar.gz: a32fb12a213171d4c1bc40c2d55e34f8572bb97ed44b9fccbcf23c0f7844114039175f4ba122ea9d240280e21e57c3edc7da85d82c69012ef98c8575a0b7c457

data/.github/workflows/ci.yml

@@ -19,27 +19,30 @@ jobs:
           ruby-version: "3.3"
           bundler-cache: true
 
-      - name: Set up Node.js
-        uses: actions/setup-node@v4
+      - uses: pnpm/action-setup@v4
+
+      - uses: actions/setup-node@v6
         with:
-          node-version: 20
-          cache: npm
+          node-version: "24"
+          cache: "pnpm"
 
-      - name: Setup npm
-        run: npm install
+      - name: Pnpm install
+        run: pnpm install
 
       - name: Rubocop
         run: bundle exec rubocop
 
       - name: ESLint
-        run: npx eslint .
+        if: ${{ !cancelled() }}
+        run: pnpm lint
 
   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
@@ -48,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:
@@ -77,6 +81,16 @@ jobs:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
 
+      - uses: pnpm/action-setup@v4
+
+      - uses: actions/setup-node@v6
+        with:
+          node-version: "24"
+          cache: "pnpm"
+
+      - name: Pnpm install
+        run: pnpm install
+
       - name: Tests
         env:
           TESTOPTS: --verbose
@@ -87,6 +101,10 @@ jobs:
     needs: [lint, test]
     runs-on: ubuntu-latest
 
+    permissions:
+      id-token: write
+      contents: write
+
     steps:
       - uses: actions/checkout@v4
 
@@ -108,8 +126,13 @@ jobs:
           git add package.json
           git commit -m 'bump'
 
+      - uses: pnpm/action-setup@v4
+
+      - uses: actions/setup-node@v6
+        with:
+          node-version: "24"
+          cache: "pnpm"
+
       - name: Publish package
-        uses: JS-DevTools/npm-publish@v3
         if: steps.publish-gem.outputs.new_version == 'true'
-        with:
-          token: ${{ secrets.NPM_TOKEN }}
+        run: pnpm publish -r

data/.gitignore

@@ -4,6 +4,7 @@
 .config
 .yardoc
 Gemfile.lock
+gemfiles/*.gemfile.lock
 InstalledFiles
 _yardoc
 coverage
@@ -16,7 +17,5 @@ test/tmp
 test/version_tmp
 tmp
 *.swp
-.rubocop-https---raw-githubusercontent-com-discourse-discourse-master--rubocop-yml
 .byebug_history
 node_modules/
-yarn.lock

data/CHANGELOG

@@ -1,3 +1,23 @@
+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
+
+  - Support chunked encoding for Puma 7 on Rack 3.1
+  - FIX: Prune empty subscriptions in `ConnectionManager#remove_client`
+
 20-03-2025
 
 - Version 4.4.1

data/README.md

@@ -4,7 +4,7 @@ A reliable, robust messaging bus for Ruby processes and web clients.
 
 MessageBus implements a Server to Server channel based protocol and Server to Web Client protocol (using polling, long-polling or long-polling + streaming)
 
-Since long-polling is implemented using Rack Hijack and Thin::Async, all common Ruby web servers (Thin, Puma, Unicorn, Passenger) can run MessageBus and handle a large number of concurrent connections that wait on messages.
+Since long-polling is implemented using Rack Hijack and Thin::Async, all common Ruby web servers (Pitchfork/Unicorn, Puma, Thin, Passenger) can run MessageBus and handle a large number of concurrent connections that wait on messages.
 
 MessageBus is implemented as Rack middleware and can be used by any Rails / Sinatra or pure Rack application.
 
@@ -381,7 +381,9 @@ MessageBus.configure(keepalive_interval: 60)
 message_bus supports using Redis as a storage backend, and you can configure message_bus to use redis in `config/initializers/message_bus.rb`, like so:
 
 ```ruby
-MessageBus.configure(backend: :redis, url: "redis://:p4ssw0rd@10.0.1.1:6380/15")
+MessageBus.configure(backend: :redis, redis_config: { 
+  url: "redis://:p4ssw0rd@10.0.1.1:6380/15"
+})
 ```
 
 The redis client message_bus uses is [redis-rb](https://github.com/redis/redis-rb), so you can visit it's repo to see what other options you can pass besides a `url`.
@@ -502,7 +504,7 @@ on_worker_boot do
 end
 ```
 
-#### Unicorn
+#### Pitchfork/Unicorn
 
 ```ruby
 # path/to/your/config/unicorn.rb

data/Rakefile

@@ -35,7 +35,7 @@ end
 namespace :jasmine do
   desc "Run Jasmine tests in headless mode"
   task 'ci' do
-    if !system("npx jasmine-browser-runner runSpecs")
+    if !system("pnpm jasmine-browser-runner runSpecs")
       exit 1
     end
   end
@@ -71,7 +71,7 @@ namespace :spec do
 
     begin
       ENV['MESSAGE_BUS_BACKEND'] = 'memory'
-      pid = spawn("bundle exec puma -p 9292 spec/fixtures/test/config.ru")
+      pid = spawn("bundle exec pitchfork -p 9292 spec/fixtures/test/config.ru")
       sleep 1 while port_available?(9292)
       Rake::TestTask.new(:integration) do |t|
         t.test_files = INTEGRATION_FILES

data/docker-compose.yml

@@ -36,7 +36,7 @@ services:
   example:
     build:
       context: .
-    command: bash -c "cd examples/chat && bundle install && bundle exec rackup --server puma --host 0.0.0.0"
+    command: bash -c "cd examples/chat && bundle install && bundle exec rackup --server pitchfork --host 0.0.0.0"
     environment:
       BUNDLE_TO: /usr/local/bundle
       REDISURL: redis://redis:6379

data/examples/bench/config.ru

@@ -30,4 +30,4 @@ end
 MessageBus.long_polling_interval = 1000 * 2
 MessageBus.max_active_clients = 10000
 use MessageBus::Rack::Middleware
-run lambda { |_env| [200, { "Content-Type" => "text/html" }, ["Howdy"]] }
+run lambda { |_env| [200, { "content-type" => "text/html" }, ["Howdy"]] }

data/examples/chat/Gemfile

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
-gem 'puma'
+gem 'pitchfork'
 gem 'redis'
 gem 'sinatra'

data/examples/chat/docker_container/chat.yml

@@ -33,18 +33,18 @@ hooks:
     - exec: cd /var/www && git clone --depth 1 https://github.com/SamSaffron/message_bus.git
     - exec:
         cmd:
-          - gem install puma
+          - gem install pitchfork
           - gem install redis
           - gem install sinatra
     - file:
-       path: /etc/service/puma/run
+       path: /etc/service/pitchfork/run
        chmod: "+x"
        contents: |
          #!/bin/bash
          exec 2>&1
          # redis
          cd $home/examples/chat
-         exec sudo -E -u chat LD_PRELOAD=/usr/lib/libjemalloc.so.1 puma -p 8080 -e production
+         exec sudo -E -u chat LD_PRELOAD=/usr/lib/libjemalloc.so.1 pitchfork -p 8080 -e production
     - exec: rm /etc/nginx/sites-enabled/default
     - replace:
         filename: /etc/nginx/nginx.conf

data/examples/minimal/config.ru

@@ -4,4 +4,4 @@ require 'message_bus'
 # MessageBus.long_polling_interval = 1000 * 2
 
 use MessageBus::Rack::Middleware
-run lambda { |_env| [200, { "Content-Type" => "text/html" }, ["Howdy"]] }
+run lambda { |_env| [200, { "content-type" => "text/html" }, ["Howdy"]] }

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

@@ -228,18 +228,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/connection_manager.rb

@@ -76,8 +76,13 @@ class MessageBus::ConnectionManager
   def remove_client(c)
     synchronize do
       @clients.delete c.client_id
-      @subscriptions[c.site_id].each do |_k, set|
-        set.delete c.client_id
+      site_subs = @subscriptions[c.site_id]
+      if site_subs
+        site_subs.delete_if do |_k, set|
+          set.delete c.client_id
+          set.empty?
+        end
+        @subscriptions.delete(c.site_id) if site_subs.empty?
       end
       if c.cleanup_timer
         # concurrency may cause this to fail

data/lib/message_bus/rack/middleware.rb

@@ -75,17 +75,17 @@ 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]
     return [404, {}, ["not found"]] unless client_id
 
     headers = {}
-    headers["Cache-Control"] = "must-revalidate, private, max-age=0"
-    headers["Content-Type"] = "application/json; charset=utf-8"
-    headers["Pragma"] = "no-cache"
-    headers["Expires"] = "0"
+    headers["cache-control"] = "must-revalidate, private, max-age=0"
+    headers["content-type"] = "application/json; charset=utf-8"
+    headers["pragma"] = "no-cache"
+    headers["expires"] = "0"
 
     if @bus.extra_response_headers_lookup
       @bus.extra_response_headers_lookup.call(env).each do |k, v|
@@ -131,7 +131,7 @@ class MessageBus::Rack::Middleware
                    env['QUERY_STRING'] !~ /dlp=t/ &&
                    @connection_manager.client_count < @bus.max_active_clients
 
-    allow_chunked = env['HTTP_VERSION'] == 'HTTP/1.1'
+    allow_chunked = env['SERVER_PROTOCOL'] == 'HTTP/1.1' || env['HTTP_VERSION'] == 'HTTP/1.1'
     allow_chunked &&= !env['HTTP_DONT_CHUNK']
     allow_chunked &&= @bus.chunked_encoding_enabled?
 
@@ -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.4.1"
+  VERSION = "4.5.2"
 end

data/message_bus.gemspec

@@ -14,9 +14,9 @@ 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', '>= 1.1.3'
+  gem.add_runtime_dependency 'rack', '> 2', '< 4'
 
   # Optional runtime dependencies
   gem.add_development_dependency 'redis'
@@ -30,13 +30,12 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'http_parser.rb'
   gem.add_development_dependency 'thin'
   gem.add_development_dependency 'rack-test'
-  gem.add_development_dependency 'puma'
+  gem.add_development_dependency 'pitchfork'
   gem.add_development_dependency 'm'
   gem.add_development_dependency 'byebug'
+  gem.add_development_dependency 'method_source'
   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

@@ -19,9 +19,16 @@
     "url": "https://github.com/discourse/message_bus/issues"
   },
   "homepage": "https://github.com/discourse/message_bus#readme",
+  "publishConfig": {
+    "access": "public"
+  },
+  "scripts": {
+    "lint": "eslint ."
+  },
   "devDependencies": {
     "eslint": "^8.31.0",
     "jasmine-browser-runner": "^0.10.0",
     "jasmine-core": "^3.10.1"
-  }
+  },
+  "packageManager": "pnpm@9.15.5"
 }