async-http 0.75.0 → 0.77.0

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

@@ -4,7 +4,7 @@
 # Copyright, 2018-2024, by Samuel Williams.
 # Copyright, 2023, by Josh Huber.
 
-require_relative '../response'
+require_relative "../response"
 
 module Async
 	module HTTP
@@ -23,7 +23,7 @@ module Async
 						end
 					end
 					
-					UPGRADE = 'upgrade'
+					UPGRADE = "upgrade"
 					
 					# @attribute [String] The HTTP response line reason.
 					attr :reason
@@ -39,6 +39,14 @@ module Async
 						super(version, status, headers, body, protocol)
 					end
 					
+					def pool=(pool)
+						if @connection.idle? or @connection.closed?
+							pool.release(@connection)
+						else
+							@connection.pool = pool
+						end
+					end
+					
 					def connection
 						@connection
 					end

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

@@ -6,8 +6,10 @@
 # Copyright, 2023, by Thomas Morgan.
 # Copyright, 2024, by Anton Zhuravsky.
 
-require_relative 'connection'
-require 'console/event/failure'
+require_relative "connection"
+require_relative "../../body/finishable"
+
+require "console/event/failure"
 
 module Async
 	module HTTP
@@ -20,7 +22,7 @@ module Async
 						write_body(@version, nil)
 					rescue => error
 						# At this point, there is very little we can do to recover:
-						Console::Event::Failure.for(error).emit(self, "Failed to write failure response.", severity: :debug)
+						Console::Event::Failure.for(error).emit(self, "Failed to write failure response!", severity: :debug)
 					end
 					
 					def next_request
@@ -35,7 +37,7 @@ module Async
 						end
 						
 						return request
-					rescue ::Protocol::HTTP1::BadRequest
+					rescue ::Protocol::HTTP1::BadRequest => error
 						fail_request(400)
 						# Conceivably we could retry here, but we don't really know how bad the error is, so it's better to just fail:
 						raise
@@ -46,7 +48,13 @@ module Async
 						task.annotate("Reading #{self.version} requests for #{self.class}.")
 						
 						while request = next_request
+							if body = request.body
+								finishable = Body::Finishable.new(body)
+								request.body = finishable
+							end
+							
 							response = yield(request, self)
+							version = request.version
 							body = response&.body
 							
 							if hijacked?
@@ -68,45 +76,57 @@ module Async
 										stream = write_upgrade_body(protocol)
 										
 										# At this point, the request body is hijacked, so we don't want to call #finish below.
-										request = nil unless request.body
+										request = nil
 										response = nil
 										
 										# We must return here as no further request processing can be done:
 										return body.call(stream)
+									elsif response.status == 101
+										# This code path is to support legacy behavior where the response status is set to 101, but the protocol is not upgraded. This may not be a valid use case, but it is supported for compatibility. We expect the response headers to contain the `upgrade` header.
+										write_response(@version, response.status, response.headers)
+										
+										stream = write_tunnel_body(version)
+										
+										# Same as above:
+										request = nil
+										response = nil
+										
+										# We must return here as no further request processing can be done:
+										return body&.call(stream)
 									else
 										write_response(@version, response.status, response.headers)
 										
 										if request.connect? and response.success?
-											stream = write_tunnel_body(request.version)
+											stream = write_tunnel_body(version)
 											
 											# Same as above:
-											request = nil unless request.body
+											request = nil
 											response = nil
 											
 											# We must return here as no further request processing can be done:
 											return body.call(stream)
 										else
 											head = request.head?
-											version = request.version
 											
 											# Same as above:
-											request = nil unless request.body
+											request = nil
 											response = nil
 											
 											write_body(version, body, head, trailer)
 										end
 									end
 									
-									# We are done with the body, you shouldn't need to call close on it:
+									# We are done with the body:
 									body = nil
 								else
 									# If the request failed to generate a response, it was an internal server error:
 									write_response(@version, 500, {})
-									write_body(request.version, nil)
+									write_body(version, nil)
+									
+									request&.finish
 								end
 								
-								# Gracefully finish reading the request body if it was not already done so.
-								request&.each{}
+								finishable&.wait
 								
 								# This ensures we yield at least once every iteration of the loop and allow other fibers to execute.
 								task.yield

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

@@ -4,10 +4,10 @@
 # Copyright, 2017-2024, by Samuel Williams.
 # Copyright, 2024, by Thomas Morgan.
 
