async-websocket 0.19.0 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0fd37d5eb2b762f6f5d7bb8027d3d51c1a9300f63d6d38b5bd7aec5a373d1a0d
-  data.tar.gz: 0c8cf165cf58f920ac80534b08fef3146e08caa3676542bea72b6ae2b2fdbe9c
+  metadata.gz: 0a051f2295a5f0874fb78259a546cf65e99a7b507a781df04817d9472391506c
+  data.tar.gz: 7fdd299047a497220c5ef7640a287b6f52691982ff12175f8d93f9a258de814e
 SHA512:
-  metadata.gz: e05aaeb2c9f4ce782bf99c57789d0e21d89a6fc262eae1141451c40c2d17776920117deae3f7c2864218a90ec5a5f7feb5ff4604460cb1cb5ee2ab783fac230d
-  data.tar.gz: 919c2aa1bafd05fe0e2283d201553fd546f9e734f7f4134c9adfd62ea9fb6ac714eace090d487b22fd3613dcd52d64eed6a225143a56687f9cecddea973e84db
+  metadata.gz: 6fb7a9e49527d946cc762da5a45bb389c91debdc55598b959dd4543f1f31e5921d3fd3901d2b99d9d7d366b3cb7cb3efde014122cce4e6fb981a372a852a5db5
+  data.tar.gz: a6f33b3043a6453754f429ac494f4afb1e44f2e7bc6511ab3d42c65e55a3e59efcc5e8d99f807d68fe707a1f1b1084a2aaaade0393d3d7b6c7dad4396b866afd

checksums.yaml.gz.sig

@@ -0,0 +1,2 @@
+n�z��KMR���*��6k9<���5��=E�8cG��Ħ/9����c��:��U4يtw�����;
��2��&1#F\���Nj��o��3`�ŝ!&n
+,�4�\�n�ADzw�D�-���Ǥ��Am�/��q�,δ~�����⍰����i����'��Y��rޑ

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

@@ -30,11 +30,11 @@ module Async
 				include ::Protocol::WebSocket::Headers
 				
 				def self.websocket?(request)
-					Array(request.protocol).include?(PROTOCOL)
+					Array(request.protocol).any? { |e| e.casecmp?(PROTOCOL) }
 				end
 				
 				def self.open(request, headers: [], protocols: [], handler: Connection, **options, &block)
-					if Array(request.protocol).include?(PROTOCOL)
+					if websocket?(request)
 						# Select websocket sub-protocol:
 						if requested_protocol = request.headers[SEC_WEBSOCKET_PROTOCOL]
 							protocol = (requested_protocol & protocols).first

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

@@ -21,6 +21,7 @@
 # THE SOFTWARE.
 
 require_relative 'http'
+require 'protocol/rack/request'
 
 module Async
 	module WebSocket
@@ -29,27 +30,19 @@ module Async
 				include ::Protocol::WebSocket::Headers
 				
 				def self.websocket?(env)
-					request = env['async.http.request'] and Array(request.protocol).include?(PROTOCOL)
+					HTTP.websocket?(
+						::Protocol::Rack::Request[env]
+					)
 				end
 				
 				def self.open(env, **options, &block)
-					if request = env['async.http.request']
-						env = nil
-						
-						if response = HTTP.open(request, **options, &block)
-							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
+					request = ::Protocol::Rack::Request[env]
+					
+					if response = HTTP.open(request, **options, &block)
+						return Protocol::Rack::Adapter.make_response(env, response)
 					end
 				end
 			end
 		end
 	end
-end
+end

data/lib/async/websocket/connect_request.rb

@@ -23,8 +23,7 @@
 require 'protocol/http/request'
 require 'protocol/http/headers'
 require 'protocol/websocket/headers'
-
-require 'async/http/body/stream'
+require 'protocol/http/body/readable'
 
 module Async
 	module WebSocket
@@ -66,7 +65,7 @@ module Async
 				end
 			end
 			
-			class Hijack < Async::HTTP::Body::Readable
+			class Hijack < Protocol::HTTP::Body::Readable
 				def initialize(request)
 					@request = request
 					@stream = nil

data/lib/async/websocket/connect_response.rb

@@ -35,7 +35,7 @@ module Async
 				if protocol
 					headers.add(SEC_WEBSOCKET_PROTOCOL, protocol)
 				end
-				
+
 				body = Async::HTTP::Body::Hijack.wrap(request, &block)
 				super(request.version, 200, headers, body)
 			end

data/lib/async/websocket/response.rb

@@ -30,7 +30,7 @@ module Async
 			def self.for(request, headers = nil, **options, &body)
 				if request.version =~ /http\/1/i
 					return UpgradeResponse.new(request, headers, **options, &body)
-				elsif request.version =~ /h2/i
+				elsif request.version =~ /http\/2/i
 					return ConnectResponse.new(request, headers, **options, &body)
 				end
 				

data/lib/async/websocket/version.rb

@@ -20,6 +20,6 @@
 
 module Async
 	module WebSocket
-		VERSION = "0.19.0"
+		VERSION = "0.20.0"
 	end
 end

metadata

@@ -1,14 +1,51 @@
 --- !ruby/object:Gem::Specification
 name: async-websocket
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.20.0
 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-06-05 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-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-http
@@ -52,6 +89,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.0
+- !ruby/object:Gem::Dependency
+  name: protocol-rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: async-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -177,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.0.dev
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: An async websocket library on top of websocket-driver.