async-http 0.50.12 → 0.50.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c270148e0c2c9fee8ac667bdf49a1b41e85cfbf1d15c29299bdc8b2c9a78d94b
-  data.tar.gz: 2286c4358edf44bb123d0048769f6ddbce3852b27d84bf2fbe3c210e5f43f7ea
+  metadata.gz: 2cecbbc1a65dc4e0697fab222184c9a310bdaccfb5673f2200c3686f77ab7b9e
+  data.tar.gz: 88a4d5a5b7c10f48033f78ac838c0b75d969f85a33e9ccca07bd0f587865d8ab
 SHA512:
-  metadata.gz: dae66750a592681dd68afc1ff146a313289cbeb9d31bce40cd2817e820227385317d36081d56b4d98a28b565b2bba5c3c107d0b7b5f8fd5880b595bd28209c36
-  data.tar.gz: e92a967b4a857ac3deeb311184e79a0f8ba84343f3bc4bde7e39668a0d2ff32bcd6405f691e5f44476568dfee10b56ff4ce2fb829ac1d4661d702d48b702cf91
+  metadata.gz: 9f1bb76e135ec8d00508c5c1625d017e79ba87a19552ea4968b3a206f65fb3702623b2f1d96f80a88948ccbf959e3aac8a959dcc5c86a3cd65cd9159a9b6ac15
+  data.tar.gz: b8ea5b50c9a4b76ddf9cd21484eba947674c590410e7335b10c24823997fa9d9c7235e160ee9d804905083e31ee51dca83faea02265421734da35227a9bf7bb0

data/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.16.0")
-	spec.add_dependency("protocol-http1", "~> 0.10.0")
+	spec.add_dependency("protocol-http", "~> 0.17.0")
+	spec.add_dependency("protocol-http1", "~> 0.11.0")
 	spec.add_dependency("protocol-http2", "~> 0.13.0")
 	
 	# spec.add_dependency("openssl")

data/bake/async/http.rb

@@ -67,6 +67,15 @@ def fetch(url, method:)
 		end
 		
 		response.finish
+		
+		if trailers = response.headers.trailers
+			trailers.each do |key, value|
+				terminal.print_line(
+					:key, key.rjust(align), :reset, ": ", :value, value.inspect
+				)
+			end
+		end
+		
 		internet.close
 	end
 end

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

@@ -33,6 +33,10 @@ module Async
 					true
 				end
 				
+				def self.trailers?
+					true
+				end
+				
 				def self.client(peer)
 					stream = IO::Stream.new(peer, sync: false)
 					

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

@@ -39,6 +39,8 @@ module Async
 							raise RequestFailed
 						end
 						
+						request.headers.trailers!
+						
 						if request.body?
 							body = request.body
 							
@@ -61,7 +63,7 @@ module Async
 									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)
+									write_body(@version, body, false, request.trailers)
 								end
 							end
 						elsif protocol = request.protocol

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

@@ -61,6 +61,7 @@ module Async
 							
 							if response
 								write_response(@version, response.status, response.headers)
+								response.headers.trailers!
 								
 								body = response.body
 								
@@ -84,11 +85,12 @@ module Async
 									body.call(stream)
 								else
 									head = request.head?
+									trailers = response.trailers
 									
 									request = nil unless body
 									response = nil
 									
-									write_body(@version, body, head)
+									write_body(@version, body, head, trailers)
 								end
 							else
 								# If the request failed to generate a response, it was an internal server error:

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

@@ -32,6 +32,10 @@ module Async
 					false
 				end
 				
+				def self.trailers?
+					false
+				end
+				
 				def self.client(peer)
 					stream = IO::Stream.new(peer, sync: false)
 					

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

@@ -32,6 +32,10 @@ module Async
 					true
 				end
 				
+				def self.trailers?
+					true
+				end
+				
 				def self.client(peer)
 					stream = IO::Stream.new(peer, sync: false)
 					

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

@@ -33,6 +33,10 @@ module Async
 					true
 				end
 				
