.github/FUNDING.yml

@@ -1 +0,0 @@
-ko_fi: raidmax

.gitignore

@@ -220,30 +220,7 @@ Thumbs.db
 DEPLOY
 global.min.css
 global.min.js
-bootstrap-custom.min.css
 bootstrap-custom.css
+bootstrap-custom.min.css
 **/Master/static
-**/Master/dev_env
-/WebfrontCore/wwwroot/**/dds
-/WebfrontCore/wwwroot/images/radar/*
-
-/DiscordWebhook/env
-/DiscordWebhook/config.dev.json
-/GameLogServer/env
-launchSettings.json
-/VpnDetectionPrivate.js
-/Plugins/ScriptPlugins/VpnDetectionPrivate.js
-**/Master/env_master
-/GameLogServer/log_env
-**/*.css
-/Master/master/persistence
-/WebfrontCore/wwwroot/fonts
-/WebfrontCore/wwwroot/font
-/Plugins/Tests/TestSourceFiles
-/Tests/ApplicationTests/Files/GameEvents.json
-/Tests/ApplicationTests/Files/replay.json
-/GameLogServer/game_log_server_env
-.idea/*
-*.db
-/Data/IW4MAdmin_Migration.db-shm
-/Data/IW4MAdmin_Migration.db-wal
+**/Master/dev_env

Application/API/EventAPI.cs

@@ -0,0 +1,75 @@
+using System;
+using System.Collections.Generic;
+
+using SharedLibraryCore;
+using SharedLibraryCore.Dtos;
+using SharedLibraryCore.Interfaces;
+using SharedLibraryCore.Objects;
+
+namespace IW4MAdmin.Application.API
+{
+    class EventApi : IEventApi
+    {
+        Queue<EventInfo> Events = new Queue<EventInfo>();
+        DateTime LastFlagEvent;
+        static string[] FlaggedMessageContains =
+        {
+            " wh ",
+            "hax",
+            "cheat",
+            " hack ",
+            "aim",
+            "wall",
+            "cheto",
+            "hak",
+            "bot"
+        };
+        int FlaggedMessageCount;
+
+        public Queue<EventInfo> GetEvents() => Events;
+
+        public void OnServerEvent(object sender, GameEvent E)
+        {
+            if (E.Type == GameEvent.EventType.Say && E.Origin.Level < Player.Permission.Trusted)
+            {
+                bool flaggedMessage = false;
+                foreach (string msg in FlaggedMessageContains)
+                    flaggedMessage = flaggedMessage ? flaggedMessage : E.Data.ToLower().Contains(msg);
+
+                if (flaggedMessage)
+                    FlaggedMessageCount++;
+
+                if (FlaggedMessageCount > 3)
+                {
+                    if (Events.Count > 20)
+                        Events.Dequeue();
+
+                    FlaggedMessageCount = 0;
+
+                    E.Owner.Broadcast("If you suspect someone of ^5CHEATING ^7use the ^5!report ^7command").Wait();
+                    Events.Enqueue(new EventInfo(
+                        EventInfo.EventType.ALERT,
+                        EventInfo.EventVersion.IW4MAdmin,
+                        "Chat indicates there may be a cheater",
+                        "Alert",
+                        E.Owner.Hostname, ""));
+                }
+
+                if ((DateTime.UtcNow - LastFlagEvent).Minutes >= 3)
+                {
+                    FlaggedMessageCount = 0;
+                    LastFlagEvent = DateTime.Now;
+                }
+            }
+
+            if (E.Type == GameEvent.EventType.Report)
+            {
+                Events.Enqueue(new EventInfo(
+                    EventInfo.EventType.ALERT,
+                    EventInfo.EventVersion.IW4MAdmin,
+                    $"**{E.Origin.Name}** has reported **{E.Target.Name}** for: {E.Data.Trim()}",
+                    E.Target.Name, E.Origin.Name, ""));
+            }
+        }
+    }
+}

Application/API/GameLogServer/IGameLogServer.cs

@@ -1,12 +0,0 @@
-using System.Threading.Tasks;
-using RestEase;
-
-namespace IW4MAdmin.Application.API.GameLogServer
-{
-    [Header("User-Agent", "IW4MAdmin-RestEase")]
-    public interface IGameLogServer
-    {
-        [Get("log/{path}/{key}")]
-        Task<LogInfo> Log([Path] string path, [Path] string key);
-    }
-}

Application/API/GameLogServer/LogInfo.cs

@@ -1,19 +0,0 @@
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace IW4MAdmin.Application.API.GameLogServer
-{
-    public class LogInfo
-    {
-        [JsonProperty("success")]
-        public bool Success { get; set; }
-        [JsonProperty("length")]
-        public int Length { get; set; }
-        [JsonProperty("data")]
-        public string Data { get; set; }
-        [JsonProperty("next_key")]
-        public string NextKey { get; set; }
-    }
-}

Application/API/Master/ApiInstance.cs

@@ -1,43 +1,20 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.Text;
 using Newtonsoft.Json;
-using SharedLibraryCore.Helpers;
+using RestEase;
 
 namespace IW4MAdmin.Application.API.Master
 {
-    /// <summary>
-    /// Defines the structure of the IW4MAdmin instance for the master API
-    /// </summary>
     public class ApiInstance
     {
-        /// <summary>
-        /// Unique ID of the instance
-        /// </summary>
         [JsonProperty("id")]
         public string Id { get; set; }
-
-        /// <summary>
-        /// Indicates how long the instance has been running
-        /// </summary>
         [JsonProperty("uptime")]
         public int Uptime { get; set; }
-
-        /// <summary>
-        /// Specifies the version of the instance
-        /// </summary>
         [JsonProperty("version")]
-        [JsonConverter(typeof(BuildNumberJsonConverter))]
-        public BuildNumber Version { get; set; }
-
-        /// <summary>
-        /// List of servers the instance is monitoring
-        /// </summary>
+        public float Version { get; set; }
         [JsonProperty("servers")]
         public List<ApiServer> Servers { get; set; }
-        
-        /// <summary>
-        /// Url IW4MAdmin is listening on
-        /// </summary>
-        [JsonProperty("webfront_url")]
-        public string WebfrontUrl { get; set; }
     }
 }

Application/API/Master/ApiServer.cs

