async-http 0.71.0 → 0.73.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86bc918af980c024aca7370544452805f98f6b207eb6bc9e86f605ba21a7a612
-  data.tar.gz: 595e2f1ce10a7cf2864992380e27398602f7e7ff956f73fd2e733f50bd02ca31
+  metadata.gz: 01cf4d909911a28f4f386982504e5865d9053210af1cb121a4acc8e0812a63bd
+  data.tar.gz: 20b913990be812792c72f5e68649ee8084310112287e316c438c6a220cee9982
 SHA512:
-  metadata.gz: 0fa98ca844d1f7b956128b17b4587756df1b8d164effb82b6704fbc61f50106095429fd7cb6596f6658ebe050c605b819fcbf3121ebc9939f739c1435f6eaac1
-  data.tar.gz: 9489e703af232522f9db1f8d931a2a31c810538b5592cdd0868af102ee3585161a7f912a14b62dcfccd412d1cd06e26e03472bd033c5f4183f4974b3e8d7f6d4
+  metadata.gz: 6b1eefc4c6f0d1a631c1b6f0365ae36a7fe4067e1b372f334473b99f379f0755d29d53a5a04183f5eef46a9c0cf6504a2a56b7c5741757700b44d5c2283fb129
+  data.tar.gz: 1ed32dc7b17b30ddd2d842e688e89df28a0cc51a0610398ea567191c6158c5adde2ebdd337035450fca499b0c312e2d9b3bed616f9cf1058c1d136bbdd10acd4

data/lib/async/http/client.rb

@@ -165,6 +165,10 @@ module Async
 						end
 						
 						super.tap do |response|
+							if version = response&.version
+								span['http.version'] = version
+							end
+							
 							if status = response&.status
 								span['http.status_code'] = status
 							end

data/lib/async/http/middleware/location_redirector.rb

@@ -81,17 +81,7 @@ module Async
 					# We don't want to follow redirects for HEAD requests:
 					return super if request.head?
 					
-					if body = request.body
-						if body.respond_to?(:rewind)
-							# The request body was already rewindable, so use it as is:
-							body = request.body
-						else
-							# The request body was not rewindable, and we might need to resubmit it if we get a response status of 307 or 308, so make it rewindable:
-							body = ::Protocol::HTTP::Body::Rewindable.new(body)
-							request.body = body
-						end
-					end
-					
+					body = ::Protocol::HTTP::Body::Rewindable.wrap(request)
 					hops = 0
 					
 					while hops <= @maximum_hops

data/lib/async/http/protocol/http1/request.rb

@@ -24,7 +24,7 @@ module Async
 						# HTTP/1 requests with an upgrade header (which can contain zero or more values) are extracted into the protocol field of the request, and we expect a response to select one of those protocols with a status code of 101 Switching Protocols.
 						protocol = headers.delete('upgrade')
 						
-						super(nil, authority, method, path, version, headers, body, protocol)
+						super(nil, authority, method, path, version, headers, body, protocol, self.public_method(:write_interim_response))
 					end
 					
 					def connection
@@ -39,8 +39,8 @@ module Async
 						@connection.hijack!
 					end
 					
-					def write_interim_response(response)
-						@connection.write_interim_response(response.version, response.status, response.headers)
+					def write_interim_response(status, headers = nil)
+						@connection.write_interim_response(@version, status, headers)
 					end
 				end
 			end

data/lib/async/http/protocol/http1/response.rb

@@ -17,6 +17,8 @@ module Async
 							
 							if response.final?
 								return response
+							else
+								request.send_interim_response(response.status, response.headers)
 							end
 						end
 					end

data/lib/async/http/protocol/http2/request.rb

@@ -23,6 +23,8 @@ module Async
 						attr :request
 						
 						def receive_initial_headers(headers, end_stream)
+							@headers = ::Protocol::HTTP::Headers.new
+							
 							headers.each do |key, value|
 								if key == SCHEME
 									raise ::Protocol::HTTP2::HeaderError, "Request scheme already specified!" if @request.scheme
@@ -85,7 +87,7 @@ module Async
 					end
 					
 					def initialize(stream)
-						super(nil, nil, nil, nil, VERSION, nil)
+						super(nil, nil, nil, nil, VERSION, nil, nil, nil, self.public_method(:write_interim_response))
 						
 						@stream = stream
 					end
