Update IW5 gametype names. (#240)

Application/Application.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <MvcRazorExcludeRefAssembliesFromPublish>false</MvcRazorExcludeRefAssembliesFromPublish>
     <PackageId>RaidMax.IW4MAdmin.Application</PackageId>
     <Version>2020.0.0.0</Version>
@@ -24,14 +24,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Jint" Version="3.0.0-beta-2037" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.1">
+    <PackageReference Include="Jint" Version="3.0.0-beta-1632" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.10">
       <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.5" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.10" />
+    <PackageReference Include="RestEase" Version="1.5.1" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0" />
   </ItemGroup>
 
   <PropertyGroup>

Application/ApplicationManager.cs

@@ -236,6 +236,13 @@ namespace IW4MAdmin.Application
                     .Select(ut => ut.Key)
                     .ToList();
 
+                // this is to prevent the log reader from starting before the initial
+                // query of players on the server
+                if (serverTasksToRemove.Count > 0)
+                {
+                    IsInitialized = true;
+                }
+
                 // remove the update tasks as they have completed
                 foreach (var serverId in serverTasksToRemove.Where(serverId => runningUpdateTasks.ContainsKey(serverId)))
                 {
@@ -348,10 +355,10 @@ namespace IW4MAdmin.Application
             // 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();
-        
+                var defaultConfig = new BaseConfigurationHandler<DefaultSettings>("DefaultSettings").Configuration();
+                //ConfigHandler.Set((ApplicationConfiguration)new ApplicationConfiguration().Generate());
+                //var newConfig = ConfigHandler.Configuration();
+
                 _appConfig.AutoMessages = defaultConfig.AutoMessages;
                 _appConfig.GlobalRules = defaultConfig.GlobalRules;
                 _appConfig.DisallowedClientNames = defaultConfig.DisallowedClientNames;
@@ -412,7 +419,7 @@ namespace IW4MAdmin.Application
 
                 if (!validationResult.IsValid)
                 {
-                    throw new ConfigurationException("Could not validate configuration")
+                    throw new ConfigurationException("MANAGER_CONFIGURATION_ERROR")
                     {
                         Errors = validationResult.Errors.Select(_error => _error.ErrorMessage).ToArray(),
                         ConfigurationFileName = ConfigHandler.FileName
@@ -523,7 +530,6 @@ namespace IW4MAdmin.Application
 
             Console.WriteLine(_translationLookup["MANAGER_COMMUNICATION_INFO"]);
             await InitializeServers();
-            IsInitialized = true;
         }
 
         private async Task InitializeServers()
@@ -545,7 +551,7 @@ namespace IW4MAdmin.Application
 
                         _servers.Add(ServerInstance);
                         Console.WriteLine(Utilities.CurrentLocalization.LocalizationIndex["MANAGER_MONITORING_TEXT"].FormatExt(ServerInstance.Hostname.StripColors()));
-                        _logger.LogInformation("Finishing initialization and now monitoring [{Server}]", ServerInstance.Hostname);
+                        _logger.LogInformation("Finishing initialization and now monitoring [{server}]", ServerInstance.Hostname, ServerInstance.ToString());
                     }
 
                     // add the start event for this server

Application/BuildScripts/PostBuild.bat

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

Application/BuildScripts/PostPublish.bat

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

Application/DefaultSettings.json

@@ -158,14 +158,14 @@
     {
       "Game": "IW5",
       "Gametypes": [
-        {
-          "Name": "tdm",
-          "Alias": "Team Deathmatch"
-        },
         {
           "Name": "dom",
           "Alias": "Domination"
         },
+        {
+          "Name": "conf",
+          "Alias": "Kill Confirmed"
+        },
         {
           "Name": "ctf",
           "Alias": "Capture The Flag"
@@ -175,37 +175,29 @@
           "Alias": "Demolition"
         },
         {
-          "Name": "dz",
-          "Alias": "Drop Zone"
-        },
-        {
-          "Name": "ffa",
+          "Name": "dm",
           "Alias": "Free For All"
         },
         {
-          "Name": "gg",
-          "Alias": "Gun Game"
+          "Name": "grnd",
+          "Alias": "Drop Zone"
         },
         {
-          "Name": "hq",
-          "Alias": "Headquarters"
+          "Name": "gun",
+          "Alias": "Gun Game"
         },
         {
           "Name": "koth",
           "Alias": "Headquarters"
         },
         {
-          "Name": "inf",
+          "Name": "infect",
           "Alias": "Infected"
         },
         {
-          "Name": "jug",
+          "Name": "jugg",
           "Alias": "Juggernaut"
         },
-        {
-          "Name": "kc",
-          "Alias": "Kill Confirmed"
-        },
         {
           "Name": "oic",
           "Alias": "One In The Chamber"
@@ -223,8 +215,12 @@
           "Alias": "Team Defender"
         },
         {
-          "Name": "tj",
+          "Name": "tjugg",
           "Alias": "Team Juggernaut"
+        },
+        {
+          "Name": "war",
+          "Alias": "Team Deathmatch"
         }
       ]
     },

Application/Extensions/StartupExtensions.cs

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

Application/Factories/ConfigurationHandlerFactory.cs

@@ -1,5 +1,4 @@
-using System.Threading.Tasks;
-using IW4MAdmin.Application.Misc;
+using IW4MAdmin.Application.Misc;
 using SharedLibraryCore.Interfaces;
 
 namespace IW4MAdmin.Application.Factories
@@ -18,17 +17,7 @@ namespace IW4MAdmin.Application.Factories
         /// <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;
+            return new BaseConfigurationHandler<T>(name);
         }
     }
 }

Application/Factories/GameLogReaderFactory.cs

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

Application/Factories/ScriptCommandFactory.cs

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

Application/IO/GameLogEventDetection.cs

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

Application/IO/GameLogReader.cs

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

Application/IO/GameLogReaderHttp.cs

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

Application/IO/NetworkGameLogReader.cs

@@ -1,157 +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>());
-                    }
-                    
-                    new Thread(() => ReadNetworkData(client)).Start();
-                }
-                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);
-
-                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 void ReadNetworkData(UdpClient client)
-        {
-            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
-                {
-                    bufferedData = client.Receive(ref remoteEndpoint);
-                }
-                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/IW4MServer.cs

@@ -12,7 +12,6 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Net;
-using System.Net.Sockets;
 using System.Runtime.InteropServices;
 using System.Text.RegularExpressions;
 using System.Threading;
@@ -26,6 +25,7 @@ using Data.Models;
 using Data.Models.Server;
 using IW4MAdmin.Application.Commands;
 using Microsoft.EntityFrameworkCore;
+using SharedLibraryCore.Formatting;
 using static Data.Models.Client.EFClient;
 
 namespace IW4MAdmin
@@ -53,9 +53,7 @@ namespace IW4MAdmin
             IServiceProvider serviceProvider,
             IClientNoticeMessageFormatter messageFormatter,
             ILookupCache<EFServer> serverCache) : base(serviceProvider.GetRequiredService<ILogger<Server>>(), 
-#pragma warning disable CS0612
             serviceProvider.GetRequiredService<SharedLibraryCore.Interfaces.ILogger>(), 
-#pragma warning restore CS0612
             serverConfiguration,
             serviceProvider.GetRequiredService<IManager>(), 
             serviceProvider.GetRequiredService<IRConConnectionFactory>(),
@@ -236,7 +234,7 @@ namespace IW4MAdmin
         private async Task CreatePluginTask(IPlugin plugin, GameEvent gameEvent)
         {
             // we don't want to run the events on parser plugins
-            if (plugin is ScriptPlugin { IsParser: true })
+            if (plugin is ScriptPlugin scriptPlugin && scriptPlugin.IsParser)
             {
                 return;
             }
@@ -248,11 +246,6 @@ namespace IW4MAdmin
             {
                 await plugin.OnEventAsync(gameEvent, this).WithWaitCancellation(tokenSource.Token);
             }
-            catch (OperationCanceledException)
-            {
-                ServerLogger.LogWarning("Timed out executing event {EventType} for {Plugin}", gameEvent.Type,
-                    plugin.Name);
-            }
             catch (Exception ex)
             {
                 Console.WriteLine(loc["SERVER_PLUGIN_ERROR"].FormatExt(plugin.Name, ex.GetType().Name));
@@ -295,7 +288,7 @@ namespace IW4MAdmin
                     }
                 }
                 
-                else if (E.Type == GameEvent.EventType.ConnectionLost)
+                if (E.Type == GameEvent.EventType.ConnectionLost)
                 {
                     var exception = E.Extra as Exception;
                     ServerLogger.LogError(exception,
@@ -309,7 +302,7 @@ namespace IW4MAdmin
                     Throttled = true;
                 }
 
-                else if (E.Type == GameEvent.EventType.ConnectionRestored)
+                if (E.Type == GameEvent.EventType.ConnectionRestored)
                 {
                     ServerLogger.LogInformation(
                         "Connection restored with {server}", ToString());
@@ -327,7 +320,7 @@ namespace IW4MAdmin
                     Throttled = false;
                 }
 
-                else if (E.Type == GameEvent.EventType.ChangePermission)
+                if (E.Type == GameEvent.EventType.ChangePermission)
                 {
                     var newPermission = (Permission) E.Extra;
                     ServerLogger.LogInformation("{origin} is setting {target} to permission level {newPermission}",
@@ -360,7 +353,7 @@ namespace IW4MAdmin
                         try
                         {
                             var factory = _serviceProvider.GetRequiredService<IDatabaseContextFactory>();
-                            await using var context = factory.CreateContext(enableTracking: false);
+                            await using var context = factory.CreateContext();
 
                             var messageCount = await context.InboxMessages
                                 .CountAsync(msg => msg.DestinationClientId == E.Origin.ClientId && !msg.IsDelivered);
@@ -619,7 +612,7 @@ namespace IW4MAdmin
                     await OnClientUpdate(E.Origin);
                 }
 
-                else if (E.Type == GameEvent.EventType.Say)
+                if (E.Type == GameEvent.EventType.Say)
                 {
                     if (E.Data?.Length > 0)
                     {
@@ -649,7 +642,7 @@ namespace IW4MAdmin
                     }
                 }
 
-                else if (E.Type == GameEvent.EventType.MapChange)
+                if (E.Type == GameEvent.EventType.MapChange)
                 {
                     ServerLogger.LogInformation("New map loaded - {clientCount} active players", ClientNum);
 
@@ -690,7 +683,7 @@ namespace IW4MAdmin
                     }
                 }
 
-                else if (E.Type == GameEvent.EventType.MapEnd)
+                if (E.Type == GameEvent.EventType.MapEnd)
                 {
                     ServerLogger.LogInformation("Game ending...");
 
@@ -700,12 +693,12 @@ namespace IW4MAdmin
                     }
                 }
 
-                else if (E.Type == GameEvent.EventType.Tell)
+                if (E.Type == GameEvent.EventType.Tell)
                 {
                     await Tell(E.Message, E.Target);
                 }
 
-                else if (E.Type == GameEvent.EventType.Broadcast)
+                if (E.Type == GameEvent.EventType.Broadcast)
                 {
                     if (!Utilities.IsDevelopment && E.Data != null) // hides broadcast when in development mode
                     {
@@ -1081,26 +1074,19 @@ namespace IW4MAdmin
         {
             try
             {
-                ResolvedIpEndPoint =
-                    new IPEndPoint(
-                        (await Dns.GetHostAddressesAsync(IP)).First(address =>
-                            address.AddressFamily == AddressFamily.InterNetwork), Port);
+                ResolvedIpEndPoint = new IPEndPoint((await Dns.GetHostAddressesAsync(IP)).First(), Port);
             }
             catch (Exception ex)
             {
                 ServerLogger.LogWarning(ex, "Could not resolve hostname or IP for RCon connection {IP}:{Port}", IP, Port);
                 ResolvedIpEndPoint = new IPEndPoint(IPAddress.Parse(IP), Port);
             }
-
+            
             RconParser = Manager.AdditionalRConParsers
-                .FirstOrDefault(parser =>
-                    parser.Version == ServerConfig.RConParserVersion ||
-                    parser.Name == ServerConfig.RConParserVersion);
+                .FirstOrDefault(_parser => _parser.Version == ServerConfig.RConParserVersion);
 
             EventParser = Manager.AdditionalEventParsers
-                .FirstOrDefault(parser =>
-                    parser.Version == ServerConfig.EventParserVersion ||
-                    parser.Name == ServerConfig.RConParserVersion);
+                .FirstOrDefault(_parser => _parser.Version == ServerConfig.EventParserVersion);
 
             RconParser ??= Manager.AdditionalRConParsers[0];
             EventParser ??= Manager.AdditionalEventParsers[0];
@@ -1117,7 +1103,7 @@ namespace IW4MAdmin
                 GameName = RconParser.GameName;
             }
 
-            if (version.Value?.Length != 0)
+            if (version?.Value?.Length != 0)
             {
                 var matchedRconParser = Manager.AdditionalRConParsers.FirstOrDefault(_parser => _parser.Version == version.Value);
                 RconParser.Configuration = matchedRconParser != null ? matchedRconParser.Configuration : RconParser.Configuration;

Application/Main.cs

@@ -18,7 +18,6 @@ using SharedLibraryCore.Repositories;
 using SharedLibraryCore.Services;
 using Stats.Dtos;
 using System;
-using System.IO;
 using System.Linq;
 using System.Net.Http;
 using System.Text;
@@ -35,17 +34,16 @@ using IW4MAdmin.Plugins.Stats.Client.Abstractions;
 using IW4MAdmin.Plugins.Stats.Client;
 using Stats.Client.Abstractions;
 using Stats.Client;
-using Stats.Config;
 using Stats.Helpers;
 
 namespace IW4MAdmin.Application
 {
     public class Program
     {
-        public static BuildNumber Version { get; } = BuildNumber.Parse(Utilities.GetVersionAsString());
-        private static ApplicationManager _serverManager;
-        private static Task _applicationTask;
-        private static ServiceProvider _serviceProvider;
+        public static BuildNumber Version { get; private set; } = BuildNumber.Parse(Utilities.GetVersionAsString());
+        public static ApplicationManager ServerManager;
+        private static Task ApplicationTask;
+        private static ServiceProvider serviceProvider;
 
         /// <summary>
         /// entrypoint of the application
@@ -58,7 +56,7 @@ namespace IW4MAdmin.Application
             Console.OutputEncoding = Encoding.UTF8;
             Console.ForegroundColor = ConsoleColor.Gray;
 
-            Console.CancelKeyPress += OnCancelKey;
+            Console.CancelKeyPress += new ConsoleCancelEventHandler(OnCancelKey);
 
             Console.WriteLine("=====================================================");
             Console.WriteLine(" IW4MAdmin");
@@ -77,10 +75,10 @@ namespace IW4MAdmin.Application
         /// <param name="e"></param>
         private static async void OnCancelKey(object sender, ConsoleCancelEventArgs e)
         {
-            _serverManager?.Stop();
-            if (_applicationTask != null)
+            ServerManager?.Stop();
+            if (ApplicationTask != null)
             {
-                await _applicationTask;
+                await ApplicationTask;
             }
         }
 
@@ -94,8 +92,9 @@ namespace IW4MAdmin.Application
             ITranslationLookup translationLookup = null;
             var logger = BuildDefaultLogger<Program>(new ApplicationConfiguration());
             Utilities.DefaultLogger = logger;
-            logger.LogInformation("Begin IW4MAdmin startup. Version is {Version} {@Args}", Version, args);
-            
+            IServiceCollection services = null;
+            logger.LogInformation("Begin IW4MAdmin startup. Version is {version} {@args}", Version, args);
+
             try
             {
                 // do any needed housekeeping file/folder migrations
@@ -103,30 +102,22 @@ namespace IW4MAdmin.Application
                 ConfigurationMigration.CheckDirectories();
                 ConfigurationMigration.RemoveObsoletePlugins20210322();
                 logger.LogDebug("Configuring services...");
-                var services = await ConfigureServices(args);
-                _serviceProvider = services.BuildServiceProvider();
-                var versionChecker = _serviceProvider.GetRequiredService<IMasterCommunication>();
-                _serverManager = (ApplicationManager) _serviceProvider.GetRequiredService<IManager>();
-                translationLookup = _serviceProvider.GetRequiredService<ITranslationLookup>();
+                services = ConfigureServices(args);
+                serviceProvider = services.BuildServiceProvider();
+                var versionChecker = serviceProvider.GetRequiredService<IMasterCommunication>();
+                ServerManager = (ApplicationManager) serviceProvider.GetRequiredService<IManager>();
+                translationLookup = serviceProvider.GetRequiredService<ITranslationLookup>();
 
-                _applicationTask = RunApplicationTasksAsync(logger, services);
-                var tasks = new[]
-                {
-                    versionChecker.CheckVersion(),
-                    _applicationTask
-                };
-
-                await _serverManager.Init();
-
-                await Task.WhenAll(tasks);
+                await versionChecker.CheckVersion();
+                await ServerManager.Init();
             }
 
             catch (Exception e)
             {
-                var failMessage = translationLookup == null
+                string failMessage = translationLookup == null
                     ? "Failed to initialize IW4MAdmin"
                     : translationLookup["MANAGER_INIT_FAIL"];
-                var exitMessage = translationLookup == null
+                string exitMessage = translationLookup == null
                     ? "Press enter to exit..."
                     : translationLookup["MANAGER_EXIT"];
 
@@ -140,10 +131,13 @@ namespace IW4MAdmin.Application
 
                 if (e is ConfigurationException configException)
                 {
-                    Console.WriteLine("{{fileName}} contains an error."
-                        .FormatExt(Path.GetFileName(configException.ConfigurationFileName)));
+                    if (translationLookup != null)
+                    {
+                        Console.WriteLine(translationLookup[configException.Message]
+                            .FormatExt(configException.ConfigurationFileName));
+                    }
 
-                    foreach (var error in configException.Errors)
+                    foreach (string error in configException.Errors)
                     {
                         Console.WriteLine(error);
                     }
@@ -159,12 +153,27 @@ namespace IW4MAdmin.Application
                 return;
             }
 
-            if (_serverManager.IsRestartRequested)
+            try
+            {
+                ApplicationTask = RunApplicationTasksAsync(logger, services);
+                await ApplicationTask;
+            }
+
+            catch (Exception e)
+            {
+                logger.LogCritical(e, "Failed to launch IW4MAdmin");
+                string failMessage = translationLookup == null
+                    ? "Failed to launch IW4MAdmin"
+                    : translationLookup["MANAGER_INIT_FAIL"];
+                Console.WriteLine($"{failMessage}: {e.GetExceptionInfo()}");
+            }
+
+            if (ServerManager.IsRestartRequested)
             {
                 goto restart;
             }
 
-            await _serviceProvider.DisposeAsync();
+            serviceProvider.Dispose();
         }
 
         /// <summary>
@@ -173,26 +182,24 @@ namespace IW4MAdmin.Application
         /// <returns></returns>
         private static async Task RunApplicationTasksAsync(ILogger logger, IServiceCollection services)
         {
-            var webfrontTask = _serverManager.GetApplicationSettings().Configuration().EnableWebFront
-                ? WebfrontCore.Program.Init(_serverManager, _serviceProvider, services, _serverManager.CancellationToken)
+            var webfrontTask = ServerManager.GetApplicationSettings().Configuration().EnableWebFront
+                ? WebfrontCore.Program.Init(ServerManager, serviceProvider, services, ServerManager.CancellationToken)
                 : Task.CompletedTask;
 
-            var collectionService = _serviceProvider.GetRequiredService<IServerDataCollector>();
+            var collectionService = serviceProvider.GetRequiredService<IServerDataCollector>();
 
             // we want to run this one on a manual thread instead of letting the thread pool handle it,
             // because we can't exit early from waiting on console input, and it prevents us from restarting
-            async void ReadInput() => await ReadConsoleInput(logger);
-
-            var inputThread = new Thread(ReadInput);
+            var inputThread = new Thread(async () => await ReadConsoleInput(logger));
             inputThread.Start();
 
             var tasks = new[]
             {
+                ServerManager.Start(),
                 webfrontTask,
-                _serverManager.Start(),
-                _serviceProvider.GetRequiredService<IMasterCommunication>()
-                    .RunUploadStatus(_serverManager.CancellationToken),
-                collectionService.BeginCollectionAsync(cancellationToken: _serverManager.CancellationToken)
+                serviceProvider.GetRequiredService<IMasterCommunication>()
+                    .RunUploadStatus(ServerManager.CancellationToken),
+                collectionService.BeginCollectionAsync(cancellationToken: ServerManager.CancellationToken)
             };
 
             logger.LogDebug("Starting webfront and input tasks");
@@ -201,7 +208,8 @@ namespace IW4MAdmin.Application
             logger.LogInformation("Shutdown completed successfully");
             Console.WriteLine(Utilities.CurrentLocalization.LocalizationIndex["MANAGER_SHUTDOWN_SUCCESS"]);
         }
-        
+
+
         /// <summary>
         /// reads input from the console and executes entered commands on the default server
         /// </summary>
@@ -214,41 +222,32 @@ namespace IW4MAdmin.Application
                 return;
             }
 
-            EFClient origin = null;
+            string lastCommand;
+            var Origin = Utilities.IW4MAdminClient(ServerManager.Servers[0]);
 
             try
             {
-                while (!_serverManager.CancellationToken.IsCancellationRequested)
+                while (!ServerManager.CancellationToken.IsCancellationRequested)
                 {
-                    if (!_serverManager.IsInitialized)
+                    lastCommand = await Console.In.ReadLineAsync();
+
+                    if (lastCommand?.Length > 0)
                     {
-                        await Task.Delay(1000);
-                        continue;
+                        if (lastCommand?.Length > 0)
+                        {
+                            GameEvent E = new GameEvent()
+                            {
+                                Type = GameEvent.EventType.Command,
+                                Data = lastCommand,
+                                Origin = Origin,
+                                Owner = ServerManager.Servers[0]
+                            };
+
+                            ServerManager.AddEvent(E);
+                            await E.WaitAsync(Utilities.DefaultCommandTimeout, ServerManager.CancellationToken);
+                            Console.Write('>');
+                        }
                     }
-                    
-                    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)
@@ -277,9 +276,9 @@ namespace IW4MAdmin.Application
             // register the native commands
             foreach (var commandType in typeof(SharedLibraryCore.Commands.QuitCommand).Assembly.GetTypes()
                 .Concat(typeof(Program).Assembly.GetTypes().Where(type => type.Namespace == "IW4MAdmin.Application.Commands"))
-                .Where(command => command.BaseType == typeof(Command)))
+                .Where(_command => _command.BaseType == typeof(Command)))
             {
-                defaultLogger.LogDebug("Registered native command type {Name}", commandType.Name);
+                defaultLogger.LogDebug("Registered native command type {name}", commandType.Name);
                 serviceCollection.AddSingleton(typeof(IManagerCommand), commandType);
             }
 
@@ -287,40 +286,40 @@ namespace IW4MAdmin.Application
             var (plugins, commands, configurations) = pluginImporter.DiscoverAssemblyPluginImplementations();
             foreach (var pluginType in plugins)
             {
-                defaultLogger.LogDebug("Registered plugin type {Name}", pluginType.FullName);
+                defaultLogger.LogDebug("Registered plugin type {name}", pluginType.FullName);
                 serviceCollection.AddSingleton(typeof(IPlugin), pluginType);
             }
 
             // register the plugin commands
             foreach (var commandType in commands)
             {
-                defaultLogger.LogDebug("Registered plugin command type {Name}", commandType.FullName);
+                defaultLogger.LogDebug("Registered plugin command type {name}", commandType.FullName);
                 serviceCollection.AddSingleton(typeof(IManagerCommand), commandType);
             }
 
             foreach (var configurationType in configurations)
             {
-                defaultLogger.LogDebug("Registered plugin config type {Name}", configurationType.Name);
+                defaultLogger.LogDebug("Registered plugin config type {name}", configurationType.Name);
                 var configInstance = (IBaseConfiguration) Activator.CreateInstance(configurationType);
                 var handlerType = typeof(BaseConfigurationHandler<>).MakeGenericType(configurationType);
-                var handlerInstance = Activator.CreateInstance(handlerType, configInstance.Name());
+                var handlerInstance = Activator.CreateInstance(handlerType, new[] {configInstance.Name()});
                 var genericInterfaceType = typeof(IConfigurationHandler<>).MakeGenericType(configurationType);
                 
                 serviceCollection.AddSingleton(genericInterfaceType, handlerInstance);
             }
 
             // register any script plugins
-            foreach (var plugin in pluginImporter.DiscoverScriptPlugins())
+            foreach (var scriptPlugin in pluginImporter.DiscoverScriptPlugins())
             {
-                serviceCollection.AddSingleton(plugin);
+                serviceCollection.AddSingleton(scriptPlugin);
             }
 
             // register any eventable types
             foreach (var assemblyType in typeof(Program).Assembly.GetTypes()
-                .Where(asmType => typeof(IRegisterEvent).IsAssignableFrom(asmType))
-                .Union(plugins.SelectMany(asm => asm.Assembly.GetTypes())
+                .Where(_asmType => typeof(IRegisterEvent).IsAssignableFrom(_asmType))
+                .Union(plugins.SelectMany(_asm => _asm.Assembly.GetTypes())
                     .Distinct()
-                    .Where(asmType => typeof(IRegisterEvent).IsAssignableFrom(asmType))))
+                    .Where(_asmType => typeof(IRegisterEvent).IsAssignableFrom(_asmType))))
             {
                 var instance = Activator.CreateInstance(assemblyType) as IRegisterEvent;
                 serviceCollection.AddSingleton(instance);
@@ -333,21 +332,12 @@ namespace IW4MAdmin.Application
         /// <summary>
         /// Configures the dependency injection services
         /// </summary>
-        private static async Task<IServiceCollection> ConfigureServices(string[] args)
+        private static IServiceCollection ConfigureServices(string[] args)
         {
-            // todo: this is a quick fix
-            AppContext.SetSwitch("Npgsql.EnableLegacyTimestampBehavior", true);
-
             // setup the static resources (config/master api/translations)
             var serviceCollection = new ServiceCollection();
             var appConfigHandler = new BaseConfigurationHandler<ApplicationConfiguration>("IW4MAdminSettings");
-            await appConfigHandler.BuildAsync();
             var defaultConfigHandler = new BaseConfigurationHandler<DefaultSettings>("DefaultSettings");
-            await defaultConfigHandler.BuildAsync();
-            var commandConfigHandler = new BaseConfigurationHandler<CommandConfiguration>("CommandConfiguration");
-            await commandConfigHandler.BuildAsync();
-            var statsCommandHandler = new BaseConfigurationHandler<StatsConfiguration>();
-            await statsCommandHandler.BuildAsync();
             var defaultConfig = defaultConfigHandler.Configuration();
             var appConfig = appConfigHandler.Configuration();
             var masterUri = Utilities.IsDevelopment
@@ -365,7 +355,7 @@ namespace IW4MAdmin.Application
             {
                 appConfig = (ApplicationConfiguration) new ApplicationConfiguration().Generate();
                 appConfigHandler.Set(appConfig);
-                await appConfigHandler.Save();
+                appConfigHandler.Save();
             }
 
             // register override level names
@@ -383,14 +373,15 @@ namespace IW4MAdmin.Application
             serviceCollection
                 .AddBaseLogger(appConfig)
                 .AddSingleton(defaultConfig)
-                .AddSingleton<IServiceCollection>(serviceCollection)
+                .AddSingleton<IServiceCollection>(_serviceProvider => serviceCollection)
                 .AddSingleton<IConfigurationHandler<DefaultSettings>, BaseConfigurationHandler<DefaultSettings>>()
                 .AddSingleton((IConfigurationHandler<ApplicationConfiguration>) appConfigHandler)
-                .AddSingleton<IConfigurationHandler<CommandConfiguration>>(commandConfigHandler)
+                .AddSingleton(
+                    new BaseConfigurationHandler<CommandConfiguration>("CommandConfiguration") as
+                        IConfigurationHandler<CommandConfiguration>)
                 .AddSingleton(appConfig)
-                .AddSingleton(statsCommandHandler.Configuration() ?? new StatsConfiguration())
-                .AddSingleton(serviceProvider =>
-                    serviceProvider.GetRequiredService<IConfigurationHandler<CommandConfiguration>>()
+                .AddSingleton(_serviceProvider =>
+                    _serviceProvider.GetRequiredService<IConfigurationHandler<CommandConfiguration>>()
                         .Configuration() ?? new CommandConfiguration())
                 .AddSingleton<IPluginImporter, PluginImporter>()
                 .AddSingleton<IMiddlewareActionHandler, MiddlewareActionHandler>()
@@ -421,9 +412,7 @@ namespace IW4MAdmin.Application
                 .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>()
@@ -434,7 +423,6 @@ namespace IW4MAdmin.Application
                 .AddSingleton<IServerDataViewer, ServerDataViewer>()
                 .AddSingleton<IServerDataCollector, ServerDataCollector>()
                 .AddSingleton<IEventPublisher, EventPublisher>()
-                .AddTransient<IScriptPluginTimerHelper, ScriptPluginTimerHelper>()
                 .AddSingleton(translationLookup)
                 .AddDatabaseContextOptions(appConfig);
 
@@ -461,4 +449,4 @@ namespace IW4MAdmin.Application
             return collection.GetRequiredService<ILogger<T>>();
         }
     }
-}
+}

Application/Misc/BaseConfigurationHandler.cs

@@ -1,13 +1,10 @@
-using SharedLibraryCore;
+using Newtonsoft.Json;
+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
 {
@@ -17,39 +14,27 @@ namespace IW4MAdmin.Application.Misc
     /// <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;
+        T _configuration;
 
-
-        public BaseConfigurationHandler(string fileName)
+        public BaseConfigurationHandler(string fn)
         {
-            _serializerOptions = new JsonSerializerOptions
-            {
-                WriteIndented = true,
-            };
-            _serializerOptions.Converters.Add(new JsonStringEnumConverter());
-            _onSaving = new SemaphoreSlim(1, 1);
-            FileName = Path.Join(Utilities.OperatingDirectory, "Configuration", $"{fileName}.json");
+            FileName = Path.Join(Utilities.OperatingDirectory, "Configuration", $"{fn}.json");
+            Build();
         }
 
         public BaseConfigurationHandler() : this(typeof(T).Name)
         {
-        }
-
-        ~BaseConfigurationHandler()
-        {
-            _onSaving.Dispose();
+            
         }
 
         public string FileName { get; }
 
-        public async Task BuildAsync()
+        public void Build()
         {
             try
             {
-                await using var fileStream = File.OpenRead(FileName);
-                _configuration = await JsonSerializer.DeserializeAsync<T>(fileStream, _serializerOptions);
+                var configContent = File.ReadAllText(FileName);
+                _configuration = JsonConvert.DeserializeObject<T>(configContent);
             }
 
             catch (FileNotFoundException)
@@ -59,7 +44,7 @@ namespace IW4MAdmin.Application.Misc
 
             catch (Exception e)
             {
-                throw new ConfigurationException("Could not load configuration")
+                throw new ConfigurationException("MANAGER_CONFIGURATION_ERROR")
                 {
                     Errors = new[] { e.Message },
                     ConfigurationFileName = FileName
@@ -67,23 +52,16 @@ namespace IW4MAdmin.Application.Misc
             }
         }
 
-        public async Task Save()
+        public Task Save()
         {
-            try
+            var settings = new JsonSerializerSettings()
             {
-                await _onSaving.WaitAsync();
+                Formatting = Formatting.Indented
+            };
+            settings.Converters.Add(new Newtonsoft.Json.Converters.StringEnumConverter());
 
-                await using var fileStream = File.Create(FileName);
-                await JsonSerializer.SerializeAsync(fileStream, _configuration, _serializerOptions);
-            }
-
-            finally
-            {
-                if (_onSaving.CurrentCount == 0)
-                {
-                    _onSaving.Release(1);
-                }
-            }
+            var appConfigJSON = JsonConvert.SerializeObject(_configuration, settings);
+            return File.WriteAllTextAsync(FileName, appConfigJSON);
         }
 
         public T Configuration()

Application/Misc/MasterCommunication.cs

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

Application/Misc/MetaService.cs

@@ -68,29 +68,6 @@ namespace IW4MAdmin.Application.Misc
             await ctx.SaveChangesAsync();
         }
 
-        public async Task SetPersistentMeta(string metaKey, string metaValue, int clientId)
-        {
-            await AddPersistentMeta(metaKey, metaValue, new EFClient { ClientId = clientId });
-        }
-
-        public async Task IncrementPersistentMeta(string metaKey, int incrementAmount, int clientId)
-        {
-            var existingMeta = await GetPersistentMeta(metaKey, new EFClient { ClientId = clientId });
-            
-            if (!long.TryParse(existingMeta?.Value ?? "0", out var existingValue))
-            {
-                existingValue = 0;
-            }
-
-            var newValue = existingValue + incrementAmount;
-            await SetPersistentMeta(metaKey, newValue.ToString(), clientId);
-        }
-
-        public async Task DecrementPersistentMeta(string metaKey, int decrementAmount, int clientId)
-        {
-            await IncrementPersistentMeta(metaKey, -decrementAmount, clientId);
-        }
-
         public async Task AddPersistentMeta(string metaKey, string metaValue)
         {
             await using var ctx = _contextFactory.CreateContext();
@@ -230,30 +207,42 @@ namespace IW4MAdmin.Application.Misc
 
         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)));
+            var meta = new List<IClientMeta>();
 
-            return metas.SelectMany(m => (IEnumerable<IClientMeta>)m)
-                .OrderByDescending(m => m.When)
+            foreach (var (type, actions) in _metaActions)
+            {
+                // information is not listed chronologically
+                if (type != MetaType.Information)
+                {
+                    var metaItems = await actions[0](request);
+                    meta.AddRange(metaItems);
+                }
+            }
+
+            return meta.OrderByDescending(_meta => _meta.When)
                 .Take(request.Count)
                 .ToList();
         }
 
         public async Task<IEnumerable<T>> GetRuntimeMeta<T>(ClientPaginationRequest request, MetaType metaType) where T : IClientMeta
         {
+            IEnumerable<T> meta;
             if (metaType == MetaType.Information)
             {
                 var allMeta = new List<T>();
 
-                var completedMeta = await Task.WhenAll(_metaActions[metaType].Select(async individualMetaRegistration =>
-                    (IEnumerable<T>)await individualMetaRegistration(request)));
-                
-                allMeta.AddRange(completedMeta.SelectMany(meta => meta));
-                
+                foreach (var individualMetaRegistration in _metaActions[metaType])
+                {
+                    allMeta.AddRange(await individualMetaRegistration(request));
+                }
+
                 return ProcessInformationMeta(allMeta);
             }
 
-            var meta = await _metaActions[metaType][0](request) as IEnumerable<T>;
+            else
+            {
+                meta = await _metaActions[metaType][0](request) as IEnumerable<T>;
+            }
 
             return meta;
         }

Application/Misc/PluginImporter.cs

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

Application/Misc/ScriptCommand.cs

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

Application/Misc/ScriptPlugin.cs

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

Application/Misc/ScriptPluginConfigurationWrapper.cs

@@ -12,22 +12,17 @@ namespace IW4MAdmin.Application.Misc
     public class ScriptPluginConfigurationWrapper
     {
         private readonly BaseConfigurationHandler<ScriptPluginConfiguration> _handler;
-        private ScriptPluginConfiguration _config;
+        private readonly ScriptPluginConfiguration _config;
         private readonly string _pluginName;
         private readonly Engine _scriptEngine;
 
         public ScriptPluginConfigurationWrapper(string pluginName, Engine scriptEngine)
         {
             _handler = new BaseConfigurationHandler<ScriptPluginConfiguration>("ScriptPluginSettings");
-            _pluginName = pluginName;
-            _scriptEngine = scriptEngine;
-        }
-
-        public async Task InitializeAsync()
-        {
-            await _handler.BuildAsync();
             _config = _handler.Configuration() ??
                       (ScriptPluginConfiguration) new ScriptPluginConfiguration().Generate();
+            _pluginName = pluginName;
+            _scriptEngine = scriptEngine;
         }
 
         private static int? AsInteger(double d)
@@ -92,4 +87,4 @@ namespace IW4MAdmin.Application.Misc
             return JsValue.FromObject(_scriptEngine, item);
         }
     }
