async-http 0.57.0 → 0.58.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 454a678139fa72fafb6fc06cc34af7f21b44bba2a7ebddf7bfc823c01c5b968a
-  data.tar.gz: d91f30582707db6bd9a717d449c7d8295f8110b315defec4477b892e28678c22
+  metadata.gz: 238edc4ed5e4244f2060e9c788aa93588f9b3dd920646c8ec9161512af381e96
+  data.tar.gz: c77506488fedd3fec5a20d1172f1a2e6e6285f2c0dccb6a447a217a2e3423bc0
 SHA512:
-  metadata.gz: 0517cac618b852dca972400c943b7fc78ee7693ad1555eeb2699d5fc45a6fee0d4ceeb45121168955da3bdd980ebee788f21c51d42e3de5fba03a8896e3fb3fc
-  data.tar.gz: 321e705b70ab0efb1d36cc8614a6193b593c930badd96f239734685594da3456ee505e9dcc9c7fe28fc4ace349c25e4cff3774b5753d1c692769b21466d80de4
+  metadata.gz: 87247dfbc7b31ead28e1fef6f6b532a6db22778eb3c0bde7932cdf6655027309ef1f0f1453b8a72d4ff38aabe3aeb9d8c7c75af28f8d35285bf6644f23655e99
+  data.tar.gz: bc199930224287caaea2c2b2c9b7219d81d24872932efa0a85b7bcada7d7c56b8f1da827ce34742db7bfc7193a72148a233cef09a65892d36949c5200f288e0a

data/lib/async/http/client.rb

@@ -138,7 +138,7 @@ module Async
 					@pool.release(connection) if connection
 				end
 			end
-
+			
 			def inspect
 				"#<#{self.class} authority=#{@authority.inspect}>"
 			end

data/lib/async/http/internet.rb

@@ -47,6 +47,14 @@ module Async
 				end
 			end
 			
+			# Make a request to the internet with the given `method` and `url`.
+			#
+			# If you provide non-frozen headers, they may be mutated.
+			#
+			# @parameter method [String] The request method, e.g. `GET`.
+			# @parameter url [String] The URL to request, e.g. `https://www.codeotaku.com`.
+			# @parameter headers [Hash | Protocol::HTTP::Headers] The headers to send with the request.
+			# @parameter body [String | Protocol::HTTP::Body] The body to send with the request.
 			def call(method, url, headers = nil, body = nil)
 				endpoint = Endpoint.parse(url)
 				client = self.client_for(endpoint)

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

@@ -32,11 +32,14 @@ module Async
 							self.new(connection, *parts)
 						end
 					end
+
+					UPGRADE = 'upgrade'
 					
 					def initialize(connection, authority, method, path, version, headers, body)
 						@connection = connection
 						
-						protocol = connection.upgrade?(headers)
+						# 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)
 					end

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

@@ -33,11 +33,13 @@ module Async
 						end
 					end
 					
+					UPGRADE = 'upgrade'
+
 					# @param reason [String] HTTP response line reason, ignored.
 					def initialize(connection, version, status, reason, headers, body)
 						@connection = connection
 						
-						protocol = connection.upgrade?(headers)
+						protocol = headers.delete(UPGRADE)
 						
 						super(version, status, headers, body, protocol)
 					end

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

@@ -60,54 +60,59 @@ module Async
 						
 						while request = next_request
 							response = yield(request, self)
-							
-							return if @stream.nil? or @stream.closed?
-							
-							if response
-								trailer = response.headers.trailer!
-								
-								write_response(@version, response.status, response.headers)
-								
-								body = response.body
-								
-								if body and protocol = response.protocol
-									stream = write_upgrade_body(protocol)
-									
-									# At this point, the request body is hijacked, so we don't want to call #finish below.
-									request = nil
-									
-									# We also don't want to hold on to the response object:
-									response = nil
-									
-									body.call(stream)
-								elsif request.connect? and response.success?
-									stream = write_tunnel_body(request.version)
-									
-									# Same as above:
-									request = nil
-									response = nil
-									
-									body.call(stream)
+							body = response&.body
+
+							begin
+								# If a response was generated, send it:
+								if response
+									trailer = response.headers.trailer!
+
+									write_response(@version, response.status, response.headers)
+
+									# Some operations in this method are long running, that is, it's expected that `body.call(stream)` could literally run indefinitely. In order to facilitate garbage collection, we want to nullify as many local variables before calling the streaming body. This ensures that the garbage collection can clean up as much state as possible during the long running operation, so we don't retain objects that are no longer needed.
+
+									if body and protocol = response.protocol
+										stream = write_upgrade_body(protocol)
+										
+										# At this point, the request body is hijacked, so we don't want to call #finish below.
+										request = response = nil
+										
+										body.call(stream)
+									elsif request.connect? and response.success?
+										stream = write_tunnel_body(request.version)
+										
+										# Same as above:
+										request = response = nil
+										
+										body.call(stream)
+									else
+										head = request.head?
+										version = request.version
+										
+										# Same as above:
+										request = nil unless body
+										response = nil
+										
+										write_body(version, body, head, trailer)
+									end
+
+									# We are done with the body, you shouldn't need to call close on it:
+									body = nil
 								else
-									head = request.head?
-									version = request.version
-									
-									request = nil unless body
-									response = nil
-									
-									write_body(version, body, head, trailer)
+									# If the request failed to generate a response, it was an internal server error:
+									write_response(@version, 500, {})
+									write_body(request.version, nil)
 								end
-							else
-								# If the request failed to generate a response, it was an internal server error:
-								write_response(@version, 500, {})
-								write_body(request.version, nil)
+								
+								# Gracefully finish reading the request body if it was not already done so.
+								request&.finish
+								
+								# This ensures we yield at least once every iteration of the loop and allow other fibers to execute.
+								task.yield
+							rescue => error
+							ensure
+								body&.close(error)
 							end
-							
-							# Gracefully finish reading the request body if it was not already done so.
-							request&.finish
-							
-							# This ensures we yield at least once every iteration of the loop and allow other fibers to execute.
-							task.yield
 						end
 					end
 				end

data/lib/async/http/server.rb

@@ -96,7 +96,7 @@ module Async
 						attributes['http.protocol'] = protocol
 					end
 					
-					trace('async.http.server.call', attributes: attributes) do |span|
+					trace('async.http.server.call', resource: "#{request.method} #{request.path}", attributes: attributes) do |span|
 						super.tap do |response|
 							if status = response&.status
 								span['http.status_code'] = status

data/lib/async/http/version.rb

@@ -22,6 +22,6 @@
 
 module Async
 	module HTTP
-		VERSION = "0.57.0"
+		VERSION = "0.58.0"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: async-http
 version: !ruby/object:Gem::Version
-  version: 0.57.0
+  version: 0.58.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -52,7 +52,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2022-08-07 00:00:00.000000000 Z
+date: 2022-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -142,14 +142,14 @@ dependencies:
   name: traces
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.0
 - !ruby/object:Gem::Dependency