Merge branch 'beta' of https://github.com/swiftly-solution/swiftlys2 into beta

Author: skuzzis

managed/src/SwiftlyS2.Core/Hosting/PluginManagerInjection.cs

@@ -13,6 +13,6 @@ public static IServiceCollection AddPluginManager( this IServiceCollection self
 
     public static void UsePluginManager( this IServiceProvider self )
     {
-        _ = self.GetRequiredService<PluginManager>();
+        self.GetRequiredService<PluginManager>().Initialize();
     }
 }

managed/src/SwiftlyS2.Core/Modules/Plugins/PluginManager.cs

@@ -150,7 +150,13 @@ static async Task WaitForFileAccess( CancellationToken token, string filePath, i
                 ? Assembly.GetExecutingAssembly()
                 : AppDomain.CurrentDomain.GetAssemblies().FirstOrDefault(a => loadingAssemblyName == a.GetName().Name);
         };
+    }
 
+    /// <summary>
+    /// Must be called after DI container is fully built to avoid circular dependency.
+    /// </summary>
+    internal void Initialize()
+    {
         LoadExports();
         LoadPlugins();
     }

managed/src/SwiftlyS2.Core/Modules/Plugins/SwiftlyCore.cs

@@ -81,7 +81,7 @@ internal class SwiftlyCore : ISwiftlyCore, IDisposable
     public string ContextBasePath { get; init; }
     public string PluginDataDirectory { get; init; }
     public GameFileSystem GameFileSystem { get; init; }
