Revert "Merge pull request #45 from bluepilledgreat/reuse-httpclient"

This reverts commit c6410eb407, reversing
changes made to 5b94b2741a.

Bloxstrap/Bootstrapper.cs

@@ -1,7 +1,6 @@
 using System.Diagnostics;
 using System.IO;
 using System.IO.Compression;
-using System.Net;
 using System.Net.Http;
 
 using Microsoft.Win32;
@@ -67,7 +66,7 @@ namespace Bloxstrap
             "By default, two mod presets are provided for restoring the old death\n" +
             "sound and the old mouse cursor.\n";
 
-        public static readonly HttpClient Client = new(new HttpClientHandler { AutomaticDecompression = DecompressionMethods.All });
+        private static readonly HttpClient Client = new();
 
         private string? LaunchCommandLine;
 

Bloxstrap/Helpers/DeployManager.cs

@@ -104,16 +104,19 @@ namespace Bloxstrap.Helpers
             string baseUrl = BuildBaseUrl(channel);
             string lastDeploy = "";
 
-            string deployHistory = await Bootstrapper.Client.GetStringAsync($"{baseUrl}/DeployHistory.txt");
+            using (HttpClient client = new())
-
-            using (StringReader reader = new(deployHistory))
             {
-                string? line;
+                string deployHistory = await client.GetStringAsync($"{baseUrl}/DeployHistory.txt");
 
-                while ((line = await reader.ReadLineAsync()) is not null)
+                using (StringReader reader = new(deployHistory))
                 {
-                    if (line.Contains("WindowsPlayer"))
+                    string? line;
-                        lastDeploy = line;
+
+                    while ((line = await reader.ReadLineAsync()) is not null)
+                    {
+                        if (line.Contains("WindowsPlayer"))
+                            lastDeploy = line;
+                    }
                 }
             }
 

Bloxstrap/Helpers/Integrations/RbxFpsUnlocker.cs

@@ -97,12 +97,15 @@ namespace Bloxstrap.Helpers.Integrations
 
             Debug.WriteLine("Installing/Updating rbxfpsunlocker...");
 
-            byte[] bytes = await Bootstrapper.Client.GetByteArrayAsync(downloadUrl);
+            using (HttpClient client = new())
-
-            using (MemoryStream zipStream = new(bytes))
             {
-                ZipArchive zip = new(zipStream);
+                byte[] bytes = await client.GetByteArrayAsync(downloadUrl);
-                zip.ExtractToDirectory(folderLocation, true);
+
+                using (MemoryStream zipStream = new(bytes))
+                {
+                    ZipArchive zip = new(zipStream);
+                    zip.ExtractToDirectory(folderLocation, true);
+                }
             }
 
             if (!File.Exists(settingsLocation))

Bloxstrap/Helpers/RSMM/PackageManifest.cs

@@ -75,8 +75,11 @@ namespace Bloxstrap.Helpers.RSMM
             string pkgManifestUrl = $"{DeployManager.BaseUrl}/{versionGuid}-rbxPkgManifest.txt";
             string pkgManifestData;
 
-            var getData = Bootstrapper.Client.GetStringAsync(pkgManifestUrl);
+            using (HttpClient http = new())
-            pkgManifestData = await getData.ConfigureAwait(false);
+            {
+                var getData = http.GetStringAsync(pkgManifestUrl);
+                pkgManifestData = await getData.ConfigureAwait(false);
+            }
 
             return new PackageManifest(pkgManifestData);
         }

Bloxstrap/Helpers/Utilities.cs

@@ -15,15 +15,13 @@ namespace Bloxstrap.Helpers
 
         public static async Task<T?> GetJson<T>(string url)
         {
-            var request = await Bootstrapper.Client.SendAsync(new()
+            using (HttpClient client = new())
             {
-                RequestUri = new Uri(url),
+                client.DefaultRequestHeaders.Add("User-Agent", Program.ProjectRepository);
-                Headers = {
+
-                    { "User-Agent", Program.ProjectRepository }
+                string json = await client.GetStringAsync(url);
-                }
+                return JsonSerializer.Deserialize<T>(json);
-            });
+            }
-            var json = await request.Content.ReadAsStringAsync();
-            return JsonSerializer.Deserialize<T>(json);
         }
 
         public static string MD5File(string filename)