async-websocket 0.20.0 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a051f2295a5f0874fb78259a546cf65e99a7b507a781df04817d9472391506c
-  data.tar.gz: 7fdd299047a497220c5ef7640a287b6f52691982ff12175f8d93f9a258de814e
+  metadata.gz: 3f647aa6496d73f12e3fb60e2f0973f1021c0e9ed4184285114182e726644ed2
+  data.tar.gz: 2263444a6dea430fcf6ffe1f39a25c05a8bcdfb3e27cb54abd334b69bcadf918
 SHA512:
-  metadata.gz: 6fb7a9e49527d946cc762da5a45bb389c91debdc55598b959dd4543f1f31e5921d3fd3901d2b99d9d7d366b3cb7cb3efde014122cce4e6fb981a372a852a5db5
-  data.tar.gz: a6f33b3043a6453754f429ac494f4afb1e44f2e7bc6511ab3d42c65e55a3e59efcc5e8d99f807d68fe707a1f1b1084a2aaaade0393d3d7b6c7dad4396b866afd
+  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/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/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/version.rb

@@ -20,6 +20,6 @@
 
 module Async
 	module WebSocket
-		VERSION = "0.20.0"
+		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.20.0
+  version: 0.21.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -45,7 +45,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2022-08-19 00:00:00.000000000 Z
+date: 2022-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-http
@@ -76,33 +76,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.23'
 - !ruby/object:Gem::Dependency
-  name: protocol-websocket
+  name: protocol-rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
-  name: protocol-rack
+  name: protocol-websocket
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: async-rspec
   requirement: !ruby/object:Gem::Requirement