async-websocket 0.18.0 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54e97832ebcebab09dfd5a042aad8532a7a5277cf6609fecae9f73a1826cac7d
-  data.tar.gz: 671da6e463ced51447b8cb49aabbb8b51d644a19adc655e9f955fe4b6772afd4
+  metadata.gz: 0fd37d5eb2b762f6f5d7bb8027d3d51c1a9300f63d6d38b5bd7aec5a373d1a0d
+  data.tar.gz: 0c8cf165cf58f920ac80534b08fef3146e08caa3676542bea72b6ae2b2fdbe9c
 SHA512:
-  metadata.gz: c33efe4ce32ddf75596defe2b3c3f56bb05973d1c13e4b9c39e9fbaed604c9774271b6dd88db11691ba1a498b3c3ee807e6aa3a54447a30ea3ba791d8818388b
-  data.tar.gz: 50b6419551ee9643771cb80dbd7ad48460e265f3e8a168e60f4afa9557802eb4bc2543b5cb678e55b81ccf006679bfa865047e590f5f7b99526f0dd628bc3005
+  metadata.gz: e05aaeb2c9f4ce782bf99c57789d0e21d89a6fc262eae1141451c40c2d17776920117deae3f7c2864218a90ec5a5f7feb5ff4604460cb1cb5ee2ab783fac230d
+  data.tar.gz: 919c2aa1bafd05fe0e2283d201553fd546f9e734f7f4134c9adfd62ea9fb6ac714eace090d487b22fd3613dcd52d64eed6a225143a56687f9cecddea973e84db

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).include?(PROTOCOL)
+				end
+				
+				def self.open(request, headers: [], protocols: [], handler: Connection, **options, &block)
+					if Array(request.protocol).include?(PROTOCOL)
+						# 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/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.18.0"
+		VERSION = "0.19.0"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-websocket
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.19.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-21 00:00:00.000000000 Z
+date: 2021-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-http
@@ -143,6 +143,7 @@ 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
@@ -176,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.0.dev
 signing_key:
 specification_version: 4
 summary: An async websocket library on top of websocket-driver.