Merge pull request #30 from longkerdandy/feature/fix-message-ordering

Fix message ordering and improve dependency injection

Author: longkerdandy

.gitignore

@@ -60,4 +60,7 @@ nunit-*.xml
 !.idea/codeStyles/
 
 # VS Code IDE
-.vscode/
+.vscode/
+
+# Trae IDE
+.trae/

SparklerNet.Samples/Program.cs

@@ -1,5 +1,9 @@
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
 using Serilog;
 using Serilog.Extensions.Logging;
+using SparklerNet.HostApplication;
+using SparklerNet.HostApplication.Caches;
 using SparklerNet.Samples.Profiles;
 
 namespace SparklerNet.Samples;
@@ -26,9 +30,35 @@ public static async Task Main(string[] args)
         var mqttOptions = profile.GetMqttClientOptions();
         var sparkplugOptions = profile.GetSparkplugClientOptions();
 
-        // Create logger factory and host application
+        // Create the logger factory
         using var loggerFactory = new SerilogLoggerFactory(Log.Logger);
-        var hostApp = new SimpleHostApplication(mqttOptions, sparkplugOptions, loggerFactory);
+
+        // Create the dependency injection container
+        var services = new ServiceCollection();
+
+        // Register the singleton services
+        services.AddSingleton(mqttOptions);
+        services.AddSingleton(sparkplugOptions);
+        services.AddSingleton(loggerFactory);
+        services.AddSingleton<ILoggerFactory>(loggerFactory);
+        
+        // Register cache services
+        services.AddMemoryCache();
+        services.AddHybridCache();
+
+        // Register the SparklerNet services
+        services.AddSingleton<IMessageOrderingService, MessageOrderingService>();
+        services.AddSingleton<IStatusTrackingService, StatusTrackingService>();
+        services.AddSingleton<SparkplugHostApplication>();
+
+        // Register the SimpleHostApplication
+        services.AddSingleton<SimpleHostApplication>();
+
+        // Build service provider
+        var serviceProvider = services.BuildServiceProvider();
+
+        // Resolve SimpleHostApplication from the container
+        var hostApp = serviceProvider.GetRequiredService<SimpleHostApplication>();
         hostApp.SubscribeToEvents();
 
         // Handle console input and process commands

SparklerNet.Samples/SimpleHostApplication.cs

@@ -3,7 +3,6 @@
 using SparklerNet.Core.Constants;
 using SparklerNet.Core.Events;
 using SparklerNet.Core.Model;
-using SparklerNet.Core.Options;
 using SparklerNet.HostApplication;
 using SparklerNet.HostApplication.Extensions;
 using static SparklerNet.Core.Constants.SparkplugMessageType;
@@ -22,13 +21,11 @@ public class SimpleHostApplication
     /// <summary>
     ///     Initializes a new instance of the SimpleHostApplication class.
     /// </summary>
-    /// <param name="mqttOptions">MQTT client options</param>
-    /// <param name="sparkplugOptions">Sparkplug client options</param>
-    /// <param name="loggerFactory">Logger factory to create required loggers</param>
-    public SimpleHostApplication(MqttClientOptions mqttOptions, SparkplugClientOptions sparkplugOptions,
-        ILoggerFactory loggerFactory)
+    /// <param name="hostApplication">The Sparkplug Host Application instance.</param>
+    /// <param name="loggerFactory">Logger factory to create required loggers.</param>
+    public SimpleHostApplication(SparkplugHostApplication hostApplication, ILoggerFactory loggerFactory)
     {
-        _hostApplication = new SparkplugHostApplication(mqttOptions, sparkplugOptions, loggerFactory);
+        _hostApplication = hostApplication;
         _logger = loggerFactory.CreateLogger<SimpleHostApplication>();
         _isRunning = false;
     }

SparklerNet.Samples/SparklerNet.Samples.csproj

@@ -8,11 +8,12 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\SparklerNet\SparklerNet.csproj"/>
-        <PackageReference Include="Serilog" Version="4.3.0"/>
-        <PackageReference Include="Serilog.Sinks.Console" Version="6.1.1"/>
-        <PackageReference Include="Serilog.Extensions.Logging" Version="9.0.2"/>
-        <PackageReference Include="MQTTnet" Version="5.0.1.1416"/>
+        <ProjectReference Include="..\SparklerNet\SparklerNet.csproj" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.10" />
+        <PackageReference Include="MQTTnet" Version="5.0.1.1416" />
+        <PackageReference Include="Serilog" Version="4.3.0" />
+        <PackageReference Include="Serilog.Sinks.Console" Version="6.1.1" />
+        <PackageReference Include="Serilog.Extensions.Logging" Version="9.0.2" />
     </ItemGroup>
 
 </Project>