-}
+}

Application/Misc/ScriptPluginTimerHelper.cs

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

Application/Misc/TokenAuthentication.cs

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

Application/RConParsers/DynamicRConParserConfiguration.cs

@@ -31,7 +31,6 @@ namespace IW4MAdmin.Application.RConParsers
         public string NoticeLineSeparator { get; set; } = Environment.NewLine;
         public int? DefaultRConPort { get; set; }
         public string DefaultInstallationDirectoryHint { get; set; }
-        public short FloodProtectInterval { get; set; } = 750;
 
         public ColorCodeMapping ColorCodeMapping { get; set; } = new ColorCodeMapping
         {
@@ -60,4 +59,4 @@ namespace IW4MAdmin.Application.RConParsers
             MaxPlayersStatus = parserRegexFactory.CreateParserRegex();
         }
     }
-}
+}

Data/Context/ContextSeed.cs

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

Data/Data.csproj

@@ -1,27 +1,30 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <Configurations>Debug;Release;Prerelease</Configurations>
     <Platforms>AnyCPU</Platforms>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageId>RaidMax.IW4MAdmin.Data</PackageId>
     <Title>RaidMax.IW4MAdmin.Data</Title>
     <Authors />
-    <PackageVersion>1.2.0</PackageVersion>
+    <PackageVersion>1.1.0</PackageVersion>
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.1">
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.10" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.10">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Npgsql" Version="6.0.2" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.2" />
-    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="6.0.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.1" />
+    <PackageReference Include="Npgsql" Version="4.1.7" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="3.1.4" />
+    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="3.2.4" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.10" />
+  </ItemGroup>
+  
+  <ItemGroup Condition="'$(Configuration)'=='Debug'">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.10" />
   </ItemGroup>
   
 </Project>

Data/Helpers/LookupCache.cs

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

Data/MigrationContext/MySqlDatabaseContext.cs

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

Data/MigrationContext/PostgresqlDatabaseContext.cs

@@ -25,10 +25,10 @@ namespace Data.MigrationContext
             {
                 optionsBuilder.UseNpgsql(
                         "Host=127.0.0.1;Database=IW4MAdmin_Migration;Username=postgres;Password=password;",
-                        options => options.SetPostgresVersion(new Version("12.9")))
+                        options => options.SetPostgresVersion(new Version("9.4")))
                     .EnableDetailedErrors(true)
                     .EnableSensitiveDataLogging(true);
             }
         }
     }
-}
+}

Data/Models/Vector3.cs

@@ -1,8 +1,6 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 using System.Text.RegularExpressions;
-// ReSharper disable CompareOfFloatsByEqualityOperator
-#pragma warning disable CS0659
 
 namespace Data.Models
 {
@@ -112,4 +110,4 @@ namespace Data.Models
 
         public double AngleBetween(Vector3 a) => Math.Acos(this.DotProduct(a) / (a.Magnitude() * this.Magnitude()));
     }
-}
+}

DeploymentFiles/UpdateIW4MAdmin.ps1

@@ -1,118 +0,0 @@
-param (
-    [Parameter(HelpMessage = "Do not prompt for any user input")]
-    [switch]$Silent = $False,
-
-    [Parameter(HelpMessage = "Clean unneeded files listed in _delete.txt after update")]
-    [switch]$Clean = $False,
-
-    [Parameter(HelpMessage = "Only update releases in the verified stream")]
-    [switch]$Verified = $False,
-
-    [Parameter(HelpMessage = "Directory to install to")]
-    [ValidateScript({
-        if (-Not($_ | Test-Path))
-        {
-            throw "File or folder does not exist"
-        } return $true
-    })]
-    [System.IO.FileInfo]$Directory
-)
-
-Write-Output "======================================="
-Write-Output " IW4MAdmin Updater v1                  "
-Write-Output " by XERXES & RaidMax                   "
-Write-Output "======================================="
-
-$stopwatch = [system.diagnostics.stopwatch]::StartNew()
-$repoName = "RaidMax/IW4M-Admin"
-$assetPattern = "IW4MAdmin-20*.zip"
-
-if ($Verified)
-{
-    $releasesUri = "https://api.github.com/repos/$repoName/releases/latest"
-}
-
-else
-{
-    $releasesUri = "https://api.github.com/repos/$repoName/releases"
-}
-
-Write-Output "Retrieving latest version info..."
-
-$releaseInfo = (Invoke-WebRequest $releasesUri | ConvertFrom-Json) | Select -First 1
-$asset = $releaseInfo.assets | Where-Object name -like $assetPattern | Select -First 1
-$downloadUri = $asset.browser_download_url
-$filename = Split-Path $downloadUri -leaf
-
-Write-Output "The latest version is $( $releaseInfo.tag_name ) released $( $releaseInfo.published_at )"
-
-if (!$Silent)
-{
-    $stopwatch.Stop()
-    Write-Warning "All IW4MAdmin files will be updated. Your database and configuration will not be modified. Are you sure you want to continue?" -WarningAction Inquire
-    $stopwatch.Start()
-}
-
-Write-Output "Downloading update. This might take a moment..."
-
-$fileDownload = Invoke-WebRequest -Uri $downloadUri
-if ($fileDownload.StatusDescription -ne "OK")
-{
-    throw "Could not update IW4MAdmin. ($fileDownload.StatusDescription)"
-}
-
-$remoteHash = $fileDownload.Headers['Content-MD5']
-$decodedHash = [System.BitConverter]::ToString([System.Convert]::FromBase64String($remoteHash)).replace('-', '')
-$directoryPath = Get-Location
-$fullPath = "$directoryPath\$filename"
-$outputFile = [System.IO.File]::Open($fullPath, 2)
-$stream = [System.IO.BinaryWriter]::new($outputFile)
-
-if ($Directory)
-{
-    $outputDir = $Directory
-}
-
-else
-{
-    $outputDir = Get-Location
-}
-
-try
-{
-    $stream.Write($fileDownload.Content)
-}
-finally
-{
-    $stream.Dispose()
-    $outputFile.Dispose()
-}
-
-$localHash = (Get-FileHash -Path $fullPath -Algorithm MD5).Hash
-
-if ($localHash -ne $decodedHash)
-{
-    throw "Failed to update. File hashes don't match!"
-}
-
-Write-Output "Extracting $filename to $outputDir"
-Expand-Archive -Path $fullPath -DestinationPath $outputDir -Force
-
-if ($Clean)
-{
-    Write-Output "Running post-update clean..."
-    $DeleteList = Get-Content -Path ./_delete.txt
-    ForEach ($file in $DeleteList)
-    {
-        Write-Output "Deleting $file"
-        Remove-Item -Path $file
-    }
-}
-
-Write-Output "Removing temporary files..."
-Remove-Item -Force $fullPath
-
-$stopwatch.Stop()
-$executionTime = [math]::Round($stopwatch.Elapsed.TotalSeconds, 0)
-
-Write-Output "Update completed successfully in $executionTime seconds!"

DeploymentFiles/UpdateIW4MAdmin.sh

@@ -1,106 +0,0 @@
-#!/bin/bash
-echo "======================================="
-echo " IW4MAdmin Updater v1                  "
-echo "======================================="
-
-while getopts scvd: flag
-do
-    case "${flag}" in
-        s) silent='true';;
-        c) clean='true';;
-        v) verified='true';;
-        d) directory=${OPTARG};;
-        *) exit 1;;
-    esac
-done
-
-start=$SECONDS
-repoName="RaidMax/IW4M-Admin"
-releaseUri="https://api.github.com/repos/$repoName/releases"
-
-echo "Retrieving latest version info..."
-
-if [ ! "$directory" ]
-then
-  directory=$(pwd)
-else
-  if [ ! -d "$directory" ]
-    then
-      mkdir "$directory"
-  fi
-fi
-
-if [ "$verified" ]
-then
-  releaseUri="https://api.github.com/repos/$repoName/releases/latest"
-fi
-
-releaseInfo=$(curl -s "${releaseUri}")
-downloadUri=$(echo "$releaseInfo" | grep "browser_download_url" | cut -d '"' -f 4"" | head -n1)
-publishDate=$(echo "$releaseInfo"| grep "published_at" | cut -d '"' -f 4"" | head -n1)
-releaseTitle=$(echo "$releaseInfo" | grep "tag_name" | cut -d '"' -f 4"" | head -n1)
-filename=$(basename $downloadUri)
-fullpath="$directory/$filename"
-
-echo "The latest version is $releaseTitle released $publishDate"
-
-if [[ ! "$silent" ]]
-  then
-  echo -e "\033[33mAll IW4MAdmin files will be updated.\033[0m"
-  echo -e "\033[33mYour database and configuration will not be modified.\033[0m"
-  read -p "Are you sure you want to continue [Y/N]? " -n 1 -r
-  echo 
-  if ! [[ $REPLY =~ ^[Yy]$ ]]
-  then
-     exit 0
-  fi
-fi
-
-echo "Downloading update. This might take a moment..."
-
-wget -q "$downloadUri" -O "$fullpath"
-
-if [[ $? -ne 0 ]]
-then
-  echo "Could not download update files!"
-  exit 1
-fi
-
-echo "Extracting $filename to $directory"
-
-unzip -o -q "$fullpath" -d "$directory"
-
-if [[ $? -ne 0 ]]
-then
-  echo "Could not extract update files!"
-  exit 1
-fi
-
-if [[ "$clean" ]]
-then
-  echo "Running post-update clean..."
-  cat "_delete.txt" | while read -r line || [[ -n $line ]];
-  do
-    rm -f "$directory/$line"
-    if [[ $? -ne 0 ]]
-    then
-      echo "Could not clean $directory/$line!"
-      exit 1
-    fi
-  done
-fi
-
-echo "Removing temporary files..."
-rm -f "$fullpath"
-
-if [[ $? -ne 0 ]]
-then
-  echo "Could not remove update files!"
-  exit 1
-fi
-
-chmod +x "$directory/StartIW4MAdmin.sh"
-chmod +x "$directory/UpdateIW4MAdmin.sh"
-
-executionTime=$(($SECONDS - start))
-echo "Update completed successfully in $executionTime seconds!"

DeploymentFiles/deployment-pipeline.yml

@@ -10,7 +10,7 @@ trigger:
 pr: none
 
 pool:
-  vmImage: 'windows-2022'
+  vmImage: 'windows-latest'
 
 variables:
   solution: 'IW4MAdmin.sln'
@@ -21,15 +21,6 @@ variables:
   isPreRelease: false
 
 steps:
-- task: UseDotNet@2
-  displayName: 'Install .NET Core 6 SDK'
-  inputs:
-    packageType: 'sdk'
-    version: '6.0.x'
-    includePreviewVersions: true
-
-- task: NuGetToolInstaller@1
-
 - task: PowerShell@2
   displayName: 'Setup Pre-Release configuration'
   condition: eq(variables['Build.SourceBranch'], 'refs/heads/release/pre')
@@ -40,7 +31,7 @@ steps:
             echo '##vso[task.setvariable variable=buildConfiguration]Prerelease'
             echo '##vso[task.setvariable variable=isPreRelease]true'
     failOnStderr: true
-  
+
 - task: NuGetCommand@2
   displayName: 'Restore nuget packages'
   inputs:
@@ -64,20 +55,6 @@ steps:
     msbuildArgs: '/p:DeployOnBuild=false /p:PackageAsSingleFile=false /p:SkipInvalidConfigurations=true /p:PackageLocation="$(build.artifactStagingDirectory)" /p:Version=$(Build.BuildNumber)'
     platform: '$(buildPlatform)'
     configuration: '$(buildConfiguration)'
-      
-- task: PowerShell@2
-  displayName: 'Bundle JS Files'
-  inputs:
-    targetType: 'inline'
-    script: |
-      Write-Host 'Getting dotnet bundle'
-      wget http://raidmax.org/IW4MAdmin/res/dotnet-bundle.zip -o $(Build.Repository.LocalPath)\dotnet-bundle.zip
-      Write-Host 'Unzipping download'
-      Expand-Archive -LiteralPath $(Build.Repository.LocalPath)\dotnet-bundle.zip -DestinationPath $(Build.Repository.LocalPath)
-      Write-Host 'Executing dotnet-bundle'
-      $(Build.Repository.LocalPath)\dotnet-bundle.exe $(Build.Repository.LocalPath)\WebfrontCore\bundleconfig.json
-    failOnStderr: true
-    workingDirectory: '$(Build.Repository.LocalPath)\WebfrontCore'
 
 - task: DotNetCoreCLI@2
   displayName: 'Publish projects'
