Extract clients -> ClientCache for better isolation.

Author: ioquatix

lib/async/http/faraday/adapter.rb

@@ -16,6 +16,8 @@
 require 'async/http/client'
 require 'async/http/proxy'
 
+require_relative 'client_cache'
+
 module Async
 	module HTTP
 		module Faraday
@@ -65,70 +67,17 @@ class Adapter < ::Faraday::Adapter
 				# 
 				# @parameter timeout [Integer] The timeout for requests.
 				# @parameter options [Hash] Additional options to pass to the underlying Async::HTTP::Client.
-				def initialize(*arguments, timeout: nil, **options, &block)
-					super(*arguments, **options)
-					
-					@timeout = timeout
-					
-					@clients = {}
-					
-					@options = options
-				end
-				
-				# Make a new client for the given endpoint.
-				#
-				# @parameter endpoint [IO::Endpoint::Generic] The endpoint to create the client for.
-				def make_client(endpoint)
-					Client.new(endpoint, **@connection_options)
-				end
-				
-				# Get the host key for the given endpoint.
-				#
-				# This is used to cache clients for the same host.
-				#
-				# @parameter endpoint [IO::Endpoint::Generic] The endpoint to get the host key for.
-				def host_key(endpoint)
-					url = endpoint.url.dup
-					
-					url.path = ""
-					url.fragment = nil
-					url.query = nil
-					
-					return url
-				end
-				
-				# Get a client for the given endpoint. If a client already exists for the host, it will be reused.
-				#
-				# @parameter endpoint [IO::Endpoint::Generic] The endpoint to get the client for.
-				def client_for(endpoint)
-					key = host_key(endpoint)
-					
-					@clients.fetch(key) do
-						@clients[key] = make_client(endpoint)
-					end
-				end
-				
-				# Get a client for the given proxy endpoint and endpoint. If a client already exists for the host, it will be reused.
-				#
-				# @parameter proxy_endpoint [IO::Endpoint::Generic] The proxy endpoint to use.
-				# @parameter endpoint [IO::Endpoint::Generic] The endpoint to get the client for.
-				def proxy_client_for(proxy_endpoint, endpoint)
-					key = [host_key(proxy_endpoint), host_key(endpoint)]
+				def initialize(...)
+					super
 
-					@clients.fetch(key) do
-						client = client_for(proxy_endpoint)
-						@clients[key] = client.proxied_client(endpoint)
-					end
+					@timeout = @connection_options.delete(:timeout)
+					@clients = ClientCache.new(**@connection_options)
 				end
 
 				# Close all clients.
 				def close
 					# The order of operations here is to avoid a race condition between iterating over clients (#close may yield) and creating new clients.
-					clients = @clients.values
-					
-					@clients.clear
-					
-					clients.each(&:close)
+					@clients.close
 				end
 
 				# Make a request using the adapter.
@@ -148,9 +97,9 @@ def call(env)
 
 						if proxy = env.request.proxy
 							proxy_endpoint = Endpoint.new(proxy.uri)
-							client = self.proxy_client_for(proxy_endpoint, endpoint)
+							client = @clients.proxy_client_for(proxy_endpoint, endpoint)
 						else
-							client = self.client_for(endpoint)
+							client = @clients.client_for(endpoint)
 						end
 
 						if body = env.body

lib/async/http/faraday/client_cache.rb

@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2018-2024, by Samuel Williams.
+# Copyright, 2018, by Andreas Garnaes.
+# Copyright, 2019, by Denis Talakevich.
+# Copyright, 2019-2020, by Igor Sidorov.
+# Copyright, 2023, by Genki Takiuchi.
+# Copyright, 2023, by Flavio Fernandes.
+# Copyright, 2024, by Jacob Frautschi.
+
+require 'faraday'
+require 'faraday/adapter'
+require 'kernel/sync'
+
+require 'async/http/client'
+require 'async/http/proxy'
+
+module Async
+	module HTTP
+		module Faraday
+			class ClientCache
+				def initialize(**options)
+					@options = options
+					@clients = {}
+				end
+				
+				def close
+					clients = @clients.values
+					@clients.clear
+					
+					clients.each(&:close)
+				end
+				
+				# Make a new client for the given endpoint.
+				#
+				# @parameter endpoint [IO::Endpoint::Generic] The endpoint to create the client for.
+				def make_client(endpoint)
+					Client.new(endpoint, **@options)
+				end
+				
+				# Get the host key for the given endpoint.
+				#
+				# This is used to cache clients for the same host.
+				#
+				# @parameter endpoint [IO::Endpoint::Generic] The endpoint to get the host key for.
+				def host_key(endpoint)
+					url = endpoint.url.dup
+					
+					url.path = ""
+					url.fragment = nil
+					url.query = nil
+					
+					return url
+				end
+				
+				# Get a client for the given endpoint. If a client already exists for the host, it will be reused.
+				#
+				# @parameter endpoint [IO::Endpoint::Generic] The endpoint to get the client for.
+				def client_for(endpoint)
+					key = host_key(endpoint)
+					
+					@clients.fetch(key) do
+						@clients[key] = make_client(endpoint)
+					end
+				end
+				
+				# Get a client for the given proxy endpoint and endpoint. If a client already exists for the host, it will be reused.
+				#
+				# @parameter proxy_endpoint [IO::Endpoint::Generic] The proxy endpoint to use.
+				# @parameter endpoint [IO::Endpoint::Generic] The endpoint to get the client for.
+				def proxy_client_for(proxy_endpoint, endpoint)
+					key = [host_key(proxy_endpoint), host_key(endpoint)]
+					
+					@clients.fetch(key) do
+						client = client_for(proxy_endpoint)
+						@clients[key] = client.proxied_client(endpoint)
+					end
+				end
+			end
+		end
+	end
+end