Use io-stream for buffered streams.

Author: ioquatix

async-http.gemspec

@@ -25,8 +25,9 @@ Gem::Specification.new do |spec|
 	spec.required_ruby_version = ">= 3.1"
 
 	spec.add_dependency "async", ">= 1.25"
-	spec.add_dependency "async-io", ">= 1.28"
+	spec.add_dependency "async-io", ">= 1.43.1"
 	spec.add_dependency "async-pool", ">= 0.6.1"
+	spec.add_dependency "io-stream", "~> 0.1.1"
 	spec.add_dependency "protocol-http", "~> 0.26.0"
 	spec.add_dependency "protocol-http1", "~> 0.19.0"
 	spec.add_dependency "protocol-http2", "~> 0.17.0"

fixtures/async/http/a_protocol.rb

@@ -202,6 +202,9 @@ module HTTP
 				end
 
 				it "disconnects slow clients" do
+					# We won't be able to disconnect slow clients if IO#timeout is not available:
+					skip_unless_method_defined(:timeout, IO)
+					
 					response = client.get("/")
 					response.read
 
@@ -478,9 +481,11 @@ def after
 				end
 
 				it "can't get /" do
+					skip_unless_method_defined(:timeout, IO)
+					
 					expect do
 						client.get("/")
-					end.to raise_exception(Async::TimeoutError)
+					end.to raise_exception(::IO::TimeoutError)
 				end
 			end
 

gems.rb

@@ -9,6 +9,7 @@
 
 # gem "async", path: "../async"
 # gem "async-io", path: "../async-io"
+# gem "io-stream", path: "../io-stream"
 # gem "traces", path: "../traces"
 
 # gem "protocol-http", path: "../protocol-http"

lib/async/http/body/pipe.rb

@@ -1,12 +1,9 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2019-2023, by Samuel Williams.
+# Copyright, 2019-2024, by Samuel Williams.
 # Copyright, 2020, by Bruno Sutic.
 
-require 'async/io/socket'
-require 'async/io/stream'
-
 require_relative 'writable'
 
 module Async
@@ -18,9 +15,9 @@ def initialize(input, output = Writable.new, task: Task.current)
 					@input = input
 					@output = output
 
-					head, tail = IO::Socket.pair(Socket::AF_UNIX, Socket::SOCK_STREAM)
+					head, tail = ::Socket.pair(Socket::AF_UNIX, Socket::SOCK_STREAM)
 
-					@head = IO::Stream.new(head)
+					@head = ::IO::Stream::Buffered.new(head)
 					@tail = tail
 
 					@reader = nil

lib/async/http/protocol/http1.rb

@@ -1,11 +1,13 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2017-2023, by Samuel Williams.
+# Copyright, 2017-2024, by Samuel Williams.
 
 require_relative 'http1/client'
 require_relative 'http1/server'
 
+require 'io/stream/buffered'
+
 module Async
 	module HTTP
 		module Protocol
@@ -21,13 +23,13 @@ def self.trailer?
 				end
 
 				def self.client(peer)
-					stream = IO::Stream.new(peer, sync: true)
+					stream = ::IO::Stream::Buffered.wrap(peer)
 
 					return HTTP1::Client.new(stream, VERSION)
 				end
 
 				def self.server(peer)
-					stream = IO::Stream.new(peer, sync: true)
+					stream = ::IO::Stream::Buffered.wrap(peer)
 
 					return HTTP1::Server.new(stream, VERSION)
 				end

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

@@ -62,7 +62,7 @@ def concurrency
 
 					# Can we use this connection to make requests?
 					def viable?
-						@ready && @stream&.connected?
+						@ready && @stream&.readable?
 					end
 
 					def reusable?

lib/async/http/protocol/http10.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2017-2023, by Samuel Williams.
+# Copyright, 2017-2024, by Samuel Williams.
 
 require_relative 'http1'
 
@@ -20,13 +20,13 @@ def self.trailer?
 				end
 
 				def self.client(peer)
-					stream = IO::Stream.new(peer, sync: true)
+					stream = ::IO::Stream::Buffered.wrap(peer)
 
 					return HTTP1::Client.new(stream, VERSION)
 				end
 
 				def self.server(peer)
