Fixed statistics system

Moonlight/App/Services/Statistics/StatisticsCaptureService.cs

@@ -1,47 +1,78 @@
-using Moonlight.App.Database;
+using Logging.Net;
+using Moonlight.App.Database;
+using Moonlight.App.Database.Entities;
 using Moonlight.App.Repositories;
+using Moonlight.App.Services.Sessions;
 
 namespace Moonlight.App.Services.Statistics;
 
 public class StatisticsCaptureService
 {
-    private readonly DataContext DataContext;
-    private readonly ConfigService ConfigService;
-    private readonly StatisticsRepository StatisticsRepository;
     private readonly IServiceScopeFactory ServiceScopeFactory;
-    private readonly WebSpaceService WebSpaceService;
+    private readonly DateTimeService DateTimeService;
     private readonly PeriodicTimer Timer;
     
-    public StatisticsCaptureService(IServiceScopeFactory serviceScopeFactory, ConfigService configService)
+    public StatisticsCaptureService(IServiceScopeFactory serviceScopeFactory, ConfigService configService, DateTimeService dateTimeService)
     {
         ServiceScopeFactory = serviceScopeFactory;
-        var provider = ServiceScopeFactory.CreateScope().ServiceProvider;
+        DateTimeService = dateTimeService;
 
-        DataContext = provider.GetRequiredService<DataContext>();
+        var config = configService
-        ConfigService = configService;
+            .GetSection("Moonlight")
-        StatisticsRepository = provider.GetRequiredService<StatisticsRepository>();
+            .GetSection("Statistics");
-        WebSpaceService = provider.GetRequiredService<WebSpaceService>();
         
-        var config = ConfigService.GetSection("Moonlight").GetSection("Statistics");
         if(!config.GetValue<bool>("Enabled"))
             return;
         
-        var _period = config.GetValue<int>("Wait");
+        var period = TimeSpan.FromMinutes(config.GetValue<int>("Wait"));
-        var period = TimeSpan.FromMinutes(_period);
         Timer = new(period);
 
+        Logger.Info("Starting statistics system");
         Task.Run(Run);
     }
 
     private async Task Run()
+    {
+        try
         {
             while (await Timer.WaitForNextTickAsync())
             {
-            StatisticsRepository.Add("statistics.usersCount", DataContext.Users.Count());
+                Logger.Warn("Creating statistics");
-            StatisticsRepository.Add("statistics.serversCount", DataContext.Servers.Count());
+                
-            StatisticsRepository.Add("statistics.domainsCount", DataContext.Domains.Count());
+                using var scope = ServiceScopeFactory.CreateScope();
-            StatisticsRepository.Add("statistics.webspacesCount", DataContext.WebSpaces.Count());
+
-            StatisticsRepository.Add("statistics.databasesCount", DataContext.Databases.Count());
+                var statisticsRepo = scope.ServiceProvider.GetRequiredService<Repository<StatisticsData>>();
+                var usersRepo = scope.ServiceProvider.GetRequiredService<Repository<User>>();
+                var serversRepo = scope.ServiceProvider.GetRequiredService<Repository<Server>>();
+                var domainsRepo = scope.ServiceProvider.GetRequiredService<Repository<Domain>>();
+                var webspacesRepo = scope.ServiceProvider.GetRequiredService<Repository<WebSpace>>();
+                var databasesRepo = scope.ServiceProvider.GetRequiredService<Repository<MySqlDatabase>>();
+                var sessionService = scope.ServiceProvider.GetRequiredService<SessionService>();
+            
+                void AddEntry(string chart, int value)
+                {
+                    statisticsRepo!.Add(new StatisticsData()
+                    {
+                        Chart = chart,
+                        Value = value,
+                        Date = DateTimeService.GetCurrent()
+                    });
+                }
+            
+                AddEntry("usersCount", usersRepo.Get().Count());
+                AddEntry("serversCount", serversRepo.Get().Count());
+                AddEntry("domainsCount", domainsRepo.Get().Count());
+                AddEntry("webspacesCount", webspacesRepo.Get().Count());
+                AddEntry("databasesCount", databasesRepo.Get().Count());
+                AddEntry("sessionsCount", sessionService.GetAll().Length);
+            }
+            
+            Logger.Log("Statistics are weird");
+        }
+        catch (Exception e)
+        {
+            Logger.Error("An unexpected error occured while capturing statistics");
+            Logger.Error(e);
         }
     }
 }

Moonlight/Shared/Views/Admin/Statistics.razor

@@ -1,21 +1,35 @@
 @page "/admin/statistics"
+
 @using Moonlight.App.Models.Misc
 @using Moonlight.App.Services.Statistics
 @using Moonlight.App.Database.Entities
 @using ApexCharts
+@using Moonlight.App.Helpers
+@using Moonlight.App.Services
 
 @inject StatisticsViewService StatisticsViewService
+@inject SmartTranslateService SmartTranslateService
 
 <OnlyAdmin>
     <div class="row mt-4 mb-2">
         <div class="col-12 col-lg-6 col-xl">
             <div class="card card-body">