@@ -117,10 +119,6 @@ module Async
 							[STATUS, response.status],
 						]
 						
-						if protocol = response.protocol
-							protocol_headers << [PROTOCOL, protocol]
-						end
-						
 						if length = response.body&.length
 							protocol_headers << [CONTENT_LENGTH, length]
 						end
@@ -142,14 +140,16 @@ module Async
 						end
 					end
 					
-					def write_interim_response(response)
-						protocol_headers = [
-							[STATUS, response.status]
+					def write_interim_response(status, headers = nil)
+						interim_response_headers = [
+							[STATUS, status]
 						]
 						
-						headers = ::Protocol::HTTP::Headers::Merged.new(protocol_headers, response.headers)
+						if headers
+							interim_response_headers = ::Protocol::HTTP::Headers::Merged.new(interim_response_headers, headers)
+						end
 						
-						@stream.send_headers(nil, headers)
+						@stream.send_headers(nil, interim_response_headers)
 					end
 				end
 			end

data/lib/async/http/protocol/http2/response.rb

@@ -38,18 +38,25 @@ module Async
 						
 						# This should be invoked from the background reader, and notifies the task waiting for the headers that we are done.
 						def receive_initial_headers(headers, end_stream)
+							# While in theory, the response pseudo-headers may be extended in the future, currently they only response pseudo-header is :status, so we can assume it is always the first header.
+							status_header = headers.shift
+							
+							if status_header.first != ':status'
+								raise ProtocolError, "Invalid response headers: #{headers.inspect}"
+							end
+							
+							status = Integer(status_header.last)
+							
+							if status >= 100 && status < 200
+								return receive_interim_headers(status, headers)
+							end
+							
+							@response.status = status
+							@headers = ::Protocol::HTTP::Headers.new
+							
 							headers.each do |key, value|
 								# It's guaranteed that this should be the first header:
-								if key == STATUS
-									status = Integer(value)
-									
-									# Ignore informational headers:
-									return if status >= 100 && status < 200
-									
-									@response.status = Integer(value)
-								elsif key == PROTOCOL
-									@response.protocol = value
-								elsif key == CONTENT_LENGTH
+								if key == CONTENT_LENGTH
 									@length = Integer(value)
 								else
 									add_header(key, value)
@@ -74,6 +81,16 @@ module Async
 							return headers
 						end
 						
+						def receive_interim_headers(status, headers)
+							if headers.any?
+								headers = ::Protocol::HTTP::Headers[headers]
+							else
+								headers = nil
+							end
+							
+							@response.request.send_interim_response(status, headers)
+						end
+						
 						# Notify anyone waiting on the response headers to be received (or failure).
 						def notify!
 							if notification = @notification

data/lib/async/http/protocol/http2/stream.rb

@@ -51,10 +51,9 @@ module Async
 					end
 					
 					def process_headers(frame)
-						if frame.end_stream? && @headers
+						if @headers and frame.end_stream?
 							self.receive_trailing_headers(super, frame.end_stream?)
 						else
-							@headers ||= ::Protocol::HTTP::Headers.new
 							self.receive_initial_headers(super, frame.end_stream?)
 						end
 						

data/lib/async/http/protocol/request.rb

@@ -25,7 +25,7 @@ module Async
 					false
 				end
 				
-				def write_interim_response(response)
+				def write_interim_response(status, headers = nil)
 				end
 				
 				def peer

data/lib/async/http/server.rb

@@ -81,6 +81,7 @@ module Async
 					end
 					
 					attributes = {
+						'http.version': request.version,
 						'http.method': request.method,
 						'http.authority': request.authority,
 						'http.scheme': request.scheme,

data/lib/async/http/version.rb

@@ -5,6 +5,6 @@
 
 module Async
 	module HTTP
-		VERSION = "0.71.0"
+		VERSION = "0.73.0"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: async-http
 version: !ruby/object:Gem::Version
-  version: 0.71.0
+  version: 0.73.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -58,7 +58,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2024-08-26 00:00:00.000000000 Z
+date: 2024-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -122,14 +122,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.28'
+        version: '0.30'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.28'
+        version: '0.30'
 - !ruby/object:Gem::Dependency
   name: protocol-http1
   requirement: !ruby/object:Gem::Requirement