async-http 0.76.0 → 0.77.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd45f82b4d28a3e9a72bbdd7eaec1877b69cfce59a3d67b49a09b99b59b42fa4
-  data.tar.gz: 05ceb7e93478b63e53bc9a16b829cc2c34efdc22953143192a5a60b310aa04b1
+  metadata.gz: 5a6e20407a7969b8eebeaf3f3a2dac09bdb3fe48130454ae49f46251a03b5c98
+  data.tar.gz: a827ae19dc5c7f60ed338357091f556d1e48b183fe8ab0c119d75547fce4a6cd
 SHA512:
-  metadata.gz: 8b293794ba1fb14494a7187a0c1255674ea771df8cc587c6fa031abca25b8bf803f32ba4889d772d53fb8f4dce0705938f1013ab72c22353b4e09c7cc54f4467
-  data.tar.gz: b0c407ee2c817bd8436bff520ae09744f44e35ba79bd992e76a783be52911fdedb0b397ab12c3cd1ffb00b3042bfc5d429f11b5252e16edbc2bab178172d747d
+  metadata.gz: 116770838b19e96fdc9ed4e1db8af834f0ed8676542d1090ed88c90d02ac0b978bd94378b41edc151108d86e61c39d2fbb9680d217790e1b1cb3f2ceed2aa64e
+  data.tar.gz: 2b05b93835b83052a89127f12db03fdcd79007b6b0f396134d9818352e48ffaf012057c0b818a56633f3e8b510e7861438e8016d2519bd4d0dec425dfd1113f7

data/bake/async/http/h2spec.rb

@@ -21,12 +21,12 @@ end
 private
 
 def server
-	require 'async'
-	require 'async/container'
-	require 'async/http/server'
-	require 'io/endpoint/host_endpoint'
+	require "async"
+	require "async/container"
+	require "async/http/server"
+	require "io/endpoint/host_endpoint"
 	
-	endpoint = IO::Endpoint.tcp('127.0.0.1', 7272)
+	endpoint = IO::Endpoint.tcp("127.0.0.1", 7272)
 	
 	container = Async::Container.new
 	
@@ -34,7 +34,7 @@ def server
 	
 	container.run(count: 1) do
 		server = Async::HTTP::Server.for(endpoint, protocol: Async::HTTP::Protocol::HTTP2, scheme: "https") do |request|
-			Protocol::HTTP::Response[200, {'content-type' => 'text/plain'}, ["Hello World"]]
+			Protocol::HTTP::Response[200, {"content-type" => "text/plain"}, ["Hello World"]]
 		end
 		
 		Async do

data/bake/async/http.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2020-2023, by Samuel Williams.
+# Copyright, 2020-2024, by Samuel Williams.
 
 # Fetch the specified URL and print the response.
 # @param url [String] the URL to parse and fetch.
 # @param method [String] the HTTP method to use.
 def fetch(url, method:)
-	require 'async/http/internet'
-	require 'kernel/sync'
+	require "async/http/internet"
+	require "kernel/sync"
 	
 	terminal = Console::Terminal.for($stdout)
 	terminal[:request] = terminal.style(:blue, nil, :bold)

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

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2024, by Samuel Williams.
+
+require "protocol/http/body/wrapper"
+require "async/variable"
+
+module Async
+	module HTTP
+		module Body
+			# Keeps track of whether a body is being read, and if so, waits for it to be closed.
+			class Finishable < ::Protocol::HTTP::Body::Wrapper
+				def initialize(body)
+					super(body)
+					
+					@closed = Async::Variable.new
+					@error = nil
+					
+					@reading = false
+				end
+				
+				def reading?
+					@reading
+				end
+				
+				def read
+					@reading = true
+					
+					super
+				end
+				
+				def close(error = nil)
+					unless @closed.resolved?
+						@error = error
+						@closed.value = true
+					end
+					
+					super
+				end
+				
+				def wait
+					if @reading
+						@closed.wait
+					else
+						self.discard
+					end
+				end
+				
+				def inspect
+					"#<#{self.class} closed=#{@closed} error=#{@error}> | #{super}"
+				end
+			end
+		end
+	end
+end

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

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

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