@@ -104,7 +81,7 @@ steps:
   inputs:
     filename: 'Application\BuildScripts\PostPublish.bat'
     workingFolder: '$(Build.Repository.LocalPath)'
-    arguments: '$(outputFolder) $(Build.Repository.LocalPath)'
+    arguments: '$(outputFolder)'
     failOnStandardError: true
 
 - task: PowerShell@2
@@ -121,7 +98,6 @@ steps:
     script: |
       echo changing to encoding for linux start script
       dos2unix $(outputFolder)\StartIW4MAdmin.sh
-      dos2unix $(outputFolder)\UpdateIW4MAdmin.sh
       echo creating website version filename
       @echo IW4MAdmin-$(Build.BuildNumber) > $(Build.ArtifactStagingDirectory)\version_$(releaseType).txt
     workingDirectory: '$(Build.Repository.LocalPath)\Application\BuildScripts'
@@ -163,11 +139,6 @@ steps:
     archiveFile: '$(Build.ArtifactStagingDirectory)/IW4MAdmin-$(Build.BuildNumber).zip'
     replaceExistingArchive: true
 
-- task: PublishPipelineArtifact@1
-  inputs:
-    targetPath: '$(Build.ArtifactStagingDirectory)/IW4MAdmin-$(Build.BuildNumber).zip'
-    artifact: 'IW4MAdmin-$(Build.BuildNumber).zip'
-
 - task: FtpUpload@2
   displayName: 'Upload zip file to website'
   inputs:

GameFiles/IW4x/userraw/scripts/_commands.gsc

@@ -0,0 +1,53 @@
+#include common_scripts\utility;
+#include maps\mp\_utility;
+#include maps\mp\gametypes\_hud_util;
+#include maps\mp\gametypes\_playerlogic;
+
+init()
+{
+	SetDvarIfUninitialized( "sv_iw4madmin_command", "" );
+	level thread WaitForCommand();
+}
+
+WaitForCommand()
+{
+	level endon( "game_ended" );
+	
+	for(;;)
+	{
+		commandInfo = strtok( getDvar("sv_iw4madmin_command"), ";" );
+		command = commandInfo[0];
+		
+		switch( command )
+		{
+			case "alert":
+				//clientId        alertType       sound           message
+				SendAlert( commandInfo[1], commandInfo[2], commandInfo[3], commandInfo[4] );
+				break;
+			case "killplayer":
+				//          clientId
+				KillPlayer( commandInfo[1], commandInfo[2] );
+				break;
+		}
+
+		setDvar( "sv_iw4madmin_command", "" );
+		wait( 1 );
+	}
+}
+
+SendAlert( clientId, alertType, sound, message )
+{
+	client = getPlayerFromClientNum( int( clientId ) );
+	client thread playLeaderDialogOnPlayer( sound, client.team );
+	client playLocalSound( sound );
+	client iPrintLnBold( "^1" + alertType + ": ^3" + message );
+}
+
+KillPlayer( targetId, originId)
+{
+	target = getPlayerFromClientNum( int( targetId ) );
+	target suicide();
+	origin = getPlayerFromClientNum( int( originId ) );
+	
+	iPrintLnBold("^1" + origin.name + " ^7killed ^5" + target.name);
+}

GameFiles/IW4x/userraw/scripts/_integration.gsc

@@ -1,704 +0,0 @@
-#include common_scripts\utility;
-#include maps\mp\_utility;
-#include maps\mp\gametypes\_hud_util;
-#include maps\mp\gametypes\_playerlogic;
-
-init()
-{
-    // setup default vars
-    level.eventBus              = spawnstruct();
-    level.eventBus.inVar        = "sv_iw4madmin_in";
-    level.eventBus.outVar       = "sv_iw4madmin_out";
-    level.eventBus.failKey      = "fail";
-    level.eventBus.timeoutKey   = "timeout";
-    level.eventBus.timeout      = 30;
-    
-    level.clientDataKey = "clientData";
-
-    level.eventTypes                            = spawnstruct();
-    level.eventTypes.localClientEvent           = "client_event";
-    level.eventTypes.clientDataReceived         = "ClientDataReceived";
-    level.eventTypes.clientDataRequested        = "ClientDataRequested";
-    level.eventTypes.setClientDataRequested     = "SetClientDataRequested";
-    level.eventTypes.setClientDataCompleted     = "SetClientDataCompleted";
-    level.eventTypes.executeCommandRequested    = "ExecuteCommandRequested";
-                                                                             
-    SetDvarIfUninitialized( level.eventBus.inVar, "" );
-    SetDvarIfUninitialized( level.eventBus.outVar, "" );
-    SetDvarIfUninitialized( "sv_iw4madmin_integration_enabled", 1 );
-    SetDvarIfUninitialized( "sv_iw4madmin_integration_debug", 0 );
-    
-    // map the event type to the handler
-    level.eventCallbacks = [];
-    level.eventCallbacks[level.eventTypes.clientDataReceived]       = ::OnClientDataReceived;
-    level.eventCallbacks[level.eventTypes.executeCommandRequested]  = ::OnExecuteCommand; 
-    level.eventCallbacks[level.eventTypes.setClientDataCompleted]   = ::OnSetClientDataCompleted;
-    
-    if ( GetDvarInt( "sv_iw4madmin_integration_enabled" ) != 1 )
-    {
-        return;
-    }
-    
-    // start long running tasks
-    level thread MonitorClientEvents();
-    level thread MonitorBus();
-    level thread OnPlayerConnect();
-}
-
-//////////////////////////////////
-// Client Methods
-//////////////////////////////////
-
-OnPlayerConnect()
-{
-    level endon ( "disconnect" );
-    
-    for ( ;; )
-    {
-        level waittill( "connected", player );
-        
-        level.iw4adminIntegrationDebug = GetDvarInt( "sv_iw4madmin_integration_debug" );
-        
-        if ( !isDefined( player.pers[level.clientDataKey] ) )
-        {
-            player.pers[level.clientDataKey] = spawnstruct();
-        }
-        
-        player thread OnPlayerSpawned();
-        player thread PlayerTrackingOnInterval();
-        player ToggleNightMode();
-    }
-}
-
-OnPlayerSpawned()
-{
-    self endon( "disconnect" );
-
-    for ( ;; )
-    {
-        self waittill( "spawned_player" );
-        self PlayerConnectEvents();
-    }
-}
-
-OnPlayerDisconnect()
-{
-    level endon ( "disconnect" );
-
-    for ( ;; )
-    {
-        self waittill( "disconnect" );
-        self SaveTrackingMetrics();
-    }
-}
-
-OnGameEnded() 
-{
-    level endon ( "disconnect" );
-    
-    for ( ;; )
-    {
-        level waittill( "game_ended" );
-        // note: you can run data code here but it's possible for 
-        // data to get truncated, so we will try a timer based approach for now
-    }
-}
-
-DisplayWelcomeData()
-{
-    self endon( "disconnect" );
-
-    clientData = self.pers[level.clientDataKey];
-    
-    if ( clientData.permissionLevel == "User" || clientData.permissionLevel == "Flagged" ) 
-    {
-        return;
-    } 
-    
-    self IPrintLnBold( "Welcome, your level is ^5" + clientData.permissionLevel );
-    wait( 2.0 );
-    self IPrintLnBold( "You were last seen ^5" + clientData.lastConnection );
-}
-
-PlayerConnectEvents() 
-{
-    self endon( "disconnect" );
-    
-    clientData = self.pers[level.clientDataKey];
-    
-    // this gives IW4MAdmin some time to register the player before making the request;
-    // although probably not necessary some users might have a slow database or poll rate
-    wait ( 2 );
-
-    if ( isDefined( clientData.state ) && clientData.state == "complete" ) 
-    {
-        return;
-    }
-    
-    self RequestClientBasicData();
-    // example of requesting meta from IW4MAdmin
-    // self RequestClientMeta( "LastServerPlayed" );
-}
-
-PlayerTrackingOnInterval() 
-{
-    self endon( "disconnect" );
-
-    for ( ;; )
-    {
-        wait ( 120 );
-        if ( IsAlive( self ) )
-        {
-            self SaveTrackingMetrics();
-        }
-    }
-}
-
-MonitorClientEvents()
-{
-    level endon( "disconnect" );
-    self endon( "disconnect" );
-    
-    for ( ;; ) 
-    {
-        level waittill( level.eventTypes.localClientEvent, client );
- 
-        if ( level.iw4adminIntegrationDebug == 1 )
-        {
-            self IPrintLn( "Processing Event " + client.event.type + "-" + client.event.subtype );
-        }
-        
-        eventHandler = level.eventCallbacks[client.event.type];
-
-        if ( isDefined( eventHandler ) )
-        {
-            client [[eventHandler]]( client.event );
-        }
-        
-        client.eventData = [];
-    }
-}
-
-//////////////////////////////////
-// Helper Methods
-//////////////////////////////////
-
-RequestClientMeta( metaKey )
-{
-    getClientMetaEvent = BuildEventRequest( true, level.eventTypes.clientDataRequested, "Meta", self, metaKey );
-    level thread QueueEvent( getClientMetaEvent, level.eventTypes.clientDataRequested, self );
-}
-
-RequestClientBasicData()
-{
-    getClientDataEvent = BuildEventRequest( true, level.eventTypes.clientDataRequested, "None", self, "" );
-    level thread QueueEvent( getClientDataEvent, level.eventTypes.clientDataRequested, self );
-}
-
-IncrementClientMeta( metaKey, incrementValue, clientId )
-{
-    SetClientMeta( metaKey, incrementValue, clientId, "increment" );
-}
-
-DecrementClientMeta( metaKey, decrementValue, clientId )
-{
-    SetClientMeta( metaKey, decrementValue, clientId, "decrement" );
-}
-
-SetClientMeta( metaKey, metaValue, clientId, direction )
-{
-    data = "key=" + metaKey + "|value=" + metaValue;
-    clientNumber = -1;
-
-    if ( IsDefined ( clientId ) )
-    {
-        data = data + "|clientId=" + clientId;
-        clientNumber = -1;
-    }
-
-    if ( IsDefined( direction ) )
-    {
-        data = data + "|direction=" + direction;
-    }
-
-    if ( IsPlayer( self ) )
-    {
-        clientNumber = self getEntityNumber();
-    }
-
-    setClientMetaEvent = BuildEventRequest( true, level.eventTypes.setClientDataRequested, "Meta", clientNumber, data );
-    level thread QueueEvent( setClientMetaEvent, level.eventTypes.setClientDataRequested, self );
-}
-
-SaveTrackingMetrics()
-{
-    if ( level.iw4adminIntegrationDebug == 1 )
-    {
-        IPrintLn( "Saving tracking metrics for " + self.persistentClientId );
-    }
-
-    currentShotCount = self getPlayerStat( "mostshotsfired" );
-    change = currentShotCount - self.lastShotCount;
-    self.lastShotCount = currentShotCount;
-
-    if ( level.iw4adminIntegrationDebug == 1 )
-    {
-        IPrintLn( "Total Shots Fired increased by " + change );
-    }
-
-    if ( !IsDefined( change ) )
-    {
-        change = 0;
-    }
-    
-    if ( change == 0 )
-    {
-        return;
-    }
-
-    IncrementClientMeta( "TotalShotsFired", change, self.persistentClientId );
-
-}
-
-BuildEventRequest( responseExpected, eventType, eventSubtype, entOrId, data ) 
-{
-    if ( !isDefined( data ) )
-    {
-        data = "";
-    }
-    
-    if ( !isDefined( eventSubtype ) )
-    {
-        eventSubtype = "None";
-    }
-
-    if ( IsPlayer( entOrId ) )
-    {
-        entOrId = entOrId getEntityNumber();
-    }
-    
-    request = "0";
-    
-    if ( responseExpected ) 
-    {
-        request = "1";
-    }
-  
-    request = request + ";" + eventType + ";" + eventSubtype + ";" + entOrId + ";" + data;
-    return request;
-}
-
-MonitorBus()
-{
-    level endon( "game_ended" );
-    
-    for( ;; )
-    {
-        wait ( 0.1 );
-        
-        // check to see if IW4MAdmin is ready to receive more data
-        if ( getDvar( level.eventBus.inVar ) == "" ) 
-        {
-            level notify( "bus_ready" );
-        }
-        
-        eventString = getDvar( level.eventBus.outVar );
-        
-        if ( eventString == "" ) 
-        {
-            continue;
-        }
-        if ( level.iw4adminIntegrationDebug == 1 )
-        {
-            IPrintLn( "-> " + eventString );
-        }
-        
-        NotifyClientEvent( strtok( eventString, ";" ) );
-        
-        SetDvar( level.eventBus.outVar, "" );
-    }
-}
-
-QueueEvent( request, eventType, notifyEntity ) 
-{
-    level endon( "disconnect" );
-
-    start = GetTime();
-    maxWait = level.eventBus.timeout * 1000; // 30 seconds
-    timedOut = "";
-   
-    while ( GetDvar( level.eventBus.inVar ) != "" && ( GetTime() - start ) < maxWait )
-    {
-        level waittill_notify_or_timeout( "bus_ready", 1 );
-        
-        if ( GetDvar( level.eventBus.inVar ) != "" )
-        {
-            if ( level.iw4adminIntegrationDebug == 1 )
-            {
-                IPrintLn( "A request is already in progress..." );
-            }
-            timedOut = "set";
-            continue;
-        }
-        
-        timedOut = "unset";
-    }
-   
-    if ( timedOut == "set")
-    {
-        if ( level.iw4adminIntegrationDebug == 1 )
-        {
-            IPrintLn( "Timed out waiting for response..." );
-        }
-        
-        if ( IsDefined( notifyEntity) )
-        {
-            notifyEntity NotifyClientEventTimeout( eventType );
-        }
-
-        return;
-    }
-    
-    if ( level.iw4adminIntegrationDebug == 1 )
-    {
-        IPrintLn("<- " + request);
-    }
-    
-    SetDvar( level.eventBus.inVar, request );
-}
-
-ParseDataString( data ) 
-{
-    dataParts = strtok( data, "|" );
-    dict = [];
-    
-    counter = 0;
-    foreach ( part in dataParts )
-    {
-        splitPart = strtok( part, "=" );
-        key = splitPart[0];
-        value = splitPart[1];
-        dict[key] = value;
-        dict[counter] = key;
-        counter++;
-    }
-    
-    return dict;
-}
-
-NotifyClientEventTimeout( eventType ) 
-{
-    // todo: make this actual eventing
-    if ( eventType == level.eventTypes.clientDataRequested )
-    {
-        self.pers["clientData"].state = level.eventBus.timeoutKey;
-    }
-}
-
-NotifyClientEvent( eventInfo )
-{
-    origin = getPlayerFromClientNum( int( eventInfo[3] ) );
-    target = getPlayerFromClientNum( int( eventInfo[4] ) );
-    
-    event = spawnstruct();
-    event.type = eventInfo[1];
-    event.subtype = eventInfo[2];
-    event.data = eventInfo[5];
-    event.origin = origin;
-    event.target = target;
-    
-    if ( level.iw4adminIntegrationDebug == 1 )
-    {
-        IPrintLn( "NotifyClientEvent->" + event.data );
-    }
-
-    client = event.origin;
-    client.event = event;
-
-    level notify( level.eventTypes.localClientEvent, client );
-}
-
-//////////////////////////////////
-// Event Handlers
-/////////////////////////////////
-
-OnClientDataReceived( event )
-{
-    event.data = ParseDataString( event.data );
-    clientData = self.pers[level.clientDataKey];
-
-    if ( event.subtype == "Fail" ) 
-    {
-        if ( level.iw4adminIntegrationDebug == 1 )
-        {
-            IPrintLn( "Received fail response" );
-        }
-        clientData.state = level.eventBus.failKey;
-        return;
-    }
-
-    if ( event.subtype == "Meta" )
-    {
-        if ( !isDefined( clientData.meta ) )
-        {
-            clientData.meta = [];
-        }
-        
-        metaKey = event.data[0];
-        clientData.meta[metaKey] = event.data[metaKey];
-        
-        return;
-    }
-    
-    clientData.permissionLevel = event.data["level"];
-    clientData.clientId = event.data["clientId"];
-    clientData.lastConnection = event.data["lastConnection"];
-    clientData.state = "complete";
-    self.persistentClientId = event.data["clientId"];
-
-    self thread DisplayWelcomeData();
-}
-
-OnExecuteCommand( event ) 
-{
-    data = ParseDataString( event.data );
-    response = "";
-
-    switch ( event.subtype ) 
-    {
-        case "GiveWeapon":
-            response = event.target GiveWeaponImpl( data );
-            break;
-        case "TakeWeapons":
-            response = event.target TakeWeaponsImpl();
-            break;
-        case "SwitchTeams":
-            response = event.target TeamSwitchImpl();
-            break;
-        case "Hide":
-            response = self HideImpl();
-            break;
-        case "Unhide":
-            response = self UnhideImpl();
-            break;
-        case "Alert":
-            response = event.target AlertImpl( data );
-            break;
-        case "Goto":
-            if ( IsDefined( event.target ) )
-            {
-                response = self GotoPlayerImpl( event.target );
-            }
-            else
-            {
-                response = self GotoImpl( event.data );
-            }
-            break;
-        case "Kill":
-            response = event.target KillImpl();
-            break;
-        case "NightMode":
-            NightModeImpl();
-            break;
-    }
-    
-    // send back the response to the origin, but only if they're not the target
-    if ( response != "" && IsPlayer( event.origin ) && event.origin != event.target ) 
-    {
-        event.origin IPrintLnBold( response );
-    }
-}
-
-OnSetClientDataCompleted( event )
-{
-    // IW4MAdmin let us know it persisted (success or fail)
-    if ( level.iw4adminIntegrationDebug == 1 )
-    {
-        IPrintLn( "Set Client Data -> subtype = " + event.subType + " status = " + event.data["status"] );
-    }
-}
-
-//////////////////////////////////
-// Command Implementations
-/////////////////////////////////
-
-GiveWeaponImpl( data )
-{
-    if ( !IsAlive( self ) )
-    {
-        return self.name + "^7 is not alive";
-    }
-    
-    self IPrintLnBold( "You have been given a new weapon" );
-    self GiveWeapon( data["weaponName"] );
-    self SwitchToWeapon( data["weaponName"] );
-    
-    return self.name + "^7 has been given ^5" + data["weaponName"]; 
-}
-
-TakeWeaponsImpl()
-{
-    if ( !IsAlive( self ) )
-    {
-        return self.name + "^7 is not alive";
-    }
-    
-    self TakeAllWeapons();
-    self IPrintLnBold( "All your weapons have been taken" );
-    
-    return "Took weapons from " + self.name;
-}
-
-TeamSwitchImpl()
-{
-    if ( !IsAlive( self ) )
-    {
-        return self.name + "^7 is not alive";
-    }
-    
-    team = level.allies;
-    
-    if ( self.team == "allies" ) 
-    {
-        team = level.axis;
-    }
-    
-    self IPrintLnBold( "You are being team switched" );
-    wait( 2 );
-    self [[team]]();
-
-    return self.name + "^7 switched to " + self.team;
-}
-
-HideImpl()
-{
-    if ( !IsAlive( self ) )
-    {
-        self IPrintLnBold( "You are not alive" );
-        return;
-    }
-
-    if ( self.isHidden )
-    {
-        self IPrintLnBold( "You are already hidden" );
-        return;
-    }
-
-    self SetClientDvar( "sv_cheats", 1 );
-	self SetClientDvar( "cg_thirdperson", 1 );
-	self SetClientDvar( "sv_cheats", 0 );
-
-    self.savedHealth = self.health;
-    self.health = 9999;
-    self.isHidden = true;
-    
-    self Hide();
-
-    self IPrintLnBold( "You are now ^5hidden ^7from other players" );
-}
-
-UnhideImpl()
-{
-    if ( !IsAlive( self ) )
-    {
-        self IPrintLnBold( "You are not alive" );
-        return;
-    }
-
-	self SetClientDvar( "sv_cheats", 1 );
-	self SetClientDvar( "cg_thirdperson", 0 );
-	self SetClientDvar( "sv_cheats", 0 );
-
-    self.health = self.savedHealth;
-    self.isHidden = false;
-
-    self Show();
-    self IPrintLnBold( "You are now ^5visible ^7to other players" );
-}
-
-AlertImpl( data )
-{
-    self thread maps\mp\gametypes\_hud_message::oldNotifyMessage( data["alertType"], data["message"], "compass_waypoint_target", ( 1, 0, 0 ), "ui_mp_nukebomb_timer", 7.5 );
-    return "Sent alert to " + self.name; 
-}
-
-GotoImpl( data )
-{
-    if ( !IsAlive( self ) )
-    {
-        self IPrintLnBold( "You are not alive" );
-        return;
-    }
-
-    position = ( int(data["x"]), int(data["y"]), int(data["z"]) );
-    self SetOrigin( position );
-    self IPrintLnBold( "Moved to " + "("+ position[0] + "," + position[1] + "," + position[2] + ")" );
-}
-
-GotoPlayerImpl( target )
-{
-    if ( !IsAlive( target ) )
-    {
-        self IPrintLnBold( target.name + " is not alive" );
-        return;
-    }
-
-    self SetOrigin( target GetOrigin() );
-    self IPrintLnBold( "Moved to " + target.name );
-}
-
-KillImpl()
-{
-    if ( !IsAlive( self ) )
-    {
-        return self.name + " is not alive";
-    }
-
-    self Suicide();
-    self IPrintLnBold( "You were killed by " + self.name );
-
-    return "You killed " + self.name;
-}
-
-NightModeImpl()
-{
-    if ( !IsDefined ( level.nightModeEnabled ) )
-    {
-        level.nightModeEnabled = true;
-    }
-    else
-    {
-       level.nightModeEnabled = !level.nightModeEnabled;
-    }
-
-    message = "^5NightMode ^7is disabled";
-
-    if ( level.nightModeEnabled )
-    {
-        message = "^5NightMode ^7is enabled";
-    }
-
-    IPrintLnBold( message );
-
-    foreach( player in level.players )
-    {
-        self ToggleNightMode();
-    }
-}
-
-ToggleNightMode()
-{
-    colorMap = 1;
-    fxDraw = 1;
-
-    if ( IsDefined( level.nightModeEnabled ) && level.nightModeEnabled )
-    {
-        colorMap = 0;
-        fxDraw = 0;
-    }
-
-    self SetClientDvar( "sv_cheats", 1 );
-    self SetClientDvar( "r_colorMap", colorMap );
-    self SetClientDvar( "fx_draw", fxDraw );
-    self SetClientDvar( "sv_cheats", 0 );
-}

IW4MAdmin.sln

@@ -6,14 +6,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Plugins", "Plugins", "{26E8
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8C8F3945-0AEF-4949-A1F7-B18E952E50BC}"
 	ProjectSection(SolutionItems) = preProject
+		GameFiles\IW4x\userraw\scripts\_commands.gsc = GameFiles\IW4x\userraw\scripts\_commands.gsc
 		GameFiles\IW4x\userraw\scripts\_customcallbacks.gsc = GameFiles\IW4x\userraw\scripts\_customcallbacks.gsc
 		DeploymentFiles\deployment-pipeline.yml = DeploymentFiles\deployment-pipeline.yml
 		DeploymentFiles\PostPublish.ps1 = DeploymentFiles\PostPublish.ps1
 		README.md = README.md
 		version.txt = version.txt
-		DeploymentFiles\UpdateIW4MAdmin.ps1 = DeploymentFiles\UpdateIW4MAdmin.ps1
-		DeploymentFiles\UpdateIW4MAdmin.sh = DeploymentFiles\UpdateIW4MAdmin.sh
-		GameFiles\IW4x\userraw\scripts\_integration.gsc = GameFiles\IW4x\userraw\scripts\_integration.gsc
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharedLibraryCore", "SharedLibraryCore\SharedLibraryCore.csproj", "{AA0541A2-8D51-4AD9-B0AC-3D1F5B162481}"
@@ -30,6 +28,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProfanityDeterment", "Plugi
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Login", "Plugins\Login\Login.csproj", "{D9F2ED28-6FA5-40CA-9912-E7A849147AB1}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IW4ScriptCommands", "Plugins\IW4ScriptCommands\IW4ScriptCommands.csproj", "{6C706CE5-A206-4E46-8712-F8C48D526091}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ScriptPlugins", "ScriptPlugins", "{3F9ACC27-26DB-49FA-BCD2-50C54A49C9FA}"
 	ProjectSection(SolutionItems) = preProject
 		Plugins\ScriptPlugins\ActionOnReport.js = Plugins\ScriptPlugins\ActionOnReport.js
