async-http 0.76.0 → 0.78.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd45f82b4d28a3e9a72bbdd7eaec1877b69cfce59a3d67b49a09b99b59b42fa4
-  data.tar.gz: 05ceb7e93478b63e53bc9a16b829cc2c34efdc22953143192a5a60b310aa04b1
+  metadata.gz: 76e78af8d20808d557b1c13c850af0a268de5535726ba07708b2012eb8752029
+  data.tar.gz: 53bdf9b950394a03ca8c1fd47befe51e8ba51a5cce82aa47c01111df7efd21b4
 SHA512:
-  metadata.gz: 8b293794ba1fb14494a7187a0c1255674ea771df8cc587c6fa031abca25b8bf803f32ba4889d772d53fb8f4dce0705938f1013ab72c22353b4e09c7cc54f4467
-  data.tar.gz: b0c407ee2c817bd8436bff520ae09744f44e35ba79bd992e76a783be52911fdedb0b397ab12c3cd1ffb00b3042bfc5d429f11b5252e16edbc2bab178172d747d
+  metadata.gz: 43c49b50bb88955088b74926e3fe33310f38f4b09d9b9ecdc538a9835c9be5b8be0e172e09794324a53db99e09b0102ae96fc179af13578a758f42644d6f4011
+  data.tar.gz: fa1a0d97f326bdd72010f07cfe21004b0da8f75fe4556778bd3b918f42e2e85f22bc41cd07e2a64b4395540e531a879480e634a8fe401ee0d0d7c146af8b61d7

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/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,16 @@
 # 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"
 
 module Async
 	module HTTP
@@ -140,7 +140,7 @@ module Async
 			def inspect
 				"#<#{self.class} authority=#{@authority.inspect}>"
 			end
-
+			
 			Traces::Provider(self) do
 				def call(request)
 					attributes = {
@@ -151,30 +151,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 +186,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/finishable.rb

@@ -0,0 +1,58 @@
+# 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 Protocol
+			module HTTP1
+				# 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
+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,24 +6,43 @@
 # Copyright, 2023, by Thomas Morgan.
 # Copyright, 2024, by Anton Zhuravsky.
 
-require_relative 'connection'
-require 'console/event/failure'
+require_relative "connection"
+require_relative "finishable"
+
+require "console/event/failure"
 
 module Async
 	module HTTP
 		module Protocol
 			module HTTP1
 				class Server < Connection
+					def initialize(...)
+						super
+						
+						@ready = Async::Notification.new
+					end
+					
+					def closed!
+						super
+						
+						@ready.signal
+					end
+					
 					def fail_request(status)
 						@persistent = false
 						write_response(@version, status, {})
 						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
+						# Wait for the connection to become idle before reading the next request:
+						unless idle?
+							@ready.wait
+						end
+						
 						# The default is true.
 						return unless @persistent
 						
@@ -35,7 +54,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 +65,13 @@ module Async
 						task.annotate("Reading #{self.version} requests for #{self.class}.")
 						
 						while request = next_request
+							if body = request.body
+								finishable = Finishable.new(body)
+								request.body = finishable
+							end
+							
 							response = yield(request, self)
+							version = request.version
 							body = response&.body
 							
 							if hijacked?
@@ -77,7 +102,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 +114,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,29 +124,27 @@ 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{}
-								
-								# This ensures we yield at least once every iteration of the loop and allow other fibers to execute.
-								task.yield
+								# Discard or wait for the input body to be consumed:
+								finishable&.wait
 							rescue => error
 								raise
 							ensure