@@ -4,7 +4,7 @@
 # Copyright, 2019-2024, by Samuel Williams.
 # Copyright, 2020, by Bruno Sutic.
 
-require_relative 'writable'
+require_relative "writable"
 
 module Async
 	module HTTP

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

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

data/lib/async/http/body.rb

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

data/lib/async/http/client.rb

@@ -4,16 +4,17 @@
 # Copyright, 2017-2024, by Samuel Williams.
 # Copyright, 2022, by Ian Ker-Seymer.
 
-require 'io/endpoint'
+require "io/endpoint"
 
-require 'async/pool/controller'
+require "async/pool/controller"
 
-require 'protocol/http/body/completable'
-require 'protocol/http/methods'
+require "protocol/http/body/completable"
+require "protocol/http/methods"
 
-require 'traces/provider'
+require "traces/provider"
 
-require_relative 'protocol'
+require_relative "protocol"
+require_relative "body/finishable"
 
 module Async
 	module HTTP
@@ -140,7 +141,7 @@ module Async
 			def inspect
 				"#<#{self.class} authority=#{@authority.inspect}>"
 			end
-
+			
 			Traces::Provider(self) do
 				def call(request)
 					attributes = {
@@ -151,30 +152,30 @@ module Async
 					}
 					
 					if protocol = request.protocol
-						attributes['http.protocol'] = protocol
+						attributes["http.protocol"] = protocol
 					end
 					
 					if length = request.body&.length
-						attributes['http.request.length'] = length
+						attributes["http.request.length"] = length
 					end
 					
-					Traces.trace('async.http.client.call', attributes: attributes) do |span|
+					Traces.trace("async.http.client.call", attributes: attributes) do |span|
 						if context = Traces.trace_context
-							request.headers['traceparent'] = context.to_s
+							request.headers["traceparent"] = context.to_s
 							# request.headers['tracestate'] = context.state
 						end
 						
 						super.tap do |response|
 							if version = response&.version
-								span['http.version'] = version
+								span["http.version"] = version
 							end
 							
 							if status = response&.status
-								span['http.status_code'] = status
+								span["http.status_code"] = status
 							end
 							
 							if length = response.body&.length
-								span['http.response.length'] = length
+								span["http.response.length"] = length
 							end
 						end
 					end
@@ -186,10 +187,7 @@ module Async
 			def make_response(request, connection)
 				response = request.call(connection)
 				
-				# The connection won't be released until the body is completely read/released.
-				::Protocol::HTTP::Body::Completable.wrap(response) do
-					@pool.release(connection)
-				end
+				response.pool = @pool
 				
 				return response
 			end

data/lib/async/http/endpoint.rb

@@ -7,22 +7,22 @@
 # Copyright, 2024, by Igor Sidorov.
 # Copyright, 2024, by Hal Brodigan.
 
-require 'io/endpoint'
-require 'io/endpoint/host_endpoint'
-require 'io/endpoint/ssl_endpoint'
+require "io/endpoint"
+require "io/endpoint/host_endpoint"
+require "io/endpoint/ssl_endpoint"
 
-require_relative 'protocol/http'
-require_relative 'protocol/https'
+require_relative "protocol/http"
+require_relative "protocol/https"
 
 module Async
 	module HTTP
 		# Represents a way to connect to a remote HTTP server.
 		class Endpoint < ::IO::Endpoint::Generic
 			SCHEMES = {
-				'http' => URI::HTTP,
-				'https' => URI::HTTPS,
-				'ws' => URI::WS,
-				'wss' => URI::WSS,
+				"http" => URI::HTTP,
+				"https" => URI::HTTPS,
+				"ws" => URI::WS,
+				"wss" => URI::WSS,
 			}
 			
 			def self.parse(string, endpoint = nil, **options)
@@ -102,7 +102,7 @@ module Async
 			end
 			
 			def secure?
