Merge pull request #2 from Hermanest/ms-di-migration

Migrated to Microsoft DI Container.

Author: Hermanest

.dockerignore

@@ -0,0 +1,27 @@
+**/.dockerignore
+**/.env
+**/.git
+**/.gitignore
+**/.project
+**/.settings
+**/.toolstarget
+**/.vs
+**/.vscode
+**/.idea
+**/*.user
+**/*.editorconfig
+**/*.*proj.user
+**/*.dbmdl
+**/*.jfm
+**/azds.yaml
+**/bin
+**/charts
+**/docker-compose*
+**/Dockerfile*
+**/node_modules
+**/npm-debug.log
+**/obj
+**/secrets.dev.yaml
+**/values.dev.yaml
+LICENSE
+README.md

.gitmodules

@@ -0,0 +1,17 @@
+FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
+
+WORKDIR /app
+COPY SabaBot/SabaBot.csproj ./SabaBot/
+
+WORKDIR /app/SabaBot
+RUN dotnet restore
+
+COPY SabaBot/ .
+RUN dotnet publish "SabaBot.csproj" --configuration Release --runtime linux-x64 -o /app/publish
+
+FROM mcr.microsoft.com/dotnet/runtime:9.0 AS final
+
+WORKDIR /app
+COPY --from=build /app/publish/ .
+
+ENTRYPOINT ["dotnet", "SabaBot.dll"]

Dockerfile

@@ -1,5 +1,7 @@
-using Newtonsoft.Json;
-using Zenject;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
+using Newtonsoft.Json;
+using SabaBot.Database;
 
 namespace SabaBot;
 
@@ -14,16 +16,22 @@ internal static class Application {
         "your-llama-prompt-here"
     );
 
-    private static readonly DiContainer applicationContainer = new();
     private static readonly TaskCompletionSource taskCompletionSource = new();
 
     private static async Task Main(string[] args) {
-        //loading config
+        // Loading config
         var path = args.Length > 0 ? args[0] : DefaultConfigPath;
         if (!TryLoadConfig(path, out var config)) return;
-        //installing
-        applicationContainer.Bind<ApplicationConfig>().FromInstance(config!).AsSingle();
-        applicationContainer.Install<ApplicationInstaller>();
+
+        // Installing
+        var services = new ServiceCollection();
+        services.AddSingleton(config!);
+        var provider = ApplicationInstaller.Install(services);
+
+        // Migrating the DB if needed
+        var db = provider.GetRequiredService<ApplicationContext>();
+        await db.Database.MigrateAsync();
+
         await taskCompletionSource.Task;
     }
 
