Create ParserH1MOD.js (#248)

Co-Authored-By: fed <58637860+fedddddd@users.noreply.github.com>

Co-authored-by: fed <58637860+fedddddd@users.noreply.github.com>

.gitignore

@@ -224,7 +224,6 @@ bootstrap-custom.min.css
 bootstrap-custom.css
 **/Master/static
 **/Master/dev_env
-/WebfrontCore/Views/Plugins/*
 /WebfrontCore/wwwroot/**/dds
 /WebfrontCore/wwwroot/images/radar/*
 
@@ -245,4 +244,6 @@ launchSettings.json
 /Tests/ApplicationTests/Files/replay.json
 /GameLogServer/game_log_server_env
 .idea/*
-*.db
+*.db
+/Data/IW4MAdmin_Migration.db-shm
+/Data/IW4MAdmin_Migration.db-wal

Application/API/Master/ApiInstance.cs

@@ -22,7 +22,7 @@ namespace IW4MAdmin.Application.API.Master
         public int Uptime { get; set; }
 
         /// <summary>
-        /// Specifices the version of the instance
+        /// Specifies the version of the instance
         /// </summary>
         [JsonProperty("version")]
         [JsonConverter(typeof(BuildNumberJsonConverter))]
@@ -33,5 +33,11 @@ namespace IW4MAdmin.Application.API.Master
         /// </summary>
         [JsonProperty("servers")]
         public List<ApiServer> Servers { get; set; }
+        
+        /// <summary>
+        /// Url IW4MAdmin is listening on
+        /// </summary>
+        [JsonProperty("webfront_url")]
+        public string WebfrontUrl { get; set; }
     }
 }

Application/Application.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <MvcRazorExcludeRefAssembliesFromPublish>false</MvcRazorExcludeRefAssembliesFromPublish>
     <PackageId>RaidMax.IW4MAdmin.Application</PackageId>
     <Version>2020.0.0.0</Version>
@@ -24,14 +24,15 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Jint" Version="3.0.0-beta-1632" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.10">
+    <PackageReference Include="Jint" Version="3.0.0-beta-2037" />
+    <PackageReference Include="MaxMind.GeoIP2" Version="5.1.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.10" />
-    <PackageReference Include="RestEase" Version="1.5.1" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
+    <PackageReference Include="RestEase" Version="1.5.5" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" />
   </ItemGroup>
 
   <PropertyGroup>
@@ -48,6 +49,8 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\Integrations\Cod\Integrations.Cod.csproj" />
+    <ProjectReference Include="..\Integrations\Source\Integrations.Source.csproj" />
     <ProjectReference Include="..\SharedLibraryCore\SharedLibraryCore.csproj">
       <Private>true</Private>
     </ProjectReference>
@@ -61,6 +64,9 @@
     <None Update="Configuration\LoggingConfiguration.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Update="Resources\GeoLite2-Country.mmdb">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
 
   <Target Name="PreBuild" BeforeTargets="PreBuildEvent">

Application/ApplicationManager.cs

@@ -1,7 +1,7 @@
 using IW4MAdmin.Application.EventParsers;
 using IW4MAdmin.Application.Extensions;
 using IW4MAdmin.Application.Misc;
-using IW4MAdmin.Application.RconParsers;
+using IW4MAdmin.Application.RConParsers;
 using SharedLibraryCore;
 using SharedLibraryCore.Commands;
 using SharedLibraryCore.Configuration;
@@ -15,6 +15,7 @@ using System;
 using System.Collections;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.Linq;
 using System.Reflection;
 using System.Text;
@@ -26,6 +27,7 @@ using IW4MAdmin.Application.Migration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Serilog.Context;
+using SharedLibraryCore.Formatting;
 using static SharedLibraryCore.GameEvent;
 using ILogger = Microsoft.Extensions.Logging.ILogger;
 using ObsoleteLogger = SharedLibraryCore.Interfaces.ILogger;
@@ -57,7 +59,6 @@ namespace IW4MAdmin.Application
         readonly PenaltyService PenaltySvc;
         public IConfigurationHandler<ApplicationConfiguration> ConfigHandler;
         readonly IPageList PageList;
-        private readonly IMetaService _metaService;
         private readonly TimeSpan _throttleTimeout = new TimeSpan(0, 1, 0);
         private readonly CancellationTokenSource _tokenSource;
         private readonly Dictionary<string, Task<IList>> _operationLookup = new Dictionary<string, Task<IList>>();
@@ -79,7 +80,7 @@ namespace IW4MAdmin.Application
             ITranslationLookup translationLookup, IConfigurationHandler<CommandConfiguration> commandConfiguration,
             IConfigurationHandler<ApplicationConfiguration> appConfigHandler, IGameServerInstanceFactory serverInstanceFactory,
             IEnumerable<IPlugin> plugins, IParserRegexFactory parserRegexFactory, IEnumerable<IRegisterEvent> customParserEvents,
-            IEventHandler eventHandler, IScriptCommandFactory scriptCommandFactory, IDatabaseContextFactory contextFactory, IMetaService metaService,
+            IEventHandler eventHandler, IScriptCommandFactory scriptCommandFactory, IDatabaseContextFactory contextFactory,
             IMetaRegistration metaRegistration, IScriptPluginServiceResolver scriptPluginServiceResolver, ClientService clientService, IServiceProvider serviceProvider,
             ChangeHistoryService changeHistoryService, ApplicationConfiguration appConfig, PenaltyService penaltyService)
         {
@@ -95,7 +96,6 @@ namespace IW4MAdmin.Application
             AdditionalRConParsers = new List<IRConParser>() { new BaseRConParser(serviceProvider.GetRequiredService<ILogger<BaseRConParser>>(), parserRegexFactory) };
             TokenAuthenticator = new TokenAuthentication();
             _logger = logger;
-            _metaService = metaService;
             _tokenSource = new CancellationTokenSource();
             _commands = commands.ToList();
             _translationLookup = translationLookup;
@@ -217,31 +217,31 @@ namespace IW4MAdmin.Application
             return _commands;
         }
 
+        public IReadOnlyList<IManagerCommand> Commands => _commands.ToImmutableList();
+
         public async Task UpdateServerStates()
         {
             // store the server hash code and task for it
-            var runningUpdateTasks = new Dictionary<long, Task>();
+            var runningUpdateTasks = new Dictionary<long, (Task task, CancellationTokenSource tokenSource, DateTime startTime)>();
 
             while (!_tokenSource.IsCancellationRequested)
             {
                 // select the server ids that have completed the update task
                 var serverTasksToRemove = runningUpdateTasks
-                    .Where(ut => ut.Value.Status == TaskStatus.RanToCompletion ||
-                        ut.Value.Status == TaskStatus.Canceled ||
-                        ut.Value.Status == TaskStatus.Faulted)
+                    .Where(ut => ut.Value.task.Status == TaskStatus.RanToCompletion ||
+                                 ut.Value.task.Status == TaskStatus.Canceled || // we want to cancel if a task takes longer than 5 minutes
+                                 ut.Value.task.Status == TaskStatus.Faulted || DateTime.Now - ut.Value.startTime > TimeSpan.FromMinutes(5))
                     .Select(ut => ut.Key)
                     .ToList();
 
-                // this is to prevent the log reader from starting before the initial
-                // query of players on the server
-                if (serverTasksToRemove.Count > 0)
+                // remove the update tasks as they have completed
+                foreach (var serverId in serverTasksToRemove.Where(serverId => runningUpdateTasks.ContainsKey(serverId)))
                 {
-                    IsInitialized = true;
-                }
+                    if (!runningUpdateTasks[serverId].tokenSource.Token.IsCancellationRequested)
+                    {
+                        runningUpdateTasks[serverId].tokenSource.Cancel();
+                    }
 
-                // remove the update tasks as they have completd
-                foreach (long serverId in serverTasksToRemove)
-                {
                     runningUpdateTasks.Remove(serverId);
                 }
 
@@ -249,11 +249,16 @@ namespace IW4MAdmin.Application
                 var serverIds = Servers.Select(s => s.EndPoint).Except(runningUpdateTasks.Select(r => r.Key)).ToList();
                 foreach (var server in Servers.Where(s => serverIds.Contains(s.EndPoint)))
                 {
-                    runningUpdateTasks.Add(server.EndPoint, Task.Run(async () =>
+                    var tokenSource = new CancellationTokenSource();
+                    runningUpdateTasks.Add(server.EndPoint, (Task.Run(async () =>
                     {
                         try
                         {
-                            await server.ProcessUpdatesAsync(_tokenSource.Token);
+                            if (runningUpdateTasks.ContainsKey(server.EndPoint))
+                            {
+                                await server.ProcessUpdatesAsync(_tokenSource.Token)
+                                    .WithWaitCancellation(runningUpdateTasks[server.EndPoint].tokenSource.Token);
+                            }
                         }
 
                         catch (Exception e)
@@ -268,7 +273,7 @@ namespace IW4MAdmin.Application
                         {
                             server.IsInitialized = true;
                         }
-                    }));
+                    }, tokenSource.Token), tokenSource, DateTime.Now));
                 }
 
                 try
@@ -341,15 +346,13 @@ namespace IW4MAdmin.Application
             // copy over default config if it doesn't exist
             if (!_appConfig.Servers?.Any() ?? true)
             {
-                var defaultConfig = new BaseConfigurationHandler<DefaultSettings>("DefaultSettings").Configuration();
-                //ConfigHandler.Set((ApplicationConfiguration)new ApplicationConfiguration().Generate());
-                //var newConfig = ConfigHandler.Configuration();
-
+                var defaultHandler = new BaseConfigurationHandler<DefaultSettings>("DefaultSettings");
+                await defaultHandler.BuildAsync();
+                var defaultConfig = defaultHandler.Configuration();
+        
                 _appConfig.AutoMessages = defaultConfig.AutoMessages;
                 _appConfig.GlobalRules = defaultConfig.GlobalRules;
-                _appConfig.Maps = defaultConfig.Maps;
                 _appConfig.DisallowedClientNames = defaultConfig.DisallowedClientNames;
-                _appConfig.QuickMessages = defaultConfig.QuickMessages;
 
                 //if (newConfig.Servers == null)
                 {
@@ -390,12 +393,24 @@ namespace IW4MAdmin.Application
                     await ConfigHandler.Save();
                 }
 
+#pragma warning disable 618
+                if (_appConfig.Maps != null)
+                {
+                    _appConfig.Maps = null;
+                }
+
+                if (_appConfig.QuickMessages != null)
+                {
+                    _appConfig.QuickMessages = null;
+                }
+#pragma warning restore 618
+
                 var validator = new ApplicationConfigurationValidator();
                 var validationResult = validator.Validate(_appConfig);
 
                 if (!validationResult.IsValid)
                 {
-                    throw new ConfigurationException("MANAGER_CONFIGURATION_ERROR")
+                    throw new ConfigurationException("Could not validate configuration")
                     {
                         Errors = validationResult.Errors.Select(_error => _error.ErrorMessage).ToArray(),
                         ConfigurationFileName = ConfigHandler.FileName
@@ -404,7 +419,7 @@ namespace IW4MAdmin.Application
 
                 foreach (var serverConfig in _appConfig.Servers)
                 {
-                    Migration.ConfigurationMigration.ModifyLogPath020919(serverConfig);
+                    ConfigurationMigration.ModifyLogPath020919(serverConfig);
 
                     if (serverConfig.RConParserVersion == null || serverConfig.EventParserVersion == null)
                     {
@@ -432,6 +447,17 @@ namespace IW4MAdmin.Application
             Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
             Utilities.EncodingType = Encoding.GetEncoding(!string.IsNullOrEmpty(_appConfig.CustomParserEncoding) ? _appConfig.CustomParserEncoding : "windows-1252");
 
+            foreach (var parser in AdditionalRConParsers)
+            {
+                if (!parser.Configuration.ColorCodeMapping.ContainsKey(ColorCodes.Accent.ToString()))
+                {
+                    parser.Configuration.ColorCodeMapping.Add(ColorCodes.Accent.ToString(),
+                        parser.Configuration.ColorCodeMapping.TryGetValue(_appConfig.IngameAccentColorKey, out var colorCode)
+                            ? colorCode
+                            : "");
+                }
+            }
+
             #endregion
 
             #region COMMANDS
@@ -457,13 +483,17 @@ namespace IW4MAdmin.Application
 
             // this is because I want to store the command prefix in IW4MAdminSettings, but can't easily
             // inject it to all the places that need it
-            cmdConfig.CommandPrefix = _appConfig.CommandPrefix;
-            cmdConfig.BroadcastCommandPrefix = _appConfig.BroadcastCommandPrefix;
+            cmdConfig.CommandPrefix = _appConfig?.CommandPrefix ?? "!";
+            cmdConfig.BroadcastCommandPrefix = _appConfig?.BroadcastCommandPrefix ?? "@";
 
             foreach (var cmd in commandsToAddToConfig)
             {
+                if (cmdConfig.Commands.ContainsKey(cmd.CommandConfigNameForType()))
+                {
+                    continue;
+                }
                 cmdConfig.Commands.Add(cmd.CommandConfigNameForType(),
-                new CommandProperties()
+                new CommandProperties
                 {
                     Name = cmd.Name,
                     Alias = cmd.Alias,
@@ -491,6 +521,7 @@ namespace IW4MAdmin.Application
 
             Console.WriteLine(_translationLookup["MANAGER_COMMUNICATION_INFO"]);
             await InitializeServers();
+            IsInitialized = true;
         }
 
         private async Task InitializeServers()
@@ -512,7 +543,7 @@ namespace IW4MAdmin.Application
 
                         _servers.Add(ServerInstance);
                         Console.WriteLine(Utilities.CurrentLocalization.LocalizationIndex["MANAGER_MONITORING_TEXT"].FormatExt(ServerInstance.Hostname.StripColors()));
-                        _logger.LogInformation("Finishing initialization and now monitoring [{server}]", ServerInstance.Hostname, ServerInstance.ToString());
+                        _logger.LogInformation("Finishing initialization and now monitoring [{Server}]", ServerInstance.Hostname);
                     }
 
                     // add the start event for this server
@@ -556,16 +587,29 @@ namespace IW4MAdmin.Application
 
         public async Task Start() => await UpdateServerStates();
 
-        public void Stop()
+        public async Task Stop()
         {
+            foreach (var plugin in Plugins)
+            {
+                try
+                {
+                    await plugin.OnUnloadAsync().WithTimeout(Utilities.DefaultCommandTimeout);
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogError(ex, "Could not cleanly unload plugin {PluginName}", plugin.Name);
+                }
+            }   
+            
             _tokenSource.Cancel();
+            
             IsRunning = false;
         }
 
         public void Restart()
         {
             IsRestartRequested = true;
-            Stop();
+            Stop().GetAwaiter().GetResult();
         }
 
         [Obsolete]
@@ -585,6 +629,11 @@ namespace IW4MAdmin.Application
             return _servers.SelectMany(s => s.Clients).ToList().Where(p => p != null).ToList();
         }
 
+        public EFClient FindActiveClient(EFClient client) =>client.ClientNumber < 0 ?
+                GetActiveClients()
+                    .FirstOrDefault(c => c.NetworkId == client.NetworkId) ?? client :
+                client;
+
         public ClientService GetClientService()
         {
             return ClientSvc;

Application/BuildScripts/PostBuild.bat

@@ -13,4 +13,5 @@ if not exist "%TargetDir%Plugins" (
 	md "%TargetDir%Plugins"
 )
 
-xcopy /y "%SolutionDir%Build\Plugins" "%TargetDir%Plugins\"
+xcopy /y "%SolutionDir%Build\Plugins" "%TargetDir%Plugins\"
+del "%TargetDir%Plugins\SQLite*"

Application/BuildScripts/PostPublish.bat

@@ -23,6 +23,7 @@ echo setting up default folders
 if not exist "%PublishDir%\Configuration" md "%PublishDir%\Configuration"
 move "%PublishDir%\DefaultSettings.json" "%PublishDir%\Configuration\"
 if not exist "%PublishDir%\Lib\" md "%PublishDir%\Lib\"
+del "%PublishDir%\Microsoft.CodeAnalysis*.dll" /F /Q
 move "%PublishDir%\*.dll" "%PublishDir%\Lib\"
 move "%PublishDir%\*.json" "%PublishDir%\Lib\"
 move "%PublishDir%\runtimes" "%PublishDir%\Lib\runtimes"
@@ -30,16 +31,37 @@ move "%PublishDir%\ru" "%PublishDir%\Lib\ru"
 move "%PublishDir%\de" "%PublishDir%\Lib\de"
 move "%PublishDir%\pt" "%PublishDir%\Lib\pt"
 move "%PublishDir%\es" "%PublishDir%\Lib\es"
+rmdir /Q /S "%PublishDir%\cs"
+rmdir /Q /S "%PublishDir%\fr"
+rmdir /Q /S "%PublishDir%\it"
+rmdir /Q /S "%PublishDir%\ja"
+rmdir /Q /S "%PublishDir%\ko"
+rmdir /Q /S "%PublishDir%\pl"
+rmdir /Q /S "%PublishDir%\pt-BR"
+rmdir /Q /S "%PublishDir%\tr"
+rmdir /Q /S "%PublishDir%\zh-Hans"
+rmdir /Q /S "%PublishDir%\zh-Hant"
 if exist "%PublishDir%\refs" move "%PublishDir%\refs" "%PublishDir%\Lib\refs"
 
 echo making start scripts
 @(echo @echo off && echo @title IW4MAdmin && echo set DOTNET_CLI_TELEMETRY_OPTOUT=1 && echo dotnet Lib\IW4MAdmin.dll && echo pause) > "%PublishDir%\StartIW4MAdmin.cmd"
 @(echo #!/bin/bash&& echo export DOTNET_CLI_TELEMETRY_OPTOUT=1&& echo dotnet Lib/IW4MAdmin.dll) > "%PublishDir%\StartIW4MAdmin.sh"
 
+echo copying update scripts
+copy "%SourceDir%\DeploymentFiles\UpdateIW4MAdmin.ps1" "%PublishDir%\UpdateIW4MAdmin.ps1"
+copy "%SourceDir%\DeploymentFiles\UpdateIW4MAdmin.sh" "%PublishDir%\UpdateIW4MAdmin.sh"
+
 echo moving front-end library dependencies
 if not exist "%PublishDir%\wwwroot\font" mkdir "%PublishDir%\wwwroot\font"
 move "WebfrontCore\wwwroot\lib\open-iconic\font\fonts\*.*" "%PublishDir%\wwwroot\font\"
 if exist "%PublishDir%\wwwroot\lib" rd /s /q "%PublishDir%\wwwroot\lib"
+if not exist "%PublishDir%\wwwroot\css" mkdir "%PublishDir%\wwwroot\css"
+move "WebfrontCore\wwwroot\css\global.min.css" "%PublishDir%\wwwroot\css\global.min.css"
+if not exist "%PublishDir%\wwwroot\js" mkdir "%PublishDir%\wwwroot\js"
+move "%SourceDir%\WebfrontCore\wwwroot\js\global.min.js" "%PublishDir%\wwwroot\js\global.min.js"
+if not exist "%PublishDir%\wwwroot\images" mkdir "%PublishDir%\wwwroot\images"
+xcopy "%SourceDir%\WebfrontCore\wwwroot\images" "%PublishDir%\wwwroot\images" /E /H /C /I
+
 
 echo setting permissions...
-cacls "%PublishDir%" /t /e /p Everyone:F
+cacls "%PublishDir%" /t /e /p Everyone:F

Application/Commands/ClientTags/AddClientTagCommand.cs

@@ -0,0 +1,64 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Data.Models;
+using Data.Models.Client;
+using Microsoft.Extensions.Logging;
+using SharedLibraryCore;
+using SharedLibraryCore.Commands;
+using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Interfaces;
+
+namespace IW4MAdmin.Application.Commands.ClientTags
+{
+    public class AddClientTagCommand : Command
+    {
+        private readonly IMetaServiceV2 _metaService;
+
+        public AddClientTagCommand(ILogger<AddClientTagCommand> commandLogger, CommandConfiguration config,
+            ITranslationLookup layout, IMetaServiceV2 metaService) :
+            base(config, layout)
+        {
+            Name = "addclienttag";
+            Description = layout["COMMANDS_ADD_CLIENT_TAG_DESC"];
+            Alias = "act";
+            Permission = EFClient.Permission.Owner;
+            RequiresTarget = false;
+            Arguments = new[]
+            {
+                new CommandArgument
+                {
+                    Name = _translationLookup["COMMANDS_ARGUMENT_TAG"],
+                    Required = true
+                }
+            };
+
+            _metaService = metaService;
+            logger = commandLogger;
+        }
+
+        public override async Task ExecuteAsync(GameEvent gameEvent)
+        {
+            var existingTags = await _metaService.GetPersistentMetaValue<List<TagMeta>>(EFMeta.ClientTagNameV2) ??
+                               new List<TagMeta>();
+
+            var tagName = gameEvent.Data.Trim();
+
+            if (existingTags.Any(tag => tag.TagName == tagName))
+            {
+                logger.LogWarning("Tag with name {TagName} already exists", tagName);
+                return;
+            }
+
+            existingTags.Add(new TagMeta
+            {
+                Id = (existingTags.LastOrDefault()?.TagId ?? 0) + 1,
+                Value = tagName
+            });
+
+            await _metaService.SetPersistentMetaValue(EFMeta.ClientTagNameV2, existingTags,
+                gameEvent.Owner.Manager.CancellationToken);
+            gameEvent.Origin.Tell(_translationLookup["COMMANDS_ADD_CLIENT_TAG_SUCCESS"].FormatExt(gameEvent.Data));
+        }
+    }
+}

Application/Commands/ClientTags/ListClientTags.cs

@@ -0,0 +1,38 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Data.Models;
+using Data.Models.Client;
+using SharedLibraryCore;
+using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Interfaces;
+
+namespace IW4MAdmin.Application.Commands.ClientTags
+{
+    public class ListClientTags : Command
+    {
+        private readonly IMetaServiceV2 _metaService;
+
+        public ListClientTags(CommandConfiguration config, ITranslationLookup layout, IMetaServiceV2 metaService) : base(
+            config, layout)
+        {
+            Name = "listclienttags";
+            Description = layout["COMMANDS_LIST_CLIENT_TAGS_DESC"];
+            Alias = "lct";
+            Permission = EFClient.Permission.Owner;
+            RequiresTarget = false;
+            _metaService = metaService;
+        }
+
+        public override async Task ExecuteAsync(GameEvent gameEvent)
+        {
+            var tags = await _metaService.GetPersistentMetaValue<List<TagMeta>>(EFMeta.ClientTagNameV2);
+            
+            if (tags is not null)
+            {
+                await gameEvent.Origin.TellAsync(tags.Select(tag => tag.TagName),
+                    gameEvent.Owner.Manager.CancellationToken);
+            }
+        }
+    }
+}

Application/Commands/ClientTags/RemoveClientTagCommand.cs

@@ -1,16 +1,21 @@
-using SharedLibraryCore.Configuration;
-using SharedLibraryCore.Database.Models;
-using SharedLibraryCore.Interfaces;
+using System.Collections.Generic;
 using System.Threading.Tasks;
+using System.Linq;
 using Data.Models;
+using Data.Models.Client;
+using SharedLibraryCore;
+using SharedLibraryCore.Commands;
+using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Interfaces;
 
-namespace SharedLibraryCore.Commands
+namespace IW4MAdmin.Application.Commands.ClientTags
 {
     public class RemoveClientTag : Command
     {
-        private readonly IMetaService _metaService;
+        private readonly IMetaServiceV2 _metaService;
 
-        public RemoveClientTag(CommandConfiguration config, ITranslationLookup layout, IMetaService metaService) : base(config, layout)
+        public RemoveClientTag(CommandConfiguration config, ITranslationLookup layout, IMetaServiceV2 metaService) : base(
+            config, layout)
         {
             Name = "removeclienttag";
             Description = layout["COMMANDS_REMOVE_CLIENT_TAG_DESC"];
@@ -19,7 +24,7 @@ namespace SharedLibraryCore.Commands
             RequiresTarget = false;
             Arguments = new[]
             {
-                new CommandArgument()
+                new CommandArgument
                 {
                     Name = _translationLookup["COMMANDS_ARGUMENT_TAG"],
                     Required = true
@@ -31,7 +36,12 @@ namespace SharedLibraryCore.Commands
 
         public override async Task ExecuteAsync(GameEvent gameEvent)
         {
-            await _metaService.RemovePersistentMeta(EFMeta.ClientTagName, gameEvent.Data);
+            var existingMeta = await _metaService.GetPersistentMetaValue<List<TagMeta>>(EFMeta.ClientTagNameV2,
+                gameEvent.Owner.Manager.CancellationToken);
+            existingMeta = existingMeta.Where(meta => meta.TagName != gameEvent.Data.Trim()).ToList();
+            await _metaService.SetPersistentMetaValue(EFMeta.ClientTagNameV2, existingMeta,
+                gameEvent.Owner.Manager.CancellationToken);
+            
             gameEvent.Origin.Tell(_translationLookup["COMMANDS_REMOVE_CLIENT_TAG_SUCCESS"].FormatExt(gameEvent.Data));
         }
     }

Application/Commands/ClientTags/SetClientTagCommand.cs

@@ -1,18 +1,23 @@
-using SharedLibraryCore.Configuration;
-using SharedLibraryCore.Database.Models;
-using SharedLibraryCore.Interfaces;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Data.Models;
+using Data.Models.Client;
+using SharedLibraryCore;
+using SharedLibraryCore.Commands;
+using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Dtos;
+using SharedLibraryCore.Interfaces;
 
-namespace SharedLibraryCore.Commands
+namespace IW4MAdmin.Application.Commands.ClientTags
 {
     public class SetClientTagCommand : Command
     {
-        private readonly IMetaService _metaService;
+        private readonly IMetaServiceV2 _metaService;
 
 
-        public SetClientTagCommand(CommandConfiguration config, ITranslationLookup layout, IMetaService metaService) : base(config, layout)
+        public SetClientTagCommand(CommandConfiguration config, ITranslationLookup layout, IMetaServiceV2 metaService) :
+            base(config, layout)
         {
             Name = "setclienttag";
             Description = layout["COMMANDS_SET_CLIENT_TAG_DESC"];
@@ -21,7 +26,7 @@ namespace SharedLibraryCore.Commands
             RequiresTarget = true;
             Arguments = new[]
             {
-                new CommandArgument()
+                new CommandArgument
                 {
                     Name = _translationLookup["COMMANDS_ARGUMENT_TAG"],
                     Required = true
@@ -33,8 +38,10 @@ namespace SharedLibraryCore.Commands
 
         public override async Task ExecuteAsync(GameEvent gameEvent)
         {
-            var availableTags = await _metaService.GetPersistentMeta(EFMeta.ClientTagName);
-            var matchingTag = availableTags.FirstOrDefault(tag => tag.Value == gameEvent.Data);
+            var token = gameEvent.Owner.Manager.CancellationToken;
+            
+            var availableTags = await _metaService.GetPersistentMetaValue<List<LookupValue<string>>>(EFMeta.ClientTagNameV2, token);
+            var matchingTag = availableTags.FirstOrDefault(tag => tag.Value == gameEvent.Data.Trim());
 
             if (matchingTag == null)
             {
@@ -43,7 +50,8 @@ namespace SharedLibraryCore.Commands
             }
 
             gameEvent.Target.Tag = matchingTag.Value;
-            await _metaService.AddPersistentMeta(EFMeta.ClientTag, string.Empty, gameEvent.Target, matchingTag);
+            await _metaService.SetPersistentMetaForLookupKey(EFMeta.ClientTagV2, EFMeta.ClientTagNameV2, matchingTag.Id,
+                gameEvent.Target.ClientId, token);
             gameEvent.Origin.Tell(_translationLookup["COMMANDS_SET_CLIENT_TAG_SUCCESS"].FormatExt(matchingTag.Value));
         }
     }

Application/Commands/ClientTags/TagMeta.cs

@@ -0,0 +1,13 @@
+using System.Text.Json.Serialization;
+using SharedLibraryCore.Interfaces;
+
+namespace IW4MAdmin.Application.Commands.ClientTags;
+
+public class TagMeta : ILookupValue<string>
+{
+    [JsonIgnore] public int TagId => Id;
+    [JsonIgnore] public string TagName => Value;
+
+    public int Id { get; set; }
+    public string Value { get; set; }
+}

Application/Commands/ClientTags/UnsetClientTagCommand.cs

@@ -1,18 +1,19 @@
-using SharedLibraryCore.Configuration;
-using SharedLibraryCore.Database.Models;
-using SharedLibraryCore.Interfaces;
-using System.Linq;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Data.Models;
+using Data.Models.Client;
+using SharedLibraryCore;
+using SharedLibraryCore.Commands;
+using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Interfaces;
 
-namespace SharedLibraryCore.Commands
+namespace IW4MAdmin.Application.Commands.ClientTags
 {
     public class UnsetClientTagCommand : Command
     {
-        private readonly IMetaService _metaService;
+        private readonly IMetaServiceV2 _metaService;
 
-
-        public UnsetClientTagCommand(CommandConfiguration config, ITranslationLookup layout, IMetaService metaService) : base(config, layout)
+        public UnsetClientTagCommand(CommandConfiguration config, ITranslationLookup layout, IMetaServiceV2 metaService) :
+            base(config, layout)
         {
             Name = "unsetclienttag";
             Description = layout["COMMANDS_UNSET_CLIENT_TAG_DESC"];
@@ -21,7 +22,7 @@ namespace SharedLibraryCore.Commands
             RequiresTarget = true;
             Arguments = new[]
             {
-                new CommandArgument()
+                new CommandArgument
                 {
                     Name = _translationLookup["COMMANDS_ARGUMENT_TAG"],
                     Required = true
@@ -34,7 +35,8 @@ namespace SharedLibraryCore.Commands
         public override async Task ExecuteAsync(GameEvent gameEvent)
         {
             gameEvent.Target.Tag = null;
-            await _metaService.RemovePersistentMeta(EFMeta.ClientTag, gameEvent.Target);
+            await _metaService.RemovePersistentMeta(EFMeta.ClientTagV2, gameEvent.Target.ClientId,
+                gameEvent.Owner.Manager.CancellationToken);
             gameEvent.Origin.Tell(_translationLookup["COMMANDS_UNSET_CLIENT_TAG_SUCCESS"]);
         }
     }

Application/Commands/FindPlayerCommand.cs

@@ -0,0 +1,59 @@
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using Data.Models.Client;
+using SharedLibraryCore;
+using SharedLibraryCore.Commands;
+using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Interfaces;
+
+namespace IW4MAdmin.Application.Commands
+{
+    /// <summary>
+    /// Finds player by name
+    /// </summary>
+    public class FindPlayerCommand : Command
+    {
+        public FindPlayerCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config,
+            translationLookup)
+        {
+            Name = "find";
+            Description = _translationLookup["COMMANDS_FIND_DESC"];
+            Alias = "f";
+            Permission = EFClient.Permission.Administrator;
+            RequiresTarget = false;
+            Arguments = new[]
+            {
+                new CommandArgument()
+                {
+                    Name = _translationLookup["COMMANDS_ARGS_PLAYER"],
+                    Required = true
+                }
+            };
+        }
+
+        public override async Task ExecuteAsync(GameEvent gameEvent)
+        {
+            if (gameEvent.Data.Length < 3)
+            {
+                gameEvent.Origin.Tell(_translationLookup["COMMANDS_FIND_MIN"]);
+                return;
+            }
+
+            var players = await gameEvent.Owner.Manager.GetClientService().FindClientsByIdentifier(gameEvent.Data);
+
+            if (!players.Any())
+            {
+                gameEvent.Origin.Tell(_translationLookup["COMMANDS_FIND_EMPTY"]);
+                return;
+            }
+
+            foreach (var client in players)
+            {
+                gameEvent.Origin.Tell(_translationLookup["COMMANDS_FIND_FORMAT_V2"].FormatExt(client.Name,
+                    client.ClientId, Utilities.ConvertLevelToColor((EFClient.Permission) client.LevelInt, client.Level),
+                    client.IPAddress, (DateTime.UtcNow - client.LastConnection).HumanizeForCurrentCulture()));
+            }
+        }
+    }
+}

Application/Commands/HelpCommand.cs

@@ -0,0 +1,93 @@
+using System;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Data.Models.Client;
+using SharedLibraryCore;
+using SharedLibraryCore.Commands;
+using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Interfaces;
+
+namespace IW4MAdmin.Application.Commands
+{
+    /// <summary>
+    /// Prints help information
+    /// </summary>
+    public class HelpCommand : Command
+    {
+        public HelpCommand(CommandConfiguration config, ITranslationLookup translationLookup) :
+            base(config, translationLookup)
+        {
+            Name = "help";
+            Description = translationLookup["COMMANDS_HELP_DESC"];
+            Alias = "h";
+            Permission = EFClient.Permission.User;
+            RequiresTarget = false;
+            Arguments = new[]
+            {
+                new CommandArgument
+                {
+                    Name = translationLookup["COMMANDS_ARGS_COMMANDS"],
+                    Required = false
+                }
+            };
+        }
+
+        public override Task ExecuteAsync(GameEvent gameEvent)
+        {
+            var searchTerm = gameEvent.Data.Trim();
+            var availableCommands = gameEvent.Owner.Manager.Commands.Distinct().Where(command =>
+                    command.SupportedGames == null || !command.SupportedGames.Any() ||
+                    command.SupportedGames.Contains(gameEvent.Owner.GameName))
+                .Where(command => gameEvent.Origin.Level >= command.Permission);
+
+            if (searchTerm.Length > 2)
+            {
+                var matchingCommand = availableCommands.FirstOrDefault(command =>
+                    command.Name.Equals(searchTerm, StringComparison.InvariantCultureIgnoreCase) ||
+                    command.Alias.Equals(searchTerm, StringComparison.InvariantCultureIgnoreCase));
+
+                if (matchingCommand != null)
+                {
+                    gameEvent.Origin.Tell(_translationLookup["COMMANDS_HELP_SEARCH_RESULT"]
+                        .FormatExt(matchingCommand.Name, matchingCommand.Alias));
+                    gameEvent.Origin.Tell(matchingCommand.Syntax);
+                }
+
+                else
+                {
+                    gameEvent.Origin.Tell(_translationLookup["COMMANDS_HELP_NOTFOUND"]);
+                }
+            }
+
+            else
+            {
+                var commandStrings = availableCommands.Select((command, index) =>
+                    new
+                    {
+                        response = $" {_translationLookup["COMMANDS_HELP_LIST_FORMAT"].FormatExt(command.Name)} ",
+                        index
+                    });
+
+                var helpResponse = new StringBuilder();
+
+                foreach (var item in commandStrings)
+                {
+                    helpResponse.Append(item.response);
+                    if (item.index == 0 || item.index % 4 != 0)
+                    {
+                        continue;
+                    }
+
+                    gameEvent.Origin.Tell(helpResponse.ToString());
+                    helpResponse = new StringBuilder();
+                }
+
+                gameEvent.Origin.Tell(helpResponse.ToString());
+                gameEvent.Origin.Tell(_translationLookup["COMMANDS_HELP_MOREINFO"]);
+            }
+
+            return Task.CompletedTask;
+        }
+    }
+}

Application/Commands/ListAdminsCommand.cs

@@ -0,0 +1,50 @@
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using Data.Models.Client;
+using SharedLibraryCore;
+using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Interfaces;
+
+namespace IW4MAdmin.Application.Commands
+{
+    /// <summary>
+    /// Lists all unmasked admins
+    /// </summary>
+    public class ListAdminsCommand : Command
+    {
+        public ListAdminsCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config,
+            translationLookup)
+        {
+            Name = "admins";
+            Description = _translationLookup["COMMANDS_ADMINS_DESC"];
+            Alias = "a";
+            Permission = EFClient.Permission.User;
+            RequiresTarget = false;
+        }
+
+        public static string OnlineAdmins(Server server, ITranslationLookup lookup)
+        {
+            var onlineAdmins = server.GetClientsAsList()
+                .Where(p => p.Level > EFClient.Permission.Flagged)
+                .Where(p => !p.Masked)
+                .Select(p =>
+                    $"[(Color::Yellow){Utilities.ConvertLevelToColor(p.Level, p.ClientPermission.Name)}(Color::White)] {p.Name}")
+                .ToList();
+
+            return onlineAdmins.Any() ? string.Join(Environment.NewLine, onlineAdmins) : lookup["COMMANDS_ADMINS_NONE"];
+        }
+
+        public override Task ExecuteAsync(GameEvent gameEvent)
+        {
+            foreach (var line in OnlineAdmins(gameEvent.Owner, _translationLookup).Split(Environment.NewLine))
+            {
+                var _ = gameEvent.Message.IsBroadcastCommand(_config.BroadcastCommandPrefix)
+                    ? gameEvent.Owner.Broadcast(line)
+                    : gameEvent.Origin.Tell(line);
+            }
+
+            return Task.CompletedTask;
+        }
+    }
+}

Application/Commands/ListAliasesCommand.cs

@@ -0,0 +1,57 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Data.Models.Client;
+using SharedLibraryCore;
+using SharedLibraryCore.Commands;
+using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Interfaces;
+
+namespace IW4MAdmin.Application.Commands
+{
+    /// <summary>
+    /// Lists alises of specified client
+    /// </summary>
+    public class ListAliasesCommand : Command
+    {
+        public ListAliasesCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config,
+            translationLookup)
+        {
+            Name = "alias";
+            Description = _translationLookup["COMMANDS_ALIAS_DESC"];
+            Alias = "known";
+            Permission = EFClient.Permission.Moderator;
+            RequiresTarget = true;
+            Arguments = new[]
+            {
+                new CommandArgument()
+                {
+                    Name = _translationLookup["COMMANDS_ARGS_PLAYER"],
+                    Required = true,
+                }
+            };
+        }
+
+        public override Task ExecuteAsync(GameEvent gameEvent)
+        {
+            var message = new StringBuilder();
+            var names = new List<string>(gameEvent.Target.AliasLink.Children.Select(a => a.Name));
+            var ips = new List<string>(gameEvent.Target.AliasLink.Children.Select(a => a.IPAddress.ConvertIPtoString())
+                .Distinct());
+
+            gameEvent.Origin.Tell($"[(Color::Accent){gameEvent.Target}(Color::White)]");
+
+            message.Append($"{_translationLookup["COMMANDS_ALIAS_ALIASES"]}: ");
+            message.Append(string.Join(" | ", names));
+            gameEvent.Origin.Tell(message.ToString());
+
+            message.Clear();
+            message.Append($"{_translationLookup["COMMANDS_ALIAS_IPS"]}: ");
+            message.Append(string.Join(" | ", ips));
+            gameEvent.Origin.Tell(message.ToString());
+
+            return Task.CompletedTask;
+        }
+    }
+}

Application/Commands/ListClientsCommand.cs

@@ -0,0 +1,37 @@
+using System.Linq;
+using System.Threading.Tasks;
+using Data.Models.Client;
+using SharedLibraryCore;
+using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Interfaces;
+
+namespace IW4MAdmin.Application.Commands
+{
+    /// <summary>
+    /// List online clients
+    /// </summary>
+    public class ListClientsCommand : Command
+    {
+        public ListClientsCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config,
+            translationLookup)
+        {
+            Name = "list";
+            Description = _translationLookup["COMMANDS_LIST_DESC"];
+            Alias = "l";
+            Permission = EFClient.Permission.Moderator;
+            RequiresTarget = false;
+        }
+
+        public override Task ExecuteAsync(GameEvent gameEvent)
+        {
+            var clientList = gameEvent.Owner.GetClientsAsList()
+                .Select(client =>
+                    $"[(Color::Accent){client.ClientPermission.Name}(Color::White){(string.IsNullOrEmpty(client.Tag) ? "" : $" {client.Tag}")}(Color::White)][(Color::Yellow)#{client.ClientNumber}(Color::White)] {client.Name}")
+                .ToArray();
+
+            gameEvent.Origin.TellAsync(clientList, gameEvent.Owner.Manager.CancellationToken);
+
+            return Task.CompletedTask;
+        }
+    }
+}

Application/Commands/ListPluginsCommand.cs

@@ -0,0 +1,41 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Data.Models.Client;
+using SharedLibraryCore;
+using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Interfaces;
+
+namespace IW4MAdmin.Application.Commands
+{
+    /// <summary>
+    /// Lists the loaded plugins
+    /// </summary>
+    public class ListPluginsCommand : Command
+    {
+        private readonly IEnumerable<IPlugin> _plugins;
+
+        public ListPluginsCommand(CommandConfiguration config, ITranslationLookup translationLookup,
+            IEnumerable<IPlugin> plugins) : base(config, translationLookup)
+        {
+            Name = "plugins";
+            Description = _translationLookup["COMMANDS_PLUGINS_DESC"];
+            Alias = "p";
+            Permission = EFClient.Permission.Administrator;
+            RequiresTarget = false;
+            _plugins = plugins;
+        }
+
+        public override Task ExecuteAsync(GameEvent gameEvent)
+        {
+            gameEvent.Origin.Tell(_translationLookup["COMMANDS_PLUGINS_LOADED"]);
+            foreach (var plugin in _plugins.Where(plugin => !plugin.IsParser))
+            {
+                gameEvent.Origin.Tell(_translationLookup["COMMANDS_LIST_PLUGINS_FORMAT"]
+                    .FormatExt(plugin.Name, plugin.Version, plugin.Author));
+            }
+
+            return Task.CompletedTask;
+        }
+    }
+}

Application/Commands/ListReportsCommand.cs

@@ -0,0 +1,59 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Data.Models.Client;
+using SharedLibraryCore;
+using SharedLibraryCore.Commands;
+using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Helpers;
+using SharedLibraryCore.Interfaces;
+
+namespace IW4MAdmin.Application.Commands
+{
+    /// <summary>
+    /// List all reports on the server
+    /// </summary>
+    public class ListReportsCommand : Command
+    {
+        public ListReportsCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config,
+            translationLookup)
+        {
+            Name = "reports";
+            Description = _translationLookup["COMMANDS_REPORTS_DESC"];
+            Alias = "reps";
+            Permission = EFClient.Permission.Moderator;
+            RequiresTarget = false;
+            Arguments = new[]
+            {
+                new CommandArgument
+                {
+                    Name = _translationLookup["COMMANDS_ARGS_CLEAR"],
+                    Required = false
+                }
+            };
+        }
+
+        public override Task ExecuteAsync(GameEvent gameEvent)
+        {
+            if (gameEvent.Data != null && gameEvent.Data.ToLower().Contains(_translationLookup["COMMANDS_ARGS_CLEAR"]))
+            {
+                gameEvent.Owner.Reports = new List<Report>();
+                gameEvent.Origin.Tell(_translationLookup["COMMANDS_REPORTS_CLEAR_SUCCESS"]);
+                return Task.CompletedTask;
+            }
+
+            if (gameEvent.Owner.Reports.Count < 1)
+            {
+                gameEvent.Origin.Tell(_translationLookup["COMMANDS_REPORTS_NONE"]);
+                return Task.CompletedTask;
+            }
+
+            foreach (var report in gameEvent.Owner.Reports)
+            {
+                gameEvent.Origin.Tell(
+                    $"(Color::Accent){report.Origin.Name}(Color::White) -> (Color::Red){report.Target.Name}(Color::White): {report.Reason}");
+            }
+
+            return Task.CompletedTask;
+        }
+    }
+}

Application/Commands/MapAndGameTypeCommand.cs

@@ -0,0 +1,116 @@
+using System.Linq;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using Data.Models.Client;
+using IW4MAdmin.Application.Extensions;
+using Microsoft.Extensions.Logging;
+using SharedLibraryCore;
+using SharedLibraryCore.Commands;
+using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Interfaces;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
+
+namespace IW4MAdmin.Application.Commands
+{
+    public class MapAndGameTypeCommand : Command
+    {
+        private const string ArgumentRegexPattern = "(?:\"([^\"]+)\"|([^\\s]+)) (?:\"([^\"]+)\"|([^\\s]+))";
+        private readonly ILogger _logger;
+        private readonly DefaultSettings _defaultSettings;
+
+        public MapAndGameTypeCommand(ILogger<MapAndGameTypeCommand> logger, CommandConfiguration config,
+            DefaultSettings defaultSettings, ITranslationLookup layout) : base(config, layout)
+        {
+            Name = "mapandgametype";
+            Description = _translationLookup["COMMANDS_MAG_DESCRIPTION"];
+            Alias = "mag";
+            Permission = EFClient.Permission.Administrator;
+            RequiresTarget = false;
+            Arguments = new[]
+            {
+                new CommandArgument
+                {
+                    Name = _translationLookup["COMMADS_MAG_ARG_1"],
+                    Required = true
+                },
+                new CommandArgument
+                {
+                    Name = _translationLookup["COMMADS_MAG_ARG_2"],
+                    Required = true
+                }
+            };
+            _logger = logger;
+            _defaultSettings = defaultSettings;
+        }
+
+        public override async Task ExecuteAsync(GameEvent gameEvent)
+        {
+            var match = Regex.Match(gameEvent.Data.Trim(), ArgumentRegexPattern,
+                RegexOptions.Compiled | RegexOptions.IgnoreCase);
+
+            if (!match.Success)
+            {
+                gameEvent.Origin.Tell(Syntax);
+                return;
+            }
+
+            var map = match.Groups[1].Length > 0 ? match.Groups[1].ToString() : match.Groups[2].ToString();
+            var gametype = match.Groups[3].Length > 0 ? match.Groups[3].ToString() : match.Groups[4].ToString();
+
+            var matchingMaps = gameEvent.Owner.FindMap(map);
+            var matchingGametypes = _defaultSettings.FindGametype(gametype, gameEvent.Owner.GameName);
+
+            if (matchingMaps.Count > 1)
+            {
+                gameEvent.Origin.Tell(_translationLookup["COMMANDS_MAG_MULTIPLE_MAPS"]);
+
+                foreach (var matchingMap in matchingMaps)
+                {
+                    gameEvent.Origin.Tell(
+                        $"[(Color::Yellow){matchingMap.Alias}(Color::White)] [(Color::Yellow){matchingMap.Name}(Color::White)]");
+                }
+
+                return;
+            }
+
+            if (matchingGametypes.Count > 1)
+            {
+                gameEvent.Origin.Tell(_translationLookup["COMMANDS_MAG_MULTIPLE_GAMETYPES"]);
+
+                foreach (var matchingGametype in matchingGametypes)
+                {
+                    gameEvent.Origin.Tell(
+                        $"[(Color::Yellow){matchingGametype.Alias}(Color::White)] [(Color::Yellow){matchingGametype.Name}(Color::White)]");
+                }
+
+                return;
+            }
+
+            map = matchingMaps.FirstOrDefault()?.Name ?? map;
+            gametype = matchingGametypes.FirstOrDefault()?.Name ?? gametype;
+            var hasMatchingGametype = matchingGametypes.Any();
+
+            _logger.LogDebug("Changing map to {Map} and gametype {Gametype}", map, gametype);
+
+            await gameEvent.Owner.SetDvarAsync("g_gametype", gametype, gameEvent.Owner.Manager.CancellationToken);
+            gameEvent.Owner.Broadcast(_translationLookup["COMMANDS_MAP_SUCCESS"].FormatExt(map));
+            await Task.Delay(gameEvent.Owner.Manager.GetApplicationSettings().Configuration().MapChangeDelaySeconds);
+
+            switch (gameEvent.Owner.GameName)
+            {
+                case Server.Game.IW5:
+                    await gameEvent.Owner.ExecuteCommandAsync(
+                        $"load_dsr {(hasMatchingGametype ? gametype.ToUpper() + "_default" : gametype)}");
+                    await gameEvent.Owner.ExecuteCommandAsync($"map {map}");
+                    break;
+                case Server.Game.T6:
+                    await gameEvent.Owner.ExecuteCommandAsync($"exec {gametype}.cfg");
+                    await gameEvent.Owner.ExecuteCommandAsync($"map {map}");
+                    break;
+                default:
+                    await gameEvent.Owner.ExecuteCommandAsync($"map {map}");
+                    break;
+            }
+        }
+    }
+}

Application/Commands/OfflineMessageCommand.cs

@@ -0,0 +1,78 @@
+using System;
+using System.Threading.Tasks;
+using Data.Abstractions;
+using Data.Models.Client;
+using Data.Models.Misc;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using SharedLibraryCore;
+using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Interfaces;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
+
+namespace IW4MAdmin.Application.Commands
+{
+    public class OfflineMessageCommand : Command
+    {
+        private readonly IDatabaseContextFactory _contextFactory;
+        private readonly ILogger _logger;
+        private const short MaxLength = 1024;
+        
+        public OfflineMessageCommand(CommandConfiguration config, ITranslationLookup layout,
+            IDatabaseContextFactory contextFactory, ILogger<IDatabaseContextFactory> logger) : base(config, layout)
+        {
+            Name = "offlinemessage";
+            Description = _translationLookup["COMMANDS_OFFLINE_MESSAGE_DESC"];
+            Alias = "om";
+            Permission = EFClient.Permission.Moderator;
+            RequiresTarget = true;
+            
+            _contextFactory = contextFactory;
+            _logger = logger;
+        }
+
+        public override async Task ExecuteAsync(GameEvent gameEvent)
+        {
+            if (gameEvent.Data.Length > MaxLength)
+            {
+                gameEvent.Origin.Tell(_translationLookup["COMMANDS_OFFLINE_MESSAGE_TOO_LONG"].FormatExt(MaxLength));
+                return;
+            }
+            
+            if (gameEvent.Target.ClientId == gameEvent.Origin.ClientId)
+            {
+                gameEvent.Origin.Tell(_translationLookup["COMMANDS_OFFLINE_MESSAGE_SELF"].FormatExt(MaxLength));
+                return;
+            }
+            
+            if (gameEvent.Target.IsIngame)
+            {
+                gameEvent.Origin.Tell(_translationLookup["COMMANDS_OFFLINE_MESSAGE_INGAME"].FormatExt(gameEvent.Target.Name));
+                return;
+            }
+            
+            await using var context = _contextFactory.CreateContext(enableTracking: false);
+            var server = await context.Servers.FirstAsync(srv => srv.EndPoint == gameEvent.Owner.ToString());
+
+            var newMessage = new EFInboxMessage()
+            {
+                SourceClientId = gameEvent.Origin.ClientId,
+                DestinationClientId = gameEvent.Target.ClientId,
+                ServerId = server.Id,
+                Message = gameEvent.Data,
+            };
+
+            try
+            {
+                context.Set<EFInboxMessage>().Add(newMessage);
+                await context.SaveChangesAsync();
+                gameEvent.Origin.Tell(_translationLookup["COMMANDS_OFFLINE_MESSAGE_SUCCESS"]);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Could not save offline message {@Message}", newMessage);
+                throw;
+            }
+        }
+    }
+}

Application/Commands/PrivateMessageCommand.cs

@@ -0,0 +1,45 @@
+using System.Threading.Tasks;
+using Data.Models.Client;
+using SharedLibraryCore;
+using SharedLibraryCore.Commands;
+using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Interfaces;
+
+namespace IW4MAdmin.Application.Commands
+{
+    /// <summary>
+    /// Sends a private message to another player
+    /// </summary>
+    public class PrivateMessageCommand : Command
+    {
+        public PrivateMessageCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config, translationLookup)
+        {
+            Name = "privatemessage";
+            Description = _translationLookup["COMMANDS_PM_DESC"];
+            Alias = "pm";
+            Permission = EFClient.Permission.User;
+            RequiresTarget = true;
+            Arguments = new[]
+            {
+                new CommandArgument
+                {
+                    Name = _translationLookup["COMMANDS_ARGS_PLAYER"],
+                    Required = true
+                },
+                new CommandArgument
+                {
+                    Name = _translationLookup["COMMANDS_ARGS_MESSAGE"],
+                    Required = true
+                }
+            };
+        }
+
+        public override Task ExecuteAsync(GameEvent gameEvent)
+        {
+            gameEvent.Target.Tell(_translationLookup["COMMANDS_PRIVATE_MESSAGE_FORMAT"].FormatExt(gameEvent.Origin.Name, gameEvent.Data));
+            gameEvent.Origin.Tell(_translationLookup["COMMANDS_PRIVATE_MESSAGE_RESULT"]
+                .FormatExt(gameEvent.Target.Name, gameEvent.Data));
+            return Task.CompletedTask;
+        }
+    }
+}

Application/Commands/ReadMessageCommand.cs

@@ -0,0 +1,79 @@
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using Data.Abstractions;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using SharedLibraryCore;
+using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Interfaces;
+using EFClient = Data.Models.Client.EFClient;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
+
+
+namespace IW4MAdmin.Application.Commands
+{
+    public class ReadMessageCommand : Command
+    {
+        private readonly IDatabaseContextFactory _contextFactory;
+        private readonly ILogger _logger;
+
+        public ReadMessageCommand(CommandConfiguration config, ITranslationLookup layout,
+            IDatabaseContextFactory contextFactory, ILogger<IDatabaseContextFactory> logger) : base(config, layout)
+        {
+            Name = "readmessage";
+            Description = _translationLookup["COMMANDS_READ_MESSAGE_DESC"];
+            Alias = "rm";
+            Permission = EFClient.Permission.Flagged;
+
+            _contextFactory = contextFactory;
+            _logger = logger;
+        }
+
+        public override async Task ExecuteAsync(GameEvent gameEvent)
+        {
+            try
+            {
+                await using var context = _contextFactory.CreateContext();
+
+                var inboxItems = await context.InboxMessages
+                    .Include(message => message.SourceClient)
+                    .ThenInclude(client => client.CurrentAlias)
+                    .Where(message => message.DestinationClientId == gameEvent.Origin.ClientId)
+                    .Where(message => !message.IsDelivered)
+                    .ToListAsync();
+
+                if (!inboxItems.Any())
+                {
+                    gameEvent.Origin.Tell(_translationLookup["COMMANDS_READ_MESSAGE_NONE"]);
+                    return;
+                }
+
+                var index = 1;
+                foreach (var inboxItem in inboxItems)
+                {
+                    await gameEvent.Origin.Tell(_translationLookup["COMMANDS_READ_MESSAGE_SUCCESS"]
+                            .FormatExt($"{index}/{inboxItems.Count}", inboxItem.SourceClient.CurrentAlias.Name))
+                        .WaitAsync();
+
+                    foreach (var messageFragment in inboxItem.Message.FragmentMessageForDisplay())
+                    {
+                        await gameEvent.Origin.Tell(messageFragment).WaitAsync();
+                    }
+
+                    index++;
+                }
+
+                inboxItems.ForEach(item => { item.IsDelivered = true; });
+
+                context.UpdateRange(inboxItems);
+                await context.SaveChangesAsync();
+            }
+            catch (Exception ex)
+            {
+                logger.LogError(ex, "Could not retrieve offline messages for {Client}", gameEvent.Origin.ToString());
+                throw;
+            }
+        }
+    }
+}

Application/Commands/ReportClientCommand.cs

@@ -0,0 +1,77 @@
+using System.Threading.Tasks;
+using Data.Models.Client;
+using SharedLibraryCore;
+using SharedLibraryCore.Commands;
+using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Interfaces;
+
+namespace IW4MAdmin.Application.Commands
+{
+    /// <summary>
+    /// Report client for given reason
+    /// </summary>
+    public class ReportClientCommand : Command
+    {
+        public ReportClientCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config,
+            translationLookup)
+        {
+            Name = "report";
+            Description = _translationLookup["COMMANDS_REPORT_DESC"];
+            Alias = "rep";
+            Permission = EFClient.Permission.User;
+            RequiresTarget = true;
+            Arguments = new[]
+            {
+                new CommandArgument
+                {
+                    Name = _translationLookup["COMMANDS_ARGS_PLAYER"],
+                    Required = true
+                },
+                new CommandArgument
+                {
+                    Name = _translationLookup["COMMANDS_ARGS_REASON"],
+                    Required = true
+                }
+            };
+        }
+
+        public override async Task ExecuteAsync(GameEvent commandEvent)
+        {
+            if (commandEvent.Data.ToLower().Contains("camp"))
+            {
+                commandEvent.Origin.Tell(_translationLookup["COMMANDS_REPORT_FAIL_CAMP"]);
+                return;
+            }
+
+            var success = false;
+
+            switch ((await commandEvent.Target.Report(commandEvent.Data, commandEvent.Origin)
+                .WaitAsync(Utilities.DefaultCommandTimeout, commandEvent.Owner.Manager.CancellationToken)).FailReason)
+            {
+                case GameEvent.EventFailReason.None:
+                    commandEvent.Origin.Tell(_translationLookup["COMMANDS_REPORT_SUCCESS"]);
+                    success = true;
+                    break;
+                case GameEvent.EventFailReason.Exception:
+                    commandEvent.Origin.Tell(_translationLookup["COMMANDS_REPORT_FAIL_DUPLICATE"]);
+                    break;
+                case GameEvent.EventFailReason.Permission:
+                    commandEvent.Origin.Tell(_translationLookup["COMMANDS_REPORT_FAIL"]
+                        .FormatExt(commandEvent.Target.Name));
+                    break;
+                case GameEvent.EventFailReason.Invalid:
+                    commandEvent.Origin.Tell(_translationLookup["COMMANDS_REPORT_FAIL_SELF"]);
+                    break;
+                case GameEvent.EventFailReason.Throttle:
+                    commandEvent.Origin.Tell(_translationLookup["COMMANDS_REPORT_FAIL_TOOMANY"]);
+                    break;
+            }
+
+            if (success)
+            {
+                commandEvent.Owner.ToAdmins(
+                    $"(Color::Accent){commandEvent.Origin.Name}(Color::White) -> (Color::Red){commandEvent.Target.Name}(Color::White): {commandEvent.Data}");
+            }
+        }
+    }
+}

Application/Commands/SayAllCommand.cs

@@ -0,0 +1,46 @@
+using System.Threading.Tasks;
+using Data.Models.Client;
+using SharedLibraryCore;
+using SharedLibraryCore.Commands;
+using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Interfaces;
+
+namespace IW4MAdmin.Application.Commands
+{
+    /// <summary>
+    /// Prints out a message to all clients on all servers
+    /// </summary>
+    public class SayAllCommand : Command
+    {
+        public SayAllCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config,
+            translationLookup)
+        {
+            Name = "sayall";
+            Description = _translationLookup["COMMANDS_SAY_ALL_DESC"];
+            Alias = "sa";
+            Permission = EFClient.Permission.Moderator;
+            RequiresTarget = false;
+            Arguments = new[]
+            {
+                new CommandArgument
+                {
+                    Name = _translationLookup["COMMANDS_ARGS_MESSAGE"],
+                    Required = true
+                }
+            };
+        }
+
+        public override Task ExecuteAsync(GameEvent gameEvent)
+        {
+            var message = $"(Color::Accent){gameEvent.Origin.Name}(Color::White) - (Color::Red){gameEvent.Data}";
+
+            foreach (var server in gameEvent.Owner.Manager.GetServers())
+            {
+                server.Broadcast(message, gameEvent.Origin);
+            }
+
+            gameEvent.Origin.Tell(_translationLookup["COMMANDS_SAY_SUCCESS"]);
+            return Task.CompletedTask;
+        }
+    }
+}

Application/Commands/SayCommand.cs

@@ -0,0 +1,42 @@
+using System.Threading.Tasks;
+using SharedLibraryCore;
+using SharedLibraryCore.Commands;
+using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Interfaces;
+using EFClient = Data.Models.Client.EFClient;
+
+namespace IW4MAdmin.Application.Commands
+{
+    /// <summary>
+    /// Prints out a message to all clients on the server
+    /// </summary>
+    public class SayCommand : Command
+    {
+        public SayCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config,
+            translationLookup)
+        {
+            Name = "say";
+            Description = _translationLookup["COMMANDS_SAY_DESC"];
+            Alias = "s";
+            Permission = EFClient.Permission.Moderator;
+            RequiresTarget = false;
+            Arguments = new[]
+            {
+                new CommandArgument
+                {
+                    Name = _translationLookup["COMMANDS_ARGS_MESSAGE"],
+                    Required = true
+                }
+            };
+        }
+
+        public override Task ExecuteAsync(GameEvent gameEvent)
+        {
+            gameEvent.Owner.Broadcast(
+                _translationLookup["COMMANDS_SAY_FORMAT"].FormatExt(gameEvent.Origin.Name, gameEvent.Data),
+                gameEvent.Origin);
+            gameEvent.Origin.Tell(_translationLookup["COMMANDS_SAY_SUCCESS"]);
+            return Task.CompletedTask;
+        }
+    }
+}

Application/Commands/WhoAmICommand.cs

@@ -0,0 +1,38 @@
+using System.Threading.Tasks;
+using Data.Models.Client;
+using SharedLibraryCore;
+using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Interfaces;
+
+namespace IW4MAdmin.Application.Commands
+{
+    /// <summary>
+    /// Prints client information
+    /// </summary>
+    public class WhoAmICommand : Command
+    {
+        public WhoAmICommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config,
+            translationLookup)
+        {
+            Name = "whoami";
+            Description = _translationLookup["COMMANDS_WHO_DESC"];
+            Alias = "who";
+            Permission = EFClient.Permission.User;
+            RequiresTarget = false;
+        }
+
+        public override Task ExecuteAsync(GameEvent gameEvent)
+        {
+            var you =
+                "[(Color::Yellow)#{{clientNumber}}(Color::White)] [(Color::Yellow)@{{clientId}}(Color::White)] [{{networkId}}] [{{ip}}] [(Color::Cyan){{level}}(Color::White){{tag}}(Color::White)] {{name}}"
+                    .FormatExt(gameEvent.Origin.ClientNumber,
+                        gameEvent.Origin.ClientId, gameEvent.Origin.GuidString,
+                        gameEvent.Origin.IPAddressString, gameEvent.Origin.ClientPermission.Name,
+                        string.IsNullOrEmpty(gameEvent.Origin.Tag) ? "" : $" {gameEvent.Origin.Tag}",
+                        gameEvent.Origin.Name);
+            gameEvent.Origin.Tell(you);
+
+            return Task.CompletedTask;
+        }
+    }
+}

Application/Configuration/LoggingConfiguration.json

@@ -3,7 +3,13 @@
     "Using": [
       "Serilog.Sinks.File"
     ],
-    "MinimumLevel": "Information",
+    "MinimumLevel": {
+      "Default": "Information",
+      "Override": {
+        "System": "Warning",
+        "Microsoft": "Warning"
+      }
+    },
     "WriteTo": [
       {
         "Name": "File",
@@ -12,6 +18,13 @@
           "rollingInterval": "Day",
           "outputTemplate": "[{Timestamp:yyyy-MM-dd HH:mm:ss.fff} {Server} {Level:u3}] {Message:lj}{NewLine}{Exception}"
         }
+      },
+      {
+        "Name": "Console",
+        "Args": {
+          "outputTemplate": "[{Timestamp:yyyy-MM-dd HH:mm:ss.fff} {Server} {Level:u3}] {Message:lj}{NewLine}{Exception}",
+          "RestrictedToMinimumLevel": "Fatal"
+        }
       }
     ],
     "Enrich": [

Application/Configuration/ScriptPluginConfiguration.cs

@@ -0,0 +1,15 @@
+using System.Collections.Generic;
+using SharedLibraryCore.Interfaces;
+
+namespace IW4MAdmin.Application.Configuration
+{
+    public class ScriptPluginConfiguration : Dictionary<string, Dictionary<string, object>>, IBaseConfiguration
+    {
+        public string Name() => nameof(ScriptPluginConfiguration);
+
+        public IBaseConfiguration Generate()
+        {
+            return new ScriptPluginConfiguration();
+        }
+    }
+}

Application/EventParsers/BaseEventParser.cs

@@ -17,6 +17,8 @@ namespace IW4MAdmin.Application.EventParsers
         private readonly Dictionary<string, (string, Func<string, IEventParserConfiguration, GameEvent, GameEvent>)> _customEventRegistrations;
         private readonly ILogger _logger;
         private readonly ApplicationConfiguration _appConfig;
+        private readonly Dictionary<ParserRegex, GameEvent.EventType> _regexMap;
+        private readonly Dictionary<string, GameEvent.EventType> _eventTypeMap;
 
         public BaseEventParser(IParserRegexFactory parserRegexFactory, ILogger logger, ApplicationConfiguration appConfig)
         {
@@ -47,8 +49,15 @@ namespace IW4MAdmin.Application.EventParsers
             Configuration.Join.AddMapping(ParserRegex.GroupType.OriginNetworkId, 2);
             Configuration.Join.AddMapping(ParserRegex.GroupType.OriginClientNumber, 3);
             Configuration.Join.AddMapping(ParserRegex.GroupType.OriginName, 4);
+            
+            Configuration.JoinTeam.Pattern = @"^(JT);(-?[A-Fa-f0-9_]{1,32}|bot[0-9]+|0);([0-9]+);(\w+);(.+)$";
+            Configuration.JoinTeam.AddMapping(ParserRegex.GroupType.EventType, 1);
+            Configuration.JoinTeam.AddMapping(ParserRegex.GroupType.OriginNetworkId, 2);
+            Configuration.JoinTeam.AddMapping(ParserRegex.GroupType.OriginClientNumber, 3);
+            Configuration.JoinTeam.AddMapping(ParserRegex.GroupType.OriginTeam, 4);
+            Configuration.JoinTeam.AddMapping(ParserRegex.GroupType.OriginName, 5);
 
-            Configuration.Damage.Pattern = @"^(D);(-?[A-Fa-f0-9_]{1,32}|bot[0-9]+|0);(-?[0-9]+);(axis|allies|world|none)?;([^;]{1,24});(-?[A-Fa-f0-9_]{1,32}|bot[0-9]+|0)?;(-?[0-9]+);(axis|allies|world|none)?;([^;]{1,24})?;((?:[0-9]+|[a-z]+|_|\+)+);([0-9]+);((?:[A-Z]|_)+);((?:[a-z]|_)+)$";
+            Configuration.Damage.Pattern = @"^(D);(-?[A-Fa-f0-9_]{1,32}|bot[0-9]+|0);(-?[0-9]+);(axis|allies|world|none)?;([^;]{1,32});(-?[A-Fa-f0-9_]{1,32}|bot[0-9]+|0)?;(-?[0-9]+);(axis|allies|world|none)?;([^;]{1,32})?;((?:[0-9]+|[a-z]+|_|\+)+);([0-9]+);((?:[A-Z]|_)+);((?:[a-z]|_)+)$";
             Configuration.Damage.AddMapping(ParserRegex.GroupType.EventType, 1);
             Configuration.Damage.AddMapping(ParserRegex.GroupType.TargetNetworkId, 2);
             Configuration.Damage.AddMapping(ParserRegex.GroupType.TargetClientNumber, 3);
@@ -63,7 +72,7 @@ namespace IW4MAdmin.Application.EventParsers
             Configuration.Damage.AddMapping(ParserRegex.GroupType.MeansOfDeath, 12);
             Configuration.Damage.AddMapping(ParserRegex.GroupType.HitLocation, 13);
 
-            Configuration.Kill.Pattern = @"^(K);(-?[A-Fa-f0-9_]{1,32}|bot[0-9]+|0);(-?[0-9]+);(axis|allies|world|none)?;([^;]{1,24});(-?[A-Fa-f0-9_]{1,32}|bot[0-9]+|0)?;(-?[0-9]+);(axis|allies|world|none)?;([^;]{1,24})?;((?:[0-9]+|[a-z]+|_|\+)+);([0-9]+);((?:[A-Z]|_)+);((?:[a-z]|_)+)$";
+            Configuration.Kill.Pattern = @"^(K);(-?[A-Fa-f0-9_]{1,32}|bot[0-9]+|0);(-?[0-9]+);(axis|allies|world|none)?;([^;]{1,32});(-?[A-Fa-f0-9_]{1,32}|bot[0-9]+|0)?;(-?[0-9]+);(axis|allies|world|none)?;([^;]{1,32})?;((?:[0-9]+|[a-z]+|_|\+)+);([0-9]+);((?:[A-Z]|_)+);((?:[a-z]|_)+)$";
             Configuration.Kill.AddMapping(ParserRegex.GroupType.EventType, 1);
             Configuration.Kill.AddMapping(ParserRegex.GroupType.TargetNetworkId, 2);
             Configuration.Kill.AddMapping(ParserRegex.GroupType.TargetClientNumber, 3);
@@ -78,7 +87,30 @@ namespace IW4MAdmin.Application.EventParsers
             Configuration.Kill.AddMapping(ParserRegex.GroupType.MeansOfDeath, 12);
             Configuration.Kill.AddMapping(ParserRegex.GroupType.HitLocation, 13);
 
+            Configuration.MapChange.Pattern = @".*InitGame.*";
+            Configuration.MapEnd.Pattern = @".*(?:ExitLevel|ShutdownGame).*";
+
             Configuration.Time.Pattern = @"^ *(([0-9]+):([0-9]+) |^[0-9]+ )";
+
+            _regexMap = new Dictionary<ParserRegex, GameEvent.EventType>
+            {
+                {Configuration.Say, GameEvent.EventType.Say},
+                {Configuration.Kill, GameEvent.EventType.Kill},
+                {Configuration.MapChange, GameEvent.EventType.MapChange},
+                {Configuration.MapEnd, GameEvent.EventType.MapEnd},
+                {Configuration.JoinTeam, GameEvent.EventType.JoinTeam}
+            };
+            
+            _eventTypeMap = new Dictionary<string, GameEvent.EventType>
+            {
+                {"say", GameEvent.EventType.Say},
+                {"sayteam", GameEvent.EventType.Say},
+                {"K", GameEvent.EventType.Kill},
+                {"D", GameEvent.EventType.Damage},
+                {"J", GameEvent.EventType.PreConnect},
+                {"JT", GameEvent.EventType.JoinTeam},
+                {"Q", GameEvent.EventType.PreDisconnect}
+            };
         }
 
         public IEventParserConfiguration Configuration { get; set; }
@@ -91,6 +123,28 @@ namespace IW4MAdmin.Application.EventParsers
 
         public string Name { get; set; } = "Call of Duty";
 
+        private (GameEvent.EventType type, string eventKey) GetEventTypeFromLine(string logLine)
+        {
+            var lineSplit = logLine.Split(';');
+            if (lineSplit.Length > 1)
+            {
+                var type = lineSplit[0];
+                return _eventTypeMap.ContainsKey(type) ? (_eventTypeMap[type], type): (GameEvent.EventType.Unknown, lineSplit[0]);
+            }
+
+            foreach (var (key, value) in _regexMap)
+            {
+                var result = key.PatternMatcher.Match(logLine);
+                if (result.Success)
+                {
+                    return (value, null);
+                }
+            }
+
+            return (GameEvent.EventType.Unknown, null);
+        }
+        
+
         public virtual GameEvent GenerateGameEvent(string logLine)
         {
             var timeMatch = Configuration.Time.PatternMatcher.Match(logLine);
@@ -104,7 +158,7 @@ namespace IW4MAdmin.Application.EventParsers
                         .Values
                         .Skip(2)
                         // this converts the timestamp into seconds passed
-                        .Select((_value, index) => long.Parse(_value.ToString()) * (index == 0 ? 60 : 1))
+                        .Select((value, index) => long.Parse(value.ToString()) * (index == 0 ? 60 : 1))
                         .Sum();
          
                 }
@@ -114,33 +168,34 @@ namespace IW4MAdmin.Application.EventParsers
                 }
                 
                 // we want to strip the time from the log line
-                logLine = logLine.Substring(timeMatch.Values.First().Length);
+                logLine = logLine.Substring(timeMatch.Values.First().Length).Trim();
             }
 
-            string[] lineSplit = logLine.Split(';');
-            string eventType = lineSplit[0];
+            var eventParseResult = GetEventTypeFromLine(logLine);
+            var eventType = eventParseResult.type;
+            
+            _logger.LogDebug(logLine);
 
-            if (eventType == "say" || eventType == "sayteam")
+            if (eventType == GameEvent.EventType.Say)
             {
                 var matchResult = Configuration.Say.PatternMatcher.Match(logLine);
 
                 if (matchResult.Success)
                 {
-                    string message = matchResult.Values[Configuration.Say.GroupMapping[ParserRegex.GroupType.Message]]
-                        .ToString()
+                    var message = matchResult.Values[Configuration.Say.GroupMapping[ParserRegex.GroupType.Message]]
                         .Replace("\x15", "")
                         .Trim();
 
                     if (message.Length > 0)
                     {
-                        string originIdString = matchResult.Values[Configuration.Say.GroupMapping[ParserRegex.GroupType.OriginNetworkId]].ToString();
-                        string originName = matchResult.Values[Configuration.Say.GroupMapping[ParserRegex.GroupType.OriginName]].ToString();
+                        var originIdString = matchResult.Values[Configuration.Say.GroupMapping[ParserRegex.GroupType.OriginNetworkId]];
+                        var originName = matchResult.Values[Configuration.Say.GroupMapping[ParserRegex.GroupType.OriginName]];
 
-                        long originId = originIdString.IsBotGuid() ?
+                        var originId = originIdString.IsBotGuid() ?
                             originName.GenerateGuidFromString() :
                             originIdString.ConvertGuidToLong(Configuration.GuidNumberStyle);
 
-                        int clientNumber = int.Parse(matchResult.Values[Configuration.Say.GroupMapping[ParserRegex.GroupType.OriginClientNumber]]);
+                        var clientNumber = int.Parse(matchResult.Values[Configuration.Say.GroupMapping[ParserRegex.GroupType.OriginClientNumber]]);
 
                         if (message.StartsWith(_appConfig.CommandPrefix) || message.StartsWith(_appConfig.BroadcastCommandPrefix))
                         {
@@ -172,26 +227,26 @@ namespace IW4MAdmin.Application.EventParsers
                 }
             }
 
-            if (eventType == "K")
+            if (eventType == GameEvent.EventType.Kill)
             {
                 var match = Configuration.Kill.PatternMatcher.Match(logLine);
 
                 if (match.Success)
                 {
-                    string originIdString = match.Values[Configuration.Kill.GroupMapping[ParserRegex.GroupType.OriginNetworkId]].ToString();
-                    string targetIdString = match.Values[Configuration.Kill.GroupMapping[ParserRegex.GroupType.TargetNetworkId]].ToString();
-                    string originName = match.Values[Configuration.Kill.GroupMapping[ParserRegex.GroupType.OriginName]].ToString();
-                    string targetName = match.Values[Configuration.Kill.GroupMapping[ParserRegex.GroupType.TargetName]].ToString();
+                    var originIdString = match.Values[Configuration.Kill.GroupMapping[ParserRegex.GroupType.OriginNetworkId]];
+                    var targetIdString = match.Values[Configuration.Kill.GroupMapping[ParserRegex.GroupType.TargetNetworkId]];
+                    var originName = match.Values[Configuration.Kill.GroupMapping[ParserRegex.GroupType.OriginName]];
+                    var targetName = match.Values[Configuration.Kill.GroupMapping[ParserRegex.GroupType.TargetName]];
 
-                    long originId = originIdString.IsBotGuid() ?
+                    var originId = originIdString.IsBotGuid() ?
                         originName.GenerateGuidFromString() :
                         originIdString.ConvertGuidToLong(Configuration.GuidNumberStyle, Utilities.WORLD_ID);
-                    long targetId = targetIdString.IsBotGuid() ?
+                    var targetId = targetIdString.IsBotGuid() ?
                         targetName.GenerateGuidFromString() :
                         targetIdString.ConvertGuidToLong(Configuration.GuidNumberStyle, Utilities.WORLD_ID);
 
-                    int originClientNumber = int.Parse(match.Values[Configuration.Kill.GroupMapping[ParserRegex.GroupType.OriginClientNumber]]);
-                    int targetClientNumber = int.Parse(match.Values[Configuration.Kill.GroupMapping[ParserRegex.GroupType.TargetClientNumber]]);
+                    var originClientNumber = int.Parse(match.Values[Configuration.Kill.GroupMapping[ParserRegex.GroupType.OriginClientNumber]]);
+                    var targetClientNumber = int.Parse(match.Values[Configuration.Kill.GroupMapping[ParserRegex.GroupType.TargetClientNumber]]);
 
                     return new GameEvent()
                     {
@@ -206,26 +261,26 @@ namespace IW4MAdmin.Application.EventParsers
                 }
             }
 
-            if (eventType == "D")
+            if (eventType == GameEvent.EventType.Damage)
             {
                 var match = Configuration.Damage.PatternMatcher.Match(logLine);
 
                 if (match.Success)
                 {
-                    string originIdString = match.Values[Configuration.Damage.GroupMapping[ParserRegex.GroupType.OriginNetworkId]].ToString();
-                    string targetIdString = match.Values[Configuration.Damage.GroupMapping[ParserRegex.GroupType.TargetNetworkId]].ToString();
-                    string originName = match.Values[Configuration.Damage.GroupMapping[ParserRegex.GroupType.OriginName]].ToString();
-                    string targetName = match.Values[Configuration.Damage.GroupMapping[ParserRegex.GroupType.TargetName]].ToString();
+                    var originIdString = match.Values[Configuration.Damage.GroupMapping[ParserRegex.GroupType.OriginNetworkId]];
+                    var targetIdString = match.Values[Configuration.Damage.GroupMapping[ParserRegex.GroupType.TargetNetworkId]];
+                    var originName = match.Values[Configuration.Damage.GroupMapping[ParserRegex.GroupType.OriginName]];
+                    var targetName = match.Values[Configuration.Damage.GroupMapping[ParserRegex.GroupType.TargetName]];
 
-                    long originId = originIdString.IsBotGuid() ?
+                    var originId = originIdString.IsBotGuid() ?
                         originName.GenerateGuidFromString() :
                         originIdString.ConvertGuidToLong(Configuration.GuidNumberStyle, Utilities.WORLD_ID);
-                    long targetId = targetIdString.IsBotGuid() ?
+                    var targetId = targetIdString.IsBotGuid() ?
                         targetName.GenerateGuidFromString() :
                         targetIdString.ConvertGuidToLong(Configuration.GuidNumberStyle, Utilities.WORLD_ID);
 
-                    int originClientNumber = int.Parse(match.Values[Configuration.Damage.GroupMapping[ParserRegex.GroupType.OriginClientNumber]]);
-                    int targetClientNumber = int.Parse(match.Values[Configuration.Damage.GroupMapping[ParserRegex.GroupType.TargetClientNumber]]);
+                    var originClientNumber = int.Parse(match.Values[Configuration.Damage.GroupMapping[ParserRegex.GroupType.OriginClientNumber]]);
+                    var targetClientNumber = int.Parse(match.Values[Configuration.Damage.GroupMapping[ParserRegex.GroupType.TargetClientNumber]]);
 
                     return new GameEvent()
                     {
@@ -240,16 +295,16 @@ namespace IW4MAdmin.Application.EventParsers
                 }
             }
 
-            if (eventType == "J")
+            if (eventType == GameEvent.EventType.PreConnect)
             {
                 var match = Configuration.Join.PatternMatcher.Match(logLine);
 
                 if (match.Success)
                 {
-                    string originIdString = match.Values[Configuration.Join.GroupMapping[ParserRegex.GroupType.OriginNetworkId]].ToString();
-                    string originName = match.Values[Configuration.Join.GroupMapping[ParserRegex.GroupType.OriginName]].ToString();
+                    var originIdString = match.Values[Configuration.Join.GroupMapping[ParserRegex.GroupType.OriginNetworkId]];
+                    var originName = match.Values[Configuration.Join.GroupMapping[ParserRegex.GroupType.OriginName]];
 
-                    long networkId = originIdString.IsBotGuid() ?
+                    var networkId = originIdString.IsBotGuid() ?
                         originName.GenerateGuidFromString() :
                         originIdString.ConvertGuidToLong(Configuration.GuidNumberStyle);
 
@@ -261,10 +316,10 @@ namespace IW4MAdmin.Application.EventParsers
                         {
                             CurrentAlias = new EFAlias()
                             {
-                                Name = match.Values[Configuration.Join.GroupMapping[ParserRegex.GroupType.OriginName]].ToString().TrimNewLine(),
+                                Name = match.Values[Configuration.Join.GroupMapping[ParserRegex.GroupType.OriginName]].TrimNewLine(),
                             },
                             NetworkId = networkId,
-                            ClientNumber = Convert.ToInt32(match.Values[Configuration.Join.GroupMapping[ParserRegex.GroupType.OriginClientNumber]].ToString()),
+                            ClientNumber = Convert.ToInt32(match.Values[Configuration.Join.GroupMapping[ParserRegex.GroupType.OriginClientNumber]]),
                             State = EFClient.ClientState.Connecting,
                         },
                         Extra = originIdString,
@@ -276,16 +331,57 @@ namespace IW4MAdmin.Application.EventParsers
                 }
             }
 
-            if (eventType == "Q")
+            if (eventType == GameEvent.EventType.JoinTeam)
+            {
+                var match = Configuration.JoinTeam.PatternMatcher.Match(logLine);
+
+                if (match.Success)
+                {
+                    var originIdString = match.Values[Configuration.JoinTeam.GroupMapping[ParserRegex.GroupType.OriginNetworkId]];
+                    var originName = match.Values[Configuration.JoinTeam.GroupMapping[ParserRegex.GroupType.OriginName]];
+                    var team = match.Values[Configuration.JoinTeam.GroupMapping[ParserRegex.GroupType.OriginTeam]];
+
+                    if (Configuration.TeamMapping.ContainsKey(team))
+                    {
+                        team = Configuration.TeamMapping[team].ToString();
+                    }
+
+                    var networkId = originIdString.IsBotGuid() ?
+                        originName.GenerateGuidFromString() :
+                        originIdString.ConvertGuidToLong(Configuration.GuidNumberStyle);
+                    
+                    return new GameEvent
+                    {
+                        Type = GameEvent.EventType.JoinTeam,
+                        Data = logLine,
+                        Origin = new EFClient
+                        {
+                            CurrentAlias = new EFAlias
+                            {
+                                Name = match.Values[Configuration.JoinTeam.GroupMapping[ParserRegex.GroupType.OriginName]].TrimNewLine(),
+                            },
+                            NetworkId = networkId,
+                            ClientNumber = Convert.ToInt32(match.Values[Configuration.JoinTeam.GroupMapping[ParserRegex.GroupType.OriginClientNumber]]),
+                            State = EFClient.ClientState.Connected,
+                        },
+                        Extra = team,
+                        RequiredEntity = GameEvent.EventRequiredEntity.Origin,
+                        GameTime = gameTime,
+                        Source = GameEvent.EventSource.Log
+                    };
+                }
+            }
+
+            if (eventType == GameEvent.EventType.PreDisconnect)
             {
                 var match = Configuration.Quit.PatternMatcher.Match(logLine);
 
                 if (match.Success)
                 {
-                    string originIdString = match.Values[Configuration.Quit.GroupMapping[ParserRegex.GroupType.OriginNetworkId]].ToString();
-                    string originName = match.Values[Configuration.Quit.GroupMapping[ParserRegex.GroupType.OriginName]].ToString();
+                    var originIdString = match.Values[Configuration.Quit.GroupMapping[ParserRegex.GroupType.OriginNetworkId]];
+                    var originName = match.Values[Configuration.Quit.GroupMapping[ParserRegex.GroupType.OriginName]];
 
-                    long networkId = originIdString.IsBotGuid() ?
+                    var networkId = originIdString.IsBotGuid() ?
                         originName.GenerateGuidFromString() :
                         originIdString.ConvertGuidToLong(Configuration.GuidNumberStyle);
 
@@ -297,10 +393,10 @@ namespace IW4MAdmin.Application.EventParsers
                         {
                             CurrentAlias = new EFAlias()
                             {
-                                Name = match.Values[Configuration.Quit.GroupMapping[ParserRegex.GroupType.OriginName]].ToString().TrimNewLine()
+                                Name = match.Values[Configuration.Quit.GroupMapping[ParserRegex.GroupType.OriginName]].TrimNewLine()
                             },
                             NetworkId = networkId,
-                            ClientNumber = Convert.ToInt32(match.Values[Configuration.Quit.GroupMapping[ParserRegex.GroupType.OriginClientNumber]].ToString()),
+                            ClientNumber = Convert.ToInt32(match.Values[Configuration.Quit.GroupMapping[ParserRegex.GroupType.OriginClientNumber]]),
                             State = EFClient.ClientState.Disconnecting
                         },
                         RequiredEntity = GameEvent.EventRequiredEntity.None,
@@ -311,7 +407,7 @@ namespace IW4MAdmin.Application.EventParsers
                 }
             }
 
-            if (eventType.Contains("ExitLevel") || eventType.Contains("ShutdownGame"))
+            if (eventType == GameEvent.EventType.MapEnd)
             {
                 return new GameEvent()
                 {
@@ -325,9 +421,9 @@ namespace IW4MAdmin.Application.EventParsers
                 };
             }
 
-            if (eventType.Contains("InitGame"))
+            if (eventType == GameEvent.EventType.MapChange)
             {
-                string dump = eventType.Replace("InitGame: ", "");
+                var dump = logLine.Replace("InitGame: ", "");
 
                 return new GameEvent()
                 {
@@ -342,26 +438,37 @@ namespace IW4MAdmin.Application.EventParsers
                 };
             }
 
-            if (_customEventRegistrations.ContainsKey(eventType))
+            if (eventParseResult.eventKey == null || !_customEventRegistrations.ContainsKey(eventParseResult.eventKey))
             {
-                var eventModifier = _customEventRegistrations[eventType];
-
-                try
+                return new GameEvent()
                 {
-                    return eventModifier.Item2(logLine, Configuration, new GameEvent()
-                    {
-                        Type = GameEvent.EventType.Other,
-                        Data = logLine,
-                        Subtype = eventModifier.Item1,
-                        GameTime = gameTime,
-                        Source = GameEvent.EventSource.Log
-                    });
-                }
+                    Type = GameEvent.EventType.Unknown,
+                    Data = logLine,
+                    Origin = Utilities.IW4MAdminClient(),
+                    Target = Utilities.IW4MAdminClient(),
+                    RequiredEntity = GameEvent.EventRequiredEntity.None,
+                    GameTime = gameTime,
+                    Source = GameEvent.EventSource.Log
+                };
+            }
 
-                catch (Exception e)
+            var eventModifier = _customEventRegistrations[eventParseResult.eventKey];
+
+            try
+            {
+                return eventModifier.Item2(logLine, Configuration, new GameEvent()
                 {
-                    _logger.LogError(e, $"Could not handle custom event generation");
-                }
+                    Type = GameEvent.EventType.Other,
+                    Data = logLine,
+                    Subtype = eventModifier.Item1,
+                    GameTime = gameTime,
+                    Source = GameEvent.EventSource.Log
+                });
+            }
+
+            catch (Exception e)
+            {
+                _logger.LogError(e, "Could not handle custom event generation");
             }
 
             return new GameEvent()

Application/EventParsers/DynamicEventParserConfiguration.cs

@@ -1,5 +1,8 @@
-using SharedLibraryCore.Interfaces;
+using System.Collections.Generic;
+using SharedLibraryCore.Interfaces;
 using System.Globalization;
+using SharedLibraryCore;
+using SharedLibraryCore.Database.Models;
 
 namespace IW4MAdmin.Application.EventParsers
 {
@@ -7,27 +10,35 @@ namespace IW4MAdmin.Application.EventParsers
     /// generic implementation of the IEventParserConfiguration
     /// allows script plugins to generate dynamic configurations
     /// </summary>
-    sealed internal class DynamicEventParserConfiguration : IEventParserConfiguration
+    internal sealed class DynamicEventParserConfiguration : IEventParserConfiguration
     {
         public string GameDirectory { get; set; }
         public ParserRegex Say { get; set; }
         public ParserRegex Join { get; set; }
+        public ParserRegex JoinTeam { get; set; }
         public ParserRegex Quit { get; set; }
         public ParserRegex Kill { get; set; }
         public ParserRegex Damage { get; set; }
         public ParserRegex Action { get; set; }
         public ParserRegex Time { get; set; }
+        public ParserRegex MapChange { get; set; }
+        public ParserRegex MapEnd { get; set; }
         public NumberStyles GuidNumberStyle { get; set; } = NumberStyles.HexNumber;
 
+        public Dictionary<string, EFClient.TeamType> TeamMapping { get; set; } = new();
+
         public DynamicEventParserConfiguration(IParserRegexFactory parserRegexFactory)
         {
             Say = parserRegexFactory.CreateParserRegex();
             Join = parserRegexFactory.CreateParserRegex();
+            JoinTeam = parserRegexFactory.CreateParserRegex();
             Quit = parserRegexFactory.CreateParserRegex();
             Kill = parserRegexFactory.CreateParserRegex();
             Damage = parserRegexFactory.CreateParserRegex();
             Action = parserRegexFactory.CreateParserRegex();
             Time = parserRegexFactory.CreateParserRegex();
+            MapChange = parserRegexFactory.CreateParserRegex();
+            MapEnd = parserRegexFactory.CreateParserRegex();
         }
     }
 }

Application/Extensions/CommandExtensions.cs

@@ -1,6 +1,10 @@
-using IW4MAdmin.Application.Misc;
+using System;
+using System.Collections.Generic;
+using IW4MAdmin.Application.Misc;
 using SharedLibraryCore.Interfaces;
 using System.Linq;
+using SharedLibraryCore;
+using SharedLibraryCore.Configuration;
 
 namespace IW4MAdmin.Application.Extensions
 {
@@ -13,9 +17,19 @@ namespace IW4MAdmin.Application.Extensions
         /// <returns></returns>
         public static string CommandConfigNameForType(this IManagerCommand command)
         {
-            return command.GetType() == typeof(ScriptCommand) ?
-                        $"{char.ToUpper(command.Name[0])}{command.Name.Substring(1)}Command" :
-                        command.GetType().Name;
+            return command.GetType() == typeof(ScriptCommand)
+                ? $"{char.ToUpper(command.Name[0])}{command.Name.Substring(1)}Command"
+                : command.GetType().Name;
         }
+
+        public static IList<Map> FindMap(this Server server, string mapName) => server.Maps.Where(map =>
+            map.Name.Equals(mapName, StringComparison.InvariantCultureIgnoreCase) ||
+            map.Alias.Equals(mapName, StringComparison.InvariantCultureIgnoreCase)).ToList();
+
+        public static IList<Gametype> FindGametype(this DefaultSettings settings, string gameType, Server.Game? game = null) =>
+            settings.Gametypes?.Where(gt => game == null || gt.Game == game)
+                .SelectMany(gt => gt.Gametypes).Where(gt =>
+                    gt.Alias.Contains(gameType, StringComparison.CurrentCultureIgnoreCase) ||
+                    gt.Name.Contains(gameType, StringComparison.CurrentCultureIgnoreCase)).ToList();
     }
 }

Application/Extensions/StartupExtensions.cs

@@ -78,8 +78,10 @@ namespace IW4MAdmin.Application.Extensions
                 case "mysql":
                     var appendTimeout = !appConfig.ConnectionString.Contains("default command timeout",
                         StringComparison.InvariantCultureIgnoreCase);
+                    var connectionString =
+                        appConfig.ConnectionString + (appendTimeout ? ";default command timeout=0" : "");
                     services.AddSingleton(sp => (DbContextOptions) new DbContextOptionsBuilder<MySqlDatabaseContext>()
-                        .UseMySql(appConfig.ConnectionString + (appendTimeout ? ";default command timeout=0" : ""),
+                        .UseMySql(connectionString, ServerVersion.AutoDetect(connectionString),
                             mysqlOptions => mysqlOptions.EnableRetryOnFailure())
                         .UseLoggerFactory(sp.GetRequiredService<ILoggerFactory>()).Options);
                     return services;
@@ -92,7 +94,7 @@ namespace IW4MAdmin.Application.Extensions
                                 postgresqlOptions =>
                                 {
                                     postgresqlOptions.EnableRetryOnFailure();
-                                    postgresqlOptions.SetPostgresVersion(new Version("9.4"));
+                                    postgresqlOptions.SetPostgresVersion(new Version("12.9"));
                                 })
                             .UseLoggerFactory(sp.GetRequiredService<ILoggerFactory>()).Options);
                     return services;
@@ -101,4 +103,4 @@ namespace IW4MAdmin.Application.Extensions
             }
         }
     }
-}
+}

Application/Factories/ConfigurationHandlerFactory.cs

@@ -1,4 +1,5 @@
-using IW4MAdmin.Application.Misc;
+using System.Threading.Tasks;
+using IW4MAdmin.Application.Misc;
 using SharedLibraryCore.Interfaces;
 
 namespace IW4MAdmin.Application.Factories
@@ -17,7 +18,17 @@ namespace IW4MAdmin.Application.Factories
         /// <returns></returns>
         public IConfigurationHandler<T> GetConfigurationHandler<T>(string name) where T : IBaseConfiguration
         {
-            return new BaseConfigurationHandler<T>(name);
+            var handler = new BaseConfigurationHandler<T>(name);
+            handler.BuildAsync().Wait();
+            return handler;
+        }
+
+        /// <inheritdoc/>
+        public async Task<IConfigurationHandler<T>> GetConfigurationHandlerAsync<T>(string name) where T : IBaseConfiguration
+        {
+            var handler = new BaseConfigurationHandler<T>(name);
+            await handler.BuildAsync();
+            return handler;
         }
     }
 }

Application/Factories/GameLogReaderFactory.cs

@@ -18,14 +18,22 @@ namespace IW4MAdmin.Application.Factories
         public IGameLogReader CreateGameLogReader(Uri[] logUris, IEventParser eventParser)
         {
             var baseUri = logUris[0];
-            if (baseUri.Scheme == Uri.UriSchemeHttp)
+            if (baseUri.Scheme == Uri.UriSchemeHttp || baseUri.Scheme == Uri.UriSchemeHttps)
             {
-                return new GameLogReaderHttp(logUris, eventParser, _serviceProvider.GetRequiredService<ILogger<GameLogReaderHttp>>());
+                return new GameLogReaderHttp(logUris, eventParser,
+                    _serviceProvider.GetRequiredService<ILogger<GameLogReaderHttp>>());
             }
 
-            else if (baseUri.Scheme == Uri.UriSchemeFile)
+            if (baseUri.Scheme == Uri.UriSchemeFile)
             {
-                return new GameLogReader(baseUri.LocalPath, eventParser, _serviceProvider.GetRequiredService<ILogger<GameLogReader>>());
+                return new GameLogReader(baseUri.LocalPath, eventParser,
+                    _serviceProvider.GetRequiredService<ILogger<GameLogReader>>());
+            }
+
+            if (baseUri.Scheme == Uri.UriSchemeNetTcp)
+            {
+                return new NetworkGameLogReader(logUris, eventParser,
+                    _serviceProvider.GetRequiredService<ILogger<NetworkGameLogReader>>());
             }
 
             throw new NotImplementedException($"No log reader implemented for Uri scheme \"{baseUri.Scheme}\"");

Application/Factories/GameServerInstanceFactory.cs

@@ -14,7 +14,7 @@ namespace IW4MAdmin.Application.Factories
     internal class GameServerInstanceFactory : IGameServerInstanceFactory
     {
         private readonly ITranslationLookup _translationLookup;
-        private readonly IMetaService _metaService;
+        private readonly IMetaServiceV2 _metaService;
         private readonly IServiceProvider _serviceProvider;
 
         /// <summary>
@@ -22,8 +22,8 @@ namespace IW4MAdmin.Application.Factories
         /// </summary>
         /// <param name="translationLookup"></param>
         /// <param name="rconConnectionFactory"></param>
-        public GameServerInstanceFactory(ITranslationLookup translationLookup, 
-            IMetaService metaService,
+        public GameServerInstanceFactory(ITranslationLookup translationLookup,
+            IMetaServiceV2 metaService,
             IServiceProvider serviceProvider)
         {
             _translationLookup = translationLookup;
@@ -39,7 +39,10 @@ namespace IW4MAdmin.Application.Factories
         /// <returns></returns>
         public Server CreateServer(ServerConfiguration config, IManager manager)
         {
-            return new IW4MServer(config, _translationLookup, _metaService, _serviceProvider, _serviceProvider.GetRequiredService<IClientNoticeMessageFormatter>(), _serviceProvider.GetRequiredService<ILookupCache<EFServer>>());
+            return new IW4MServer(config,
+                _serviceProvider.GetRequiredService<CommandConfiguration>(), _translationLookup, _metaService,
+                _serviceProvider, _serviceProvider.GetRequiredService<IClientNoticeMessageFormatter>(),
+                _serviceProvider.GetRequiredService<ILookupCache<EFServer>>());
         }
     }
 }

Application/Factories/RConConnectionFactory.cs

@@ -1,7 +1,13 @@
-using IW4MAdmin.Application.RCon;
+using System;
+using System.Net;
 using SharedLibraryCore.Interfaces;
 using System.Text;
+using Integrations.Cod;
+using Integrations.Source;
+using Integrations.Source.Interfaces;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
+using SharedLibraryCore.Configuration;
 
 namespace IW4MAdmin.Application.Factories
 {
@@ -10,28 +16,31 @@ namespace IW4MAdmin.Application.Factories
     /// </summary>
     internal class RConConnectionFactory : IRConConnectionFactory
     {
-        private static readonly Encoding gameEncoding = Encoding.GetEncoding("windows-1252");
-        private readonly ILogger<RConConnection> _logger;
-       
+        private static readonly Encoding GameEncoding = Encoding.GetEncoding("windows-1252");
+        private readonly IServiceProvider _serviceProvider;
+
         /// <summary>
         /// Base constructor
         /// </summary>
         /// <param name="logger"></param>
-        public RConConnectionFactory(ILogger<RConConnection> logger)
+        public RConConnectionFactory(IServiceProvider serviceProvider)
         {
-            _logger = logger;
+            _serviceProvider = serviceProvider;
         }
 
-        /// <summary>
-        /// creates a new rcon connection instance
-        /// </summary>
-        /// <param name="ipAddress">ip address of the server</param>
-        /// <param name="port">port of the server</param>
-        /// <param name="password">rcon password of the server</param>
-        /// <returns></returns>
-        public IRConConnection CreateConnection(string ipAddress, int port, string password)
+        /// <inheritdoc/>
+        public IRConConnection CreateConnection(IPEndPoint ipEndpoint, string password, string rconEngine)
         {
-            return new RConConnection(ipAddress, port, password, _logger, gameEncoding);
+            return rconEngine switch
+            {
+                "COD" => new CodRConConnection(ipEndpoint, password,
+                    _serviceProvider.GetRequiredService<ILogger<CodRConConnection>>(), GameEncoding,
+                    _serviceProvider.GetRequiredService<ApplicationConfiguration>()?.ServerConnectionAttempts ?? 6),
+                "Source" => new SourceRConConnection(
+                    _serviceProvider.GetRequiredService<ILogger<SourceRConConnection>>(),
+                    _serviceProvider.GetRequiredService<IRConClientFactory>(), ipEndpoint, password),
+                _ => throw new ArgumentException($"No supported RCon engine available for '{rconEngine}'")
+            };
         }
     }
-}
+}

Application/Factories/ScriptCommandFactory.cs

@@ -6,6 +6,7 @@ using SharedLibraryCore.Interfaces;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 using Data.Models.Client;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
@@ -30,7 +31,7 @@ namespace IW4MAdmin.Application.Factories
 
         /// <inheritdoc/>
         public IManagerCommand CreateScriptCommand(string name, string alias, string description, string permission, 
-            bool isTargetRequired, IEnumerable<(string, bool)> args, Action<GameEvent> executeAction)
+            bool isTargetRequired, IEnumerable<(string, bool)> args, Func<GameEvent, Task> executeAction, Server.Game[] supportedGames)
         {
             var permissionEnum = Enum.Parse<EFClient.Permission>(permission);
             var argsArray = args.Select(_arg => new CommandArgument
@@ -40,7 +41,7 @@ namespace IW4MAdmin.Application.Factories
             }).ToArray();
 
             return new ScriptCommand(name, alias, description, isTargetRequired, permissionEnum, argsArray, executeAction,
-                _config, _transLookup, _serviceProvider.GetRequiredService<ILogger<ScriptCommand>>());
+                _config, _transLookup, _serviceProvider.GetRequiredService<ILogger<ScriptCommand>>(), supportedGames);
         }
     }
 }

Application/GameEventHandler.cs

@@ -13,6 +13,7 @@ namespace IW4MAdmin.Application
     {
         private readonly EventLog _eventLog;
         private readonly ILogger _logger;
+        private readonly IEventPublisher _eventPublisher;
         private static readonly GameEvent.EventType[] overrideEvents = new[]
         {
             GameEvent.EventType.Connect,
@@ -21,10 +22,11 @@ namespace IW4MAdmin.Application
             GameEvent.EventType.Stop
         };
 
-        public GameEventHandler(ILogger<GameEventHandler> logger)
+        public GameEventHandler(ILogger<GameEventHandler> logger, IEventPublisher eventPublisher)
         {
             _eventLog = new EventLog();
             _logger = logger;
+            _eventPublisher = eventPublisher;
         }
 
         public void HandleEvent(IManager manager, GameEvent gameEvent)
@@ -32,6 +34,7 @@ namespace IW4MAdmin.Application
             if (manager.IsRunning || overrideEvents.Contains(gameEvent.Type))
             {
                 EventApi.OnGameEvent(gameEvent);
+                _eventPublisher.Publish(gameEvent);
                 Task.Factory.StartNew(() => manager.ExecuteEvent(gameEvent));
             }
             else

Application/IO/GameLogEventDetection.cs

@@ -21,7 +21,7 @@ namespace IW4MAdmin.Application.IO
         {
             _reader = gameLogReaderFactory.CreateGameLogReader(gameLogUris, server.EventParser);
             _server = server;
-            _ignoreBots = server?.Manager.GetApplicationSettings().Configuration().IgnoreBots ?? false;
+            _ignoreBots = server.Manager.GetApplicationSettings().Configuration()?.IgnoreBots ?? false;
             _logger = logger;
         }
 
@@ -69,7 +69,7 @@ namespace IW4MAdmin.Application.IO
                 return;
             }
 
-            var events = await _reader.ReadEventsFromLog(fileDiff, previousFileSize);
+            var events = await _reader.ReadEventsFromLog(fileDiff, previousFileSize, _server);
 
             foreach (var gameEvent in events)
             {

Application/IO/GameLogReader.cs

@@ -28,7 +28,7 @@ namespace IW4MAdmin.Application.IO
             _logger = logger;
         }
 
-        public async Task<IEnumerable<GameEvent>> ReadEventsFromLog(long fileSizeDiff, long startPosition)
+        public async Task<IEnumerable<GameEvent>> ReadEventsFromLog(long fileSizeDiff, long startPosition, Server server = null)
         {
             // allocate the bytes for the new log lines
             List<string> logLines = new List<string>();

Application/IO/GameLogReaderHttp.cs

@@ -34,7 +34,7 @@ namespace IW4MAdmin.Application.IO
 
         public int UpdateInterval => 500;
 
-        public async Task<IEnumerable<GameEvent>> ReadEventsFromLog(long fileSizeDiff, long startPosition)
+        public async Task<IEnumerable<GameEvent>> ReadEventsFromLog(long fileSizeDiff, long startPosition, Server server = null)
         {
             var events = new List<GameEvent>();
             var response = await _logServerApi.Log(_safeLogPath, lastKey);

Application/IO/NetworkGameLogReader.cs

@@ -0,0 +1,163 @@
+using SharedLibraryCore;
+using SharedLibraryCore.Interfaces;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Sockets;
+using System.Threading;
+using System.Threading.Tasks;
+using Integrations.Cod;
+using Microsoft.Extensions.Logging;
+using Serilog.Context;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
+
+namespace IW4MAdmin.Application.IO
+{
+    /// <summary>
+    /// provides capability of reading log files over udp 
+    /// </summary>
+    class NetworkGameLogReader : IGameLogReader
+    {
+        private readonly IEventParser _eventParser;
+        private readonly ILogger _logger;
+        private readonly Uri _uri;
+        private static readonly NetworkLogState State = new();
+        private bool _stateRegistered;
+        private CancellationToken _token;
+
+        public NetworkGameLogReader(IReadOnlyList<Uri> uris, IEventParser parser, ILogger<NetworkGameLogReader> logger)
+        {
+            _eventParser = parser;
+            _uri = uris[0];
+            _logger = logger;
+        }
+
+        public long Length => -1;
+
+        public int UpdateInterval => 150;
+
+        public Task<IEnumerable<GameEvent>> ReadEventsFromLog(long fileSizeDiff, long startPosition,
+            Server server = null)
+        {
+            // todo: other games might support this
+            var serverEndpoint = (server?.RemoteConnection as CodRConConnection)?.Endpoint;
+
+            if (serverEndpoint is null)
+            {
+                return Task.FromResult(Enumerable.Empty<GameEvent>());
+            }
+
+            if (!_stateRegistered && !State.EndPointExists(serverEndpoint))
+            {
+                try
+                {
+                    var client = State.RegisterEndpoint(serverEndpoint, BuildLocalEndpoint()).Client;
+
+                    _stateRegistered = true;
+                    _token = server.Manager.CancellationToken;
+
+                    if (client == null)
+                    {
+                        using (LogContext.PushProperty("Server", server.ToString()))
+                        {
+                            _logger.LogInformation("Not registering {Name} socket because it is already bound",
+                                nameof(NetworkGameLogReader));
+                        }
+                        return Task.FromResult(Enumerable.Empty<GameEvent>());
+                    }
+
+                    Task.Run(async () => await ReadNetworkData(client, _token), _token);
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogError(ex, "Could not register {Name} endpoint {Endpoint}",
+                        nameof(NetworkGameLogReader), _uri);
+                    throw;
+                }
+            }
+
+            var events = new List<GameEvent>();
+
+            foreach (var logData in State.GetServerLogData(serverEndpoint)
+                         .Select(log => Utilities.EncodingType.GetString(log)))
+            {
+                if (string.IsNullOrWhiteSpace(logData))
+                {
+                    return Task.FromResult(Enumerable.Empty<GameEvent>());
+                }
+
+                var lines = logData
+                    .Split('\n')
+                    .Where(line => line.Length > 0 && !line.Contains('ÿ'));
+
+                foreach (var eventLine in lines)
+                {
+                    try
+                    {
+                        // this trim end should hopefully fix the nasty runaway regex
+                        var gameEvent = _eventParser.GenerateGameEvent(eventLine.TrimEnd('\r'));
+                        events.Add(gameEvent);
+                    }
+
+                    catch (Exception ex)
+                    {
+                        _logger.LogError(ex, "Could not properly parse event line from http {EventLine}",
+                            eventLine);
+                    }
+                }
+            }
+
+            return Task.FromResult((IEnumerable<GameEvent>)events);
+        }
+
+        private async Task ReadNetworkData(UdpClient client, CancellationToken token)
+        {
+            while (!token.IsCancellationRequested)
+            {
+                // get more data
+                IPEndPoint remoteEndpoint = null;
+                byte[] bufferedData = null;
+
+                if (client == null)
+                {
+                    // we already have a socket listening on this port for data, so we don't need to run another thread
+                    break;
+                }
+
+                try
+                {
+                    var result = await client.ReceiveAsync(_token);
+                    remoteEndpoint = result.RemoteEndPoint;
+                    bufferedData = result.Buffer;
+                }
+                catch (OperationCanceledException)
+                {
+                    _logger.LogDebug("Stopping network log receive");
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogError(ex, "Could not receive lines for {LogReader}", nameof(NetworkGameLogReader));
+                }
+
+                if (bufferedData != null)
+                {
+                    State.QueueServerLogData(remoteEndpoint, bufferedData);
+                }
+            }
+        }
+
+        private IPEndPoint BuildLocalEndpoint()
+        {
+            try
+            {
+                return new IPEndPoint(Dns.GetHostAddresses(_uri.Host).First(), _uri.Port);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Could not setup {LogReader} endpoint", nameof(NetworkGameLogReader));
+                throw;
+            }
+        }
+    }
+}

Application/IO/NetworkLogState.cs

@@ -0,0 +1,138 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Sockets;
+using System.Threading;
+
+namespace IW4MAdmin.Application.IO;
+
+public class NetworkLogState : Dictionary<IPEndPoint, UdpClientState>
+{
+    public UdpClientState RegisterEndpoint(IPEndPoint serverEndpoint, IPEndPoint localEndpoint)
+    {
+        try
+        {
+            lock (this)
+            {
+                if (!ContainsKey(serverEndpoint))
+                {
+                    Add(serverEndpoint, new UdpClientState { Client = new UdpClient(localEndpoint) });
+                }
+            }
+        }
+        catch (SocketException ex) when (ex.SocketErrorCode == SocketError.AddressAlreadyInUse)
+        {
+            lock (this)
+            {
+                // we don't add the udp client because it already exists (listening to multiple servers from one socket)
+                Add(serverEndpoint,  new UdpClientState());
+            }
+        }
+
+        return this[serverEndpoint];
+    }
+
+
+    public List<byte[]> GetServerLogData(IPEndPoint serverEndpoint)
+    {
+        try
+        {
+            var state = this[serverEndpoint];
+            
+            if (state == null)
+            {
+                return new List<byte[]>();
+            }
+            
+            // it's possible that we could be trying to read and write to the queue simultaneously so we need to wait 
+            this[serverEndpoint].OnAction.Wait();
+
+            var data = new List<byte[]>();
+            
+            while (this[serverEndpoint].AvailableLogData.Count > 0)
+            {
+                data.Add(this[serverEndpoint].AvailableLogData.Dequeue());
+            }
+           
+            return data;
+        }
+        finally
+        {
+            if (this[serverEndpoint].OnAction.CurrentCount == 0)
+            {
+                this[serverEndpoint].OnAction.Release(1);
+            }
+        }
+    }
+
+    public void QueueServerLogData(IPEndPoint serverEndpoint, byte[] data)
+    {
+        var endpoint = Keys.FirstOrDefault(key =>
+            Equals(key.Address, serverEndpoint.Address) && key.Port == serverEndpoint.Port);
+
+        try
+        {
+            if (endpoint == null)
+            {
+                return;
+            }
+
+            // currently our expected start and end characters
+            var startsWithPrefix = StartsWith(data, "ÿÿÿÿprint\n");
+            var endsWithDelimiter = data[^1] == '\n';
+
+            // we have the data we expected
+            if (!startsWithPrefix || !endsWithDelimiter)
+            {
+                return;
+            }
+
+            // it's possible that we could be trying to read and write to the queue simultaneously so we need to wait 
+            this[endpoint].OnAction.Wait();
+            this[endpoint].AvailableLogData.Enqueue(data);
+        }
+        finally
+        {
+            if (endpoint != null && this[endpoint].OnAction.CurrentCount == 0)
+            {
+                this[endpoint].OnAction.Release(1);
+            }
+        }
+    }
+
+    public bool EndPointExists(IPEndPoint serverEndpoint)
+    {
+        lock (this)
+        {
+            return ContainsKey(serverEndpoint);
+        }
+    }
+
+    private static bool StartsWith(byte[] sourceArray, string match)
+    {
+        if (sourceArray is null)
+        {
+            return false;
+        }
+        
+        if (match.Length > sourceArray.Length)
+        {
+            return false;
+        }
+
+        return !match.Where((t, i) => sourceArray[i] != (byte)t).Any();
+    }
+}
+
+public class UdpClientState
+{
+    public UdpClient Client { get; set; }
+    public Queue<byte[]> AvailableLogData { get; } = new();
+    public SemaphoreSlim OnAction { get; } = new(1, 1);
+
+    ~UdpClientState()
+    {
+        OnAction.Dispose();
+        Client?.Dispose();
+    }
+}

Application/Main.cs

@@ -18,12 +18,15 @@ using SharedLibraryCore.Repositories;
 using SharedLibraryCore.Services;
 using Stats.Dtos;
 using System;
+using System.IO;
 using System.Linq;
+using System.Net.Http;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Data.Abstractions;
 using Data.Helpers;
+using Integrations.Source.Extensions;
 using IW4MAdmin.Application.Extensions;
 using IW4MAdmin.Application.Localization;
 using Microsoft.Extensions.Logging;
@@ -32,16 +35,17 @@ using IW4MAdmin.Plugins.Stats.Client.Abstractions;
 using IW4MAdmin.Plugins.Stats.Client;
 using Stats.Client.Abstractions;
 using Stats.Client;
+using Stats.Config;
 using Stats.Helpers;
 
 namespace IW4MAdmin.Application
 {
     public class Program
     {
-        public static BuildNumber Version { get; private set; } = BuildNumber.Parse(Utilities.GetVersionAsString());
-        public static ApplicationManager ServerManager;
-        private static Task ApplicationTask;
-        private static ServiceProvider serviceProvider;
+        public static BuildNumber Version { get; } = BuildNumber.Parse(Utilities.GetVersionAsString());
+        private static ApplicationManager _serverManager;
+        private static Task _applicationTask;
+        private static ServiceProvider _serviceProvider;
 
         /// <summary>
         /// entrypoint of the application
@@ -54,7 +58,7 @@ namespace IW4MAdmin.Application
             Console.OutputEncoding = Encoding.UTF8;
             Console.ForegroundColor = ConsoleColor.Gray;
 
-            Console.CancelKeyPress += new ConsoleCancelEventHandler(OnCancelKey);
+            Console.CancelKeyPress += OnCancelKey;
 
             Console.WriteLine("=====================================================");
             Console.WriteLine(" IW4MAdmin");
@@ -73,10 +77,14 @@ namespace IW4MAdmin.Application
         /// <param name="e"></param>
         private static async void OnCancelKey(object sender, ConsoleCancelEventArgs e)
         {
-            ServerManager?.Stop();
-            if (ApplicationTask != null)
+            if (_serverManager is not null)
             {
-                await ApplicationTask;
+                await _serverManager.Stop();
+            }
+
+            if (_applicationTask is not null)
+            {
+                await _applicationTask;
             }
         }
 
@@ -90,9 +98,8 @@ namespace IW4MAdmin.Application
             ITranslationLookup translationLookup = null;
             var logger = BuildDefaultLogger<Program>(new ApplicationConfiguration());
             Utilities.DefaultLogger = logger;
-            IServiceCollection services = null;
-            logger.LogInformation("Begin IW4MAdmin startup. Version is {version} {@args}", Version, args);
-
+            logger.LogInformation("Begin IW4MAdmin startup. Version is {Version} {@Args}", Version, args);
+            
             try
             {
                 // do any needed housekeeping file/folder migrations
@@ -100,22 +107,30 @@ namespace IW4MAdmin.Application
                 ConfigurationMigration.CheckDirectories();
                 ConfigurationMigration.RemoveObsoletePlugins20210322();
                 logger.LogDebug("Configuring services...");
-                services = ConfigureServices(args);
-                serviceProvider = services.BuildServiceProvider();
-                var versionChecker = serviceProvider.GetRequiredService<IMasterCommunication>();
-                ServerManager = (ApplicationManager) serviceProvider.GetRequiredService<IManager>();
-                translationLookup = serviceProvider.GetRequiredService<ITranslationLookup>();
+                var services = await ConfigureServices(args);
+                _serviceProvider = services.BuildServiceProvider();
+                var versionChecker = _serviceProvider.GetRequiredService<IMasterCommunication>();
+                _serverManager = (ApplicationManager) _serviceProvider.GetRequiredService<IManager>();
+                translationLookup = _serviceProvider.GetRequiredService<ITranslationLookup>();
 
-                await versionChecker.CheckVersion();
-                await ServerManager.Init();
+                _applicationTask = RunApplicationTasksAsync(logger, services);
+                var tasks = new[]
+                {
+                    versionChecker.CheckVersion(),
+                    _applicationTask
+                };
+
+                await _serverManager.Init();
+
+                await Task.WhenAll(tasks);
             }
 
             catch (Exception e)
             {
-                string failMessage = translationLookup == null
+                var failMessage = translationLookup == null
                     ? "Failed to initialize IW4MAdmin"
                     : translationLookup["MANAGER_INIT_FAIL"];
-                string exitMessage = translationLookup == null
+                var exitMessage = translationLookup == null
                     ? "Press enter to exit..."
                     : translationLookup["MANAGER_EXIT"];
 
@@ -129,13 +144,10 @@ namespace IW4MAdmin.Application
 
                 if (e is ConfigurationException configException)
                 {
-                    if (translationLookup != null)
-                    {
-                        Console.WriteLine(translationLookup[configException.Message]
-                            .FormatExt(configException.ConfigurationFileName));
-                    }
+                    Console.WriteLine("{{fileName}} contains an error."
+                        .FormatExt(Path.GetFileName(configException.ConfigurationFileName)));
 
-                    foreach (string error in configException.Errors)
+                    foreach (var error in configException.Errors)
                     {
                         Console.WriteLine(error);
                     }
@@ -146,32 +158,22 @@ namespace IW4MAdmin.Application
                     Console.WriteLine(e.Message);
                 }
 
+                if (_serverManager is not null)
+                {
+                    await _serverManager?.Stop();
+                }
+
                 Console.WriteLine(exitMessage);
                 await Console.In.ReadAsync(new char[1], 0, 1);
                 return;
             }
 
-            try
-            {
-                ApplicationTask = RunApplicationTasksAsync(logger, services);
-                await ApplicationTask;
-            }
-
-            catch (Exception e)
-            {
-                logger.LogCritical(e, "Failed to launch IW4MAdmin");
-                string failMessage = translationLookup == null
-                    ? "Failed to launch IW4MAdmin"
-                    : translationLookup["MANAGER_INIT_FAIL"];
-                Console.WriteLine($"{failMessage}: {e.GetExceptionInfo()}");
-            }
-
-            if (ServerManager.IsRestartRequested)
+            if (_serverManager.IsRestartRequested)
             {
                 goto restart;
             }
 
-            serviceProvider.Dispose();
+            await _serviceProvider.DisposeAsync();
         }
 
         /// <summary>
@@ -180,21 +182,26 @@ namespace IW4MAdmin.Application
         /// <returns></returns>
         private static async Task RunApplicationTasksAsync(ILogger logger, IServiceCollection services)
         {
-            var webfrontTask = ServerManager.GetApplicationSettings().Configuration().EnableWebFront
-                ? WebfrontCore.Program.Init(ServerManager, serviceProvider, services, ServerManager.CancellationToken)
+            var webfrontTask = _serverManager.GetApplicationSettings().Configuration().EnableWebFront
+                ? WebfrontCore.Program.Init(_serverManager, _serviceProvider, services, _serverManager.CancellationToken)
                 : Task.CompletedTask;
 
+            var collectionService = _serviceProvider.GetRequiredService<IServerDataCollector>();
+
             // we want to run this one on a manual thread instead of letting the thread pool handle it,
             // because we can't exit early from waiting on console input, and it prevents us from restarting
-            var inputThread = new Thread(async () => await ReadConsoleInput(logger));
+            async void ReadInput() => await ReadConsoleInput(logger);
+
+            var inputThread = new Thread(ReadInput);
             inputThread.Start();
 
             var tasks = new[]
             {
-                ServerManager.Start(),
                 webfrontTask,
-                serviceProvider.GetRequiredService<IMasterCommunication>()
-                    .RunUploadStatus(ServerManager.CancellationToken)
+                _serverManager.Start(),
+                _serviceProvider.GetRequiredService<IMasterCommunication>()
+                    .RunUploadStatus(_serverManager.CancellationToken),
+                collectionService.BeginCollectionAsync(cancellationToken: _serverManager.CancellationToken)
             };
 
             logger.LogDebug("Starting webfront and input tasks");
@@ -203,8 +210,7 @@ namespace IW4MAdmin.Application
             logger.LogInformation("Shutdown completed successfully");
             Console.WriteLine(Utilities.CurrentLocalization.LocalizationIndex["MANAGER_SHUTDOWN_SUCCESS"]);
         }
-
-
+        
         /// <summary>
         /// reads input from the console and executes entered commands on the default server
         /// </summary>
@@ -217,32 +223,41 @@ namespace IW4MAdmin.Application
                 return;
             }
 
-            string lastCommand;
-            var Origin = Utilities.IW4MAdminClient(ServerManager.Servers[0]);
+            EFClient origin = null;
 
             try
             {
-                while (!ServerManager.CancellationToken.IsCancellationRequested)
+                while (!_serverManager.CancellationToken.IsCancellationRequested)
                 {
-                    lastCommand = await Console.In.ReadLineAsync();
-
-                    if (lastCommand?.Length > 0)
+                    if (!_serverManager.IsInitialized)
                     {
-                        if (lastCommand?.Length > 0)
-                        {
-                            GameEvent E = new GameEvent()
-                            {
-                                Type = GameEvent.EventType.Command,
-                                Data = lastCommand,
-                                Origin = Origin,
-                                Owner = ServerManager.Servers[0]
-                            };
-
-                            ServerManager.AddEvent(E);
-                            await E.WaitAsync(Utilities.DefaultCommandTimeout, ServerManager.CancellationToken);
-                            Console.Write('>');
-                        }
+                        await Task.Delay(1000);
+                        continue;
                     }
+                    
+                    var lastCommand = await Console.In.ReadLineAsync();
+
+                    if (lastCommand == null)
+                    {
+                        continue;
+                    }
+
+                    if (!lastCommand.Any())
+                    {
+                        continue;
+                    }
+
+                    var gameEvent = new GameEvent
+                    {
+                        Type = GameEvent.EventType.Command,
+                        Data = lastCommand,
+                        Origin = origin ??= Utilities.IW4MAdminClient(_serverManager.Servers.FirstOrDefault()),
+                        Owner = _serverManager.Servers[0]
+                    };
+
+                    _serverManager.AddEvent(gameEvent);
+                    await gameEvent.WaitAsync(Utilities.DefaultCommandTimeout, _serverManager.CancellationToken);
+                    Console.Write('>');
                 }
             }
             catch (OperationCanceledException)
@@ -270,9 +285,10 @@ namespace IW4MAdmin.Application
 
             // register the native commands
             foreach (var commandType in typeof(SharedLibraryCore.Commands.QuitCommand).Assembly.GetTypes()
-                .Where(_command => _command.BaseType == typeof(Command)))
+                .Concat(typeof(Program).Assembly.GetTypes().Where(type => type.Namespace?.StartsWith("IW4MAdmin.Application.Commands") ?? false))
+                .Where(command => command.BaseType == typeof(Command)))
             {
-                defaultLogger.LogDebug("Registered native command type {name}", commandType.Name);
+                defaultLogger.LogDebug("Registered native command type {Name}", commandType.Name);
                 serviceCollection.AddSingleton(typeof(IManagerCommand), commandType);
             }
 
@@ -280,40 +296,40 @@ namespace IW4MAdmin.Application
             var (plugins, commands, configurations) = pluginImporter.DiscoverAssemblyPluginImplementations();
             foreach (var pluginType in plugins)
             {
-                defaultLogger.LogDebug("Registered plugin type {name}", pluginType.FullName);
+                defaultLogger.LogDebug("Registered plugin type {Name}", pluginType.FullName);
                 serviceCollection.AddSingleton(typeof(IPlugin), pluginType);
             }
 
             // register the plugin commands
             foreach (var commandType in commands)
             {
-                defaultLogger.LogDebug("Registered plugin command type {name}", commandType.FullName);
+                defaultLogger.LogDebug("Registered plugin command type {Name}", commandType.FullName);
                 serviceCollection.AddSingleton(typeof(IManagerCommand), commandType);
             }
 
             foreach (var configurationType in configurations)
             {
-                defaultLogger.LogDebug("Registered plugin config type {name}", configurationType.Name);
+                defaultLogger.LogDebug("Registered plugin config type {Name}", configurationType.Name);
                 var configInstance = (IBaseConfiguration) Activator.CreateInstance(configurationType);
                 var handlerType = typeof(BaseConfigurationHandler<>).MakeGenericType(configurationType);
-                var handlerInstance = Activator.CreateInstance(handlerType, new[] {configInstance.Name()});
+                var handlerInstance = Activator.CreateInstance(handlerType, configInstance.Name());
                 var genericInterfaceType = typeof(IConfigurationHandler<>).MakeGenericType(configurationType);
                 
                 serviceCollection.AddSingleton(genericInterfaceType, handlerInstance);
             }
 
             // register any script plugins
-            foreach (var scriptPlugin in pluginImporter.DiscoverScriptPlugins())
+            foreach (var plugin in pluginImporter.DiscoverScriptPlugins())
             {
-                serviceCollection.AddSingleton(scriptPlugin);
+                serviceCollection.AddSingleton(plugin);
             }
 
             // register any eventable types
             foreach (var assemblyType in typeof(Program).Assembly.GetTypes()
-                .Where(_asmType => typeof(IRegisterEvent).IsAssignableFrom(_asmType))
-                .Union(plugins.SelectMany(_asm => _asm.Assembly.GetTypes())
+                .Where(asmType => typeof(IRegisterEvent).IsAssignableFrom(asmType))
+                .Union(plugins.SelectMany(asm => asm.Assembly.GetTypes())
                     .Distinct()
-                    .Where(_asmType => typeof(IRegisterEvent).IsAssignableFrom(_asmType))))
+                    .Where(asmType => typeof(IRegisterEvent).IsAssignableFrom(asmType))))
             {
                 var instance = Activator.CreateInstance(assemblyType) as IRegisterEvent;
                 serviceCollection.AddSingleton(instance);
@@ -326,23 +342,39 @@ namespace IW4MAdmin.Application
         /// <summary>
         /// Configures the dependency injection services
         /// </summary>
-        private static IServiceCollection ConfigureServices(string[] args)
+        private static async Task<IServiceCollection> ConfigureServices(string[] args)
         {
+            // todo: this is a quick fix
+            AppContext.SetSwitch("Npgsql.EnableLegacyTimestampBehavior", true);
+
             // setup the static resources (config/master api/translations)
             var serviceCollection = new ServiceCollection();
             var appConfigHandler = new BaseConfigurationHandler<ApplicationConfiguration>("IW4MAdminSettings");
+            await appConfigHandler.BuildAsync();
+            var defaultConfigHandler = new BaseConfigurationHandler<DefaultSettings>("DefaultSettings");
+            await defaultConfigHandler.BuildAsync();
+            var commandConfigHandler = new BaseConfigurationHandler<CommandConfiguration>("CommandConfiguration");
+            await commandConfigHandler.BuildAsync();
+            var statsCommandHandler = new BaseConfigurationHandler<StatsConfiguration>("StatsPluginSettings");
+            await statsCommandHandler.BuildAsync();
+            var defaultConfig = defaultConfigHandler.Configuration();
             var appConfig = appConfigHandler.Configuration();
             var masterUri = Utilities.IsDevelopment
                 ? new Uri("http://127.0.0.1:8080")
                 : appConfig?.MasterUrl ?? new ApplicationConfiguration().MasterUrl;
-            var masterRestClient = RestClient.For<IMasterApi>(masterUri);
+            var httpClient = new HttpClient
+            {
+                BaseAddress = masterUri,
+                Timeout = TimeSpan.FromSeconds(15)
+            };
+            var masterRestClient = RestClient.For<IMasterApi>(httpClient);
             var translationLookup = Configure.Initialize(Utilities.DefaultLogger, masterRestClient, appConfig);
 
             if (appConfig == null)
             {
                 appConfig = (ApplicationConfiguration) new ApplicationConfiguration().Generate();
                 appConfigHandler.Set(appConfig);
-                appConfigHandler.Save();
+                await appConfigHandler.Save();
             }
 
             // register override level names
@@ -359,15 +391,15 @@ namespace IW4MAdmin.Application
 
             serviceCollection
                 .AddBaseLogger(appConfig)
-                .AddSingleton<IServiceCollection>(_serviceProvider => serviceCollection)
+                .AddSingleton(defaultConfig)
+                .AddSingleton<IServiceCollection>(serviceCollection)
                 .AddSingleton<IConfigurationHandler<DefaultSettings>, BaseConfigurationHandler<DefaultSettings>>()
                 .AddSingleton((IConfigurationHandler<ApplicationConfiguration>) appConfigHandler)
-                .AddSingleton(
-                    new BaseConfigurationHandler<CommandConfiguration>("CommandConfiguration") as
-                        IConfigurationHandler<CommandConfiguration>)
+                .AddSingleton<IConfigurationHandler<CommandConfiguration>>(commandConfigHandler)
                 .AddSingleton(appConfig)
-                .AddSingleton(_serviceProvider =>
-                    _serviceProvider.GetRequiredService<IConfigurationHandler<CommandConfiguration>>()
+                .AddSingleton(statsCommandHandler.Configuration() ?? new StatsConfiguration())
+                .AddSingleton(serviceProvider =>
+                    serviceProvider.GetRequiredService<IConfigurationHandler<CommandConfiguration>>()
                         .Configuration() ?? new CommandConfiguration())
                 .AddSingleton<IPluginImporter, PluginImporter>()
                 .AddSingleton<IMiddlewareActionHandler, MiddlewareActionHandler>()
@@ -380,7 +412,10 @@ namespace IW4MAdmin.Application
                 .AddSingleton<IScriptCommandFactory, ScriptCommandFactory>()
                 .AddSingleton<IAuditInformationRepository, AuditInformationRepository>()
                 .AddSingleton<IEntityService<EFClient>, ClientService>()
+#pragma warning disable CS0618
                 .AddSingleton<IMetaService, MetaService>()
+#pragma warning restore CS0618
+                .AddSingleton<IMetaServiceV2, MetaServiceV2>()
                 .AddSingleton<ClientService>()
                 .AddSingleton<PenaltyService>()
                 .AddSingleton<ChangeHistoryService>()
@@ -393,11 +428,15 @@ namespace IW4MAdmin.Application
                 .AddSingleton<IResourceQueryHelper<ClientPaginationRequest, UpdatedAliasResponse>,
                     UpdatedAliasResourceQueryHelper>()
                 .AddSingleton<IResourceQueryHelper<ChatSearchQuery, MessageResponse>, ChatResourceQueryHelper>()
+                .AddSingleton<IResourceQueryHelper<ClientPaginationRequest, ConnectionHistoryResponse>, ConnectionsResourceQueryHelper>()
+                .AddSingleton<IResourceQueryHelper<ClientPaginationRequest, PermissionLevelChangedResponse>, PermissionLevelChangedResourceQueryHelper>()
                 .AddTransient<IParserPatternMatcher, ParserPatternMatcher>()
                 .AddSingleton<IRemoteAssemblyHandler, RemoteAssemblyHandler>()
                 .AddSingleton<IMasterCommunication, MasterCommunication>()
                 .AddSingleton<IManager, ApplicationManager>()
+#pragma warning disable CS0612
                 .AddSingleton<SharedLibraryCore.Interfaces.ILogger, Logger>()
+#pragma warning restore CS0612
                 .AddSingleton<IClientNoticeMessageFormatter, ClientNoticeMessageFormatter>()
                 .AddSingleton<IClientStatisticCalculator, HitCalculator>()
                 .AddSingleton<IServerDistributionCalculator, ServerDistributionCalculator>()
@@ -405,6 +444,11 @@ namespace IW4MAdmin.Application
                 .AddSingleton<IHitInfoBuilder, HitInfoBuilder>()
                 .AddSingleton(typeof(ILookupCache<>), typeof(LookupCache<>))
                 .AddSingleton(typeof(IDataValueCache<,>), typeof(DataValueCache<,>))
+                .AddSingleton<IServerDataViewer, ServerDataViewer>()
+                .AddSingleton<IServerDataCollector, ServerDataCollector>()
+                .AddSingleton<IEventPublisher, EventPublisher>()
+                .AddSingleton<IGeoLocationService>(new GeoLocationService(Path.Join(".", "Resources", "GeoLite2-Country.mmdb")))
+                .AddTransient<IScriptPluginTimerHelper, ScriptPluginTimerHelper>()
                 .AddSingleton(translationLookup)
                 .AddDatabaseContextOptions(appConfig);
 
@@ -417,6 +461,8 @@ namespace IW4MAdmin.Application
                 serviceCollection.AddSingleton<IEventHandler, GameEventHandler>();
             }
 
+            serviceCollection.AddSource();
+
             return serviceCollection;
         }
 
@@ -429,4 +475,4 @@ namespace IW4MAdmin.Application
             return collection.GetRequiredService<ILogger<T>>();
         }
     }
-}
+}

Application/Meta/ConnectionsResourceQueryHelper.cs

@@ -0,0 +1,60 @@
+using System.Linq;
+using System.Threading.Tasks;
+using Data.Abstractions;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using SharedLibraryCore.Dtos.Meta.Responses;
+using SharedLibraryCore.Helpers;
+using SharedLibraryCore.Interfaces;
+using SharedLibraryCore.QueryHelper;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
+
+namespace IW4MAdmin.Application.Meta
+{
+    public class
+        ConnectionsResourceQueryHelper : IResourceQueryHelper<ClientPaginationRequest, ConnectionHistoryResponse>
+    {
+        private readonly ILogger _logger;
+        private readonly IDatabaseContextFactory _contextFactory;
+
+        public ConnectionsResourceQueryHelper(ILogger<ConnectionsResourceQueryHelper> logger,
+            IDatabaseContextFactory contextFactory)
+        {
+            _contextFactory = contextFactory;
+            _logger = logger;
+        }
+
+        public async Task<ResourceQueryHelperResult<ConnectionHistoryResponse>> QueryResource(
+            ClientPaginationRequest query)
+        {
+            _logger.LogDebug("{Class} {@Request}", nameof(ConnectionsResourceQueryHelper), query);
+
+            await using var context = _contextFactory.CreateContext(enableTracking: false);
+
+            var iqConnections = context.ConnectionHistory.AsNoTracking()
+                .Where(history => query.ClientId == history.ClientId)
+                .Where(history => history.CreatedDateTime < query.Before)
+                .OrderByDescending(history => history.CreatedDateTime);
+
+            var connections = await iqConnections.Select(history => new ConnectionHistoryResponse
+                {
+                    MetaId = history.ClientConnectionId,
+                    ClientId = history.ClientId,
+                    Type = MetaType.ConnectionHistory,
+                    ShouldDisplay = true,
+                    When = history.CreatedDateTime,
+                    ServerName = history.Server.HostName,
+                    ConnectionType = history.ConnectionType
+                })
+                .ToListAsync();
+
+            _logger.LogDebug("{Class} retrieved {Number} items", nameof(ConnectionsResourceQueryHelper),
+                connections.Count);
+
+            return new ResourceQueryHelperResult<ConnectionHistoryResponse>
+            {
+                Results = connections
+            };
+        }
+    }
+}

Application/Meta/MetaRegistration.cs

@@ -5,6 +5,7 @@ using SharedLibraryCore.Interfaces;
 using SharedLibraryCore.QueryHelper;
 using System;
 using System.Collections.Generic;
+using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using ILogger = Microsoft.Extensions.Logging.ILogger;
@@ -15,16 +16,28 @@ namespace IW4MAdmin.Application.Meta
     {
         private readonly ILogger _logger;
         private ITranslationLookup _transLookup;
-        private readonly IMetaService _metaService;
+        private readonly IMetaServiceV2 _metaService;
         private readonly IEntityService<EFClient> _clientEntityService;
         private readonly IResourceQueryHelper<ClientPaginationRequest, ReceivedPenaltyResponse> _receivedPenaltyHelper;
-        private readonly IResourceQueryHelper<ClientPaginationRequest, AdministeredPenaltyResponse> _administeredPenaltyHelper;
+
+        private readonly IResourceQueryHelper<ClientPaginationRequest, AdministeredPenaltyResponse>
+            _administeredPenaltyHelper;
+
         private readonly IResourceQueryHelper<ClientPaginationRequest, UpdatedAliasResponse> _updatedAliasHelper;
 
-        public MetaRegistration(ILogger<MetaRegistration> logger, IMetaService metaService, ITranslationLookup transLookup, IEntityService<EFClient> clientEntityService,
+        private readonly IResourceQueryHelper<ClientPaginationRequest, ConnectionHistoryResponse>
+            _connectionHistoryHelper;
+
+        private readonly IResourceQueryHelper<ClientPaginationRequest, PermissionLevelChangedResponse>
+            _permissionLevelHelper;
+
+        public MetaRegistration(ILogger<MetaRegistration> logger, IMetaServiceV2 metaService,
+            ITranslationLookup transLookup, IEntityService<EFClient> clientEntityService,
             IResourceQueryHelper<ClientPaginationRequest, ReceivedPenaltyResponse> receivedPenaltyHelper,
             IResourceQueryHelper<ClientPaginationRequest, AdministeredPenaltyResponse> administeredPenaltyHelper,
-            IResourceQueryHelper<ClientPaginationRequest, UpdatedAliasResponse> updatedAliasHelper)
+            IResourceQueryHelper<ClientPaginationRequest, UpdatedAliasResponse> updatedAliasHelper,
+            IResourceQueryHelper<ClientPaginationRequest, ConnectionHistoryResponse> connectionHistoryHelper,
+            IResourceQueryHelper<ClientPaginationRequest, PermissionLevelChangedResponse> permissionLevelHelper)
         {
             _logger = logger;
             _transLookup = transLookup;
@@ -33,20 +46,32 @@ namespace IW4MAdmin.Application.Meta
             _receivedPenaltyHelper = receivedPenaltyHelper;
             _administeredPenaltyHelper = administeredPenaltyHelper;
             _updatedAliasHelper = updatedAliasHelper;
+            _connectionHistoryHelper = connectionHistoryHelper;
+            _permissionLevelHelper = permissionLevelHelper;
         }
 
         public void Register()
         {
-            _metaService.AddRuntimeMeta<ClientPaginationRequest, InformationResponse>(MetaType.Information, GetProfileMeta);
-            _metaService.AddRuntimeMeta<ClientPaginationRequest, ReceivedPenaltyResponse>(MetaType.ReceivedPenalty, GetReceivedPenaltiesMeta);
-            _metaService.AddRuntimeMeta<ClientPaginationRequest, AdministeredPenaltyResponse>(MetaType.Penalized, GetAdministeredPenaltiesMeta);
-            _metaService.AddRuntimeMeta<ClientPaginationRequest, UpdatedAliasResponse>(MetaType.AliasUpdate, GetUpdatedAliasMeta);
+            _metaService.AddRuntimeMeta<ClientPaginationRequest, InformationResponse>(MetaType.Information,
+                GetProfileMeta);
+            _metaService.AddRuntimeMeta<ClientPaginationRequest, ReceivedPenaltyResponse>(MetaType.ReceivedPenalty,
+                GetReceivedPenaltiesMeta);
+            _metaService.AddRuntimeMeta<ClientPaginationRequest, AdministeredPenaltyResponse>(MetaType.Penalized,
+                GetAdministeredPenaltiesMeta);
+            _metaService.AddRuntimeMeta<ClientPaginationRequest, UpdatedAliasResponse>(MetaType.AliasUpdate,
+                GetUpdatedAliasMeta);
+            _metaService.AddRuntimeMeta<ClientPaginationRequest, ConnectionHistoryResponse>(MetaType.ConnectionHistory,
+                GetConnectionHistoryMeta);
+            _metaService.AddRuntimeMeta<ClientPaginationRequest, PermissionLevelChangedResponse>(
+                MetaType.PermissionLevel, GetPermissionLevelMeta);
         }
 
-        private async Task<IEnumerable<InformationResponse>> GetProfileMeta(ClientPaginationRequest request)
+        private async Task<IEnumerable<InformationResponse>> GetProfileMeta(ClientPaginationRequest request,
+            CancellationToken cancellationToken = default)
         {
             var metaList = new List<InformationResponse>();
-            var lastMapMeta = await _metaService.GetPersistentMeta("LastMapPlayed", new EFClient() { ClientId = request.ClientId });
+            var lastMapMeta =
+                await _metaService.GetPersistentMeta("LastMapPlayed", request.ClientId, cancellationToken);
 
             if (lastMapMeta != null)
             {
@@ -58,12 +83,12 @@ namespace IW4MAdmin.Application.Meta
                     Value = lastMapMeta.Value,
                     ShouldDisplay = true,
                     Type = MetaType.Information,
-                    Column = 1,
                     Order = 6
                 });
             }
 
-            var lastServerMeta = await _metaService.GetPersistentMeta("LastServerPlayed", new EFClient() { ClientId = request.ClientId });
+            var lastServerMeta =
+                await _metaService.GetPersistentMeta("LastServerPlayed", request.ClientId, cancellationToken);
 
             if (lastServerMeta != null)
             {
@@ -75,8 +100,7 @@ namespace IW4MAdmin.Application.Meta
                     Value = lastServerMeta.Value,
                     ShouldDisplay = true,
                     Type = MetaType.Information,
-                    Column = 0,
-                    Order = 6
+                    Order = 7
                 });
             }
 
@@ -84,7 +108,7 @@ namespace IW4MAdmin.Application.Meta
 
             if (client == null)
             {
-                _logger.LogWarning("No client found with id {clientId} when generating profile meta", request.ClientId);
+                _logger.LogWarning("No client found with id {ClientId} when generating profile meta", request.ClientId);
                 return metaList;
             }
 
@@ -94,8 +118,7 @@ namespace IW4MAdmin.Application.Meta
                 Key = _transLookup["WEBFRONT_PROFILE_META_PLAY_TIME"],
                 Value = TimeSpan.FromHours(client.TotalConnectionTime / 3600.0).HumanizeForCurrentCulture(),
                 ShouldDisplay = true,
-                Column = 1,
-                Order = 0,
+                Order = 8,
                 Type = MetaType.Information
             });
 
@@ -105,8 +128,7 @@ namespace IW4MAdmin.Application.Meta
                 Key = _transLookup["WEBFRONT_PROFILE_META_FIRST_SEEN"],
                 Value = (DateTime.UtcNow - client.FirstConnection).HumanizeForCurrentCulture(),
                 ShouldDisplay = true,
-                Column = 1,
-                Order = 1,
+                Order = 9,
                 Type = MetaType.Information
             });
 
@@ -116,8 +138,7 @@ namespace IW4MAdmin.Application.Meta
                 Key = _transLookup["WEBFRONT_PROFILE_META_LAST_SEEN"],
                 Value = (DateTime.UtcNow - client.LastConnection).HumanizeForCurrentCulture(),
                 ShouldDisplay = true,
-                Column = 1,
-                Order = 2,
+                Order = 10,
                 Type = MetaType.Information
             });
 
@@ -125,10 +146,10 @@ namespace IW4MAdmin.Application.Meta
             {
                 ClientId = client.ClientId,
                 Key = Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_CLIENT_META_CONNECTIONS"],
-                Value = client.Connections.ToString("#,##0", new System.Globalization.CultureInfo(Utilities.CurrentLocalization.LocalizationName)),
+                Value = client.Connections.ToString("#,##0",
+                    new System.Globalization.CultureInfo(Utilities.CurrentLocalization.LocalizationName)),
                 ShouldDisplay = true,
-                Column = 1,
-                Order = 3,
+                Order = 11,
                 Type = MetaType.Information
             });
 
@@ -136,32 +157,50 @@ namespace IW4MAdmin.Application.Meta
             {
                 ClientId = client.ClientId,
                 Key = Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_CLIENT_META_MASKED"],
-                Value = client.Masked ? Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_CLIENT_META_TRUE"] : Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_CLIENT_META_FALSE"],
+                Value = client.Masked
+                    ? Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_CLIENT_META_TRUE"]
+                    : Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_CLIENT_META_FALSE"],
                 IsSensitive = true,
-                Column = 1,
-                Order = 4,
+                Order = 12,
                 Type = MetaType.Information
             });
 
             return metaList;
         }
 
-        private async Task<IEnumerable<ReceivedPenaltyResponse>> GetReceivedPenaltiesMeta(ClientPaginationRequest request)
+        private async Task<IEnumerable<ReceivedPenaltyResponse>> GetReceivedPenaltiesMeta(
+            ClientPaginationRequest request, CancellationToken token = default)
         {
             var penalties = await _receivedPenaltyHelper.QueryResource(request);
             return penalties.Results;
         }
 
-        private async Task<IEnumerable<AdministeredPenaltyResponse>> GetAdministeredPenaltiesMeta(ClientPaginationRequest request)
+        private async Task<IEnumerable<AdministeredPenaltyResponse>> GetAdministeredPenaltiesMeta(
+            ClientPaginationRequest request, CancellationToken token = default)
         {
             var penalties = await _administeredPenaltyHelper.QueryResource(request);
             return penalties.Results;
         }
 
-        private async Task<IEnumerable<UpdatedAliasResponse>> GetUpdatedAliasMeta(ClientPaginationRequest request)
+        private async Task<IEnumerable<UpdatedAliasResponse>> GetUpdatedAliasMeta(ClientPaginationRequest request,
+            CancellationToken token = default)
         {
             var aliases = await _updatedAliasHelper.QueryResource(request);
             return aliases.Results;
         }
+
+        private async Task<IEnumerable<ConnectionHistoryResponse>> GetConnectionHistoryMeta(
+            ClientPaginationRequest request, CancellationToken token = default)
+        {
+            var connections = await _connectionHistoryHelper.QueryResource(request);
+            return connections.Results;
+        }
+
+        private async Task<IEnumerable<PermissionLevelChangedResponse>> GetPermissionLevelMeta(
+            ClientPaginationRequest request, CancellationToken token = default)
+        {
+            var permissionChanges = await _permissionLevelHelper.QueryResource(request);
+            return permissionChanges.Results;
+        }
     }
 }

Application/Meta/PermissionLevelChangedResourceQueryHelper.cs

@@ -0,0 +1,51 @@
+using System.Linq;
+using System.Threading.Tasks;
+using Data.Abstractions;
+using Data.Models;
+using Microsoft.EntityFrameworkCore;
+using SharedLibraryCore.Dtos.Meta.Responses;
+using SharedLibraryCore.Helpers;
+using SharedLibraryCore.Interfaces;
+using SharedLibraryCore.QueryHelper;
+
+namespace IW4MAdmin.Application.Meta;
+
+public class
+    PermissionLevelChangedResourceQueryHelper : IResourceQueryHelper<ClientPaginationRequest,
+        PermissionLevelChangedResponse>
+{
+    private readonly IDatabaseContextFactory _contextFactory;
+
+    public PermissionLevelChangedResourceQueryHelper(IDatabaseContextFactory contextFactory)
+    {
+        _contextFactory = contextFactory;
+    }
+
+    public async Task<ResourceQueryHelperResult<PermissionLevelChangedResponse>> QueryResource(
+        ClientPaginationRequest query)
+    {
+        await using var context = _contextFactory.CreateContext();
+
+        var auditEntries = context.EFChangeHistory.Where(change => change.TargetEntityId == query.ClientId)
+            .Where(change => change.TypeOfChange == EFChangeHistory.ChangeType.Permission);
+
+        var audits = from change in auditEntries
+            join client in context.Clients
+                on change.OriginEntityId equals client.ClientId
+            select new PermissionLevelChangedResponse
+            {
+                ChangedById = change.OriginEntityId,
+                ChangedByName = client.CurrentAlias.Name,
+                PreviousPermissionLevelValue = change.PreviousValue,
+                CurrentPermissionLevelValue = change.CurrentValue,
+                When = change.TimeChanged,
+                ClientId = change.TargetEntityId,
+                IsSensitive = true
+            };
+
+        return new ResourceQueryHelperResult<PermissionLevelChangedResponse>
+        {
+            Results = await audits.Skip(query.Offset).Take(query.Count).ToListAsync()
+        };
+    }
+}

Application/Meta/ReceivedPenaltyResourceQueryHelper.cs

@@ -1,14 +1,17 @@
-using System.Linq;
+using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using Data.Abstractions;
 using Data.Models;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 using SharedLibraryCore;
+using SharedLibraryCore.Configuration;
 using SharedLibraryCore.Dtos.Meta.Responses;
 using SharedLibraryCore.Helpers;
 using SharedLibraryCore.Interfaces;
 using SharedLibraryCore.QueryHelper;
+using SharedLibraryCore.Services;
 using ILogger = Microsoft.Extensions.Logging.ILogger;
 
 namespace IW4MAdmin.Application.Meta
@@ -17,33 +20,75 @@ namespace IW4MAdmin.Application.Meta
     /// implementation of IResourceQueryHelper
     /// used to pull in penalties applied to a given client id
     /// </summary>
-    public class ReceivedPenaltyResourceQueryHelper : IResourceQueryHelper<ClientPaginationRequest, ReceivedPenaltyResponse>
+    public class
+        ReceivedPenaltyResourceQueryHelper : IResourceQueryHelper<ClientPaginationRequest, ReceivedPenaltyResponse>
     {
         private readonly ILogger _logger;
         private readonly IDatabaseContextFactory _contextFactory;
+        private readonly ApplicationConfiguration _appConfig;
 
-        public ReceivedPenaltyResourceQueryHelper(ILogger<ReceivedPenaltyResourceQueryHelper> logger, IDatabaseContextFactory contextFactory)
+        public ReceivedPenaltyResourceQueryHelper(ILogger<ReceivedPenaltyResourceQueryHelper> logger,
+            IDatabaseContextFactory contextFactory, ApplicationConfiguration appConfig)
         {
             _contextFactory = contextFactory;
             _logger = logger;
+            _appConfig = appConfig;
         }
 
-        public async Task<ResourceQueryHelperResult<ReceivedPenaltyResponse>> QueryResource(ClientPaginationRequest query)
+        public async Task<ResourceQueryHelperResult<ReceivedPenaltyResponse>> QueryResource(
+            ClientPaginationRequest query)
         {
             var linkedPenaltyType = Utilities.LinkedPenaltyTypes();
             await using var ctx = _contextFactory.CreateContext(enableTracking: false);
 
             var linkId = await ctx.Clients.AsNoTracking()
-                    .Where(_client => _client.ClientId == query.ClientId)
-                    .Select(_client => _client.AliasLinkId)
-                    .FirstOrDefaultAsync();
+                .Where(_client => _client.ClientId == query.ClientId)
+                .Select(_client => new { _client.AliasLinkId, _client.CurrentAliasId })
+                .FirstOrDefaultAsync();
 
             var iqPenalties = ctx.Penalties.AsNoTracking()
-                .Where(_penalty => _penalty.OffenderId == query.ClientId || (linkedPenaltyType.Contains(_penalty.Type) && _penalty.LinkId == linkId))
-                .Where(_penalty => _penalty.When < query.Before)
-                .OrderByDescending(_penalty => _penalty.When);
+                .Where(_penalty => _penalty.OffenderId == query.ClientId ||
+                                   linkedPenaltyType.Contains(_penalty.Type) && _penalty.LinkId == linkId.AliasLinkId);
 
-            var penalties = await iqPenalties
+            IQueryable<EFPenalty> iqIpLinkedPenalties = null;
+            IQueryable<EFPenalty> identifierPenalties = null;
+
+            if (!_appConfig.EnableImplicitAccountLinking)
+            {
+                var usedIps = await ctx.Aliases.AsNoTracking()
+                    .Where(alias =>
+                        (alias.LinkId == linkId.AliasLinkId || alias.AliasId == linkId.CurrentAliasId) &&
+                        alias.IPAddress != null)
+                    .Select(alias => alias.IPAddress).ToListAsync();
+
+                   identifierPenalties = ctx.PenaltyIdentifiers.AsNoTracking().Where(identifier =>
+                        identifier.IPv4Address != null && usedIps.Contains(identifier.IPv4Address))
+                    .Select(id => id.Penalty);
+
+                var aliasedIds = await ctx.Aliases.AsNoTracking().Where(alias => usedIps.Contains(alias.IPAddress))
+                    .Select(alias => alias.LinkId)
+                    .ToListAsync();
+
+                iqIpLinkedPenalties = ctx.Penalties.AsNoTracking()
+                    .Where(penalty =>
+                        linkedPenaltyType.Contains(penalty.Type) && aliasedIds.Contains(penalty.LinkId ?? -1));
+            }
+
+            var iqAllPenalties = iqPenalties;
+
+            if (iqIpLinkedPenalties != null)
+            {
+                iqAllPenalties = iqPenalties.Union(iqIpLinkedPenalties);
+            }
+
+            if (identifierPenalties != null)
+            {
+                iqAllPenalties = iqPenalties.Union(identifierPenalties);
+            }
+
+            var penalties = await iqAllPenalties
+                .Where(_penalty => _penalty.When < query.Before)
+                .OrderByDescending(_penalty => _penalty.When)
                 .Take(query.Count)
                 .Select(_penalty => new ReceivedPenaltyResponse()
                 {
@@ -67,7 +112,7 @@ namespace IW4MAdmin.Application.Meta
             {
                 // todo: maybe actually count
                 RetrievedResultCount = penalties.Count,
-                Results = penalties
+                Results = penalties.Distinct()
             };
         }
     }

Application/Migration/ConfigurationMigration.cs

@@ -88,7 +88,7 @@ namespace IW4MAdmin.Application.Migration
 
         public static void RemoveObsoletePlugins20210322()
         {
-            var files = new[] {"StatsWeb.dll", "StatsWeb.Views.dll"};
+            var files = new[] {"StatsWeb.dll", "StatsWeb.Views.dll", "IW4ScriptCommands.dll"};
 
             foreach (var file in files)
             {

Application/Migration/DatabaseHousekeeping.cs

@@ -4,8 +4,6 @@ using System.Threading;
 using System.Threading.Tasks;
 using Data.Abstractions;
 using Data.Models.Client.Stats;
-using SharedLibraryCore.Database;
-using SharedLibraryCore.Interfaces;
 
 namespace IW4MAdmin.Application.Migration
 {

Application/Misc/BaseConfigurationHandler.cs

@@ -1,10 +1,13 @@
-using Newtonsoft.Json;
-using SharedLibraryCore;
+using SharedLibraryCore;
 using SharedLibraryCore.Exceptions;
 using SharedLibraryCore.Interfaces;
 using System;
 using System.IO;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.Threading;
 using System.Threading.Tasks;
+using JsonSerializer = System.Text.Json.JsonSerializer;
 
 namespace IW4MAdmin.Application.Misc
 {
@@ -14,27 +17,40 @@ namespace IW4MAdmin.Application.Misc
     /// <typeparam name="T">base configuration type</typeparam>
     public class BaseConfigurationHandler<T> : IConfigurationHandler<T> where T : IBaseConfiguration
     {
-        T _configuration;
+        private T _configuration;
+        private readonly SemaphoreSlim _onSaving;
+        private readonly JsonSerializerOptions _serializerOptions;
 
-        public BaseConfigurationHandler(string fn)
+
+        public BaseConfigurationHandler(string fileName)
         {
-            FileName = Path.Join(Utilities.OperatingDirectory, "Configuration", $"{fn}.json");
-            Build();
+            _serializerOptions = new JsonSerializerOptions
+            {
+                WriteIndented = true,
+                Encoder = System.Text.Encodings.Web.JavaScriptEncoder.UnsafeRelaxedJsonEscaping
+            };
+            _serializerOptions.Converters.Add(new JsonStringEnumConverter());
+            _onSaving = new SemaphoreSlim(1, 1);
+            FileName = Path.Join(Utilities.OperatingDirectory, "Configuration", $"{fileName}.json");
         }
 
         public BaseConfigurationHandler() : this(typeof(T).Name)
         {
-            
+        }
+
+        ~BaseConfigurationHandler()
+        {
+            _onSaving.Dispose();
         }
 
         public string FileName { get; }
 
-        public void Build()
+        public async Task BuildAsync()
         {
             try
             {
-                var configContent = File.ReadAllText(FileName);
-                _configuration = JsonConvert.DeserializeObject<T>(configContent);
+                await using var fileStream = File.OpenRead(FileName);
+                _configuration = await JsonSerializer.DeserializeAsync<T>(fileStream, _serializerOptions);
             }
 
             catch (FileNotFoundException)
@@ -44,7 +60,7 @@ namespace IW4MAdmin.Application.Misc
 
             catch (Exception e)
             {
-                throw new ConfigurationException("MANAGER_CONFIGURATION_ERROR")
+                throw new ConfigurationException("Could not load configuration")
                 {
                     Errors = new[] { e.Message },
                     ConfigurationFileName = FileName
@@ -52,16 +68,23 @@ namespace IW4MAdmin.Application.Misc
             }
         }
 
-        public Task Save()
+        public async Task Save()
         {
-            var settings = new JsonSerializerSettings()
+            try
             {
-                Formatting = Formatting.Indented
-            };
-            settings.Converters.Add(new Newtonsoft.Json.Converters.StringEnumConverter());
+                await _onSaving.WaitAsync();
 
-            var appConfigJSON = JsonConvert.SerializeObject(_configuration, settings);
-            return File.WriteAllTextAsync(FileName, appConfigJSON);
+                await using var fileStream = File.Create(FileName);
+                await JsonSerializer.SerializeAsync(fileStream, _configuration, _serializerOptions);
+            }
+
+            finally
+            {
+                if (_onSaving.CurrentCount == 0)
+                {
+                    _onSaving.Release(1);
+                }
+            }
         }
 
         public T Configuration()

Application/Misc/EventPublisher.cs

@@ -0,0 +1,44 @@
+using System;
+using Microsoft.Extensions.Logging;
+using SharedLibraryCore;
+using SharedLibraryCore.Interfaces;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
+
+namespace IW4MAdmin.Application.Misc
+{
+    public class EventPublisher : IEventPublisher
+    {
+        public event EventHandler<GameEvent> OnClientDisconnect;
+        public event EventHandler<GameEvent> OnClientConnect;
+
+        private readonly ILogger _logger;
+
+        public EventPublisher(ILogger<EventPublisher> logger)
+        {
+            _logger = logger;
+        }
+
+        public void Publish(GameEvent gameEvent)
+        {
+            _logger.LogDebug("Handling publishing event of type {EventType}", gameEvent.Type);
+
+            try
+            {
+                if (gameEvent.Type == GameEvent.EventType.Connect)
+                {
+                    OnClientConnect?.Invoke(this, gameEvent);
+                }
+
+                if (gameEvent.Type == GameEvent.EventType.Disconnect)
+                {
+                    OnClientDisconnect?.Invoke(this, gameEvent);
+                }
+            }
+
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Could not publish event of type {EventType}", gameEvent.Type);
+            }
+        }
+    }
+}

Application/Misc/GeoLocationResult.cs

@@ -0,0 +1,13 @@
+using SharedLibraryCore.Interfaces;
+
+namespace IW4MAdmin.Application.Misc;
+
+public class GeoLocationResult : IGeoLocationResult
+{
+    public string Country { get; set; }
+    public string CountryCode { get; set; }
+    public string Region { get; set; }
+    public string ASN { get; set; }
+    public string Timezone { get; set; }
+    public string Organization { get; set; }
+}

Application/Misc/GeoLocationService.cs

@@ -0,0 +1,40 @@
+using System;
+using System.Threading.Tasks;
+using MaxMind.GeoIP2;
+using MaxMind.GeoIP2.Responses;
+using SharedLibraryCore.Interfaces;
+
+namespace IW4MAdmin.Application.Misc;
+
+public class GeoLocationService : IGeoLocationService
+{
+    private readonly string _sourceAddress;
+    
+    public GeoLocationService(string sourceAddress)
+    {
+        _sourceAddress = sourceAddress;
+    }
+    
+    public Task<IGeoLocationResult> Locate(string address)
+    {
+        CountryResponse country = null;
+        
+        try
+        {
+            using var reader = new DatabaseReader(_sourceAddress);
+            reader.TryCountry(address, out country);
+        }
+        catch
+        {
+            // ignored
+        }
+
+        var response = new GeoLocationResult
+        {
+            Country = country?.Country.Name ?? "Unknown",
+            CountryCode = country?.Country.IsoCode ?? ""
+        };
+
+        return Task.FromResult((IGeoLocationResult)response);
+    }
+}

Application/Misc/LogPathGeneratorInfo.cs

@@ -19,6 +19,12 @@ namespace IW4MAdmin.Application.Misc
         /// </summary>
         public string BasePathDirectory { get; set; } = "";
 
+        /// <summary>
+        /// directory for local storage
+        /// <remarks>fs_homepath</remarks>
+        /// </summary>
+        public string HomePathDirectory { get; set; } = "";
+
         /// <summary>
         /// overide game directory
         /// <remarks>plugin driven</remarks>
@@ -41,5 +47,11 @@ namespace IW4MAdmin.Application.Misc
         /// indicates if running on windows
         /// </summary>
         public bool IsWindows { get; set; } = true;
+        
+        /// <summary>
+        /// indicates that the game does not log to the mods folder (when mod is loaded),
+        /// but rather always to the fs_basegame directory
+        /// </summary>
+        public bool IsOneLog { get; set; }
     }
 }

Application/Misc/MasterCommunication.cs

@@ -26,7 +26,8 @@ namespace IW4MAdmin.Application.Misc
         private readonly ApplicationConfiguration _appConfig;
         private readonly BuildNumber _fallbackVersion = BuildNumber.Parse("99.99.99.99");
         private readonly int _apiVersion = 1;
-        private bool firstHeartBeat = true;
+        private bool _firstHeartBeat = true;
+        private static readonly TimeSpan Interval = TimeSpan.FromSeconds(30);
 
         public MasterCommunication(ILogger<MasterCommunication> logger, ApplicationConfiguration appConfig, ITranslationLookup translationLookup, IMasterApi apiInstance, IManager manager)
         {
@@ -93,53 +94,24 @@ namespace IW4MAdmin.Application.Misc
 
         public async Task RunUploadStatus(CancellationToken token)
         {
-            // todo: clean up this logic
-            bool connected;
-
             while (!token.IsCancellationRequested)
             {
                 try
                 {
-                    await UploadStatus();
-                }
-
-                catch (System.Net.Http.HttpRequestException e)
-                {
-                    _logger.LogWarning(e, "Could not send heartbeat");
-                }
-
-                catch (AggregateException e)
-                {
-                    _logger.LogWarning(e, "Could not send heartbeat");
-                    var exceptions = e.InnerExceptions.Where(ex => ex.GetType() == typeof(ApiException));
-
-                    foreach (var ex in exceptions)
+                    if (_manager.IsRunning)
                     {
-                        if (((ApiException)ex).StatusCode == System.Net.HttpStatusCode.Unauthorized)
-                        {
-                            connected = false;
-                        }
+                        await UploadStatus();
                     }
                 }
 
-                catch (ApiException e)
+                catch (Exception ex)
                 {
-                    _logger.LogWarning(e, "Could not send heartbeat");
-                    if (e.StatusCode == System.Net.HttpStatusCode.Unauthorized)
-                    {
-                        connected = false;
-                    }
+                    _logger.LogWarning(ex, "Could not send heartbeat");
                 }
 
-                catch (Exception e)
-                {
-                    _logger.LogWarning(e, "Could not send heartbeat");
-                }
-
-
                 try
                 {
-                    await Task.Delay(30000, token);
+                    await Task.Delay(Interval, token);
                 }
 
                 catch
@@ -151,7 +123,7 @@ namespace IW4MAdmin.Application.Misc
 
         private async Task UploadStatus()
         {
-            if (firstHeartBeat)
+            if (_firstHeartBeat)
             {
                 var token = await _apiInstance.Authenticate(new AuthenticationId
                 {
@@ -179,12 +151,13 @@ namespace IW4MAdmin.Application.Misc
                                 Id = s.EndPoint,
                                 Port = (short)s.Port,
                                 IPAddress = s.IP
-                            }).ToList()
+                            }).ToList(),
+                WebfrontUrl = _appConfig.WebfrontUrl
             };
 
             Response<ResultMessage> response = null;
 
-            if (firstHeartBeat)
+            if (_firstHeartBeat)
             {
                 response = await _apiInstance.AddInstance(instance);
             }
@@ -192,7 +165,7 @@ namespace IW4MAdmin.Application.Misc
             else
             {
                 response = await _apiInstance.UpdateInstance(instance.Id, instance);
-                firstHeartBeat = false;
+                _firstHeartBeat = false;
             }
 
             if (response.ResponseMessage.StatusCode != System.Net.HttpStatusCode.OK)

Application/Misc/MetaService.cs

@@ -18,6 +18,7 @@ namespace IW4MAdmin.Application.Misc
     /// implementation of IMetaService
     /// used to add and retrieve runtime and persistent meta
     /// </summary>
+    [Obsolete("Use MetaServiceV2")]
     public class MetaService : IMetaService
     {
         private readonly IDictionary<MetaType, List<dynamic>> _metaActions;
@@ -68,6 +69,29 @@ namespace IW4MAdmin.Application.Misc
             await ctx.SaveChangesAsync();
         }
 
+        public async Task SetPersistentMeta(string metaKey, string metaValue, int clientId)
+        {
+            await AddPersistentMeta(metaKey, metaValue, new EFClient { ClientId = clientId });
+        }
+
+        public async Task IncrementPersistentMeta(string metaKey, int incrementAmount, int clientId)
+        {
+            var existingMeta = await GetPersistentMeta(metaKey, new EFClient { ClientId = clientId });
+            
+            if (!long.TryParse(existingMeta?.Value ?? "0", out var existingValue))
+            {
+                existingValue = 0;
+            }
+
+            var newValue = existingValue + incrementAmount;
+            await SetPersistentMeta(metaKey, newValue.ToString(), clientId);
+        }
+
+        public async Task DecrementPersistentMeta(string metaKey, int decrementAmount, int clientId)
+        {
+            await IncrementPersistentMeta(metaKey, -decrementAmount, clientId);
+        }
+
         public async Task AddPersistentMeta(string metaKey, string metaValue)
         {
             await using var ctx = _contextFactory.CreateContext();
@@ -207,42 +231,30 @@ namespace IW4MAdmin.Application.Misc
 
         public async Task<IEnumerable<IClientMeta>> GetRuntimeMeta(ClientPaginationRequest request)
         {
-            var meta = new List<IClientMeta>();
+            var metas = await Task.WhenAll(_metaActions.Where(kvp => kvp.Key != MetaType.Information)
+                .Select(async kvp => await kvp.Value[0](request)));
 
-            foreach (var (type, actions) in _metaActions)
-            {
-                // information is not listed chronologically
-                if (type != MetaType.Information)
-                {
-                    var metaItems = await actions[0](request);
-                    meta.AddRange(metaItems);
-                }
-            }
-
-            return meta.OrderByDescending(_meta => _meta.When)
+            return metas.SelectMany(m => (IEnumerable<IClientMeta>)m)
+                .OrderByDescending(m => m.When)
                 .Take(request.Count)
                 .ToList();
         }
 
         public async Task<IEnumerable<T>> GetRuntimeMeta<T>(ClientPaginationRequest request, MetaType metaType) where T : IClientMeta
         {
-            IEnumerable<T> meta;
             if (metaType == MetaType.Information)
             {
                 var allMeta = new List<T>();
 
-                foreach (var individualMetaRegistration in _metaActions[metaType])
-                {
-                    allMeta.AddRange(await individualMetaRegistration(request));
-                }
-
+                var completedMeta = await Task.WhenAll(_metaActions[metaType].Select(async individualMetaRegistration =>
+                    (IEnumerable<T>)await individualMetaRegistration(request)));
+                
+                allMeta.AddRange(completedMeta.SelectMany(meta => meta));
+                
                 return ProcessInformationMeta(allMeta);
             }
 
-            else
-            {
-                meta = await _metaActions[metaType][0](request) as IEnumerable<T>;
-            }
+            var meta = await _metaActions[metaType][0](request) as IEnumerable<T>;
 
             return meta;
         }

Application/Misc/MetaServiceV2.cs

@@ -0,0 +1,453 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json;
+using System.Threading;
+using System.Threading.Tasks;
+using Data.Abstractions;
+using Data.Models;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using SharedLibraryCore.Dtos;
+using SharedLibraryCore.Interfaces;
+using SharedLibraryCore.QueryHelper;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
+
+namespace IW4MAdmin.Application.Misc;
+
+public class MetaServiceV2 : IMetaServiceV2
+{
+    private readonly IDictionary<MetaType, List<dynamic>> _metaActions;
+    private readonly IDatabaseContextFactory _contextFactory;
+    private readonly ILogger _logger;
+
+    public MetaServiceV2(ILogger<MetaServiceV2> logger, IDatabaseContextFactory contextFactory)
+    {
+        _logger = logger;
+        _metaActions = new Dictionary<MetaType, List<dynamic>>();
+        _contextFactory = contextFactory;
+    }
+
+    public async Task SetPersistentMeta(string metaKey, string metaValue, int clientId,
+        CancellationToken token = default)
+    {
+        if (!ValidArgs(metaKey, clientId))
+        {
+            return;
+        }
+
+        await using var context = _contextFactory.CreateContext();
+
+        var existingMeta = await context.EFMeta
+            .Where(meta => meta.Key == metaKey)
+            .Where(meta => meta.ClientId == clientId)
+            .FirstOrDefaultAsync(token);
+
+        if (existingMeta != null)
+        {
+            _logger.LogDebug("Updating existing meta with key {Key} and id {Id}", existingMeta.Key,
+                existingMeta.MetaId);
+            existingMeta.Value = metaValue;
+            existingMeta.Updated = DateTime.UtcNow;
+        }
+
+        else
+        {
+            _logger.LogDebug("Adding new meta with key {Key}", metaKey);
+            context.EFMeta.Add(new EFMeta
+            {
+                ClientId = clientId,
+                Created = DateTime.UtcNow,
+                Key = metaKey,
+                Value = metaValue,
+            });
+        }
+
+        await context.SaveChangesAsync(token);
+    }
+
+    public async Task SetPersistentMetaValue<T>(string metaKey, T metaValue, int clientId,
+        CancellationToken token = default) where T : class
+    {
+        if (!ValidArgs(metaKey, clientId))
+        {
+            return;
+        }
+
+        string serializedValue;
+
+        try
+        {
+            serializedValue = JsonSerializer.Serialize(metaValue);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Could not serialize meta with key {Key}", metaKey);
+            return;
+        }
+
+        await SetPersistentMeta(metaKey, serializedValue, clientId, token);
+    }
+
+    public async Task SetPersistentMetaForLookupKey(string metaKey, string lookupKey, int lookupId, int clientId,
+        CancellationToken token = default)
+    {
+        if (!ValidArgs(metaKey, clientId))
+        {
+            return;
+        }
+
+        await using var context = _contextFactory.CreateContext();
+
+        var lookupMeta = await context.EFMeta.FirstOrDefaultAsync(meta => meta.Key == lookupKey, token);
+
+        if (lookupMeta is null)
+        {
+            _logger.LogWarning("No lookup meta exists for metaKey {MetaKey} and lookupKey {LookupKey}", metaKey,
+                lookupKey);
+            return;
+        }
+
+        var lookupValues = JsonSerializer.Deserialize<List<LookupValue<string>>>(lookupMeta.Value);
+
+        if (lookupValues is null)
+        {
+            return;
+        }
+
+        var foundLookup = lookupValues.FirstOrDefault(value => value.Id == lookupId);
+
+        if (foundLookup is null)
+        {
+            _logger.LogWarning("No lookup meta found for provided lookup id {MetaKey}, {LookupKey}, {LookupId}",
+                metaKey, lookupKey, lookupId);
+            return;
+        }
+
+        _logger.LogDebug("Setting meta for lookup {MetaKey}, {LookupKey}, {LookupId}",
+            metaKey, lookupKey, lookupId);
+
+        await SetPersistentMeta(metaKey, lookupId.ToString(), clientId, token);
+    }
+
+    public async Task IncrementPersistentMeta(string metaKey, int incrementAmount, int clientId,
+        CancellationToken token = default)
+    {
+        if (!ValidArgs(metaKey, clientId))
+        {
+            return;
+        }
+
+        var existingMeta = await GetPersistentMeta(metaKey, clientId, token);
+
+        if (!long.TryParse(existingMeta?.Value ?? "0", out var existingValue))
+        {
+            existingValue = 0;
+        }
+
+        var newValue = existingValue + incrementAmount;
+        await SetPersistentMeta(metaKey, newValue.ToString(), clientId, token);
+    }
+
+    public async Task DecrementPersistentMeta(string metaKey, int decrementAmount, int clientId,
+        CancellationToken token = default)
+    {
+        await IncrementPersistentMeta(metaKey, -decrementAmount, clientId, token);
+    }
+
+    public async Task<EFMeta> GetPersistentMeta(string metaKey, int clientId, CancellationToken token = default)
+    {
+        if (!ValidArgs(metaKey, clientId))
+        {
+            return null;
+        }
+
+        await using var ctx = _contextFactory.CreateContext(enableTracking: false);
+
+        return await ctx.EFMeta
+            .Where(meta => meta.Key == metaKey)
+            .Where(meta => meta.ClientId == clientId)
+            .Select(meta => new EFMeta
+            {
+                MetaId = meta.MetaId,
+                Key = meta.Key,
+                ClientId = meta.ClientId,
+                Value = meta.Value,
+            })
+            .FirstOrDefaultAsync(token);
+    }
+
+    public async Task<T> GetPersistentMetaValue<T>(string metaKey, int clientId, CancellationToken token = default)
+        where T : class
+    {
+        var meta = await GetPersistentMeta(metaKey, clientId, token);
+
+        if (meta is null)
+        {
+            return default;
+        }
+
+        try
+        {
+            return JsonSerializer.Deserialize<T>(meta.Value);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Could not deserialize meta with key {Key} and value {Value}", metaKey, meta.Value);
+            return default;
+        }
+    }
+
+    public async Task<EFMeta> GetPersistentMetaByLookup(string metaKey, string lookupKey, int clientId,
+        CancellationToken token = default)
+    {
+        await using var context = _contextFactory.CreateContext();
+
+        var metaValue = await GetPersistentMeta(metaKey, clientId, token);
+
+        if (metaValue is null)
+        {
+            _logger.LogDebug("No meta exists for key {Key}, clientId {ClientId}", metaKey, clientId);
+            return default;
+        }
+
+        var lookupMeta = await context.EFMeta.FirstOrDefaultAsync(meta => meta.Key == lookupKey, token);
+
+        if (lookupMeta is null)
+        {
+            _logger.LogWarning("No lookup meta exists for metaKey {MetaKey} and lookupKey {LookupKey}", metaKey,
+                lookupKey);
+            return default;
+        }
+
+        var lookupId = int.Parse(metaValue.Value);
+        var lookupValues = JsonSerializer.Deserialize<List<LookupValue<string>>>(lookupMeta.Value);
+
+        if (lookupValues is null)
+        {
+            return default;
+        }
+
+        var foundLookup = lookupValues.FirstOrDefault(value => value.Id == lookupId);
+
+        if (foundLookup is not null)
+        {
+            return new EFMeta
+            {
+                Created = metaValue.Created,
+                Updated = metaValue.Updated,
+                Extra = metaValue.Extra,
+                MetaId = metaValue.MetaId,
+                Value = foundLookup.Value
+            };
+        }
+
+        _logger.LogWarning("No lookup meta found for provided lookup id {MetaKey}, {LookupKey}, {LookupId}",
+            metaKey, lookupKey, lookupId);
+        return default;
+    }
+
+    public async Task RemovePersistentMeta(string metaKey, int clientId, CancellationToken token = default)
+    {
+        if (!ValidArgs(metaKey, clientId))
+        {
+            return;
+        }
+
+        await using var context = _contextFactory.CreateContext();
+
+        var existingMeta = await context.EFMeta
+            .FirstOrDefaultAsync(meta => meta.Key == metaKey && meta.ClientId == clientId, token);
+
+        if (existingMeta == null)
+        {
+            _logger.LogDebug("No meta with key {Key} found for client id {Id}", metaKey, clientId);
+            return;
+        }
+
+        _logger.LogDebug("Removing meta for key {Key} with id {Id}", metaKey, existingMeta.MetaId);
+        context.EFMeta.Remove(existingMeta);
+        await context.SaveChangesAsync(token);
+    }
+
+    public async Task SetPersistentMeta(string metaKey, string metaValue, CancellationToken token = default)
+    {
+        if (string.IsNullOrWhiteSpace(metaKey))
+        {
+            _logger.LogWarning("Cannot save meta with no key");
+            return;
+        }
+
+        await using var ctx = _contextFactory.CreateContext();
+
+        var existingMeta = await ctx.EFMeta
+            .Where(meta => meta.Key == metaKey)
+            .Where(meta => meta.ClientId == null)
+            .FirstOrDefaultAsync(token);
+
+        if (existingMeta is not null)
+        {
+            _logger.LogDebug("Updating existing meta with key {Key} and id {Id}", existingMeta.Key,
+                existingMeta.MetaId);
+
+            existingMeta.Value = metaValue;
+            existingMeta.Updated = DateTime.UtcNow;
+
+            await ctx.SaveChangesAsync(token);
+        }
+
+        else
+        {
+            _logger.LogDebug("Adding new meta with key {Key}", metaKey);
+
+            ctx.EFMeta.Add(new EFMeta
+            {
+                Created = DateTime.UtcNow,
+                Key = metaKey,
+                Value = metaValue
+            });
+
+            await ctx.SaveChangesAsync(token);
+        }
+    }
+
+    public async Task SetPersistentMetaValue<T>(string metaKey, T metaValue, CancellationToken token = default)
+        where T : class
+    {
+        if (string.IsNullOrWhiteSpace(metaKey))
+        {
+            _logger.LogWarning("Meta key is null, not setting");
+            return;
+        }
+
+        if (metaValue is null)
+        {
+            _logger.LogWarning("Meta value is null, not setting");
+            return;
+        }
+
+        string serializedMeta;
+        try
+        {
+            serializedMeta = JsonSerializer.Serialize(metaValue);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Could not serialize meta with {Key} and value {Value}", metaKey, metaValue);
+            return;
+        }
+
+        await SetPersistentMeta(metaKey, serializedMeta, token);
+    }
+
+    public async Task<EFMeta> GetPersistentMeta(string metaKey, CancellationToken token = default)
+    {
+        if (string.IsNullOrWhiteSpace(metaKey))
+        {
+            return null;
+        }
+
+        await using var context = _contextFactory.CreateContext(false);
+        return await context.EFMeta.FirstOrDefaultAsync(meta => meta.Key == metaKey, token);
+    }
+
+    public async Task<T> GetPersistentMetaValue<T>(string metaKey, CancellationToken token = default) where T : class
+    {
+        if (string.IsNullOrWhiteSpace(metaKey))
+        {
+            return default;
+        }
+
+        var meta = await GetPersistentMeta(metaKey, token);
+
+        if (meta is null)
+        {
+            return default;
+        }
+
+        try
+        {
+            return JsonSerializer.Deserialize<T>(meta.Value);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Could not serialize meta with key {Key} and value {Value}", metaKey, meta.Value);
+            return default;
+        }
+    }
+
+    public async Task RemovePersistentMeta(string metaKey, CancellationToken token = default)
+    {
+        if (string.IsNullOrWhiteSpace(metaKey))
+        {
+            return;
+        }
+
+        await using var context = _contextFactory.CreateContext(enableTracking: false);
+
+        var existingMeta = await context.EFMeta
+            .Where(meta => meta.Key == metaKey)
+            .Where(meta => meta.ClientId == null)
+            .FirstOrDefaultAsync(token);
+
+        if (existingMeta != null)
+        {
+            _logger.LogDebug("Removing meta for key {Key} with id {Id}", metaKey, existingMeta.MetaId);
+            context.Remove(existingMeta);
+            await context.SaveChangesAsync(token);
+        }
+    }
+
+    public void AddRuntimeMeta<T, TReturnType>(MetaType metaKey,
+        Func<T, CancellationToken, Task<IEnumerable<TReturnType>>> metaAction)
+        where T : PaginationRequest where TReturnType : IClientMeta
+    {
+        if (!_metaActions.ContainsKey(metaKey))
+        {
+            _metaActions.Add(metaKey, new List<dynamic> { metaAction });
+        }
+
+        else
+        {
+            _metaActions[metaKey].Add(metaAction);
+        }
+    }
+
+    public async Task<IEnumerable<IClientMeta>> GetRuntimeMeta(ClientPaginationRequest request, CancellationToken token = default)
+    {
+        var metas = await Task.WhenAll(_metaActions.Where(kvp => kvp.Key != MetaType.Information)
+            .Select(async kvp => await kvp.Value[0](request, token)));
+
+        return metas.SelectMany(m => (IEnumerable<IClientMeta>)m)
+            .OrderByDescending(m => m.When)
+            .Take(request.Count)
+            .ToList();
+    }
+
+    public async Task<IEnumerable<T>> GetRuntimeMeta<T>(ClientPaginationRequest request, MetaType metaType,  CancellationToken token = default)
+        where T : IClientMeta
+    {
+        if (metaType == MetaType.Information)
+        {
+            var allMeta = new List<T>();
+
+            var completedMeta = await Task.WhenAll(_metaActions[metaType].Select(async individualMetaRegistration =>
+                (IEnumerable<T>)await individualMetaRegistration(request, token)));
+
+            allMeta.AddRange(completedMeta.SelectMany(meta => meta));
+
+            return ProcessInformationMeta(allMeta);
+        }
+
+        var meta = await _metaActions[metaType][0](request, token) as IEnumerable<T>;
+
+        return meta;
+    }
+
+    private static IEnumerable<T> ProcessInformationMeta<T>(IEnumerable<T> meta) where T : IClientMeta
+    {
+        return meta;
+    }
+
+    private static bool ValidArgs(string key, int clientId) => !string.IsNullOrWhiteSpace(key) && clientId > 0;
+}

Application/Misc/PluginImporter.cs

@@ -6,6 +6,7 @@ using SharedLibraryCore.Interfaces;
 using System.Linq;
 using SharedLibraryCore;
 using IW4MAdmin.Application.API.Master;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using SharedLibraryCore.Configuration;
 using ILogger = Microsoft.Extensions.Logging.ILogger;
@@ -39,24 +40,23 @@ namespace IW4MAdmin.Application.Misc
         /// <returns></returns>
         public IEnumerable<IPlugin> DiscoverScriptPlugins()
         {
-            string pluginDir = $"{Utilities.OperatingDirectory}{PLUGIN_DIR}{Path.DirectorySeparatorChar}";
+            var pluginDir = $"{Utilities.OperatingDirectory}{PLUGIN_DIR}{Path.DirectorySeparatorChar}";
 
-            if (Directory.Exists(pluginDir))
+            if (!Directory.Exists(pluginDir))
             {
-                var scriptPluginFiles = Directory.GetFiles(pluginDir, "*.js").AsEnumerable().Union(GetRemoteScripts());
-
-                _logger.LogDebug("Discovered {count} potential script plugins", scriptPluginFiles.Count());
-
-                if (scriptPluginFiles.Count() > 0)
-                {
-                    foreach (string fileName in scriptPluginFiles)
-                    {
-                        _logger.LogDebug("Discovered script plugin {fileName}", fileName);
-                        var plugin = new ScriptPlugin(_logger, fileName);
-                        yield return plugin;
-                    }
-                }
+                return Enumerable.Empty<IPlugin>();
             }
+
+            var scriptPluginFiles =
+                Directory.GetFiles(pluginDir, "*.js").AsEnumerable().Union(GetRemoteScripts()).ToList();
+
+            _logger.LogDebug("Discovered {count} potential script plugins", scriptPluginFiles.Count);
+
+            return scriptPluginFiles.Select(fileName =>
+            {
+                _logger.LogDebug("Discovered script plugin {fileName}", fileName);
+                return new ScriptPlugin(_logger, fileName);
+            }).ToList();
         }
 
         /// <summary>
@@ -83,19 +83,47 @@ namespace IW4MAdmin.Application.Misc
                         .GroupBy(_assembly => _assembly.FullName).Select(_assembly => _assembly.OrderByDescending(_assembly => _assembly.GetName().Version).First());
 
                     pluginTypes = assemblies
-                        .SelectMany(_asm => _asm.GetTypes())
+                        .SelectMany(_asm =>
+                        {
+                            try
+                            {
+                                return _asm.GetTypes();
+                            }
+                            catch
+                            {
+                                return Enumerable.Empty<Type>();
+                            }
+                        })
                         .Where(_assemblyType => _assemblyType.GetInterface(nameof(IPlugin), false) != null);
 
                     _logger.LogDebug("Discovered {count} plugin implementations", pluginTypes.Count());
 
                     commandTypes = assemblies
-                        .SelectMany(_asm => _asm.GetTypes())
+                        .SelectMany(_asm =>{
+                            try
+                            {
+                                return _asm.GetTypes();
+                            }
+                            catch
+                            {
+                                return Enumerable.Empty<Type>();
+                            }
+                        })
                         .Where(_assemblyType => _assemblyType.IsClass && _assemblyType.BaseType == typeof(Command));
 
                     _logger.LogDebug("Discovered {count} plugin commands", commandTypes.Count());
 
                     configurationTypes = assemblies
-                        .SelectMany(asm => asm.GetTypes())
+                        .SelectMany(asm => {
+                            try
+                            {
+                                return asm.GetTypes();
+                            }
+                            catch
+                            {
+                                return Enumerable.Empty<Type>();
+                            }
+                        })
                         .Where(asmType =>
                             asmType.IsClass && asmType.GetInterface(nameof(IBaseConfiguration), false) != null);
 

Application/Misc/ScriptCommand.cs

@@ -6,7 +6,6 @@ using System;
 using System.Threading.Tasks;
 using Data.Models.Client;
 using Microsoft.Extensions.Logging;
-using static SharedLibraryCore.Database.Models.EFClient;
 using ILogger = Microsoft.Extensions.Logging.ILogger;
 
 namespace IW4MAdmin.Application.Misc
@@ -16,14 +15,15 @@ namespace IW4MAdmin.Application.Misc
     /// </summary>
     public class ScriptCommand : Command
     {
-        private readonly Action<GameEvent> _executeAction;
+        private readonly Func<GameEvent, Task> _executeAction;
         private readonly ILogger _logger;
 
-        public ScriptCommand(string name, string alias, string description, bool isTargetRequired, EFClient.Permission permission,
-            CommandArgument[] args, Action<GameEvent> executeAction, CommandConfiguration config, ITranslationLookup layout, ILogger<ScriptCommand> logger)
+        public ScriptCommand(string name, string alias, string description, bool isTargetRequired,
+            EFClient.Permission permission,
+            CommandArgument[] args, Func<GameEvent, Task> executeAction, CommandConfiguration config,
+            ITranslationLookup layout, ILogger<ScriptCommand> logger, Server.Game[] supportedGames)
             : base(config, layout)
         {
-
             _executeAction = executeAction;
             _logger = logger;
             Name = name;
@@ -32,6 +32,7 @@ namespace IW4MAdmin.Application.Misc
             RequiresTarget = isTargetRequired;
             Permission = permission;
             Arguments = args;
+            SupportedGames = supportedGames;
         }
 
         public override async Task ExecuteAsync(GameEvent e)
@@ -43,7 +44,7 @@ namespace IW4MAdmin.Application.Misc
 
             try
             {
-                await Task.Run(() => _executeAction(e));
+                await _executeAction(e);
             }
             catch (Exception ex)
             {

Application/Misc/ScriptPlugin.cs

@@ -13,6 +13,7 @@ using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using Jint.Runtime.Interop;
 using Microsoft.Extensions.Logging;
 using Serilog.Context;
 using ILogger = Microsoft.Extensions.Logging.ILogger;
@@ -36,12 +37,12 @@ namespace IW4MAdmin.Application.Misc
         /// </summary>
         public bool IsParser { get; private set; }
 
-        public FileSystemWatcher Watcher { get; private set; }
+        public FileSystemWatcher Watcher { get; }
 
         private Engine _scriptEngine;
         private readonly string _fileName;
-        private readonly SemaphoreSlim _onProcessing;
-        private bool successfullyLoaded;
+        private readonly SemaphoreSlim _onProcessing = new(1, 1);
+        private bool _successfullyLoaded;
         private readonly List<string> _registeredCommandNames;
         private readonly ILogger _logger;
 
@@ -49,15 +50,14 @@ namespace IW4MAdmin.Application.Misc
         {
             _logger = logger;
             _fileName = filename;
-            Watcher = new FileSystemWatcher()
+            Watcher = new FileSystemWatcher
             {
-                Path = workingDirectory == null ? $"{Utilities.OperatingDirectory}Plugins{Path.DirectorySeparatorChar}" : workingDirectory,
+                Path = workingDirectory ?? $"{Utilities.OperatingDirectory}Plugins{Path.DirectorySeparatorChar}",
                 NotifyFilter = NotifyFilters.Size,
                 Filter = _fileName.Split(Path.DirectorySeparatorChar).Last()
             };
 
             Watcher.EnableRaisingEvents = true;
-            _onProcessing = new SemaphoreSlim(1, 1);
             _registeredCommandNames = new List<string>();
         }
 
@@ -67,12 +67,13 @@ namespace IW4MAdmin.Application.Misc
             _onProcessing.Dispose();
         }
 
-        public async Task Initialize(IManager manager, IScriptCommandFactory scriptCommandFactory, IScriptPluginServiceResolver serviceResolver)
+        public async Task Initialize(IManager manager, IScriptCommandFactory scriptCommandFactory,
+            IScriptPluginServiceResolver serviceResolver)
         {
-            await _onProcessing.WaitAsync();
-
             try
             {
+                await _onProcessing.WaitAsync();
+
                 // for some reason we get an event trigger when the file is not finished being modified.
                 // this must have been a change in .NET CORE 3.x
                 // so if the new file is empty we can't process it yet
@@ -81,26 +82,27 @@ namespace IW4MAdmin.Application.Misc
                     return;
                 }
 
-                bool firstRun = _scriptEngine == null;
+                var firstRun = _scriptEngine == null;
 
                 // it's been loaded before so we need to call the unload event
                 if (!firstRun)
                 {
                     await OnUnloadAsync();
 
-                    foreach (string commandName in _registeredCommandNames)
+                    foreach (var commandName in _registeredCommandNames)
                     {
-                        _logger.LogDebug("Removing plugin registered command {command}", commandName);
+                        _logger.LogDebug("Removing plugin registered command {Command}", commandName);
                         manager.RemoveCommandByName(commandName);
                     }
 
                     _registeredCommandNames.Clear();
                 }
 
-                successfullyLoaded = false;
+                _successfullyLoaded = false;
                 string script;
 
-                using (var stream = new FileStream(_fileName, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+                await using (var stream =
+                             new FileStream(_fileName, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
                 {
                     using (var reader = new StreamReader(stream, Encoding.Default))
                     {
@@ -110,45 +112,34 @@ namespace IW4MAdmin.Application.Misc
 
                 _scriptEngine = new Engine(cfg =>
                     cfg.AllowClr(new[]
-                    {
-                    typeof(System.Net.Http.HttpClient).Assembly,
-                    typeof(EFClient).Assembly,
-                    typeof(Utilities).Assembly,
-                    typeof(Encoding).Assembly
-                    })
-                    .CatchClrExceptions());
-
-                try
-                {
-                    _scriptEngine.Execute(script);
-                }
-                catch (JavaScriptException ex)
-                {
-                
-                    _logger.LogError(ex,
-                        "Encountered JavaScript runtime error while executing {methodName} for script plugin {plugin} at {@locationInfo}",
-                        nameof(Initialize), _fileName, ex.Location);
-                    throw new PluginException($"A JavaScript parsing error occured while initializing script plugin");
-                }
-
-                catch (Exception e)
-                {
-
-                        _logger.LogError(e,
-                            "Encountered unexpected error while running {methodName} for script plugin {plugin}",
-                            nameof(Initialize), _fileName);
-                    throw new PluginException($"An unexpected error occured while initialization script plugin");
-                }
+                        {
+                            typeof(System.Net.Http.HttpClient).Assembly,
+                            typeof(EFClient).Assembly,
+                            typeof(Utilities).Assembly,
+                            typeof(Encoding).Assembly
+                        })
+                        .CatchClrExceptions()
+                        .AddObjectConverter(new PermissionLevelToStringConverter()));
 
+                _scriptEngine.Execute(script);
                 _scriptEngine.SetValue("_localization", Utilities.CurrentLocalization);
                 _scriptEngine.SetValue("_serviceResolver", serviceResolver);
-                dynamic pluginObject = _scriptEngine.GetValue("plugin").ToObject();
+                _scriptEngine.SetValue("_lock", _onProcessing);
+                dynamic pluginObject = _scriptEngine.Evaluate("plugin").ToObject();
 
                 Author = pluginObject.author;
                 Name = pluginObject.name;
                 Version = (float)pluginObject.version;
 
-                var commands = _scriptEngine.GetValue("commands");
+                var commands = JsValue.Undefined;
+                try
+                {
+                    commands = _scriptEngine.Evaluate("commands");
+                }
+                catch (JavaScriptException)
+                {
+                    // ignore because commands aren't defined;
+                }
 
                 if (commands != JsValue.Undefined)
                 {
@@ -156,7 +147,7 @@ namespace IW4MAdmin.Application.Misc
                     {
                         foreach (var command in GenerateScriptCommands(commands, scriptCommandFactory))
                         {
-                            _logger.LogDebug("Adding plugin registered command {commandName}", command.Name);
+                            _logger.LogDebug("Adding plugin registered command {CommandName}", command.Name);
                             manager.AddAdditionalCommand(command);
                             _registeredCommandNames.Add(command.Name);
                         }
@@ -164,50 +155,110 @@ namespace IW4MAdmin.Application.Misc
 
                     catch (RuntimeBinderException e)
                     {
-                        throw new PluginException($"Not all required fields were found: {e.Message}") { PluginFile = _fileName };
+                        throw new PluginException($"Not all required fields were found: {e.Message}")
+                            { PluginFile = _fileName };
                     }
                 }
 
-                await OnLoadAsync(manager);
-
                 try
                 {
                     if (pluginObject.isParser)
                     {
+                        await OnLoadAsync(manager);
                         IsParser = true;
-                        IEventParser eventParser = (IEventParser)_scriptEngine.GetValue("eventParser").ToObject();
-                        IRConParser rconParser = (IRConParser)_scriptEngine.GetValue("rconParser").ToObject();
+                        var eventParser = (IEventParser)_scriptEngine.Evaluate("eventParser").ToObject();
+                        var rconParser = (IRConParser)_scriptEngine.Evaluate("rconParser").ToObject();
                         manager.AdditionalEventParsers.Add(eventParser);
                         manager.AdditionalRConParsers.Add(rconParser);
                     }
                 }
 
-                catch (RuntimeBinderException) { }
+                catch (RuntimeBinderException)
+                {
+                    var configWrapper = new ScriptPluginConfigurationWrapper(Name, _scriptEngine);
+                    await configWrapper.InitializeAsync();
+                    _scriptEngine.SetValue("_configHandler", configWrapper);
+                    await OnLoadAsync(manager);
+                }
 
                 if (!firstRun)
                 {
                     await OnLoadAsync(manager);
                 }
 
-                successfullyLoaded = true;
+                _successfullyLoaded = true;
+            }
+            catch (JavaScriptException ex)
+            {
+                _logger.LogError(ex,
+                    "Encountered JavaScript runtime error while executing {MethodName} for script plugin {Plugin} at {@LocationInfo}",
+                    nameof(Initialize), Path.GetFileName(_fileName), ex.Location);
+
+                throw new PluginException("An error occured while initializing script plugin");
+            }
+            catch (Exception ex) when (ex.InnerException is JavaScriptException jsEx)
+            {
+                _logger.LogError(ex,
+                    "Encountered JavaScript runtime error while executing {MethodName} for script plugin {Plugin} initialization {@LocationInfo}",
+                    nameof(Initialize), _fileName, jsEx.Location);
+
+                throw new PluginException("An error occured while initializing script plugin");
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex,
+                    "Encountered JavaScript runtime error while executing {MethodName} for script plugin {Plugin}",
+                    nameof(OnLoadAsync), Path.GetFileName(_fileName));
+
+                throw new PluginException("An error occured while executing action for script plugin");
+            }
+            finally
+            {
+                if (_onProcessing.CurrentCount == 0)
+                {
+                    _onProcessing.Release(1);
+                }
+            }
+        }
+
+        public async Task OnEventAsync(GameEvent gameEvent, Server server)
+        {
+            if (!_successfullyLoaded)
+            {
+                return;
+            }
+
+            try
+            {
+                await _onProcessing.WaitAsync();
+                _scriptEngine.SetValue("_gameEvent", gameEvent);
+                _scriptEngine.SetValue("_server", server);
+                _scriptEngine.SetValue("_IW4MAdminClient", Utilities.IW4MAdminClient(server));
+                _scriptEngine.Evaluate("plugin.onEventAsync(_gameEvent, _server)");
             }
 
             catch (JavaScriptException ex)
             {
-                _logger.LogError(ex,
-                    "Encountered JavaScript runtime error while executing {methodName} for script plugin {plugin} initialization {@locationInfo}",
-                    nameof(OnLoadAsync), _fileName, ex.Location);
-                
-                throw new PluginException("An error occured while initializing script plugin");
+                using (LogContext.PushProperty("Server", server.ToString()))
+                {
+                    _logger.LogError(ex,
+                        "Encountered JavaScript runtime error while executing {MethodName} for script plugin {Plugin} with event type {EventType} {@LocationInfo}",
+                        nameof(OnEventAsync), Path.GetFileName(_fileName), gameEvent.Type, ex.Location);
+                }
+
+                throw new PluginException("An error occured while executing action for script plugin");
             }
-            
+
             catch (Exception ex)
             {
-                _logger.LogError(ex,
-                    "Encountered unexpected error while running {methodName} for script plugin {plugin}",
-                    nameof(OnLoadAsync), _fileName);
-                
-                throw new PluginException("An unexpected error occured while initializing script plugin");
+                using (LogContext.PushProperty("Server", server.ToString()))
+                {
+                    _logger.LogError(ex,
+                        "Encountered error while running {MethodName} for script plugin {Plugin} with event type {EventType}",
+                        nameof(OnEventAsync), _fileName, gameEvent.Type);
+                }
+
+                throw new PluginException("An error occured while executing action for script plugin");
             }
 
             finally
@@ -219,73 +270,71 @@ namespace IW4MAdmin.Application.Misc
             }
         }
 
-        public async Task OnEventAsync(GameEvent E, Server S)
-        {
-            if (successfullyLoaded)
-            {
-                await _onProcessing.WaitAsync();
-
-                try
-                {
-                    _scriptEngine.SetValue("_gameEvent", E);
-                    _scriptEngine.SetValue("_server", S);
-                    _scriptEngine.SetValue("_IW4MAdminClient", Utilities.IW4MAdminClient(S));
-                    _scriptEngine.Execute("plugin.onEventAsync(_gameEvent, _server)").GetCompletionValue();
-                }
-                
-                catch (JavaScriptException ex)
-                {
-                    using (LogContext.PushProperty("Server", S.ToString()))
-                    {
-                        _logger.LogError(ex,
-                            "Encountered JavaScript runtime error while executing {methodName} for script plugin {plugin} with event type {eventType} {@locationInfo}",
-                            nameof(OnEventAsync), _fileName, E.Type, ex.Location);
-                    }
-
-                    throw new PluginException($"An error occured while executing action for script plugin");
-                }
-
-                catch (Exception e)
-                {
-                    using (LogContext.PushProperty("Server", S.ToString()))
-                    {
-                        _logger.LogError(e,
-                            "Encountered unexpected error while running {methodName} for script plugin {plugin} with event type {eventType}",
-                            nameof(OnEventAsync), _fileName, E.Type);
-                    }
-
-                    throw new PluginException($"An error occured while executing action for script plugin");
-                }
-
-                finally
-                {
-                    if (_onProcessing.CurrentCount == 0)
-                    {
-                        _onProcessing.Release(1);
-                    }
-                }
-            }
-        }
-
         public Task OnLoadAsync(IManager manager)
         {
-            _logger.LogDebug("OnLoad executing for {name}", Name);
-            _scriptEngine.SetValue("_manager", manager);
-            return Task.FromResult(_scriptEngine.Execute("plugin.onLoadAsync(_manager)").GetCompletionValue());
-        }
-
-        public Task OnTickAsync(Server S)
-        {
-            _scriptEngine.SetValue("_server", S);
-            return Task.FromResult(_scriptEngine.Execute("plugin.onTickAsync(_server)").GetCompletionValue());
-        }
-
-        public async Task OnUnloadAsync()
-        {
-            if (successfullyLoaded)
+            try
             {
-                await Task.FromResult(_scriptEngine.Execute("plugin.onUnloadAsync()").GetCompletionValue());
+                _logger.LogDebug("OnLoad executing for {Name}", Name);
+                _scriptEngine.SetValue("_manager", manager);
+                _scriptEngine.SetValue("getDvar", GetDvarAsync);
+                _scriptEngine.SetValue("setDvar", SetDvarAsync);
+                _scriptEngine.Evaluate("plugin.onLoadAsync(_manager)");
+
+                return Task.CompletedTask;
             }
+            catch (JavaScriptException ex)
+            {
+                _logger.LogError(ex,
+                    "Encountered JavaScript runtime error while executing {MethodName} for script plugin {Plugin} at {@LocationInfo}",
+                    nameof(OnLoadAsync), Path.GetFileName(_fileName), ex.Location);
+
+                throw new PluginException("A runtime error occured while executing action for script plugin");
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex,
+                    "Encountered JavaScript runtime error while executing {MethodName} for script plugin {Plugin}",
+                    nameof(OnLoadAsync), Path.GetFileName(_fileName));
+
+                throw new PluginException("An error occured while executing action for script plugin");
+            }
+        }
+
+        public async Task OnTickAsync(Server server)
+        {
+            _scriptEngine.SetValue("_server", server);
+            await Task.FromResult(_scriptEngine.Evaluate("plugin.onTickAsync(_server)"));
+        }
+
+        public Task OnUnloadAsync()
+        {
+            if (!_successfullyLoaded)
+            {
+                return Task.CompletedTask;
+            }
+
+            try
+            {
+                _scriptEngine.Evaluate("plugin.onUnloadAsync()");
+            }
+            catch (JavaScriptException ex)
+            {
+                _logger.LogError(ex,
+                    "Encountered JavaScript runtime error while executing {MethodName} for script plugin {Plugin} at {@LocationInfo}",
+                    nameof(OnUnloadAsync), Path.GetFileName(_fileName), ex.Location);
+
+                throw new PluginException("A runtime error occured while executing action for script plugin");
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex,
+                    "Encountered JavaScript runtime error while executing {MethodName} for script plugin {Plugin}",
+                    nameof(OnUnloadAsync), Path.GetFileName(_fileName));
+
+                throw new PluginException("An error occured while executing action for script plugin");
+            }
+
+            return Task.CompletedTask;
         }
 
         /// <summary>
@@ -294,9 +343,9 @@ namespace IW4MAdmin.Application.Misc
         /// <param name="commands">commands value from jint parser</param>
         /// <param name="scriptCommandFactory">factory to create the command from</param>
         /// <returns></returns>
-        public IEnumerable<IManagerCommand> GenerateScriptCommands(JsValue commands, IScriptCommandFactory scriptCommandFactory)
+        private IEnumerable<IManagerCommand> GenerateScriptCommands(JsValue commands, IScriptCommandFactory scriptCommandFactory)
         {
-            List<IManagerCommand> commandList = new List<IManagerCommand>();
+            var commandList = new List<IManagerCommand>();
 
             // go through each defined command
             foreach (var command in commands.AsArray())
@@ -306,9 +355,10 @@ namespace IW4MAdmin.Application.Misc
                 string alias = dynamicCommand.alias;
                 string description = dynamicCommand.description;
                 string permission = dynamicCommand.permission;
-                bool targetRequired = false;
+                List<Server.Game> supportedGames = null;
+                var targetRequired = false;
 
-                List<(string, bool)> args = new List<(string, bool)>();
+                var args = new List<(string, bool)>();
                 dynamic arguments = null;
 
                 try
@@ -339,26 +389,164 @@ namespace IW4MAdmin.Application.Misc
                     }
                 }
 
-                void execute(GameEvent e)
+                try
                 {
-                    _scriptEngine.SetValue("_event", e);
-                    var jsEventObject = _scriptEngine.GetValue("_event");
+                    foreach (var game in dynamicCommand.supportedGames)
+                    {
+                        supportedGames ??= new List<Server.Game>();
+                        supportedGames.Add(Enum.Parse(typeof(Server.Game), game.ToString()));
+                    }
+                }
+                catch (RuntimeBinderException)
+                {
+                    // supported games is optional
+                }
 
+                async Task Execute(GameEvent gameEvent)
+                {
                     try
                     {
-                        dynamicCommand.execute.Target.Invoke(jsEventObject);
+                        await _onProcessing.WaitAsync();
+
+                        _scriptEngine.SetValue("_event", gameEvent);
+                        var jsEventObject = _scriptEngine.Evaluate("_event");
+                        
+                        dynamicCommand.execute.Target.Invoke(_scriptEngine, jsEventObject);
                     }
 
                     catch (JavaScriptException ex)
                     {
-                        throw new PluginException($"An error occured while executing action for script plugin: {ex.Error} (Line: {ex.Location.Start.Line}, Character: {ex.Location.Start.Column})") { PluginFile = _fileName };
+                        using (LogContext.PushProperty("Server", gameEvent.Owner?.ToString()))
+                        {
+                            _logger.LogError(ex, "Could not execute command action for {Filename} {@Location}",
+                                Path.GetFileName(_fileName), ex.Location);
+                        }
+
+                        throw new PluginException("A runtime error occured while executing action for script plugin");
+                    }
+                    
+                    catch (Exception ex)
+                    {
+                        using (LogContext.PushProperty("Server", gameEvent.Owner?.ToString()))
+                        {
+                            _logger.LogError(ex,
+                                "Could not execute command action for script plugin {FileName}",
+                                Path.GetFileName(_fileName));
+                        }
+
+                        throw new PluginException("An error occured while executing action for script plugin");
+                    }
+
+
+                    finally
+                    {
+                        if (_onProcessing.CurrentCount == 0)
+                        {
+                            _onProcessing.Release(1);
+                        }
                     }
                 }
 
-                commandList.Add(scriptCommandFactory.CreateScriptCommand(name, alias, description, permission, targetRequired, args, execute));
+                commandList.Add(scriptCommandFactory.CreateScriptCommand(name, alias, description, permission,
+                    targetRequired, args, Execute, supportedGames?.ToArray()));
             }
 
             return commandList;
         }
+
+        private void GetDvarAsync(Server server, string dvarName, Delegate onCompleted)
+        {
+            Task.Run(() =>
+            {
+                var tokenSource = new CancellationTokenSource();
+                tokenSource.CancelAfter(TimeSpan.FromSeconds(5));
+                string result = null;
+                var success = true;
+                try
+                {
+                    result = server.GetDvarAsync<string>(dvarName, token: tokenSource.Token).GetAwaiter().GetResult().Value;
+                }
+                catch
+                {
+                    success = false;
+                }
+
+                _onProcessing.Wait();
+                try
+                {
+                    onCompleted.DynamicInvoke(JsValue.Undefined,
+                        new[]
+                        {
+                            JsValue.FromObject(_scriptEngine, server), 
+                            JsValue.FromObject(_scriptEngine, dvarName),
+                            JsValue.FromObject(_scriptEngine, result),
+                            JsValue.FromObject(_scriptEngine, success), 
+                        });
+                }
+
+                finally
+                {
+                    if (_onProcessing.CurrentCount == 0)
+                    {
+                        _onProcessing.Release();
+                    }
+                }
+            });
+        }
+        private void SetDvarAsync(Server server, string dvarName, string dvarValue, Delegate onCompleted)
+        {
+            Task.Run(() =>
+            {
+                var tokenSource = new CancellationTokenSource();
+                tokenSource.CancelAfter(TimeSpan.FromSeconds(5));
+                var success = true;
+
+                try
+                {
+                    server.SetDvarAsync(dvarName, dvarValue, tokenSource.Token).GetAwaiter().GetResult();
+                }
+                catch
+                {
+                    success = false;
+                }
+
+                _onProcessing.Wait();
+                try
+                {
+                    onCompleted.DynamicInvoke(JsValue.Undefined,
+                        new[]
+                        {
+                            JsValue.FromObject(_scriptEngine, server),
+                            JsValue.FromObject(_scriptEngine, dvarName), 
+                            JsValue.FromObject(_scriptEngine, dvarValue),
+                            JsValue.FromObject(_scriptEngine, success)
+                        });
+                }
+
+                finally
+                {
+                    if (_onProcessing.CurrentCount == 0)
+                    {
+                        _onProcessing.Release();
+                    }
+                }
+            });
+        }
+    }
+
+    public class PermissionLevelToStringConverter : IObjectConverter
+    {
+        public bool TryConvert(Engine engine, object value, out JsValue result)
+        {
+            if (value is Data.Models.Client.EFClient.Permission)
+            {
+                result = value.ToString();
+                return true;
+            }
+
+
+            result = JsValue.Null;
+            return false;
+        }
     }
 }

Application/Misc/ScriptPluginConfigurationWrapper.cs

@@ -0,0 +1,96 @@
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text.Json;
+using System.Threading.Tasks;
+using IW4MAdmin.Application.Configuration;
+using Jint;
+using Jint.Native;
+using Newtonsoft.Json.Linq;
+
+namespace IW4MAdmin.Application.Misc
+{
+    public class ScriptPluginConfigurationWrapper
+    {
+        private readonly BaseConfigurationHandler<ScriptPluginConfiguration> _handler;
+        private ScriptPluginConfiguration _config;
+        private readonly string _pluginName;
+        private readonly Engine _scriptEngine;
+
+        public ScriptPluginConfigurationWrapper(string pluginName, Engine scriptEngine)
+        {
+            _handler = new BaseConfigurationHandler<ScriptPluginConfiguration>("ScriptPluginSettings");
+            _pluginName = pluginName;
+            _scriptEngine = scriptEngine;
+        }
+
+        public async Task InitializeAsync()
+        {
+            await _handler.BuildAsync();
+            _config = _handler.Configuration() ??
+                      (ScriptPluginConfiguration) new ScriptPluginConfiguration().Generate();
+        }
+
+        private static int? AsInteger(double d)
+        {
+            return int.TryParse(d.ToString(CultureInfo.InvariantCulture), out var parsed) ? parsed : (int?) null;
+        }
+
+        public async Task SetValue(string key, object value)
+        {
+            var castValue = value;
+
+            if (value is double d)
+            {
+                castValue = AsInteger(d) ?? value;
+            }
+
+            if (value is object[] array && array.All(item => item is double d && AsInteger(d) != null))
+            {
+                castValue = array.Select(item => AsInteger((double)item)).ToArray();
+            }
+
+            if (!_config.ContainsKey(_pluginName))
+            {
+                _config.Add(_pluginName, new Dictionary<string, object>());
+            }
+
+            var plugin = _config[_pluginName];
+
+            if (plugin.ContainsKey(key))
+            {
+                plugin[key] = castValue;
+            }
+
+            else
+            {
+                plugin.Add(key, castValue);
+            }
+
+            _handler.Set(_config);
+            await _handler.Save();
+        }
+
+        public JsValue GetValue(string key)
+        {
+            if (!_config.ContainsKey(_pluginName))
+            {
+                return JsValue.Undefined;
+            }
+
+            if (!_config[_pluginName].ContainsKey(key))
+            {
+                return JsValue.Undefined;
+            }
+
+            var item = _config[_pluginName][key];
+
+            if (item is JsonElement { ValueKind: JsonValueKind.Array } jElem)
+            {
+                item = jElem.Deserialize<List<dynamic>>();
+            }
+
+            return JsValue.FromObject(_scriptEngine, item);
+        }
+    }
+}

Application/Misc/ScriptPluginTimerHelper.cs

@@ -0,0 +1,159 @@
+using System;
+using System.Threading;
+using Jint.Native;
+using Jint.Runtime;
+using Microsoft.Extensions.Logging;
+using SharedLibraryCore.Interfaces;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
+
+namespace IW4MAdmin.Application.Misc;
+
+public class ScriptPluginTimerHelper : IScriptPluginTimerHelper
+{
+    private Timer _timer;
+    private Action _actions;
+    private Delegate _jsAction;
+    private string _actionName;
+    private const int DefaultDelay = 0;
+    private const int DefaultInterval = 1000;
+    private readonly ILogger _logger;
+    private readonly ManualResetEventSlim _onRunningTick = new();
+    private SemaphoreSlim _onDependentAction;
+
+    public ScriptPluginTimerHelper(ILogger<ScriptPluginTimerHelper> logger)
+    {
+        _logger = logger;
+    }
+
+    ~ScriptPluginTimerHelper()
+    {
+        if (_timer != null)
+        {
+            Stop();
+        }
+        _onRunningTick.Dispose();
+    }
+
+    public void Start(int delay, int interval)
+    {
+        if (_actions is null)
+        {
+            throw new InvalidOperationException("Timer action must be defined before starting");
+        }
+
+        if (delay < 0)
+        {
+            throw new ArgumentException("Timer delay must be >= 0");
+        }
+
+        if (interval < 20)
+        {
+            throw new ArgumentException("Timer interval must be at least 20ms");
+        }
+        
+        Stop();
+        
+        _logger.LogDebug("Starting script timer...");
+
+        _onRunningTick.Set();
+        _timer ??= new Timer(callback => _actions(), null, delay, interval);
+        IsRunning = true;
+    }
+
+    public void Start(int interval)
+    {
+        Start(DefaultDelay, interval);
+    }
+
+    public void Start()
+    {
+        Start(DefaultDelay, DefaultInterval);
+    }
+
+    public void Stop()
+    {
+        if (_timer == null)
+        {
+            return;
+        }
+        
+        _logger.LogDebug("Stopping script timer...");
+        _timer.Change(Timeout.Infinite, Timeout.Infinite);
+        _timer.Dispose();
+        _timer = null;
+        IsRunning = false;
+    }
+
+    public void OnTick(Delegate action, string actionName)
+    {
+        if (string.IsNullOrEmpty(actionName))
+        {
+            throw new ArgumentException("actionName must be provided", nameof(actionName));
+        }
+
+        if (action is null)
+        {
+            throw new ArgumentException("action must be provided", nameof(action));
+        }
+
+        _logger.LogDebug("Adding new action with name {ActionName}", actionName);
+
+        _jsAction = action;
+        _actionName = actionName;
+        _actions = OnTick;
+    }
+
+    private void ReleaseThreads()
+    {
+        _onRunningTick.Set();
+
+        if (_onDependentAction?.CurrentCount != 0)
+        {
+            return;
+        }
+
+        _onDependentAction?.Release(1);
+    }
+    private void OnTick()
+    {
+        try
+        {
+            if (!_onRunningTick.IsSet)
+            {
+                _logger.LogDebug("Previous {OnTick} is still running, so we are skipping this one",
+                    nameof(OnTick));
+                return;
+            }
+
+            _onRunningTick.Reset();
+
+            // the js engine is not thread safe so we need to ensure we're not executing OnTick and OnEventAsync simultaneously
+            _onDependentAction?.WaitAsync().Wait();
+            var start = DateTime.Now;
+            _jsAction.DynamicInvoke(JsValue.Undefined, new[] { JsValue.Undefined });
+            _logger.LogDebug("OnTick took {Time}ms", (DateTime.Now - start).TotalMilliseconds);
+            ReleaseThreads();
+        }
+
+        catch (Exception ex) when (ex.InnerException is JavaScriptException jsex)
+        {
+            _logger.LogError(jsex,
+                "Could not execute timer tick for script action {ActionName} [@{LocationInfo}]", _actionName,
+                jsex.Location);
+            ReleaseThreads();
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Could not execute timer tick for script action {ActionName}", _actionName);
+            _onRunningTick.Set();
+            ReleaseThreads();
+        }
+    }
+
+    public void SetDependency(SemaphoreSlim dependentSemaphore)
+    {
+        _onDependentAction = dependentSemaphore;
+    }
+
+    public bool IsRunning { get; private set; }
+}

Application/Misc/ServerDataCollector.cs

@@ -0,0 +1,148 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Data.Abstractions;
+using Data.Models;
+using Data.Models.Client;
+using Data.Models.Client.Stats.Reference;
+using Data.Models.Server;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using SharedLibraryCore;
+using SharedLibraryCore.Configuration;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
+using SharedLibraryCore.Interfaces;
+
+namespace IW4MAdmin.Application.Misc
+{
+    /// <inheritdoc/>
+    public class ServerDataCollector : IServerDataCollector
+    {
+        private readonly ILogger _logger;
+        private readonly IManager _manager;
+        private readonly IDatabaseContextFactory _contextFactory;
+        private readonly ApplicationConfiguration _appConfig;
+        private readonly IEventPublisher _eventPublisher;
+
+        private bool _inProgress;
+        private TimeSpan _period;
+
+        public ServerDataCollector(ILogger<ServerDataCollector> logger, ApplicationConfiguration appConfig,
+            IManager manager, IDatabaseContextFactory contextFactory, IEventPublisher eventPublisher)
+        {
+            _logger = logger;
+            _appConfig = appConfig;
+            _manager = manager;
+            _contextFactory = contextFactory;
+            _eventPublisher = eventPublisher;
+
+            _eventPublisher.OnClientConnect += SaveConnectionInfo;
+            _eventPublisher.OnClientDisconnect += SaveConnectionInfo;
+        }
+
+        ~ServerDataCollector()
+        {
+            _eventPublisher.OnClientConnect -= SaveConnectionInfo;
+            _eventPublisher.OnClientDisconnect -= SaveConnectionInfo;
+        }
+
+        public async Task BeginCollectionAsync(TimeSpan? period = null, CancellationToken cancellationToken = default)
+        {
+            if (_inProgress)
+            {
+                throw new InvalidOperationException($"{nameof(ServerDataCollector)} is already collecting data");
+            }
+
+            _logger.LogDebug("Initializing data collection with {Name}", nameof(ServerDataCollector));
+            _inProgress = true;
+            _period = period ?? (Utilities.IsDevelopment
+                ? TimeSpan.FromMinutes(1)
+                : _appConfig.ServerDataCollectionInterval);
+
+            while (!cancellationToken.IsCancellationRequested)
+            {
+                try
+                {
+                    await Task.Delay(_period, cancellationToken);
+                    _logger.LogDebug("{Name} is collecting server data", nameof(ServerDataCollector));
+
+                    var data = await BuildCollectionData(cancellationToken);
+                    await SaveData(data, cancellationToken);
+                }
+                catch (TaskCanceledException)
+                {
+                    _logger.LogInformation("Shutdown requested for {Name}", nameof(ServerDataCollector));
+                    return;
+                }
+
+                catch (Exception ex)
+                {
+                    _logger.LogError(ex, "Unexpected error encountered collecting server data for {Name}",
+                        nameof(ServerDataCollector));
+                }
+            }
+        }
+
+        private async Task<IEnumerable<EFServerSnapshot>> BuildCollectionData(CancellationToken token)
+        {
+            var data = await Task.WhenAll(_manager.GetServers()
+                .Select(async server => new EFServerSnapshot
+                {
+                    CapturedAt = DateTime.UtcNow,
+                    PeriodBlock = (int) (DateTimeOffset.UtcNow - DateTimeOffset.UnixEpoch).TotalMinutes,
+                    ServerId = await server.GetIdForServer(),
+                    MapId = await GetOrCreateMap(server.CurrentMap.Name, (Reference.Game) server.GameName, token),
+                    ClientCount = server.ClientNum,
+                    ConnectionInterrupted = server.Throttled,
+                }));
+
+            return data;
+        }
+
+        private async Task<int> GetOrCreateMap(string mapName, Reference.Game game, CancellationToken token)
+        {
+            await using var context = _contextFactory.CreateContext();
+            var existingMap =
+                await context.Maps.FirstOrDefaultAsync(map => map.Name == mapName && map.Game == game, token);
+
+            if (existingMap != null)
+            {
+                return existingMap.MapId;
+            }
+
+            var newMap = new EFMap
+            {
+                Name = mapName,
+                Game = game
+            };
+
+            context.Maps.Add(newMap);
+            await context.SaveChangesAsync(token);
+
+            return newMap.MapId;
+        }
+
+        private async Task SaveData(IEnumerable<EFServerSnapshot> snapshots, CancellationToken token)
+        {
+            await using var context = _contextFactory.CreateContext();
+            context.ServerSnapshots.AddRange(snapshots);
+            await context.SaveChangesAsync(token);
+        }
+
+        private void SaveConnectionInfo(object sender, GameEvent gameEvent)
+        {
+            using var context = _contextFactory.CreateContext(enableTracking: false);
+            context.ConnectionHistory.Add(new EFClientConnectionHistory
+            {
+                ClientId = gameEvent.Origin.ClientId,
+                ServerId = gameEvent.Owner.GetIdForServer().Result,
+                ConnectionType = gameEvent.Type == GameEvent.EventType.Connect
+                    ? Reference.ConnectionType.Connect
+                    : Reference.ConnectionType.Disconnect
+            });
+            context.SaveChanges();
+        }
+    }
+}

Application/Misc/ServerDataViewer.cs

@@ -0,0 +1,164 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Data.Abstractions;
+using Data.Models.Client;
+using Data.Models.Server;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using SharedLibraryCore;
+using SharedLibraryCore.Dtos;
+using SharedLibraryCore.Interfaces;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
+
+namespace IW4MAdmin.Application.Misc
+{
+    /// <inheritdoc/>
+    public class ServerDataViewer : IServerDataViewer
+    {
+        private readonly ILogger _logger;
+        private readonly IDataValueCache<EFServerSnapshot, (int?, DateTime?)> _snapshotCache;
+        private readonly IDataValueCache<EFClient, (int, int)> _serverStatsCache;
+        private readonly IDataValueCache<EFServerSnapshot, List<ClientHistoryInfo>> _clientHistoryCache;
+
+        private readonly TimeSpan? _cacheTimeSpan =
+            Utilities.IsDevelopment ? TimeSpan.FromSeconds(30) : (TimeSpan?) TimeSpan.FromMinutes(10);
+
+        public ServerDataViewer(ILogger<ServerDataViewer> logger, IDataValueCache<EFServerSnapshot, (int?, DateTime?)> snapshotCache,
+            IDataValueCache<EFClient, (int, int)> serverStatsCache,
+            IDataValueCache<EFServerSnapshot, List<ClientHistoryInfo>> clientHistoryCache)
+        {
+            _logger = logger;
+            _snapshotCache = snapshotCache;
+            _serverStatsCache = serverStatsCache;
+            _clientHistoryCache = clientHistoryCache;
+        }
+
+        public async Task<(int?, DateTime?)> 
+            MaxConcurrentClientsAsync(long? serverId = null, TimeSpan? overPeriod = null,
+            CancellationToken token = default)
+        {
+            _snapshotCache.SetCacheItem(async (snapshots, cancellationToken) =>
+            {
+                var oldestEntry = overPeriod.HasValue
+                    ? DateTime.UtcNow - overPeriod.Value
+                    : DateTime.UtcNow.AddDays(-1);
+                
+                int? maxClients;
+                DateTime? maxClientsTime;
+
+                if (serverId != null)
+                {
+                    var clients = await snapshots.Where(snapshot => snapshot.ServerId == serverId)
+                        .Where(snapshot => snapshot.CapturedAt >= oldestEntry)
+                        .OrderByDescending(snapshot => snapshot.ClientCount)
+                        .Select(snapshot => new
+                        {
+                            snapshot.ClientCount,
+                            snapshot.CapturedAt
+                        })
+                        .FirstOrDefaultAsync(cancellationToken);
+
+                    maxClients = clients?.ClientCount;
+                    maxClientsTime = clients?.CapturedAt;
+                }
+
+                else
+                {
+                    var clients = await snapshots.Where(snapshot => snapshot.CapturedAt >= oldestEntry)
+                        .GroupBy(snapshot => snapshot.PeriodBlock)
+                        .Select(grp => new
+                        {
+                            ClientCount = grp.Sum(snapshot => (int?) snapshot.ClientCount),
+                            Time = grp.Max(snapshot => (DateTime?) snapshot.CapturedAt)
+                        })
+                        .OrderByDescending(snapshot => snapshot.ClientCount)
+                        .FirstOrDefaultAsync(cancellationToken);
+                    
+                    maxClients = clients?.ClientCount;
+                    maxClientsTime = clients?.Time;
+                }
+
+                _logger.LogDebug("Max concurrent clients since {Start} is {Clients}", oldestEntry, maxClients);
+
+                return (maxClients, maxClientsTime);
+            }, nameof(MaxConcurrentClientsAsync), _cacheTimeSpan, true);
+
+            try
+            {
+                return await _snapshotCache.GetCacheItem(nameof(MaxConcurrentClientsAsync), token);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Could not retrieve data for {Name}", nameof(MaxConcurrentClientsAsync));
+                return (null, null);
+            }
+        }
+
+        public async Task<(int, int)> ClientCountsAsync(TimeSpan? overPeriod = null, CancellationToken token = default)
+        {
+            _serverStatsCache.SetCacheItem(async (set, cancellationToken) =>
+            {
+                var count = await set.CountAsync(cancellationToken);
+                var startOfPeriod =
+                    DateTime.UtcNow.AddHours(-overPeriod?.TotalHours ?? -24);
+                var recentCount = await set.CountAsync(client => client.LastConnection >= startOfPeriod,
+                    cancellationToken);
+
+                return (count, recentCount);
+            }, nameof(_serverStatsCache), _cacheTimeSpan, true);
+
+            try
+            {
+                return await _serverStatsCache.GetCacheItem(nameof(_serverStatsCache), token);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Could not retrieve data for {Name}", nameof(ClientCountsAsync));
+                return (0, 0);
+            }
+        }
+
+        public async Task<IEnumerable<ClientHistoryInfo>> ClientHistoryAsync(TimeSpan? overPeriod = null, CancellationToken token = default)
+        {
+            _clientHistoryCache.SetCacheItem(async (set, cancellationToken) =>
+            {
+                var oldestEntry = overPeriod.HasValue
+                    ? DateTime.UtcNow - overPeriod.Value
+                    : DateTime.UtcNow.AddHours(-12);
+
+                var history = await set.Where(snapshot => snapshot.CapturedAt >= oldestEntry)
+                    .Select(snapshot =>
+                        new
+                        {
+                            snapshot.ServerId,
+                            snapshot.CapturedAt,
+                            snapshot.ClientCount,
+                            snapshot.ConnectionInterrupted,
+                            MapName = snapshot.Map.Name,
+                        })
+                    .OrderBy(snapshot => snapshot.CapturedAt)
+                    .ToListAsync(cancellationToken);
+
+                return history.GroupBy(snapshot => snapshot.ServerId).Select(byServer => new ClientHistoryInfo
+                {
+                    ServerId = byServer.Key,
+                    ClientCounts = byServer.Select(snapshot => new ClientCountSnapshot
+                        { Time = snapshot.CapturedAt, ClientCount = snapshot.ClientCount, ConnectionInterrupted = snapshot.ConnectionInterrupted ?? false, Map = snapshot.MapName}).ToList()
+                }).ToList();
+            }, nameof(_clientHistoryCache), TimeSpan.MaxValue);
+
+            try
+            {
+                return await _clientHistoryCache.GetCacheItem(nameof(_clientHistoryCache), token);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Could not retrieve data for {Name}", nameof(ClientHistoryAsync));
+                return Enumerable.Empty<ClientHistoryInfo>();
+            }
+        }
+    }
+}

Application/Misc/TokenAuthentication.cs

@@ -7,26 +7,26 @@ using System.Text;
 
 namespace IW4MAdmin.Application.Misc
 {
-    class TokenAuthentication : ITokenAuthentication
+    internal class TokenAuthentication : ITokenAuthentication
     {
         private readonly ConcurrentDictionary<long, TokenState> _tokens;
-        private readonly RNGCryptoServiceProvider _random;
-        private readonly static TimeSpan _timeoutPeriod = new TimeSpan(0, 0, 120);
-        private const short TOKEN_LENGTH = 4;
+        private readonly RandomNumberGenerator _random;
+        private static readonly TimeSpan TimeoutPeriod = new TimeSpan(0, 0, 120);
+        private const short TokenLength = 4;
 
         public TokenAuthentication()
         {
             _tokens = new ConcurrentDictionary<long, TokenState>();
-            _random = new RNGCryptoServiceProvider();
+            _random = RandomNumberGenerator.Create();
         }
 
         public bool AuthorizeToken(long networkId, string token)
         {
-            bool authorizeSuccessful = _tokens.ContainsKey(networkId) && _tokens[networkId].Token == token;
+            var authorizeSuccessful = _tokens.ContainsKey(networkId) && _tokens[networkId].Token == token;
 
             if (authorizeSuccessful)
             {
-                _tokens.TryRemove(networkId, out TokenState _);
+                _tokens.TryRemove(networkId, out _);
             }
 
             return authorizeSuccessful;
@@ -34,15 +34,15 @@ namespace IW4MAdmin.Application.Misc
 
         public TokenState GenerateNextToken(long networkId)
         {
-            TokenState state = null;
+            TokenState state;
 
             if (_tokens.ContainsKey(networkId))
             {
                 state = _tokens[networkId];
 
-                if ((DateTime.Now - state.RequestTime) > _timeoutPeriod)
+                if ((DateTime.Now - state.RequestTime) > TimeoutPeriod)
                 {
-                    _tokens.TryRemove(networkId, out TokenState _);
+                    _tokens.TryRemove(networkId, out _);
                 }
 
                 else
@@ -51,11 +51,11 @@ namespace IW4MAdmin.Application.Misc
                 }
             }
 
-            state = new TokenState()
+            state = new TokenState
             {
                 NetworkId = networkId,
                 Token = _generateToken(),
-                TokenDuration = _timeoutPeriod
+                TokenDuration = TimeoutPeriod
             };
 
             _tokens.TryAdd(networkId, state);
@@ -63,31 +63,31 @@ namespace IW4MAdmin.Application.Misc
             // perform some housekeeping so we don't have built up tokens if they're not ever used
             foreach (var (key, value) in _tokens)
             {
-                if ((DateTime.Now - value.RequestTime) > _timeoutPeriod)
+                if ((DateTime.Now - value.RequestTime) > TimeoutPeriod)
                 {
-                    _tokens.TryRemove(key, out TokenState _);
+                    _tokens.TryRemove(key, out _);
                 }
             }
 
             return state;
         }
 
-        public string _generateToken()
+        private string _generateToken()
         {
-            bool validCharacter(char c)
+            bool ValidCharacter(char c)
             {
                 // this ensure that the characters are 0-9, A-Z, a-z
                 return (c > 47 && c < 58) || (c > 64 && c < 91) || (c > 96 && c < 123);
             }
 
-            StringBuilder token = new StringBuilder();
+            var token = new StringBuilder();
 
-            while (token.Length < TOKEN_LENGTH)
+            var charSet = new byte[1];
+            while (token.Length < TokenLength)
             {
-                byte[] charSet = new byte[1];
                 _random.GetBytes(charSet);
 
-                if (validCharacter((char)charSet[0]))
+                if (ValidCharacter((char)charSet[0]))
                 {
                     token.Append((char)charSet[0]);
                 }

Application/RCon/RConConnection.cs

@@ -1,471 +0,0 @@
-using SharedLibraryCore;
-using SharedLibraryCore.Exceptions;
-using SharedLibraryCore.Interfaces;
-using SharedLibraryCore.RCon;
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Net.Sockets;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Logging;
-using Serilog.Context;
-using ILogger = Microsoft.Extensions.Logging.ILogger;
-
-namespace IW4MAdmin.Application.RCon
-{
-    /// <summary>
-    /// implementation of IRConConnection
-    /// </summary>
-    public class RConConnection : IRConConnection
-    {
-        static readonly ConcurrentDictionary<EndPoint, ConnectionState> ActiveQueries = new ConcurrentDictionary<EndPoint, ConnectionState>();
-        public IPEndPoint Endpoint { get; private set; }
-        public string RConPassword { get; private set; }
-
-        private IRConParser parser;
-        private IRConParserConfiguration config;
-        private readonly ILogger _log;
-        private readonly Encoding _gameEncoding;
-
-        public RConConnection(string ipAddress, int port, string password, ILogger<RConConnection> log, Encoding gameEncoding)
-        {
-            Endpoint = new IPEndPoint(IPAddress.Parse(ipAddress), port);
-            _gameEncoding = gameEncoding;
-            RConPassword = password;
-            _log = log;
-        }
-
-        public void SetConfiguration(IRConParser parser)
-        {
-            this.parser = parser;
-            config = parser.Configuration;
-        }
-
-        public async Task<string[]> SendQueryAsync(StaticHelpers.QueryType type, string parameters = "")
-        {
-            if (!ActiveQueries.ContainsKey(this.Endpoint))
-            {
-                ActiveQueries.TryAdd(this.Endpoint, new ConnectionState());
-            }
-
-            var connectionState = ActiveQueries[this.Endpoint];
-
-            _log.LogDebug("Waiting for semaphore to be released [{endpoint}]", Endpoint);
-
-            // enter the semaphore so only one query is sent at a time per server.
-            await connectionState.OnComplete.WaitAsync();
-
-            var timeSinceLastQuery = (DateTime.Now - connectionState.LastQuery).TotalMilliseconds;
-
-            if (timeSinceLastQuery < StaticHelpers.FloodProtectionInterval)
-            {
-                await Task.Delay(StaticHelpers.FloodProtectionInterval - (int)timeSinceLastQuery);
-            }
-
-            connectionState.LastQuery = DateTime.Now;
-
-            _log.LogDebug("Semaphore has been released [{endpoint}]", Endpoint);
-            _log.LogDebug("Query {@queryInfo}", new { endpoint=Endpoint.ToString(), type, parameters });
-
-            byte[] payload = null;
-            bool waitForResponse = config.WaitForResponse;
-
-            string convertEncoding(string text)
-            {
-                byte[] convertedBytes = Utilities.EncodingType.GetBytes(text);
-                return _gameEncoding.GetString(convertedBytes);
-            }
-
-            try
-            {
-                string convertedRConPassword = convertEncoding(RConPassword);
-                string convertedParameters = convertEncoding(parameters);
-
-                switch (type)
-                {
-                    case StaticHelpers.QueryType.GET_DVAR:
-                        waitForResponse |= true;
-                        payload = string.Format(config.CommandPrefixes.RConGetDvar, convertedRConPassword, convertedParameters + '\0').Select(Convert.ToByte).ToArray();
-                        break;
-                    case StaticHelpers.QueryType.SET_DVAR:
-                        payload = string.Format(config.CommandPrefixes.RConSetDvar, convertedRConPassword, convertedParameters + '\0').Select(Convert.ToByte).ToArray();
-                        break;
-                    case StaticHelpers.QueryType.COMMAND:
-                        payload = string.Format(config.CommandPrefixes.RConCommand, convertedRConPassword, convertedParameters + '\0').Select(Convert.ToByte).ToArray();
-                        break;
-                    case StaticHelpers.QueryType.GET_STATUS:
-                        waitForResponse |= true;
-                        payload = (config.CommandPrefixes.RConGetStatus + '\0').Select(Convert.ToByte).ToArray();
-                        break;
-                    case StaticHelpers.QueryType.GET_INFO:
-                        waitForResponse |= true;
-                        payload = (config.CommandPrefixes.RConGetInfo + '\0').Select(Convert.ToByte).ToArray();
-                        break;
-                    case StaticHelpers.QueryType.COMMAND_STATUS:
-                        waitForResponse |= true;
-                        payload = string.Format(config.CommandPrefixes.RConCommand, convertedRConPassword, "status\0").Select(Convert.ToByte).ToArray();
-                        break;
-                }
-            }
-
-            // this happens when someone tries to send something that can't be converted into a 7 bit character set
-            // e.g: emoji -> windows-1252
-            catch (OverflowException ex)
-            {
-                connectionState.OnComplete.Release(1);
-                using (LogContext.PushProperty("Server", Endpoint.ToString()))
-                {
-                    _log.LogError(ex, "Could not convert RCon data payload to desired encoding {encoding} {params}",
-                        _gameEncoding.EncodingName, parameters);
-                }
-
-                throw new RConException($"Invalid character encountered when converting encodings");
-            }
-
-            byte[][] response = null;
-
-            retrySend:
-            if (connectionState.ConnectionAttempts > 1)
-            {
-                using (LogContext.PushProperty("Server", Endpoint.ToString()))
-                {
-                    _log.LogInformation(
-                        "Retrying RCon message ({connectionAttempts}/{allowedConnectionFailures} attempts) with parameters {payload}", 
-                        connectionState.ConnectionAttempts, 
-                        StaticHelpers.AllowedConnectionFails, parameters);
-                }
-            }
-            using (var socket = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp)
-            {
-                DontFragment = false,
-                Ttl = 100,
-                ExclusiveAddressUse = true,
-            })
-            {
-                connectionState.SendEventArgs.UserToken = socket;
-                connectionState.OnSentData.Reset();
-                connectionState.OnReceivedData.Reset();
-                connectionState.ConnectionAttempts++;
-                connectionState.BytesReadPerSegment.Clear();
-                bool exceptionCaught = false;
-
-                _log.LogDebug("Sending {payloadLength} bytes to [{endpoint}] ({connectionAttempts}/{allowedConnectionFailures})",
-                payload.Length, Endpoint, connectionState.ConnectionAttempts, StaticHelpers.AllowedConnectionFails);
-
-                try
-                {
-                    
-                    response = await SendPayloadAsync(payload, waitForResponse, parser.OverrideTimeoutForCommand(parameters));
-
-                    if ((response.Length == 0 || response[0].Length == 0) && waitForResponse)
-                    {
-                        throw new RConException("Expected response but got 0 bytes back");
-                    }
-
-                    connectionState.ConnectionAttempts = 0;
-                }
-
-                catch
-                {
-                    // we want to retry with a delay
-                    if (connectionState.ConnectionAttempts < StaticHelpers.AllowedConnectionFails)
-                    {
-                        exceptionCaught = true;
-                        await Task.Delay(StaticHelpers.SocketTimeout(connectionState.ConnectionAttempts));
-                        goto retrySend;
-                    }
-
-                    using (LogContext.PushProperty("Server", Endpoint.ToString()))
-                    {
-                        _log.LogWarning(
-                            "Made {connectionAttempts} attempts to send RCon data to server, but received no response",
-                            connectionState.ConnectionAttempts);
-                    }
-                    connectionState.ConnectionAttempts = 0;
-                    throw new NetworkException("Reached maximum retry attempts to send RCon data to server");
-                }
-
-                finally
-                {
-                    // we don't want to release if we're going to retry the query
-                    if (connectionState.OnComplete.CurrentCount == 0 && !exceptionCaught)
-                    {
-                        connectionState.OnComplete.Release(1);
-                    }
-                }
-            }
-
-            if (response.Length == 0)
-            {
-                _log.LogDebug("Received empty response for RCon request {@query}", new { endpoint=Endpoint.ToString(), type, parameters });
-                return new string[0];
-            }
-
-            string responseString = type == StaticHelpers.QueryType.COMMAND_STATUS ?
-               ReassembleSegmentedStatus(response) : RecombineMessages(response);
-
-            // note: not all games respond if the pasword is wrong or not set
-            if (responseString.Contains("Invalid password") || responseString.Contains("rconpassword"))
-            {
-                throw new RConException(Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_RCON_INVALID"]);
-            }
-
-            if (responseString.Contains("rcon_password"))
-            {
-                throw new RConException(Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_RCON_NOTSET"]);
-            }
-
-            if (responseString.Contains(config.ServerNotRunningResponse))
-            {
-                throw new ServerException(Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_NOT_RUNNING"].FormatExt(Endpoint.ToString()));
-            }
-
-            string responseHeaderMatch = Regex.Match(responseString, config.CommandPrefixes.RConResponse).Value;
-            string[] headerSplit = responseString.Split(type == StaticHelpers.QueryType.GET_INFO ? config.CommandPrefixes.RconGetInfoResponseHeader : responseHeaderMatch);
-
-            if (headerSplit.Length != 2)
-            {
-                using (LogContext.PushProperty("Server", Endpoint.ToString()))
-                {
-                    _log.LogWarning("Invalid response header from server. Expected {expected}, but got {response}",
-                        config.CommandPrefixes.RConResponse, headerSplit.FirstOrDefault());
-                }
-
-                throw new RConException("Unexpected response header from server");
-            }
-
-            string[] splitResponse = headerSplit.Last().Split(new char[] { '\n' }, StringSplitOptions.RemoveEmptyEntries);
-            return splitResponse;
-        }
-
-        /// <summary>
-        /// reassembles broken status segments into the 'correct' ordering
-        /// <remarks>this is primarily for T7, and is really only reliable for 2 segments</remarks>
-        /// </summary>
-        /// <param name="segments">array of segmented byte arrays</param>
-        /// <returns></returns>
-        public string ReassembleSegmentedStatus(byte[][] segments)
-        {
-            var splitStatusStrings = new List<string>();
-
-            foreach (byte[] segment in segments)
-            {
-                string responseString = _gameEncoding.GetString(segment, 0, segment.Length);
-                var statusHeaderMatch = config.StatusHeader.PatternMatcher.Match(responseString);
-                if (statusHeaderMatch.Success)
-                {
-                    splitStatusStrings.Insert(0, responseString.TrimEnd('\0'));
-                }
-
-                else
-                {
-                    splitStatusStrings.Add(responseString.Replace(config.CommandPrefixes.RConResponse, "").TrimEnd('\0'));
-                }
-            }
-
-            return string.Join("", splitStatusStrings);
-        }
-
-        /// <summary>
-        /// Recombines multiple game messages into one
-        /// </summary>
-        /// <param name="payload"></param>
-        /// <returns></returns>
-        private string RecombineMessages(byte[][] payload)
-        {
-            if (payload.Length == 1)
-            {
-                return _gameEncoding.GetString(payload[0]).TrimEnd('\n') + '\n';
-            }
-
-            else
-            {
-                var builder = new StringBuilder();
-                for (int i = 0; i < payload.Length; i++)
-                {
-                    string message = _gameEncoding.GetString(payload[i]).TrimEnd('\n') + '\n';
-                    if (i > 0)
-                    {
-                        message = message.Replace(config.CommandPrefixes.RConResponse, "");
-                    }
-                    builder.Append(message);
-                }
-                builder.Append('\n');
-                return builder.ToString();
-            }
-        }
-
-        private async Task<byte[][]> SendPayloadAsync(byte[] payload, bool waitForResponse, TimeSpan overrideTimeout)
-        {
-            var connectionState = ActiveQueries[this.Endpoint];
-            var rconSocket = (Socket)connectionState.SendEventArgs.UserToken;
-
-            if (connectionState.ReceiveEventArgs.RemoteEndPoint == null &&
-                connectionState.SendEventArgs.RemoteEndPoint == null)
-            {
-                // setup the event handlers only once because we're reusing the event args
-                connectionState.SendEventArgs.Completed += OnDataSent;
-                connectionState.ReceiveEventArgs.Completed += OnDataReceived;
-                connectionState.SendEventArgs.RemoteEndPoint = this.Endpoint;
-                connectionState.ReceiveEventArgs.RemoteEndPoint = this.Endpoint;
-                connectionState.ReceiveEventArgs.DisconnectReuseSocket = true;
-                connectionState.SendEventArgs.DisconnectReuseSocket = true;
-            }
-
-            connectionState.SendEventArgs.SetBuffer(payload);
-
-            // send the data to the server
-            bool sendDataPending = rconSocket.SendToAsync(connectionState.SendEventArgs);
-
-            if (sendDataPending)
-            {
-                // the send has not been completed asynchronously
-                // this really shouldn't ever happen because it's UDP
-                if (!await Task.Run(() => connectionState.OnSentData.Wait(StaticHelpers.SocketTimeout(1))))
-                {
-                    using(LogContext.PushProperty("Server", Endpoint.ToString()))
-                    {
-                        _log.LogWarning("Socket timed out while sending RCon data on attempt {attempt}",
-                            connectionState.ConnectionAttempts);
-                    }
-                    rconSocket.Close();
-                    throw new NetworkException("Timed out sending RCon data", rconSocket);
-                }
-            }
-
-            if (!waitForResponse)
-            {
-                return new byte[0][];
-            }
-
-            connectionState.ReceiveEventArgs.SetBuffer(connectionState.ReceiveBuffer);
-
-            // get our response back
-            bool receiveDataPending = rconSocket.ReceiveFromAsync(connectionState.ReceiveEventArgs);
-
-            if (receiveDataPending)
-            {
-                _log.LogDebug("Waiting to asynchronously receive data on attempt #{connectionAttempts}", connectionState.ConnectionAttempts);
-                if (!await Task.Run(() => connectionState.OnReceivedData.Wait(
-                    new[]
-                    {
-                        StaticHelpers.SocketTimeout(connectionState.ConnectionAttempts), 
-                        overrideTimeout
-                    }.Max())))
-                {
-                    if (connectionState.ConnectionAttempts > 1) // this reduces some spam for unstable connections
-                    {
-                        using (LogContext.PushProperty("Server", Endpoint.ToString()))
-                        {
-                            _log.LogWarning(
-                                "Socket timed out while waiting for RCon response on attempt {attempt} with timeout delay of {timeout}",
-                                connectionState.ConnectionAttempts,
-                                StaticHelpers.SocketTimeout(connectionState.ConnectionAttempts));
-                        }
-                    }
-
-                    rconSocket.Close();
-                    throw new NetworkException("Timed out receiving RCon response", rconSocket);
-                }
-            }
-
-            rconSocket.Close();
-
-            return GetResponseData(connectionState);
-        }
-
-        private byte[][] GetResponseData(ConnectionState connectionState)
-        {
-            var responseList = new List<byte[]>();
-            int totalBytesRead = 0;
-
-            foreach (int bytesRead in connectionState.BytesReadPerSegment)
-            {
-                responseList.Add(connectionState.ReceiveBuffer
-                    .Skip(totalBytesRead)
-                    .Take(bytesRead)
-                    .ToArray());
-
-                totalBytesRead += bytesRead;
-            }
-
-            return responseList.ToArray();
-        }
-
-        private void OnDataReceived(object sender, SocketAsyncEventArgs e)
-        {
-            _log.LogDebug("Read {bytesTransferred} bytes from {endpoint}", e.BytesTransferred, e.RemoteEndPoint);
-
-            // this occurs when we close the socket
-            if (e.BytesTransferred == 0)
-            {
-                _log.LogDebug("No bytes were transmitted so the connection was probably closed");
-                ActiveQueries[this.Endpoint].OnReceivedData.Set();
-                return;
-            }
-
-            if (!(sender is Socket sock))
-            {
-                return;
-            }
-            
-            var state = ActiveQueries[this.Endpoint];
-            state.BytesReadPerSegment.Add(e.BytesTransferred);
-
-            // I don't even want to know why this works for getting more data from Cod4x
-            // but I'm leaving it in here as long as it doesn't break anything.
-            // it's very stupid...
-            Thread.Sleep(150);
-
-            try
-            {
-                var totalBytesTransferred = e.BytesTransferred;
-                _log.LogDebug("{total} total bytes transferred with {available} bytes remaining", totalBytesTransferred, sock.Available);
-                // we still have available data so the payload was segmented
-                while (sock.Available > 0)
-                {
-                    _log.LogDebug("{available} more bytes to be read", sock.Available);
-
-                    var bufferSpaceAvailable = sock.Available + totalBytesTransferred - state.ReceiveBuffer.Length;
-                    if (bufferSpaceAvailable >= 0 )
-                    {
-                        _log.LogWarning("Not enough buffer space to store incoming data {bytesNeeded} additional bytes required", bufferSpaceAvailable);
-                        continue;
-                    }
-
-                    state.ReceiveEventArgs.SetBuffer(state.ReceiveBuffer, totalBytesTransferred, sock.Available);
-
-                    if (sock.ReceiveAsync(state.ReceiveEventArgs))
-                    {
-                        _log.LogDebug("Remaining bytes are async");
-                        continue;
-                    }
-                        
-                    _log.LogDebug("Read {bytesTransferred} synchronous bytes from {endpoint}", state.ReceiveEventArgs.BytesTransferred, e.RemoteEndPoint);
-                    // we need to increment this here because the callback isn't executed if there's no pending IO
-                    state.BytesReadPerSegment.Add(state.ReceiveEventArgs.BytesTransferred);
-                    totalBytesTransferred += state.ReceiveEventArgs.BytesTransferred;
-                }
-                    
-                ActiveQueries[this.Endpoint].OnReceivedData.Set();
-            }
-
-            catch (ObjectDisposedException)
-            {
-                _log.LogDebug("Socket was disposed while receiving data");
-                ActiveQueries[this.Endpoint].OnReceivedData.Set();
-            }
-        }
-
-        private void OnDataSent(object sender, SocketAsyncEventArgs e)
-        {
-            _log.LogDebug("Sent {byteCount} bytes to {endpoint}", e.Buffer?.Length, e.ConnectSocket?.RemoteEndPoint);
-            ActiveQueries[this.Endpoint].OnSentData.Set();
-        }
-    }
-}

Application/RConParsers/BaseRConParser.cs

@@ -7,13 +7,14 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
+using System.Threading;
 using System.Threading.Tasks;
 using Data.Models;
 using Microsoft.Extensions.Logging;
 using static SharedLibraryCore.Server;
 using ILogger = Microsoft.Extensions.Logging.ILogger;
 
-namespace IW4MAdmin.Application.RconParsers
+namespace IW4MAdmin.Application.RConParsers
 {
     public class BaseRConParser : IRConParser
     {
@@ -56,6 +57,7 @@ namespace IW4MAdmin.Application.RconParsers
             Configuration.Dvar.AddMapping(ParserRegex.GroupType.RConDvarDefaultValue, 3);
             Configuration.Dvar.AddMapping(ParserRegex.GroupType.RConDvarLatchedValue, 4);
             Configuration.Dvar.AddMapping(ParserRegex.GroupType.RConDvarDomain, 5);
+            Configuration.Dvar.AddMapping(ParserRegex.GroupType.AdditionalGroup, int.MaxValue);
 
             Configuration.StatusHeader.Pattern = "num +score +ping +guid +name +lastmsg +address +qport +rate *";
             Configuration.GametypeStatus.Pattern = "";
@@ -73,20 +75,23 @@ namespace IW4MAdmin.Application.RconParsers
         public Game GameName { get; set; } = Game.COD;
         public bool CanGenerateLogPath { get; set; } = true;
         public string Name { get; set; } = "Call of Duty";
+        public string RConEngine { get; set; } = "COD";
+        public bool IsOneLog { get; set; }
 
-        public async Task<string[]> ExecuteCommandAsync(IRConConnection connection, string command)
+        public async Task<string[]> ExecuteCommandAsync(IRConConnection connection, string command, CancellationToken token = default)
         {
-            var response = await connection.SendQueryAsync(StaticHelpers.QueryType.COMMAND, command);
-            return response.Skip(1).ToArray();
+            command = command.FormatMessageForEngine(Configuration?.ColorCodeMapping);
+            var response = await connection.SendQueryAsync(StaticHelpers.QueryType.COMMAND, command, token);
+            return response.Where(item => item != Configuration.CommandPrefixes.RConResponse).ToArray();
         }
 
-        public async Task<Dvar<T>> GetDvarAsync<T>(IRConConnection connection, string dvarName, T fallbackValue = default)
+        public async Task<Dvar<T>> GetDvarAsync<T>(IRConConnection connection, string dvarName, T fallbackValue = default, CancellationToken token = default)
         {
             string[] lineSplit;
 
             try
             {
-                lineSplit = await connection.SendQueryAsync(StaticHelpers.QueryType.GET_DVAR, dvarName);
+                lineSplit = await connection.SendQueryAsync(StaticHelpers.QueryType.GET_DVAR, dvarName, token);
             }
             catch
             {
@@ -95,10 +100,10 @@ namespace IW4MAdmin.Application.RconParsers
                     throw;
                 }
 
-                lineSplit = new string[0];
+                lineSplit = Array.Empty<string>();
             }
 
-            string response = string.Join('\n', lineSplit).TrimEnd('\0');
+            var response = string.Join('\n', lineSplit).TrimEnd('\0');
             var match = Regex.Match(response, Configuration.Dvar.Pattern);
 
             if (response.Contains("Unknown command") ||
@@ -106,7 +111,7 @@ namespace IW4MAdmin.Application.RconParsers
             {
                 if (fallbackValue != null)
                 {
-                    return new Dvar<T>()
+                    return new Dvar<T>
                     {
                         Name = dvarName,
                         Value = fallbackValue
@@ -116,19 +121,19 @@ namespace IW4MAdmin.Application.RconParsers
                 throw new DvarException(Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_DVAR"].FormatExt(dvarName));
             }
 
-            string value = match.Groups[Configuration.Dvar.GroupMapping[ParserRegex.GroupType.RConDvarValue]].Value;
-            string defaultValue = match.Groups[Configuration.Dvar.GroupMapping[ParserRegex.GroupType.RConDvarDefaultValue]].Value;
-            string latchedValue = match.Groups[Configuration.Dvar.GroupMapping[ParserRegex.GroupType.RConDvarLatchedValue]].Value;
+            var value = match.Groups[Configuration.Dvar.GroupMapping[ParserRegex.GroupType.RConDvarValue]].Value;
+            var defaultValue = match.Groups[Configuration.Dvar.GroupMapping[ParserRegex.GroupType.RConDvarDefaultValue]].Value;
+            var latchedValue = match.Groups[Configuration.Dvar.GroupMapping[ParserRegex.GroupType.RConDvarLatchedValue]].Value;
 
-            string removeTrailingColorCode(string input) => Regex.Replace(input, @"\^7$", "");
+            string RemoveTrailingColorCode(string input) => Regex.Replace(input, @"\^7$", "");
 
-            value = removeTrailingColorCode(value);
-            defaultValue = removeTrailingColorCode(defaultValue);
-            latchedValue = removeTrailingColorCode(latchedValue);
+            value = RemoveTrailingColorCode(value);
+            defaultValue = RemoveTrailingColorCode(defaultValue);
+            latchedValue = RemoveTrailingColorCode(latchedValue);
 
-            return new Dvar<T>()
+            return new Dvar<T>
             {
-                Name = match.Groups[Configuration.Dvar.GroupMapping[ParserRegex.GroupType.RConDvarName]].Value,
+                Name = dvarName,
                 Value = string.IsNullOrEmpty(value) ? default : (T)Convert.ChangeType(value, typeof(T)),
                 DefaultValue = string.IsNullOrEmpty(defaultValue) ? default : (T)Convert.ChangeType(defaultValue, typeof(T)),
                 LatchedValue = string.IsNullOrEmpty(latchedValue) ? default : (T)Convert.ChangeType(latchedValue, typeof(T)),
@@ -136,55 +141,59 @@ namespace IW4MAdmin.Application.RconParsers
             };
         }
 
-        public virtual async Task<(List<EFClient>, string, string)> GetStatusAsync(IRConConnection connection)
+        public virtual async Task<IStatusResponse> GetStatusAsync(IRConConnection connection, CancellationToken token = default)
         {
-            string[] response = await connection.SendQueryAsync(StaticHelpers.QueryType.COMMAND_STATUS);
-            _logger.LogDebug("Status Response {response}", string.Join(Environment.NewLine, response));
-            return (ClientsFromStatus(response), MapFromStatus(response), GameTypeFromStatus(response));
+            var response = await connection.SendQueryAsync(StaticHelpers.QueryType.COMMAND_STATUS, "status", token);
+            
+            _logger.LogDebug("Status Response {Response}", string.Join(Environment.NewLine, response));
+            
+            return new StatusResponse
+            {
+                Clients = ClientsFromStatus(response).ToArray(),
+                Map = GetValueFromStatus<string>(response, ParserRegex.GroupType.RConStatusMap, Configuration.MapStatus.Pattern),
+                GameType = GetValueFromStatus<string>(response, ParserRegex.GroupType.RConStatusGametype, Configuration.GametypeStatus.Pattern),
+                Hostname = GetValueFromStatus<string>(response, ParserRegex.GroupType.RConStatusHostname, Configuration.HostnameStatus.Pattern),
+                MaxClients = GetValueFromStatus<int?>(response, ParserRegex.GroupType.RConStatusMaxPlayers, Configuration.MaxPlayersStatus.Pattern)
+            };
         }
 
-        private string MapFromStatus(string[] response)
+        private T GetValueFromStatus<T>(IEnumerable<string> response, ParserRegex.GroupType groupType, string groupPattern)
         {
-            string map = null;
+            if (string.IsNullOrEmpty(groupPattern))
+            {
+                return default;
+            }
+            
+            string value = null;
             foreach (var line in response)
             {
-                var regex = Regex.Match(line, Configuration.MapStatus.Pattern);
+                var regex = Regex.Match(line, groupPattern);
                 if (regex.Success)
                 {
-                    map = regex.Groups[Configuration.MapStatus.GroupMapping[ParserRegex.GroupType.RConStatusMap]].ToString();
+                    value = regex.Groups[Configuration.MapStatus.GroupMapping[groupType]].ToString();
                 }
             }
 
-            return map;
-        }
-
-        private string GameTypeFromStatus(string[] response)
-        {
-            if (string.IsNullOrWhiteSpace(Configuration.GametypeStatus.Pattern))
+            if (value == null)
             {
-                return null;
+                return default;
             }
 
-            string gametype = null;
-            foreach (var line in response)
+            if (typeof(T) == typeof(int?))
             {
-                var regex = Regex.Match(line, Configuration.GametypeStatus.Pattern);
-                if (regex.Success)
-                {
-                    gametype = regex.Groups[Configuration.GametypeStatus.GroupMapping[ParserRegex.GroupType.RConStatusGametype]].ToString();
-                }
+                return (T)Convert.ChangeType(int.Parse(value), Nullable.GetUnderlyingType(typeof(T)));
             }
-
-            return gametype;
+            
+            return (T)Convert.ChangeType(value, typeof(T));
         }
 
-        public async Task<bool> SetDvarAsync(IRConConnection connection, string dvarName, object dvarValue)
+        public async Task<bool> SetDvarAsync(IRConConnection connection, string dvarName, object dvarValue, CancellationToken token = default)
         {
-            string dvarString = (dvarValue is string str)
+            var dvarString = (dvarValue is string str)
                 ? $"{dvarName} \"{str}\""
-                : $"{dvarName} {dvarValue.ToString()}";
+                : $"{dvarName} {dvarValue}";
 
-            return (await connection.SendQueryAsync(StaticHelpers.QueryType.SET_DVAR, dvarString)).Length > 0;
+            return (await connection.SendQueryAsync(StaticHelpers.QueryType.SET_DVAR, dvarString, token)).Length > 0;
         }
 
         private List<EFClient> ClientsFromStatus(string[] Status)
@@ -212,10 +221,15 @@ namespace IW4MAdmin.Application.RconParsers
                         continue;
                     }
                     
-                    int clientNumber = int.Parse(match.Values[Configuration.Status.GroupMapping[ParserRegex.GroupType.RConClientNumber]]);
-                    int score = int.Parse(match.Values[Configuration.Status.GroupMapping[ParserRegex.GroupType.RConScore]]);
+                    var clientNumber = int.Parse(match.Values[Configuration.Status.GroupMapping[ParserRegex.GroupType.RConClientNumber]]);
+                    var score = 0;
+                    
+                    if (Configuration.Status.GroupMapping[ParserRegex.GroupType.RConScore] > 0)
+                    {
+                        score = int.Parse(match.Values[Configuration.Status.GroupMapping[ParserRegex.GroupType.RConScore]]);
+                    }
 
-                    int ping = 999;
+                    var ping = 999;
 
                     // their state can be CNCT, ZMBI etc
                     if (match.Values[Configuration.Status.GroupMapping[ParserRegex.GroupType.RConPing]].Length <= 3)
@@ -224,7 +238,7 @@ namespace IW4MAdmin.Application.RconParsers
                     }
 
                     long networkId;
-                    string name = match.Values[Configuration.Status.GroupMapping[ParserRegex.GroupType.RConName]].TrimNewLine();
+                    var name = match.Values[Configuration.Status.GroupMapping[ParserRegex.GroupType.RConName]].TrimNewLine();
                     string networkIdString;
                     var ip = match.Values[Configuration.Status.GroupMapping[ParserRegex.GroupType.RConIpAddress]].Split(':')[0].ConvertToIP();
 
@@ -258,6 +272,17 @@ namespace IW4MAdmin.Application.RconParsers
 
                     client.SetAdditionalProperty("BotGuid", networkIdString);
 
+                    if (Configuration.Status.GroupMapping.ContainsKey(ParserRegex.GroupType.AdditionalGroup))
+                    {
+                        var additionalGroupIndex =
+                            Configuration.Status.GroupMapping[ParserRegex.GroupType.AdditionalGroup];
+                        
+                        if (match.Values.Length > additionalGroupIndex)
+                        {
+                            client.SetAdditionalProperty("ConnectionClientId", match.Values[additionalGroupIndex]);
+                        }
+                    }
+
                     StatusPlayers.Add(client);
                 }
             }

Application/RConParsers/DynamicRConParser.cs

@@ -1,13 +1,13 @@
 using Microsoft.Extensions.Logging;
 using SharedLibraryCore.Interfaces;
 
-namespace IW4MAdmin.Application.RconParsers
+namespace IW4MAdmin.Application.RConParsers
 {
     /// <summary>
     /// empty implementation of the IW4RConParser
     /// allows script plugins to generate dynamic RCon parsers
     /// </summary>
-    sealed internal class DynamicRConParser : BaseRConParser
+    internal sealed class DynamicRConParser : BaseRConParser
     {
         public DynamicRConParser(ILogger<BaseRConParser> logger, IParserRegexFactory parserRegexFactory) : base(logger, parserRegexFactory)
         {

Application/RConParsers/DynamicRConParserConfiguration.cs

@@ -3,8 +3,9 @@ using SharedLibraryCore.Interfaces;
 using SharedLibraryCore.RCon;
 using System.Collections.Generic;
 using System.Globalization;
+using SharedLibraryCore.Formatting;
 
-namespace IW4MAdmin.Application.RconParsers
+namespace IW4MAdmin.Application.RConParsers
 {
     /// <summary>
     /// generic implementation of the IRConParserConfiguration
@@ -16,6 +17,8 @@ namespace IW4MAdmin.Application.RconParsers
         public ParserRegex Status { get; set; }
         public ParserRegex MapStatus { get; set; }
         public ParserRegex GametypeStatus { get; set; }
+        public ParserRegex HostnameStatus { get; set; }
+        public ParserRegex MaxPlayersStatus { get; set; }
         public ParserRegex Dvar { get; set; }
         public ParserRegex StatusHeader { get; set; }
         public string ServerNotRunningResponse { get; set; }
@@ -26,6 +29,25 @@ namespace IW4MAdmin.Application.RconParsers
         public int NoticeMaximumLines { get; set; } = 8;
         public int NoticeMaxCharactersPerLine { get; set; } = 50;
         public string NoticeLineSeparator { get; set; } = Environment.NewLine;
+        public int? DefaultRConPort { get; set; }
+        public string DefaultInstallationDirectoryHint { get; set; }
+        public short FloodProtectInterval { get; set; } = 750;
+
+        public ColorCodeMapping ColorCodeMapping { get; set; } = new ColorCodeMapping
+        {
+            // this is the default mapping (IW4), but can be overridden as needed in the parsers
+            {ColorCodes.Black.ToString(), "^0"},
+            {ColorCodes.Red.ToString(), "^1"},
+            {ColorCodes.Green.ToString(), "^2"},
+            {ColorCodes.Yellow.ToString(), "^3"},
+            {ColorCodes.Blue.ToString(), "^4"},
+            {ColorCodes.Cyan.ToString(), "^5"},
+            {ColorCodes.Pink.ToString(), "^6"},
+            {ColorCodes.White.ToString(), "^7"},
+            {ColorCodes.Map.ToString(), "^8"},
+            {ColorCodes.Grey.ToString(), "^9"},
+            {ColorCodes.Wildcard.ToString(), ":^"},
+        };
 
         public DynamicRConParserConfiguration(IParserRegexFactory parserRegexFactory)
         {
@@ -34,6 +56,8 @@ namespace IW4MAdmin.Application.RconParsers
             GametypeStatus = parserRegexFactory.CreateParserRegex();
             Dvar = parserRegexFactory.CreateParserRegex();
             StatusHeader = parserRegexFactory.CreateParserRegex();
+            HostnameStatus = parserRegexFactory.CreateParserRegex();
+            MaxPlayersStatus = parserRegexFactory.CreateParserRegex();
         }
     }
 }

Application/RConParsers/StatusResponse.cs

@@ -0,0 +1,15 @@
+using SharedLibraryCore.Database.Models;
+using SharedLibraryCore.Interfaces;
+
+namespace IW4MAdmin.Application.RConParsers
+{
+    /// <inheritdoc cref="IStatusResponse"/>
+    public class StatusResponse : IStatusResponse
+    {
+        public string Map { get; set; }
+        public string GameType { get; set; }
+        public string Hostname { get; set; }
+        public int? MaxClients { get; set; }
+        public EFClient[] Clients { get; set; }
+    }
+}

Data/Abstractions/IAuditFields.cs

@@ -0,0 +1,10 @@
+using System;
+
+namespace Data.Abstractions
+{
+    public class IAuditFields
+    {
+        DateTime CreatedDateTime { get; set; }
+        DateTime? UpdatedDateTime { get; set; } 
+    }
+}

Data/Abstractions/IDataValueCache.cs

@@ -1,12 +1,14 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
 
 namespace Data.Abstractions
 {
-    public interface IDataValueCache<T, V> where T : class
+    public interface IDataValueCache<TEntityType, TReturnType> where TEntityType : class
     {
-        void SetCacheItem(Func<DbSet<T>, Task<V>> itemGetter, string keyName, TimeSpan? expirationTime = null);
-        Task<V> GetCacheItem(string keyName);
+        void SetCacheItem(Func<DbSet<TEntityType>, CancellationToken, Task<TReturnType>> itemGetter, string keyName,
+            TimeSpan? expirationTime = null, bool autoRefresh = false);
+        Task<TReturnType> GetCacheItem(string keyName, CancellationToken token = default);
     }
 }

Data/Context/ContextSeed.cs

@@ -23,7 +23,7 @@ namespace Data.Context
             {
                 var link = new EFAliasLink();
 
-                context.Clients.Add(new EFClient()
+                context.Clients.Add(new EFClient
                 {
                     Active = false,
                     Connections = 0,
@@ -33,7 +33,7 @@ namespace Data.Context
                     Masked = true,
                     NetworkId = 0,
                     AliasLink = link,
-                    CurrentAlias = new EFAlias()
+                    CurrentAlias = new EFAlias
                     {
                         Link = link,
                         Active = true,
@@ -46,4 +46,4 @@ namespace Data.Context
             }
         }
     }
-}
+}

Data/Context/DatabaseContext.cs

@@ -7,6 +7,7 @@ using Data.Models;
 using Data.Models.Client;
 using Data.Models.Client.Stats;
 using Data.Models.Client.Stats.Reference;
+using Data.Models.Misc;
 using Data.Models.Server;
 
 namespace Data.Context
@@ -17,6 +18,7 @@ namespace Data.Context
         public DbSet<EFAlias> Aliases { get; set; }
         public DbSet<EFAliasLink> AliasLinks { get; set; }
         public DbSet<EFPenalty> Penalties { get; set; }
+        public DbSet<EFPenaltyIdentifier> PenaltyIdentifiers { get; set; }
         public DbSet<EFMeta> EFMeta { get; set; }
         public DbSet<EFChangeHistory> EFChangeHistory { get; set; }
 
@@ -35,6 +37,14 @@ namespace Data.Context
         public DbSet<EFWeapon> Weapons { get; set; }
         public DbSet<EFWeaponAttachment> WeaponAttachments { get; set; }
         public DbSet<EFMap> Maps { get; set; }
+        
+        #endregion
+
+        #region MISC
+
+        public DbSet<EFInboxMessage> InboxMessages { get; set; }
+        public DbSet<EFServerSnapshot> ServerSnapshots { get;set; }
+        public DbSet<EFClientConnectionHistory> ConnectionHistory { get; set; }
 
         #endregion
 
@@ -109,7 +119,10 @@ namespace Data.Context
                 ent.HasIndex(a => a.Name);
                 ent.Property(_alias => _alias.SearchableName).HasMaxLength(24);
                 ent.HasIndex(_alias => _alias.SearchableName);
-                ent.HasIndex(_alias => new {_alias.Name, _alias.IPAddress}).IsUnique();
+                ent.HasIndex(_alias => new {_alias.Name, _alias.IPAddress});
+                ent.Property(alias => alias.SearchableIPAddress)
+                    .HasComputedColumnSql(@"((IPAddress & 255) || '.' || ((IPAddress >> 8) & 255)) || '.' || ((IPAddress >> 16) & 255) || '.' || ((IPAddress >> 24) & 255)", stored: true);
+                ent.HasIndex(alias => alias.SearchableIPAddress);
             });
 
             modelBuilder.Entity<EFMeta>(ent =>
@@ -121,15 +134,26 @@ namespace Data.Context
                     .OnDelete(DeleteBehavior.SetNull);
             });
 
+            modelBuilder.Entity<EFPenaltyIdentifier>(ent =>
+            {
+                ent.HasIndex(identifiers => identifiers.NetworkId);
+                ent.HasIndex(identifiers => identifiers.IPv4Address);
+            });
+
+            modelBuilder.Entity<EFClientConnectionHistory>(ent => ent.HasIndex(history => history.CreatedDateTime));
+
             // force full name for database conversion
             modelBuilder.Entity<EFClient>().ToTable("EFClients");
             modelBuilder.Entity<EFAlias>().ToTable("EFAlias");
             modelBuilder.Entity<EFAliasLink>().ToTable("EFAliasLinks");
             modelBuilder.Entity<EFPenalty>().ToTable("EFPenalties");
+            modelBuilder.Entity<EFPenaltyIdentifier>().ToTable("EFPenaltyIdentifiers");
+            modelBuilder.Entity<EFServerSnapshot>().ToTable(nameof(EFServerSnapshot));
+            modelBuilder.Entity<EFClientConnectionHistory>().ToTable(nameof(EFClientConnectionHistory));
 
             Models.Configuration.StatsModelConfiguration.Configure(modelBuilder);
 
             base.OnModelCreating(modelBuilder);
         }
     }
-}
+}

Data/Data.csproj

@@ -1,82 +1,27 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Configurations>Debug;Release;Prerelease</Configurations>
     <Platforms>AnyCPU</Platforms>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageId>RaidMax.IW4MAdmin.Data</PackageId>
     <Title>RaidMax.IW4MAdmin.Data</Title>
     <Authors />
+    <PackageVersion>1.2.0</PackageVersion>
   </PropertyGroup>
-
+  
   <ItemGroup>
-    <Compile Remove="Migrations\MySql\20210210221342_AddAdditionalClientStats.cs" />
-    <Compile Remove="Migrations\MySql\20210210221342_AddAdditionalClientStats.Designer.cs" />
-    <Compile Remove="Migrations\Postgresql\20210224014503_AddAdditionalClientStats.cs" />
-    <Compile Remove="Migrations\Postgresql\20210224014503_AddAdditionalClientStats.Designer.cs" />
-    <Compile Remove="Migrations\Postgresql\20210224030227_AddAdditionalClientStats.cs" />
-    <Compile Remove="Migrations\Postgresql\20210224030227_AddAdditionalClientStats.Designer.cs" />
-    <Compile Remove="Migrations\Postgresql\20210224031245_AddAdditionalClientStats.cs" />
-    <Compile Remove="Migrations\Postgresql\20210224031245_AddAdditionalClientStats.Designer.cs" />
-    <Compile Remove="Migrations\Postgresql\20210227041237_AddPerformancePercentileToClientStats.cs" />
-    <Compile Remove="Migrations\Postgresql\20210227041237_AddPerformancePercentileToClientStats.Designer.cs" />
-    <Compile Remove="Migrations\Postgresql\20210227161333_AddPerformancePercentileToClientStats.cs" />
-    <Compile Remove="Migrations\Postgresql\20210227161333_AddPerformancePercentileToClientStats.Designer.cs" />
-    <Compile Remove="Migrations\Postgresql\20210307163752_AddRankingHistory.cs" />
-    <Compile Remove="Migrations\Postgresql\20210307163752_AddRankingHistory.Designer.cs" />
-    <Compile Remove="Migrations\Sqlite\20210209205243_AddAdditionaClientStats.cs" />
-    <Compile Remove="Migrations\Sqlite\20210209205243_AddAdditionaClientStats.Designer.cs" />
-    <Compile Remove="Migrations\Sqlite\20210209205948_AddAdditionaClientStats.cs" />
-    <Compile Remove="Migrations\Sqlite\20210209205948_AddAdditionaClientStats.Designer.cs" />
-    <Compile Remove="Migrations\Sqlite\20210209211745_AddAdditionaClientStats.cs" />
-    <Compile Remove="Migrations\Sqlite\20210209211745_AddAdditionaClientStats.Designer.cs" />
-    <Compile Remove="Migrations\Sqlite\20210209212725_AddAdditionaClientStats.cs" />
-    <Compile Remove="Migrations\Sqlite\20210209212725_AddAdditionaClientStats.Designer.cs" />
-    <Compile Remove="Migrations\Sqlite\20210210020314_AddAdditionaClientStats.cs" />
-    <Compile Remove="Migrations\Sqlite\20210210020314_AddAdditionaClientStats.Designer.cs" />
-    <Compile Remove="Migrations\Sqlite\20210210140835_AddAdditionaClientStats.cs" />
-    <Compile Remove="Migrations\Sqlite\20210210140835_AddAdditionaClientStats.Designer.cs" />
-    <Compile Remove="Migrations\Sqlite\20210210154738_AddAdditionaClientStats.cs" />
-    <Compile Remove="Migrations\Sqlite\20210210154738_AddAdditionaClientStats.Designer.cs" />
-    <Compile Remove="Migrations\Sqlite\20210210163803_AddAdditionaClientStats.cs" />
-    <Compile Remove="Migrations\Sqlite\20210210163803_AddAdditionaClientStats.Designer.cs" />
-    <Compile Remove="Migrations\Sqlite\20210210193852_AddAdditionaClientStats.cs" />
-    <Compile Remove="Migrations\Sqlite\20210210193852_AddAdditionaClientStats.Designer.cs" />
-    <Compile Remove="Migrations\Sqlite\20210211033835_AddAdditionalClientStats.cs" />
-    <Compile Remove="Migrations\Sqlite\20210211033835_AddAdditionalClientStats.Designer.cs" />
-    <Compile Remove="Migrations\Sqlite\20210219013429_AddAdditionalClientStats.cs" />
-    <Compile Remove="Migrations\Sqlite\20210219013429_AddAdditionalClientStats.Designer.cs" />
-    <Compile Remove="Migrations\Sqlite\20210220171950_AddAdditionalClientStats.cs" />
-    <Compile Remove="Migrations\Sqlite\20210220171950_AddAdditionalClientStats.Designer.cs" />
-    <Compile Remove="Migrations\Sqlite\20210223163022_AddAdditionalClientStats.cs" />
-    <Compile Remove="Migrations\Sqlite\20210223163022_AddAdditionalClientStats.Designer.cs" />
-    <Compile Remove="Migrations\Sqlite\20210226215929_AddPerformancePercentileToClientStats.cs" />
-    <Compile Remove="Migrations\Sqlite\20210226215929_AddPerformancePercentileToClientStats.Designer.cs" />
-    <Compile Remove="Migrations\Sqlite\20210227160800_AddPerformancePercentileToClientStats.cs" />
-    <Compile Remove="Migrations\Sqlite\20210227160800_AddPerformancePercentileToClientStats.Designer.cs" />
-    <Compile Remove="Migrations\Sqlite\20210305033616_AddRankingHistory.cs" />
-    <Compile Remove="Migrations\Sqlite\20210305033616_AddRankingHistory.Designer.cs" />
-    <Compile Remove="Migrations\Sqlite\20210305033846_AddRankingHistory.cs" />
-    <Compile Remove="Migrations\Sqlite\20210305033846_AddRankingHistory.Designer.cs" />
-    <Compile Remove="Migrations\Sqlite\20210306223712_AddRankingHistory.cs" />
-    <Compile Remove="Migrations\Sqlite\20210306223712_AddRankingHistory.Designer.cs" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.10" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.10">
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Npgsql" Version="4.1.7" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="3.1.4" />
-    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="3.2.4" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.10" />
-  </ItemGroup>
-  
-  <ItemGroup Condition="'$(Configuration)'=='Debug'">
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.10" />
+    <PackageReference Include="Npgsql" Version="6.0.2" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.2" />
+    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="6.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.1" />
   </ItemGroup>
   
 </Project>

Data/Helpers/DataValueCache.cs

@@ -1,54 +1,84 @@
 using System;
-using System.Collections.Generic;
+using System.Collections.Concurrent;
+using System.Threading;
 using System.Threading.Tasks;
 using Data.Abstractions;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
+using Timer = System.Timers.Timer;
 
 namespace Data.Helpers
 {
-    public class DataValueCache<T, V> : IDataValueCache<T, V> where T : class
+    public class DataValueCache<TEntityType, TReturnType> : IDataValueCache<TEntityType, TReturnType>
+        where TEntityType : class
     {
         private readonly ILogger _logger;
         private readonly IDatabaseContextFactory _contextFactory;
-        private readonly Dictionary<string, CacheState> _cacheStates = new Dictionary<string, CacheState>();
-        private const int DefaultExpireMinutes = 15;
 
-        private class CacheState
+        private readonly ConcurrentDictionary<string, CacheState<TReturnType>> _cacheStates =
+            new ConcurrentDictionary<string, CacheState<TReturnType>>();
+
+        private bool _autoRefresh;
+        private const int DefaultExpireMinutes = 15;
+        private Timer _timer;
+
+        private class CacheState<TCacheType>
         {
             public string Key { get; set; }
             public DateTime LastRetrieval { get; set; }
             public TimeSpan ExpirationTime { get; set; }
-            public Func<DbSet<T>, Task<V>> Getter { get; set; }
-            public V Value { get; set; }
-            public bool IsExpired => (DateTime.Now - LastRetrieval.Add(ExpirationTime)).TotalSeconds > 0;
+            public Func<DbSet<TEntityType>, CancellationToken, Task<TCacheType>> Getter { get; set; }
+            public TCacheType Value { get; set; }
+            public bool IsSet { get; set; }
+
+            public bool IsExpired => ExpirationTime != TimeSpan.MaxValue &&
+                                     (DateTime.Now - LastRetrieval.Add(ExpirationTime)).TotalSeconds > 0;
         }
-        
-        public DataValueCache(ILogger<DataValueCache<T, V>> logger, IDatabaseContextFactory contextFactory)
+
+        public DataValueCache(ILogger<DataValueCache<TEntityType, TReturnType>> logger,
+            IDatabaseContextFactory contextFactory)
         {
             _logger = logger;
             _contextFactory = contextFactory;
         }
-        
-        public void SetCacheItem(Func<DbSet<T>, Task<V>> getter, string key, TimeSpan? expirationTime = null)
+
+        ~DataValueCache()
+        {
+            _timer?.Stop();
+            _timer?.Dispose();
+        }
+
+        public void SetCacheItem(Func<DbSet<TEntityType>, CancellationToken, Task<TReturnType>> getter, string key,
+            TimeSpan? expirationTime = null, bool autoRefresh = false)
         {
             if (_cacheStates.ContainsKey(key))
             {
-                _logger.LogDebug("Cache key {key} is already added", key);
+                _logger.LogDebug("Cache key {Key} is already added", key);
                 return;
             }
-                 
-            var state = new CacheState()
+
+            var state = new CacheState<TReturnType>
             {
                 Key = key,
                 Getter = getter,
                 ExpirationTime = expirationTime ?? TimeSpan.FromMinutes(DefaultExpireMinutes)
             };
-  
-            _cacheStates.Add(key, state);
+
+            _autoRefresh = autoRefresh;
+
+            _cacheStates.TryAdd(key, state);
+
+            if (!_autoRefresh || expirationTime == TimeSpan.MaxValue)
+            {
+                return;
+            }
+
+            _timer = new Timer(state.ExpirationTime.TotalMilliseconds);
+            _timer.Elapsed += async (sender, args) => await RunCacheUpdate(state, CancellationToken.None);
+            _timer.Start();
         }
-        
-        public async Task<V> GetCacheItem(string keyName)
+
+        public async Task<TReturnType> GetCacheItem(string keyName, CancellationToken cancellationToken = default)
         {
             if (!_cacheStates.ContainsKey(keyName))
             {
@@ -57,27 +87,31 @@ namespace Data.Helpers
 
             var state = _cacheStates[keyName];
 
-            if (state.IsExpired)
+            // when auto refresh is off we want to check the expiration and value
+            // when auto refresh is on, we want to only check the value, because it'll be refreshed automatically
+            if ((state.IsExpired || !state.IsSet) && !_autoRefresh || _autoRefresh && !state.IsSet)
             {
-                await RunCacheUpdate(state);
+                await RunCacheUpdate(state, cancellationToken);
             }
 
             return state.Value;
         }
 
-        private async Task RunCacheUpdate(CacheState state)
+        private async Task RunCacheUpdate(CacheState<TReturnType> state, CancellationToken token)
         {
             try
             {
+                _logger.LogDebug("Running update for {ClassName} {@State}", GetType().Name, state);
                 await using var context = _contextFactory.CreateContext(false);
-                var set = context.Set<T>();
-                var value = await state.Getter(set);
+                var set = context.Set<TEntityType>();
+                var value = await state.Getter(set, token);
                 state.Value = value;
+                state.IsSet = true;
                 state.LastRetrieval = DateTime.Now;
             }
             catch (Exception ex)
             {
-                _logger.LogError(ex, "Could not get cached value for {key}", state.Key);
+                _logger.LogError(ex, "Could not get cached value for {Key}", state.Key);
             }
         }
     }

Data/Helpers/LookupCache.cs

@@ -102,7 +102,7 @@ namespace Data.Helpers
         {
             try
             {
-                await using var context = _contextFactory.CreateContext();
+                await using var context = _contextFactory.CreateContext(false);
                 _cachedItems = await context.Set<T>().ToDictionaryAsync(item => item.Id);
             }
             catch (Exception ex)
@@ -111,4 +111,4 @@ namespace Data.Helpers
             }
         }
     }
-}
+}

Data/MigrationContext/MySqlDatabaseContext.cs

@@ -24,10 +24,11 @@ namespace Data.MigrationContext
         {
             if (MigrationExtensions.IsMigration)
             {
-                optionsBuilder.UseMySql("Server=127.0.0.1;Database=IW4MAdmin_Migration;Uid=root;Pwd=password;")
-                    .EnableDetailedErrors(true)
-                    .EnableSensitiveDataLogging(true);
+                var connectionString = "Server=127.0.0.1;Database=IW4MAdmin_Migration;Uid=root;Pwd=password;";
+                optionsBuilder.UseMySql(connectionString, ServerVersion.AutoDetect(connectionString))
+                    .EnableDetailedErrors()
+                    .EnableSensitiveDataLogging();
             }
         }
     }
-}
+}

Data/MigrationContext/PostgresqlDatabaseContext.cs

@@ -23,12 +23,13 @@ namespace Data.MigrationContext
         {
             if (MigrationExtensions.IsMigration)
             {
+                AppContext.SetSwitch("Npgsql.EnableLegacyTimestampBehavior", true);
                 optionsBuilder.UseNpgsql(
                         "Host=127.0.0.1;Database=IW4MAdmin_Migration;Username=postgres;Password=password;",
-                        options => options.SetPostgresVersion(new Version("9.4")))
+                        options => options.SetPostgresVersion(new Version("12.9")))
                     .EnableDetailedErrors(true)
                     .EnableSensitiveDataLogging(true);
             }
         }
     }
-}
+}

Data/Migrations/MySql/20210628153649_AddWeaponReferenceToEFClientKill.cs

@@ -0,0 +1,22 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace Data.Migrations.MySql
+{
+    public partial class AddWeaponReferenceToEFClientKill : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "WeaponReference",
+                table: "EFClientKills",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "WeaponReference",
+                table: "EFClientKills");
+        }
+    }
+}

Data/Migrations/MySql/20210628160144_AddWeaponReferenceAndServerIdToEFACSnapshot.cs

@@ -0,0 +1,52 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace Data.Migrations.MySql
+{
+    public partial class AddWeaponReferenceAndServerIdToEFACSnapshot : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<long>(
+                name: "ServerId",
+                table: "EFACSnapshot",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "WeaponReference",
+                table: "EFACSnapshot",
+                nullable: true);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_EFACSnapshot_ServerId",
+                table: "EFACSnapshot",
+                column: "ServerId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_EFACSnapshot_EFServers_ServerId",
+                table: "EFACSnapshot",
+                column: "ServerId",
+                principalTable: "EFServers",
+                principalColumn: "ServerId",
+                onDelete: ReferentialAction.Restrict);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_EFACSnapshot_EFServers_ServerId",
+                table: "EFACSnapshot");
+
+            migrationBuilder.DropIndex(
+                name: "IX_EFACSnapshot_ServerId",
+                table: "EFACSnapshot");
+
+            migrationBuilder.DropColumn(
+                name: "ServerId",
+                table: "EFACSnapshot");
+
+            migrationBuilder.DropColumn(
+                name: "WeaponReference",
+                table: "EFACSnapshot");
+        }
+    }
+}

Data/Migrations/MySql/20210629022028_AddHitLocationReferenceToEFACSnapshot.cs

@@ -0,0 +1,22 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace Data.Migrations.MySql
+{
+    public partial class AddHitLocationReferenceToEFACSnapshot : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "HitLocationReference",
+                table: "EFACSnapshot",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "HitLocationReference",
+                table: "EFACSnapshot");
+        }
+    }
+}

Data/Migrations/MySql/20210709010749_AddEFInboxMessage.cs

@@ -0,0 +1,70 @@
+using System;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace Data.Migrations.MySql
+{
+    public partial class AddEFInboxMessage : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "InboxMessages",
+                columns: table => new
+                {
+                    InboxMessageId = table.Column<int>(nullable: false)
+                        .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
+                    CreatedDateTime = table.Column<DateTime>(nullable: false),
+                    UpdatedDateTime = table.Column<DateTime>(nullable: true),
+                    SourceClientId = table.Column<int>(nullable: false),
+                    DestinationClientId = table.Column<int>(nullable: false),
+                    ServerId = table.Column<long>(nullable: true),
+                    Message = table.Column<string>(nullable: true),
+                    IsDelivered = table.Column<bool>(nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_InboxMessages", x => x.InboxMessageId);
+                    table.ForeignKey(
+                        name: "FK_InboxMessages_EFClients_DestinationClientId",
+                        column: x => x.DestinationClientId,
+                        principalTable: "EFClients",
+                        principalColumn: "ClientId",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_InboxMessages_EFServers_ServerId",
+                        column: x => x.ServerId,
+                        principalTable: "EFServers",
+                        principalColumn: "ServerId",
+                        onDelete: ReferentialAction.Restrict);
+                    table.ForeignKey(
+                        name: "FK_InboxMessages_EFClients_SourceClientId",
+                        column: x => x.SourceClientId,
+                        principalTable: "EFClients",
+                        principalColumn: "ClientId",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_InboxMessages_DestinationClientId",
+                table: "InboxMessages",
+                column: "DestinationClientId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_InboxMessages_ServerId",
+                table: "InboxMessages",
+                column: "ServerId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_InboxMessages_SourceClientId",
+                table: "InboxMessages",
+                column: "SourceClientId");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "InboxMessages");
+        }
+    }
+}

Data/Migrations/MySql/20210826222452_AddEFServerSnapshot.cs

@@ -0,0 +1,58 @@
+using System;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace Data.Migrations.MySql
+{
+    public partial class AddEFServerSnapshot : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "EFServerSnapshot",
+                columns: table => new
+                {
+                    ServerSnapshotId = table.Column<long>(nullable: false)
+                        .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
+                    Active = table.Column<bool>(nullable: false),
+                    CapturedAt = table.Column<DateTime>(nullable: false),
+                    PeriodBlock = table.Column<int>(nullable: false),
+                    ServerId = table.Column<long>(nullable: false),
+                    MapId = table.Column<int>(nullable: false),
+                    ClientCount = table.Column<int>(nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_EFServerSnapshot", x => x.ServerSnapshotId);
+                    table.ForeignKey(
+                        name: "FK_EFServerSnapshot_EFMaps_MapId",
+                        column: x => x.MapId,
+                        principalTable: "EFMaps",
+                        principalColumn: "MapId",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_EFServerSnapshot_EFServers_ServerId",
+                        column: x => x.ServerId,
+                        principalTable: "EFServers",
+                        principalColumn: "ServerId",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_EFServerSnapshot_MapId",
+                table: "EFServerSnapshot",
+                column: "MapId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_EFServerSnapshot_ServerId",
+                table: "EFServerSnapshot",
+                column: "ServerId");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "EFServerSnapshot");
+        }
+    }
+}

Data/Migrations/MySql/20210831231006_AddEFClientConnectionHistory.cs

@@ -0,0 +1,62 @@
+using System;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace Data.Migrations.MySql
+{
+    public partial class AddEFClientConnectionHistory : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "EFClientConnectionHistory",
+                columns: table => new
+                {
+                    ClientConnectionId = table.Column<long>(nullable: false)
+                        .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
+                    CreatedDateTime = table.Column<DateTime>(nullable: false),
+                    UpdatedDateTime = table.Column<DateTime>(nullable: true),
+                    ClientId = table.Column<int>(nullable: false),
+                    ServerId = table.Column<long>(nullable: false),
+                    ConnectionType = table.Column<int>(nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_EFClientConnectionHistory", x => x.ClientConnectionId);
+                    table.ForeignKey(
+                        name: "FK_EFClientConnectionHistory_EFClients_ClientId",
+                        column: x => x.ClientId,
+                        principalTable: "EFClients",
+                        principalColumn: "ClientId",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_EFClientConnectionHistory_EFServers_ServerId",
+                        column: x => x.ServerId,
+                        principalTable: "EFServers",
+                        principalColumn: "ServerId",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_EFClientConnectionHistory_ClientId",
+                table: "EFClientConnectionHistory",
+                column: "ClientId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_EFClientConnectionHistory_CreatedDateTime",
+                table: "EFClientConnectionHistory",
+                column: "CreatedDateTime");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_EFClientConnectionHistory_ServerId",
+                table: "EFClientConnectionHistory",
+                column: "ServerId");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "EFClientConnectionHistory");
+        }
+    }
+}

Data/Migrations/MySql/20220102221729_RemoveUniqueAliasIndexConstraint.cs

@@ -0,0 +1,32 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace Data.Migrations.MySql
+{
+    public partial class RemoveUniqueAliasIndexConstraint : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropIndex(
+                name: "IX_EFAlias_Name_IPAddress",
+                table: "EFAlias");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_EFAlias_Name_IPAddress",
+                table: "EFAlias",
+                columns: new[] { "Name", "IPAddress" });
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropIndex(
+                name: "IX_EFAlias_Name_IPAddress",
+                table: "EFAlias");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_EFAlias_Name_IPAddress",
+                table: "EFAlias",
+                columns: new[] { "Name", "IPAddress" },
+                unique: true);
+        }
+    }
+}

Data/Migrations/MySql/20220222215149_AddEFPenaltyIdentifier.cs

@@ -0,0 +1,250 @@
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Data.Migrations.MySql
+{
+    public partial class AddEFPenaltyIdentifier : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "EFPenaltyIdentifiers",
+                columns: table => new
+                {
+                    PenaltyIdentifierId = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
+                    IPv4Address = table.Column<int>(type: "int", nullable: true),
+                    NetworkId = table.Column<long>(type: "bigint", nullable: false),
+                    PenaltyId = table.Column<int>(type: "int", nullable: false),
+                    Active = table.Column<bool>(type: "tinyint(1)", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_EFPenaltyIdentifiers", x => x.PenaltyIdentifierId);
+                    table.ForeignKey(
+                        name: "FK_EFPenaltyIdentifiers_EFPenalties_PenaltyId",
+                        column: x => x.PenaltyId,
+                        principalTable: "EFPenalties",
+                        principalColumn: "PenaltyId",
+                        onDelete: ReferentialAction.Cascade);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_EFPenaltyIdentifiers_IPv4Address",
+                table: "EFPenaltyIdentifiers",
+                column: "IPv4Address");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_EFPenaltyIdentifiers_NetworkId",
+                table: "EFPenaltyIdentifiers",
+                column: "NetworkId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_EFPenaltyIdentifiers_PenaltyId",
+                table: "EFPenaltyIdentifiers",
+                column: "PenaltyId");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "EFPenaltyIdentifiers");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "Message",
+                table: "InboxMessages",
+                type: "longtext CHARACTER SET utf8mb4",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "longtext",
+                oldNullable: true)
+                .Annotation("MySql:CharSet", "utf8mb4")
+                .OldAnnotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "Name",
+                table: "EFWeaponAttachments",
+                type: "longtext CHARACTER SET utf8mb4",
+                nullable: false,
+                oldClrType: typeof(string),
+                oldType: "longtext")
+                .Annotation("MySql:CharSet", "utf8mb4")
+                .OldAnnotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "HostName",
+                table: "EFServers",
+                type: "longtext CHARACTER SET utf8mb4",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "longtext",
+                oldNullable: true)
+                .Annotation("MySql:CharSet", "utf8mb4")
+                .OldAnnotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "EndPoint",
+                table: "EFServers",
+                type: "longtext CHARACTER SET utf8mb4",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "longtext",
+                oldNullable: true)
+                .Annotation("MySql:CharSet", "utf8mb4")
+                .OldAnnotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "Offense",
+                table: "EFPenalties",
+                type: "longtext CHARACTER SET utf8mb4",
+                nullable: false,
+                oldClrType: typeof(string),
+                oldType: "longtext")
+                .Annotation("MySql:CharSet", "utf8mb4")
+                .OldAnnotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "AutomatedOffense",
+                table: "EFPenalties",
+                type: "longtext CHARACTER SET utf8mb4",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "longtext",
+                oldNullable: true)
+                .Annotation("MySql:CharSet", "utf8mb4")
+                .OldAnnotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "Value",
+                table: "EFMeta",
+                type: "longtext CHARACTER SET utf8mb4",
+                nullable: false,
+                oldClrType: typeof(string),
+                oldType: "longtext")
+                .Annotation("MySql:CharSet", "utf8mb4")
+                .OldAnnotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "Extra",
+                table: "EFMeta",
+                type: "longtext CHARACTER SET utf8mb4",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "longtext",
+                oldNullable: true)
+                .Annotation("MySql:CharSet", "utf8mb4")
+                .OldAnnotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "Name",
+                table: "EFMeansOfDeath",
+                type: "longtext CHARACTER SET utf8mb4",
+                nullable: false,
+                oldClrType: typeof(string),
+                oldType: "longtext")
+                .Annotation("MySql:CharSet", "utf8mb4")
+                .OldAnnotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "Name",
+                table: "EFMaps",
+                type: "longtext CHARACTER SET utf8mb4",
+                nullable: false,
+                oldClrType: typeof(string),
+                oldType: "longtext")
+                .Annotation("MySql:CharSet", "utf8mb4")
+                .OldAnnotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "PasswordSalt",
+                table: "EFClients",
+                type: "longtext CHARACTER SET utf8mb4",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "longtext",
+                oldNullable: true)
+                .Annotation("MySql:CharSet", "utf8mb4")
+                .OldAnnotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "Password",
+                table: "EFClients",
+                type: "longtext CHARACTER SET utf8mb4",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "longtext",
+                oldNullable: true)
+                .Annotation("MySql:CharSet", "utf8mb4")
+                .OldAnnotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "Message",
+                table: "EFClientMessages",
+                type: "longtext CHARACTER SET utf8mb4",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "longtext",
+                oldNullable: true)
+                .Annotation("MySql:CharSet", "utf8mb4")
+                .OldAnnotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "WeaponReference",
+                table: "EFClientKills",
+                type: "longtext CHARACTER SET utf8mb4",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "longtext",
+                oldNullable: true)
+                .Annotation("MySql:CharSet", "utf8mb4")
+                .OldAnnotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "PreviousValue",
+                table: "EFChangeHistory",
+                type: "longtext CHARACTER SET utf8mb4",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "longtext",
+                oldNullable: true)
+                .Annotation("MySql:CharSet", "utf8mb4")
+                .OldAnnotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "CurrentValue",
+                table: "EFChangeHistory",
+                type: "longtext CHARACTER SET utf8mb4",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "longtext",
+                oldNullable: true)
+                .Annotation("MySql:CharSet", "utf8mb4")
+                .OldAnnotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "WeaponReference",
+                table: "EFACSnapshot",
+                type: "longtext CHARACTER SET utf8mb4",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "longtext",
+                oldNullable: true)
+                .Annotation("MySql:CharSet", "utf8mb4")
+                .OldAnnotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "HitLocationReference",
+                table: "EFACSnapshot",
+                type: "longtext CHARACTER SET utf8mb4",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "longtext",
+                oldNullable: true)
+                .Annotation("MySql:CharSet", "utf8mb4")
+                .OldAnnotation("MySql:CharSet", "utf8mb4");
+        }
+    }
+}