async-websocket 0.17.0 → 0.19.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2b2cae182fcc4c6dbfd9724236afc25472d930a98be9496b4bc2af6f67ad502
-  data.tar.gz: a9bb7c63e69247a287bd512973788d0e807b6464835ebef1f5d5d1c407574327
+  metadata.gz: 0a471c482c07189921b6c9af76ea30c02e31d677897567b0616de7c818258cb5
+  data.tar.gz: e3d34e6f906b3271ea1da568d450f46faf1e84eaed512f74ef3ba4e275a6fdbf
 SHA512:
-  metadata.gz: e0f1f16a9e9fecfa3b68eec6c3b18b63588477ef3b4d2049d42a017e9f35073c6b54641585db4cbebaeff53a37537c742130354ee604620c68c79b24980d6bdf
-  data.tar.gz: 2b43de05bcffc2089345160f21e853bba156430b183ce8b0268ca229c0903f11b723849bcec6d8117271580d9265b2ac0999aacd7be9d336987401ec09c179ba
+  metadata.gz: f7ad0c1cbdf9c9e4ccfe35e313474890ed9a134dacbbb1a26c584810619445db585e6fea6620390b10da44bbaa300bc4824879a8feb64505b21c1f6f35bc9d4c
+  data.tar.gz: a27f16b8ec763fc216d4fbe63c6867289aebc25e952b68d56517c318d32504b47a2c38d791053547f0c511b512c89c017cd61fe1c1966e26d1b57904018b733c

data/lib/async/websocket/adapters/http.rb

@@ -0,0 +1,64 @@
+# frozen_string_literals: true
+#
+# Copyright, 2019, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 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.
+
+require_relative '../connection'
+require_relative '../response'
+
+module Async
+	module WebSocket
+		module Adapters
+			module HTTP
+				include ::Protocol::WebSocket::Headers
+				
+				def self.websocket?(request)
+					Array(request.protocol).any? { |e| e.casecmp?(PROTOCOL) }
+				end
+				
+				def self.open(request, headers: [], protocols: [], handler: Connection, **options, &block)
+					if websocket?(request)
+						# Select websocket sub-protocol:
+						if requested_protocol = request.headers[SEC_WEBSOCKET_PROTOCOL]
+							protocol = (requested_protocol & protocols).first
+						end
+						
+						response = Response.for(request, headers, protocol: protocol, **options) do |stream|
+							# Once we get to this point, we no longer need to hold on to the response:
+							response = nil
+							
+							framer = Protocol::WebSocket::Framer.new(stream)
+							connection = handler.call(framer, protocol)
+							
+							yield connection
+							
+							connection.close unless connection.closed?
+						end
+						
+						# Once we get to this point, we no longer need to hold on to the request:
+						request = nil
+						
+						return response
+					end
+				end
+			end
+		end
+	end
+end

data/lib/async/websocket/adapters/rack.rb

@@ -20,8 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require_relative '../connection'
-require_relative '../response'
+require_relative 'http'
 
 module Async
 	module WebSocket
@@ -33,37 +32,21 @@ module Async
 					request = env['async.http.request'] and Array(request.protocol).include?(PROTOCOL)
 				end
 				
-				def self.open(env, headers: [], protocols: [], handler: Connection, **options, &block)
-					if request = env['async.http.request'] and Array(request.protocol).include?(PROTOCOL)
+				def self.open(env, **options, &block)
+					if request = env['async.http.request']
 						env = nil
 						
-						# Select websocket sub-protocol:
-						if requested_protocol = request.headers[SEC_WEBSOCKET_PROTOCOL]
-							protocol = (requested_protocol & protocols).first
-						end
-						
-						response = Response.for(request, headers, protocol: protocol, **options) do |stream|
-							response = nil
-							
-							framer = Protocol::WebSocket::Framer.new(stream)
-							
-							connection = handler.call(framer, protocol)
+						if response = HTTP.open(request, **options, &block)
+							headers = response.headers
 							
