async-http 0.30.4 → 0.31.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 988a06a8b08c2251198294138b4bd8a8ef679bf072633b0db804abb3b80424c8
-  data.tar.gz: a923e52d7d7c4b38c32e7db4a49867daad1a6e0d3393fcd524a615f793ebcc95
+  metadata.gz: 20c4728c088a68663d0f336b2326d3e988a342c5d1f1cd2890a12e43cefda133
+  data.tar.gz: da0503f98a16003b0a2c6606e4419ebb311365dac4be7ea685b18bb994b3613c
 SHA512:
-  metadata.gz: c03b5e2b487e5071447db19ebb738986a434e121fb26d98676ffd262262682d63e612963ba46b4716de649a3558ea843f92dd2fcceef721d499759343450f077
-  data.tar.gz: 1191e5d82efd60553715e771cf13ddca15348dc7b241ecae2ba546147b6ca344518fef3588203f55f35e3b35886ac6049c1bef5b1e916e37a3c23112073c61bd
+  metadata.gz: 5ecdd9b68abcaf50db65f02ab8f1db4e8ce1e4a00af980510df5d1323a0d4c3b2c135d85fe3683dcf02f5e818b364fe659c44ab5df25459b687ba2a50d8db9e2
+  data.tar.gz: 68536e0f1ea03914f0e4b34116e7a7f738c5fbc7cf2baf9f2d87f7dd6675329c6c48b444ece69cf8a977f4184a525df1fc14b25bb3f7cb3a85c4983519551eed

data/async-http.gemspec

@@ -17,9 +17,9 @@ Gem::Specification.new do |spec|
 	spec.require_paths = ["lib"]
 	
 	spec.add_dependency("async", "~> 1.6")
-	spec.add_dependency("async-io", "~> 1.15")
+	spec.add_dependency("async-io", "~> 1.16")
 	
-	spec.add_dependency("http-protocol", "~> 0.3.0")
+	spec.add_dependency("http-protocol", "~> 0.5.0")
 	
 	# spec.add_dependency("openssl")
 	

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

@@ -19,6 +19,7 @@
 # THE SOFTWARE.
 
 require_relative 'readable'
+require 'async/io/stream'
 
 module Async
 	module HTTP

data/lib/async/http/client.rb

@@ -19,6 +19,7 @@
 # THE SOFTWARE.
 
 require 'async/io/endpoint'
+require 'async/io/stream'
 
 require_relative 'protocol'
 require_relative 'body/streamable'

data/lib/async/http/pool.rb

@@ -136,8 +136,8 @@ module Async
 				# This is a linear search... not idea, but simple for now.
 				@resources.each do |resource, count|
 					if count < resource.multiplex
-						# We want to use this resource... but is it good?
-						if resource.good?
+						# We want to use this resource... but is it connected?
+						if resource.connected?
 							@resources[resource] += 1
 							
 							return resource

data/lib/async/http/protocol.rb

@@ -20,3 +20,27 @@
 
 require_relative 'protocol/http1'
 require_relative 'protocol/https'
+
+module Async
+	module HTTP
+		# A protocol specifies a way in which to communicate with a remote peer.
+		module Protocol
+			# A protocol must implement the following interface:
+			# class Protocol
+			# 	def client(stream) -> Connection
+			# 	def server(stream) -> Connection
+			# end
+			
+			# A connection must implement the following interface:
+			# class Connection
+			# 	def multiplex -> can invoke call 1 or more times simultaneously.
+			# 	def reusable? -> can be used again/persistent connection.
+			
+			# 	def connected? -> Boolean
+			
+			# 	def call(request) -> Response
+			# 	def each -> (yield(request) -> Response)
+			# end
+		end
+	end
+end

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

@@ -27,37 +27,28 @@ module Async
 	module HTTP
 		module Protocol
 			# A server that supports both HTTP1.0 and HTTP1.1 semantics by detecting the version of the request.
-			class HTTP1 < Async::IO::Protocol::Line
-				HANDLERS = {
-					"HTTP/1.0" => HTTP10,
-					"HTTP/1.1" => HTTP11,
-				}
-				
-				def initialize(stream)
-					super(stream, HTTP11::CRLF)
-				end
-				
-				class << self
-					def client(*args)
-						HTTP11.new(*args)
-					end
-					
-					alias server new
-				end
-				
-				def create_handler(version)
-					if klass = HANDLERS[version]
-						klass.server(@stream)
-					else
-						raise RuntimeError, "Unsupported protocol version #{version}"
-					end
+			module HTTP1
+				def self.client(*args)
+					HTTP11.client(*args)
 				end
 				
-				def receive_requests(&block)
-					method, path, version = self.peek_line.split(/\s+/, 3)
-					
-					create_handler(version).receive_requests(&block)
+				def self.server(*args)
+					HTTP11.server(*args)
 				end