@@ -8,13 +8,9 @@ namespace IW4MAdmin.Application.API.Master
     public class ApiServer
     {
         [JsonProperty("id")]
-        public long Id { get; set; }
-        [JsonProperty("ip")]
-        public string IPAddress { get; set; }
+        public int Id { get; set; }
         [JsonProperty("port")]
         public short Port { get; set; }
-        [JsonProperty("version")]
-        public string Version { get; set; }
         [JsonProperty("gametype")]
         public string Gametype { get; set; }
         [JsonProperty("map")]

Application/API/Master/Heartbeat.cs

@@ -0,0 +1,58 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using RestEase;
+using SharedLibraryCore;
+
+namespace IW4MAdmin.Application.API.Master
+{
+    public class Heartbeat
+    {
+
+        public static async Task Send(ApplicationManager mgr, bool firstHeartbeat = false)
+        {
+            var api = Endpoint.Get();
+
+            if (firstHeartbeat)
+            {
+                var token = await api.Authenticate(new AuthenticationId()
+                {
+                    Id = mgr.GetApplicationSettings().Configuration().Id
+                });
+
+                api.AuthorizationToken = $"Bearer {token.AccessToken}";
+            }
+
+            var instance = new ApiInstance()
+            {
+                Id = mgr.GetApplicationSettings().Configuration().Id,
+                Uptime = (int)(DateTime.UtcNow - mgr.StartTime).TotalSeconds,
+                Version = (float)Program.Version,
+                Servers = mgr.Servers.Select(s =>
+                            new ApiServer()
+                            {
+                                ClientNum = s.ClientNum,
+                                Game = s.GameName.ToString(),
+                                Gametype = s.Gametype,
+                                Hostname = s.Hostname,
+                                Map = s.CurrentMap.Name,
+                                MaxClientNum = s.MaxClients,
+                                Id = s.GetHashCode(),
+                                Port = (short)s.GetPort()
+                            }).ToList()
+            };
+
+            if (firstHeartbeat)
+            {
+                var message = await api.AddInstance(instance);
+            }
+
+            else
+            {
+                var message = await api.UpdateInstance(instance.Id, instance);
+            }
+        }
+    }
+}

Application/API/Master/IMasterApi.cs

@@ -1,15 +1,14 @@
 using System;
 using System.Collections.Generic;
+using System.Text;
 using System.Threading.Tasks;
-using IW4MAdmin.Application.Plugin;
 using Newtonsoft.Json;
 using RestEase;
-using SharedLibraryCore.Helpers;
 
 namespace IW4MAdmin.Application.API.Master
 {
     public class AuthenticationId
-    {
+    { 
         [JsonProperty("id")]
         public string Id { get; set; }
     }
@@ -23,12 +22,9 @@ namespace IW4MAdmin.Application.API.Master
     public class VersionInfo
     {
         [JsonProperty("current-version-stable")]
-        [JsonConverter(typeof(BuildNumberJsonConverter))]
-        public BuildNumber CurrentVersionStable { get; set; }
-
+        public float CurrentVersionStable { get; set; }
         [JsonProperty("current-version-prerelease")]
-        [JsonConverter(typeof(BuildNumberJsonConverter))]
-        public BuildNumber CurrentVersionPrerelease { get; set; }
+        public float CurrentVersionPrerelease { get; set; }
     }
 
     public class ResultMessage
@@ -37,16 +33,16 @@ namespace IW4MAdmin.Application.API.Master
         public string Message { get; set; }
     }
 
-    public class PluginSubscriptionContent
+    public class Endpoint
     {
-        public string Content { get; set; }
-        public PluginType Type { get; set; }
+#if !DEBUG
+        private static IMasterApi api = RestClient.For<IMasterApi>("http://api.raidmax.org:5000");
+#else
+        private static IMasterApi api = RestClient.For<IMasterApi>("http://127.0.0.1");
+#endif
+        public static IMasterApi Get() => api;
     }
 
-
-    /// <summary>
-    /// Defines the capabilities of the master API
-    /// </summary>
     [Header("User-Agent", "IW4MAdmin-RestEase")]
     public interface IMasterApi
     {
@@ -57,23 +53,12 @@ namespace IW4MAdmin.Application.API.Master
         Task<TokenId> Authenticate([Body] AuthenticationId Id);
 
         [Post("instance/")]
-        [AllowAnyStatusCode]
-        Task<Response<ResultMessage>> AddInstance([Body] ApiInstance instance);
+        Task<ResultMessage> AddInstance([Body] ApiInstance instance);
 
         [Put("instance/{id}")]
-        [AllowAnyStatusCode]
-        Task<Response<ResultMessage>> UpdateInstance([Path] string id, [Body] ApiInstance instance);
+        Task<ResultMessage> UpdateInstance([Path] string id, [Body] ApiInstance instance);
 
-        [Get("version/{apiVersion}")]
-        Task<VersionInfo> GetVersion([Path] int apiVersion);
-
-        [Get("localization")]
-        Task<List<SharedLibraryCore.Localization.Layout>> GetLocalization();
-
-        [Get("localization/{languageTag}")]
-        Task<SharedLibraryCore.Localization.Layout> GetLocalization([Path("languageTag")] string languageTag);
-
-        [Get("plugin_subscriptions")]
-        Task<IEnumerable<PluginSubscriptionContent>> GetPluginSubscription([Query("instance_id")] Guid instanceId, [Query("subscription_id")] string subscription_id);
+        [Get("version")]
+        Task<VersionInfo> GetVersion();
     }
 }

Application/Alerts/AlertExtensions.cs

@@ -1,55 +0,0 @@
-using System;
-using SharedLibraryCore;
-using SharedLibraryCore.Alerts;
-using SharedLibraryCore.Database.Models;
-
-namespace IW4MAdmin.Application.Alerts;
-
-public static class AlertExtensions
-{
-    public static Alert.AlertState BuildAlert(this EFClient client, Alert.AlertCategory? type = null)
-    {
-        return new Alert.AlertState
-        {
-            RecipientId = client.ClientId,
-            Category = type ?? Alert.AlertCategory.Information
-        };
-    }
-
-    public static Alert.AlertState WithCategory(this Alert.AlertState state, Alert.AlertCategory category)
-    {
-        state.Category = category;
-        return state;
-    }
-
-    public static Alert.AlertState OfType(this Alert.AlertState state, string type)
-    {
-        state.Type = type;
-        return state;
-    }
-
-    public static Alert.AlertState WithMessage(this Alert.AlertState state, string message)
-    {
-        state.Message = message;
-        return state;
-    }
-
-    public static Alert.AlertState ExpiresIn(this Alert.AlertState state, TimeSpan expiration)
-    {
-        state.ExpiresAt = DateTime.Now.Add(expiration);
-        return state;
-    }
-    
-    public static Alert.AlertState FromSource(this Alert.AlertState state, string source)
-    {
-        state.Source = source;
-        return state;
-    }
-
-    public static Alert.AlertState FromClient(this Alert.AlertState state, EFClient client)
-    {
-        state.Source = client.Name.StripColors();
-        state.SourceId = client.ClientId;
-        return state;
-    }
-}

Application/Alerts/AlertManager.cs

@@ -1,172 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using SharedLibraryCore.Alerts;
-using SharedLibraryCore.Configuration;
-using SharedLibraryCore.Database.Models;
-using SharedLibraryCore.Interfaces;
-
-namespace IW4MAdmin.Application.Alerts;
-
-public class AlertManager : IAlertManager
-{
-    private readonly ApplicationConfiguration _appConfig;
-    private readonly ConcurrentDictionary<int, List<Alert.AlertState>> _states = new();
-    private readonly List<Func<Task<IEnumerable<Alert.AlertState>>>> _staticSources = new();
-    private readonly SemaphoreSlim _onModifyingAlerts = new(1, 1);
-
-    public AlertManager(ApplicationConfiguration appConfig)
-    {
-        _appConfig = appConfig;
-        _states.TryAdd(0, new List<Alert.AlertState>());
-    }
-
-    public EventHandler<Alert.AlertState> OnAlertConsumed { get; set; }
-
-    public async Task Initialize()
-    {
-        foreach (var source in _staticSources)
-        {
-            var alerts = await source();
-            foreach (var alert in alerts)
-            {
-                AddAlert(alert);
-            }
-        }
-    }
-
-    public IEnumerable<Alert.AlertState> RetrieveAlerts(EFClient client)
-    {
-        try
-        {
-            _onModifyingAlerts.Wait();
-            var alerts = Enumerable.Empty<Alert.AlertState>();
-            if (client.Level > Data.Models.Client.EFClient.Permission.Trusted)
-            {
-                alerts = alerts.Concat(_states[0].Where(alert =>
-                    alert.MinimumPermission is null || alert.MinimumPermission <= client.Level));
-            }
-
-            if (_states.ContainsKey(client.ClientId))
-            {
-                alerts = alerts.Concat(_states[client.ClientId].AsReadOnly());
-            }
-
-            return alerts.OrderByDescending(alert => alert.OccuredAt).ToList();
-        }
-        finally
-        {
-            if (_onModifyingAlerts.CurrentCount == 0)
-            {
-                _onModifyingAlerts.Release(1);
-            }
-        }
-    }
-
-    public void MarkAlertAsRead(Guid alertId)
-    {
-        try
-        {
-            _onModifyingAlerts.Wait();
-            foreach (var items in _states.Values)
-            {
-                var matchingEvent = items.FirstOrDefault(item => item.AlertId == alertId);
-
-                if (matchingEvent is null)
-                {
-                    continue;
-                }
-
-                items.Remove(matchingEvent);
-                OnAlertConsumed?.Invoke(this, matchingEvent);
-            }
-        }
-        finally
-        {
-            if (_onModifyingAlerts.CurrentCount == 0)
-            {
-                _onModifyingAlerts.Release(1);
-            }
-        }
-    }
-
-    public void MarkAllAlertsAsRead(int recipientId)
-    {
-        try
-        {
-            _onModifyingAlerts.Wait();
-            foreach (var items in _states.Values)
-            {
-                items.RemoveAll(item =>
-                {
-                    if (item.RecipientId != null && item.RecipientId != recipientId)
-                    {
-                        return false;
-                    }
-
-                    OnAlertConsumed?.Invoke(this, item);
-                    return true;
-                });
-            }
-        }
-        finally
-        {
-            if (_onModifyingAlerts.CurrentCount == 0)
-            {
-                _onModifyingAlerts.Release(1);
-            }
-        }
-    }
-
-    public void AddAlert(Alert.AlertState alert)
-    {
-        try
-        {
-            _onModifyingAlerts.Wait();
-            if (alert.RecipientId is null)
-            {
-                _states[0].Add(alert);
-                return;
-            }
-
-            if (!_states.ContainsKey(alert.RecipientId.Value))
-            {
-                _states[alert.RecipientId.Value] = new List<Alert.AlertState>();
-            }
-
-            if (_appConfig.MinimumAlertPermissions.ContainsKey(alert.Type))
-            {
-                alert.MinimumPermission = _appConfig.MinimumAlertPermissions[alert.Type];
-            }
-
-            _states[alert.RecipientId.Value].Add(alert);
-
-            PruneOldAlerts();
-        }
-        finally
-        {
-            if (_onModifyingAlerts.CurrentCount == 0)
-            {
-                _onModifyingAlerts.Release(1);
-            }
-        }
-        
-    }
-
-    public void RegisterStaticAlertSource(Func<Task<IEnumerable<Alert.AlertState>>> alertSource)
-    {
-        _staticSources.Add(alertSource);
-    }
-
-
-    private void PruneOldAlerts()
-    {
-        foreach (var value in _states.Values)
-        {
-            value.RemoveAll(item => item.ExpiresAt < DateTime.UtcNow);
-        }
-    }
-}

Application/Application.csproj

@@ -2,15 +2,15 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
     <MvcRazorExcludeRefAssembliesFromPublish>false</MvcRazorExcludeRefAssembliesFromPublish>
     <PackageId>RaidMax.IW4MAdmin.Application</PackageId>
-    <Version>2020.0.0.0</Version>
+    <Version>2.1.0</Version>
     <Authors>RaidMax</Authors>
     <Company>Forever None</Company>
     <Product>IW4MAdmin</Product>
-    <Description>IW4MAdmin is a complete server administration tool for IW4x and most Call of Duty® dedicated servers</Description>
-    <Copyright>2020</Copyright>
+    <Description>IW4MAdmin is a complete server administration tool for IW4x and most Call of Duty® dedicated server</Description>
+    <Copyright>2018</Copyright>
     <PackageLicenseUrl>https://github.com/RaidMax/IW4M-Admin/blob/master/LICENSE</PackageLicenseUrl>
     <PackageProjectUrl>https://raidmax.org/IW4MAdmin</PackageProjectUrl>
     <RepositoryUrl>https://github.com/RaidMax/IW4M-Admin</RepositoryUrl>
@@ -19,70 +19,57 @@
     <AssemblyName>IW4MAdmin</AssemblyName>
     <Configurations>Debug;Release;Prerelease</Configurations>
     <Win32Resource />
-    <RootNamespace>IW4MAdmin.Application</RootNamespace>
-    <PublishWithAspNetCoreTargetManifest>false</PublishWithAspNetCoreTargetManifest>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Jint" Version="3.0.0-beta-2049" />
-    <PackageReference Include="MaxMind.GeoIP2" Version="5.1.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.8">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
-    <PackageReference Include="RestEase" Version="1.5.7" />
-    <PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
-    <PackageReference Include="System.CommandLine.DragonFruit" Version="0.4.0-alpha.22272.1" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" />
+    <PackageReference Include="RestEase" Version="1.4.5" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.4.0" />
   </ItemGroup>
 
-  <PropertyGroup>
-    <ServerGarbageCollection>true</ServerGarbageCollection>
-    <ConcurrentGarbageCollection>true</ConcurrentGarbageCollection>
-    <TieredCompilation>true</TieredCompilation>
-    <LangVersion>Latest</LangVersion>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Prerelease|AnyCPU'">
-    <ErrorReport>none</ErrorReport>
-    <DebugType>full</DebugType>
-    <DebugSymbols>true</DebugSymbols>
-  </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>
-    <ProjectReference Include="..\WebfrontCore\WebfrontCore.csproj" />
+    <ProjectReference Include="..\WebfrontCore\WebfrontCore.csproj">
+      <Private>true</Private>
+      <CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
+    </ProjectReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="Properties\IW4MAdmin.en-US.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>IW4MAdmin.en-US.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Properties\IW4MAdmin.en-US.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>IW4MAdmin.en-US.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
   </ItemGroup>
 
   <ItemGroup>
     <None Update="DefaultSettings.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Update="Configuration\LoggingConfiguration.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="Resources\GeoLite2-Country.mmdb">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    <None Update="Localization\IW4MAdmin.en-US.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
 
   <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
-    <Exec Command="if $(ConfigurationName) == Debug call $(ProjectDir)BuildScripts\PreBuild.bat $(ProjectDir)..\ $(ProjectDir) $(TargetDir) $(OutDir)" />
+    <Exec Command="call $(ProjectDir)BuildScripts\PreBuild.bat $(SolutionDir) $(ProjectDir) $(TargetDir) $(OutDir)" />
   </Target>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <GetAssemblyIdentity AssemblyFiles="$(TargetPath)">
-      <Output TaskParameter="Assemblies" ItemName="CurrentAssembly" />
-    </GetAssemblyIdentity>
-    <Exec Command="if $(ConfigurationName) == Debug call $(ProjectDir)BuildScripts\PostBuild.bat $(ProjectDir)..\ $(ProjectDir) $(TargetDir) $(OutDir) %25(CurrentAssembly.Version)" />
+    <Exec Command="call $(ProjectDir)BuildScripts\PostBuild.bat $(SolutionDir) $(ProjectDir) $(TargetDir) $(OutDir)" />
   </Target>
 
   <Target Name="PostPublish" AfterTargets="Publish">
-    <Exec Command="if $(ConfigurationName) == Debug call $(ProjectDir)BuildScripts\PostPublish.bat $(ProjectDir)..\ $(ProjectDir) $(TargetDir) $(ConfigurationName)" />
+    <Exec Command="call $(ProjectDir)BuildScripts\PostPublish.bat $(SolutionDir) $(ProjectDir) $(TargetDir) $(OutDir)" />
   </Target>
+
 </Project>

Application/ApplicationManager.cs

@@ -1,894 +0,0 @@
-using IW4MAdmin.Application.EventParsers;
-using IW4MAdmin.Application.Extensions;
-using IW4MAdmin.Application.Misc;
-using IW4MAdmin.Application.RConParsers;
-using SharedLibraryCore;
-using SharedLibraryCore.Commands;
-using SharedLibraryCore.Configuration;
-using SharedLibraryCore.Configuration.Validation;
-using SharedLibraryCore.Database.Models;
-using SharedLibraryCore.Exceptions;
-using SharedLibraryCore.Helpers;
-using SharedLibraryCore.Interfaces;
-using SharedLibraryCore.Services;
-using System;
-using System.Collections;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Collections.Immutable;
-using System.Globalization;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using Data.Abstractions;
-using Data.Context;
-using Data.Models;
-using IW4MAdmin.Application.Configuration;
-using IW4MAdmin.Application.Migration;
-using IW4MAdmin.Application.Plugin.Script;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Serilog.Context;
-using SharedLibraryCore.Events;
-using SharedLibraryCore.Events.Management;
-using SharedLibraryCore.Events.Server;
-using SharedLibraryCore.Formatting;
-using SharedLibraryCore.Interfaces.Events;
-using static SharedLibraryCore.GameEvent;
-using ILogger = Microsoft.Extensions.Logging.ILogger;
-using ObsoleteLogger = SharedLibraryCore.Interfaces.ILogger;
-
-namespace IW4MAdmin.Application
-{
-    public class ApplicationManager : IManager
-    {
-        private readonly ConcurrentBag<Server> _servers;
-        public List<Server> Servers => _servers.OrderByDescending(s => s.ClientNum).ToList();
-        [Obsolete] public ObsoleteLogger Logger => _serviceProvider.GetRequiredService<ObsoleteLogger>();
-        public bool IsRunning { get; private set; }
-        public bool IsInitialized { get; private set; }
-        public DateTime StartTime { get; private set; }
-        public string Version => Assembly.GetEntryAssembly().GetName().Version.ToString();
-
-        public IList<IRConParser> AdditionalRConParsers { get; }
-        public IList<IEventParser> AdditionalEventParsers { get; }
-        public IList<Func<GameEvent, bool>> CommandInterceptors { get; set; } =
-            new List<Func<GameEvent, bool>>();
-        public ITokenAuthentication TokenAuthenticator { get; }
-        public CancellationToken CancellationToken => _isRunningTokenSource.Token;
-        public string ExternalIPAddress { get; private set; }
-        public bool IsRestartRequested { get; private set; }
-        public IMiddlewareActionHandler MiddlewareActionHandler { get; }
-        public event EventHandler<GameEvent> OnGameEventExecuted;
-        private readonly List<IManagerCommand> _commands;
-        private readonly ILogger _logger;
-        private readonly List<MessageToken> MessageTokens;
-        private readonly ClientService ClientSvc;
-        readonly PenaltyService PenaltySvc;
-        private readonly IAlertManager _alertManager;
-        public IConfigurationHandler<ApplicationConfiguration> ConfigHandler;
-        readonly IPageList PageList;
-        private readonly TimeSpan _throttleTimeout = new TimeSpan(0, 1, 0);
-        private CancellationTokenSource _isRunningTokenSource;
-        private CancellationTokenSource _eventHandlerTokenSource;
-        private readonly Dictionary<string, Task<IList>> _operationLookup = new Dictionary<string, Task<IList>>();
-        private readonly ITranslationLookup _translationLookup;
-        private readonly IConfigurationHandler<CommandConfiguration> _commandConfiguration;
-        private readonly IGameServerInstanceFactory _serverInstanceFactory;
-        private readonly IParserRegexFactory _parserRegexFactory;
-        private readonly IEnumerable<IRegisterEvent> _customParserEvents;
-        private readonly ICoreEventHandler _coreEventHandler;
-        private readonly IScriptCommandFactory _scriptCommandFactory;
-        private readonly IMetaRegistration _metaRegistration;
-        private readonly IScriptPluginServiceResolver _scriptPluginServiceResolver;
-        private readonly IServiceProvider _serviceProvider;
-        private readonly ChangeHistoryService _changeHistoryService;
-        private readonly ApplicationConfiguration _appConfig;
-        public ConcurrentDictionary<long, GameEvent> ProcessingEvents { get; } = new();
-
-        public ApplicationManager(ILogger<ApplicationManager> logger, IMiddlewareActionHandler actionHandler, IEnumerable<IManagerCommand> commands,
-            ITranslationLookup translationLookup, IConfigurationHandler<CommandConfiguration> commandConfiguration,
-            IConfigurationHandler<ApplicationConfiguration> appConfigHandler, IGameServerInstanceFactory serverInstanceFactory,
-            IEnumerable<IPlugin> plugins, IParserRegexFactory parserRegexFactory, IEnumerable<IRegisterEvent> customParserEvents,
-            ICoreEventHandler coreEventHandler, IScriptCommandFactory scriptCommandFactory, IDatabaseContextFactory contextFactory,
-            IMetaRegistration metaRegistration, IScriptPluginServiceResolver scriptPluginServiceResolver, ClientService clientService, IServiceProvider serviceProvider,
-            ChangeHistoryService changeHistoryService, ApplicationConfiguration appConfig, PenaltyService penaltyService, IAlertManager alertManager, IInteractionRegistration interactionRegistration, IEnumerable<IPluginV2> v2PLugins)
-        {
-            MiddlewareActionHandler = actionHandler;
-            _servers = new ConcurrentBag<Server>();
-            MessageTokens = new List<MessageToken>();
-            ClientSvc = clientService;
-            PenaltySvc = penaltyService;
-            _alertManager = alertManager;
-            ConfigHandler = appConfigHandler;
-            StartTime = DateTime.UtcNow;
-            PageList = new PageList();
-            AdditionalEventParsers = new List<IEventParser> { new BaseEventParser(parserRegexFactory, logger, _appConfig) };
-            AdditionalRConParsers = new List<IRConParser> { new BaseRConParser(serviceProvider.GetRequiredService<ILogger<BaseRConParser>>(), parserRegexFactory) };
-            TokenAuthenticator = new TokenAuthentication();
-            _logger = logger;
-            _isRunningTokenSource = new CancellationTokenSource();
-            _commands = commands.ToList();
-            _translationLookup = translationLookup;
-            _commandConfiguration = commandConfiguration;
-            _serverInstanceFactory = serverInstanceFactory;
-            _parserRegexFactory = parserRegexFactory;
-            _customParserEvents = customParserEvents;
-            _coreEventHandler = coreEventHandler;
-            _scriptCommandFactory = scriptCommandFactory;
-            _metaRegistration = metaRegistration;
-            _scriptPluginServiceResolver = scriptPluginServiceResolver;
-            _serviceProvider = serviceProvider;
-            _changeHistoryService = changeHistoryService;
-            _appConfig = appConfig;
-            Plugins = plugins;
-            InteractionRegistration = interactionRegistration;
-            
-            IManagementEventSubscriptions.ClientPersistentIdReceived += OnClientPersistentIdReceived;
-        }
-
-        public IEnumerable<IPlugin> Plugins { get; }
-        public IInteractionRegistration InteractionRegistration { get; }
-
-        public async Task ExecuteEvent(GameEvent newEvent)
-        {
-            ProcessingEvents.TryAdd(newEvent.IncrementalId, newEvent);
-            
-            // the event has failed already
-            if (newEvent.Failed)
-            {
-                goto skip;
-            }
-
-            try
-            {
-                await newEvent.Owner.ExecuteEvent(newEvent);
-
-                // save the event info to the database
-                await _changeHistoryService.Add(newEvent);
-            }
-
-            catch (TaskCanceledException)
-            {
-                _logger.LogDebug("Received quit signal for event id {EventId}, so we are aborting early", newEvent.IncrementalId);
-            }
-
-            catch (OperationCanceledException)
-            {
-                _logger.LogDebug("Received quit signal for event id {EventId}, so we are aborting early", newEvent.IncrementalId);
-            }
-
-            // this happens if a plugin requires login
-            catch (AuthorizationException ex)
-            {
-                newEvent.FailReason = EventFailReason.Permission;
-                newEvent.Origin.Tell($"{Utilities.CurrentLocalization.LocalizationIndex["COMMAND_NOTAUTHORIZED"]} - {ex.Message}");
-            }
-
-            catch (NetworkException ex)
-            {
-                newEvent.FailReason = EventFailReason.Exception;
-                using (LogContext.PushProperty("Server", newEvent.Owner?.ToString()))
-                {
-                    _logger.LogError(ex, ex.Message);
-                }
-            }
-
-            catch (ServerException ex)
-            {
-                newEvent.FailReason = EventFailReason.Exception;
-                using (LogContext.PushProperty("Server", newEvent.Owner?.ToString()))
-                {
-                    _logger.LogError(ex, ex.Message);
-                }
-            }
-
-            catch (Exception ex)
-            {
-                newEvent.FailReason = EventFailReason.Exception;
-                Console.WriteLine(Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_EXCEPTION"].FormatExt(newEvent.Owner));
-                using (LogContext.PushProperty("Server", newEvent.Owner?.ToString()))
-                {
-                    _logger.LogError(ex, "Unexpected exception");
-                }
-            }
-
-            skip:
-            if (newEvent.Type == EventType.Command && newEvent.ImpersonationOrigin == null && newEvent.CorrelationId is not null)
-            {
-                var correlatedEvents =
-                    ProcessingEvents.Values.Where(ev =>
-                            ev.CorrelationId == newEvent.CorrelationId && ev.IncrementalId != newEvent.IncrementalId)
-                        .ToList();
-
-                await Task.WhenAll(correlatedEvents.Select(ev =>
-                    ev.WaitAsync(Utilities.DefaultCommandTimeout, CancellationToken)));
-                newEvent.Output.AddRange(correlatedEvents.SelectMany(ev => ev.Output));
-
-                foreach (var correlatedEvent in correlatedEvents)
-                {
-                    ProcessingEvents.Remove(correlatedEvent.IncrementalId, out _);
-                }
-            }
-
-            // we don't want to remove events that are correlated to command
-            if (ProcessingEvents.Values.Count(gameEvent =>
-                    newEvent.CorrelationId is not null && newEvent.CorrelationId == gameEvent.CorrelationId) == 1 ||
-                newEvent.CorrelationId is null)
-            {
-                ProcessingEvents.Remove(newEvent.IncrementalId, out _);
-            }
-
-            // tell anyone waiting for the output that we're done
-            newEvent.Complete();
-            OnGameEventExecuted?.Invoke(this, newEvent);
-        }
-
-        public IList<Server> GetServers()
-        {
-            return Servers;
-        }
-
-        public IList<IManagerCommand> GetCommands()
-        {
-            return _commands;
-        }
-
-        public IReadOnlyList<IManagerCommand> Commands => _commands.ToImmutableList();
-
-        private Task UpdateServerStates()
-        {
-            var index = 0;
-            return Task.WhenAll(_servers.Select(server =>
-            {
-                var thisIndex = index;
-                Interlocked.Increment(ref index);
-                return ProcessUpdateHandler(server, thisIndex);
-            }));
-        }
-
-        private async Task ProcessUpdateHandler(Server server, int index)
-        {
-            const int delayScalar = 50; // Task.Delay is inconsistent enough there's no reason to try to prevent collisions
-            var timeout = TimeSpan.FromMinutes(2);
-
-            while (!_isRunningTokenSource.IsCancellationRequested)
-            {
-                try
-                {
-                    var delayFactor = Math.Min(_appConfig.RConPollRate, delayScalar * index);
-                    await Task.Delay(delayFactor, _isRunningTokenSource.Token);
-
-                    using var timeoutTokenSource = new CancellationTokenSource();
-                    timeoutTokenSource.CancelAfter(timeout);
-                    using var linkedTokenSource =
-                        CancellationTokenSource.CreateLinkedTokenSource(timeoutTokenSource.Token,
-                            _isRunningTokenSource.Token);
-                    await server.ProcessUpdatesAsync(linkedTokenSource.Token);
-
-                    await Task.Delay(Math.Max(1000, _appConfig.RConPollRate - delayFactor),
-                        _isRunningTokenSource.Token);
-                }
-                catch (OperationCanceledException)
-                {
-                    // ignored
-                }
-                catch (Exception ex)
-                {
-                    using (LogContext.PushProperty("Server", server.Id))
-                    {
-                        _logger.LogError(ex, "Failed to update status");
-                    }
-                }
-                finally
-                {
-                    server.IsInitialized = true;
-                }
-            }
-            
-            // run the final updates to clean up server
-            await server.ProcessUpdatesAsync(_isRunningTokenSource.Token);
-        }
-
-        public async Task Init()
-        {
-            IsRunning = true;
-            ExternalIPAddress = await Utilities.GetExternalIP();
-
-            #region DATABASE
-            _logger.LogInformation("Beginning database migration sync");
-            Console.WriteLine(_translationLookup["MANAGER_MIGRATION_START"]);
-            await ContextSeed.Seed(_serviceProvider.GetRequiredService<IDatabaseContextFactory>(), _isRunningTokenSource.Token);
-            await DatabaseHousekeeping.RemoveOldRatings(_serviceProvider.GetRequiredService<IDatabaseContextFactory>(), _isRunningTokenSource.Token);
-            _logger.LogInformation("Finished database migration sync");
-            Console.WriteLine(_translationLookup["MANAGER_MIGRATION_END"]);
-            #endregion
-            
-            #region EVENTS                        
-            IGameServerEventSubscriptions.ServerValueRequested += OnServerValueRequested;
-            IGameServerEventSubscriptions.ServerValueSetRequested += OnServerValueSetRequested;
-            IGameServerEventSubscriptions.ServerCommandExecuteRequested += OnServerCommandExecuteRequested;
-            await IManagementEventSubscriptions.InvokeLoadAsync(this, CancellationToken);
-            # endregion
-
-            #region PLUGINS
-            foreach (var plugin in Plugins)
-            {
-                try
-                {
-                    if (plugin is ScriptPlugin scriptPlugin && !plugin.IsParser)
-                    {
-                        await scriptPlugin.Initialize(this, _scriptCommandFactory, _scriptPluginServiceResolver, 
-                            _serviceProvider.GetService<IConfigurationHandlerV2<ScriptPluginConfiguration>>());
-                        scriptPlugin.Watcher.Changed += async (sender, e) =>
-                        {
-                            try
-                            {
-                                await scriptPlugin.Initialize(this, _scriptCommandFactory, _scriptPluginServiceResolver, 
-                                    _serviceProvider.GetService<IConfigurationHandlerV2<ScriptPluginConfiguration>>());
-                            }
-
-                            catch (Exception ex)
-                            {
-                                Console.WriteLine(Utilities.CurrentLocalization.LocalizationIndex["PLUGIN_IMPORTER_ERROR"].FormatExt(scriptPlugin.Name));
-                                _logger.LogError(ex, "Could not properly load plugin {plugin}", scriptPlugin.Name);
-                            }
-                        };
-                    }
-
-                    else
-                    {
-                        await plugin.OnLoadAsync(this);
-                    }
-                }
-
-                catch (Exception ex)
-                {
-                    _logger.LogError(ex, $"{_translationLookup["SERVER_ERROR_PLUGIN"]} {plugin.Name}");
-                }
-            }
-            #endregion
-
-            #region CONFIG
-            // copy over default config if it doesn't exist
-            if (!_appConfig.Servers?.Any() ?? true)
-            {
-                var defaultHandler = new BaseConfigurationHandler<DefaultSettings>("DefaultSettings");
-                await defaultHandler.BuildAsync();
-                var defaultConfig = defaultHandler.Configuration();
-        
-                _appConfig.AutoMessages = defaultConfig.AutoMessages;
-                _appConfig.GlobalRules = defaultConfig.GlobalRules;
-                _appConfig.DisallowedClientNames = defaultConfig.DisallowedClientNames;
-
-                //if (newConfig.Servers == null)
-                {
-                    ConfigHandler.Set(_appConfig);
-                    _appConfig.Servers = new ServerConfiguration[1];
-
-                    do
-                    {
-                        var serverConfig = new ServerConfiguration();
-                        foreach (var parser in AdditionalRConParsers)
-                        {
-                            serverConfig.AddRConParser(parser);
-                        }
-
-                        foreach (var parser in AdditionalEventParsers)
-                        {
-                            serverConfig.AddEventParser(parser);
-                        }
-
-                        _appConfig.Servers = _appConfig.Servers.Where(_servers => _servers != null).Append((ServerConfiguration)serverConfig.Generate()).ToArray();
-                    } while (Utilities.PromptBool(_translationLookup["SETUP_SERVER_SAVE"]));
-
-                    await ConfigHandler.Save();
-                }
-            }
-
-            else
-            {
-                if (string.IsNullOrEmpty(_appConfig.Id))
-                {
-                    _appConfig.Id = Guid.NewGuid().ToString();
-                }
-
-                if (string.IsNullOrEmpty(_appConfig.WebfrontBindUrl))
-                {
-                    _appConfig.WebfrontBindUrl = "http://0.0.0.0:1624";
-                }
-
-#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("Could not validate configuration")
-                    {
-                        Errors = validationResult.Errors.Select(_error => _error.ErrorMessage).ToArray(),
-                        ConfigurationFileName = ConfigHandler.FileName
-                    };
-                }
-
-                foreach (var serverConfig in _appConfig.Servers)
-                {
-                    ConfigurationMigration.ModifyLogPath020919(serverConfig);
-
-                    if (serverConfig.RConParserVersion == null || serverConfig.EventParserVersion == null)
-                    {
-                        foreach (var parser in AdditionalRConParsers)
-                        {
-                            serverConfig.AddRConParser(parser);
-                        }
-
-                        foreach (var parser in AdditionalEventParsers)
-                        {
-                            serverConfig.AddEventParser(parser);
-                        }
-
-                        serverConfig.ModifyParsers();
-                    }
-                }
-                await ConfigHandler.Save();
-            }
-
-            if (_appConfig.Servers.Length == 0)
-            {
-                throw new ServerException("A server configuration in IW4MAdminSettings.json is invalid");
-            }
-
-            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
-            if (await ClientSvc.HasOwnerAsync(_isRunningTokenSource.Token))
-            {
-                _commands.RemoveAll(_cmd => _cmd.GetType() == typeof(OwnerCommand));
-            }
-
-            List<IManagerCommand> commandsToAddToConfig = new List<IManagerCommand>();
-            var cmdConfig = _commandConfiguration.Configuration();
-
-            if (cmdConfig == null)
-            {
-                cmdConfig = new CommandConfiguration();
-                commandsToAddToConfig.AddRange(_commands);
-            }
-
-            else
-            {
-                var unsavedCommands = _commands.Where(_cmd => !cmdConfig.Commands.Keys.Contains(_cmd.CommandConfigNameForType()));
-                commandsToAddToConfig.AddRange(unsavedCommands);
-            }
-
-            // 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 ?? "@";
-
-            foreach (var cmd in commandsToAddToConfig)
-            {
-                if (cmdConfig.Commands.ContainsKey(cmd.CommandConfigNameForType()))
-                {
-                    continue;
-                }
-                cmdConfig.Commands.Add(cmd.CommandConfigNameForType(),
-                new CommandProperties
-                {
-                    Name = cmd.Name,
-                    Alias = cmd.Alias,
-                    MinimumPermission = cmd.Permission,
-                    AllowImpersonation = cmd.AllowImpersonation,
-                    SupportedGames = cmd.SupportedGames
-                });
-            }
-
-            _commandConfiguration.Set(cmdConfig);
-            await _commandConfiguration.Save();
-            #endregion
-
-            _metaRegistration.Register();
-            await _alertManager.Initialize();
-
-            #region CUSTOM_EVENTS
-            foreach (var customEvent in _customParserEvents.SelectMany(_events => _events.Events))
-            {
-                foreach (var parser in AdditionalEventParsers)
-                {
-                    parser.RegisterCustomEvent(customEvent.Item1, customEvent.Item2, customEvent.Item3);
-                }
-            }
-            #endregion
-            
-            Console.WriteLine(_translationLookup["MANAGER_COMMUNICATION_INFO"]);
-            await InitializeServers();
-            IsInitialized = true;
-        }
-
-        private async Task InitializeServers()
-        {
-            var config = ConfigHandler.Configuration();
-            int successServers = 0;
-            Exception lastException = null;
-
-            async Task Init(ServerConfiguration Conf)
-            {
-                try
-                {
-                    // todo: this might not always be an IW4MServer
-                    var serverInstance = _serverInstanceFactory.CreateServer(Conf, this) as IW4MServer;
-                    using (LogContext.PushProperty("Server", serverInstance!.ToString()))
-                    {
-                        _logger.LogInformation("Beginning server communication initialization");
-                        await serverInstance.Initialize();
-
-                        _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);
-                    }
-
-                    QueueEvent(new MonitorStartEvent
-                    {
-                        Server = serverInstance,
-                        Source = this
-                    });                    
-                    
-                    successServers++;
-                }
-
-                catch (ServerException e)
-                {
-                    Console.WriteLine(Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_UNFIXABLE"].FormatExt($"[{Conf.IPAddress}:{Conf.Port}]"));
-                    using (LogContext.PushProperty("Server", $"{Conf.IPAddress}:{Conf.Port}"))
-                    {
-                        _logger.LogError(e, "Unexpected exception occurred during initialization");
-                    }
-                    lastException = e;
-                }
-            }
-
-            await Task.WhenAll(config.Servers.Select(c => Init(c)).ToArray());
-
-            if (successServers == 0)
-            {
-                throw lastException;
-            }
-
-            if (successServers != config.Servers.Length && !AppContext.TryGetSwitch("NoConfirmPrompt", out _))
-            {
-                if (!Utilities.CurrentLocalization.LocalizationIndex["MANAGER_START_WITH_ERRORS"].PromptBool())
-                {
-                    throw lastException;
-                }
-            }
-        }
-
-        public async Task Start()
-        {
-            _eventHandlerTokenSource = new CancellationTokenSource();
-            
-            var eventHandlerThread = new Thread(() =>
-            {
-                _coreEventHandler.StartProcessing(_eventHandlerTokenSource.Token);
-            })
-            {
-                Name = nameof(CoreEventHandler)
-            };
-
-            eventHandlerThread.Start();
-            await UpdateServerStates();
-            _eventHandlerTokenSource.Cancel();
-            eventHandlerThread.Join();
-        }
-
-        public async Task Stop()
-        {
-            foreach (var plugin in Plugins.Where(plugin => !plugin.IsParser))
-            {
-                try
-                {
-                    await plugin.OnUnloadAsync().WithTimeout(Utilities.DefaultCommandTimeout);
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError(ex, "Could not cleanly unload plugin {PluginName}", plugin.Name);
-                }
-            }
-
-            _isRunningTokenSource.Cancel();
-
-            IsRunning = false;
-        }
-
-        public async Task Restart()
-        {
-            IsRestartRequested = true;
-            await Stop();
-            
-            using var subscriptionTimeoutToken = new CancellationTokenSource();
-            subscriptionTimeoutToken.CancelAfter(Utilities.DefaultCommandTimeout);
-
-            await IManagementEventSubscriptions.InvokeUnloadAsync(this, subscriptionTimeoutToken.Token);
-
-            IGameEventSubscriptions.ClearEventInvocations();
-            IGameServerEventSubscriptions.ClearEventInvocations();
-            IManagementEventSubscriptions.ClearEventInvocations();
-            
-            _isRunningTokenSource.Dispose();
-            _isRunningTokenSource = new CancellationTokenSource();
-            
-            _eventHandlerTokenSource.Dispose();
-            _eventHandlerTokenSource = new CancellationTokenSource();
-        }
-
-        [Obsolete]
-        public ObsoleteLogger GetLogger(long serverId)
-        {
-            return _serviceProvider.GetRequiredService<ObsoleteLogger>();
-        }
-
-        public IList<MessageToken> GetMessageTokens()
-        {
-            return MessageTokens;
-        }
-
-        public IList<EFClient> GetActiveClients()
-        {
-            // we're adding another to list here so we don't get a collection modified exception..
-            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 && c.GameName == client.GameName) ?? client :
-                client;
-
-        public ClientService GetClientService()
-        {
-            return ClientSvc;
-        }
-
-        public PenaltyService GetPenaltyService()
-        {
-            return PenaltySvc;
-        }
-
-        public IConfigurationHandler<ApplicationConfiguration> GetApplicationSettings()
-        {
-            return ConfigHandler;
-        }
-
-        public void AddEvent(GameEvent gameEvent)
-        {
-            _coreEventHandler.QueueEvent(this, gameEvent);
-        }
-
-        public void QueueEvent(CoreEvent coreEvent)
-        {
-            _coreEventHandler.QueueEvent(this, coreEvent);
-        }
-        
-        public IPageList GetPageList()
-        {
-            return PageList;
-        }
-
-        public IRConParser GenerateDynamicRConParser(string name)
-        {
-            return new DynamicRConParser(_serviceProvider.GetRequiredService<ILogger<BaseRConParser>>(), _parserRegexFactory)
-            {
-                Name = name
-            };
-        }
-
-        public IEventParser GenerateDynamicEventParser(string name)
-        {
-            return new DynamicEventParser(_parserRegexFactory, _logger, ConfigHandler.Configuration())
-            {
-                Name = name
-            };
-        }
-
-        public async Task<IList<T>> ExecuteSharedDatabaseOperation<T>(string operationName)
-        {
-            var result = await _operationLookup[operationName];
-            return (IList<T>)result;
-        }
-
-        public void RegisterSharedDatabaseOperation(Task<IList> operation, string operationName)
-        {
-            _operationLookup.Add(operationName, operation);
-        }
-
-        public void AddAdditionalCommand(IManagerCommand command)
-        {
-            lock (_commands)
-            {
-                if (_commands.Any(cmd => cmd.Name == command.Name || cmd.Alias == command.Alias))
-                {
-                    throw new InvalidOperationException(
-                        $"Duplicate command name or alias ({command.Name}, {command.Alias})");
-                }
-
-                _commands.Add(command);
-            }
-        }
-
-        public void RemoveCommandByName(string commandName) => _commands.RemoveAll(_command => _command.Name == commandName);
-        public IAlertManager AlertManager => _alertManager;
-        
-        private async Task OnServerValueRequested(ServerValueRequestEvent requestEvent, CancellationToken token)
-        {
-            if (requestEvent.Server is not IW4MServer server)
-            {
-                return;
-            }
-
-            Dvar<string> serverValue = null;
-            try
-            {
-                if (requestEvent.DelayMs.HasValue)
-                {
-                    await Task.Delay(requestEvent.DelayMs.Value, token);
-                }
-
-                var waitToken = token;
-                using var timeoutTokenSource = new CancellationTokenSource();
-                using var linkedTokenSource =
-                    CancellationTokenSource.CreateLinkedTokenSource(timeoutTokenSource.Token, token);
-                
-                if (requestEvent.TimeoutMs is not null)
-                {
-                    timeoutTokenSource.CancelAfter(requestEvent.TimeoutMs.Value);
-                    waitToken = linkedTokenSource.Token;
-                }
-
-                serverValue =
-                    await server.GetDvarAsync(requestEvent.ValueName, requestEvent.FallbackValue, waitToken);
-            }
-            catch
-            {
-                //  ignored
-            }
-            finally
-            {
-                QueueEvent(new ServerValueReceiveEvent
-                {
-                    Server = server,
-                    Source = server,
-                    Response = serverValue ?? new Dvar<string> { Name = requestEvent.ValueName },
-                    Success = serverValue is not null
-                });
-            }
-        }
-
-        private Task OnServerValueSetRequested(ServerValueSetRequestEvent requestEvent, CancellationToken token)
-        {
-            return ExecuteWrapperForServerQuery(requestEvent, token, async (innerEvent) =>
-            {
-                if (innerEvent.DelayMs.HasValue)
-                {
-                    await Task.Delay(innerEvent.DelayMs.Value, token);
-                }
-
-                if (innerEvent.TimeoutMs is not null)
-                {
-                    using var timeoutTokenSource = new CancellationTokenSource(innerEvent.TimeoutMs.Value);
-                    using var linkedTokenSource =
-                        CancellationTokenSource.CreateLinkedTokenSource(timeoutTokenSource.Token, token);
-                    token = linkedTokenSource.Token;
-                }
-
-                await innerEvent.Server.SetDvarAsync(innerEvent.ValueName, innerEvent.Value, token);
-            }, (completed, innerEvent) =>
-            {
-                QueueEvent(new ServerValueSetCompleteEvent
-                {
-                    Server = innerEvent.Server,
-                    Source = innerEvent.Server,
-                    Success = completed,
-                    Value = innerEvent.Value,
-                    ValueName = innerEvent.ValueName
-                });
-                return Task.CompletedTask;
-            });
-        }
-
-        private Task OnServerCommandExecuteRequested(ServerCommandRequestExecuteEvent executeEvent, CancellationToken token)
-        {
-            return ExecuteWrapperForServerQuery(executeEvent, token, async (innerEvent) =>
-            {
-                if (innerEvent.DelayMs.HasValue)
-                {
-                    await Task.Delay(innerEvent.DelayMs.Value, token);
-                }
-
-                if (innerEvent.TimeoutMs is not null)
-                {
-                    using var timeoutTokenSource = new CancellationTokenSource(innerEvent.TimeoutMs.Value);
-                    using var linkedTokenSource =
-                        CancellationTokenSource.CreateLinkedTokenSource(timeoutTokenSource.Token, token);
-                    token = linkedTokenSource.Token;
-                }
-
-                await innerEvent.Server.ExecuteCommandAsync(innerEvent.Command, token);
-            }, (_, __) => Task.CompletedTask);
-        }
-
-        private async Task ExecuteWrapperForServerQuery<TEventType>(TEventType serverEvent, CancellationToken token,
-            Func<TEventType, Task> action, Func<bool, TEventType, Task> complete) where TEventType : GameServerEvent
-        {
-            if (serverEvent.Server is not IW4MServer)
-            {
-                return;
-            }
-
-            var completed = false;
-            try
-            {
-                await action(serverEvent);
-                completed = true;
-            }
-            catch
-            {
-                //  ignored
-            }
-            finally
-            {
-                await complete(completed, serverEvent);
-            }
-        }
-
-        private async Task OnClientPersistentIdReceived(ClientPersistentIdReceiveEvent receiveEvent, CancellationToken token)
-        {
-            var parts = receiveEvent.PersistentId.Split(",");
-
-            if (parts.Length == 2 && int.TryParse(parts[0], out var high) &&
-                int.TryParse(parts[1], out var low))
-            {
-                var guid = long.Parse(high.ToString("X") + low.ToString("X"), NumberStyles.HexNumber);
-
-                var penalties = await PenaltySvc
-                    .GetActivePenaltiesByIdentifier(null, guid, receiveEvent.Client.GameName);
-                var banPenalty =
-                    penalties.FirstOrDefault(penalty => penalty.Type == EFPenalty.PenaltyType.Ban);
-
-                if (banPenalty is not null && receiveEvent.Client.Level != Data.Models.Client.EFClient.Permission.Banned)
-                {
-                    _logger.LogInformation(
-                        "Banning {Client} as they have have provided a persistent clientId of {PersistentClientId}, which is banned",
-                        receiveEvent.Client, guid);
-                    receiveEvent.Client.Ban(_translationLookup["SERVER_BAN_EVADE"].FormatExt(guid),
-                        receiveEvent.Client.CurrentServer.AsConsoleClient(), true);
-                }
-            }
-        }
-    }
-}

Application/BuildScripts/DownloadTranslations.ps1

@@ -1,12 +0,0 @@
-param (
-    [string]$OutputDir = $(throw "-OutputDir is required.")
-)
-
-$localizations = @("en-US", "ru-RU", "es-EC", "pt-BR", "de-DE")
-foreach($localization in $localizations)
-{
-    $url = "http://api.raidmax.org:5000/localization/{0}" -f $localization
-    $filePath = "{0}Localization\IW4MAdmin.{1}.json" -f $OutputDir, $localization
-    $response = Invoke-WebRequest $url -UseBasicParsing
-    Out-File -FilePath $filePath -InputObject $response.Content -Encoding utf8
-}

Application/BuildScripts/PostBuild.bat

@@ -2,11 +2,10 @@ set SolutionDir=%1
 set ProjectDir=%2
 set TargetDir=%3
 set OutDir=%4
-set Version=%5
 
 echo Copying dependency configs
 copy "%SolutionDir%WebfrontCore\%OutDir%*.deps.json" "%TargetDir%"
-copy "%SolutionDir%SharedLibraryCore\%OutDir%*.deps.json" "%TargetDir%"
+copy "%SolutionDir%SharedLibaryCore\%OutDir%*.deps.json" "%TargetDir%"
 
 if not exist "%TargetDir%Plugins" (
 	echo "Making plugin dir"
@@ -14,4 +13,6 @@ if not exist "%TargetDir%Plugins" (
 )
 
 xcopy /y "%SolutionDir%Build\Plugins" "%TargetDir%Plugins\"
-del "%TargetDir%Plugins\SQLite*"
+
+echo Copying plugins for publish
+xcopy /Y "%SolutionDir%BUILD\Plugins" "%SolutionDir%Publish\Windows\Plugins\"

Application/BuildScripts/PostPublish.bat

@@ -1,67 +1,29 @@
-set PublishDir=%1
-set SourceDir=%2
-SET COPYCMD=/Y
+set SolutionDir=%1
+set ProjectDir=%2
+set TargetDir=%3
 
-echo deleting extra runtime files
-if exist "%PublishDir%\runtimes\linux-arm" powershell Remove-Item -Force -Recurse '%PublishDir%\runtimes\linux-arm'
-if exist "%PublishDir%\runtimes\linux-arm64" powershell Remove-Item -Force -Recurse '%PublishDir%\runtimes\linux-arm64'
-if exist "%PublishDir%\runtimes\linux-armel" powershell Remove-Item -Force -Recurse '%PublishDir%\runtimes\linux-armel'
-if exist "%PublishDir%\runtimes\osx" powershell Remove-Item -Force -Recurse '%PublishDir%\runtimes\osx'
-if exist "%PublishDir%\runtimes\osx-x64" powershell Remove-Item -Force -Recurse '%PublishDir%\runtimes\osx-x64'
-if exist "%PublishDir%\runtimes\win-arm" powershell Remove-Item -Force -Recurse '%PublishDir%\runtimes\win-arm'
-if exist "%PublishDir%\runtimes\win-arm64" powershell Remove-Item -Force -Recurse '%PublishDir%\runtimes\win-arm64'
-if exist "%PublishDir%\runtimes\alpine-x64" powershell Remove-Item -Force -Recurse '%PublishDir%\runtimes\alpine-x64'
-if exist "%PublishDir%\runtimes\linux-musl-x64" powershell Remove-Item -Force -Recurse '%PublishDir%\runtimes\linux-musl-x64'
+echo Deleting extra language files
+if exist  "%SolutionDir%Publish\Windows\de\" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\Windows\de'
+if exist "%SolutionDir%Publish\Windows\es\" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\Windows\es'
+if exist "%SolutionDir%Publish\Windows\fr\" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\Windows\fr'
+if exist "%SolutionDir%Publish\Windows\it\" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\Windows\it'
+if exist "%SolutionDir%Publish\Windows\ja\" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\Windows\ja'
+if exist "%SolutionDir%Publish\Windows\ko\" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\Windows\ko'
+if exist "%SolutionDir%Publish\Windows\ru\" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\Windows\ru'
+if exist "%SolutionDir%Publish\Windows\zh-Hans\" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\Windows\zh-Hans'
+if exist "%SolutionDir%Publish\Windows\zh-Hant\" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\Windows\zh-Hant'
 
-echo deleting misc files
-if exist "%PublishDir%\web.config" del "%PublishDir%\web.config"
-if exist "%PublishDir%\libman.json" del "%PublishDir%\libman.json"
-del "%PublishDir%\*.exe"
-del "%PublishDir%\*.pdb"
+echo Deleting extra runtime files
+if exist "%SolutionDir%Publish\Windows\runtimes\linux-arm" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\Windows\runtimes\linux-arm'
+if exist "%SolutionDir%Publish\Windows\runtimes\linux-arm64" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\Windows\runtimes\linux-arm64'
+if exist "%SolutionDir%Publish\Windows\runtimes\linux-armel" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\Windows\runtimes\linux-armel'
 
-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"
-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"
+if exist "%SolutionDir%Publish\Windows\runtimes\osx" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\Windows\runtimes\osx'
+if exist "%SolutionDir%Publish\Windows\runtimes\osx-x64" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\Windows\runtimes\osx-x64'
 
-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"
+if exist "%SolutionDir%Publish\Windows\runtimes\win-arm" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\Windows\runtimes\win-arm'
+if exist "%SolutionDir%Publish\Windows\runtimes\win-arm64" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\Windows\runtimes\win-arm64'
 
-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
+echo Deleting misc files
+if exist "%SolutionDir%Publish\Windows\web.config" del "%SolutionDir%Publish\Windows\web.config"
+del "%SolutionDir%Publish\Windows\*pdb"

Application/BuildScripts/PreBuild.bat

@@ -1,6 +1,3 @@
 set SolutionDir=%1
 set ProjectDir=%2
-set TargetDir=%3
-
-echo D | xcopy "%SolutionDir%Plugins\ScriptPlugins\*.js" "%TargetDir%Plugins" /y
-powershell -File "%ProjectDir%BuildScripts\DownloadTranslations.ps1" %TargetDir%
+set TargetDir=%3

Application/Commands/AddClientNoteCommand.cs

@@ -1,52 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Data.Models.Client;
-using IW4MAdmin.Application.Meta;
-using SharedLibraryCore;
-using SharedLibraryCore.Commands;
-using SharedLibraryCore.Configuration;
-using SharedLibraryCore.Dtos.Meta.Responses;
-using SharedLibraryCore.Interfaces;
-
-namespace IW4MAdmin.Application.Commands;
-
-public class AddClientNoteCommand : Command
-{
-    private readonly IMetaServiceV2 _metaService;
-
-    public AddClientNoteCommand(CommandConfiguration config, ITranslationLookup layout, IMetaServiceV2 metaService) : base(config, layout)
-    {
-        Name = "addnote";
-        Description = _translationLookup["COMMANDS_ADD_CLIENT_NOTE_DESCRIPTION"];
-        Alias = "an";
-        Permission = EFClient.Permission.Moderator;
-        RequiresTarget = true;
-        Arguments = new[]
-        {
-            new CommandArgument
-            {
-                Name = _translationLookup["COMMANDS_ARGS_PLAYER"],
-                Required = true
-            },
-            new CommandArgument
-            {
-                Name = _translationLookup["COMMANDS_ARGS_NOTE"],
-                Required = false
-            }
-        };
-        
-        _metaService = metaService;
-    }
-
-    public override async Task ExecuteAsync(GameEvent gameEvent)
-    {
-        var note = new ClientNoteMetaResponse
-        {
-            Note = gameEvent.Data?.Trim(),
-            OriginEntityId = gameEvent.Origin.ClientId,
-            ModifiedDate = DateTime.UtcNow
-        };
-        await _metaService.SetPersistentMetaValue("ClientNotes", note, gameEvent.Target.ClientId);
-        gameEvent.Origin.Tell(_translationLookup["COMMANDS_ADD_CLIENT_NOTE_SUCCESS"]);
-    }
-}

Application/Commands/ClientTags/AddClientTagCommand.cs

@@ -1,64 +0,0 @@
-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

@@ -1,38 +0,0 @@
-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,48 +0,0 @@
-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 IW4MAdmin.Application.Commands.ClientTags
-{
-    public class RemoveClientTag : Command
-    {
-        private readonly IMetaServiceV2 _metaService;
-
-        public RemoveClientTag(CommandConfiguration config, ITranslationLookup layout, IMetaServiceV2 metaService) : base(
-            config, layout)
-        {
-            Name = "removeclienttag";
-            Description = layout["COMMANDS_REMOVE_CLIENT_TAG_DESC"];
-            Alias = "rct";
-            Permission = EFClient.Permission.Owner;
-            RequiresTarget = false;
-            Arguments = new[]
-            {
-                new CommandArgument
-                {
-                    Name = _translationLookup["COMMANDS_ARGUMENT_TAG"],
-                    Required = true
-                }
-            };
-
-            _metaService = metaService;
-        }
-
-        public override async Task ExecuteAsync(GameEvent gameEvent)
-        {
-            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,58 +0,0 @@
-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 IW4MAdmin.Application.Commands.ClientTags
-{
-    public class SetClientTagCommand : Command
-    {
-        private readonly IMetaServiceV2 _metaService;
-
-
-        public SetClientTagCommand(CommandConfiguration config, ITranslationLookup layout, IMetaServiceV2 metaService) :
-            base(config, layout)
-        {
-            Name = "setclienttag";
-            Description = layout["COMMANDS_SET_CLIENT_TAG_DESC"];
-            Alias = "sct";
-            Permission = EFClient.Permission.Owner;
-            RequiresTarget = true;
-            Arguments = new[]
-            {
-                new CommandArgument
-                {
-                    Name = _translationLookup["COMMANDS_ARGUMENT_TAG"],
-                    Required = true
-                }
-            };
-
-            _metaService = metaService;
-        }
-
-        public override async Task ExecuteAsync(GameEvent gameEvent)
-        {
-            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)
-            {
-                gameEvent.Origin.Tell(_translationLookup["COMMANDS_SET_CLIENT_TAG_FAIL"].FormatExt(gameEvent.Data));
-                return;
-            }
-
-            gameEvent.Target.Tag = matchingTag.Value;
-            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

@@ -1,13 +0,0 @@
-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,43 +0,0 @@
-using System.Threading.Tasks;
-using Data.Models;
-using Data.Models.Client;
-using SharedLibraryCore;
-using SharedLibraryCore.Commands;
-using SharedLibraryCore.Configuration;
-using SharedLibraryCore.Interfaces;
-
-namespace IW4MAdmin.Application.Commands.ClientTags
-{
-    public class UnsetClientTagCommand : Command
-    {
-        private readonly IMetaServiceV2 _metaService;
-
-        public UnsetClientTagCommand(CommandConfiguration config, ITranslationLookup layout, IMetaServiceV2 metaService) :
-            base(config, layout)
-        {
-            Name = "unsetclienttag";
-            Description = layout["COMMANDS_UNSET_CLIENT_TAG_DESC"];
-            Alias = "uct";
-            Permission = EFClient.Permission.Owner;
-            RequiresTarget = true;
-            Arguments = new[]
-            {
-                new CommandArgument
-                {
-                    Name = _translationLookup["COMMANDS_ARGUMENT_TAG"],
-                    Required = true
-                }
-            };
-
-            _metaService = metaService;
-        }
-
-        public override async Task ExecuteAsync(GameEvent gameEvent)
-        {
-            gameEvent.Target.Tag = null;
-            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

@@ -1,59 +0,0 @@
-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

@@ -1,95 +0,0 @@
-using System;
-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>
-    /// 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 async 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();
-                var messageList = new List<string>();
-
-                foreach (var item in commandStrings)
-                {
-                    helpResponse.Append(item.response);
-                    
-                    if (item.index == 0 || item.index % 4 != 0)
-                    {
-                        continue;
-                    }
-
-                    messageList.Add(helpResponse.ToString());
-                    helpResponse = new StringBuilder();
-                }
-
-                messageList.Add(helpResponse.ToString());
-
-                await gameEvent.Origin.TellAsync(messageList);
-            }
-        }
-    }
-}

Application/Commands/ListAdminsCommand.cs

@@ -1,50 +0,0 @@
-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

@@ -1,57 +0,0 @@
-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

@@ -1,37 +0,0 @@
-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

@@ -1,41 +0,0 @@
-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

@@ -1,59 +0,0 @@
-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

@@ -1,116 +0,0 @@
-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

@@ -1,135 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using Data.Abstractions;
-using Data.Models.Client;
-using Data.Models.Misc;
-using IW4MAdmin.Application.Alerts;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Logging;
-using SharedLibraryCore;
-using SharedLibraryCore.Alerts;
-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 readonly IAlertManager _alertManager;
-        private const short MaxLength = 1024;
-
-        public OfflineMessageCommand(CommandConfiguration config, ITranslationLookup layout,
-            IDatabaseContextFactory contextFactory, ILogger<IDatabaseContextFactory> logger, IAlertManager alertManager)
-            : base(config, layout)
-        {
-            Name = "offlinemessage";
-            Description = _translationLookup["COMMANDS_OFFLINE_MESSAGE_DESC"];
-            Alias = "om";
-            Permission = EFClient.Permission.Moderator;
-            RequiresTarget = true;
-
-            _contextFactory = contextFactory;
-            _logger = logger;
-            _alertManager = alertManager;
-
-            _alertManager.RegisterStaticAlertSource(async () =>
-            {
-                var context = contextFactory.CreateContext(false);
-                return await context.InboxMessages.Where(message => !message.IsDelivered)
-                    .Where(message => message.CreatedDateTime >= DateTime.UtcNow.AddDays(-7))
-                    .Where(message => message.DestinationClient.Level > EFClient.Permission.User)
-                    .Select(message => new Alert.AlertState
-                    {
-                        OccuredAt = message.CreatedDateTime,
-                        Message = message.Message,
-                        ExpiresAt = DateTime.UtcNow.AddDays(7),
-                        Category = Alert.AlertCategory.Message,
-                        Source = message.SourceClient.CurrentAlias.Name.StripColors(),
-                        SourceId = message.SourceClientId,
-                        RecipientId = message.DestinationClientId,
-                        ReferenceId = message.InboxMessageId,
-                        Type = nameof(EFInboxMessage)
-                    }).ToListAsync();
-            });
-
-            _alertManager.OnAlertConsumed += (_, state) =>
-            {
-                if (state.Category != Alert.AlertCategory.Message || state.ReferenceId is null)
-                {
-                    return;
-                }
-
-                try
-                {
-                    var context = contextFactory.CreateContext(true);
-                    foreach (var message in context.InboxMessages
-                                 .Where(message => message.InboxMessageId == state.ReferenceId.Value).ToList())
-                    {
-                        message.IsDelivered = true;
-                    }
-
-                    context.SaveChanges();
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError(ex, "Could not update message state for alert {@Alert}", state);
-                }
-            };
-        }
-
-        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,
-            };
-
-            _alertManager.AddAlert(gameEvent.Target.BuildAlert(Alert.AlertCategory.Message)
-                .WithMessage(gameEvent.Data.Trim())
-                .FromClient(gameEvent.Origin)
-                .OfType(nameof(EFInboxMessage))
-                .ExpiresIn(TimeSpan.FromDays(7)));
-
-            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

@@ -1,45 +0,0 @@
-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

@@ -1,72 +0,0 @@
-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.User;
-
-            _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;
-                }
-
-                await gameEvent.Origin.TellAsync(inboxItems.Select((inboxItem, index) =>
-                {
-                    var header = _translationLookup["COMMANDS_READ_MESSAGE_SUCCESS"]
-                        .FormatExt($"{index + 1}/{inboxItems.Count}", inboxItem.SourceClient.CurrentAlias.Name);
-
-                    return new[] { header }.Union(inboxItem.Message.FragmentMessageForDisplay());
-                }).SelectMany(item => item));
-
-                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

@@ -1,77 +0,0 @@
-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

@@ -1,46 +0,0 @@
-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

@@ -1,42 +0,0 @@
-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/SetLogLevelCommand.cs

@@ -1,80 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Data.Models.Client;
-using Serilog.Core;
-using Serilog.Events;
-using SharedLibraryCore;
-using SharedLibraryCore.Commands;
-using SharedLibraryCore.Configuration;
-using SharedLibraryCore.Interfaces;
-
-namespace IW4MAdmin.Application.Commands;
-
-public class SetLogLevelCommand : Command
-{
-    private readonly Func<string, LoggingLevelSwitch> _levelSwitchResolver;
-
-    public SetLogLevelCommand(CommandConfiguration config, ITranslationLookup layout, Func<string, LoggingLevelSwitch> levelSwitchResolver) : base(config, layout)
-    {
-        _levelSwitchResolver = levelSwitchResolver;
-
-        Name = "loglevel";
-        Alias = "ll";
-        Description = "set minimum logging level";
-        Permission = EFClient.Permission.Owner;
-        Arguments = new CommandArgument[]
-        {
-            new()
-            {
-                Name = "Log Level",
-                Required = true
-            },
-            new()
-            {
-                Name = "Override",
-                Required = false
-            },
-            new()
-            {
-                Name = "IsDevelopment",
-                Required = false
-            }
-        };
-
-    }
-
-    public override async Task ExecuteAsync(GameEvent gameEvent)
-    {
-        var args = gameEvent.Data.Split(" ");
-        if (!Enum.TryParse<LogEventLevel>(args[0], out var minLevel))
-        {
-            await gameEvent.Origin.TellAsync(new[]
-            {
-                $"Valid log values: {string.Join(",", Enum.GetValues<LogEventLevel>())}"
-            });
-            return;
-        }
-
-        var context = string.Empty;
-        
-        if (args.Length > 1)
-        {
-            context = args[1];
-        }
-
-        var loggingSwitch = _levelSwitchResolver(context);
-        loggingSwitch.MinimumLevel = minLevel;
-
-        if (args.Length > 2 && (args[2] == "1" || args[2].ToLower() == "true"))
-        {
-            AppContext.SetSwitch("IsDevelop", true);
-        }
-        else
-        {
-            AppContext.SetSwitch("IsDevelop", false);
-        }
-
-        await gameEvent.Origin.TellAsync(new[]
-            { $"Set minimum log level to {loggingSwitch.MinimumLevel.ToString()}" });
-    }
-}

Application/Commands/WhoAmICommand.cs

@@ -1,38 +0,0 @@
-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

@@ -1,56 +0,0 @@
-{
-  "Serilog": {
-    "Using": [
-      "Serilog.Sinks.File"
-    ],
-    "MinimumLevel": {
-      "Default": "Information",
-      "Override": {
-        "System": "Warning",
-        "Microsoft": "Warning"
-      }
-    },
-    "WriteTo": [
-      {
-        "Name": "File",
-        "Args": {
-          "path": "Log/IW4MAdmin-Application.log",
-          "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": [
-      "FromLogContext",
-      "WithMachineName",
-      "WithThreadId"
-    ],
-    "Destructure": [
-      {
-        "Name": "ToMaximumDepth",
-        "Args": {
-          "maximumDestructuringDepth": 4
-        }
-      },
-      {
-        "Name": "ToMaximumStringLength",
-        "Args": {
-          "maximumStringLength": 1000
-        }
-      },
-      {
-        "Name": "ToMaximumCollectionCount",
-        "Args": {
-          "maximumCollectionCount": 24
-        }
-      }
-    ]
-  }
-}

Application/Configuration/ScriptPluginConfiguration.cs

@@ -1,15 +0,0 @@
-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/ConfigurationGenerator.cs

@@ -0,0 +1,62 @@
+using SharedLibraryCore;
+using SharedLibraryCore.Configuration;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IW4MAdmin.Application
+{
+    class ConfigurationGenerator
+    {
+        public static List<ServerConfiguration> GenerateServerConfig(List<ServerConfiguration> configList)
+        {
+
+            var loc = Utilities.CurrentLocalization.LocalizationSet;
+            var newConfig = new ServerConfiguration();
+
+            while (string.IsNullOrEmpty(newConfig.IPAddress))
+            {
+                try
+                {
+                    string input = Utilities.PromptString(loc["SETUP_SERVER_IP"]);
+                    IPAddress.Parse(input);
+                    newConfig.IPAddress = input;
+                }
+
+                catch (Exception)
+                {
+                    continue;
+                }
+            }
+
+            while (newConfig.Port == 0)
+            {
+                try
+                {
+                    newConfig.Port = Int16.Parse(Utilities.PromptString(loc["SETUP_SERVER_PORT"]));
+                }
+
+                catch (Exception)
+                {
+                    continue;
+                }
+            }
+
+            newConfig.Password = Utilities.PromptString(loc["SETUP_SERVER_RCON"]);
+            newConfig.AutoMessages = new List<string>();
+            newConfig.Rules = new List<string>();
+
+            newConfig.UseT6MParser = Utilities.PromptBool(loc["SETUP_SERVER_USET6M"]);
+
+            configList.Add(newConfig);
+
+            if (Utilities.PromptBool(loc["SETUP_SERVER_SAVE"]))
+                GenerateServerConfig(configList);
+
+            return configList;
+        }
+    }
+}

Application/CoreEventHandler.cs

@@ -1,145 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using SharedLibraryCore;
-using SharedLibraryCore.Events;
-using SharedLibraryCore.Interfaces;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Logging;
-using SharedLibraryCore.Events.Management;
-using SharedLibraryCore.Events.Server;
-using SharedLibraryCore.Interfaces.Events;
-using ILogger = Microsoft.Extensions.Logging.ILogger;
-
-namespace IW4MAdmin.Application
-{
-    public class CoreEventHandler : ICoreEventHandler
-    {
-        private const int MaxCurrentEvents = 25;
-        private readonly ILogger _logger;
-        private readonly SemaphoreSlim _onProcessingEvents = new(MaxCurrentEvents, MaxCurrentEvents);
-        private readonly ManualResetEventSlim _onEventReady = new(false);
-        private readonly ConcurrentQueue<(IManager, CoreEvent)> _runningEventTasks = new();
-        private CancellationToken _cancellationToken;
-        private int _activeTasks;
-
-        private static readonly GameEvent.EventType[] OverrideEvents =
-        {
-            GameEvent.EventType.Connect,
-            GameEvent.EventType.Disconnect,
-            GameEvent.EventType.Quit,
-            GameEvent.EventType.Stop
-        };
-
-        public CoreEventHandler(ILogger<CoreEventHandler> logger)
-        {
-            _logger = logger;
-        }
-
-        public void QueueEvent(IManager manager, CoreEvent coreEvent)
-        {
-            _runningEventTasks.Enqueue((manager, coreEvent));
-            _onEventReady.Set();
-        }
-
-        public void StartProcessing(CancellationToken token)
-        {
-            _cancellationToken = token;
-
-            while (!_cancellationToken.IsCancellationRequested)
-            {
-                _onEventReady.Reset();
-                
-                try
-                {
-                    _onProcessingEvents.Wait(_cancellationToken);
-
-                    if (!_runningEventTasks.TryDequeue(out var coreEvent))
-                    {
-                        if (_onProcessingEvents.CurrentCount < MaxCurrentEvents)
-                        {
-                            _onProcessingEvents.Release(1);
-                        }
-                        
-                        _onEventReady.Wait(_cancellationToken);
-                        continue;
-                    }
-                    
-                    _logger.LogDebug("Start processing event {Name} {SemaphoreCount} - {QueuedTasks}",
-                        coreEvent.Item2.GetType().Name, _onProcessingEvents.CurrentCount, _runningEventTasks.Count);
-
-                    _ = Task.Factory.StartNew(() =>
-                    {
-                        Interlocked.Increment(ref _activeTasks);
-                        _logger.LogDebug("[Start] Active Tasks = {TaskCount}", _activeTasks);
-                        return HandleEventTaskExecute(coreEvent);
-                    });
-                }
-                catch (OperationCanceledException)
-                {
-                    // ignored
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError(ex, "Could not enqueue event for processing");
-                }
-            }
-        }
-
-        private async Task HandleEventTaskExecute((IManager, CoreEvent) coreEvent)
-        {
-            try
-            {
-                await GetEventTask(coreEvent.Item1, coreEvent.Item2);
-            }
-            catch (OperationCanceledException)
-            {
-                _logger.LogWarning("Event timed out {Type}", coreEvent.Item2.GetType().Name);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Could not complete invoke for {EventType}",
-                    coreEvent.Item2.GetType().Name);
-            }
-            finally
-            {
-                if (_onProcessingEvents.CurrentCount < MaxCurrentEvents)
-                {
-                    _logger.LogDebug("Freeing up event semaphore for next event {SemaphoreCount}",
-                        _onProcessingEvents.CurrentCount);
-                    _onProcessingEvents.Release(1);
-                }
-
-                Interlocked.Decrement(ref _activeTasks);
-                _logger.LogDebug("[Complete] {Type}, Active Tasks = {TaskCount} - {Queue}", coreEvent.Item2.GetType(),
-                    _activeTasks, _runningEventTasks.Count);
-            }
-        }
-
-        private Task GetEventTask(IManager manager, CoreEvent coreEvent)
-        {
-            return coreEvent switch
-            {
-                GameEvent gameEvent => BuildLegacyEventTask(manager, coreEvent, gameEvent),
-                GameServerEvent gameServerEvent => IGameServerEventSubscriptions.InvokeEventAsync(gameServerEvent,
-                    manager.CancellationToken),
-                ManagementEvent managementEvent => IManagementEventSubscriptions.InvokeEventAsync(managementEvent,
-                    manager.CancellationToken),
-                _ => Task.CompletedTask
-            };
-        }
-
-        private async Task BuildLegacyEventTask(IManager manager, CoreEvent coreEvent, GameEvent gameEvent)
-        {
-            if (manager.IsRunning || OverrideEvents.Contains(gameEvent.Type))
-            {
-                await manager.ExecuteEvent(gameEvent);
-                await IGameEventSubscriptions.InvokeEventAsync(coreEvent, manager.CancellationToken);
-                return;
-            }
-            
-            _logger.LogDebug("Skipping event as we're shutting down {EventId}", gameEvent.IncrementalId);
-        }
-    }
-}

Application/EventParsers/BaseEventParser.cs

@@ -1,708 +0,0 @@
-using SharedLibraryCore;
-using SharedLibraryCore.Configuration;
-using SharedLibraryCore.Database.Models;
-using SharedLibraryCore.Interfaces;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Data.Models;
-using Microsoft.Extensions.Logging;
-using SharedLibraryCore.Events.Game;
-using static System.Int32;
-using static SharedLibraryCore.Server;
-using ILogger = Microsoft.Extensions.Logging.ILogger;
-
-namespace IW4MAdmin.Application.EventParsers
-{
-    public class BaseEventParser : IEventParser
-    {
-        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)
-        {
-            _customEventRegistrations =
-                new Dictionary<string, (string, Func<string, IEventParserConfiguration, GameEvent, GameEvent>)>();
-            _logger = logger;
-            _appConfig = appConfig;
-
-            Configuration = new DynamicEventParserConfiguration(parserRegexFactory)
-            {
-                GameDirectory = "main",
-                LocalizeText = "\x15",
-            };
-
-            Configuration.Say.Pattern = @"^(say|sayteam);(-?[A-Fa-f0-9_]{1,32}|bot[0-9]+|0);([0-9]+);([^;]*);(.*)$";
-            Configuration.Say.AddMapping(ParserRegex.GroupType.EventType, 1);
-            Configuration.Say.AddMapping(ParserRegex.GroupType.OriginNetworkId, 2);
-            Configuration.Say.AddMapping(ParserRegex.GroupType.OriginClientNumber, 3);
-            Configuration.Say.AddMapping(ParserRegex.GroupType.OriginName, 4);
-            Configuration.Say.AddMapping(ParserRegex.GroupType.Message, 5);
-
-            Configuration.Quit.Pattern = @"^(Q);(-?[A-Fa-f0-9_]{1,32}|bot[0-9]+|0);([0-9]+);(.*)$";
-            Configuration.Quit.AddMapping(ParserRegex.GroupType.EventType, 1);
-            Configuration.Quit.AddMapping(ParserRegex.GroupType.OriginNetworkId, 2);
-            Configuration.Quit.AddMapping(ParserRegex.GroupType.OriginClientNumber, 3);
-            Configuration.Quit.AddMapping(ParserRegex.GroupType.OriginName, 4);
-
-            Configuration.Join.Pattern = @"^(J);(-?[A-Fa-f0-9_]{1,32}|bot[0-9]+|0);([0-9]+);(.*)$";
-            Configuration.Join.AddMapping(ParserRegex.GroupType.EventType, 1);
-            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,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);
-            Configuration.Damage.AddMapping(ParserRegex.GroupType.TargetTeam, 4);
-            Configuration.Damage.AddMapping(ParserRegex.GroupType.TargetName, 5);
-            Configuration.Damage.AddMapping(ParserRegex.GroupType.OriginNetworkId, 6);
-            Configuration.Damage.AddMapping(ParserRegex.GroupType.OriginClientNumber, 7);
-            Configuration.Damage.AddMapping(ParserRegex.GroupType.OriginTeam, 8);
-            Configuration.Damage.AddMapping(ParserRegex.GroupType.OriginName, 9);
-            Configuration.Damage.AddMapping(ParserRegex.GroupType.Weapon, 10);
-            Configuration.Damage.AddMapping(ParserRegex.GroupType.Damage, 11);
-            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,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);
-            Configuration.Kill.AddMapping(ParserRegex.GroupType.TargetTeam, 4);
-            Configuration.Kill.AddMapping(ParserRegex.GroupType.TargetName, 5);
-            Configuration.Kill.AddMapping(ParserRegex.GroupType.OriginNetworkId, 6);
-            Configuration.Kill.AddMapping(ParserRegex.GroupType.OriginClientNumber, 7);
-            Configuration.Kill.AddMapping(ParserRegex.GroupType.OriginTeam, 8);
-            Configuration.Kill.AddMapping(ParserRegex.GroupType.OriginName, 9);
-            Configuration.Kill.AddMapping(ParserRegex.GroupType.Weapon, 10);
-            Configuration.Kill.AddMapping(ParserRegex.GroupType.Damage, 11);
-            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.SayTeam },
-                { "chat", GameEvent.EventType.Say },
-                { "chatteam", GameEvent.EventType.SayTeam },
-                { "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; }
-
-        public string Version { get; set; } = "CoD";
-
-        public Game GameName { get; set; } = Game.COD;
-
-        public string URLProtocolFormat { get; set; } = "CoD://{{ip}}:{{port}}";
-
-        public string Name { get; set; } = "Call of Duty";
-
-        public virtual GameEvent GenerateGameEvent(string logLine)
-        {
-            var timeMatch = Configuration.Time.PatternMatcher.Match(logLine);
-            var gameTime = 0L;
-
-            if (timeMatch.Success)
-            {
-                if (timeMatch.Values[0].Contains(':'))
-                {
-                    gameTime = timeMatch
-                        .Values
-                        .Skip(2)
-                        // this converts the timestamp into seconds passed
-                        .Select((value, index) => long.Parse(value.ToString()) * (index == 0 ? 60 : 1))
-                        .Sum();
-                }
-                else
-                {
-                    gameTime = long.Parse(timeMatch.Values[0]);
-                }
-
-                // we want to strip the time from the log line
-                logLine = logLine[timeMatch.Values.First().Length..].Trim();
-            }
-
-            var (eventType, eventKey) = GetEventTypeFromLine(logLine);
-
-            switch (eventType)
-            {
-                case GameEvent.EventType.Say or GameEvent.EventType.SayTeam:
-                    return ParseMessageEvent(logLine, gameTime, eventType) ?? GenerateDefaultEvent(logLine, gameTime);
-                case GameEvent.EventType.Kill:
-                    return ParseKillEvent(logLine, gameTime) ?? GenerateDefaultEvent(logLine, gameTime);
-                case GameEvent.EventType.Damage:
-                    return ParseDamageEvent(logLine, gameTime) ?? GenerateDefaultEvent(logLine, gameTime);
-                case GameEvent.EventType.PreConnect:
-                    return ParseClientEnterMatchEvent(logLine, gameTime) ?? GenerateDefaultEvent(logLine, gameTime);
-                case GameEvent.EventType.JoinTeam:
-                    return ParseJoinTeamEvent(logLine, gameTime) ?? GenerateDefaultEvent(logLine, gameTime);
-                case GameEvent.EventType.PreDisconnect:
-                    return ParseClientExitMatchEvent(logLine, gameTime) ?? GenerateDefaultEvent(logLine, gameTime);
-                case GameEvent.EventType.MapEnd:
-                    return ParseMatchEndEvent(logLine, gameTime);
-                case GameEvent.EventType.MapChange:
-                    return ParseMatchStartEvent(logLine, gameTime);
-            }
-            
-            if (logLine.StartsWith("GSE;"))
-            {
-                return new GameScriptEvent
-                {
-                    ScriptData = logLine,
-                    GameTime = gameTime,
-                    Source = GameEvent.EventSource.Log
-                };
-            }
-
-            if (eventKey is null || !_customEventRegistrations.ContainsKey(eventKey))
-            {
-                return GenerateDefaultEvent(logLine, gameTime);
-            }
-
-            var eventModifier = _customEventRegistrations[eventKey];
-
-            try
-            {
-                return eventModifier.Item2(logLine, Configuration, new GameEvent()
-                {
-                    Type = GameEvent.EventType.Other,
-                    Data = logLine,
-                    Subtype = eventModifier.Item1,
-                    GameTime = gameTime,
-                    Source = GameEvent.EventSource.Log
-                });
-            }
-
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Could not handle custom log event generation");
-            }
-
-            return GenerateDefaultEvent(logLine, gameTime);
-        }
-
-        private static GameEvent GenerateDefaultEvent(string logLine, long gameTime)
-        {
-            return new GameEvent
-            {
-                Type = GameEvent.EventType.Unknown,
-                Data = logLine,
-                Origin = Utilities.IW4MAdminClient(),
-                Target = Utilities.IW4MAdminClient(),
-                RequiredEntity = GameEvent.EventRequiredEntity.None,
-                GameTime = gameTime,
-                Source = GameEvent.EventSource.Log
-            };
-        }
-
-        private static GameEvent ParseMatchStartEvent(string logLine, long gameTime)
-        {
-            var dump = logLine.Replace("InitGame: ", "").DictionaryFromKeyValue();
-
-            return new MatchStartEvent
-            {
-                Type = GameEvent.EventType.MapChange,
-                Data = logLine,
-                Origin = Utilities.IW4MAdminClient(),
-                Target = Utilities.IW4MAdminClient(),
-                Extra = dump,
-                RequiredEntity = GameEvent.EventRequiredEntity.None,
-                GameTime = gameTime,
-                Source = GameEvent.EventSource.Log,
-
-                // V2
-                SessionData = dump
-            };
-        }
-
-        private static GameEvent ParseMatchEndEvent(string logLine, long gameTime)
-        {
-            return new MatchEndEvent
-            {
-                Type = GameEvent.EventType.MapEnd,
-                Data = logLine,
-                Origin = Utilities.IW4MAdminClient(),
-                Target = Utilities.IW4MAdminClient(),
-                RequiredEntity = GameEvent.EventRequiredEntity.None,
-                GameTime = gameTime,
-                Source = GameEvent.EventSource.Log,
-
-                // V2
-                SessionData = logLine
-            };
-        }
-
-        private GameEvent ParseClientExitMatchEvent(string logLine, long gameTime)
-        {
-            var match = Configuration.Quit.PatternMatcher.Match(logLine);
-
-            if (!match.Success)
-            {
-                return null;
-            }
-
-            var originIdString =
-                match.Values[Configuration.Quit.GroupMapping[ParserRegex.GroupType.OriginNetworkId]];
-            var originName = match.Values[Configuration.Quit.GroupMapping[ParserRegex.GroupType.OriginName]]
-                ?.TrimNewLine();
-            var originClientNumber =
-                Convert.ToInt32(
-                    match.Values[Configuration.Join.GroupMapping[ParserRegex.GroupType.OriginClientNumber]]);
-
-            var networkId = originIdString.IsBotGuid()
-                ? originName.GenerateGuidFromString()
-                : originIdString.ConvertGuidToLong(Configuration.GuidNumberStyle);
-
-            return new ClientExitMatchEvent
-            {
-                Type = GameEvent.EventType.PreDisconnect,
-                Data = logLine,
-                Origin = new EFClient
-                {
-                    CurrentAlias = new EFAlias
-                    {
-                        Name = originName
-                    },
-                    NetworkId = networkId,
-                    ClientNumber = originClientNumber,
-                    State = EFClient.ClientState.Disconnecting
-                },
-                RequiredEntity = GameEvent.EventRequiredEntity.None,
-                IsBlocking = true,
-                GameTime = gameTime,
-                Source = GameEvent.EventSource.Log,
-
-                // V2
-                ClientName = originName,
-                ClientNetworkId = originIdString,
-                ClientSlotNumber = originClientNumber
-            };
-        }
-
-        private GameEvent ParseJoinTeamEvent(string logLine, long gameTime)
-        {
-            var match = Configuration.JoinTeam.PatternMatcher.Match(logLine);
-
-            if (!match.Success)
-            {
-                return null;
-            }
-
-            var originIdString =
-                match.Values[Configuration.JoinTeam.GroupMapping[ParserRegex.GroupType.OriginNetworkId]];
-            var originName = match.Values[Configuration.JoinTeam.GroupMapping[ParserRegex.GroupType.OriginName]]
-                ?.TrimNewLine();
-            var team = match.Values[Configuration.JoinTeam.GroupMapping[ParserRegex.GroupType.OriginTeam]];
-            var clientSlotNumber =
-                Parse(match.Values[
-                    Configuration.JoinTeam.GroupMapping[ParserRegex.GroupType.OriginClientNumber]]);
-
-            if (Configuration.TeamMapping.ContainsKey(team))
-            {
-                team = Configuration.TeamMapping[team].ToString();
-            }
-
-            var networkId = originIdString.IsBotGuid()
-                ? originName.GenerateGuidFromString()
-                : originIdString.ConvertGuidToLong(Configuration.GuidNumberStyle);
-
-            return new ClientJoinTeamEvent
-            {
-                Type = GameEvent.EventType.JoinTeam,
-                Data = logLine,
-                Origin = new EFClient
-                {
-                    CurrentAlias = new EFAlias
-                    {
-                        Name = originName
-                    },
-                    NetworkId = networkId,
-                    ClientNumber = clientSlotNumber,
-                    State = EFClient.ClientState.Connected,
-                },
-                Extra = team,
-                RequiredEntity = GameEvent.EventRequiredEntity.Origin,
-                GameTime = gameTime,
-                Source = GameEvent.EventSource.Log,
-
-                // V2
-                TeamName = team,
-                ClientName = originName,
-                ClientNetworkId = originIdString,
-                ClientSlotNumber = clientSlotNumber
-            };
-        }
-
-        private GameEvent ParseClientEnterMatchEvent(string logLine, long gameTime)
-        {
-            var match = Configuration.Join.PatternMatcher.Match(logLine);
-
-            if (!match.Success)
-            {
-                return null;
-            }
-
-            var originIdString = match.Values[Configuration.Join.GroupMapping[ParserRegex.GroupType.OriginNetworkId]];
-            var originName = match.Values[Configuration.Join.GroupMapping[ParserRegex.GroupType.OriginName]]
-                .TrimNewLine();
-            var originClientNumber =
-                Convert.ToInt32(
-                    match.Values[Configuration.Join.GroupMapping[ParserRegex.GroupType.OriginClientNumber]]);
-
-            var networkId = originIdString.IsBotGuid()
-                ? originName.GenerateGuidFromString()
-                : originIdString.ConvertGuidToLong(Configuration.GuidNumberStyle);
-
-            return new ClientEnterMatchEvent
-            {
-                Type = GameEvent.EventType.PreConnect,
-                Data = logLine,
-                Origin = new EFClient
-                {
-                    CurrentAlias = new EFAlias
-                    {
-                        Name = originName
-                    },
-                    NetworkId = networkId,
-                    ClientNumber = originClientNumber,
-                    State = EFClient.ClientState.Connecting,
-                },
-                Extra = originIdString,
-                RequiredEntity = GameEvent.EventRequiredEntity.None,
-                IsBlocking = true,
-                GameTime = gameTime,
-                Source = GameEvent.EventSource.Log,
-
-                // V2
-                ClientName = originName,
-                ClientNetworkId = originIdString,
-                ClientSlotNumber = originClientNumber
-            };
-        }
-
-        #region DAMAGE
-
-        private GameEvent ParseDamageEvent(string logLine, long gameTime)
-        {
-            var match = Configuration.Damage.PatternMatcher.Match(logLine);
-
-            if (!match.Success)
-            {
-                return null;
-            }
-
-            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]]
-                ?.TrimNewLine();
-            var targetName = match.Values[Configuration.Damage.GroupMapping[ParserRegex.GroupType.TargetName]]
-                ?.TrimNewLine();
-
-            var originId = originIdString.IsBotGuid()
-                ? originName.GenerateGuidFromString()
-                : originIdString.ConvertGuidToLong(Configuration.GuidNumberStyle, Utilities.WORLD_ID);
-            var targetId = targetIdString.IsBotGuid()
-                ? targetName.GenerateGuidFromString()
-                : targetIdString.ConvertGuidToLong(Configuration.GuidNumberStyle, Utilities.WORLD_ID);
-
-            var originClientNumber =
-                Parse(match.Values[Configuration.Damage.GroupMapping[ParserRegex.GroupType.OriginClientNumber]]);
-            var targetClientNumber =
-                Parse(match.Values[Configuration.Damage.GroupMapping[ParserRegex.GroupType.TargetClientNumber]]);
-
-            var originTeamName =
-                match.Values[Configuration.Damage.GroupMapping[ParserRegex.GroupType.OriginTeam]];
-            var targetTeamName =
-                match.Values[Configuration.Damage.GroupMapping[ParserRegex.GroupType.TargetTeam]];
-
-            if (Configuration.TeamMapping.ContainsKey(originTeamName))
-            {
-                originTeamName = Configuration.TeamMapping[originTeamName].ToString();
-            }
-
-            if (Configuration.TeamMapping.ContainsKey(targetTeamName))
-            {
-                targetTeamName = Configuration.TeamMapping[targetTeamName].ToString();
-            }
-
-            var weaponName = match.Values[Configuration.Damage.GroupMapping[ParserRegex.GroupType.Weapon]];
-            TryParse(match.Values[Configuration.Damage.GroupMapping[ParserRegex.GroupType.Damage]],
-                out var damage);
-            var meansOfDeath =
-                match.Values[Configuration.Damage.GroupMapping[ParserRegex.GroupType.MeansOfDeath]];
-            var hitLocation =
-                match.Values[Configuration.Damage.GroupMapping[ParserRegex.GroupType.HitLocation]];
-
-            return new ClientDamageEvent
-            {
-                Type = GameEvent.EventType.Damage,
-                Data = logLine,
-                Origin = new EFClient { NetworkId = originId, ClientNumber = originClientNumber },
-                Target = new EFClient { NetworkId = targetId, ClientNumber = targetClientNumber },
-                RequiredEntity = GameEvent.EventRequiredEntity.Origin | GameEvent.EventRequiredEntity.Target,
-                GameTime = gameTime,
-                Source = GameEvent.EventSource.Log,
-
-                // V2
-                ClientName = originName,
-                ClientNetworkId = originIdString,
-                ClientSlotNumber = originClientNumber,
-                AttackerTeamName = originTeamName,
-                VictimClientName = targetName,
-                VictimNetworkId = targetIdString,
-                VictimClientSlotNumber = targetClientNumber,
-                VictimTeamName = targetTeamName,
-                WeaponName = weaponName,
-                Damage = damage,
-                MeansOfDeath = meansOfDeath,
-                HitLocation = hitLocation
-            };
-        }
-
-        private GameEvent ParseKillEvent(string logLine, long gameTime)
-        {
-            var match = Configuration.Kill.PatternMatcher.Match(logLine);
-
-            if (!match.Success)
-            {
-                return null;
-            }
-
-            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]]
-                ?.TrimNewLine();
-            var targetName = match.Values[Configuration.Kill.GroupMapping[ParserRegex.GroupType.TargetName]]
-                ?.TrimNewLine();
-
-            var originId = originIdString.IsBotGuid()
-                ? originName.GenerateGuidFromString()
-                : originIdString.ConvertGuidToLong(Configuration.GuidNumberStyle, Utilities.WORLD_ID);
-            var targetId = targetIdString.IsBotGuid()
-                ? targetName.GenerateGuidFromString()
-                : targetIdString.ConvertGuidToLong(Configuration.GuidNumberStyle, Utilities.WORLD_ID);
-
-            var originClientNumber =
-                Parse(match.Values[Configuration.Kill.GroupMapping[ParserRegex.GroupType.OriginClientNumber]]);
-            var targetClientNumber =
-                Parse(match.Values[Configuration.Kill.GroupMapping[ParserRegex.GroupType.TargetClientNumber]]);
-
-            var originTeamName =
-                match.Values[Configuration.Kill.GroupMapping[ParserRegex.GroupType.OriginTeam]];
-            var targetTeamName =
-                match.Values[Configuration.Kill.GroupMapping[ParserRegex.GroupType.TargetTeam]];
-
-            if (Configuration.TeamMapping.ContainsKey(originTeamName))
-            {
-                originTeamName = Configuration.TeamMapping[originTeamName].ToString();
-            }
-
-            if (Configuration.TeamMapping.ContainsKey(targetTeamName))
-            {
-                targetTeamName = Configuration.TeamMapping[targetTeamName].ToString();
-            }
-
-            var weaponName = match.Values[Configuration.Kill.GroupMapping[ParserRegex.GroupType.Weapon]];
-            TryParse(match.Values[Configuration.Kill.GroupMapping[ParserRegex.GroupType.Damage]],
-                out var damage);
-            var meansOfDeath =
-                match.Values[Configuration.Kill.GroupMapping[ParserRegex.GroupType.MeansOfDeath]];
-            var hitLocation =
-                match.Values[Configuration.Kill.GroupMapping[ParserRegex.GroupType.HitLocation]];
-
-            return new ClientKillEvent
-            {
-                Type = GameEvent.EventType.Kill,
-                Data = logLine,
-                Origin = new EFClient { NetworkId = originId, ClientNumber = originClientNumber },
-                Target = new EFClient { NetworkId = targetId, ClientNumber = targetClientNumber },
-                RequiredEntity = GameEvent.EventRequiredEntity.Origin | GameEvent.EventRequiredEntity.Target,
-                GameTime = gameTime,
-                Source = GameEvent.EventSource.Log,
-
-                // V2
-                ClientName = originName,
-                ClientNetworkId = originIdString,
-                ClientSlotNumber = originClientNumber,
-                AttackerTeamName = originTeamName,
-                VictimClientName = targetName,
-                VictimNetworkId = targetIdString,
-                VictimClientSlotNumber = targetClientNumber,
-                VictimTeamName = targetTeamName,
-                WeaponName = weaponName,
-                Damage = damage,
-                MeansOfDeath = meansOfDeath,
-                HitLocation = hitLocation
-            };
-        }
-
-        #endregion
-
-        #region MESSAGE
-
-        private GameEvent ParseMessageEvent(string logLine, long gameTime, GameEvent.EventType eventType)
-        {
-            var matchResult = Configuration.Say.PatternMatcher.Match(logLine);
-
-            if (!matchResult.Success)
-            {
-                return null;
-            }
-
-            var message = new string(matchResult.Values[Configuration.Say.GroupMapping[ParserRegex.GroupType.Message]]
-                .Where(c => !char.IsControl(c)).ToArray());
-
-            if (message.StartsWith("/"))
-            {
-                message = message[1..];
-            }
-
-            if (String.IsNullOrEmpty(message))
-            {
-                return null;
-            }
-
-            var originIdString =
-                matchResult.Values[Configuration.Say.GroupMapping[ParserRegex.GroupType.OriginNetworkId]];
-            var originName = matchResult.Values[Configuration.Say.GroupMapping[ParserRegex.GroupType.OriginName]]
-                ?.TrimNewLine();
-            var clientNumber =
-                Parse(matchResult.Values[Configuration.Say.GroupMapping[ParserRegex.GroupType.OriginClientNumber]]);
-
-            var originId = originIdString.IsBotGuid()
-                ? originName.GenerateGuidFromString()
-                : originIdString.ConvertGuidToLong(Configuration.GuidNumberStyle);
-
-
-            if (message.StartsWith(_appConfig.CommandPrefix) || message.StartsWith(_appConfig.BroadcastCommandPrefix))
-            {
-                return new ClientCommandEvent
-                {
-                    Type = GameEvent.EventType.Command,
-                    Data = message,
-                    Origin = new EFClient { NetworkId = originId, ClientNumber = clientNumber },
-                    Message = message,
-                    Extra = logLine,
-                    RequiredEntity = GameEvent.EventRequiredEntity.Origin,
-                    GameTime = gameTime,
-                    Source = GameEvent.EventSource.Log,
-
-                    //V2
-                    ClientName = originName,
-                    ClientNetworkId = originIdString,
-                    ClientSlotNumber = clientNumber,
-                    IsTeamMessage = eventType == GameEvent.EventType.SayTeam
-                };
-            }
-
-            return new ClientMessageEvent
-            {
-                Type = GameEvent.EventType.Say,
-                Data = message,
-                Origin = new EFClient { NetworkId = originId, ClientNumber = clientNumber },
-                Message = message,
-                Extra = logLine,
-                RequiredEntity = GameEvent.EventRequiredEntity.Origin,
-                GameTime = gameTime,
-                Source = GameEvent.EventSource.Log,
-
-                //V2
-                ClientName = originName,
-                ClientNetworkId = originIdString,
-                ClientSlotNumber = clientNumber,
-                IsTeamMessage = eventType == GameEvent.EventType.SayTeam
-            };
-        }
-
-        #endregion
-
-        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);
-        }
-
-        /// <inheritdoc/>
-        public void RegisterCustomEvent(string eventSubtype, string eventTriggerValue,
-            Func<string, IEventParserConfiguration, GameEvent, GameEvent> eventModifier)
-        {
-            if (string.IsNullOrWhiteSpace(eventSubtype))
-            {
-                throw new ArgumentException("Event subtype cannot be empty");
-            }
-
-            if (string.IsNullOrWhiteSpace(eventTriggerValue))
-            {
-                throw new ArgumentException("Event trigger value cannot be empty");
-            }
-
-            if (eventModifier == null)
-            {
-                throw new ArgumentException("Event modifier must be specified");
-            }
-
-            if (_customEventRegistrations.ContainsKey(eventTriggerValue))
-            {
-                throw new ArgumentException($"Event trigger value '{eventTriggerValue}' is already registered");
-            }
-
-            _customEventRegistrations.Add(eventTriggerValue, (eventSubtype, eventModifier));
-        }
-    }
-}

