Initial configuration write changes

Hyperbar.Windows.Primary/PrimaryWidget.cs

@@ -9,6 +9,17 @@ public class PrimaryWidget :
         WidgetBuilder<PrimaryWidgetConfiguration>.Configure(args =>
         {
             args.Name = "Primary commands";
+            args.Commands =
+            [
+                new KeyAcceleratorCommandConfiguration
+                {
+                    Id = Guid.NewGuid(),
+                    Order = 0,
+                    Text = "Test",
+                    Icon = "dd",
+                    Key = 1
+                }
+            ];
         }).ConfigureServices(services =>
         {
             services.AddCache<(Guid ParentId, Guid Id), PrimaryCommandConfiguration>()

Hyperbar/Configuration/ConfigurationFactory.cs

@@ -5,5 +5,6 @@ public class ConfigurationFactory<TConfiguration>(Func<TConfiguration> factory)
     where TConfiguration :
     class
 {
-    public TConfiguration Create() => factory.Invoke();
+    public object Create() => factory.Invoke();
+
 }

Hyperbar/Configuration/ConfigurationInitializer.cs

@@ -9,13 +9,21 @@ public class ConfigurationInitializer<TConfiguration>(IConfigurationMonitor<TCon
     where TConfiguration :
     class
 {
+    public bool isInitilized;
+
     public async Task InitializeAsync()
     {
+        if (isInitilized)
+        {
+            return;
+        }
+
+        isInitilized = true;
         if (!reader.TryRead(out TConfiguration? _))
         {
-            if (factory.Create() is TConfiguration configuration)
+            if (factory.Create() is object defaultConfiguration)
             {
-                writer.Write(configuration);
+                writer.Write(defaultConfiguration);
             }
         }
 

Hyperbar/Configuration/ConfigurationReader.cs

@@ -16,7 +16,7 @@ public class ConfigurationReader<TConfiguration>(IConfigurationSource<TConfigura
             }
         }
 
-        return factory.Create();
+        return (TConfiguration)factory.Create();
     }
 
     public bool TryRead(out TConfiguration? configuration)

Hyperbar/Configuration/ConfigurationSource.cs

@@ -27,7 +27,9 @@ public class ConfigurationSource<TConfiguration>(IConfigurationFile<TConfigurati
         };
     });
 
-    public void Set(TConfiguration value)
+    public void Set(TConfiguration value) => Set(value);
+
+    public void Set(object value)
     {
         lock (lockingObject)
         {

Hyperbar/Configuration/ConfigurationWriter.cs

@@ -14,8 +14,7 @@ public class ConfigurationWriter<TConfiguration>(IConfigurationSource<TConfigura
         }
     }
 
-    public void Write(TConfiguration value)
-    {
-        source.Set(value);
-    }
+    public void Write(object value) => source.Set(value);
+
+    public void Write(TConfiguration value) => source.Set(value);
 }

Hyperbar/Configuration/IConfigurationFactory.cs

@@ -4,6 +4,6 @@
         where TConfiguration : 
         class
     {
-        TConfiguration Create();
+        object Create();
     }
 }

Hyperbar/Configuration/IConfigurationInitializer.cs

@@ -1,10 +1,8 @@
-
-namespace Hyperbar
+namespace Hyperbar;
+
+public interface IConfigurationInitializer<TConfiguration> 
+    where TConfiguration :
+    class
 {
-    public interface IConfigurationInitializer<TConfiguration> 
-        where TConfiguration :
-        class
-    {
-        Task InitializeAsync();
-    }
+    Task InitializeAsync();
 }

Hyperbar/Configuration/IConfigurationSource.cs

@@ -7,4 +7,6 @@ public interface IConfigurationSource<TConfiguration>
     bool TryGet(out TConfiguration? value);
 
     void Set(TConfiguration value);
+
+    void Set(object value);
 }

Hyperbar/Configuration/IConfigurationWriter.cs

@@ -6,5 +6,7 @@ public interface IConfigurationWriter<TConfiguration>
 {
     void Write(Action<TConfiguration> updateDelegate);
 
+    void Write(object value);
+
     void Write(TConfiguration value);
 }

Hyperbar/Extensions/IServiceCollectionExtensions.cs

