[HttpClient] Allow Sharing HttpClient With Main Program

Author: Raspberry-Monster

HyPlayer.NeteaseApi/NeteaseCloudMusicApiHandler.cs

@@ -6,9 +6,17 @@ namespace HyPlayer.NeteaseApi;
 
 public class NeteaseCloudMusicApiHandler
 {
+    public NeteaseCloudMusicApiHandler()
+    {
+        HttpClient = new HttpClient();
+    }
+    public NeteaseCloudMusicApiHandler(HttpClient httpClient)
+    {
+        HttpClient = httpClient;
+    }
     public ApiHandlerOption Option { get; set; } = new();
-
-    private readonly HttpClientHandler _httpClientHandler =
+    public HttpClient HttpClient { get; set; }
+    public static readonly HttpClientHandler HttpClientHandler =
         new()
         {
             UseCookies = false,
@@ -17,17 +25,16 @@ public class NeteaseCloudMusicApiHandler
 
     public void UseProxyConfiguration(bool useProxy, IWebProxy proxy)
     {
-        _httpClientHandler.UseProxy = useProxy;
-        _httpClientHandler.Proxy = proxy;
+        HttpClientHandler.UseProxy = useProxy;
+        HttpClientHandler.Proxy = proxy;
     }
 
     public async Task<Results<TResponse, ErrorResultBase>> RequestAsync<TRequest, TResponse, TError, TActualRequest>(
         ApiContractBase<TRequest, TResponse, TError, TActualRequest> contract, CancellationToken cancellationToken = default)
         where TError : ErrorResultBase where TActualRequest : ActualRequestBase where TRequest : RequestBase where TResponse : ResponseBase, new()
     {
-        var client = new HttpClient(_httpClientHandler);
         using var requestMessage = await contract.GenerateRequestMessageAsync(Option, cancellationToken);
-        using var response = await client.SendAsync(requestMessage,
+        using var response = await HttpClient.SendAsync(requestMessage,
                                               cancellationToken).ConfigureAwait(false);
         return await contract.ProcessResponseAsync(response, Option, cancellationToken).ConfigureAwait(false);
     }
@@ -36,33 +43,30 @@ public async Task<Results<TResponse, ErrorResultBase>> RequestAsync<TRequest, TR
         ApiContractBase<TRequest, TResponse, TError, TActualRequest> contract, TRequest? request, CancellationToken cancellationToken = default)
         where TError : ErrorResultBase where TActualRequest : ActualRequestBase where TRequest : RequestBase where TResponse : ResponseBase, new()
     {
-        var client = new HttpClient(_httpClientHandler);
         contract.Request = request;
         await contract.MapRequest().ConfigureAwait(false);
         using var requestMessage = await contract.GenerateRequestMessageAsync(Option, cancellationToken).ConfigureAwait(false);
-        using var response = await client.SendAsync(requestMessage, cancellationToken).ConfigureAwait(false);
+        using var response = await HttpClient.SendAsync(requestMessage, cancellationToken).ConfigureAwait(false);
         return await contract.ProcessResponseAsync(response, Option, cancellationToken).ConfigureAwait(false);
     }
 
     public async Task<Results<TCustomResponse, ErrorResultBase>> RequestAsync<TCustomResponse, TRequest, TResponse, TError, TActualRequest>(
         ApiContractBase<TRequest, TResponse, TError, TActualRequest> contract, TRequest? request, CancellationToken cancellationToken = default)
         where TError : ErrorResultBase where TActualRequest : ActualRequestBase where TRequest : RequestBase where TCustomResponse : ResponseBase, new() where TResponse : ResponseBase, new()
     {
-        var client = new HttpClient(_httpClientHandler);
         contract.Request = request;
         await contract.MapRequest().ConfigureAwait(false);
         using var requestMessage = await contract.GenerateRequestMessageAsync(Option, cancellationToken).ConfigureAwait(false);
-        using var response = await client.SendAsync(requestMessage, cancellationToken).ConfigureAwait(false);
+        using var response = await HttpClient.SendAsync(requestMessage, cancellationToken).ConfigureAwait(false);
         return await contract.ProcessResponseAsync<TCustomResponse>(response, Option, cancellationToken).ConfigureAwait(false);
     }
 
     public async Task<Results<TCustomResponse, ErrorResultBase>> RequestAsync<TCustomRequest, TCustomResponse, TRequest, TResponse, TError, TActualRequest>(
         ApiContractBase<TRequest, TResponse, TError, TActualRequest> contract, TCustomRequest? request, CancellationToken cancellationToken = default)
         where TError : ErrorResultBase where TActualRequest : ActualRequestBase where TRequest : RequestBase where TResponse : ResponseBase, new() where TCustomResponse : ResponseBase, new()
     {
-        var client = new HttpClient(_httpClientHandler);
         using var requestMessage = await contract.GenerateRequestMessageAsync<TCustomRequest>(request!, Option, cancellationToken).ConfigureAwait(false);
-        using var response = await client.SendAsync(requestMessage, cancellationToken).ConfigureAwait(false);
+        using var response = await HttpClient.SendAsync(requestMessage, cancellationToken).ConfigureAwait(false);
         return await contract.ProcessResponseAsync<TCustomResponse>(response, Option, cancellationToken).ConfigureAwait(false);
     }
 
@@ -71,9 +75,8 @@ public async Task<Results<TResponse, ErrorResultBase>> RequestAsync<TCustomReque
         ApiHandlerOption option, CancellationToken cancellationToken = default)
         where TError : ErrorResultBase where TActualRequest : ActualRequestBase where TRequest : RequestBase where TResponse : ResponseBase, new()
     {
-        var client = new HttpClient(_httpClientHandler);
         using var requestMessage = await contract.GenerateRequestMessageAsync<TCustomRequest>(request!, option, cancellationToken);
-        using var response = await client.SendAsync(requestMessage, cancellationToken).ConfigureAwait(false);
+        using var response = await HttpClient.SendAsync(requestMessage, cancellationToken).ConfigureAwait(false);
         return await contract.ProcessResponseAsync(response, option, cancellationToken).ConfigureAwait(false);
     }
 }