Stop using HttpClient

KSP-CKAN · Dec 17, 2023 · 354ff97 · 354ff97
1 parent cc883a7
commit 354ff97
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 61 deletions.
diff --git a/Core/Net/Net.cs b/Core/Net/Net.cs
@@ -3,7 +3,6 @@
 using System.IO;
 using System.Linq;
 using System.Net;
-using System.Net.Http;
 using System.Text.RegularExpressions;
 using System.Threading;
 
@@ -46,27 +45,17 @@ public static class Net
         /// https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/ETag
         /// </returns>
         public static string CurrentETag(Uri url)
-            => httpClient.SendAsync(new HttpRequestMessage(HttpMethod.Head, url),
-                                    HttpCompletionOption.ResponseHeadersRead)
-                         .Result
-                         .Headers.ETag.ToString()
-                         .Replace("\"", "");
-
-        /// <summary>
-        /// "HttpClient is intended to be instantiated once and reused
-        ///  throughout the life of an application. In .NET Core and .NET 5+,
-        ///  HttpClient pools connections inside the handler instance and
-        ///  reuses a connection across multiple requests. If you instantiate
-        ///  an HttpClient class for every request, the number of sockets
-        ///  available under heavy loads will be exhausted. This exhaustion
-        ///  will result in SocketException errors."
-        /// </summary>
-        public static readonly HttpClient httpClient = new HttpClient();
-        public static readonly HttpClient nonRedirectingHttpClient = new HttpClient(
-            new HttpClientHandler()
-            {
-                AllowAutoRedirect = false,
-            });
+        {
+            // HttpClient apparently is worse than what it was supposed to replace
+            #pragma warning disable SYSLIB0014
+            WebRequest req = WebRequest.Create(url);
+            #pragma warning restore SYSLIB0014
+            req.Method = "HEAD";
+            HttpWebResponse resp = (HttpWebResponse)req.GetResponse();
+            string val = resp.Headers["ETag"]?.Replace("\"", "");
+            resp.Close();
+            return val;
+        }
 
         /// <summary>
         /// Downloads the specified url, and stores it in the filename given.
@@ -257,10 +246,6 @@ public static Uri ResolveRedirect(Uri url)
             const int maxRedirects = 6;
             for (int redirects = 0; redirects <= maxRedirects; ++redirects)
             {
-                #if NETFRAMEWORK
-
-                // HttpClient doesn't handle redirects well on Mono, but net7.0 considers WebClient obsolete
-
                 var rwClient = new RedirectWebClient();
                 using (rwClient.OpenRead(url)) { }
                 var location = rwClient.ResponseHeaders["Location"];
@@ -281,37 +266,6 @@ public static Uri ResolveRedirect(Uri url)
                 {
                     throw new Kraken(string.Format(Properties.Resources.NetInvalidLocation, location));
                 }
-
-                #else
-
-                var req = new HttpRequestMessage(HttpMethod.Head, url);
-                req.Headers.UserAgent.Clear();
-                req.Headers.UserAgent.ParseAdd(UserAgentString);
-                using (var response = nonRedirectingHttpClient.SendAsync(
-                                          req, HttpCompletionOption.ResponseHeadersRead).Result)
-                {
-                    if (response.Headers.Location == null)
-                    {
-                        return url;
-                    }
-
-                    var location = response.Headers.Location.ToString();
-                    if (Uri.IsWellFormedUriString(location, UriKind.Absolute))
-                    {
-                        url = response.Headers.Location;
-                    }
-                    else if (Uri.IsWellFormedUriString(location, UriKind.Relative))
-                    {
-                        url = new Uri(url, response.Headers.Location);
-                        log.DebugFormat("Relative URL {0} is absolute URL {1}", location, url);
-                    }
-                    else
-                    {
-                        throw new Kraken(string.Format(Properties.Resources.NetInvalidLocation, location));
-                    }
-                }
-
-                #endif
             }
             return null;
         }

diff --git a/Core/Net/RedirectWebClient.cs b/Core/Net/RedirectWebClient.cs
@@ -1,8 +1,8 @@
-#if NETFRAMEWORK
-
 using System;
 using System.Net;
 
+#pragma warning disable SYSLIB0014
+
 namespace CKAN
 {
     // HttpClient doesn't handle redirects well on Mono, but net7.0 considers WebClient obsolete
@@ -23,5 +23,3 @@ protected override WebRequest GetWebRequest(Uri address)
         }
     }
 }
-
-#endif