-require_relative 'http1/client'
-require_relative 'http1/server'
+require_relative "http1/client"
+require_relative "http1/server"
 
-require 'io/stream'
+require "io/stream"
 
 module Async
 	module HTTP

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

@@ -4,7 +4,7 @@
 # Copyright, 2017-2024, by Samuel Williams.
 # Copyright, 2024, by Thomas Morgan.
 
-require_relative 'http1'
+require_relative "http1"
 
 module Async
 	module HTTP

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

@@ -5,7 +5,7 @@
 # Copyright, 2018, by Janko Marohnić.
 # Copyright, 2024, by Thomas Morgan.
 
-require_relative 'http1'
+require_relative "http1"
 
 module Async
 	module HTTP

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

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2018-2023, by Samuel Williams.
+# Copyright, 2018-2024, by Samuel Williams.
 
-require_relative 'connection'
-require_relative 'response'
+require_relative "connection"
+require_relative "response"
 
-require 'protocol/http2/client'
+require "protocol/http2/client"
 
 module Async
 	module HTTP

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

@@ -4,25 +4,25 @@
 # Copyright, 2018-2024, by Samuel Williams.
 # Copyright, 2020, by Bruno Sutic.
 
-require_relative 'stream'
+require_relative "stream"
 
-require 'async/semaphore'
+require "async/semaphore"
 
 module Async
 	module HTTP
 		module Protocol
 			module HTTP2
-				HTTPS = 'https'.freeze
-				SCHEME = ':scheme'.freeze
-				METHOD = ':method'.freeze
-				PATH = ':path'.freeze
-				AUTHORITY = ':authority'.freeze
-				STATUS = ':status'.freeze
-				PROTOCOL = ':protocol'.freeze
+				HTTPS = "https".freeze
+				SCHEME = ":scheme".freeze
+				METHOD = ":method".freeze
+				PATH = ":path".freeze
+				AUTHORITY = ":authority".freeze
+				STATUS = ":status".freeze
+				PROTOCOL = ":protocol".freeze
 				
-				CONTENT_LENGTH = 'content-length'.freeze
-				CONNECTION = 'connection'.freeze
-				TRAILER = 'trailer'.freeze
+				CONTENT_LENGTH = "content-length".freeze
+				CONNECTION = "connection".freeze
+				TRAILER = "trailer".freeze
 				
 				module Connection
 					def initialize(*)

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

@@ -1,16 +1,16 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2020-2023, by Samuel Williams.
+# Copyright, 2020-2024, by Samuel Williams.
 
-require_relative '../../body/writable'
+require "protocol/http/body/writable"
 
 module Async
 	module HTTP
 		module Protocol
 			module HTTP2
 				# A writable body which requests window updates when data is read from it.
-				class Input < Body::Writable
+				class Input < ::Protocol::HTTP::Body::Writable
 					def initialize(stream, length)
 						super(length)
 						

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

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2020-2023, by Samuel Williams.
+# Copyright, 2020-2024, by Samuel Williams.
 
-require 'protocol/http/body/stream'
+require "protocol/http/body/stream"
 
 module Async
 	module HTTP
@@ -50,18 +50,25 @@ module Async
 						end
 					end
 					
-					# This method should only be called from within the context of the output task.
-					def close(error = nil)
-						if @stream
-							@stream.finish_output(error)
+					def close_write(error = nil)
+						if stream = @stream
 							@stream = nil
+							stream.finish_output(error)
 						end
 					end
 					
+					# This method should only be called from within the context of the output task.
+					def close(error = nil)
+						close_write(error)
+						stop(error)
+					end
+					
 					# This method should only be called from within the context of the HTTP/2 stream.
 					def stop(error)
-						@task&.stop
-						@task = nil
+						if task = @task
+							@task = nil
+							task.stop(error)
+						end
 					end
 					
 					private
@@ -70,10 +77,12 @@ module Async
 						task.annotate("Streaming #{@body} to #{@stream}.")
 						
 						input = @stream.wait_for_input
+						stream = ::Protocol::HTTP::Body::Stream.new(input, self)
 						
-						@body.call(::Protocol::HTTP::Body::Stream.new(input, self))
-					rescue Async::Stop
-						# Ignore.
+						@body.call(stream)
+					rescue => error
+						self.close(error)
+						raise
 					end
 					
 					# Reads chunks from the given body and writes them to the stream as fast as possible.