-				['https', 'wss'].include?(self.scheme)
+				["https", "wss"].include?(self.scheme)
 			end
 			
 			def protocol

data/lib/async/http/internet/instance.rb

@@ -3,7 +3,7 @@
 # Released under the MIT License.
 # Copyright, 2021-2024, by Samuel Williams.
 
-require_relative '../internet'
+require_relative "../internet"
 
 ::Thread.attr_accessor :async_http_internet_instance
 

data/lib/async/http/internet.rb

@@ -4,12 +4,12 @@
 # Copyright, 2018-2024, by Samuel Williams.
 # Copyright, 2024, by Igor Sidorov.
 
-require_relative 'client'
-require_relative 'endpoint'
+require_relative "client"
+require_relative "endpoint"
 
-require 'protocol/http/middleware'
-require 'protocol/http/body/buffered'
-require 'protocol/http/accept_encoding'
+require "protocol/http/middleware"
+require "protocol/http/body/buffered"
+require "protocol/http/accept_encoding"
 
 module Async
 	module HTTP

data/lib/async/http/middleware/location_redirector.rb

@@ -3,10 +3,10 @@
 # Released under the MIT License.
 # Copyright, 2024, by Samuel Williams.
 
-require_relative '../reference'
+require_relative "../reference"
 
-require 'protocol/http/middleware'
-require 'protocol/http/body/rewindable'
+require "protocol/http/middleware"
+require "protocol/http/body/rewindable"
 
 module Async
 	module HTTP
@@ -34,10 +34,10 @@ module Async
 				
 				# Header keys which should be deleted when changing a request from a POST to a GET as defined by <https://fetch.spec.whatwg.org/#request-body-header-name>.
 				PROHIBITED_GET_HEADERS = [
-					'content-encoding',
-					'content-language',
-					'content-location',
-					'content-type',
+					"content-encoding",
+					"content-language",
+					"content-location",
+					"content-type",
 				]
 				
 				# maximum_hops is the max number of redirects. Set to 0 to allow 1 request with no redirects.
@@ -91,7 +91,7 @@ module Async
 							hops += 1
 							
 							# Get the redirect location:
-							unless location = response.headers['location']
+							unless location = response.headers["location"]
 								return response
 							end
 							

data/lib/async/http/mock/endpoint.rb

@@ -3,9 +3,9 @@
 # Released under the MIT License.
 # Copyright, 2024, by Samuel Williams.
 
-require_relative '../protocol'
+require_relative "../protocol"
 
-require 'async/queue'
+require "async/queue"
 
 module Async
 	module HTTP

data/lib/async/http/mock.rb

@@ -3,4 +3,4 @@
 # Released under the MIT License.
 # Copyright, 2024, by Samuel Williams.
 
-require_relative 'mock/endpoint'
+require_relative "mock/endpoint"

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

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

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

@@ -3,18 +3,32 @@
 # Released under the MIT License.
 # Copyright, 2018-2024, by Samuel Williams.
 
-require_relative 'connection'
+require_relative "connection"
 
 module Async
 	module HTTP
 		module Protocol
 			module HTTP1
 				class Client < Connection
+					def initialize(...)
+						super
+						
+						@pool = nil
+					end
+					
+					attr_accessor :pool
+					
+					def closed!
+						super
+						
+						if pool = @pool
+							@pool = nil
+							pool.release(self)
+						end
+					end
+					
 					# Used by the client to send requests to the remote server.
 					def call(request, task: Task.current)
-						# We need to keep track of connections which are not in the initial "ready" state.
-						@ready = false
-						
 						Console.logger.debug(self) {"#{request.method} #{request.path} #{request.headers.inspect}"}
 						
 						# Mark the start of the trailers:
@@ -54,12 +68,11 @@ module Async
 						end
 						
 						response = Response.read(self, request)
-						@ready = true
 						
 						return response
 					rescue
 						# This will ensure that #reusable? returns false.
-						@stream.close
+						self.close
 						
 						raise
 					end

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

