From 4ea5dd5ad2ad6d4869d57c8aed1e187d81662135 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=98=E9=9F=AC=20=E5=BC=A0?= <hongtao_zhang@outlook.com>
Date: Tue, 13 Oct 2020 20:54:00 +0800
Subject: [PATCH] Move Old HttpWebRequest to HttpClient Instance (solve
 connection timeout)

---
 Flow.Launcher.Core/Updater.cs             |  2 +-
 Flow.Launcher.Infrastructure/Http/Http.cs | 77 ++++++++++++++---------
 2 files changed, 48 insertions(+), 31 deletions(-)

diff --git a/Flow.Launcher.Core/Updater.cs b/Flow.Launcher.Core/Updater.cs
index 99d48275a..4ad8b19be 100644
--- a/Flow.Launcher.Core/Updater.cs
+++ b/Flow.Launcher.Core/Updater.cs
@@ -139,7 +139,7 @@ namespace Flow.Launcher.Core
             var latest = releases.Where(r => !r.Prerelease).OrderByDescending(r => r.PublishedAt).First();
             var latestUrl = latest.HtmlUrl.Replace("/tag/", "/download/");
 
-            var client = new WebClient { Proxy = Http.WebProxy() };
+            var client = new WebClient { Proxy = Http.WebProxy };
             var downloader = new FileDownloader(client);
 
             var manager = new UpdateManager(latestUrl, urlDownloader: downloader);
diff --git a/Flow.Launcher.Infrastructure/Http/Http.cs b/Flow.Launcher.Infrastructure/Http/Http.cs
index b7d274205..038362a0d 100644
--- a/Flow.Launcher.Infrastructure/Http/Http.cs
+++ b/Flow.Launcher.Infrastructure/Http/Http.cs
@@ -13,6 +13,13 @@ namespace Flow.Launcher.Infrastructure.Http
     {
         private const string UserAgent = @"Mozilla/5.0 (Trident/7.0; rv:11.0) like Gecko";
 
+        private static HttpClient client;
+        private static SocketsHttpHandler socketsHttpHandler = new SocketsHttpHandler()
+        {
+            UseProxy = true,
+            Proxy = WebProxy
+        };
+
         static Http()
         {
             // need to be added so it would work on a win10 machine
@@ -20,36 +27,55 @@ namespace Flow.Launcher.Infrastructure.Http
             ServicePointManager.SecurityProtocol |= SecurityProtocolType.Tls
                                                     | SecurityProtocolType.Tls11
                                                     | SecurityProtocolType.Tls12;
+
+            client.DefaultRequestHeaders.Add("User-Agent", UserAgent);
+
+        }
+        private static HttpProxy proxy;
+        public static HttpProxy Proxy
+        {
+            private get
+            {
+                return proxy;
+            }
+            set
+            {
+                proxy = value;
+                UpdateProxy();
+            }
         }
 
-        public static HttpProxy Proxy { private get; set; }
-        public static IWebProxy WebProxy()
+        public static WebProxy WebProxy { get; private set; }
+
+        /// <summary>
+        /// Update the Address of the Proxy to modify the client Proxy
+        /// </summary>
+        public static void UpdateProxy()
+        // TODO: need test with a proxy
         {
             if (Proxy != null && Proxy.Enabled && !string.IsNullOrEmpty(Proxy.Server))
             {
                 if (string.IsNullOrEmpty(Proxy.UserName) || string.IsNullOrEmpty(Proxy.Password))
                 {
-                    var webProxy = new WebProxy(Proxy.Server, Proxy.Port);
-                    return webProxy;
+                    WebProxy.Address = new Uri($"http://{Proxy.Server}:{Proxy.Port}");
+                    WebProxy.Credentials = null;
                 }
                 else
                 {
-                    var webProxy = new WebProxy(Proxy.Server, Proxy.Port)
-                    {
-                        Credentials = new NetworkCredential(Proxy.UserName, Proxy.Password)
-                    };
-                    return webProxy;
+                    WebProxy.Address = new Uri($"http://{Proxy.Server}:{Proxy.Port}");
+                    WebProxy.Credentials = new NetworkCredential(Proxy.UserName, Proxy.Password);
                 }
             }
             else
             {
-                return WebRequest.GetSystemWebProxy();
+                WebProxy.Address = new WebProxy().Address;
+                WebProxy.Credentials = null;
             }
         }
 
         public static void Download([NotNull] string url, [NotNull] string filePath)
         {
-            var client = new WebClient { Proxy = WebProxy() };
+            var client = new WebClient { Proxy = WebProxy };
             client.Headers.Add("user-agent", UserAgent);
             client.DownloadFile(url, filePath);
         }
@@ -57,26 +83,17 @@ namespace Flow.Launcher.Infrastructure.Http
         public static async Task<string> Get([NotNull] string url, string encoding = "UTF-8")
         {
             Log.Debug($"|Http.Get|Url <{url}>");
-            var request = WebRequest.CreateHttp(url);
-            request.Method = "GET";
-            request.Timeout = 1000;
-            request.Proxy = WebProxy();
-            request.UserAgent = UserAgent;
-            var response = await request.GetResponseAsync() as HttpWebResponse;
-            response = response.NonNull();
-            var stream = response.GetResponseStream().NonNull();
-
-            using (var reader = new StreamReader(stream, Encoding.GetEncoding(encoding)))
+            var response = await client.GetAsync(url);
+            using var stream = await response.Content.ReadAsStreamAsync();
+            using var reader = new StreamReader(stream, Encoding.GetEncoding(encoding));
+            var content = await reader.ReadToEndAsync();
+            if (response.StatusCode == HttpStatusCode.OK)
             {
-                var content = await reader.ReadToEndAsync();
-                if (response.StatusCode == HttpStatusCode.OK)
-                {
-                    return content;
-                }
-                else
-                {
-                    throw new HttpRequestException($"Error code <{response.StatusCode}> with content <{content}> returned from <{url}>");
-                }
+                return content;
+            }
+            else
+            {
+                throw new HttpRequestException($"Error code <{response.StatusCode}> with content <{content}> returned from <{url}>");
             }
         }
     }