async-http 0.19.0 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd03fb46876ed4121fa2232b18de6ec00e7176a6c224adf8d5001ec53cf89f1c
-  data.tar.gz: c42bf8f085ad74ee4fbc6b15c47bcb06915a41f42d3a48d58d39a43f695b267d
+  metadata.gz: b40fa9e658f1c38dbd0a8c6ecdfb201af8e6bc504dfb30697b776d6fdf001eac
+  data.tar.gz: 714670c4acf8f6b961558d3ea336e81e1d596db29ecbe4df66dbe8349d257975
 SHA512:
-  metadata.gz: 7be71154d37d575a6c7b19c7d2c5b81b98e513d260a5d15c9d4c8e0a7fbaf3285d99ca7dc4030e9567af159ff73f4dc25c6144dd55e1745ae307898d0f6c8c9f
-  data.tar.gz: bb5748a2d385ce8528b218246a5a701d1c8fb1b45d1b40c2d9ce8e559b023c9c032c1ef396cc930c101278e56ddd2a57280e9e16d77df4eca1bfbc09c99e4caf
+  metadata.gz: 740c053ba517dd857b7b612d9e10054edc0e63f3a16062cecde65f042a1fc8036e9c9c299c258f894de91fbb2fa1ab8ad1f27b4ecacce7527fb166c76774b5f8
+  data.tar.gz: fed266d04a67864ab917d61162b577bd2a24a8567eea6cbc59df5535558d735b0f5e5ef5e902a6b27bac7343ecfc0eec9654d105f346b2492f4d0edb3da5b55b

data/async-http.gemspec

@@ -17,9 +17,9 @@ Gem::Specification.new do |spec|
 	spec.require_paths = ["lib"]
 	
 	spec.add_dependency("async", "~> 1.6")
-	spec.add_dependency("async-io", "~> 1.7")
+	spec.add_dependency("async-io", "~> 1.8")
 	
-	spec.add_dependency("http-2", "~> 0.8")
+	spec.add_dependency("http-2", "~> 0.9.0")
 	# spec.add_dependency("openssl")
 	
 	spec.add_development_dependency "async-rspec", "~> 1.1"

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

@@ -36,7 +36,7 @@ module Async
 				
 				def read
 					if @remaining > 0
-						if chunk = @stream.read(@remaining)
+						if chunk = @stream.read_partial(@remaining)
 							@remaining -= chunk.bytesize
 							
 							return chunk

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

@@ -51,6 +51,7 @@ module Async
 					return chunk
 				end
 				
+				# Cause the next call to write to fail with the given error.
 				def stop(error)
 					@stopped = error
 				end
@@ -67,13 +68,15 @@ module Async
 					@queue.enqueue(chunk)
 				end
 				
+				alias << write
+				
 				# Signal that output has finished.
 				def finish
 					@queue.enqueue(nil)
 				end
 				
 				def inspect
-					"\#<#{self.class} #{@count} chunks written>"
+					"\#<#{self.class} #{@count} chunks written#{@finished ? ', finished' : ''}>"
 				end
 			end
 		end

data/lib/async/http/client.rb

@@ -59,17 +59,24 @@ module Async
 			include Verbs
 			
 			def call(request)
-				connection = @connections.acquire
-				
 				request.authority ||= @authority
-				response = connection.call(request)
 				
-				# The connection won't be released until the body is completely read/released.
-				Body::Streamable.wrap(response) do
-					@connections.release(connection)
+				# 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.
+				while true
+					connection = @connections.acquire
+					
+					if response = connection.call(request)
+						# The connection won't be released until the body is completely read/released.
+						Body::Streamable.wrap(response) do
+							@connections.release(connection)
+						end
+						
+						return response
+					else
+						# The connection failed for some reason, we close it.
+						connection.close
+					end
 				end
-				
-				return response
 			end
 			
 			protected
@@ -78,15 +85,10 @@ module Async
 				Pool.new(connection_limit) do
 					Async.logger.debug(self) {"Making connection to #{@endpoint.inspect}"}
 					
-					@endpoint.each do |endpoint|
-						peer = endpoint.connect
-						
-						peer.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
-						
-						stream = IO::Stream.new(peer)
-						
-						break @protocol.client(stream)
-					end
+					peer = @endpoint.connect
+					peer.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
+					
+					@protocol.client(IO::Stream.new(peer))
 				end
 			end
 		end

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

@@ -31,7 +31,7 @@ module Async
 					VERSION
 				end
 				
-				def keep_alive?(headers)
+				def persistent?(headers)
 					headers['connection'] == KEEP_ALIVE
 				end
 				
@@ -44,7 +44,7 @@ module Async
 						
 						write_response(response.version, response.status, response.headers, response.body)
 						
-						unless keep_alive?(request.headers) && keep_alive?(headers)
+						unless persistent?(request.headers) && persistent?(headers)
 							@keep_alive = false
 							
 							break
@@ -54,9 +54,9 @@ module Async
 					return false
 				end
 				
-				def write_body(body, chunked = true)
+				def write_body(body, chunked = false)
 					# We don't support chunked encoding.
-					super(body, false)
+					super(body, chunked)
 				end
 				
 				def read_body(headers)
@@ -65,7 +65,7 @@ module Async
 					end
 					
 					# Technically, with HTTP/1.0, if no content-length is specified, we just need to read everything until the connection is closed.
-					if !keep_alive?(headers)
+					if !persistent?(headers)
 						return Body::Remainder.new(@stream)
 					end
 				end

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

@@ -36,16 +36,19 @@ module Async
 				def initialize(stream)
 					super(stream, CRLF)
 					