Application/EventParsers/DynamicEventParser.cs

@@ -1,17 +0,0 @@
-using SharedLibraryCore.Configuration;
-using SharedLibraryCore.Interfaces;
-using ILogger = Microsoft.Extensions.Logging.ILogger;
-
-namespace IW4MAdmin.Application.EventParsers
-{
-    /// <summary>
-    /// empty generic implementation of the IEventParserConfiguration
-    /// allows script plugins to generate dynamic event parsers
-    /// </summary>
-    sealed internal class DynamicEventParser : BaseEventParser
-    {
-        public DynamicEventParser(IParserRegexFactory parserRegexFactory, ILogger logger, ApplicationConfiguration appConfig) : base(parserRegexFactory, logger, appConfig)
-        {
-        }
-    }
-}

Application/EventParsers/DynamicEventParserConfiguration.cs

@@ -1,45 +0,0 @@
-using System.Collections.Generic;
-using SharedLibraryCore.Interfaces;
-using System.Globalization;
-using SharedLibraryCore;
-using SharedLibraryCore.Database.Models;
-
-namespace IW4MAdmin.Application.EventParsers
-{
-    /// <summary>
-    /// generic implementation of the IEventParserConfiguration
-    /// allows script plugins to generate dynamic configurations
-    /// </summary>
-    internal sealed class DynamicEventParserConfiguration : IEventParserConfiguration
-    {
-        public string GameDirectory { get; set; }
-        public ParserRegex Say { get; set; }
-        public string LocalizeText { 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/EventParsers/IW4EventParser.cs

@@ -0,0 +1,110 @@
+using System;
+using System.Linq;
+using System.Text.RegularExpressions;
+using SharedLibraryCore;
+using SharedLibraryCore.Interfaces;
+using SharedLibraryCore.Objects;
+
+namespace Application.EventParsers
+{
+    class IW4EventParser : IEventParser
+    {
+        public GameEvent GetEvent(Server server, string logLine)
+        {
+            string[] lineSplit = logLine.Split(';');
+            string cleanedEventLine = Regex.Replace(lineSplit[0], @"[0-9]+:[0-9]+\ ", "").Trim();
+
+            if (cleanedEventLine[0] == 'K')
+            {
+                if (!server.CustomCallback)
+                {
+                    return new GameEvent()
+                    {
+                        Type = GameEvent.EventType.Script,
+                        Data = logLine,
+                        Origin = server.GetPlayersAsList().First(c => c.ClientNumber == Utilities.ClientIdFromString(lineSplit, 6)),
+                        Target = server.GetPlayersAsList().First(c => c.ClientNumber == Utilities.ClientIdFromString(lineSplit, 2)),
+                        Owner = server
+                    };
+                }
+            }
+
+            if (cleanedEventLine == "say" || cleanedEventLine == "sayteam")
+            {
+                return new GameEvent()
+                {
+                    Type = GameEvent.EventType.Say,
+                    Data = lineSplit[4].Replace("\x15", ""),
+                    Origin = server.GetPlayersAsList().First(c => c.ClientNumber == Utilities.ClientIdFromString(lineSplit, 2)),
+                    Owner = server,
+                    Message = lineSplit[4].Replace("\x15", "")
+                };
+            }
+
+            if (cleanedEventLine.Contains("ScriptKill"))
+            {
+                return new GameEvent()
+                {
+                    Type = GameEvent.EventType.Script,
+                    Data = logLine,
+                    Origin = server.GetPlayersAsList().First(c => c.NetworkId == lineSplit[1].ConvertLong()),
+                    Target = server.GetPlayersAsList().First(c => c.NetworkId == lineSplit[2].ConvertLong()),
+                    Owner = server
+                };
+            }
+
+            if (cleanedEventLine.Contains("ExitLevel"))
+            {
+                return new GameEvent()
+                {
+                    Type = GameEvent.EventType.MapEnd,
+                    Data = lineSplit[0],
+                    Origin = new Player()
+                    {
+                        ClientId = 1
+                    },
+                    Target = new Player()
+                    {
+                        ClientId = 1
+                    },
+                    Owner = server
+                };
+            }
+
+            if (cleanedEventLine.Contains("InitGame"))
+            {
+                return new GameEvent()
+                {
+                    Type = GameEvent.EventType.MapChange,
+                    Data = lineSplit[0],
+                    Origin = new Player()
+                    {
+                        ClientId = 1
+                    },
+                    Target = new Player()
+                    {
+                        ClientId = 1
+                    },
+                    Owner = server
+                };
+            }
+
+            return new GameEvent()
+            {
+                Type = GameEvent.EventType.Unknown,
+                Origin = new Player()
+                {
+                    ClientId = 1
+                },
+                Target = new Player()
+                {
+                    ClientId = 1
+                },
+                Owner = server
+            };
+        }
+
+        // other parsers can derive from this parser so we make it virtual
+        public virtual string GetGameDir() => "userraw";
+    }
+}

Application/EventParsers/IW5EventParser.cs

@@ -0,0 +1,12 @@
+using SharedLibraryCore.Interfaces;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Application.EventParsers
+{
+    class IW5EventParser : IW4EventParser
+    {
+        public override string GetGameDir() => "rzodemo";
+    }
+}

Application/EventParsers/ParserPatternMatcher.cs

@@ -1,35 +0,0 @@
-using IW4MAdmin.Application.Misc;
-using SharedLibraryCore.Interfaces;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.RegularExpressions;
-
-namespace IW4MAdmin.Application.EventParsers
-{
-    /// <summary>
-    /// implementation of the IParserPatternMatcher for windows (really it's the only implementation)
-    /// </summary>
-    public class ParserPatternMatcher : IParserPatternMatcher
-    {
-        private Regex regex;
-
-        /// <inheritdoc/>
-        public void Compile(string pattern)
-        {
-            regex = new Regex(pattern, RegexOptions.Compiled | RegexOptions.IgnoreCase);
-        }
-
-        /// <inheritdoc/>
-        public IMatchResult Match(string input)
-        {
-            var match = regex.Match(input);
-
-            return new ParserMatchResult()
-            {
-                Success = match.Success,
-                Values = (match.Groups as IEnumerable<object>)?
-                    .Select(_item => _item.ToString()).ToArray() ?? new string[0]
-            };
-        }
-    }
-}

Application/EventParsers/T6MEventParser.cs

@@ -0,0 +1,112 @@
+using System;
+using System.IO;
+using System.Linq;
+using System.Text.RegularExpressions;
+using SharedLibraryCore;
+using SharedLibraryCore.Interfaces;
+using SharedLibraryCore.Objects;
+
+namespace Application.EventParsers
+{
+    class T6MEventParser : IEventParser
+    {
+        public GameEvent GetEvent(Server server, string logLine)
+        {
+            string cleanedLogLine = Regex.Replace(logLine, @"^ *[0-9]+:[0-9]+ *", "");
+            string[] lineSplit = cleanedLogLine.Split(';');
+
+            if (lineSplit[0][0] == 'K')
+            {
+                return new GameEvent()
+                {
+                    Type = GameEvent.EventType.Script,
+                    Data = cleanedLogLine,
+                    Origin = server.GetPlayersAsList().First(c => c.ClientNumber == Utilities.ClientIdFromString(lineSplit, 6)),
+                    Target = server.GetPlayersAsList().First(c => c.ClientNumber == Utilities.ClientIdFromString(lineSplit, 2)),
+                    Owner = server
+                };
+            }
+
+            if (lineSplit[0][0] == 'D')
+            {
+                return new GameEvent()
+                {
+                    Type = GameEvent.EventType.Damage,
+                    Data = cleanedLogLine,
+                    Origin = server.GetPlayersAsList().First(c => c.ClientNumber == Utilities.ClientIdFromString(lineSplit, 6)),
+                    Target = server.GetPlayersAsList().First(c => c.ClientNumber == Utilities.ClientIdFromString(lineSplit, 2)),
+                    Owner = server
+                };
+            }
+
+            if (lineSplit[0] == "say" || lineSplit[0] == "sayteam")
+            {
+                return new GameEvent()
+                {
+                    Type = GameEvent.EventType.Say,
+                    Data = lineSplit[4],
+                    Origin = server.GetPlayersAsList().First(c => c.ClientNumber == Utilities.ClientIdFromString(lineSplit, 2)),
+                    Owner = server,
+                    Message = lineSplit[4]
+                };
+            }
+
+            if (lineSplit[0].Contains("ExitLevel"))
+            {
+                return new GameEvent()
+                {
+                    Type = GameEvent.EventType.MapEnd,
+                    Data = lineSplit[0],
+                    Origin = new Player()
+                    {
+                        ClientId = 1
+                    },
+                    Target = new Player()
+                    {
+                        ClientId = 1
+                    },
+                    Owner = server
+                };
+            }
+
+            /*if (lineSplit[0].Contains("ShutdownGame"))
+            {
+                
+            }*/
+
+            if (lineSplit[0].Contains("InitGame"))
+            {
+                return new GameEvent()
+                {
+                    Type = GameEvent.EventType.MapChange,
+                    Data = lineSplit[0],
+                    Origin = new Player()
+                    {
+                        ClientId = 1
+                    },
+                    Target = new Player()
+                    {
+                        ClientId = 1
+                    },
+                    Owner = server
+                };
+            }
+
+            return new GameEvent()
+            {
+                Type = GameEvent.EventType.Unknown,
+                Origin = new Player()
+                {
+                    ClientId = 1
+                },
+                Target = new Player()
+                {
+                    ClientId = 1
+                },
+                Owner = server
+            };
+        }
+
+        public string GetGameDir() => $"t6r{Path.DirectorySeparatorChar}data";
+    }
+}

Application/Extensions/CommandExtensions.cs

@@ -1,35 +0,0 @@
-using System;
-using System.Collections.Generic;
-using SharedLibraryCore.Interfaces;
-using System.Linq;
-using IW4MAdmin.Application.Plugin.Script;
-using SharedLibraryCore;
-using SharedLibraryCore.Configuration;
-
-namespace IW4MAdmin.Application.Extensions
-{
-    public static class CommandExtensions
-    {
-        /// <summary>
-        /// determines the command configuration name for given manager command
-        /// </summary>
-        /// <param name="command">command to determine config name for</param>
-        /// <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;
-        }
-
-        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/ScriptPluginExtensions.cs

@@ -1,28 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using Data.Models.Client.Stats;
-using Microsoft.EntityFrameworkCore;
-
-namespace IW4MAdmin.Application.Extensions;
-
-public static class ScriptPluginExtensions
-{
-    public static IEnumerable<object> GetClientsBasicData(
-        this DbSet<Data.Models.Client.EFClient> set, int[] clientIds)
-    {
-        return set.Where(client => clientIds.Contains(client.ClientId))
-            .Select(client => new
-            {
-                client.ClientId,
-                client.CurrentAlias,
-                client.Level,
-                client.NetworkId
-            }).ToList();
-    }
-
-    public static IEnumerable<object> GetClientsStatData(this DbSet<EFClientStatistics> set, int[] clientIds,
-        double serverId)
-    {
-        return set.Where(stat => clientIds.Contains(stat.ClientId) && stat.ServerId == (long)serverId).ToList();
-    }
-}

Application/Extensions/StartupExtensions.cs

@@ -1,126 +0,0 @@
-using System;
-using System.IO;
-using System.Runtime.InteropServices;
-using Data.MigrationContext;
-using Microsoft.Data.Sqlite;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Serilog;
-using Serilog.Core;
-using Serilog.Events;
-using SharedLibraryCore;
-using SharedLibraryCore.Configuration;
-using ILogger = Serilog.ILogger;
-
-namespace IW4MAdmin.Application.Extensions
-{
-    public static class StartupExtensions
-    {
-        private static ILogger _defaultLogger;
-        private static readonly LoggingLevelSwitch LevelSwitch = new();
-        private static readonly LoggingLevelSwitch MicrosoftLevelSwitch = new();
-        private static readonly LoggingLevelSwitch SystemLevelSwitch = new();
-
-        public static IServiceCollection AddBaseLogger(this IServiceCollection services,
-            ApplicationConfiguration appConfig)
-        {
-            if (_defaultLogger == null)
-            {
-                var configuration = new ConfigurationBuilder()
-                    .AddJsonFile(Path.Join(Utilities.OperatingDirectory, "Configuration", "LoggingConfiguration.json"))
-                    .Build();
-
-                var loggerConfig = new LoggerConfiguration()
-                    .ReadFrom.Configuration(configuration);
-
-                LevelSwitch.MinimumLevel = Enum.Parse<LogEventLevel>(configuration["Serilog:MinimumLevel:Default"]);
-                MicrosoftLevelSwitch.MinimumLevel = Enum.Parse<LogEventLevel>(configuration["Serilog:MinimumLevel:Override:Microsoft"]);
-                SystemLevelSwitch.MinimumLevel = Enum.Parse<LogEventLevel>(configuration["Serilog:MinimumLevel:Override:System"]);
-
-                loggerConfig = loggerConfig.MinimumLevel.ControlledBy(LevelSwitch);
-                loggerConfig = loggerConfig.MinimumLevel.Override("Microsoft", MicrosoftLevelSwitch)
-                    .MinimumLevel.Override("System", SystemLevelSwitch);
-
-                if (Utilities.IsDevelopment)
-                {
-                    loggerConfig = loggerConfig.WriteTo.Console(
-                            outputTemplate:
-                            "[{Timestamp:HH:mm:ss} {Server} {Level:u3}] {Message:lj}{NewLine}{Exception}")
-                            .MinimumLevel.Override("Microsoft", LogEventLevel.Information)
-                            .MinimumLevel.Debug();
-                }
-
-                _defaultLogger = loggerConfig.CreateLogger();
-            }
-
-            services.AddSingleton((string context) =>
-            {
-                return context.ToLower() switch
-                {
-                    "microsoft" => MicrosoftLevelSwitch,
-                    "system" => SystemLevelSwitch,
-                    _ => LevelSwitch
-                };
-            });
-            services.AddLogging(builder => builder.AddSerilog(_defaultLogger, dispose: true));
-            services.AddSingleton(new LoggerFactory()
-                .AddSerilog(_defaultLogger, true));
-            return services;
-        }
-
-        public static IServiceCollection AddDatabaseContextOptions(this IServiceCollection services,
-            ApplicationConfiguration appConfig)
-        {
-            var activeProvider = appConfig.DatabaseProvider?.ToLower();
-
-            if (string.IsNullOrEmpty(appConfig.ConnectionString) || activeProvider == "sqlite")
-            {
-                var currentPath = Utilities.OperatingDirectory;
-                currentPath = !RuntimeInformation.IsOSPlatform(OSPlatform.Windows)
-                    ? $"{Path.DirectorySeparatorChar}{currentPath}"
-                    : currentPath;
-
-                var connectionStringBuilder = new SqliteConnectionStringBuilder
-                    {DataSource = Path.Join(currentPath, "Database", "Database.db")};
-                var connectionString = connectionStringBuilder.ToString();
-
-                services.AddSingleton(sp => (DbContextOptions) new DbContextOptionsBuilder<SqliteDatabaseContext>()
-                    .UseSqlite(connectionString)
-                    .UseLoggerFactory(sp.GetRequiredService<ILoggerFactory>())
-                    .EnableSensitiveDataLogging().Options);
-                return services;
-            }
-
-            switch (activeProvider)
-            {
-                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(connectionString, ServerVersion.AutoDetect(connectionString),
-                            mysqlOptions => mysqlOptions.EnableRetryOnFailure())
-                        .UseLoggerFactory(sp.GetRequiredService<ILoggerFactory>()).Options);
-                    return services;
-                case "postgresql":
-                    appendTimeout = !appConfig.ConnectionString.Contains("Command Timeout",
-                        StringComparison.InvariantCultureIgnoreCase);
-                    services.AddSingleton(sp =>
-                        (DbContextOptions) new DbContextOptionsBuilder<PostgresqlDatabaseContext>()
-                            .UseNpgsql(appConfig.ConnectionString + (appendTimeout ? ";Command Timeout=0" : ""),
-                                postgresqlOptions =>
-                                {
-                                    postgresqlOptions.EnableRetryOnFailure();
-                                    postgresqlOptions.SetPostgresVersion(new Version("12.9"));
-                                })
-                            .UseLoggerFactory(sp.GetRequiredService<ILoggerFactory>()).Options);
-                    return services;
-                default:
-                    throw new ArgumentException($"No context available for {appConfig.DatabaseProvider}");
-            }
-        }
-    }
-}

Application/Factories/ConfigurationHandlerFactory.cs

@@ -1,34 +0,0 @@
-using System.Threading.Tasks;
-using IW4MAdmin.Application.Misc;
-using SharedLibraryCore.Interfaces;
-
-namespace IW4MAdmin.Application.Factories
-{
-    /// <summary>
-    /// implementation of IConfigurationHandlerFactory
-    /// provides base functionality to create configuration handlers
-    /// </summary>
-    public class ConfigurationHandlerFactory : IConfigurationHandlerFactory
-    {
-        /// <summary>
-        /// creates a base configuration handler
-        /// </summary>
-        /// <typeparam name="T">base configuration type</typeparam>
-        /// <param name="name">name of the config file</param>
-        /// <returns></returns>
-        public IConfigurationHandler<T> GetConfigurationHandler<T>(string name) where T : IBaseConfiguration
-        {
-            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/DatabaseContextFactory.cs

@@ -1,62 +0,0 @@
-using System;
-using Data.Abstractions;
-using Data.Context;
-using Data.MigrationContext;
-using Microsoft.EntityFrameworkCore;
-using SharedLibraryCore.Configuration;
-
-namespace IW4MAdmin.Application.Factories
-{
-    /// <summary>
-    /// implementation of the IDatabaseContextFactory interface
-    /// </summary>
-    public class DatabaseContextFactory : IDatabaseContextFactory
-    {
-        private readonly DbContextOptions _contextOptions;
-        private readonly string _activeProvider;
-
-        public DatabaseContextFactory(ApplicationConfiguration appConfig, DbContextOptions contextOptions)
-        {
-            _contextOptions = contextOptions;
-            _activeProvider = appConfig.DatabaseProvider?.ToLower();
-        }
-
-        /// <summary>
-        /// creates a new database context
-        /// </summary>
-        /// <param name="enableTracking">indicates if entity tracking should be enabled</param>
-        /// <returns></returns>
-        public DatabaseContext CreateContext(bool? enableTracking = true)
-        {
-            var context = BuildContext();
-
-            enableTracking ??= true;
-
-            if (enableTracking.Value)
-            {
-                context.ChangeTracker.AutoDetectChangesEnabled = true;
-                context.ChangeTracker.LazyLoadingEnabled = true;
-                context.ChangeTracker.QueryTrackingBehavior = QueryTrackingBehavior.TrackAll;
-            }
-            else
-            {
-                context.ChangeTracker.AutoDetectChangesEnabled = false;
-                context.ChangeTracker.LazyLoadingEnabled = false;
-                context.ChangeTracker.QueryTrackingBehavior = QueryTrackingBehavior.NoTracking;
-            }
-
-            return context;
-        }
-
-        private DatabaseContext BuildContext()
-        {
-            return _activeProvider switch
-            {
-                "sqlite" => new SqliteDatabaseContext(_contextOptions),
-                "mysql" => new MySqlDatabaseContext(_contextOptions),
-                "postgresql" => new PostgresqlDatabaseContext(_contextOptions),
-                _ => throw new ArgumentException($"No context found for {_activeProvider}")
-            };
-        }
-    }
-}

Application/Factories/GameLogReaderFactory.cs

@@ -1,42 +0,0 @@
-using IW4MAdmin.Application.IO;
-using Microsoft.Extensions.DependencyInjection;
-using SharedLibraryCore.Interfaces;
-using System;
-using Microsoft.Extensions.Logging;
-
-namespace IW4MAdmin.Application.Factories
-{
-    public class GameLogReaderFactory : IGameLogReaderFactory
-    {
-        private readonly IServiceProvider _serviceProvider;
-
-        public GameLogReaderFactory(IServiceProvider serviceProvider)
-        {
-            _serviceProvider = serviceProvider;
-        }
-
-        public IGameLogReader CreateGameLogReader(Uri[] logUris, IEventParser eventParser)
-        {
-            var baseUri = logUris[0];
-            if (baseUri.Scheme == Uri.UriSchemeHttp || baseUri.Scheme == Uri.UriSchemeHttps)
-            {
-                return new GameLogReaderHttp(logUris, eventParser,
-                    _serviceProvider.GetRequiredService<ILogger<GameLogReaderHttp>>());
-            }
-
-            if (baseUri.Scheme == Uri.UriSchemeFile)
-            {
-                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

@@ -1,48 +0,0 @@
-using System;
-using Data.Abstractions;
-using Data.Models.Server;
-using Microsoft.Extensions.DependencyInjection;
-using SharedLibraryCore;
-using SharedLibraryCore.Configuration;
-using SharedLibraryCore.Interfaces;
-
-namespace IW4MAdmin.Application.Factories
-{
-    /// <summary>
-    /// implementation of IGameServerInstanceFactory
-    /// </summary>
-    internal class GameServerInstanceFactory : IGameServerInstanceFactory
-    {
-        private readonly ITranslationLookup _translationLookup;
-        private readonly IMetaServiceV2 _metaService;
-        private readonly IServiceProvider _serviceProvider;
-
-        /// <summary>
-        /// base constructor
-        /// </summary>
-        /// <param name="translationLookup"></param>
-        /// <param name="rconConnectionFactory"></param>
-        public GameServerInstanceFactory(ITranslationLookup translationLookup,
-            IMetaServiceV2 metaService,
-            IServiceProvider serviceProvider)
-        {
-            _translationLookup = translationLookup;
-            _metaService = metaService;
-            _serviceProvider = serviceProvider;
-        }
-
-        /// <summary>
-        /// creates an IW4MServer instance
-        /// </summary>
-        /// <param name="config">server configuration</param>
-        /// <param name="manager">application manager</param>
-        /// <returns></returns>
-        public Server CreateServer(ServerConfiguration config, IManager manager)
-        {
-            return new IW4MServer(config,
-                _serviceProvider.GetRequiredService<CommandConfiguration>(), _translationLookup, _metaService,
-                _serviceProvider, _serviceProvider.GetRequiredService<IClientNoticeMessageFormatter>(),
-                _serviceProvider.GetRequiredService<ILookupCache<EFServer>>());
-        }
-    }
-}

Application/Factories/ParserRegexFactory.cs

@@ -1,26 +0,0 @@
-using SharedLibraryCore.Interfaces;
-using Microsoft.Extensions.DependencyInjection;
-using System;
-
-namespace IW4MAdmin.Application.Factories
-{
-    /// <summary>
-    /// Implementation of the IParserRegexFactory
-    /// </summary>
-    public class ParserRegexFactory : IParserRegexFactory
-    {
-        private readonly IServiceProvider _serviceProvider;
-
-        /// <inheritdoc/>
-        public ParserRegexFactory(IServiceProvider serviceProvider)
-        {
-            _serviceProvider = serviceProvider;
-        }
-
-        /// <inheritdoc/>
-        public ParserRegex CreateParserRegex()
-        {
-            return new ParserRegex(_serviceProvider.GetService<IParserPatternMatcher>());
-        }
-    }
-}

Application/Factories/RConConnectionFactory.cs

@@ -1,46 +0,0 @@
-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
-{
-    /// <summary>
-    /// implementation of IRConConnectionFactory
-    /// </summary>
-    internal class RConConnectionFactory : IRConConnectionFactory
-    {
-        private static readonly Encoding GameEncoding = Encoding.GetEncoding("windows-1252");
-        private readonly IServiceProvider _serviceProvider;
-
-        /// <summary>
-        /// Base constructor
-        /// </summary>
-        /// <param name="logger"></param>
-        public RConConnectionFactory(IServiceProvider serviceProvider)
-        {
-            _serviceProvider = serviceProvider;
-        }
-
-        /// <inheritdoc/>
-        public IRConConnection CreateConnection(IPEndPoint ipEndpoint, string password, string rconEngine)
-        {
-            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

@@ -1,42 +0,0 @@
-using SharedLibraryCore;
-using SharedLibraryCore.Commands;
-using SharedLibraryCore.Configuration;
-using SharedLibraryCore.Interfaces;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Data.Models;
-using Data.Models.Client;
-using IW4MAdmin.Application.Plugin.Script;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-
-namespace IW4MAdmin.Application.Factories
-{
-    /// <summary>
-    /// implementation of IScriptCommandFactory
-    /// </summary>
-    public class ScriptCommandFactory : IScriptCommandFactory
-    {
-        private readonly CommandConfiguration _config;
-        private readonly ITranslationLookup _transLookup;
-        private readonly IServiceProvider _serviceProvider;
-
-        public ScriptCommandFactory(CommandConfiguration  config, ITranslationLookup transLookup, IServiceProvider serviceProvider)
-        {
-            _config = config;
-            _transLookup = transLookup;
-            _serviceProvider = serviceProvider;
-        }
-
-        /// <inheritdoc/>
-        public IManagerCommand CreateScriptCommand(string name, string alias, string description, string permission, 
-            bool isTargetRequired, IEnumerable<CommandArgument> args, Func<GameEvent, Task> executeAction, IEnumerable<Reference.Game> supportedGames)
-        {
-            var permissionEnum = Enum.Parse<EFClient.Permission>(permission);
-
-            return new ScriptCommand(name, alias, description, isTargetRequired, permissionEnum, args, executeAction,
-                _config, _transLookup, _serviceProvider.GetRequiredService<ILogger<ScriptCommand>>(), supportedGames);
-        }
-    }
-}

Application/IO/BaseConfigurationHandlerV2.cs

@@ -1,213 +0,0 @@
-using System;
-using System.Collections;
-using System.IO;
-using System.Linq;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Logging;
-using SharedLibraryCore;
-using SharedLibraryCore.Interfaces;
-
-namespace IW4MAdmin.Application.IO;
-
-public class BaseConfigurationHandlerV2<TConfigurationType> : IConfigurationHandlerV2<TConfigurationType>
-    where TConfigurationType : class
-{
-    private readonly ILogger<BaseConfigurationHandlerV2<TConfigurationType>> _logger;
-    private readonly ConfigurationWatcher _watcher;
-
-    private readonly JsonSerializerOptions _serializerOptions = new()
-    {
-        WriteIndented = true,
-        Converters =
-        {
-            new JsonStringEnumConverter()
-        },
-        Encoder = System.Text.Encodings.Web.JavaScriptEncoder.UnsafeRelaxedJsonEscaping
-    };
-
-    private readonly SemaphoreSlim _onIo = new(1, 1);
-    private TConfigurationType _configurationInstance;
-    private string _path = string.Empty;
-    private event Action<string> FileUpdated;
-
-    public BaseConfigurationHandlerV2(ILogger<BaseConfigurationHandlerV2<TConfigurationType>> logger,
-        ConfigurationWatcher watcher)
-    {
-        _logger = logger;
-        _watcher = watcher;
-        FileUpdated += OnFileUpdated;
-    }
-
-    ~BaseConfigurationHandlerV2()
-    {
-        FileUpdated -= OnFileUpdated;
-        _watcher.Unregister(_path);
-    }
-
-    public async Task<TConfigurationType> Get(string configurationName,
-        TConfigurationType defaultConfiguration = default)
-    {
-        if (string.IsNullOrWhiteSpace(configurationName))
-        {
-            return defaultConfiguration;
-        }
-
-        var cleanName = configurationName.Replace("\\", "").Replace("/", "");
-
-        if (string.IsNullOrWhiteSpace(configurationName))
-        {
-            return defaultConfiguration;
-        }
-
-        _path = Path.Join(Utilities.OperatingDirectory, "Configuration", $"{cleanName}.json");
-        TConfigurationType readConfiguration = null;
-
-        try
-        {
-            await _onIo.WaitAsync();
-            await using var fileStream = File.OpenRead(_path);
-            readConfiguration =
-                await JsonSerializer.DeserializeAsync<TConfigurationType>(fileStream, _serializerOptions);
-            await fileStream.DisposeAsync();
-            _watcher.Register(_path, FileUpdated);
-
-            if (readConfiguration is null)
-            {
-                _logger.LogError("Could not parse configuration {Type} at {FileName}", typeof(TConfigurationType).Name,
-                    _path);
-
-                return defaultConfiguration;
-            }
-        }
-        catch (FileNotFoundException)
-        {
-            if (defaultConfiguration is not null)
-            {
-                await InternalSet(defaultConfiguration, false);
-            }
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Could not read configuration file at {Path}", _path);
-            return defaultConfiguration;
-        }
-        finally
-        {
-            if (_onIo.CurrentCount == 0)
-            {
-                _onIo.Release(1);
-            }
-        }
-
-        return _configurationInstance ??= readConfiguration;
-    }
-
-    public async Task Set(TConfigurationType configuration)
-    {
-        await InternalSet(configuration, true);
-    }
-
-    public async Task Set()
-    {
-        if (_configurationInstance is not null)
-        {
-            await InternalSet(_configurationInstance, true);
-        }
-    }
-
-    public event Action<TConfigurationType> Updated;
-
-    private async Task InternalSet(TConfigurationType configuration, bool awaitSemaphore)
-    {
-        try
-        {
-            if (awaitSemaphore)
-            {
-                await _onIo.WaitAsync();
-            }
-
-            await using var fileStream = File.Create(_path);
-            await JsonSerializer.SerializeAsync(fileStream, configuration, _serializerOptions);
-            await fileStream.DisposeAsync();
-            _configurationInstance = configuration;
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Could not save configuration {Type} {Path}", configuration.GetType().Name, _path);
-        }
-        finally
-        {
-            if (awaitSemaphore && _onIo.CurrentCount == 0)
-            {
-                _onIo.Release(1);
-            }
-        }
-    }
-
-    private async void OnFileUpdated(string filePath)
-    {
-        try
-        {
-            await _onIo.WaitAsync();
-            await using var fileStream = File.OpenRead(_path);
-            var readConfiguration =
-                await JsonSerializer.DeserializeAsync<TConfigurationType>(fileStream, _serializerOptions);
-            await fileStream.DisposeAsync();
-
-            if (readConfiguration is null)
-            {
-                _logger.LogWarning("Could not parse updated configuration {Type} at {Path}",
-                    typeof(TConfigurationType).Name, filePath);
-            }
-            else
-            {
-                CopyUpdatedProperties(readConfiguration);
-                Updated?.Invoke(readConfiguration);
-            }
-        }
-        catch (Exception ex)
-        {
-            _logger.LogWarning(ex, "Could not parse updated configuration {Type} at {Path}",
-                typeof(TConfigurationType).Name, filePath);
-        }
-        finally
-        {
-            if (_onIo.CurrentCount == 0)
-            {
-                _onIo.Release(1);
-            }
-        }
-    }
-
-    private void CopyUpdatedProperties(TConfigurationType newConfiguration)
-    {
-        if (_configurationInstance is null)
-        {
-            _configurationInstance = newConfiguration;
-            return;
-        }
-
-        _logger.LogDebug("Updating existing config with new values {Type} at {Path}", typeof(TConfigurationType).Name,
-            _path);
-
-        if (_configurationInstance is IDictionary configDict && newConfiguration is IDictionary newConfigDict)
-        {
-            configDict.Clear();
-            foreach (var key in newConfigDict.Keys)
-            {
-                configDict.Add(key, newConfigDict[key]);
-            }
-        }
-        else
-        {
-            foreach (var property in _configurationInstance.GetType().GetProperties()
-                         .Where(prop => prop.CanRead && prop.CanWrite))
-            {
-                property.SetValue(_configurationInstance, property.GetValue(newConfiguration));
-            }
-        }
-    }
-}

Application/IO/ConfigurationWatcher.cs

@@ -1,60 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using SharedLibraryCore;
-
-namespace IW4MAdmin.Application.IO;
-
-public sealed class ConfigurationWatcher : IDisposable
-{
-    private readonly FileSystemWatcher _watcher;
-    private readonly Dictionary<string, Action<string>> _registeredActions = new();
-
-    public ConfigurationWatcher()
-    {
-        _watcher = new FileSystemWatcher
-        {
-            Path = Path.Join(Utilities.OperatingDirectory, "Configuration"),
-            Filter = "*.json",
-            NotifyFilter = NotifyFilters.LastWrite
-        };
-
-        _watcher.Changed += WatcherOnChanged;
-        _watcher.EnableRaisingEvents = true;
-    }
-
-    public void Dispose()
-    {
-        _watcher.Changed -= WatcherOnChanged;
-        _watcher.Dispose();
-    }
-
-    public void Register(string fileName, Action<string> fileUpdated)
-    {
-        if (_registeredActions.ContainsKey(fileName))
-        {
-            return;
-        }
-
-        _registeredActions.Add(fileName, fileUpdated);
-    }
-
-    public void Unregister(string fileName)
-    {
-        if (_registeredActions.ContainsKey(fileName))
-        {
-            _registeredActions.Remove(fileName);
-        }
-    }
-
-    private void WatcherOnChanged(object sender, FileSystemEventArgs eventArgs)
-    {
-        if (!_registeredActions.ContainsKey(eventArgs.FullPath) || eventArgs.ChangeType != WatcherChangeTypes.Changed ||
-            new FileInfo(eventArgs.FullPath).Length == 0)
-        {
-            return;
-        }
-
-        _registeredActions[eventArgs.FullPath].Invoke(eventArgs.FullPath);
-    }
-}

Application/IO/GameLogEventDetection.cs

@@ -1,124 +0,0 @@
-using SharedLibraryCore;
-using SharedLibraryCore.Interfaces;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Logging;
-using Serilog.Context;
-using ILogger = Microsoft.Extensions.Logging.ILogger;
-
-namespace IW4MAdmin.Application.IO
-{
-    public class GameLogEventDetection
-    {
-        private long previousFileSize;
-        private readonly Server _server;
-        private readonly IGameLogReader _reader;
-        private readonly bool _ignoreBots;
-        private readonly ILogger _logger;
-
-        public GameLogEventDetection(ILogger<GameLogEventDetection> logger, IW4MServer server, Uri[] gameLogUris, IGameLogReaderFactory gameLogReaderFactory)
-        {
-            _reader = gameLogReaderFactory.CreateGameLogReader(gameLogUris, server.EventParser);
-            _server = server;
-            _ignoreBots = server.Manager.GetApplicationSettings().Configuration()?.IgnoreBots ?? false;
-            _logger = logger;
-        }
-
-        public async Task PollForChanges()
-        {
-            while (!_server.Manager.CancellationToken.IsCancellationRequested)
-            {
-                if (_server.IsInitialized)
-                {
-                    try
-                    {
-                        await UpdateLogEvents();
-                    }
-
-                    catch (Exception e)
-                    {
-                        using(LogContext.PushProperty("Server", _server.ToString()))
-                        {
-                            _logger.LogError(e, "Failed to update log event for {endpoint}", _server.EndPoint);
-                        }
-                    }
-                }
-
-                await Task.Delay(_reader.UpdateInterval, _server.Manager.CancellationToken);
-            }
-
-            _logger.LogDebug("Stopped polling for changes");
-        }
-
-        public async Task UpdateLogEvents()
-        {
-            long fileSize = _reader.Length;
-
-            if (previousFileSize == 0)
-            {
-                previousFileSize = fileSize;
-            }
-
-            long fileDiff = fileSize - previousFileSize;
-
-            // this makes the http log get pulled
-            if (fileDiff < 1 && fileSize != -1)
-            {
-                previousFileSize = fileSize;
-                return;
-            }
-
-            var events = await _reader.ReadEventsFromLog(fileDiff, previousFileSize, _server);
-
-            foreach (var gameEvent in events)
-            {
-                try
-                {
-                    gameEvent.Owner = _server;
-
-                    // we don't want to add the event if ignoreBots is on and the event comes from a bot
-                    if (!_ignoreBots || (_ignoreBots && !((gameEvent.Origin?.IsBot ?? false) || (gameEvent.Target?.IsBot ?? false))))
-                    {
-                        if ((gameEvent.RequiredEntity & GameEvent.EventRequiredEntity.Origin) == GameEvent.EventRequiredEntity.Origin && gameEvent.Origin.NetworkId != Utilities.WORLD_ID)
-                        {
-                            gameEvent.Origin = _server.GetClientsAsList().First(_client => _client.NetworkId == gameEvent.Origin?.NetworkId);;
-                        }
-
-                        if ((gameEvent.RequiredEntity & GameEvent.EventRequiredEntity.Target) == GameEvent.EventRequiredEntity.Target)
-                        {
-                            gameEvent.Target = _server.GetClientsAsList().First(_client => _client.NetworkId == gameEvent.Target?.NetworkId);
-                        }
-
-                        if (gameEvent.Origin != null)
-                        {
-                            gameEvent.Origin.CurrentServer = _server;
-                        }
-
-                        if (gameEvent.Target != null)
-                        {
-                            gameEvent.Target.CurrentServer = _server;
-                        }
-
-                        _server.Manager.AddEvent(gameEvent);
-                    }
-                }
-
-                catch (InvalidOperationException)
-                {
-                    if (_ignoreBots)
-                    {
-                        continue;
-                    }
-                    
-                    using(LogContext.PushProperty("Server", _server.ToString()))
-                    {
-                        _logger.LogError("Could not find client in client list when parsing event line {data}", gameEvent.Data);
-                    }
-                }
-            }
-
-            previousFileSize = fileSize;
-        }
-    }
-}

Application/IO/GameLogReader.cs

@@ -1,85 +0,0 @@
-using SharedLibraryCore;
-using SharedLibraryCore.Interfaces;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Logging;
-using ILogger = Microsoft.Extensions.Logging.ILogger;
-
-namespace IW4MAdmin.Application.IO
-{
-    class GameLogReader : IGameLogReader
-    {
-        private readonly IEventParser _parser;
-        private readonly string _logFile;
-        private readonly ILogger _logger;
-
-        public long Length => new FileInfo(_logFile).Length;
-
-        public int UpdateInterval => 300;
-
-        public GameLogReader(string logFile, IEventParser parser, ILogger<GameLogReader> logger)
-        {
-            _logFile = logFile;
-            _parser = parser;
-            _logger = logger;
-        }
-
-        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>();
-
-            // open the file as a stream
-            using (FileStream fs = new FileStream(_logFile, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
-            {
-                byte[] buff = new byte[fileSizeDiff];
-                fs.Seek(startPosition, SeekOrigin.Begin);
-                await fs.ReadAsync(buff, 0, (int)fileSizeDiff);
-                var stringBuilder = new StringBuilder();
-                char[] charBuff = Utilities.EncodingType.GetChars(buff);
-
-                foreach (char c in charBuff)
-                {
-                    if (c == '\n')
-                    {
-                        logLines.Add(stringBuilder.ToString());
-                        stringBuilder = new StringBuilder();
-                    }
-
-                    else if (c != '\r')
-                    {
-                        stringBuilder.Append(c);
-                    }
-                }
-
-                if (stringBuilder.Length > 0)
-                {
-                    logLines.Add(stringBuilder.ToString());
-                }
-            }
-
-            List<GameEvent> events = new List<GameEvent>();
-
-            // parse each line
-            foreach (string eventLine in logLines.Where(_line => _line.Length > 0))
-            {
-                try
-                {
-                    var gameEvent = _parser.GenerateGameEvent(eventLine);
-                    events.Add(gameEvent);
-                }
-
-                catch (Exception e)
-                {
-                    _logger.LogError(e, "Could not properly parse event line {@eventLine}", eventLine);
-                }
-            }
-
-            return events;
-        }
-    }
-}

Application/IO/GameLogReaderHttp.cs

@@ -1,75 +0,0 @@
-using IW4MAdmin.Application.API.GameLogServer;
-using RestEase;
-using SharedLibraryCore;
-using SharedLibraryCore.Interfaces;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Logging;
-using ILogger = Microsoft.Extensions.Logging.ILogger;
-
-namespace IW4MAdmin.Application.IO
-{
-    /// <summary>
-    /// provides capability of reading log files over HTTP
-    /// </summary>
-    class GameLogReaderHttp : IGameLogReader
-    {
-        private readonly IEventParser _eventParser;
-        private readonly IGameLogServer _logServerApi;
-        private readonly ILogger _logger;
-        private readonly string _safeLogPath;
-        private string lastKey = "next";
-
-        public GameLogReaderHttp(Uri[] gameLogServerUris, IEventParser parser, ILogger<GameLogReaderHttp> logger)
-        {
-            _eventParser = parser;
-            _logServerApi = RestClient.For<IGameLogServer>(gameLogServerUris[0].ToString());
-            _safeLogPath = gameLogServerUris[1].LocalPath.ToBase64UrlSafeString();
-            _logger = logger;
-        }
-
-        public long Length => -1;
-
-        public int UpdateInterval => 500;
-
-        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);
-            lastKey = response.NextKey;
-
-            if (!response.Success && string.IsNullOrEmpty(lastKey))
-            {
-                _logger.LogError("Could not get log server info of {logPath}", _safeLogPath);
-                return events;
-            }
-
-            else if (!string.IsNullOrWhiteSpace(response.Data))
-            {
-                // parse each line
-                var lines = response.Data
-                     .Split(Environment.NewLine)
-                     .Where(_line => _line.Length > 0);
-
-                foreach (string 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 e)
-                    {
-                        _logger.LogError(e, "Could not properly parse event line from http {eventLine}", eventLine);
-                    }
-                }
-            }
-
-            return events;
-        }
-    }
-}

Application/IO/NetworkGameLogReader.cs

@@ -1,163 +0,0 @@
-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

@@ -1,138 +0,0 @@
-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/Localization/Configure.cs

@@ -1,88 +1,33 @@
-using IW4MAdmin.Application.API.Master;
-using SharedLibraryCore;
-using SharedLibraryCore.Interfaces;
+using SharedLibraryCore;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Text;
-using Microsoft.Extensions.Logging;
-using SharedLibraryCore.Configuration;
-using ILogger = Microsoft.Extensions.Logging.ILogger;
 
 namespace IW4MAdmin.Application.Localization
 {
-    public static class Configure
+    public class Configure
     {
-        public static ITranslationLookup Initialize(ILogger logger, IMasterApi apiInstance, ApplicationConfiguration applicationConfiguration)
+        public static void Initialize()
         {
-            var useLocalTranslation = applicationConfiguration?.UseLocalTranslations ?? true;
-            var customLocale = applicationConfiguration?.EnableCustomLocale ?? false
-                ? (applicationConfiguration.CustomLocale ?? "en-US")
-                : "en-US";
-            var currentLocale = string.IsNullOrEmpty(customLocale) ? CultureInfo.CurrentCulture.Name : customLocale;
-            var localizationFiles = Directory.GetFiles(Path.Join(Utilities.OperatingDirectory, "Localization"), $"*.{currentLocale}.json");
+            string currentLocal = CultureInfo.CurrentCulture.Name;
+            string localizationFile = $"Localization{Path.DirectorySeparatorChar}IW4MAdmin.{currentLocal}.json";
+            string localizationContents;
 
-            if (!useLocalTranslation)
+            if (File.Exists(localizationFile))
             {
-                try
-                {
-                    var localization = apiInstance.GetLocalization(currentLocale).Result;
-                    Utilities.CurrentLocalization = localization;
-                    return localization.LocalizationIndex;
-                }
-
-                catch (Exception ex)
-                {
-                    // the online localization failed so will default to local files
-                    logger.LogWarning(ex, "Could not download latest translations");
-                }
+                localizationContents = File.ReadAllText(localizationFile);
+               
             }
 
-            // culture doesn't exist so we just want language
-            if (localizationFiles.Length == 0)
+            else
             {
-                localizationFiles = Directory.GetFiles(Path.Join(Utilities.OperatingDirectory, "Localization"), $"*.{currentLocale.Substring(0, 2)}*.json");
+                localizationFile = $"Localization{Path.DirectorySeparatorChar}IW4MAdmin.en-US.json";
+                localizationContents = File.ReadAllText(localizationFile);
             }
 
-            // language doesn't exist either so defaulting to english
-            if (localizationFiles.Length == 0)
-            {
-                localizationFiles = Directory.GetFiles(Path.Join(Utilities.OperatingDirectory, "Localization"), "*.en-US.json");
-            }
-
-            // this should never happen unless the localization folder is empty
-            if (localizationFiles.Length == 0)
-            {
-                throw new Exception("No localization files were found");
-            }
-
-            var localizationDict = new Dictionary<string, string>();
-
-            foreach (string filePath in localizationFiles)
-            {
-                var localizationContents = File.ReadAllText(filePath, Encoding.UTF8);
-                var eachLocalizationFile = Newtonsoft.Json.JsonConvert.DeserializeObject<SharedLibraryCore.Localization.Layout>(localizationContents);
-                if (eachLocalizationFile == null)
-                {
-                    continue;
-                }
-
-                foreach (var item in eachLocalizationFile.LocalizationIndex.Set)
-                {
-                    if (!localizationDict.TryAdd(item.Key, item.Value))
-                    {
-                        logger.LogError("Could not add locale string {key} to localization", item.Key);
-                    }
-                }
-            }
-
-            Utilities.CurrentLocalization = new SharedLibraryCore.Localization.Layout(localizationDict)
-            {
-                LocalizationName = currentLocale,
-            };
-
-            return Utilities.CurrentLocalization.LocalizationIndex;
+            Utilities.CurrentLocalization = Newtonsoft.Json.JsonConvert.DeserializeObject<SharedLibraryCore.Localization.Layout>(localizationContents);
         }
     }
 }

Application/Localization/IW4MAdmin.en-US.json

@@ -0,0 +1,109 @@
+{
+  "LocalizationName": "en-US",
+  "LocalizationSet": {
+    "MANAGER_VERSION_FAIL": "Could not get latest IW4MAdmin version",
+    "MANAGER_VERSION_UPDATE": "has an update. Latest version is",
+    "MANAGER_VERSION_CURRENT": "Your version is",
+    "MANAGER_VERSION_SUCCESS": "IW4MAdmin is up to date",
+    "MANAGER_INIT_FAIL": "Fatal error during initialization",
+    "MANAGER_EXIT": "Press any key to exit...",
+    "SETUP_ENABLE_WEBFRONT": "Enable webfront",
+    "SETUP_ENABLE_MULTIOWN": "Enable multiple owners",
+    "SETUP_ENABLE_STEPPEDPRIV": "Enable stepped privilege hierarchy",
+    "SETUP_ENABLE_CUSTOMSAY": "Enable custom say name",
+    "SETUP_SAY_NAME": "Enter custom say name",
+    "SETUP_USE_CUSTOMENCODING": "Use custom encoding parser",
+    "SETUP_ENCODING_STRING": "Enter encoding string",
+    "SETUP_ENABLE_VPNS": "Enable client VPNs",
+    "SETUP_IPHUB_KEY": "Enter iphub.info api key",
+    "SETUP_DISPLAY_DISCORD": "Display discord link on webfront",
+    "SETUP_DISCORD_INVITE": "Enter discord invite link",
+    "SETUP_SERVER_USET6M": "Use T6M parser",
+    "SETUP_SERVER_IP": "Enter server IP Address",
+    "SETUP_SERVER_PORT": "Enter server port",
+    "SETUP_SERVER_RCON": "Enter server RCon password",
+    "SETUP_SERVER_SAVE": "Configuration saved, add another",
+    "SERVER_KICK_VPNS_NOTALLOWED": "VPNs are not allowed on this server",
+    "SERVER_KICK_TEXT": "You were kicked",
+    "SERVER_KICK_MINNAME": "Your name must contain at least 3 characters",
+    "SERVER_KICK_NAME_INUSE": "Your name is being used by someone else",
+    "SERVER_KICK_GENERICNAME": "Please change your name using /name",
+    "SERVER_KICK_CONTROLCHARS": "Your name cannot contain control characters",
+    "SERVER_TB_TEXT": "You're temporarily banned",
+    "SERVER_TB_REMAIN": "You are temporarily banned",
+    "SERVER_BAN_TEXT": "You're banned",
+    "SERVER_BAN_PREV": "Previously banned for",
+    "SERVER_BAN_APPEAL": "appeal at",
+    "SERVER_REPORT_COUNT": "There are ^5{0} ^7recent reports",
+    "SERVER_WARNLIMT_REACHED": "Too many warnings",
+    "SERVER_WARNING": "Warning",
+    "SERVER_WEBSITE_GENERIC": "this server's website",
+    "BROADCAST_ONLINE": "^5IW4MADMIN ^7is now ^2ONLINE",
+    "BROADCAST_OFFLINE": "IW4MAdmin is going offline",
+    "COMMAND_HELP_SYNTAX": "syntax:",
+    "COMMAND_HELP_OPTIONAL": "optional",
+    "COMMAND_UNKNOWN": "You entered an unknown command",
+    "COMMAND_NOACCESS": "You do not have access to that command",
+    "COMMAND_NOTAUTHORIZED": "You are not authorized to execute that command",
+    "COMMAND_MISSINGARGS": "Not enough arguments supplied",
+    "COMMAND_TARGET_MULTI": "Multiple players match that name",
+    "COMMAND_TARGET_NOTFOUND": "Unable to find specified player",
+    "PLUGIN_IMPORTER_NOTFOUND": "No plugins found to load",
+    "PLUGIN_IMPORTER_REGISTERCMD": "Registered command",
+    "COMMANDS_OWNER_SUCCESS": "Congratulations, you have claimed ownership of this server!",
+    "COMMANDS_OWNER_FAIL": "This server already has an owner",
+    "COMMANDS_WARN_FAIL": "You do not have the required privileges to warn",
+    "COMMANDS_WARNCLEAR_SUCCESS": "All warning cleared for",
+    "COMMANDS_KICK_SUCCESS": "has been kicked",
+    "COMMANDS_KICK_FAIL": "You do not have the required privileges to kick",
+    "COMMANDS_TEMPBAN_SUCCESS": "has been temporarily banned for",
+    "COMMANDS_TEMPBAN_FAIL": "You cannot temporarily ban",
+    "COMMANDS_BAN_SUCCESS": "has been permanently banned",
+    "COMMANDS_BAN_FAIL": "You cannot ban",
+    "COMMANDS_UNBAN_SUCCESS": "Successfully unbanned",
+    "COMMANDS_UNBAN_FAIL": "is not banned",
+    "COMMANDS_HELP_NOTFOUND": "Could not find that command",
+    "COMMANDS_HELP_MOREINFO": "Type !help <command name> to get command usage syntax",
+    "COMMANDS_FASTRESTART_UNMASKED": "fast restarted the map",
+    "COMMANDS_FASTRESTART_MASKED": "The map has been fast restarted",
+    "COMMANDS_MAPROTATE": "Map rotating in ^55 ^7seconds",
+    "COMMANDS_SETLEVEL_SELF": "You cannot change your own level",
+    "COMMANDS_SETLEVEL_OWNER": "There can only be 1 owner. Modify your settings if multiple owners are required",
+    "COMMANDS_SETLEVEL_STEPPEDDISABLED": "This server does not allow you to promote",
+    "COMMANDS_SETLEVEL_LEVELTOOHIGH": "You can only promote ^5{0} ^7to ^5{1} ^7or lower privilege",
+    "COMMANDS_SETLEVEL_SUCCESS_TARGET": "Congratulations! You have been promoted to",
+    "COMMANDS_SETLEVEL_SUCCESS": "was successfully promoted",
+    "COMMANDS_SETLEVEL_FAIL": "Invalid group specified",
+    "COMMANDS_ADMINS_NONE": "No visible administrators online",
+    "COMMANDS_MAP_SUCCESS": "Changing to map",
+    "COMMANDS_MAP_UKN": "Attempting to change to unknown map",
+    "COMMANDS_FIND_MIN": "Please enter at least 3 characters",
+    "COMMANDS_FIND_EMPTY": "No players found",
+    "COMMANDS_RULES_NONE": "The server owner has not set any rules",
+    "COMMANDS_FLAG_SUCCESS": "You have flagged",
+    "COMMANDS_FLAG_UNFLAG": "You have unflagged",
+    "COMMANDS_FLAG_FAIL": "You cannot flag",
+    "COMMANDS_REPORT_FAIL_CAMP": "You cannot report an player for camping",
+    "COMMANDS_REPORT_FAIL_DUPLICATE": "You have already reported this player",
+    "COMMANDS_REPORT_FAIL_SELF": "You cannot report yourself",
+    "COMMANDS_REPORT_FAIL": "You cannot report",
+    "COMMANDS_REPORT_SUCCESS": "Thank you for your report, an administrator has been notified",
+    "COMMANDS_REPORTS_CLEAR_SUCCESS": "Reports successfully cleared",
+    "COMMANDS_REPORTS_NONE": "No players reported yet",
+    "COMMANDS_MASK_ON": "You are now masked",
+    "COMMANDS_MASK_OFF": "You are now unmasked",
+    "COMMANDS_BANINFO_NONE": "No active ban was found for that player",
+    "COMMANDS_BANINO_SUCCESS": "was banned by ^5{0} ^7for:",
+    "COMMANDS_ALIAS_ALIASES": "Aliases",
+    "COMMANDS_ALIAS_IPS": "IPs",
+    "COMMANDS_RCON_SUCCESS": "Successfully sent RCon command",
+    "COMMANDS_PLUGINS_LOADED": "Loaded Plugins",
+    "COMMANDS_IP_SUCCESS": "Your external IP is",
+    "COMMANDS_PRUNE_FAIL": "Invalid number of inactive days",
+    "COMMANDS_PRUNE_SUCCESS": "inactive privileged users were pruned",
+    "COMMANDS_PASSWORD_FAIL": "Your password must be at least 5 characters long",
+    "COMMANDS_PASSWORD_SUCCESS": "Your password has been set successfully",
+    "COMMANDS_PING_TARGET": "ping is",
+    "COMMANDS_PING_SELF": "Your ping is"
+  }
+}

Application/Logger.cs

@@ -0,0 +1,79 @@
+using System;
+using System.IO;
+
+namespace IW4MAdmin.Application
+{
+    class Logger : SharedLibraryCore.Interfaces.ILogger
+    {
+        enum LogType
+        { 
+            Verbose,
+            Info,
+            Debug,
+            Warning,
+            Error,
+            Assert
+        }
+
+        string FileName;
+        object ThreadLock;
+
+        public Logger(string fn)
+        {
+            FileName = fn;
+            ThreadLock = new object();
+            if (File.Exists(fn))
+                File.Delete(fn);
+        }
+
+        void Write(string msg, LogType type)
+        {
+            string LogLine = $"[{DateTime.Now.ToString("HH:mm:ss")}] - {type}: {msg}";
+            lock (ThreadLock)
+            {
+#if DEBUG
+            // lets keep it simple and dispose of everything quickly as logging wont be that much (relatively)
+
+            Console.WriteLine(LogLine);
+            File.AppendAllText(FileName, LogLine + Environment.NewLine);
+#else
+                if (type == LogType.Error || type == LogType.Verbose)
+                    Console.WriteLine(LogLine);
+                //if (type != LogType.Debug)
+                File.AppendAllText(FileName, $"{LogLine}{Environment.NewLine}");
+#endif
+            }
+        }
+
+        public void WriteVerbose(string msg)
+        {
+            Write(msg, LogType.Verbose);
+        }
+
+        public void WriteDebug(string msg)
+        {
+            Write(msg, LogType.Debug);
+        }
+
+        public void WriteError(string msg)
+        {
+            Write(msg, LogType.Error);
+        }
+
+        public void WriteInfo(string msg)
+        {
+            Write(msg, LogType.Info);
+        }
+
+        public void WriteWarning(string msg)
+        {
+            Write(msg, LogType.Warning);
+        }
+
+        public void WriteAssert(bool condition, string msg)
+        {
+            if (!condition)
+                Write(msg, LogType.Assert);
+        }
+    }
+}

Application/Main.cs

@@ -1,550 +1,154 @@
-using IW4MAdmin.Application.API.Master;
-using IW4MAdmin.Application.EventParsers;
-using IW4MAdmin.Application.Factories;
-using IW4MAdmin.Application.Meta;
-using IW4MAdmin.Application.Migration;
-using IW4MAdmin.Application.Misc;
-using Microsoft.Extensions.DependencyInjection;
-using RestEase;
-using SharedLibraryCore;
-using SharedLibraryCore.Configuration;
-using SharedLibraryCore.Database.Models;
-using SharedLibraryCore.Dtos.Meta.Responses;
-using SharedLibraryCore.Exceptions;
-using SharedLibraryCore.Helpers;
-using SharedLibraryCore.Interfaces;
-using SharedLibraryCore.QueryHelper;
-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;
 using System.Threading.Tasks;
-using Data.Abstractions;
-using Data.Helpers;
-using Integrations.Source.Extensions;
-using IW4MAdmin.Application.Alerts;
-using IW4MAdmin.Application.Extensions;
-using IW4MAdmin.Application.IO;
-using IW4MAdmin.Application.Localization;
-using IW4MAdmin.Application.Plugin;
-using IW4MAdmin.Application.Plugin.Script;
-using IW4MAdmin.Application.QueryHelpers;
-using Microsoft.Extensions.Logging;
-using ILogger = Microsoft.Extensions.Logging.ILogger;
-using IW4MAdmin.Plugins.Stats.Client.Abstractions;
-using IW4MAdmin.Plugins.Stats.Client;
-using Microsoft.Extensions.Hosting;
-using Stats.Client.Abstractions;
-using Stats.Client;
-using Stats.Config;
-using Stats.Helpers;
-using WebfrontCore.QueryHelpers.Models;
+using System.IO;
+using System.Reflection;
+
+using SharedLibraryCore;
+using SharedLibraryCore.Objects;
+using SharedLibraryCore.Database;
 
 namespace IW4MAdmin.Application
 {
     public class Program
     {
-        public static BuildNumber Version { get; } = BuildNumber.Parse(Utilities.GetVersionAsString());
-        private static ApplicationManager _serverManager;
-        private static Task _applicationTask;
-        private static IServiceProvider _serviceProvider;
+        static public double Version { get; private set; }
+        static public ApplicationManager ServerManager = ApplicationManager.GetInstance();
+        public static string OperatingDirectory = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location) + Path.DirectorySeparatorChar;
 
-        /// <summary>
-        /// entrypoint of the application
-        /// </summary>
-        /// <returns></returns>
-        public static async Task Main(bool noConfirm = false, int? maxConcurrentRequests = 25, int? requestQueueLimit = 25)
+        public static void Main(string[] args)
         {
-            AppDomain.CurrentDomain.SetData("DataDirectory", Utilities.OperatingDirectory);
-            AppDomain.CurrentDomain.AssemblyResolve += (sender, eventArgs) =>
-            {
-                var libraryName = eventArgs.Name.Split(",").First();
+            AppDomain.CurrentDomain.SetData("DataDirectory", OperatingDirectory);
+            System.Diagnostics.Process.GetCurrentProcess().PriorityClass = System.Diagnostics.ProcessPriorityClass.BelowNormal;
+            Localization.Configure.Initialize();
+            var loc = Utilities.CurrentLocalization.LocalizationSet;
 
-                var overrides = new[] { nameof(SharedLibraryCore), nameof(Stats) };
-                if (!overrides.Contains(libraryName))
-                {
-                    return AppDomain.CurrentDomain.GetAssemblies().FirstOrDefault(asm => asm.FullName == eventArgs.Name);
-                }
-                // added to be a bit more permissive with plugin references
-                return AppDomain.CurrentDomain.GetAssemblies()
-                    .FirstOrDefault(asm => asm.FullName?.StartsWith(libraryName) ?? false);
-            };
-
-            if (noConfirm)
-            {
-                AppContext.SetSwitch("NoConfirmPrompt", true);
-            }
-
-            Environment.SetEnvironmentVariable("MaxConcurrentRequests", (maxConcurrentRequests * Environment.ProcessorCount).ToString());
-            Environment.SetEnvironmentVariable("RequestQueueLimit", requestQueueLimit.ToString());
-
-            Console.OutputEncoding = Encoding.UTF8;
-            Console.ForegroundColor = ConsoleColor.Gray;
-
-            Console.CancelKeyPress += OnCancelKey;
+            Version = Assembly.GetExecutingAssembly().GetName().Version.Major + Assembly.GetExecutingAssembly().GetName().Version.Minor / 10.0f;
 
             Console.WriteLine("=====================================================");
-            Console.WriteLine(" IW4MAdmin");
+            Console.WriteLine(" IW4M ADMIN");
             Console.WriteLine(" by RaidMax ");
-            Console.WriteLine($" Version {Utilities.GetVersionAsString()}");
+            Console.WriteLine($" Version {Version.ToString("0.0")}");
             Console.WriteLine("=====================================================");
 
-            await LaunchAsync();
-        }
-
-        /// <summary>
-        /// event callback executed when the control + c combination is detected
-        /// gracefully stops the server manager and waits for all tasks to finish
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private static async void OnCancelKey(object sender, ConsoleCancelEventArgs e)
-        {
-            if (_serverManager is not null)
-            {
-                await _serverManager.Stop();
-            }
-
-            if (_applicationTask is not null)
-            {
-                await _applicationTask;
-            }
-        }
-
-        /// <summary>
-        /// task that initializes application and starts the application monitoring and runtime tasks
-        /// </summary>
-        /// <returns></returns>
-        private static async Task LaunchAsync()
-        {
-            restart:
-            ITranslationLookup translationLookup = null;
-            var logger = BuildDefaultLogger<Program>(new ApplicationConfiguration());
-            Utilities.DefaultLogger = logger;
-            logger.LogInformation("Begin IW4MAdmin startup. Version is {Version}", Version);
-            
             try
             {
-                // do any needed housekeeping file/folder migrations
-                ConfigurationMigration.MoveConfigFolder10518(null);
-                ConfigurationMigration.CheckDirectories();
-                ConfigurationMigration.RemoveObsoletePlugins20210322();
-                
-                logger.LogDebug("Configuring services...");
+                using (var db = new DatabaseContext())
+                    new ContextSeed(db).Seed().Wait();
 
-                var configHandler = new BaseConfigurationHandler<ApplicationConfiguration>("IW4MAdminSettings");
-                await configHandler.BuildAsync();
-                _serviceProvider = WebfrontCore.Program.InitializeServices(ConfigureServices,
-                    (configHandler.Configuration() ?? new ApplicationConfiguration()).WebfrontBindUrl);
-              
-                _serverManager = (ApplicationManager)_serviceProvider.GetRequiredService<IManager>();
-                translationLookup = _serviceProvider.GetRequiredService<ITranslationLookup>();
+                CheckDirectories();
 
-                await _serverManager.Init();
+                ServerManager = ApplicationManager.GetInstance();
+
+                var api = API.Master.Endpoint.Get();
+                var version = new API.Master.VersionInfo()
+                {
+                    CurrentVersionStable = 99.99f
+                };
+
+                try
+                {
+                    version = api.GetVersion().Result;
+                }
+
+                catch (Exception e)
+                {
+                    ServerManager.Logger.WriteWarning(loc["MANAGER_VERSION_FAIL"]);
+                    while (e.InnerException != null)
+                    {
+                        e = e.InnerException;
+                    }
+
+                    ServerManager.Logger.WriteDebug(e.Message);
+                }
+
+                if (version.CurrentVersionStable == 99.99f)
+                {
+                    Console.ForegroundColor = ConsoleColor.Red;
+                    Console.WriteLine(loc["MANAGER_VERSION_FAIL"]);
+                    Console.ForegroundColor = ConsoleColor.White;
+                }
+
+#if !PRERELEASE
+                else if (version.CurrentVersionStable > Version)
+                {
+                    Console.ForegroundColor = ConsoleColor.DarkYellow;
+                    Console.WriteLine($"IW4MAdmin {loc["MANAGER_VERSION_UPDATE"]} [v{version.CurrentVersionStable.ToString("0.0")}]");
+                    Console.WriteLine($"{loc["MANAGER_VERSION_CURRENT"]} [v{Version.ToString("0.0")}]");
+                    Console.ForegroundColor = ConsoleColor.White;
+                }
+#else
+                else if (version.CurrentVersionPrerelease > Version)
+                {
+                    Console.ForegroundColor = ConsoleColor.DarkYellow;
+                    Console.WriteLine($"IW4MAdmin-Prerelease {loc["MANAGER_VERSION_UPDATE"]} [v{version.CurrentVersionPrerelease.ToString("0.0")}-pr]");
+                    Console.WriteLine($"{loc["MANAGER_VERSION_CURRENT"]} [v{Version.ToString("0.0")}-pr]");
+                    Console.ForegroundColor = ConsoleColor.White;
+                }
+#endif 
+                else
+                {
+                    Console.ForegroundColor = ConsoleColor.Green;
+                    Console.WriteLine(loc["MANAGER_VERSION_SUCCESS"]);
+                    Console.ForegroundColor = ConsoleColor.White;
+                }
+
+                ServerManager.Init().Wait();
+
+                var consoleTask = Task.Run(() =>
+                {
+                    String userInput;
+                    Player Origin = ServerManager.GetClientService().Get(1).Result.AsPlayer();
+
+                    do
+                    {
+                        userInput = Console.ReadLine();
+
+                        if (userInput?.ToLower() == "quit")
+                            ServerManager.Stop();
+
+                        if (ServerManager.Servers.Count == 0)
+                        {
+                            Console.WriteLine("No servers are currently being monitored");
+                            continue;
+                        }
+
+                        Origin.CurrentServer = ServerManager.Servers[0];
+                        GameEvent E = new GameEvent(GameEvent.EventType.Say, userInput, Origin, null, ServerManager.Servers[0]);
+                        ServerManager.Servers[0].ExecuteEvent(E);
+                        Console.Write('>');
+
+                    } while (ServerManager.Running);
+                });
+
+                if (ServerManager.GetApplicationSettings().Configuration().EnableWebFront)
+                {
+                    Task.Run(() => WebfrontCore.Program.Init(ServerManager));
+                }
+
+                ServerManager.Start();
+                ServerManager.Logger.WriteVerbose("Shutdown complete");
 
-                _applicationTask = RunApplicationTasksAsync(logger, _serverManager, _serviceProvider);
-                
-                await _applicationTask;
-                logger.LogInformation("Shutdown completed successfully");
             }
 
             catch (Exception e)
             {
-                var failMessage = translationLookup == null
-                    ? "Failed to initialize IW4MAdmin"
-                    : translationLookup["MANAGER_INIT_FAIL"];
-                var exitMessage = translationLookup == null
-                    ? "Press enter to exit..."
-                    : translationLookup["MANAGER_EXIT"];
-
-                logger.LogCritical(e, "Failed to initialize IW4MAdmin");
-                Console.WriteLine(failMessage);
-
+                Console.WriteLine(loc["MANAGER_INIT_FAIL"]);
                 while (e.InnerException != null)
                 {
                     e = e.InnerException;
                 }
-
-                if (e is ConfigurationException configException)
-                {
-                    Console.WriteLine("{{fileName}} contains an error."
-                        .FormatExt(Path.GetFileName(configException.ConfigurationFileName)));
-
-                    foreach (var error in configException.Errors)
-                    {
-                        Console.WriteLine(error);
-                    }
-                }
-
-                else
-                {
-                    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;
-            }
-
-            if (_serverManager.IsRestartRequested)
-            {
-                goto restart;
+                Console.WriteLine($"Exception: {e.Message}");
+                Console.WriteLine(loc["MANAGER_EXIT"]);
+                Console.ReadKey();
             }
         }
 
-        /// <summary>
-        /// runs the core application tasks
-        /// </summary>
-        /// <returns></returns>
-        private static Task RunApplicationTasksAsync(ILogger logger, ApplicationManager applicationManager,
-            IServiceProvider serviceProvider)
+        static void CheckDirectories()
         {
-            var collectionService = serviceProvider.GetRequiredService<IServerDataCollector>();
-            var versionChecker = serviceProvider.GetRequiredService<IMasterCommunication>();
-            var masterCommunicator = serviceProvider.GetRequiredService<IMasterCommunication>();
-            var webfrontLifetime = serviceProvider.GetRequiredService<IHostApplicationLifetime>();
-            using var onWebfrontErrored = new ManualResetEventSlim();
-            
-            var webfrontTask = _serverManager.GetApplicationSettings().Configuration().EnableWebFront
-                ? WebfrontCore.Program.GetWebHostTask(_serverManager.CancellationToken).ContinueWith(continuation =>
-                {
-                    if (!continuation.IsFaulted)
-                    {
-                        return;
-                    }
+            string curDirectory = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location) + Path.DirectorySeparatorChar;
 
-                    logger.LogCritical("Unable to start webfront task. {Message}",
-                        continuation.Exception?.InnerException?.Message);
-
-                    logger.LogDebug(continuation.Exception, "Unable to start webfront task");
-                    
-                    onWebfrontErrored.Set();
-                    
-                })
-                : Task.CompletedTask;
-
-            if (_serverManager.GetApplicationSettings().Configuration().EnableWebFront)
-            {
-                try
-                {
-                    onWebfrontErrored.Wait(webfrontLifetime.ApplicationStarted);
-                }
-                catch
-                {
-                    // ignored when webfront successfully starts
-                }
-
-                if (onWebfrontErrored.IsSet)
-                {
-                    return Task.CompletedTask;
-                }
-            }
-
-            // 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
-            async void ReadInput() => await ReadConsoleInput(logger);
-
-            var inputThread = new Thread(ReadInput);
-            inputThread.Start();
-
-            var tasks = new[]
-            {
-                applicationManager.Start(),
-                versionChecker.CheckVersion(),
-                webfrontTask,
-                masterCommunicator.RunUploadStatus(_serverManager.CancellationToken),
-                collectionService.BeginCollectionAsync(cancellationToken: _serverManager.CancellationToken)
-            };
-
-            logger.LogDebug("Starting webfront and input tasks");
-            return Task.WhenAll(tasks);
-        }
-        
-        /// <summary>
-        /// reads input from the console and executes entered commands on the default server
-        /// </summary>
-        /// <returns></returns>
-        private static async Task ReadConsoleInput(ILogger logger)
-        {
-            if (Console.IsInputRedirected)
-            {
-                logger.LogInformation("Disabling console input as it has been redirected");
-                return;
-            }
-
-            EFClient origin = null;
-
-            try
-            {
-                while (!_serverManager.CancellationToken.IsCancellationRequested)
-                {
-                    if (!_serverManager.IsInitialized)
-                    {
-                        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)
-            {
-            }
-        }
-
-        private static IServiceCollection HandlePluginRegistration(ApplicationConfiguration appConfig,
-            IServiceCollection serviceCollection,
-            IMasterApi masterApi)
-        {
-            var defaultLogger = BuildDefaultLogger<Program>(appConfig);
-            var pluginServiceProvider = new ServiceCollection()
-                .AddBaseLogger(appConfig)
-                .AddSingleton(appConfig)
-                .AddSingleton(masterApi)
-                .AddSingleton<IRemoteAssemblyHandler, RemoteAssemblyHandler>()
-                .AddSingleton<IPluginImporter, PluginImporter>()
-                .BuildServiceProvider();
-
-            var pluginImporter = pluginServiceProvider.GetRequiredService<IPluginImporter>();
-
-            // we need to register the rest client with regular collection
-            serviceCollection.AddSingleton(masterApi);
-
-            // register the native commands
-            foreach (var commandType in typeof(SharedLibraryCore.Commands.QuitCommand).Assembly.GetTypes()
-                .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);
-                serviceCollection.AddSingleton(typeof(IManagerCommand), commandType);
-            }
-
-            // register the plugin implementations
-            var (plugins, commands, configurations) = pluginImporter.DiscoverAssemblyPluginImplementations();
-            foreach (var pluginType in plugins)
-            {
-                var isV2 = pluginType.GetInterface(nameof(IPluginV2), false) != null;
-
-                defaultLogger.LogDebug("Registering plugin type {Name}", pluginType.FullName);
-
-                serviceCollection.AddSingleton(!isV2 ? typeof(IPlugin) : typeof(IPluginV2), pluginType);
-
-                try
-                {
-                    var registrationMethod = pluginType.GetMethod(nameof(IPluginV2.RegisterDependencies));
-                    registrationMethod?.Invoke(null, new object[] { serviceCollection });
-                }
-                catch (Exception ex)
-                {
-                    defaultLogger.LogError(ex, "Could not register plugin of type {Type}", pluginType.Name);
-                }
-            }
-
-            // register the plugin commands
-            foreach (var commandType in commands)
-            {
-                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);
-                var configInstance = (IBaseConfiguration) Activator.CreateInstance(configurationType);
-                var handlerType = typeof(BaseConfigurationHandler<>).MakeGenericType(configurationType);
-                var handlerInstance = Activator.CreateInstance(handlerType, configInstance.Name());
-                var genericInterfaceType = typeof(IConfigurationHandler<>).MakeGenericType(configurationType);
-                
-                serviceCollection.AddSingleton(genericInterfaceType, handlerInstance);
-            }
-
-            var scriptPlugins = pluginImporter.DiscoverScriptPlugins();
-
-            foreach (var scriptPlugin in scriptPlugins)
-            {
-                serviceCollection.AddSingleton(scriptPlugin.Item1, sp =>
-                    sp.GetRequiredService<IScriptPluginFactory>()
-                        .CreateScriptPlugin(scriptPlugin.Item1, scriptPlugin.Item2));
-            }
-
-            // 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())
-                    .Distinct()
-                    .Where(asmType => typeof(IRegisterEvent).IsAssignableFrom(asmType))))
-            {
-                var instance = Activator.CreateInstance(assemblyType) as IRegisterEvent;
-                serviceCollection.AddSingleton(instance);
-            }
-
-            return serviceCollection;
-        }
-
-
-        /// <summary>
-        /// Configures the dependency injection services
-        /// </summary>
-        private static void ConfigureServices(IServiceCollection serviceCollection)
-        {
-            // todo: this is a quick fix
-            AppContext.SetSwitch("Npgsql.EnableLegacyTimestampBehavior", true);
-
-            serviceCollection.AddConfiguration<ApplicationConfiguration>("IW4MAdminSettings")
-                .AddConfiguration<DefaultSettings>()
-                .AddConfiguration<CommandConfiguration>()
-                .AddConfiguration<StatsConfiguration>("StatsPluginSettings");
-            
-            // for legacy purposes. update at some point
-            var appConfigHandler = new BaseConfigurationHandler<ApplicationConfiguration>("IW4MAdminSettings");
-            appConfigHandler.BuildAsync().GetAwaiter().GetResult();
-            var commandConfigHandler = new BaseConfigurationHandler<CommandConfiguration>("CommandConfiguration");
-            commandConfigHandler.BuildAsync().GetAwaiter().GetResult();
-
-            if (appConfigHandler.Configuration()?.MasterUrl == new Uri("http://api.raidmax.org:5000"))
-            {
-                appConfigHandler.Configuration().MasterUrl = new ApplicationConfiguration().MasterUrl;
-            }
-
-            var appConfig = appConfigHandler.Configuration();
-            var masterUri = Utilities.IsDevelopment
-                ? new Uri("http://127.0.0.1:8080")
-                : appConfig?.MasterUrl ?? new ApplicationConfiguration().MasterUrl;
-            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().GetAwaiter().GetResult();
-            }
-
-            // register override level names
-            foreach (var (key, value) in appConfig.OverridePermissionLevelNames)
-            {
-                if (!Utilities.PermissionLevelOverrides.ContainsKey(key))
-                {
-                    Utilities.PermissionLevelOverrides.Add(key, value);
-                }
-            }
-
-            // build the dependency list
-            serviceCollection
-                .AddBaseLogger(appConfig)
-                .AddSingleton((IConfigurationHandler<ApplicationConfiguration>) appConfigHandler)
-                .AddSingleton<IConfigurationHandler<CommandConfiguration>>(commandConfigHandler)
-                .AddSingleton(serviceProvider =>
-                    serviceProvider.GetRequiredService<IConfigurationHandler<CommandConfiguration>>()
-                        .Configuration() ?? new CommandConfiguration())
-                .AddSingleton<IPluginImporter, PluginImporter>()
-                .AddSingleton<IMiddlewareActionHandler, MiddlewareActionHandler>()
-                .AddSingleton<IRConConnectionFactory, RConConnectionFactory>()
-                .AddSingleton<IGameServerInstanceFactory, GameServerInstanceFactory>()
-                .AddSingleton<IConfigurationHandlerFactory, ConfigurationHandlerFactory>()
-                .AddSingleton<IParserRegexFactory, ParserRegexFactory>()
-                .AddSingleton<IDatabaseContextFactory, DatabaseContextFactory>()
-                .AddSingleton<IGameLogReaderFactory, GameLogReaderFactory>()
-                .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>()
-                .AddSingleton<IMetaRegistration, MetaRegistration>()
-                .AddSingleton<IScriptPluginServiceResolver, ScriptPluginServiceResolver>()
-                .AddSingleton<IResourceQueryHelper<ClientPaginationRequest, ReceivedPenaltyResponse>,
-                    ReceivedPenaltyResourceQueryHelper>()
-                .AddSingleton<IResourceQueryHelper<ClientPaginationRequest, AdministeredPenaltyResponse>,
-                    AdministeredPenaltyResourceQueryHelper>()
-                .AddSingleton<IResourceQueryHelper<ClientPaginationRequest, UpdatedAliasResponse>,
-                    UpdatedAliasResourceQueryHelper>()
-                .AddSingleton<IResourceQueryHelper<ChatSearchQuery, MessageResponse>, ChatResourceQueryHelper>()
-                .AddSingleton<IResourceQueryHelper<ClientPaginationRequest, ConnectionHistoryResponse>, ConnectionsResourceQueryHelper>()
-                .AddSingleton<IResourceQueryHelper<ClientPaginationRequest, PermissionLevelChangedResponse>, PermissionLevelChangedResourceQueryHelper>()
-                .AddSingleton<IResourceQueryHelper<ClientResourceRequest, ClientResourceResponse>, ClientResourceQueryHelper>()
-                .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>()
-                .AddSingleton<IWeaponNameParser, WeaponNameParser>()
-                .AddSingleton<IHitInfoBuilder, HitInfoBuilder>()
-                .AddSingleton(typeof(ILookupCache<>), typeof(LookupCache<>))
-                .AddSingleton(typeof(IDataValueCache<,>), typeof(DataValueCache<,>))
-                .AddSingleton<IServerDataViewer, ServerDataViewer>()
-                .AddSingleton<IServerDataCollector, ServerDataCollector>()
-                .AddSingleton<IGeoLocationService>(new GeoLocationService(Path.Join(".", "Resources", "GeoLite2-Country.mmdb")))
-                .AddSingleton<IAlertManager, AlertManager>()
-#pragma warning disable CS0618
-                .AddTransient<IScriptPluginTimerHelper, ScriptPluginTimerHelper>()
-#pragma warning restore CS0618
-                .AddSingleton<IInteractionRegistration, InteractionRegistration>()
-                .AddSingleton<IRemoteCommandService, RemoteCommandService>()
-                .AddSingleton(new ConfigurationWatcher())
-                .AddSingleton(typeof(IConfigurationHandlerV2<>), typeof(BaseConfigurationHandlerV2<>))
-                .AddSingleton<IScriptPluginFactory, ScriptPluginFactory>()
-                .AddSingleton(translationLookup)
-                .AddDatabaseContextOptions(appConfig);
-           
-            serviceCollection.AddSingleton<ICoreEventHandler, CoreEventHandler>();
-            serviceCollection.AddSource();
-            HandlePluginRegistration(appConfig, serviceCollection, masterRestClient);
-        }
-
-        private static ILogger BuildDefaultLogger<T>(ApplicationConfiguration appConfig)
-        {
-            var collection = new ServiceCollection()
-                .AddBaseLogger(appConfig)
-                .BuildServiceProvider();
-
-            return collection.GetRequiredService<ILogger<T>>();
+            if (!Directory.Exists($"{curDirectory}Plugins"))
+                Directory.CreateDirectory($"{curDirectory}Plugins");
         }
     }
 }

Application/Manager.cs

@@ -0,0 +1,415 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.IO;
+using System.Threading.Tasks;
+
+using SharedLibraryCore;
+using SharedLibraryCore.Interfaces;
+using SharedLibraryCore.Commands;
+using SharedLibraryCore.Helpers;
+using SharedLibraryCore.Exceptions;
+using SharedLibraryCore.Objects;
+using SharedLibraryCore.Services;
+using IW4MAdmin.Application.API;
+using Microsoft.Extensions.Configuration;
+using WebfrontCore;
+using SharedLibraryCore.Configuration;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System.Text;
+
+namespace IW4MAdmin.Application
+{
+    public class ApplicationManager : IManager
+    {
+        private List<Server> _servers;
+        public List<Server> Servers => _servers.OrderByDescending(s => s.ClientNum).ToList();
+        public Dictionary<int, Player> PrivilegedClients { get; set; }
+        public ILogger Logger { get; private set; }
+        public bool Running { get; private set; }
+        public EventHandler<GameEvent> ServerEventOccurred { get; private set; }
+        public DateTime StartTime { get; private set; }
+
+        static ApplicationManager Instance;
+        List<AsyncStatus> TaskStatuses;
+        List<Command> Commands;
+        List<MessageToken> MessageTokens;
+        ClientService ClientSvc;
+        AliasService AliasSvc;
+        PenaltyService PenaltySvc;
+        BaseConfigurationHandler<ApplicationConfiguration> ConfigHandler;
+        EventApi Api;
+#if FTP_LOG
+        const int UPDATE_FREQUENCY = 700;
+#else
+        const int UPDATE_FREQUENCY = 450;
+#endif
+
+        private ApplicationManager()
+        {
+            Logger = new Logger($@"{Utilities.OperatingDirectory}IW4MAdmin.log");
+            _servers = new List<Server>();
+            Commands = new List<Command>();
+            TaskStatuses = new List<AsyncStatus>();
+            MessageTokens = new List<MessageToken>();
+            ClientSvc = new ClientService();
+            AliasSvc = new AliasService();
+            PenaltySvc = new PenaltyService();
+            PrivilegedClients = new Dictionary<int, Player>();
+            Api = new EventApi();
+            ServerEventOccurred += Api.OnServerEvent;
+            ConfigHandler = new BaseConfigurationHandler<ApplicationConfiguration>("IW4MAdminSettings");
+            Console.CancelKeyPress += new ConsoleCancelEventHandler(OnCancelKey);
+            StartTime = DateTime.UtcNow;
+        }
+
+        private void OnCancelKey(object sender, ConsoleCancelEventArgs args)
+        {
+            Stop();
+        }
+
+
+        public IList<Server> GetServers()
+        {
+            return Servers;
+        }
+
+        public IList<Command> GetCommands()
+        {
+            return Commands;
+        }
+
+        public static ApplicationManager GetInstance()
+        {
+            return Instance ?? (Instance = new ApplicationManager());
+        }
+
+        public async Task Init()
+        {
+            #region DATABASE
+            var ipList = (await ClientSvc.Find(c => c.Level > Player.Permission.Trusted))
+                .Select(c => new
+                {
+                    c.Password,
+                    c.PasswordSalt,
+                    c.ClientId,
+                    c.Level,
+                    c.Name
+                });
+
+            foreach (var a in ipList)
+            {
+                try
+                {
+                    PrivilegedClients.Add(a.ClientId, new Player()
+                    {
+                        Name = a.Name,
+                        ClientId = a.ClientId,
+                        Level = a.Level,
+                        PasswordSalt = a.PasswordSalt,
+                        Password = a.Password
+                    });
+                }
+
+                catch (ArgumentException)
+                {
+                    continue;
+                }
+            }
+            #endregion
+
+            #region CONFIG
+            var config = ConfigHandler.Configuration();
+
+            // copy over default config if it doesn't exist
+            if (config == null)
+            {
+                var defaultConfig = new BaseConfigurationHandler<DefaultConfiguration>("DefaultSettings").Configuration();
+                ConfigHandler.Set((ApplicationConfiguration)new ApplicationConfiguration().Generate());
+                var newConfig = ConfigHandler.Configuration();
+
+                newConfig.AutoMessagePeriod = defaultConfig.AutoMessagePeriod;
+                newConfig.AutoMessages = defaultConfig.AutoMessages;
+                newConfig.GlobalRules = defaultConfig.GlobalRules;
+                newConfig.Maps = defaultConfig.Maps;
+
+                if (newConfig.Servers == null)
+                {
+                    ConfigHandler.Set(newConfig);
+                    newConfig.Servers = ConfigurationGenerator.GenerateServerConfig(new List<ServerConfiguration>());
+                    config = newConfig;
+                    await ConfigHandler.Save();
+                }
+            }
+
+            else if (config != null)
+            {
+                if (string.IsNullOrEmpty(config.Id))
+                {
+                    config.Id = Guid.NewGuid().ToString();
+                    await ConfigHandler.Save();
+                }
+
+                if (string.IsNullOrEmpty(config.WebfrontBindUrl))
+                {
+                    config.WebfrontBindUrl = "http://127.0.0.1:1624";
+                    await ConfigHandler.Save();
+                }
+            }
+
+            else if (config.Servers.Count == 0)
+                throw new ServerException("A server configuration in IW4MAdminSettings.json is invalid");
+
+            Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
+            Utilities.EncodingType = Encoding.GetEncoding(!string.IsNullOrEmpty(config.CustomParserEncoding) ? config.CustomParserEncoding : "windows-1252");
+
+            #endregion
+            #region PLUGINS
+            SharedLibraryCore.Plugins.PluginImporter.Load(this);
+
+            foreach (var Plugin in SharedLibraryCore.Plugins.PluginImporter.ActivePlugins)
+            {
+                try
+                {
+                    await Plugin.OnLoadAsync(this);
+                }
+
+                catch (Exception e)
+                {
+                    Logger.WriteError($"An error occured loading plugin {Plugin.Name}");
+                    Logger.WriteDebug($"Exception: {e.Message}");
+                    Logger.WriteDebug($"Stack Trace: {e.StackTrace}");
+                }
+            }
+            #endregion
+
+            #region COMMANDS
+            if (ClientSvc.GetOwners().Result.Count == 0)
+                Commands.Add(new COwner());
+
+            Commands.Add(new CQuit());
+            Commands.Add(new CKick());
+            Commands.Add(new CSay());
+            Commands.Add(new CTempBan());
+            Commands.Add(new CBan());
+            Commands.Add(new CWhoAmI());
+            Commands.Add(new CList());
+            Commands.Add(new CHelp());
+            Commands.Add(new CFastRestart());
+            Commands.Add(new CMapRotate());
+            Commands.Add(new CSetLevel());
+            Commands.Add(new CUsage());
+            Commands.Add(new CUptime());
+            Commands.Add(new CWarn());
+            Commands.Add(new CWarnClear());
+            Commands.Add(new CUnban());
+            Commands.Add(new CListAdmins());
+            Commands.Add(new CLoadMap());
+            Commands.Add(new CFindPlayer());
+            Commands.Add(new CListRules());
+            Commands.Add(new CPrivateMessage());
+            Commands.Add(new CFlag());
+            Commands.Add(new CReport());
+            Commands.Add(new CListReports());
+            Commands.Add(new CListBanInfo());
+            Commands.Add(new CListAlias());
+            Commands.Add(new CExecuteRCON());
+            Commands.Add(new CPlugins());
+            Commands.Add(new CIP());
+            Commands.Add(new CMask());
+            Commands.Add(new CPruneAdmins());
+            Commands.Add(new CKillServer());
+            Commands.Add(new CSetPassword());
+            Commands.Add(new CPing());
+
+            foreach (Command C in SharedLibraryCore.Plugins.PluginImporter.ActiveCommands)
+                Commands.Add(C);
+            #endregion
+
+            #region INIT
+            async Task Init(ServerConfiguration Conf)
+            {
+                try
+                {
+                    var ServerInstance = new IW4MServer(this, Conf);
+                    await ServerInstance.Initialize();
+
+                    lock (_servers)
+                    {
+                        _servers.Add(ServerInstance);
+                    }
+
+                    Logger.WriteVerbose($"Now monitoring {ServerInstance.Hostname}");
+
+                    // this way we can keep track of execution time and see if problems arise.
+                    var Status = new AsyncStatus(ServerInstance, UPDATE_FREQUENCY);
+                    lock (TaskStatuses)
+                    {
+                        TaskStatuses.Add(Status);
+                    }
+                }
+
+                catch (ServerException e)
+                {
+                    Logger.WriteError($"Not monitoring server {Conf.IPAddress}:{Conf.Port} due to uncorrectable errors");
+                    if (e.GetType() == typeof(DvarException))
+                        Logger.WriteDebug($"Could not get the dvar value for {(e as DvarException).Data["dvar_name"]} (ensure the server has a map loaded)");
+                    else if (e.GetType() == typeof(NetworkException))
+                    {
+                        Logger.WriteDebug(e.Message);
+                    }
+
+                    // throw the exception to the main method to stop before instantly exiting
+                    throw e;
+                }
+            }
+
+            await Task.WhenAll(config.Servers.Select(c => Init(c)).ToArray());
+
+            #endregion
+
+            Running = true;
+        }
+
+        private void HeartBeatThread()
+        {
+            bool successfulConnection = false;
+            restartConnection:
+            while (!successfulConnection)
+            {
+                try
+                {
+                    API.Master.Heartbeat.Send(this, true).Wait();
+                    successfulConnection = true;
+                }
+
+                catch (Exception e)
+                {
+                    successfulConnection = false;
+                    Logger.WriteWarning($"Could not connect to heartbeat server - {e.Message}");
+                }
+
+                Thread.Sleep(30000);
+            }
+
+            while (Running)
+            {
+                Logger.WriteDebug("Sending heartbeat...");
+                try
+                {
+                    API.Master.Heartbeat.Send(this).Wait();
+                }
+                catch (System.Net.Http.HttpRequestException e)
+                {
+                    Logger.WriteWarning($"Could not send heartbeat - {e.Message}");
+                }
+
+                catch (AggregateException e)
+                {
+                    Logger.WriteWarning($"Could not send heartbeat - {e.Message}");
+                    var exceptions = e.InnerExceptions.Where(ex => ex.GetType() == typeof(RestEase.ApiException));
+
+                    foreach (var ex in exceptions)
+                    {
+                        if (((RestEase.ApiException)ex).StatusCode == System.Net.HttpStatusCode.Unauthorized)
+                        {
+                            successfulConnection = false;
+                            goto restartConnection;
+                        }
+                    }
+                }
+
+                catch (RestEase.ApiException e)
+                {
+                    Logger.WriteWarning($"Could not send heartbeat - {e.Message}");
+                    if (e.StatusCode == System.Net.HttpStatusCode.Unauthorized)
+                    {
+                        successfulConnection = false;
+                        goto restartConnection;
+                    }
+                }
+
+                Thread.Sleep(30000);
+            }
+        }
+
+        public void Start()
+        {
+            Task.Run(() => HeartBeatThread());
+            while (Running || TaskStatuses.Count > 0)
+            {
+                for (int i = 0; i < TaskStatuses.Count; i++)
+                {
+                    var Status = TaskStatuses[i];
+
+                    // task is read to be rerun
+                    if (Status.RequestedTask == null || Status.RequestedTask.Status == TaskStatus.RanToCompletion)
+                    {
+                        // remove the task when we want to quit and last run has finished
+                        if (!Running)
+                        {
+                            TaskStatuses.RemoveAt(i);
+                            continue;
+                        }
+                        // normal operation
+                        else
+                        {
+                            Status.Update(new Task<bool>(() => { return (Status.Dependant as Server).ProcessUpdatesAsync(Status.GetToken()).Result; }));
+                            if (Status.RunAverage > 1000 + UPDATE_FREQUENCY && !(Status.Dependant as Server).Throttled)
+                                Logger.WriteWarning($"Update task average execution is longer than desired for {(Status.Dependant as Server)} [{Status.RunAverage}ms]");
+                        }
+                    }
+
+                    if (Status.RequestedTask.Status == TaskStatus.Faulted)
+                    {
+                        Logger.WriteWarning($"Update task for  {(Status.Dependant as Server)} faulted, restarting");
+                        Status.Abort();
+                    }
+                }
+
+                Thread.Sleep(UPDATE_FREQUENCY);
+            }
+#if !DEBUG
+            foreach (var S in Servers)
+                S.Broadcast(Utilities.CurrentLocalization.LocalizationSet["BROADCAST_OFFLINE"]).Wait();
+#endif
+            _servers.Clear();
+        }
+
+
+        public void Stop()
+        {
+            Running = false;
+        }
+
+        public ILogger GetLogger()
+        {
+            return Logger;
+        }
+
+        public IList<MessageToken> GetMessageTokens()
+        {
+            return MessageTokens;
+        }
+
+        public IList<Player> GetActiveClients()
+        {
+            var ActiveClients = new List<Player>();
+
+            foreach (var server in _servers)
+                ActiveClients.AddRange(server.Players.Where(p => p != null));
+
+            return ActiveClients;
+        }
+
+        public ClientService GetClientService() => ClientSvc;
+        public AliasService GetAliasService() => AliasSvc;
+        public PenaltyService GetPenaltyService() => PenaltySvc;
+        public IConfigurationHandler<ApplicationConfiguration> GetApplicationSettings() => ConfigHandler;
+        public IDictionary<int, Player> GetPrivilegedClients() => PrivilegedClients;
+        public IEventApi GetEventApi() => Api;
+        public bool ShutdownRequested() => !Running;
+    }
+}

Application/Meta/AdministeredPenaltyResourceQueryHelper.cs

@@ -1,67 +0,0 @@
-using System.Linq;
-using System.Threading.Tasks;
-using Data.Abstractions;
-using Data.Models;
-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
-{
-    /// <summary>
-    /// implementation of IResourceQueryHelper
-    /// query helper that retrieves administered penalties for provided client id
-    /// </summary>
-    public class AdministeredPenaltyResourceQueryHelper : IResourceQueryHelper<ClientPaginationRequest, AdministeredPenaltyResponse>
-    {
-        private readonly ILogger _logger;
-        private readonly IDatabaseContextFactory _contextFactory;
-
-        public AdministeredPenaltyResourceQueryHelper(ILogger<AdministeredPenaltyResourceQueryHelper> logger, IDatabaseContextFactory contextFactory)
-        {
-            _contextFactory = contextFactory;
-            _logger = logger;
-        }
-
-        public async Task<ResourceQueryHelperResult<AdministeredPenaltyResponse>> QueryResource(ClientPaginationRequest query)
-        {
-            await using var ctx = _contextFactory.CreateContext(enableTracking: false);
-
-            var iqPenalties = ctx.Penalties.AsNoTracking()
-                .Where(_penalty => query.ClientId == _penalty.PunisherId)
-                .Where(_penalty => _penalty.When < query.Before)
-                .OrderByDescending(_penalty => _penalty.When);
-
-            var penalties = await iqPenalties
-                .Take(query.Count)
-                .Select(_penalty => new AdministeredPenaltyResponse()
-                {
-                    PenaltyId = _penalty.PenaltyId,
-                    Offense = _penalty.Offense,
-                    AutomatedOffense = _penalty.AutomatedOffense,
-                    ClientId = _penalty.OffenderId,
-                    OffenderName = _penalty.Offender.CurrentAlias.Name,
-                    OffenderClientId = _penalty.Offender.ClientId,
-                    PunisherClientId = _penalty.PunisherId,
-                    PunisherName = _penalty.Punisher.CurrentAlias.Name,
-                    PenaltyType = _penalty.Type,
-                    When = _penalty.When,
-                    ExpirationDate = _penalty.Expires,
-                    IsLinked = _penalty.OffenderId != query.ClientId,
-                    IsSensitive = _penalty.Type == EFPenalty.PenaltyType.Flag
-                })
-                .ToListAsync();
-
-            return new ResourceQueryHelperResult<AdministeredPenaltyResponse>
-            {
-                // todo: might need to do count at some point
-                RetrievedResultCount = penalties.Count,
-                Results = penalties
-            };
-        }
-    }
-}

Application/Meta/ConnectionsResourceQueryHelper.cs

@@ -1,60 +0,0 @@
-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

@@ -1,206 +0,0 @@
-using SharedLibraryCore;
-using SharedLibraryCore.Database.Models;
-using SharedLibraryCore.Dtos.Meta.Responses;
-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;
-
-namespace IW4MAdmin.Application.Meta
-{
-    public class MetaRegistration : IMetaRegistration
-    {
-        private readonly ILogger _logger;
-        private ITranslationLookup _transLookup;
-        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, UpdatedAliasResponse> _updatedAliasHelper;
-
-        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, ConnectionHistoryResponse> connectionHistoryHelper,
-            IResourceQueryHelper<ClientPaginationRequest, PermissionLevelChangedResponse> permissionLevelHelper)
-        {
-            _logger = logger;
-            _transLookup = transLookup;
-            _metaService = metaService;
-            _clientEntityService = clientEntityService;
-            _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, ConnectionHistoryResponse>(MetaType.ConnectionHistory,
-                GetConnectionHistoryMeta);
-            _metaService.AddRuntimeMeta<ClientPaginationRequest, PermissionLevelChangedResponse>(
-                MetaType.PermissionLevel, GetPermissionLevelMeta);
-        }
-
-        private async Task<IEnumerable<InformationResponse>> GetProfileMeta(ClientPaginationRequest request,
-            CancellationToken cancellationToken = default)
-        {
-            var metaList = new List<InformationResponse>();
-            var lastMapMeta =
-                await _metaService.GetPersistentMeta("LastMapPlayed", request.ClientId, cancellationToken);
-
-            if (lastMapMeta != null)
-            {
-                metaList.Add(new InformationResponse()
-                {
-                    ClientId = request.ClientId,
-                    MetaId = lastMapMeta.MetaId,
-                    Key = Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_CLIENT_META_LAST_MAP"],
-                    Value = lastMapMeta.Value,
-                    ShouldDisplay = true,
-                    Type = MetaType.Information,
-                    Order = 6
-                });
-            }
-
-            var lastServerMeta =
-                await _metaService.GetPersistentMeta("LastServerPlayed", request.ClientId, cancellationToken);
-
-            if (lastServerMeta != null)
-            {
-                metaList.Add(new InformationResponse()
-                {
-                    ClientId = request.ClientId,
-                    MetaId = lastServerMeta.MetaId,
-                    Key = Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_CLIENT_META_LAST_SERVER"],
-                    Value = lastServerMeta.Value,
-                    ShouldDisplay = true,
-                    Type = MetaType.Information,
-                    Order = 7
-                });
-            }
-
-            var client = await _clientEntityService.Get(request.ClientId);
-
-            if (client == null)
-            {
-                _logger.LogWarning("No client found with id {ClientId} when generating profile meta", request.ClientId);
-                return metaList;
-            }
-
-            metaList.Add(new InformationResponse()
-            {
-                ClientId = client.ClientId,
-                Key = _transLookup["WEBFRONT_PROFILE_META_PLAY_TIME"],
-                Value = TimeSpan.FromHours(client.TotalConnectionTime / 3600.0).HumanizeForCurrentCulture(),
-                ShouldDisplay = true,
-                Order = 8,
-                Type = MetaType.Information
-            });
-
-            metaList.Add(new InformationResponse()
-            {
-                ClientId = client.ClientId,
-                Key = _transLookup["WEBFRONT_PROFILE_META_FIRST_SEEN"],
-                Value = (DateTime.UtcNow - client.FirstConnection).HumanizeForCurrentCulture(),
-                ShouldDisplay = true,
-                Order = 9,
-                Type = MetaType.Information
-            });
-
-            metaList.Add(new InformationResponse()
-            {
-                ClientId = client.ClientId,
-                Key = _transLookup["WEBFRONT_PROFILE_META_LAST_SEEN"],
-                Value = (DateTime.UtcNow - client.LastConnection).HumanizeForCurrentCulture(),
-                ShouldDisplay = true,
-                Order = 10,
-                Type = MetaType.Information
-            });
-
-            metaList.Add(new InformationResponse()
-            {
-                ClientId = client.ClientId,
-                Key = Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_CLIENT_META_CONNECTIONS"],
-                Value = client.Connections.ToString("#,##0",
-                    new System.Globalization.CultureInfo(Utilities.CurrentLocalization.LocalizationName)),
-                ShouldDisplay = true,
-                Order = 11,
-                Type = MetaType.Information
-            });
-
-            metaList.Add(new InformationResponse()
-            {
-                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"],
-                IsSensitive = true,
-                Order = 12,
-                Type = MetaType.Information
-            });
-
-            return metaList;
-        }
-
-        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, CancellationToken token = default)
-        {
-            var penalties = await _administeredPenaltyHelper.QueryResource(request);
-            return penalties.Results;
-        }
-
-        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

@@ -1,52 +0,0 @@
-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)
-            .OrderByDescending(change => change.TimeChanged);
-
-        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,119 +0,0 @@
-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
-{
-    /// <summary>
-    /// implementation of IResourceQueryHelper
-    /// used to pull in penalties applied to a given client id
-    /// </summary>
-    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, ApplicationConfiguration appConfig)
-        {
-            _contextFactory = contextFactory;
-            _logger = logger;
-            _appConfig = appConfig;
-        }
-
-        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 => new { _client.AliasLinkId, _client.CurrentAliasId })
-                .FirstOrDefaultAsync();
-
-            var iqPenalties = ctx.Penalties.AsNoTracking()
-                .Where(_penalty => _penalty.OffenderId == query.ClientId ||
-                                   linkedPenaltyType.Contains(_penalty.Type) && _penalty.LinkId == linkId.AliasLinkId);
-
-            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()
-                {
-                    PenaltyId = _penalty.PenaltyId,
-                    ClientId = query.ClientId,
-                    Offense = _penalty.Offense,
-                    AutomatedOffense = _penalty.AutomatedOffense,
-                    OffenderClientId = _penalty.OffenderId,
-                    OffenderName = _penalty.Offender.CurrentAlias.Name,
-                    PunisherClientId = _penalty.PunisherId,
-                    PunisherName = _penalty.Punisher.CurrentAlias.Name,
-                    PenaltyType = _penalty.Type,
-                    When = _penalty.When,
-                    ExpirationDate = _penalty.Expires,
-                    IsLinked = _penalty.OffenderId != query.ClientId,
-                    IsSensitive = _penalty.Type == EFPenalty.PenaltyType.Flag
-                })
-                .ToListAsync();
-
-            return new ResourceQueryHelperResult<ReceivedPenaltyResponse>
-            {
-                // todo: maybe actually count
-                RetrievedResultCount = penalties.Count,
-                Results = penalties.Distinct()
-            };
-        }
-    }
-}

Application/Meta/UpdatedAliasResourceQueryHelper.cs

@@ -1,63 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using SharedLibraryCore;
-using SharedLibraryCore.Dtos.Meta.Responses;
-using SharedLibraryCore.Helpers;
-using SharedLibraryCore.Interfaces;
-using SharedLibraryCore.QueryHelper;
-using System.Linq;
-using System.Threading.Tasks;
-using Data.Abstractions;
-using Microsoft.Extensions.Logging;
-using ILogger = Microsoft.Extensions.Logging.ILogger;
-
-namespace IW4MAdmin.Application.Meta
-{
-    /// <summary>
-    /// implementation if IResrouceQueryHerlp
-    /// used to pull alias changes for given client id
-    /// </summary>
-    public class UpdatedAliasResourceQueryHelper : IResourceQueryHelper<ClientPaginationRequest, UpdatedAliasResponse>
-    {
-        private readonly ILogger _logger;
-        private readonly IDatabaseContextFactory _contextFactory;
-
-        public UpdatedAliasResourceQueryHelper(ILogger<UpdatedAliasResourceQueryHelper> logger, IDatabaseContextFactory contextFactory)
-        {
-            _logger = logger;
-            _contextFactory = contextFactory;
-        }
-
-        public async Task<ResourceQueryHelperResult<UpdatedAliasResponse>> QueryResource(ClientPaginationRequest query)
-        {
-            await using var ctx = _contextFactory.CreateContext(enableTracking: false);
-            int linkId = ctx.Clients.First(_client => _client.ClientId == query.ClientId).AliasLinkId;
-
-            var iqAliasUpdates = ctx.Aliases
-                .Where(_alias => _alias.LinkId == linkId)
-                .Where(_alias => _alias.DateAdded < query.Before)
-                .Where(_alias => _alias.IPAddress != null)
-                .OrderByDescending(_alias => _alias.DateAdded)
-                .Select(_alias => new UpdatedAliasResponse
-                {
-                    MetaId = _alias.AliasId,
-                    Name = _alias.Name,
-                    IPAddress = _alias.IPAddress.ConvertIPtoString(),
-                    When = _alias.DateAdded,
-                    Type = MetaType.AliasUpdate,
-                    IsSensitive = true
-                });
-
-            var result = (await iqAliasUpdates
-                .Take(query.Count)
-                .ToListAsync())
-                .Distinct();
-
-
-            return new ResourceQueryHelperResult<UpdatedAliasResponse>
-            {
-                Results = result, // we can potentially have duplicates
-                RetrievedResultCount = result.Count()
-            };
-        }
-    }
-}

Application/Migration/ConfigurationMigration.cs

@@ -1,104 +0,0 @@
-using SharedLibraryCore;
-using System;
-using System.IO;
-using System.Linq;
-using ILogger = Microsoft.Extensions.Logging.ILogger;
-
-namespace IW4MAdmin.Application.Migration
-{
-    /// <summary>
-    /// helps facilitate the migration of configs from one version and or location
-    /// to another
-    /// </summary>
-    class ConfigurationMigration
-    {
-        /// <summary>
-        /// ensures required directories are created
-        /// </summary>
-        public static void CheckDirectories()
-        {
-            if (!Directory.Exists(Path.Join(Utilities.OperatingDirectory, "Plugins")))
-            {
-                Directory.CreateDirectory(Path.Join(Utilities.OperatingDirectory, "Plugins"));
-            }
-
-            if (!Directory.Exists(Path.Join(Utilities.OperatingDirectory, "Database")))
-            {
-                Directory.CreateDirectory(Path.Join(Utilities.OperatingDirectory, "Database"));
-            }
-
-            if (!Directory.Exists(Path.Join(Utilities.OperatingDirectory, "Log")))
-            {
-                Directory.CreateDirectory(Path.Join(Utilities.OperatingDirectory, "Log"));
-            }
-
-            if (!Directory.Exists(Path.Join(Utilities.OperatingDirectory, "Localization")))
-            {
-                Directory.CreateDirectory(Path.Join(Utilities.OperatingDirectory, "Localization"));
-            }
-        }
-
-        /// <summary>
-        /// moves existing configs from the root folder into a configs folder
-        /// </summary>
-        public static void MoveConfigFolder10518(ILogger log)
-        {
-            string currentDirectory = Utilities.OperatingDirectory;
-
-            // we don't want to do this for migrations or tests where the 
-            // property isn't initialized or it's wrong
-            if (currentDirectory != null)
-            {
-                string configDirectory = Path.Join(currentDirectory, "Configuration");
-
-                if (!Directory.Exists(configDirectory))
-                {
-                    Directory.CreateDirectory(configDirectory);
-                }
-
-                var configurationFiles = Directory.EnumerateFiles(currentDirectory, "*.json")
-                    .Select(f => f.Split(Path.DirectorySeparatorChar).Last())
-                    .Where(f => f.Count(c => c == '.') == 1);
-
-                foreach (var configFile in configurationFiles)
-                {
-                    string destinationPath = Path.Join("Configuration", configFile);
-                    if (!File.Exists(destinationPath))
-                    {
-                        File.Move(configFile, destinationPath);
-                    }
-                }
-
-                if (!File.Exists(Path.Join("Database", "Database.db")) &&
-                    File.Exists("Database.db"))
-                {
-                    File.Move("Database.db", Path.Join("Database", "Database.db"));
-                }
-            }
-        }
-
-        public static void ModifyLogPath020919(SharedLibraryCore.Configuration.ServerConfiguration config)
-        {
-            if (config.ManualLogPath.IsRemoteLog())
-            {
-                config.GameLogServerUrl = new Uri(config.ManualLogPath);
-                config.ManualLogPath = null;
-            }
-        }
-
-        public static void RemoveObsoletePlugins20210322()
-        {
-            var files = new[] {"StatsWeb.dll", "StatsWeb.Views.dll", "IW4ScriptCommands.dll"};
-
-            foreach (var file in files)
-            {
-                var path = Path.Join(Utilities.OperatingDirectory, "Plugins", file);
-                
-                if (File.Exists(path))
-                {
-                    File.Delete(path);
-                }
-            }
-        }
-    }
-}

Application/Migration/DatabaseHousekeeping.cs

@@ -1,23 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Data.Abstractions;
-using Data.Models.Client.Stats;
-
-namespace IW4MAdmin.Application.Migration
-{
-    public static class DatabaseHousekeeping
-    {
-        private static readonly DateTime CutoffDate = DateTime.UtcNow.AddMonths(-6);
-        
-        public static async Task RemoveOldRatings(IDatabaseContextFactory contextFactory, CancellationToken token)
-        {
-            await using var context = contextFactory.CreateContext();
-            var dbSet = context.Set<EFRating>();
-            var itemsToDelete = dbSet.Where(rating => rating.When <= CutoffDate);
-            dbSet.RemoveRange(itemsToDelete);
-            await context.SaveChangesAsync(token);
-        }
-    }
-}

Application/Misc/AsyncResult.cs

@@ -1,12 +0,0 @@
-using System;
-using System.Threading;
-
-namespace IW4MAdmin.Application.Misc;
-
-public class AsyncResult : IAsyncResult
-{
-    public object AsyncState { get; set; }
-    public WaitHandle AsyncWaitHandle { get; set; }
-    public bool CompletedSynchronously { get; set; }
-    public bool IsCompleted { get; set; }
-}

Application/Misc/BaseConfigurationHandler.cs

@@ -1,110 +0,0 @@
-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
-{
-    /// <summary>
-    /// default implementation of IConfigurationHandler
-    /// </summary>
-    /// <typeparam name="T">base configuration type</typeparam>
-    public class BaseConfigurationHandler<T> : IConfigurationHandler<T> where T : IBaseConfiguration
-    {
-        private T _configuration;
-        private readonly SemaphoreSlim _onSaving;
-        private readonly JsonSerializerOptions _serializerOptions;
-
-
-        public BaseConfigurationHandler(string fileName)
-        {
-            _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 async Task BuildAsync()
-        {
-            try
-            {
-                await _onSaving.WaitAsync();
-                await using var fileStream = File.OpenRead(FileName);
-                _configuration = await JsonSerializer.DeserializeAsync<T>(fileStream, _serializerOptions);
-                await fileStream.DisposeAsync();
-            }
-
-            catch (FileNotFoundException)
-            {
-                _configuration = default;
-            }
-
-            catch (Exception e)
-            {
-                throw new ConfigurationException("Could not load configuration")
-                {
-                    Errors = new[] { e.Message },
-                    ConfigurationFileName = FileName
-                };
-            }
-            finally
-            {
-                if (_onSaving.CurrentCount == 0)
-                {
-                    _onSaving.Release(1);
-                }
-            }
-        }
-
-        public async Task Save()
-        {
-            try
-            {
-                await _onSaving.WaitAsync();
-
-                await using var fileStream = File.Create(FileName);
-                await JsonSerializer.SerializeAsync(fileStream, _configuration, _serializerOptions);
-                await fileStream.DisposeAsync();
-            }
-
-            finally
-            {
-                if (_onSaving.CurrentCount == 0)
-                {
-                    _onSaving.Release(1);
-                }
-            }
-        }
-
-        public T Configuration()
-        {
-            return _configuration;
-        }
-
-        public void Set(T config)
-        {
-            _configuration = config;
-        }
-    }
-}

Application/Misc/ClientNoticeMessageFormatter.cs

@@ -1,120 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Data.Models;
-using SharedLibraryCore;
-using SharedLibraryCore.Configuration;
-using SharedLibraryCore.Interfaces;
-
-namespace IW4MAdmin.Application.Misc
-{
-    /// <summary>
-    /// implementation of IClientNoticeMessageFormatter
-    /// </summary>
-    public class ClientNoticeMessageFormatter : IClientNoticeMessageFormatter
-    {
-        private readonly ITranslationLookup _transLookup;
-        private readonly ApplicationConfiguration _appConfig;
-
-        public ClientNoticeMessageFormatter(ITranslationLookup transLookup, ApplicationConfiguration appConfig)
-        {
-            _transLookup = transLookup;
-            _appConfig = appConfig;
-        }
-
-        public string BuildFormattedMessage(IRConParserConfiguration config, EFPenalty currentPenalty, EFPenalty originalPenalty = null)
-        {
-            var isNewLineSeparator = config.NoticeLineSeparator == Environment.NewLine;
-            var penalty = originalPenalty ?? currentPenalty;
-            var builder = new StringBuilder();
-            // build the top level header
-            var header = _transLookup[$"SERVER_{penalty.Type.ToString().ToUpper()}_TEXT"];
-            builder.Append(header);
-            builder.Append(config.NoticeLineSeparator);
-            // build the reason
-            var reason = _transLookup["GAME_MESSAGE_PENALTY_REASON"].FormatExt(penalty.Offense.FormatMessageForEngine(config));
-
-            if (isNewLineSeparator)
-            {
-                foreach (var splitReason in SplitOverMaxLength(reason, config.NoticeMaxCharactersPerLine))
-                {
-                    builder.Append(splitReason);
-                    builder.Append(config.NoticeLineSeparator);
-                }
-            }
-
-            else
-            {
-                builder.Append(reason);
-                builder.Append(config.NoticeLineSeparator);
-            }
-
-            if (penalty.Type == EFPenalty.PenaltyType.TempBan)
-            {
-                // build the time remaining if temporary
-                var timeRemainingValue = penalty.Expires.HasValue
-                    ? (penalty.Expires - DateTime.UtcNow).Value.HumanizeForCurrentCulture()
-                    : "--";
-                var timeRemaining = _transLookup["GAME_MESSAGE_PENALTY_TIME_REMAINING"].FormatExt(timeRemainingValue);
-
-                if (isNewLineSeparator)
-                {
-                    foreach (var splitReason in SplitOverMaxLength(timeRemaining, config.NoticeMaxCharactersPerLine))
-                    {
-                        builder.Append(splitReason);
-                        builder.Append(config.NoticeLineSeparator);
-                    }
-                }
-
-                else
-                {
-                    builder.Append(timeRemaining);
-                }
-            }
-
-            if (penalty.Type == EFPenalty.PenaltyType.Ban)
-            {
-                // provide a place to appeal the ban (should always be specified but including a placeholder just incase)
-                builder.Append(_transLookup["GAME_MESSAGE_PENALTY_APPEAL"].FormatExt(_appConfig.ContactUri ?? "--"));
-            }
-            
-            // final format looks something like:
-            /*
-             * You are permanently banned
-             * Reason - toxic behavior
-             * Visit example.com to appeal
-             */
-
-            return builder.ToString();
-        }
-
-        private static IEnumerable<string> SplitOverMaxLength(string source, int maxCharactersPerLine)
-        {
-            if (source.Length <= maxCharactersPerLine)
-            {
-                return new[] {source};
-            }
-
-            var segments = new List<string>();
-            var currentLocation = 0;
-            while (currentLocation < source.Length)
-            {
-                var nextLocation = currentLocation + maxCharactersPerLine;
-                // there's probably a more efficient way to do this but this is readable
-                segments.Add(string.Concat(
-                    source
-                    .Skip(currentLocation)
-                    .Take(Math.Min(maxCharactersPerLine, source.Length - currentLocation))));
-                currentLocation = nextLocation;
-            }
-
-            if (currentLocation < source.Length)
-            {
-                segments.Add(source.Substring(currentLocation, source.Length - currentLocation));
-            }
-
-            return segments;
-        }
-    }
-}

Application/Misc/GeoLocationResult.cs

@@ -1,13 +0,0 @@
-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

@@ -1,40 +0,0 @@
-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);
-            country = reader.Country(address);
-        }
-        catch
-        {
-            // ignored
-        }
-
-        var response = new GeoLocationResult
-        {
-            Country = country?.Country.Name ?? "Unknown",
-            CountryCode = country?.Country.IsoCode ?? ""
-        };
-
-        return Task.FromResult((IGeoLocationResult)response);
-    }
-}

