async-http 0.23.3 → 0.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: deadf37dcc1031b4d90620691dcbba62a5053dad924d8be2ac74f0066ccef5e2
-  data.tar.gz: d5ddc775312cdf35f8fd9d388d93eb02dc5e7134edb11e19ad43fbdced14c92e
+  metadata.gz: 2e35c6673eda6e9dd937957b447502b7d6ad4e715508185ead1d9ef2f03db7b3
+  data.tar.gz: 597da90259cdb9611a5b70701d6eefc2ede3deaee51f905bdbbc78cd14feffd8
 SHA512:
-  metadata.gz: 72870ae703d379f1de5e2a025cc1096703b786e118306bb196aaca40a2bbb946609dfa6bc0ac9e1615620b1792ee86745db7fe0bcd3aa9a9906570198cf39dc6
-  data.tar.gz: 176290c981e692d4851e5959f1b73e74b6a84a5dc13d96852e32b516971fe05a57a5a2ca93ba197098eab832d45202b563278829f0b2f0d387712257e2d45ec8
+  metadata.gz: 03ab49f9a1363ca6b2ee627a4ea437ead245103f7d6ec0feec290ea25a3ef7601f5afa19417c8fe0656c9b4bdde89868d051babec2234c35c1908ebacf41ccb6
+  data.tar.gz: a7e24ce9ba42e98bd8ebcfeaf043a1b7e3748b8e50400365a8a1ec6214dc20f33b46ad553e3156bb320fa376d0fb1c0a030d50b7fbee3bc4ef69187f01af8dab

data/async-http.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
 	spec.require_paths = ["lib"]
 	
 	spec.add_dependency("async", "~> 1.6")
-	spec.add_dependency("async-io", "~> 1.11")
+	spec.add_dependency("async-io", "~> 1.12")
 	
 	spec.add_dependency("http-2", "~> 0.9.0")
 	# spec.add_dependency("openssl")

data/lib/async/http/accept_encoding.rb

@@ -44,12 +44,10 @@ module Async
 				response = super
 				
 				if !response.body.empty? and content_encoding = response.headers['content-encoding']
-					encodings = content_encoding.split(/\s*,\s*/)
-					
 					body = response.body
 					
 					# We want to unwrap all encodings
-					encodings.reverse_each do |name|
+					content_encoding.reverse_each do |name|
 						if wrapper = @wrappers[name]
 							body = wrapper.call(body)
 						end

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

@@ -0,0 +1,76 @@
+# 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'
+
+module Async
+	module HTTP
+		module Body
+			class File < Readable
+				def initialize(path, range = nil, block_size: Async::IO::Stream::BLOCK_SIZE)
+					@path = path
+					@file = File.open(path)
+					
+					@block_size = block_size
+					
+					if range
+						@offset = range.min
+						@length = @remaining = range.size
+					else
+						@offset = 0
+						@length = @remaining = @file.size
+					end
+				end
+				
+				attr :length
+				
+				def empty?
+					@remaining == 0
+				end
+				
+				def read
+					if @remaining > 0
+						amount = [@remaining, @block_size].min
+						
+						if chunk = @file.read(amount)
+							@remaining -= chunk.bytesize
+							
+							return chunk
+						else
+							@file.close
+						end
+					end
+				end
+				
+				def join
+					buffer = @file.read(@remaining)
+					
+					@remaining = 0
+					
+					return buffer
+				end
+				
+				def inspect
+					"\#<#{self.class} path=#{@path} offset=#{@offset} remaining=#{@remaining}>"
+				end
+			end
+		end
+	end
+end

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

@@ -30,6 +30,9 @@ module Async
 					@remaining = length
 				end
 				
+				attr :length
+				attr :remaining
+				
 				def empty?
 					@remaining == 0
 				end

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

@@ -35,6 +35,10 @@ module Async
 					false
 				end
 				
+				def length
+					nil
+				end
+				
 				# Read the next available chunk.
 				def read
 					nil

data/lib/async/http/client.rb

@@ -63,7 +63,7 @@ module Async
 				request.authority ||= @authority
 				attempt = 0
 				
-				# There is a challenge with how this works. If you have 8 connections in the connection pool and they've all expired, retrying 3 times isn't going to work. We need to, perhaps, on the last retry, initiate a completely new connection.
+				# We may retry the request if it is possible to do so. https://tools.ietf.org/html/draft-nottingham-httpbis-retry-01 is a good guide for how retrying requests should work.
 				begin
 					attempt += 1
 					

data/lib/async/http/headers.rb

