async-http 0.56.6 → 0.59.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8a62982c0ca9bd57cf326b34e0f697a6fac7af99de50cf98fe36b7cc93fb4cd
-  data.tar.gz: 16e52379346b1d2e7a9ad115c1859c8c8ba3c3e229e2f1a6385eaf9f5477ca12
+  metadata.gz: 462c9c83407e01dff971e0642b8bb589da83d6ae533ba32d932c1d384e92d26b
+  data.tar.gz: 34b7f23b1d0e37e67e624465f9d444713cc7bb382fa74a4c72114a266a88b409
 SHA512:
-  metadata.gz: f0d95e9e50f34b39a8725ef5cef5b8affb7a3feee22eda029e5c064ca7afd254aa77d2ce5fba65d0a8903e8c65875a6e3756fa98a204725f322a2e2c3fb0c570
-  data.tar.gz: 71c38354bd9ce92fb507bd7e36b0e557fb7073eeb30fcbba1c44511ac1d9cf96d5ca6e0c8556e86b036b4dc53fb3fd394eaf7975f16b8509e50cbdd58c1de399
+  metadata.gz: 81720dc20d8807e6e46c71206191a737e98c09a5df08b6e9cedada59f2333c8498a4e9bfaefe4cef73992d5c350dd0ec0fc6f70d8e4b26e1f013e88b5c8aabb0
+  data.tar.gz: fde249eaa964c5aea2dea86ff147053bb7981248302349c4caed80092c5abeecd27b84ddc4bfdf6625a4db5a328d770addef765a40bb7734b9314656d49dd5e9

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

@@ -21,7 +21,9 @@
 # THE SOFTWARE.
 
 require 'protocol/http/body/readable'
-require_relative 'stream'
+require 'protocol/http/body/stream'
+
+require_relative 'writable'
 
 module Async
 	module HTTP
@@ -42,6 +44,7 @@ module Async
 					
 					@task = nil
 					@stream = nil
+					@output = nil
 				end
 				
 				# We prefer streaming directly as it's the lowest overhead.
@@ -57,23 +60,18 @@ module Async
 				
 				# Has the producer called #finish and has the reader consumed the nil token?
 				def empty?
-					if @stream
-						@stream.empty?
-					else
-						false
-					end
+					@output&.empty?
 				end
 				
 				def ready?
-					if @stream
-						@stream.output.ready?
-					end
+					@output&.ready?
 				end
 				
 				# Read the next available chunk.
 				def read
-					unless @task
-						@stream = Stream.new(@input)
+					unless @output
+						@output = Writable.new
+						@stream = ::Protocol::HTTP::Body::Stream.new(@input, @output)
 						
 						@task = Task.current.async do |task|
 							task.annotate "Streaming hijacked body."
@@ -82,7 +80,7 @@ module Async
 						end
 					end
 					
-					return @stream.output.read
+					return @output.read
 				end
 				
 				def inspect

data/lib/async/http/client.rb

@@ -138,7 +138,7 @@ module Async
 					@pool.release(connection) if connection
 				end
 			end
-
+			
 			def inspect
 				"#<#{self.class} authority=#{@authority.inspect}>"
 			end

data/lib/async/http/endpoint.rb

@@ -37,13 +37,13 @@ module Async
 				return self.new(url, endpoint, **options)
 			end
 			
-			# Construct an endpoint with a specified scheme, hostname, and options.
-			def self.for(scheme, hostname, **options)
+			# Construct an endpoint with a specified scheme, hostname, optional path, and options.
+			def self.for(scheme, hostname, path = "/", **options)
 				# TODO: Consider using URI.for once it becomes available:
 				uri_klass = URI.scheme_list[scheme.upcase] || URI::HTTP
 				
 				self.new(
-					uri_klass.new(scheme, nil, hostname, nil, nil, nil, nil, nil, nil).normalize,
+					uri_klass.new(scheme, nil, hostname, nil, nil, path, nil, nil, nil).normalize,
 					**options
 				)
 			end

data/lib/async/http/internet.rb

@@ -47,6 +47,14 @@ module Async
 				end
 			end
 			
