WIP

Author: ioquatix

async-http.gemspec

@@ -28,8 +28,8 @@ Gem::Specification.new do |spec|
 	spec.add_dependency "async-pool", "~> 0.7"
 	spec.add_dependency "io-endpoint", "~> 0.11"
 	spec.add_dependency "io-stream", "~> 0.4"
-	spec.add_dependency "protocol-http", "~> 0.35"
-	spec.add_dependency "protocol-http1", "~> 0.20"
+	spec.add_dependency "protocol-http", "~> 0.36"
+	spec.add_dependency "protocol-http1", "~> 0.23"
 	spec.add_dependency "protocol-http2", "~> 0.18"
 	spec.add_dependency "traces", ">= 0.10"
 end

lib/async/http/body/finishable.rb

@@ -9,12 +9,25 @@
 module Async
 	module HTTP
 		module Body
+			# Keeps track of whether a body is being read, and if so, waits for it to be closed.
 			class Finishable < ::Protocol::HTTP::Body::Wrapper
 				def initialize(body)
 					super(body)
 
 					@closed = Async::Variable.new
 					@error = nil
+					
+					@reading = false
+				end
+				
+				def reading?
+					@reading
+				end
+				
+				def read
+					@reading = true
+					
+					super
 				end
 
 				def close(error = nil)
@@ -27,7 +40,11 @@ def close(error = nil)
 				end
 
 				def wait
-					@closed.wait
+					if @reading
+						@closed.wait
+					else
+						self.discard
+					end
 				end
 
 				def inspect

lib/async/http/client.rb

@@ -14,6 +14,7 @@
 require 'traces/provider'
 
 require_relative 'protocol'
+require_relative 'body/finishable'
 
 module Async
 	module HTTP
@@ -140,7 +141,7 @@ def call(request)
 			def inspect
 				"#<#{self.class} authority=#{@authority.inspect}>"
 			end
-
+			
 			Traces::Provider(self) do
 				def call(request)
 					attributes = {
@@ -186,9 +187,14 @@ def call(request)
 			def make_response(request, connection)
 				response = request.call(connection)
 
+				if body = request.body
+					finishable = Body::Finishable.new(body)
+				end
+				
 				# The connection won't be released until the body is completely read/released.
 				::Protocol::HTTP::Body::Completable.wrap(response) do
 					# TODO: We should probably wait until the request is fully consumed and/or the connection is ready before releasing it back into the pool.
+					finishable&.wait
 
 					# Release the connection back into the pool:
 					@pool.release(connection)

lib/async/http/protocol/response.rb

@@ -33,6 +33,10 @@ def remote_address
 				def remote_address= value
 					@remote_address = value
 				end
+				
+				def finished!
+					
+				end
 			end
 		end
 	end

test/async/http/middleware/location_redirector.rb

@@ -18,8 +18,6 @@
 		with '301' do
 			let(:app) do
 				Protocol::HTTP::Middleware.for do |request|
-					request.finish # TODO: request.discard - or some default handling?
-					
 					case request.path
 					when '/home'
 						Protocol::HTTP::Response[301, {'location' => '/'}, []]