@@ -50,7 +50,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ScriptPlugins", "ScriptPlug
 		Plugins\ScriptPlugins\ParserCSGO.js = Plugins\ScriptPlugins\ParserCSGO.js
 		Plugins\ScriptPlugins\ParserCSGOSM.js = Plugins\ScriptPlugins\ParserCSGOSM.js
 		Plugins\ScriptPlugins\ParserPlutoniumT4COZM.js = Plugins\ScriptPlugins\ParserPlutoniumT4COZM.js
-		Plugins\ScriptPlugins\GameInterface.js = Plugins\ScriptPlugins\GameInterface.js
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutomessageFeed", "Plugins\AutomessageFeed\AutomessageFeed.csproj", "{F5815359-CFC7-44B4-9A3B-C04BACAD5836}"
@@ -59,6 +58,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LiveRadar", "Plugins\LiveRa
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{3065279E-17F0-4CE0-AF5B-014E04263D77}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationTests", "Tests\ApplicationTests\ApplicationTests.csproj", "{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Data", "Data\Data.csproj", "{81689023-E55E-48ED-B7A8-53F4E21BBF2D}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Integrations", "Integrations", "{A2AE33B4-0830-426A-9E11-951DAB12BE5B}"
@@ -251,6 +252,30 @@ Global
 		{D9F2ED28-6FA5-40CA-9912-E7A849147AB1}.Release|x64.Build.0 = Release|Any CPU
 		{D9F2ED28-6FA5-40CA-9912-E7A849147AB1}.Release|x86.ActiveCfg = Release|Any CPU
 		{D9F2ED28-6FA5-40CA-9912-E7A849147AB1}.Release|x86.Build.0 = Release|Any CPU
+		{6C706CE5-A206-4E46-8712-F8C48D526091}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6C706CE5-A206-4E46-8712-F8C48D526091}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6C706CE5-A206-4E46-8712-F8C48D526091}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6C706CE5-A206-4E46-8712-F8C48D526091}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6C706CE5-A206-4E46-8712-F8C48D526091}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6C706CE5-A206-4E46-8712-F8C48D526091}.Debug|x64.Build.0 = Debug|Any CPU
+		{6C706CE5-A206-4E46-8712-F8C48D526091}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6C706CE5-A206-4E46-8712-F8C48D526091}.Debug|x86.Build.0 = Debug|Any CPU
+		{6C706CE5-A206-4E46-8712-F8C48D526091}.Prerelease|Any CPU.ActiveCfg = Prerelease|Any CPU
+		{6C706CE5-A206-4E46-8712-F8C48D526091}.Prerelease|Any CPU.Build.0 = Prerelease|Any CPU
+		{6C706CE5-A206-4E46-8712-F8C48D526091}.Prerelease|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6C706CE5-A206-4E46-8712-F8C48D526091}.Prerelease|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6C706CE5-A206-4E46-8712-F8C48D526091}.Prerelease|x64.ActiveCfg = Debug|Any CPU
+		{6C706CE5-A206-4E46-8712-F8C48D526091}.Prerelease|x64.Build.0 = Debug|Any CPU
+		{6C706CE5-A206-4E46-8712-F8C48D526091}.Prerelease|x86.ActiveCfg = Debug|Any CPU
+		{6C706CE5-A206-4E46-8712-F8C48D526091}.Prerelease|x86.Build.0 = Debug|Any CPU
+		{6C706CE5-A206-4E46-8712-F8C48D526091}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6C706CE5-A206-4E46-8712-F8C48D526091}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6C706CE5-A206-4E46-8712-F8C48D526091}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{6C706CE5-A206-4E46-8712-F8C48D526091}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{6C706CE5-A206-4E46-8712-F8C48D526091}.Release|x64.ActiveCfg = Release|Any CPU
+		{6C706CE5-A206-4E46-8712-F8C48D526091}.Release|x64.Build.0 = Release|Any CPU
+		{6C706CE5-A206-4E46-8712-F8C48D526091}.Release|x86.ActiveCfg = Release|Any CPU
+		{6C706CE5-A206-4E46-8712-F8C48D526091}.Release|x86.Build.0 = Release|Any CPU
 		{F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -299,6 +324,29 @@ Global
 		{00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}.Release|x64.Build.0 = Release|Any CPU
 		{00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}.Release|x86.ActiveCfg = Release|Any CPU
 		{00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}.Release|x86.Build.0 = Release|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Debug|x64.Build.0 = Debug|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Debug|x86.Build.0 = Debug|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Prerelease|Any CPU.ActiveCfg = Debug|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Prerelease|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Prerelease|Mixed Platforms.Build.0 = Debug|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Prerelease|x64.ActiveCfg = Debug|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Prerelease|x64.Build.0 = Debug|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Prerelease|x86.ActiveCfg = Debug|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Prerelease|x86.Build.0 = Debug|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Release|x64.ActiveCfg = Release|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Release|x64.Build.0 = Release|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Release|x86.ActiveCfg = Release|Any CPU
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B}.Release|x86.Build.0 = Release|Any CPU
 		{81689023-E55E-48ED-B7A8-53F4E21BBF2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{81689023-E55E-48ED-B7A8-53F4E21BBF2D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{81689023-E55E-48ED-B7A8-53F4E21BBF2D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -380,9 +428,11 @@ Global
 		{179140D3-97AA-4CB4-8BF6-A0C73CA75701} = {26E8B310-269E-46D4-A612-24601F16065F}
 		{958FF7EC-0226-4E85-A85B-B84EC768197D} = {26E8B310-269E-46D4-A612-24601F16065F}
 		{D9F2ED28-6FA5-40CA-9912-E7A849147AB1} = {26E8B310-269E-46D4-A612-24601F16065F}
+		{6C706CE5-A206-4E46-8712-F8C48D526091} = {26E8B310-269E-46D4-A612-24601F16065F}
 		{3F9ACC27-26DB-49FA-BCD2-50C54A49C9FA} = {26E8B310-269E-46D4-A612-24601F16065F}
 		{F5815359-CFC7-44B4-9A3B-C04BACAD5836} = {26E8B310-269E-46D4-A612-24601F16065F}
 		{00A1FED2-2254-4AF7-A5DB-2357FA7C88CD} = {26E8B310-269E-46D4-A612-24601F16065F}
+		{581FA7AF-FEF6-483C-A7D0-2D13EF50801B} = {3065279E-17F0-4CE0-AF5B-014E04263D77}
 		{A9348433-58C1-4B9C-8BB7-088B02529D9D} = {A2AE33B4-0830-426A-9E11-951DAB12BE5B}
 		{9512295B-3045-40E0-9B7E-2409F2173E9D} = {A2AE33B4-0830-426A-9E11-951DAB12BE5B}
 	EndGlobalSection

Integrations/Cod/CodRConConnection.cs

@@ -64,9 +64,9 @@ namespace Integrations.Cod
 
             var timeSinceLastQuery = (DateTime.Now - connectionState.LastQuery).TotalMilliseconds;
 
-            if (timeSinceLastQuery < config.FloodProtectInterval)
+            if (timeSinceLastQuery < StaticHelpers.FloodProtectionInterval)
             {
-                await Task.Delay(config.FloodProtectInterval - (int)timeSinceLastQuery);
+                await Task.Delay(StaticHelpers.FloodProtectionInterval - (int)timeSinceLastQuery);
             }
 
             connectionState.LastQuery = DateTime.Now;
@@ -150,9 +150,9 @@ namespace Integrations.Cod
             })
             {
                 connectionState.SendEventArgs.UserToken = socket;
+                connectionState.OnSentData.Reset();
+                connectionState.OnReceivedData.Reset();
                 connectionState.ConnectionAttempts++;
-                await connectionState.OnSentData.WaitAsync();
-                await connectionState.OnReceivedData.WaitAsync();
                 connectionState.BytesReadPerSegment.Clear();
                 bool exceptionCaught = false;
 
@@ -199,16 +199,6 @@ namespace Integrations.Cod
                     {
                         connectionState.OnComplete.Release(1);
                     }
-
-                    if (connectionState.OnSentData.CurrentCount == 0)
-                    {
-                        connectionState.OnSentData.Release();
-                    }
-
-                    if (connectionState.OnReceivedData.CurrentCount == 0)
-                    {
-                        connectionState.OnReceivedData.Release();
-                    }
                 }
             }
 
@@ -338,8 +328,7 @@ namespace Integrations.Cod
             {
                 // the send has not been completed asynchronously
                 // this really shouldn't ever happen because it's UDP
-                
-                if(!await connectionState.OnSentData.WaitAsync(StaticHelpers.SocketTimeout(1)))
+                if (!await Task.Run(() => connectionState.OnSentData.Wait(StaticHelpers.SocketTimeout(1))))
                 {
                     using(LogContext.PushProperty("Server", Endpoint.ToString()))
                     {
@@ -353,7 +342,7 @@ namespace Integrations.Cod
 
             if (!waitForResponse)
             {
-                return Array.Empty<byte[]>();
+                return new byte[0][];
             }
 
             connectionState.ReceiveEventArgs.SetBuffer(connectionState.ReceiveBuffer);
@@ -364,12 +353,12 @@ namespace Integrations.Cod
             if (receiveDataPending)
             {
                 _log.LogDebug("Waiting to asynchronously receive data on attempt #{connectionAttempts}", connectionState.ConnectionAttempts);
-                if (!await connectionState.OnReceivedData.WaitAsync(
+                if (!await Task.Run(() => connectionState.OnReceivedData.Wait(
                     new[]
                     {
                         StaticHelpers.SocketTimeout(connectionState.ConnectionAttempts), 
                         overrideTimeout
-                    }.Max()))
+                    }.Max())))
                 {
                     if (connectionState.ConnectionAttempts > 1) // this reduces some spam for unstable connections
                     {
@@ -418,24 +407,12 @@ namespace Integrations.Cod
             if (e.BytesTransferred == 0)
             {
                 _log.LogDebug("No bytes were transmitted so the connection was probably closed");
-               
-                var semaphore = ActiveQueries[this.Endpoint].OnReceivedData;
-                if (semaphore.CurrentCount == 0)
-                {
-                    semaphore.Release();
-                }
-                
+                ActiveQueries[this.Endpoint].OnReceivedData.Set();
                 return;
             }
 
-            if (sender is not Socket sock)
+            if (!(sender is Socket sock))
             {
-                var semaphore = ActiveQueries[this.Endpoint].OnReceivedData;
-                if (semaphore.CurrentCount == 0)
-                {
-                    semaphore.Release();
-                }
-                
                 return;
             }
             
@@ -450,19 +427,16 @@ namespace Integrations.Cod
             try
             {
                 var totalBytesTransferred = e.BytesTransferred;
-                _log.LogDebug("{total} total bytes transferred with {available} bytes remaining", totalBytesTransferred,
-                    sock.Available);
+                _log.LogDebug("{total} total bytes transferred with {available} bytes remaining", totalBytesTransferred, sock.Available);
                 // we still have available data so the payload was segmented
                 while (sock.Available > 0)
                 {
                     _log.LogDebug("{available} more bytes to be read", sock.Available);
 
                     var bufferSpaceAvailable = sock.Available + totalBytesTransferred - state.ReceiveBuffer.Length;
-                    if (bufferSpaceAvailable >= 0)
+                    if (bufferSpaceAvailable >= 0 )
                     {
-                        _log.LogWarning(
-                            "Not enough buffer space to store incoming data {bytesNeeded} additional bytes required",
-                            bufferSpaceAvailable);
+                        _log.LogWarning("Not enough buffer space to store incoming data {bytesNeeded} additional bytes required", bufferSpaceAvailable);
                         continue;
                     }
 
@@ -473,39 +447,27 @@ namespace Integrations.Cod
                         _log.LogDebug("Remaining bytes are async");
                         continue;
                     }
-
-                    _log.LogDebug("Read {bytesTransferred} synchronous bytes from {endpoint}",
-                        state.ReceiveEventArgs.BytesTransferred, e.RemoteEndPoint);
+                        
+                    _log.LogDebug("Read {bytesTransferred} synchronous bytes from {endpoint}", state.ReceiveEventArgs.BytesTransferred, e.RemoteEndPoint);
                     // we need to increment this here because the callback isn't executed if there's no pending IO
                     state.BytesReadPerSegment.Add(state.ReceiveEventArgs.BytesTransferred);
                     totalBytesTransferred += state.ReceiveEventArgs.BytesTransferred;
                 }
+                    
+                ActiveQueries[this.Endpoint].OnReceivedData.Set();
             }
 
             catch (ObjectDisposedException)
             {
                 _log.LogDebug("Socket was disposed while receiving data");
-            }
-
-            finally
-            {
-                var semaphore = ActiveQueries[this.Endpoint].OnReceivedData;
-                if (semaphore.CurrentCount == 0)
-                {
-                    semaphore.Release();
-                }
+                ActiveQueries[this.Endpoint].OnReceivedData.Set();
             }
         }
 
         private void OnDataSent(object sender, SocketAsyncEventArgs e)
         {
             _log.LogDebug("Sent {byteCount} bytes to {endpoint}", e.Buffer?.Length, e.ConnectSocket?.RemoteEndPoint);
-            
-            var semaphore = ActiveQueries[this.Endpoint].OnSentData;
-            if (semaphore.CurrentCount == 0)
-            {
-                semaphore.Release();
-            }
+            ActiveQueries[this.Endpoint].OnSentData.Set();
         }
     }
-}
+}

Integrations/Cod/ConnectionState.cs

@@ -21,12 +21,11 @@ namespace Integrations.Cod
         private const int BufferSize = 16384;
         public readonly byte[] ReceiveBuffer = new byte[BufferSize];
         public readonly SemaphoreSlim OnComplete = new SemaphoreSlim(1, 1);
-        public readonly SemaphoreSlim OnSentData = new(1, 1);
-        public readonly SemaphoreSlim OnReceivedData = new (1, 1);
-       
+        public readonly ManualResetEventSlim OnSentData = new ManualResetEventSlim(false);
+        public readonly ManualResetEventSlim OnReceivedData = new ManualResetEventSlim(false);
         public List<int> BytesReadPerSegment { get; set; } = new List<int>();
         public SocketAsyncEventArgs SendEventArgs { get; set; } = new SocketAsyncEventArgs();
         public SocketAsyncEventArgs ReceiveEventArgs { get; set; } = new SocketAsyncEventArgs();
         public DateTime LastQuery { get; set; } = DateTime.Now;
     }
-}
+}

Integrations/Cod/Integrations.Cod.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
         <AssemblyName>Integrations.Cod</AssemblyName>
         <RootNamespace>Integrations.Cod</RootNamespace>
         <Configurations>Debug;Release;Prerelease</Configurations>

Integrations/Source/Integrations.Source.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
         <AssemblyName>Integrations.Source</AssemblyName>
         <RootNamespace>Integrations.Source</RootNamespace>
         <Configurations>Debug;Release;Prerelease</Configurations>

Plugins/AutomessageFeed/AutomessageFeed.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
     <LangVersion>Latest</LangVersion>
     <Configurations>Debug;Release;Prerelease</Configurations>
@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.SyndicationFeed.ReaderWriter" Version="1.0.2" />
-    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.1.28.1" PrivateAssets="All" />
+    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.1.20.1" PrivateAssets="All" />
   </ItemGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">

Plugins/AutomessageFeed/Plugin.cs

