fix(core): plugin double load, double unload

Author: Kxnrl

Core/Bootstrap.cs

@@ -9,25 +9,31 @@
 using System.IO;
 using System.Reflection;
 using System.Runtime.InteropServices;
-using System.Threading;
 using System.Threading.Tasks;
 
 namespace SourceSharp.Core;
 
 public static class Bootstrap
 {
-    private static readonly CancellationTokenSource CancellationTokenSource = new();
+    private static bool _isShutdown;
+    private static Task? _signalTask;
 
     [UnmanagedCallersOnly]
     public static int InitializeSourceSharp() => Initialize();
 
     [UnmanagedCallersOnly]
-    public static void ShutdownSourceSharp() => CancellationTokenSource.Cancel(false);
+    public static void ShutdownSourceSharp()
+    {
+        _isShutdown = true;
+        _signalTask?.Wait();
+    }
 
     public static int InitializeTest() => Initialize();
 
     private static int Initialize()
     {
+        _isShutdown = false;
+
         try
         {
             var root = Path.Combine(Path.GetDirectoryName(
@@ -50,6 +56,9 @@ private static int Initialize()
                 ValidateScopes = true
             });
 
+            Console.WriteLine("MaxClients is " + Bridges.SourceSharp.GetMaxClients());
+            Console.WriteLine("MaxHumanPlayers is " + Bridges.SourceSharp.GetMaxHumanPlayers());
+
             Boot(serviceProvider);
 
             return 0;
@@ -97,7 +106,7 @@ private static void Boot(IServiceProvider services)
         // export caller invoker
         Invoker.Initialize(services);
 
-        Task.Run(async () => await SignalThread(services));
+        _signalTask = Task.Run(async () => await SignalThread(services));
     }
 
     private static async Task SignalThread(IServiceProvider services)
@@ -108,19 +117,18 @@ private static async Task SignalThread(IServiceProvider services)
         {
             await Task.Delay(TimeSpan.FromMicroseconds(1));
 
-            if (!CancellationTokenSource.IsCancellationRequested)
+            if (_isShutdown)
             {
-                pluginManager.Signal();
-                continue;
+                // Shutdown !!!
+                foreach (var module in services.GetAllServices<IModuleBase>())
+                {
+                    module.Shutdown();
+                }
+                services.GetRequiredService<IPluginManager>().Shutdown();
+                return;
             }
 
-            // Shutdown !!!
-            foreach (var module in services.GetAllServices<IModuleBase>())
-            {
-                module.Shutdown();
-            }
-            services.GetRequiredService<IPluginManager>().Shutdown();
-            break;
+            pluginManager.Signal();
         }
     }
 }

Core/PluginManager.cs

@@ -98,9 +98,6 @@ public void Initialize()
                 {
                     listener.OnPluginLoad(plugin);
                 }
-
-                _plugins.Add(plugin);
-                // _sourceSharp.PrintLine($"Plugin <{name}> checked.");
             }
             catch (Exception e)
             {
@@ -139,7 +136,7 @@ public void Shutdown()
     {
         foreach (var plugin in _plugins)
         {
-            UnloadPlugin(plugin);
+            UnloadPlugin(plugin, false);
         }
 
         _plugins.Clear();
@@ -184,7 +181,7 @@ private void LoadPlugin(CPlugin plugin)
         }
     }
 
-    private void UnloadPlugin(CPlugin plugin)
+    private void UnloadPlugin(CPlugin plugin, bool remove)
     {
         try
         {
@@ -208,7 +205,11 @@ private void UnloadPlugin(CPlugin plugin)
             plugin.Instance.OnShutdown();
             plugin.Loader.Dispose();
             plugin.UpdateStatus(PluginStatus.None);
-            _plugins.Remove(plugin);
+
+            if (remove)
+            {
+                _plugins.Remove(plugin);
+            }
         }
         catch (Exception e)
         {