+ falcon

anycable · Sep 14, 2024 · 724d2e7 · 724d2e7
1 parent 5132136
commit 724d2e7
Show file tree

Hide file tree

Showing 9 changed files with 304 additions and 104 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -31,6 +31,9 @@ jobs:
           - server: "iodine"
             rails_version: "dev"
             scenario: "broadcast"
+          - server: "falcon"
+            rails_version: "dev"
+            scenario: "broadcast"
     steps:
     - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
@@ -66,6 +69,8 @@ jobs:
         include:
           - server: "iodine"
             rails_version: "dev"
+          - server: "falcon"
+            rails_version: "dev"
     steps:
     - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1

diff --git a/Gemfile b/Gemfile
@@ -20,7 +20,9 @@ gem "puma", "~> 6.4"
 gem "redis", "~> 5.0"
 
 # Async setup
-# TODO
+gem "falcon"
+gem "async-websocket"
+gem "async-redis"
 
 # Iodine
 gem "iodine", require: false

diff --git a/Makefile b/Makefile
@@ -32,6 +32,14 @@ anyt-anycable: bin/dist/anycable-go
 	bundle exec anyt -c "bin/dist/anycable-go" --target-url="ws://localhost:8080/cable"
 
 anyt-iodine:
-	@bundle exec anyt --self-check --require=scripts/anyt/rails/*.rb --rails-command="bundle exec iodine -p 9292 -t 5 -w 2 %{config}" --except=features/server_restart
+	@bundle exec anyt --self-check --require="{lib/servers/iodine.rb,scripts/anyt/rails/*.rb}" \
+		--rails-command="bundle exec iodine scripts/anyt/iodine.ru -p 9292 -t 5 -w 2" \
+		--except=streams/single
+
+anyt-falcon:
+	ACTION_CABLE_ADAPTER=redis \
+	bundle exec anyt --self-check --require="{lib/servers/falcon.rb,scripts/anyt/rails/*.rb}" \
+		--rails-command="bundle exec ruby scripts/anyt/falcon.rb" \
+		--except=features/server_restart,request/disconnection,features/channel_state
 
 .PHONY: websocket-bench
diff --git a/lib/application.rb b/lib/application.rb
@@ -27,6 +27,10 @@ class App < Rails::Application
   end
 end
 
+ActionCable.server.config.cable = {
+  "adapter" => ENV.fetch("ACTION_CABLE_ADAPTER", "redis"),
+  "url" => ENV["REDIS_URL"]
+}
 ActionCable.server.config.connection_class = -> { ApplicationCable::Connection }
 ActionCable.server.config.disable_request_forgery_protection = true
 ActionCable.server.config.logger = Rails.logger

diff --git a/lib/servers/anycable.rb b/lib/servers/anycable.rb
@@ -3,10 +3,7 @@
 require "redis"
 require "anycable-rails"
 
-ActionCable.server.config.cable = {
-  "adapter" => $benchmark_server == :anycable ? "any_cable" : "redis",
-  "url" => ENV["REDIS_URL"]
-}
+ActionCable.server.config.cable = {"adapter" => "any_cable"}
 
 class BenchmarkServer
   def self.run!