@@ -65,7 +65,6 @@ namespace AutomessageFeed
 
         public async Task OnLoadAsync(IManager manager)
         {
-            await _configurationHandler.BuildAsync();
             if (_configurationHandler.Configuration() == null)
             {
                 _configurationHandler.Set((Configuration)new Configuration().Generate());

Plugins/IW4ScriptCommands/Commands/KillPlayerCommand.cs

@@ -0,0 +1,44 @@
+using SharedLibraryCore;
+using SharedLibraryCore.Commands;
+using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Database.Models;
+using SharedLibraryCore.Interfaces;
+using System.Threading.Tasks;
+
+namespace IW4ScriptCommands.Commands
+{
+    /// <summary>
+    /// Example script command
+    /// </summary>
+    public class KillPlayerCommand : Command
+    {
+        public KillPlayerCommand(CommandConfiguration config, ITranslationLookup lookup) : base(config, lookup)
+        {
+            Name = "killplayer";
+            Description = "kill a player";
+            Alias = "kp";
+            Permission = EFClient.Permission.Administrator;
+            RequiresTarget = true;
+            Arguments = new[]
+            {
+                new CommandArgument()
+                {
+                    Name = "player",
+                    Required = true
+                }
+            };
+        }
+
+        public override async Task ExecuteAsync(GameEvent E)
+        {
+            var cmd = new ScriptCommand()
+            {
+                CommandName = "killplayer",
+                ClientNumber = E.Target.ClientNumber,
+                CommandArguments = new[] { E.Origin.ClientNumber.ToString() }
+            };
+
+            await cmd.Execute(E.Owner);
+        }
+    }
+}

Plugins/IW4ScriptCommands/GscApiController.cs

@@ -0,0 +1,44 @@
+using Microsoft.AspNetCore.Mvc;
+using SharedLibraryCore;
+using SharedLibraryCore.Interfaces;
+using System.Linq;
+using System.Text;
+
+namespace WebfrontCore.Controllers.API
+{
+    [Route("api/gsc/[action]")]
+    public class GscApiController : BaseController
+    {
+        public GscApiController(IManager manager) : base(manager)
+        {
+
+        }
+
+        /// <summary>
+        /// grabs basic info about the client from IW4MAdmin
+        /// </summary>
+        /// <param name="networkId"></param>
+        /// <returns></returns>
+        [HttpGet("{networkId}")]
+        public IActionResult ClientInfo(string networkId)
+        {
+            long decimalNetworkId = networkId.ConvertGuidToLong(System.Globalization.NumberStyles.HexNumber);
+            var clientInfo = Manager.GetActiveClients()
+                .FirstOrDefault(c => c.NetworkId == decimalNetworkId);
+
+            if (clientInfo != null)
+            {
+                var sb = new StringBuilder();
+                sb.AppendLine($"admin={clientInfo.IsPrivileged()}");
+                sb.AppendLine($"level={(int)clientInfo.Level}");
+                sb.AppendLine($"levelstring={clientInfo.Level.ToLocalizedLevelName()}");
+                sb.AppendLine($"connections={clientInfo.Connections}");
+                sb.AppendLine($"authenticated={clientInfo.GetAdditionalProperty<bool>("IsLoggedIn") == true}");
+
+                return Content(sb.ToString());
+            }
+
+            return Content("");
+        }
+    }
+}

Plugins/IW4ScriptCommands/IW4ScriptCommands.csproj

@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <ApplicationIcon />
+    <StartupObject />
+    <Configurations>Debug;Release;Prerelease</Configurations>
+    <LangVersion>Latest</LangVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.1.20.1" PrivateAssets="All" />
+  </ItemGroup>
+
+  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
+    <Exec Command="dotnet publish $(ProjectPath) -c $(ConfigurationName) -o $(ProjectDir)..\..\Build\Plugins --no-build --no-restore --no-dependencies" />
+  </Target>
+  
+</Project>

Plugins/IW4ScriptCommands/Plugin.cs

@@ -0,0 +1,46 @@
+using SharedLibraryCore;
+using SharedLibraryCore.Interfaces;
+using System.Threading.Tasks;
+
+namespace IW4ScriptCommands
+{
+    public class Plugin : IPlugin
+    {
+        public string Name => "IW4 Script Commands";
+
+        public float Version => 1.0f;
+
+        public string Author => "RaidMax";
+
+        public async Task OnEventAsync(GameEvent E, Server S)
+        {
+            if (E.Type == GameEvent.EventType.Start)
+            {
+                await S.SetDvarAsync("sv_iw4madmin_serverid", S.EndPoint);
+            }
+
+            if (E.Type == GameEvent.EventType.Warn)
+            {
+                var cmd = new ScriptCommand()
+                {
+                    ClientNumber = E.Target.ClientNumber,
+                    CommandName = "alert",
+                    CommandArguments = new[]
+                    {
+                        "Warning",
+                        "ui_mp_nukebomb_timer",
+                        E.Data
+                    }
+                };
+                // notifies the player ingame of the warning
+                await cmd.Execute(S);
+            }
+        }
+
+        public Task OnLoadAsync(IManager manager) => Task.CompletedTask;
+
+        public Task OnTickAsync(Server S) => Task.CompletedTask;
+
+        public Task OnUnloadAsync() => Task.CompletedTask;
+    }
+}

Plugins/IW4ScriptCommands/ScriptCommand.cs

@@ -0,0 +1,36 @@
+using SharedLibraryCore;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace IW4ScriptCommands
+{
+    /// <summary>
+    /// Contains basic properties for command information read by gsc
+    /// </summary>
+    class ScriptCommand
+    {
+        /// <summary>
+        /// Name of the command to execute
+        /// </summary>
+        public string CommandName { get; set; }
+
+        /// <summary>
+        /// Target client number
+        /// </summary>
+        public int ClientNumber { get; set; }
+
+        /// <summary>
+        /// Arguments for the script function itself
+        /// </summary>
+        public string[] CommandArguments { get; set; } = new string[0];
+
+        public override string ToString() => string.Join(";", new[] { CommandName, ClientNumber.ToString() }.Concat(CommandArguments).Select(_arg => _arg.Replace(";", "")));
+
+        /// <summary>
+        /// Executes the command 
+        /// </summary>
+        /// <param name="server">server to execute the command on</param>
+        /// <returns></returns>
+        public async Task Execute(Server server) => await server.SetDvarAsync("sv_iw4madmin_command", ToString());
+    }
+}

Plugins/LiveRadar/Controllers/RadarController.cs

@@ -1,25 +1,29 @@
 using LiveRadar.Configuration;
 using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json;
 using SharedLibraryCore;
 using SharedLibraryCore.Dtos;
 using SharedLibraryCore.Interfaces;
 using System.Linq;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 
 namespace LiveRadar.Web.Controllers
 {
     public class RadarController : BaseController
     {
+        private static readonly JsonSerializerSettings _serializerSettings = new JsonSerializerSettings()
+        {
+            ReferenceLoopHandling = ReferenceLoopHandling.Ignore,
+            ContractResolver = new Newtonsoft.Json.Serialization.CamelCasePropertyNamesContractResolver()
+        };
+
         private readonly IManager _manager;
-        private static LiveRadarConfiguration _config;
-        private readonly IConfigurationHandler<LiveRadarConfiguration> _configurationHandler;
+        private readonly LiveRadarConfiguration _config;
 
         public RadarController(IManager manager, IConfigurationHandlerFactory configurationHandlerFactory) : base(manager)
         {
             _manager = manager;
-            _configurationHandler =
-                configurationHandlerFactory.GetConfigurationHandler<LiveRadarConfiguration>("LiveRadarConfiguration");
+            _config = configurationHandlerFactory.GetConfigurationHandler<LiveRadarConfiguration>("LiveRadarConfiguration").Configuration() ?? new LiveRadarConfiguration();
         }
 
         [HttpGet]
@@ -42,7 +46,7 @@ namespace LiveRadar.Web.Controllers
 
         [HttpGet]
         [Route("Radar/{serverId}/Map")]
-        public async Task<IActionResult> Map(long? serverId = null)
+        public IActionResult Map(long? serverId = null)
         {
             var server = serverId == null ? _manager.GetServers().FirstOrDefault() : _manager.GetServers().FirstOrDefault(_server => _server.EndPoint == serverId);
             
@@ -50,12 +54,6 @@ namespace LiveRadar.Web.Controllers
             {
                 return NotFound();
             }
-
-            if (_config == null)
-            {
-                await _configurationHandler.BuildAsync();
-                _config = _configurationHandler.Configuration() ?? new LiveRadarConfiguration();
-            }
             
             var map = _config.Maps.FirstOrDefault(_map => _map.Name == server.CurrentMap.Name);
 
@@ -95,4 +93,4 @@ namespace LiveRadar.Web.Controllers
             return Ok();
         }
     }
-}
+}

Plugins/LiveRadar/LiveRadar.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <RazorCompileOnBuild Condition="'$(CONFIG)'!='Debug'">true</RazorCompileOnBuild>
     <RazorCompiledOnPublish Condition="'$(CONFIG)'!='Debug'">true</RazorCompiledOnPublish>
     <PreserveCompilationContext Condition="'$(CONFIG)'!='Debug'">false</PreserveCompilationContext>
@@ -23,7 +23,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.1.28.1" PrivateAssets="All" />
+    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.1.20.1" PrivateAssets="All" />
   </ItemGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">

Plugins/LiveRadar/Plugin.cs

@@ -103,7 +103,6 @@ namespace LiveRadar
 
         public async Task OnLoadAsync(IManager manager)
         {
-            await _configurationHandler.BuildAsync();
             if (_configurationHandler.Configuration() == null)
             {
                 _configurationHandler.Set((LiveRadarConfiguration)new LiveRadarConfiguration().Generate());

Plugins/LiveRadar/RadarEvent.cs

@@ -2,8 +2,6 @@
 using SharedLibraryCore;
 using System;
 using System.Linq;
-// ReSharper disable CompareOfFloatsByEqualityOperator
-#pragma warning disable CS0659
 
 namespace LiveRadar
 {

Plugins/Login/Login.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <ApplicationIcon />
     <StartupObject />
     <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
@@ -19,7 +19,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.1.28.1" PrivateAssets="All" />
+    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.1.20.1" PrivateAssets="All" />
   </ItemGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">

Plugins/Login/Plugin.cs

@@ -76,7 +76,6 @@ namespace IW4MAdmin.Plugins.Login
         {
             AuthorizedClients = new ConcurrentDictionary<int, bool>();
 
-            await _configHandler.BuildAsync();
             if (_configHandler.Configuration() == null)
             {
                 _configHandler.Set((Configuration)new Configuration().Generate());

Plugins/ProfanityDeterment/Plugin.cs

@@ -109,7 +109,6 @@ namespace IW4MAdmin.Plugins.ProfanityDeterment
 
         public async Task OnLoadAsync(IManager manager)
         {
-            await _configHandler.BuildAsync();
             if (_configHandler.Configuration() == null)
             {
                 _configHandler.Set((Configuration)new Configuration().Generate());

Plugins/ProfanityDeterment/ProfanityDeterment.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <ApplicationIcon />
     <StartupObject />
     <PackageId>RaidMax.IW4MAdmin.Plugins.ProfanityDeterment</PackageId>
@@ -16,7 +16,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.1.28.1" PrivateAssets="All" />
+    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.1.20.1" PrivateAssets="All" />
   </ItemGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">

Plugins/ScriptPlugins/GameInterface.js

@@ -1,473 +0,0 @@
-const eventTypes = {
-    1: 'start', // a server started being monitored
-    6: 'disconnect', // a client detected a leaving the game
-    9: 'preconnect', // client detected as joining via log or status
-    101: 'warn' // client was warned
-};
-
-const servers = {};
-const inDvar = 'sv_iw4madmin_in';
-const outDvar = 'sv_iw4madmin_out';
-const pollRate = 750;
-let logger = {};
-
-let plugin = {
-    author: 'RaidMax',
-    version: 1.0,
-    name: 'Game Interface',
-
-    onEventAsync: (gameEvent, server) => {
-        if (servers[server.EndPoint] != null && !servers[server.EndPoint].enabled) {
-            return;
-        }
-
-        const eventType = eventTypes[gameEvent.Type];
-
-        if (eventType === undefined) {
-            return;
-        }
-
-        switch (eventType) {
-            case 'start':
-                const enabled = initialize(server);
-
-                if (!enabled) {
-                    return;
-                }
-                break;
-            case 'preconnect':
-                // when the plugin is reloaded after the servers are started
-                if (servers[server.EndPoint] === undefined || servers[server.EndPoint] == null) {
-                    const enabled = initialize(server);
-
-                    if (!enabled) {
-                        return;
-                    }
-                }
-                const timer = servers[server.EndPoint].timer;
-                if (!timer.IsRunning) {
-                    timer.Start(0, pollRate);
-                }
-                break;
-            case 'warn':
-                const warningTitle = _localization.LocalizationIndex['GLOBAL_WARNING'];
-                sendScriptCommand(server, 'Alert', gameEvent.Target, {
-                    alertType: warningTitle + '!',
-                    message: gameEvent.Data
-                });
-                break;
-        }
-    },
-
-    onLoadAsync: manager => {
-        logger = _serviceResolver.ResolveService('ILogger');
-        logger.WriteInfo('Game Interface Startup');
-    },
-
-    onUnloadAsync: () => {
-        for (let i = 0; i < servers.length; i++) {
-            if (servers[i].enabled) {
-                servers[i].timer.Stop();
-            }
-        }
-    },
-
-    onTickAsync: server => {
-    }
-};
-
-let commands = [{
-    name: 'giveweapon',
-    description: 'gives specified weapon',
-    alias: 'gw',
-    permission: 'SeniorAdmin',
-    targetRequired: true,
-    arguments: [{
-        name: 'player',
-        required: true
-    },
-    {
-        name: 'weapon name',
-        required: true
-    }],
-    supportedGames: ['IW4'],
-    execute: (gameEvent) => {
-        sendScriptCommand(gameEvent.Owner, 'GiveWeapon', gameEvent.Origin, gameEvent.Target, {weaponName: gameEvent.Data});
-    }
-},
-{
-    name: 'takeweapons',
-    description: 'take all weapons from specified player',
-    alias: 'tw',
-    permission: 'SeniorAdmin',
-    targetRequired: true,
-    arguments: [{
-        name: 'player',
-        required: true
-    }],
-    supportedGames: ['IW4'],
-    execute: (gameEvent) => {
-        sendScriptCommand(gameEvent.Owner, 'TakeWeapons', gameEvent.Origin, gameEvent.Target, undefined);
-    }
-},
-{
-    name: 'switchteam',
-    description: 'switches specified player to the opposite team',
-    alias: 'st',
-    permission: 'Administrator',
-    targetRequired: true,
-    arguments: [{
-        name: 'player',
-        required: true
-    }],
-    supportedGames: ['IW4'],
-    execute: (gameEvent) => {
-        sendScriptCommand(gameEvent.Owner, 'SwitchTeams', gameEvent.Origin, gameEvent.Target, undefined);
-    }
-},
-{
-    name: 'hide',
-    description: 'hide yourself',
-    alias: 'hi',
-    permission: 'SeniorAdmin',
-    targetRequired: false,
-    arguments: [],
-    supportedGames: ['IW4'],
-    execute: (gameEvent) => {
-        sendScriptCommand(gameEvent.Owner, 'Hide', gameEvent.Origin, gameEvent.Origin, undefined);
-    }
-},
-{
-    name: 'unhide',
-    description: 'unhide yourself',
-    alias: 'unh',
-    permission: 'SeniorAdmin',
-    targetRequired: false,
-    arguments: [],
-    supportedGames: ['IW4'],
-    execute: (gameEvent) => {
-        sendScriptCommand(gameEvent.Owner, 'Unhide', gameEvent.Origin, gameEvent.Origin, undefined);
-    }
-},
-{
-    name: 'alert',
-    description: 'alert a player',
-    alias: 'alr',
-    permission: 'SeniorAdmin',
-    targetRequired: true,
-    arguments: [{
-        name: 'player',
-        required: true
-    },
-        {
-            name: 'message',
-            required: true
-        }],
-    supportedGames: ['IW4'],
-    execute: (gameEvent) => {
-        sendScriptCommand(gameEvent.Owner, 'Alert', gameEvent.Origin, gameEvent.Target, {
-            alertType: 'Alert',
-            message: gameEvent.Data
-        });
-    }
-},
-{
-    name: 'gotoplayer',
-    description: 'teleport to a player',
-    alias: 'g2p',
-    permission: 'SeniorAdmin',
-    targetRequired: true,
-    arguments: [{
-        name: 'player',
-        required: true
-    }],
-    supportedGames: ['IW4'],
-    execute: (gameEvent) => {
-        sendScriptCommand(gameEvent.Owner, 'Goto', gameEvent.Origin, gameEvent.Target, undefined);
-    }
-},
-{
-    name: 'goto',
-    description: 'teleport to a position',
-    alias: 'g2',
-    permission: 'SeniorAdmin',
-    targetRequired: false,
-    arguments: [{
-        name: 'x',
-        required: true
-    },
-    {
-        name: 'y',
-        required: true
-    },
-    {
-        name: 'z',
-        required: true
-    }],
-    supportedGames: ['IW4'],
-    execute: (gameEvent) => {
-        const args = String(gameEvent.Data).split(' ');
-        sendScriptCommand(gameEvent.Owner, 'Goto', gameEvent.Origin, gameEvent.Target, {
-            x: args[0],
-            y: args[1],
-            z: args[2]
-        });
-    }
-},
-{
-    name: 'kill',
-    description: 'kill a player',
-    alias: 'kpl',
-    permission: 'SeniorAdmin',
-    targetRequired: true,
-    arguments: [{
-        name: 'player',
-        required: true
-    }],
-    supportedGames: ['IW4'],
-    execute: (gameEvent) => {
-        sendScriptCommand(gameEvent.Owner, 'Kill', gameEvent.Origin, gameEvent.Target, undefined);
-    }
-},
-{
-    name: 'nightmode',
-    description: 'sets server into nightmode',
-    alias: 'nitem',
-    permission: 'SeniorAdmin',
-    targetRequired: false,
-    arguments: [],
-    supportedGames: ['IW4'],
-    execute: (gameEvent) => {
-        sendScriptCommand(gameEvent.Owner, 'NightMode', gameEvent.Origin, undefined, undefined);
-    }
-}];
-
-const sendScriptCommand = (server, command, origin, target, data) => {
-    const state = servers[server.EndPoint];
-    if (state === undefined || !state.enabled) {
-        return;
-    }
-    sendEvent(server, false, 'ExecuteCommandRequested', command, origin, target, data);
-}
-
-const sendEvent = (server, responseExpected, event, subtype, origin, target, data) => {
-    const logger = _serviceResolver.ResolveService('ILogger');
-
-    let pendingOut = true;
-    let pendingCheckCount = 0;
-    const start = new Date();
-
-    while (pendingOut && pendingCheckCount <= 10) {
-        try {
-            const out = server.GetServerDvar(outDvar);
-            pendingOut = !(out == null || out === '' || out === 'null');
-        } catch (error) {
-            logger.WriteError(`Could not check server output dvar for IO status ${error}`);
-        }
-
-        if (pendingOut) {
-            logger.WriteDebug('Waiting for event bus to be cleared');
-            System.Threading.Tasks.Task.Delay(1000).Wait();
-        }
-        pendingCheckCount++;
-    }
-
-    if (pendingOut) {
-        logger.WriteWarning(`Reached maximum attempts waiting for output to be available for ${server.EndPoint}`)
-    }
-
-    let targetClientNumber = -1;
-    if (target != null) {
-        targetClientNumber = target.ClientNumber;
-    }
-
-    const output = `${responseExpected ? '1' : '0'};${event};${subtype};${origin.ClientNumber};${targetClientNumber};${buildDataString(data)}`;
-    logger.WriteDebug(`Sending output to server ${output}`);
-
-    try {
-        server.SetServerDvar(outDvar, output);
-        logger.WriteDebug(`SendEvent took ${(new Date() - start) / 1000}ms`);
-    } catch (error) {
-        logger.WriteError(`Could not set server output dvar ${error}`);
-    }
-};
-
-const parseEvent = (input) => {
-    if (input === undefined) {
-        return {};
-    }
-
-    const eventInfo = input.split(';');
-
-    return {
-        eventType: eventInfo[1],
-        subType: eventInfo[2],
-        clientNumber: eventInfo[3],
-        data: eventInfo.length > 4 ? parseDataString(eventInfo[4]) : undefined
-    }
-}
-
-const initialize = (server) => {
-    const logger = _serviceResolver.ResolveService('ILogger');
-
-    servers[server.EndPoint] = {
-        enabled: false
-    }
-
-    let enabled = false;
-    try {
-        enabled = server.GetServerDvar('sv_iw4madmin_integration_enabled') === '1';
-    } catch (error) {
-        logger.WriteError(`Could not get integration status of ${server.EndPoint} - ${error}`);
-    }
-
-    logger.WriteInfo(`GSC Integration enabled = ${enabled}`);
-
-    if (!enabled) {
-        return false;
-    }
-
-    logger.WriteDebug(`Setting up bus timer for ${server.EndPoint}`);
-
-    let timer = _serviceResolver.ResolveService('IScriptPluginTimerHelper');
-    timer.OnTick(() => pollForEvents(server), `GameEventPoller ${server.ToString()}`);
-    // necessary to prevent multi-threaded access to the JS context
-    timer.SetDependency(_lock);
-
-    servers[server.EndPoint].timer = timer;
-    servers[server.EndPoint].enabled = true;
-
-    try {
-        server.SetServerDvar(inDvar, '');
-        server.SetServerDvar(outDvar, '');
-    } catch (error) {
-        logger.WriteError(`Could set default values bus dvars for ${server.EndPoint} - ${error}`);
-    }
-
-    return true;
-};
-
-const pollForEvents = server => {
-    const logger = _serviceResolver.ResolveService('ILogger');
-
-    let input;
-    try {
-        input = server.GetServerDvar(inDvar);
-    } catch (error) {
-        logger.WriteError(`Could not get input bus value for ${server.EndPoint} - ${error}`);
-        return;
-    }
-
-    if (input === undefined || input === null || input === 'null') {
-        input = '';
-    }
-
-    if (input.length > 0) {
-        const event = parseEvent(input)
-
-        logger.WriteDebug(`Processing input... ${event.eventType} ${event.subType} ${event.data} ${event.clientNumber}`);
-
-        // todo: refactor to mapping if possible
-        if (event.eventType === 'ClientDataRequested') {
-            const client = server.GetClientByNumber(event.clientNumber);
-
-            if (client != null) {
-                logger.WriteDebug(`Found client ${client.Name}`);
-
-                let data = [];
-
-                if (event.subType === 'Meta') {
-                    const metaService = _serviceResolver.ResolveService('IMetaService');
-                    const meta = metaService.GetPersistentMeta(event.data, client).GetAwaiter().GetResult();
-                    data[event.data] = meta === null ? '' : meta.Value;
-                } else {
-                    data = {
-                        level: client.Level,
-                        clientId: client.ClientId,
-                        lastConnection: client.LastConnection
-                    };
-                }
-
-                sendEvent(server, false, 'ClientDataReceived', event.subType, client, undefined, data);
-            } else {
-                logger.WriteWarning(`Could not find client slot ${event.clientNumber} when processing ${event.eventType}`);
-                sendEvent(server, false, 'ClientDataReceived', 'Fail', event.clientNumber, undefined, {ClientNumber: event.clientNumber});
-            }
-        }
-
-        if (event.eventType === 'SetClientDataRequested') {
-            let client = server.GetClientByNumber(event.clientNumber);
-            let clientId;
-
-            if (client != null) {
-                clientId = client.ClientId;
-            } else {
-                clientId = parseInt(event.data.clientId);
-            }
-
-            logger.WriteDebug(`ClientId=${clientId}`);
-
-            if (clientId == null) {
-                logger.WriteWarning(`Could not find client slot ${event.clientNumber} when processing ${event.eventType}`);
-                sendEvent(server, false, 'SetClientDataCompleted', 'Meta', {ClientNumber: event.clientNumber}, undefined, {status: 'Fail'});
-            } else {
-                if (event.subType === 'Meta') {
-                    const metaService = _serviceResolver.ResolveService('IMetaService');
-                    try {
-                        logger.WriteDebug(`Key=${event.data['key']}, Value=${event.data['value']}`);
-                        if (event.data['direction'] != null) {
-                            event.data['direction'] = 'up'
-                                ? metaService.IncrementPersistentMeta(event.data['key'], event.data['value'], clientId).GetAwaiter().GetResult()
-                                : metaService.DecrementPersistentMeta(event.data['key'], event.data['value'], clientId).GetAwaiter().GetResult();
-                        } else {
-                            metaService.SetPersistentMeta(event.data['key'], event.data['value'], clientId).GetAwaiter().GetResult();
-                        }
-                        sendEvent(server, false, 'SetClientDataCompleted', 'Meta', {ClientNumber: event.clientNumber}, undefined,{status: 'Complete'});
-                    } catch (error) {
-                        sendEvent(server, false, 'SetClientDataCompleted', 'Meta', {ClientNumber: event.clientNumber}, undefined,{status: 'Fail'});
-                    }
-                }
-            }
-        }
-
-        try {
-            server.SetServerDvar(inDvar, '');
-        } catch (error) {
-            logger.WriteError(`Could not reset in bus value for ${server.EndPoint} - ${error}`);
-        }
-    } else if (server.ClientNum === 0) {
-        servers[server.EndPoint].timer.Stop();
-    }
-}
-
-const buildDataString = data => {
-    if (data === undefined) {
-        return '';
-    }
-
-    let formattedData = '';
-
-    for (const prop in data) {
-        formattedData += `${prop}=${data[prop]}|`;
-    }
-
-    return formattedData.substring(0, Math.max(0, formattedData.length - 1));
-}
-
-const parseDataString = data => {
-    if (data === undefined) {
-        return '';
-    }
-
-    const dict = {}
-
-    for (const segment of data.split('|')) {
-        const keyValue = segment.split('=');
-        if (keyValue.length !== 2) {
-            continue;
-        }
-        dict[keyValue[0]] = keyValue[1];
-    }
-
-    return dict.length === 0 ? data : dict;
-}

Plugins/ScriptPlugins/ParserIW4x.js

@@ -3,7 +3,7 @@ var eventParser;
 
 var plugin = {
     author: 'RaidMax',
-    version: 0.6,
+    version: 0.5,
     name: 'IW4x Parser',
     isParser: true,
 
@@ -20,11 +20,10 @@ var plugin = {
         rconParser.Configuration.CommandPrefixes.Ban     = 'clientkick {0} "{1}"';
         rconParser.Configuration.CommandPrefixes.TempBan = 'tempbanclient {0} "{1}"';
         
-        rconParser.Configuration.DefaultRConPort = 28960;
-        rconParser.Configuration.DefaultInstallationDirectoryHint = 'HKEY_CURRENT_USER\\Software\\Classes\\iw4x\\shell\\open\\command';
-        rconParser.Configuration.FloodProtectInterval = 150;
+        rconParser.Configuration.DefaultRConPort                = 28960;
+        rconParser.Configuration.DefaultInstallationDirectoryHint   = 'HKEY_CURRENT_USER\\Software\\Classes\\iw4x\\shell\\open\\command';
 
-        eventParser.Configuration.GameDirectory = 'userraw';
+        eventParser.Configuration.GameDirectory          = 'userraw';
 
         rconParser.Version = 'IW4x (v0.6.0)';
         rconParser.GameName = 2; // IW4x
@@ -38,4 +37,4 @@ var plugin = {
 
     onTickAsync: function (server) {
     }
-};
+};

Plugins/Stats/Client/HitCalculator.cs

@@ -201,7 +201,7 @@ namespace IW4MAdmin.Plugins.Stats.Client
                 }
                 catch (Exception ex)
                 {
-                    _logger.LogError(ex, "Could not retrieve previous hit data for client {Client}", hitInfo.EntityId);
+                    _logger.LogError(ex, "Could not retrieve previous hit data for client {client}");
                     continue;
                 }
 
@@ -613,4 +613,4 @@ namespace IW4MAdmin.Plugins.Stats.Client
             }
         }
     }
-}
+}

Plugins/Stats/Client/ServerDistributionCalculator.cs

@@ -48,7 +48,6 @@ namespace Stats.Client
             await LoadServers();
             _distributionCache.SetCacheItem((async (set, token) =>
             {
-                await _configurationHandler.BuildAsync();
                 var validPlayTime = _configurationHandler.Configuration()?.TopPlayersMinPlayTime ?? 3600 * 3;
 
                 var distributions = new Dictionary<long, Extensions.LogParams>();
@@ -74,7 +73,6 @@ namespace Stats.Client
 
             _maxZScoreCache.SetCacheItem(async (set, token) =>
             {
-                await _configurationHandler.BuildAsync();
                 var validPlayTime = _configurationHandler.Configuration()?.TopPlayersMinPlayTime ?? 3600 * 3;
 
                 var zScore = await set

Plugins/Stats/Client/WeaponNameParser.cs

@@ -3,7 +3,9 @@ using Stats.Client.Abstractions;
 using Stats.Client.Game;
 using System.Collections.Generic;
 using System.Linq;
+using IW4MAdmin.Plugins.Stats.Config;
 using SharedLibraryCore;
+using SharedLibraryCore.Interfaces;
 using Stats.Config;
 using ILogger = Microsoft.Extensions.Logging.ILogger;
 
@@ -14,10 +16,10 @@ namespace Stats.Client
         private readonly ILogger _logger;
         private readonly StatsConfiguration _config;
 
-        public WeaponNameParser(ILogger<WeaponNameParser> logger, StatsConfiguration config)
+        public WeaponNameParser(ILogger<WeaponNameParser> logger, IConfigurationHandler<StatsConfiguration> config)
         {
             _logger = logger;
-            _config = config;
+            _config = config.Configuration();
         }
 
         public WeaponInfo Parse(string weaponName, Server.Game gameName)
@@ -65,4 +67,4 @@ namespace Stats.Client
             return weaponInfo;
         }
     }
-}
+}

Plugins/Stats/Commands/MostKillsCommand.cs

@@ -17,6 +17,7 @@ namespace IW4MAdmin.Plugins.Stats.Commands
     class MostKillsCommand : Command
     {
         private readonly IDatabaseContextFactory _contextFactory;
+        private readonly CommandConfiguration _config;
 
         public MostKillsCommand(CommandConfiguration config, ITranslationLookup translationLookup,
             IDatabaseContextFactory contextFactory) : base(config, translationLookup)
@@ -27,6 +28,7 @@ namespace IW4MAdmin.Plugins.Stats.Commands
             Permission = EFClient.Permission.User;
 
             _contextFactory = contextFactory;
+            _config = config;
         }
 
         public override async Task ExecuteAsync(GameEvent E)
@@ -79,4 +81,4 @@ namespace IW4MAdmin.Plugins.Stats.Commands
                 .Prepend(Utilities.CurrentLocalization.LocalizationIndex["PLUGINS_STATS_COMMANDS_MOSTKILLS_HEADER"]);
         }
     }
-}
+}

Plugins/Stats/Commands/MostPlayedCommand.cs

@@ -56,6 +56,7 @@ namespace IW4MAdmin.Plugins.Stats.Commands
             return mostPlayed;
         }
 
+        private readonly CommandConfiguration _config;
         private readonly IDatabaseContextFactory _contextFactory;
 
         public MostPlayedCommand(CommandConfiguration config, ITranslationLookup translationLookup,
@@ -67,6 +68,7 @@ namespace IW4MAdmin.Plugins.Stats.Commands
             Permission = EFClient.Permission.User;
             RequiresTarget = false;
 
+            _config = config;
             _contextFactory = contextFactory;
         }
 
@@ -89,4 +91,4 @@ namespace IW4MAdmin.Plugins.Stats.Commands
             }
         }
     }
-}
+}

Plugins/Stats/Helpers/StatManager.cs

@@ -21,7 +21,7 @@ using Data.Models.Server;
 using Humanizer.Localisation;
 using Microsoft.Data.Sqlite;
 using Microsoft.Extensions.Logging;
-using MySqlConnector;
+using MySql.Data.MySqlClient;
 using Npgsql;
 using Stats.Client.Abstractions;
 using Stats.Config;
@@ -38,7 +38,7 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
         private readonly ConcurrentDictionary<long, ServerStats> _servers;
         private readonly ILogger _log;
         private readonly IDatabaseContextFactory _contextFactory;
-        private readonly StatsConfiguration _config;
+        private readonly IConfigurationHandler<StatsConfiguration> _configHandler;
         private static List<EFServer> serverModels;
         public static string CLIENT_STATS_KEY = "ClientStats";
         public static string CLIENT_DETECTIONS_KEY = "ClientDetections";
@@ -47,13 +47,13 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
         private readonly IServerDistributionCalculator _serverDistributionCalculator;
 
         public StatManager(ILogger<StatManager> logger, IManager mgr, IDatabaseContextFactory contextFactory,
-            StatsConfiguration statsConfig,
+            IConfigurationHandler<StatsConfiguration> configHandler,
             IServerDistributionCalculator serverDistributionCalculator)
         {
             _servers = new ConcurrentDictionary<long, ServerStats>();
             _log = logger;
             _contextFactory = contextFactory;
-            _config = statsConfig;
+            _configHandler = configHandler;
             _serverDistributionCalculator = serverDistributionCalculator;
         }
 
