async-http 0.56.0 → 0.56.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48e39e03d8f8d966cd0b9fa29b04f806011e8a4c735225bc2869accb5189c433
-  data.tar.gz: c6d938753a924cae643c8b7a627d621a0e37d7227df11ad2cf9baa9c962b46ad
+  metadata.gz: caff6f0e39afa2ec8e8eaff86fc960121968f136fd23bee8e4c4344e1da55c36
+  data.tar.gz: 8428ae61665e4bc9275cf1a127006c9c975cc184267a1ac0a35b9b7df80d608f
 SHA512:
-  metadata.gz: 81d8b0437f1aa6651a0bf730f1646c14962fec6229058cad0a65385e5055931756b30f18eb3f8469b9fdcaf7ed49e50cb50bc53e1a590194463b59adb9ba2dc8
-  data.tar.gz: dd2c97685a6cef840107421e14e00f2575fc69c00dde5cad7ef8e681cc2bdc0e2705dc4af90fba403cacc5e084534978dc5b67b162b6a9f121aacd7e65a6551f
+  metadata.gz: 761f315b4fc933cb92d80eb9000e2f5dd2c796bc9e119265ee452f27f0edabc071766e4d48e35dd1866661d315166b7e32fb509348ec5c9cb43c38c5d1b4586f
+  data.tar.gz: 0b229bf87de21d7cc05de022283901f75114bf37acc240e7992430c5e47602ab04f8b9aa76884b30733f55a1b52b0d3ae51b9dc0e25ea1a653dfda680e77a1ce

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/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

@@ -31,7 +31,7 @@ module Async
 	module HTTP
 		class Internet
 			def initialize(**options)
-				@clients = {}
+				@clients = Hash.new
 				@options = options
 			end
 			
@@ -39,13 +39,17 @@ module Async
 			# @attribute [Hash(URI, Client)]
 			attr :clients
 			
-			def call(method, url, headers = nil, body = nil)
-				endpoint = Endpoint.parse(url)
+			def client_for(endpoint)
 				key = host_key(endpoint)
 				
-				client = @clients.fetch(key) do
-					@clients[key] = self.client_for(endpoint)
+				@clients.fetch(key) do
+					@clients[key] = self.make_client(endpoint)
 				end
+			end
+			
+			def call(method, url, headers = nil, body = nil)
+				endpoint = Endpoint.parse(url)
+				client = self.client_for(endpoint)
 				
 				body = Body::Buffered.wrap(body)
 				headers = ::Protocol::HTTP::Headers[headers]
@@ -55,12 +59,6 @@ module Async
 				return client.call(request)
 			end
 			
-			def client_for(endpoint)
-				::Protocol::HTTP::AcceptEncoding.new(
-					Client.new(endpoint, **@options)
-				)
-			end
-			
 			def close
 				# The order of operations here is to avoid a race condition between iterating over clients (#close may yield) and creating new clients.
 				clients = @clients.values
@@ -75,7 +73,13 @@ module Async
 				end
 			end
 			
-			private
+			protected
+			
+			def make_client(endpoint)
+				::Protocol::HTTP::AcceptEncoding.new(
+					Client.new(endpoint, **@options)
+				)
+			end
 			
 			def host_key(endpoint)
 				url = endpoint.url.dup

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

@@ -21,7 +21,7 @@
 # THE SOFTWARE.
 
 require_relative '../internet'
-require 'thread-local'
+require 'thread/local'
 
 module Async
 	module HTTP

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

@@ -29,7 +29,10 @@ 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
+						
+						Console.logger.debug(self) {"#{request.method} #{request.path} #{request.headers.inspect}"}
 						
 						trailer = request.headers.trailer!
 						
@@ -72,7 +75,10 @@ module Async
 							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/http2/stream.rb

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

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.56.0"
+		VERSION = "0.56.4"
 	end
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: async-http
 version: !ruby/object:Gem::Version
-  version: 0.56.0
+  version: 0.56.4
 platform: ruby
 authors:
 - Samuel Williams
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-23 00:00:00.000000000 Z
+date: 2021-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.25'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.25'
 - !ruby/object:Gem::Dependency
@@ -244,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.2.22
 signing_key:
 specification_version: 4
 summary: A HTTP client and server library.