WIP

Author: rebelzach

src/Wolder.Core/Workspace/Events/InvocationBeginContext.cs

@@ -0,0 +1,6 @@
+namespace Wolder.Core.Workspace.Events;
+
+public record InvocationBeginContext(
+    IInvokable Invokable, object? Parameter)
+{
+}

src/Wolder.Core/Workspace/Events/InvocationEndContext.cs

@@ -0,0 +1,7 @@
+namespace Wolder.Core.Workspace.Events;
+
+public record InvocationEndContext(
+    IInvokable Invokable)
+{
+    
+}

src/Wolder.Core/Workspace/Events/WorkspaceStateDelegateDispatcher.cs

@@ -0,0 +1,23 @@
+namespace Wolder.Core.Workspace.Events;
+
+public class WorkspaceStateEventDispatcher
+{
+    internal WorkspaceStateEvents Events { get; }
+    public ICollection<WorkspaceStateEvents> Delegates { get; } = new List<WorkspaceStateEvents>();
+
+    public WorkspaceStateEventDispatcher()
+    {
+        Events = new WorkspaceStateEvents()
+        {
+            WorkspaceInitializedAsync = async () =>
+                await Task.WhenAll(Delegates.Select(d =>
+                    d.WorkspaceInitializedAsync())),
+            InvocationBeginAsync = async (c) => 
+                await Task.WhenAll(Delegates.Select(d =>
+                    d.InvocationBeginAsync(c))),
+            InvocationEndAsync = async (c) =>
+                await Task.WhenAll(Delegates.Select(d =>
+                    d.InvocationEndAsync(c))),
+        };
+    }
+}

src/Wolder.Core/Workspace/Events/WorkspaceStateEvents.cs

@@ -0,0 +1,8 @@
+namespace Wolder.Core.Workspace.Events;
+
+public class WorkspaceStateEvents
+{
+    public Func<Task> WorkspaceInitializedAsync { get; set; } = () => Task.CompletedTask;
+    public Func<InvocationBeginContext, Task> InvocationBeginAsync { get; set; } = (c) => Task.CompletedTask;
+    public Func<InvocationEndContext, Task> InvocationEndAsync { get; set; } = (c) => Task.CompletedTask;
+}

src/Wolder.Core/Workspace/GeneratorWorkspaceBuilder.cs

@@ -4,6 +4,7 @@
 using Microsoft.Extensions.Logging;
 using Wolder.Core.Assistants;
 using Wolder.Core.Files;
+using Wolder.Core.Workspace.Events;
 
 namespace Wolder.Core.Workspace;
 
@@ -12,14 +13,15 @@ public class GeneratorWorkspaceBuilder
     private readonly ILoggerFactory _loggerFactory;
     private readonly IConfigurationSection _rootConfiguration;
     private readonly ServiceCollection _services;