@@ -9,28 +9,6 @@ namespace Hyperbar;
 
 public static class IServiceCollectionExtensions
 {
-    public static IServiceCollection AddDefault(this IServiceCollection services)
-    {
-        services.AddSingleton<IServiceFactory>(provider =>
-            new ServiceFactory((type, parameters) => ActivatorUtilities.CreateInstance(provider, type, parameters!)));
-
-        services.AddSingleton<IMediator, Mediator>();
-        services.AddSingleton<IProxyService<IMediator>>(provider =>
-            new ProxyService<IMediator>(provider.GetRequiredService<IMediator>()));
-
-        services.AddSingleton<IDisposer, Disposer>();
-
-        services.AddTransient<IInitializer, WidgetInitializer>();
-        services.AddTransient<IFactory<Type, IWidget>, WidgetFactory>();
-
-        services.AddHandler<WidgetEnumerationHandler>();
-        services.AddHandler<WidgetAssemblyHandler>();
-        services.AddHandler<WidgetHandler>();
-        services.AddHandler<WidgetHostHander>();
-
-        return services;
-    }
-
     public static IServiceCollection AddCache<TKey, TValue>(this IServiceCollection services)
         where TKey :
         notnull
@@ -53,21 +31,21 @@ public static class IServiceCollectionExtensions
 
     public static IServiceCollection AddConfiguration<TConfiguration>(this IServiceCollection services)
         where TConfiguration :
-        class => services.AddConfiguration<TConfiguration>(typeof(TConfiguration).Name, 
-            "Settings.json", 
+        class => services.AddConfiguration<TConfiguration>(typeof(TConfiguration).Name,
+            "Settings.json",
             null);
 
     public static IServiceCollection AddConfiguration<TConfiguration>(this IServiceCollection services,
         Action<TConfiguration> configurationDelegate)
         where TConfiguration :
-        class, 
+        class,
         new()
     {
         TConfiguration configuration = new();
         configurationDelegate.Invoke(configuration);
 
-        return services.AddConfiguration(typeof(TConfiguration).Name, 
-            "Settings.json", 
+        return services.AddConfiguration(typeof(TConfiguration).Name,
+            "Settings.json",
             configuration);
     }
 
@@ -75,13 +53,13 @@ public static class IServiceCollectionExtensions
         TConfiguration configuration)
         where TConfiguration :
         class => services.AddConfiguration(configuration.GetType().Name,
-            "Settings.json", 
+            "Settings.json",
             configuration);
 
     public static IServiceCollection AddConfiguration<TConfiguration>(this IServiceCollection services,
         object configuration)
         where TConfiguration :
-        class => services.AddConfiguration(configuration.GetType().Name, 
+        class => services.AddConfiguration(configuration.GetType().Name,
             "Settings.json",
             (TConfiguration?)configuration);
 
@@ -160,6 +138,27 @@ public static class IServiceCollectionExtensions
         return services;
     }
 
+    public static IServiceCollection AddDefault(this IServiceCollection services)
+    {
+        services.AddSingleton<IServiceFactory>(provider =>
+            new ServiceFactory((type, parameters) => ActivatorUtilities.CreateInstance(provider, type, parameters!)));
+
+        services.AddSingleton<IMediator, Mediator>();
+        services.AddSingleton<IProxyService<IMediator>>(provider =>
+            new ProxyService<IMediator>(provider.GetRequiredService<IMediator>()));
+
+        services.AddSingleton<IDisposer, Disposer>();
+
+        services.AddTransient<IInitializer, WidgetInitializer>();
+        services.AddTransient<IFactory<Type, IWidget>, WidgetFactory>();
+
+        services.AddHandler<WidgetEnumerationHandler>();
+        services.AddHandler<WidgetAssemblyHandler>();
+        services.AddHandler<WidgetHandler>();
+        services.AddHandler<WidgetHostHander>();
+
+        return services;
+    }
     public static IServiceCollection AddHandler<THandler>(this IServiceCollection services,
         ServiceLifetime lifetime = ServiceLifetime.Transient)
         where THandler :
@@ -203,8 +202,19 @@ public static class IServiceCollectionExtensions
         return services;
     }
 
+    public static IServiceCollection AddNotificationRelay<TFromNotification,
+        TToNotification>(this IServiceCollection services)
+        where TFromNotification :
+        INotification
+        where TToNotification :
+        INotification, new()
+    {
+        return services.AddHandler<NotficationRelayHandler<TFromNotification,
+            TToNotification>>();
+    }
+
     public static IServiceCollection AddRange(this IServiceCollection services,
-        IServiceCollection fromServices)
+            IServiceCollection fromServices)
     {
         foreach (ServiceDescriptor service in fromServices)
         {

Hyperbar/Mediators/Created.cs

@@ -1,3 +1,5 @@
-namespace Hyperbar;
+
+namespace Hyperbar;
 
-public record Created<TValue>(TValue Value, object? Target = null) : INotification;
+public record Created<TValue>(TValue Value, object? Target = null) :
+    INotification;

Hyperbar/Mediators/NotficationRelayHandler.cs

@@ -0,0 +1,16 @@
+
+namespace Hyperbar;
+
+public class NotficationRelayHandler<TFromNotification, ToNotification>(IMediator mediator) :
+    INotificationHandler<TFromNotification>,
+    IHandler
+    where TFromNotification :
+    INotification
+    where ToNotification :
+    INotification, new()
+{
+    private readonly IMediator mediator = mediator;
+
+    public Task Handle(TFromNotification notification, CancellationToken cancellationToken) =>
+        mediator.PublishAsync<ToNotification>(cancellationToken);
+}

Hyperbar/Widgets/WidgetBuilder.cs

@@ -28,13 +28,15 @@ public class WidgetBuilder<TConfiguration>(TConfiguration configuration) :
 
             services.AddScoped<IMediator, Mediator>();
             services.AddScoped<IDisposer, Disposer>();
+
+            services.AddSingleton<IValue<WidgetAvailability>, 
+                Value<WidgetAvailability>>();
+
             services.AddHandler<WidgetConfigurationHandler>();
 
-            services.AddSingleton<IValue<WidgetAvailability>, Value<WidgetAvailability>>(); 
-
-            //services.AddConfiguration(configuration);
-            services.AddConfiguration<WidgetConfiguration>(section: configuration.GetType().Name, 
+            services.AddConfiguration<WidgetConfiguration>(section: configuration.GetType().Name,
                 configuration: configuration);
+            services.AddConfiguration(configuration);
         });
 
     public static IWidgetBuilder Configure(Action<TConfiguration> configurationDelegate)

Hyperbar/Widgets/WidgetConfiguration.cs

@@ -1,7 +1,6 @@
 using System.Text.Json.Serialization;
 
 namespace Hyperbar;
-
 public class WidgetConfiguration 
 {
     public string? Description { get; set; }
@@ -14,3 +13,5 @@ public class WidgetConfiguration
     [JsonInclude]
     internal bool IsAvailable { get; set; }
 }
+
+public class WidgetConfiguration<TConfiguration>;

Hyperbar/Widgets/WidgetConfigurationChanged.cs

@@ -0,0 +1,4 @@
+
+namespace Hyperbar;
+
+public record WidgetConfigurationChanged<TConfiguration> : INotification;

Hyperbar/Widgets/WidgetHost.cs

@@ -1,15 +1,16 @@
 using Microsoft.Extensions.Hosting;
 
 namespace Hyperbar;
+
 public class WidgetHost :
     INotificationHandler<Changed<WidgetAvailability>>,
     IWidgetHost
 {
-    private readonly IHost host;
-    private readonly IMediator mediator;
-    private readonly IEnumerable<IInitializer> initializers;
-    private readonly IProxyService<IMediator> proxyMediator;
     private readonly IConfigurationInitializer<WidgetConfiguration> configurationInitializer;
+    private readonly IHost host;
+    private readonly IEnumerable<IInitializer> initializers;
+    private readonly IMediator mediator;
+    private readonly IProxyService<IMediator> proxyMediator;
 
     public WidgetHost(IHost host,
         IMediator mediator,
@@ -28,19 +29,27 @@ public class WidgetHost :
 
     public IServiceProvider Services => host.Services;
 
-    public Task Handle(Changed<WidgetAvailability> notification,
+    public async Task Handle(Changed<WidgetAvailability> notification,
         CancellationToken cancellationToken)
     {
-        throw new NotImplementedException();
+        if (notification.Value is WidgetAvailability widgetAvailability)
+        {
+            if (widgetAvailability.Value)
+            {
+                await StartAsync();
+            }
+        }
     }
 
-    public async Task InitializeAsync()
+    public async Task InitializeAsync() => await configurationInitializer.InitializeAsync();
+
+    private async Task StartAsync()
     {
-        await configurationInitializer.InitializeAsync();
-        //foreach (IInitializer initializer in initializers)
-        //{
-        //    await initializer.InitializeAsync();
-        //}
+        foreach (IInitializer initializer in initializers)
+        {
+            await initializer.InitializeAsync();
+        }
+
 
         //if (proxyMediator.Proxy is IMediator mediator)
         //{