@@ -3,10 +3,10 @@
 # Released under the MIT License.
 # Copyright, 2018-2024, by Samuel Williams.
 
-require 'protocol/http1'
+require "protocol/http1"
 
-require_relative 'request'
-require_relative 'response'
+require_relative "request"
+require_relative "response"
 
 module Async
 	module HTTP
@@ -16,12 +16,11 @@ module Async
 					def initialize(stream, version)
 						super(stream)
 						
-						@ready = true
 						@version = version
 					end
 					
 					def to_s
-						"\#<#{self.class} negotiated #{@version}, currently #{@ready ? 'ready' : 'in-use'}>"
+						"\#<#{self.class} negotiated #{@version}, #{@state}>"
 					end
 					
 					def as_json(...)
@@ -62,11 +61,11 @@ module Async
 					
 					# Can we use this connection to make requests?
 					def viable?
-						@ready && @stream&.readable?
+						self.idle? && @stream&.readable?
 					end
 					
 					def reusable?
-						@ready && @persistent && @stream && !@stream.closed?
+						@persistent && @stream && !@stream.closed?
 					end
 				end
 			end

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

@@ -3,7 +3,7 @@
 # Released under the MIT License.
 # Copyright, 2018-2024, by Samuel Williams.
 
-require_relative '../request'
+require_relative "../request"
 
 module Async
 	module HTTP
@@ -16,13 +16,13 @@ module Async
 						end
 					end
 					
-					UPGRADE = 'upgrade'
+					UPGRADE = "upgrade"
 					
 					def initialize(connection, authority, method, path, version, headers, body)
 						@connection = connection
 						
 						# HTTP/1 requests with an upgrade header (which can contain zero or more values) are extracted into the protocol field of the request, and we expect a response to select one of those protocols with a status code of 101 Switching Protocols.
-						protocol = headers.delete('upgrade')
+						protocol = headers.delete("upgrade")
 						
 						super(nil, authority, method, path, version, headers, body, protocol, self.public_method(:write_interim_response))
 					end

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?
@@ -77,7 +85,7 @@ module Async
 										# 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(request.version)
+										stream = write_tunnel_body(version)
 										
 										# Same as above:
 										request = nil
@@ -89,7 +97,7 @@ module Async
 										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
@@ -99,26 +107,26 @@ module Async
 											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,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/writable'
+require "protocol/http/body/writable"
 
 module Async
 	module HTTP

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

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}!"
@@ -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
 

data/lib/async/http/server.rb

@@ -4,12 +4,12 @@
 # Copyright, 2017-2024, by Samuel Williams.
 # Copyright, 2019, by Brian Morearty.
 
-require 'async'
-require 'io/endpoint'
-require 'protocol/http/middleware'
-require 'traces/provider'
+require "async"
+require "io/endpoint"
+require "protocol/http/middleware"
+require "traces/provider"
 
-require_relative 'protocol'
+require_relative "protocol"
 
 module Async
 	module HTTP
@@ -76,8 +76,8 @@ module Async
 			
 			Traces::Provider(self) do
 				def call(request)
-					if trace_parent = request.headers['traceparent']
-						Traces.trace_context = Traces::Context.parse(trace_parent.join, request.headers['tracestate'], remote: true)
+					if trace_parent = request.headers["traceparent"]
+						Traces.trace_context = Traces::Context.parse(trace_parent.join, request.headers["tracestate"], remote: true)
 					end
 					
 					attributes = {
@@ -86,25 +86,25 @@ module Async
 						'http.authority': request.authority,
 						'http.scheme': request.scheme,
 						'http.path': request.path,
-						'http.user_agent': request.headers['user-agent'],
+						'http.user_agent': request.headers["user-agent"],
 					}
 					
 					if length = request.body&.length
-						attributes['http.request.length'] = length
+						attributes["http.request.length"] = length
 					end
 					
 					if protocol = request.protocol
-						attributes['http.protocol'] = protocol
+						attributes["http.protocol"] = protocol
 					end
 					