-					@keep_alive = true
+					@persistent = true
+					@count = 0
 				end
 				
+				attr :count
+				
 				# Only one simultaneous connection at a time.
 				def multiplex
 					1
 				end
 				
 				def reusable?
-					@keep_alive
+					@persistent
 				end
 				
 				class << self
@@ -62,7 +65,7 @@ module Async
 					VERSION
 				end
 				
-				def keep_alive?(headers)
+				def persistent?(headers)
 					headers['connection'] != CLOSE
 				end
 				
@@ -70,6 +73,7 @@ module Async
 				def receive_requests(task: Task.current)
 					while true
 						request = Request.new(*read_request)
+						@count += 1
 						
 						response = yield request
 						
@@ -79,8 +83,8 @@ module Async
 						
 						request.finish
 						
-						unless keep_alive?(request.headers) and keep_alive?(response.headers)
-							@keep_alive = false
+						unless persistent?(request.headers) and persistent?(response.headers)
+							@persistent = false
 							
 							break
 						end
@@ -91,6 +95,8 @@ module Async
 				end
 				
 				def call(request)
+					@count += 1
+					
 					request.version ||= self.version
 					
 					Async.logger.debug(self) {"#{request.method} #{request.path} #{request.headers.inspect}"}
@@ -98,6 +104,7 @@ module Async
 					
 					return Response.new(*read_response)
 				rescue EOFError
+					Async.logger.debug(self) {"Connection failed with EOFError after #{@count} requests."}
 					return nil
 				end
 				
@@ -118,7 +125,7 @@ module Async
 					headers = read_headers
 					body = read_body(headers)
 					
-					@keep_alive = keep_alive?(headers)
+					@keep_alive = persistent?(headers)
 					
 					return version, Integer(status), reason, headers, body
 				end
@@ -163,9 +170,9 @@ module Async
 				end
 				
 				def write_body(body, chunked = true)
-					if body.empty?
+					if body.nil? or body.empty?
 						@stream.write("Content-Length: 0\r\n\r\n")
-						body.read
+						body.read if body
 					elsif chunked
 						@stream.write("Transfer-Encoding: chunked\r\n\r\n")
 						

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

@@ -64,8 +64,12 @@ module Async
 					@controller.on(:frame_received) do |frame|
 						Async.logger.debug(self) {"Received frame: #{frame.inspect}"}
 					end
+					
+					@count = 0
 				end
 				
+				attr :count
+				
 				# Multiple requests can be processed at the same time.
 				def multiplex
 					@controller.remote_settings[:settings_max_concurrent_streams]
@@ -85,10 +89,10 @@ module Async
 				
 				def read_in_background(task: Task.current)
 					task.async do |nested_task|
-						buffer = Async::IO::BinaryString.new
+						nested_task.annotate("#{version} reading data")
 						
-						while data = @stream.io.read(1024*8, buffer)
-							@controller << data
+						while buffer = @stream.read_partial
+							@controller << buffer
 						end
 						
 						Async.logger.debug(self) {"Connection reset by peer!"}
@@ -104,6 +108,8 @@ module Async
 				def receive_requests(task: Task.current, &block)
 					# emits new streams opened by the client
 					@controller.on(:stream) do |stream|
+						@count += 1
+						
 						request = Request.new
 						request.version = self.version
 						request.headers = {}
@@ -143,9 +149,9 @@ module Async
 							headers.update(response.headers)
 							
 							# puts "Sending headers #{headers}"
-							if response.body.empty?
+							if response.body.nil? or response.body.empty?
 								stream.headers(headers, end_stream: true)
-								response.body.read
+								response.body.read if response.body
 							else
 								stream.headers(headers, end_stream: false)
 								
@@ -166,6 +172,8 @@ module Async
 				end
 				
 				def call(request)
+					@count += 1
+					
 					request.version ||= self.version
 					
 					stream = @controller.new_stream
@@ -207,8 +215,9 @@ module Async
 						body.finish
 					end
 					
-					if request.body.empty?
+					if request.body.nil? or request.body.empty?
 						stream.headers(headers, end_stream: true)
+						request.body.read if request.body
 					else
 						stream.headers(headers, end_stream: false)
 						

data/lib/async/http/server.rb

@@ -42,8 +42,9 @@ module Async
 			
 			def accept(peer, address, task: Task.current)
 				peer.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
+				block_size = peer.getsockopt(Socket::SOL_SOCKET, Socket::SO_RCVBUF).int
 				
-				stream = Async::IO::Stream.new(peer)
+				stream = Async::IO::Stream.new(peer, block_size: block_size)
 				protocol = @protocol_class.server(stream)
 				
 				# Async.logger.debug(self) {"Incoming connnection from #{address.inspect}"}
@@ -63,8 +64,6 @@ module Async
 				end
 			rescue EOFError, Errno::ECONNRESET, Errno::EPIPE
 				# Sometimes client will disconnect without completing a result or reading the entire buffer.
-			ensure
-				peer.close
 			end
 			
 			def run

data/lib/async/http/statistics.rb

@@ -34,7 +34,9 @@ module Async
 			end
 			
 			def wrap(response, &block)
-				response.body = Body::Statistics.new(@start_time, response.body, block)
+				if response and response.body
+					response.body = Body::Statistics.new(@start_time, response.body, block)
+				end
 			end
 		end
 		

data/lib/async/http/version.rb

@@ -20,6 +20,6 @@
 
 module Async
 	module HTTP
-		VERSION = "0.19.0"
+		VERSION = "0.20.0"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-http
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.20.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-17 00:00:00.000000000 Z
+date: 2018-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: http-2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: async-rspec
   requirement: !ruby/object:Gem::Requirement