async-http 0.53.0 → 0.56.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4bc8de85da015e7e82aa4c9d5b74a8beb8eb7ad9703cb5e12ce26562afbf6536
-  data.tar.gz: 1aed8b966a3c63de7b6b5504a99eb89599dcb54fd0f8879c7712425cb83eff96
+  metadata.gz: 48e39e03d8f8d966cd0b9fa29b04f806011e8a4c735225bc2869accb5189c433
+  data.tar.gz: c6d938753a924cae643c8b7a627d621a0e37d7227df11ad2cf9baa9c962b46ad
 SHA512:
-  metadata.gz: 3b13c0d84ff2d98a361c08c9e0a853a0cc09d06e394375d9b4abb768328e308c0c1e02d8e964fa05e8d1169c6f0c844ad0f527ea298ba84acc16082d4eff2670
-  data.tar.gz: 24b43624c98754808ced1e5721442a2f9e98b7edcae8a7fb0fd258ca83b962dbd4f368ae8c5addbee130e95bf76f14ac8cac6d16a52048bf47f5f87c6696cea6
+  metadata.gz: 81d8b0437f1aa6651a0bf730f1646c14962fec6229058cad0a65385e5055931756b30f18eb3f8469b9fdcaf7ed49e50cb50bc53e1a590194463b59adb9ba2dc8
+  data.tar.gz: dd2c97685a6cef840107421e14e00f2575fc69c00dde5cad7ef8e681cc2bdc0e2705dc4af90fba403cacc5e084534978dc5b67b162b6a9f121aacd7e65a6551f

data/bake/async/http.rb

@@ -68,8 +68,8 @@ def fetch(url, method:)
 		
 		response.finish
 		
-		if trailers = response.headers.trailers
-			trailers.each do |key, value|
+		if trailer = response.headers.trailer
+			trailer.each do |key, value|
 				terminal.print_line(
 					:key, key.rjust(align), :reset, ": ", :value, value.inspect
 				)

data/bake/async/http/h2spec.rb

@@ -29,7 +29,7 @@ def server
 	Async.logger.info(self){"Starting server..."}
 	
 	container.run(count: 1) do
-		server = Async::HTTP::Server.for(endpoint, Async::HTTP::Protocol::HTTP2, "https") do |request|
+		server = Async::HTTP::Server.for(endpoint, protocol: Async::HTTP::Protocol::HTTP2, scheme: "https") do |request|
 			Protocol::HTTP::Response[200, {'content-type' => 'text/plain'}, ["Hello World"]]
 		end
 		

data/lib/async/http/body/hijack.rb

@@ -32,13 +32,13 @@ module Async
 					::Protocol::HTTP::Response[status, headers, self.wrap(request, &block)]
 				end
 				
-				def self.wrap(request, &block)
-					self.new(request.body, &block)
+				def self.wrap(request = nil, &block)
+					self.new(block, request&.body)
 				end
 				
-				def initialize(input = nil, &block)
-					@input = input
+				def initialize(block, input = nil)
 					@block = block
+					@input = input
 					
 					@task = nil
 					@stream = nil

data/lib/async/http/client.rb

@@ -45,7 +45,7 @@ module Async
 			# @param protocol [Protocol::HTTP1 | Protocol::HTTP2 | Protocol::HTTPS] the protocol to use.
 			# @param scheme [String] The default scheme to set to requests.
 			# @param authority [String] The default authority to set to requests.
-			def initialize(endpoint, protocol = endpoint.protocol, scheme = endpoint.scheme, authority = endpoint.authority, retries: DEFAULT_RETRIES, connection_limit: DEFAULT_CONNECTION_LIMIT)
+			def initialize(endpoint, protocol: endpoint.protocol, scheme: endpoint.scheme, authority: endpoint.authority, retries: DEFAULT_RETRIES, connection_limit: DEFAULT_CONNECTION_LIMIT)
 				@endpoint = endpoint
 				@protocol = protocol
 				

data/lib/async/http/internet.rb

@@ -22,8 +22,10 @@
 
 require_relative 'client'
 require_relative 'endpoint'
+
 require 'protocol/http/middleware'
 require 'protocol/http/body/buffered'
+require 'protocol/http/accept_encoding'
 
 module Async
 	module HTTP
@@ -48,13 +50,15 @@ module Async
 				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)
