Fix SpeedTestClient

Author: manuelmayer-dev

src/SpeedTestSharp/Client/SpeedTestClient.cs

@@ -4,6 +4,7 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Net.Http;
+using System.Net.Http.Headers;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
@@ -55,8 +56,9 @@ public async Task<SpeedTestResult> TestSpeedAsync(SpeedUnit speedUnit,
                     var latency = await TestServerLatencyAsync(server);
                     serverLatency.TryAdd(server, latency);
                 }
-                catch
+                catch (Exception ex)
                 {
+                    Console.WriteLine(ex.Message);
                     // ignore this server
                 }
             }
@@ -66,7 +68,7 @@ public async Task<SpeedTestResult> TestSpeedAsync(SpeedUnit speedUnit,
 
         private async Task<Server[]> FetchServersAsync()
         {
-            using var httpClient = new HttpClient();
+            using var httpClient = GetHttpClient();
             var serversXml = await httpClient.GetStringAsync(Constants.ServersUrl);
             return serversXml.DeserializeFromXml<ServersList>().Servers ?? Array.Empty<Server>();
         }
@@ -82,7 +84,7 @@ private async Task<int> TestServerLatencyAsync(Server server, int tests = 4)
 
             var latencyUrl = GetBaseUrl(server.Url).Append("latency.txt");
             var stopwatch = new Stopwatch();
-            using var httpClient = new HttpClient();
+            using var httpClient = GetHttpClient();
 
             var test = 1;
             do
@@ -98,7 +100,7 @@ private async Task<int> TestServerLatencyAsync(Server server, int tests = 4)
                 test++;
             } while (test < tests);
 
-            return (int)stopwatch.ElapsedMilliseconds / tests / 2;
+            return (int)stopwatch.ElapsedMilliseconds / tests;
         }
 
         private async Task<double> TestUploadSpeedAsync(Server server, int parallelUploads)
@@ -145,13 +147,13 @@ private async Task<double> TestSpeedAsync<T>(IEnumerable<T> testData,
             var timer = new Stopwatch();
             var throttler = new SemaphoreSlim(parallelTasks);
 
-            using var httpClient = new HttpClient();
             timer.Start();
             long totalBytesProcessed = 0;
 
             var downloadTasks = testData.Select(async data =>
             {
                 await throttler.WaitAsync().ConfigureAwait(false);
+                using var httpClient = GetHttpClient();
                 try
                 {
                     var size = await doWork(httpClient, data).ConfigureAwait(false);
@@ -247,5 +249,15 @@ private static string GetBaseUrl(string url)
         {
             return new Uri(new Uri(url), ".").OriginalString;
         }
+
+        private static HttpClient GetHttpClient()
+        {
+            var httpClient = new HttpClient();
+            httpClient.DefaultRequestHeaders.UserAgent.ParseAdd(
+                "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/112.0.0.0 Safari/537.36");
+            httpClient.DefaultRequestHeaders.Accept.ParseAdd("text/html, application/xhtml+xml, */*");
+            httpClient.DefaultRequestHeaders.CacheControl = new CacheControlHeaderValue {NoCache = true};
+            return httpClient;
+        }
     }
 }

src/SpeedTestSharp/Constants.cs

@@ -5,8 +5,8 @@ public class Constants
         public const string ConfigUrl = "https://www.speedtest.net/speedtest-config.php";
         public const string ServersUrl = "http://www.speedtest.net/speedtest-servers.php";
         public const string Chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-        public const int MaxUploadSize = 10;
-        public static readonly int[] DownloadSizes = { 350, 500, 750, 1000, 1500, 2000, 2500, 3000, 3500, 4000 };
+        public const int MaxUploadSize = 4;
+        public static readonly int[] DownloadSizes = { 350, 500, 750, 1000, 1500, 2000 };
     }
 }