+			# Make a request to the internet with the given `method` and `url`.
+			#
+			# If you provide non-frozen headers, they may be mutated.
+			#
+			# @parameter method [String] The request method, e.g. `GET`.
+			# @parameter url [String] The URL to request, e.g. `https://www.codeotaku.com`.
+			# @parameter headers [Hash | Protocol::HTTP::Headers] The headers to send with the request.
+			# @parameter body [String | Protocol::HTTP::Body] The body to send with the request.
 			def call(method, url, headers = nil, body = nil)
 				endpoint = Endpoint.parse(url)
 				client = self.client_for(endpoint)

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

@@ -32,11 +32,14 @@ module Async
 							self.new(connection, *parts)
 						end
 					end
+
+					UPGRADE = 'upgrade'
 					
 					def initialize(connection, authority, method, path, version, headers, body)
 						@connection = connection
 						
-						protocol = connection.upgrade?(headers)
+						# 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')
 						
 						super(nil, authority, method, path, version, headers, body, protocol)
 					end

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

@@ -33,11 +33,13 @@ module Async
 						end
 					end
 					
+					UPGRADE = 'upgrade'
+
 					# @param reason [String] HTTP response line reason, ignored.
 					def initialize(connection, version, status, reason, headers, body)
 						@connection = connection
 						
-						protocol = connection.upgrade?(headers)
+						protocol = headers.delete(UPGRADE)
 						
 						super(version, status, headers, body, protocol)
 					end

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

@@ -60,54 +60,59 @@ module Async
 						
 						while request = next_request
 							response = yield(request, self)
-							
-							return if @stream.nil? or @stream.closed?
-							
-							if response
-								trailer = response.headers.trailer!
-								
-								write_response(@version, response.status, response.headers)
-								
-								body = response.body
-								
-								if body and protocol = response.protocol
-									stream = write_upgrade_body(protocol)
-									
-									# At this point, the request body is hijacked, so we don't want to call #finish below.
-									request = nil
-									
-									# We also don't want to hold on to the response object:
-									response = nil
-									
-									body.call(stream)
-								elsif request.connect? and response.success?
-									stream = write_tunnel_body(request.version)
-									
-									# Same as above:
-									request = nil
-									response = nil
-									
-									body.call(stream)
+							body = response&.body
+
+							begin
+								# If a response was generated, send it:
+								if response
+									trailer = response.headers.trailer!
+
+									write_response(@version, response.status, response.headers)
+
+									# Some operations in this method are long running, that is, it's expected that `body.call(stream)` could literally run indefinitely. In order to facilitate garbage collection, we want to nullify as many local variables before calling the streaming body. This ensures that the garbage collection can clean up as much state as possible during the long running operation, so we don't retain objects that are no longer needed.
+
+									if body and protocol = response.protocol
+										stream = write_upgrade_body(protocol)
+										
+										# At this point, the request body is hijacked, so we don't want to call #finish below.
+										request = response = nil
+										
+										body.call(stream)
+									elsif request.connect? and response.success?
+										stream = write_tunnel_body(request.version)
+										
+										# Same as above:
+										request = response = nil
+										
+										body.call(stream)
+									else
+										head = request.head?
+										version = request.version
+										
+										# Same as above:
+										request = nil unless body
+										response = nil
+										
+										write_body(version, body, head, trailer)
+									end
+
+									# We are done with the body, you shouldn't need to call close on it:
+									body = nil
 								else
-									head = request.head?
-									version = request.version
-									
-									request = nil unless body
-									response = nil
-									
-									write_body(version, body, head, trailer)
+									# If the request failed to generate a response, it was an internal server error:
+									write_response(@version, 500, {})
+									write_body(request.version, nil)
 								end
-							else
-								# If the request failed to generate a response, it was an internal server error:
-								write_response(@version, 500, {})
-								write_body(request.version, nil)
+								
+								# 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
+							rescue => error
+							ensure
+								body&.close(error)
 							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

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

@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require_relative '../../body/stream'
+require 'protocol/http/body/stream'
 
 module Async
 	module HTTP
@@ -88,7 +88,7 @@ module Async
 						
 						input = @stream.wait_for_input
 						
-						@body.call(Body::Stream.new(input, self))
+						@body.call(::Protocol::HTTP::Body::Stream.new(input, self))
 					rescue Async::Stop
 						# Ignore.
 					end

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

@@ -27,7 +27,7 @@ module Async
 	module HTTP
 		module Protocol
 			module HTTP2
-				VERSION = "h2"
+				VERSION = "HTTP/2"
 				
 				def self.bidirectional?
 					true