@@ -21,6 +21,38 @@
 module Async
 	module HTTP
 		class Headers
+			class Split < Array
+				COMMA = /\s*,\s*/
+				
+				def initialize(value)
+					super(value.split(COMMA))
+				end
+				
+				def << value
+					super value.split(COMMA)
+				end
+				
+				def to_s
+					join(", ")
+				end
+			end
+			
+			class Multiple < Array
+				def initialize(value)
+					super()
+					
+					self << value
+				end
+				
+				def to_s
+					join("\n")
+				end
+			end
+			
+			def self.[] hash
+				self.new(hash.to_a)
+			end
+			
 			def initialize(fields = [])
 				@fields = fields
 				@indexed = to_h
@@ -36,6 +68,10 @@ module Async
 				super
 			end
 			
+			def empty?
+				@fields.empty?
+			end
+			
 			def each(&block)
 				@fields.each(&block)
 			end
@@ -59,17 +95,69 @@ module Async
 				end
 			end
 			
+			def slice!(keys)
+				values, @fields = @fields.partition do |field|
+					keys.include?(field.first.downcase)
+				end
+				
+				if @indexed
+					keys.each do |key|
+						@indexed.delete(key)
+					end
+				end
+			end
+			
+			def add(key, value)
+				self[key] = value
+			end
+			
 			def []= key, value
 				@fields << [key, value]
 				
 				if @indexed
-					key = key.downcase
-					
-					if current_value = @indexed[key]
-						@indexed[key] = Array(current_value) << value
+					# It would be good to do some kind of validation here.
+					merge(@indexed, key.downcase, value)
+				end
+			end
+			
+			MERGE_POLICY = {
+				# Headers which may only be specified once.
+				'content-type' => false,
+				'content-disposition' => false,
+				'content-length' => false,
+				'user-agent' => false,
+				'referer' => false,
+				'host' => false,
+				'authorization' => false,
+				'proxy-authorization' => false,
+				'if-modified-since' => false,
+				'if-unmodified-since' => false,
+				'from' => false,
+				'location' => false,
+				'max-forwards' => false,
+				
+				'connection' => Split,
+				
+				# Headers specifically for proxies:
+				'via' => Split,
+				'x-forwarded-for' => Split,
+				
+				# Headers which may be specified multiple times, but which can't be concatenated.
+				'set-cookie' => Multiple,
+				'www-authenticate' => Multiple,
+				'proxy-authenticate' => Multiple
+			}.tap{|hash| hash.default = Split}
+			
+			def merge(hash, key, value)
+				if policy = MERGE_POLICY[key]
+					if current_value = hash[key]
+						current_value << value
 					else
-						@indexed[key] = value
+						hash[key] = policy.new(value)
 					end
+				else
+					# We can't merge these, we only expose the last one set.
+					hash[key] = value
 				end
 			end
 			
@@ -81,13 +169,7 @@ module Async
 			
 			def to_h
 				@fields.inject({}) do |hash, (key, value)|
-					key = key.downcase
-					
-					if current_value = hash[key]
-						hash[key] = Array(current_value) << value
-					else
-						hash[key] = value
-					end
+					merge(hash, key.downcase, value)
 					
 					hash
 				end
@@ -100,6 +182,20 @@ module Async
 					@fields == other.fields
 				end
 			end
+			
+			class Merged
+				def initialize(*all)
+					@all = all
+				end
+				
+				def each(&block)
+					@all.each do |headers|
+						headers.each do |key, value|
+							yield key, value.to_s
+						end
+					end
+				end
+			end
 		end
 	end
 end

data/lib/async/http/protocol/http10.rb

@@ -34,7 +34,11 @@ module Async
 				end
 				
 				def persistent?(headers)
-					headers.delete(CONNECTION) == KEEP_ALIVE
+					if connection = headers[CONNECTION]
+						return connection.include?(KEEP_ALIVE)
+					else
+						return false
+					end
 				end
 				
 				# Server loop.

data/lib/async/http/protocol/http11.rb

@@ -38,7 +38,6 @@ module Async
 				CONNECTION = 'connection'.freeze
 				HOST = 'host'.freeze
 				CLOSE = 'close'.freeze
-				
 				VERSION = "HTTP/1.1".freeze
 				
 				def initialize(stream)
@@ -74,7 +73,11 @@ module Async
 				end
 				
 				def persistent?(headers)
-					headers.delete(CONNECTION) != CLOSE
+					if connection = headers[CONNECTION]
+						return !connection.include?(CLOSE)
+					else
+						return true
+					end
 				end
 				
 				# Server loop.
