wip

Hyperbar.Widget/WidgetButtonViewModel.cs

@@ -6,12 +6,13 @@ namespace Hyperbar.Widget;
 [NotificationHandler(nameof(Id))]
 public partial class WidgetButtonViewModel(IServiceProvider serviceProvider,
     IServiceFactory serviceFactory,
-    IMediator mediator,
+    IPublisher publisher,
+    ISubscriber subscriber,
     IDisposer disposer,
     Guid id,
     string? text = null,
     string? icon = null,
-    RelayCommand? invokeCommand = null) : WidgetComponentViewModel(serviceProvider, serviceFactory, mediator, disposer)
+    RelayCommand? invokeCommand = null) : WidgetComponentViewModel(serviceProvider, serviceFactory, publisher, subscriber, disposer)
 {
     [ObservableProperty]
     private string? icon = icon;

Hyperbar.Widget/WidgetComponentViewModel.cs

@@ -6,17 +6,19 @@ public partial class WidgetComponentViewModel :
 {
     public WidgetComponentViewModel(IServiceProvider serviceProvider, 
         IServiceFactory serviceFactory,
-        IMediator mediator, 
+        IPublisher publisher, 
+        ISubscriber subscriber,
         IDisposer disposer,
-        IEnumerable<IWidgetComponentViewModel> items) : base(serviceProvider, serviceFactory, mediator, disposer, items)
+        IEnumerable<IWidgetComponentViewModel> items) : base(serviceProvider, serviceFactory, publisher, subscriber, disposer, items)
     {
 
     }
 
     public WidgetComponentViewModel(IServiceProvider serviceProvider,
         IServiceFactory serviceFactory,
-        IMediator mediator,
-        IDisposer disposer) : base(serviceProvider, serviceFactory, mediator, disposer)
+        IPublisher publisher,
+        ISubscriber subscriber,
+        IDisposer disposer) : base(serviceProvider, serviceFactory, publisher, subscriber, disposer)
     {
 
     }

Hyperbar.Widget/WidgetExtensionEnumerator.cs

