async-cable 0.1.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d7aec9e4d2af6f7e33c0684d7e5f1d7ec6484cd055f2be48bd08b4f635935a5
-  data.tar.gz: 4bac0fc445833442bab84556ca34aed98872e9f1d250b411a8abfef777c85555
+  metadata.gz: b9aa3fe6a825d58f713ffd71b32b26bd034de7f3175ee6b9505e4f53433f6999
+  data.tar.gz: 5bea7df4792f6f0bf2ed0847437ac13f23972de50b443854f597b4f9b8b6defa
 SHA512:
-  metadata.gz: 3af7edbe1360eff3316b2fc88076476006ad39f607a20fdf112ddb40130dad0b9cd26316cc7c14e6c7af9cbe6a5320daab159ff71e219799ba9445592d523a2f
-  data.tar.gz: 8c021590476f294e34448d59d629fd9499f082ba5a8ed68d72677f52c799fcbd2a10cc7872c10e6ccc317e093ec708c992c70b8e055478ce66b1576b814cb7df
+  metadata.gz: 2291b430d4dbfd1072d8dadb1643857e71e84ef749dd08f6bb97168cdb842af6edf6da703d41acc370d9899e0130fffd068ac568a0d5bf269306746e3aeefe11
+  data.tar.gz: aa8346b8289d1dbe14e606631506ee5a2801cef846a67b13cb0e092806f0da1c6cdf980358b43163c3b2a614fea71bd5f8363383051f741ff39a03794a0e5ff7

data/lib/async/cable/middleware.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Released under the MIT License.
 # Copyright, 2024, by Samuel Williams.
 
@@ -10,8 +11,9 @@ require_relative "socket"
 module Async
 	module Cable
 		class Middleware
-			def initialize(app, server: ActionCable.server)
+			def initialize(app, path: "/cable", server: ActionCable.server)
 				@app = app
+				@path = path
 				@server = server
 				@coder = ActiveSupport::JSON
 				@protocols = ::ActionCable::INTERNAL[:protocols]
@@ -19,8 +21,12 @@ module Async
 			
 			attr :server
 			
+			def valid_path?(env)
+				env["PATH_INFO"] == @path
+			end
+			
 			def call(env)
-				if Async::WebSocket::Adapters::Rack.websocket?(env) and allow_request_origin?(env)
+				if valid_path?(env) and Async::WebSocket::Adapters::Rack.websocket?(env) and allow_request_origin?(env)
 					Async::WebSocket::Adapters::Rack.open(env, protocols: @protocols) do |websocket|
 						handle_incoming_websocket(env, websocket)
 					end
@@ -42,13 +48,13 @@ module Async
 				socket_task = socket.run
 				
 				while message = websocket.read
-					Console.debug(self, "Received cable data:", message.buffer)
+					# Console.debug(self, "Received cable data:", message.buffer)
 					connection.handle_incoming(@coder.decode(message.buffer))
 				end
 			rescue Protocol::WebSocket::ClosedError, EOFError
 				# This is a normal disconnection.
 			rescue => error
-				Console.warn(self, error)
+				Console.warn(self, "Abnormal client failure!", error)
 			ensure
 				if connection
 					@server.remove_connection(connection)

data/lib/async/cable/socket.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Released under the MIT License.
 # Copyright, 2024, by Samuel Williams.
 
@@ -33,12 +34,16 @@ module Async::Cable
 		def run(parent: Async::Task.current)
 			parent.async do
 				while buffer = @output.pop
+					# Console.debug(self, "Sending cable data:", buffer, flush: @output.empty?)
 					@websocket.send_text(buffer)
 					@websocket.flush if @output.empty?
 				end
 			rescue => error
+				Console.error(self, "Error while sending cable data:", error)
 			ensure
-				@websocket.close_write(error)
+				unless @websocket.closed?
+					@websocket.close_write(error)
+				end
 			end
 		end
 		

data/lib/async/cable/version.rb

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
+
 # Released under the MIT License.
 # Copyright, 2023-2024, by Samuel Williams.
 
 module Async
 	module Cable
