misc improvements

Author: soenneker

src/Abstract/IHttpClientCache.cs

@@ -59,8 +59,9 @@ public interface IHttpClientCache : IAsyncDisposable, IDisposable
     /// Should be used if the component using <see cref="IHttpClientCache"/> is disposed (unless the entire app is being disposed). Includes disposal of the <see cref="HttpClient"/>.
     /// </summary>
     /// <param name="id">The cache key</param>
-    ValueTask Remove(string id);
+    /// <param name="cancellationToken"></param>
+    ValueTask Remove(string id, CancellationToken cancellationToken = default);
 
-    /// <inheritdoc cref="Remove(string)"/>
-    void RemoveSync(string id);
+    /// <inheritdoc cref="Remove(string,CancellationToken)"/>
+    void RemoveSync(string id, CancellationToken cancellationToken = default);
 }

src/HandlerKey.cs

@@ -1,4 +1,4 @@
 namespace Soenneker.Utils.HttpClientCache
 {
     internal readonly record struct HandlerKey(double LifetimeSeconds, int MaxConnections, bool UseCookies);
-}
+}

src/HttpClientCache.cs

@@ -16,7 +16,7 @@
 namespace Soenneker.Utils.HttpClientCache;
 
 ///<inheritdoc cref="IHttpClientCache"/>
-public class HttpClientCache : IHttpClientCache
+public sealed class HttpClientCache : IHttpClientCache
 {
     private readonly SingletonDictionary<HttpClient> _httpClients;
 
@@ -145,39 +145,38 @@ private static void AddDefaultRequestHeaders(HttpClient httpClient, Dictionary<s
         }
     }
 
-    public ValueTask Remove(string id)
+    public ValueTask Remove(string id, CancellationToken cancellationToken = default)
     {
-        return _httpClients.Remove(id);
+        return _httpClients.Remove(id, cancellationToken);
     }
 
-    public void RemoveSync(string id)
+    public void RemoveSync(string id, CancellationToken cancellationToken = default)
     {
-        _httpClients.RemoveSync(id);
+        _httpClients.RemoveSync(id, cancellationToken);
     }
 
-    public ValueTask DisposeAsync()
+    private void DisposeHandlers()
     {
-        GC.SuppressFinalize(this);
-
         foreach (KeyValuePair<HandlerKey, SocketsHttpHandler> kvp in _handlers.ToArray())
         {
             if (_handlers.TryRemove(kvp.Key, out SocketsHttpHandler? handler))
                 handler.Dispose();
         }
+    }
+
+    public ValueTask DisposeAsync()
+    {
+        GC.SuppressFinalize(this);
 
+        DisposeHandlers();
         return _httpClients.DisposeAsync();
     }
 
     public void Dispose()
     {
         GC.SuppressFinalize(this);
 
-        foreach (KeyValuePair<HandlerKey, SocketsHttpHandler> kvp in _handlers.ToArray())
-        {
-            if (_handlers.TryRemove(kvp.Key, out SocketsHttpHandler? handler))
-                handler.Dispose();
-        }
-
+        DisposeHandlers();
         _httpClients.Dispose();
     }
 }