async-websocket 0.19.1 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a471c482c07189921b6c9af76ea30c02e31d677897567b0616de7c818258cb5
-  data.tar.gz: e3d34e6f906b3271ea1da568d450f46faf1e84eaed512f74ef3ba4e275a6fdbf
+  metadata.gz: 3f647aa6496d73f12e3fb60e2f0973f1021c0e9ed4184285114182e726644ed2
+  data.tar.gz: 2263444a6dea430fcf6ffe1f39a25c05a8bcdfb3e27cb54abd334b69bcadf918
 SHA512:
-  metadata.gz: f7ad0c1cbdf9c9e4ccfe35e313474890ed9a134dacbbb1a26c584810619445db585e6fea6620390b10da44bbaa300bc4824879a8feb64505b21c1f6f35bc9d4c
-  data.tar.gz: a27f16b8ec763fc216d4fbe63c6867289aebc25e952b68d56517c318d32504b47a2c38d791053547f0c511b512c89c017cd61fe1c1966e26d1b57904018b733c
+  metadata.gz: 1545f3675a0168932cfa393d24fcc68332e254c3e279e9db35c7c0478b5d541d6dd293ab0e2dfb76cc52fd5bc55c8a157ecc4e2283150ab44c814d5b791ef4eb
+  data.tar.gz: 3b28edd7eeef1ba6f1f89ffc05cead77f9fdcd85dc79d85d11cdafc65b85d98c4f1bed7bd9a019b71fdc0ce4ff5f1a6ab8b844844a3c75715c64987988c645d4

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

@@ -23,6 +23,8 @@
 require_relative '../connection'
 require_relative '../response'
 
+require 'protocol/websocket/extensions'
+
 module Async
 	module WebSocket
 		module Adapters
@@ -33,19 +35,24 @@ module Async
 					Array(request.protocol).any? { |e| e.casecmp?(PROTOCOL) }
 				end
 				
-				def self.open(request, headers: [], protocols: [], handler: Connection, **options, &block)
+				def self.open(request, headers: [], protocols: [], handler: Connection, extensions: ::Protocol::WebSocket::Extensions::Server.default, **options, &block)
 					if websocket?(request)
+						headers = Protocol::HTTP::Headers[headers]
+						
 						# Select websocket sub-protocol:
 						if requested_protocol = request.headers[SEC_WEBSOCKET_PROTOCOL]
 							protocol = (requested_protocol & protocols).first
 						end
 						
+						if extensions and extension_headers = request.headers[SEC_WEBSOCKET_EXTENSIONS]
+							extensions.accept(extension_headers) do |header|
+								headers.add(SEC_WEBSOCKET_EXTENSIONS, header.join(";"))
+							end
+						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)
+							connection = handler.call(framer, protocol, extensions)
 							
 							yield connection
 							

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

@@ -24,6 +24,7 @@ require_relative 'request'
 require_relative 'connection'
 
 require 'protocol/websocket/headers'
+require 'protocol/websocket/extensions'
 require 'protocol/http/middleware'
 
 require 'async/http/client'
@@ -48,8 +49,8 @@ module Async
 			end
 			
 			# @return [Connection] an open websocket connection to the given endpoint.
-			def self.connect(endpoint, *args, **options, &block)
-				client = self.open(endpoint, *args)
+			def self.connect(endpoint, *arguments, **options, &block)
+				client = self.open(endpoint, *arguments)
 				connection = client.connect(endpoint.authority, endpoint.path, **options)
 					
 				return connection unless block_given?
@@ -86,8 +87,13 @@ module Async
 				end
 			end
 			
-			def connect(authority, path, headers: nil, handler: Connection, **options, &block)
+			def connect(authority, path, headers: nil, handler: Connection, extensions: ::Protocol::WebSocket::Extensions::Client.default, **options, &block)
 				headers = ::Protocol::HTTP::Headers[headers]
+				
+				extensions&.offer do |extension|
+					headers.add(SEC_WEBSOCKET_EXTENSIONS, extension.join("; "))
+				end
+				
 				request = Request.new(nil, authority, path, headers, **options)
 				
 				pool = @delegate.pool
@@ -101,12 +107,19 @@ module Async
 				
 				protocol = response.headers[SEC_WEBSOCKET_PROTOCOL]&.first
 				stream = response.stream
-				response = nil
 				
 				framer = Framer.new(pool, connection, stream)
+				
 				connection = nil
 				
-				handler.call(framer, protocol, **@options, &block)
+				if extension_headers = response.headers[SEC_WEBSOCKET_EXTENSIONS]
+					extensions.accept(extension_headers)
+				end
+				
+				response = nil
+				stream = nil
+				
+				connction = handler.call(framer, protocol, extensions, **@options, &block)
 			ensure
 				pool.release(connection) if connection
 			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/connection.rb

@@ -31,9 +31,11 @@ module Async
 		class Connection < ::Protocol::WebSocket::Connection
 			include ::Protocol::WebSocket::Headers
 			
-			def self.call(framer, protocol = [], **options)
+			def self.call(framer, protocol = [], extensions = nil, **options)
 				instance = self.new(framer, Array(protocol).first, **options)
 				
+				extensions&.apply(instance)
+				
 				return instance unless block_given?
 				
 				begin
@@ -50,6 +52,10 @@ module Async
 				@response = response
 			end
 			
+			def reusable?
+				false
+			end
+			
 			def close
 				super
 				

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.1"
+		VERSION = "0.21.0"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: async-websocket
 version: !ruby/object:Gem::Version
-  version: 0.19.1
+  version: 0.21.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -18,33 +18,34 @@ bindir: bin
 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=
+  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-01 00:00:00.000000000 Z
+date: 2022-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-http
@@ -74,20 +75,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.23'
+- !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: protocol-websocket
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: async-rspec
   requirement: !ruby/object:Gem::Requirement