+				def self.trailers?
+					true
+				end
+				
 				CLIENT_SETTINGS = {
 					::Protocol::HTTP2::Settings::ENABLE_PUSH => 0,
 					::Protocol::HTTP2::Settings::MAXIMUM_FRAME_SIZE => 0x100000,

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

@@ -27,22 +27,18 @@ module Async
 		module Protocol
 			module HTTP2
 				class Output
-					def self.for(stream, body)
-						output = self.new(stream, body)
-						
-						output.start
-						
-						return output
-					end
-					
-					def initialize(stream, body)
+					def initialize(stream, body, trailers = nil)
 						@stream = stream
 						@body = body
+						@trailers = trailers
+						
 						@task = nil
 						
 						@window_updated = Async::Condition.new
 					end
 					
+					attr :trailers
+					
 					def start(parent: Task.current)
 						raise "Task already started!" if @task
 						

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

@@ -184,7 +184,7 @@ module Async
 						
 						if body = response.body and !self.head?
 							@stream.send_headers(nil, headers)
-							@stream.send_body(body)
+							@stream.send_body(body, response.trailers)
 						else
 							# Ensure the response body is closed if we are ending the stream:
 							response.close

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

@@ -221,7 +221,7 @@ module Async
 								raise RequestFailed
 							end
 							
-							@stream.send_body(request.body)
+							@stream.send_body(request.body, request.trailers)
 						end
 					end
 				end

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

@@ -60,17 +60,15 @@ module Async
 						end
 					end
 					
-					def add_trailer(key, value)
-						if @trailers.include(key)
-							add_header(key, value)
-						else
-							raise ::Protocol::HTTP2::HeaderError, "Cannot add trailer #{key} as it was not specified in trailers!"
-						end
-					end
-					
 					def receive_trailing_headers(headers, end_stream)
+						@headers.trailers!
+						
 						headers.each do |key, value|
-							add_trailer(key, value)
+							if @trailers.include?(key)
+								add_header(key, value)
+							else
+								raise ::Protocol::HTTP2::HeaderError, "Cannot add trailer #{key} as it was not specified as a trailer!"
+							end
 						end
 					end
 					
@@ -84,6 +82,12 @@ module Async
 						else
 							raise ::Protocol::HTTP2::HeaderError, "Unable to process headers!"
 						end
+						
+						# TODO this might need to be in an ensure block:
+						if @input and frame.end_stream?
+							@input.close($!)
+							@input = nil
+						end
 					rescue ::Protocol::HTTP2::HeaderError => error
 						Async.logger.error(self, error)
 						
@@ -133,18 +137,27 @@ module Async
 					end
 					
 					# Set the body and begin sending it.
-					def send_body(body)
-						@output = Output.for(self, body)
+					def send_body(body, trailers = nil)
+						@output = Output.new(self, body, trailers)
+						
+						@output.start
 					end
 					
 					# Called when the output terminates normally.
 					def finish_output(error = nil)
+						trailers = @output&.trailers
+						
 						@output = nil
 						
 						if error
 							send_reset_stream(::Protocol::HTTP2::Error::INTERNAL_ERROR)
 						else
-							send_data(nil, ::Protocol::HTTP2::END_STREAM)
+							# Write trailers?
+							if trailers
+								send_headers(nil, trailers, ::Protocol::HTTP2::END_STREAM)
+							else
+								send_data(nil, ::Protocol::HTTP2::END_STREAM)
+							end
 						end
 					end
 					
@@ -168,6 +181,9 @@ module Async
 						
 						if @output
 							@output.stop(error)
+							
+							Async.logger.warn(self) {"Closed output: #{@output}"}
+							
 							@output = nil
 						end
 						

data/lib/async/http/version.rb

@@ -22,6 +22,6 @@
 
 module Async
 	module HTTP
-		VERSION = "0.50.12"
+		VERSION = "0.50.13"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-http
 version: !ruby/object:Gem::Version
-  version: 0.50.12
+  version: 0.50.13
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-05 00:00:00.000000000 Z
+date: 2020-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: protocol-http1
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: protocol-http2
   requirement: !ruby/object:Gem::Requirement