+				request = ::Protocol::HTTP::Request.new(endpoint.scheme, endpoint.authority, method, endpoint.path, nil, headers, body)
 				
 				return client.call(request)
 			end
 			
 			def client_for(endpoint)
-				Client.new(endpoint, **@options)
+				::Protocol::HTTP::AcceptEncoding.new(
+					Client.new(endpoint, **@options)
+				)
 			end
 			
 			def close

data/lib/async/http/internet/instance.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+#
+# Copyright, 2018, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require_relative '../internet'
+require 'thread-local'
+
+module Async
+	module HTTP
+		class Internet
+			# Provide access to a shared thread-local instance.
+			extend ::Thread::Local
+		end
+	end
+end

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

@@ -33,18 +33,18 @@ module Async
 					true
 				end
 				
-				def self.trailers?
+				def self.trailer?
 					true
 				end
 				
 				def self.client(peer)
-					stream = IO::Stream.new(peer, sync: false)
+					stream = IO::Stream.new(peer, sync: true)
 					
 					return HTTP1::Client.new(stream, VERSION)
 				end
 				
 				def self.server(peer)
-					stream = IO::Stream.new(peer, sync: false)
+					stream = IO::Stream.new(peer, sync: true)
 					
 					return HTTP1::Server.new(stream, VERSION)
 				end

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

@@ -31,7 +31,7 @@ module Async
 					def call(request, task: Task.current)
 						Async.logger.debug(self) {"#{request.method} #{request.path} #{request.headers.inspect}"}
 						
-						trailers = request.headers.trailers!
+						trailer = request.headers.trailer!
 						
 						# We carefully interpret https://tools.ietf.org/html/rfc7230#section-6.3.1 to implement this correctly.
 						begin
@@ -63,13 +63,13 @@ 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, false, trailers)
+									write_body(@version, body, false, trailer)
 								end
 							end
 						elsif protocol = request.protocol
 							write_upgrade_body(protocol)
 						else
-							write_body(@version, body, false, trailers)
+							write_body(@version, body, false, trailer)
 						end
 						
 						return Response.read(self, request)

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

@@ -64,7 +64,7 @@ module Async
 							return if @stream.nil? or @stream.closed?
 							
 							if response
-								trailers = response.headers.trailers!
+								trailer = response.headers.trailer!
 								
 								write_response(@version, response.status, response.headers)
 								
@@ -95,7 +95,7 @@ module Async
 									request = nil unless body
 									response = nil
 									
-									write_body(version, body, head, trailers)
+									write_body(version, body, head, trailer)
 								end
 							else
 								# If the request failed to generate a response, it was an internal server error:

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

@@ -32,18 +32,18 @@ module Async
 					false
 				end
 				
-				def self.trailers?
+				def self.trailer?
 					false
 				end
 				
 				def self.client(peer)
-					stream = IO::Stream.new(peer, sync: false)
+					stream = IO::Stream.new(peer, sync: true)
 					
 					return HTTP1::Client.new(stream, VERSION)
 				end
 				
 				def self.server(peer)
-					stream = IO::Stream.new(peer, sync: false)
+					stream = IO::Stream.new(peer, sync: true)
 					
 					return HTTP1::Server.new(stream, VERSION)
 				end

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

@@ -32,18 +32,18 @@ module Async
 					true
 				end
 				
-				def self.trailers?
+				def self.trailer?
 					true
 				end
 				
 				def self.client(peer)
-					stream = IO::Stream.new(peer, sync: false)
+					stream = IO::Stream.new(peer, sync: true)
 					
 					return HTTP1::Client.new(stream, VERSION)
 				end
 				
 				def self.server(peer)
-					stream = IO::Stream.new(peer, sync: false)
+					stream = IO::Stream.new(peer, sync: true)
 					
 					return HTTP1::Server.new(stream, VERSION)
 				end

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

@@ -33,7 +33,7 @@ module Async
 					true
 				end
 				
-				def self.trailers?
+				def self.trailer?
 					true
 				end
 				
@@ -76,24 +76,6 @@ module Async
 				def self.names
 					["h2"]
 				end
-				
-				module WithPush
-					CLIENT_SETTINGS = HTTP2::CLIENT_SETTINGS.merge(
-						::Protocol::HTTP2::Settings::ENABLE_PUSH => 1,
-					)
-					
-					def self.client(peer, settings = CLIENT_SETTINGS)
-						HTTP2.client(peer, settings)
-					end
-					
-					def self.server(peer, settings = SERVER_SETTINGS)
-						HTTP2.server(peer, settings)
-					end
-					
-					def self.names
-						HTTP2.names
-					end
-				end
 			end
 		end
 	end

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