-                <select class="form-select" @bind="bind">
+                <select class="form-select" @bind="TimeSpanBind">
-                    <option value="1"><TL>Hour</TL></option>
+                    <option value="1">
-                    <option value="24"><TL>Day</TL></option>
+                        <TL>Hour</TL>
-                    <option value="744"><TL>Month</TL></option>
+                    </option>
-                    <option value="8760"><TL>Year</TL></option>
+                    <option value="24">
-                    <option value="867240"><TL>All time</TL></option>
+                        <TL>Day</TL>
+                    </option>
+                    <option value="744">
+                        <TL>Month</TL>
+                    </option>
+                    <option value="8760">
+                        <TL>Year</TL>
+                    </option>
+                    <option value="867240">
+                        <TL>All time</TL>
+                    </option>
                 </select>
             </div>
         </div>
@@ -31,7 +45,7 @@
                         <div class="card mt-4">
                             <div class="card-header">
                                 <div class="card-title">
-                                        <TL>@chart.Header</TL>
+                                    <TL>@chart.Key</TL>
                                 </div>
                             </div>
                             <div class="card-body">
@@ -39,12 +53,12 @@
                                            Options="GenerateOptions()"
                                            OnRendered="OnChartRendered">
                                     <ApexPointSeries TItem="StatisticsData"
-                                                         Items="chart.Data"
+                                                     Items="chart.Value"
                                                      SeriesType="SeriesType.Area"
                                                      Name=""
                                                      ShowDataLabels="false"
-                                                         XValue="@(e => FormatDate(e.Date))"
+                                                     XValue="@(e => Formatter.FormatDate(e.Date))"
-                                                         YValue="@(e => (decimal) Math.Round(e.Value))"/>
+                                                     YValue="@(e => (decimal)Math.Round(e.Value))"/>
                                 </ApexChart>
                             </div>
                         </div>
@@ -55,40 +69,57 @@
     </LazyLoader>
 </OnlyAdmin>
 
-@code {
+@code
+{
     private StatisticsTimeSpan StatisticsTimeSpan = StatisticsTimeSpan.Day;
     private LazyLoader Loader;
-    private List<(string Header, StatisticsData[] Data)> Charts = new();
+    private Dictionary<string, StatisticsData[]> Charts = new();
 
-    private int bind
+    private int TimeSpanBind
     {
-        get { return (int) StatisticsTimeSpan; }
+        get => (int)StatisticsTimeSpan;
-        set { StatisticsTimeSpan = (StatisticsTimeSpan) value;
+        set
-            Task.Run(async() => await Loader.Reload());
+        {
+            StatisticsTimeSpan = (StatisticsTimeSpan)value;
+            Task.Run(async () => await Loader.Reload());
         }
     }
 
-    private async Task Load(LazyLoader loader)
+    private Task Load(LazyLoader loader)
     {
         Charts.Clear();
 
-        Charts.Add(("Servers", StatisticsViewService.GetData("statistics.serversCount", StatisticsTimeSpan)));
+        Charts.Add(
-        Charts.Add(("Users", StatisticsViewService.GetData("statistics.usersCount", StatisticsTimeSpan)));
+            SmartTranslateService.Translate("Servers"),
-        Charts.Add(("Domains", StatisticsViewService.GetData("statistics.domainsCount", StatisticsTimeSpan)));
+            StatisticsViewService.GetData("serversCount", StatisticsTimeSpan)
-        Charts.Add(("Databases", StatisticsViewService.GetData("statistics.databasesCount", StatisticsTimeSpan)));
+            );
-        Charts.Add(("Websites", StatisticsViewService.GetData("statistics.websitesCount", StatisticsTimeSpan)));
-    }
 
-    private string FormatDate(DateTime e)
+        Charts.Add(
-    {
+            SmartTranslateService.Translate("Users"),
-        string i2s(int i)
+            StatisticsViewService.GetData("usersCount", StatisticsTimeSpan)
-        {
+            );
-            if (i.ToString().Length < 2)
-                return "0" + i;
-            return i.ToString();
-        }
 
-        return $"{i2s(e.Day)}.{i2s(e.Month)}.{e.Year} {i2s(e.Hour)}:{i2s(e.Minute)}";
+        Charts.Add(
+            SmartTranslateService.Translate("Domains"),
+            StatisticsViewService.GetData("domainsCount", StatisticsTimeSpan)
+            );
+
+        Charts.Add(
+            SmartTranslateService.Translate("Databases"),
+            StatisticsViewService.GetData("databasesCount", StatisticsTimeSpan)
+            );
+
+        Charts.Add(
+            SmartTranslateService.Translate("Webspaces"),
+            StatisticsViewService.GetData("webspacesCount", StatisticsTimeSpan)
+            );
+
+        Charts.Add(
+            SmartTranslateService.Translate("Sessions"),
+            StatisticsViewService.GetData("sessionsCount", StatisticsTimeSpan)
+            );
+
+        return Task.CompletedTask;
     }
 
     private ApexChartOptions<StatisticsData> GenerateOptions()
@@ -122,7 +153,8 @@
         };
     }
 
-    private async Task OnChartRendered()
+    private Task OnChartRendered()
     {
+        return Task.CompletedTask;
     }
 }

Moonlight/defaultstorage/configs/config.json

@@ -78,6 +78,10 @@
     "DiscordNotifications": {
       "Enable": false,
       "WebHook": ""
+    },
+    "Statistics": {
+      "Enabled": true,
+      "Wait": 15
     }
   }
 }