Fix interceptor memory leaks (#66)

code/Infrastructure/Verticals/Arr/ArrClient.cs

@@ -15,27 +15,22 @@ using Newtonsoft.Json;
 
 namespace Infrastructure.Verticals.Arr;
 
-public abstract class ArrClient : InterceptedService, IArrClient, IDryRunService
+public abstract class ArrClient : IArrClient
 {
     protected readonly ILogger<ArrClient> _logger;
     protected readonly HttpClient _httpClient;
     protected readonly LoggingConfig _loggingConfig;
     protected readonly QueueCleanerConfig _queueCleanerConfig;
     protected readonly IStriker _striker;
-    
-    /// <summary>
-    /// Constructor to be used by interceptors.
-    /// </summary>
-    protected ArrClient()
-    {
-    }
+    protected readonly IDryRunInterceptor _dryRunInterceptor;
     
     protected ArrClient(
         ILogger<ArrClient> logger,
         IHttpClientFactory httpClientFactory,
         IOptions<LoggingConfig> loggingConfig,
         IOptions<QueueCleanerConfig> queueCleanerConfig,
-        IStriker striker
+        IStriker striker,
+        IDryRunInterceptor dryRunInterceptor
     )
     {
         _logger = logger;
@@ -43,6 +38,7 @@ public abstract class ArrClient : InterceptedService, IArrClient, IDryRunService
         _loggingConfig = loggingConfig.Value;
         _queueCleanerConfig = queueCleanerConfig.Value;
         _striker = striker;
+        _dryRunInterceptor = dryRunInterceptor;
     }
 
     public virtual async Task<QueueListResponse> GetQueueItemsAsync(ArrInstance arrInstance, int page)
@@ -125,7 +121,8 @@ public abstract class ArrClient : InterceptedService, IArrClient, IDryRunService
             using HttpRequestMessage request = new(HttpMethod.Delete, uri);
             SetApiKey(request, arrInstance.ApiKey);
 
-            using var _ = await ((ArrClient)Proxy).SendRequestAsync(request);
+            HttpResponseMessage? response = await _dryRunInterceptor.InterceptAsync<HttpResponseMessage>(SendRequestAsync, request);
+            response?.Dispose();
             
             _logger.LogInformation(
                 removeFromClient

code/Infrastructure/Verticals/Arr/LidarrClient.cs

@@ -5,6 +5,7 @@ using Common.Configuration.QueueCleaner;
 using Domain.Models.Arr;
 using Domain.Models.Arr.Queue;
 using Domain.Models.Lidarr;
+using Infrastructure.Interceptors;
 using Infrastructure.Verticals.Arr.Interfaces;
 using Infrastructure.Verticals.ItemStriker;
 using Microsoft.Extensions.Logging;
@@ -15,18 +16,14 @@ namespace Infrastructure.Verticals.Arr;
 
 public class LidarrClient : ArrClient, ILidarrClient
 {
-    /// <inheritdoc/>
-    public LidarrClient()
-    {
-    }
-    
     public LidarrClient(
         ILogger<LidarrClient> logger,
         IHttpClientFactory httpClientFactory,
         IOptions<LoggingConfig> loggingConfig,
         IOptions<QueueCleanerConfig> queueCleanerConfig,
-        IStriker striker
-    ) : base(logger, httpClientFactory, loggingConfig, queueCleanerConfig, striker)
+        IStriker striker,
+        IDryRunInterceptor dryRunInterceptor
+    ) : base(logger, httpClientFactory, loggingConfig, queueCleanerConfig, striker, dryRunInterceptor)
     {
     }
 
@@ -64,7 +61,8 @@ public class LidarrClient : ArrClient, ILidarrClient
 
             try
             {
-                using var _ = await ((LidarrClient)Proxy).SendRequestAsync(request);
+                HttpResponseMessage? response = await _dryRunInterceptor.InterceptAsync<HttpResponseMessage>(SendRequestAsync, request);
+                response?.Dispose();
                 
                 _logger.LogInformation("{log}", GetSearchLog(arrInstance.Url, command, true, logContext));
             }

code/Infrastructure/Verticals/Arr/RadarrClient.cs

@@ -5,6 +5,7 @@ using Common.Configuration.QueueCleaner;
 using Domain.Models.Arr;
 using Domain.Models.Arr.Queue;
 using Domain.Models.Radarr;
+using Infrastructure.Interceptors;
 using Infrastructure.Verticals.Arr.Interfaces;
 using Infrastructure.Verticals.ItemStriker;
 using Microsoft.Extensions.Logging;
@@ -15,18 +16,14 @@ namespace Infrastructure.Verticals.Arr;
 
 public class RadarrClient : ArrClient, IRadarrClient
 {
-    /// <inheritdoc/>
-    public RadarrClient()
-    {
-    }
-    
     public RadarrClient(
         ILogger<ArrClient> logger,
         IHttpClientFactory httpClientFactory,
         IOptions<LoggingConfig> loggingConfig,
         IOptions<QueueCleanerConfig> queueCleanerConfig,
-        IStriker striker
-    ) : base(logger, httpClientFactory, loggingConfig, queueCleanerConfig, striker)
+        IStriker striker,
+        IDryRunInterceptor dryRunInterceptor
+    ) : base(logger, httpClientFactory, loggingConfig, queueCleanerConfig, striker, dryRunInterceptor)
     {
     }
 
@@ -72,7 +69,8 @@ public class RadarrClient : ArrClient, IRadarrClient
 
         try
         {
-            using var _ = await ((RadarrClient)Proxy).SendRequestAsync(request);
+            HttpResponseMessage? response = await _dryRunInterceptor.InterceptAsync<HttpResponseMessage>(SendRequestAsync, request);
+            response?.Dispose();
             
             _logger.LogInformation("{log}", GetSearchLog(arrInstance.Url, command, true, logContext));
         }

code/Infrastructure/Verticals/Arr/SonarrClient.cs

@@ -5,6 +5,7 @@ using Common.Configuration.QueueCleaner;
 using Domain.Models.Arr;
 using Domain.Models.Arr.Queue;
 using Domain.Models.Sonarr;
+using Infrastructure.Interceptors;
 using Infrastructure.Verticals.Arr.Interfaces;
 using Infrastructure.Verticals.ItemStriker;
 using Microsoft.Extensions.Logging;
@@ -16,18 +17,14 @@ namespace Infrastructure.Verticals.Arr;
 
 public class SonarrClient : ArrClient, ISonarrClient
 {
-    /// <inheritdoc/>
-    public SonarrClient()
-    {
-    }
-    
     public SonarrClient(
         ILogger<SonarrClient> logger,
         IHttpClientFactory httpClientFactory,
         IOptions<LoggingConfig> loggingConfig,
         IOptions<QueueCleanerConfig> queueCleanerConfig,
-        IStriker striker
-    ) : base(logger, httpClientFactory, loggingConfig, queueCleanerConfig, striker)
+        IStriker striker,
+        IDryRunInterceptor dryRunInterceptor
+    ) : base(logger, httpClientFactory, loggingConfig, queueCleanerConfig, striker, dryRunInterceptor)
     {
     }
     
@@ -68,8 +65,9 @@ public class SonarrClient : ArrClient, ISonarrClient
 
             try
             {
-                using var _ = await ((SonarrClient)Proxy).SendRequestAsync(request);
-
+                HttpResponseMessage? response = await _dryRunInterceptor.InterceptAsync<HttpResponseMessage>(SendRequestAsync, request);
+                response?.Dispose();
+                
                 _logger.LogInformation("{log}", GetSearchLog(command.SearchType, arrInstance.Url, command, true, logContext));
             }
             catch