Replace Async::IO::Endpoint with IO::Endpoint.

ioquatix · ioquatix · commit 0c4e6c5943fa · 2024-04-24T00:48:00.000+12:00
diff --git a/async-http.gemspec b/async-http.gemspec
@@ -24,10 +24,10 @@ Gem::Specification.new do |spec|
 	
 	spec.required_ruby_version = ">= 3.1"
 	
-	spec.add_dependency "async", ">= 1.25"
-	spec.add_dependency "async-io", ">= 1.43.1"
+	spec.add_dependency "async", ">= 2.10.2"
 	spec.add_dependency "async-pool", ">= 0.6.1"
-	spec.add_dependency "io-stream", "~> 0.1.1"
+	spec.add_dependency "io-endpoint", "~> 0.10.0"
+	spec.add_dependency "io-stream", "~> 0.3.0"
 	spec.add_dependency "protocol-http", "~> 0.26.0"
 	spec.add_dependency "protocol-http1", "~> 0.19.0"
 	spec.add_dependency "protocol-http2", "~> 0.17.0"
diff --git a/bake/async/http/h2spec.rb b/bake/async/http/h2spec.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.
 
 def build
 	# Fetch the code:
@@ -24,9 +24,9 @@ def server
 	require 'async'
 	require 'async/container'
 	require 'async/http/server'
-	require 'async/io/host_endpoint'
+	require 'io/endpoint/host_endpoint'
 	
-	endpoint = Async::IO::Endpoint.tcp('127.0.0.1', 7272)
+	endpoint = IO::Endpoint.tcp('127.0.0.1', 7272)
 	
 	container = Async::Container.new
 	
diff --git a/config/external.yaml b/config/external.yaml
@@ -9,7 +9,7 @@ async-websocket:
   command: bundle exec sus
 async-http-faraday:
   url: https://github.com/socketry/async-http-faraday.git
-  command: bundle exec rspec
+  command: bundle exec bake test
 # async-http-cache:
 #   url: https://github.com/socketry/async-http-cache.git
 #   command: bundle exec rspec
diff --git a/examples/google/codeotaku.rb b/examples/google/codeotaku.rb
@@ -2,7 +2,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2020-2023, by Samuel Williams.
+# Copyright, 2020-2024, by Samuel Williams.
 
 require "async"
 require "async/clock"
@@ -12,8 +12,6 @@
 URL = "https://www.codeotaku.com/index"
 ENDPOINT = Async::HTTP::Endpoint.parse(URL)
 
-Console.logger.enable(Async::IO::Stream, Console::Logger::DEBUG)
-
 if count = ENV['COUNT']&.to_i
 	terms = terms.first(count)
 end
diff --git a/examples/google/search.rb b/examples/google/search.rb
@@ -2,7 +2,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2019-2023, by Samuel Williams.
+# Copyright, 2019-2024, by Samuel Williams.
 
 require "async"
 require "async/clock"
@@ -12,8 +12,6 @@
 URL = "https://www.google.com/search"
 ENDPOINT = Async::HTTP::Endpoint.parse(URL)
 
-# Console.logger.enable(Async::IO::Stream, Console::Logger::DEBUG)
-
 class Google < Protocol::HTTP::Middleware
 	def search(term)
 		Console.logger.info(self) {"Searching for #{term}..."}
diff --git a/fixtures/async/http/a_protocol.rb b/fixtures/async/http/a_protocol.rb
@@ -202,9 +202,6 @@ 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
 					
@@ -481,8 +478,6 @@ def after
 				end
 				
 				it "can't get /" do
-					skip_unless_method_defined(:timeout, IO)
-					
 					expect do
 						client.get("/")
 					end.to raise_exception(::IO::TimeoutError)
@@ -536,47 +531,45 @@ def after
 					end
 				end
 				
-				def around
-					current = Console.logger.level
-					Console.logger.fatal!
-					
-					super
-				ensure
-					Console.logger.level = current
-				end
-				
 				it "doesn't cancel all requests" do
-					tasks = []
 					task = Async::Task.current
+					tasks = []
 					stopped = []
 					
 					10.times do
-						tasks << task.async {
-							begin
-								loop do
-									client.get('http://127.0.0.1:8080/a').finish
-								end
+						task.async do |child|
+							tasks << child
+							
+							loop do
+								response = client.get('/a')
+								response.finish
 							ensure
-								stopped << 'a'
+								response&.close
 							end
-						}
+						ensure
+							stopped << 'a'
+						end
 					end
 					
 					10.times do
