async-http 0.45.9 → 0.46.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db1594d1f164cc3ab8f63d2c4b4b9b75fa1ca13f564ea4a4908b6fa27aabf0b9
-  data.tar.gz: 6df7e3e2c1a82dcdd699ec612bf7d9e7ad293baaba308f7a61935af5966ea7c9
+  metadata.gz: 354c7fb881a4d777bdf8f19a4c333b832e3bbc81f4dfa7e9851c3aa983d9bc7b
+  data.tar.gz: 9408b0a577c8162b2479e485e1d098d271717c8f9043a9c1bfa931655b650821
 SHA512:
-  metadata.gz: a59e18445d9e8d31bb08a577d46d88dec3a758a481f57577a22612dbe435f6ff89ff22ac1a4cff15b56f59774ccdad8ebde939186ecd411102ac03ac944334ea
-  data.tar.gz: 9577d519fd0d5d7207df86243e9ce11842b32113d8ac7a21744d7a4089ee16ffed5aa99fbe8f8e772ea99b3bb81dc4c8569db73ad3c1fcf0aeca72c146fd1a3e
+  metadata.gz: 709eb4507c6d562ae0eb69594ccb7f77d88d48be7259ac3ed215bb84a4c6e3de252fe9aff141cbbc1bd98e522b2d36442b4ce9dfab715b64a7ded784b00224a1
+  data.tar.gz: 9d45db2e2e87d3c89da79518ea7c0685b005c8b07ea295b7501a5ec6f093786c35ec6fe7b858d66c0ce57397ab295488694711681a7e7c4b4109ad4a38d6b76a

data/lib/async/http/client.rb

@@ -34,6 +34,10 @@ module Async
 			# * If there are already connections, it will reuse it.
 			# * If a request fails, it will retry it up to N times if it was idempotent.
 			# The client object will never become unusable. It internally manages persistent connections (or non-persistent connections if that's required).
+			# @param endpoint [Endpoint] the endpoint to connnect to.
+			# @param protocol [Protocol::HTTP1 | Protocol::HTTP2 | Protocol::HTTPS] the protocol to use.
+			# @param scheme [String] The default scheme to set to requests.
+			# @param authority [String] The default authority to set to requests.
 			def initialize(endpoint, protocol = endpoint.protocol, scheme = endpoint.scheme, authority = endpoint.authority, retries: 3, connection_limit: nil)
 				@endpoint = endpoint
 				@protocol = protocol

data/lib/async/http/endpoint.rb

@@ -27,11 +27,12 @@ require_relative 'protocol/https'
 
 module Async
 	module HTTP
+		# Represents a way to connect to a remote HTTP server.
 		class Endpoint < Async::IO::Endpoint
 			def self.parse(string, **options)
 				url = URI.parse(string).normalize
 				
-				self.new(url, **options)
+				return self.new(url, nil, **options)
 			end
 			
 			# @option scheme [String] the scheme to use, overrides the URL scheme.
@@ -67,7 +68,6 @@ module Async
 			end
 			
 			attr :url
-			attr :options
 			
 			def address
 				endpoint.address
@@ -78,10 +78,12 @@ module Async
 			end
 			
 			def protocol
-				if secure?
-					Protocol::HTTPS
-				else
-					Protocol::HTTP1
+				@options.fetch(:protocol) do
+					if secure?
+						Protocol::HTTPS
+					else
+						Protocol::HTTP1
+					end
 				end
 			end
 			
@@ -124,18 +126,17 @@ module Async
 				return buffer
 			end
 			
-			DEFAULT_ALPN_PROTOCOLS = ['h2', 'http/1.1'].freeze
-			
 			def alpn_protocols
-				@options[:alpn_protocols] || DEFAULT_ALPN_PROTOCOLS
+				@options.fetch(:alpn_protocols) {self.protocol.names}
 			end
 			
-			LOCALHOST = 'localhost'.freeze
+			def localhost?
+				self.hostname =~ /^(.*?\.)?localhost\.?$/
+			end
 			
 			# We don't try to validate peer certificates when talking to localhost because they would always be self-signed.
 			def ssl_verify_mode
-				case self.hostname
-				when LOCALHOST
+				if self.localhost?
 					OpenSSL::SSL::VERIFY_NONE
 				else
 					OpenSSL::SSL::VERIFY_PEER
@@ -162,6 +163,7 @@ module Async
 				options.delete(:hostname)
 				options.delete(:ssl_context)
 				options.delete(:alpn_protocols)
+				options.delete(:protocol)
 				
 				return options
 			end

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

@@ -27,14 +27,20 @@ module Async
 			module HTTP1
 				VERSION = "HTTP/1.1"
 				
+				def self.bidirectional?
+					true
+				end
+				
 				def self.client(stream)