@@ -193,6 +196,12 @@ module Async
 					if body.nil? or body.empty?
 						@stream.write("Content-Length: 0\r\n\r\n")
 						body.read if body
+					elsif length = body.length
+						@stream.write("Content-Length: #{length}\r\n\r\n")
+						
+						body.each do |chunk|
+							@stream.write(chunk)
+						end
 					elsif chunked
 						@stream.write("Transfer-Encoding: chunked\r\n\r\n")
 						
@@ -219,11 +228,25 @@ module Async
 					@stream.flush
 				end
 				
+				TRANSFER_ENCODING = 'transfer-encoding'.freeze
+				CONTENT_LENGTH = 'content-length'.freeze
+				CHUNKED = 'chunked'.freeze
+				
+				def chunked?(headers)
+					if transfer_encoding = headers[TRANSFER_ENCODING]
+						if transfer_encoding.count == 1
+							return transfer_encoding.first == CHUNKED
+						end
+					end
+				end
+				
 				def read_body(headers)
-					if headers.delete('transfer-encoding') == 'chunked'
+					if chunked?(headers)
 						return Body::Chunked.new(self)
-					elsif content_length = headers.delete('content-length')
-						return Body::Fixed.new(@stream, Integer(content_length))
+					elsif content_length = headers[CONTENT_LENGTH]
+						if content_length != 0
+							return Body::Fixed.new(@stream, Integer(content_length))
+						end
 					end
 				end
 			end

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

@@ -66,11 +66,12 @@ module Async
 						Async.logger.debug(self) {"Received frame: #{frame.inspect}"}
 					end
 					
+					@goaway = false
+					
 					@controller.on(:goaway) do |payload|
 						Async.logger.error(self) {"goaway: #{payload.inspect}"}
 						
-						@reader.stop
-						@stream.close
+						@goaway = true
 					end
 					
 					@count = 0
@@ -89,7 +90,7 @@ module Async
 				end
 				
 				def reusable?
-					!@stream.closed?
+					!@goaway || !@stream.closed?
 				end
 				
 				def version
@@ -197,19 +198,19 @@ module Async
 					stream = @controller.new_stream
 					@count += 1
 					
-					headers = {
+					headers = Headers::Merged.new({
 						SCHEME => HTTPS,
-						METHOD => request.method.to_s,
-						PATH => request.path.to_s,
-						AUTHORITY => request.authority.to_s,
-					}.merge(request.headers)
+						METHOD => request.method,
+						PATH => request.path,
+						AUTHORITY => request.authority,
+					}, request.headers)
 					
 					finished = Async::Notification.new
 					
 					exception = nil
 					response = Response.new
 					response.version = self.version
-					response.headers = {}
+					response.headers = Headers.new
 					body = Body::Writable.new
 					response.body = body
 					
@@ -254,7 +255,7 @@ module Async
 						request.body.read if request.body
 					else
 						begin
-							stream.headers(headers, end_stream: false)
+							stream.headers(headers)
 						rescue
 							raise RequestFailed.new
 						end
@@ -263,7 +264,7 @@ module Async
 							stream.data(chunk, end_stream: false)
 						end
 							
-						stream.data("", end_stream: true)
+						stream.data("")
 					end
 					
 					start_connection

data/lib/async/http/url_endpoint.rb

@@ -94,9 +94,13 @@ module Async
 				end
 			end
 			
+			def tcp_options
+				{reuse_port: @options[:reuse_port] ? true : false}
+			end
+			
 			def endpoint
 				unless @endpoint
-					@endpoint = Async::IO::Endpoint.tcp(hostname, port)
+					@endpoint = Async::IO::Endpoint.tcp(hostname, port, tcp_options)
 					
 					if secure?
 						# Wrap it in SSL:

data/lib/async/http/version.rb

@@ -20,6 +20,6 @@
 
 module Async
 	module HTTP
-		VERSION = "0.23.3"
+		VERSION = "0.24.0"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: async-http
 version: !ruby/object:Gem::Version
-  version: 0.23.3
+  version: 0.24.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.12'
 - !ruby/object:Gem::Dependency
   name: http-2
   requirement: !ruby/object:Gem::Requirement
@@ -128,6 +128,7 @@ files:
 - lib/async/http/body/buffered.rb
 - lib/async/http/body/chunked.rb
 - lib/async/http/body/deflate.rb
+- lib/async/http/body/file.rb
 - lib/async/http/body/fixed.rb
 - lib/async/http/body/inflate.rb
 - lib/async/http/body/readable.rb