dan/Toolkit2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor

Browse Source
This commit is contained in:
Dan Clark
2025-02-09 13:51:25 +00:00
parent f2e501454e
commit 0afe621f59
22 changed files with 147 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Toolkit.Foundation/IHostBuilderExtension.cs
+9 -5
View File
@@ -197,16 +197,20 @@ public static class IHostBuilderExtension
return builder;
}
public static IHostBuilder ConfigureSerial<TConfiguration, TSerialReader, TContent>(this IHostBuilder hostBuilder,
Action<HostBuilderContext> configureDelegate) where TSerialReader : SerialReader<TContent>
where TConfiguration : ISerialConfiguration, new()
public static IHostBuilder ConfigureMicroControllers(this IHostBuilder hostBuilder, Action<IMicroControllerBuilder> builderDelegate)
{
hostBuilder.ConfigureServices((hostBuilderContext, serviceCollection) =>
{
configureDelegate.Invoke(hostBuilderContext);
MicroControllerBuilder? builder = new();
builderDelegate.Invoke(builder);
serviceCollection.TryAddSingleton<ISerialFactory, SerialFactory>();
serviceCollection.AddSingleton(provider => provider.GetService<ISerialFactory>()!.Create<TSerialReader, TContent>(provider.GetService<IOptionsMonitor<TConfiguration>>()!.CurrentValue));
serviceCollection.TryAddSingleton<IMicroControllerContextFactory, MicroControllerContextFactory>();
foreach (IMicroControllerBuilderConfiguration configuration in builder.Configurations)
{
serviceCollection.AddSingleton(provider => configuration.Factory.Invoke(provider) ?? throw new NullReferenceException());
}
});
return hostBuilder;
Toolkit.Foundation/IMicroControllerContextFactory.cs
+9
View File
@@ -0,0 +1,9 @@
namespace Toolkit.Foundation;
public interface IMicroControllerContextFactory
{
IMicroControllerContext<TRead, TEvent>? Create<TConfiguration, TReader, TRead, TEvent>(IReadOnlyCollection<IMicroControllerModuleDescriptor> modules)
where TConfiguration : ISerialConfiguration
where TReader : SerialReader<TRead>
where TEvent : ISerialEventArgs<TRead>;
}
Toolkit.Foundation/IMicrocontrollerBuilder.cs
+7 -8
View File
@@ -1,12 +1,11 @@
using Microsoft.Extensions.Configuration;
namespace Toolkit.Foundation;
namespace Toolkit.Foundation;
public interface IMicrocontrollerBuilder
public interface IMicroControllerBuilder
{
IReadOnlyCollection<IMicrocontrollerBuilderConfiguration> Configurations { get; }
IReadOnlyCollection<IMicroControllerBuilderConfiguration> Configurations { get; }
IMicrocontrollerBuilderConfiguration<TConfiguration, TSerialReader, TRead, TReadDeserializer> Add<TConfiguration, TSerialReader, TRead, TReadDeserializer>(IConfiguration configuration)
where TConfiguration : IMicrocontrollerConfiguration, new()
where TSerialReader : SerialReader<TRead> where TReadDeserializer : IMicrocontrollerModuleDeserializer<TRead>, new();
IMicroControllerBuilderConfiguration<TConfiguration, TReader, TRead, TEvent> Add<TConfiguration, TReader, TRead, TEvent>()
where TConfiguration : ISerialConfiguration
where TReader : SerialReader<TRead>
where TEvent : ISerialEventArgs<TRead>;
}
Toolkit.Foundation/IMicrocontrollerBuilderConfiguration.cs
+10 -8
View File
@@ -1,17 +1,19 @@
namespace Toolkit.Foundation;
public interface IMicrocontrollerBuilderConfiguration
public interface IMicroControllerBuilderConfiguration
{
IReadOnlyCollection<IMicrocontrollerModuleDescriptor> Modules { get; }
IReadOnlyCollection<IMicroControllerModuleDescriptor> Modules { get; }
Func<IServiceProvider, IMicrocontrollerContext> Factory { get; }
Func<IServiceProvider, IMicroControllerContext?> Factory { get; }
}
public interface IMicrocontrollerBuilderConfiguration<TConfiguration, TSerialReader, TRead, TReadDeserializer> :
IMicrocontrollerBuilderConfiguration where TConfiguration : IMicrocontrollerConfiguration, new()
where TSerialReader : SerialReader<TRead> where TReadDeserializer : IMicrocontrollerModuleDeserializer<TRead>, new()
public interface IMicroControllerBuilderConfiguration<TConfiguration, TReader, TRead, IEvent> :
IMicroControllerBuilderConfiguration
where TConfiguration : ISerialConfiguration
where TReader : SerialReader<TRead>
where IEvent : ISerialEventArgs<TRead>
{
IMicrocontrollerBuilderConfiguration<TConfiguration, TSerialReader, TRead, TReadDeserializer> AddModule<TModule>()
where TModule : IMicrocontrollerModule, new();
IMicroControllerBuilderConfiguration<TConfiguration, TReader, TRead, IEvent> AddModule<TModule>()
where TModule : IMicroControllerModule, new();
}
Toolkit.Foundation/IMicrocontrollerConfiguration.cs
-4
View File
@@ -1,4 +0,0 @@
namespace Toolkit.Foundation;
public interface IMicrocontrollerConfiguration :
ISerialConfiguration;
Toolkit.Foundation/IMicrocontrollerContext.cs
+4 -3
View File
@@ -1,6 +1,7 @@
namespace Toolkit.Foundation;
public interface IMicrocontrollerContext<TRead, TModuleDeserializer> :
IMicrocontrollerContext where TModuleDeserializer : IMicrocontrollerModuleDeserializer<TRead>, new();
public interface IMicroControllerContext<TRead, TEvent> :
IMicroControllerContext
where TEvent : ISerialEventArgs<TRead>;
public interface IMicrocontrollerContext;
public interface IMicroControllerContext;
Toolkit.Foundation/IMicrocontrollerFactory.cs
-7
View File
@@ -1,7 +0,0 @@
namespace Toolkit.Foundation;
public interface IMicrocontrollerFactory
{
IMicrocontrollerContext<TRead, TReadDeserializer> Create<TSerialReader, TRead, TReadDeserializer>(IMicrocontrollerConfiguration configuration, IReadOnlyCollection<IMicrocontrollerModuleDescriptor> modules)
where TSerialReader : SerialReader<TRead> where TReadDeserializer : IMicrocontrollerModuleDeserializer<TRead>, new();
}
Toolkit.Foundation/IMicrocontrollerModule.cs
+1 -1
View File
@@ -1,3 +1,3 @@
namespace Toolkit.Foundation;
public interface IMicrocontrollerModule;
public interface IMicroControllerModule;
Toolkit.Foundation/IMicrocontrollerModuleDescriptor.cs
+4 -3
View File
@@ -1,12 +1,13 @@
namespace Toolkit.Foundation;
public interface IMicrocontrollerModuleDescriptor<TModule> :
IMicrocontrollerModuleDescriptor where TModule : IMicrocontrollerModule
public interface IMicroControllerModuleDescriptor<TModule> :
IMicroControllerModuleDescriptor
where TModule : IMicroControllerModule
{
Func<TModule>? Factory { get; }
}
public interface IMicrocontrollerModuleDescriptor
public interface IMicroControllerModuleDescriptor
{
Type Type { get; }
}
Toolkit.Foundation/IMicrocontrollerModuleDeserializer.cs
-6
View File
@@ -1,6 +0,0 @@
namespace Toolkit.Foundation;
public interface IMicrocontrollerModuleDeserializer<TRead>
{
public TRead? Read { get; set; }
}
Toolkit.Foundation/ISerialContext.cs
+3 -2
View File
@@ -1,7 +1,8 @@
namespace Toolkit.Foundation;
public interface ISerialContext<TSerialReader, TContent> :
ISerialContext where TSerialReader : SerialReader<TContent>;
public interface ISerialContext<TReader, TRead> :
ISerialContext
where TReader : SerialReader<TRead>;
public interface ISerialContext
{
Toolkit.Foundation/ISerialEventArgs.cs
+3
View File
@@ -0,0 +1,3 @@
namespace Toolkit.Foundation;
public interface ISerialEventArgs<TRead>;
Toolkit.Foundation/ISerialFactory.cs
+3 -2
View File
@@ -2,6 +2,7 @@
public interface ISerialFactory
{
ISerialContext<TSerialReader, TContent> Create<TSerialReader, TContent>(ISerialConfiguration configuration)
where TSerialReader : SerialReader<TContent>;
ISerialContext<TReader, TRead>? Create<TConfiguration, TReader, TRead>()
where TConfiguration : ISerialConfiguration
where TReader : SerialReader<TRead>;
}
Toolkit.Foundation/MicroControllerContextFactory.cs
+35
View File
@@ -0,0 +1,35 @@
using Microsoft.Extensions.DependencyInjection;
namespace Toolkit.Foundation;
public class MicroControllerContextFactory(IServiceProvider provider,
IServiceFactory factory,
ISerialFactory serialFactory) :
IMicroControllerContextFactory
{
private readonly Dictionary<ISerialConfiguration, IMicroControllerContext> cache = [];
public IMicroControllerContext<TRead, THandler>? Create<TConfiguration, TReader, TRead, THandler>(IReadOnlyCollection<IMicroControllerModuleDescriptor> modules)
where TConfiguration : ISerialConfiguration
where TReader : SerialReader<TRead>
where THandler : ISerialEventArgs<TRead>
{
if (provider.GetRequiredService<TConfiguration>() is TConfiguration configuration)
{
if (cache.TryGetValue(configuration, out IMicroControllerContext? context))
{
return (IMicroControllerContext<TRead, THandler>)context;
}
if (serialFactory.Create<TConfiguration, TReader, TRead>() is ISerialContext<TReader, TRead> serialContext)
{
context = factory.Create<MicroControllerContext<TRead, THandler>>(modules, serialContext);
cache.Add(configuration, context);
return (IMicroControllerContext<TRead, THandler>)context;
}
}
return default;
}
}
Toolkit.Foundation/MicrocontrollerBuilder.cs
+11 -12
View File
@@ -1,22 +1,21 @@
using Microsoft.Extensions.Configuration;
using System.Collections.ObjectModel;
using System.Collections.ObjectModel;
namespace Toolkit.Foundation;
public class MicrocontrollerBuilder :
IMicrocontrollerBuilder
public class MicroControllerBuilder :
IMicroControllerBuilder
{
private readonly List<IMicrocontrollerBuilderConfiguration> configurations = [];
private readonly List<IMicroControllerBuilderConfiguration> configurations = [];
public IReadOnlyCollection<IMicrocontrollerBuilderConfiguration> Configurations =>
new ReadOnlyCollection<IMicrocontrollerBuilderConfiguration>(configurations);
public IReadOnlyCollection<IMicroControllerBuilderConfiguration> Configurations =>
new ReadOnlyCollection<IMicroControllerBuilderConfiguration>(configurations);
public IMicrocontrollerBuilderConfiguration<TConfiguration, TSerialReader, TRead, TReadDeserializer> Add<TConfiguration, TSerialReader, TRead, TReadDeserializer>(IConfiguration configuration)
where TConfiguration : IMicrocontrollerConfiguration, new()
where TSerialReader : SerialReader<TRead>
where TReadDeserializer : IMicrocontrollerModuleDeserializer<TRead>, new()
public IMicroControllerBuilderConfiguration<TConfiguration, TReader, TRead, TEvent> Add<TConfiguration, TReader, TRead, TEvent>()
where TConfiguration : ISerialConfiguration
where TReader : SerialReader<TRead>
where TEvent : ISerialEventArgs<TRead>
{
MicrocontrollerBuilderConfiguration<TConfiguration, TSerialReader, TRead, TReadDeserializer>? builderConfiguration = new(configuration);
MicroControllerBuilderConfiguration<TConfiguration, TReader, TRead, TEvent>? builderConfiguration = new();
configurations.Add(builderConfiguration);
return builderConfiguration;
Toolkit.Foundation/MicrocontrollerBuilderConfiguration.cs
+13 -12
View File
@@ -1,24 +1,25 @@
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.DependencyInjection;
using System.Collections.ObjectModel;
namespace Toolkit.Foundation;
public class MicrocontrollerBuilderConfiguration<TConfiguration, TSerialReader, TRead, TReadDeserializer>(IConfiguration configuration) :
IMicrocontrollerBuilderConfiguration<TConfiguration, TSerialReader, TRead, TReadDeserializer>
where TConfiguration : IMicrocontrollerConfiguration, new()
where TSerialReader : SerialReader<TRead> where TReadDeserializer : IMicrocontrollerModuleDeserializer<TRead>, new()
public class MicroControllerBuilderConfiguration<TConfiguration, TReader, TRead, TEvent> :
IMicroControllerBuilderConfiguration<TConfiguration, TReader, TRead, TEvent>
where TConfiguration : ISerialConfiguration
where TReader : SerialReader<TRead>
where TEvent : ISerialEventArgs<TRead>
{
private readonly List<IMicrocontrollerModuleDescriptor> modules = new();
private readonly List<IMicroControllerModuleDescriptor> modules = [];
public Func<IServiceProvider, IMicrocontrollerContext> Factory => (IServiceProvider provider) => provider.GetService<IMicrocontrollerFactory>()!.Create<TSerialReader, TRead, TReadDeserializer>(configuration.Get<TConfiguration>(), Modules);
public Func<IServiceProvider, IMicroControllerContext?> Factory => (IServiceProvider provider) => provider.GetService<IMicroControllerContextFactory>()!
.Create<TConfiguration, TReader, TRead, TEvent>(Modules);
public IReadOnlyCollection<IMicrocontrollerModuleDescriptor> Modules => new ReadOnlyCollection<IMicrocontrollerModuleDescriptor>(modules);
public IReadOnlyCollection<IMicroControllerModuleDescriptor> Modules => new ReadOnlyCollection<IMicroControllerModuleDescriptor>(modules);
public IMicrocontrollerBuilderConfiguration<TConfiguration, TSerialReader, TRead, TReadDeserializer> AddModule<TModule>()
where TModule : IMicrocontrollerModule, new()
public IMicroControllerBuilderConfiguration<TConfiguration, TReader, TRead, TEvent> AddModule<TModule>()
where TModule : IMicroControllerModule, new()
{
modules.Add(new MicrocontrollerModuleDescriptor<TModule>());
modules.Add(new MicroControllerModuleDescriptor<TModule>());
return this;
}
}
Toolkit.Foundation/MicrocontrollerConfiguration.cs
+2 -2
View File
@@ -2,8 +2,8 @@
namespace Toolkit.Foundation;
public class MicrocontrollerConfiguration :
IMicrocontrollerConfiguration
public class MicroControllerConfiguration :
ISerialConfiguration
{
[NotNull]
public string? PortName { get; set; }
Toolkit.Foundation/MicrocontrollerContext.cs
+3 -2
View File
@@ -2,10 +2,11 @@
namespace Toolkit.Foundation;
public class MicrocontrollerContext<TRead, TReadDeserializer>(IReadOnlyCollection<IMicrocontrollerModuleDescriptor> modules,
public class MicroControllerContext<TRead, TEvent>(IReadOnlyCollection<IMicroControllerModuleDescriptor> modules,
IMessenger messenger,
ISerialContext serialContext) :
IMicrocontrollerContext<TRead, TReadDeserializer> where TReadDeserializer : IMicrocontrollerModuleDeserializer<TRead>, new()
IMicroControllerContext<TRead, TEvent>
where TEvent : ISerialEventArgs<TRead>
{
public async Task InitializeAsync()
{
Toolkit.Foundation/MicrocontrollerFactory.cs
-23
View File
@@ -1,23 +0,0 @@
namespace Toolkit.Foundation;
public class MicrocontrollerFactory(IServiceFactory factory,
ISerialFactory serialFactory) :
IMicrocontrollerFactory
{
private readonly Dictionary<ISerialConfiguration, IMicrocontrollerContext> cache = new();
public IMicrocontrollerContext<TRead, TReadDeserializer> Create<TSerialReader, TRead, TReadDeserializer>(IMicrocontrollerConfiguration configuration, IReadOnlyCollection<IMicrocontrollerModuleDescriptor> modules) where TSerialReader : SerialReader<TRead> where TReadDeserializer : IMicrocontrollerModuleDeserializer<TRead>, new()
{
if (cache.TryGetValue(configuration, out IMicrocontrollerContext? context))
{
return (IMicrocontrollerContext<TRead, TReadDeserializer>)context;
}
ISerialContext<TSerialReader, TRead> serialContext = serialFactory.Create<TSerialReader, TRead>(configuration);
context = factory.Create<MicrocontrollerContext<TRead, TReadDeserializer>>(modules, serialContext);
cache.Add(configuration, context);
return (IMicrocontrollerContext<TRead, TReadDeserializer>)context;
}
}
Toolkit.Foundation/MicrocontrollerModuleDescriptor.cs
+2 -2
View File
@@ -1,7 +1,7 @@
namespace Toolkit.Foundation;
public record MicrocontrollerModuleDescriptor<TModule> :
IMicrocontrollerModuleDescriptor<TModule> where TModule : IMicrocontrollerModule, new()
public record MicroControllerModuleDescriptor<TModule> :
IMicroControllerModuleDescriptor<TModule> where TModule : IMicroControllerModule, new()
{
public Type Type => typeof(TModule);
Toolkit.Foundation/SerialFactory.cs
+26 -18
View File
@@ -1,31 +1,39 @@
using System.IO.Ports;
using Microsoft.Extensions.DependencyInjection;
using System.IO.Ports;
namespace Toolkit.Foundation;
public class SerialFactory(IServiceFactory factory) :
public class SerialFactory(IServiceProvider provider,
IServiceFactory factory) :
ISerialFactory
{
private readonly Dictionary<ISerialConfiguration, ISerialContext> cache = [];
public ISerialContext<TSerialReader, TContent> Create<TSerialReader, TContent>(ISerialConfiguration configuration)
where TSerialReader : SerialReader<TContent>
public ISerialContext<TReader, TRead>? Create<TConfiguration, TReader, TRead>()
where TConfiguration : ISerialConfiguration
where TReader : SerialReader<TRead>
{
if (cache.TryGetValue(configuration, out ISerialContext? context))
if (provider.GetRequiredService<TConfiguration>() is TConfiguration configuration)
{
return (ISerialContext<TSerialReader, TContent>)context;
if (cache.TryGetValue(configuration, out ISerialContext? context))
{
return (ISerialContext<TReader, TRead>)context;
}
SerialPort serialPort = new(configuration.PortName, configuration.BaudRate)
{
DtrEnable = true
};
SerialConnection connection = new(serialPort);
SerialStreamer streamer = new(serialPort);
context = factory.Create<SerialContext<TReader, TRead>>(connection, streamer);
cache.Add(configuration, context);
return (ISerialContext<TReader, TRead>)context;
}
SerialPort serialPort = new(configuration.PortName, configuration.BaudRate)
{
DtrEnable = true
};
SerialConnection connection = new(serialPort);
SerialStreamer streamer = new(serialPort);
context = factory.Create<SerialContext<TSerialReader, TContent>>(connection, streamer);
cache.Add(configuration, context);
return (ISerialContext<TSerialReader, TContent>)context;
return default;
}
}
Toolkit.Foundation/SerialReader.cs
+2 -2
View File
@@ -1,8 +1,8 @@
namespace Toolkit.Foundation;
public abstract class SerialReader<TContent>(Stream stream)
public abstract class SerialReader<TRead>(Stream stream)
{
public Stream Stream { get; } = stream;
public abstract IAsyncEnumerable<TContent> ReadAsync();
public abstract IAsyncEnumerable<TRead> ReadAsync();
}