@@ -75,7 +75,7 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
                           r.When > fifteenDaysAgo &&
                           r.RatingHistory.Client.Level != EFClient.Permission.Banned &&
                           r.Newest &&
-                          r.ActivityAmount >= _config.TopPlayersMinPlayTime;
+                          r.ActivityAmount >= _configHandler.Configuration().TopPlayersMinPlayTime;
         }
 
         /// <summary>
@@ -87,7 +87,7 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
         {
             await using var context = _contextFactory.CreateContext(enableTracking: false);
             
-            if (_config.EnableAdvancedMetrics)
+            if (_configHandler.Configuration().EnableAdvancedMetrics)
             {
                 var clientRanking = await context.Set<EFClientRankingHistory>()
                     .Where(r => r.ClientId == clientId)
@@ -126,7 +126,7 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
                                 && ranking.PerformanceMetric != null
                                 && ranking.Newest
                                 && ranking.Client.TotalConnectionTime >=
-                                _config.TopPlayersMinPlayTime;
+                                _configHandler.Configuration().TopPlayersMinPlayTime;
         }
 
         public async Task<int> GetTotalRankedPlayers(long serverId)
@@ -217,7 +217,7 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
 
         public async Task<List<TopStatsInfo>> GetTopStats(int start, int count, long? serverId = null)
         {
-            if (_config.EnableAdvancedMetrics)
+            if (_configHandler.Configuration().EnableAdvancedMetrics)
             {
                 return await GetNewTopStats(start, count, serverId);
             }
@@ -570,7 +570,7 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
             {
                 clientStats = UpdateStats(clientStats, pl);
                 await SaveClientStats(clientStats);
-                if (_config.EnableAdvancedMetrics)
+                if (_configHandler.Configuration().EnableAdvancedMetrics)
                 {
                     await UpdateHistoricalRanking(pl.ClientId, clientStats, serverId);
                 }
@@ -973,7 +973,7 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
 
             // update their performance 
             if ((DateTime.UtcNow - attackerStats.LastStatHistoryUpdate).TotalMinutes >=
-                (Utilities.IsDevelopment ? 0.5 : _config.EnableAdvancedMetrics ? 5.0 : 2.5))
+                (Utilities.IsDevelopment ? 0.5 : _configHandler.Configuration().EnableAdvancedMetrics ? 5.0 : 2.5))
             {
                 try
                 {
@@ -982,7 +982,7 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
                     // for stat history update, but one is already processing that invalidates the original
                     await attackerStats.ProcessingHit.WaitAsync(Utilities.DefaultCommandTimeout,
                         Plugin.ServerManager.CancellationToken);
-                    if (_config.EnableAdvancedMetrics)
+                    if (_configHandler.Configuration().EnableAdvancedMetrics)
                     {
                         await UpdateHistoricalRanking(attacker.ClientId, attackerStats, serverId);
                     }
@@ -1190,7 +1190,7 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
         public async Task UpdateHistoricalRanking(int clientId, EFClientStatistics clientStats, long serverId)
         {
             await using var context = _contextFactory.CreateContext();
-            var minPlayTime = _config.TopPlayersMinPlayTime;
+            var minPlayTime = _configHandler.Configuration().TopPlayersMinPlayTime;
             
             var performances = await context.Set<EFClientStatistics>()
                 .AsNoTracking()
@@ -1208,7 +1208,7 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
                 var serverRanking = await context.Set<EFClientStatistics>()
                     .Where(stats => stats.ClientId != clientStats.ClientId)
                     .Where(AdvancedClientStatsResourceQueryHelper.GetRankingFunc(
-                        _config.TopPlayersMinPlayTime, clientStats.ZScore, serverId))
+                        _configHandler.Configuration().TopPlayersMinPlayTime, clientStats.ZScore, serverId))
                     .CountAsync();
 
                 var serverRankingSnapshot = new EFClientRankingHistory

Plugins/Stats/Plugin.cs

@@ -11,6 +11,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Data.Abstractions;
+using Data.Models.Client;
 using Data.Models.Client.Stats;
 using Data.Models.Server;
 using Microsoft.Extensions.Logging;
@@ -171,7 +172,6 @@ namespace IW4MAdmin.Plugins.Stats
 
         public async Task OnLoadAsync(IManager manager)
         {
-            await Config.BuildAsync();
             // load custom configuration
             if (Config.Configuration() == null)
             {
@@ -191,8 +191,10 @@ namespace IW4MAdmin.Plugins.Stats
             async Task<IEnumerable<InformationResponse>> getStats(ClientPaginationRequest request)
             {
                 IList<EFClientStatistics> clientStats;
+                int messageCount = 0;
                 await using var ctx = _databaseContextFactory.CreateContext(enableTracking: false);
                 clientStats = await ctx.Set<EFClientStatistics>().Where(c => c.ClientId == request.ClientId).ToListAsync();
+                messageCount = await ctx.Set<EFClientMessage>().CountAsync(_message => _message.ClientId == request.ClientId);
 
                 int kills = clientStats.Sum(c => c.Kills);
                 int deaths = clientStats.Sum(c => c.Deaths);
@@ -251,6 +253,14 @@ namespace IW4MAdmin.Plugins.Stats
                         Column = 0,
                         Order = 5,
                         Type = MetaType.Information
+                    },
+                    new InformationResponse()
+                    {
+                        Key = Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_PROFILE_MESSAGES"],
+                        Value = messageCount.ToString("#,##0", new System.Globalization.CultureInfo(Utilities.CurrentLocalization.LocalizationName)),
+                        Column = 1,
+                        Order = 4,
+                        Type = MetaType.Information
                     }
                 };
             }
@@ -441,7 +451,7 @@ namespace IW4MAdmin.Plugins.Stats
             }
 
             ServerManager = manager;
-            Manager = new StatManager(_managerLogger, manager, _databaseContextFactory, Config.Configuration(), _serverDistributionCalculator);
+            Manager = new StatManager(_managerLogger, manager, _databaseContextFactory, Config, _serverDistributionCalculator);
             await _serverDistributionCalculator.Initialize();
         }
 

Plugins/Stats/Stats.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <ApplicationIcon />
     <StartupObject />
     <PackageId>RaidMax.IW4MAdmin.Plugins.Stats</PackageId>
@@ -17,7 +17,7 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.1.28.1" PrivateAssets="All" />
+    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.1.20.1" PrivateAssets="All" />
   </ItemGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">

Plugins/Welcome/Plugin.cs

@@ -6,7 +6,6 @@ using SharedLibraryCore.Database.Models;
 using System.Linq;
 using Microsoft.EntityFrameworkCore;
 using System.Net;
-using System.Net.Http;
 using Newtonsoft.Json.Linq;
 using Humanizer;
 using Data.Abstractions;
@@ -35,7 +34,6 @@ namespace IW4MAdmin.Plugins.Welcome
 
         public async Task OnLoadAsync(IManager manager)
         {
-            await _configHandler.BuildAsync();
             if (_configHandler.Configuration() == null)
             {
                 _configHandler.Set((WelcomeConfiguration) new WelcomeConfiguration().Generate());
@@ -95,7 +93,7 @@ namespace IW4MAdmin.Plugins.Welcome
                 msg = msg.Replace("{{ClientLocation}}", await GetCountryName(joining.IPAddressString));
             }
 
-            msg = msg.Replace("{{TimesConnected}}", joining.Connections.Ordinalize(Utilities.CurrentLocalization.Culture));
+            msg = msg.Replace("{{TimesConnected}}", joining.Connections.Ordinalize());
 
             return msg;
         }
@@ -107,11 +105,11 @@ namespace IW4MAdmin.Plugins.Welcome
         /// <returns></returns>
         private async Task<string> GetCountryName(string ip)
         {
-            using var wc = new HttpClient();
+            using var wc = new WebClient();
             try
             {
                 var response =
-                    await wc.GetStringAsync(new Uri($"http://ip-api.com/json/{ip}"));
+                    await wc.DownloadStringTaskAsync(new Uri($"http://extreme-ip-lookup.com/json/{ip}?key=demo"));
                 var responseObj = JObject.Parse(response);
                 response = responseObj["country"]?.ToString();
 
@@ -126,4 +124,4 @@ namespace IW4MAdmin.Plugins.Welcome
             }
         }
     }
-}
+}

Plugins/Welcome/Welcome.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <ApplicationIcon />
     <StartupObject />
     <PackageId>RaidMax.IW4MAdmin.Plugins.Welcome</PackageId>
@@ -20,7 +20,7 @@
   </Target>
 
   <ItemGroup>
-    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.1.28.1" PrivateAssets="All" />
+    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.1.20.1" PrivateAssets="All" />
   </ItemGroup>
 
 </Project>

README.md

@@ -13,9 +13,9 @@ Latest binary builds are always available at:
 ## Setup
 **IW4MAdmin** requires minimal effort to get up and running.
 ### Prerequisites
-* [.NET Core 6.0.x Runtime](https://www.microsoft.com/net/download)
-    * [Direct Download (Windows)](https://dotnet.microsoft.com/en-us/download/dotnet/thank-you/runtime-aspnetcore-6.0.1-windows-hosting-bundle-installer)
-    * [Package Installation Instructions (Linux)](https://docs.microsoft.com/en-us/dotnet/core/install/linux)
+* [.NET Core 3.1.x Runtime](https://www.microsoft.com/net/download) *or newer*
+    * [Direct Download (Windows)](https://dotnet.microsoft.com/download/dotnet-core/thank-you/runtime-aspnetcore-3.1.4-windows-hosting-bundle-installer)
+    * [Package Installation (Linux)](https://docs.microsoft.com/en-us/dotnet/core/install/linux-package-manager-ubuntu-1910)
 ### Installation
 1. Install .NET Core Runtime
 2.  Extract `IW4MAdmin-<version>.zip`  
@@ -35,22 +35,11 @@ Linux
     * You will need to retrieve your login credentials by typing `!rt` ingame
 
 ### Updating
-**Manually**  
 1. Download the latest version of **IW4MAdmin**
 2. Extract the newer version of **IW4MAdmin** into pre-existing **IW4MAdmin** folder and overwrite existing files
 
     _Your configuration and database will be saved_
 
-**OR**  
-Use the provided `UpdateIW4MAdmin` script to download and install automatically
-
-| Argument Windows (Linux) | Description                                               |
-|--------------------------|-----------------------------------------------------------|
-| -Silent (s)              | Do not prompt for any user input                          |
-| -Clean (c)               | Clean unneeded files listed in `_delete.txt` after update |
-| -Verified (v)            | Only update releases in the verified stream               |
- | -Directory (d)           | Directory to install to                                   |
-
 ## Help
 Feel free to join the **IW4MAdmin** [Discord](https://discord.gg/ZZFK5p3)  
 If you come across an issue,  bug, or feature request please post an [issue](https://github.com/RaidMax/IW4M-Admin/issues)

SharedLibraryCore/BaseController.cs

@@ -1,35 +1,38 @@
-using System;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Authentication.Cookies;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
+using SharedLibraryCore.Database.Models;
+using SharedLibraryCore.Dtos;
+using SharedLibraryCore.Interfaces;
+using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.Linq;
 using System.Security.Claims;
 using System.Threading.Tasks;
 using Data.Context;
 using Data.Models;
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Authentication.Cookies;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Filters;
 using SharedLibraryCore.Configuration;
-using SharedLibraryCore.Database.Models;
-using SharedLibraryCore.Dtos;
-using SharedLibraryCore.Interfaces;
-using SharedLibraryCore.Localization;
 
 namespace SharedLibraryCore
 {
     public class BaseController : Controller
     {
         /// <summary>
-        ///     life span in months
+        /// life span in months
         /// </summary>
         private const int COOKIE_LIFESPAN = 3;
 
+        public IManager Manager { get; private set; }
+        protected readonly DatabaseContext Context;
+        protected bool Authorized { get; set; }
+        protected Localization.TranslationLookup Localization { get; private set; }
+        protected EFClient Client { get; private set; }
         private static readonly byte[] LocalHost = { 127, 0, 0, 1 };
         private static string SocialLink;
         private static string SocialTitle;
-        protected readonly DatabaseContext Context;
         protected List<Page> Pages;
+        protected ApplicationConfiguration AppConfig { get; }
 
         public BaseController(IManager manager)
         {
@@ -43,7 +46,7 @@ namespace SharedLibraryCore
                 SocialTitle = AppConfig.SocialLinkTitle;
             }
 
-
+            
             Pages = Manager.GetPageList().Pages
                 .Select(page => new Page
                 {
@@ -56,30 +59,23 @@ namespace SharedLibraryCore
             ViewBag.EnableColorCodes = AppConfig.EnableColorCodes;
             ViewBag.Language = Utilities.CurrentLocalization.Culture.TwoLetterISOLanguageName;
 
-            Client ??= new EFClient
+            Client ??= new EFClient()
             {
                 ClientId = -1,
-                Level = Data.Models.Client.EFClient.Permission.Banned,
-                CurrentAlias = new EFAlias { Name = "Webfront Guest" }
+                Level = EFClient.Permission.Banned,
+                CurrentAlias = new EFAlias() { Name = "Webfront Guest" }
             };
         }
 
-        public IManager Manager { get; }
-        protected bool Authorized { get; set; }
-        protected TranslationLookup Localization { get; }
-        protected EFClient Client { get; }
-        protected ApplicationConfiguration AppConfig { get; }
-
         protected async Task SignInAsync(ClaimsPrincipal claimsPrinciple)
         {
-            await HttpContext.SignInAsync(CookieAuthenticationDefaults.AuthenticationScheme, claimsPrinciple,
-                new AuthenticationProperties
-                {
-                    AllowRefresh = true,
-                    ExpiresUtc = DateTime.UtcNow.AddMonths(COOKIE_LIFESPAN),
-                    IsPersistent = true,
-                    IssuedUtc = DateTime.UtcNow
-                });
+            await HttpContext.SignInAsync(CookieAuthenticationDefaults.AuthenticationScheme, claimsPrinciple, new AuthenticationProperties()
+            {
+                AllowRefresh = true,
+                ExpiresUtc = DateTime.UtcNow.AddMonths(COOKIE_LIFESPAN),
+                IsPersistent = true,
+                IssuedUtc = DateTime.UtcNow
+            });
         }
 
         public override void OnActionExecuting(ActionExecutingContext context)
@@ -88,27 +84,21 @@ namespace SharedLibraryCore
             {
                 try
                 {
-                    var clientId =
-                        Convert.ToInt32(User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid)?.Value ?? "-1");
+                    int clientId = Convert.ToInt32(User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid)?.Value ?? "-1");
 
                     if (clientId > 0)
                     {
                         Client.ClientId = clientId;
-                        Client.NetworkId = clientId == 1
-                            ? 0
-                            : User.Claims.First(_claim => _claim.Type == ClaimTypes.PrimarySid).Value
-                                .ConvertGuidToLong(NumberStyles.HexNumber);
-                        Client.Level = (Data.Models.Client.EFClient.Permission)Enum.Parse(
-                            typeof(Data.Models.Client.EFClient.Permission),
-                            User.Claims.First(c => c.Type == ClaimTypes.Role).Value);
-                        Client.CurrentAlias = new EFAlias
-                            { Name = User.Claims.First(c => c.Type == ClaimTypes.NameIdentifier).Value };
+                        Client.NetworkId = clientId == 1 ? 0 : User.Claims.First(_claim => _claim.Type == ClaimTypes.PrimarySid).Value.ConvertGuidToLong(System.Globalization.NumberStyles.HexNumber);
+                        Client.Level = (EFClient.Permission)Enum.Parse(typeof(EFClient.Permission), User.Claims.First(c => c.Type == ClaimTypes.Role).Value);
+                        Client.CurrentAlias = new EFAlias() { Name = User.Claims.First(c => c.Type == ClaimTypes.NameIdentifier).Value };
                         Authorized = Client.ClientId >= 0;
                     }
                 }
 
                 catch (InvalidOperationException)
                 {
+
                 }
 
                 catch (KeyNotFoundException)
@@ -122,25 +112,25 @@ namespace SharedLibraryCore
             else if (!HttpContext.Request.Headers.ContainsKey("X-Forwarded-For"))
             {
                 Client.ClientId = 1;
-                Client.Level = Data.Models.Client.EFClient.Permission.Console;
-                Client.CurrentAlias = new EFAlias { Name = "IW4MAdmin" };
+                Client.Level = EFClient.Permission.Console;
+                Client.CurrentAlias = new EFAlias() { Name = "IW4MAdmin" };
                 Authorized = true;
                 var claims = new[]
                 {
                     new Claim(ClaimTypes.NameIdentifier, Client.CurrentAlias.Name),
-                    new Claim(ClaimTypes.Role, Client.Level.ToString()),
-                    new Claim(ClaimTypes.Sid, Client.ClientId.ToString()),
-                    new Claim(ClaimTypes.PrimarySid, Client.NetworkId.ToString("X"))
+                   new Claim(ClaimTypes.Role, Client.Level.ToString()),
+                   new Claim(ClaimTypes.Sid, Client.ClientId.ToString()),
+                   new Claim(ClaimTypes.PrimarySid, Client.NetworkId.ToString("X"))
                 };
                 var claimsIdentity = new ClaimsIdentity(claims, "login");
                 SignInAsync(new ClaimsPrincipal(claimsIdentity)).Wait();
             }
 
             var communityName = AppConfig.CommunityInformation?.Name;
-            var shouldUseCommunityName = !string.IsNullOrWhiteSpace(communityName)
-                                         && !communityName.Contains("IW4MAdmin")
+            var shouldUseCommunityName = !string.IsNullOrWhiteSpace(communityName) 
+                                         && !communityName.Contains("IW4MAdmin") 
                                          && AppConfig.CommunityInformation.IsEnabled;
-
+            
             ViewBag.Authorized = Authorized;
             ViewBag.Url = AppConfig.WebfrontUrl;
             ViewBag.User = Client;
@@ -160,4 +150,4 @@ namespace SharedLibraryCore
             base.OnActionExecuting(context);
         }
     }
-}
+}

SharedLibraryCore/Command.cs

@@ -1,9 +1,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Data.Models.Client;
 using SharedLibraryCore.Commands;
 using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Database.Models;
 using SharedLibraryCore.Interfaces;
 using static SharedLibraryCore.Server;
 using ILogger = Microsoft.Extensions.Logging.ILogger;
@@ -11,17 +11,13 @@ using ILogger = Microsoft.Extensions.Logging.ILogger;
 namespace SharedLibraryCore
 {
     /// <summary>
-    ///     Abstract class for command
+    /// Abstract class for command
     /// </summary>
     public abstract class Command : IManagerCommand
     {
         protected readonly CommandConfiguration _config;
         protected readonly ITranslationLookup _translationLookup;
-        private string alias;
         protected ILogger logger;
-        private string name;
-        private EFClient.Permission permission;
-        private Game[] supportedGames;
 
         public Command(CommandConfiguration config, ITranslationLookup layout)
         {
@@ -31,25 +27,14 @@ namespace SharedLibraryCore
         }
 
         /// <summary>
-        ///     Helper property to determine the number of required args
-        /// </summary>
-        public int RequiredArgumentCount => Arguments.Count(c => c.Required);
-
-
-        /// <summary>
-        ///     Argument list for the command
-        /// </summary>
-        public CommandArgument[] Arguments { get; protected set; } = new CommandArgument[0];
-
-        /// <summary>
-        ///     Executes the command
+        /// Executes the command
         /// </summary>
         /// <param name="gameEvent"></param>
         /// <returns></returns>
-        public abstract Task ExecuteAsync(GameEvent gameEvent);
+        abstract public Task ExecuteAsync(GameEvent gameEvent);
 
         /// <summary>
-        ///     Specifies the name and string that triggers the command
+        /// Specifies the name and string that triggers the command
         /// </summary>
         public string Name
         {
@@ -67,20 +52,20 @@ namespace SharedLibraryCore
                 }
             }
         }
+        private string name;
 
         /// <summary>
-        ///     Specifies the command description
+        /// Specifies the command description
         /// </summary>
         public string Description { get; protected set; }
 
         /// <summary>
-        ///     Helper property to provide the syntax of the command
+        /// Helper property to provide the syntax of the command
         /// </summary>
-        public string Syntax =>
-            $"{_translationLookup["COMMAND_HELP_SYNTAX"]} {_config.CommandPrefix ?? "!"}{Alias} {string.Join(" ", Arguments.Select(a => $"<{(a.Required ? "" : _translationLookup["COMMAND_HELP_OPTIONAL"] + " ")}{a.Name}>"))}";
+        public string Syntax => $"{_translationLookup["COMMAND_HELP_SYNTAX"]} {_config.CommandPrefix ?? "!"}{Alias} {string.Join(" ", Arguments.Select(a => $"<{(a.Required ? "" : _translationLookup["COMMAND_HELP_OPTIONAL"] + " ")}{a.Name}>"))}";
 
         /// <summary>
-        ///     Alternate name for this command to be executed by
+        /// Alternate name for this command to be executed by
         /// </summary>
         public string Alias
         {
@@ -98,14 +83,20 @@ namespace SharedLibraryCore
                 }
             }
         }
+        private string alias;
 
         /// <summary>
-        ///     Indicates if the command requires a target to execute on
+        /// Helper property to determine the number of required args
+        /// </summary>
+        public int RequiredArgumentCount => Arguments.Count(c => c.Required);
+
+        /// <summary>
+        /// Indicates if the command requires a target to execute on
         /// </summary>
         public bool RequiresTarget { get; protected set; }
 
         /// <summary>
-        ///     Minimum permission level to execute command
+        /// Minimum permission level to execute command
         /// </summary>
         public EFClient.Permission Permission
         {
@@ -123,6 +114,7 @@ namespace SharedLibraryCore
                 }
             }
         }
+        private EFClient.Permission permission;
 
         public Game[] SupportedGames
         {
@@ -132,7 +124,7 @@ namespace SharedLibraryCore
                 try
                 {
                     var savedGames = _config?.Commands[GetType().Name].SupportedGames;
-                    supportedGames = savedGames?.Length != 0 ? savedGames : value;
+                    supportedGames =  savedGames?.Length != 0 ? savedGames : value;
                 }
 
                 catch (KeyNotFoundException)
@@ -141,12 +133,19 @@ namespace SharedLibraryCore
                 }
             }
         }
+        private Game[] supportedGames;
+
 
         /// <summary>
-        ///     indicates if this command allows impersonation (run as)
+        /// Argument list for the command
+        /// </summary>
+        public CommandArgument[] Arguments { get; protected set; } = new CommandArgument[0];
+
+        /// <summary>
+        /// indicates if this command allows impersonation (run as)
         /// </summary>
         public bool AllowImpersonation { get; set; }
 
         public bool IsBroadcast { get; set; }
     }
-}
+}

SharedLibraryCore/Commands/AddClientTagCommand.cs

@@ -1,8 +1,8 @@
-using System.Threading.Tasks;
-using Data.Models;
-using Data.Models.Client;
-using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Database.Models;
 using SharedLibraryCore.Interfaces;
