async-websocket 0.27.0 → 0.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7deca426ef06ec0886b25c2786697db4b9b3c98b2424eead9f227dd53879e3b5
-  data.tar.gz: d21453d57e1a10e04b41c192e39a050274ef80f44eb78aaea69d48c662146bd9
+  metadata.gz: 4289b4859913198c24ca663a119281dd61bb34549e6cfe3cc9b85fe27e31c6ab
+  data.tar.gz: 651f3364c06bd402877b94a36f2d358ab3cc1167a0aa9dd2c44b3745be04cfe5
 SHA512:
-  metadata.gz: 1400f27ba9a845dc4867c2d16461759d4e6036ba711f08c9e198393bb76e7c5363b3de6a36d437405c31cc88b1f712f077b181c0ddebe1acf9e314dbc7649f4d
-  data.tar.gz: d022004d81f93c2c75b36c0331ecccd4e9c0b51214378dd9d8ddd07fbe9069da23edaa3d957bef0d2b357f94b26fff20446b110f6efb24470ca735d6fb49b05b
+  metadata.gz: ec78385e62fe64eae8e50e7f8cd70f7f1a317c3a9961d72ac0f33f1682d99fc6bb753ce91611bceaa9cb642edd978dcb6d59ca4dbea978c1b0d9804a934dddb6
+  data.tar.gz: da98480c126237140e19e45983ce73cb47e949c29078a5d867f694e02eab180e7f707649a0a4f6ad8e6377ea6412faddca63822866e73027995695aaecb12a90

data/lib/async/websocket/client.rb

@@ -110,9 +110,7 @@ module Async
 				response = request.call(connection)
 				
 				unless response.stream?
-					response.close
-					
-					raise ProtocolError, "Failed to negotiate connection: #{response.status}"
+					raise ConnectionError.new("Failed to negotiate connection!", response.unwrap)
 				end
 				
 				protocol = response.headers[SEC_WEBSOCKET_PROTOCOL]&.first

data/lib/async/websocket/connect_request.rb

@@ -28,6 +28,10 @@ module Async
 					@response.close
 				end
 				
+				def unwrap
+					@response.buffered!
+				end
+				
 				attr_accessor :response
 				attr_accessor :stream
 				

data/lib/async/websocket/connect_response.rb

@@ -19,6 +19,11 @@ module Async
 					headers.add(SEC_WEBSOCKET_PROTOCOL, protocol)
 				end
 				
+				# For compatibility with HTTP/1 websockets proxied over HTTP/2, we process the accept nounce here:
+				if accept_nounce = request.headers[SEC_WEBSOCKET_KEY]&.first
+					headers.add(SEC_WEBSOCKET_ACCEPT, Nounce.accept_digest(accept_nounce))
+				end
+				
 				body = Async::HTTP::Body::Hijack.wrap(request, &block)
 				
 				super(request.version, 200, headers, body)

data/lib/async/websocket/error.rb

@@ -15,5 +15,16 @@ module Async
 		
 		class UnsupportedVersionError < Error
 		end
+		
+		class ConnectionError < Error
+			def initialize(message, response)
+				super(message)
+				
+				@response = response
+			end
+			
+			# The failed HTTP response.
+			attr :response
+		end
 	end
 end

data/lib/async/websocket/upgrade_request.rb

@@ -33,6 +33,10 @@ module Async
 					@response.close
 				end
 				
+				def unwrap
+					@response.buffered!
+				end
+				
 				attr_accessor :response
 				
 				def stream?
@@ -77,6 +81,7 @@ module Async
 						raise ProtocolError, "Invalid accept digest, expected #{expected_accept_digest.inspect}, got #{accept_digest.inspect}!"
 					end
 				end
+				
 				verified = accept_digest && Array(response.protocol).map(&:downcase) == %w(websocket) && response.headers['connection']&.include?('upgrade')
 				
 				return Wrapper.new(response, verified: verified)

data/lib/async/websocket/version.rb

@@ -5,6 +5,6 @@
 
 module Async
 	module WebSocket
-		VERSION = "0.27.0"
+		VERSION = "0.29.0"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: async-websocket
 version: !ruby/object:Gem::Version
-  version: 0.27.0
+  version: 0.29.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -49,7 +49,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2024-07-03 00:00:00.000000000 Z
+date: 2024-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-http
@@ -65,6 +65,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.54'
+- !ruby/object:Gem::Dependency
+  name: protocol-http
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.28.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.28.1
 - !ruby/object:Gem::Dependency
   name: protocol-rack
   requirement: !ruby/object:Gem::Requirement