-    private readonly List<IWorkspaceStateDelegate> _stateDelegates = new List<IWorkspaceStateDelegate>();
+    public WorkspaceStateEventDispatcher EventDispatcher { get; } = new();
 
     public GeneratorWorkspaceBuilder(ILoggerFactory loggerFactory, IConfigurationSection rootConfiguration)
     {
         _loggerFactory = loggerFactory;
         _rootConfiguration = rootConfiguration;
         _services = new ServiceCollection();
         _services.AddSingleton<WorkspaceRootPath>();
+        _services.AddSingleton(EventDispatcher);
         _services.AddSingleton(loggerFactory);
         _services.Add(ServiceDescriptor.Singleton(typeof(ILogger<>), typeof(Logger<>)));
         _services.AddScoped<IInvoke, InvocationMiddleware>();
@@ -31,11 +33,6 @@ public GeneratorWorkspaceBuilder(ILoggerFactory loggerFactory, IConfigurationSec
     public IServiceCollection Services => _services;
 
     public IConfiguration Config => _rootConfiguration;
-
-    public void RegisterWorkspaceStateDelegate(IWorkspaceStateDelegate stateDelegate)
-    {
-        _stateDelegates.Add(stateDelegate);
-    }
 
     public GeneratorWorkspaceBuilder AddActions<TActionCollection>()
         where TActionCollection : class, ITypedActionCollection

src/Wolder.Core/Workspace/IWorkspaceStateDelegate.cs

@@ -1,19 +1,20 @@
 using Microsoft.Extensions.DependencyInjection;
+using Wolder.Core.Workspace.Events;
 
 namespace Wolder.Core.Workspace;
 
 internal class InvocationMiddleware(IServiceProvider provider) : IInvoke
 {
-    private readonly IWorkspaceStateDelegate _stateDelegate = provider.GetRequiredService<IWorkspaceStateDelegate>();
+    private readonly WorkspaceStateEventDispatcher _stateDelegate = provider.GetRequiredService<WorkspaceStateEventDispatcher>();
 
     public async Task InvokeVoidAsync<TInvokable>()
         where TInvokable : IVoidInvokable
     {
         using var scope = provider.CreateScope();
         var invokable = ActivatorUtilities.CreateInstance<TInvokable>(scope.ServiceProvider);
-        await _stateDelegate.InvocationBeginAsync(invokable, null);
+        await _stateDelegate.Events.InvocationBeginAsync(new (invokable, null));
         await invokable.InvokeAsync();
-        await _stateDelegate.InvocationEndAsync();
+        await _stateDelegate.Events.InvocationEndAsync(new (invokable));
     }
 
     public async Task InvokeVoidAsync<TInvokable, TParameter>(TParameter parameter)
@@ -22,9 +23,9 @@ public async Task InvokeVoidAsync<TInvokable, TParameter>(TParameter parameter)
     {
         var scope = provider.CreateScope();
         var invokable = ActivatorUtilities.CreateInstance<TInvokable>(scope.ServiceProvider, parameter);
-        await _stateDelegate.InvocationBeginAsync(invokable, parameter);
+        await _stateDelegate.Events.InvocationBeginAsync(new(invokable, parameter));
         await invokable.InvokeAsync();
-        await _stateDelegate.InvocationEndAsync();
+        await _stateDelegate.Events.InvocationEndAsync(new(invokable));
     }
 
     public async Task<TOutput> InvokeAsync<TInvokable, TParameter, TOutput>(TParameter parameter)
@@ -33,9 +34,9 @@ public async Task<TOutput> InvokeAsync<TInvokable, TParameter, TOutput>(TParamet
     {
         var scope = provider.CreateScope();
         var invokable = ActivatorUtilities.CreateInstance<TInvokable>(scope.ServiceProvider, parameter);
-        await _stateDelegate.InvocationBeginAsync(invokable, parameter);
+        await _stateDelegate.Events.InvocationBeginAsync(new(invokable, parameter));
         var result = await invokable.InvokeAsync();
-        await _stateDelegate.InvocationEndAsync();
+        await _stateDelegate.Events.InvocationEndAsync(new(invokable));
         return result;
     }
 
@@ -44,9 +45,9 @@ public async Task<TOutput> InvokeAsync<TInvokable, TOutput>()
     {
         var scope = provider.CreateScope();
         var invokable = ActivatorUtilities.CreateInstance<TInvokable>(scope.ServiceProvider);
-        await _stateDelegate.InvocationBeginAsync(invokable, null);
+        await _stateDelegate.Events.InvocationBeginAsync(new(invokable, null));
         var result = await invokable.InvokeAsync();
-        await _stateDelegate.InvocationEndAsync();
+        await _stateDelegate.Events.InvocationEndAsync(new(invokable));
         return result;
     }
 }

src/Wolder.Core/Workspace/InvocationMiddleware.cs

@@ -13,7 +13,7 @@
 </head>
 
 <body>
-<Routes/>
+<Routes />
 <script src="_framework/blazor.web.js"></script>
 </body>
 

src/Wolder.Core/Workspace/WorkspaceStateDelegateDispatcher.cs

@@ -6,7 +6,9 @@ public static class GeneratorWorkspaceBuilderExtensions
 {
     public static GeneratorWorkspaceBuilder AddInteractiveWebServer(this GeneratorWorkspaceBuilder builder)
     {
-        builder.RegisterWorkspaceStateDelegate();
+        var server = new WorkspaceInteractiveWebHost();
+        builder.Services.AddSingleton(server);
+        builder.EventDispatcher.Delegates.Add(server.WorkspaceStateNotifications.Events);
         return builder;
     }
 }

src/Wolder.Interactive.Web/App.razor

@@ -1,11 +1,28 @@
 namespace Wolder.Interactive.Web;
 
-public class WolderInteractiveHost()
+public class WorkspaceInteractiveWebHost
 {
     private WebApplication? _app;
+    private Task? _serverInitializeTask;
 
-    public async Task StartAsync()
+    public WorkspaceInteractiveWebHost()
     {
+        WorkspaceStateNotifications.WorkspaceInitialized += () =>
+        {
+            _serverInitializeTask = StartAsync();
+        };
+    }
+
+    public WorkspaceStateNotifications WorkspaceStateNotifications { get; } = new();
+
+    private async Task StartAsync()
+    {
+        if (_serverInitializeTask is not null)
+        {
+            await _serverInitializeTask;
+            return;
+        }
+        
         var webBuilder = WebApplication.CreateBuilder();
 
         // Add services to the container.

src/Wolder.Interactive.Web/SetupExtensions.cs

@@ -1,18 +1,39 @@
 using Wolder.Core.Workspace;
+using Wolder.Core.Workspace.Events;
 using Wolder.Interactive.Web.Models;
 
 namespace Wolder.Interactive.Web;
 
-public class WorkspaceStateNotifications : IWorkspaceStateDelegate
+public class WorkspaceStateNotifications
 {
+    public WorkspaceStateNotifications()
+    {
+        Events = new()
+        {
+            WorkspaceInitializedAsync = WorkspaceInitializedAsync,
+            InvocationBeginAsync = InvocationBeginAsync,
+            InvocationEndAsync = InvocationEndAsync,
+        };
+    }
+
+    internal WorkspaceStateEvents Events { get; }
+
     public event Action<InvocationDetail>? InvocationBegin;
-    public Task InvocationBeginAsync(IInvokable invokable, object? parameters)
+    public event Action? WorkspaceInitialized;
+    
+    public Task WorkspaceInitializedAsync()
+    {
+        WorkspaceInitialized?.Invoke();
+        return Task.CompletedTask;
+    }
+
+    public Task InvocationBeginAsync(InvocationBeginContext c)
     {
-        InvocationBegin?.Invoke(new InvocationDetail(invokable.GetType().Name));
+        InvocationBegin?.Invoke(new InvocationDetail(c.Invokable.GetType().Name));
         return Task.CompletedTask;
     }
 
-    public Task InvocationEndAsync()
+    public Task InvocationEndAsync(InvocationEndContext c)
     {
         return Task.CompletedTask;
     }