From 864df57a5c05ae8611c9a8d7840258ed81c06f51 Mon Sep 17 00:00:00 2001 From: rjindael Date: Mon, 31 Jul 2023 03:55:18 -0700 Subject: [PATCH] fix: make every Http request blocking (lol) --- Kiseki.Launcher.Windows/Launcher.cs | 6 +++--- Kiseki.Launcher/Helpers/Http.cs | 5 ++--- Kiseki.Launcher/Web.cs | 4 ++-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Kiseki.Launcher.Windows/Launcher.cs b/Kiseki.Launcher.Windows/Launcher.cs index 47e35b8..c1a53d1 100644 --- a/Kiseki.Launcher.Windows/Launcher.cs +++ b/Kiseki.Launcher.Windows/Launcher.cs @@ -8,11 +8,11 @@ namespace Kiseki.Launcher.Windows { public readonly static string Version = Assembly.GetExecutingAssembly().GetName().Version!.ToString()[..^2]; - public async static void Install() + public static void Install() { Directory.CreateDirectory(Directories.Base); - int response = await Web.CheckHealth(); - + int response = Web.CheckHealth(); + if (response != Web.RESPONSE_SUCCESS) { if (response != Web.RESPONSE_MAINTENANCE) diff --git a/Kiseki.Launcher/Helpers/Http.cs b/Kiseki.Launcher/Helpers/Http.cs index 77bdfe3..ea818e5 100644 --- a/Kiseki.Launcher/Helpers/Http.cs +++ b/Kiseki.Launcher/Helpers/Http.cs @@ -4,12 +4,11 @@ namespace Kiseki.Launcher.Helpers { public static class Http { - public static async Task GetJson(string url) + public static T GetJson(string url) { - string json = await Web.HttpClient.GetStringAsync(url); - try { + string json = Web.HttpClient.GetStringAsync(url).Result; return JsonSerializer.Deserialize(json); } catch diff --git a/Kiseki.Launcher/Web.cs b/Kiseki.Launcher/Web.cs index 2fe6378..738509f 100644 --- a/Kiseki.Launcher/Web.cs +++ b/Kiseki.Launcher/Web.cs @@ -16,9 +16,9 @@ namespace Kiseki.Launcher public static void Initialize() => CurrentUrl = BaseUrl; public static string Url(string path) => $"https://{CurrentUrl}{path}"; - public static async Task CheckHealth() + public static int CheckHealth() { - var response = await Helpers.Http.GetJson(Url("/api/health")); + var response = Helpers.Http.GetJson(Url("/api/health")); return response is null ? RESPONSE_FAILURE : response.Status; }