async-http 0.47.0 → 0.48.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27b6378ebb80f14051f9869d2409de28292dac437c14d7b4188edcd45c7d9971
-  data.tar.gz: a52c8f9553effe5e0e1bdf0e90a9eaa529e3f4cc1e1c53d06e7606fe16966e16
+  metadata.gz: bd79f3f1a3f1c5c5283c9e851433bce5833c18f33b231623fb1e414de078282f
+  data.tar.gz: bc27cc3ed8568cdd884e09c0889d8d78c3a879bf0117c94c9845f8ea2bd4e5d9
 SHA512:
-  metadata.gz: 4ed7257439e6e3829c88cedefc78df137551b9c0183abaa76e59a7d39d0ae399af9a5fec7b66ece4a22648099ef6e29abe9d1c2f93ba83d80622c17edf0f604d
-  data.tar.gz: 35906d4412cf80f45a3ef074b0f29ec9076f40f73b74c542353d60a2dfb1509aba95c27e5b8fe340d49c0e6a873998adbc49920622f28439b9a4f360f0f4350c
+  metadata.gz: 5efa88bd4fb17b26b36b434879ff1e2757fdee205d08ee9b5f6a111d867ace9fd2d06ade0b6f895445fc9d5c09057b047d474d80d70f79022644a2af4b3fba0e
+  data.tar.gz: cd4863983ac3392d88e47c7d5244a5968ea90caa5b906d7335a2ccc42a70f9fd2348bc48a77e9b4e34dad736c83477af39759c6a14d08aff69d1d27775017828

data/async-http.gemspec

@@ -17,10 +17,10 @@ Gem::Specification.new do |spec|
 	spec.require_paths = ["lib"]
 	
 	spec.add_dependency("async", "~> 1.19")
-	spec.add_dependency("async-io", "~> 1.24")
+	spec.add_dependency("async-io", "~> 1.25")
 	
 	spec.add_dependency("protocol-http", "~> 0.12.0")
-	spec.add_dependency("protocol-http1", "~> 0.8.0")
+	spec.add_dependency("protocol-http1", "~> 0.9.0")
 	spec.add_dependency("protocol-http2", "~> 0.9.0")
 	
 	# spec.add_dependency("openssl")

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

@@ -0,0 +1,100 @@
+# frozen_string_literal: true
+#
+# Copyright, 2019, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require_relative 'writable'
+
+require 'forwardable'
+
+module Async
+	module HTTP
+		module Body
+			class Pipe
+				extend Forwardable
+				
+				def initialize(input, output = Writable.new, task: Task.current)
+					@input = input
+					@output = output
+					
+					head, tail = IO::Socket.pair(Socket::AF_UNIX, Socket::SOCK_STREAM)
+					
+					@head = Async::IO::Stream.new(head)
+					@tail = tail
+					
+					@reader = nil
+					@writer = nil
+					
+					task.async(&self.method(:reader))
+					task.async(&self.method(:writer))
+				end
+				
+				def to_io
+					@tail
+				end
+				
+				def close
+					@reader&.stop
+					@writer&.stop
+					
+					@tail.close
+				end
+				
+				private
+				
+				# Read from the @input stream and write to the head of the pipe.
+				def reader(task)
+					@reader = task
+					
+					task.annotate "pipe reader"
+					
+					while chunk = @input.read
+						@head.write(chunk)
+						@head.flush
+					end
+					
+					@head.close_write
+				ensure
+					@reader = nil
+					@input.close($!)
+					
+					@head.close if @writer.nil?
+				end
+				
+				# Read from the head of the pipe and write to the @output stream.
+				# If the @tail is closed, this will cause chunk to be nil, which in turn will call `@output.close` and `@head.close`
+				def writer(task)
+					@writer = task
+					
+					task.annotate "pipe writer"
+					
+					while chunk = @head.read_partial
+						@output.write(chunk)
+					end
+				ensure
+					@writer = nil
+					@output.close($!)
+					
+					@head.close if @reader.nil?
+				end
+			end
+		end
+	end
+end

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

@@ -74,10 +74,31 @@ module Async
 					return buffer
 				end
 				
+				# Read at most `size` bytes from the stream. Will avoid reading from the underlying stream if possible.
+				def read_partial(size = nil)
+					if @buffer
+						buffer = @buffer
+						@buffer = nil
+					else
+						buffer = read_next
+					end
+					
+					if buffer and size
+						if buffer.bytesize > size
+							@buffer = buffer.byteslice(size, buffer.bytesize)
+							buffer = buffer.byteslice(0, size)
+						end
+					end
+					
+					return buffer
+				end
+				
 				def read_nonblock(length, buffer = nil)
 					@buffer ||= read_next
 					chunk = nil
 					
+					return nil if @buffer.nil?
+					
 					if @buffer.bytesize > length
 						chunk = @buffer.byteslice(0, length)
 						@buffer = @buffer.byteslice(length, @buffer.bytesize)

data/lib/async/http/endpoint.rb

@@ -29,10 +29,10 @@ module Async
 	module HTTP
 		# Represents a way to connect to a remote HTTP server.
 		class Endpoint < Async::IO::Endpoint
-			def self.parse(string, **options)
+			def self.parse(string, endpoint = nil, **options)
 				url = URI.parse(string).normalize
 				
-				return self.new(url, nil, **options)
+				return self.new(url, endpoint, **options)
 			end
 			
 			# @option scheme [String] the scheme to use, overrides the URL scheme.
