Update trailers interface and handling of headers.

Author: ioquatix

async-http.gemspec

@@ -21,8 +21,8 @@ Gem::Specification.new do |spec|
 	spec.add_dependency("async-io", "~> 1.28")
 	spec.add_dependency("async-pool", "~> 0.2")
 
-	spec.add_dependency("protocol-http", "~> 0.17.0")
-	spec.add_dependency("protocol-http1", "~> 0.11.0")
+	spec.add_dependency("protocol-http", "~> 0.18.0")
+	spec.add_dependency("protocol-http1", "~> 0.12.0")
 	spec.add_dependency("protocol-http2", "~> 0.13.0")
 
 	# spec.add_dependency("openssl")

lib/async/http/internet.rb

@@ -33,7 +33,7 @@ def initialize(**options)
 				@options = options
 			end
 
-			def call(method, url, headers = [], body = nil)
+			def call(method, url, headers = nil, body = nil)
 				endpoint = Endpoint.parse(url)
 				key = host_key(endpoint)
 
@@ -42,6 +42,7 @@ def call(method, url, headers = [], body = nil)
 				end
 
 				body = Body::Buffered.wrap(body)
+				headers = ::Protocol::HTTP::Headers[headers]
 
 				request = ::Protocol::HTTP::Request.new(client.scheme, endpoint.authority, method, endpoint.path, nil, headers, body)
 

lib/async/http/protocol/http1/client.rb

@@ -31,6 +31,8 @@ class Client < Connection
 					def call(request, task: Task.current)
 						Async.logger.debug(self) {"#{request.method} #{request.path} #{request.headers.inspect}"}
 
+						trailers = request.headers.trailers!
+						
 						# We carefully interpret https://tools.ietf.org/html/rfc7230#section-6.3.1 to implement this correctly.
 						begin
 							write_request(request.authority, request.method, request.path, @version, request.headers)
@@ -39,8 +41,6 @@ def call(request, task: Task.current)
 							raise RequestFailed
 						end
 
-						request.headers.trailers!
-						
 						if request.body?
 							body = request.body
 
@@ -63,7 +63,7 @@ def call(request, task: Task.current)
 									subtask.annotate("Streaming body.")
 
 									# Once we start writing the body, we can't recover if the request fails. That's because the body might be generated dynamically, streaming, etc.
-									write_body(@version, body, false, request.trailers)
+									write_body(@version, body, false, trailers)
 								end
 							end
 						elsif protocol = request.protocol

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

@@ -60,8 +60,9 @@ def each(task: Task.current)
 							return if @stream.nil? or @stream.closed?
 
 							if response
+								trailers = response.headers.trailers!
+								
 								write_response(@version, response.status, response.headers)
-								response.headers.trailers!
 
 								body = response.body
 
@@ -85,7 +86,6 @@ def each(task: Task.current)
 									body.call(stream)
 								else
 									head = request.head?
-									trailers = response.trailers
 
 									request = nil unless body
 									response = nil

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

@@ -183,8 +183,12 @@ def send_response(response)
 						headers = ::Protocol::HTTP::Headers::Merged.new(protocol_headers, response.headers)
 
 						if body = response.body and !self.head?
+							# This function informs the headers object that any subsequent headers are going to be trailers. Therefore, it must be called *before* sending the headers, to avoid any race conditions.
+							trailers = response.headers.trailers!
+							
 							@stream.send_headers(nil, headers)
-							@stream.send_body(body, response.trailers)
+							
+							@stream.send_body(body, trailers)
 						else
 							# Ensure the response body is closed if we are ending the stream:
 							response.close

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

@@ -215,13 +215,16 @@ def send_request(request)
 						if request.body.nil?
 							@stream.send_headers(nil, headers, ::Protocol::HTTP2::END_STREAM)
 						else
+							# This function informs the headers object that any subsequent headers are going to be trailers. Therefore, it must be called *before* sending the headers, to avoid any race conditions.
+							trailers = request.headers.trailers!
+							
 							begin
 								@stream.send_headers(nil, headers)
 							rescue
 								raise RequestFailed
 							end
 
-							@stream.send_body(request.body, request.trailers)
+							@stream.send_body(request.body, trailers)
 						end
 					end
 				end

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

@@ -61,8 +61,6 @@ def add_header(key, value)
 					end
 
 					def receive_trailing_headers(headers, end_stream)
-						@headers.trailers!
-						
 						headers.each do |key, value|
 							if @trailers.include?(key)
 								add_header(key, value)
@@ -76,6 +74,7 @@ def process_headers(frame)
 						if @headers.nil?
 							@headers = ::Protocol::HTTP::Headers.new
 							self.receive_initial_headers(super, frame.end_stream?)
+							
 							@trailers = @headers[TRAILERS]
 						elsif @trailers and frame.end_stream?
 							self.receive_trailing_headers(super, frame.end_stream?)