@@ -86,11 +95,17 @@ module Async
 							# chunk.clear unless chunk.frozen?
 							# GC.start
 						end
-						
-						self.close
+					rescue => error
+						raise
 					ensure
-						@body&.close($!)
-						@body = nil
+						# Ensure the body we are reading from is fully closed:
+						if body = @body
+							@body = nil
+							body.close(error)
+						end
+						
+						# Ensure the output of this body is closed:
+						self.close_write(error)
 					end
 					
 					# Send `maximum_size` bytes of data using the specified `stream`. If the buffer has no more chunks, `END_STREAM` will be sent on the final chunk.

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

@@ -3,8 +3,8 @@
 # Released under the MIT License.
 # Copyright, 2018-2024, by Samuel Williams.
 
-require_relative '../request'
-require_relative 'stream'
+require_relative "../request"
+require_relative "stream"
 
 module Async
 	module HTTP
@@ -53,7 +53,7 @@ module Async
 									@length = Integer(value)
 								elsif key == CONNECTION
 									raise ::Protocol::HTTP2::HeaderError, "Connection header is not allowed!"
-								elsif key.start_with? ':'
+								elsif key.start_with? ":"
 									raise ::Protocol::HTTP2::HeaderError, "Invalid pseudo-header #{key}!"
 								elsif key =~ /[A-Z]/
 									raise ::Protocol::HTTP2::HeaderError, "Invalid characters in header #{key}!"
@@ -107,7 +107,7 @@ module Async
 					end
 					
 					NO_RESPONSE = [
-						[STATUS, '500'],
+						[STATUS, "500"],
 					]
 					
 					def send_response(response)

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

@@ -3,8 +3,8 @@
 # Released under the MIT License.
 # Copyright, 2018-2024, by Samuel Williams.
 
-require_relative '../response'
-require_relative 'stream'
+require_relative "../response"
+require_relative "stream"
 
 module Async
 	module HTTP
@@ -41,7 +41,7 @@ module Async
 							# While in theory, the response pseudo-headers may be extended in the future, currently they only response pseudo-header is :status, so we can assume it is always the first header.
 							status_header = headers.shift
 							
-							if status_header.first != ':status'
+							if status_header.first != ":status"
 								raise ProtocolError, "Invalid response headers: #{headers.inspect}"
 							end
 							
@@ -137,6 +137,16 @@ module Async
 					attr :stream
 					attr :request
 					
+					def pool=(pool)
+						# If we are already closed, the stream can be released now:
+						if @stream.closed?
+							pool.release(@stream.connection)
+						else
+							# Otherwise, we will release the stream when it is closed:
+							@stream.pool = pool
+						end
+					end
+					
 					def connection
 						@stream.connection
 					end
@@ -175,7 +185,7 @@ module Async
 								raise ::Protocol::HTTP2::HeaderError, "Request path already specified!" if request.path
 								
 								request.path = value
-							elsif key.start_with? ':'
+							elsif key.start_with? ":"
 								raise ::Protocol::HTTP2::HeaderError, "Invalid pseudo-header #{key}!"
 							else
 								request.headers[key] = value

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

@@ -3,10 +3,10 @@
 # Released under the MIT License.
 # Copyright, 2018-2024, by Samuel Williams.
 
-require_relative 'connection'
-require_relative 'request'
+require_relative "connection"
+require_relative "request"
 
-require 'protocol/http2/server'
+require "protocol/http2/server"
 
 module Async
 	module HTTP

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

@@ -5,10 +5,10 @@
 # Copyright, 2022, by Marco Concetto Rudilosso.
 # Copyright, 2023, by Thomas Morgan.
 
-require 'protocol/http2/stream'
+require "protocol/http2/stream"
 
-require_relative 'input'
-require_relative 'output'
+require_relative "input"
+require_relative "output"
 
 module Async
 	module HTTP
@@ -20,6 +20,8 @@ module Async
 						
 						@headers = nil
 						
+						@pool = nil
+						
 						# Input buffer, reading request body, or response body (receive_data):
 						@length = nil
 						@input = nil
@@ -30,12 +32,14 @@ module Async
 					
 					attr_accessor :headers
 					