Application/Misc/InteractionRegistration.cs

@@ -1,171 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Data.Models;
-using IW4MAdmin.Application.Plugin.Script;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using SharedLibraryCore.Interfaces;
-using InteractionRegistrationCallback =
-    System.Func<int?, Data.Models.Reference.Game?, System.Threading.CancellationToken,
-        System.Threading.Tasks.Task<SharedLibraryCore.Interfaces.IInteractionData>>;
-
-namespace IW4MAdmin.Application.Misc;
-
-public class InteractionRegistration : IInteractionRegistration
-{
-    private readonly ILogger<InteractionRegistration> _logger;
-    private readonly IServiceProvider _serviceProvider;
-    private readonly ConcurrentDictionary<string, InteractionRegistrationCallback> _interactions = new();
-
-    public InteractionRegistration(ILogger<InteractionRegistration> logger, IServiceProvider serviceProvider)
-    {
-        _logger = logger;
-        _serviceProvider = serviceProvider;
-    }
-
-    public void RegisterScriptInteraction(string interactionName, string source, Delegate interactionRegistration)
-    {
-        if (string.IsNullOrWhiteSpace(source))
-        {
-            throw new ArgumentException("Script interaction source cannot be null");
-        }
-        
-        _logger.LogDebug("Registering script interaction {InteractionName} from {Source}", interactionName, source);
-        
-        var plugin = _serviceProvider.GetRequiredService<IEnumerable<IPlugin>>()
-            .FirstOrDefault(plugin => plugin.Name == source);
-
-        if (plugin is not ScriptPlugin scriptPlugin)
-        {
-            return;
-        }
-
-        Task<IInteractionData> WrappedDelegate(int? clientId, Reference.Game? game, CancellationToken token) =>
-            Task.FromResult(
-                scriptPlugin.WrapDelegate<IInteractionData>(interactionRegistration, token, clientId, game, token));
-
-        if (!_interactions.ContainsKey(interactionName))
-        {
-            _interactions.TryAdd(interactionName, WrappedDelegate);
-        }
-        else
-        {
-            _interactions[interactionName] = WrappedDelegate;
-        }
-    }
-
-    public void RegisterInteraction(string interactionName, InteractionRegistrationCallback interactionRegistration)
-    {
-        if (!_interactions.ContainsKey(interactionName))
-        {
-            _logger.LogDebug("Registering interaction {InteractionName}", interactionName);
-            _interactions.TryAdd(interactionName, interactionRegistration);
-        }
-        else
-        {
-            _logger.LogDebug("Updating interaction {InteractionName}", interactionName);
-            _interactions[interactionName] = interactionRegistration;
-        }
-    }
-
-    public void UnregisterInteraction(string interactionName)
-    {
-        if (!_interactions.ContainsKey(interactionName))
-        {
-            return;
-        }
-
-        _logger.LogDebug("Unregistering interaction {InteractionName}", interactionName);
-        _interactions.TryRemove(interactionName, out _);
-    }
-
-    public async Task<IEnumerable<IInteractionData>> GetInteractions(string interactionPrefix = null,
-        int? clientId = null,
-        Reference.Game? game = null, CancellationToken token = default)
-    {
-        return await GetInteractionsInternal(interactionPrefix, clientId, game, token);
-    }
-
-    public async Task<string> ProcessInteraction(string interactionId, int originId, int? targetId = null,
-        Reference.Game? game = null, IDictionary<string, string> meta = null, CancellationToken token = default)
-    {
-        if (!_interactions.ContainsKey(interactionId))
-        {
-            throw new ArgumentException($"Interaction with ID {interactionId} has not been registered");
-        }
-
-        try
-        {
-            var interaction = await _interactions[interactionId](targetId, game, token);
-
-            if (interaction.Action is not null)
-            {
-                return await interaction.Action(originId, targetId, game, meta, token);
-            }
-
-            if (interaction.ScriptAction is not null)
-            {
-                foreach (var plugin in _serviceProvider.GetRequiredService<IEnumerable<IPlugin>>())
-                {
-                    if (plugin is not ScriptPlugin scriptPlugin || scriptPlugin.Name != interaction.Source)
-                    {
-                        continue;
-                    }
-
-                    return scriptPlugin.ExecuteAction<string>(interaction.ScriptAction, token, originId, targetId, game, meta,
-                        token);
-                }
-                
-                foreach (var plugin in _serviceProvider.GetRequiredService<IEnumerable<IPluginV2>>())
-                {
-                    if (plugin is not ScriptPluginV2 scriptPlugin || scriptPlugin.Name != interaction.Source)
-                    {
-                        continue;
-                    }
-
-                    return scriptPlugin
-                        .QueryWithErrorHandling(interaction.ScriptAction, originId, targetId, game, meta, token)
-                        ?.ToString();
-                }
-            }
-        }
-        catch (Exception ex)
-        {
-            _logger.LogWarning(ex,
-                "Could not process interaction for {InteractionName} and OriginId {ClientId}",
-                interactionId, originId);
-        }
-
-        return null;
-    }
-
-    private async Task<IEnumerable<IInteractionData>> GetInteractionsInternal(string prefix = null,
-        int? clientId = null, Reference.Game? game = null, CancellationToken token = default)
-    {
-        var interactions = _interactions
-            .Where(interaction => string.IsNullOrWhiteSpace(prefix) || interaction.Key.StartsWith(prefix)).Select(
-                async kvp =>
-                {
-                    try
-                    {
-                        return await kvp.Value(clientId, game, token);
-                    }
-                    catch (Exception ex)
-                    {
-                        _logger.LogWarning(ex,
-                            "Could not get interaction for {InteractionName} and ClientId {ClientId}",
-                            kvp.Key,
-                            clientId);
-                        return null;
-                    }
-                });
-
-        return (await Task.WhenAll(interactions))
-            .Where(interaction => interaction is not null)
-            .ToList();
-    }
-}

