Cleanup & Bug Fixes

- WebAssembly fix (missing app.Run)
 - API comms cleanup

DeepDrftCli/Services/GuiService.cs

@@ -1,9 +1,6 @@
 using Microsoft.Extensions.Logging;
 using Terminal.Gui;
-using DeepDrftWeb.Services.Repositories;
-using DeepDrftContent.Services;
 using DeepDrftModels.Entities;
-using NetBlocks.Models;
 
 namespace DeepDrftCli.Services;
 
@@ -13,7 +10,6 @@ namespace DeepDrftCli.Services;
 public class GuiService
 {
     private readonly ILogger<GuiService> _logger;
-    private readonly TrackRepository _trackRepository;
     private readonly DeepDrftWeb.Services.TrackService _webTrackService;
     private readonly DeepDrftContent.Services.TrackService _contentTrackService;
 
@@ -27,12 +23,10 @@ public class GuiService
 
     public GuiService(
         ILogger<GuiService> logger,
-        TrackRepository trackRepository,
         DeepDrftWeb.Services.TrackService webTrackService,
         DeepDrftContent.Services.TrackService contentTrackService)
     {
         _logger = logger;
-        _trackRepository = trackRepository;
         _webTrackService = webTrackService;
         _contentTrackService = contentTrackService;
     }

DeepDrftContent/Program.cs

@@ -55,15 +55,6 @@ if (app.Environment.IsDevelopment())
 {
     app.MapOpenApi();
 }
-else
-{
-    // Only use HTTPS redirection if not behind a reverse proxy
-    var forwardedProto = app.Services.GetService<IConfiguration>()?["ForwardedHeaders:DisableHttpsRedirection"];
-    if (string.IsNullOrEmpty(forwardedProto) || !bool.Parse(forwardedProto))
-    {
-        app.UseHttpsRedirection();
-    }
-}
 
 app.UseCors("ContentApiPolicy");
 app.UseApiKeyAuthentication(apiKeySettings.ApiKey);

DeepDrftWeb.Client/Pages/TracksView.razor

@@ -1,4 +1,5 @@
-@page "/tracks"
+@page "/tracks"
+@rendermode @(new InteractiveAutoRenderMode(prerender: false))
 
 @using DeepDrftWeb.Client.Controls
 
@@ -19,6 +20,16 @@
                                 SelectedChanged="@SetPage"
                                 BoundaryCount="2"
                                 MiddleCount="3"/>
+                
+                <div class="interactivity-test mt-4">
+                    <MudButton Variant="Variant.Filled" Color="Color.Primary" OnClick="TestInteractivity">
+                        Test Interactivity (@_clickCount)
+                    </MudButton>
+                    <MudText Typo="Typo.body2" Class="mt-2">
+                        Lifecycle Status: @_lifecycleStatus
+                    </MudText>
+                </div>
+                
                 <AudioPlayerBar AudioPlaybackEngine="AudioPlaybackEngine" />
             </div>
         }

DeepDrftWeb.Client/Pages/TracksView.razor.cs

@@ -1,4 +1,4 @@
-using DeepDrftModels.Entities;
+using DeepDrftModels.Entities;
 using DeepDrftModels.Models;
 using DeepDrftWeb.Client.Services;
 using DeepDrftWeb.Client.ViewModels;
@@ -12,13 +12,29 @@ public partial class TracksView : ComponentBase
     [Inject] public required AudioPlaybackEngine AudioPlaybackEngine { get; set; }
 
     private TrackEntity? _selectedTrack = null;
+    private int _clickCount = 0;
+    private string _lifecycleStatus = "Not initialized";
     
     protected override async Task OnInitializedAsync()
     {
+        _lifecycleStatus = "OnInitializedAsync called";
         await SetPage(1);
+    }
 
-        if (!RendererInfo.IsInteractive) return;
-        await AudioPlaybackEngine.InitializeAudioPlayer();
+    protected override async Task OnAfterRenderAsync(bool firstRender)
+    {
+        if (firstRender)
+        {
+            _lifecycleStatus = "OnAfterRenderAsync called - WebAssembly is active!";
+            await AudioPlaybackEngine.InitializeAudioPlayer();
+            StateHasChanged();
+        }
+    }
+
+    private void TestInteractivity()
+    {
+        _clickCount++;
+        _lifecycleStatus = $"Button clicked {_clickCount} times - Interactivity working!";
     }
     
     private async Task SetPage(int newPage)

DeepDrftWeb.Client/Program.cs

@@ -1,5 +1,4 @@
 using DeepDrftWeb.Client;
-using DeepDrftWeb.Client.Services;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 using MudBlazor.Services;
 
@@ -16,3 +15,5 @@ Startup.ConfigureContentServices(builder.Services, contentApiUrl);
 Startup.ConfigureDomainServices(builder.Services);
 
 var app = builder.Build();
+
+await app.RunAsync();

DeepDrftWeb.Client/Routes.razor

@@ -1,6 +1,5 @@
-<Router AppAssembly="typeof(Program).Assembly">
+<Router AppAssembly="typeof(_Imports).Assembly">
     <Found Context="routeData">
         <RouteView RouteData="routeData" DefaultLayout="typeof(Layout.MainLayout)" />
-        <FocusOnNavigate RouteData="routeData" Selector="h1" />
     </Found>
 </Router>

DeepDrftWeb.Client/Services/AudioPlaybackEngine.cs

