Tidying up the PR

Backend/IPluginFactory.cs

@@ -5,5 +5,6 @@ namespace Slipstream.Backend
     public interface IPluginFactory
     {
         IPlugin CreatePlugin(string id, string name);
+        IPlugin CreatePlugin<T>(string pluginId, string name, T configuration);
     }
 }

Backend/IPluginManager.cs

@@ -14,6 +14,6 @@ public interface IPluginManager : IDisposable
         public void DisablePlugin(IPlugin p);
         public void FindPluginAndExecute(string pluginId, Action<IPlugin> a);
         public void ForAllPluginsExecute(Action<IPlugin> a);
-        void RestartReconfigurablePlugins();
+        public void RestartReconfigurablePlugins();
     }
 }

Backend/PluginManager.cs

@@ -190,7 +190,7 @@ public IPlugin CreatePlugin(string id, string name)
             return name switch
             {
                 "FileMonitorPlugin" => new FileMonitorPlugin(id, EventFactory, EventBus, ApplicationConfiguration),
-                "FileTriggerPlugin" => new FileTriggerPlugin(id, EventFactory, EventBus, StateService, this),
+                "FileTriggerPlugin" => new FileTriggerPlugin(id, EventFactory, EventBus, this, this),
                 "AudioPlugin" => new AudioPlugin(id, EventFactory, EventBus, ApplicationConfiguration),
                 "IRacingPlugin" => new IRacingPlugin(id, EventFactory, EventBus),
                 "TwitchPlugin" => new TwitchPlugin(id, EventFactory, EventBus, ApplicationConfiguration),
@@ -200,6 +200,17 @@ public IPlugin CreatePlugin(string id, string name)
             };
         }
 
+        public IPlugin CreatePlugin<T>(string pluginId, string name, T configuration)
+        {
+            return name switch
+            {
+#pragma warning disable CS8604 // Possible null reference argument.
+                "LuaPlugin" when configuration is ILuaConfiguration => new LuaPlugin(pluginId, EventFactory, EventBus, StateService, configuration as ILuaConfiguration),
+#pragma warning restore CS8604 // Possible null reference argument.
+                _ => throw new Exception($"Unknown configurable plugin '{name}'"),
+            };
+        }
+
         public void Dispose()
         {
             lock(Plugins)

Backend/Plugins/BasePlugin.cs

@@ -36,7 +36,7 @@ public bool Enabled
         public bool PendingOnDisable { get { return pendingOnDisable; } set { pendingOnDisable = value; } }
 
         public event IPlugin.OnStateChangedHandler? OnStateChanged;
-        public bool Reconfigurable { get; protected set; }
+        public bool Reconfigurable { get; private set; }
 
         public string WorkerName
         {

Backend/Plugins/FileTriggerPlugin.cs

@@ -1,7 +1,5 @@
-using Slipstream.Backend.Services;
-using Slipstream.Shared;
+using Slipstream.Shared;
 using System.Collections.Generic;
-//using System.Diagnostics;
 using System.IO;
 using EventHandler = Slipstream.Shared.EventHandler;
 
@@ -13,8 +11,8 @@ class FileTriggerPlugin : BasePlugin
     {
         private readonly IEventFactory EventFactory;
         private readonly IEventBus EventBus;
-        private readonly IStateService StateService;
         private readonly IPluginManager PluginManager;
+        private readonly IPluginFactory PluginFactory;
         private readonly IDictionary<string, IPlugin> Scripts = new Dictionary<string, IPlugin>();
 
         // At bootup we will receive zero or more FileCreated events ending with a ScanCompleted. 
@@ -23,12 +21,12 @@ class FileTriggerPlugin : BasePlugin
         private bool BootUp = true;
         private readonly List<string> WaitingForLuaScripts = new List<string>();
 
-        public FileTriggerPlugin(string id, IEventFactory eventFactory, IEventBus eventBus, IStateService stateService, IPluginManager pluginManager) : base(id, "FileTriggerPlugin", "FileTriggerPlugin", "Core")
+        public FileTriggerPlugin(string id, IEventFactory eventFactory, IEventBus eventBus, IPluginManager pluginManager, IPluginFactory pluginFactory) : base(id, "FileTriggerPlugin", "FileTriggerPlugin", "Core")
         {
             EventFactory = eventFactory;
             EventBus = eventBus;
-            StateService = stateService;
             PluginManager = pluginManager;
+            PluginFactory = pluginFactory;
 
             EventHandler.OnFileMonitorFileCreated += EventHandler_OnFileMonitorFileCreated;
             EventHandler.OnFileMonitorFileDeleted += EventHandler_OnFileMonitorFileDeleted;
@@ -78,8 +76,9 @@ private void NewFile(string filePath)
                 WaitingForLuaScripts.Add(pluginId);
             }
 
-            // Use PluginManager director
-            var plugin = new LuaPlugin(pluginId, EventFactory, EventBus, StateService, new LuaConfiguration { FilePath = filePath });
+
+            var plugin = PluginFactory.CreatePlugin(pluginId, "LuaPlugin", (ILuaConfiguration)new LuaConfiguration { FilePath = filePath });
+
             PluginManager.RegisterPlugin(plugin);
             PluginManager.EnablePlugin(plugin);
 
@@ -95,6 +94,8 @@ private void DeletedFile(string filePath)
 
         private void EventHandler_OnFileMonitorFileRenamed(EventHandler source, EventHandler.EventHandlerArgs<Shared.Events.FileMonitor.FileMonitorFileRenamed> e)
         {
+            // If we're been unregistered (while app is running) and re-registered,we need to ignore these events
+            // until we're ready (received the FileMonitorScanCompleted). We need to revisit this later.
             if (e.Event.FilePath == null || e.Event.OldFilePath == null || BootUp)
                 return;
 

Backend/Services/ILuaSevice.cs

@@ -0,0 +1,9 @@
+#nullable enable
+
+namespace Slipstream.Backend.Services
+{
+    public interface ILuaSevice
+    {
+        ILuaContext Parse(string filename, string logPrefix);
+    }
+}

Backend/Services/LuaService.cs

@@ -5,11 +5,6 @@
 
 namespace Slipstream.Backend.Services
 {
-    public interface ILuaSevice
-    {
-        ILuaContext Parse(string filename, string logPrefix);
-    }
-
     public class LuaService : ILuaSevice
     {
         private readonly IEventFactory EventFactory;

Slipstream.csproj

@@ -141,6 +141,7 @@
     <Compile Include="Backend\Plugins\BasePlugin.cs" />
     <Compile Include="Backend\Plugins\TwitchPlugin.cs" />
     <Compile Include="Backend\Services\IEventSerdeService.cs" />
+    <Compile Include="Backend\Services\ILuaSevice.cs" />
     <Compile Include="Backend\Services\IStateService.cs" />
     <Compile Include="Backend\Services\EventSerdeService.cs" />
     <Compile Include="Backend\Services\ITxrxService.cs" />