Merge pull request 'Improved plugin loading and handling' (#17) from feat/ImprovePluginLoading into v2.1

Reviewed-on: #17

Hosts/Moonlight.Api.Host/Moonlight.Api.Host.csproj

@@ -7,9 +7,6 @@
     </PropertyGroup>
 
     <ItemGroup>
-
-        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="10.0.1"/>
-
         <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.1">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; analyzers; buildtransitive</IncludeAssets>

Hosts/Moonlight.Api.Host/Program.cs

@@ -1,27 +1,9 @@
-using Moonlight.Api.Startup;
+using Moonlight.Api;
 using SimplePlugin.Generated;
 
-var modules = PluginRegistry.Modules
-    .OfType<IAppStartup>()
+var plugins = PluginRegistry
+    .Modules
+    .OfType<MoonlightPlugin>()
     .ToArray();
 
-var builder = WebApplication.CreateBuilder(args);
-
-foreach (var startup in modules)
-    startup.PreBuild(builder);
-
-var app = builder.Build();
-
-foreach (var startup in modules)
-    startup.PostBuild(app);
-
-foreach (var startup in modules)
-    startup.PostMiddleware(app);
-
-if (app.Environment.IsDevelopment())
-    app.UseWebAssemblyDebugging();
-
-app.UseBlazorFrameworkFiles();
-app.UseStaticFiles();
-
-await app.RunAsync();
+await StartupHandler.RunAsync(args, plugins);

Hosts/Moonlight.Frontend.Host/Program.cs

@@ -1,20 +1,9 @@
-using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
-using Moonlight.Frontend.Startup;
+using Moonlight.Frontend;
 using SimplePlugin.Generated;
 
-var modules = PluginRegistry
+var plugins = PluginRegistry
     .Modules
-    .OfType<IAppStartup>()
+    .OfType<MoonlightPlugin>()
     .ToArray();
 
-var builder = WebAssemblyHostBuilder.CreateDefault(args);
-
-foreach (var startup in modules)
-    startup.PreBuild(builder);
-
-var app = builder.Build();
-
-foreach(var startup in modules)
-    startup.PostBuild(app);
-
-await app.RunAsync();
+await StartupHandler.RunAsync(args, plugins);

Moonlight.Api/Moonlight.Api.csproj

@@ -25,6 +25,7 @@
 
     <ItemGroup>
         <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="10.0.1"/>
+        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="10.0.1"/>
         <PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.1"/>
         <PackageReference Include="Microsoft.Extensions.Caching.Hybrid" Version="10.3.0" />
         <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="10.0.3" />

Moonlight.Api/MoonlightPlugin.cs

@@ -0,0 +1,28 @@
+using System.Reflection;
+using System.Text.Json.Serialization;
+using Microsoft.AspNetCore.Builder;
+using SimplePlugin.Abstractions;
+
+namespace Moonlight.Api;
+
+public abstract class MoonlightPlugin : IPluginModule
+{
+    protected MoonlightPlugin[] Plugins { get; private set; }
+
+    public void Initialize(MoonlightPlugin[] plugins)
+    {
+        Plugins = plugins;
+    }
+    
+    public virtual void PreBuild(WebApplicationBuilder builder)
+    {
+    }
+
+    public virtual void PostBuild(WebApplication application)
+    {
+    }
+
+    public virtual void PostMiddleware(WebApplication application)
+    {
+    }
+}

Moonlight.Api/Startup/IAppStartup.cs

@@ -1,11 +0,0 @@
-using Microsoft.AspNetCore.Builder;
-using SimplePlugin.Abstractions;
-
-namespace Moonlight.Api.Startup;
-
-public interface IAppStartup : IPluginModule
-{
-    public void PreBuild(WebApplicationBuilder builder);
-    public void PostBuild(WebApplication application);
-    public void PostMiddleware(WebApplication application);
-}

Moonlight.Api/Startup/Startup.Base.cs

@@ -16,16 +16,19 @@ namespace Moonlight.Api.Startup;
 
 public partial class Startup
 {
-    private static void AddBase(WebApplicationBuilder builder)
+    private void AddBase(WebApplicationBuilder builder)
     {
         // Create the base directory
         Directory.CreateDirectory("storage");
 
-        // Hook up source-generated serialization
-        builder.Services.AddControllers().AddJsonOptions(options =>
-        {
-            options.JsonSerializerOptions.TypeInfoResolverChain.Add(SerializationContext.Default);
-        });
+        // Hook up source-generated serialization and add controllers
+        builder.Services
+            .AddControllers()
+            .AddApplicationPart(typeof(Startup).Assembly)
+            .AddJsonOptions(options =>
+            {
+                options.JsonSerializerOptions.TypeInfoResolverChain.Add(SerializationContext.Default);
+            });
 
         // Configure logging
         builder.Logging.ClearProviders();
@@ -53,10 +56,10 @@ public partial class Startup
 
         // Container Helper Options
         builder.Configuration.GetSection("Moonlight:ContainerHelper").Bind(builder.Configuration);
-        
+
         builder.Services.AddOptions<ContainerHelperOptions>().BindConfiguration("Moonlight:ContainerHelper");
         builder.Services.AddSingleton<ContainerHelperService>();
-        
+
         builder.Services.AddHttpClient("ContainerHelper", (provider, client) =>
         {
             var options = provider.GetRequiredService<IOptions<ContainerHelperOptions>>();

Moonlight.Api/Startup/Startup.cs

@@ -1,12 +1,15 @@
-using Microsoft.AspNetCore.Builder;
+using System.Reflection;
+using System.Text.Json.Serialization;
+using Microsoft.AspNetCore.Builder;
+using Moonlight.Shared.Http;
 using SimplePlugin.Abstractions;
 
 namespace Moonlight.Api.Startup;
 
 [PluginModule]
-public partial class Startup : IAppStartup
+public partial class Startup : MoonlightPlugin
 {
-    public void PreBuild(WebApplicationBuilder builder)
+    public override void PreBuild(WebApplicationBuilder builder)
     {
         AddBase(builder);
         AddAuth(builder);
@@ -14,13 +17,13 @@ public partial class Startup : IAppStartup
         AddCache(builder);
     }
 
-    public void PostBuild(WebApplication application)
+    public override void PostBuild(WebApplication application)
     {
         UseBase(application);
         UseAuth(application);
     }
 
-    public void PostMiddleware(WebApplication application)
+    public override void PostMiddleware(WebApplication application)
     {
         MapBase(application);
     }

Moonlight.Api/StartupHandler.cs

@@ -0,0 +1,42 @@
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.Hosting;
+
+namespace Moonlight.Api;
+
+public static class StartupHandler
+{
+    public static async Task RunAsync(string[] args, MoonlightPlugin[] plugins)
+    {
+        Console.WriteLine($"Starting with: {string.Join(", ", plugins.Select(x => x.GetType().FullName))}");
+        
+        var builder = WebApplication.CreateBuilder(args);
+
+        // Setting up context
+        foreach (var plugin in plugins)
+            plugin.Initialize(plugins);
+
+        // Stage 1: Pre Build
+        foreach (var startup in plugins)
+            startup.PreBuild(builder);
+
+        var app = builder.Build();
+
+        // Stage 2: Post Build
+        foreach (var startup in plugins)
+            startup.PostBuild(app);
+
+        // Stage 3: Post Middleware
+        foreach (var startup in plugins)
+            startup.PostMiddleware(app);
+
+        // Frontend debugging
+        if (app.Environment.IsDevelopment())
+            app.UseWebAssemblyDebugging();
+
+        // Frontend hosting
+        app.UseBlazorFrameworkFiles();
+        app.UseStaticFiles();
+
+        await app.RunAsync();
+    }
+}

Moonlight.Frontend/Configuration/NavigationAssemblyOptions.cs

@@ -0,0 +1,8 @@
+using System.Reflection;
+
+namespace Moonlight.Frontend.Configuration;
+
+public class NavigationAssemblyOptions
+{
+    public List<Assembly> Assemblies { get; private set; } = new();
+}

Moonlight.Frontend/MoonlightPlugin.cs

@@ -0,0 +1,10 @@
+using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
+using SimplePlugin.Abstractions;
+
+namespace Moonlight.Frontend;
+
+public abstract class MoonlightPlugin : IPluginModule
+{
+    public virtual void PreBuild(WebAssemblyHostBuilder builder){}
+    public virtual void PostBuild(WebAssemblyHost application){}
+}

Moonlight.Frontend/Startup/Startup.Base.cs

@@ -1,6 +1,7 @@
 using Microsoft.AspNetCore.Components.Web;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 using Microsoft.Extensions.DependencyInjection;
+using Moonlight.Frontend.Configuration;
 using Moonlight.Frontend.Implementations;
 using Moonlight.Frontend.Interfaces;
 using Moonlight.Frontend.Services;
@@ -25,5 +26,10 @@ public partial class Startup
         builder.Services.AddSingleton<ISidebarProvider, SidebarProvider>();
 
         builder.Services.AddScoped<FrontendService>();
+
+        builder.Services.Configure<NavigationAssemblyOptions>(options =>
+        {
+            options.Assemblies.Add(typeof(Startup).Assembly);
+        });
     }
 }

Moonlight.Frontend/Startup/Startup.cs

@@ -4,15 +4,15 @@ using SimplePlugin.Abstractions;
 namespace Moonlight.Frontend.Startup;
 
 [PluginModule]
-public partial class Startup : IAppStartup
+public partial class Startup : MoonlightPlugin
 {
-    public void PreBuild(WebAssemblyHostBuilder builder)
+    public override void PreBuild(WebAssemblyHostBuilder builder)
     {
         AddBase(builder);
         AddAuth(builder);
     }
 
-    public void PostBuild(WebAssemblyHost application)
+    public override void PostBuild(WebAssemblyHost application)
     {
         
     }

Moonlight.Frontend/StartupHandler.cs

@@ -0,0 +1,23 @@
+using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
+
+namespace Moonlight.Frontend;
+
+public static class StartupHandler
+{
+    public static async Task RunAsync(string[] args, MoonlightPlugin[] plugins)
+    {
+        Console.WriteLine($"Starting with: {string.Join(", ", plugins.Select(x => x.GetType().FullName))}");
+        
+        var builder = WebAssemblyHostBuilder.CreateDefault(args);
+
+        foreach (var plugin in plugins)
+            plugin.PreBuild(builder);
+
+        var app = builder.Build();
+
+        foreach(var plugin in plugins)
+            plugin.PostBuild(app);
+
+        await app.RunAsync();
+    }
+}

Moonlight.Frontend/UI/App.razor

@@ -1,6 +1,9 @@
 @using System.Net
+@using System.Reflection
 @using LucideBlazor
 @using Microsoft.AspNetCore.Components.Authorization
+@using Microsoft.Extensions.Options
+@using Moonlight.Frontend.Configuration
 @using Moonlight.Frontend.UI.Shared
 @using Moonlight.Frontend.UI.Shared.Components
 @using ShadcnBlazor.Emptys
@@ -8,12 +11,13 @@
 @using Moonlight.Frontend.UI.Shared.Partials
 
 @inject NavigationManager Navigation
+@inject IOptions<NavigationAssemblyOptions> NavigationOptions
 
 <ErrorBoundary>
     <ChildContent>
         <AuthorizeView>
             <ChildContent>
-                <Router AppAssembly="@typeof(App).Assembly" NotFoundPage="typeof(NotFound)">
+                <Router AppAssembly="@typeof(App).Assembly" AdditionalAssemblies="Assemblies" NotFoundPage="typeof(NotFound)">
                     <Found Context="routeData">
                         <AuthorizeRouteView RouteData="routeData" DefaultLayout="typeof(MainLayout)">
                             <NotAuthorized Context="authRouteViewContext">
@@ -71,4 +75,14 @@
             </div>
         }
     </ErrorContent>
-</ErrorBoundary>
+</ErrorBoundary>
+
+@code
+{
+    private Assembly[] Assemblies;
+
+    protected override void OnInitialized()
+    {
+        Assemblies = NavigationOptions.Value.Assemblies.ToArray();
+    }
+}