-    // public PluginManager PluginManager { get; set; }
+    public PluginManager PluginManager { get; set; }
     public SwiftlyCore( string contextId, string contextBaseDirectory, PluginMetadata? pluginManifest, Type contextType, IServiceProvider coreProvider, string pluginDataDirectory )
     {
 
@@ -94,7 +94,7 @@ public SwiftlyCore( string contextId, string contextBaseDirectory, PluginMetadat
             .AddSingleton(this)
             .AddSingleton<ISwiftlyCore>(this)
             .AddSingleton(coreProvider.GetRequiredService<ProfileService>())
-            // .AddSingleton(coreProvider.GetRequiredService<PluginManager>())
+            .AddSingleton(coreProvider.GetRequiredService<PluginManager>())
             .AddSingleton(coreProvider.GetRequiredService<ConfigurationService>())
             .AddSingleton(coreProvider.GetRequiredService<HookManager>())
             .AddSingleton(coreProvider.GetRequiredService<PlayerManagerService>())
@@ -141,7 +141,7 @@ public SwiftlyCore( string contextId, string contextBaseDirectory, PluginMetadat
             .AddSingleton<IContextedProfilerService>(provider => provider.GetRequiredService<ContextedProfilerService>())
             .AddSingleton<ISchedulerService>(provider => provider.GetRequiredService<SchedulerService>())
             .AddSingleton<IEngineService>(provider => provider.GetRequiredService<EngineService>())
-            // .AddSingleton<IPluginManager>(provider => provider.GetRequiredService<PluginManager>())
+            .AddSingleton<IPluginManager>(provider => provider.GetRequiredService<PluginManager>())
             .AddSingleton<ITraceManager>(provider => provider.GetRequiredService<TraceManager>())
             .AddSingleton<IDatabaseService>(provider => provider.GetRequiredService<DatabaseService>())
             .AddSingleton<ITranslationService>(provider => provider.GetRequiredService<TranslationService>())
@@ -185,7 +185,7 @@ public SwiftlyCore( string contextId, string contextBaseDirectory, PluginMetadat
         GameService = serviceProvider.GetRequiredService<GameService>();
         Logger = LoggerFactory.CreateLogger(contextType);
         GameFileSystem = serviceProvider.GetRequiredService<GameFileSystem>();
-        // PluginManager = serviceProvider.GetRequiredService<PluginManager>();
+        PluginManager = serviceProvider.GetRequiredService<PluginManager>();
     }
 
     public void InitializeType( Type type )
@@ -232,7 +232,7 @@ public void Dispose()
     IHelpers ISwiftlyCore.Helpers => Helpers;
     IGameService ISwiftlyCore.Game => GameService;
     IGameFileSystem ISwiftlyCore.GameFileSystem => GameFileSystem;
-    // IPluginManager ISwiftlyCore.PluginManager => PluginManager;
+    IPluginManager ISwiftlyCore.PluginManager => PluginManager;
     string ISwiftlyCore.PluginPath => ContextBasePath;
     string ISwiftlyCore.PluginDataDirectory => PluginDataDirectory;
     string ISwiftlyCore.CSGODirectory => NativeEngineHelpers.GetCSGODirectoryPath();

managed/src/SwiftlyS2.Shared/ISwiftlyCore.cs

@@ -167,10 +167,11 @@ public interface ISwiftlyCore
     /// Game file system interface.
     /// </summary>
     public IGameFileSystem GameFileSystem { get; }
+
     /// <summary>
     /// Plugin manager.
     /// </summary>
-    // public IPluginManager PluginManager { get; }
+    public IPluginManager PluginManager { get; }
 
     /// <summary>
     /// Gets the file path to the plugin directory.

managed/src/SwiftlyS2.Shared/SwiftlyCoreInjection.cs

@@ -9,41 +9,42 @@ public static class SwiftlyCoreInjection
     public static IServiceCollection AddSwiftly( this IServiceCollection self, ISwiftlyCore core, bool addLogger = true, bool addConfiguration = true )
     {
         _ = self
-          .AddSingleton(core)
-          .AddSingleton(core.ConVar)
-          .AddSingleton(core.Command)
-          .AddSingleton(core.Database)
-          .AddSingleton(core.Engine)
-          .AddSingleton(core.EntitySystem)
-          .AddSingleton(core.Event)
-          .AddSingleton(core.GameData)
-          .AddSingleton(core.GameEvent)
-          .AddSingleton(core.Localizer)
-          .AddSingleton(core.Memory)
-          .AddSingleton(core.NetMessage)
-          .AddSingleton(core.Permission)
-          .AddSingleton(core.PlayerManager)
-          .AddSingleton(core.Profiler)
-          .AddSingleton(core.Scheduler)
-          .AddSingleton(core.Trace)
-          .AddSingleton(core.MenusAPI)
-          .AddSingleton(core.CommandLine)
-          .AddSingleton(core.GameFileSystem)
-          .AddSingleton(core.Translation);
+            .AddSingleton(core)
+            .AddSingleton(core.ConVar)
+            .AddSingleton(core.Command)
+            .AddSingleton(core.Database)
+            .AddSingleton(core.Engine)
+            .AddSingleton(core.EntitySystem)
+            .AddSingleton(core.Event)
+            .AddSingleton(core.GameData)
+            .AddSingleton(core.GameEvent)
+            .AddSingleton(core.Localizer)
+            .AddSingleton(core.Memory)
+            .AddSingleton(core.NetMessage)
+            .AddSingleton(core.Permission)
+            .AddSingleton(core.PlayerManager)
+            .AddSingleton(core.Profiler)
+            .AddSingleton(core.Scheduler)
+            .AddSingleton(core.Trace)
+            .AddSingleton(core.MenusAPI)
+            .AddSingleton(core.CommandLine)
+            .AddSingleton(core.GameFileSystem)
+            .AddSingleton(core.Translation)
+            .AddSingleton(core.PluginManager);
 
         if (addLogger)
         {
             _ = self
-              .AddSingleton(core.LoggerFactory)
-              .AddSingleton(typeof(ILogger<>), typeof(Logger<>));
+                .AddSingleton(core.LoggerFactory)
+                .AddSingleton(typeof(ILogger<>), typeof(Logger<>));
         }
 
         if (addConfiguration && core.Configuration.BasePathExists)
         {
             _ = self
-              .AddSingleton(core.Configuration)
-              .AddSingleton(core.Configuration.Manager)
-              .AddSingleton<IConfiguration>(provider => provider.GetRequiredService<IConfigurationManager>());
+                .AddSingleton(core.Configuration)
+                .AddSingleton(core.Configuration.Manager)
+                .AddSingleton<IConfiguration>(provider => provider.GetRequiredService<IConfigurationManager>());
         }
 
         return self;