whoosh 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf87392b23cb5b6a3cdc3fc27c06df4d62d7dd3b780e8695f9479cf869a0922a
-  data.tar.gz: 249803c4606645c7032deae70836954c3f1255ed5c9bf44342d07cf50afb2214
+  metadata.gz: 5baff744454d485e7f9788aca18285ece0c8901a5abea6f9c2f3fd4a22a7de75
+  data.tar.gz: 6c2062d73b6bec5e60c0adfd897e7e8aec5d10fa366439471592fc196bfe5bbd
 SHA512:
-  metadata.gz: c871107c868e72d7f27596a48719dd752155d91ff114937b7448a7474e1a0ac6bdfa39dec8db23fe857e9728e3e2a0db3517013a70f820590386ebc7876b2707
-  data.tar.gz: 6ebad6447841c6587c0b3853fdb4f2666680db1e6e1eaf01a1fb1edb854af0a13ebd5e5a205b5866686346caf747a0aa49cbba30b2587afec681dc409829de23
+  metadata.gz: 7ef32b36e7405fe117eefc60908baf71a9553d328ccd2fd7823c715b7e37d4f01aeedc29a7cb1709e865410d407a32bc511f49353b90339702a06bb7f9a31425
+  data.tar.gz: 75188ded90b9205cb7c779d18252ef842989ec84d76ad78e1167d4ca267e544918b39c5d2a3596abe0b2d6001620e98e4272a75bdd62491b4130127bba78487c

data/lib/whoosh/streaming/websocket.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "json"
-require "faye/websocket"
 
 module Whoosh
   module Streaming
@@ -19,7 +18,8 @@ module Whoosh
 
       # Check if the request is a WebSocket upgrade
       def self.websocket?(env)
-        Faye::WebSocket.websocket?(env)
+        upgrade = env["HTTP_UPGRADE"]
+        upgrade && upgrade.downcase == "websocket"
       end
 
       # Register callbacks
@@ -46,18 +46,47 @@ module Whoosh
         return if @closed
         @closed = true
         @ws&.close(code || 1000, reason || "")
+      rescue
+        # Already closed
       end
 
       def closed?
         @closed
       end
 
-      # Returns a Rack response — hijacks the connection via faye-websocket
+      # Returns a Rack response — auto-detects Faye (Puma) or Async (Falcon)
       def rack_response
         unless self.class.websocket?(@env)
           return [400, { "content-type" => "text/plain" }, ["Not a WebSocket request"]]
         end
 
+        if async_websocket_available? && falcon_env?
+          rack_response_async
+        else
+          rack_response_faye
+        end
+      end
+
+      # For testing without real socket
+      def trigger_message(msg)
+        @on_message&.call(msg)
+      end
+
+      def trigger_close(code = 1000, reason = "")
+        @on_close&.call(code, reason)
+        @closed = true
+      end
+
+      def trigger_open
+        @on_open&.call
+      end
+
+      private
+
+      # Faye WebSocket — works with Puma (threads + EventMachine)
+      def rack_response_faye
+        require "faye/websocket"
+
         @ws = Faye::WebSocket.new(@env)
 
         @ws.on :open do |_event|
@@ -77,18 +106,52 @@ module Whoosh
         @ws.rack_response
       end
 
-      # For testing without real socket
-      def trigger_message(msg)
-        @on_message&.call(msg)
+      # Async WebSocket — works with Falcon (fibers + async)
+      def rack_response_async
+        require "async/websocket/adapters/rack"
+
+        Async::WebSocket::Adapters::Rack.open(@env, protocols: ["ws"]) do |connection|
+          @ws = AsyncWSWrapper.new(connection)
+          @on_open&.call
+
+          while (message = connection.read)
+            @on_message&.call(message.to_str)
+          end
+        rescue EOFError, Protocol::WebSocket::ClosedError
+          # Client disconnected
+        ensure
+          @closed = true
+          @on_close&.call(1000, "")
+          @ws = nil
+        end
       end
 
-      def trigger_close(code = 1000, reason = "")
-        @on_close&.call(code, reason)
-        @closed = true
+      def falcon_env?
+        # Falcon sets async.* keys in the env
+        @env.key?("async.reactor") || @env.key?("protocol.http.request")
       end
 
-      def trigger_open
-        @on_open&.call
+      def async_websocket_available?
+        require "async/websocket/adapters/rack"
+        true
+      rescue LoadError
+        false
+      end
+
+      # Wrapper to give async-websocket the same #send interface
+      class AsyncWSWrapper
+        def initialize(connection)
+          @connection = connection
+        end
+
+        def send(data)
+          @connection.write(Protocol::WebSocket::TextMessage.generate(data))
+          @connection.flush
+        end
+
+        def close(code = 1000, reason = "")
+          @connection.close
+        end
       end
     end
   end

data/lib/whoosh/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Whoosh
-  VERSION = "1.4.0"
+  VERSION = "1.4.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: whoosh
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Johannes Dwi Cahyo