async-http 0.52.5 → 0.53.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f3f0a32ca906a1af82161acfe4d4256748c1d2e7a8792e9973abf7f203df7d9
-  data.tar.gz: 0f2e158de8e076bb7af74b3ac268e1a0260169ae2fee56925b2fd244f668f904
+  metadata.gz: 4bc8de85da015e7e82aa4c9d5b74a8beb8eb7ad9703cb5e12ce26562afbf6536
+  data.tar.gz: 1aed8b966a3c63de7b6b5504a99eb89599dcb54fd0f8879c7712425cb83eff96
 SHA512:
-  metadata.gz: 53a44e49b1502fb8cb2e6d2234b7ea94831b4b6f391f9ee48c842aeea0a80f517143894fb10c98499fdbb2f1bb23994ad26d82735c9912f4333975acfdc6b1af
-  data.tar.gz: 53052f74772e143a831df936aad2f4687b045ae1d2ccf7bcf598d6e8b105ec3c5e47ffb20bc72ecc7fe07b6701d8f3155ba717aa6cebd065caf0506cb5ed1c70
+  metadata.gz: 3b13c0d84ff2d98a361c08c9e0a853a0cc09d06e394375d9b4abb768328e308c0c1e02d8e964fa05e8d1169c6f0c844ad0f527ea298ba84acc16082d4eff2670
+  data.tar.gz: 24b43624c98754808ced1e5721442a2f9e98b7edcae8a7fb0fd258ca83b962dbd4f368ae8c5addbee130e95bf76f14ac8cac6d16a52048bf47f5f87c6696cea6

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

@@ -44,6 +44,11 @@ module Async
 					@stream = nil
 				end
 				
+				# We prefer streaming directly as it's the lowest overhead.
+				def stream?
+					true
+				end
+				
 				def call(stream)
 					return @block.call(stream)
 				end

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

@@ -20,6 +20,9 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
+require 'async/io/socket'
+require 'async/io/stream'
+
 require_relative 'writable'
 
 module Async
@@ -39,8 +42,8 @@ module Async
 					@reader = nil
 					@writer = nil
 					
-					task.async(&self.method(:reader))
-					task.async(&self.method(:writer))
+					task.async(transient: true, &self.method(:reader))
+					task.async(transient: true, &self.method(:writer))
 				end
 				
 				def to_io
@@ -69,10 +72,9 @@ module Async
 					
 					@head.close_write
 				ensure
-					@reader = nil
 					@input.close($!)
 					
-					@head.close if @writer.nil?
+					close_head if @writer&.finished?
 				end
 				
 				# Read from the head of the pipe and write to the @output stream.
@@ -86,11 +88,17 @@ module Async
 						@output.write(chunk)
 					end
 				ensure
-					@writer = nil
-					
 					@output.close($!)
 					
-					@head.close if @reader.nil?
+					close_head if @reader&.finished?
+				end
+				
+				def close_head
+					@head.close
+					
+					# Both tasks are done, don't keep references:
+					@reader = nil
+					@writer = nil
 				end
 			end
 		end

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

@@ -139,7 +139,7 @@ module Async
 				end
 				
 				# Close the input and output bodies.
-				def close
+				def close(error = nil)
 					self.close_read
 					self.close_write
 				ensure

data/lib/async/http/client.rb

@@ -25,7 +25,7 @@ require 'async/io/stream'
 
 require 'async/pool/controller'
 
-require 'protocol/http/body/streamable'
+require 'protocol/http/body/completable'
 require 'protocol/http/methods'
 
 require_relative 'protocol'
@@ -143,7 +143,7 @@ module Async
 				response = request.call(connection)
 				
 				# The connection won't be released until the body is completely read/released.
-				::Protocol::HTTP::Body::Streamable.wrap(response) do
+				::Protocol::HTTP::Body::Completable.wrap(response) do
 					@pool.release(connection)
 				end
 				

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

@@ -74,11 +74,6 @@ module Async
 					def reusable?
 						@persistent && @stream && !@stream.closed?
 					end
-					
-					def close
-						Async.logger.debug(self) {"Closing connection"}
-						super
-					end
 				end
 			end
 		end

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

@@ -80,7 +80,7 @@ module Async
 									response = nil
 									
 									body.call(stream)
-								elsif body and request.connect?
+								elsif request.connect? and response.success?
 									stream = write_tunnel_body(request.version)
 									
 									# Same as above:

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

@@ -42,7 +42,7 @@ module Async
 					def start(parent: Task.current)
 						raise "Task already started!" if @task
 						
-						if @body.respond_to?(:call)
+						if @body.stream?
 							@task = parent.async(&self.method(:stream))
 						else
 							@task = parent.async(&self.method(:passthrough))

data/lib/async/http/proxy.rb

@@ -30,6 +30,15 @@ module Async
 		# Wraps a client, address and headers required to initiate a connectio to a remote host using the CONNECT verb.
 		# Behaves like a TCP endpoint for the purposes of connecting to a remote host.
 		class Proxy
+			class ConnectFailure < StandardError
+				def initialize(response)
+					super "Failed to connect: #{response.status}"
+					@response = response
+				end
+				
+				attr :response
+			end
+			
 			module Client
 				def proxy(endpoint, headers = nil)
 					Proxy.new(self, endpoint.authority(false), headers)
@@ -92,14 +101,21 @@ module Async
 				
 				response = @client.connect(@address.to_s, @headers, input)
 				
-				pipe = Body::Pipe.new(response.body, input)
-				
-				return pipe.to_io unless block_given?
-				
-				begin
-					yield pipe.to_io
-				ensure
-					pipe.close
+				if response.success?
+					pipe = Body::Pipe.new(response.body, input)
+					
+					return pipe.to_io unless block_given?
+					
+					begin
+						yield pipe.to_io
+					ensure
+						pipe.close
+					end
+				else
+					# This ensures we don't leave a response dangling:
+					response.close
+					
+					raise ConnectFailure, response
 				end
 			end
 			

data/lib/async/http/version.rb

@@ -22,6 +22,6 @@
 
 module Async
 	module HTTP
-		VERSION = "0.52.5"
+		VERSION = "0.53.0"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-http
 version: !ruby/object:Gem::Version
-  version: 0.52.5
+  version: 0.53.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-19 00:00:00.000000000 Z
+date: 2020-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: protocol-http1
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +164,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.6'
+- !ruby/object:Gem::Dependency
+  name: localhost
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description:
 email:
 executables: []
@@ -229,7 +243,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: A HTTP client and server library.