Better options support

Author: soenneker

src/HandlerKey.cs

@@ -1,3 +1,18 @@
 namespace Soenneker.Utils.HttpClientCache;
 
-internal readonly record struct HandlerKey(double LifetimeSeconds, int MaxConnections, bool UseCookies);
+internal readonly record struct HandlerKey(
+    double LifetimeSeconds,
+    int MaxConnections,
+    bool UseCookies,
+    double ConnectTimeoutSeconds,
+    double? ResponseDrainTimeoutSeconds,
+    bool? AllowAutoRedirect,
+    int? AutomaticDecompression,
+    double? KeepAlivePingDelaySeconds,
+    double? KeepAlivePingTimeoutSeconds,
+    int? KeepAlivePingPolicy,
+    bool? UseProxy,
+    int? ProxyHashCode,
+    int? MaxResponseDrainSize,
+    int? MaxResponseHeadersLength,
+    int? SslOptionsHashCode);

src/HttpClientCache.cs

@@ -106,20 +106,70 @@ await modifyClient(httpClient)
 
     private SocketsHttpHandler GetOrCreateHandler(HttpClientOptions? options)
     {
-        var key = new HandlerKey(options?.PooledConnectionLifetime?.TotalSeconds ?? 600, options?.MaxConnectionsPerServer ?? 40,
-            options?.UseCookieContainer == true);
+        double connectTimeoutSeconds = options?.Timeout?.TotalSeconds ?? 100;
+        
+        var key = new HandlerKey(
+            LifetimeSeconds: options?.PooledConnectionLifetime?.TotalSeconds ?? 600,
+            MaxConnections: options?.MaxConnectionsPerServer ?? 40,
+            UseCookies: options?.UseCookieContainer == true,
+            ConnectTimeoutSeconds: connectTimeoutSeconds,
+            ResponseDrainTimeoutSeconds: options?.ResponseDrainTimeout?.TotalSeconds,
+            AllowAutoRedirect: options?.AllowAutoRedirect,
+            AutomaticDecompression: (int?)options?.AutomaticDecompression,
+            KeepAlivePingDelaySeconds: options?.KeepAlivePingDelay?.TotalSeconds,
+            KeepAlivePingTimeoutSeconds: options?.KeepAlivePingTimeout?.TotalSeconds,
+            KeepAlivePingPolicy: (int?)options?.KeepAlivePingPolicy,
+            UseProxy: options?.UseProxy,
+            ProxyHashCode: options?.Proxy?.GetHashCode(),
+            MaxResponseDrainSize: options?.MaxResponseDrainSize,
+            MaxResponseHeadersLength: options?.MaxResponseHeadersLength,
+            SslOptionsHashCode: options?.SslOptions?.GetHashCode());
 
         return _handlers.GetOrAdd(key, _ =>
         {
             var handler = new SocketsHttpHandler
             {
                 PooledConnectionLifetime = TimeSpan.FromSeconds(key.LifetimeSeconds),
-                MaxConnectionsPerServer = key.MaxConnections
+                MaxConnectionsPerServer = key.MaxConnections,
+                ConnectTimeout = TimeSpan.FromSeconds(key.ConnectTimeoutSeconds)
             };
 
             if (key.UseCookies)
                 handler.CookieContainer = new CookieContainer();
 
+            if (key.ResponseDrainTimeoutSeconds.HasValue)
+                handler.ResponseDrainTimeout = TimeSpan.FromSeconds(key.ResponseDrainTimeoutSeconds.Value);
+
+            if (key.AllowAutoRedirect.HasValue)
+                handler.AllowAutoRedirect = key.AllowAutoRedirect.Value;
+
+            if (key.AutomaticDecompression.HasValue)
+                handler.AutomaticDecompression = (DecompressionMethods)key.AutomaticDecompression.Value;
+
+            if (key.KeepAlivePingDelaySeconds.HasValue)
+                handler.KeepAlivePingDelay = TimeSpan.FromSeconds(key.KeepAlivePingDelaySeconds.Value);
+
+            if (key.KeepAlivePingTimeoutSeconds.HasValue)
+                handler.KeepAlivePingTimeout = TimeSpan.FromSeconds(key.KeepAlivePingTimeoutSeconds.Value);
+
+            if (key.KeepAlivePingPolicy.HasValue)
+                handler.KeepAlivePingPolicy = (HttpKeepAlivePingPolicy)key.KeepAlivePingPolicy.Value;
+
+            if (key.UseProxy.HasValue)
+                handler.UseProxy = key.UseProxy.Value;
+
+            if (options?.Proxy != null)
+                handler.Proxy = options.Proxy;
+
+            if (key.MaxResponseDrainSize.HasValue)
+                handler.MaxResponseDrainSize = key.MaxResponseDrainSize.Value;
+
+            if (key.MaxResponseHeadersLength.HasValue)
+                handler.MaxResponseHeadersLength = key.MaxResponseHeadersLength.Value;
+
+            if (options?.SslOptions != null)
+                handler.SslOptions = options.SslOptions;
+
             return handler;
         });
     }

src/Soenneker.Utils.HttpClientCache.csproj

@@ -1,4 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?><Project Sdk="Microsoft.NET.Sdk">
+<?xml version="1.0" encoding="utf-8"?>
+
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
         <TargetFramework>net10.0</TargetFramework>
@@ -30,15 +32,19 @@
         <LangVersion>latest</LangVersion>
         <PackageReadmeFile>README.md</PackageReadmeFile>
         <PackageIcon>icon.png</PackageIcon>
-    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild></PropertyGroup>
-    
+        <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+    </PropertyGroup>
+
     <ItemGroup>
         <None Include="..\README.md" Pack="true" PackagePath="\" />
         <None Include="..\LICENSE" Pack="true" PackagePath="\" />
         <None Include="..\icon.png" Pack="true" PackagePath="\" />
+    </ItemGroup>
+
+    <ItemGroup>
         <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.1" />
-        <PackageReference Include="Soenneker.Dtos.HttpClientOptions" Version="4.0.9" />
+        <PackageReference Include="Soenneker.Dtos.HttpClientOptions" Version="4.0.10" />
         <PackageReference Include="Soenneker.Utils.Runtime" Version="4.0.897" />
         <PackageReference Include="Soenneker.Utils.SingletonDictionary" Version="4.0.1135" />
     </ItemGroup>
-</Project>
+</Project>