-					Client.new(stream, VERSION)
+					HTTP1::Client.new(stream, VERSION)
 				end
 				
-				# A server that supports both HTTP1.0 and HTTP1.1 semantics by detecting the version of the request.
-				# TODO Verify correct behaviour.
 				def self.server(stream)
-					Server.new(stream, VERSION)
+					HTTP1::Server.new(stream, VERSION)
+				end
+				
+				def self.names
+					["http/1.1", "http/1.0"]
 				end
 			end
 		end

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

@@ -53,6 +53,11 @@ module Async
 					# Server loop.
 					def each(task: Task.current)
 						while request = next_request
+							Async.logger.debug(self) do |buffer|
+								buffer.puts "Incoming request: #{request.authority} #{request.method} #{request.path} #{request.version}"
+								buffer.puts "Incoming headers: #{request.headers}"
+							end
+							
 							response = yield(request, self)
 							
 							return if @stream.nil? or @stream.closed?

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

@@ -37,6 +37,10 @@ module Async
 				def self.server(stream)
 					HTTP1::Server.new(stream, VERSION)
 				end
+				
+				def self.names
+					["http/1.0"]
+				end
 			end
 		end
 	end

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

@@ -37,6 +37,10 @@ module Async
 				def self.server(stream)
 					HTTP1::Server.new(stream, VERSION)
 				end
+				
+				def self.names
+					["http/1.1"]
+				end
 			end
 		end
 	end

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

@@ -63,6 +63,10 @@ module Async
 					return server
 				end
 				
+				def self.names
+					["h2"]
+				end
+				
 				module WithPush
 					CLIENT_SETTINGS = HTTP2::CLIENT_SETTINGS.merge(
 						::Protocol::HTTP2::Settings::ENABLE_PUSH => 1,
@@ -75,6 +79,10 @@ module Async
 					def self.server(stream, settings = SERVER_SETTINGS)
 						HTTP2.server(stream, settings)
 					end
+					
+					def self.names
+						HTTP2.names
+					end
 				end
 			end
 		end

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

@@ -124,25 +124,25 @@ module Async
 						VERSION
 					end
 					
-					def encode_headers(headers, buffer = String.new.b)
-						super.tap do |data|
-							Async.logger.debug(self) do |buffer|
-								buffer.puts "Encode headers: #{headers.inspect}"
-								buffer.puts "-> #{data.inspect}"
-								buffer.puts "@encoder: #{@encoder.inspect}"
-							end
-						end
-					end
-					
-					def decode_headers(data)
-						super.tap do |headers|
-							Async.logger.debug(self) do |buffer|
-								buffer.puts "Decode headers: #{data.inspect}"
-								buffer.puts "-> #{headers.inspect}"
-								buffer.puts "@decoder: #{@decoder.inspect}"
-							end
-						end
-					end
+					# def encode_headers(headers, buffer = String.new.b)
+					# 	super.tap do |data|
+					# 		Async.logger.debug(self) do |buffer|
+					# 			buffer.puts "Encode headers: #{headers.inspect}"
+					# 			buffer.puts "-> #{data.inspect}"
+					# 			buffer.puts "@encoder: #{@encoder.inspect}"
+					# 		end
+					# 	end
+					# end
+					# 
+					# def decode_headers(data)
+					# 	super.tap do |headers|
+					# 		Async.logger.debug(self) do |buffer|
+					# 			buffer.puts "Decode headers: #{data.inspect}"
+					# 			buffer.puts "-> #{headers.inspect}"
+					# 			buffer.puts "@decoder: #{@decoder.inspect}"
+					# 		end
+					# 	end
+					# end
 				end
 			end
 		end

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

@@ -49,9 +49,9 @@ module Async
 			# A server that supports both HTTP1.0 and HTTP1.1 semantics by detecting the version of the request.
 			module HTTPS
 				HANDLERS = {
-					"http/1.0" => HTTP10,
-					"http/1.1" => HTTP11,
 					"h2" => HTTP2,
+					"http/1.1" => HTTP11,
+					"http/1.0" => HTTP10,
 					nil => HTTP11,
 				}
 				
@@ -75,6 +75,11 @@ module Async
 				def self.server(stream)
 					protocol_for(stream).server(stream)
 				end
+				
+				# Supported Application Layer Protocol Negotiation names:
+				def self.names
+					HANDLERS.keys.compact
+				end
 			end
 		end
 	end

data/lib/async/http/version.rb

@@ -20,6 +20,6 @@
 
 module Async
 	module HTTP
-		VERSION = "0.45.9"
+		VERSION = "0.46.0"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-http
 version: !ruby/object:Gem::Version
-  version: 0.45.9
+  version: 0.46.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-22 00:00:00.000000000 Z
+date: 2019-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async