-					Traces.trace('async.http.server.call', resource: "#{request.method} #{request.path}", attributes: attributes) do |span|
+					Traces.trace("async.http.server.call", resource: "#{request.method} #{request.path}", attributes: attributes) do |span|
 						super.tap do |response|
 							if status = response&.status
-								span['http.status_code'] = status
+								span["http.status_code"] = status
 							end
 							
 							if length = response&.body&.length
-								span['http.response.length'] = length
+								span["http.response.length"] = length
 							end
 						end
 					end

data/lib/async/http/statistics.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2018-2023, by Samuel Williams.
+# Copyright, 2018-2024, by Samuel Williams.
 
-require 'protocol/http/body/wrapper'
+require "protocol/http/body/wrapper"
 
-require 'async/clock'
+require "async/clock"
 
 module Async
 	module HTTP
@@ -89,7 +89,7 @@ module Async
 						parts << "took #{format_duration(duration)} until first chunk"
 					end
 					
-					return parts.join('; ')
+					return parts.join("; ")
 				end
 				
 				def inspect

data/lib/async/http/version.rb

@@ -5,6 +5,6 @@
 
 module Async
 	module HTTP
-		VERSION = "0.76.0"
+		VERSION = "0.77.0"
 	end
 end

data/lib/async/http.rb

@@ -3,11 +3,11 @@
 # Released under the MIT License.
 # Copyright, 2017-2024, by Samuel Williams.
 
-require_relative 'http/version'
+require_relative "http/version"
 
-require_relative 'http/client'
-require_relative 'http/server'
+require_relative "http/client"
+require_relative "http/server"
 
-require_relative 'http/internet'
+require_relative "http/internet"
 
-require_relative 'http/endpoint'
+require_relative "http/endpoint"

data/readme.md

@@ -16,6 +16,17 @@ Please see the [project documentation](https://socketry.github.io/async-http/) f
 
 Please see the [project releases](https://socketry.github.io/async-http/releases/index) for all releases.
 
+### v0.77.0
+
+  - Improved HTTP/1 connection handling.
+  - The input stream is no longer closed when the output stream is closed.
+
+### v0.76.0
+
+  - `Async::HTTP::Body::Writable` is moved to `Protocol::HTTP::Body::Writable`.
+  - Remove `Async::HTTP::Body::Delayed` with no replacement.
+  - Remove `Async::HTTP::Body::Slowloris` with no replacement.
+
 ### v0.75.0
 
   - Better handling of HTTP/1 \<-\> HTTP/2 proxying, specifically upgrade/CONNECT requests.

data/releases.md

@@ -1,5 +1,16 @@
 # Releases
 
+## v0.77.0
+
+  - Improved HTTP/1 connection handling.
+  - The input stream is no longer closed when the output stream is closed.
+
+## v0.76.0
+
+  - `Async::HTTP::Body::Writable` is moved to `Protocol::HTTP::Body::Writable`.
+  - Remove `Async::HTTP::Body::Delayed` with no replacement.
+  - Remove `Async::HTTP::Body::Slowloris` with no replacement.
+
 ## v0.75.0
 
   - Better handling of HTTP/1 \<-\> HTTP/2 proxying, specifically upgrade/CONNECT requests.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: async-http
 version: !ruby/object:Gem::Version
-  version: 0.76.0
+  version: 0.77.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -58,7 +58,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2024-09-10 00:00:00.000000000 Z
+date: 2024-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -122,28 +122,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.34'
+        version: '0.37'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.34'
+        version: '0.37'
 - !ruby/object:Gem::Dependency
   name: protocol-http1
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '0.25'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '0.25'
 - !ruby/object:Gem::Dependency
   name: protocol-http2
   requirement: !ruby/object:Gem::Requirement
@@ -182,6 +182,7 @@ files:
 - bake/async/http/h2spec.rb
 - lib/async/http.rb
 - lib/async/http/body.rb
+- lib/async/http/body/finishable.rb
 - lib/async/http/body/hijack.rb
 - lib/async/http/body/pipe.rb
 - lib/async/http/body/writable.rb