-		VERSION = "0.1.0"
+		VERSION = "0.3.0"
 	end
 end

data/readme.md

@@ -14,6 +14,14 @@ Please see the [project documentation](https://socketry.github.io/async-cable/)
 
 Please see the [project releases](https://socketry.github.io/async-cable/releases/index) for all releases.
 
+### v0.3.0
+
+  - Filter requests based on path - don't eat all inbound WebSocket connections.
+
+### v0.2.0
+
+  - Don't close the WebSocket if it is already closed.
+
 ### v0.1.0
 
   - Initial implementation.

data/releases.md

@@ -1,5 +1,13 @@
 # Releases
 
+## v0.3.0
+
+  - Filter requests based on path - don't eat all inbound WebSocket connections.
+
+## v0.2.0
+
+  - Don't close the WebSocket if it is already closed.
+
 ## v0.1.0
 
   - Initial implementation.

metadata

@@ -1,11 +1,10 @@
 --- !ruby/object:Gem::Specification
 name: async-cable
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Samuel Williams
-autorequire:
 bindir: bin
 cert_chain:
 - |
@@ -37,7 +36,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2024-11-19 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actioncable-next
@@ -81,13 +80,10 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
-email:
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/action_cable/subscription_adapters/async_cable_redis.rb
 - lib/async/cable.rb
 - lib/async/cable/middleware.rb
 - lib/async/cable/railtie.rb
@@ -96,13 +92,11 @@ files:
 - license.md
 - readme.md
 - releases.md
-homepage:
 licenses:
 - MIT
 metadata:
   documentation_uri: https://socketry.github.io/async-cable/
   source_code_uri: https://github.com/socketry/async-cable
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -110,15 +104,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.1'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: An asynchronous adapter for ActionCable.
 test_files: []

data/lib/action_cable/subscription_adapters/async_cable_redis.rb

@@ -1,82 +0,0 @@
-# frozen_string_literal: true
-# Released under the MIT License.
-# Copyright, 2024, by Samuel Williams.
-
-require "action_cable/subscription_adapter/base"
-require "action_cable/subscription_adapter/channel_prefix"
-require "action_cable/subscription_adapter/subscriber_map"
-
-require "async/redis"
-
-module ActionCable::SubscriptionAdapter
-	class AsyncCableRedis < Base
-		prepend ChannelPrefix
-		
-		def initialize(*arguments, endpoint: nil, **options)
-			super(*arguments, **options)
-			
-			@endpoint = endpoint || ::Async::Redis.local_endpoint
-			@client = ::Async::Redis::Client.new(endpoint)
-			
-			@subscriber = Subscriber.new(@client, self.executor)
-		end
-		
-		def subscribe(channel, callback, success_callback = nil)
-			@subscriber.add_subscriber(channel, callback, success_callback)
-		end
-		
-		def unsubscribe(channel, callback)
-			@subscriber.remove_subscriber(channel, callback)
-		end
-		
-		def broadcast(channel, payload)
-			@client.publish(channel, payload)
-		end
-		
-		def shutdown
-			@subscriber&.close
-		end
-		
-		private
-		
-		class Subscriber < SubscriberMap::Async
-			CHANNEL = "_action_cable_internal"
-			
-			def initialize(client, executor, parent: Async::Task.current)
-				super(executor)
-				
-				@context = @client.subscribe(CHANNEL)
-				@task = parent.async{self.listen(CHANNEL)}
-			end
-
-			def add_channel(channel, on_success)
-				@context.subscribe(channel)
-				on_success&.call
-			end
-
-			def remove_channel(channel)
-				@context.unsubscribe(channel)
-			end
-
-			def close
-				if task = @task
-					@task = nil
-					task.stop
-				end
-				
-				if context = @context
-					@context = nil
-					context.close
-				end
-			end
-
-			private
-
-			def listen
-				context.each do |type, channel, message|
-					self.broadcast(event[1], event[2])
-				end
-			end
-		end
-	end
-end