+using System.Threading.Tasks;
+using Data.Models;
 
 namespace SharedLibraryCore.Commands
 {
@@ -10,8 +10,7 @@ namespace SharedLibraryCore.Commands
     {
         private readonly IMetaService _metaService;
 
-        public AddClientTagCommand(CommandConfiguration config, ITranslationLookup layout, IMetaService metaService) :
-            base(config, layout)
+        public AddClientTagCommand(CommandConfiguration config, ITranslationLookup layout, IMetaService metaService) : base(config, layout)
         {
             Name = "addclienttag";
             Description = layout["COMMANDS_ADD_CLIENT_TAG_DESC"];
@@ -20,7 +19,7 @@ namespace SharedLibraryCore.Commands
             RequiresTarget = false;
             Arguments = new[]
             {
-                new CommandArgument
+                new CommandArgument()
                 {
                     Name = _translationLookup["COMMANDS_ARGUMENT_TAG"],
                     Required = true
@@ -32,8 +31,8 @@ namespace SharedLibraryCore.Commands
 
         public override async Task ExecuteAsync(GameEvent gameEvent)
         {
-            await _metaService.AddPersistentMeta(EFMeta.ClientTagName, gameEvent.Data);
-            gameEvent.Origin.Tell(_translationLookup["COMMANDS_ADD_CLIENT_TAG_SUCCESS"].FormatExt(gameEvent.Data));
+                await _metaService.AddPersistentMeta(EFMeta.ClientTagName, gameEvent.Data);
+                gameEvent.Origin.Tell(_translationLookup["COMMANDS_ADD_CLIENT_TAG_SUCCESS"].FormatExt(gameEvent.Data));
         }
     }
-}
+}

SharedLibraryCore/Commands/CommandArgument.cs

@@ -1,18 +1,18 @@
 namespace SharedLibraryCore.Commands
 {
     /// <summary>
-    ///     Holds information about command args
+    /// Holds information about command args
     /// </summary>
     public class CommandArgument
     {
         /// <summary>
-        ///     Name of the argument
+        /// Name of the argument
         /// </summary>
         public string Name { get; set; }
 
         /// <summary>
-        ///     Indicates if the argument is required
+        /// Indicates if the argument is required
         /// </summary>
         public bool Required { get; set; }
     }
-}
+}

SharedLibraryCore/Commands/CommandExtensions.cs

@@ -1,15 +1,13 @@
-namespace SharedLibraryCore.Commands
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace SharedLibraryCore.Commands
 {
     public static class CommandExtensions
     {
-        public static bool IsTargetingSelf(this GameEvent gameEvent)
-        {
-            return gameEvent.Origin?.Equals(gameEvent.Target) ?? false;
-        }
+        public static bool IsTargetingSelf(this GameEvent gameEvent) => gameEvent.Origin?.Equals(gameEvent.Target) ?? false;
 
-        public static bool CanPerformActionOnTarget(this GameEvent gameEvent)
-        {
-            return gameEvent.Origin?.Level > gameEvent.Target?.Level;
-        }
+        public static bool CanPerformActionOnTarget(this GameEvent gameEvent) => gameEvent.Origin?.Level > gameEvent.Target?.Level;
     }
-}
+}

SharedLibraryCore/Commands/CommandProcessing.cs

@@ -1,35 +1,36 @@
-using System;
+using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Database.Models;
+using SharedLibraryCore.Exceptions;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
-using SharedLibraryCore.Configuration;
-using SharedLibraryCore.Database.Models;
-using SharedLibraryCore.Exceptions;
 
 namespace SharedLibraryCore.Commands
 {
     public class CommandProcessing
     {
-        public static async Task<Command> ValidateCommand(GameEvent E, ApplicationConfiguration appConfig,
-            CommandConfiguration commandConfig)
+        public static async Task<Command> ValidateCommand(GameEvent E, ApplicationConfiguration appConfig, CommandConfiguration commandConfig)
         {
             var loc = Utilities.CurrentLocalization.LocalizationIndex;
             var Manager = E.Owner.Manager;
-            var isBroadcast = E.Data.StartsWith(appConfig.BroadcastCommandPrefix);
-            var prefixLength = isBroadcast ? appConfig.BroadcastCommandPrefix.Length : appConfig.CommandPrefix.Length;
+            bool isBroadcast = E.Data.StartsWith(appConfig.BroadcastCommandPrefix);
+            int prefixLength = isBroadcast ? appConfig.BroadcastCommandPrefix.Length : appConfig.CommandPrefix.Length;
 
-            var CommandString = E.Data.Substring(prefixLength, E.Data.Length - prefixLength).Split(' ')[0];
+            string CommandString = E.Data.Substring(prefixLength, E.Data.Length - prefixLength).Split(' ')[0];
             E.Message = E.Data;
 
             Command C = null;
             foreach (Command cmd in Manager.GetCommands()
-                         .Where(c => c.Name != null))
-                if (cmd.Name.Equals(CommandString, StringComparison.OrdinalIgnoreCase) ||
+                .Where(c => c.Name != null))
+            {
+                if (cmd.Name.Equals(CommandString, StringComparison.OrdinalIgnoreCase) || 
                     (cmd.Alias ?? "").Equals(CommandString, StringComparison.OrdinalIgnoreCase))
                 {
                     C = cmd;
                 }
+            }
 
             if (C == null)
             {
@@ -42,7 +43,7 @@ namespace SharedLibraryCore.Commands
             var allowImpersonation = commandConfig?.Commands?.ContainsKey(C.GetType().Name) ?? false
                 ? commandConfig.Commands[C.GetType().Name].AllowImpersonation
                 : C.AllowImpersonation;
-
+            
             if (!allowImpersonation && E.ImpersonationOrigin != null)
             {
                 E.ImpersonationOrigin.Tell(loc["COMMANDS_RUN_AS_FAIL"]);
@@ -50,7 +51,7 @@ namespace SharedLibraryCore.Commands
             }
 
             E.Data = E.Data.RemoveWords(1);
-            var Args = E.Data.Trim().Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
+            String[] Args = E.Data.Trim().Split(new char[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
             // todo: the code below can be cleaned up 
 
             if (E.Origin.Level < C.Permission)
@@ -59,7 +60,7 @@ namespace SharedLibraryCore.Commands
                 throw new CommandException($"{E.Origin} does not have access to \"{C.Name}\"");
             }
 
-            if (Args.Length < C.RequiredArgumentCount)
+            if (Args.Length < (C.RequiredArgumentCount))
             {
                 E.Origin.Tell(loc["COMMAND_MISSINGARGS"]);
                 E.Origin.Tell(C.Syntax);
@@ -70,14 +71,14 @@ namespace SharedLibraryCore.Commands
             {
                 if (Args.Length > 0)
                 {
-                    if (!int.TryParse(Args[0], out var cNum))
+                    if (!Int32.TryParse(Args[0], out int cNum))
                     {
                         cNum = -1;
                     }
 
                     if (Args[0][0] == '@') // user specifying target by database ID
                     {
-                        int.TryParse(Args[0].Substring(1, Args[0].Length - 1), out var dbID);
+                        int.TryParse(Args[0].Substring(1, Args[0].Length - 1), out int dbID);
 
                         var found = await Manager.GetClientService().Get(dbID);
                         if (found != null)
@@ -89,13 +90,12 @@ namespace SharedLibraryCore.Commands
                         }
                     }
 
-                    else if (Args[0].Length < 3 && cNum > -1 && cNum < E.Owner.MaxClients
-                            ) // user specifying target by client num
+                    else if (Args[0].Length < 3 && cNum > -1 && cNum < E.Owner.MaxClients) // user specifying target by client num
                     {
                         if (E.Owner.Clients[cNum] != null)
                         {
                             E.Target = E.Owner.Clients[cNum];
-                            E.Data = string.Join(" ", Args.Skip(1));
+                            E.Data = String.Join(" ", Args.Skip(1));
                         }
                     }
                 }
@@ -111,11 +111,11 @@ namespace SharedLibraryCore.Commands
                         throw new CommandException($"{E.Origin} had multiple players found for {C.Name}");
                     }
 
-                    if (matchingPlayers.Count == 1)
+                    else if (matchingPlayers.Count == 1)
                     {
                         E.Target = matchingPlayers.First();
 
-                        var escapedName = Regex.Escape(E.Target.CleanedName);
+                        string escapedName = Regex.Escape(E.Target.CleanedName);
                         var reg = new Regex($"(\"{escapedName}\")|({escapedName})", RegexOptions.IgnoreCase);
                         E.Data = reg.Replace(E.Data, "", 1).Trim();
 
@@ -135,21 +135,23 @@ namespace SharedLibraryCore.Commands
                     {
                         E.Origin.Tell(loc["COMMAND_TARGET_MULTI"]);
                         foreach (var p in matchingPlayers)
+                        {
                             E.Origin.Tell($"[(Color::Yellow){p.ClientNumber}(Color::White)] {p.Name}");
+                        }
                         throw new CommandException($"{E.Origin} had multiple players found for {C.Name}");
                     }
 
-                    if (matchingPlayers.Count == 1)
+                    else if (matchingPlayers.Count == 1)
                     {
                         E.Target = matchingPlayers.First();
 
-                        var escapedName = Regex.Escape(E.Target.CleanedName);
-                        var escapedArg = Regex.Escape(Args[0]);
+                        string escapedName = Regex.Escape(E.Target.CleanedName);
+                        string escapedArg = Regex.Escape(Args[0]);
                         var reg = new Regex($"({escapedName})|({escapedArg})", RegexOptions.IgnoreCase);
                         E.Data = reg.Replace(E.Data, "", 1).Trim();
 
                         if ((E.Data.Trim() == E.Target.CleanedName.ToLower().Trim() ||
-                             E.Data == string.Empty) &&
+                            E.Data == String.Empty) &&
                             C.RequiresTarget)
                         {
                             E.Origin.Tell(loc["COMMAND_MISSINGARGS"]);
@@ -170,4 +172,4 @@ namespace SharedLibraryCore.Commands
             return C;
         }
     }
-}
+}

SharedLibraryCore/Commands/ListClientTags.cs

@@ -1,25 +1,27 @@
-using System.Linq;
+using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Database.Models;
+using SharedLibraryCore.Interfaces;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using Data.Models;
-using Data.Models.Client;
-using SharedLibraryCore.Configuration;
-using SharedLibraryCore.Interfaces;
 
 namespace SharedLibraryCore.Commands
 {
+
     public class ListClientTags : Command
     {
         private readonly IMetaService _metaService;
 
-        public ListClientTags(CommandConfiguration config, ITranslationLookup layout, IMetaService metaService) : base(
-            config, layout)
+        public ListClientTags(CommandConfiguration config, ITranslationLookup layout, IMetaService metaService) : base(config, layout)
         {
             Name = "listclienttags";
             Description = layout["COMMANDS_LIST_CLIENT_TAGS_DESC"];
             Alias = "lct";
             Permission = EFClient.Permission.Owner;
             RequiresTarget = false;
-
+            
             _metaService = metaService;
         }
 
@@ -29,4 +31,4 @@ namespace SharedLibraryCore.Commands
             gameEvent.Origin.Tell(tags.Select(tag => tag.Value));
         }
     }
-}
+}

SharedLibraryCore/Commands/PrivateMessageAdminsCommand.cs

@@ -1,16 +1,16 @@
-using System.Linq;
-using System.Threading.Tasks;
-using Data.Models.Client;
-using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Database.Models;
 using SharedLibraryCore.Interfaces;
+using System;
+using System.Linq;
+using System.Threading.Tasks;
 using static SharedLibraryCore.Server;
 
 namespace SharedLibraryCore.Commands
 {
     public class PrivateMessageAdminsCommand : Command
     {
-        public PrivateMessageAdminsCommand(CommandConfiguration config, ITranslationLookup lookup) : base(config,
-            lookup)
+        public PrivateMessageAdminsCommand(CommandConfiguration config, ITranslationLookup lookup) : base(config, lookup)
         {
             Name = "privatemessageadmin";
             Description = lookup["COMMANDS_PMADMINS_DESC"];
@@ -21,14 +21,12 @@ namespace SharedLibraryCore.Commands
 
         public override Task ExecuteAsync(GameEvent E)
         {
-            var isGameSupported = _config.Commands[nameof(PrivateMessageAdminsCommand)].SupportedGames.Length > 0 &&
-                                  _config.Commands[nameof(PrivateMessageAdminsCommand)].SupportedGames
-                                      .Contains(E.Owner.GameName);
+            bool isGameSupported = _config.Commands[nameof(PrivateMessageAdminsCommand)].SupportedGames.Length > 0 &&
+                _config.Commands[nameof(PrivateMessageAdminsCommand)].SupportedGames.Contains(E.Owner.GameName);
 
             if (!isGameSupported)
             {
-                E.Origin.Tell(_translationLookup["COMMANDS_GAME_NOT_SUPPORTED"]
-                    .FormatExt(nameof(PrivateMessageAdminsCommand)));
+                E.Origin.Tell(_translationLookup["COMMANDS_GAME_NOT_SUPPORTED"].FormatExt(nameof(PrivateMessageAdminsCommand)));
                 return Task.CompletedTask;
             }
 
@@ -36,4 +34,4 @@ namespace SharedLibraryCore.Commands
             return Task.CompletedTask;
         }
     }
-}
+}

SharedLibraryCore/Commands/RemoveClientTagCommand.cs

@@ -1,8 +1,8 @@
-using System.Threading.Tasks;
-using Data.Models;
-using Data.Models.Client;
-using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Database.Models;
 using SharedLibraryCore.Interfaces;
+using System.Threading.Tasks;
+using Data.Models;
 
 namespace SharedLibraryCore.Commands
 {
@@ -10,8 +10,7 @@ namespace SharedLibraryCore.Commands
     {
         private readonly IMetaService _metaService;
 
-        public RemoveClientTag(CommandConfiguration config, ITranslationLookup layout, IMetaService metaService) : base(
-            config, layout)
+        public RemoveClientTag(CommandConfiguration config, ITranslationLookup layout, IMetaService metaService) : base(config, layout)
         {
             Name = "removeclienttag";
             Description = layout["COMMANDS_REMOVE_CLIENT_TAG_DESC"];
@@ -20,7 +19,7 @@ namespace SharedLibraryCore.Commands
             RequiresTarget = false;
             Arguments = new[]
             {
-                new CommandArgument
+                new CommandArgument()
                 {
                     Name = _translationLookup["COMMANDS_ARGUMENT_TAG"],
                     Required = true
@@ -36,4 +35,4 @@ namespace SharedLibraryCore.Commands
             gameEvent.Origin.Tell(_translationLookup["COMMANDS_REMOVE_CLIENT_TAG_SUCCESS"].FormatExt(gameEvent.Data));
         }
     }
-}
+}

SharedLibraryCore/Commands/RequestTokenCommand.cs

@@ -1,12 +1,12 @@
-using System.Threading.Tasks;
-using Data.Models.Client;
-using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Database.Models;
 using SharedLibraryCore.Interfaces;
+using System.Threading.Tasks;
 
 namespace SharedLibraryCore.Commands
 {
     /// <summary>
-    ///     Generates a token for use in webfront login
+    /// Generates a token for use in webfront login
     /// </summary>
     public class RequestTokenCommand : Command
     {
@@ -22,10 +22,9 @@ namespace SharedLibraryCore.Commands
         public override Task ExecuteAsync(GameEvent E)
         {
             var state = E.Owner.Manager.TokenAuthenticator.GenerateNextToken(E.Origin.NetworkId);
-            E.Origin.Tell(string.Format(_translationLookup["COMMANDS_GENERATETOKEN_SUCCESS"], state.Token,
-                $"{state.RemainingTime} {_translationLookup["GLOBAL_MINUTES"]}", E.Origin.ClientId));
+            E.Origin.Tell(string.Format(_translationLookup["COMMANDS_GENERATETOKEN_SUCCESS"], state.Token, $"{state.RemainingTime} {_translationLookup["GLOBAL_MINUTES"]}", E.Origin.ClientId));
 
             return Task.CompletedTask;
         }
     }
-}
+}

SharedLibraryCore/Commands/RunAsCommand.cs

@@ -1,8 +1,8 @@
-using System.Linq;
-using System.Threading.Tasks;
-using Data.Models.Client;
-using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Database.Models;
 using SharedLibraryCore.Interfaces;
+using System.Linq;
+using System.Threading.Tasks;
 
 namespace SharedLibraryCore.Commands
 {
@@ -17,7 +17,7 @@ namespace SharedLibraryCore.Commands
             RequiresTarget = true;
             Arguments = new[]
             {
-                new CommandArgument
+                new CommandArgument()
                 {
                     Name = lookup["COMMANDS_ARGS_COMMANDS"],
                     Required = true
@@ -40,7 +40,7 @@ namespace SharedLibraryCore.Commands
             }
 
             var cmd = $"{Utilities.CommandPrefix}{gameEvent.Data}";
-            var impersonatedCommandEvent = new GameEvent
+            var impersonatedCommandEvent = new GameEvent()
             {
                 Type = GameEvent.EventType.Command,
                 Origin = gameEvent.Target,
@@ -52,8 +52,7 @@ namespace SharedLibraryCore.Commands
             };
             gameEvent.Owner.Manager.AddEvent(impersonatedCommandEvent);
 
-            var result = await impersonatedCommandEvent.WaitAsync(Utilities.DefaultCommandTimeout,
-                gameEvent.Owner.Manager.CancellationToken);
+            var result = await impersonatedCommandEvent.WaitAsync(Utilities.DefaultCommandTimeout, gameEvent.Owner.Manager.CancellationToken);
             await result.WaitAsync(Utilities.DefaultCommandTimeout, gameEvent.Owner.Manager.CancellationToken);
 
             // remove the added command response
@@ -62,10 +61,11 @@ namespace SharedLibraryCore.Commands
                 .Where(ev => ev.Value.CorrelationId == impersonatedCommandEvent.CorrelationId)
                 .SelectMany(ev => ev.Value.Output)
                 .ToList();
-
+            
             foreach (var output in responses)
-                await gameEvent.Origin.Tell(_translationLookup["COMMANDS_RUN_AS_SUCCESS"].FormatExt(output))
-                    .WaitAsync();
+            {
+                await gameEvent.Origin.Tell(_translationLookup["COMMANDS_RUN_AS_SUCCESS"].FormatExt(output)).WaitAsync();
+            }
         }
     }
-}
+}

SharedLibraryCore/Commands/SetClientTagCommand.cs

@@ -1,9 +1,9 @@
-using System.Linq;
+using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Database.Models;
+using SharedLibraryCore.Interfaces;
+using System.Linq;
 using System.Threading.Tasks;
 using Data.Models;
-using Data.Models.Client;
-using SharedLibraryCore.Configuration;
-using SharedLibraryCore.Interfaces;
 
 namespace SharedLibraryCore.Commands
 {
@@ -12,8 +12,7 @@ namespace SharedLibraryCore.Commands
         private readonly IMetaService _metaService;
 
 
-        public SetClientTagCommand(CommandConfiguration config, ITranslationLookup layout, IMetaService metaService) :
-            base(config, layout)
+        public SetClientTagCommand(CommandConfiguration config, ITranslationLookup layout, IMetaService metaService) : base(config, layout)
         {
             Name = "setclienttag";
             Description = layout["COMMANDS_SET_CLIENT_TAG_DESC"];
@@ -22,7 +21,7 @@ namespace SharedLibraryCore.Commands
             RequiresTarget = true;
             Arguments = new[]
             {
-                new CommandArgument
+                new CommandArgument()
                 {
                     Name = _translationLookup["COMMANDS_ARGUMENT_TAG"],
                     Required = true
@@ -48,4 +47,4 @@ namespace SharedLibraryCore.Commands
             gameEvent.Origin.Tell(_translationLookup["COMMANDS_SET_CLIENT_TAG_SUCCESS"].FormatExt(matchingTag.Value));
         }
     }
-}
+}

SharedLibraryCore/Commands/UnlinkClientCommand.cs

@@ -1,16 +1,16 @@
-using System.Threading.Tasks;
-using Data.Models.Client;
-using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Database.Models;
 using SharedLibraryCore.Interfaces;
+using System.Threading.Tasks;
 
 namespace SharedLibraryCore.Commands
 {
     /// <summary>
-    ///     Provides a way for administrators to "unlink" linked accounts
-    ///     This problem is common in IW4x where the client identifier is a file
-    ///     that is commonly transmitted when uploading and sharing the game files
-    ///     This command creates a new link and assigns the guid, and all aliases with the current IP
-    ///     associated to the provided client ID to the new link
+    /// Provides a way for administrators to "unlink" linked accounts
+    /// This problem is common in IW4x where the client identifier is a file
+    /// that is commonly transmitted when uploading and sharing the game files
+    /// This command creates a new link and assigns the guid, and all aliases with the current IP
+    /// associated to the provided client ID to the new link
     /// </summary>
     public class UnlinkClientCommand : Command
     {
@@ -29,4 +29,4 @@ namespace SharedLibraryCore.Commands
             E.Origin.Tell(_translationLookup["COMMANDS_UNLINK_CLIENT_SUCCESS"].FormatExt(E.Target));
         }
     }
-}
+}

SharedLibraryCore/Commands/UnsetClientTagCommand.cs

@@ -1,8 +1,9 @@
-using System.Threading.Tasks;
-using Data.Models;
-using Data.Models.Client;
-using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Database.Models;
 using SharedLibraryCore.Interfaces;
+using System.Linq;
+using System.Threading.Tasks;
+using Data.Models;
 
 namespace SharedLibraryCore.Commands
 {
@@ -11,8 +12,7 @@ namespace SharedLibraryCore.Commands
         private readonly IMetaService _metaService;
 
 
-        public UnsetClientTagCommand(CommandConfiguration config, ITranslationLookup layout, IMetaService metaService) :
-            base(config, layout)
+        public UnsetClientTagCommand(CommandConfiguration config, ITranslationLookup layout, IMetaService metaService) : base(config, layout)
         {
             Name = "unsetclienttag";
             Description = layout["COMMANDS_UNSET_CLIENT_TAG_DESC"];
@@ -21,7 +21,7 @@ namespace SharedLibraryCore.Commands
             RequiresTarget = true;
             Arguments = new[]
             {
-                new CommandArgument
+                new CommandArgument()
                 {
                     Name = _translationLookup["COMMANDS_ARGUMENT_TAG"],
                     Required = true
@@ -38,4 +38,4 @@ namespace SharedLibraryCore.Commands
             gameEvent.Origin.Tell(_translationLookup["COMMANDS_UNSET_CLIENT_TAG_SUCCESS"]);
         }
     }
-}
+}

SharedLibraryCore/Configuration/ApplicationConfiguration.cs

@@ -1,10 +1,10 @@
-using System;
+using SharedLibraryCore.Configuration.Attributes;
+using SharedLibraryCore.Interfaces;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using Newtonsoft.Json;
-using SharedLibraryCore.Configuration.Attributes;
-using SharedLibraryCore.Interfaces;
 using static Data.Models.Client.EFClient;
 
 namespace SharedLibraryCore.Configuration