Application/Misc/LogPathGeneratorInfo.cs

@@ -1,57 +0,0 @@
-using System.Runtime.InteropServices;
-
-namespace IW4MAdmin.Application.Misc
-{
-    /// <summary>
-    /// dto class for handling log path generation
-    /// </summary>
-    public class LogPathGeneratorInfo
-    {
-        /// <summary>
-        /// directory under the paths where data comes from by default
-        /// <remarks>fs_basegame</remarks>
-        /// </summary>
-        public string BaseGameDirectory { get; set; } = "";
-
-        /// <summary>
-        /// base game root path
-        /// <remarks>fs_basepath</remarks>
-        /// </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>
-        /// </summary>
-        public string GameDirectory { get; set; } = "";
-
-        /// <summary>
-        /// game director
-        /// <remarks>fs_game</remarks>
-        /// </summary>
-        public string ModDirectory { get; set; } = "";
-
-        /// <summary>
-        /// log file name
-        /// <remarks>g_log</remarks>
-        /// </summary>
-        public string LogFile { get; set; } = "";
-
-        /// <summary>
-        /// 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/Logger.cs

@@ -1,47 +0,0 @@
-using System;
-using Microsoft.Extensions.Logging;
-using ILogger = SharedLibraryCore.Interfaces.ILogger;
-
-namespace IW4MAdmin.Application
-{
-    [Obsolete]
-    public class Logger : ILogger
-    {
-        private readonly Microsoft.Extensions.Logging.ILogger _logger;
-
-        public Logger(ILogger<Logger> logger)
-        {
-            _logger = logger;
-        }
-
-        public void WriteVerbose(string msg)
-        {
-            _logger.LogInformation(msg);
-        }
-
-        public void WriteDebug(string msg)
-        {
-            _logger.LogDebug(msg);
-        }
-
-        public void WriteError(string msg)
-        {
-            _logger.LogError(msg);
-        }
-
-        public void WriteInfo(string msg)
-        {
-            WriteVerbose(msg);
-        }
-
-        public void WriteWarning(string msg)
-        {
-            _logger.LogWarning(msg);
-        }
-
-        public void WriteAssert(bool condition, string msg)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}

Application/Misc/MasterCommunication.cs

@@ -1,175 +0,0 @@
-using IW4MAdmin.Application.API.Master;
-using RestEase;
-using SharedLibraryCore;
-using SharedLibraryCore.Configuration;
-using SharedLibraryCore.Helpers;
-using SharedLibraryCore.Interfaces;
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Logging;
-using ILogger = Microsoft.Extensions.Logging.ILogger;
-
-namespace IW4MAdmin.Application.Misc
-{
-    /// <summary>
-    /// implementation of IMasterCommunication
-    /// talks to the master server
-    /// </summary>
-    class MasterCommunication : IMasterCommunication
-    {
-        private readonly ILogger _logger;
-        private readonly ITranslationLookup _transLookup;
-        private readonly IMasterApi _apiInstance;
-        private readonly IManager _manager;
-        private readonly ApplicationConfiguration _appConfig;
-        private readonly BuildNumber _fallbackVersion = BuildNumber.Parse("99.99.99.99");
-        private readonly int _apiVersion = 1;
-        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)
-        {
-            _logger = logger;
-            _transLookup = translationLookup;
-            _apiInstance = apiInstance;
-            _appConfig = appConfig;
-            _manager = manager;
-        }
-
-        /// <summary>
-        /// checks for latest version of the application
-        /// notifies user if an update is available
-        /// </summary>
-        /// <returns></returns>
-        public async Task CheckVersion()
-        {
-            var version = new VersionInfo()
-            {
-                CurrentVersionStable = _fallbackVersion
-            };
-
-            try
-            {
-                version = await _apiInstance.GetVersion(_apiVersion);
-            }
-
-            catch (Exception e)
-            {
-                _logger.LogWarning(e, "Unable to retrieve IW4MAdmin version information");
-            }
-
-            if (version.CurrentVersionStable == _fallbackVersion)
-            {
-                Console.ForegroundColor = ConsoleColor.Red;
-                Console.WriteLine(_transLookup["MANAGER_VERSION_FAIL"]);
-                Console.ForegroundColor = ConsoleColor.Gray;
-            }
-
-#if !PRERELEASE
-            else if (version.CurrentVersionStable > Program.Version)
-            {
-                Console.ForegroundColor = ConsoleColor.DarkYellow;
-                Console.WriteLine($"IW4MAdmin {_transLookup["MANAGER_VERSION_UPDATE"]} [v{version.CurrentVersionStable.ToString()}]");
-                Console.WriteLine(_transLookup["MANAGER_VERSION_CURRENT"].FormatExt($"[v{Program.Version.ToString()}]"));
-                Console.ForegroundColor = ConsoleColor.Gray;
-            }
-#else
-            else if (version.CurrentVersionPrerelease > Program.Version)
-            {
-                Console.ForegroundColor = ConsoleColor.DarkYellow;
-                Console.WriteLine($"IW4MAdmin-Prerelease {_transLookup["MANAGER_VERSION_UPDATE"]} [v{version.CurrentVersionPrerelease.ToString()}-pr]");
-                Console.WriteLine(_transLookup["MANAGER_VERSION_CURRENT"].FormatExt($"[v{Program.Version.ToString()}-pr]"));
-                Console.ForegroundColor = ConsoleColor.Gray;
-            }
-#endif
-            else
-            {
-                Console.ForegroundColor = ConsoleColor.Green;
-                Console.WriteLine(_transLookup["MANAGER_VERSION_SUCCESS"]);
-                Console.ForegroundColor = ConsoleColor.Gray;
-            }
-        }
-
-        public async Task RunUploadStatus(CancellationToken token)
-        {
-            while (!token.IsCancellationRequested)
-            {
-                try
-                {
-                    if (_manager.IsRunning)
-                    {
-                        await UploadStatus();
-                    }
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogWarning("Could not send heartbeat - {Message}", ex.Message);
-                }
-
-                try
-                {
-                    await Task.Delay(Interval, token);
-                }
-                catch
-                {
-                    break;
-                }
-            }
-        }
-
-        private async Task UploadStatus()
-        {
-            if (_firstHeartBeat)
-            {
-                var token = await _apiInstance.Authenticate(new AuthenticationId
-                {
-                    Id = _appConfig.Id
-                });
-
-                _apiInstance.AuthorizationToken = $"Bearer {token.AccessToken}";
-            }
-
-            var instance = new ApiInstance
-            {
-                Id = _appConfig.Id,
-                Uptime = (int)(DateTime.UtcNow - (_manager as ApplicationManager).StartTime).TotalSeconds,
-                Version = Program.Version,
-                Servers = _manager.GetServers().Select(s =>
-                            new ApiServer()
-                            {
-                                ClientNum = s.ClientNum,
-                                Game = s.GameName.ToString(),
-                                Version = s.Version,
-                                Gametype = s.Gametype,
-                                Hostname = s.Hostname,
-                                Map = s.CurrentMap.Name,
-                                MaxClientNum = s.MaxClients,
-                                Id = s.EndPoint,
-                                Port = (short)s.ListenPort,
-                                IPAddress = s.ListenAddress
-                            }).ToList(),
-                WebfrontUrl = _appConfig.WebfrontUrl
-            };
-
-            Response<ResultMessage> response;
-
-            if (_firstHeartBeat)
-            {
-                response = await _apiInstance.AddInstance(instance);
-            }
-
-            else
-            {
-                response = await _apiInstance.UpdateInstance(instance.Id, instance);
-                _firstHeartBeat = false;
-            }
-
-            if (response.ResponseMessage.StatusCode != System.Net.HttpStatusCode.OK)
-            {
-                _logger.LogWarning("Non success response code from master is {StatusCode}, message is {Message}", response.ResponseMessage.StatusCode, response.StringContent);
-            }
-        }
-    }
-}

Application/Misc/MetaService.cs

@@ -1,312 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using SharedLibraryCore.Database.Models;
-using SharedLibraryCore.Dtos;
-using SharedLibraryCore.Interfaces;
-using SharedLibraryCore.QueryHelper;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Data.Abstractions;
-using Microsoft.Extensions.Logging;
-using ILogger = Microsoft.Extensions.Logging.ILogger;
-using Data.Models;
-
-namespace IW4MAdmin.Application.Misc
-{
-    /// <summary>
-    /// 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;
-        private readonly IDatabaseContextFactory _contextFactory;
-        private readonly ILogger _logger;
-
-        public MetaService(ILogger<MetaService> logger, IDatabaseContextFactory contextFactory)
-        {
-            _logger = logger;
-            _metaActions = new Dictionary<MetaType, List<dynamic>>();
-            _contextFactory = contextFactory;
-        }
-
-        public async Task AddPersistentMeta(string metaKey, string metaValue, EFClient client, EFMeta linkedMeta = null)
-        {
-            // this seems to happen if the client disconnects before they've had time to authenticate and be added
-            if (client.ClientId < 1)
-            {
-                return;
-            }
-
-            await using var ctx = _contextFactory.CreateContext();
-
-            var existingMeta = await ctx.EFMeta
-                .Where(_meta => _meta.Key == metaKey)
-                .Where(_meta => _meta.ClientId == client.ClientId)
-                .FirstOrDefaultAsync();
-
-            if (existingMeta != null)
-            {
-                existingMeta.Value = metaValue;
-                existingMeta.Updated = DateTime.UtcNow;
-                existingMeta.LinkedMetaId = linkedMeta?.MetaId;
-            }
-
-            else
-            {
-                ctx.EFMeta.Add(new EFMeta()
-                {
-                    ClientId = client.ClientId,
-                    Created = DateTime.UtcNow,
-                    Key = metaKey,
-                    Value = metaValue,
-                    LinkedMetaId = linkedMeta?.MetaId
-                });
-            }
-
-            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();
-
-            var existingMeta = await ctx.EFMeta
-                .Where(meta => meta.Key == metaKey)
-                .Where(meta => meta.ClientId == null)
-                .ToListAsync();
-
-            var matchValues = existingMeta
-                .Where(meta => meta.Value == metaValue)
-                .ToArray();
-
-            if (matchValues.Any())
-            {
-                foreach (var meta in matchValues)
-                {
-                    _logger.LogDebug("Updating existing meta with key {key} and id {id}", meta.Key, meta.MetaId);
-                    meta.Value = metaValue;
-                    meta.Updated = DateTime.UtcNow;
-                }
-
-                await ctx.SaveChangesAsync();
-            }
-
-            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();
-            }
-        }
-
-        public async Task RemovePersistentMeta(string metaKey, EFClient client)
-        {
-            await using var context = _contextFactory.CreateContext();
-
-            var existingMeta = await context.EFMeta
-                .FirstOrDefaultAsync(meta => meta.Key == metaKey && meta.ClientId == client.ClientId);
-
-            if (existingMeta == null)
-            {
-                _logger.LogDebug("No meta with key {key} found for client id {id}", metaKey, client.ClientId);
-                return;
-            }
-
-            _logger.LogDebug("Removing meta for key {key} with id {id}", metaKey, existingMeta.MetaId);
-            context.EFMeta.Remove(existingMeta);
-            await context.SaveChangesAsync();
-        }
-
-        public async Task RemovePersistentMeta(string metaKey, string metaValue = null)
-        {
-            await using var context = _contextFactory.CreateContext(enableTracking: false);
-            var existingMeta = await context.EFMeta
-                .Where(meta => meta.Key == metaKey)
-                .Where(meta => meta.ClientId == null)
-                .ToListAsync();
-
-            if (metaValue == null)
-            {
-                _logger.LogDebug("Removing all meta for key {key} with ids [{ids}] ", metaKey, string.Join(", ", existingMeta.Select(meta => meta.MetaId)));
-                existingMeta.ForEach(meta => context.Remove(existingMeta));
-                await context.SaveChangesAsync();
-                return;
-            }
-
-            var foundMeta = existingMeta.FirstOrDefault(meta => meta.Value == metaValue);
-
-            if (foundMeta != null)
-            {
-                _logger.LogDebug("Removing meta for key {key} with id {id}", metaKey, foundMeta.MetaId);
-                context.Remove(foundMeta);
-                await context.SaveChangesAsync();
-            }
-        }
-
-        public async Task<EFMeta> GetPersistentMeta(string metaKey, EFClient client)
-        {
-            await using var ctx = _contextFactory.CreateContext(enableTracking: false);
-
-            return await ctx.EFMeta
-                .Where(_meta => _meta.Key == metaKey)
-                .Where(_meta => _meta.ClientId == client.ClientId)
-                .Select(_meta => new EFMeta()
-                {
-                    MetaId = _meta.MetaId,
-                    Key = _meta.Key,
-                    ClientId = _meta.ClientId,
-                    Value = _meta.Value,
-                    LinkedMetaId = _meta.LinkedMetaId,
-                    LinkedMeta = _meta.LinkedMetaId != null ? new EFMeta()
-                    {
-                        MetaId = _meta.LinkedMeta.MetaId,
-                        Key = _meta.LinkedMeta.Key,
-                        Value = _meta.LinkedMeta.Value
-                    } : null
-                })
-                .FirstOrDefaultAsync();
-        }
-
-        public async Task<IEnumerable<EFMeta>> GetPersistentMeta(string metaKey)
-        {
-            await using var context = _contextFactory.CreateContext(enableTracking: false);
-            return await context.EFMeta
-                .Where(meta => meta.Key == metaKey)
-                .Where(meta => meta.ClientId == null)
-                .Select(meta => new EFMeta
-                {
-                    MetaId = meta.MetaId,
-                    Key = meta.Key,
-                    ClientId = meta.ClientId,
-                    Value = meta.Value,
-                })
-                .ToListAsync();
-        }
-
-        public void AddRuntimeMeta<T, V>(MetaType metaKey, Func<T, Task<IEnumerable<V>>> metaAction) where T : PaginationRequest where V : 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)
-        {
-            var metas = await Task.WhenAll(_metaActions.Where(kvp => kvp.Key != MetaType.Information)
-                .Select(async kvp => await kvp.Value[0](request)));
-
-            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
-        {
-            if (metaType == MetaType.Information)
-            {
-                var allMeta = new List<T>();
-
-                var completedMeta = await Task.WhenAll(_metaActions[metaType].Select(async individualMetaRegistration =>
-                    (IEnumerable<T>)await individualMetaRegistration(request)));
-                
-                allMeta.AddRange(completedMeta.SelectMany(meta => meta));
-                
-                return ProcessInformationMeta(allMeta);
-            }
-
-            var meta = await _metaActions[metaType][0](request) as IEnumerable<T>;
-
-            return meta;
-        }
-
-        private static IEnumerable<T> ProcessInformationMeta<T>(IEnumerable<T> meta) where T : IClientMeta
-        {
-            var table = new List<List<T>>();
-            var metaWithColumn = meta
-                .Where(_meta => _meta.Column != null);
-
-            var columnGrouping = metaWithColumn
-                .GroupBy(_meta => _meta.Column);
-
-            var metaToSort = meta.Except(metaWithColumn).ToList();
-
-            foreach (var metaItem in columnGrouping)
-            {
-                table.Add(new List<T>(metaItem));
-            }
-
-            while (metaToSort.Count > 0)
-            {
-                var sortingMeta = metaToSort.First();
-
-                int indexOfSmallestColumn()
-                {
-                    int index = 0;
-                    int smallestColumnSize = int.MaxValue;
-                    for (int i = 0; i < table.Count; i++)
-                    {
-                        if (table[i].Count < smallestColumnSize)
-                        {
-                            smallestColumnSize = table[i].Count;
-                            index = i;
-                        }
-                    }
-                    return index;
-                }
-
-                int columnIndex = indexOfSmallestColumn();
-
-                sortingMeta.Column = columnIndex;
-                sortingMeta.Order = columnGrouping
-                    .First(_group => _group.Key == columnIndex)
-                    .Count();
-
-                table[columnIndex].Add(sortingMeta);
-
-                metaToSort.Remove(sortingMeta);
-            }
-
-            return meta;
-        }
-    }
-}