data/lib/async/http/server.rb

@@ -96,7 +96,7 @@ module Async
 						attributes['http.protocol'] = protocol
 					end
 					
-					trace('async.http.server.call', attributes: attributes) do |span|
+					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

data/lib/async/http/version.rb

@@ -22,6 +22,6 @@
 
 module Async
 	module HTTP
-		VERSION = "0.56.6"
+		VERSION = "0.59.0"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: async-http
 version: !ruby/object:Gem::Version
-  version: 0.56.6
+  version: 0.59.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -25,33 +25,34 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIEhDCCAuygAwIBAgIBATANBgkqhkiG9w0BAQsFADA3MTUwMwYDVQQDDCxzYW11
-  ZWwud2lsbGlhbXMvREM9b3Jpb250cmFuc2Zlci9EQz1jby9EQz1uejAeFw0yMTA4
-  MTYwNjMzNDRaFw0yMjA4MTYwNjMzNDRaMDcxNTAzBgNVBAMMLHNhbXVlbC53aWxs
-  aWFtcy9EQz1vcmlvbnRyYW5zZmVyL0RDPWNvL0RDPW56MIIBojANBgkqhkiG9w0B
-  AQEFAAOCAY8AMIIBigKCAYEAyXLSS/cw+fXJ5e7hi+U/TeChPWeYdwJojDsFY1xr
-  xvtqbTTL8gbLHz5LW3QD2nfwCv3qTlw0qI3Ie7a9VMJMbSvgVEGEfQirqIgJXWMj
-  eNMDgKsMJtC7u/43abRKx7TCURW3iWyR19NRngsJJmaR51yGGGm2Kfsr+JtKKLtL
-  L188Wm3f13KAx7QJU8qyuBnj1/gWem076hzdA7xi1DbrZrch9GCRz62xymJlrJHn
-  9iZEZ7AxrS7vokhMlzSr/XMUihx/8aFKtk+tMLClqxZSmBWIErWdicCGTULXCBNb
-  E/mljo4zEVKhlTWpJklMIhr55ZRrSarKFuW7en0+tpJrfsYiAmXMJNi4XAYJH7uL
-  rgJuJwSaa/dMz+VmUoo7VKtSfCoOI+6v5/z0sK3oT6sG6ZwyI47DBq2XqNC6tnAj
-  w+XmCywiTQrFzMMAvcA7rPI4F0nU1rZId51rOvvfxaONp+wgTi4P8owZLw0/j0m4
-  8C20DYi6EYx4AHDXiLpElWh3AgMBAAGjgZowgZcwCQYDVR0TBAIwADALBgNVHQ8E
-  BAMCBLAwHQYDVR0OBBYEFB6ZaeWKxQjGTI+pmz7cKRmMIywwMC4GA1UdEQQnMCWB
-  I3NhbXVlbC53aWxsaWFtc0BvcmlvbnRyYW5zZmVyLmNvLm56MC4GA1UdEgQnMCWB
-  I3NhbXVlbC53aWxsaWFtc0BvcmlvbnRyYW5zZmVyLmNvLm56MA0GCSqGSIb3DQEB
-  CwUAA4IBgQBVoM+pu3dpdUhZM1w051iw5GfiqclAr1Psypf16Tiod/ho//4oAu6T
-  9fj3DPX/acWV9P/FScvqo4Qgv6g4VWO5ZU7z2JmPoTXZtYMunRAmQPFL/gSUc6aK
-  vszMHIyhtyzRc6DnfW2AiVOjMBjaYv8xXZc9bduniRVPrLR4J7ozmGLh4o4uJp7w
-  x9KCFaR8Lvn/r0oJWJOqb/DMAYI83YeN2Dlt3jpwrsmsONrtC5S3gOUle5afSGos
-  bYt5ocnEpKSomR9ZtnCGljds/aeO1Xgpn2r9HHcjwnH346iNrnHmMlC7BtHUFPDg
-  Ts92S47PTOXzwPBDsrFiq3VLbRjHSwf8rpqybQBH9MfzxGGxTaETQYOd6b4e4Ag6
-  y92abGna0bmIEb4+Tx9rQ10Uijh1POzvr/VTH4bbIPy9FbKrRsIQ24qDbNJRtOpE
-  RAOsIl+HOBTb252nx1kIRN5hqQx272AJCbCjKx8egcUQKffFVVCI0nye09v5CK+a
-  HiLJ8VOFx6w=
+  MIIE2DCCA0CgAwIBAgIBATANBgkqhkiG9w0BAQsFADBhMRgwFgYDVQQDDA9zYW11
+  ZWwud2lsbGlhbXMxHTAbBgoJkiaJk/IsZAEZFg1vcmlvbnRyYW5zZmVyMRIwEAYK
+  CZImiZPyLGQBGRYCY28xEjAQBgoJkiaJk/IsZAEZFgJuejAeFw0yMjA4MDYwNDUz
+  MjRaFw0zMjA4MDMwNDUzMjRaMGExGDAWBgNVBAMMD3NhbXVlbC53aWxsaWFtczEd
+  MBsGCgmSJomT8ixkARkWDW9yaW9udHJhbnNmZXIxEjAQBgoJkiaJk/IsZAEZFgJj
+  bzESMBAGCgmSJomT8ixkARkWAm56MIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIB
+  igKCAYEAomvSopQXQ24+9DBB6I6jxRI2auu3VVb4nOjmmHq7XWM4u3HL+pni63X2
+  9qZdoq9xt7H+RPbwL28LDpDNflYQXoOhoVhQ37Pjn9YDjl8/4/9xa9+NUpl9XDIW
+  sGkaOY0eqsQm1pEWkHJr3zn/fxoKPZPfaJOglovdxf7dgsHz67Xgd/ka+Wo1YqoE
+  e5AUKRwUuvaUaumAKgPH+4E4oiLXI4T1Ff5Q7xxv6yXvHuYtlMHhYfgNn8iiW8WN
+  XibYXPNP7NtieSQqwR/xM6IRSoyXKuS+ZNGDPUUGk8RoiV/xvVN4LrVm9upSc0ss
+  RZ6qwOQmXCo/lLcDUxJAgG95cPw//sI00tZan75VgsGzSWAOdjQpFM0l4dxvKwHn
+  tUeT3ZsAgt0JnGqNm2Bkz81kG4A2hSyFZTFA8vZGhp+hz+8Q573tAR89y9YJBdYM
+  zp0FM4zwMNEUwgfRzv1tEVVUEXmoFCyhzonUUw4nE4CFu/sE3ffhjKcXcY//qiSW
+  xm4erY3XAgMBAAGjgZowgZcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0O
+  BBYEFO9t7XWuFf2SKLmuijgqR4sGDlRsMC4GA1UdEQQnMCWBI3NhbXVlbC53aWxs
+  aWFtc0BvcmlvbnRyYW5zZmVyLmNvLm56MC4GA1UdEgQnMCWBI3NhbXVlbC53aWxs
+  aWFtc0BvcmlvbnRyYW5zZmVyLmNvLm56MA0GCSqGSIb3DQEBCwUAA4IBgQB5sxkE
+  cBsSYwK6fYpM+hA5B5yZY2+L0Z+27jF1pWGgbhPH8/FjjBLVn+VFok3CDpRqwXCl
+  xCO40JEkKdznNy2avOMra6PFiQyOE74kCtv7P+Fdc+FhgqI5lMon6tt9rNeXmnW/
+  c1NaMRdxy999hmRGzUSFjozcCwxpy/LwabxtdXwXgSay4mQ32EDjqR1TixS1+smp
+  8C/NCWgpIfzpHGJsjvmH2wAfKtTTqB9CVKLCWEnCHyCaRVuKkrKjqhYCdmMBqCws
+  JkxfQWC+jBVeG9ZtPhQgZpfhvh+6hMhraUYRQ6XGyvBqEUe+yo6DKIT3MtGE2+CP
+  eX9i9ZWBydWb8/rvmwmX2kkcBbX0hZS1rcR593hGc61JR6lvkGYQ2MYskBveyaxt
+  Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
+  voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2022-05-02 00:00:00.000000000 Z
+date: 2022-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -101,14 +102,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.23.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.23.1
 - !ruby/object:Gem::Dependency
   name: protocol-http1
   requirement: !ruby/object:Gem::Requirement
