This should fix the relavite path for signalr

devedse · Aug 1, 2023 · ab77e7a · ab77e7a
1 parent e40ab33
commit ab77e7a
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 7 deletions.
diff --git a/DeveLanCacheUI_Frontend/Pages/ChatTest.razor b/DeveLanCacheUI_Frontend/Pages/ChatTest.razor
@@ -61,7 +61,7 @@
 
         var backendBaseUrl = await _backendConnectionService.GetBackendBaseUrlAsync();
         hubConnection = new HubConnectionBuilder()
-            .WithUrl($"{backendBaseUrl}chathub")
+            .WithUrl(Navigation.ToAbsoluteUri($"{backendBaseUrl}chathub"))
             .Build();
 
         hubConnection.On<string, string>("ReceiveMessage", async (user, message) =>

diff --git a/DeveLanCacheUI_Frontend/Pages/DownloadStatsPage.razor b/DeveLanCacheUI_Frontend/Pages/DownloadStatsPage.razor
@@ -6,6 +6,7 @@
 @inject HttpClient Http
 @inject BackendConnectionService _backendConnectionService
 @inject Blazored.LocalStorage.ISyncLocalStorageService _localStorage
+@inject NavigationManager Navigation
 
 <PageTitle>Download Stats</PageTitle>
 
@@ -136,7 +137,7 @@
 
         backendBaseUrl = await _backendConnectionService.GetBackendBaseUrlAsync();
         hubConnection = new HubConnectionBuilder()
-            .WithUrl($"{backendBaseUrl}lancachehub")
+            .WithUrl(Navigation.ToAbsoluteUri($"{backendBaseUrl}lancachehub"))
             .Build();
 
         hubConnection.On("UpdateDownloadEvents", async () =>

diff --git a/DeveLanCacheUI_Frontend/Pages/LatestDownload.razor b/DeveLanCacheUI_Frontend/Pages/LatestDownload.razor
@@ -6,6 +6,7 @@
 @inject HttpClient Http
 @inject BackendConnectionService _backendConnectionService
 @inject Blazored.LocalStorage.ISyncLocalStorageService _localStorage
+@inject NavigationManager Navigation
 
 <PageTitle>Latest Downloads</PageTitle>
 
@@ -141,7 +142,7 @@
 
         backendBaseUrl = await _backendConnectionService.GetBackendBaseUrlAsync();
         hubConnection = new HubConnectionBuilder()
-            .WithUrl($"{backendBaseUrl}lancachehub")
+            .WithUrl(Navigation.ToAbsoluteUri($"{backendBaseUrl}lancachehub"))
             .Build();
 
         hubConnection.On("UpdateDownloadEvents", async () =>

diff --git a/DeveLanCacheUI_Frontend/Pages/SteamLatestDownloads.razor b/DeveLanCacheUI_Frontend/Pages/SteamLatestDownloads.razor
@@ -6,6 +6,7 @@
 @inject HttpClient Http
 @inject BackendConnectionService _backendConnectionService
 @inject Blazored.LocalStorage.ISyncLocalStorageService _localStorage
+@inject NavigationManager Navigation
 
 <PageTitle>Steam Latest Downloads</PageTitle>
 
@@ -159,7 +160,7 @@
 
         backendBaseUrl = await _backendConnectionService.GetBackendBaseUrlAsync();
         hubConnection = new HubConnectionBuilder()
-            .WithUrl($"{backendBaseUrl}lancachehub")
+            .WithUrl(Navigation.ToAbsoluteUri($"{backendBaseUrl}lancachehub"))
             .Build();
 
         hubConnection.On("UpdateDownloadEvents", async () =>

diff --git a/DeveLanCacheUI_Frontend/Shared/NavMenu.razor b/DeveLanCacheUI_Frontend/Shared/NavMenu.razor
@@ -124,9 +124,21 @@
 
     private async Task<StatusModel> GetBackendVersion()
     {
-        var statusUrl = await _backendConnectionService.CreateBackendUrlAsync("Status");
-        var status = await Http.GetFromJsonAsync<StatusModel>(statusUrl);
-        return status;
+        try
+        {
+            var statusUrl = await _backendConnectionService.CreateBackendUrlAsync("Status");
+            var status = await Http.GetFromJsonAsync<StatusModel>(statusUrl);
+            return status;
+        }
+        catch (Exception ex)
+        {
+            return new StatusModel()
+            {
+                Version = "???",
+                DepotVersion = "???",
+                UpTime = "0"
+            };
+        }
     }
 
     public class StatusModel