async-http 0.39.0 → 0.40.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d2ae06b181bb3fc7bca37de3c13361d9cf06c033f5ca0a4221cd1afb32108f7
-  data.tar.gz: 2e91385f85f2a2710ea7fa4490b04f01272f7cf525b24581cfe774683eb625a5
+  metadata.gz: 9648e5ee0b4e51a48771c3c861cdd9642eaba42a2d55fe9ad6bf47a70f2dc150
+  data.tar.gz: 4690e5a313f699de6ac6e774259f21ec889fb3f4540074c3526c92bc1e0ceab8
 SHA512:
-  metadata.gz: 0ed6969ab041fd96096c6e445d1fba0774d7de57546c98d1b241a27f46328fae44eb331bff08febb0175457c62f46447070f9eb25afe4c1de84d9786bff99379
-  data.tar.gz: 80b2ad6e10754ed1eb99d244f838f45fa9f8478273ce740ea922ed1abd4a0180d324fe9c4a968f152bbded8ff6f8483ab0fe8e13d4ddeab5f961070a077f3217
+  metadata.gz: 816c05d8d689c21b64f046cff2f7da9460c4b4d9b28205ce23b91ac8fd3053edfced60d9d5838a9f237e89497b004a644267c7f4cfd14a375f08a1195ae15ff9
+  data.tar.gz: 9c4ed6fa66a82c2ad4de23249ff5e21ba1a8d24d9d59ccf07b93b640233d2892afe5e3a70ce84e3d5eb04e032b4ef0ec84926c41803ab198dc0b1ec6b3dffe52

data/async-http.gemspec

@@ -19,9 +19,9 @@ Gem::Specification.new do |spec|
 	spec.add_dependency("async", "~> 1.14")
 	spec.add_dependency("async-io", "~> 1.18")
 	
-	spec.add_dependency("protocol-http", "~> 0.1.0")
-	spec.add_dependency("protocol-http1", "~> 0.1.0")
-	spec.add_dependency("protocol-http2", "~> 0.1.0")
+	spec.add_dependency("protocol-http", "~> 0.3.0")
+	spec.add_dependency("protocol-http1", "~> 0.3.0")
+	spec.add_dependency("protocol-http2", "~> 0.2.0")
 	
 	# spec.add_dependency("openssl")
 	

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

@@ -0,0 +1,79 @@
+# Copyright, 2018, 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 'readable'
+require_relative 'stream'
+
+module Async
+	module HTTP
+		module Body
+			# A body which is designed for hijacked connections.
+			class Hijack < Readable
+				def self.response(request, status, headers, &block)
+					Async::HTTP::Response[status, headers, self.wrap(request, &block)]
+				end
+				
+				def self.wrap(request, &block)
+					self.new(request.body, &block)
+				end
+				
+				def initialize(input = nil, &block)
+					@input = input
+					@block = block
+					
+					@task = nil
+					@stream = nil
+				end
+				
+				def call(stream)
+					return @block.call(stream)
+				ensure
+					@block = nil
+				end
+				
+				# Has the producer called #finish and has the reader consumed the nil token?
+				def empty?
+					@block.nil?
+				end
+				
+				# Read the next available chunk.
+				def read
+					return unless @block
+					
+					unless @task
+						@stream = Stream.new(@input)
+						
+						@task = Task.current.async do
+							@block.call(@stream)
+						end
+						
+						@block = nil
+					end
+					
+					return @stream.output.read
+				end
+				
+				def inspect
+					"\#<#{self.class} #{@block}>"
+				end
+			end
+		end
+	end
+end

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

