persist client count history data across reboots and allow for configurable timespan

WebfrontCore/ViewComponents/ServerListViewComponent.cs

@@ -1,45 +1,94 @@
-using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc;
 using SharedLibraryCore;
 using SharedLibraryCore.Dtos;
 using System.Linq;
 using System.Net;
+using System.Threading;
+using System.Threading.Tasks;
 using Data.Models.Client.Stats;
+using Microsoft.AspNetCore.Hosting.Server;
+using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Interfaces;
 using static SharedLibraryCore.Server;
 
 namespace WebfrontCore.ViewComponents
 {
     public class ServerListViewComponent : ViewComponent
     {
+        private readonly IServerDataViewer _serverDataViewer;
+        private readonly ApplicationConfiguration _appConfig;
+
+        public ServerListViewComponent(IServerDataViewer serverDataViewer,
+            ApplicationConfiguration applicationConfiguration)
+        {
+            _serverDataViewer = serverDataViewer;
+            _appConfig = applicationConfiguration;
+        }
+
         public IViewComponentResult Invoke(Game? game)
         {
-            var servers = Program.Manager.GetServers().Where(_server => !game.HasValue || _server.GameName == game);
+            var servers = Program.Manager.GetServers().Where(server => !game.HasValue || server.GameName == game);
 
-            var serverInfo = servers.Select(s => new ServerInfo()
+            var serverInfo = new List<ServerInfo>();
+
+            foreach (var server in servers)
             {
-                Name = s.Hostname,
-                ID = s.EndPoint,
-                Port = s.Port,
-                Map = s.CurrentMap.Alias,
-                ClientCount = s.ClientNum,
-                MaxClients = s.MaxClients,
-                GameType = s.Gametype,
-                PlayerHistory = s.ClientHistory.ToArray(),
-                Players = s.GetClientsAsList()
-                .Select(p => new PlayerInfo()
+                var serverId = server.GetIdForServer().Result;
+                var clientHistory = _serverDataViewer.ClientHistoryAsync(_appConfig.MaxClientHistoryTime,
+                                            CancellationToken.None).Result
+                                        .FirstOrDefault(history => history.ServerId == serverId) ??
+                                    new ClientHistoryInfo
+                                    {
+                                        ServerId = serverId
+                                    };
+
+                var counts = clientHistory.ClientCounts?.AsEnumerable() ?? Enumerable.Empty<ClientCountSnapshot>();
+
+                if (server.ClientHistory.Count > 0)
                 {
-                    Name = p.Name,
-                    ClientId = p.ClientId,
-                    Level = p.Level.ToLocalizedLevelName(),
-                    LevelInt = (int)p.Level,
-                    Tag = p.Tag,
-                    ZScore = p.GetAdditionalProperty<EFClientStatistics>(IW4MAdmin.Plugins.Stats.Helpers.StatManager.CLIENT_STATS_KEY)?.ZScore
-                }).ToList(),
-                ChatHistory = s.ChatHistory.ToList(),
-                Online = !s.Throttled,
-                IPAddress = $"{(s.ResolvedIpEndPoint.Address.IsInternal() ? Program.Manager.ExternalIPAddress : s.IP)}:{s.Port}",
-                ConnectProtocolUrl = s.EventParser.URLProtocolFormat.FormatExt(s.ResolvedIpEndPoint.Address.IsInternal() ? Program.Manager.ExternalIPAddress : s.IP, s.Port)
-            }).ToList();
+                    counts = counts.Union(server.ClientHistory
+                        .Select(history => history.ToClientCountSnapshot()).Where(history =>
+                            history.Time > clientHistory.ClientCounts.Last().Time));
+                }
+
+                serverInfo.Add(new ServerInfo()
+                {
+                    Name = server.Hostname,
+                    ID = server.EndPoint,
+                    Port = server.Port,
+                    Map = server.CurrentMap.Alias,
+                    ClientCount = server.ClientNum,
+                    MaxClients = server.MaxClients,
+                    GameType = server.Gametype,
+                    PlayerHistory = server.ClientHistory.ToArray(),
+                    Players = server.GetClientsAsList()
+                        .Select(p => new PlayerInfo()
+                        {
+                            Name = p.Name,
+                            ClientId = p.ClientId,
+                            Level = p.Level.ToLocalizedLevelName(),
+                            LevelInt = (int) p.Level,
+                            Tag = p.Tag,
+                            ZScore = p.GetAdditionalProperty<EFClientStatistics>(IW4MAdmin.Plugins.Stats.Helpers
+                                .StatManager
+                                .CLIENT_STATS_KEY)?.ZScore
+                        }).ToList(),
+                    ChatHistory = server.ChatHistory.ToList(),
+                    ClientCountHistory =
+                        counts.Where(history => history.Time >= DateTime.UtcNow - _appConfig.MaxClientHistoryTime)
+                            .ToList(),
+                    Online = !server.Throttled,
+                    IPAddress =
+                        $"{(server.ResolvedIpEndPoint.Address.IsInternal() ? Program.Manager.ExternalIPAddress : server.IP)}:{server.Port}",
+                    ConnectProtocolUrl = server.EventParser.URLProtocolFormat.FormatExt(
+                        server.ResolvedIpEndPoint.Address.IsInternal() ? Program.Manager.ExternalIPAddress : server.IP,
+                        server.Port)
+                });
+            }
+
             return View("_List", serverInfo);
         }
     }
-}
+}