async-http 0.52.1 → 0.53.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3eae41a03fcbeb32308cd6f6632f18ef6f8c3fc8bbf4dabd8e360cca792c2510
-  data.tar.gz: 473658b819493d2c4cd493c7b723ae02bccf69f3cb19f760599d18d30867de70
+  metadata.gz: 4bc8de85da015e7e82aa4c9d5b74a8beb8eb7ad9703cb5e12ce26562afbf6536
+  data.tar.gz: 1aed8b966a3c63de7b6b5504a99eb89599dcb54fd0f8879c7712425cb83eff96
 SHA512:
-  metadata.gz: d7ded1163becb221402d6c048d9611518883662d3efc6a5246268d7feff5fe013736d4fcb60c082a3d821bb9df3f1dc8da0e07f0995d0564c2b37fa6160587f9
-  data.tar.gz: 9a7f56f11024114ee9615af2abc60fcba83d20803815519956db9fee20f212cd156d1505da349c21b702c85e85373a0688601541bc3588944e583fe358d55044
+  metadata.gz: 3b13c0d84ff2d98a361c08c9e0a853a0cc09d06e394375d9b4abb768328e308c0c1e02d8e964fa05e8d1169c6f0c844ad0f527ea298ba84acc16082d4eff2670
+  data.tar.gz: 24b43624c98754808ced1e5721442a2f9e98b7edcae8a7fb0fd258ca83b962dbd4f368ae8c5addbee130e95bf76f14ac8cac6d16a52048bf47f5f87c6696cea6

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

@@ -20,18 +20,22 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require_relative 'wrapper'
+require 'protocol/http/body/wrapper'
 
 module Async
 	module HTTP
 		module Body
-			class Delayed < Async::HTTP::Body::Wrapper
+			class Delayed < Protocol::HTTP::Body::Wrapper
 				def initialize(body, delay = 0.01)
 					super(body)
 					
 					@delay = delay
 				end
 				
+				def ready?
+					false
+				end
+				
 				def read
 					Async::Task.current.sleep(@delay)
 					

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
@@ -59,6 +64,12 @@ module Async
 					end
 				end
 				
+				def ready?
+					if @stream
+						@stream.output.ready?
+					end
+				end
+				
 				# Read the next available chunk.
 				def read
 					unless @task

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/slowloris.rb

@@ -37,8 +37,8 @@ module Async
 				
 				# In order for this implementation to work correctly, you need to use a LimitedQueue.
 				# @param minimum_throughput [Integer] the minimum bytes per second otherwise this body will be forcefully closed.
-				def initialize(*args, minimum_throughput: 1024, **options)
-					super(*args, **options)
+				def initialize(*arguments, minimum_throughput: 1024, **options)
+					super(*arguments, **options)
 					
 					@minimum_throughput = minimum_throughput
 					

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/body/writable.rb

@@ -68,6 +68,10 @@ module Async
 					@closed
 				end
 				
+				def ready?
+					!@queue.empty?
+				end
+				
 				# Has the producer called #finish and has the reader consumed the nil token?
 				def empty?
 					@finished

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/endpoint.rb

@@ -193,8 +193,8 @@ module Async
 				@endpoint ||= build_endpoint
 			end
 			
-			def bind(*args, &block)
-				endpoint.bind(*args, &block)
+			def bind(*arguments, &block)
+				endpoint.bind(*arguments, &block)
 			end
 			
 			def connect(&block)

data/lib/async/http/internet.rb

@@ -33,6 +33,10 @@ module Async
 				@options = options
 			end
 			
+			# A cache of clients.
+			# @attribute [Hash(URI, Client)]
+			attr :clients
+			
 			def call(method, url, headers = nil, body = nil)
 				endpoint = Endpoint.parse(url)
 				key = host_key(endpoint)

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

@@ -56,7 +56,7 @@ module Async
 					
 					# Server loop.
 					def each(task: Task.current)
-						task.annotate("Reading #{version} requests for #{self.class}.")
+						task.annotate("Reading #{self.version} requests for #{self.class}.")
 						
 						while request = next_request
 							response = yield(request, self)
@@ -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:
@@ -90,11 +90,12 @@ module Async
 									body.call(stream)
 								else
 									head = request.head?
+									version = request.version
 									
 									request = nil unless body
 									response = nil
 									
-									write_body(request.version, body, head, trailers)
+									write_body(version, body, head, trailers)
 								end
 							else
 								# If the request failed to generate a response, it was an internal server error:

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.1"
+		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.1
+  version: 0.53.0
 platform: ruby
 authors:
 - Samuel Williams
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-05 00:00:00.000000000 Z
+date: 2020-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: 0.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: protocol-http1
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: protocol-http2
   requirement: !ruby/object:Gem::Requirement
@@ -95,35 +95,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.14.0
 - !ruby/object:Gem::Dependency
-  name: async-rspec
+  name: async-container
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0.14'
 - !ruby/object:Gem::Dependency
-  name: async-container
+  name: async-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: '1.10'
 - !ruby/object:Gem::Dependency
-  name: rack-test
+  name: covered
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: covered
+  name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,21 +151,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.6'
 - !ruby/object:Gem::Dependency
-  name: bake-bundler
+  name: localhost
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -178,57 +178,14 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.6'
-description: 
+description:
 email:
-- samuel.williams@oriontransfer.co.nz
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".editorconfig"
-- ".github/workflows/development.yml"
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
-- README.md
-- async-http.gemspec
-- bake.rb
 - bake/async/http.rb
 - bake/async/http/h2spec.rb
-- examples/compare/Gemfile
-- examples/compare/benchmark.rb
-- examples/download/chunked.rb
-- examples/fetch/Gemfile
-- examples/fetch/Gemfile.lock
-- examples/fetch/README.md
-- examples/fetch/config.ru
-- examples/fetch/public/index.html
-- examples/fetch/public/stream.js
-- examples/google/search.rb
-- examples/request.rb
-- examples/stream/stop.rb
-- examples/trenni/Gemfile
-- examples/trenni/streaming.rb
-- examples/upload/client.rb
-- examples/upload/data.txt
-- examples/upload/server.rb
-- examples/upload/upload.rb
-- gems.locked
-- gems.rb
 - lib/async/http.rb
 - lib/async/http/body.rb
 - lib/async/http/body/delayed.rb
@@ -271,7 +228,7 @@ homepage: https://github.com/socketry/async-http
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -287,7 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: A HTTP client and server library.
 test_files: []