@@ -0,0 +1,131 @@
+# 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'
+
+module Async
+	module HTTP
+		module Body
+			# The input stream is an IO-like object which contains the raw HTTP POST data. When applicable, its external encoding must be “ASCII-8BIT” and it must be opened in binary mode, for Ruby 1.9 compatibility. The input stream must respond to gets, each, read and rewind.
+			class Stream
+				def initialize(input, output = Writable.new)
+					@input = input
+					@output = output
+					
+					# Will hold remaining data in `#read`.
+					@buffer = nil
+				end
+				
+				attr :input
+				attr :output
+				
+				# rack.hijack_io must respond to:
+				# read, write, read_nonblock, write_nonblock, flush, close, close_read, close_write, closed?
+				
+				# read behaves like IO#read. Its signature is read([length, [buffer]]). If given, length must be a non-negative Integer (>= 0) or nil, and buffer must be a String and may not be nil. If length is given and not nil, then this method reads at most length bytes from the input stream. If length is not given or nil, then this method reads all data until EOF. When EOF is reached, this method returns nil if length is given and not nil, or “” if length is not given or is nil. If buffer is given, then the read data will be placed into buffer instead of a newly created String object.
+				# @param length [Integer] the amount of data to read
+				# @param buffer [String] the buffer which will receive the data
+				# @return a buffer containing the data
+				def read(length = nil, buffer = nil)
+					buffer ||= Async::IO::Buffer.new
+					buffer.clear
+					
+					until buffer.bytesize == length
+						@buffer = read_next if @buffer.nil?
+						break if @buffer.nil?
+						
+						remaining_length = length - buffer.bytesize if length
+						
+						if remaining_length && remaining_length < @buffer.bytesize
+							# We know that we are not going to reuse the original buffer.
+							# But byteslice will generate a hidden copy. So let's freeze it first:
+							@buffer.freeze
+							
+							buffer << @buffer.byteslice(0, remaining_length)
+							@buffer = @buffer.byteslice(remaining_length, @buffer.bytesize)
+						else
+							buffer << @buffer
+							@buffer = nil
+						end
+					end
+					
+					return nil if buffer.empty? && length && length > 0
+					
+					return buffer
+				end
+				
+				def read_nonblock(length, buffer = nil)
+					@buffer ||= read_next
+					chunk = nil
+					
+					if @buffer.bytesize > length
+						chunk = @buffer.byteslice(0, length)
+						@buffer = @buffer.byteslice(length, @buffer.bytesize)
+					else
+						chunk = @buffer
+						@buffer = nil
+					end
+					
+					if buffer
+						buffer.replace(chunk)
+					else
+						buffer = chunk
+					end
+					
+					return buffer
+				end
+				
+				def write(buffer)
+					@output.write(buffer)
+				end
+				
+				alias write_nonblock write
+				
+				def flush
+				end
+				
+				def close_read
+					@input&.close
+				end
+				
+				# close must never be called on the input stream. huh?
+				def close_write
+					@output&.close
+				end
+				
+				def close
+					self.close_read
+					self.close_write
+				end
+				
+				private
+				
+				def read_next
+					if chunk = @input&.read
+						return chunk
+					else
+						@input = nil
+						return nil
+					end
+				end
+			end
+		end
+	end
+end

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

@@ -61,6 +61,10 @@ module Async
 					super
 				end
 				
+				def closed?
+					@closed
+				end
+				
 				# Has the producer called #finish and has the reader consumed the nil token?
 				def empty?
 					@finished

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

@@ -57,14 +57,22 @@ module Async
 							return if @stream.closed?
 							
 							if response
-								write_response(@version, response.status, response.headers, response.body, request.head?)
+								# 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, response.body, head)
 							else
 								# If the request failed to generate a response, it was an internal server error:
 								write_response(@version, 500, {}, nil)
 							end
 							
 							# Gracefully finish reading the request body if it was not already done so.
-							request.finish
+							request&.finish
 							
 							# This ensures we yield at least once every iteration of the loop and allow other fibers to execute.
 							task.yield

data/lib/async/http/version.rb

@@ -20,6 +20,6 @@
 
 module Async
 	module HTTP
-		VERSION = "0.39.0"
+		VERSION = "0.40.0"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-http
 version: !ruby/object:Gem::Version
-  version: 0.39.0
+  version: 0.40.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-08 00:00:00.000000000 Z
+date: 2019-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -44,42 +44,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: protocol-http1
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: protocol-http2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: async-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -187,11 +187,13 @@ files:
 - lib/async/http/body/delayed.rb
 - lib/async/http/body/file.rb
 - lib/async/http/body/fixed.rb
+- lib/async/http/body/hijack.rb
 - lib/async/http/body/inflate.rb
 - lib/async/http/body/readable.rb
 - lib/async/http/body/reader.rb
 - lib/async/http/body/rewindable.rb
 - lib/async/http/body/slowloris.rb
+- lib/async/http/body/stream.rb
 - lib/async/http/body/streamable.rb
 - lib/async/http/body/wrapper.rb
 - lib/async/http/body/writable.rb