async-websocket 0.18.0 → 0.19.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54e97832ebcebab09dfd5a042aad8532a7a5277cf6609fecae9f73a1826cac7d
-  data.tar.gz: 671da6e463ced51447b8cb49aabbb8b51d644a19adc655e9f955fe4b6772afd4
+  metadata.gz: 4494a49f3ddda2ac524f29eb3d7c9819441f8816532f4e2650f4a375580cac5a
+  data.tar.gz: 93d249315220fc12d1619ed02e0706ce5c24f6591fb820c6f8894e6f8009e877
 SHA512:
-  metadata.gz: c33efe4ce32ddf75596defe2b3c3f56bb05973d1c13e4b9c39e9fbaed604c9774271b6dd88db11691ba1a498b3c3ee807e6aa3a54447a30ea3ba791d8818388b
-  data.tar.gz: 50b6419551ee9643771cb80dbd7ad48460e265f3e8a168e60f4afa9557802eb4bc2543b5cb678e55b81ccf006679bfa865047e590f5f7b99526f0dd628bc3005
+  metadata.gz: 3c66caf1da58fb21136cdbdbd9c7d4342b270b65d524578eaa8821f15877f081324fd7c74aa22c16d7a062ea4e7a926c8baa6ab8bdcb111f45a4bd111d999f29
+  data.tar.gz: 1ee636003a5962dea1ed85465bb2cd4447b3589d51cca1b11df6f473f7a54ae348bc0a94ded3aab66bb9ba6a78083157ce29ca6a08ce3b39c345d28573f7ae75

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/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/connect_request.rb

@@ -24,8 +24,6 @@ require 'protocol/http/request'
 require 'protocol/http/headers'
 require 'protocol/websocket/headers'
 
-require 'async/http/body/stream'
-
 module Async
 	module WebSocket
 		# This is required for HTTP/1.x to upgrade the connection to the WebSocket protocol.

data/lib/async/websocket/version.rb

@@ -20,6 +20,6 @@
 
 module Async
 	module WebSocket
-		VERSION = "0.18.0"
+		VERSION = "0.19.2"
 	end
 end

data.tar.gz.sig

@@ -0,0 +1,3 @@
+W�^���kIJ���Y�zw ���3�14���*����-��z��QZ���������g����~��y�Ϊ|
Im�������Y�P�Z�G�Z?xI��:i8���ڜ�y0`q��v�?N�W��
+�=.���3����J����i�TJK
+B��V����M2@Ok��ѡ��
kY�G���x���N�+&�ۮ2����(� 4��N

metadata

@@ -1,14 +1,51 @@
 --- !ruby/object:Gem::Specification
 name: async-websocket
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.19.2
 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-04-21 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIE2DCCA0CgAwIBAgIBATANBgkqhkiG9w0BAQsFADBhMRgwFgYDVQQDDA9zYW11
+  ZWwud2lsbGlhbXMxHTAbBgoJkiaJk/IsZAEZFg1vcmlvbnRyYW5zZmVyMRIwEAYK
+  CZImiZPyLGQBGRYCY28xEjAQBgoJkiaJk/IsZAEZFgJuejAeFw0yMjA4MDYwNDUz
+  MjRaFw0zMjA4MDMwNDUzMjRaMGExGDAWBgNVBAMMD3NhbXVlbC53aWxsaWFtczEd
+  MBsGCgmSJomT8ixkARkWDW9yaW9udHJhbnNmZXIxEjAQBgoJkiaJk/IsZAEZFgJj
+  bzESMBAGCgmSJomT8ixkARkWAm56MIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIB
+  igKCAYEAomvSopQXQ24+9DBB6I6jxRI2auu3VVb4nOjmmHq7XWM4u3HL+pni63X2
+  9qZdoq9xt7H+RPbwL28LDpDNflYQXoOhoVhQ37Pjn9YDjl8/4/9xa9+NUpl9XDIW
+  sGkaOY0eqsQm1pEWkHJr3zn/fxoKPZPfaJOglovdxf7dgsHz67Xgd/ka+Wo1YqoE
+  e5AUKRwUuvaUaumAKgPH+4E4oiLXI4T1Ff5Q7xxv6yXvHuYtlMHhYfgNn8iiW8WN
+  XibYXPNP7NtieSQqwR/xM6IRSoyXKuS+ZNGDPUUGk8RoiV/xvVN4LrVm9upSc0ss
+  RZ6qwOQmXCo/lLcDUxJAgG95cPw//sI00tZan75VgsGzSWAOdjQpFM0l4dxvKwHn
+  tUeT3ZsAgt0JnGqNm2Bkz81kG4A2hSyFZTFA8vZGhp+hz+8Q573tAR89y9YJBdYM
+  zp0FM4zwMNEUwgfRzv1tEVVUEXmoFCyhzonUUw4nE4CFu/sE3ffhjKcXcY//qiSW
+  xm4erY3XAgMBAAGjgZowgZcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0O
+  BBYEFO9t7XWuFf2SKLmuijgqR4sGDlRsMC4GA1UdEQQnMCWBI3NhbXVlbC53aWxs
+  aWFtc0BvcmlvbnRyYW5zZmVyLmNvLm56MC4GA1UdEgQnMCWBI3NhbXVlbC53aWxs
+  aWFtc0BvcmlvbnRyYW5zZmVyLmNvLm56MA0GCSqGSIb3DQEBCwUAA4IBgQB5sxkE
+  cBsSYwK6fYpM+hA5B5yZY2+L0Z+27jF1pWGgbhPH8/FjjBLVn+VFok3CDpRqwXCl
+  xCO40JEkKdznNy2avOMra6PFiQyOE74kCtv7P+Fdc+FhgqI5lMon6tt9rNeXmnW/
+  c1NaMRdxy999hmRGzUSFjozcCwxpy/LwabxtdXwXgSay4mQ32EDjqR1TixS1+smp
+  8C/NCWgpIfzpHGJsjvmH2wAfKtTTqB9CVKLCWEnCHyCaRVuKkrKjqhYCdmMBqCws
+  JkxfQWC+jBVeG9ZtPhQgZpfhvh+6hMhraUYRQ6XGyvBqEUe+yo6DKIT3MtGE2+CP
+  eX9i9ZWBydWb8/rvmwmX2kkcBbX0hZS1rcR593hGc61JR6lvkGYQ2MYskBveyaxt
+  Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
+  voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
+  -----END CERTIFICATE-----
+date: 2022-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-http
@@ -143,6 +180,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 +214,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.