-						tasks << task.async {
-							begin
-								loop do
-									client.get('http://127.0.0.1:8080/b').finish
-								end
+						task.async do |child|
+							tasks << child
+							
+							loop do
+								response = client.get('/b')
+								response.finish
 							ensure
-								stopped << 'b'
+								response&.close
 							end
-						}
+						ensure
+							stopped << 'b'
+						end
 					end
 					
 					tasks.each do |child|
 						sleep 0.01
 						child.stop
+						child.wait
 					end
 					
 					expect(stopped.sort).to be == stopped
diff --git a/gems.rb b/gems.rb
@@ -1,16 +1,19 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2017-2023, by Samuel Williams.
+# Copyright, 2017-2024, by Samuel Williams.
 
 source 'https://rubygems.org'
 
 gemspec
 
 # gem "async", path: "../async"
 # gem "async-io", path: "../async-io"
+# gem "io-endpoint", path: "../io-endpoint"
 # gem "io-stream", path: "../io-stream"
+# gem "openssl", git: "https://github.com/ruby/openssl.git"
 # gem "traces", path: "../traces"
+# gem "sus-fixtures-async-http", path: "../sus-fixtures-async-http"
 
 # gem "protocol-http", path: "../protocol-http"
 # gem "protocol-http1", path: "../protocol-http1"
@@ -29,7 +32,7 @@
 	gem "covered"
 	gem "sus"
 	gem "sus-fixtures-async"
-	gem "sus-fixtures-async-http", "~> 0.7"
+	gem "sus-fixtures-async-http", "~> 0.8"
 	gem "sus-fixtures-openssl"
 	
 	gem "bake"
diff --git a/lib/async/http/client.rb b/lib/async/http/client.rb
@@ -4,8 +4,7 @@
 # Copyright, 2017-2024, by Samuel Williams.
 # Copyright, 2022, by Ian Ker-Seymer.
 
-require 'async/io/endpoint'
-require 'async/io/stream'
+require 'io/endpoint'
 
 require 'async/pool/controller'
 
@@ -107,7 +106,6 @@ def call(request)
 					
 					# This signals that the ensure block below should not try to release the connection, because it's bound into the response which will be returned:
 					connection = nil
-					
 					return response
 				rescue Protocol::RequestFailed
 					# This is a specific case where the entire request wasn't sent before a failure occurred. So, we can even resend non-idempotent requests.
@@ -133,7 +131,9 @@ def call(request)
 						raise
 					end
 				ensure
-					@pool.release(connection) if connection
+					if connection
+						@pool.release(connection)
+					end
 				end
 			end
 			
diff --git a/lib/async/http/endpoint.rb b/lib/async/http/endpoint.rb
@@ -4,18 +4,17 @@
 # Copyright, 2019-2024, by Samuel Williams.
 # Copyright, 2021-2022, by Adam Daniels.
 
-require 'async/io/host_endpoint'
-require 'async/io/ssl_endpoint'
-require 'async/io/ssl_socket'
-require 'async/io/shared_endpoint'
+require 'io/endpoint'
+require 'io/endpoint/host_endpoint'
+require 'io/endpoint/ssl_endpoint'
 
 require_relative 'protocol/http1'
 require_relative 'protocol/https'
 
 module Async
 	module HTTP
 		# Represents a way to connect to a remote HTTP server.
-		class Endpoint < Async::IO::Endpoint
+		class Endpoint < ::IO::Endpoint::Generic
 			def self.parse(string, endpoint = nil, **options)
 				url = URI.parse(string).normalize
 				
@@ -164,7 +163,7 @@ def build_endpoint(endpoint = nil)
 				
 				if secure?
 					# Wrap it in SSL:
-					return Async::IO::SSLEndpoint.new(endpoint,
+					return ::IO::Endpoint::SSLEndpoint.new(endpoint,
 						ssl_context: self.ssl_context,
 						hostname: @url.hostname,
 						timeout: self.timeout,
@@ -226,7 +225,7 @@ def tcp_options
 			end
 			
 			def tcp_endpoint
-				Async::IO::Endpoint.tcp(self.hostname, port, **tcp_options)
+				::IO::Endpoint.tcp(self.hostname, port, **tcp_options)
 			end
 		end
 	end
diff --git a/lib/async/http/protocol/http1/request.rb b/lib/async/http/protocol/http1/request.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2018-2023, by Samuel Williams.
+# Copyright, 2018-2024, by Samuel Williams.
 
 require_relative '../request'
 
@@ -15,7 +15,7 @@ def self.read(connection)
 							self.new(connection, *parts)
 						end
 					end
-
+					
 					UPGRADE = 'upgrade'
 					
 					def initialize(connection, authority, method, path, version, headers, body)
diff --git a/lib/async/http/protocol/http2/connection.rb b/lib/async/http/protocol/http2/connection.rb
@@ -90,19 +90,18 @@ def read_in_background(parent: Task.current)
 									self.consume_window
 									self.read_frame
 								end
-							rescue SocketError, IOError, EOFError, Errno::ECONNRESET, Errno::EPIPE, Async::Wrapper::Cancelled
-								# Ignore.
-							rescue ::Protocol::HTTP2::GoawayError => error
+							rescue Async::Stop, ::IO::TimeoutError, ::Protocol::HTTP2::GoawayError => error
 								# Error is raised if a response is actively reading from the
 								# connection. The connection is silently closed if GOAWAY is
 								# received outside the request/response cycle.
-								if @reader
-									self.close(error)
-								end
+							rescue SocketError, IOError, EOFError, Errno::ECONNRESET, Errno::EPIPE => ignored_error
+								# Ignore.
+							rescue => error
+								# Every other error.
 							ensure
 								# Don't call #close twice.
 								if @reader
-									self.close($!)
+									self.close(error)
 								end
 							end
 						end
diff --git a/lib/async/http/proxy.rb b/lib/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.
 
 require_relative 'client'
 require_relative 'endpoint'
@@ -46,7 +46,7 @@ def proxied_endpoint(endpoint, headers = nil)
 			# @param host [String] the hostname or address to connect to.
 			# @param port [String] the port number to connect to.
 			# @param headers [Array] an optional list of headers to use when establishing the connection.
-			# @see Async::IO::Endpoint#tcp
+			# @see IO::Endpoint#tcp
 			def self.tcp(client, host, port, headers = nil)
 				self.new(client, "#{host}:#{port}", headers)
 			end
diff --git a/lib/async/http/server.rb b/lib/async/http/server.rb
@@ -4,8 +4,7 @@
 # Copyright, 2017-2024, by Samuel Williams.
 # Copyright, 2019, by Brian Morearty.
 
-require 'async/io/endpoint'
-require 'async/io/stream'
+require 'io/endpoint'
 
 require 'protocol/http/middleware'
 
diff --git a/test/async/http/body.rb b/test/async/http/body.rb
@@ -1,14 +1,15 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2018-2023, by Samuel Williams.
+# Copyright, 2018-2024, by Samuel Williams.
 
 require 'async/http/body'
 
 require 'sus/fixtures/async'
 require 'sus/fixtures/openssl'
 require 'sus/fixtures/async/http'
 require 'localhost/authority'
+require 'io/endpoint/ssl_endpoint'
 
 ABody = Sus::Shared("a body") do
 	with 'echo server' do
@@ -97,11 +98,11 @@
 	let(:client_context) {authority.client_context}
 	
 	def make_server_endpoint(bound_endpoint)
-		Async::IO::SSLEndpoint.new(super, ssl_context: server_context)
+		::IO::Endpoint::SSLEndpoint.new(super, ssl_context: server_context)
 	end
 	
 	def make_client_endpoint(bound_endpoint)
-		Async::IO::SSLEndpoint.new(super, ssl_context: client_context)
+		::IO::Endpoint::SSLEndpoint.new(super, ssl_context: client_context)
 	end
 	
 	it_behaves_like ABody
diff --git a/test/async/http/endpoint.rb b/test/async/http/endpoint.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2018-2023, by Samuel Williams.
+# Copyright, 2018-2024, by Samuel Williams.
 # Copyright, 2021-2022, by Adam Daniels.
 
 require 'async/http/endpoint'
@@ -36,7 +36,7 @@
 			end
 			
 			it "should be connecting to 127.0.0.1" do
-				expect(subject.endpoint).to be_a Async::IO::SSLEndpoint
+				expect(subject.endpoint).to be_a ::IO::Endpoint::SSLEndpoint
 				expect(subject.endpoint).to have_attributes(hostname: be == '127.0.0.1')
 				expect(subject.endpoint.endpoint).to have_attributes(hostname: be == '127.0.0.1')
 			end
@@ -49,7 +49,7 @@
 			end
 			
 			it "should be connecting to localhost" do
-				expect(subject.endpoint).to be_a Async::IO::SSLEndpoint
+				expect(subject.endpoint).to be_a ::IO::Endpoint::SSLEndpoint
 				expect(subject.endpoint).to have_attributes(hostname: be == '127.0.0.1')
 				expect(subject.endpoint.endpoint).to have_attributes(hostname: be == 'localhost')
 			end
diff --git a/test/async/http/proxy.rb b/test/async/http/proxy.rb
diff --git a/test/async/http/ssl.rb b/test/async/http/ssl.rb