@@ -6,7 +6,7 @@ namespace Hyperbar.Widget;
 
 public class WidgetExtensionEnumerator(IFactory<Type, IWidget> factory,
     IHostEnvironment hostEnvironment, 
-    IMediator mediator) :
+    IPublisher publisher) :
     INotificationHandler<Enumerate<WidgetExtension>>
 {
     public Task Handle(Enumerate<WidgetExtension> args, 
@@ -29,7 +29,7 @@ public class WidgetExtensionEnumerator(IFactory<Type, IWidget> factory,
                 {
                     if (factory.Create(widgetType) is IWidget widget)
                     {
-                        await mediator.PublishAsync(new Create<WidgetExtension>(new WidgetExtension(widget, 
+                        await publisher.PublishAsync(new Create<WidgetExtension>(new WidgetExtension(widget, 
                             new WidgetAssembly(assembly))), cancellationToken);
                     }
                 }

Hyperbar.Widget/WidgetExtensionHandler.cs

@@ -3,7 +3,7 @@
 namespace Hyperbar.Widget;
 
 public class WidgetExtensionHandler(IServiceProvider provider,
-    IMediator mediator,
+    IPublisher publisher,
     IProxyServiceCollection<IWidgetBuilder> typedServices) :
     INotificationHandler<Create<WidgetExtension>>
 {
@@ -22,7 +22,7 @@ public class WidgetExtensionHandler(IServiceProvider provider,
             });
 
             IWidgetHost host = builder.Build();
-            await mediator.PublishAsync(new Create<IWidgetHost>(host),
+            await publisher.PublishAsync(new Create<IWidgetHost>(host),
                 cancellationToken);
         }
     }

Hyperbar.Widget/WidgetExtensionInitializer.cs

@@ -1,8 +1,8 @@
 namespace Hyperbar.Widget;
 
-public class WidgetExtensionInitializer(IMediator mediator) :
+public class WidgetExtensionInitializer(IPublisher publisher) :
     IInitializer
 {
     public async Task InitializeAsync() => 
-        await mediator.PublishAsync<Enumerate<WidgetExtension>>();
+        await publisher.PublishAsync<Enumerate<WidgetExtension>>();
 }

Hyperbar.Widget/WidgetHost.cs

@@ -7,17 +7,17 @@ public sealed class WidgetHost :
     IWidgetHost
 {
     private readonly IServiceProvider services;
-    private readonly IMediator mediator;
+    private readonly IPublisher publisher;
     private readonly IProxyService<IMediator> proxyMediator;
     private readonly IEnumerable<IHostedService> hostedServices;
 
     public WidgetHost(IServiceProvider services,
-        IMediator mediator,
+        IPublisher publisher,
         IProxyService<IMediator> proxyMediator,
         IEnumerable<IHostedService> hostedServices)
     {
         this.services = services;
-        this.mediator = mediator;
+        this.publisher = publisher;
         this.proxyMediator = proxyMediator;
         this.hostedServices = hostedServices;
     }
@@ -41,11 +41,11 @@ public sealed class WidgetHost :
 
         if (proxyMediator.Proxy is IMediator mediator)
         {
-            await mediator.PublishAsync(new Started<IWidgetHost>(this),
+            await publisher.PublishAsync(new Started<IWidgetHost>(this),
                 cancellationToken);
         }
 
-        await this.mediator.PublishAsync(new Started<IWidgetHost>(this), 
+        await this.publisher.PublishAsync(new Started<IWidgetHost>(this), 
             cancellationToken);
     }
 

Hyperbar.Widget/WidgetMenuViewModel.cs

@@ -6,12 +6,13 @@ namespace Hyperbar.Widget;
 [NotificationHandler(nameof(Id))]
 public partial class WidgetMenuViewModel(IServiceProvider serviceProvider,
     IServiceFactory serviceFactory,
-    IMediator mediator,
+    IPublisher publisher,
+    ISubscriber subscriber,
     IDisposer disposer,
     Guid id = default,
     string? text = null,
     string? icon = null,
-    RelayCommand? command = null) : WidgetComponentViewModel(serviceProvider, serviceFactory, mediator, disposer)
+    RelayCommand? command = null) : WidgetComponentViewModel(serviceProvider, serviceFactory, publisher, subscriber, disposer)
 {
     [ObservableProperty]
     private IRelayCommand? click = command;

Hyperbar.Widget/WidgetSplitButtonViewModel.cs

@@ -6,13 +6,14 @@ namespace Hyperbar.Widget;
 [NotificationHandler(nameof(Id))]
 public partial class WidgetSplitButtonViewModel(IServiceProvider serviceProvider,
     IServiceFactory serviceFactory,
-    IMediator mediator,
+    IPublisher publisher,
+    ISubscriber subscriber,
     IDisposer disposer,
     IEnumerable<IWidgetComponentViewModel> items,
     Guid id = default,
     string? text = null,
     string? icon = null,
-    RelayCommand? command = null) : WidgetComponentViewModel(serviceProvider, serviceFactory, mediator, disposer, items)
+    RelayCommand? command = null) : WidgetComponentViewModel(serviceProvider, serviceFactory, publisher, subscriber, disposer, items)
 {
     [ObservableProperty]
     private IRelayCommand? click = command;

Hyperbar.Widget/WidgetStartedHandler.cs

@@ -2,7 +2,7 @@
 
 namespace Hyperbar.Widget;
 
-public class WidgetStartedHandler(IMediator mediator) :
+public class WidgetStartedHandler(IPublisher publisher) :
     INotificationHandler<Started<IWidgetHost>>
 {
     public async Task Handle(Started<IWidgetHost> notification,
@@ -12,7 +12,7 @@ public class WidgetStartedHandler(IMediator mediator) :
         {
             if (host.Services.GetService<IWidgetViewModel>() is IWidgetViewModel viewModel)
             {
-                await mediator.PublishAsync(new Create<IWidgetViewModel>(viewModel),
+                await publisher.PublishAsync(new Create<IWidgetViewModel>(viewModel),
                     nameof(IWidgetHostViewModel), cancellationToken);
             }
         }

Hyperbar.Widget/WidgetViewModelEnumerator.cs

@@ -3,7 +3,7 @@
 namespace Hyperbar.Widget;
 
 public class WidgetViewModelEnumerator(IWidgetHost host, 
-    IMediator mediator) :
+    IPublisher publisher) :
     INotificationHandler<Enumerate<IWidgetViewModel>>
 {
     public async Task Handle(Enumerate<IWidgetViewModel> notification,
@@ -13,7 +13,7 @@ public class WidgetViewModelEnumerator(IWidgetHost host,
         {
             foreach (IWidgetViewModel viewModel in viewModels)
             {
-                await mediator.PublishAsync(new Create<IWidgetViewModel>(viewModel),
+                await publisher.PublishAsync(new Create<IWidgetViewModel>(viewModel),
                     nameof(IWidgetHostViewModel), cancellationToken);
             }
         }