@@ -38,7 +38,7 @@ module Async
 				
 				CONTENT_LENGTH = 'content-length'.freeze
 				CONNECTION = 'connection'.freeze
-				TRAILERS = 'trailers'.freeze
+				TRAILER = 'trailer'.freeze
 				
 				module Connection
 					def initialize(*)
@@ -107,6 +107,13 @@ module Async
 								end
 							rescue SocketError, IOError, EOFError, Errno::ECONNRESET, Errno::EPIPE, Async::Wrapper::Cancelled
 								# Ignore.
+							rescue ::Protocol::HTTP2::GoawayError => error
+								# Error is raised if a response is actively reading from the
+								# connection. The connection is silently closed if GOAWAY is
+								# received outside the request/response cycle.
+								if @reader
+									self.close(error)
+								end
 							ensure
 								# Don't call #close twice.
 								if @reader

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

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

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

@@ -39,18 +39,6 @@ module Async
 						
 						attr :request
 						
-						# Create a fake request on the server, with the given headers.
-						def create_push_promise_stream(headers)
-							stream = @connection.create_push_promise_stream(&Stream.method(:create))
-							
-							stream.headers = ::Protocol::HTTP::Headers.new
-							
-							# This will ultimately enqueue the request to be processed by the server:
-							stream.receive_initial_headers(headers, false)
-							
-							return stream
-						end
-						
 						def receive_initial_headers(headers, end_stream)
 							headers.each do |key, value|
 								if key == SCHEME
@@ -133,32 +121,6 @@ module Async
 						false
 					end
 					
-					def push?
-						@stream.connection.enable_push?
-					end
-					
-					# @return [Stream] the promised stream, on which to send data.
-					def push(path, headers = nil, scheme = @scheme, authority = @authority)
-						raise ArgumentError, "Missing scheme!" unless scheme
-						raise ArgumentError, "Missing authority!" unless authority
-						
-						push_headers = [
-							[SCHEME, scheme],
-							[METHOD, ::Protocol::HTTP::Methods::GET],
-							[PATH, path],
-							[AUTHORITY, authority]
-						]
-						
-						if headers
-							push_headers = Headers::Merged.new(
-								push_headers,
-								headers
-							)
-						end
-						
-						@stream.send_push_promise(push_headers)
-					end
-					
 					NO_RESPONSE = [
 						[STATUS, '500'],
 					]
@@ -183,12 +145,12 @@ module Async
 						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!
+							# This function informs the headers object that any subsequent headers are going to be trailer. Therefore, it must be called *before* sending the headers, to avoid any race conditions.
+							trailer = response.headers.trailer!
 							
 							@stream.send_headers(nil, headers)
 							
-							@stream.send_body(body, trailers)
+							@stream.send_body(body, trailer)
 						else
 							# Ensure the response body is closed if we are ending the stream:
 							response.close

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

@@ -50,13 +50,7 @@ module Async
 						end
 						
 						def accept_push_promise_stream(promised_stream_id, headers)
-							stream = @connection.accept_push_promise_stream(promised_stream_id, &Stream.method(:create))
-							
-							stream.response.build_request(headers)
-							
-							@response.promises.enqueue(stream.response)
-							
-							return stream
+							raise ProtocolError, "Cannot accept push promise stream!"
 						end
 						
 						# This should be invoked from the background reader, and notifies the task waiting for the headers that we are done.
@@ -113,7 +107,6 @@ module Async
 							super
 							
 							if @response
-								@response.promises.enqueue nil
 								@response = nil
 							end
 							
@@ -128,7 +121,6 @@ module Async
 						
 						@stream = stream
 						@request = nil
-						@promises = nil
 					end
 					
 					attr :stream
@@ -150,10 +142,6 @@ module Async
 						!!@status
 					end
 					
-					def promises
-						@promises ||= Async::Queue.new
-					end
-					
 					def build_request(headers)
 						request = ::Protocol::HTTP::Request.new
 						request.headers = ::Protocol::HTTP::Headers.new
@@ -215,8 +203,13 @@ module Async
 						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!
