async-websocket 0.19.2 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4494a49f3ddda2ac524f29eb3d7c9819441f8816532f4e2650f4a375580cac5a
-  data.tar.gz: 93d249315220fc12d1619ed02e0706ce5c24f6591fb820c6f8894e6f8009e877
+  metadata.gz: 2f44102a9613ddc21a24c007f7d2dd321d86e1f7e0e9f58d9d8493ac26f65689
+  data.tar.gz: bb7b076d16e8037c7fd6a61c7736f956c53d51088371b285e13883d3a2343445
 SHA512:
-  metadata.gz: 3c66caf1da58fb21136cdbdbd9c7d4342b270b65d524578eaa8821f15877f081324fd7c74aa22c16d7a062ea4e7a926c8baa6ab8bdcb111f45a4bd111d999f29
-  data.tar.gz: 1ee636003a5962dea1ed85465bb2cd4447b3589d51cca1b11df6f473f7a54ae348bc0a94ded3aab66bb9ba6a78083157ce29ca6a08ce3b39c345d28573f7ae75
+  metadata.gz: 1c41481ccfaeee07401f5d4607c645de83116de199908c12e921299b924763bb763d01f2181798d1c1f7f2d568474e2d3391dadc69da7ce329e441927e970519
+  data.tar.gz: ba0006b75404a857f2b97e43e8d8bdc51db402d677975a0c1bd4e6ad20146b9e631142c65bd9cd4e14e2d2fc0e129336751eea932b89d557f3fcd1fbd68a740a

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,6 +23,7 @@
 require 'protocol/http/request'
 require 'protocol/http/headers'
 require 'protocol/websocket/headers'
+require 'protocol/http/body/readable'
 
 module Async
 	module WebSocket
@@ -64,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
 				
@@ -61,24 +67,6 @@ module Async
 			
 			attr :protocol
 			
-			def read
-				if buffer = super
-					parse(buffer)
-				end
-			end
-			
-			def write(object)
-				super(dump(object))
-			end
-			
-			def parse(buffer)
-				JSON.parse(buffer, symbolize_names: true)
-			end
-			
-			def dump(object)
-				JSON.dump(object)
-			end
-			
 			def call
 				self.close
 			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.2"
+		VERSION = "0.22.0"
 	end
 end

data.tar.gz.sig

@@ -1,3 +1,4 @@
-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
+.�-�՝�G�}L���..���0'�@V�
�%�:s���M1
+�)*w
+Ba���a���._`�x�����ݫQ��K��>g��<�A�F)=ǚE�%��� k?�dҞr<�Hľ>�A�|ߔ{�� �D��פV
��8�Ձany��x��Sv:�`���帽���%�ƃe��<�����Cs�YY����ZP_�3�����~Q�@��s�X�X��a�B�[ō�I�_ꗯ�l�w|���#Y	����%����Ｔ(T[?p#�i�ۜ�!0�q@���
+��괯�"�jO�lb����C�	�m��w��RmW|$�WCn/l�ǝ��sn��oP��{��3������[�=<R�

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: async-websocket
 version: !ruby/object:Gem::Version
-  version: 0.19.2
+  version: 0.22.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -45,7 +45,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2022-08-07 00:00:00.000000000 Z
+date: 2022-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-http
@@ -75,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.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: async-rspec
   requirement: !ruby/object:Gem::Requirement