async-http 0.75.0 → 0.77.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 946e45fa80db4dc1a3416f91a6533d58e7e4c5b8e7db9a687b922e9161f84dcf
-  data.tar.gz: 7810dfb04b6c120e91660c4cabec884ef531bb4b4078c149558a6190314f88cb
+  metadata.gz: 5a6e20407a7969b8eebeaf3f3a2dac09bdb3fe48130454ae49f46251a03b5c98
+  data.tar.gz: a827ae19dc5c7f60ed338357091f556d1e48b183fe8ab0c119d75547fce4a6cd
 SHA512:
-  metadata.gz: 456325793d94251a8b8b117000361e512c23aad9ce03dd2df6c387a35405ac83a7cae1b0de270bf0264485ab98ff5fff3778d720845fe26753950bedd1066b38
-  data.tar.gz: de2cb3749808740c03bd0d0d6cfe5facb3282d26f8465ddeb734158389cfdd70b2bf5610a01bf1d4f0af44fdc1d6c15249f912942038778e9f38217e96ad9c84
+  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
@@ -36,7 +36,7 @@ module Async
 				end
 				
 				def call(stream)
-					return @block.call(stream)
+					@block.call(stream)
 				end
 				
 				attr :input

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
@@ -17,7 +17,7 @@ module Async
 					
 					head, tail = ::Socket.pair(Socket::AF_UNIX, Socket::SOCK_STREAM)
 					
-					@head = ::IO::Stream::Buffered.new(head)
+					@head = ::IO::Stream(head)
 					@tail = tail
 					
 					@reader = nil
@@ -52,8 +52,10 @@ module Async
 					end
 					
 					@head.close_write
+				rescue => error
+					raise
 				ensure
-					@input.close($!)
+					@input.close(error)
 					
 					close_head if @writer&.finished?
 				end
@@ -68,8 +70,10 @@ module Async
 					while chunk = @head.read_partial
 						@output.write(chunk)
 					end
+				rescue => error
+					raise
 				ensure
-					@output.close($!)
+					@output.close_write(error)
 					
 					close_head if @reader&.finished?
 				end

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

@@ -1,106 +1,15 @@
 # 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/readable'
-require 'async/queue'
+require "protocol/http/body/writable"
+require "async/queue"
 
 module Async
 	module HTTP
 		module Body
-			include ::Protocol::HTTP::Body
-			
-			# A dynamic body which you can write to and read from.
-			class Writable < Readable
-				class Closed < StandardError
-				end
-				
-				# @param [Integer] length The length of the response body if known.
-				# @param [Async::Queue] queue Specify a different queue implementation, e.g. `Async::LimitedQueue.new(8)` to enable back-pressure streaming.
-				def initialize(length = nil, queue: Async::Queue.new)
-					@queue = queue
-					
-					@length = length
-					
-					@count = 0
-					
-					@finished = false
-					
-					@closed = false
-					@error = nil
-				end
-				
-				def length
-					@length
-				end
-				
-				# Stop generating output; cause the next call to write to fail with the given error.
-				def close(error = nil)
-					unless @closed
-						@queue.enqueue(nil)
-						
-						@closed = true
-						@error = error
-					end
-					
-					super
-				end
-				
-				def closed?
-					@closed
-				end
-				
-				def ready?
-					!@queue.empty?
-				end
-				
-				# Has the producer called #finish and has the reader consumed the nil token?
-				def empty?
-					@finished
-				end
-				
-				# Read the next available chunk.
-				def read
-					return if @finished
-					
-					unless chunk = @queue.dequeue
-						@finished = true
-					end
-					
-					return chunk
-				end
-				
-				# Write a single chunk to the body. Signal completion by calling `#finish`.
-				def write(chunk)
-					# If the reader breaks, the writer will break.
-					# The inverse of this is less obvious (*)
-					if @closed
-						raise(@error || Closed)
-					end
-					
-					@count += 1
-					@queue.enqueue(chunk)
-				end
-				
-				alias << write
-				
-				def inspect
-					"\#<#{self.class} #{@count} chunks written, #{status}>"
-				end
-				
-				private
-				
-				def status
-					if @finished
-						'finished'
-					elsif @closed
-						'closing'
-					else
-						'waiting'
-					end
-				end
-			end
+			Writable = ::Protocol::HTTP::Body::Writable
 		end
 	end
 end

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