+							if length = request.body.length
+								# This puts it at the end of the pseudo-headers:
+								pseudo_headers << [CONTENT_LENGTH, length]
+							end
+							
+							# This function informs the headers object that any subsequent headers are going to be trailer. Therefore, it must be called *before* sending the headers, to avoid any race conditions.
+							trailer = request.headers.trailer!
 							
 							begin
 								@stream.send_headers(nil, headers)
@@ -224,7 +217,7 @@ module Async
 								raise RequestFailed
 							end
 							
-							@stream.send_body(request.body, trailers)
+							@stream.send_body(request.body, trailer)
 						end
 					end
 				end

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

@@ -34,7 +34,7 @@ module Async
 						super
 						
 						@headers = nil
-						@trailers = nil
+						@trailer = nil
 						
 						# Input buffer, reading request body, or response body (receive_data):
 						@length = nil
@@ -62,7 +62,7 @@ module Async
 					
 					def receive_trailing_headers(headers, end_stream)
 						headers.each do |key, value|
-							if @trailers.include?(key)
+							if @trailer.include?(key)
 								add_header(key, value)
 							else
 								raise ::Protocol::HTTP2::HeaderError, "Cannot add trailer #{key} as it was not specified as a trailer!"
@@ -75,8 +75,8 @@ module Async
 							@headers = ::Protocol::HTTP::Headers.new
 							self.receive_initial_headers(super, frame.end_stream?)
 							
-							@trailers = @headers[TRAILERS]
-						elsif @trailers and frame.end_stream?
+							@trailer = @headers[TRAILER]
+						elsif @trailer and frame.end_stream?
 							self.receive_trailing_headers(super, frame.end_stream?)
 						else
 							raise ::Protocol::HTTP2::HeaderError, "Unable to process headers!"
@@ -136,24 +136,24 @@ module Async
 					end
 					
 					# Set the body and begin sending it.
-					def send_body(body, trailers = nil)
-						@output = Output.new(self, body, trailers)
+					def send_body(body, trailer = nil)
+						@output = Output.new(self, body, trailer)
 						
 						@output.start
 					end
 					
 					# Called when the output terminates normally.
 					def finish_output(error = nil)
-						trailers = @output&.trailers
+						trailer = @output&.trailer
 						
 						@output = nil
 						
 						if error
 							send_reset_stream(::Protocol::HTTP2::Error::INTERNAL_ERROR)
 						else
-							# Write trailers?
-							if trailers
-								send_headers(nil, trailers, ::Protocol::HTTP2::END_STREAM)
+							# Write trailer?
+							if trailer
+								send_headers(nil, trailer, ::Protocol::HTTP2::END_STREAM)
 							else
 								send_data(nil, ::Protocol::HTTP2::END_STREAM)
 							end

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

@@ -42,10 +42,6 @@ module Async
 					false
 				end
 				
-				def push?
-					false
-				end
-				
 				def peer
 					if connection = self.connection
 						connection.peer

data/lib/async/http/server.rb

@@ -29,11 +29,11 @@ require 'protocol/http/middleware'
 module Async
 	module HTTP
 		class Server < ::Protocol::HTTP::Middleware
-			def self.for(*arguments, &block)
-				self.new(block, *arguments)
+			def self.for(*arguments, **options, &block)
+				self.new(block, *arguments, **options)
 			end
 			
-			def initialize(app, endpoint, protocol = endpoint.protocol, scheme = endpoint.scheme)
+			def initialize(app, endpoint, protocol: endpoint.protocol, scheme: endpoint.scheme)
 				super(app)
 				
 				@endpoint = endpoint

data/lib/async/http/version.rb

@@ -22,6 +22,6 @@
 
 module Async
 	module HTTP
-		VERSION = "0.53.0"
+		VERSION = "0.56.0"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-http
 version: !ruby/object:Gem::Version
-  version: 0.53.0
+  version: 0.56.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-15 00:00:00.000000000 Z
+date: 2021-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.22.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: protocol-http1
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: protocol-http2
   requirement: !ruby/object:Gem::Requirement
@@ -197,6 +197,7 @@ files:
 - lib/async/http/client.rb
 - lib/async/http/endpoint.rb
 - lib/async/http/internet.rb
+- lib/async/http/internet/instance.rb
 - lib/async/http/protocol.rb
 - lib/async/http/protocol/http1.rb
 - lib/async/http/protocol/http1/client.rb