+					attr_accessor :pool
+					
 					attr :input
 					
 					def add_header(key, value)
 						if key == CONNECTION
 							raise ::Protocol::HTTP2::HeaderError, "Connection header is not allowed!"
-						elsif key.start_with? ':'
+						elsif key.start_with? ":"
 							raise ::Protocol::HTTP2::HeaderError, "Invalid pseudo-header #{key}!"
 						elsif key =~ /[A-Z]/
 							raise ::Protocol::HTTP2::HeaderError, "Invalid upper-case characters in header #{key}!"
@@ -59,7 +63,7 @@ module Async
 						
 						# TODO this might need to be in an ensure block:
 						if @input and frame.end_stream?
-							@input.close($!)
+							@input.close_write
 							@input = nil
 						end
 					rescue ::Protocol::HTTP2::HeaderError => error
@@ -98,7 +102,7 @@ module Async
 							end
 							
 							if frame.end_stream?
-								@input.close
+								@input.close_write
 								@input = nil
 							end
 						end
@@ -149,7 +153,7 @@ module Async
 						super
 						
 						if @input
-							@input.close(error)
+							@input.close_write(error)
 							@input = nil
 						end
 						
@@ -158,6 +162,10 @@ module Async
 							@output = nil
 						end
 						
+						if pool = @pool and @connection
+							pool.release(@connection)
+						end
+						
 						return self
 					end
 				end

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

@@ -4,10 +4,10 @@
 # Copyright, 2018-2024, by Samuel Williams.
 # Copyright, 2024, by Thomas Morgan.
 
-require_relative 'http2/client'
-require_relative 'http2/server'
+require_relative "http2/client"
+require_relative "http2/server"
 
-require 'io/stream'
+require "io/stream"
 
 module Async
 	module HTTP

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

@@ -4,10 +4,10 @@
 # Copyright, 2018-2024, by Samuel Williams.
 # Copyright, 2019, by Brian Morearty.
 
-require_relative 'http10'
-require_relative 'http11'
+require_relative "http10"
+require_relative "http11"
 
-require_relative 'http2'
+require_relative "http2"
 
 module Async
 	module HTTP

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

@@ -3,10 +3,10 @@
 # Released under the MIT License.
 # Copyright, 2017-2024, by Samuel Williams.
 
-require 'protocol/http/request'
-require 'protocol/http/headers'
+require "protocol/http/request"
+require "protocol/http/headers"
 
-require_relative '../body/writable'
+require_relative "../body/writable"
 
 module Async
 	module HTTP

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

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2017-2023, by Samuel Williams.
+# Copyright, 2017-2024, by Samuel Williams.
 
-require 'protocol/http/response'
+require "protocol/http/response"
 
-require_relative '../body/writable'
+require_relative "../body/writable"
 
 module Async
 	module HTTP

data/lib/async/http/protocol.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2017-2023, by Samuel Williams.
+# Copyright, 2017-2024, by Samuel Williams.
 
-require_relative 'protocol/http1'
-require_relative 'protocol/https'
+require_relative "protocol/http1"
+require_relative "protocol/https"
 
 module Async
 	module HTTP

data/lib/async/http/proxy.rb

@@ -3,10 +3,10 @@
 # Released under the MIT License.
 # Copyright, 2019-2024, by Samuel Williams.
 
-require_relative 'client'
-require_relative 'endpoint'
+require_relative "client"
+require_relative "endpoint"
 
-require_relative 'body/pipe'
+require_relative "body/pipe"
 
 module Async
 	module HTTP
@@ -96,6 +96,7 @@ module Async
 					end
 				else
 					# This ensures we don't leave a response dangling:
+					input.close
 					response.close
 					
 					raise ConnectFailure, response

data/lib/async/http/reference.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2018-2023, by Samuel Williams.
+# Copyright, 2018-2024, by Samuel Williams.
 
-require 'protocol/http/reference'
+require "protocol/http/reference"
 
 module Async
 	module HTTP

data/lib/async/http/relative_location.rb

@@ -4,7 +4,7 @@
 # Copyright, 2018-2024, by Samuel Williams.
 # Copyright, 2019-2020, by Brian Morearty.
 
-require_relative 'middleware/location_redirector'
+require_relative "middleware/location_redirector"
 
 warn "`Async::HTTP::RelativeLocation` is deprecated and will be removed in the next release. Please use `Async::HTTP::Middleware::LocationRedirector` instead.", uplevel: 1