Use IO::Stream::Readable for Protocol::Rack::Input.

Author: ioquatix

lib/protocol/rack/input.rb

@@ -4,7 +4,7 @@
 # Copyright, 2022-2025, by Samuel Williams.
 # Copyright, 2023, by Genki Takiuchi.
 
-require "protocol/http/body/stream"
+require "io/stream/readable"
 
 module Protocol
 	module Rack
@@ -14,22 +14,21 @@ module Rack
 		#
 		# This implementation is not always rewindable, to avoid buffering the input when handling large uploads. See {Rewindable} for more details.
 		class Input
+			include IO::Stream::Readable
+			
 			# Initialize the input wrapper.
 			# @parameter body [Protocol::HTTP::Body::Readable]
-			def initialize(body)
+			def initialize(body, ...)
 				@body = body
 				@closed = false
 
-				# Will hold remaining data in `#read`.
-				@buffer = nil
+				super(...)
 			end
 
 			# The input body.
 			# @attribute [Protocol::HTTP::Body::Readable]
 			attr :body
 
-			include Protocol::HTTP::Body::Stream::Reader
-			
 			# Enumerate chunks of the request body.
 			# @yields {|chunk| ...}
 			# 	@parameter chunk [String]
@@ -65,7 +64,6 @@ def rewind
 					# If the body is not rewindable, this will fail.
 					@body.rewind
 
-					@buffer = nil
 					@finished = false
 					@closed = false
 
@@ -87,7 +85,11 @@ def empty?
 
 			private
 
-			def read_next
+			def flush
+				# No-op.
+			end
+			
+			def sysread(size, buffer = nil)
 				if @body
 					# User's may forget to call #close...
 					if chunk = @body.read
@@ -98,7 +100,15 @@ def read_next
 							@closed = true
 						end
 
-						return chunk
+						if buffer
+							# If a buffer is provided, we copy the chunk into it:
+							buffer.replace(chunk)
+						else
+							# Otherwise we return the chunk directly:
+							buffer = chunk
+						end
+						
+						return buffer
 					else
 						unless @closed
 							# So if we are at the end of the stream, we close it automatically:

protocol-rack.gemspec

@@ -25,5 +25,6 @@ Gem::Specification.new do |spec|
 	spec.required_ruby_version = ">= 3.2"
 
 	spec.add_dependency "protocol-http", "~> 0.43"
+	spec.add_dependency "io-stream", ">= 0.10"
 	spec.add_dependency "rack", ">= 1.0"
 end

releases.md

@@ -1,5 +1,9 @@
 # Releases
 
+## Unreleased
+
+  - Use `IO::Stream::Readable` for the input body, which is a better tested and more robust interface.
+
 ## v0.14.0
 
   - Handling of `HEAD` requests is now more robust.