Обнновлено до .net10

YandexMusic.API/Common/Providers/DefaultRequestProvider.cs

@@ -1,69 +1,45 @@
 using System.Net;
 
-using YandexMusic.API.Models.Common;
+namespace YandexMusic.API.Common.Providers;
 
-namespace YandexMusic.API.Common.Providers
+/// <summary>Стандартный провайдер HTTP-запросов с использованием HttpClient.</summary>
+public class DefaultRequestProvider : CommonRequestProvider
 {
-    /// <summary>
-    /// Стандартный провайдер запросов
-    /// </summary>
-    public class DefaultRequestProvider : CommonRequestProvider
+    /// <summary>Инициализирует новый экземпляр провайдера.</summary>
+    /// <param name="authStorage">Хранилище авторизации.</param>
+    public DefaultRequestProvider(AuthStorage authStorage) : base(authStorage) { }
+
+    /// <summary>Выполняет HTTP-запрос и возвращает ответ.</summary>
+    /// <param name="message">HTTP-запрос.</param>
+    /// <param name="completionOption">Опция завершения запроса.</param>
+    /// <returns>HTTP-ответ.</returns>
+    public override async Task<HttpResponseMessage> GetWebResponseAsync(
+        HttpRequestMessage message,
+        HttpCompletionOption completionOption = HttpCompletionOption.ResponseContentRead)
     {
-        #region Вспомогательные функции
-
-        private Exception ProcessException(Exception ex)
+        using var handler = new SocketsHttpHandler
         {
-            if (ex is not WebException webException)
-                return ex;
+            Proxy = storage.Context.WebProxy,
+            AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate,
+            UseCookies = true,
+            CookieContainer = storage.Context.Cookies,
+            AllowAutoRedirect = true,
+            MaxAutomaticRedirections = 10
+        };
 
-            if (webException.Response is null)
-                return ex;
+        using var client = new HttpClient(handler);
 
-            Stream s = webException.Response.GetResponseStream();
-            if (s is null)
-                return ex;
-
-            using StreamReader sr = new(s);
-            string result = sr.ReadToEnd();
-
-            YErrorResponse exception = JsonConvert.DeserializeObject<YErrorResponse>(result);
-
-            return exception ?? ex;
-        }
-
-        #endregion Вспомогательные функции
-
-
-
-        public DefaultRequestProvider(AuthStorage authStorage) : base(authStorage)
+        try
         {
+            return await client.SendAsync(message, completionOption);
         }
-
-
-
-        #region IRequestProvider
-
-        public override Task<HttpResponseMessage> GetWebResponseAsync(HttpRequestMessage message,
-            HttpCompletionOption completionOption = HttpCompletionOption.ResponseContentRead)
+        catch (HttpRequestException ex)
         {
-            try
-            {
-                HttpClient client = new(new SocketsHttpHandler
-                {
-                    Proxy = storage.Context.WebProxy,
-                    AutomaticDecompression = DecompressionMethods.GZip,
-                    UseCookies = true,
-                    CookieContainer = storage.Context.Cookies,
-                });
+            // Пытаемся извлечь тело ошибки, если оно доступно
+            if (ex.InnerException == null)
+                throw;
 
-                return client.SendAsync(message, completionOption);
-            }
-            catch (Exception ex)
-            {
-                throw ProcessException(ex);
-            }
+            throw new Exception($"Ошибка HTTP-запроса: {ex.Message}", ex);
         }
-
-        #endregion IRequestProvider
     }
 }