-					stream = IO::Stream.new(peer, sync: true)
+					stream = ::IO::Stream::Buffered.wrap(peer)
 
 					return HTTP1::Server.new(stream, VERSION)
 				end

lib/async/http/protocol/http11.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2017-2023, by Samuel Williams.
+# Copyright, 2017-2024, by Samuel Williams.
 # Copyright, 2018, by Janko Marohnić.
 
 require_relative 'http1'
@@ -21,13 +21,13 @@ def self.trailer?
 				end
 
 				def self.client(peer)
-					stream = IO::Stream.new(peer, sync: true)
+					stream = ::IO::Stream::Buffered.wrap(peer)
 
 					return HTTP1::Client.new(stream, VERSION)
 				end
 
 				def self.server(peer)
-					stream = IO::Stream.new(peer, sync: true)
+					stream = ::IO::Stream::Buffered.wrap(peer)
 
 					return HTTP1::Server.new(stream, VERSION)
 				end

lib/async/http/protocol/http2.rb

@@ -1,11 +1,13 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2018-2023, by Samuel Williams.
+# Copyright, 2018-2024, by Samuel Williams.
 
 require_relative 'http2/client'
 require_relative 'http2/server'
 
+require 'io/stream/buffered'
+
 module Async
 	module HTTP
 		module Protocol
@@ -35,8 +37,7 @@ def self.trailer?
 				}
 
 				def self.client(peer, settings = CLIENT_SETTINGS)
-					stream = IO::Stream.new(peer, sync: true)
-					
+					stream = ::IO::Stream::Buffered.wrap(peer)
 					client = Client.new(stream)
 
 					client.send_connection_preface(settings)
@@ -46,8 +47,7 @@ def self.client(peer, settings = CLIENT_SETTINGS)
 				end
 
 				def self.server(peer, settings = SERVER_SETTINGS)
-					stream = IO::Stream.new(peer, sync: true)
-					
+					stream = ::IO::Stream::Buffered.wrap(peer)
 					server = Server.new(stream)
 
 					server.read_connection_preface(settings)

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

@@ -122,7 +122,7 @@ def concurrency
 
 					# Can we use this connection to make requests?
 					def viable?
-						@stream.connected?
+						@stream&.readable?
 					end
 
 					def reusable?

test/async/http/body/pipe.rb

@@ -42,7 +42,7 @@ def aftrer
 		end
 
 		it "returns an io socket" do
-			expect(io).to be_a(Async::IO::Socket)
+			expect(io).to be_a(::Socket)
 			expect(io.read).to be == data
 		end
 

test/async/http/proxy.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2019-2023, by Samuel Williams.
+# Copyright, 2019-2024, by Samuel Williams.
 # Copyright, 2020, by Sam Shadwell.
 
 require 'async'
@@ -86,12 +86,10 @@
 			expect(proxy.client.pool).to be(:empty?)
 
 			proxy.connect do |peer|
-				stream = Async::IO::Stream.new(peer)
+				peer.write(data)
+				peer.close_write
 
-				stream.write(data)
-				stream.close_write
-				
-				expect(stream.read).to be == data
+				expect(peer.read).to be == data
 			end
 
 			proxy.close
@@ -102,14 +100,14 @@
 			proxy = Async::HTTP::Proxy.tcp(client, "localhost", 1)
 			expect(proxy.client.pool).to be(:empty?)
 
-			stream = Async::IO::Stream.new(proxy.connect)
+			peer = proxy.connect
 
-			stream.write(data)
-			stream.close_write
+			peer.write(data)
+			peer.close_write
 
-			expect(stream.read).to be == data
+			expect(peer.read).to be == data
 
-			stream.close
+			peer.close
 			proxy.close
 
 			expect(proxy.client.pool).to be(:empty?)
@@ -131,7 +129,7 @@
 				Console.logger.debug(self) {"Making connection to #{endpoint}..."}
 
 				Async::HTTP::Body::Hijack.response(request, 200, {}) do |stream|
-					upstream = Async::IO::Stream.new(endpoint.connect)
+					upstream = ::IO::Stream::Buffered.wrap(endpoint.connect)
 					Console.logger.debug(self) {"Connected to #{upstream}..."}
 
 					reader = Async do |task|