@@ -46,7 +46,8 @@ module Async
 				raise ArgumentError, "URL must be absolute (include scheme, host): #{url}" unless url.absolute?
 				
 				@url = url
-				@endpoint = endpoint
+				
+				@endpoint = self.build_endpoint(endpoint)
 			end
 			
 			def to_url

data/lib/async/http/pool.rb

@@ -43,13 +43,14 @@ module Async
 				@available = Async::Notification.new
 				
 				@limit = limit
-				@active = 0
 				
 				@constructor = block
 			end
 			
 			# The number of allocated resources.
-			attr :active
+			def active
+				@resources.count
+			end
 			
 			# Whether there are resources which are currently in use.
 			def busy?
@@ -60,6 +61,11 @@ module Async
 				return false
 			end
 			
+			# Wait until a pool resource has been freed.
+			def wait
+				@available.wait
+			end
+			
 			# All allocated resources.
 			attr :resources
 			
@@ -92,8 +98,6 @@ module Async
 			def close
 				@resources.each_key(&:close)
 				@resources.clear
-				
-				@active = 0
 			end
 			
 			def to_s
@@ -121,8 +125,6 @@ module Async
 				
 				@resources.delete(resource)
 				
-				@active -= 1
-				
 				resource.close
 				
 				@available.signal
@@ -149,7 +151,7 @@ module Async
 			end
 			
 			def available_resource
-				# This is a linear search... not idea, but simple for now.
+				# TODO This is a linear search... not ideal, but simple for now.
 				@resources.each do |resource, count|
 					if count < resource.multiplex
 						# We want to use this resource... but is it connected?
@@ -163,11 +165,9 @@ module Async
 					end
 				end
 				
-				if !@limit or @active < @limit
+				if !@limit or self.active < @limit
 					Async.logger.debug(self) {"No resources resources, allocating new one..."}
 					
-					@active += 1
-					
 					return create
 				end
 				

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

@@ -48,6 +48,12 @@ module Async
 									# If this fails, this connection will be closed.
 									write_upgrade_body(protocol, body)
 								end
+							elsif request.connect?
+								task.async do |subtask|
+									subtask.annotate("Tunnelling body.")
+									
+									write_tunnel_body(@version, body)
+								end
 							else
 								task.async do |subtask|
 									subtask.annotate("Streaming body.")

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

@@ -37,7 +37,7 @@ module Async
 						# Read an incoming request:
 						return unless request = Request.read(self)
 						
-						unless persistent?(request.version, request.headers)
+						unless persistent?(request.version, request.method, request.headers)
 							@persistent = false
 						end
 						
@@ -58,14 +58,6 @@ module Async
 							return if @stream.nil? or @stream.closed?
 							
 							if response
-								# Try to avoid holding on to request, to minimse GC overhead:
-								head = request.head?
-								
-								unless request.body?
-									# If there is no body, #finish is a no-op.
-									request = nil
-								end
-								
 								write_response(@version, response.status, response.headers)
 								
 								body = response.body
@@ -79,8 +71,21 @@ module Async
 									# We also don't want to hold on to the response object:
 									response = nil
 									
+									body.call(stream)
+								elsif body and request.connect?
+									stream = write_tunnel_body(request.version)
+									
+									# Same as above:
+									request = nil
+									response = nil
+									
 									body.call(stream)
 								else
+									head = request.head?
+									
+									request = nil unless body
+									response = nil
+									
 									write_body(@version, body, head)
 								end
 							else

data/lib/async/http/proxy.rb

@@ -0,0 +1,70 @@
+# Copyright, 2019, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require_relative 'client'
+require_relative 'endpoint'
+
+require_relative 'body/pipe'
+
+module Async
+	module HTTP
+		class Proxy
+			def self.tcp(client, host, port, headers = [])
+				self.new(client, "#{host}:#{port}", headers)
+			end
+			
+			def initialize(client, address, headers = [])
+				@client = client
+				@address = address
+				@headers = headers
+			end
+			
+			attr :client
+			
+			def close
+				while @client.pool.busy?
+					@client.pool.wait
+				end
+				
+				@client.close
+			end
+			
+			def connect(&block)
+				input = Body::Writable.new
+				
+				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
+				end
+			end
+			
+			def endpoint(url, **options)
+				Endpoint.parse(url, self, **options)
+			end
+		end
+	end
+end

data/lib/async/http/version.rb

@@ -20,6 +20,6 @@
 
 module Async
 	module HTTP
-		VERSION = "0.47.0"
+		VERSION = "0.48.0"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-http
 version: !ruby/object:Gem::Version
-  version: 0.47.0
+  version: 0.48.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-21 00:00:00.000000000 Z
+date: 2019-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.24'
+        version: '1.25'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.24'
+        version: '1.25'
 - !ruby/object:Gem::Dependency
   name: protocol-http
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: protocol-http2
   requirement: !ruby/object:Gem::Requirement
@@ -210,6 +210,7 @@ files:
 - lib/async/http/body.rb
 - lib/async/http/body/delayed.rb
 - lib/async/http/body/hijack.rb
+- lib/async/http/body/pipe.rb
 - lib/async/http/body/slowloris.rb
 - lib/async/http/body/stream.rb
 - lib/async/http/body/writable.rb
@@ -236,6 +237,7 @@ files:
 - lib/async/http/protocol/https.rb
 - lib/async/http/protocol/request.rb
 - lib/async/http/protocol/response.rb
+- lib/async/http/proxy.rb
 - lib/async/http/reference.rb
 - lib/async/http/relative_location.rb
 - lib/async/http/server.rb