async-http 0.23.1 → 0.23.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7207e1954ae1668e09deb15b8f64218c74ff6f9ee6cb4fae89b80b3049f54201
-  data.tar.gz: 4bf817e6c1c04458e37edea51c867bea9e69a0571868d9e49ea0d124202b7a1f
+  metadata.gz: 57206755197e6bd15038e9036eb5c6ab74a8942b6b00dae74d15eb999c7bf760
+  data.tar.gz: a59c0f71558d7b1ee34b21485cebda98bd30aef71744e83efd1c321b37622389
 SHA512:
-  metadata.gz: 1337adfccba971eef65e3c66f189ec5037b0a9bc5b7f422008641863e8484ca65ced7ece6ac6e25b0bbef17d6c1b57e9d9306acf0b2151ec26cdafcd38219b82
-  data.tar.gz: 1ade6934603866b12d10b99bc923c6659a30210c70dff74a744d43305eeb9369606b31008cb4bd5324505277ba10660f2bf697a8fb316efc2079d1e3e5c737a0
+  metadata.gz: 4d5e76a534e11c8045540c691882d0c92014bbb208444bfd1dbf265867da06deb324c89d5e04bb5fc28f3e71415d9a821797ac6b3614e6ef4b8b48c9ae115754
+  data.tar.gz: deea701332633244e625b516429ace7ac8892a86945facf3295aa6e81d4503de8db1136253f1cba3214cb4b5ff92b7ed47bf8318a4be5227fc977f25a02fc181

data/async-http.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
 	spec.require_paths = ["lib"]
 	
 	spec.add_dependency("async", "~> 1.6")
-	spec.add_dependency("async-io", "~> 1.10")
+	spec.add_dependency("async-io", "~> 1.11")
 	
 	spec.add_dependency("http-2", "~> 0.9.0")
 	# spec.add_dependency("openssl")

data/lib/async/http/client.rb

@@ -63,10 +63,11 @@ module Async
 				request.authority ||= @authority
 				attempt = 0
 				
+				# There is a challenge with how this works. If you have 8 connections in the connection pool and they've all expired, retrying 3 times isn't going to work. We need to, perhaps, on the last retry, initiate a completely new connection.
 				begin
 					attempt += 1
 					
-					# As we cache connections, it's possible these connections go bad (e.g. closed by remote host). In this case, we need to try again. It's up to the caller to impose a timeout on this.
+					# As we cache connections, it's possible these connections go bad (e.g. closed by remote host). In this case, we need to try again. It's up to the caller to impose a timeout on this. If this is the last attempt, we force a new connection.
 					connection = @connections.acquire
 					
 					response = connection.call(request)

data/lib/async/http/pool.rb

@@ -58,17 +58,11 @@ module Async
 			
 			# Make the resource available and let waiting tasks know that there is something available.
 			def release(resource)
+				# A resource that is not good should also not be reusable.
 				if resource.reusable?
-					Async.logger.debug(self) {"Reusing resource #{resource}"}
-					
-					@available[resource] -= 1
-					
-					if task = @waiting.pop
-						task.resume
-					end
+					reuse(resource)
 				else
-					Async.logger.debug(self) {"Closing resource: #{resource}"}
-					resource.close
+					retire(resource)
 				end
 			end
 			
@@ -79,6 +73,24 @@ module Async
 			
 			protected
 			
+			def reuse(resource)
+				Async.logger.debug(self) {"Reuse #{resource}"}
+				
+				@available[resource] -= 1
+				
+				if task = @waiting.pop
+					task.resume
+				end
+			end
+			
+			def retire(resource)
+				Async.logger.debug(self) {"Retire #{resource}"}
+				
+				@available.delete(resource)
+				
+				resource.close
+			end
+			
 			def wait_for_next_available
 				until resource = next_available
 					@waiting << Fiber.current
@@ -88,11 +100,11 @@ module Async
 				return resource
 			end
 			
-			def create_resource
+			def create
 				begin
 					# This might fail, which is okay :)
 					resource = @constructor.call
-				rescue StandardError
+				rescue
 					Async.logger.error "#{$!}: #{$!.backtrace}"
 					return nil
 				end
@@ -102,19 +114,24 @@ module Async
 				return resource
 			end
 			
-			# TODO this does not take into account resources that start off good but can fail.
 			def next_available
 				@available.each do |resource, count|
 					if count < resource.multiplex
-						@available[resource] += 1
-						
-						return resource
+						# We want to use this resource... but is it good?
+						if resource.good?
+							@available[resource] += 1
+							
+							return resource
+						else
+							retire(resource)
+						end
 					end
 				end
 				
 				if !@limit or @available.count < @limit
 					Async.logger.debug(self) {"No available resources, allocating new one..."}
-					return create_resource
+					
+					return create
 				end
 			end
 		end

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

@@ -55,6 +55,11 @@ module Async
 					1
 				end
 				
+				# Can we use this connection to make requests?
+				def good?
+					@stream.connected?
+				end
+				
 				def reusable?
 					@persistent && !@stream.closed?
 				end

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

@@ -70,7 +70,7 @@ module Async
 						Async.logger.error(self) {"goaway: #{payload.inspect}"}
 						
 						@reader.stop
-						@stream.io.close
+						@stream.close
 					end
 					
 					@count = 0
@@ -83,6 +83,11 @@ module Async
 					@controller.remote_settings[:settings_max_concurrent_streams]
 				end
 				
+				# Can we use this connection to make requests?
+				def good?
+					@stream.connected?
+				end
+				
 				def reusable?
 					!@stream.closed?
 				end
@@ -149,6 +154,8 @@ module Async
 						end
 						
 						stream.on(:half_close) do
+							# The requirements for this to be in lock-step with other opertaions is minimal.
+							# TODO consider putting this in it's own async task.
 							begin
 								# We are no longer receiving any more data frames:
 								body.finish

data/lib/async/http/version.rb

@@ -20,6 +20,6 @@
 
 module Async
 	module HTTP
-		VERSION = "0.23.1"
+		VERSION = "0.23.2"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-http
 version: !ruby/object:Gem::Version
-  version: 0.23.1
+  version: 0.23.2
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-02 00:00:00.000000000 Z
+date: 2018-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: http-2
   requirement: !ruby/object:Gem::Requirement