async-http 0.54.1 → 0.56.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82df1313e46a49ebe4ba6c345c911dcf0c899e59361f09abaedc5f7c7979e61f
-  data.tar.gz: 838d76ab9e99d661ac7be82169d6931325e64d22fab02ca93089d5da2ed13b31
+  metadata.gz: efbee0417c7ab944ad2ec6b6bd2c29735924d821b2396b02e78a6826874aa644
+  data.tar.gz: '08abaadc604cba6bb2ade84fd1387f962bab03c915f613c69cd5a1588666b431'
 SHA512:
-  metadata.gz: 0d78d6636a59967ab8de9c76eddad387d6a607c04224563bf6599ab4b637d5fccceffa462d700c7f4d19c4ce1bee6b6f72562dd91cc6f9532802dbe1769f4315
-  data.tar.gz: bcdc8bc22dfeb30ed425ad4117c682aca370acfab125a478cba7af03ec83b29eafabd5f8b0194adaf060dbdf03d7c926f348658cd9b89d4b5b12b583e33a9dc6
+  metadata.gz: 60cf32dd530b64e7919047f662ba3a94a81a05328a404c5e51e9d45f0f8a379f59462b7d04e52aa2a8e83d42df44605866aec128b87a8528d233ec1ecc8d44fc
+  data.tar.gz: 3c62522dbe7bb6915cf2d6613d356515911ebb63e5036c643073632b0571f62be2d254177fbf6565eb0044c31d3c21b5195cc98d6a43b5cf687851cdd531eebd

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

@@ -26,7 +26,7 @@ def server
 	
 	container = Async::Container.new
 	
-	Async.logger.info(self){"Starting server..."}
+	Console.logger.info(self){"Starting server..."}
 	
 	container.run(count: 1) do
 		server = Async::HTTP::Server.for(endpoint, protocol: Async::HTTP::Protocol::HTTP2, scheme: "https") do |request|

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

@@ -83,7 +83,7 @@ module Async
 			
 			def close
 				while @pool.busy?
-					Async.logger.warn(self) {"Waiting for #{@protocol} pool to drain: #{@pool}"}
+					Console.logger.warn(self) {"Waiting for #{@protocol} pool to drain: #{@pool}"}
 					@pool.wait
 				end
 				
@@ -152,7 +152,7 @@ module Async
 			
 			def make_pool(connection_limit)
 				Async::Pool::Controller.wrap(limit: connection_limit) do
-					Async.logger.debug(self) {"Making connection to #{@endpoint.inspect}"}
+					Console.logger.debug(self) {"Making connection to #{@endpoint.inspect}"}
 					
 					@protocol.client(@endpoint.connect)
 				end

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,7 +33,7 @@ module Async
 					true
 				end
 				
-				def self.trailers?
+				def self.trailer?
 					true
 				end
 				

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

@@ -29,9 +29,12 @@ module Async
 				class Client < Connection
 					# Used by the client to send requests to the remote server.
 					def call(request, task: Task.current)
-						Async.logger.debug(self) {"#{request.method} #{request.path} #{request.headers.inspect}"}
+						# We need to keep track of connections which are not in the initial "ready" state.
+						@ready = false
 						
-						trailers = request.headers.trailers!
+						Console.logger.debug(self) {"#{request.method} #{request.path} #{request.headers.inspect}"}
+						
+						trailer = request.headers.trailer!
 						
 						# We carefully interpret https://tools.ietf.org/html/rfc7230#section-6.3.1 to implement this correctly.
 						begin
@@ -63,16 +66,19 @@ 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)
+						response = Response.read(self, request)
+						@ready = true
+						
+						return response
 					rescue
 						# This will ensure that #reusable? returns false.
 						@stream.close

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

@@ -33,6 +33,7 @@ module Async
 					def initialize(stream, version)
 						super(stream)
 						
+						@ready = true
 						@version = version
 					end
 					
@@ -48,8 +49,6 @@ module Async
 					
 					def read_line?
 						@stream.read_until(CRLF)
-					rescue Errno::ECONNRESET
-						return nil
 					end
 					
 					def read_line
@@ -68,11 +67,11 @@ module Async
 					
 					# Can we use this connection to make requests?
 					def viable?
-						@stream&.connected?
+						@ready && @stream&.connected?
 					end
 					
 					def reusable?
-						@persistent && @stream && !@stream.closed?
+						@ready && @persistent && @stream && !@stream.closed?
 					end
 				end
 			end

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,7 +32,7 @@ module Async
 					false
 				end
 				
-				def self.trailers?
+				def self.trailer?
 					false
 				end
 				

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

@@ -32,7 +32,7 @@ module Async
 					true
 				end
 				
-				def self.trailers?
+				def self.trailer?
 					true
 				end
 				

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

@@ -33,7 +33,7 @@ module Async
 					true
 				end
 				
-				def self.trailers?
+				def self.trailer?
 					true
 				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(*)

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

@@ -145,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

@@ -208,8 +208,8 @@ module Async
 								pseudo_headers << [CONTENT_LENGTH, length]
 							end
 							
-							# 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!
+							# 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)
@@ -217,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!"
@@ -88,7 +88,7 @@ module Async
 							@input = nil
 						end
 					rescue ::Protocol::HTTP2::HeaderError => error
-						Async.logger.error(self, error)
+						Console.logger.error(self, error)
 						
 						send_reset_stream(error.code)
 					end
@@ -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/https.rb

@@ -59,7 +59,7 @@ module Async
 					# alpn_protocol is only available if openssl v1.0.2+
 					name = peer.alpn_protocol
 					
-					Async.logger.debug(self) {"Negotiating protocol #{name.inspect}..."}
+					Console.logger.debug(self) {"Negotiating protocol #{name.inspect}..."}
 					
 					if protocol = HANDLERS[name]
 						return protocol

data/lib/async/http/server.rb

@@ -48,7 +48,7 @@ module Async
 			def accept(peer, address, task: Task.current)
 				connection = @protocol.server(peer)
 				
-				Async.logger.debug(self) {"Incoming connnection from #{address.inspect} to #{@protocol}"}
+				Console.logger.debug(self) {"Incoming connnection from #{address.inspect} to #{@protocol}"}
 				
 				connection.each do |request|
 					# We set the default scheme unless it was otherwise specified.
@@ -58,7 +58,7 @@ module Async
 					# This is a slight optimization to avoid having to get the address from the socket.
 					request.remote_address = address
 					
-					# Async.logger.debug(self) {"Incoming request from #{address.inspect}: #{request.method} #{request.path}"}
+					# Console.logger.debug(self) {"Incoming request from #{address.inspect}: #{request.method} #{request.path}"}
 					
 					# If this returns nil, we assume that the connection has been hijacked.
 					self.call(request)

data/lib/async/http/version.rb

@@ -22,6 +22,6 @@
 
 module Async
 	module HTTP
-		VERSION = "0.54.1"
+		VERSION = "0.56.3"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-http
 version: !ruby/object:Gem::Version
-  version: 0.54.1
+  version: 0.56.3
 platform: ruby
 authors:
 - Samuel Williams
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-06 00:00:00.000000000 Z
+date: 2021-06-04 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
@@ -243,7 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.0.dev
 signing_key:
 specification_version: 4
 summary: A HTTP client and server library.