Merge pull request #714 from Blazam-App/v1-Dev

Memory Optimizations

BLAZAM/BLAZAM.csproj

@@ -6,7 +6,7 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<ServerGarbageCollection>false</ServerGarbageCollection>
 		<AssemblyVersion>1.2.3</AssemblyVersion>
-		<Version>2024.12.19.2303</Version>
+		<Version>2024.12.22.1816</Version>
 		<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
 		<RootNamespace>BLAZAM</RootNamespace>
 		<GenerateDocumentationFile>True</GenerateDocumentationFile>

BLAZAM/Middleware/ApplicationStatusRedirectMiddleware.cs

@@ -22,7 +22,7 @@ public ApplicationStatusRedirectMiddleware(
             _monitor = monitor;
         }
 
-        public async Task InvokeAsync(HttpContext context, IAppDatabaseFactory factory)
+        public async Task InvokeAsync(HttpContext context, IUserDatabaseFactory factory)
         {
             intendedUri = context.Request.Path.ToUriComponent();
             if (!InIgnoreList(intendedUri))

BLAZAM/Pages/API/v1/ApiController.cs

@@ -30,7 +30,7 @@ public class ApiController : Controller
         /// <summary>
         /// A factory for <see cref="IDatabaseContext"/> connections
         /// </summary>
-        protected readonly IAppDatabaseFactory DbFactory;
+        protected readonly IUserDatabaseFactory DbFactory;
         /// <summary>
         /// The API audit logger
         /// </summary>
@@ -45,7 +45,7 @@ public class ApiController : Controller
         /// </summary>
         protected IApplicationUserState? CurrentUserState { get; }
 
-        public ApiController(IApplicationUserStateService applicationUserStateService, AuditLogger audit, IAppDatabaseFactory appDatabaseFactory, IHttpContextAccessor httpContextAccessor, IActiveDirectoryContextFactory adFactory)
+        public ApiController(IApplicationUserStateService applicationUserStateService, AuditLogger audit, IUserDatabaseFactory appDatabaseFactory, IHttpContextAccessor httpContextAccessor, IActiveDirectoryContextFactory adFactory)
         {
             //User = httpContextAccessor.HttpContext.User;
             AuditLogger = audit;

BLAZAM/Pages/API/v1/Search.cs

@@ -13,7 +13,7 @@ namespace BLAZAM.Pages.API.v1
     [Produces("application/json")]
     public class Search : ApiController
     {
-        public Search(IApplicationUserStateService applicationUserStateService, AuditLogger audit, IAppDatabaseFactory appDatabaseFactory, IHttpContextAccessor httpContextAccessor, IActiveDirectoryContextFactory adFactory) : base(applicationUserStateService, audit, appDatabaseFactory, httpContextAccessor, adFactory)
+        public Search(IApplicationUserStateService applicationUserStateService, AuditLogger audit, IUserDatabaseFactory appDatabaseFactory, IHttpContextAccessor httpContextAccessor, IActiveDirectoryContextFactory adFactory) : base(applicationUserStateService, audit, appDatabaseFactory, httpContextAccessor, adFactory)
         {
         }
 

BLAZAM/Pages/API/v1/Templates.cs

@@ -29,12 +29,12 @@ namespace BLAZAM.Pages.API.v1
     /// </summary>
     public class Templates : ApiController
     {
-        private IAppDatabaseFactory _appDatabaseFactory;
+        private IUserDatabaseFactory _appDatabaseFactory;
         private IStringLocalizer<AppLocalization> AppLocalization;
         private EmailService EmailService;
         private NotificationGenerationService OUNotificationService;
 
-        public Templates(NotificationGenerationService ouNotificationService, EmailService email, IApplicationUserStateService applicationUserStateService, IStringLocalizer<AppLocalization> localizer, AuditLogger audit, IAppDatabaseFactory appDatabaseFactory, IHttpContextAccessor httpContextAccessor, IActiveDirectoryContextFactory adFactory) : base(applicationUserStateService, audit, appDatabaseFactory, httpContextAccessor, adFactory)
+        public Templates(NotificationGenerationService ouNotificationService, EmailService email, IApplicationUserStateService applicationUserStateService, IStringLocalizer<AppLocalization> localizer, AuditLogger audit, IUserDatabaseFactory appDatabaseFactory, IHttpContextAccessor httpContextAccessor, IActiveDirectoryContextFactory adFactory) : base(applicationUserStateService, audit, appDatabaseFactory, httpContextAccessor, adFactory)
         {
             AppLocalization = localizer;
             EmailService = email;

BLAZAM/Pages/API/v1/Test.cs

@@ -11,7 +11,7 @@ namespace BLAZAM.Pages.API.v1
 {
     public class Test : ApiController
     {
-        public Test(IApplicationUserStateService applicationUserStateService, AuditLogger audit, IAppDatabaseFactory appDatabaseFactory, IHttpContextAccessor httpContextAccessor, IActiveDirectoryContextFactory adFactory) : base(applicationUserStateService, audit, appDatabaseFactory, httpContextAccessor, adFactory)
+        public Test(IApplicationUserStateService applicationUserStateService, AuditLogger audit, IUserDatabaseFactory appDatabaseFactory, IHttpContextAccessor httpContextAccessor, IActiveDirectoryContextFactory adFactory) : base(applicationUserStateService, audit, appDatabaseFactory, httpContextAccessor, adFactory)
         {
         }
 

BLAZAM/Pages/Benchmark.razor

@@ -1,4 +1,4 @@
-@inject IAppDatabaseFactory factory
+@inject IUserDatabaseFactory factory
 @inject IActiveDirectoryContextFactory directoryFactory
 @inherits AppComponentBase
 @page "/benchmark"

BLAZAM/Pages/Error/UnhandledExceptionPage.razor

@@ -1,6 +1,6 @@
 @inject EmailService email
 @inject ApplicationInfo ApplicationInfo
-@inject IAppDatabaseFactory factory
+@inject IUserDatabaseFactory factory
 @inject NavigationManager Nav
 <PageTitle>Error</PageTitle>
 

BLAZAM/Pages/PWAManifest.cshtml.cs

@@ -27,9 +27,9 @@ public class PWAManifest
     [Produces("application/json")]
     public class PWAManifestModel : PageModel
     {
-        private readonly IAppDatabaseFactory _factory;
+        private readonly IUserDatabaseFactory _factory;
 
-        public PWAManifestModel(IAppDatabaseFactory factory)
+        public PWAManifestModel(IUserDatabaseFactory factory)
         {
             _factory = factory;
         }

BLAZAM/Pages/Static.cshtml.cs

@@ -21,7 +21,7 @@ public class StaticModel : PageModel
         protected IDatabaseContext Context { get; private set; }
 
 
-        public StaticModel(IAppDatabaseFactory factory)
+        public StaticModel(IUserDatabaseFactory factory)
         {
             Context = factory.CreateDbContext();
 

BLAZAM/Program.cs

@@ -214,7 +214,7 @@ private static void SetupKestrel(WebApplicationBuilder builder)
         {
 
             var _programDbFactory = new AppDatabaseFactory(Configuration);
-            var kestrelContext = _programDbFactory.CreateDbContext();
+            using var kestrelContext = _programDbFactory.CreateDbContext();
 
 
             if (!ApplicationInfo.isUnderIIS && !Debugger.IsAttached)

BLAZAM/ProgramHelpers.cs

@@ -227,6 +227,7 @@ public static WebApplicationBuilder InjectServices(this WebApplicationBuilder bu
 
 
             builder.Services.AddSingleton<IAppDatabaseFactory, AppDatabaseFactory>();
+            builder.Services.AddScoped<IUserDatabaseFactory, UserDatabaseFactory>();
 
             //Provide an Http client as a service with custom construction via api service class
             builder.Services.AddHttpClient();
@@ -407,7 +408,7 @@ public static void PreRun(this WebApplication application)
         //Setup Seq logging if allowed by admin
         try
         {
-            var context = Program.AppInstance.Services.GetRequiredService<IAppDatabaseFactory>().CreateDbContext();
+            using var context = Program.AppInstance.Services.GetRequiredService<IAppDatabaseFactory>().CreateDbContext();
             if (context != null && context.AppSettings.FirstOrDefault()?.SendLogsToDeveloper != null)
             {
                 Loggers.SendToSeqServer = context.AppSettings.FirstOrDefault().SendLogsToDeveloper;

BLAZAMCommon/Data/ApplicationStatistics.cs

@@ -0,0 +1,38 @@
+using Microsoft.Extensions.ObjectPool;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.Contracts;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BLAZAM.Common.Data
+{
+    public static class ApplicationStatistics
+    {
+        public static int ADContextCount { get; private set; }
+        public static void AddADContext()
+        {
+            ADContextCount++;
+        }
+        public static void RemoveADContext()
+        {
+            if (ADContextCount > 0)
+                ADContextCount--;
+
+        }
+
+
+        public static int DBContextCount { get; private set; }
+        public static void AddDBContext()
+        {
+            DBContextCount++;
+        }
+        public static void RemoveDBContext()
+        {
+            if (DBContextCount > 0)
+                DBContextCount--;
+
+        }
+    }
+}

BLAZAMDatabase/Context/AppDatabaseFactory.cs

@@ -56,7 +56,7 @@ public AppDatabaseFactory(IConfiguration configuration)
         /// <exception cref="NotImplementedException"></exception>
         private void SeedData()
         {
-            var seedContext = this.CreateDbContext();
+            using var seedContext = this.CreateDbContext();
 
 
             SetupDenyAll(seedContext);
@@ -177,7 +177,10 @@ private bool CheckInstallation()
         /// Async call to <see cref="CreateDbContext"/>
         /// </summary>
         /// <returns></returns>
-        public async Task<IDatabaseContext> CreateDbContextAsync() => await Task.Run(() => { return CreateDbContext(); });
+        public async Task<IDatabaseContext> CreateDbContextAsync()
+        {
+            return await Task.Run(() => { return CreateDbContext(); });
+        }
         public DatabaseType DatabaseType
         {
             get
@@ -190,7 +193,7 @@ public DatabaseType DatabaseType
                 {
 
                     case "sql":
-                       return DatabaseType.SQL;
+                        return DatabaseType.SQL;
                     case "sqlite":
 
                         return DatabaseType.SQLite;
@@ -217,7 +220,7 @@ public DatabaseType DatabaseType
         /// <exception cref="Exception">Thrown for unexpected exceptions</exception>
         public IDatabaseContext CreateDbContext()
         {
-           
+
             IDatabaseContext? databaseContext = null;
             switch (DatabaseType)
             {

BLAZAMDatabase/Context/DatabaseContextBase.cs

@@ -24,6 +24,13 @@ namespace BLAZAM.Database.Context
     public class DatabaseContextBase : DbContext, IDatabaseContext
     {
 
+        public override void Dispose()
+        {
+            ApplicationStatistics.RemoveDBContext();
+
+            base.Dispose();
+        }
+
 
 
 
@@ -76,12 +83,15 @@ public enum DatabaseStatus
         public DatabaseContextBase()
         {
             ConnectionString = new("");
+            ApplicationStatistics.AddDBContext();
+
         }
 
 
         public DatabaseContextBase(DatabaseConnectionString databaseConnectionString) : base()
         {
             ConnectionString = databaseConnectionString;
+            ApplicationStatistics.AddDBContext();
 
         }
 
@@ -93,6 +103,8 @@ public DatabaseContextBase(DatabaseConnectionString databaseConnectionString) :
 
         public DatabaseContextBase(DbContextOptions options) : base(options)
         {
+            ApplicationStatistics.AddDBContext();
+
         }
 
         //App Settings

BLAZAMDatabase/Context/IUserDatabaseFactory.cs

@@ -0,0 +1,14 @@
+using BLAZAM.Common.Data.Database;
+using BLAZAM.Database.Exceptions;
+
+namespace BLAZAM.Database.Context
+{
+    /// <summary>
+    /// The primary database factory for BLAZAM.
+    /// Creates <see cref="IDatabaseContext"/> types 
+    /// that can have a number of database type backings
+    /// </summary>
+    public interface IUserDatabaseFactory : IAppDatabaseFactory
+    {
+    }
+}

BLAZAMDatabase/Context/UserDatabaseFactory.cs

@@ -0,0 +1,52 @@
+using BLAZAM.Common.Data.Database;
+using System;
+using System.Collections.Generic;
+using System.Data.Entity.Core.Mapping;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BLAZAM.Database.Context
+{
+    public class UserDatabaseFactory : IUserDatabaseFactory, IDisposable
+    {
+        private readonly IAppDatabaseFactory _appDatabaseFactory;
+
+        public UserDatabaseFactory(IAppDatabaseFactory appDatabaseFactory)
+        {
+            _appDatabaseFactory = appDatabaseFactory;
+        }
+
+        public DatabaseType DatabaseType => _appDatabaseFactory.DatabaseType;
+
+        public bool ApplyDatabaseMigrations(bool force = false) => _appDatabaseFactory.ApplyDatabaseMigrations(force);
+
+        public Task<bool> ApplyDatabaseMigrationsAsync(bool force = false) => _appDatabaseFactory.ApplyDatabaseMigrationsAsync(force);
+
+        private List<IDatabaseContext> _userContexts = new();
+
+        public IDatabaseContext CreateDbContext()
+        {
+            var ctx= _appDatabaseFactory.CreateDbContext();
+            _userContexts.Add(ctx);
+
+            return ctx;
+        }
+
+        public async Task<IDatabaseContext> CreateDbContextAsync()
+        {
+            var ctx = await _appDatabaseFactory.CreateDbContextAsync();
+            _userContexts.Add(ctx);
+
+            return ctx;
+        }
+
+        public void Dispose()
+        {
+            foreach(var ctx in _userContexts)
+            {
+                ctx.Dispose();
+            }
+        }
+    }
+}

BLAZAMGui/Layouts/LoginLayout.razor

@@ -1,7 +1,7 @@
 @inherits LayoutComponentBase
 
 @inject IActiveDirectoryContext directory
-@inject IAppDatabaseFactory DbFactory
+@inject IUserDatabaseFactory DbFactory
 @inject ConnMonitor monitor
 
 

BLAZAMGui/Layouts/MainLayout.razor

@@ -5,7 +5,7 @@
 @inject NavigationManager Nav
 @inject IActiveDirectoryContext directory
 @inject IApplicationUserStateService UserStateService
-@inject IAppDatabaseFactory DbFactory
+@inject IUserDatabaseFactory DbFactory
 @inject AppSnackBarService SnackBarService
 @inject ApplicationInfo ApplicationInfo
 @inject ConnMonitor monitor

BLAZAMGui/UI/AppComponentBase.cs

@@ -90,7 +90,7 @@ protected bool LoadingData
         }
         //protected IDatabaseContext? Context;
         [Inject]
-        protected IAppDatabaseFactory DbFactory { get; set; }
+        protected IUserDatabaseFactory DbFactory { get; set; }
 
 
         protected override void OnInitialized()