Smarter base address resolution.

src/ProfanityFilter.WebApi/Components/Pages/Home.razor.cs

@@ -26,10 +26,7 @@ public sealed partial class Home : IAsyncDisposable
     public required ILogger<Home> Logger { get; set; }
 
     [Inject]
-    public required NavigationManager Nav { get; set; }
-
-    [Inject]
-    public required IServerAddressesFeature ServerAddresses { get; set; }
+    public required BaseAddressResolver BaseAddressResolver { get; set; }
 
     [Inject]
     public required ILocalStorageService LocalStorage { get; set; }
@@ -68,12 +65,11 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
 
         if (_hub is null)
         {
-            var baseAddress = ServerAddresses.Addresses.FirstOrDefault(
-                a => a.StartsWith("https", StringComparison.OrdinalIgnoreCase));
+            var baseAddress = BaseAddressResolver.GetBaseAddress();
 
-            Logger.LogInformation("Attempting hub base address: {Address}", baseAddress);
+            Logger.LogInformation("Connecting to: {Address}/profanity/hub", baseAddress);
 
-            var uri = new UriBuilder(baseAddress ?? Nav.BaseUri)
+            var uri = new UriBuilder(baseAddress)
             {
                 Path = "/profanity/hub"
             };

src/ProfanityFilter.WebApi/GlobalUsings.cs

@@ -14,6 +14,8 @@
 global using Microsoft.AspNetCore.Components;
 global using Microsoft.AspNetCore.DataProtection;
 global using Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption;
+global using Microsoft.AspNetCore.Hosting.Server;
+global using Microsoft.AspNetCore.Hosting.Server.Features;
 global using Microsoft.AspNetCore.Http.Connections;
 global using Microsoft.AspNetCore.Http.HttpResults;
 global using Microsoft.AspNetCore.HttpLogging;
@@ -35,5 +37,6 @@
 global using ProfanityFilter.WebApi.Hubs;
 global using ProfanityFilter.WebApi.Models;
 global using ProfanityFilter.WebApi.Serialization;
+global using ProfanityFilter.WebApi.Services;
 
 global using SystemTimer = System.Timers.Timer;

src/ProfanityFilter.WebApi/Program.cs

@@ -1,18 +1,16 @@
 // Copyright (c) David Pine. All rights reserved.
 // Licensed under the MIT License.
 
-using Microsoft.AspNetCore.Hosting.Server;
-using Microsoft.AspNetCore.Hosting.Server.Features;
-
 var builder = WebApplication.CreateBuilder(args);
 
-builder.Services.AddSingleton<IServerAddressesFeature>(sp =>
+builder.Services.AddScoped(sp =>
 {
     var server = sp.GetRequiredService<IServer>();
 
     return server.Features.Get<IServerAddressesFeature>()
         ?? throw new InvalidOperationException("There's no IServerAddressesFeature in the IServer.");
 });
+builder.Services.AddScoped<BaseAddressResolver>();
 
 builder.Services.AddRedaction(static redaction =>
     redaction.SetRedactor<CharacterRedactor>(

src/ProfanityFilter.WebApi/Services/BaseAddressResolver.cs

@@ -0,0 +1,25 @@
+// Copyright (c) David Pine. All rights reserved.
+// Licensed under the MIT License.
+
+namespace ProfanityFilter.WebApi.Services;
+
+public sealed class BaseAddressResolver(
+    IConfiguration configuration,
+    IServerAddressesFeature serverAddresses,
+    NavigationManager navigationManager)
+{
+    private bool IsRunningInContainer => configuration.GetValue<bool>("DOTNET_RUNNING_IN_CONTAINER");
+
+    public string GetBaseAddress()
+    {
+        return IsRunningInContainer switch
+        {
+            // When running in a container, use the internal container port.
+            true => "https://localhost:8081",
+
+            // Otherwise, rely on the server address or the base URI.
+            _ => serverAddresses.Addresses.FirstOrDefault(address => address.StartsWith("https"))
+                ?? navigationManager.BaseUri
+        };
+    }
+}