@@ -12,9 +12,8 @@ namespace SharedLibraryCore.Configuration
     public class ApplicationConfiguration : IBaseConfiguration
     {
         [ConfigurationIgnore]
-        public CommunityInformationConfiguration CommunityInformation { get; set; } =
-            new CommunityInformationConfiguration();
-
+        public CommunityInformationConfiguration CommunityInformation { get; set; } = new CommunityInformationConfiguration();
+            
         [LocalizedDisplayName("SETUP_ENABLE_WEBFRONT")]
         [ConfigurationLinked("WebfrontBindUrl", "ManualWebfrontUrl", "WebfrontPrimaryColor", "WebfrontSecondaryColor",
             "WebfrontCustomBranding")]
@@ -39,7 +38,8 @@ namespace SharedLibraryCore.Configuration
         [LocalizedDisplayName("WEBFRONT_CONFIGURATION_CUSTOM_BRANDING")]
         public string WebfrontCustomBranding { get; set; }
 
-        [ConfigurationIgnore] public WebfrontConfiguration Webfront { get; set; } = new WebfrontConfiguration();
+        [ConfigurationIgnore]
+        public WebfrontConfiguration Webfront { get; set; } = new WebfrontConfiguration();
 
         [LocalizedDisplayName("SETUP_ENABLE_MULTIOWN")]
         public bool EnableMultipleOwners { get; set; }
@@ -116,7 +116,8 @@ namespace SharedLibraryCore.Configuration
         [LocalizedDisplayName("WEBFRONT_CONFIGURATION_ENABLE_COLOR_CODES")]
         public bool EnableColorCodes { get; set; }
 
-        [ConfigurationIgnore] public string IngameAccentColorKey { get; set; } = "Cyan";
+        [ConfigurationIgnore] 
+        public string IngameAccentColorKey { get; set; } = "Cyan";
 
         [LocalizedDisplayName("WEBFRONT_CONFIGURATION_AUTOMESSAGE_PERIOD")]
         public int AutoMessagePeriod { get; set; }
@@ -134,8 +135,7 @@ namespace SharedLibraryCore.Configuration
         public int MapChangeDelaySeconds { get; set; } = 5;
 
         [LocalizedDisplayName("WEBFRONT_CONFIGURATION_BAN_DURATIONS")]
-        public TimeSpan[] BanDurations { get; set; } =
-        {
+        public TimeSpan[] BanDurations { get; set; } = {
             TimeSpan.FromHours(1),
             TimeSpan.FromHours(6),
             TimeSpan.FromDays(1),
@@ -147,38 +147,36 @@ namespace SharedLibraryCore.Configuration
         [ConfigurationIgnore]
         [LocalizedDisplayName("WEBFRONT_CONFIGURATION_PRESET_BAN_REASONS")]
         public Dictionary<string, string> PresetPenaltyReasons { get; set; } = new Dictionary<string, string>
-            { { "afk", "Away from keyboard" }, { "ci", "Connection interrupted. Reconnect" } };
-
-        [LocalizedDisplayName("WEBFRONT_CONFIGURATION_ENABLE_PRIVILEGED_USER_PRIVACY")]
+            {{"afk", "Away from keyboard"}, {"ci", "Connection interrupted. Reconnect"}};
+        [LocalizedDisplayName(("WEBFRONT_CONFIGURATION_ENABLE_PRIVILEGED_USER_PRIVACY"))]
         public bool EnablePrivilegedUserPrivacy { get; set; }
 
-        [ConfigurationIgnore] public bool EnableImplicitAccountLinking { get; set; } = false;
+        [ConfigurationIgnore]
+        public bool EnableImplicitAccountLinking { get; set; } = false;
 
-        [ConfigurationIgnore] public TimeSpan MaxClientHistoryTime { get; set; } = TimeSpan.FromHours(12);
+        [ConfigurationIgnore] 
+        public TimeSpan MaxClientHistoryTime { get; set; } = TimeSpan.FromHours(12);
 
-        [ConfigurationIgnore] public TimeSpan ServerDataCollectionInterval { get; set; } = TimeSpan.FromMinutes(5);
+        [ConfigurationIgnore] 
+        public TimeSpan ServerDataCollectionInterval { get; set; } = TimeSpan.FromMinutes(5);
 
         public int ServerConnectionAttempts { get; set; } = 6;
-
+        
         [ConfigurationIgnore]
         public Dictionary<Permission, string> OverridePermissionLevelNames { get; set; } = Enum
             .GetValues(typeof(Permission))
             .Cast<Permission>()
             .ToDictionary(perm => perm, perm => perm.ToString());
-
-        [UIHint("ServerConfiguration")] public ServerConfiguration[] Servers { get; set; }
+        [UIHint("ServerConfiguration")] 
+        public ServerConfiguration[] Servers { get; set; }
 
         [ConfigurationIgnore] public int MinimumNameLength { get; set; } = 3;
         [ConfigurationIgnore] public string Id { get; set; }
         [ConfigurationIgnore] public string SubscriptionId { get; set; }
-
         [Obsolete("Moved to DefaultSettings")]
-        [ConfigurationIgnore]
-        public MapConfiguration[] Maps { get; set; }
-
+        [ConfigurationIgnore] public MapConfiguration[] Maps { get; set; }
         [Obsolete("Moved to DefaultSettings")]
-        [ConfigurationIgnore]
-        public QuickMessageConfiguration[] QuickMessages { get; set; }
+        [ConfigurationIgnore] public QuickMessageConfiguration[] QuickMessages { get; set; }
 
         [ConfigurationIgnore]
         [JsonIgnore]
@@ -194,30 +192,30 @@ namespace SharedLibraryCore.Configuration
             var loc = Utilities.CurrentLocalization.LocalizationIndex;
             Id = Guid.NewGuid().ToString();
 
-            EnableWebFront = loc["SETUP_ENABLE_WEBFRONT"].PromptBool();
-            EnableMultipleOwners = loc["SETUP_ENABLE_MULTIOWN"].PromptBool();
-            EnableSteppedHierarchy = loc["SETUP_ENABLE_STEPPEDPRIV"].PromptBool();
-            EnableCustomSayName = loc["SETUP_ENABLE_CUSTOMSAY"].PromptBool();
+            EnableWebFront = Utilities.PromptBool(loc["SETUP_ENABLE_WEBFRONT"]);
+            EnableMultipleOwners = Utilities.PromptBool(loc["SETUP_ENABLE_MULTIOWN"]);
+            EnableSteppedHierarchy = Utilities.PromptBool(loc["SETUP_ENABLE_STEPPEDPRIV"]);
+            EnableCustomSayName = Utilities.PromptBool(loc["SETUP_ENABLE_CUSTOMSAY"]);
 
-            var useCustomParserEncoding = loc["SETUP_USE_CUSTOMENCODING"].PromptBool();
+            bool useCustomParserEncoding = Utilities.PromptBool(loc["SETUP_USE_CUSTOMENCODING"]);
             if (useCustomParserEncoding)
             {
-                CustomParserEncoding = loc["SETUP_ENCODING_STRING"].PromptString();
+                CustomParserEncoding = Utilities.PromptString(loc["SETUP_ENCODING_STRING"]);
             }
 
             WebfrontBindUrl = "http://0.0.0.0:1624";
 
             if (EnableCustomSayName)
             {
-                CustomSayName = loc["SETUP_SAY_NAME"].PromptString();
+                CustomSayName = Utilities.PromptString(loc["SETUP_SAY_NAME"]);
             }
 
-            EnableSocialLink = loc["SETUP_DISPLAY_SOCIAL"].PromptBool();
+            EnableSocialLink = Utilities.PromptBool(loc["SETUP_DISPLAY_SOCIAL"]);
 
             if (EnableSocialLink)
             {
-                SocialLinkTitle = loc["SETUP_SOCIAL_TITLE"].PromptString();
-                SocialLinkAddress = loc["SETUP_SOCIAL_LINK"].PromptString();
+                SocialLinkTitle = Utilities.PromptString(loc["SETUP_SOCIAL_TITLE"]);
+                SocialLinkAddress = Utilities.PromptString(loc["SETUP_SOCIAL_LINK"]);
             }
 
             RConPollRate = 5000;

SharedLibraryCore/Configuration/Attributes/ConfigurationIgnore.cs

@@ -1,9 +1,11 @@
 using System;
+using System.Collections.Generic;
+using System.Text;
 
 namespace SharedLibraryCore.Configuration.Attributes
 {
-    [AttributeUsage(AttributeTargets.Property)]
+    [AttributeUsage(AttributeTargets.Property, Inherited = false)]
     public class ConfigurationIgnore : Attribute
     {
     }
-}
+}

SharedLibraryCore/Configuration/Attributes/ConfigurationLinked.cs

@@ -2,14 +2,14 @@
 
 namespace SharedLibraryCore.Configuration.Attributes
 {
-    [AttributeUsage(AttributeTargets.Property)]
+    [AttributeUsage(AttributeTargets.Property, Inherited = false)]
     public class ConfigurationLinked : Attribute
     {
+        public string[] LinkedPropertyNames { get; set; }
+
         public ConfigurationLinked(params string[] linkedPropertyNames)
         {
             LinkedPropertyNames = linkedPropertyNames;
         }
-
-        public string[] LinkedPropertyNames { get; set; }
     }
-}
+}

SharedLibraryCore/Configuration/Attributes/ConfigurationOptional.cs

@@ -1,9 +1,11 @@
 using System;
+using System.Collections.Generic;
+using System.Text;
 
 namespace SharedLibraryCore.Configuration.Attributes
 {
-    [AttributeUsage(AttributeTargets.Property)]
+    [AttributeUsage(AttributeTargets.Property, Inherited = false)]
     public class ConfigurationOptional : Attribute
     {
     }
-}
+}

SharedLibraryCore/Configuration/Attributes/LocalizedDisplayName.cs

@@ -1,11 +1,13 @@
-using System.ComponentModel;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Text;
 
 namespace SharedLibraryCore.Configuration.Attributes
 {
-    internal class LocalizedDisplayName : DisplayNameAttribute
+    class LocalizedDisplayName : DisplayNameAttribute
     {
         private readonly string _localizationKey;
-
         public LocalizedDisplayName(string localizationKey)
         {
             _localizationKey = localizationKey;
@@ -13,4 +15,4 @@ namespace SharedLibraryCore.Configuration.Attributes
 
         public override string DisplayName => Utilities.CurrentLocalization.LocalizationIndex[_localizationKey];
     }
-}
+}

SharedLibraryCore/Configuration/CommandConfiguration.cs

@@ -1,29 +1,28 @@
-using System;
+using SharedLibraryCore.Interfaces;
+using System;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
-using SharedLibraryCore.Interfaces;
 
 namespace SharedLibraryCore.Configuration
 {
     /// <summary>
-    ///     Basic command configuration
+    /// Basic command configuration
     /// </summary>
     public class CommandConfiguration : IBaseConfiguration
     {
         /// <summary>
-        ///     Dict of command class names mapped to configurable properties
+        /// Dict of command class names mapped to configurable properties
         /// </summary>
-        public Dictionary<string, CommandProperties> Commands { get; set; } =
-            new Dictionary<string, CommandProperties>();
+        public Dictionary<string, CommandProperties> Commands { get; set; } = new Dictionary<string, CommandProperties>();
 
         /// <summary>
-        ///     prefix indicated the chat message is a command
+        /// prefix indicated the chat message is a command
         /// </summary>
         [JsonIgnore]
         public string CommandPrefix { get; set; }
 
         /// <summary>
-        ///     prefix indicating that the chat message is a broadcast command
+        /// prefix indicating that the chat message is a broadcast command
         /// </summary>
         [JsonIgnore]
         public string BroadcastCommandPrefix { get; set; }
@@ -33,9 +32,6 @@ namespace SharedLibraryCore.Configuration
             throw new NotImplementedException();
         }
 
-        public string Name()
-        {
-            return nameof(CommandConfiguration);
-        }
+        public string Name() => nameof(CommandConfiguration);
     }
-}
+}

SharedLibraryCore/Configuration/CommandProperties.cs

@@ -6,35 +6,35 @@ using static SharedLibraryCore.Server;
 namespace SharedLibraryCore.Configuration
 {
     /// <summary>
-    ///     Config driven command properties
+    /// Config driven command properties
     /// </summary>
     public class CommandProperties
     {
         /// <summary>
-        ///     Specifies the command name
+        /// Specifies the command name
         /// </summary>
         public string Name { get; set; }
 
         /// <summary>
-        ///     Alias of this command
+        /// Alias of this command
         /// </summary>
         public string Alias { get; set; }
 
         /// <summary>
-        ///     Specifies the minimum permission level needed to execute the
+        /// Specifies the minimum permission level needed to execute the 
         /// </summary>
         [JsonConverter(typeof(StringEnumConverter))]
         public Permission MinimumPermission { get; set; }
 
         /// <summary>
-        ///     Indicates if the command can be run by another user (impersonation)
+        /// Indicates if the command can be run by another user (impersonation)
         /// </summary>
         public bool AllowImpersonation { get; set; }
 
         /// <summary>
-        ///     Specifies the games supporting the functionality of the command
+        /// Specifies the games supporting the functionality of the command
         /// </summary>
         [JsonProperty(ItemConverterType = typeof(StringEnumConverter))]
         public Game[] SupportedGames { get; set; } = new Game[0];
     }
-}
+}

SharedLibraryCore/Configuration/CommunityInformationConfiguration.cs

@@ -1,12 +1,12 @@
-namespace SharedLibraryCore.Configuration
+using System.Linq;
+
+namespace SharedLibraryCore.Configuration
 {
     public class CommunityInformationConfiguration
     {
         public string Name { get; set; } = "IW4MAdmin - Configure In IW4MAdminSettings.json";
-
         public string Description { get; set; } =
             "IW4MAdmin is an administration tool for IW4x, Pluto T6, Pluto IW5, CoD4x, TeknoMW3, and most Call of Duty® dedicated servers. It allows complete control of your server; from changing maps, to banning players, IW4MAdmin monitors and records activity on your server(s). With plugin support, extending its functionality is a breeze.";
-
         public bool EnableBanner { get; set; } = true;
 
         public SocialAccountConfiguration[] SocialAccounts { get; set; } =

SharedLibraryCore/Configuration/DefaultSettings.cs

@@ -8,18 +8,12 @@ namespace SharedLibraryCore.Configuration
         public string[] GlobalRules { get; set; }
         public MapConfiguration[] Maps { get; set; }
         public GametypeConfiguration[] Gametypes { get; set; }
-        public QuickMessageConfiguration[] QuickMessages { get; set; }
+        public QuickMessageConfiguration[] QuickMessages {get; set;}
         public string[] DisallowedClientNames { get; set; }
         public GameStringConfiguration GameStrings { get; set; }
 
-        public IBaseConfiguration Generate()
-        {
-            return this;
-        }
+        public IBaseConfiguration Generate() => this;
 
-        public string Name()
-        {
-            return "DefaultConfiguration";
-        }
+        public string Name() => "DefaultConfiguration";
     }
-}
+}

SharedLibraryCore/Configuration/Extensions/ConfigurationExtensions.cs

@@ -1,10 +1,10 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Net;
 using System.Net.NetworkInformation;
 using System.Net.Sockets;
-using System.Runtime.InteropServices;
 using System.Text.RegularExpressions;
 using Microsoft.Win32;
 using SharedLibraryCore.Interfaces;
@@ -43,11 +43,6 @@ namespace SharedLibraryCore.Configuration.Extensions
             string searchPath = null;
             var isRegistryKey = parser.Configuration.DefaultInstallationDirectoryHint.Contains("HKEY_");
 
-            if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-            {
-                return null;
-            }
-
             try
             {
                 if (isRegistryKey)
@@ -56,10 +51,10 @@ namespace SharedLibraryCore.Configuration.Extensions
 
                     if (result == null)
                     {
-                        return Array.Empty<(string, string)>();
+                        return new (string, string)[0];
                     }
 
-                    searchPath = Path.Combine(result.ToString()!.Split(Path.DirectorySeparatorChar)
+                    searchPath = Path.Combine(result.ToString().Split(Path.DirectorySeparatorChar)
                         .Where(p => !p.Contains(".exe"))
                         .Select(p => p.Replace("\"", "")).ToArray());
                 }
@@ -77,14 +72,14 @@ namespace SharedLibraryCore.Configuration.Extensions
 
                 if (string.IsNullOrEmpty(searchPath))
                 {
-                    return Array.Empty<(string, string)>();
+                    return new (string, string)[0];
                 }
 
                 var possibleFiles = Directory.GetFiles(searchPath, "*.cfg", SearchOption.AllDirectories);
 
                 if (!possibleFiles.Any())
                 {
-                    return Array.Empty<(string, string)>();
+                    return new (string, string)[0];
                 }
 
                 var possiblePasswords = possibleFiles.SelectMany(File.ReadAllLines)
@@ -100,8 +95,8 @@ namespace SharedLibraryCore.Configuration.Extensions
             }
             catch
             {
-                return Array.Empty<(string, string)>();
+                return new (string, string)[0];
             }
         }
     }
-}
+}

SharedLibraryCore/Configuration/GametypeConfiguration.cs

@@ -5,4 +5,4 @@
         public Server.Game Game { get; set; }
         public Gametype[] Gametypes { get; set; }
     }
-}
+}

SharedLibraryCore/Configuration/MapConfiguration.cs

@@ -5,4 +5,4 @@
         public Server.Game Game { get; set; }
         public Map[] Maps { get; set; }
     }
-}
+}

SharedLibraryCore/Configuration/QuickMessageConfiguration.cs

@@ -1,4 +1,6 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.Text;
 using static SharedLibraryCore.Server;
 
 namespace SharedLibraryCore.Configuration
@@ -8,4 +10,4 @@ namespace SharedLibraryCore.Configuration
         public Game Game { get; set; }
         public Dictionary<string, string> Messages { get; set; }
     }
-}
+}

SharedLibraryCore/Configuration/ServerConfiguration.cs

@@ -1,24 +1,14 @@
-using System;
+using SharedLibraryCore.Configuration.Attributes;
+using SharedLibraryCore.Interfaces;
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using SharedLibraryCore.Configuration.Attributes;
 using SharedLibraryCore.Configuration.Extensions;
-using SharedLibraryCore.Interfaces;
 
 namespace SharedLibraryCore.Configuration
 {
     public class ServerConfiguration : IBaseConfiguration
     {
-        private readonly IList<IRConParser> _rconParsers;
-        private IRConParser _selectedParser;
-
-        public ServerConfiguration()
-        {
-            _rconParsers = new List<IRConParser>();
-            Rules = new string[0];
-            AutoMessages = new string[0];
-        }
-
         [LocalizedDisplayName("WEBFRONT_CONFIGURATION_SERVER_IP")]
         public string IPAddress { get; set; }
 
@@ -55,74 +45,14 @@ namespace SharedLibraryCore.Configuration
         [ConfigurationOptional]
         public string CustomHostname { get; set; }
 
-        public IBaseConfiguration Generate()
+        private readonly IList<IRConParser> _rconParsers;
+        private IRConParser _selectedParser;
+
+        public ServerConfiguration()
         {
-            ModifyParsers();
-            var loc = Utilities.CurrentLocalization.LocalizationIndex;
-            var shouldTryFindIp = loc["SETUP_SERVER_IP_AUTO"].PromptBool(defaultValue: true);
-
-            if (shouldTryFindIp)
-            {
-                this.TrySetIpAddress();
-                Console.WriteLine(loc["SETUP_SERVER_IP_AUTO_RESULT"].FormatExt(IPAddress));
-            }
-
-            else
-            {
-                while (string.IsNullOrEmpty(IPAddress))
-                {
-                    var input = loc["SETUP_SERVER_IP"].PromptString();
-                    IPAddress = input;
-                }
-            }
-
-            var defaultPort = _selectedParser.Configuration.DefaultRConPort;
-            Port = loc["SETUP_SERVER_PORT"].PromptInt(null, 1, ushort.MaxValue, defaultPort);
-
-            if (!string.IsNullOrEmpty(_selectedParser.Configuration.DefaultInstallationDirectoryHint))
-            {
-                var shouldTryFindPassword = loc["SETUP_RCON_PASSWORD_AUTO"].PromptBool(defaultValue: true);
-
-                if (shouldTryFindPassword)
-                {
-                    var passwords = _selectedParser.TryGetRConPasswords();
-                    if (passwords.Length > 1)
-                    {
-                        var (index, value) =
-                            loc["SETUP_RCON_PASSWORD_PROMPT"].PromptSelection(loc["SETUP_RCON_PASSWORD_MANUAL"], null,
-                                passwords.Select(pw =>
-                                        $"{pw.Item1}{(string.IsNullOrEmpty(pw.Item2) ? "" : "        " + pw.Item2)}")
-                                    .ToArray());
-
-                        if (index > 0)
-                        {
-                            Password = passwords[index - 1].Item1;
-                        }
-                    }
-
-                    else if (passwords.Length > 0)
-                    {
-                        Password = passwords[0].Item1;
-                        Console.WriteLine(loc["SETUP_RCON_PASSWORD_RESULT"].FormatExt(Password));
-                    }
-                }
-            }
-
-            if (string.IsNullOrEmpty(Password))
-            {
-                Password = loc["SETUP_SERVER_RCON"].PromptString();
-            }
-
-            AutoMessages = new string[0];
+            _rconParsers = new List<IRConParser>();
             Rules = new string[0];
-            ManualLogPath = null;
-
-            return this;
-        }
-
-        public string Name()
-        {
-            return "ServerConfiguration";
+            AutoMessages = new string[0];
         }
 
         public void AddRConParser(IRConParser parser)
@@ -147,8 +77,8 @@ namespace SharedLibraryCore.Configuration
             }
 
             _selectedParser = _rconParsers.FirstOrDefault(p => p.Name == parser);
-            RConParserVersion = _selectedParser?.Name;
-            EventParserVersion = _selectedParser?.Name;
+            RConParserVersion = _selectedParser?.Version;
+            EventParserVersion = _selectedParser?.Version;
 
             if (index <= 0 || _rconParsers[index].CanGenerateLogPath)
             {
@@ -158,5 +88,74 @@ namespace SharedLibraryCore.Configuration
             Console.WriteLine(loc["SETUP_SERVER_NO_LOG"]);
             ManualLogPath = loc["SETUP_SERVER_LOG_PATH"].PromptString();
         }
+
+        public IBaseConfiguration Generate()
+        {
+            ModifyParsers();
+            var loc = Utilities.CurrentLocalization.LocalizationIndex;
+            var shouldTryFindIp = loc["SETUP_SERVER_IP_AUTO"].PromptBool(defaultValue: true);
+
+            if (shouldTryFindIp)
+            {
+                this.TrySetIpAddress();
+                Console.WriteLine(loc["SETUP_SERVER_IP_AUTO_RESULT"].FormatExt(IPAddress));
+            }
+
+            else
+            {
+                while (string.IsNullOrEmpty(IPAddress))
+                {
+                    var input = loc["SETUP_SERVER_IP"].PromptString();
+                    IPAddress = input;
+                }
+            }
+
+            var defaultPort = _selectedParser.Configuration.DefaultRConPort;
+            Port = loc["SETUP_SERVER_PORT"].PromptInt(null, 1, ushort.MaxValue, defaultValue:defaultPort);
+
+            if (!string.IsNullOrEmpty(_selectedParser.Configuration.DefaultInstallationDirectoryHint))
+            {
+                var shouldTryFindPassword = loc["SETUP_RCON_PASSWORD_AUTO"].PromptBool(defaultValue: true);
+
+                if (shouldTryFindPassword)
+                {
+                    var passwords = _selectedParser.TryGetRConPasswords();
+                    if (passwords.Length > 1)
+                    {
+                        var (index, value) =
+                            loc["SETUP_RCON_PASSWORD_PROMPT"].PromptSelection(loc["SETUP_RCON_PASSWORD_MANUAL"], null,
+                                passwords.Select(pw =>
+                                    $"{pw.Item1}{(string.IsNullOrEmpty(pw.Item2) ? "" : "        " + pw.Item2)}").ToArray());
+
+                        if (index > 0)
+                        {
+                            Password = passwords[index - 1].Item1;
+                        }
+                    }
+
+                    else if (passwords.Length > 0)
+                    {
+                        Password = passwords[0].Item1;
+                        Console.WriteLine(loc["SETUP_RCON_PASSWORD_RESULT"].FormatExt(Password));
+                    }
+                }
+            }
+  
+            if (string.IsNullOrEmpty(Password))
+            {
+                Password = loc["SETUP_SERVER_RCON"].PromptString();
+            }
+
+            AutoMessages = new string[0];
+            Rules = new string[0];
+            ManualLogPath = null;
+
+            return this;
+        }
+
+        public string Name()
+        {
+            return "ServerConfiguration";
+        }
     }
-}
+}

SharedLibraryCore/Configuration/Validation/ApplicationConfigurationValidator.cs

@@ -1,12 +1,11 @@
-using System;
+using FluentValidation;
+using System;
 using System.Linq;
-using System.Net;
-using FluentValidation;
 
 namespace SharedLibraryCore.Configuration.Validation
 {
     /// <summary>
-    ///     Validation class for main application configuration
+    /// Validation class for main application configuration
     /// </summary>
     public class ApplicationConfigurationValidator : AbstractValidator<ApplicationConfiguration>
     {
@@ -24,27 +23,27 @@ namespace SharedLibraryCore.Configuration.Validation
                 .When(_app => _app.EnableSocialLink);
 
             RuleFor(_app => _app.SocialLinkTitle)
-                .NotEmpty()
-                .When(_app => _app.EnableSocialLink);
+               .NotEmpty()
+               .When(_app => _app.EnableSocialLink);
 
             RuleFor(_app => _app.CustomParserEncoding)
-                .NotEmpty()
-                .When(_app => _app.EnableCustomParserEncoding);
+              .NotEmpty()
+              .When(_app => _app.EnableCustomParserEncoding);
 
             RuleFor(_app => _app.WebfrontConnectionWhitelist)
                 .NotEmpty()
                 .When(_app => _app.EnableWebfrontConnectionWhitelist);
 
             RuleForEach(_app => _app.WebfrontConnectionWhitelist)
-                .Must(_address => IPAddress.TryParse(_address, out _));
+                .Must(_address => System.Net.IPAddress.TryParse(_address, out _));
 
             RuleFor(_app => _app.CustomLocale)
-                .NotEmpty()
-                .When(_app => _app.EnableCustomLocale);
+              .NotEmpty()
+              .When(_app => _app.EnableCustomLocale);
 
             RuleFor(_app => _app.DatabaseProvider)
-                .NotEmpty()
-                .Must(_provider => new[] { "sqlite", "mysql", "postgresql" }.Contains(_provider));
+                  .NotEmpty()
+                  .Must(_provider => new[] { "sqlite", "mysql", "postgresql" }.Contains(_provider));
 
             RuleFor(_app => _app.ConnectionString)
                 .NotEmpty()
@@ -80,4 +79,4 @@ namespace SharedLibraryCore.Configuration.Validation
                 .SetValidator(new ServerConfigurationValidator());
         }
     }
-}
+}