Merge pull request #233 from tpill90/TimeoutRefactor

tpill90 · Dec 9, 2022 · 70e226f · 70e226f
2 parents 33b05ee + 0c140fa
commit 70e226f
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 5 deletions.
diff --git a/LancachePrefill.Common/Colors.cs b/LancachePrefill.Common/Colors.cs
@@ -14,6 +14,8 @@ public static class SpectreFormatters
         public static string LightRed(object inputObj) => $"[{SpectreColors.LightRed.ToMarkup()}]{inputObj}[/]";
         public static string LightYellow(object inputObj) => $"[rgb(249,241,165)]{inputObj}[/]";
 
+        public static string ForestGreen(object inputObj) => $"[rgb(121,158,105)]{inputObj}[/]";
+
         public static string Green(object inputObj) => $"[green]{inputObj}[/]";
         public static string Grey(object inputObj) => $"[grey]{inputObj}[/]";
 

diff --git a/LancachePrefill.Common/LancacheIpResolver.cs b/LancachePrefill.Common/LancacheIpResolver.cs
@@ -40,7 +40,7 @@ await _ansiConsole.StatusSpinner().StartAsync("Detecting Lancache server...", as
 
         private static async Task<DetectedServer> DetectLancacheServerAsync(string cdnUrl)
         {
-            using var httpClient = new HttpClient { Timeout = TimeSpan.FromSeconds(3) };
+            using var httpClient = new HttpClient { Timeout = TimeSpan.FromSeconds(15) };
 
             // Tries to resolve poisoned DNS record, then localhost, then Docker's host
             var possibleLancacheUrls = new List<string> { cdnUrl, "localhost", "172.17.0.1" };

diff --git a/LancachePrefill.Common/UpdateChecker.cs b/LancachePrefill.Common/UpdateChecker.cs
@@ -20,7 +20,7 @@ public static async Task CheckForUpdatesAsync(Type executingAppType, string repo
                 }
 
                 using var httpClient = new HttpClient();
-                httpClient.Timeout = TimeSpan.FromSeconds(5);
+                httpClient.Timeout = TimeSpan.FromSeconds(15);
                 httpClient.DefaultRequestHeaders.Accept.Clear();
                 httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/vnd.github.v3+json"));
                 httpClient.DefaultRequestHeaders.Add("User-Agent", repoName);

diff --git a/SteamPrefill/Handlers/DownloadHandler.cs b/SteamPrefill/Handlers/DownloadHandler.cs
@@ -18,7 +18,7 @@ public DownloadHandler(IAnsiConsole ansiConsole, CdnPool cdnPool)
 
             _client = new HttpClient
             {
-                Timeout = TimeSpan.FromSeconds(15)
+                Timeout = AppConfig.SteamKitRequestTimeout
             };
             _client.DefaultRequestHeaders.Add("User-Agent", "Valve/Steam HTTP Client 1.0");
         }

diff --git a/SteamPrefill/Handlers/Steam/CdnPool.cs b/SteamPrefill/Handlers/Steam/CdnPool.cs
@@ -91,7 +91,7 @@ await Task.Run(async () =>
                                                                                                          && (e.Type == "SteamCache" || e.Type == "CDN"))
                                                 .DistinctBy(e => e.Host)
                                                 .ToConcurrentStack();
-                }).WaitAsync(TimeSpan.FromSeconds(6));
+                }).WaitAsync(TimeSpan.FromSeconds(15));
             }
             catch (TimeoutException)
             {

diff --git a/SteamPrefill/Handlers/Steam/SteamChartsService.cs b/SteamPrefill/Handlers/Steam/SteamChartsService.cs
@@ -11,7 +11,7 @@ public static async Task<List<MostPlayedGame>> MostPlayedByDailyPlayersAsync(IAn
             {
                 using var httpClient = new HttpClient
                 {
-                    Timeout = TimeSpan.FromSeconds(5)
+                    Timeout = TimeSpan.FromSeconds(15)
                 };
 
                 using var request = new HttpRequestMessage(HttpMethod.Get, new Uri("https://api.steampowered.com/ISteamChartsService/GetMostPlayedGames/v1/"));