@@ -13,6 +13,7 @@ public class AudioPlaybackEngine : IAsyncDisposable
     public required AudioInteropService AudioInterop { get; set; }
 
     public string PlayerId { get; private set; } = Guid.NewGuid().ToString();
+    public bool IsInitialized { get; private set; } = false;
     public bool IsLoaded { get; private set; } = false;
     public bool IsPlaying { get; private set; } = false;
     public bool IsPaused { get; private set; } = false;
@@ -30,6 +31,8 @@ public class AudioPlaybackEngine : IAsyncDisposable
 
     public async Task InitializeAudioPlayer()
     {
+        if (IsInitialized) return;
+
         var result = await AudioInterop.CreatePlayerAsync(PlayerId);
         if (!result.Success)
         {
@@ -42,6 +45,8 @@ public class AudioPlaybackEngine : IAsyncDisposable
         await AudioInterop.SetOnLoadProgressCallbackAsync(PlayerId, OnLoadProgress);
         
         await AudioInterop.SetVolumeAsync(PlayerId, Volume);
+        
+        IsInitialized = true;
     }
 
     public async Task LoadTrack(TrackEntity track)

DeepDrftWeb.Client/Startup.cs

@@ -1,8 +1,6 @@
 using DeepDrftWeb.Client.Clients;
 using DeepDrftWeb.Client.Services;
 using DeepDrftWeb.Client.ViewModels;
-using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
-using NetBlocks.Models;
 
 namespace DeepDrftWeb.Client;
 
@@ -31,6 +29,6 @@ public static class Startup
         });
         services.AddScoped<TrackMediaClient>();
         services.AddScoped<AudioInteropService>();
-        services.AddScoped<AudioPlaybackEngine>();
+        services.AddTransient<AudioPlaybackEngine>();
     }
 }

DeepDrftWeb.Client/wwwroot/appsettings.Development.json

@@ -6,6 +6,6 @@
     }
   },
   "ApiUrls": {
-    "ContentApi": "https://localhost:54493/api"
+    "ContentApi": "http://localhost:54493/api/"
   }
 }

DeepDrftWeb.Client/wwwroot/appsettings.json

@@ -6,6 +6,6 @@
     }
   },
   "ApiUrls": {
-    "ContentApi": "https://media.deepdrft.com/api"
+    "ContentApi": "https://media.deepdrft.com/api/"
   }
 }

DeepDrftWeb/Program.cs

@@ -12,8 +12,8 @@ builder.Services.AddMudServices();
 // Add AudioInteropService for both server and client rendering
 builder.Services.AddScoped<AudioInteropService>();
 
-var baseUrl = Startup.GetKestrelUrl(builder);
-var contentApiUrl = builder.Configuration["ApiUrls:ContentApi"] ?? "https://localhost:7001";
+var baseUrl = builder.GetKestrelUrl();
+var contentApiUrl = builder.Configuration["ApiUrls:ContentApi"] ?? throw new Exception("Content API URL is not configured");
 
 Startup.ConfigureDomainServices(builder);
 
@@ -28,6 +28,17 @@ builder.Services.AddRazorComponents()
     .AddInteractiveServerComponents()
     .AddInteractiveWebAssemblyComponents();
 
+// Configure SignalR for better circuit cleanup
+builder.Services.AddSignalR(options =>
+{
+    if (builder.Environment.IsDevelopment())
+    {
+        options.EnableDetailedErrors = true;
+        options.KeepAliveInterval = TimeSpan.FromSeconds(10);
+        options.ClientTimeoutInterval = TimeSpan.FromSeconds(30);
+    }
+});
+
 // Configure forwarded headers for reverse proxy support
 builder.Services.Configure<ForwardedHeadersOptions>(options =>
 {
@@ -63,6 +74,22 @@ else
 
 app.UseAntiforgery();
 
+// Configure cache headers for Blazor WebAssembly assets
+if (app.Environment.IsDevelopment())
+{
+    app.Use(async (context, next) =>
+    {
+        if (context.Request.Path.StartsWithSegments("/_framework") ||
+            context.Request.Path.StartsWithSegments("/_content"))
+        {
+            context.Response.Headers.CacheControl = "no-cache, no-store, must-revalidate";
+            context.Response.Headers.Pragma = "no-cache";
+            context.Response.Headers.Expires = "0";
+        }
+        await next();
+    });
+}
+
 app.MapStaticAssets();
 app.MapControllers();
 app.MapRazorComponents<App>()
@@ -70,4 +97,5 @@ app.MapRazorComponents<App>()
     .AddInteractiveWebAssemblyRenderMode()
     .AddAdditionalAssemblies(typeof(DeepDrftWeb.Client._Imports).Assembly);
 
+
 app.Run();

DeepDrftWeb/appsettings.Development.json

@@ -7,6 +7,6 @@
   },
   "DetailedErrors": true,
   "ApiUrls": {
-    "ContentApi": "https://localhost:54493/api"
+    "ContentApi": "http://localhost:54493/api/"
   }
 }

DeepDrftWeb/appsettings.json

@@ -10,7 +10,7 @@
     "DefaultConnection": "Data Source=../Database/deepdrft.db"
   },
   "ApiUrls": {
-    "ContentApi": "https://localhost:12777/api"
+    "ContentApi": "http://localhost:12777/api/"
   },
   "ForwardedHeaders": {
     "DisableHttpsRedirection": "true"