message_bus 3.3.6 → 3.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52ac95c63b3775df984e4900aff333c2ea9f9bab7e79d16b85909048247fb709
-  data.tar.gz: 879fd243f8947150fe8a31307d023b6ca719192568e0def45255dfdddaf1e34f
+  metadata.gz: 16601ac02268a477a94bf0347922162f66ce17dfdba1c4c655d576b46e78a79c
+  data.tar.gz: 746e2295f873d9cfe75c28b079b406bb42329a992146d414c63292c2148a8f48
 SHA512:
-  metadata.gz: fe7252d6965628dd75027af80f775126394e6b3a81be01fd03f538f17fe5e7874e997cea552ee2e92d91b7ee47d17059755e7df995c5b8bab24049ce2746e0a8
-  data.tar.gz: 2c4ef234bab5ee1701b5bb2d7362929128855dda113a2531dd35f025b9d2be11a2c18a287aa25731e73a9e8f82af898e2f7725a7c9ea4200a390eaff633b4098
+  metadata.gz: 3d048dde14c63d5abdda283571cb9c2be1b7fc809a94c7f0b4ec2eaa4785da03bc47535264741f65cfa1d66c75e1b0169ea0de39449456b9c791ba91518d62e9
+  data.tar.gz: 0cfbed1cab954e33805c94c7662c9094276615d5f338168da48d26f033da0f42685024b87aaee64d221e192d0592cd655fba7473da8d973616b218ce2858b045

data/.eslintrc.js

@@ -4,10 +4,18 @@ module.exports = {
     browser: true,
     es2021: false,
   },
-  extends: "eslint:recommended",
+  extends: 'eslint:recommended',
   parserOptions: {
     ecmaVersion: 2015,
-    sourceType: "module",
+    sourceType: 'module',
   },
   rules: {},
+  ignorePatterns: [
+    '/vendor',
+    '/doc',
+    '/assets/babel.min.js',
+    '/assets/jquery-1.8.2.js',
+    '/assets/react-dom.js',
+    '/assets/react.js',
+  ],
 };

data/.github/workflows/ci.yml

@@ -4,7 +4,7 @@ on:
   pull_request:
   push:
     branches:
-      - master
+      - main
 
 env:
   PGHOST: localhost
@@ -15,40 +15,57 @@ env:
 jobs:
   build:
     runs-on: ubuntu-latest
-    name: Ruby ${{ matrix.ruby }}
+    name: Ruby ${{ matrix.ruby }} (redis ${{ matrix.redis }})
+    timeout-minutes: 10
+
     services:
       postgres:
-        image: postgres:9.4
+        image: postgres:14.0
         env:
           POSTGRES_PASSWORD: postgres
         ports:
           - 5432:5432
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
+      redis:
+        image: ${{ format('redis:{0}', matrix.redis) }}
+        ports:
+          - 6379:6379
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+
     strategy:
+      fail-fast: false
       matrix:
-        ruby: ["2.7", "2.6", "2.5"]
+        ruby: ["3.0", "2.7", "2.6"]
+        redis: ["5", "6"]
+
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-ruby@v1
+
+      - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-      - name: Bundler cache
-        uses: actions/cache@v2
+          bundler-cache: true # 'bundle install' and cache
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v2
         with:
-          path: vendor/bundle
-          key: ${{ runner.os }}-${{ matrix.ruby }}-gems-${{ hashFiles('**/Gemfile.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-${{ matrix.ruby }}-gems-
+          node-version: 16
+          cache: npm
+
+      - name: Setup npm
+        run: npm install
+
       - name: Create Database
         run: |
           createdb message_bus_test
-      - name: Setup redis
-        uses: shogo82148/actions-setup-redis@v1
-        with:
-          redis-version: '5.x'
-      - name: Setup gems
-        run: |
-          bundle config path vendor/bundle
-          bundle install --jobs 4
+
       - name: Tests
         run: bundle exec rake
+        timeout-minutes: 3
+
+      - name: Linting
+        run: npx eslint .

data/CHANGELOG

@@ -1,10 +1,17 @@
+15-12-2021
+
+- Version 3.3.7
+
+  - FIX: Prevent simple polling from clobbering the session
+  - SECURITY: Fix path traversal on diagnostics route.
+
 31-05-2021
 
 - Version 3.3.6
 
   - FEATURE: Introduce support for transport codecs
   - FIX: event subscription leak in JS after start/stop/start sequence
-  - FEATURE: MessageBus.onVisibilityChange() can be used to trigger a visiblity change check by hand
+  - FEATURE: MessageBus.onVisibilityChange() can be used to trigger a visibility change check by hand
 
 28-04-2021
 
@@ -62,7 +69,7 @@
 
 - Version 3.2.0
 
-   - FIX: compatability with Rails 6.0.3, note: apps without ActionDispatch::Flash may stop working after this upgrade
+   - FIX: compatibility with Rails 6.0.3, note: apps without ActionDispatch::Flash may stop working after this upgrade
    to correct this disable middleware injection with `config.skip_message_bus_middleware = true` and configure middleware by hand with `app.middleware.use(MessageBus::Rack::Middleware)`
 
 28-04-2020
@@ -189,7 +196,7 @@
 
 - Version 2.1.6
 
-- FEATURE: `MesssageBus.publish` accepts option `site_id` to publish to a site
+- FEATURE: `MessageBus.publish` accepts option `site_id` to publish to a site
 - FEATURE: Added MessageBus::DistributedCache for cross process caching
 - PERF: Use monotonic times in timer thread
 - FEATURE: min poll interval is now configurable client side
@@ -253,7 +260,7 @@
 
 - Version 2.0.6
 
-- Fix: correct after_fork so it correctly disconnnects redis
+- Fix: correct after_fork so it correctly disconnects redis
 - Fix: correct message_bus #destroy used in tests to clean up spec (deadlock)
 - Fix: deliver backlog unconditionally when polling (and not long polling)
 
@@ -323,7 +330,7 @@
 
 - Version 2.0.0.beta.6
 
-- Feature: Support standalone opertion without depending on jQuery @nathanstitt
+- Feature: Support standalone operation without depending on jQuery @nathanstitt
 - Feature: Support a noconflict mode @nathanstitt
 - Feature: Support JSON POST payload @nathanstitt
 
@@ -369,7 +376,7 @@
 - Version 1.1.0
 - Fix: keep track of client sequence on server, abandon old subscribes
 - Fix: rare concurrency issue when subscribing concurrently
-- Fature: remove most jQuery dependency from message-bus.js
+- Feature: remove most jQuery dependency from message-bus.js
 
 09-07-2015
 - Version 1.0.16
@@ -393,7 +400,7 @@
 
 28-05-2015
 - Version 1.0.12
-- Feature: Support client_id targetted message
+- Feature: Support client_id targeted message
 
 06-05-2015
 - Version 1.0.11
@@ -402,7 +409,7 @@
 01-05-2015
 - Version: 1.0.10
 - Feature: no longer depends on EventMachine (only used for Thin backend)
-- Feature: realiable pub sub will queue messages in memory if redis is readonly, configurable
+- Feature: reliable pub sub will queue messages in memory if redis is readonly, configurable
 - Fix: if redis is flushed we will continue to deliver messages
 
 23-03-2015

data/DEV.md

@@ -5,5 +5,3 @@
 2. Log in to npm `yarn login`
 
 3. Publish: `yarn publish`
-
-

data/Gemfile

@@ -3,30 +3,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in message_bus.gemspec
 gemspec
-
-group :test do
-  gem 'minitest'
-  gem 'minitest-hooks'
-  gem 'minitest-global_expectations'
-  gem 'rake'
-  gem 'http_parser.rb'
-  gem 'thin'
-  gem 'rack-test', require: 'rack/test'
-  gem 'jasmine'
-  gem 'puma'
-  gem 'm'
-end
-
-group :test, :development do
-  gem 'byebug'
-  gem 'oj'
-end
-
-group :development do
-  gem 'yard'
-  gem 'rubocop-discourse', require: false
-  gem 'rubocop-rspec', require: false
-end
-
-gem 'rack'
-gem 'concurrent-ruby' # for distributed-cache

data/LICENSE

@@ -19,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -12,7 +12,7 @@ Read the generated docs: <https://www.rubydoc.info/gems/message_bus>
 
 ## Ruby version support
 
-MessageBus only support officially supported versions of Ruby; as of [2018-06-20](https://www.ruby-lang.org/en/news/2018/06/20/support-of-ruby-2-2-has-ended/) this means we only support Ruby version 2.3 and up.
+MessageBus only support officially supported versions of Ruby; as of [2021-03-31](https://www.ruby-lang.org/en/downloads/branches/) this means we only support Ruby version 2.6 and up.
 
 ## Can you handle concurrent requests?
 
@@ -68,19 +68,19 @@ id = MessageBus.last_id("/channel")
 MessageBus.backlog "/channel", id
 ```
 
-### Targetted messages
+### Targeted messages
 
-Messages can be targetted to particular clients by supplying the `client_ids` option when publishing a message.
+Messages can be targeted to particular clients by supplying the `client_ids` option when publishing a message.
 
 ```ruby
 MessageBus.publish "/channel", "hello", client_ids: ["XXX", "YYY"] # (using MessageBus.clientId)
 ```
 
-By configuring the `user_id_lookup` and `group_ids_lookup` options with a Proc or Lambda which will be called with a [Rack specification environment](https://github.com/rack/rack/blob/master/SPEC.rdoc#the-environment-), messages can be targetted to particular clients users or groups by supplying either the `user_ids` or `group_ids` options when publishing a message.
+By configuring the `user_id_lookup` and `group_ids_lookup` options with a Proc or Lambda which will be called with a [Rack specification environment](https://github.com/rack/rack/blob/master/SPEC.rdoc#the-environment-), messages can be targeted to particular clients users or groups by supplying either the `user_ids` or `group_ids` options when publishing a message.
 
 ```ruby
 MessageBus.configure(user_id_lookup: proc do |env|
-  # this lookup occurs on JS-client poolings, so that server can retrieve backlog
+  # this lookup occurs on JS-client polling, so that server can retrieve backlog
   # for the client considering/matching/filtering user_ids set on published messages
   # if user_id is not set on publish time, any user_id returned here will receive the message
   # return the user id here
@@ -98,7 +98,7 @@ end)
 MessageBus.publish "/channel", "hello", group_ids: [1, 2, 3]
 
 # example of MessageBus to set user_ids from an initializer in Rails and Devise:
-# config/inializers/message_bus.rb
+# config/initializers/message_bus.rb
 MessageBus.user_id_lookup do |env|
   req = Rack::Request.new(env)
 
@@ -109,13 +109,13 @@ MessageBus.user_id_lookup do |env|
 end
 ```
 
-If both `user_ids` and `group_ids` options are supplied when publishing a message, the message will be targetted at clients with lookup return values that  matches on either the `user_ids` **or** the `group_ids` options.
+If both `user_ids` and `group_ids` options are supplied when publishing a message, the message will be targeted at clients with lookup return values that  matches on either the `user_ids` **or** the `group_ids` options.
 
 ```ruby
 MessageBus.publish "/channel", "hello", user_ids: [1, 2, 3], group_ids: [1, 2, 3]
 ```
 
-If the `client_ids` option is supplied with either the `user_ids` or `group_ids` options when publising a message, the `client_ids` option will be applied unconditionally and messages will be filtered further using `user_id` or `group_id` clauses.
+If the `client_ids` option is supplied with either the `user_ids` or `group_ids` options when publishing a message, the `client_ids` option will be applied unconditionally and messages will be filtered further using `user_id` or `group_id` clauses.
 
 ```ruby
 MessageBus.publish "/channel", "hello", client_ids: ["XXX", "YYY"], user_ids: [1, 2, 3], group_ids: [1, 2, 3]
@@ -245,7 +245,7 @@ end)
 MessageBus.publish "/channel", "some message"
 
 # you can also choose to pass the `:site_id`.
-# This takes precendence over whatever `site_id_lookup`
+# This takes precedence over whatever `site_id_lookup`
 # returns
 MessageBus.publish "/channel", "some message", site_id: "site-id"
 
@@ -454,7 +454,7 @@ using a packed string encoder.
 
 Keep in mind, much of MessageBus internals and supporting tools expect data to be converted to JSON and back, if you use a naive (and fast) `Marshal` based codec you may need to limit the features you use. Specifically the Postgresql backend expects the codec never to return a string with `\u0000`, additionally some classes like DistributedCache expect keys to be converted to Strings.
 
-Another example may be very large and complicated messages where Oj in compatability mode outperforms JSON. To opt for the Oj codec use:
+Another example may be very large and complicated messages where Oj in compatibility mode outperforms JSON. To opt for the Oj codec use:
 
 ```
 MessageBus.configure(transport_codec: MessageBus::Codec::Oj.new)

data/Rakefile

@@ -4,12 +4,8 @@ require 'rake/testtask'
 require 'bundler'
 require 'bundler/gem_tasks'
 require 'bundler/setup'
-require 'jasmine'
-
-ENV['JASMINE_CONFIG_PATH'] ||= File.join(Dir.pwd, 'spec', 'assets', 'support', 'jasmine.yml')
-load 'jasmine/tasks/jasmine.rake'
-
 require 'rubocop/rake_task'
+
 RuboCop::RakeTask.new
 
 require 'yard'
@@ -35,7 +31,14 @@ module Bundler
   end
 end
 
-task spec_client_js: 'jasmine:ci'
+namespace :jasmine do
+  desc "Run Jasmine tests in headless mode"
+  task 'ci' do
+    if !system("npx jasmine-browser-runner runSpecs")
+      exit 1
+    end
+  end
+end
 
 backends = Dir["lib/message_bus/backends/*.rb"].map { |file| file.match(%r{backends/(?<backend>.*).rb})[:backend] } - ["base"]
 
@@ -57,6 +60,8 @@ namespace :spec do
 
   desc "Run integration tests"
   task :integration do
+    require "socket"
+
     def port_available?(port)
       server = TCPServer.open("0.0.0.0", port)
       server.close
@@ -78,7 +83,7 @@ namespace :spec do
 end
 
 desc "Run tests on all backends, plus client JS tests"
-task spec: backends.map { |backend| "spec:#{backend}" } + [:spec_client_js, "spec:integration"]
+task spec: backends.map { |backend| "spec:#{backend}" } + ["jasmine:ci", "spec:integration"]
 
 desc "Run performance benchmarks on all backends"
 task :performance do

data/assets/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;
   };
 

data/bench/codecs/marshal.rb

@@ -6,6 +6,6 @@ class MarshalCodec
   end
 
   def decode(payload)
-    ::Marshal.load(payload)
+    ::Marshal.load(payload) # rubocop:disable Security/MarshalLoad
   end
 end

data/bench/codecs/packed_string.rb

@@ -55,7 +55,7 @@ class PackedString
   end
 
   def decode(payload)
-    result = Marshal.load(payload)
+    result = Marshal.load(payload) # rubocop:disable Security/MarshalLoad
     result["data"] = ::Oj.load(result["data"], @oj_options)
 
     if str = result["user_ids"]

data/examples/bench/bench.lua

@@ -1,9 +1,9 @@
 -- wrk returns lots of read errors, this is unavoidable cause
 --
--- 1. There is no internal implmentation of chunked encoding in wrk (which would be ideal)
+-- 1. There is no internal implementation of chunked encoding in wrk (which would be ideal)
 --
 -- 2. MessageBus gem does not provide http keepalive (by design), and can not provide content length
---   if MessageBus provided keepalive it would have to be able to redispatch the reqs to rack, something
+--   if MessageBus provided keepalive it would have to be able to re-dispatch requests to rack, something
 --   that is not supported by the underlying rack hijack protocol, once a req is hijacked it can not be
 --   returned
 --

data/lib/message_bus/backends/base.rb

@@ -62,7 +62,7 @@ module MessageBus
       attr_accessor :max_backlog_size
       # @return [Integer] the largest permitted size (number of messages) for the global backlog; beyond this capacity, old messages will be dropped.
       attr_accessor :max_global_backlog_size
-      # @return [Integer] the longest amount of time a message may live in a backlog before beging removed, in seconds.
+      # @return [Integer] the longest amount of time a message may live in a backlog before being removed, in seconds.
       attr_accessor :max_backlog_age
       # Typically, backlogs are trimmed whenever we publish to them. This setting allows some tolerance in order to improve performance.
       # @return [Integer] the interval of publications between which the backlog will not be cleared.
@@ -74,7 +74,7 @@ module MessageBus
       # @param [Integer] max_backlog_size the largest permitted size (number of messages) for per-channel backlogs; beyond this capacity, old messages will be dropped.
       def initialize(config = {}, max_backlog_size = 1000); end
 
-      # Performs routines specific to the backend that are necessary after a process fork, typically triggerd by a forking webserver. Typically this re-opens sockets to the backend.
+      # Performs routines specific to the backend that are necessary after a process fork, typically triggered by a forking webserver. Typically this re-opens sockets to the backend.
       def after_fork
         raise ConcreteClassMustImplementError
       end
@@ -96,7 +96,7 @@ module MessageBus
       # @param [JSON] data some data to publish to the channel. Must be an object that can be encoded as JSON
       # @param [Hash] opts
       # @option opts [Boolean] :queue_in_memory (true) whether or not to hold the message in an in-memory buffer if publication fails, to be re-tried later
-      # @option opts [Integer] :max_backlog_age (`self.max_backlog_age`) the longest amount of time a message may live in a backlog before beging removed, in seconds
+      # @option opts [Integer] :max_backlog_age (`self.max_backlog_age`) the longest amount of time a message may live in a backlog before being removed, in seconds
       # @option opts [Integer] :max_backlog_size (`self.max_backlog_size`) the largest permitted size (number of messages) for the channel backlog; beyond this capacity, old messages will be dropped
       #
       # @return [Integer] the channel-specific ID the message was given

data/lib/message_bus/backends/postgres.rb

@@ -44,6 +44,7 @@ module MessageBus
           @listening_on = {}
           @available = []
           @allocated = {}
+          @subscribe_connection = nil
           @mutex = Mutex.new
           @pid = Process.pid
         end
@@ -131,7 +132,7 @@ module MessageBus
           listener = Listener.new
           yield listener
 
-          conn = raw_pg_connection
+          conn = @subscribe_connection = raw_pg_connection
           conn.exec "LISTEN #{channel}"
           listener.do_sub.call
           while listening_on?(channel, obj)
@@ -145,6 +146,9 @@ module MessageBus
 
           conn.exec "UNLISTEN #{channel}"
           nil
+        ensure
+          @subscribe_connection&.close
+          @subscribe_connection = nil
         end
 
         def unsubscribe
@@ -251,7 +255,7 @@ module MessageBus
         @clear_every = config[:clear_every] || 1
       end
 
-      # Reconnects to Postgres; used after a process fork, typically triggerd by a forking webserver
+      # Reconnects to Postgres; used after a process fork, typically triggered by a forking webserver
       # @see Base#after_fork
       def after_fork
         client.reconnect
@@ -277,7 +281,7 @@ module MessageBus
         msg = MessageBus::Message.new backlog_id, backlog_id, channel, data
         payload = msg.encode
         c.publish postgresql_channel_name, payload
-        if backlog_id % clear_every == 0
+        if backlog_id && backlog_id % clear_every == 0
           max_backlog_size = (opts && opts[:max_backlog_size]) || self.max_backlog_size
           max_backlog_age = (opts && opts[:max_backlog_age]) || self.max_backlog_age
           c.clear_global_backlog(backlog_id, @max_global_backlog_size)

data/lib/message_bus/backends/redis.rb

@@ -62,7 +62,7 @@ module MessageBus
         @max_backlog_age = 604800
       end
 
-      # Reconnects to Redis; used after a process fork, typically triggerd by a forking webserver
+      # Reconnects to Redis; used after a process fork, typically triggered by a forking webserver
       # @see Base#after_fork
       def after_fork
         pub_redis.disconnect!

data/lib/message_bus/client.rb

@@ -220,7 +220,7 @@ class MessageBus::Client
 
   private
 
-  # heavily optimised to avoid all uneeded allocations
+  # heavily optimised to avoid all unneeded allocations
   NEWLINE = "\r\n".freeze
   COLON_SPACE = ": ".freeze
   HTTP_11 = "HTTP/1.1 200 OK\r\n".freeze
@@ -261,7 +261,7 @@ class MessageBus::Client
       @wrote_headers = true
     end
 
-    # chunked encoding may be "re-chunked" by proxies, so add a seperator
+    # chunked encoding may be "re-chunked" by proxies, so add a separator
     postfix = NEWLINE + "|" + NEWLINE
     data = data.gsub(postfix, NEWLINE + "||" + NEWLINE)
     chunk_length = data.bytesize + postfix.bytesize
@@ -275,11 +275,7 @@ class MessageBus::Client
       @async_response << postfix
       @async_response << NEWLINE
     else
-      @io.write(chunk_length.to_s(16))
-      @io.write(NEWLINE)
-      @io.write(data)
-      @io.write(postfix)
-      @io.write(NEWLINE)
+      @io.write(chunk_length.to_s(16) << NEWLINE << data << postfix << NEWLINE)
     end
   end
 

data/lib/message_bus/connection_manager.rb

@@ -37,7 +37,7 @@ class MessageBus::ConnectionManager
             rescue
               # pipe may be broken, move on
             end
-            # turns out you can delete from a set while itereating
+            # turns out you can delete from a set while iterating
             remove_client(client) if client.closed?
           end
         end

data/lib/message_bus/distributed_cache.rb

@@ -45,7 +45,8 @@ module MessageBus
             hash = current.hash(message.site_id || DEFAULT_SITE_ID)
 
             case payload["op"]
-            when "set" then hash[payload["key"]] = payload["marshalled"] ? Marshal.load(Base64.decode64(payload["value"])) : payload["value"]
+            # TODO: consider custom marshal support with a restricted set
+            when "set" then hash[payload["key"]] = payload["marshalled"] ? Marshal.load(Base64.decode64(payload["value"])) : payload["value"] # rubocop:disable Security/MarshalLoad
             when "delete" then hash.delete(payload["key"])
             when "clear"  then hash.clear
             end

data/lib/message_bus/http_client.rb

@@ -146,8 +146,8 @@ module MessageBus
     #
     # A last_message_id may be provided.
     #  * -1 will subscribe to all new messages
-    #  * -2 will recieve last message + all new messages
-    #  * -3 will recieve last 2 message + all new messages
+    #  * -2 will receive last message + all new messages
+    #  * -3 will receive last 2 message + all new messages
     #
     # @example Subscribing to a channel with `last_message_id`
     #   client.subscribe("/test", last_message_id: -2) do |payload|

data/lib/message_bus/rack/diagnostics.rb

@@ -13,6 +13,15 @@ class MessageBus::Rack::Diagnostics
     @bus = config[:message_bus] || MessageBus
   end
 
+  JS_ASSETS = %w{
+    jquery-1.8.2.js
+    react.js
+    react-dom.js
+    babel.min.js
+    message-bus.js
+    application.jsx
+  }
+
   # Process an HTTP request from a subscriber client
   # @param [Rack::Request::Env] env the request environment
   def call(env)
@@ -39,9 +48,9 @@ class MessageBus::Rack::Diagnostics
     end
 
     asset = route.split('/assets/')[1]
-    if asset && !asset !~ /\//
+
+    if asset && JS_ASSETS.include?(asset)
       content = asset_contents(asset)
-      split = asset.split('.')
       return [200, { 'Content-Type' => 'application/javascript;charset=UTF-8' }, [content]]
     end
 
@@ -75,6 +84,23 @@ class MessageBus::Rack::Diagnostics
     File.expand_path("../../../../assets/#{asset}", __FILE__)
   end
 
+  def script_tags
+    tags = []
+
+    JS_ASSETS.each do |asset|
+      type =
+        if asset.end_with?('.js')
+          'text/javascript'
+        elsif asset.end_with?('.jsx')
+          'text/jsx'
+        end
+
+      tags << js_asset(asset, type)
+    end
+
+    tags.join("\n")
+  end
+
   def index
     html = <<~HTML
       <!DOCTYPE html>
@@ -83,12 +109,8 @@ class MessageBus::Rack::Diagnostics
         </head>
         <body>
           <div id="app"></div>
-          #{js_asset "jquery-1.8.2.js"}
-          #{js_asset "react.js"}
-          #{js_asset "react-dom.js"}
-          #{js_asset "babel.min.js"}
-          #{js_asset "message-bus.js"}
-          #{js_asset "application.jsx", "text/jsx"}
+
+          #{script_tags}
         </body>
       </html>
     HTML

data/lib/message_bus/rack/middleware.rb

@@ -66,6 +66,12 @@ class MessageBus::Rack::Middleware
   private
 
   def handle_request(env)
+    # Prevent simple polling from clobbering the session
+    # See: https://github.com/discourse/message_bus/issues/257
+    if (rack_session_options = env[Rack::RACK_SESSION_OPTIONS])
+      rack_session_options[:skip] = true
+    end
+
     # special debug/test route
     if @bus.allow_broadcast? && env['PATH_INFO'] == @broadcast_route
       parsed = Rack::Request.new(env)

data/lib/message_bus/rack/thin_ext.rb

@@ -38,7 +38,7 @@ module Thin
     end
   end
 
-  # Response whos body is sent asynchronously.
+  # Response which body is sent asynchronously.
   class AsyncResponse
     include Rack::Response::Helpers