-							yield connection
+							if protocol = response.protocol
+								headers = Protocol::HTTP::Headers::Merged.new(headers, [
+									['rack.protocol', protocol]
+								])
+							end
 							
-							connection.close unless connection.closed?
+							return [response.status, headers.to_h, response.body]
 						end
-						
-						request = nil
-						headers = response.headers
-						
-						if protocol = response.protocol
-							headers = Protocol::HTTP::Headers::Merged.new(headers, [
-								['rack.protocol', protocol]
-							])
-						end
-						
-						return [response.status, headers.to_h, response.body]
 					end
 				end
 			end

data/lib/async/websocket/adapters/rails.rb

@@ -0,0 +1,44 @@
+# frozen_string_literals: true
+#
+# Copyright, 2019, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 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.
+
+require_relative 'rack'
+
+module Async
+	module WebSocket
+		module Adapters
+			module Rails
+				def self.open(request, **options, &block)
+					if response = Rack.open(request.env, **options, &block)
+						response[1]['rack.hijack'] = lambda do |stream|
+							response[2].call(stream)
+						end
+						
+						# Close the response to prevent Rails from... trying to render a view?
+						return ::ActionDispatch::Response.new(response[0], response[1], nil).tap(&:close)
+					end
+					
+					return ::ActionDispatch::Response.new(404, [], [])
+				end
+			end
+		end
+	end
+end

data/lib/async/websocket/client.rb

@@ -49,16 +49,16 @@ module Async
 			
 			# @return [Connection] an open websocket connection to the given endpoint.
 			def self.connect(endpoint, *args, **options, &block)
-				self.open(endpoint, *args) do |client|
-					connection = client.connect(endpoint.authority, endpoint.path, **options)
+				client = self.open(endpoint, *args)
+				connection = client.connect(endpoint.authority, endpoint.path, **options)
 					
-					return connection unless block_given?
+				return connection unless block_given?
 					
-					begin
-						yield connection
-					ensure
-						connection.close
-					end
+				begin
+					yield connection
+				ensure
+					connection.close
+					client.close
 				end
 			end
 			

data/lib/async/websocket/version.rb

@@ -20,6 +20,6 @@
 
 module Async
 	module WebSocket
-		VERSION = "0.17.0"
+		VERSION = "0.19.1"
 	end
 end

data.tar.gz.sig