+				# 
+				# def create_handler(version)
+				# 	if klass = HANDLERS[version]
+				# 		klass.server(@stream)
+				# 	else
+				# 		raise RuntimeError, "Unsupported protocol version #{version}"
+				# 	end
+				# end
+				# 
+				# def receive_requests(&block)
+				# 	method, path, version = self.peek_line.split(/\s+/, 3)
+				# 
+				# 	create_handler(version).receive_requests(&block)
+				# end
 			end
 		end
 	end

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

@@ -0,0 +1,55 @@
+# Copyright, 2017, 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 'http/protocol/http11/connection'
+require_relative '../http1/connection'
+
+module Async
+	module HTTP
+		module Protocol
+			module HTTP1
+				module Client
+					# Used by the client to send requests to the remote server.
+					def call(request)
+						Async.logger.debug(self) {"#{request.method} #{request.path} #{request.headers.inspect}"}
+						
+						# We carefully interpret https://tools.ietf.org/html/rfc7230#section-6.3.1 to implement this correctly.
+						begin
+							self.write_request(request.authority, request.method, request.path, self.version, request.headers)
+						rescue
+							# If we fail to fully write the request and body, we can retry this request.
+							raise RequestFailed.new
+						end
+						
+						# Once we start writing the body, we can't recover if the request fails. That's because the body might be generated dynamically, streaming, etc.
+						self.write_body(request.body)
+						
+						return Response.new(self, request)
+					rescue
+						# This will ensure that #reusable? returns false.
+						@stream.close
+						
+						raise
+					end
+				end
+			end
+		end
+	end
+end

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

@@ -0,0 +1,94 @@
+# Copyright, 2017, 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 'request'
+require_relative 'response'
+
+require_relative '../../body/chunked'
+require_relative '../../body/fixed'
+
+module Async
+	module HTTP
+		module Protocol
+			module HTTP1
+				module Connection
+					CRLF = "\r\n"
+					
+					attr :stream
+					
+					def read_line
+						@stream.read_until(CRLF) or raise EOFError
+					end
+					
+					# @return [Async::Wrapper] the underlying non-blocking IO.
+					def hijack
+						@persistent = false
+						
+						@stream.flush
+						
+						return @stream.io
+					end
+					
+					def peer
+						@stream.io
+					end
+					
+					attr :count
+					
+					def multiplex
+						1
+					end
+					
+					# Can we use this connection to make requests?
+					def connected?
+						@stream.connected?
+					end
+					
+					def reusable?
+						!@stream.closed?
+						# !(self.closed? || @stream.closed?)
+					end
+					
+					def close
+						Async.logger.debug(self) {"Closing connection"}
+						
+						@stream.close
+					end
+					
+					def read_chunked_body
+						Body::Chunked.new(self)
+					end
+					
+					def read_fixed_body(length)
+						Body::Fixed.new(@stream, length)
+					end
+					
+					def read_tunnel_body
+						read_remainder_body
+					end
+					
+					def read_remainder_body
+						Body::Remainder.new(@stream)
+					end
+				end
+			end
+		end
+	end
+end

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

@@ -0,0 +1,45 @@
+# 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 '../request'
+
+module Async
+	module HTTP
+		module Protocol
+			module HTTP1
+				class Request < Protocol::Request
+					def initialize(protocol)
+						super(*protocol.read_request)
+						
+						@protocol = protocol
+					end
+					
+					def hijack?
+						true
+					end
+					
+					def hijack
+						@protocol.hijack
+					end
+				end
+			end
+		end
+	end
+end

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

@@ -0,0 +1,37 @@
+# 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 '../response'
+
+module Async
+	module HTTP
+		module Protocol
+			module HTTP1
+				class Response < Protocol::Response
+					def initialize(protocol, request)
+						super(*protocol.read_response(request.method))
+						
+						@protocol = protocol
+					end
+				end
+			end
+		end
+	end
+end

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

@@ -0,0 +1,72 @@
+# Copyright, 2017, 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 'http/protocol/http11/connection'
+require_relative '../http1/connection'
+
+module Async
+	module HTTP
+		module Protocol
+			module HTTP1
+				module Server
+					def next_request
+						# The default is true.
+						return nil unless @persistent
+						
+						request = Request.new(self)
+						
+						unless persistent?(request.headers)
+							@persistent = false
+						end
+						
+						return request
+					rescue
+						# Bad Request
+						write_response(self.version, 400, {}, nil)
+						
+						raise
+					end
+					
+					# Server loop.
+					def each(task: Task.current)
+						while request = next_request
+							response = yield(request, self)
+							
+							return if @stream.closed?
+							
+							if response
+								write_response(self.version, response.status, response.headers, response.body, request.head?)
+							else
+								# If the request failed to generate a response, it was an internal server error:
+								write_response(self.version, 500, {}, nil)
+							end
+							
+							# Gracefully finish reading the request body if it was not already done so.
+							request.finish
+							
+							# This ensures we yield at least once every iteration of the loop and allow other fibers to execute.
+							task.yield
+						end
+					end
+				end
+			end
+		end
+	end
+end