@@ -42,6 +50,32 @@ private static bool TryLoadConfig(string path, out ApplicationConfig? config) {
         try {
             var json = File.ReadAllText(path);
             config = JsonConvert.DeserializeObject<ApplicationConfig>(json);
+
+            if (config == null) {
+                throw new Exception("Deserialization failure");
+            }
+
+            // Note that Path.Combine takes into account rooted paths, so:
+            // /home + /config.json = /config.json
+            // /home + config.json = /home/config.json
+
+            var configDir = Path.GetDirectoryName(path) ?? string.Empty;
+            var dbAddress = config.DbAddress;
+
+            {
+                var dbFile = Path.Combine(configDir, dbAddress);
+
+                // DB can be either a path or a network address, so we check if the file exists first
+                if (File.Exists(dbFile)) {
+                    dbAddress = dbFile;
+                }
+            }
+
+            config = config with {
+                DbAddress = dbAddress,
+                LocalizationFile = Path.Combine(configDir, config.LocalizationFile)
+            };
+
             return true;
         } catch (Exception ex) {
             Console.WriteLine($"Unable to load config:\n{ex}");

SabaBot/Application.cs

@@ -1,66 +1,67 @@
 using Discord;
 using Discord.Interactions;
-using Discord.Rest;
 using Discord.WebSocket;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using SabaBot.Database;
-using Zenject;
 
 namespace SabaBot;
 
-internal class ApplicationInstaller : Installer {
-    public override void InstallBindings() {
-        //adapters
-        Container.BindInterfacesAndSelfTo<ZenjectServiceScopeFactory>().AsSingle().Lazy();
-        Container.BindInterfacesAndSelfTo<ZenjectServiceProvider>().AsSingle().Lazy();
-        //base dependencies
+internal static class ApplicationInstaller {
+    public static ServiceProvider Install(IServiceCollection services) {
+        // Base dependencies
         var config = new DiscordSocketConfig {
             GatewayIntents = GatewayIntents.AllUnprivileged | GatewayIntents.MessageContent,
             MessageCacheSize = 1000
         };
+
         var socketClient = new DiscordSocketClient(config);
-        Container.Bind<DiscordSocketClient>().FromInstance(socketClient).AsSingle().Lazy();
-        Container.Bind<DiscordRestClient>().FromInstance(socketClient.Rest).AsSingle().Lazy();
-        Container.Bind<InteractionService>().AsSingle().Lazy();
-        Container.Bind<ApplicationContext>().AsSingle().Lazy();
-        //logging
-        InstallLogger();
-        //services
-        InstallServices();
-        //installing apis
-        InstallAPI();
-        //starting
-        Container.Bind<ModuleLoader>().AsSingle().NonLazy();
-        Container.Bind<Bootstrapper>().AsSingle().NonLazy();
-        //a little workaround to start non-lazy bindings
-        Bootstrap();
-    }
+        services.AddSingleton(socketClient);
+        services.AddSingleton(socketClient.Rest);
 
-    private void InstallAPI() {
-        Container.Bind<HttpClient>().AsSingle();
-        Container.BindInterfacesTo<BeatLeaderAPI>().AsSingle();
-    }
+        var interactionService = new InteractionService(socketClient);
+        services.AddSingleton(interactionService);
+        services.AddDbContext<ApplicationContext>();
+        services.AddSingleton<ILocalization, Localization>();
+
+        // Logging
+        services.AddLoggingEnhanced();
+
+        // Services
+        services.AddSingleton<InteractionManagementService>();
+        services.AddService<DiscordLoggerService>();
+        services.AddService<MessageService>();
+        services.AddService<ReactionChampService>();
+        services.AddService<LeaveNotifService>();
 
-    private void InstallServices() {
-        Container.Bind(typeof(ISystemService), typeof(ILocalization)).To<Localization>().AsSingle();
-        Container.BindInterfacesTo<DiscordLoggerService>().AsSingle();
-        Container.BindInterfacesTo<InteractionManagementService>().AsSingle();
-        //Container.BindInterfacesTo<OpenAIChatBot>().AsSingle();
-        Container.BindInterfacesTo<MessageRewindChatBot>().AsSingle();
-        Container.BindInterfacesTo<MessageService>().AsSingle();
-        Container.BindInterfacesAndSelfTo<ReactionChampService>().AsSingle();
-        Container.BindInterfacesAndSelfTo<LeaveNotifService>().AsSingle();
+        // Installing apis
+        services.AddSingleton<HttpClient>();
+        services.AddSingleton<IBeatLeaderAPI, BeatLeaderAPI>();
+        services.AddSingleton<IChatBot, MessageRewindChatBot>();
+
+        // Starting
+        services.AddSingleton<ModuleLoader>();
+        services.AddSingleton<Bootstrapper>();
+
+        // A little workaround to start non-lazy bindings
+        var provider = services.BuildServiceProvider();
+        provider.GetRequiredService<ModuleLoader>();
+        provider.GetRequiredService<Bootstrapper>().Start();
+
+        return provider;
     }
-    
-    private void InstallLogger() {
+
+    private static void AddLoggingEnhanced(this IServiceCollection services) {
         var factory = LoggerFactory.Create(x => x.AddConsole().SetMinimumLevel(LogLevel.Information));
         var logger = factory.CreateLogger("Bot");
-        Container.Bind<ILoggerFactory>().FromInstance(factory).AsSingle();
-        Container.Bind<ILogger>().FromInstance(logger).AsTransient();
+        
+        services.AddSingleton(factory);
+        services.AddSingleton(logger);
+        services.AddSingleton(typeof(ILogger<>), typeof(Logger<>));
     }
 
-    private void Bootstrap() {
-        Container.Resolve<ModuleLoader>();
-        Container.Resolve<Bootstrapper>();
+    private static void AddService<T>(this IServiceCollection services) where T : class, IService {
+        services.AddSingleton<T>();
+        services.AddSingleton<IService, T>();
     }
 }

SabaBot/ApplicationInstaller.cs

@@ -1,19 +1,15 @@
 using Discord;
 using Discord.WebSocket;
-using SabaBot.Database;
-using Zenject;
 
 namespace SabaBot;
 
-internal class Bootstrapper {
-    [Inject]
-    public async void Start(
-        DiscordSocketClient client,
-        ApplicationConfig config,
-        ApplicationContext context,
-        [InjectOptional] IEnumerable<ISystemService>? systemServices,
-        [InjectOptional] IEnumerable<IService>? services
-    ) {
+internal class Bootstrapper(
+    DiscordSocketClient client,
+    ApplicationConfig config,
+    IEnumerable<ISystemService>? systemServices = null,
+    IEnumerable<IService>? services = null
+) {
+    public async void Start() {
         //bootstrapping system services
         if (systemServices != null) {
             try {
@@ -33,7 +29,7 @@ [InjectOptional] IEnumerable<IService>? services
         }
     }
 
-    private void BootstrapServices(IEnumerable<IService> services) {
+    private static void BootstrapServices(IEnumerable<IService> services) {
         foreach (var service in services) {
             service.Start();
         }

SabaBot/Core/Bootstrapper.cs

@@ -1,25 +1,21 @@
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
-using Zenject;
 
 namespace SabaBot.Database;
 
 public class ApplicationContext : DbContext {
+    public ApplicationContext(ApplicationConfig config, ILoggerFactory? loggerFactory = null) {
+        _config = config;
+        _loggerFactory = loggerFactory;
+    }
+
     [UsedImplicitly]
     public ApplicationContext() {
         // do not remove, this constructor is used for migrations
         _migration = true;
     }
 
-    [Inject]
-    public ApplicationContext(ApplicationConfig config, [InjectOptional] ILoggerFactory? loggerFactory) {
-        _config = config;
-        _loggerFactory = loggerFactory;
-        // ReSharper disable once VirtualMemberCallInConstructor
-        Database.Migrate();
-    }
-
     public required DbSet<GuildSettings> Guilds { get; set; }
 
     private readonly ApplicationConfig? _config;
@@ -31,7 +27,7 @@ public async Task Modify(ulong guildId, Action<GuildSettings> action) {
         action(settings);
         await SaveChangesAsync();
     }
-    
+
     public async Task<GuildSettings> EnsureSettingsCreated(ulong guildId) {
         var guild = await Guilds.FindAsync(guildId);
         if (guild == null) {
@@ -51,6 +47,8 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) {
             );
         modelBuilder.Entity<GuildSettings>()
             .OwnsOne(x => x.RewardSettings);
+        modelBuilder.Entity<GuildSettings>()
+            .OwnsOne(x => x.LeaveNotifSettings);
         modelBuilder.Entity<GuildSettings>()
             .OwnsOne(x => x.ReactionChampSettings)
             .OwnsMany(

SabaBot/Core/Database/ApplicationContext.cs

@@ -1,20 +1,24 @@
-using SabaBot.Database;
-using Zenject;
+using Discord.Interactions;
+using JetBrains.Annotations;
+using SabaBot.Database;
 
 namespace SabaBot;
 
-public abstract class AppInteractionModuleBase : DiInteractionModuleBase {
-    [Inject] private readonly ILocalization _localization = null!;
-    [Inject] protected readonly ApplicationContext DbContext = null!;
+public abstract class AppInteractionModuleBase : InteractionModuleBase {
+    [UsedImplicitly]
+    public ILocalization Localization { get; init; } = null!;
+    
+    [UsedImplicitly]
+    public ApplicationContext DbContext { get; init; } = null!;
 
     protected async Task<string> GetLocalizedKey(string key) {
         var guildId = Context.Guild?.Id;
-        var locale = _localization.DefaultLocale;
+        var locale = Localization.DefaultLocale;
         if (guildId != null) {
             var settings = await GetSettingsAsync();
             locale = settings.Locale;
         }
-        return _localization[locale, key];
+        return Localization[locale, key];
     }
 
     protected async Task ModifyAsync(string? text = null) {