@@ -0,0 +1,5 @@
+��[��ǽ�Kp��[��aALʟ0��G�G��Nt�]1��b����ק�)�tx�FV;��S
�>λ�o�D� ��+�t�'��=�F��l���	q���T:������w����!8ᶔ�S�K�뺳K�P*'8Q<7�U
+\�t�{t���0���#h�&��G-�n�k��
+��hص��[X�HG���
+,�z
+!ʈ|�h�$�uU���6�

metadata

@@ -1,14 +1,50 @@
 --- !ruby/object:Gem::Specification
 name: async-websocket
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.19.1
 platform: ruby
 authors:
 - Samuel Williams
+- destructobeam
+- Olle Jonsson
+- Aurora
+- Bryan Powell
+- Gleb Sinyavskiy
+- Janko Marohnić
+- Michel Boaventura
+- jaml
 autorequire:
 bindir: bin
-cert_chain: []
-date: 2021-02-13 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIEhDCCAuygAwIBAgIBATANBgkqhkiG9w0BAQsFADA3MTUwMwYDVQQDDCxzYW11
+  ZWwud2lsbGlhbXMvREM9b3Jpb250cmFuc2Zlci9EQz1jby9EQz1uejAeFw0yMTA4
+  MTYwNjMzNDRaFw0yMjA4MTYwNjMzNDRaMDcxNTAzBgNVBAMMLHNhbXVlbC53aWxs
+  aWFtcy9EQz1vcmlvbnRyYW5zZmVyL0RDPWNvL0RDPW56MIIBojANBgkqhkiG9w0B
+  AQEFAAOCAY8AMIIBigKCAYEAyXLSS/cw+fXJ5e7hi+U/TeChPWeYdwJojDsFY1xr
+  xvtqbTTL8gbLHz5LW3QD2nfwCv3qTlw0qI3Ie7a9VMJMbSvgVEGEfQirqIgJXWMj
+  eNMDgKsMJtC7u/43abRKx7TCURW3iWyR19NRngsJJmaR51yGGGm2Kfsr+JtKKLtL
+  L188Wm3f13KAx7QJU8qyuBnj1/gWem076hzdA7xi1DbrZrch9GCRz62xymJlrJHn
+  9iZEZ7AxrS7vokhMlzSr/XMUihx/8aFKtk+tMLClqxZSmBWIErWdicCGTULXCBNb
+  E/mljo4zEVKhlTWpJklMIhr55ZRrSarKFuW7en0+tpJrfsYiAmXMJNi4XAYJH7uL
+  rgJuJwSaa/dMz+VmUoo7VKtSfCoOI+6v5/z0sK3oT6sG6ZwyI47DBq2XqNC6tnAj
+  w+XmCywiTQrFzMMAvcA7rPI4F0nU1rZId51rOvvfxaONp+wgTi4P8owZLw0/j0m4
+  8C20DYi6EYx4AHDXiLpElWh3AgMBAAGjgZowgZcwCQYDVR0TBAIwADALBgNVHQ8E
+  BAMCBLAwHQYDVR0OBBYEFB6ZaeWKxQjGTI+pmz7cKRmMIywwMC4GA1UdEQQnMCWB
+  I3NhbXVlbC53aWxsaWFtc0BvcmlvbnRyYW5zZmVyLmNvLm56MC4GA1UdEgQnMCWB
+  I3NhbXVlbC53aWxsaWFtc0BvcmlvbnRyYW5zZmVyLmNvLm56MA0GCSqGSIb3DQEB
+  CwUAA4IBgQBVoM+pu3dpdUhZM1w051iw5GfiqclAr1Psypf16Tiod/ho//4oAu6T
+  9fj3DPX/acWV9P/FScvqo4Qgv6g4VWO5ZU7z2JmPoTXZtYMunRAmQPFL/gSUc6aK
+  vszMHIyhtyzRc6DnfW2AiVOjMBjaYv8xXZc9bduniRVPrLR4J7ozmGLh4o4uJp7w
+  x9KCFaR8Lvn/r0oJWJOqb/DMAYI83YeN2Dlt3jpwrsmsONrtC5S3gOUle5afSGos
+  bYt5ocnEpKSomR9ZtnCGljds/aeO1Xgpn2r9HHcjwnH346iNrnHmMlC7BtHUFPDg
+  Ts92S47PTOXzwPBDsrFiq3VLbRjHSwf8rpqybQBH9MfzxGGxTaETQYOd6b4e4Ag6
+  y92abGna0bmIEb4+Tx9rQ10Uijh1POzvr/VTH4bbIPy9FbKrRsIQ24qDbNJRtOpE
+  RAOsIl+HOBTb252nx1kIRN5hqQx272AJCbCjKx8egcUQKffFVVCI0nye09v5CK+a
+  HiLJ8VOFx6w=
+  -----END CERTIFICATE-----
+date: 2022-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-http
@@ -143,7 +179,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/async/websocket.rb
+- lib/async/websocket/adapters/http.rb
 - lib/async/websocket/adapters/rack.rb
+- lib/async/websocket/adapters/rails.rb
 - lib/async/websocket/client.rb
 - lib/async/websocket/connect_request.rb
 - lib/async/websocket/connect_response.rb
@@ -175,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: An async websocket library on top of websocket-driver.

metadata.gz.sig

@@ -0,0 +1,2 @@
+\�
C����p�T{�	���I�g�"����o˒:��O�4ޗ�_�2X@��X�����J�[K��
+�Y��lo{��T9>�?���tKJ`��m�_���/Xe�5�#՘�>J�՗�L�˦�����"�iǝ��ʰe4�x��	���e�T1��p����") E��H����GZ����6*���[���� P�,2�|���,��w!������E5G��h;�,[/