Merge pull request #37 from basecamp/isolated-ac-server

Use a separate action cable server for hotwire-spark

app/assets/javascripts/hotwire_spark.js

@@ -512,7 +512,7 @@ var HotwireSpark = (function () {
     }
   }
 
-  var consumer = createConsumer();
+  var consumer = createConsumer("/hotwire-spark");
 
   function assetNameFromPath(path) {
     return path.split("/").pop().split(".")[0];

app/javascript/hotwire/spark/channels/consumer.js

@@ -1,3 +1,3 @@
 import { createConsumer } from "@rails/actioncable"
 
-export default createConsumer()
+export default createConsumer("/hotwire-spark")

lib/hotwire-spark.rb

@@ -23,5 +23,9 @@ def install_into(application)
     def enabled?
       enabled && defined?(Rails::Server)
     end
+
+    def cable_server
+      @server ||= Hotwire::Spark::ActionCable::Server.new
+    end
   end
 end

lib/hotwire/spark/action_cable/server.rb

@@ -0,0 +1,7 @@
+class Hotwire::Spark::ActionCable::Server < ActionCable::Server::Base
+  def initialize(config: nil)
+    config = ::ActionCable::Server::Base.config.dup
+    config.connection_class = -> { ::ActionCable::Connection::Base }
+    super(config: config)
+  end
+end

lib/hotwire/spark/engine.rb

@@ -12,7 +12,7 @@ class Engine < ::Rails::Engine
       html_paths: %w[ app/controllers app/helpers app/models app/views ],
       stimulus_paths: %w[ app/javascript/controllers ]
 
-    initializer "hotwire_spark.config" do |app|
+    initializer "hotwire_spark.config" do |application|
       config.hotwire.spark.each do |key, value|
         Hotwire::Spark.send("#{key}=", value)
       end

lib/hotwire/spark/installer.rb

@@ -6,21 +6,25 @@ def initialize(application)
   end
 
   def install
+    configure_cable_server
     configure_middleware
     monitor_paths
   end
 
   def configure_middleware
-    ::ActionCable::Server::Base.prepend(Hotwire::Spark::ActionCable::PersistentCableServer)
-
-    middleware.insert_before ActionDispatch::Executor, Hotwire::Spark::ActionCable::PersistentCableMiddleware
     middleware.use Hotwire::Spark::Middleware
   end
 
   private
     attr_reader :application
     delegate :middleware, to: :application
 
+    def configure_cable_server
+      application.routes.prepend do
+        mount Hotwire::Spark.cable_server => "/hotwire-spark", internal: true, anchor: true
+      end
+    end
+
     def monitor_paths
       register_monitored_paths
       file_watcher.start
@@ -39,7 +43,7 @@ def monitor(paths_name, action:)
     end
 
     def broadcast_reload_action(action, file_path)
-      ActionCable.server.broadcast "hotwire_spark", reload_message_for(action, file_path)
+      Hotwire::Spark.cable_server.broadcast "hotwire_spark", reload_message_for(action, file_path)
     end
 
     def reload_message_for(action, file_path)

test/test_helper.rb

@@ -16,18 +16,11 @@
 
 require "helpers/files_helper"
 
-::ActionCable::Server::Base.prepend(Hotwire::Spark::ActionCable::PersistentCableServer)
-
 class ActiveSupport::TestCase
   include FilesHelper
 
   setup do
     reload_rails_reloader
-    ActionCable.server.suppress_restarts = true
-  end
-
-  teardown do
-    ActionCable.server.suppress_restarts = false
   end
 
   private