async-http 0.40.3 → 0.41.0

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

@@ -66,10 +66,22 @@ module Async
 									request = nil
 								end
 								
-								write_response(@version, response.status, response.headers, response.body, head)
+								write_response(@version, response.status, response.headers)
+								
+								if body = response.body and protocol = response.protocol
+									stream = write_upgrade_body(protocol)
+									
+									# At this point, the request body is hijacked, so we don't want to call #finish below.
+									request = nil
+									
+									body.call(stream)
+								else
+									write_body(@version, body, head)
+								end
 							else
 								# If the request failed to generate a response, it was an internal server error:
-								write_response(@version, 500, {}, nil)
+								write_response(@version, 500, {})
+								write_body(@version, nil)
 							end
 							
 							# Gracefully finish reading the request body if it was not already done so.

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

@@ -26,6 +26,10 @@ module Async
 			module HTTP10
 				VERSION = "HTTP/1.0"
 				
+				def self.bidirectional?
+					false
+				end
+				
 				def self.client(stream)
 					HTTP1::Client.new(stream, VERSION)
 				end

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

@@ -26,6 +26,10 @@ module Async
 			module HTTP11
 				VERSION = "HTTP/1.1"
 				
+				def self.bidirectional?
+					true
+				end
+				
 				def self.client(stream)
 					HTTP1::Client.new(stream, VERSION)
 				end

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

@@ -25,11 +25,18 @@ module Async
 	module HTTP
 		module Protocol
 			module HTTP2
+				VERSION = "h2"
+				
+				def self.bidirectional?
+					true
+				end
+				
 				CLIENT_SETTINGS = {
 					::Protocol::HTTP2::Settings::ENABLE_PUSH => 0,
 					::Protocol::HTTP2::Settings::MAXIMUM_CONCURRENT_STREAMS => 256,
 					::Protocol::HTTP2::Settings::MAXIMUM_FRAME_SIZE => 0x100000,
 					::Protocol::HTTP2::Settings::INITIAL_WINDOW_SIZE => 0x7FFFFFFF,
+					::Protocol::HTTP2::Settings::ENABLE_CONNECT_PROTOCOL => 1,
 				}
 				
 				SERVER_SETTINGS = {
@@ -38,6 +45,7 @@ module Async
 					::Protocol::HTTP2::Settings::MAXIMUM_CONCURRENT_STREAMS => 32,
 					::Protocol::HTTP2::Settings::MAXIMUM_FRAME_SIZE => 0x100000,
 					::Protocol::HTTP2::Settings::INITIAL_WINDOW_SIZE => 0x7FFFFFFF,
+					::Protocol::HTTP2::Settings::ENABLE_CONNECT_PROTOCOL => 1,
 				}
 				
 				def self.client(stream, settings = CLIENT_SETTINGS)

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

@@ -31,7 +31,7 @@ module Async
 				AUTHORITY = ':authority'.freeze
 				REASON = 'reason'.freeze
 				STATUS = ':status'.freeze
-				VERSION = 'HTTP/2.0'.freeze
+				PROTOCOL = ':protocol'.freeze
 				
 				CONTENT_LENGTH = 'content-length'
 				
@@ -45,6 +45,14 @@ module Async
 					
 					attr :stream
 					
+					def http1?
+						false
+					end
+					
+					def http2?
+						true
+					end
+					
 					def start_connection
 						@reader ||= read_in_background
 					end
@@ -97,7 +105,8 @@ module Async
 						Async.logger.debug(self) {"Closing connection"}
 						
 						@reader.stop if @reader
-						@stream.close
+						
+						super
 					end
 				end
 			end

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

@@ -35,8 +35,8 @@ module Async
 					attr :request
 					
 					private def build_request(headers)
-						request = HTTP::Request.new
-						request.headers = Headers.new
+						request = ::Protocol::HTTP::Request.new
+						request.headers = ::Protocol::HTTP::Headers.new
 						
 						headers.each do |key, value|
 							if key == SCHEME

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

@@ -26,12 +26,12 @@ module Async
 		module Protocol
 			module HTTP2
 				class Request < Protocol::Request
-					def initialize(protocol, stream_id)
-						super(nil, nil, nil, nil, VERSION, Headers.new)
+					def initialize(connection, stream_id)
+						super(nil, nil, nil, nil, VERSION, ::Protocol::HTTP::Headers.new)
 						
 						@input = nil
-						@protocol = protocol
-						@stream = Stream.new(self, protocol, stream_id)
+						@connection = connection
+						@stream = Stream.new(self, connection, stream_id)
 					end
 					
 					attr :stream
@@ -41,11 +41,11 @@ module Async
 					end
 					
 					def push?
-						@protocol.enable_push?
+						@connection.enable_push?
 					end
 					
 					def create_promise_stream(headers, stream_id)
-						request = self.class.new(@protocol, stream_id)
+						request = self.class.new(@connection, stream_id)
 						request.receive_headers(self, headers, false)
 						
 						return request.stream