Application/Misc/MetaServiceV2.cs

@@ -1,453 +0,0 @@
-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, IServiceProvider serviceProvider)
-    {
-        _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/MiddlewareActionHandler.cs

@@ -1,74 +0,0 @@
-using SharedLibraryCore.Interfaces;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Logging;
-using ILogger = Microsoft.Extensions.Logging.ILogger;
-
-namespace IW4MAdmin.Application.Misc
-{
-    class MiddlewareActionHandler : IMiddlewareActionHandler
-    {
-        private readonly IDictionary<string, IList<object>> _actions;
-        private readonly ILogger _logger;
-
-        public MiddlewareActionHandler(ILogger<MiddlewareActionHandler> logger)
-        {
-            _actions = new Dictionary<string, IList<object>>();
-            _logger = logger;
-        }
-
-        /// <summary>
-        /// Executes the action with the given name
-        /// </summary>
-        /// <typeparam name="T">Execution return type</typeparam>
-        /// <param name="value">Input value</param>
-        /// <param name="name">Name of action to execute</param>
-        /// <returns></returns>
-        public async Task<T> Execute<T>(T value, string name = null)
-        {
-            string key = string.IsNullOrEmpty(name) ? typeof(T).ToString() : name;
-
-            if (_actions.ContainsKey(key))
-            {
-                foreach (var action in _actions[key])
-                {
-                    try
-                    {
-                        value = await ((IMiddlewareAction<T>)action).Invoke(value);
-                    }
-                    catch (Exception e) 
-                    {
-                        _logger.LogWarning(e, "Failed to invoke middleware action {name}", name);
-                    }
-                }
-
-                return value;
-            }
-
-            return value;
-        }
-
-        /// <summary>
-        /// Registers an action by name
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="actionType">Action type specifier</param>
-        /// <param name="action">Action to perform</param>
-        /// <param name="name">Name of action</param>
-        public void Register<T>(T actionType, IMiddlewareAction<T> action, string name = null)
-        {
-            string key = string.IsNullOrEmpty(name) ? typeof(T).ToString() : name;
-
-            if (_actions.ContainsKey(key))
-            {
-                _actions[key].Add(action);
-            }
-
-            else
-            {
-                _actions.Add(key, new[] { action });
-            }
-        }
-    }
-}

Application/Misc/PageList.cs

@@ -1,26 +0,0 @@
-using SharedLibraryCore.Interfaces;
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace IW4MAdmin.Application
-{
-    /// <summary>
-    /// implementatin of IPageList that supports basic
-    /// pages title and page location for webfront
-    /// </summary>
-    class PageList : IPageList
-    {
-        /// <summary>
-        /// Pages dictionary
-        /// Key = page name
-        /// Value = page location (url)
-        /// </summary>
-        public IDictionary<string, string> Pages { get; set; }
-
-        public PageList()
-        {
-            Pages = new Dictionary<string, string>();
-        }
-    }
-}

Application/Misc/ParserMatchResult.cs

@@ -1,21 +0,0 @@
-using SharedLibraryCore.Interfaces;
-
-namespace IW4MAdmin.Application.Misc
-{
-    /// <summary>
-    /// implementation of the IMatchResult
-    /// used to hold matching results
-    /// </summary>
-    public class ParserMatchResult : IMatchResult
-    {
-        /// <summary>
-        /// array of matched pattern groups
-        /// </summary>
-        public string[] Values { get; set; }
-
-        /// <summary>
-        /// indicates if the match succeeded
-        /// </summary>
-        public bool Success { get; set; }
-    }
-}

Application/Misc/RemoteAssemblyHandler.cs

@@ -1,76 +0,0 @@
-using SharedLibraryCore.Configuration;
-using SharedLibraryCore.Interfaces;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Security.Cryptography;
-using System.Text;
-using Microsoft.Extensions.Logging;
-using ILogger = Microsoft.Extensions.Logging.ILogger;
-
-namespace IW4MAdmin.Application.Misc
-{
-    public class RemoteAssemblyHandler : IRemoteAssemblyHandler
-    {
-        private const int KeyLength = 32;
-        private const int TagLength = 16;
-        private const int NonceLength = 12;
-        private const int IterationCount = 10000;
-
-        private readonly ApplicationConfiguration _appconfig;
-        private readonly ILogger _logger;
-
-        public RemoteAssemblyHandler(ILogger<RemoteAssemblyHandler> logger, ApplicationConfiguration appconfig)
-        {
-            _appconfig = appconfig;
-            _logger = logger;
-        }
-
-        public IEnumerable<Assembly> DecryptAssemblies(string[] encryptedAssemblies)
-        {
-            return DecryptContent(encryptedAssemblies)
-                .Select(Assembly.Load);
-        }
-
-        public IEnumerable<string> DecryptScripts(string[] encryptedScripts)
-        {
-            return DecryptContent(encryptedScripts).Select(decryptedScript => Encoding.UTF8.GetString(decryptedScript));
-        }
-
-        private IEnumerable<byte[]> DecryptContent(string[] content)
-        {
-            if (string.IsNullOrEmpty(_appconfig.Id) || string.IsNullOrWhiteSpace(_appconfig.SubscriptionId))
-            {
-                _logger.LogWarning($"{nameof(_appconfig.Id)} and {nameof(_appconfig.SubscriptionId)} must be provided to attempt loading remote assemblies/scripts");
-                return Array.Empty<byte[]>();
-            }
-
-            var assemblies = content.Select(piece =>
-            {
-                var byteContent = Convert.FromBase64String(piece);
-                var encryptedContent = byteContent.Take(byteContent.Length - (TagLength + NonceLength)).ToArray();
-                var tag = byteContent.Skip(byteContent.Length - (TagLength + NonceLength)).Take(TagLength).ToArray();
-                var nonce = byteContent.Skip(byteContent.Length - NonceLength).Take(NonceLength).ToArray();
-                var decryptedContent = new byte[encryptedContent.Length];
-
-                var keyGen = new Rfc2898DeriveBytes(Encoding.UTF8.GetBytes(_appconfig.SubscriptionId), Encoding.UTF8.GetBytes(_appconfig.Id), IterationCount, HashAlgorithmName.SHA512);
-                var encryption = new AesGcm(keyGen.GetBytes(KeyLength));
-
-                try
-                {
-                    encryption.Decrypt(nonce, encryptedContent, tag, decryptedContent);
-                }
-
-                catch (CryptographicException ex)
-                {
-                    _logger.LogError(ex, "Could not decrypt remote plugin assemblies");
-                }
-
-                return decryptedContent;
-            });
-
-            return assemblies.ToArray();
-        }
-    }
-}

Application/Misc/RemoteCommandService.cs

@@ -1,109 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Logging;
-using SharedLibraryCore;
-using SharedLibraryCore.Configuration;
-using SharedLibraryCore.Dtos;
-using SharedLibraryCore.Interfaces;
-using SharedLibraryCore.Services;
-using ILogger = Microsoft.Extensions.Logging.ILogger;
-
-namespace IW4MAdmin.Application.Misc;
-
-public class RemoteCommandService : IRemoteCommandService
-{
-    private readonly ILogger _logger;
-    private readonly ApplicationConfiguration _appConfig;
-    private readonly ClientService _clientService;
-
-    public RemoteCommandService(ILogger<RemoteCommandService> logger, ApplicationConfiguration appConfig, ClientService clientService)
-    {
-        _logger = logger;
-        _appConfig = appConfig;
-        _clientService = clientService;
-    }
-
-    public async Task<IEnumerable<CommandResponseInfo>> Execute(int originId, int? targetId, string command,
-        IEnumerable<string> arguments, Server server)
-    {
-        var (_, result) = await ExecuteWithResult(originId, targetId, command, arguments, server);
-
-        return result;
-    }
-    
-    public async Task<(bool, IEnumerable<CommandResponseInfo>)> ExecuteWithResult(int originId, int? targetId, string command,
-        IEnumerable<string> arguments, Server server)
-    {
-        if (originId < 1)
-        {
-            _logger.LogWarning("Not executing command {Command} for {Originid} because origin id is invalid", command,
-                originId);
-            return (false, Enumerable.Empty<CommandResponseInfo>());
-        }
-        
-        var client = await _clientService.Get(originId);
-        client.CurrentServer = server;
-
-        command += $" {(targetId.HasValue ? $"@{targetId} " : "")}{string.Join(" ", arguments ?? Enumerable.Empty<string>())}";
-
-        var remoteEvent = new GameEvent
-        {
-            Type = GameEvent.EventType.Command,
-            Data = command.StartsWith(_appConfig.CommandPrefix) ||
-                   command.StartsWith(_appConfig.BroadcastCommandPrefix)
-                ? command
-                : $"{_appConfig.CommandPrefix}{command}",
-            Origin = client,
-            Owner = server,
-            IsRemote = true,
-            CorrelationId = Guid.NewGuid()
-        };
-
-        server.Manager.AddEvent(remoteEvent);
-        CommandResponseInfo[] response;
-
-        try
-        {
-            // wait for the event to process
-            var completedEvent =
-                await remoteEvent.WaitAsync(Utilities.DefaultCommandTimeout, server.Manager.CancellationToken);
-
-            if (completedEvent.FailReason == GameEvent.EventFailReason.Timeout)
-            {
-                response = new[]
-                {
-                    new CommandResponseInfo
-                    {
-                        ClientId = client.ClientId,
-                        Response = Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_COMMAND_TIMEOUT"]
-                    }
-                };
-            }
-
-            else
-            {
-                response = completedEvent.Output.Select(output => new CommandResponseInfo()
-                {
-                    Response = output,
-                    ClientId = client.ClientId
-                }).ToArray();
-            }
-        }
-
-        catch (OperationCanceledException)
-        {
-            response = new[]
-            {
-                new CommandResponseInfo
-                {
-                    ClientId = client.ClientId,
-                    Response = Utilities.CurrentLocalization.LocalizationIndex["COMMANDS_RESTART_SUCCESS"]
-                }
-            };
-        }
-
-        return (!remoteEvent.Failed, response);
-    }
-}

Application/Misc/SerializationHelpers.cs

@@ -1,150 +0,0 @@
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using SharedLibraryCore;
-using SharedLibraryCore.Database.Models;
-using System;
-using System.Net;
-using Data.Models;
-using static SharedLibraryCore.Database.Models.EFClient;
-using static SharedLibraryCore.GameEvent;
-
-namespace IW4MAdmin.Application.Misc
-{
-    class IPAddressConverter : JsonConverter
-    {
-        public override bool CanConvert(Type objectType)
-        {
-            return (objectType == typeof(IPAddress));
-        }
-
-        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-        {
-            writer.WriteValue(value.ToString());
-        }
-
-        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
-        {
-            return IPAddress.Parse((string)reader.Value);
-        }
-    }
-
-    class IPEndPointConverter : JsonConverter
-    {
-        public override bool CanConvert(Type objectType)
-        {
-            return (objectType == typeof(IPEndPoint));
-        }
-
-        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-        {
-            IPEndPoint ep = (IPEndPoint)value;
-            JObject jo = new JObject();
-            jo.Add("Address", JToken.FromObject(ep.Address, serializer));
-            jo.Add("Port", ep.Port);
-            jo.WriteTo(writer);
-        }
-
-        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
-        {
-            JObject jo = JObject.Load(reader);
-            IPAddress address = jo["Address"].ToObject<IPAddress>(serializer);
-            int port = (int)jo["Port"];
-            return new IPEndPoint(address, port);
-        }
-    }
-
-    class ClientEntityConverter : JsonConverter
-    {
-        public override bool CanConvert(Type objectType) => objectType == typeof(EFClient);
-
-        public override object ReadJson(JsonReader reader, Type objectType,object existingValue, JsonSerializer serializer)
-        {
-            if (reader.Value == null)
-            {
-                return null;
-            }
-
-            var jsonObject = JObject.Load(reader);
-
-            return new EFClient
-            {
-                NetworkId = (long)jsonObject["NetworkId"],
-                ClientNumber = (int)jsonObject["ClientNumber"],
-                State = Enum.Parse<ClientState>(jsonObject["state"].ToString()),
-                CurrentAlias = new EFAlias()
-                {
-                    IPAddress = (int?)jsonObject["IPAddress"],
-                    Name = jsonObject["Name"].ToString()
-                }
-            };
-        }
-
-        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-        {
-            var client = value as EFClient;
-            var jsonObject = new JObject
-            {
-                { "NetworkId", client.NetworkId },
-                { "ClientNumber", client.ClientNumber },
-                { "IPAddress", client.CurrentAlias?.IPAddress },
-                { "Name", client.CurrentAlias?.Name },
-                { "State", (int)client.State }
-            };
-
-            jsonObject.WriteTo(writer);
-        }
-    }
-
-    class GameEventConverter : JsonConverter
-    {
-        public override bool CanConvert(Type objectType) =>objectType == typeof(GameEvent);
-
-        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
-        {
-            var jsonObject = JObject.Load(reader);
-
-            return new GameEvent
-            {
-                Type = Enum.Parse<EventType>(jsonObject["Type"].ToString()),
-                Subtype = jsonObject["Subtype"]?.ToString(),
-                Source = Enum.Parse<EventSource>(jsonObject["Source"].ToString()),
-                RequiredEntity = Enum.Parse<EventRequiredEntity>(jsonObject["RequiredEntity"].ToString()),
-                Data = jsonObject["Data"].ToString(),
-                Message = jsonObject["Message"].ToString(),
-                GameTime = (int?)jsonObject["GameTime"],
-                Origin = jsonObject["Origin"]?.ToObject<EFClient>(serializer),
-                Target = jsonObject["Target"]?.ToObject<EFClient>(serializer),
-                ImpersonationOrigin = jsonObject["ImpersonationOrigin"]?.ToObject<EFClient>(serializer),
-                IsRemote = (bool)jsonObject["IsRemote"],
-                Extra = null, // fix
-                Time = (DateTime)jsonObject["Time"],
-                IsBlocking = (bool)jsonObject["IsBlocking"]
-            };
-        }
-
-        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-        {
-            var gameEvent = value as GameEvent;
-
-            var jsonObject = new JObject
-            {
-                { "Type", (int)gameEvent.Type },
-                { "Subtype", gameEvent.Subtype },
-                { "Source", (int)gameEvent.Source },
-                { "RequiredEntity", (int)gameEvent.RequiredEntity },
-                { "Data", gameEvent.Data },
-                { "Message", gameEvent.Message },
-                { "GameTime", gameEvent.GameTime },
-                { "Origin", gameEvent.Origin != null ? JToken.FromObject(gameEvent.Origin, serializer) : null },
-                { "Target", gameEvent.Target != null ? JToken.FromObject(gameEvent.Target, serializer) : null },
-                { "ImpersonationOrigin", gameEvent.ImpersonationOrigin != null ? JToken.FromObject(gameEvent.ImpersonationOrigin, serializer) : null},
-                { "IsRemote", gameEvent.IsRemote },
-                { "Extra", gameEvent.Extra?.ToString() },
-                { "Time", gameEvent.Time },
-                { "IsBlocking", gameEvent.IsBlocking }
-            };
-
-            jsonObject.WriteTo(writer);
-        }
-    }
-}