@@ -141,14 +142,14 @@ dependencies:
   name: traces
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.0
 - !ruby/object:Gem::Dependency
@@ -249,7 +250,6 @@ files:
 - lib/async/http/body/hijack.rb
 - lib/async/http/body/pipe.rb
 - lib/async/http/body/slowloris.rb
-- lib/async/http/body/stream.rb
 - lib/async/http/body/writable.rb
 - lib/async/http/client.rb
 - lib/async/http/endpoint.rb

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

@@ -1,172 +0,0 @@
-# frozen_string_literal: true
-#
-# Copyright, 2019, 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 'writable'
-
-module Async
-	module HTTP
-		module Body
-			# The input stream is an IO-like object which contains the raw HTTP POST data. When applicable, its external encoding must be “ASCII-8BIT” and it must be opened in binary mode, for Ruby 1.9 compatibility. The input stream must respond to gets, each, read and rewind.
-			class Stream
-				def initialize(input, output = Writable.new)
-					@input = input
-					@output = output
-					
-					raise ArgumentError, "Non-writable output!" unless output.respond_to?(:write)
-					
-					# Will hold remaining data in `#read`.
-					@buffer = nil
-					@closed = false
-				end
-				
-				attr :input
-				attr :output
-				
-				# rack.hijack_io must respond to:
-				# read, write, read_nonblock, write_nonblock, flush, close, close_read, close_write, closed?
-				
-				# read behaves like IO#read. Its signature is read([length, [buffer]]). If given, length must be a non-negative Integer (>= 0) or nil, and buffer must be a String and may not be nil. If length is given and not nil, then this method reads at most length bytes from the input stream. If length is not given or nil, then this method reads all data until EOF. When EOF is reached, this method returns nil if length is given and not nil, or “” if length is not given or is nil. If buffer is given, then the read data will be placed into buffer instead of a newly created String object.
-				# @param length [Integer] the amount of data to read
-				# @param buffer [String] the buffer which will receive the data
-				# @return a buffer containing the data
-				def read(size = nil, buffer = nil)
-					return '' if size == 0
-					
-					buffer ||= Async::IO::Buffer.new
-					if @buffer
-						buffer.replace(@buffer)
-						@buffer = nil
-					end
-					
-					if size
-						while buffer.bytesize < size and chunk = read_next
-							buffer << chunk
-						end
-						
-						@buffer = buffer.byteslice(size, buffer.bytesize)
-						buffer = buffer.byteslice(0, size)
-						
-						if buffer.empty?
-							return nil
-						else
-							return buffer
-						end
-					else
-						while chunk = read_next
-							buffer << chunk
-						end
-						
-						return buffer
-					end
-				end
-				
-				# Read at most `size` bytes from the stream. Will avoid reading from the underlying stream if possible.
-				def read_partial(size = nil)
-					if @buffer
-						buffer = @buffer
-						@buffer = nil
-					else
-						buffer = read_next
-					end
-					
-					if buffer and size
-						if buffer.bytesize > size
-							@buffer = buffer.byteslice(size, buffer.bytesize)
-							buffer = buffer.byteslice(0, size)
-						end
-					end
-					
-					return buffer
-				end
-				
-				def read_nonblock(length, buffer = nil)
-					@buffer ||= read_next
-					chunk = nil
-					
-					return nil if @buffer.nil?
-					
-					if @buffer.bytesize > length
-						chunk = @buffer.byteslice(0, length)
-						@buffer = @buffer.byteslice(length, @buffer.bytesize)
-					else
-						chunk = @buffer
-						@buffer = nil
-					end
-					
-					if buffer
-						buffer.replace(chunk)
-					else
-						buffer = chunk
-					end
-					
-					return buffer
-				end
-				
-				def write(buffer)
-					@output.write(buffer)
-				end
-				
-				alias write_nonblock write
-				
-				def flush
-				end
-				
-				def close_read
-					@input&.close
-				end
-				
-				def close_write
-					@output&.close
-				end
-				
-				# Close the input and output bodies.
-				def close(error = nil)
-					self.close_read
-					self.close_write
-				ensure
-					@closed = true
-				end
-				
-				# Whether the stream has been closed.
-				def closed?
-					@closed
-				end
-				
-				# Whether there are any output chunks remaining?
-				def empty?
-					@output.empty?
-				end
-				
-				private
-				
-				def read_next
-					if chunk = @input&.read
-						return chunk
-					else
-						@input = nil
-						return nil
-					end
-				end
-			end
-		end
-	end
-end