@@ -58,7 +58,7 @@ module Async
 					def push(path, headers = nil)
 						push_headers = [
 							[SCHEME, @scheme],
-							[METHOD, GET],
+							[METHOD, ::Protocol::HTTP::Methods::GET],
 							[PATH, path],
 							[AUTHORITY, @authority]
 						]
@@ -91,6 +91,10 @@ module Async
 								return @stream.send_failure(400, "Request path already specified") if @path
 								
 								@path = value
+							elsif key == PROTOCOL
+								return @stream.send_failure(400, "Request protocol already specified") if @protocol
+								
+								@protocol = value
 							else
 								@headers[key] = value
 							end
@@ -102,7 +106,7 @@ module Async
 						end
 						
 						# We are ready for processing:
-						@protocol.requests.enqueue self
+						@connection.requests.enqueue self
 					end
 					
 					def receive_data(stream, data, end_stream)
@@ -138,7 +142,11 @@ module Async
 								pseudo_headers << [CONTENT_LENGTH, length]
 							end
 							
-							headers = Headers::Merged.new(
+							if protocol = response.protocol
+								pseudo_headers << [PROTOCOL, protocol]
+							end
+							
+							headers = ::Protocol::HTTP::Headers::Merged.new(
 								pseudo_headers,
 								response.headers
 							)

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

@@ -25,14 +25,14 @@ module Async
 		module Protocol
 			module HTTP2
 				class Response < Protocol::Response
-					def initialize(protocol, stream_id)
+					def initialize(connection, stream_id)
 						@input = nil
 						@length = nil
 						
-						super(protocol.version, nil, nil, Headers.new, nil)
+						super(connection.version, nil, nil, ::Protocol::HTTP::Headers.new)
 						
-						@protocol = protocol
-						@stream = Stream.new(self, protocol, stream_id)
+						@connection = connection
+						@stream = Stream.new(self, connection, stream_id)
 						
 						@notification = Async::Notification.new
 						@exception = nil
@@ -45,7 +45,7 @@ module Async
 					end
 					
 					def create_promise_stream(headers, stream_id)
-						promise = Promise.new(@protocol, headers, stream_id)
+						promise = Promise.new(@connection, headers, stream_id)
 						
 						self.promises.enqueue(promise)
 						
@@ -89,6 +89,8 @@ module Async
 								@reason = value
 							elsif key == CONTENT_LENGTH
 								@length = Integer(value)
+							elsif key == PROTOCOL
+								@protocol = value
 							else
 								@headers[key] = value
 							end
@@ -142,7 +144,11 @@ module Async
 							pseudo_headers << [AUTHORITY, authority]
 						end
 						
-						headers = Headers::Merged.new(
+						if protocol = request.protocol
+							pseudo_headers << [PROTOCOL, protocol]
+						end
+						
+						headers = ::Protocol::HTTP::Headers::Merged.new(
 							pseudo_headers,
 							request.headers
 						)

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

@@ -55,19 +55,21 @@ module Async
 						@requests.enqueue nil
 					end
 					
-					def each
+					def each(task: Task.current)
 						while request = @requests.dequeue
 							@count += 1
 							
-							# We need to close the stream if the user code blows up while generating a response:
-							response = begin
-								response = yield(request)
-							rescue
-								request.stream.send_reset_stream(::Protocol::HTTP2::INTERNAL_ERROR)
-								
-								Async.logger.error(request) {$!}
-							else
-								request.send_response(response)
+							task.async do
+								begin
+									response = yield(request)
+								rescue
+									# We need to close the stream if the user code blows up while generating a response:
+									request.stream.send_reset_stream(::Protocol::HTTP2::INTERNAL_ERROR)
+									
+									raise
+								else
+									request.send_response(response)
+								end
 							end
 						end
 					end

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

@@ -79,7 +79,7 @@ module Async
 							end
 							
 							# @body.read above might take a while and a stream reset might be received in the mean time.
-							unless closed?
+							unless closed? or @connection.closed?
 								send_data(nil, ::Protocol::HTTP2::END_STREAM)
 							end
 							

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

@@ -18,8 +18,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require_relative '../request'
-require_relative '../headers'
+require 'protocol/http/request'
+require 'protocol/http/headers'
 
 require_relative '../body/writable'
 
@@ -31,8 +31,8 @@ module Async
 			end
 			
 			# This is generated by server protocols.
-			class Request < HTTP::Request
-				attr :protocol
+			class Request < ::Protocol::HTTP::Request
+				attr :connection
 				
 				def hijack?
 					false
@@ -43,8 +43,8 @@ module Async
 				end
 				
 				def peer
-					if @protocol
-						@protocol.peer
+					if @connection
+						@connection.peer
 					end
 				end
 				

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

@@ -18,8 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require_relative '../response'
-require_relative '../headers'
+require 'protocol/http/response'
 
 require_relative '../body/writable'
 
@@ -27,16 +26,16 @@ module Async
 	module HTTP
 		module Protocol
 			# This is generated by client protocols.
-			class Response < HTTP::Response
-				attr :protocol
+			class Response < ::Protocol::HTTP::Response
+				attr :connection
 				
 				def hijack?
 					false
 				end
 				
 				def peer
-					if @protocol
-						@protocol.peer
+					if @connection
+						@connection.peer
 					end
 				end
 				

data/lib/async/http/relative_location.rb

@@ -19,15 +19,16 @@
 # THE SOFTWARE.
 
 require_relative 'client'
-require_relative 'url_endpoint'
-
+require_relative 'endpoint'
 require_relative 'reference'
 
+require 'protocol/http/middleware'
+
 module Async
 	module HTTP
 		# A client wrapper which transparently handles both relative and absolute redirects to a given maximum number of hops.
-		class RelativeLocation < Middleware
-			DEFAULT_METHOD = 'GET'.freeze
+		class RelativeLocation < ::Protocol::HTTP::Middleware
+			DEFAULT_METHOD = GET
 			
 			def initialize(app, maximum_hops = 4)
 				super(app)

data/lib/async/http/server.rb

@@ -22,11 +22,11 @@ require 'async/io/endpoint'
 require 'async/io/stream'
 
 require_relative 'protocol'
-require_relative 'response'
+require 'protocol/http/middleware'
 
 module Async
 	module HTTP
-		class Server < Middleware
+		class Server < ::Protocol::HTTP::Middleware
 			def self.for(*args, &block)
 				self.new(block, *args)
 			end
@@ -39,15 +39,17 @@ module Async
 				@scheme = scheme
 			end
 			
+			attr :endpoint
+			attr :protocol
 			attr :scheme
 			
 			def accept(peer, address, task: Task.current)
 				stream = Async::IO::Stream.new(peer)
-				protocol = @protocol.server(stream)
+				connection = @protocol.server(stream)
 				
-				Async.logger.debug(self) {"Incoming connnection from #{address.inspect} to #{protocol}"}
+				Async.logger.debug(self) {"Incoming connnection from #{address.inspect} to #{@protocol}"}
 				
-				protocol.each do |request|
+				connection.each do |request|
 					# We set the default scheme unless it was otherwise specified.
 					# https://tools.ietf.org/html/rfc7230#section-5.5
 					request.scheme ||= self.scheme

data/lib/async/http/statistics.rb

@@ -18,7 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require_relative 'body/wrapper'
+require 'protocol/http/body/wrapper'
 
 require 'async/clock'
 
@@ -44,7 +44,7 @@ module Async
 		
 		module Body
 			# Invokes a callback once the body has finished reading.
-			class Statistics < Wrapper
+			class Statistics < ::Protocol::HTTP::Body::Wrapper
 				def initialize(start_time, body, callback)
 					super(body)
 					

data/lib/async/http/version.rb

@@ -20,6 +20,6 @@
 
 module Async
 	module HTTP
-		VERSION = "0.40.3"
+		VERSION = "0.41.0"
 	end
 end

data/tasks/server.rake

@@ -1,7 +1,7 @@
 
 task :http1 do
 	require 'async/http/protocol'
-	require 'async/http/url_endpoint'
+	require 'async/http/endpoint'
 	require 'async/io/host_endpoint'
 
 	@protocol = Async::HTTP::Protocol::HTTP1
@@ -18,7 +18,7 @@ task :google do
 	require 'pry'
 	
 	Async.run do
-		endpoint = Async::HTTP::URLEndpoint.parse("https://www.google.com")
+		endpoint = Async::HTTP::Endpoint.parse("https://www.google.com")
 		peer = endpoint.connect
 		stream = Async::IO::Stream.new(peer)
 		
@@ -44,7 +44,7 @@ task :server do
 	require 'async/http/server'
 	
 	server = Async::HTTP::Server.for(Async::IO::Endpoint.tcp('127.0.0.1', 9294, reuse_port: true), @protocol) do |request|
-		return Async::HTTP::Response[200, {'content-type' => 'text/plain'}, ["Hello World"]]
+		return Protocol::HTTP::Response[200, {'content-type' => 'text/plain'}, ["Hello World"]]
 	end
 	
 	container = Async::Container::Forked.new(concurrency: 1) do
@@ -81,7 +81,7 @@ task :wrk do
 	require 'async/container/forked'
 
 	server = Async::HTTP::Server.for(Async::IO::Endpoint.tcp('127.0.0.1', 9294, reuse_port: true), @protocol) do |request|
-		return Async::HTTP::Response[200, {'content-type' => 'text/plain'}, ["Hello World"]]
+		return Protocol::HTTP::Response[200, {'content-type' => 'text/plain'}, ["Hello World"]]
 	end
 
 	concurrency = 1