fix introduced bug :)

- reset recoil state on map change
- refactor config
- remove m21 from chest detection
- allow ignored client ids

.github/FUNDING.yml

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

.gitignore

@@ -221,10 +221,12 @@ DEPLOY
 global.min.css
 global.min.js
 bootstrap-custom.min.css
+bootstrap-custom.css
 **/Master/static
 **/Master/dev_env
 /WebfrontCore/Views/Plugins/*
 /WebfrontCore/wwwroot/**/dds
+/WebfrontCore/wwwroot/images/radar/*
 
 /DiscordWebhook/env
 /DiscordWebhook/config.dev.json
@@ -234,3 +236,11 @@ launchSettings.json
 /Plugins/ScriptPlugins/VpnDetectionPrivate.js
 **/Master/env_master
 /GameLogServer/log_env
+**/*.css
+/Master/master/persistence
+/WebfrontCore/wwwroot/fonts
+/WebfrontCore/wwwroot/font
+/Plugins/Tests/TestSourceFiles
+/Tests/ApplicationTests/Files/GameEvents.json
+/Tests/ApplicationTests/Files/replay.json
+/GameLogServer/game_log_server_env

Application/API/GameLogServer/IGameLogServer.cs

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

Application/API/GameLogServer/LogInfo.cs

@@ -13,5 +13,7 @@ namespace IW4MAdmin.Application.API.GameLogServer
         public int Length { get; set; }
         [JsonProperty("data")]
         public string Data { get; set; }
+        [JsonProperty("next_key")]
+        public string NextKey { get; set; }
     }
 }

Application/API/Master/ApiInstance.cs

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

Application/API/Master/Heartbeat.cs

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

Application/API/Master/IMasterApi.cs

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

Application/Application.csproj

@@ -2,16 +2,15 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <RuntimeFrameworkVersion>2.2.2</RuntimeFrameworkVersion>
     <MvcRazorExcludeRefAssembliesFromPublish>false</MvcRazorExcludeRefAssembliesFromPublish>
     <PackageId>RaidMax.IW4MAdmin.Application</PackageId>
-    <Version>2.2.6.5</Version>
+    <Version>2.3.2.0</Version>
     <Authors>RaidMax</Authors>
     <Company>Forever None</Company>
     <Product>IW4MAdmin</Product>
     <Description>IW4MAdmin is a complete server administration tool for IW4x and most Call of Duty® dedicated servers</Description>
-    <Copyright>2019</Copyright>
+    <Copyright>2020</Copyright>
     <PackageLicenseUrl>https://github.com/RaidMax/IW4M-Admin/blob/master/LICENSE</PackageLicenseUrl>
     <PackageProjectUrl>https://raidmax.org/IW4MAdmin</PackageProjectUrl>
     <RepositoryUrl>https://github.com/RaidMax/IW4M-Admin</RepositoryUrl>
@@ -21,28 +20,39 @@
     <Configurations>Debug;Release;Prerelease</Configurations>
     <Win32Resource />
     <RootNamespace>IW4MAdmin.Application</RootNamespace>
+    <PublishWithAspNetCoreTargetManifest>false</PublishWithAspNetCoreTargetManifest>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="RestEase" Version="1.4.7" />
+    <PackageReference Include="Jint" Version="3.0.0-beta-1632" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.5.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.7">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.7" />
+    <PackageReference Include="RestEase" Version="1.5.0" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.1" />
   </ItemGroup>
 
   <PropertyGroup>
-    <ServerGarbageCollection>true</ServerGarbageCollection>
+    <ServerGarbageCollection>false</ServerGarbageCollection>
+    <ConcurrentGarbageCollection>true</ConcurrentGarbageCollection>
     <TieredCompilation>true</TieredCompilation>
-    <AssemblyVersion>2.2.6.5</AssemblyVersion>
+    <LangVersion>Latest</LangVersion>
-    <FileVersion>2.2.6.5</FileVersion>
+    <StartupObject></StartupObject>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Prerelease|AnyCPU'">
+    <ErrorReport>none</ErrorReport>
+    <DebugType>full</DebugType>
+    <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\SharedLibraryCore\SharedLibraryCore.csproj">
       <Private>true</Private>
     </ProjectReference>
-    <ProjectReference Include="..\WebfrontCore\WebfrontCore.csproj">
+    <ProjectReference Include="..\WebfrontCore\WebfrontCore.csproj" />
-      <Private>true</Private>
-      <CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
-    </ProjectReference>
   </ItemGroup>
 
   <ItemGroup>
@@ -51,22 +61,18 @@
     </None>
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Update="Microsoft.NETCore.App" Version="2.2.2" />
-  </ItemGroup>
-
   <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
-    <Exec Command="call $(ProjectDir)BuildScripts\PreBuild.bat $(ProjectDir)..\ $(ProjectDir) $(TargetDir) $(OutDir)" />
+    <Exec Command="if $(ConfigurationName) == Debug call $(ProjectDir)BuildScripts\PreBuild.bat $(ProjectDir)..\ $(ProjectDir) $(TargetDir) $(OutDir)" />
   </Target>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">
     <GetAssemblyIdentity AssemblyFiles="$(TargetPath)">
       <Output TaskParameter="Assemblies" ItemName="CurrentAssembly" />
     </GetAssemblyIdentity>
-    <Exec Command="call $(ProjectDir)BuildScripts\PostBuild.bat $(ProjectDir)..\ $(ProjectDir) $(TargetDir) $(OutDir) %(CurrentAssembly.Version)" />
+    <Exec Command="if $(ConfigurationName) == Debug call $(ProjectDir)BuildScripts\PostBuild.bat $(ProjectDir)..\ $(ProjectDir) $(TargetDir) $(OutDir) %25(CurrentAssembly.Version)" />
   </Target>
 
   <Target Name="PostPublish" AfterTargets="Publish">
-    <Exec Command="call $(ProjectDir)BuildScripts\PostPublish.bat $(ProjectDir)..\ $(ProjectDir) $(TargetDir) $(ConfigurationName)" />
+    <Exec Command="if $(ConfigurationName) == Debug call $(ProjectDir)BuildScripts\PostPublish.bat $(ProjectDir)..\ $(ProjectDir) $(TargetDir) $(ConfigurationName)" />
   </Target>
 </Project>

Application/ApplicationManager.cs

@@ -1,96 +1,118 @@
 using IW4MAdmin.Application.API.Master;
 using IW4MAdmin.Application.EventParsers;
+using IW4MAdmin.Application.Extensions;
 using IW4MAdmin.Application.Misc;
 using IW4MAdmin.Application.RconParsers;
 using SharedLibraryCore;
 using SharedLibraryCore.Commands;
 using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Configuration.Validation;
 using SharedLibraryCore.Database;
 using SharedLibraryCore.Database.Models;
 using SharedLibraryCore.Dtos;
-using SharedLibraryCore.Events;
 using SharedLibraryCore.Exceptions;
 using SharedLibraryCore.Helpers;
 using SharedLibraryCore.Interfaces;
-using SharedLibraryCore.Objects;
+using SharedLibraryCore.QueryHelper;
 using SharedLibraryCore.Services;
 using System;
+using System.Collections;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using static SharedLibraryCore.GameEvent;
 
 namespace IW4MAdmin.Application
 {
     public class ApplicationManager : IManager
     {
-        private List<Server> _servers;
+        private readonly ConcurrentBag<Server> _servers;
         public List<Server> Servers => _servers.OrderByDescending(s => s.ClientNum).ToList();
-        public Dictionary<int, EFClient> PrivilegedClients { get; set; }
         public ILogger Logger => GetLogger(0);
-        public bool Running { get; private set; }
+        public bool IsRunning { get; private set; }
         public bool IsInitialized { get; private set; }
-        // define what the delagate function looks like
-        public delegate void OnServerEventEventHandler(object sender, GameEventArgs e);
-        // expose the event handler so we can execute the events
-        public OnServerEventEventHandler OnServerEvent { get; set; }
         public DateTime StartTime { get; private set; }
         public string Version => Assembly.GetEntryAssembly().GetName().Version.ToString();
 
         public IList<IRConParser> AdditionalRConParsers { get; }
         public IList<IEventParser> AdditionalEventParsers { get; }
-        public ITokenAuthentication TokenAuthenticator => Authenticator;
+        public ITokenAuthentication TokenAuthenticator { get; }
-        public ITokenAuthentication Authenticator => _authenticator;
+        public CancellationToken CancellationToken => _tokenSource.Token;
         public string ExternalIPAddress { get; private set; }
-
+        public bool IsRestartRequested { get; private set; }
-        static ApplicationManager Instance;
+        public IMiddlewareActionHandler MiddlewareActionHandler { get; }
-        readonly List<AsyncStatus> TaskStatuses;
+        public event EventHandler<GameEvent> OnGameEventExecuted;
-        List<Command> Commands;
+        private readonly List<IManagerCommand> _commands;
-        readonly List<MessageToken> MessageTokens;
+        private readonly ILogger _logger;
-        ClientService ClientSvc;
+        private readonly List<MessageToken> MessageTokens;
+        private readonly ClientService ClientSvc;
         readonly AliasService AliasSvc;
         readonly PenaltyService PenaltySvc;
-        public BaseConfigurationHandler<ApplicationConfiguration> ConfigHandler;
+        public IConfigurationHandler<ApplicationConfiguration> ConfigHandler;
-        GameEventHandler Handler;
-        ManualResetEventSlim OnQuit;
         readonly IPageList PageList;
-        readonly SemaphoreSlim ProcessingEvent = new SemaphoreSlim(1, 1);
+        private readonly Dictionary<long, ILogger> _loggers = new Dictionary<long, ILogger>();
-        readonly Dictionary<long, ILogger> Loggers = new Dictionary<long, ILogger>();
+        private readonly IMetaService _metaService;
-        readonly ITokenAuthentication _authenticator;
-        private readonly MetaService _metaService;
         private readonly TimeSpan _throttleTimeout = new TimeSpan(0, 1, 0);
+        private readonly CancellationTokenSource _tokenSource;
+        private readonly Dictionary<string, Task<IList>> _operationLookup = new Dictionary<string, Task<IList>>();
+        private readonly ITranslationLookup _translationLookup;
+        private readonly IConfigurationHandler<CommandConfiguration> _commandConfiguration;
+        private readonly IGameServerInstanceFactory _serverInstanceFactory;
+        private readonly IParserRegexFactory _parserRegexFactory;
+        private readonly IEnumerable<IRegisterEvent> _customParserEvents;
+        private readonly IEventHandler _eventHandler;
+        private readonly IScriptCommandFactory _scriptCommandFactory;
+        private readonly IMetaRegistration _metaRegistration;
+        private readonly IScriptPluginServiceResolver _scriptPluginServiceResolver;
 
-        private ApplicationManager()
+        public ApplicationManager(ILogger logger, IMiddlewareActionHandler actionHandler, IEnumerable<IManagerCommand> commands,
+            ITranslationLookup translationLookup, IConfigurationHandler<CommandConfiguration> commandConfiguration,
+            IConfigurationHandler<ApplicationConfiguration> appConfigHandler, IGameServerInstanceFactory serverInstanceFactory,
+            IEnumerable<IPlugin> plugins, IParserRegexFactory parserRegexFactory, IEnumerable<IRegisterEvent> customParserEvents,
+            IEventHandler eventHandler, IScriptCommandFactory scriptCommandFactory, IDatabaseContextFactory contextFactory, IMetaService metaService,
+            IMetaRegistration metaRegistration, IScriptPluginServiceResolver scriptPluginServiceResolver)
         {
-            _servers = new List<Server>();
+            MiddlewareActionHandler = actionHandler;
-            Commands = new List<Command>();
+            _servers = new ConcurrentBag<Server>();
-            TaskStatuses = new List<AsyncStatus>();
             MessageTokens = new List<MessageToken>();
-            ClientSvc = new ClientService();
+            ClientSvc = new ClientService(contextFactory);
             AliasSvc = new AliasService();
             PenaltySvc = new PenaltyService();
-            ConfigHandler = new BaseConfigurationHandler<ApplicationConfiguration>("IW4MAdminSettings");
+            ConfigHandler = appConfigHandler;
             StartTime = DateTime.UtcNow;
-            OnQuit = new ManualResetEventSlim();
             PageList = new PageList();
-            AdditionalEventParsers = new List<IEventParser>();
+            AdditionalEventParsers = new List<IEventParser>() { new BaseEventParser(parserRegexFactory, logger, appConfigHandler.Configuration()) };
-            AdditionalRConParsers = new List<IRConParser>();
+            AdditionalRConParsers = new List<IRConParser>() { new BaseRConParser(parserRegexFactory) };
-            OnServerEvent += OnGameEvent;
+            TokenAuthenticator = new TokenAuthentication();
-            OnServerEvent += EventApi.OnGameEvent;
+            _logger = logger;
-            _authenticator = new TokenAuthentication();
+            _metaService = metaService;
-            _metaService = new MetaService();
+            _tokenSource = new CancellationTokenSource();
+            _loggers.Add(0, logger);
+            _commands = commands.ToList();
+            _translationLookup = translationLookup;
+            _commandConfiguration = commandConfiguration;
+            _serverInstanceFactory = serverInstanceFactory;
+            _parserRegexFactory = parserRegexFactory;
+            _customParserEvents = customParserEvents;
+            _eventHandler = eventHandler;
+            _scriptCommandFactory = scriptCommandFactory;
+            _metaRegistration = metaRegistration;
+            _scriptPluginServiceResolver = scriptPluginServiceResolver;
+            Plugins = plugins;
         }
 
-        private async void OnGameEvent(object sender, GameEventArgs args)
+        public IEnumerable<IPlugin> Plugins { get; }
+
+        public async Task ExecuteEvent(GameEvent newEvent)
         {
 #if DEBUG == true
-            Logger.WriteDebug($"Entering event process for {args.Event.Id}");
+            Logger.WriteDebug($"Entering event process for {newEvent.Id}");
 #endif
 
-            var newEvent = args.Event;
-
             // the event has failed already
             if (newEvent.Failed)
             {
@@ -103,44 +125,58 @@ namespace IW4MAdmin.Application
 
                 // save the event info to the database
                 var changeHistorySvc = new ChangeHistoryService();
-                await changeHistorySvc.Add(args.Event);
+                await changeHistorySvc.Add(newEvent);
 
 #if DEBUG
                 Logger.WriteDebug($"Processed event with id {newEvent.Id}");
 #endif
             }
 
+            catch (TaskCanceledException)
+            {
+                Logger.WriteInfo($"Received quit signal for event id {newEvent.Id}, so we are aborting early");
+            }
+
+            catch (OperationCanceledException)
+            {
+                Logger.WriteInfo($"Received quit signal for event id {newEvent.Id}, so we are aborting early");
+            }
+
             // this happens if a plugin requires login
             catch (AuthorizationException ex)
             {
-                newEvent.FailReason = GameEvent.EventFailReason.Permission;
+                newEvent.FailReason = EventFailReason.Permission;
                 newEvent.Origin.Tell($"{Utilities.CurrentLocalization.LocalizationIndex["COMMAND_NOTAUTHORIZED"]} - {ex.Message}");
             }
 
             catch (NetworkException ex)
             {
-                newEvent.FailReason = GameEvent.EventFailReason.Exception;
+                newEvent.FailReason = EventFailReason.Exception;
                 Logger.WriteError(ex.Message);
                 Logger.WriteDebug(ex.GetExceptionInfo());
             }
 
             catch (ServerException ex)
             {
-                newEvent.FailReason = GameEvent.EventFailReason.Exception;
+                newEvent.FailReason = EventFailReason.Exception;
                 Logger.WriteWarning(ex.Message);
             }
 
             catch (Exception ex)
             {
-                newEvent.FailReason = GameEvent.EventFailReason.Exception;
+                newEvent.FailReason = EventFailReason.Exception;
                 Logger.WriteError(Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_EXCEPTION"].FormatExt(newEvent.Owner));
                 Logger.WriteDebug(ex.GetExceptionInfo());
             }
 
         skip:
-
             // tell anyone waiting for the output that we're done
-            newEvent.OnProcessed.Set();
+            newEvent.Complete();
+            OnGameEventExecuted?.Invoke(this, newEvent);
+
+#if DEBUG == true
+            Logger.WriteDebug($"Exiting event process for {newEvent.Id}");
+#endif
         }
 
         public IList<Server> GetServers()
@@ -148,22 +184,17 @@ namespace IW4MAdmin.Application
             return Servers;
         }
 
-        public IList<Command> GetCommands()
+        public IList<IManagerCommand> GetCommands()
         {
-            return Commands;
+            return _commands;
         }
 
-        public static ApplicationManager GetInstance()
+        public async Task UpdateServerStates()
-        {
-            return Instance ?? (Instance = new ApplicationManager());
-        }
-
-        public async Task UpdateServerStates(CancellationToken token)
         {
             // store the server hash code and task for it
             var runningUpdateTasks = new Dictionary<long, Task>();
 
-            while (Running)
+            while (!_tokenSource.IsCancellationRequested)
             {
                 // select the server ids that have completed the update task
                 var serverTasksToRemove = runningUpdateTasks
@@ -194,10 +225,11 @@ namespace IW4MAdmin.Application
                     {
                         try
                         {
-                            await server.ProcessUpdatesAsync(token);
+                            await server.ProcessUpdatesAsync(_tokenSource.Token);
+
                             if (server.Throttled)
                             {
-                                await Task.Delay((int)_throttleTimeout.TotalMilliseconds);
+                                await Task.Delay((int)_throttleTimeout.TotalMilliseconds, _tokenSource.Token);
                             }
                         }
 
@@ -221,31 +253,57 @@ namespace IW4MAdmin.Application
 #endif
                 try
                 {
-                    await Task.Delay(ConfigHandler.Configuration().RConPollRate, token);
+                    await Task.Delay(ConfigHandler.Configuration().RConPollRate, _tokenSource.Token);
+                }
+                // if a cancellation is received, we want to return immediately after shutting down
+                catch
+                {
+                    foreach (var server in Servers.Where(s => serverIds.Contains(s.EndPoint)))
+                    {
+                        await server.ProcessUpdatesAsync(_tokenSource.Token);
+                    }
+                    break;
                 }
-                // if a cancellation is received, we want to return immediately
-                catch { break; }
             }
         }
 
         public async Task Init()
         {
-            Running = true;
+            IsRunning = true;
             ExternalIPAddress = await Utilities.GetExternalIP();
 
             #region PLUGINS
-            SharedLibraryCore.Plugins.PluginImporter.Load(this);
+            foreach (var plugin in Plugins)
-
-            foreach (var Plugin in SharedLibraryCore.Plugins.PluginImporter.ActivePlugins)
             {
                 try
                 {
-                    await Plugin.OnLoadAsync(this);
+                    if (plugin is ScriptPlugin scriptPlugin)
+                    {
+                        await scriptPlugin.Initialize(this, _scriptCommandFactory, _scriptPluginServiceResolver);
+                        scriptPlugin.Watcher.Changed += async (sender, e) =>
+                        {
+                            try
+                            {
+                                await scriptPlugin.Initialize(this, _scriptCommandFactory, _scriptPluginServiceResolver);
+                            }
+
+                            catch (Exception ex)
+                            {
+                                Logger.WriteError(Utilities.CurrentLocalization.LocalizationIndex["PLUGIN_IMPORTER_ERROR"].FormatExt(scriptPlugin.Name));
+                                Logger.WriteDebug(ex.Message);
+                            }
+                        };
+                    }
+
+                    else
+                    {
+                        await plugin.OnLoadAsync(this);
+                    }
                 }
 
                 catch (Exception ex)
                 {
-                    Logger.WriteError($"{Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_PLUGIN"]} {Plugin.Name}");
+                    Logger.WriteError($"{_translationLookup["SERVER_ERROR_PLUGIN"]} {plugin.Name}");
                     Logger.WriteDebug(ex.GetExceptionInfo());
                 }
             }
@@ -270,7 +328,7 @@ namespace IW4MAdmin.Application
                 if (newConfig.Servers == null)
                 {
                     ConfigHandler.Set(newConfig);
-                    newConfig.Servers = new List<ServerConfiguration>();
+                    newConfig.Servers = new ServerConfiguration[1];
 
                     do
                     {
@@ -285,8 +343,8 @@ namespace IW4MAdmin.Application
                             serverConfig.AddEventParser(parser);
                         }
 
-                        newConfig.Servers.Add((ServerConfiguration)serverConfig.Generate());
+                        newConfig.Servers = newConfig.Servers.Where(_servers => _servers != null).Append((ServerConfiguration)serverConfig.Generate()).ToArray();
-                    } while (Utilities.PromptBool(Utilities.CurrentLocalization.LocalizationIndex["SETUP_SERVER_SAVE"]));
+                    } while (Utilities.PromptBool(_translationLookup["SETUP_SERVER_SAVE"]));
 
                     config = newConfig;
                     await ConfigHandler.Save();
@@ -307,6 +365,18 @@ namespace IW4MAdmin.Application
                     await ConfigHandler.Save();
                 }
 
+                var validator = new ApplicationConfigurationValidator();
+                var validationResult = validator.Validate(config);
+
+                if (!validationResult.IsValid)
+                {
+                    throw new ConfigurationException("MANAGER_CONFIGURATION_ERROR")
+                    {
+                        Errors = validationResult.Errors.Select(_error => _error.ErrorMessage).ToArray(),
+                        ConfigurationFileName = ConfigHandler.FileName
+                    };
+                }
+
                 foreach (var serverConfig in config.Servers)
                 {
                     Migration.ConfigurationMigration.ModifyLogPath020919(serverConfig);
@@ -329,7 +399,7 @@ namespace IW4MAdmin.Application
                 }
             }
 
-            if (config.Servers.Count == 0)
+            if (config.Servers.Length == 0)
             {
                 throw new ServerException("A server configuration in IW4MAdminSettings.json is invalid");
             }
@@ -345,203 +415,81 @@ namespace IW4MAdmin.Application
             {
                 await new ContextSeed(db).Seed();
             }
-
-            PrivilegedClients = (await ClientSvc.GetPrivilegedClients()).ToDictionary(_client => _client.ClientId);
             #endregion
 
             #region COMMANDS
-            if (ClientSvc.GetOwners().Result.Count == 0)
+            if (ClientSvc.GetOwners().Result.Count > 0)
             {
-                Commands.Add(new COwner());
+                _commands.RemoveAll(_cmd => _cmd.GetType() == typeof(OwnerCommand));
             }
 
-            Commands.Add(new CQuit());
+            List<IManagerCommand> commandsToAddToConfig = new List<IManagerCommand>();
-            Commands.Add(new CKick());
+            var cmdConfig = _commandConfiguration.Configuration();
-            Commands.Add(new CSay());
-            Commands.Add(new CTempBan());
-            Commands.Add(new CBan());
-            Commands.Add(new CWhoAmI());
-            Commands.Add(new CList());
-            Commands.Add(new CHelp());
-            Commands.Add(new CFastRestart());
-            Commands.Add(new CMapRotate());
-            Commands.Add(new CSetLevel());
-            Commands.Add(new CUsage());
-            Commands.Add(new CUptime());
-            Commands.Add(new CWarn());
-            Commands.Add(new CWarnClear());
-            Commands.Add(new CUnban());
-            Commands.Add(new CListAdmins());
-            Commands.Add(new CLoadMap());
-            Commands.Add(new CFindPlayer());
-            Commands.Add(new CListRules());
-            Commands.Add(new CPrivateMessage());
-            Commands.Add(new CFlag());
-            Commands.Add(new CUnflag());
-            Commands.Add(new CReport());
-            Commands.Add(new CListReports());
-            Commands.Add(new CListBanInfo());
-            Commands.Add(new CListAlias());
-            Commands.Add(new CExecuteRCON());
-            Commands.Add(new CPlugins());
-            Commands.Add(new CIP());
-            Commands.Add(new CMask());
-            Commands.Add(new CPruneAdmins());
-            Commands.Add(new CKillServer());
-            Commands.Add(new CSetPassword());
-            Commands.Add(new CPing());
-            Commands.Add(new CSetGravatar());
-            Commands.Add(new CNextMap());
-            Commands.Add(new RequestTokenCommand());
 
-            foreach (Command C in SharedLibraryCore.Plugins.PluginImporter.ActiveCommands)
+            if (cmdConfig == null)
             {
-                Commands.Add(C);
+                cmdConfig = new CommandConfiguration();
+                commandsToAddToConfig.AddRange(_commands);
+            }
+
+            else
+            {
+                var unsavedCommands = _commands.Where(_cmd => !cmdConfig.Commands.Keys.Contains(_cmd.CommandConfigNameForType()));
+                commandsToAddToConfig.AddRange(unsavedCommands);
+            }
+
+            // this is because I want to store the command prefix in IW4MAdminSettings, but can't easily
+            // inject it to all the places that need it
+            cmdConfig.CommandPrefix = config.CommandPrefix;
+            cmdConfig.BroadcastCommandPrefix = config.BroadcastCommandPrefix;
+
+            foreach (var cmd in commandsToAddToConfig)
+            {
+                cmdConfig.Commands.Add(cmd.CommandConfigNameForType(),
+                new CommandProperties()
+                {
+                    Name = cmd.Name,
+                    Alias = cmd.Alias,
+                    MinimumPermission = cmd.Permission,
+                    AllowImpersonation = cmd.AllowImpersonation,
+                    SupportedGames = cmd.SupportedGames
+                });
+            }
+
+            _commandConfiguration.Set(cmdConfig);
+            await _commandConfiguration.Save();
+            #endregion
+
+            _metaRegistration.Register();
+
+            #region CUSTOM_EVENTS
+            foreach (var customEvent in _customParserEvents.SelectMany(_events => _events.Events))
+            {
+                foreach (var parser in AdditionalEventParsers)
+                {
+                    parser.RegisterCustomEvent(customEvent.Item1, customEvent.Item2, customEvent.Item3);
+                }
             }
             #endregion
 
-            #region META
+            await InitializeServers();
-            async Task<List<ProfileMeta>> getProfileMeta(int clientId, int offset, int count, DateTime? startAt)
+        }
-            {
-                var metaList = new List<ProfileMeta>();
 
-                // we don't want to return anything because it means we're trying to retrieve paged meta data
+        private async Task InitializeServers()
-                if (count > 1)
+        {
-                {
+            var config = ConfigHandler.Configuration();
-                    return metaList;
-                }
-
-                var lastMapMeta = await _metaService.GetPersistentMeta("LastMapPlayed", new EFClient() { ClientId = clientId });
-
-                if (lastMapMeta != null)
-                {
-                    metaList.Add(new ProfileMeta()
-                    {
-                        Id = lastMapMeta.MetaId,
-                        Key = Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_CLIENT_META_LAST_MAP"],
-                        Value = lastMapMeta.Value,
-                        Show = true,
-                        Type = ProfileMeta.MetaType.Information,
-                    });
-                }
-
-                var lastServerMeta = await _metaService.GetPersistentMeta("LastServerPlayed", new EFClient() { ClientId = clientId });
-
-                if (lastServerMeta != null)
-                {
-                    metaList.Add(new ProfileMeta()
-                    {
-                        Id = lastServerMeta.MetaId,
-                        Key = Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_CLIENT_META_LAST_SERVER"],
-                        Value = lastServerMeta.Value,
-                        Show = true,
-                        Type = ProfileMeta.MetaType.Information
-                    });
-                }
-
-                var client = await GetClientService().Get(clientId);
-
-                metaList.Add(new ProfileMeta()
-                {
-                    Id = client.ClientId,
-                    Key = $"{Utilities.CurrentLocalization.LocalizationIndex["GLOBAL_TIME_HOURS"]} {Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_PROFILE_PLAYER"]}",
-                    Value = Math.Round(client.TotalConnectionTime / 3600.0, 1).ToString("#,##0", new System.Globalization.CultureInfo(Utilities.CurrentLocalization.LocalizationName)),
-                    Show = true,
-                    Column = 1,
-                    Order = 0,
-                    Type = ProfileMeta.MetaType.Information
-                });
-
-                metaList.Add(new ProfileMeta()
-                {
-                    Id = client.ClientId,
-                    Key = Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_PROFILE_FSEEN"],
-                    Value = Utilities.GetTimePassed(client.FirstConnection, false),
-                    Show = true,
-                    Column = 1,
-                    Order = 1,
-                    Type = ProfileMeta.MetaType.Information
-                });
-
-                metaList.Add(new ProfileMeta()
-                {
-                    Id = client.ClientId,
-                    Key = Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_PROFILE_LSEEN"],
-                    Value = Utilities.GetTimePassed(client.LastConnection, false),
-                    Show = true,
-                    Column = 1,
-                    Order = 2,
-                    Type = ProfileMeta.MetaType.Information
-                });
-
-                metaList.Add(new ProfileMeta()
-                {
-                    Id = client.ClientId,
-                    Key = Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_CLIENT_META_CONNECTIONS"],
-                    Value = client.Connections.ToString("#,##0", new System.Globalization.CultureInfo(Utilities.CurrentLocalization.LocalizationName)),
-                    Show = true,
-                    Column = 1,
-                    Order = 3,
-                    Type = ProfileMeta.MetaType.Information
-                });
-
-                metaList.Add(new ProfileMeta()
-                {
-                    Key = Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_CLIENT_META_MASKED"],
-                    Value = client.Masked ? Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_CLIENT_META_TRUE"] : Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_CLIENT_META_FALSE"],
-                    Sensitive = true,
-                    Column = 1,
-                    Order = 4,
-                    Type = ProfileMeta.MetaType.Information
-                });
-
-                return metaList;
-            }
-
-            async Task<List<ProfileMeta>> getPenaltyMeta(int clientId, int offset, int count, DateTime? startAt)
-            {
-                if (count <= 1)
-                {
-                    return new List<ProfileMeta>();
-                }
-
-                var penalties = await GetPenaltyService().GetClientPenaltyForMetaAsync(clientId, count, offset, startAt);
-
-                return penalties.Select(_penalty => new ProfileMeta()
-                {
-                    Id = _penalty.Id,
-                    Type = _penalty.PunisherId == clientId ? ProfileMeta.MetaType.Penalized : ProfileMeta.MetaType.ReceivedPenalty,
-                    Value = _penalty,
-                    When = _penalty.TimePunished,
-                    Sensitive = _penalty.Sensitive
-                })
-                .ToList();
-            }
-
-            MetaService.AddRuntimeMeta(getProfileMeta);
-            MetaService.AddRuntimeMeta(getPenaltyMeta);
-            #endregion
-
-            #region INIT
-            int failedServers = 0;
             int successServers = 0;
             Exception lastException = null;
 
             async Task Init(ServerConfiguration Conf)
             {
-                // setup the event handler after the class is initialized
-
-                Handler = new GameEventHandler(this);
-
                 try
                 {
-                    var ServerInstance = new IW4MServer(this, Conf);
+                    // todo: this might not always be an IW4MServer
+                    var ServerInstance = _serverInstanceFactory.CreateServer(Conf, this) as IW4MServer;
                     await ServerInstance.Initialize();
 
-                    lock (_servers)
+                    _servers.Add(ServerInstance);
-                    {
-                        _servers.Add(ServerInstance);
-                    }
 
                     Logger.WriteVerbose(Utilities.CurrentLocalization.LocalizationIndex["MANAGER_MONITORING_TEXT"].FormatExt(ServerInstance.Hostname));
                     // add the start event for this server
@@ -553,7 +501,7 @@ namespace IW4MAdmin.Application
                         Owner = ServerInstance
                     };
 
-                    Handler.AddEvent(e);
+                    AddEvent(e);
                     successServers++;
                 }
 
@@ -563,143 +511,55 @@ namespace IW4MAdmin.Application
 
                     if (e.GetType() == typeof(DvarException))
                     {
-                        Logger.WriteDebug($"{Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_DVAR"].FormatExt((e as DvarException).Data["dvar_name"])} ({Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_DVAR_HELP"]})");
+                        Logger.WriteDebug($"{e.Message} {(e.GetType() == typeof(DvarException) ? $"({Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_DVAR_HELP"]})" : "")}");
                     }
 
-                    else if (e.GetType() == typeof(NetworkException))
-                    {
-                        Logger.WriteDebug(e.Message);
-                    }
-
-                    failedServers++;
                     lastException = e;
                 }
             }
 
             await Task.WhenAll(config.Servers.Select(c => Init(c)).ToArray());
 
-            if (successServers - failedServers <= 0)
+            if (successServers == 0)
+            {
+                throw lastException;
+            }
+
+            if (successServers != config.Servers.Length)
             {
                 if (!Utilities.PromptBool(Utilities.CurrentLocalization.LocalizationIndex["MANAGER_START_WITH_ERRORS"]))
                 {
                     throw lastException;
                 }
             }
-            #endregion
         }
 
-        private async Task SendHeartbeat(object state)
+        public async Task Start() => await UpdateServerStates();
-        {
-            var heartbeatState = (HeartbeatState)state;
-
-            while (Running)
-            {
-                if (!heartbeatState.Connected)
-                {
-                    try
-                    {
-                        await Heartbeat.Send(this, true);
-                        heartbeatState.Connected = true;
-                    }
-
-                    catch (Exception e)
-                    {
-                        heartbeatState.Connected = false;
-                        Logger.WriteWarning($"Could not connect to heartbeat server - {e.Message}");
-                    }
-                }
-
-                else
-                {
-                    try
-                    {
-                        await Heartbeat.Send(this);
-                    }
-
-                    catch (System.Net.Http.HttpRequestException e)
-                    {
-                        Logger.WriteWarning($"Could not send heartbeat - {e.Message}");
-                    }
-
-                    catch (AggregateException e)
-                    {
-                        Logger.WriteWarning($"Could not send heartbeat - {e.Message}");
-                        var exceptions = e.InnerExceptions.Where(ex => ex.GetType() == typeof(RestEase.ApiException));
-
-                        foreach (var ex in exceptions)
-                        {
-                            if (((RestEase.ApiException)ex).StatusCode == System.Net.HttpStatusCode.Unauthorized)
-                            {
-                                heartbeatState.Connected = false;
-                            }
-                        }
-                    }
-
-                    catch (RestEase.ApiException e)
-                    {
-                        Logger.WriteWarning($"Could not send heartbeat - {e.Message}");
-                        if (e.StatusCode == System.Net.HttpStatusCode.Unauthorized)
-                        {
-                            heartbeatState.Connected = false;
-                        }
-                    }
-                    catch (Exception e)
-                    {
-                        Logger.WriteWarning($"Could not send heartbeat - {e.Message}");
-                    }
-
-                }
-
-                try
-                {
-                    await Task.Delay(30000, heartbeatState.Token);
-                }
-                catch { break; }
-            }
-        }
-
-        public void Start()
-        {
-            var tokenSource = new CancellationTokenSource();
-            // this needs to be run seperately from the main thread
-            _ = Task.Run(() => SendHeartbeat(new HeartbeatState() { Token = tokenSource.Token }));
-            _ = Task.Run(() => UpdateServerStates(tokenSource.Token));
-
-            while (Running)
-            {
-                OnQuit.Wait();
-                tokenSource.Cancel();
-                OnQuit.Reset();
-            }
-        }
 
         public void Stop()
         {
-            Running = false;
+            _tokenSource.Cancel();
-            OnQuit.Set();
+            IsRunning = false;
+        }
+
+        public void Restart()
+        {
+            IsRestartRequested = true;
+            Stop();
         }
 
         public ILogger GetLogger(long serverId)
         {
-            if (Loggers.ContainsKey(serverId))
+            if (_loggers.ContainsKey(serverId))
             {
-                return Loggers[serverId];
+                return _loggers[serverId];
             }
 
             else
             {
-                Logger newLogger;
+                var newLogger = new Logger($"IW4MAdmin-Server-{serverId}");
 
-                if (serverId == 0)
+                _loggers.Add(serverId, newLogger);
-                {
-                    newLogger = new Logger("IW4MAdmin-Manager");
-                }
-                else
-                {
-                    newLogger = new Logger($"IW4MAdmin-Server-{serverId}");
-                }
-
-                Loggers.Add(serverId, newLogger);
                 return newLogger;
             }
         }
@@ -711,7 +571,8 @@ namespace IW4MAdmin.Application
 
         public IList<EFClient> GetActiveClients()
         {
-            return _servers.SelectMany(s => s.Clients).Where(p => p != null).ToList();
+            // we're adding another to list here so we don't get a collection modified exception..
+            return _servers.SelectMany(s => s.Clients).ToList().Where(p => p != null).ToList();
         }
 
         public ClientService GetClientService()
@@ -734,29 +595,9 @@ namespace IW4MAdmin.Application
             return ConfigHandler;
         }
 
-        public IDictionary<int, EFClient> GetPrivilegedClients()
+        public void AddEvent(GameEvent gameEvent)
         {
-            return PrivilegedClients;
+            _eventHandler.HandleEvent(this, gameEvent);
-        }
-
-        public bool ShutdownRequested()
-        {
-            return !Running;
-        }
-
-        public IEventHandler GetEventHandler()
-        {
-            return Handler;
-        }
-
-        public void SetHasEvent()
-        {
-            
-        }
-
-        public IList<Assembly> GetPluginAssemblies()
-        {
-            return SharedLibraryCore.Plugins.PluginImporter.PluginAssemblies.Union(SharedLibraryCore.Plugins.PluginImporter.Assemblies).ToList();
         }
 
         public IPageList GetPageList()
@@ -764,14 +605,43 @@ namespace IW4MAdmin.Application
             return PageList;
         }
 
-        public IRConParser GenerateDynamicRConParser()
+        public IRConParser GenerateDynamicRConParser(string name)
         {
-            return new DynamicRConParser();
+            return new DynamicRConParser(_parserRegexFactory)
+            {
+                Name = name
+            };
         }
 
-        public IEventParser GenerateDynamicEventParser()
+        public IEventParser GenerateDynamicEventParser(string name)
         {
-            return new DynamicEventParser();
+            return new DynamicEventParser(_parserRegexFactory, _logger, ConfigHandler.Configuration())
+            {
+                Name = name
+            };
         }
+
+        public async Task<IList<T>> ExecuteSharedDatabaseOperation<T>(string operationName)
+        {
+            var result = await _operationLookup[operationName];
+            return (IList<T>)result;
+        }
+
+        public void RegisterSharedDatabaseOperation(Task<IList> operation, string operationName)
+        {
+            _operationLookup.Add(operationName, operation);
+        }
+
+        public void AddAdditionalCommand(IManagerCommand command)
+        {
+            if (_commands.Any(_command => _command.Name == command.Name || _command.Alias == command.Alias))
+            {
+                throw new InvalidOperationException($"Duplicate command name or alias ({command.Name}, {command.Alias})");
+            }
+
+            _commands.Add(command);
+        }
+
+        public void RemoveCommandByName(string commandName) => _commands.RemoveAll(_command => _command.Name == commandName);
     }
 }

Application/BuildScripts/DownloadTranslations.ps1

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

Application/BuildScripts/PostBuild.bat

@@ -24,11 +24,4 @@ xcopy /Y "%SolutionDir%BUILD\Plugins" "%SolutionDir%Publish\WindowsPrerelease\Pl
 
 echo Copying script plugins for publish
 xcopy /Y "%SolutionDir%Plugins\ScriptPlugins" "%SolutionDir%Publish\Windows\Plugins\"
-xcopy /Y "%SolutionDir%Plugins\ScriptPlugins" "%SolutionDir%Publish\WindowsPrerelease\Plugins\"
+xcopy /Y "%SolutionDir%Plugins\ScriptPlugins" "%SolutionDir%Publish\WindowsPrerelease\Plugins\"
-
-echo Copying GSC files for publish
-xcopy /Y  "%SolutionDir%_customcallbacks.gsc" "%SolutionDir%Publish\Windows\userraw\scripts\"
-xcopy /Y "%SolutionDir%_customcallbacks.gsc" "%SolutionDir%Publish\WindowsPrerelease\userraw\scripts\"
-
-xcopy /Y "%SolutionDir%_commands.gsc" "%SolutionDir%Publish\Windows\userraw\scripts\"
-xcopy /Y "%SolutionDir%_commands.gsc" "%SolutionDir%Publish\WindowsPrerelease\userraw\scripts\"

Application/BuildScripts/PostPublish.bat

@@ -1,115 +1,45 @@
-set SolutionDir=%1
+set PublishDir=%1
-set ProjectDir=%2
+set SourceDir=%2
-set TargetDir=%3
-set CurrentConfiguration=%4
 SET COPYCMD=/Y
 
-echo Deleting extra language files
+echo deleting extra runtime files
+if exist "%PublishDir%\runtimes\linux-arm" powershell Remove-Item -Force -Recurse '%PublishDir%\runtimes\linux-arm'
+if exist "%PublishDir%\runtimes\linux-arm64" powershell Remove-Item -Force -Recurse '%PublishDir%\runtimes\linux-arm64'
+if exist "%PublishDir%\runtimes\linux-armel" powershell Remove-Item -Force -Recurse '%PublishDir%\runtimes\linux-armel'
+if exist "%PublishDir%\runtimes\osx" powershell Remove-Item -Force -Recurse '%PublishDir%\runtimes\osx'
+if exist "%PublishDir%\runtimes\osx-x64" powershell Remove-Item -Force -Recurse '%PublishDir%\runtimes\osx-x64'
+if exist "%PublishDir%\runtimes\win-arm" powershell Remove-Item -Force -Recurse '%PublishDir%\runtimes\win-arm'
+if exist "%PublishDir%\runtimes\win-arm64" powershell Remove-Item -Force -Recurse '%PublishDir%\runtimes\win-arm64'
+if exist "%PublishDir%\runtimes\alpine-x64" powershell Remove-Item -Force -Recurse '%PublishDir%\runtimes\alpine-x64'
+if exist "%PublishDir%\runtimes\linux-musl-x64" powershell Remove-Item -Force -Recurse '%PublishDir%\runtimes\linux-musl-x64'
 
-if exist  "%SolutionDir%Publish\Windows\en-US\" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\Windows\en-US'
+echo deleting misc files
-if exist  "%SolutionDir%Publish\Windows\de\" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\Windows\de'
+if exist "%PublishDir%\web.config" del "%PublishDir%\web.config"
-if exist "%SolutionDir%Publish\Windows\es\" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\Windows\es'
+if exist "%PublishDir%\libman.json" del "%PublishDir%\libman.json"
-if exist "%SolutionDir%Publish\Windows\fr\" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\Windows\fr'
+del "%PublishDir%\*.exe"
-if exist "%SolutionDir%Publish\Windows\it\" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\Windows\it'
+del "%PublishDir%\*.pdb"
-if exist "%SolutionDir%Publish\Windows\ja\" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\Windows\ja'
-if exist "%SolutionDir%Publish\Windows\ko\" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\Windows\ko'
-if exist "%SolutionDir%Publish\Windows\ru\" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\Windows\ru'
-if exist "%SolutionDir%Publish\Windows\zh-Hans\" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\Windows\zh-Hans'
-if exist "%SolutionDir%Publish\Windows\zh-Hant\" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\Windows\zh-Hant'
 
-if exist  "%SolutionDir%Publish\WindowsPrerelease\en-US\" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\WindowsPrerelease\en-US'
+echo setting up default folders
-if exist  "%SolutionDir%Publish\WindowsPrerelease\de\" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\WindowsPrerelease\de'
+if not exist "%PublishDir%\Configuration" md "%PublishDir%\Configuration"
-if exist "%SolutionDir%Publish\WindowsPrerelease\es\" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\WindowsPrerelease\es'
+move "%PublishDir%\DefaultSettings.json" "%PublishDir%\Configuration\"
-if exist "%SolutionDir%Publish\WindowsPrerelease\fr\" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\WindowsPrerelease\fr'
+if not exist "%PublishDir%\Lib\" md "%PublishDir%\Lib\"
-if exist "%SolutionDir%Publish\WindowsPrerelease\it\" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\WindowsPrerelease\it'
+move "%PublishDir%\*.dll" "%PublishDir%\Lib\"
-if exist "%SolutionDir%Publish\WindowsPrerelease\ja\" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\WindowsPrerelease\ja'
+move "%PublishDir%\*.json" "%PublishDir%\Lib\"
-if exist "%SolutionDir%Publish\WindowsPrerelease\ko\" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\WindowsPrerelease\ko'
+move "%PublishDir%\runtimes" "%PublishDir%\Lib\runtimes"
-if exist "%SolutionDir%Publish\WindowsPrerelease\ru\" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\WindowsPrerelease\ru'
+move "%PublishDir%\ru" "%PublishDir%\Lib\ru"
-if exist "%SolutionDir%Publish\WindowsPrerelease\zh-Hans\" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\WindowsPrerelease\zh-Hans'
+move "%PublishDir%\de" "%PublishDir%\Lib\de"
-if exist "%SolutionDir%Publish\WindowsPrerelease\zh-Hant\" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\WindowsPrerelease\zh-Hant'
+move "%PublishDir%\pt" "%PublishDir%\Lib\pt"
-
+move "%PublishDir%\es" "%PublishDir%\Lib\es"
-echo Deleting extra runtime files
+if exist "%PublishDir%\refs" move "%PublishDir%\refs" "%PublishDir%\Lib\refs"
-if exist "%SolutionDir%Publish\Windows\runtimes\linux-arm" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\Windows\runtimes\linux-arm'
-if exist "%SolutionDir%Publish\Windows\runtimes\linux-arm64" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\Windows\runtimes\linux-arm64'
-if exist "%SolutionDir%Publish\Windows\runtimes\linux-armel" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\Windows\runtimes\linux-armel'
-
-if exist "%SolutionDir%Publish\Windows\runtimes\osx" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\Windows\runtimes\osx'
-if exist "%SolutionDir%Publish\Windows\runtimes\osx-x64" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\Windows\runtimes\osx-x64'
-
-if exist "%SolutionDir%Publish\Windows\runtimes\win-arm" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\Windows\runtimes\win-arm'
-if exist "%SolutionDir%Publish\Windows\runtimes\win-arm64" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\Windows\runtimes\win-arm64'
-
-if exist "%SolutionDir%Publish\WindowsPrerelease\runtimes\linux-arm" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\WindowsPrerelease\runtimes\linux-arm'
-if exist "%SolutionDir%Publish\WindowsPrerelease\runtimes\linux-arm64" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\WindowsPrerelease\runtimes\linux-arm64'
-if exist "%SolutionDir%Publish\WindowsPrerelease\runtimes\linux-armel" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\WindowsPrerelease\runtimes\linux-armel'
-
-if exist "%SolutionDir%Publish\WindowsPrerelease\runtimes\osx" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\WindowsPrerelease\runtimes\osx'
-if exist "%SolutionDir%Publish\WindowsPrerelease\runtimes\osx-x64" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\WindowsPrerelease\runtimes\osx-x64'
-
-if exist "%SolutionDir%Publish\WindowsPrerelease\runtimes\win-arm" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\WindowsPrerelease\runtimes\win-arm'
-if exist "%SolutionDir%Publish\WindowsPrerelease\runtimes\win-arm64" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\WindowsPrerelease\runtimes\win-arm64'
-
-echo Deleting misc files
-if exist "%SolutionDir%Publish\Windows\web.config" del "%SolutionDir%Publish\Windows\web.config"
-del "%SolutionDir%Publish\Windows\*pdb"
-
-if exist "%SolutionDir%Publish\WindowsPrerelease\web.config" del "%SolutionDir%Publish\WindowsPrerelease\web.config"
-del "%SolutionDir%Publish\WindowsPrerelease\*pdb"
-
-echo setting up library folders
-
-if "%CurrentConfiguration%" == "Prerelease" (
-	echo PR-Config
-	if not exist  "%SolutionDir%Publish\WindowsPrerelease\Configuration" md "%SolutionDir%Publish\WindowsPrerelease\Configuration"
-	move "%SolutionDir%Publish\WindowsPrerelease\DefaultSettings.json" "%SolutionDir%Publish\WindowsPrerelease\Configuration\"
-)
-
-if "%CurrentConfiguration%" == "Release" (
-	echo R-Config
-	if not exist  "%SolutionDir%Publish\Windows\Configuration" md "%SolutionDir%Publish\Windows\Configuration"
-	if exist "%SolutionDir%Publish\Windows\DefaultSettings.json" move "%SolutionDir%Publish\Windows\DefaultSettings.json" "%SolutionDir%Publish\Windows\Configuration\DefaultSettings.json"
-)
-
-if "%CurrentConfiguration%" == "Prerelease" (
-	echo PR-LIB
-	if not exist "%SolutionDir%Publish\WindowsPrerelease\Lib\" md "%SolutionDir%Publish\WindowsPrerelease\Lib\"
-	move "%SolutionDir%Publish\WindowsPrerelease\*.dll" "%SolutionDir%Publish\WindowsPrerelease\Lib\"
-	move "%SolutionDir%Publish\WindowsPrerelease\*.json" "%SolutionDir%Publish\WindowsPrerelease\Lib\"
-)
-
-if "%CurrentConfiguration%" == "Release" (
-	echo R-LIB
-	if not exist "%SolutionDir%Publish\Windows\Lib\" md "%SolutionDir%Publish\Windows\Lib\"
-	move "%SolutionDir%Publish\Windows\*.dll" "%SolutionDir%Publish\Windows\Lib\"
-	move "%SolutionDir%Publish\Windows\*.json" "%SolutionDir%Publish\Windows\Lib\"
-)
-
-if "%CurrentConfiguration%" == "Prerelease" (
-	echo PR-RT
-	move "%SolutionDir%Publish\WindowsPrerelease\runtimes" "%SolutionDir%Publish\WindowsPrerelease\Lib\runtimes"
-	if exist "%SolutionDir%Publish\WindowsPrerelease\refs" move "%SolutionDir%Publish\WindowsPrerelease\refs" "%SolutionDir%Publish\WindowsPrerelease\Lib\refs"
-)
-
-
-if "%CurrentConfiguration%" == "Release" (
-	echo R-RT
-	move "%SolutionDir%Publish\Windows\runtimes" "%SolutionDir%Publish\Windows\Lib\runtimes"
-	if exist "%SolutionDir%Publish\Windows\refs" move "%SolutionDir%Publish\Windows\refs" "%SolutionDir%Publish\Windows\Lib\refs"
-)
-
-if "%CurrentConfiguration%" == "Prerelease" (
-	echo PR-LOC
-	if not exist  "%SolutionDir%Publish\WindowsPrerelease\Localization" md "%SolutionDir%Publish\WindowsPrerelease\Localization"
-)
-
-if "%CurrentConfiguration%" == "Release" (
-	echo R-LOC
-	if not exist  "%SolutionDir%Publish\Windows\Localization" md "%SolutionDir%Publish\Windows\Localization"
-)
 
 echo making start scripts
-@(echo @echo off && echo @title IW4MAdmin && echo dotnet Lib\IW4MAdmin.dll && echo pause) > "%SolutionDir%Publish\WindowsPrerelease\StartIW4MAdmin.cmd"
+@(echo @echo off && echo @title IW4MAdmin && echo set DOTNET_CLI_TELEMETRY_OPTOUT=1 && echo dotnet Lib\IW4MAdmin.dll && echo pause) > "%PublishDir%\StartIW4MAdmin.cmd"
-@(echo @echo off && echo @title IW4MAdmin && echo dotnet Lib\IW4MAdmin.dll && echo pause) > "%SolutionDir%Publish\Windows\StartIW4MAdmin.cmd"
+@(echo #!/bin/bash&& echo export DOTNET_CLI_TELEMETRY_OPTOUT=1&& echo dotnet Lib/IW4MAdmin.dll) > "%PublishDir%\StartIW4MAdmin.sh"
 
-@(echo #!/bin/bash && echo dotnet Lib/IW4MAdmin.dll) > "%SolutionDir%Publish\WindowsPrerelease\StartIW4MAdmin.sh"
+echo moving front-end library dependencies
-@(echo #!/bin/bash && echo dotnet Lib/IW4MAdmin.dll) > "%SolutionDir%Publish\Windows\StartIW4MAdmin.sh"
+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"
+
+echo setting permissions...
+cacls "%PublishDir%" /t /e /p Everyone:F

Application/BuildScripts/PreBuild.bat

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

Application/DefaultSettings.json

@@ -16,7 +16,7 @@
     "Keep grenade launcher use to a minimum",
     "Balance teams at ALL times"
   ],
-  "DisallowedClientNames": ["Unknown Soldier", "VickNet", "UnknownSoldier", "CHEATER"],
+  "DisallowedClientNames": [ "Unknown Soldier", "VickNet", "UnknownSoldier", "CHEATER", "Play77" ],
   "QuickMessages": [
     {
       "Game": "IW4",
@@ -517,6 +517,10 @@
           "Alias": "Hanoi",
           "Name": "mp_hanoi"
         },
+        {
+          "Alias": "Havana",
+          "Name":  "mp_cairo"
+        },
         {
           "Alias": "Hazard",
           "Name": "mp_golfcourse"

Application/EventParsers/BaseEventParser.cs

@@ -1,42 +1,51 @@
 using SharedLibraryCore;
+using SharedLibraryCore.Configuration;
 using SharedLibraryCore.Database.Models;
 using SharedLibraryCore.Interfaces;
 using System;
+using System.Collections.Generic;
 using System.Linq;
-using System.Text.RegularExpressions;
 using static SharedLibraryCore.Server;
 
 namespace IW4MAdmin.Application.EventParsers
 {
-    class BaseEventParser : IEventParser
+    public class BaseEventParser : IEventParser
     {
-        public BaseEventParser()
+        private readonly Dictionary<string, (string, Func<string, IEventParserConfiguration, GameEvent, GameEvent>)> _customEventRegistrations;
+        private readonly ILogger _logger;
+        private readonly ApplicationConfiguration _appConfig;
+
+        public BaseEventParser(IParserRegexFactory parserRegexFactory, ILogger logger, ApplicationConfiguration appConfig)
         {
-            Configuration = new DynamicEventParserConfiguration()
+            _customEventRegistrations = new Dictionary<string, (string, Func<string, IEventParserConfiguration, GameEvent, GameEvent>)>();
+            _logger = logger;
+            _appConfig = appConfig;
+
+            Configuration = new DynamicEventParserConfiguration(parserRegexFactory)
             {
                 GameDirectory = "main",
             };
 
-            Configuration.Say.Pattern = @"^(say|sayteam);(-?[A-Fa-f0-9_]{1,32});([0-9]+);(.+);(.*)$";
+            Configuration.Say.Pattern = @"^(say|sayteam);(-?[A-Fa-f0-9_]{1,32}|bot[0-9]+|0);([0-9]+);([^;]*);(.*)$";
             Configuration.Say.AddMapping(ParserRegex.GroupType.EventType, 1);
             Configuration.Say.AddMapping(ParserRegex.GroupType.OriginNetworkId, 2);
             Configuration.Say.AddMapping(ParserRegex.GroupType.OriginClientNumber, 3);
             Configuration.Say.AddMapping(ParserRegex.GroupType.OriginName, 4);
             Configuration.Say.AddMapping(ParserRegex.GroupType.Message, 5);
 
-            Configuration.Quit.Pattern = @"^(Q);(-?[A-Fa-f0-9_]{1,32}|bot[0-9]+);([0-9]+);(.*)$";
+            Configuration.Quit.Pattern = @"^(Q);(-?[A-Fa-f0-9_]{1,32}|bot[0-9]+|0);([0-9]+);(.*)$";
             Configuration.Quit.AddMapping(ParserRegex.GroupType.EventType, 1);
             Configuration.Quit.AddMapping(ParserRegex.GroupType.OriginNetworkId, 2);
             Configuration.Quit.AddMapping(ParserRegex.GroupType.OriginClientNumber, 3);
             Configuration.Quit.AddMapping(ParserRegex.GroupType.OriginName, 4);
 
-            Configuration.Join.Pattern = @"^(J);(-?[A-Fa-f0-9_]{1,32}|bot[0-9]+);([0-9]+);(.*)$";
+            Configuration.Join.Pattern = @"^(J);(-?[A-Fa-f0-9_]{1,32}|bot[0-9]+|0);([0-9]+);(.*)$";
             Configuration.Join.AddMapping(ParserRegex.GroupType.EventType, 1);
             Configuration.Join.AddMapping(ParserRegex.GroupType.OriginNetworkId, 2);
             Configuration.Join.AddMapping(ParserRegex.GroupType.OriginClientNumber, 3);
             Configuration.Join.AddMapping(ParserRegex.GroupType.OriginName, 4);
 
-            Configuration.Damage.Pattern = @"^(D);(-?[A-Fa-f0-9_]{1,32}|bot[0-9]+);(-?[0-9]+);(axis|allies|world);(.{1,24});(-?[A-Fa-f0-9_]{1,32}|bot[0-9]+)?;-?([0-9]+);(axis|allies|world);(.{1,24})?;((?:[0-9]+|[a-z]+|_)+);([0-9]+);((?:[A-Z]|_)+);((?:[a-z]|_)+)$";
+            Configuration.Damage.Pattern = @"^(D);(-?[A-Fa-f0-9_]{1,32}|bot[0-9]+|0);(-?[0-9]+);(axis|allies|world|none)?;([^;]{1,24});(-?[A-Fa-f0-9_]{1,32}|bot[0-9]+|0)?;(-?[0-9]+);(axis|allies|world|none)?;([^;]{1,24})?;((?:[0-9]+|[a-z]+|_|\+)+);([0-9]+);((?:[A-Z]|_)+);((?:[a-z]|_)+)$";
             Configuration.Damage.AddMapping(ParserRegex.GroupType.EventType, 1);
             Configuration.Damage.AddMapping(ParserRegex.GroupType.TargetNetworkId, 2);
             Configuration.Damage.AddMapping(ParserRegex.GroupType.TargetClientNumber, 3);
@@ -51,7 +60,7 @@ namespace IW4MAdmin.Application.EventParsers
             Configuration.Damage.AddMapping(ParserRegex.GroupType.MeansOfDeath, 12);
             Configuration.Damage.AddMapping(ParserRegex.GroupType.HitLocation, 13);
 
-            Configuration.Kill.Pattern = @"^(K);(-?[A-Fa-f0-9_]{1,32}|bot[0-9]+);(-?[0-9]+);(axis|allies|world);(.{1,24});(-?[A-Fa-f0-9_]{1,32}|bot[0-9]+)?;-?([0-9]+);(axis|allies|world);(.{1,24})?;((?:[0-9]+|[a-z]+|_)+);([0-9]+);((?:[A-Z]|_)+);((?:[a-z]|_)+)$";
+            Configuration.Kill.Pattern = @"^(K);(-?[A-Fa-f0-9_]{1,32}|bot[0-9]+|0);(-?[0-9]+);(axis|allies|world|none)?;([^;]{1,24});(-?[A-Fa-f0-9_]{1,32}|bot[0-9]+|0)?;(-?[0-9]+);(axis|allies|world|none)?;([^;]{1,24})?;((?:[0-9]+|[a-z]+|_|\+)+);([0-9]+);((?:[A-Z]|_)+);((?:[a-z]|_)+)$";
             Configuration.Kill.AddMapping(ParserRegex.GroupType.EventType, 1);
             Configuration.Kill.AddMapping(ParserRegex.GroupType.TargetNetworkId, 2);
             Configuration.Kill.AddMapping(ParserRegex.GroupType.TargetClientNumber, 3);
@@ -65,6 +74,8 @@ namespace IW4MAdmin.Application.EventParsers
             Configuration.Kill.AddMapping(ParserRegex.GroupType.Damage, 11);
             Configuration.Kill.AddMapping(ParserRegex.GroupType.MeansOfDeath, 12);
             Configuration.Kill.AddMapping(ParserRegex.GroupType.HitLocation, 13);
+
+            Configuration.Time.Pattern = @"^ *(([0-9]+):([0-9]+) |^[0-9]+ )";
         }
 
         public IEventParserConfiguration Configuration { get; set; }
@@ -75,216 +86,215 @@ namespace IW4MAdmin.Application.EventParsers
 
         public string URLProtocolFormat { get; set; } = "CoD://{{ip}}:{{port}}";
 
-        public virtual GameEvent GetEvent(Server server, string logLine)
+        public string Name { get; set; } = "Call of Duty";
+
+        public virtual GameEvent GenerateGameEvent(string logLine)
         {
-            logLine = Regex.Replace(logLine, @"([0-9]+:[0-9]+ |^[0-9]+ )", "").Trim();
+            var timeMatch = Configuration.Time.PatternMatcher.Match(logLine);
+            int gameTime = 0;
+
+            if (timeMatch.Success)
+            {
+                gameTime = timeMatch
+                    .Values
+                    .Skip(2)
+                    // this converts the timestamp into seconds passed
+                    .Select((_value, index) => int.Parse(_value.ToString()) * (index == 0 ? 60 : 1))
+                    .Sum();
+                // we want to strip the time from the log line
+                logLine = logLine.Substring(timeMatch.Values.First().Length);
+            }
+
             string[] lineSplit = logLine.Split(';');
             string eventType = lineSplit[0];
 
-            if (eventType == "JoinTeam")
-            {
-                var origin = server.GetClientsAsList()
-                    .FirstOrDefault(c => c.NetworkId == lineSplit[1].ConvertLong());
-
-                return new GameEvent()
-                {
-                    Type = GameEvent.EventType.JoinTeam,
-                    Data = logLine,
-                    Origin = origin,
-                    Owner = server
-                };
-            }
-
             if (eventType == "say" || eventType == "sayteam")
             {
-                var matchResult = Regex.Match(logLine, Configuration.Say.Pattern);
+                var matchResult = Configuration.Say.PatternMatcher.Match(logLine);
 
                 if (matchResult.Success)
                 {
-                    string message = matchResult
+                    string message = matchResult.Values[Configuration.Say.GroupMapping[ParserRegex.GroupType.Message]]
-                        .Groups[Configuration.Say.GroupMapping[ParserRegex.GroupType.Message]]
                         .ToString()
                         .Replace("\x15", "")
                         .Trim();
 
-                    var origin = server.GetClientsAsList()
+                    if (message.Length > 0)
-                        .First(c => c.NetworkId == matchResult.Groups[Configuration.Say.GroupMapping[ParserRegex.GroupType.OriginNetworkId]].ToString().ConvertLong());
-
-                    if (message[0] == '!' || message[0] == '@')
                     {
+                        string originIdString = matchResult.Values[Configuration.Say.GroupMapping[ParserRegex.GroupType.OriginNetworkId]].ToString();
+                        string originName = matchResult.Values[Configuration.Say.GroupMapping[ParserRegex.GroupType.OriginName]].ToString();
+
+                        long originId = originIdString.IsBotGuid() ?
+                            originName.GenerateGuidFromString() :
+                            originIdString.ConvertGuidToLong(Configuration.GuidNumberStyle);
+
+                        int clientNumber = int.Parse(matchResult.Values[Configuration.Say.GroupMapping[ParserRegex.GroupType.OriginClientNumber]]);
+
+                        if (message.StartsWith(_appConfig.CommandPrefix) || message.StartsWith(_appConfig.BroadcastCommandPrefix))
+                        {
+                            return new GameEvent()
+                            {
+                                Type = GameEvent.EventType.Command,
+                                Data = message,
+                                Origin = new EFClient() { NetworkId = originId, ClientNumber = clientNumber },
+                                Message = message,
+                                Extra = logLine,
+                                RequiredEntity = GameEvent.EventRequiredEntity.Origin,
+                                GameTime = gameTime,
+                                Source = GameEvent.EventSource.Log
+                            };
+                        }
+
                         return new GameEvent()
                         {
-                            Type = GameEvent.EventType.Command,
+                            Type = GameEvent.EventType.Say,
                             Data = message,
-                            Origin = origin,
+                            Origin = new EFClient() { NetworkId = originId, ClientNumber = clientNumber },
-                            Owner = server,
+                            Message = message,
-                            Message = message
+                            Extra = logLine,
+                            RequiredEntity = GameEvent.EventRequiredEntity.Origin,
+                            GameTime = gameTime,
+                            Source = GameEvent.EventSource.Log
                         };
                     }
-
-                    return new GameEvent()
-                    {
-                        Type = GameEvent.EventType.Say,
-                        Data = message,
-                        Origin = origin,
-                        Owner = server,
-                        Message = message
-                    };
                 }
             }
 
             if (eventType == "K")
             {
-                if (!server.CustomCallback)
+                var match = Configuration.Kill.PatternMatcher.Match(logLine);
+
+                if (match.Success)
                 {
-                    var match = Regex.Match(logLine, Configuration.Kill.Pattern);
+                    string originIdString = match.Values[Configuration.Kill.GroupMapping[ParserRegex.GroupType.OriginNetworkId]].ToString();
+                    string targetIdString = match.Values[Configuration.Kill.GroupMapping[ParserRegex.GroupType.TargetNetworkId]].ToString();
+                    string originName = match.Values[Configuration.Kill.GroupMapping[ParserRegex.GroupType.OriginName]].ToString();
+                    string targetName = match.Values[Configuration.Kill.GroupMapping[ParserRegex.GroupType.TargetName]].ToString();
 
-                    if (match.Success)
+                    long originId = originIdString.IsBotGuid() ?
+                        originName.GenerateGuidFromString() :
+                        originIdString.ConvertGuidToLong(Configuration.GuidNumberStyle, Utilities.WORLD_ID);
+                    long targetId = targetIdString.IsBotGuid() ?
+                        targetName.GenerateGuidFromString() :
+                        targetIdString.ConvertGuidToLong(Configuration.GuidNumberStyle, Utilities.WORLD_ID);
+
+                    int originClientNumber = int.Parse(match.Values[Configuration.Kill.GroupMapping[ParserRegex.GroupType.OriginClientNumber]]);
+                    int targetClientNumber = int.Parse(match.Values[Configuration.Kill.GroupMapping[ParserRegex.GroupType.TargetClientNumber]]);
+
+                    return new GameEvent()
                     {
-                        string originId = match.Groups[Configuration.Kill.GroupMapping[ParserRegex.GroupType.OriginNetworkId]].Value.ToString();
+                        Type = GameEvent.EventType.Kill,
-                        string targetId = match.Groups[Configuration.Kill.GroupMapping[ParserRegex.GroupType.TargetNetworkId]].Value.ToString();
+                        Data = logLine,
-
+                        Origin = new EFClient() { NetworkId = originId, ClientNumber = originClientNumber },
-                        var origin = !string.IsNullOrEmpty(originId) ? server.GetClientsAsList()
+                        Target = new EFClient() { NetworkId = targetId, ClientNumber = targetClientNumber },
-                                .First(c => c.NetworkId == originId.ConvertLong()) :
+                        RequiredEntity = GameEvent.EventRequiredEntity.Origin | GameEvent.EventRequiredEntity.Target,
-                                Utilities.IW4MAdminClient(server);
+                        GameTime = gameTime,
-
+                        Source = GameEvent.EventSource.Log
-                        var target = !string.IsNullOrEmpty(targetId) ? server.GetClientsAsList()
+                    };
-                                .First(c => c.NetworkId == targetId.ConvertLong()) :
-                                Utilities.IW4MAdminClient(server);
-
-                        return new GameEvent()
-                        {
-                            Type = GameEvent.EventType.Kill,
-                            Data = logLine,
-                            Origin = origin,
-                            Target = target,
-                            Owner = server
-                        };
-                    }
                 }
             }
 
-            if (eventType == "ScriptKill")
-            {
-                long originId = lineSplit[1].ConvertLong();
-                long targetId = lineSplit[2].ConvertLong();
-
-                var origin = originId == long.MinValue ? Utilities.IW4MAdminClient(server) :
-                    server.GetClientsAsList().First(c => c.NetworkId == originId);
-                var target = targetId == long.MinValue ? Utilities.IW4MAdminClient(server) :
-                    server.GetClientsAsList().FirstOrDefault(c => c.NetworkId == targetId) ?? Utilities.IW4MAdminClient(server);
-
-                return new GameEvent()
-                {
-                    Type = GameEvent.EventType.ScriptKill,
-                    Data = logLine,
-                    Origin = origin,
-                    Target = target,
-                    Owner = server
-                };
-            }
-
-            if (eventType == "ScriptDamage")
-            {
-                long originId = lineSplit[1].ConvertLong();
-                long targetId = lineSplit[2].ConvertLong();
-
-                var origin = originId == long.MinValue ? Utilities.IW4MAdminClient(server) :
-                    server.GetClientsAsList().First(c => c.NetworkId == originId);
-                var target = targetId == long.MinValue ? Utilities.IW4MAdminClient(server) :
-                    server.GetClientsAsList().FirstOrDefault(c => c.NetworkId == targetId) ?? Utilities.IW4MAdminClient(server);
-
-                return new GameEvent()
-                {
-                    Type = GameEvent.EventType.ScriptDamage,
-                    Data = logLine,
-                    Origin = origin,
-                    Target = target,
-                    Owner = server
-                };
-            }
-
-            // damage
             if (eventType == "D")
             {
-                if (!server.CustomCallback)
+                var match = Configuration.Damage.PatternMatcher.Match(logLine);
+
+                if (match.Success)
                 {
-                    var regexMatch = Regex.Match(logLine, Configuration.Damage.Pattern);
+                    string originIdString = match.Values[Configuration.Damage.GroupMapping[ParserRegex.GroupType.OriginNetworkId]].ToString();
+                    string targetIdString = match.Values[Configuration.Damage.GroupMapping[ParserRegex.GroupType.TargetNetworkId]].ToString();
+                    string originName = match.Values[Configuration.Damage.GroupMapping[ParserRegex.GroupType.OriginName]].ToString();
+                    string targetName = match.Values[Configuration.Damage.GroupMapping[ParserRegex.GroupType.TargetName]].ToString();
 
-                    if (regexMatch.Success)
+                    long originId = originIdString.IsBotGuid() ?
+                        originName.GenerateGuidFromString() :
+                        originIdString.ConvertGuidToLong(Configuration.GuidNumberStyle, Utilities.WORLD_ID);
+                    long targetId = targetIdString.IsBotGuid() ?
+                        targetName.GenerateGuidFromString() :
+                        targetIdString.ConvertGuidToLong(Configuration.GuidNumberStyle, Utilities.WORLD_ID);
+
+                    int originClientNumber = int.Parse(match.Values[Configuration.Damage.GroupMapping[ParserRegex.GroupType.OriginClientNumber]]);
+                    int targetClientNumber = int.Parse(match.Values[Configuration.Damage.GroupMapping[ParserRegex.GroupType.TargetClientNumber]]);
+
+                    return new GameEvent()
                     {
-                        string originId = regexMatch.Groups[Configuration.Damage.GroupMapping[ParserRegex.GroupType.OriginNetworkId]].ToString();
+                        Type = GameEvent.EventType.Damage,
-                        string targetId = regexMatch.Groups[Configuration.Damage.GroupMapping[ParserRegex.GroupType.TargetNetworkId]].ToString();
+                        Data = logLine,
-
+                        Origin = new EFClient() { NetworkId = originId, ClientNumber = originClientNumber },
-                        var origin = !string.IsNullOrEmpty(originId) ? server.GetClientsAsList()
+                        Target = new EFClient() { NetworkId = targetId, ClientNumber = targetClientNumber },
-                            .First(c => c.NetworkId == originId.ConvertLong()) :
+                        RequiredEntity = GameEvent.EventRequiredEntity.Origin | GameEvent.EventRequiredEntity.Target,
-                            Utilities.IW4MAdminClient(server);
+                        GameTime = gameTime,
-
+                        Source = GameEvent.EventSource.Log
-                        var target = !string.IsNullOrEmpty(targetId) ? server.GetClientsAsList()
+                    };
-                            .First(c => c.NetworkId == targetId.ConvertLong()) :
-                            Utilities.IW4MAdminClient(server);
-
-                        return new GameEvent()
-                        {
-                            Type = GameEvent.EventType.Damage,
-                            Data = logLine,
-                            Origin = origin,
-                            Target = target,
-                            Owner = server
-                        };
-                    }
                 }
             }
 
-            // join
             if (eventType == "J")
             {
-                var regexMatch = Regex.Match(logLine, Configuration.Join.Pattern);
+                var match = Configuration.Join.PatternMatcher.Match(logLine);
-                if (regexMatch.Success)
+
+                if (match.Success)
                 {
-                    bool isBot = regexMatch.Groups[Configuration.Join.GroupMapping[ParserRegex.GroupType.OriginNetworkId]].ToString().Contains("bot");
+                    string originIdString = match.Values[Configuration.Join.GroupMapping[ParserRegex.GroupType.OriginNetworkId]].ToString();
+                    string originName = match.Values[Configuration.Join.GroupMapping[ParserRegex.GroupType.OriginName]].ToString();
+
+                    long networkId = originIdString.IsBotGuid() ?
+                        originName.GenerateGuidFromString() :
+                        originIdString.ConvertGuidToLong(Configuration.GuidNumberStyle);
 
                     return new GameEvent()
                     {
                         Type = GameEvent.EventType.PreConnect,
                         Data = logLine,
-                        Owner = server,
                         Origin = new EFClient()
                         {
                             CurrentAlias = new EFAlias()
                             {
-                                Name = regexMatch.Groups[Configuration.Join.GroupMapping[ParserRegex.GroupType.OriginName]].ToString().StripColors(),
+                                Name = match.Values[Configuration.Join.GroupMapping[ParserRegex.GroupType.OriginName]].ToString().TrimNewLine(),
                             },
-                            NetworkId = regexMatch.Groups[Configuration.Join.GroupMapping[ParserRegex.GroupType.OriginNetworkId]].ToString().ConvertLong(),
+                            NetworkId = networkId,
-                            ClientNumber = Convert.ToInt32(regexMatch.Groups[Configuration.Join.GroupMapping[ParserRegex.GroupType.OriginClientNumber]].ToString()),
+                            ClientNumber = Convert.ToInt32(match.Values[Configuration.Join.GroupMapping[ParserRegex.GroupType.OriginClientNumber]].ToString()),
                             State = EFClient.ClientState.Connecting,
-                            CurrentServer = server,
+                        },
-                            IsBot = isBot
+                        Extra = originIdString,
-                        }
+                        RequiredEntity = GameEvent.EventRequiredEntity.None,
+                        IsBlocking = true,
+                        GameTime = gameTime,
+                        Source = GameEvent.EventSource.Log
                     };
                 }
             }
 
             if (eventType == "Q")
             {
-                var regexMatch = Regex.Match(logLine, Configuration.Quit.Pattern);
+                var match = Configuration.Quit.PatternMatcher.Match(logLine);
-                if (regexMatch.Success)
+
+                if (match.Success)
                 {
+                    string originIdString = match.Values[Configuration.Quit.GroupMapping[ParserRegex.GroupType.OriginNetworkId]].ToString();
+                    string originName = match.Values[Configuration.Quit.GroupMapping[ParserRegex.GroupType.OriginName]].ToString();
+
+                    long networkId = originIdString.IsBotGuid() ?
+                        originName.GenerateGuidFromString() :
+                        originIdString.ConvertGuidToLong(Configuration.GuidNumberStyle);
+
                     return new GameEvent()
                     {
                         Type = GameEvent.EventType.PreDisconnect,
                         Data = logLine,
-                        Owner = server,
                         Origin = new EFClient()
                         {
                             CurrentAlias = new EFAlias()
                             {
-                                Name = regexMatch.Groups[Configuration.Quit.GroupMapping[ParserRegex.GroupType.OriginName]].ToString().StripColors()
+                                Name = match.Values[Configuration.Quit.GroupMapping[ParserRegex.GroupType.OriginName]].ToString().TrimNewLine()
                             },
-                            NetworkId = regexMatch.Groups[Configuration.Quit.GroupMapping[ParserRegex.GroupType.OriginNetworkId]].ToString().ConvertLong(),
+                            NetworkId = networkId,
-                            ClientNumber = Convert.ToInt32(regexMatch.Groups[Configuration.Quit.GroupMapping[ParserRegex.GroupType.OriginClientNumber]].ToString()),
+                            ClientNumber = Convert.ToInt32(match.Values[Configuration.Quit.GroupMapping[ParserRegex.GroupType.OriginClientNumber]].ToString()),
                             State = EFClient.ClientState.Disconnecting
-                        }
+                        },
+                        RequiredEntity = GameEvent.EventRequiredEntity.None,
+                        IsBlocking = true,
+                        GameTime = gameTime,
+                        Source = GameEvent.EventSource.Log
                     };
                 }
             }
@@ -294,10 +304,12 @@ namespace IW4MAdmin.Application.EventParsers
                 return new GameEvent()
                 {
                     Type = GameEvent.EventType.MapEnd,
-                    Data = lineSplit[0],
+                    Data = logLine,
-                    Origin = Utilities.IW4MAdminClient(server),
+                    Origin = Utilities.IW4MAdminClient(),
-                    Target = Utilities.IW4MAdminClient(server),
+                    Target = Utilities.IW4MAdminClient(),
-                    Owner = server
+                    RequiredEntity = GameEvent.EventRequiredEntity.None,
+                    GameTime = gameTime,
+                    Source = GameEvent.EventSource.Log
                 };
             }
 
@@ -308,21 +320,74 @@ namespace IW4MAdmin.Application.EventParsers
                 return new GameEvent()
                 {
                     Type = GameEvent.EventType.MapChange,
-                    Data = lineSplit[0],
+                    Data = logLine,
-                    Origin = Utilities.IW4MAdminClient(server),
+                    Origin = Utilities.IW4MAdminClient(),
-                    Target = Utilities.IW4MAdminClient(server),
+                    Target = Utilities.IW4MAdminClient(),
-                    Owner = server,
+                    Extra = dump.DictionaryFromKeyValue(),
-                    Extra = dump.DictionaryFromKeyValue()
+                    RequiredEntity = GameEvent.EventRequiredEntity.None,
+                    GameTime = gameTime,
+                    Source = GameEvent.EventSource.Log
                 };
             }
 
+            if (_customEventRegistrations.ContainsKey(eventType))
+            {
+                var eventModifier = _customEventRegistrations[eventType];
+
+                try
+                {
+                    return eventModifier.Item2(logLine, Configuration, new GameEvent()
+                    {
+                        Type = GameEvent.EventType.Other,
+                        Data = logLine,
+                        Subtype = eventModifier.Item1,
+                        GameTime = gameTime,
+                        Source = GameEvent.EventSource.Log
+                    });
+                }
+
+                catch (Exception e)
+                {
+                    _logger.WriteWarning($"Could not handle custom event generation - {e.GetExceptionInfo()}");
+                }
+            }
+
             return new GameEvent()
             {
                 Type = GameEvent.EventType.Unknown,
-                Origin = Utilities.IW4MAdminClient(server),
+                Data = logLine,
-                Target = Utilities.IW4MAdminClient(server),
+                Origin = Utilities.IW4MAdminClient(),
-                Owner = server
+                Target = Utilities.IW4MAdminClient(),
+                RequiredEntity = GameEvent.EventRequiredEntity.None,
+                GameTime = gameTime,
+                Source = GameEvent.EventSource.Log
             };
         }
+
+        /// <inheritdoc/>
+        public void RegisterCustomEvent(string eventSubtype, string eventTriggerValue, Func<string, IEventParserConfiguration, GameEvent, GameEvent> eventModifier)
+        {
+            if (string.IsNullOrWhiteSpace(eventSubtype))
+            {
+                throw new ArgumentException("Event subtype cannot be empty");
+            }
+
+            if (string.IsNullOrWhiteSpace(eventTriggerValue))
+            {
+                throw new ArgumentException("Event trigger value cannot be empty");
+            }
+
+            if (eventModifier == null)
+            {
+                throw new ArgumentException("Event modifier must be specified");
+            }
+
+            if (_customEventRegistrations.ContainsKey(eventTriggerValue))
+            {
+                throw new ArgumentException($"Event trigger value '{eventTriggerValue}' is already registered");
+            }
+
+            _customEventRegistrations.Add(eventTriggerValue, (eventSubtype, eventModifier));
+        }
     }
 }

Application/EventParsers/DynamicEventParser.cs

@@ -1,7 +1,5 @@
-using System;
+using SharedLibraryCore.Configuration;
-using System.Collections.Generic;
+using SharedLibraryCore.Interfaces;
-using System.Text;
-using static SharedLibraryCore.Server;
 
 namespace IW4MAdmin.Application.EventParsers
 {
@@ -11,5 +9,8 @@ namespace IW4MAdmin.Application.EventParsers
     /// </summary>
     sealed internal class DynamicEventParser : BaseEventParser
     {
+        public DynamicEventParser(IParserRegexFactory parserRegexFactory, ILogger logger, ApplicationConfiguration appConfig) : base(parserRegexFactory, logger, appConfig)
+        {
+        }
     }
 }

Application/EventParsers/DynamicEventParserConfiguration.cs

@@ -1,4 +1,5 @@
 using SharedLibraryCore.Interfaces;
+using System.Globalization;
 
 namespace IW4MAdmin.Application.EventParsers
 {
@@ -9,11 +10,24 @@ namespace IW4MAdmin.Application.EventParsers
     sealed internal class DynamicEventParserConfiguration : IEventParserConfiguration
     {
         public string GameDirectory { get; set; }
-        public ParserRegex Say { get; set; } = new ParserRegex();
+        public ParserRegex Say { get; set; }
-        public ParserRegex Join { get; set; } = new ParserRegex();
+        public ParserRegex Join { get; set; }
-        public ParserRegex Quit { get; set; } = new ParserRegex();
+        public ParserRegex Quit { get; set; }
-        public ParserRegex Kill { get; set; } = new ParserRegex();
+        public ParserRegex Kill { get; set; }
-        public ParserRegex Damage { get; set; } = new ParserRegex();
+        public ParserRegex Damage { get; set; }
-        public ParserRegex Action { get; set; } = new ParserRegex();
+        public ParserRegex Action { get; set; }
+        public ParserRegex Time { get; set; }
+        public NumberStyles GuidNumberStyle { get; set; } = NumberStyles.HexNumber;
+
+        public DynamicEventParserConfiguration(IParserRegexFactory parserRegexFactory)
+        {
+            Say = parserRegexFactory.CreateParserRegex();
+            Join = parserRegexFactory.CreateParserRegex();
+            Quit = parserRegexFactory.CreateParserRegex();
+            Kill = parserRegexFactory.CreateParserRegex();
+            Damage = parserRegexFactory.CreateParserRegex();
+            Action = parserRegexFactory.CreateParserRegex();
+            Time = parserRegexFactory.CreateParserRegex();
+        }
     }
 }

Application/EventParsers/ParserPatternMatcher.cs

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

Application/Extensions/CommandExtensions.cs

@@ -0,0 +1,21 @@
+using IW4MAdmin.Application.Misc;
+using SharedLibraryCore.Interfaces;
+using System.Linq;
+
+namespace IW4MAdmin.Application.Extensions
+{
+    public static class CommandExtensions
+    {
+        /// <summary>
+        /// determines the command configuration name for given manager command
+        /// </summary>
+        /// <param name="command">command to determine config name for</param>
+        /// <returns></returns>
+        public static string CommandConfigNameForType(this IManagerCommand command)
+        {
+            return command.GetType() == typeof(ScriptCommand) ?
+                        $"{char.ToUpper(command.Name[0])}{command.Name.Substring(1)}Command" :
+                        command.GetType().Name;
+        }
+    }
+}

Application/Factories/ConfigurationHandlerFactory.cs

@@ -0,0 +1,23 @@
+using IW4MAdmin.Application.Misc;
+using SharedLibraryCore.Interfaces;
+
+namespace IW4MAdmin.Application.Factories
+{
+    /// <summary>
+    /// implementation of IConfigurationHandlerFactory
+    /// provides base functionality to create configuration handlers
+    /// </summary>
+    public class ConfigurationHandlerFactory : IConfigurationHandlerFactory
+    {
+        /// <summary>
+        /// creates a base configuration handler
+        /// </summary>
+        /// <typeparam name="T">base configuration type</typeparam>
+        /// <param name="name">name of the config file</param>
+        /// <returns></returns>
+        public IConfigurationHandler<T> GetConfigurationHandler<T>(string name) where T : IBaseConfiguration
+        {
+            return new BaseConfigurationHandler<T>(name);
+        }
+    }
+}

Application/Factories/DatabaseContextFactory.cs

@@ -0,0 +1,21 @@
+using SharedLibraryCore.Database;
+using SharedLibraryCore.Interfaces;
+
+namespace IW4MAdmin.Application.Factories
+{
+    /// <summary>
+    /// implementation of the IDatabaseContextFactory interface
+    /// </summary>
+    public class DatabaseContextFactory : IDatabaseContextFactory
+    {
+        /// <summary>
+        /// creates a new database context
+        /// </summary>
+        /// <param name="enableTracking">indicates if entity tracking should be enabled</param>
+        /// <returns></returns>
+        public DatabaseContext CreateContext(bool? enableTracking = true)
+        {
+            return enableTracking.HasValue ? new DatabaseContext(disableTracking: !enableTracking.Value) : new DatabaseContext();
+        }
+    }
+}

Application/Factories/GameLogReaderFactory.cs

@@ -0,0 +1,33 @@
+using IW4MAdmin.Application.IO;
+using Microsoft.Extensions.DependencyInjection;
+using SharedLibraryCore.Interfaces;
+using System;
+
+namespace IW4MAdmin.Application.Factories
+{
+    public class GameLogReaderFactory : IGameLogReaderFactory
+    {
+        private readonly IServiceProvider _serviceProvider;
+
+        public GameLogReaderFactory(IServiceProvider serviceProvider)
+        {
+            _serviceProvider = serviceProvider;
+        }
+
+        public IGameLogReader CreateGameLogReader(Uri[] logUris, IEventParser eventParser)
+        {
+            var baseUri = logUris[0];
+            if (baseUri.Scheme == Uri.UriSchemeHttp)
+            {
+                return new GameLogReaderHttp(logUris, eventParser, _serviceProvider.GetRequiredService<ILogger>());
+            }
+
+            else if (baseUri.Scheme == Uri.UriSchemeFile)
+            {
+                return new GameLogReader(baseUri.LocalPath, eventParser, _serviceProvider.GetRequiredService<ILogger>());
+            }
+
+            throw new NotImplementedException($"No log reader implemented for Uri scheme \"{baseUri.Scheme}\"");
+        }
+    }
+}

Application/Factories/GameServerInstanceFactory.cs

@@ -0,0 +1,42 @@
+using SharedLibraryCore;
+using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Interfaces;
+using System.Collections;
+
+namespace IW4MAdmin.Application.Factories
+{
+    /// <summary>
+    /// implementation of IGameServerInstanceFactory
+    /// </summary>
+    internal class GameServerInstanceFactory : IGameServerInstanceFactory
+    {
+        private readonly ITranslationLookup _translationLookup;
+        private readonly IRConConnectionFactory _rconConnectionFactory;
+        private readonly IGameLogReaderFactory _gameLogReaderFactory;
+        private readonly IMetaService _metaService;
+
+        /// <summary>
+        /// base constructor
+        /// </summary>
+        /// <param name="translationLookup"></param>
+        /// <param name="rconConnectionFactory"></param>
+        public GameServerInstanceFactory(ITranslationLookup translationLookup, IRConConnectionFactory rconConnectionFactory, IGameLogReaderFactory gameLogReaderFactory, IMetaService metaService)
+        {
+            _translationLookup = translationLookup;
+            _rconConnectionFactory = rconConnectionFactory;
+            _gameLogReaderFactory = gameLogReaderFactory;
+            _metaService = metaService;
+        }
+
+        /// <summary>
+        /// creates an IW4MServer instance
+        /// </summary>
+        /// <param name="config">server configuration</param>
+        /// <param name="manager">application manager</param>
+        /// <returns></returns>
+        public Server CreateServer(ServerConfiguration config, IManager manager)
+        {
+            return new IW4MServer(manager, config, _translationLookup, _rconConnectionFactory, _gameLogReaderFactory, _metaService);
+        }
+    }
+}

Application/Factories/ParserRegexFactory.cs

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

Application/Factories/RConConnectionFactory.cs

@@ -0,0 +1,36 @@
+using IW4MAdmin.Application.RCon;
+using SharedLibraryCore.Interfaces;
+using System.Text;
+
+namespace IW4MAdmin.Application.Factories
+{
+    /// <summary>
+    /// implementation of IRConConnectionFactory
+    /// </summary>
+    internal class RConConnectionFactory : IRConConnectionFactory
+    {
+        private static readonly Encoding gameEncoding = Encoding.GetEncoding("windows-1252");
+        private readonly ILogger _logger;
+       
+        /// <summary>
+        /// Base constructor
+        /// </summary>
+        /// <param name="logger"></param>
+        public RConConnectionFactory(ILogger logger)
+        {
+            _logger = logger;
+        }
+
+        /// <summary>
+        /// creates a new rcon connection instance
+        /// </summary>
+        /// <param name="ipAddress">ip address of the server</param>
+        /// <param name="port">port of the server</param>
+        /// <param name="password">rcon password of the server</param>
+        /// <returns></returns>
+        public IRConConnection CreateConnection(string ipAddress, int port, string password)
+        {
+            return new RConConnection(ipAddress, port, password, _logger, gameEncoding);
+        }
+    }
+}

Application/Factories/ScriptCommandFactory.cs

@@ -0,0 +1,40 @@
+using IW4MAdmin.Application.Misc;
+using SharedLibraryCore;
+using SharedLibraryCore.Commands;
+using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Interfaces;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using static SharedLibraryCore.Database.Models.EFClient;
+
+namespace IW4MAdmin.Application.Factories
+{
+    /// <summary>
+    /// implementation of IScriptCommandFactory
+    /// </summary>
+    public class ScriptCommandFactory : IScriptCommandFactory
+    {
+        private CommandConfiguration _config;
+        private readonly ITranslationLookup _transLookup;
+
+        public ScriptCommandFactory(CommandConfiguration  config, ITranslationLookup transLookup)
+        {
+            _config = config;
+            _transLookup = transLookup;
+        }
+
+        /// <inheritdoc/>
+        public IManagerCommand CreateScriptCommand(string name, string alias, string description, string permission, bool isTargetRequired, IEnumerable<(string, bool)> args, Action<GameEvent> executeAction)
+        {
+            var permissionEnum = Enum.Parse<Permission>(permission);
+            var argsArray = args.Select(_arg => new CommandArgument
+            {
+                Name = _arg.Item1,
+                Required = _arg.Item2
+            }).ToArray();
+
+            return new ScriptCommand(name, alias, description, isTargetRequired, permissionEnum, argsArray, executeAction, _config, _transLookup);
+        }
+    }
+}

Application/GameEventHandler.cs

@@ -1,23 +1,55 @@
-using SharedLibraryCore;
+using IW4MAdmin.Application.Misc;
+using Newtonsoft.Json;
+using SharedLibraryCore;
 using SharedLibraryCore.Events;
 using SharedLibraryCore.Interfaces;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
+using System.Threading.Tasks;
 
 namespace IW4MAdmin.Application
 {
-    class GameEventHandler : IEventHandler
+    public class GameEventHandler : IEventHandler
     {
-        readonly IManager Manager;
+        private readonly EventLog _eventLog;
-        public GameEventHandler(IManager mgr)
+        private static readonly GameEvent.EventType[] overrideEvents = new[]
         {
-            Manager = mgr;
+            GameEvent.EventType.Connect,
+            GameEvent.EventType.Disconnect,
+            GameEvent.EventType.Quit,
+            GameEvent.EventType.Stop
+        };
+
+        public GameEventHandler()
+        {
+            _eventLog = new EventLog();
         }
 
-        public void AddEvent(GameEvent gameEvent)
+        public void HandleEvent(IManager manager, GameEvent gameEvent)
         {
-            ((Manager as ApplicationManager).OnServerEvent)(this, new GameEventArgs(null, false, gameEvent));
+#if DEBUG
+            ThreadPool.GetMaxThreads(out int workerThreads, out int n);
+            ThreadPool.GetAvailableThreads(out int availableThreads, out int m);
+            gameEvent.Owner.Logger.WriteDebug($"There are {workerThreads - availableThreads} active threading tasks");
+
+#endif
+            if (manager.IsRunning || overrideEvents.Contains(gameEvent.Type))
+            {
+#if DEBUG
+                gameEvent.Owner.Logger.WriteDebug($"Adding event with id {gameEvent.Id}");
+#endif
+
+                EventApi.OnGameEvent(gameEvent);
+                Task.Factory.StartNew(() => manager.ExecuteEvent(gameEvent));
+            }
+#if DEBUG
+            else
+            {
+                gameEvent.Owner.Logger.WriteDebug($"Skipping event as we're shutting down {gameEvent.Id}");
+            }
+#endif
         }
     }
 }

Application/IO/GameLogEventDetection.cs

@@ -1,36 +1,30 @@
 using SharedLibraryCore;
 using SharedLibraryCore.Interfaces;
 using System;
-using System.Threading;
+using System.Linq;
 using System.Threading.Tasks;
 
 namespace IW4MAdmin.Application.IO
 {
-    class GameLogEventDetection
+    public class GameLogEventDetection
     {
-        Server Server;
+        private long previousFileSize;
-        long PreviousFileSize;
+        private readonly Server _server;
-        IGameLogReader Reader;
+        private readonly IGameLogReader _reader;
-        readonly string GameLogFile;
+        private readonly bool _ignoreBots;
 
-        class EventState
+        public GameLogEventDetection(Server server, Uri[] gameLogUris, IGameLogReaderFactory gameLogReaderFactory)
         {
-            public ILogger Log { get; set; }
+            _reader = gameLogReaderFactory.CreateGameLogReader(gameLogUris, server.EventParser);
-            public string ServerId { get; set; }
+            _server = server;
-        }
+            _ignoreBots = server?.Manager.GetApplicationSettings().Configuration().IgnoreBots ?? false;
-
-        public GameLogEventDetection(Server server, string gameLogPath, Uri gameLogServerUri)
-        {
-            GameLogFile = gameLogPath;
-            Reader = gameLogServerUri != null ? new GameLogReaderHttp(gameLogServerUri, gameLogPath, server.EventParser) : Reader = new GameLogReader(gameLogPath, server.EventParser); 
-            Server = server;
         }
 
         public async Task PollForChanges()
         {
-            while (!Server.Manager.ShutdownRequested())
+            while (!_server.Manager.CancellationToken.IsCancellationRequested)
             {
-                if (Server.IsInitialized)
+                if (_server.IsInitialized)
                 {
                     try
                     {
@@ -39,39 +33,84 @@ namespace IW4MAdmin.Application.IO
 
                     catch (Exception e)
                     {
-                        Server.Logger.WriteWarning($"Failed to update log event for {Server.EndPoint}");
+                        _server.Logger.WriteWarning($"Failed to update log event for {_server.EndPoint}");
-                        Server.Logger.WriteDebug($"Exception: {e.Message}");
+                        _server.Logger.WriteDebug(e.GetExceptionInfo());
-                        Server.Logger.WriteDebug($"StackTrace: {e.StackTrace}");
                     }
                 }
-                Thread.Sleep(Reader.UpdateInterval);
+
+                await Task.Delay(_reader.UpdateInterval, _server.Manager.CancellationToken);
             }
+
+            _server.Logger.WriteDebug("Stopped polling for changes");
         }
 
-        private async Task UpdateLogEvents()
+        public async Task UpdateLogEvents()
         {
-            long fileSize = Reader.Length;
+            long fileSize = _reader.Length;
 
-            if (PreviousFileSize == 0)
+            if (previousFileSize == 0)
-                PreviousFileSize = fileSize;
+            {
+                previousFileSize = fileSize;
+            }
 
-            long fileDiff = fileSize - PreviousFileSize;
+            long fileDiff = fileSize - previousFileSize;
 
             // this makes the http log get pulled
             if (fileDiff < 1 && fileSize != -1)
-                return;
-
-            PreviousFileSize = fileSize;
-
-            var events = await Reader.ReadEventsFromLog(Server, fileDiff, 0);
-
-            foreach (var ev in events)
             {
-                Server.Manager.GetEventHandler().AddEvent(ev);
+                previousFileSize = fileSize;
-                await ev.WaitAsync();
+                return;
             }
 
-            PreviousFileSize = fileSize;
+            var events = await _reader.ReadEventsFromLog(fileDiff, previousFileSize);
+
+            foreach (var gameEvent in events)
+            {
+                try
+                {
+#if DEBUG
+                    _server.Logger.WriteVerbose(gameEvent.Data);
+#endif
+                    gameEvent.Owner = _server;
+
+                    // we don't want to add the event if ignoreBots is on and the event comes from a bot
+                    if (!_ignoreBots || (_ignoreBots && !((gameEvent.Origin?.IsBot ?? false) || (gameEvent.Target?.IsBot ?? false))))
+                    {
+                        if ((gameEvent.RequiredEntity & GameEvent.EventRequiredEntity.Origin) == GameEvent.EventRequiredEntity.Origin && gameEvent.Origin.NetworkId != Utilities.WORLD_ID)
+                        {
+                            gameEvent.Origin = _server.GetClientsAsList().First(_client => _client.NetworkId == gameEvent.Origin?.NetworkId);;
+                        }
+
+                        if ((gameEvent.RequiredEntity & GameEvent.EventRequiredEntity.Target) == GameEvent.EventRequiredEntity.Target)
+                        {
+                            gameEvent.Target = _server.GetClientsAsList().First(_client => _client.NetworkId == gameEvent.Target?.NetworkId);
+                        }
+
+                        if (gameEvent.Origin != null)
+                        {
+                            gameEvent.Origin.CurrentServer = _server;
+                        }
+
+                        if (gameEvent.Target != null)
+                        {
+                            gameEvent.Target.CurrentServer = _server;
+                        }
+
+                        _server.Manager.AddEvent(gameEvent);
+                    }
+                }
+
+                catch (InvalidOperationException)
+                {
+                    if (!_ignoreBots)
+                    {
+                        _server.Logger.WriteWarning("Could not find client in client list when parsing event line");
+                        _server.Logger.WriteDebug(gameEvent.Data);
+                    }
+                }
+            }
+
+            previousFileSize = fileSize;
         }
     }
 }

Application/IO/GameLogReader.cs

@@ -3,6 +3,7 @@ using SharedLibraryCore.Interfaces;
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
@@ -10,57 +11,71 @@ namespace IW4MAdmin.Application.IO
 {
     class GameLogReader : IGameLogReader
     {
-        IEventParser Parser;
+        private readonly IEventParser _parser;
-        readonly string LogFile;
+        private readonly string _logFile;
+        private readonly ILogger _logger;
 
-        public long Length => new FileInfo(LogFile).Length;
+        public long Length => new FileInfo(_logFile).Length;
 
         public int UpdateInterval => 300;
 
-        public GameLogReader(string logFile, IEventParser parser)
+        public GameLogReader(string logFile, IEventParser parser, ILogger logger)
         {
-            LogFile = logFile;
+            _logFile = logFile;
-            Parser = parser;
+            _parser = parser;
+            _logger = logger;
         }
 
-        public async Task<ICollection<GameEvent>> ReadEventsFromLog(Server server, long fileSizeDiff, long startPosition)
+        public async Task<IEnumerable<GameEvent>> ReadEventsFromLog(long fileSizeDiff, long startPosition)
         {
             // allocate the bytes for the new log lines
             List<string> logLines = new List<string>();
 
             // open the file as a stream
-            using (var rd = new StreamReader(new FileStream(LogFile, FileMode.Open, FileAccess.Read, FileShare.ReadWrite), Utilities.EncodingType))
+            using (FileStream fs = new FileStream(_logFile, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
             {
-                // todo: max async
+                byte[] buff = new byte[fileSizeDiff];
-                // take the old start position and go back the number of new characters
+                fs.Seek(startPosition, SeekOrigin.Begin);
-                rd.BaseStream.Seek(-fileSizeDiff, SeekOrigin.End);
+                await fs.ReadAsync(buff, 0, (int)fileSizeDiff);
-                
+                var stringBuilder = new StringBuilder();
-                string newLine;
+                char[] charBuff = Utilities.EncodingType.GetChars(buff);
-                while (!string.IsNullOrEmpty(newLine = await rd.ReadLineAsync()))
+
+                foreach (char c in charBuff)
                 {
-                    logLines.Add(newLine);
+                    if (c == '\n')
+                    {
+                        logLines.Add(stringBuilder.ToString());
+                        stringBuilder = new StringBuilder();
+                    }
+
+                    else if (c != '\r')
+                    {
+                        stringBuilder.Append(c);
+                    }
+                }
+
+                if (stringBuilder.Length > 0)
+                {
+                    logLines.Add(stringBuilder.ToString());
                 }
             }
 
             List<GameEvent> events = new List<GameEvent>();
 
             // parse each line
-            foreach (string eventLine in logLines)
+            foreach (string eventLine in logLines.Where(_line => _line.Length > 0))
             {
-                if (eventLine.Length > 0)
+                try
                 {
-                    try
+                    var gameEvent = _parser.GenerateGameEvent(eventLine);
-                    {
+                    events.Add(gameEvent);
-                        // todo: catch elsewhere
+                }
-                        events.Add(Parser.GetEvent(server, eventLine));
+
-                    }
+                catch (Exception e)
-                    
+                {
-                    catch (Exception e)
+                    _logger.WriteWarning("Could not properly parse event line");
-                    {
+                    _logger.WriteDebug(e.Message);
-                        server.Logger.WriteWarning("Could not properly parse event line");
+                    _logger.WriteDebug(eventLine);
-                        server.Logger.WriteDebug(e.Message);
-                        server.Logger.WriteDebug(eventLine);
-                    }
                 }
             }
 

Application/IO/GameLogReaderHttp.cs

@@ -4,66 +4,67 @@ using SharedLibraryCore;
 using SharedLibraryCore.Interfaces;
 using System;
 using System.Collections.Generic;
-using System.Net.Http;
+using System.Linq;
 using System.Threading.Tasks;
-using static SharedLibraryCore.Utilities;
 
 namespace IW4MAdmin.Application.IO
 {
     /// <summary>
-    /// provides capibility of reading log files over HTTP
+    /// provides capability of reading log files over HTTP
     /// </summary>
     class GameLogReaderHttp : IGameLogReader
     {
-        readonly IEventParser Parser;
+        private readonly IEventParser _eventParser;
-        readonly IGameLogServer Api;
+        private readonly IGameLogServer _logServerApi;
-        readonly string logPath;
+        private readonly ILogger _logger;
+        private readonly string _safeLogPath;
+        private string lastKey = "next";
 
-        public GameLogReaderHttp(Uri gameLogServerUri, string logPath, IEventParser parser)
+        public GameLogReaderHttp(Uri[] gameLogServerUris, IEventParser parser, ILogger logger)
         {
-            this.logPath = logPath.ToBase64UrlSafeString(); ;
+            _eventParser = parser;
-            Parser = parser;
+            _logServerApi = RestClient.For<IGameLogServer>(gameLogServerUris[0].ToString());
-            Api = RestClient.For<IGameLogServer>(gameLogServerUri);
+            _safeLogPath = gameLogServerUris[1].LocalPath.ToBase64UrlSafeString();
+            _logger = logger;
         }
 
         public long Length => -1;
 
-        public int UpdateInterval => 350;
+        public int UpdateInterval => 500;
 
-        public async Task<ICollection<GameEvent>> ReadEventsFromLog(Server server, long fileSizeDiff, long startPosition)
+        public async Task<IEnumerable<GameEvent>> ReadEventsFromLog(long fileSizeDiff, long startPosition)
         {
-#if DEBUG == true
-            server.Logger.WriteDebug($"Begin reading from http log");
-#endif
             var events = new List<GameEvent>();
-            string b64Path = logPath;
+            var response = await _logServerApi.Log(_safeLogPath, lastKey);
-            var response = await Api.Log(b64Path);
+            lastKey = response.NextKey;
 
-            if (!response.Success)
+            if (!response.Success && string.IsNullOrEmpty(lastKey))
             {
-                server.Logger.WriteError($"Could not get log server info of {logPath}/{b64Path} ({server.LogPath})");
+                _logger.WriteError($"Could not get log server info of {_safeLogPath}");
                 return events;
             }
 
-            // parse each line
+            else if (!string.IsNullOrWhiteSpace(response.Data))
-            foreach (string eventLine in response.Data.Split(Environment.NewLine))
             {
-                if (eventLine.Length > 0)
+                // parse each line
+                var lines = response.Data
+                     .Split(Environment.NewLine)
+                     .Where(_line => _line.Length > 0);
+
+                foreach (string eventLine in lines)
                 {
                     try
                     {
-                        var e = Parser.GetEvent(server, eventLine);
+                        // this trim end should hopefully fix the nasty runaway regex
-#if DEBUG == true
+                        var gameEvent = _eventParser.GenerateGameEvent(eventLine.TrimEnd('\r'));
-                        server.Logger.WriteDebug($"Parsed event with id {e.Id}  from http");
+                        events.Add(gameEvent);
-#endif
-                        events.Add(e);
                     }
 
                     catch (Exception e)
                     {
-                        server.Logger.WriteWarning("Could not properly parse event line");
+                        _logger.WriteError("Could not properly parse event line from http");
-                        server.Logger.WriteDebug(e.Message);
+                        _logger.WriteDebug(e.Message);
-                        server.Logger.WriteDebug(eventLine);
+                        _logger.WriteDebug(eventLine);
                     }
                 }
             }

Application/Localization/Configure.cs

@@ -1,30 +1,28 @@
 using IW4MAdmin.Application.API.Master;
 using SharedLibraryCore;
+using SharedLibraryCore.Interfaces;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace IW4MAdmin.Application.Localization
 {
     public class Configure
     {
-        public static void Initialize(string customLocale = null)
+        public static ITranslationLookup Initialize(bool useLocalTranslation, IMasterApi apiInstance, string customLocale = null)
         {
             string currentLocale = string.IsNullOrEmpty(customLocale) ? CultureInfo.CurrentCulture.Name : customLocale;
             string[] localizationFiles = Directory.GetFiles(Path.Join(Utilities.OperatingDirectory, "Localization"), $"*.{currentLocale}.json");
 
-            if (!Program.ServerManager.GetApplicationSettings()?.Configuration()?.UseLocalTranslations ?? false)
+            if (!useLocalTranslation)
             {
                 try
                 {
-                    var api = Endpoint.Get();
+                    var localization = apiInstance.GetLocalization(currentLocale).Result;
-                    var localization = api.GetLocalization(currentLocale).Result;
                     Utilities.CurrentLocalization = localization;
-                    return;
+                    return localization.LocalizationIndex;
                 }
 
                 catch (Exception)
@@ -73,6 +71,8 @@ namespace IW4MAdmin.Application.Localization
             {
                 LocalizationName = currentLocale,
             };
+
+            return Utilities.CurrentLocalization.LocalizationIndex;
         }
     }
 }

Application/Main.cs

@@ -1,8 +1,26 @@
-using IW4MAdmin.Application.Migration;
+using IW4MAdmin.Application.API.Master;
+using IW4MAdmin.Application.EventParsers;
+using IW4MAdmin.Application.Factories;
+using IW4MAdmin.Application.Helpers;
+using IW4MAdmin.Application.Meta;
+using IW4MAdmin.Application.Migration;
+using IW4MAdmin.Application.Misc;
+using Microsoft.Extensions.DependencyInjection;
+using RestEase;
 using SharedLibraryCore;
-using SharedLibraryCore.Localization;
+using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Database.Models;
+using SharedLibraryCore.Dtos.Meta.Responses;
+using SharedLibraryCore.Exceptions;
+using SharedLibraryCore.Helpers;
+using SharedLibraryCore.Interfaces;
+using SharedLibraryCore.QueryHelper;
+using SharedLibraryCore.Repositories;
+using SharedLibraryCore.Services;
+using Stats.Dtos;
+using StatsWeb;
 using System;
-using System.IO;
+using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
@@ -11,195 +29,297 @@ namespace IW4MAdmin.Application
 {
     public class Program
     {
-        static public double Version { get; private set; }
+        public static BuildNumber Version { get; private set; } = BuildNumber.Parse(Utilities.GetVersionAsString());
-        static public ApplicationManager ServerManager;
+        public static ApplicationManager ServerManager;
-        private static ManualResetEventSlim OnShutdownComplete = new ManualResetEventSlim();
+        private static Task ApplicationTask;
+        private static ServiceProvider serviceProvider;
 
-        public static void Main(string[] args)
+        /// <summary>
+        /// entrypoint of the application
+        /// </summary>
+        /// <returns></returns>
+        public static async Task Main(string[] args)
         {
             AppDomain.CurrentDomain.SetData("DataDirectory", Utilities.OperatingDirectory);
+
             Console.OutputEncoding = Encoding.UTF8;
             Console.ForegroundColor = ConsoleColor.Gray;
 
-            Version = Utilities.GetVersionAsDouble();
+            Console.CancelKeyPress += new ConsoleCancelEventHandler(OnCancelKey);
 
             Console.WriteLine("=====================================================");
-            Console.WriteLine(" IW4M ADMIN");
+            Console.WriteLine(" IW4MAdmin");
             Console.WriteLine(" by RaidMax ");
             Console.WriteLine($" Version {Utilities.GetVersionAsString()}");
             Console.WriteLine("=====================================================");
 
-            Index loc = null;
+            await LaunchAsync(args);
+        }
 
+        /// <summary>
+        /// event callback executed when the control + c combination is detected
+        /// gracefully stops the server manager and waits for all tasks to finish
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private static async void OnCancelKey(object sender, ConsoleCancelEventArgs e)
+        {
+            ServerManager?.Stop();
+            await ApplicationTask;
+        }
+
+        /// <summary>
+        /// task that initializes application and starts the application monitoring and runtime tasks
+        /// </summary>
+        /// <returns></returns>
+        private static async Task LaunchAsync(string[] args)
+        {
+        restart:
+            ITranslationLookup translationLookup = null;
             try
             {
-                ServerManager = ApplicationManager.GetInstance();
+                // do any needed housekeeping file/folder migrations
-                var configuration = ServerManager.GetApplicationSettings().Configuration();
-
-                if (configuration != null)
-                {
-                    Localization.Configure.Initialize(configuration.EnableCustomLocale ? (configuration.CustomLocale ?? "windows-1252") : "windows-1252");
-                }
-
-                else
-                {
-                    Localization.Configure.Initialize();
-                }
-
-                loc = Utilities.CurrentLocalization.LocalizationIndex;
-                Console.CancelKeyPress += new ConsoleCancelEventHandler(OnCancelKey);
-
-                CheckDirectories();
-                // do any needed migrations
-                // todo: move out
                 ConfigurationMigration.MoveConfigFolder10518(null);
+                ConfigurationMigration.CheckDirectories();
 
-                ServerManager.Logger.WriteInfo($"Version is {Version}");
+                var services = ConfigureServices(args);
+                serviceProvider = services.BuildServiceProvider();
+                var versionChecker = serviceProvider.GetRequiredService<IMasterCommunication>();
+                ServerManager = (ApplicationManager)serviceProvider.GetRequiredService<IManager>();
+                translationLookup = serviceProvider.GetRequiredService<ITranslationLookup>();
 
-                var api = API.Master.Endpoint.Get();
+                ServerManager.Logger.WriteInfo(Utilities.CurrentLocalization.LocalizationIndex["MANAGER_VERSION"].FormatExt(Version));
 
-                var version = new API.Master.VersionInfo()
+                await versionChecker.CheckVersion();
-                {
+                await ServerManager.Init();
-                    CurrentVersionStable = 99.99f
-                };
-
-                try
-                {
-                    version = api.GetVersion().Result;
-                }
-
-                catch (Exception e)
-                {
-                    ServerManager.Logger.WriteWarning(loc["MANAGER_VERSION_FAIL"]);
-                    while (e.InnerException != null)
-                    {
-                        e = e.InnerException;
-                    }
-
-                    ServerManager.Logger.WriteDebug(e.Message);
-                }
-
-                if (version.CurrentVersionStable == 99.99f)
-                {
-                    Console.ForegroundColor = ConsoleColor.Red;
-                    Console.WriteLine(loc["MANAGER_VERSION_FAIL"]);
-                    Console.ForegroundColor = ConsoleColor.Gray;
-                }
-
-#if !PRERELEASE
-                else if (version.CurrentVersionStable > Version)
-                {
-                    Console.ForegroundColor = ConsoleColor.DarkYellow;
-                    Console.WriteLine($"IW4MAdmin {loc["MANAGER_VERSION_UPDATE"]} [v{version.CurrentVersionStable.ToString("0.0")}]");
-                        Console.WriteLine(loc["MANAGER_VERSION_CURRENT"].FormatExt($"[v{Version.ToString("0.0")}]"));
-                    Console.ForegroundColor = ConsoleColor.Gray;
-                }
-#else
-                else if (version.CurrentVersionPrerelease > Version)
-                {
-                    Console.ForegroundColor = ConsoleColor.DarkYellow;
-                    Console.WriteLine($"IW4MAdmin-Prerelease {loc["MANAGER_VERSION_UPDATE"]} [v{version.CurrentVersionPrerelease.ToString("0.0")}-pr]");
-                    Console.WriteLine(loc["MANAGER_VERSION_CURRENT"].FormatExt($"[v{Version.ToString("0.0")}-pr]"));
-                    Console.ForegroundColor = ConsoleColor.Gray;
-                }
-#endif 
-                else
-                {
-                    Console.ForegroundColor = ConsoleColor.Green;
-                    Console.WriteLine(loc["MANAGER_VERSION_SUCCESS"]);
-                    Console.ForegroundColor = ConsoleColor.Gray;
-                }
-
-                ServerManager.Init().Wait();
-
-                var consoleTask = Task.Run(async () =>
-                {
-                    string userInput;
-                    var Origin = Utilities.IW4MAdminClient(ServerManager.Servers[0]);
-
-                    do
-                    {
-                        userInput = Console.ReadLine();
-
-                        if (userInput?.ToLower() == "quit")
-                        {
-                            ServerManager.Stop();
-                        }
-
-                        if (ServerManager.Servers.Count == 0)
-                        {
-                            Console.WriteLine(loc["MANAGER_CONSOLE_NOSERV"]);
-                            continue;
-                        }
-
-                        if (userInput?.Length > 0)
-                        {
-                            GameEvent E = new GameEvent()
-                            {
-                                Type = GameEvent.EventType.Command,
-                                Data = userInput,
-                                Origin = Origin,
-                                Owner = ServerManager.Servers[0]
-                            };
-
-                            ServerManager.GetEventHandler().AddEvent(E);
-                            await E.WaitAsync(30 * 1000);
-                        }
-                        Console.Write('>');
-
-                    } while (ServerManager.Running);
-                });
             }
 
             catch (Exception e)
             {
-                string failMessage = loc == null ? "Failed to initalize IW4MAdmin" : loc["MANAGER_INIT_FAIL"];
+                string failMessage = translationLookup == null ? "Failed to initalize IW4MAdmin" : translationLookup["MANAGER_INIT_FAIL"];
-                string exitMessage = loc == null ? "Press any key to exit..." : loc["MANAGER_EXIT"];
+                string exitMessage = translationLookup == null ? "Press enter to exit..." : translationLookup["MANAGER_EXIT"];
 
                 Console.WriteLine(failMessage);
+
                 while (e.InnerException != null)
                 {
                     e = e.InnerException;
                 }
-                Console.WriteLine(e.Message);
+
+                if (e is ConfigurationException configException)
+                {
+                    if (translationLookup != null)
+                    {
+                        Console.WriteLine(translationLookup[configException.Message].FormatExt(configException.ConfigurationFileName));
+                    }
+
+                    foreach (string error in configException.Errors)
+                    {
+                        Console.WriteLine(error);
+                    }
+                }
+
+                else
+                {
+                    Console.WriteLine(e.Message);
+                }
+
                 Console.WriteLine(exitMessage);
-                Console.ReadKey();
+                await Console.In.ReadAsync(new char[1], 0, 1);
                 return;
             }
 
-            if (ServerManager.GetApplicationSettings().Configuration().EnableWebFront)
+            try
             {
-                Task.Run(() => WebfrontCore.Program.Init(ServerManager));
+                ApplicationTask = RunApplicationTasksAsync();
+                await ApplicationTask;
             }
 
-            OnShutdownComplete.Reset();
+            catch (Exception e) 
-            ServerManager.Start();
+            {
-            ServerManager.Logger.WriteVerbose(loc["MANAGER_SHUTDOWN_SUCCESS"]);
+                string failMessage = translationLookup == null ? "Failed to initalize IW4MAdmin" : translationLookup["MANAGER_INIT_FAIL"];
-            OnShutdownComplete.Set();
+                Console.WriteLine($"{failMessage}: {e.GetExceptionInfo()}");
+            }
+
+            if (ServerManager.IsRestartRequested)
+            {
+                goto restart;
+            }
+
+            serviceProvider.Dispose();
         }
 
-        private static void OnCancelKey(object sender, ConsoleCancelEventArgs e)
+        /// <summary>
+        /// runs the core application tasks
+        /// </summary>
+        /// <returns></returns>
+        private static async Task RunApplicationTasksAsync()
         {
-            ServerManager.Stop();
+            var webfrontTask = ServerManager.GetApplicationSettings().Configuration().EnableWebFront ?
-            OnShutdownComplete.Wait();
+                WebfrontCore.Program.Init(ServerManager, serviceProvider, ServerManager.CancellationToken) :
+                Task.CompletedTask;
+
+            // we want to run this one on a manual thread instead of letting the thread pool handle it,
+            // because we can't exit early from waiting on console input, and it prevents us from restarting
+            var inputThread = new Thread(async () => await ReadConsoleInput());
+            inputThread.Start();
+
+            var tasks = new[]
+            {
+                ServerManager.Start(),
+                webfrontTask,
+                serviceProvider.GetRequiredService<IMasterCommunication>().RunUploadStatus(ServerManager.CancellationToken)
+            };
+
+            await Task.WhenAll(tasks);
+
+            ServerManager.Logger.WriteVerbose(Utilities.CurrentLocalization.LocalizationIndex["MANAGER_SHUTDOWN_SUCCESS"]);
         }
 
-        static void CheckDirectories()
+
+        /// <summary>
+        /// reads input from the console and executes entered commands on the default server
+        /// </summary>
+        /// <returns></returns>
+        private static async Task ReadConsoleInput()
         {
-            if (!Directory.Exists(Path.Join(Utilities.OperatingDirectory, "Plugins")))
+            if (Console.IsInputRedirected)
             {
-                Directory.CreateDirectory(Path.Join(Utilities.OperatingDirectory, "Plugins"));
+                ServerManager.Logger.WriteInfo("Disabling console input as it has been redirected");
+                return;
             }
 
-            if (!Directory.Exists(Path.Join(Utilities.OperatingDirectory, "Database")))
+            string lastCommand;
+            var Origin = Utilities.IW4MAdminClient(ServerManager.Servers[0]);
+
+            try
             {
-                Directory.CreateDirectory(Path.Join(Utilities.OperatingDirectory, "Database"));
+                while (!ServerManager.CancellationToken.IsCancellationRequested)
+                {
+                    lastCommand = await Console.In.ReadLineAsync();
+
+                    if (lastCommand?.Length > 0)
+                    {
+                        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('>');
+                        }
+                    }
+                }
+            }
+            catch (OperationCanceledException)
+            { }
+        }
+
+        /// <summary>
+        /// Configures the dependency injection services
+        /// </summary>
+        private static IServiceCollection ConfigureServices(string[] args)
+        {
+            var defaultLogger = new Logger("IW4MAdmin-Manager");
+            var pluginImporter = new PluginImporter(defaultLogger);
+
+            var serviceCollection = new ServiceCollection();
+            serviceCollection.AddSingleton<IServiceCollection>(_serviceProvider => serviceCollection)
+                .AddSingleton(new BaseConfigurationHandler<ApplicationConfiguration>("IW4MAdminSettings") as IConfigurationHandler<ApplicationConfiguration>)
+                .AddSingleton(new BaseConfigurationHandler<CommandConfiguration>("CommandConfiguration") as IConfigurationHandler<CommandConfiguration>)
+                .AddSingleton(_serviceProvider => _serviceProvider.GetRequiredService<IConfigurationHandler<ApplicationConfiguration>>().Configuration() ?? new ApplicationConfiguration())
+                .AddSingleton(_serviceProvider => _serviceProvider.GetRequiredService<IConfigurationHandler<CommandConfiguration>>().Configuration() ?? new CommandConfiguration())
+                .AddSingleton<ILogger>(_serviceProvider => defaultLogger)
+                .AddSingleton<IPluginImporter, PluginImporter>()
+                .AddSingleton<IMiddlewareActionHandler, MiddlewareActionHandler>()
+                .AddSingleton<IRConConnectionFactory, RConConnectionFactory>()
+                .AddSingleton<IGameServerInstanceFactory, GameServerInstanceFactory>()
+                .AddSingleton<IConfigurationHandlerFactory, ConfigurationHandlerFactory>()
+                .AddSingleton<IParserRegexFactory, ParserRegexFactory>()
+                .AddSingleton<IDatabaseContextFactory, DatabaseContextFactory>()
+                .AddSingleton<IGameLogReaderFactory, GameLogReaderFactory>()
+                .AddSingleton<IScriptCommandFactory, ScriptCommandFactory>()
+                .AddSingleton<IAuditInformationRepository, AuditInformationRepository>()
+                .AddSingleton<IEntityService<EFClient>, ClientService>()
+                .AddSingleton<IMetaService, MetaService>()
+                .AddSingleton<IMetaRegistration, MetaRegistration>()
+                .AddSingleton<IScriptPluginServiceResolver, ScriptPluginServiceResolver>()
+                .AddSingleton<IResourceQueryHelper<ClientPaginationRequest, ReceivedPenaltyResponse>, ReceivedPenaltyResourceQueryHelper>()
+                .AddSingleton<IResourceQueryHelper<ClientPaginationRequest, AdministeredPenaltyResponse>, AdministeredPenaltyResourceQueryHelper>()
+                .AddSingleton<IResourceQueryHelper<ClientPaginationRequest, UpdatedAliasResponse>, UpdatedAliasResourceQueryHelper>()
+                .AddSingleton<IResourceQueryHelper<ChatSearchQuery, MessageResponse>, ChatResourceQueryHelper>()
+                .AddTransient<IParserPatternMatcher, ParserPatternMatcher>()
+                .AddSingleton(_serviceProvider =>
+                {
+                    var config = _serviceProvider.GetRequiredService<IConfigurationHandler<ApplicationConfiguration>>().Configuration();
+                    return Localization.Configure.Initialize(useLocalTranslation: config?.UseLocalTranslations ?? false,
+                        apiInstance: _serviceProvider.GetRequiredService<IMasterApi>(),
+                        customLocale: config?.EnableCustomLocale ?? false ? (config.CustomLocale ?? "en-US") : "en-US");
+                })
+                .AddSingleton<IManager, ApplicationManager>()
+                .AddSingleton(_serviceProvider => RestClient
+                    .For<IMasterApi>(Utilities.IsDevelopment ? new Uri("http://127.0.0.1:8080") : _serviceProvider
+                    .GetRequiredService<IConfigurationHandler<ApplicationConfiguration>>().Configuration()?.MasterUrl ??
+                    new ApplicationConfiguration().MasterUrl))
+                .AddSingleton<IMasterCommunication, MasterCommunication>();
+
+            if (args.Contains("serialevents"))
+            {
+                serviceCollection.AddSingleton<IEventHandler, SerialGameEventHandler>();
+            }
+            else
+            {
+                serviceCollection.AddSingleton<IEventHandler, GameEventHandler>();
             }
 
-            if (!Directory.Exists(Path.Join(Utilities.OperatingDirectory, "Log")))
+            // register the native commands
+            foreach (var commandType in typeof(SharedLibraryCore.Commands.QuitCommand).Assembly.GetTypes()
+                        .Where(_command => _command.BaseType == typeof(Command)))
             {
-                Directory.CreateDirectory(Path.Join(Utilities.OperatingDirectory, "Log"));
+                defaultLogger.WriteInfo($"Registered native command type {commandType.Name}");
+                serviceCollection.AddSingleton(typeof(IManagerCommand), commandType);
             }
+
+            // register the plugin implementations
+            var pluginImplementations = pluginImporter.DiscoverAssemblyPluginImplementations();
+            foreach (var pluginType in pluginImplementations.Item1)
+            {
+                defaultLogger.WriteInfo($"Registered plugin type {pluginType.FullName}");
+                serviceCollection.AddSingleton(typeof(IPlugin), pluginType);
+            }
+
+            // register the plugin commands
+            foreach (var commandType in pluginImplementations.Item2)
+            {
+                defaultLogger.WriteInfo($"Registered plugin command type {commandType.FullName}");
+                serviceCollection.AddSingleton(typeof(IManagerCommand), commandType);
+            }
+
+            // register any script plugins
+            foreach (var scriptPlugin in pluginImporter.DiscoverScriptPlugins())
+            {
+                serviceCollection.AddSingleton(scriptPlugin);
+            }
+
+            // register any eventable types
+            foreach (var assemblyType in typeof(Program).Assembly.GetTypes()
+                .Where(_asmType => typeof(IRegisterEvent).IsAssignableFrom(_asmType))
+                .Union(pluginImplementations
+                .Item1.SelectMany(_asm => _asm.Assembly.GetTypes())
+                .Distinct()
+                .Where(_asmType => typeof(IRegisterEvent).IsAssignableFrom(_asmType))))
+            {
+                var instance = Activator.CreateInstance(assemblyType) as IRegisterEvent;
+                serviceCollection.AddSingleton(instance);
+            }
+
+            return serviceCollection;
         }
     }
 }

Application/Meta/AdministeredPenaltyResourceQueryHelper.cs

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

Application/Meta/MetaRegistration.cs

@@ -0,0 +1,165 @@
+using SharedLibraryCore;
+using SharedLibraryCore.Database.Models;
+using SharedLibraryCore.Dtos.Meta.Responses;
+using SharedLibraryCore.Interfaces;
+using SharedLibraryCore.QueryHelper;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace IW4MAdmin.Application.Meta
+{
+    public class MetaRegistration : IMetaRegistration
+    {
+        private readonly ILogger _logger;
+        private ITranslationLookup _transLookup;
+        private readonly IMetaService _metaService;
+        private readonly IEntityService<EFClient> _clientEntityService;
+        private readonly IResourceQueryHelper<ClientPaginationRequest, ReceivedPenaltyResponse> _receivedPenaltyHelper;
+        private readonly IResourceQueryHelper<ClientPaginationRequest, AdministeredPenaltyResponse> _administeredPenaltyHelper;
+        private readonly IResourceQueryHelper<ClientPaginationRequest, UpdatedAliasResponse> _updatedAliasHelper;
+
+        public MetaRegistration(ILogger logger, IMetaService metaService, ITranslationLookup transLookup, IEntityService<EFClient> clientEntityService,
+            IResourceQueryHelper<ClientPaginationRequest, ReceivedPenaltyResponse> receivedPenaltyHelper,
+            IResourceQueryHelper<ClientPaginationRequest, AdministeredPenaltyResponse> administeredPenaltyHelper,
+            IResourceQueryHelper<ClientPaginationRequest, UpdatedAliasResponse> updatedAliasHelper)
+        {
+            _logger = logger;
+            _transLookup = transLookup;
+            _metaService = metaService;
+            _clientEntityService = clientEntityService;
+            _receivedPenaltyHelper = receivedPenaltyHelper;
+            _administeredPenaltyHelper = administeredPenaltyHelper;
+            _updatedAliasHelper = updatedAliasHelper;
+        }
+
+        public void Register()
+        {
+            _metaService.AddRuntimeMeta<ClientPaginationRequest, InformationResponse>(MetaType.Information, GetProfileMeta);
+            _metaService.AddRuntimeMeta<ClientPaginationRequest, ReceivedPenaltyResponse>(MetaType.ReceivedPenalty, GetReceivedPenaltiesMeta);
+            _metaService.AddRuntimeMeta<ClientPaginationRequest, AdministeredPenaltyResponse>(MetaType.Penalized, GetAdministeredPenaltiesMeta);
+            _metaService.AddRuntimeMeta<ClientPaginationRequest, UpdatedAliasResponse>(MetaType.AliasUpdate, GetUpdatedAliasMeta);
+        }
+
+        private async Task<IEnumerable<InformationResponse>> GetProfileMeta(ClientPaginationRequest request)
+        {
+            var metaList = new List<InformationResponse>();
+            var lastMapMeta = await _metaService.GetPersistentMeta("LastMapPlayed", new EFClient() { ClientId = request.ClientId });
+
+            if (lastMapMeta != null)
+            {
+                metaList.Add(new InformationResponse()
+                {
+                    ClientId = request.ClientId,
+                    MetaId = lastMapMeta.MetaId,
+                    Key = Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_CLIENT_META_LAST_MAP"],
+                    Value = lastMapMeta.Value,
+                    ShouldDisplay = true,
+                    Type = MetaType.Information,
+                    Column = 1,
+                    Order = 6
+                });
+            }
+
+            var lastServerMeta = await _metaService.GetPersistentMeta("LastServerPlayed", new EFClient() { ClientId = request.ClientId });
+
+            if (lastServerMeta != null)
+            {
+                metaList.Add(new InformationResponse()
+                {
+                    ClientId = request.ClientId,
+                    MetaId = lastServerMeta.MetaId,
+                    Key = Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_CLIENT_META_LAST_SERVER"],
+                    Value = lastServerMeta.Value,
+                    ShouldDisplay = true,
+                    Type = MetaType.Information,
+                    Column = 0,
+                    Order = 6
+                });
+            }
+
+            var client = await _clientEntityService.Get(request.ClientId);
+
+            if (client == null)
+            {
+                _logger.WriteWarning($"No client found with id {request.ClientId} when generating profile meta");
+                return metaList;
+            }
+
+            metaList.Add(new InformationResponse()
+            {
+                ClientId = client.ClientId,
+                Key = _transLookup["WEBFRONT_PROFILE_META_PLAY_TIME"],
+                Value = TimeSpan.FromHours(client.TotalConnectionTime / 3600.0).HumanizeForCurrentCulture(),
+                ShouldDisplay = true,
+                Column = 1,
+                Order = 0,
+                Type = MetaType.Information
+            });
+
+            metaList.Add(new InformationResponse()
+            {
+                ClientId = client.ClientId,
+                Key = _transLookup["WEBFRONT_PROFILE_META_FIRST_SEEN"],
+                Value = (DateTime.UtcNow - client.FirstConnection).HumanizeForCurrentCulture(),
+                ShouldDisplay = true,
+                Column = 1,
+                Order = 1,
+                Type = MetaType.Information
+            });
+
+            metaList.Add(new InformationResponse()
+            {
+                ClientId = client.ClientId,
+                Key = _transLookup["WEBFRONT_PROFILE_META_LAST_SEEN"],
+                Value = (DateTime.UtcNow - client.LastConnection).HumanizeForCurrentCulture(),
+                ShouldDisplay = true,
+                Column = 1,
+                Order = 2,
+                Type = MetaType.Information
+            });
+
+            metaList.Add(new InformationResponse()
+            {
+                ClientId = client.ClientId,
+                Key = Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_CLIENT_META_CONNECTIONS"],
+                Value = client.Connections.ToString("#,##0", new System.Globalization.CultureInfo(Utilities.CurrentLocalization.LocalizationName)),
+                ShouldDisplay = true,
+                Column = 1,
+                Order = 3,
+                Type = MetaType.Information
+            });
+
+            metaList.Add(new InformationResponse()
+            {
+                ClientId = client.ClientId,
+                Key = Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_CLIENT_META_MASKED"],
+                Value = client.Masked ? Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_CLIENT_META_TRUE"] : Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_CLIENT_META_FALSE"],
+                IsSensitive = true,
+                Column = 1,
+                Order = 4,
+                Type = MetaType.Information
+            });
+
+            return metaList;
+        }
+
+        private async Task<IEnumerable<ReceivedPenaltyResponse>> GetReceivedPenaltiesMeta(ClientPaginationRequest request)
+        {
+            var penalties = await _receivedPenaltyHelper.QueryResource(request);
+            return penalties.Results;
+        }
+
+        private async Task<IEnumerable<AdministeredPenaltyResponse>> GetAdministeredPenaltiesMeta(ClientPaginationRequest request)
+        {
+            var penalties = await _administeredPenaltyHelper.QueryResource(request);
+            return penalties.Results;
+        }
+
+        private async Task<IEnumerable<UpdatedAliasResponse>> GetUpdatedAliasMeta(ClientPaginationRequest request)
+        {
+            var aliases = await _updatedAliasHelper.QueryResource(request);
+            return aliases.Results;
+        }
+    }
+}

Application/Meta/ReceivedPenaltyResourceQueryHelper.cs

@@ -0,0 +1,72 @@
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
+using SharedLibraryCore;
+using SharedLibraryCore.Database.Models;
+using SharedLibraryCore.Dtos.Meta.Responses;
+using SharedLibraryCore.Helpers;
+using SharedLibraryCore.Interfaces;
+using SharedLibraryCore.QueryHelper;
+
+namespace IW4MAdmin.Application.Meta
+{
+    /// <summary>
+    /// implementation of IResourceQueryHelper
+    /// used to pull in penalties applied to a given client id
+    /// </summary>
+    public class ReceivedPenaltyResourceQueryHelper : IResourceQueryHelper<ClientPaginationRequest, ReceivedPenaltyResponse>
+    {
+        private readonly ILogger _logger;
+        private readonly IDatabaseContextFactory _contextFactory;
+
+        public ReceivedPenaltyResourceQueryHelper(ILogger logger, IDatabaseContextFactory contextFactory)
+        {
+            _contextFactory = contextFactory;
+            _logger = logger;
+        }
+
+        public async Task<ResourceQueryHelperResult<ReceivedPenaltyResponse>> QueryResource(ClientPaginationRequest query)
+        {
+            var linkedPenaltyType = Utilities.LinkedPenaltyTypes();
+            using var ctx = _contextFactory.CreateContext(enableTracking: false);
+
+            var linkId = await ctx.Clients.AsNoTracking()
+                    .Where(_client => _client.ClientId == query.ClientId)
+                    .Select(_client => _client.AliasLinkId)
+                    .FirstOrDefaultAsync();
+
+            var iqPenalties = ctx.Penalties.AsNoTracking()
+                .Where(_penalty => _penalty.OffenderId == query.ClientId || (linkedPenaltyType.Contains(_penalty.Type) && _penalty.LinkId == linkId))
+                .Where(_penalty => _penalty.When < query.Before)
+                .OrderByDescending(_penalty => _penalty.When);
+
+            var penalties = await iqPenalties
+                .Take(query.Count)
+                .Select(_penalty => new ReceivedPenaltyResponse()
+                {
+                    PenaltyId = _penalty.PenaltyId,
+                    ClientId = query.ClientId,
+                    Offense = _penalty.Offense,
+                    AutomatedOffense = _penalty.AutomatedOffense,
+                    OffenderClientId = _penalty.OffenderId,
+                    OffenderName = _penalty.Offender.CurrentAlias.Name,
+                    PunisherClientId = _penalty.PunisherId,
+                    PunisherName = _penalty.Punisher.CurrentAlias.Name,
+                    PenaltyType = _penalty.Type,
+                    When = _penalty.When,
+                    ExpirationDate = _penalty.Expires,
+                    IsLinked = _penalty.OffenderId != query.ClientId,
+                    IsSensitive = _penalty.Type == EFPenalty.PenaltyType.Flag
+                })
+                .ToListAsync();
+
+            return new ResourceQueryHelperResult<ReceivedPenaltyResponse>
+            {
+                // todo: maybe actually count
+                RetrievedResultCount = penalties.Count,
+                Results = penalties
+            };
+        }
+    }
+}

Application/Meta/UpdatedAliasResourceQueryHelper.cs

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

Application/Migration/ConfigurationMigration.cs

@@ -15,6 +15,32 @@ namespace IW4MAdmin.Application.Migration
     /// </summary>
     class ConfigurationMigration
     {
+        /// <summary>
+        /// ensures required directories are created
+        /// </summary>
+        public static void CheckDirectories()
+        {
+            if (!Directory.Exists(Path.Join(Utilities.OperatingDirectory, "Plugins")))
+            {
+                Directory.CreateDirectory(Path.Join(Utilities.OperatingDirectory, "Plugins"));
+            }
+
+            if (!Directory.Exists(Path.Join(Utilities.OperatingDirectory, "Database")))
+            {
+                Directory.CreateDirectory(Path.Join(Utilities.OperatingDirectory, "Database"));
+            }
+
+            if (!Directory.Exists(Path.Join(Utilities.OperatingDirectory, "Log")))
+            {
+                Directory.CreateDirectory(Path.Join(Utilities.OperatingDirectory, "Log"));
+            }
+
+            if (!Directory.Exists(Path.Join(Utilities.OperatingDirectory, "Localization")))
+            {
+                Directory.CreateDirectory(Path.Join(Utilities.OperatingDirectory, "Localization"));
+            }
+        }
+
         /// <summary>
         /// moves existing configs from the root folder into a configs folder
         /// </summary>

Application/Misc/BaseConfigurationHandler.cs

@@ -0,0 +1,72 @@
+using Newtonsoft.Json;
+using SharedLibraryCore;
+using SharedLibraryCore.Exceptions;
+using SharedLibraryCore.Interfaces;
+using System;
+using System.IO;
+using System.Threading.Tasks;
+
+namespace IW4MAdmin.Application.Misc
+{
+    /// <summary>
+    /// default implementation of IConfigurationHandler
+    /// </summary>
+    /// <typeparam name="T">base configuration type</typeparam>
+    public class BaseConfigurationHandler<T> : IConfigurationHandler<T> where T : IBaseConfiguration
+    {
+        T _configuration;
+
+        public BaseConfigurationHandler(string fn)
+        {
+            FileName = Path.Join(Utilities.OperatingDirectory, "Configuration", $"{fn}.json");
+            Build();
+        }
+
+        public string FileName { get; }
+
+        public void Build()
+        {
+            try
+            {
+                var configContent = File.ReadAllText(FileName);
+                _configuration = JsonConvert.DeserializeObject<T>(configContent);
+            }
+
+            catch (FileNotFoundException)
+            {
+                _configuration = default;
+            }
+
+            catch (Exception e)
+            {
+                throw new ConfigurationException("MANAGER_CONFIGURATION_ERROR")
+                {
+                    Errors = new[] { e.Message },
+                    ConfigurationFileName = FileName
+                };
+            }
+        }
+
+        public Task Save()
+        {
+            var settings = new JsonSerializerSettings()
+            {
+                Formatting = Formatting.Indented
+            };
+            settings.Converters.Add(new Newtonsoft.Json.Converters.StringEnumConverter());
+
+            var appConfigJSON = JsonConvert.SerializeObject(_configuration, settings);
+            return File.WriteAllTextAsync(FileName, appConfigJSON);
+        }
+
+        public T Configuration()
+        {
+            return _configuration;
+        }
+
+        public void Set(T config)
+        {
+            _configuration = config;
+        }
+    }
+}

Application/Misc/EventLog.cs

@@ -0,0 +1,27 @@
+using Newtonsoft.Json;
+using SharedLibraryCore;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace IW4MAdmin.Application.Misc
+{
+    public class EventLog : Dictionary<long, IList<GameEvent>>
+    {
+        private static JsonSerializerSettings serializationSettings;
+
+        public static JsonSerializerSettings BuildVcrSerializationSettings()
+        {
+            if (serializationSettings == null)
+            {
+                serializationSettings = new JsonSerializerSettings() { Formatting = Formatting.Indented, ReferenceLoopHandling = ReferenceLoopHandling.Ignore };
+                serializationSettings.Converters.Add(new IPAddressConverter());
+                serializationSettings.Converters.Add(new IPEndPointConverter());
+                serializationSettings.Converters.Add(new GameEventConverter());
+                serializationSettings.Converters.Add(new ClientEntityConverter());
+            }
+
+            return serializationSettings;
+        }
+    }
+}

Application/Misc/EventProfiler.cs

@@ -0,0 +1,63 @@
+using SharedLibraryCore;
+using SharedLibraryCore.Interfaces;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace IW4MAdmin.Application.Misc
+{
+    internal class EventPerformance
+    {
+        public long ExecutionTime { get; set; }
+        public GameEvent Event { get; set; }
+        public string EventInfo => $"{Event.Type}, {Event.FailReason}, {Event.IsBlocking}, {Event.Data}, {Event.Message}, {Event.Extra}";
+    }
+
+    public class DuplicateKeyComparer<TKey> : IComparer<TKey> where TKey : IComparable
+    {
+        public int Compare(TKey x, TKey y)
+        {
+            int result = x.CompareTo(y);
+
+            if (result == 0)
+                return 1;
+            else
+                return result;
+        }
+    }
+
+    internal class EventProfiler
+    {
+        public double AverageEventTime { get; private set; }
+        public double MaxEventTime => Events.Values.Last().ExecutionTime;
+        public double MinEventTime => Events.Values[0].ExecutionTime;
+        public int TotalEventCount => Events.Count;
+        public SortedList<long, EventPerformance> Events { get; private set; } = new SortedList<long, EventPerformance>(new DuplicateKeyComparer<long>());
+        private readonly ILogger _logger;
+
+        public EventProfiler(ILogger logger)
+        {
+            _logger = logger;
+        }
+
+        public void Profile(DateTime start, DateTime end, GameEvent gameEvent)
+        {
+            _logger.WriteDebug($"Starting profile of event {gameEvent.Id}");
+            long executionTime = (long)Math.Round((end - start).TotalMilliseconds);
+
+            var perf = new EventPerformance()
+            {
+                Event = gameEvent,
+                ExecutionTime = executionTime
+            };
+
+            lock (Events)
+            {
+                Events.Add(executionTime, perf);
+            }
+
+            AverageEventTime = (AverageEventTime * (TotalEventCount - 1) + executionTime) / TotalEventCount;
+            _logger.WriteDebug($"Finished profile of event {gameEvent.Id}");
+        }
+    }
+}

Application/Misc/LogPathGeneratorInfo.cs

@@ -0,0 +1,45 @@
+using System.Runtime.InteropServices;
+
+namespace IW4MAdmin.Application.Misc
+{
+    /// <summary>
+    /// dto class for handling log path generation
+    /// </summary>
+    public class LogPathGeneratorInfo
+    {
+        /// <summary>
+        /// directory under the paths where data comes from by default
+        /// <remarks>fs_basegame</remarks>
+        /// </summary>
+        public string BaseGameDirectory { get; set; } = "";
+
+        /// <summary>
+        /// base game root path
+        /// <remarks>fs_basepath</remarks>
+        /// </summary>
+        public string BasePathDirectory { get; set; } = "";
+
+        /// <summary>
+        /// overide game directory
+        /// <remarks>plugin driven</remarks>
+        /// </summary>
+        public string GameDirectory { get; set; } = "";
+
+        /// <summary>
+        /// game director
+        /// <remarks>fs_game</remarks>
+        /// </summary>
+        public string ModDirectory { get; set; } = "";
+
+        /// <summary>
+        /// log file name
+        /// <remarks>g_log</remarks>
+        /// </summary>
+        public string LogFile { get; set; } = "";
+
+        /// <summary>
+        /// indicates if running on windows
+        /// </summary>
+        public bool IsWindows { get; set; } = true;
+    }
+}

Application/Misc/Logger.cs

@@ -1,12 +1,14 @@
-using SharedLibraryCore;
+using IW4MAdmin.Application.IO;
+using SharedLibraryCore;
+using SharedLibraryCore.Interfaces;
 using System;
-using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Threading;
 
 namespace IW4MAdmin.Application
 {
-    class Logger : SharedLibraryCore.Interfaces.ILogger
+    public class Logger : ILogger
     {
         enum LogType
         {
@@ -19,16 +21,21 @@ namespace IW4MAdmin.Application
         }
 
         readonly string FileName;
-        readonly SemaphoreSlim OnLogWriting;
+        readonly ReaderWriterLockSlim WritingLock;
         static readonly short MAX_LOG_FILES = 10;
 
         public Logger(string fn)
         {
             FileName = Path.Join(Utilities.OperatingDirectory, "Log", $"{fn}.log");
-            OnLogWriting = new SemaphoreSlim(1, 1);
+            WritingLock = new ReaderWriterLockSlim();
             RotateLogs();
         }
 
+        ~Logger()
+        {
+            WritingLock.Dispose();
+        }
+
         /// <summary>
         /// rotates logs when log is initialized
         /// </summary>
@@ -55,9 +62,10 @@ namespace IW4MAdmin.Application
 
         void Write(string msg, LogType type)
         {
-            OnLogWriting.Wait();
+            WritingLock.EnterWriteLock();
 
             string stringType = type.ToString();
+            msg = msg.StripColors();
 
             try
             {
@@ -71,12 +79,12 @@ namespace IW4MAdmin.Application
             {
 #if DEBUG
                 // lets keep it simple and dispose of everything quickly as logging wont be that much (relatively)
-                Console.WriteLine(LogLine);
+                Console.WriteLine(msg);
-                File.AppendAllText(FileName, LogLine + Environment.NewLine);
 #else
                 if (type == LogType.Error || type == LogType.Verbose)
+                {
                     Console.WriteLine(LogLine);
-                //if (type != LogType.Debug)
+                }
                 File.AppendAllText(FileName, $"{LogLine}{Environment.NewLine}");
 #endif
             }
@@ -87,7 +95,7 @@ namespace IW4MAdmin.Application
                 Console.WriteLine(ex.GetExceptionInfo());
             }
 
-            OnLogWriting.Release(1);
+            WritingLock.ExitWriteLock();
         }
 
         public void WriteVerbose(string msg)

Application/Misc/MasterCommunication.cs

@@ -0,0 +1,209 @@
+using IW4MAdmin.Application.API.Master;
+using RestEase;
+using SharedLibraryCore;
+using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Helpers;
+using SharedLibraryCore.Interfaces;
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace IW4MAdmin.Application.Misc
+{
+    /// <summary>
+    /// implementation of IMasterCommunication
+    /// talks to the master server
+    /// </summary>
+    class MasterCommunication : IMasterCommunication
+    {
+        private readonly ILogger _logger;
+        private readonly ITranslationLookup _transLookup;
+        private readonly IMasterApi _apiInstance;
+        private readonly IManager _manager;
+        private readonly ApplicationConfiguration _appConfig;
+        private readonly BuildNumber _fallbackVersion = BuildNumber.Parse("99.99.99.99");
+        private readonly int _apiVersion = 1;
+
+        private bool firstHeartBeat = true;
+
+        public MasterCommunication(ILogger logger, ApplicationConfiguration appConfig, ITranslationLookup translationLookup, IMasterApi apiInstance, IManager manager)
+        {
+            _logger = logger;
+            _transLookup = translationLookup;
+            _apiInstance = apiInstance;
+            _appConfig = appConfig;
+            _manager = manager;
+        }
+
+        /// <summary>
+        /// checks for latest version of the application
+        /// notifies user if an update is available
+        /// </summary>
+        /// <returns></returns>
+        public async Task CheckVersion()
+        {
+            var version = new VersionInfo()
+            {
+                CurrentVersionStable = _fallbackVersion
+            };
+
+            try
+            {
+                version = await _apiInstance.GetVersion(_apiVersion);
+            }
+
+            catch (Exception e)
+            {
+                _logger.WriteWarning(_transLookup["MANAGER_VERSION_FAIL"]);
+                while (e.InnerException != null)
+                {
+                    e = e.InnerException;
+                }
+
+                _logger.WriteDebug(e.Message);
+            }
+
+            if (version.CurrentVersionStable == _fallbackVersion)
+            {
+                Console.ForegroundColor = ConsoleColor.Red;
+                Console.WriteLine(_transLookup["MANAGER_VERSION_FAIL"]);
+                Console.ForegroundColor = ConsoleColor.Gray;
+            }
+
+#if !PRERELEASE
+            else if (version.CurrentVersionStable > Program.Version)
+            {
+                Console.ForegroundColor = ConsoleColor.DarkYellow;
+                Console.WriteLine($"IW4MAdmin {_transLookup["MANAGER_VERSION_UPDATE"]} [v{version.CurrentVersionStable.ToString()}]");
+                Console.WriteLine(_transLookup["MANAGER_VERSION_CURRENT"].FormatExt($"[v{Program.Version.ToString()}]"));
+                Console.ForegroundColor = ConsoleColor.Gray;
+            }
+#else
+            else if (version.CurrentVersionPrerelease > Program.Version)
+            {
+                Console.ForegroundColor = ConsoleColor.DarkYellow;
+                Console.WriteLine($"IW4MAdmin-Prerelease {_transLookup["MANAGER_VERSION_UPDATE"]} [v{version.CurrentVersionPrerelease.ToString()}-pr]");
+                Console.WriteLine(_transLookup["MANAGER_VERSION_CURRENT"].FormatExt($"[v{Program.Version.ToString()}-pr]"));
+                Console.ForegroundColor = ConsoleColor.Gray;
+            }
+#endif
+            else
+            {
+                Console.ForegroundColor = ConsoleColor.Green;
+                Console.WriteLine(_transLookup["MANAGER_VERSION_SUCCESS"]);
+                Console.ForegroundColor = ConsoleColor.Gray;
+            }
+        }
+
+        public async Task RunUploadStatus(CancellationToken token)
+        {
+            // todo: clean up this logic
+            bool connected;
+
+            while (!token.IsCancellationRequested)
+            {
+                try
+                {
+                    await UploadStatus();
+                }
+
+                catch (System.Net.Http.HttpRequestException e)
+                {
+                    _logger.WriteWarning($"Could not send heartbeat - {e.Message}");
+                }
+
+                catch (AggregateException e)
+                {
+                    _logger.WriteWarning($"Could not send heartbeat - {e.Message}");
+                    var exceptions = e.InnerExceptions.Where(ex => ex.GetType() == typeof(ApiException));
+
+                    foreach (var ex in exceptions)
+                    {
+                        if (((ApiException)ex).StatusCode == System.Net.HttpStatusCode.Unauthorized)
+                        {
+                            connected = false;
+                        }
+                    }
+                }
+
+                catch (ApiException e)
+                {
+                    _logger.WriteWarning($"Could not send heartbeat - {e.Message}");
+                    if (e.StatusCode == System.Net.HttpStatusCode.Unauthorized)
+                    {
+                        connected = false;
+                    }
+                }
+
+                catch (Exception e)
+                {
+                    _logger.WriteWarning($"Could not send heartbeat - {e.Message}");
+                }
+
+
+                try
+                {
+                    await Task.Delay(30000, token);
+                }
+
+                catch
+                {
+                    break;
+                }
+            }
+        }
+
+        private async Task UploadStatus()
+        {
+            if (firstHeartBeat)
+            {
+                var token = await _apiInstance.Authenticate(new AuthenticationId
+                {
+                    Id = _appConfig.Id
+                });
+
+                _apiInstance.AuthorizationToken = $"Bearer {token.AccessToken}";
+            }
+
+            var instance = new ApiInstance
+            {
+                Id = _appConfig.Id,
+                Uptime = (int)(DateTime.UtcNow - (_manager as ApplicationManager).StartTime).TotalSeconds,
+                Version = Program.Version,
+                Servers = _manager.GetServers().Select(s =>
+                            new ApiServer()
+                            {
+                                ClientNum = s.ClientNum,
+                                Game = s.GameName.ToString(),
+                                Version = s.Version,
+                                Gametype = s.Gametype,
+                                Hostname = s.Hostname,
+                                Map = s.CurrentMap.Name,
+                                MaxClientNum = s.MaxClients,
+                                Id = s.EndPoint,
+                                Port = (short)s.Port,
+                                IPAddress = s.IP
+                            }).ToList()
+            };
+
+            Response<ResultMessage> response = null;
+
+            if (firstHeartBeat)
+            {
+                response = await _apiInstance.AddInstance(instance);
+            }
+
+            else
+            {
+                response = await _apiInstance.UpdateInstance(instance.Id, instance);
+                firstHeartBeat = false;
+            }
+
+            if (response.ResponseMessage.StatusCode != System.Net.HttpStatusCode.OK)
+            {
+                _logger.WriteWarning($"Response code from master is {response.ResponseMessage.StatusCode}, message is {response.StringContent}");
+            }
+        }
+    }
+}

Application/Misc/MetaService.cs

@@ -0,0 +1,187 @@
+using Microsoft.EntityFrameworkCore;
+using SharedLibraryCore.Database.Models;
+using SharedLibraryCore.Dtos;
+using SharedLibraryCore.Interfaces;
+using SharedLibraryCore.QueryHelper;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace IW4MAdmin.Application.Misc
+{
+    /// <summary>
+    /// implementation of IMetaService
+    /// used to add and retrieve runtime and persistent meta
+    /// </summary>
+    public class MetaService : IMetaService
+    {
+        private readonly IDictionary<MetaType, List<dynamic>> _metaActions;
+        private readonly IDatabaseContextFactory _contextFactory;
+        private readonly ILogger _logger;
+
+        public MetaService(ILogger logger, IDatabaseContextFactory contextFactory)
+        {
+            _logger = logger;
+            _metaActions = new Dictionary<MetaType, List<dynamic>>();
+            _contextFactory = contextFactory;
+        }
+
+        public async Task AddPersistentMeta(string metaKey, string metaValue, EFClient client)
+        {
+            // this seems to happen if the client disconnects before they've had time to authenticate and be added
+            if (client.ClientId < 1)
+            {
+                return;
+            }
+
+            using var ctx = _contextFactory.CreateContext();
+
+            var existingMeta = await ctx.EFMeta
+                .Where(_meta => _meta.Key == metaKey)
+                .Where(_meta => _meta.ClientId == client.ClientId)
+                .FirstOrDefaultAsync();
+
+            if (existingMeta != null)
+            {
+                existingMeta.Value = metaValue;
+                existingMeta.Updated = DateTime.UtcNow;
+            }
+
+            else
+            {
+                ctx.EFMeta.Add(new EFMeta()
+                {
+                    ClientId = client.ClientId,
+                    Created = DateTime.UtcNow,
+                    Key = metaKey,
+                    Value = metaValue
+                });
+            }
+
+            await ctx.SaveChangesAsync();
+        }
+
+        public async Task<EFMeta> GetPersistentMeta(string metaKey, EFClient client)
+        {
+            using var ctx = _contextFactory.CreateContext(enableTracking: false);
+
+            return await ctx.EFMeta
+                .Where(_meta => _meta.Key == metaKey)
+                .Where(_meta => _meta.ClientId == client.ClientId)
+                .Select(_meta => new EFMeta()
+                {
+                    MetaId = _meta.MetaId,
+                    Key = _meta.Key,
+                    ClientId = _meta.ClientId,
+                    Value = _meta.Value
+                })
+                .FirstOrDefaultAsync();
+        }
+
+        public void AddRuntimeMeta<T, V>(MetaType metaKey, Func<T, Task<IEnumerable<V>>> metaAction) where T : PaginationRequest where V : IClientMeta
+        {
+            if (!_metaActions.ContainsKey(metaKey))
+            {
+                _metaActions.Add(metaKey, new List<dynamic>() { metaAction });
+            }
+
+            else
+            {
+                _metaActions[metaKey].Add(metaAction);
+            }
+        }
+
+        public async Task<IEnumerable<IClientMeta>> GetRuntimeMeta(ClientPaginationRequest request)
+        {
+            var meta = new List<IClientMeta>();
+
+            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>();
+
+                foreach (var individualMetaRegistration in _metaActions[metaType])
+                {
+                    allMeta.AddRange(await individualMetaRegistration(request));
+                }
+
+                return ProcessInformationMeta(allMeta);
+            }
+
+            else
+            {
+                meta = await _metaActions[metaType][0](request) as IEnumerable<T>;
+            }
+
+            return meta;
+        }
+
+        private static IEnumerable<T> ProcessInformationMeta<T>(IEnumerable<T> meta) where T : IClientMeta
+        {
+            var table = new List<List<T>>();
+            var metaWithColumn = meta
+                .Where(_meta => _meta.Column != null);
+
+            var columnGrouping = metaWithColumn
+                .GroupBy(_meta => _meta.Column);
+
+            var metaToSort = meta.Except(metaWithColumn).ToList();
+
+            foreach (var metaItem in columnGrouping)
+            {
+                table.Add(new List<T>(metaItem));
+            }
+
+            while (metaToSort.Count > 0)
+            {
+                var sortingMeta = metaToSort.First();
+
+                int indexOfSmallestColumn()
+                {
+                    int index = 0;
+                    int smallestColumnSize = int.MaxValue;
+                    for (int i = 0; i < table.Count; i++)
+                    {
+                        if (table[i].Count < smallestColumnSize)
+                        {
+                            smallestColumnSize = table[i].Count;
+                            index = i;
+                        }
+                    }
+                    return index;
+                }
+
+                int columnIndex = indexOfSmallestColumn();
+
+                sortingMeta.Column = columnIndex;
+                sortingMeta.Order = columnGrouping
+                    .First(_group => _group.Key == columnIndex)
+                    .Count();
+
+                table[columnIndex].Add(sortingMeta);
+
+                metaToSort.Remove(sortingMeta);
+            }
+
+            return meta;
+        }
+    }
+}

Application/Misc/MiddlewareActionHandler.cs

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

Application/Misc/ParserMatchResult.cs

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

Application/Misc/PluginImporter.cs

@@ -0,0 +1,88 @@
+using System;
+using System.IO;
+using System.Collections.Generic;
+using System.Reflection;
+using SharedLibraryCore.Interfaces;
+using System.Linq;
+using SharedLibraryCore;
+using IW4MAdmin.Application.Misc;
+
+namespace IW4MAdmin.Application.Helpers
+{
+    /// <summary>
+    /// implementation of IPluginImporter
+    /// discovers plugins and script plugins
+    /// </summary>
+    public class PluginImporter : IPluginImporter
+    {
+        private static readonly string PLUGIN_DIR = "Plugins";
+        private readonly ILogger _logger;
+
+        public PluginImporter(ILogger logger)
+        {
+            _logger = logger;
+        }
+
+        /// <summary>
+        /// discovers all the script plugins in the plugins dir
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerable<IPlugin> DiscoverScriptPlugins()
+        {
+            string pluginDir = $"{Utilities.OperatingDirectory}{PLUGIN_DIR}{Path.DirectorySeparatorChar}";
+
+            if (Directory.Exists(pluginDir))
+            {
+                string[] scriptPluginFiles = Directory.GetFiles(pluginDir, "*.js");
+
+                _logger.WriteInfo($"Discovered {scriptPluginFiles.Length} potential script plugins");
+
+                if (scriptPluginFiles.Length > 0)
+                {
+                    foreach (string fileName in scriptPluginFiles)
+                    {
+                        _logger.WriteInfo($"Discovered script plugin {fileName}");
+                        var plugin = new ScriptPlugin(fileName);
+                        yield return plugin;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// discovers all the C# assembly plugins and commands
+        /// </summary>
+        /// <returns></returns>
+        public (IEnumerable<Type>, IEnumerable<Type>) DiscoverAssemblyPluginImplementations()
+        {
+            string pluginDir = $"{Utilities.OperatingDirectory}{PLUGIN_DIR}{Path.DirectorySeparatorChar}";
+            var pluginTypes = Enumerable.Empty<Type>();
+            var commandTypes = Enumerable.Empty<Type>();
+
+            if (Directory.Exists(pluginDir))
+            {
+                var dllFileNames = Directory.GetFiles(pluginDir, "*.dll");
+                _logger.WriteInfo($"Discovered {dllFileNames.Length} potential plugin assemblies");
+
+                if (dllFileNames.Length > 0)
+                {
+                    var assemblies = dllFileNames.Select(_name => Assembly.LoadFrom(_name));
+
+                    pluginTypes = assemblies
+                        .SelectMany(_asm => _asm.GetTypes())
+                        .Where(_assemblyType => _assemblyType.GetInterface(nameof(IPlugin), false) != null);
+
+                    _logger.WriteInfo($"Discovered {pluginTypes.Count()} plugin implementations");
+
+                    commandTypes = assemblies
+                        .SelectMany(_asm => _asm.GetTypes())
+                        .Where(_assemblyType => _assemblyType.IsClass && _assemblyType.BaseType == typeof(Command));
+
+                    _logger.WriteInfo($"Discovered {commandTypes.Count()} plugin commands");
+                }
+            }
+
+            return (pluginTypes, commandTypes);
+        }
+    }
+}

Application/Misc/ScriptCommand.cs

@@ -0,0 +1,42 @@
+using SharedLibraryCore;
+using SharedLibraryCore.Commands;
+using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Interfaces;
+using System;
+using System.Threading.Tasks;
+using static SharedLibraryCore.Database.Models.EFClient;
+
+namespace IW4MAdmin.Application.Misc
+{
+    /// <summary>
+    /// generic script command implementation
+    /// </summary>
+    public class ScriptCommand : Command
+    {
+        private readonly Action<GameEvent> _executeAction;
+
+        public ScriptCommand(string name, string alias, string description, bool isTargetRequired, Permission permission,
+            CommandArgument[] args, Action<GameEvent> executeAction, CommandConfiguration config, ITranslationLookup layout)
+            : base(config, layout)
+        {
+
+            _executeAction = executeAction;
+            Name = name;
+            Alias = alias;
+            Description = description;
+            RequiresTarget = isTargetRequired;
+            Permission = permission;
+            Arguments = args;
+        }
+
+        public override Task ExecuteAsync(GameEvent E)
+        {
+            if (_executeAction == null)
+            {
+                throw new InvalidOperationException($"No execute action defined for command \"{Name}\"");
+            }
+
+            return Task.Run(() => _executeAction(E));
+        }
+    }
+}

Application/Misc/ScriptPlugin.cs

@@ -0,0 +1,310 @@
+using Jint;
+using Jint.Native;
+using Jint.Runtime;
+using Microsoft.CSharp.RuntimeBinder;
+using SharedLibraryCore;
+using SharedLibraryCore.Database.Models;
+using SharedLibraryCore.Exceptions;
+using SharedLibraryCore.Interfaces;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace IW4MAdmin.Application.Misc
+{
+    /// <summary>
+    /// implementation of IPlugin
+    /// used to proxy script plugin requests
+    /// </summary>
+    public class ScriptPlugin : IPlugin
+    {
+        public string Name { get; set; }
+
+        public float Version { get; set; }
+
+        public string Author { get; set; }
+
+        /// <summary>
+        /// indicates if the plugin is a parser
+        /// </summary>
+        public bool IsParser { get; private set; }
+
+        public FileSystemWatcher Watcher { get; private set; }
+
+        private Engine _scriptEngine;
+        private readonly string _fileName;
+        private readonly SemaphoreSlim _onProcessing;
+        private bool successfullyLoaded;
+        private readonly List<string> _registeredCommandNames;
+
+        public ScriptPlugin(string filename, string workingDirectory = null)
+        {
+            _fileName = filename;
+            Watcher = new FileSystemWatcher()
+            {
+                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>();
+        }
+
+        ~ScriptPlugin()
+        {
+            Watcher.Dispose();
+            _onProcessing.Dispose();
+        }
+
+        public async Task Initialize(IManager manager, IScriptCommandFactory scriptCommandFactory, IScriptPluginServiceResolver serviceResolver)
+        {
+            await _onProcessing.WaitAsync();
+
+            try
+            {
+                // 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
+                if (new FileInfo(_fileName).Length == 0L)
+                {
+                    return;
+                }
+
+                bool firstRun = _scriptEngine == null;
+
+                // it's been loaded before so we need to call the unload event
+                if (!firstRun)
+                {
+                    await OnUnloadAsync();
+
+                    foreach (string commandName in _registeredCommandNames)
+                    {
+                        manager.GetLogger(0).WriteDebug($"Removing plugin registered command \"{commandName}\"");
+                        manager.RemoveCommandByName(commandName);
+                    }
+
+                    _registeredCommandNames.Clear();
+                }
+
+                successfullyLoaded = false;
+                string script;
+
+                using (var stream = new FileStream(_fileName, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+                {
+                    using (var reader = new StreamReader(stream, Encoding.Default))
+                    {
+                        script = await reader.ReadToEndAsync();
+                    }
+                }
+
+                _scriptEngine = new Engine(cfg =>
+                    cfg.AllowClr(new[]
+                    {
+                    typeof(System.Net.Http.HttpClient).Assembly,
+                    typeof(EFClient).Assembly,
+                    typeof(Utilities).Assembly,
+                    typeof(Encoding).Assembly
+                    })
+                    .CatchClrExceptions());
+
+                _scriptEngine.Execute(script);
+                _scriptEngine.SetValue("_localization", Utilities.CurrentLocalization);
+                _scriptEngine.SetValue("_serviceResolver", serviceResolver);
+                dynamic pluginObject = _scriptEngine.GetValue("plugin").ToObject();
+
+                Author = pluginObject.author;
+                Name = pluginObject.name;
+                Version = (float)pluginObject.version;
+
+                var commands = _scriptEngine.GetValue("commands");
+
+                if (commands != JsValue.Undefined)
+                {
+                    try
+                    {
+                        foreach (var command in GenerateScriptCommands(commands, scriptCommandFactory))
+                        {
+                            manager.GetLogger(0).WriteDebug($"Adding plugin registered command \"{command.Name}\"");
+                            manager.AddAdditionalCommand(command);
+                            _registeredCommandNames.Add(command.Name);
+                        }
+                    }
+
+                    catch (RuntimeBinderException e)
+                    {
+                        throw new PluginException($"Not all required fields were found: {e.Message}") { PluginFile = _fileName };
+                    }
+                }
+
+                await OnLoadAsync(manager);
+
+                try
+                {
+                    if (pluginObject.isParser)
+                    {
+                        IsParser = true;
+                        IEventParser eventParser = (IEventParser)_scriptEngine.GetValue("eventParser").ToObject();
+                        IRConParser rconParser = (IRConParser)_scriptEngine.GetValue("rconParser").ToObject();
+                        manager.AdditionalEventParsers.Add(eventParser);
+                        manager.AdditionalRConParsers.Add(rconParser);
+                    }
+                }
+
+                catch (RuntimeBinderException) { }
+
+                if (!firstRun)
+                {
+                    await OnLoadAsync(manager);
+                }
+
+                successfullyLoaded = true;
+            }
+
+            catch (JavaScriptException ex)
+            {
+                throw new PluginException($"An error occured while initializing script plugin: {ex.Error} (Line: {ex.Location.Start.Line}, Character: {ex.Location.Start.Column})") { PluginFile = _fileName };
+            }
+
+            catch
+            {
+                throw;
+            }
+
+            finally
+            {
+                if (_onProcessing.CurrentCount == 0)
+                {
+                    _onProcessing.Release(1);
+                }
+            }
+        }
+
+        public async Task OnEventAsync(GameEvent E, Server S)
+        {
+            if (successfullyLoaded)
+            {
+                await _onProcessing.WaitAsync();
+
+                try
+                {
+                    _scriptEngine.SetValue("_gameEvent", E);
+                    _scriptEngine.SetValue("_server", S);
+                    _scriptEngine.SetValue("_IW4MAdminClient", Utilities.IW4MAdminClient(S));
+                    _scriptEngine.Execute("plugin.onEventAsync(_gameEvent, _server)").GetCompletionValue();
+                }
+
+                catch
+                {
+                    throw;
+                }
+
+                finally
+                {
+                    if (_onProcessing.CurrentCount == 0)
+                    {
+                        _onProcessing.Release(1);
+                    }
+                }
+            }
+        }
+
+        public Task OnLoadAsync(IManager manager)
+        {
+            manager.GetLogger(0).WriteDebug($"OnLoad executing for {Name}");
+            _scriptEngine.SetValue("_manager", manager);
+            return Task.FromResult(_scriptEngine.Execute("plugin.onLoadAsync(_manager)").GetCompletionValue());
+        }
+
+        public Task OnTickAsync(Server S)
+        {
+            _scriptEngine.SetValue("_server", S);
+            return Task.FromResult(_scriptEngine.Execute("plugin.onTickAsync(_server)").GetCompletionValue());
+        }
+
+        public async Task OnUnloadAsync()
+        {
+            if (successfullyLoaded)
+            {
+                await Task.FromResult(_scriptEngine.Execute("plugin.onUnloadAsync()").GetCompletionValue());
+            }
+        }
+
+        /// <summary>
+        /// finds declared script commands in the script plugin
+        /// </summary>
+        /// <param name="commands">commands value from jint parser</param>
+        /// <param name="scriptCommandFactory">factory to create the command from</param>
+        /// <returns></returns>
+        public IEnumerable<IManagerCommand> GenerateScriptCommands(JsValue commands, IScriptCommandFactory scriptCommandFactory)
+        {
+            List<IManagerCommand> commandList = new List<IManagerCommand>();
+
+            // go through each defined command
+            foreach (var command in commands.AsArray())
+            {
+                dynamic dynamicCommand = command.ToObject();
+                string name = dynamicCommand.name;
+                string alias = dynamicCommand.alias;
+                string description = dynamicCommand.description;
+                string permission = dynamicCommand.permission;
+                bool targetRequired = false;
+
+                List<(string, bool)> args = new List<(string, bool)>();
+                dynamic arguments = null;
+
+                try
+                {
+                    arguments = dynamicCommand.arguments;
+                }
+
+                catch (RuntimeBinderException)
+                {
+                    // arguments are optional
+                }
+
+                try
+                {
+                    targetRequired = dynamicCommand.targetRequired;
+                }
+
+                catch (RuntimeBinderException)
+                {
+                    // arguments are optional
+                }
+
+                if (arguments != null)
+                {
+                    foreach (var arg in dynamicCommand.arguments)
+                    {
+                        args.Add((arg.name, (bool)arg.required));
+                    }
+                }
+
+                void execute(GameEvent e)
+                {
+                    _scriptEngine.SetValue("_event", e);
+                    var jsEventObject = _scriptEngine.GetValue("_event");
+
+                    try
+                    {
+                        dynamicCommand.execute.Target.Invoke(jsEventObject);
+                    }
+
+                    catch (JavaScriptException ex)
+                    {
+                        throw new PluginException($"An error occured while executing action for script plugin: {ex.Error} (Line: {ex.Location.Start.Line}, Character: {ex.Location.Start.Column})") { PluginFile = _fileName };
+                    }
+                }
+
+                commandList.Add(scriptCommandFactory.CreateScriptCommand(name, alias, description, permission, targetRequired, args, execute));
+            }
+
+            return commandList;
+        }
+    }
+}

Application/Misc/ScriptPluginServiceResolver.cs

@@ -0,0 +1,48 @@
+using SharedLibraryCore.Interfaces;
+using System;
+using System.Linq;
+
+namespace IW4MAdmin.Application.Misc
+{
+    /// <summary>
+    /// implementation of IScriptPluginServiceResolver
+    /// </summary>
+    public class ScriptPluginServiceResolver : IScriptPluginServiceResolver
+    {
+        private readonly IServiceProvider _serviceProvider;
+
+        public ScriptPluginServiceResolver(IServiceProvider serviceProvider)
+        {
+            _serviceProvider = serviceProvider;
+        }
+
+        public object ResolveService(string serviceName)
+        {
+            var serviceType = DetermineRootType(serviceName);
+            return _serviceProvider.GetService(serviceType);
+        }
+
+        public object ResolveService(string serviceName, string[] genericParameters)
+        {
+            var serviceType = DetermineRootType(serviceName, genericParameters.Length);
+            var genericTypes = genericParameters.Select(_genericTypeParam => DetermineRootType(_genericTypeParam));
+            var resolvedServiceType = serviceType.MakeGenericType(genericTypes.ToArray());
+            return _serviceProvider.GetService(resolvedServiceType);
+        }
+
+        private Type DetermineRootType(string serviceName, int genericParamCount = 0)
+        {
+            var typeCollection = AppDomain.CurrentDomain.GetAssemblies()
+                       .SelectMany(t => t.GetTypes());
+            string generatedName = $"{serviceName}{(genericParamCount == 0 ? "" : $"`{genericParamCount}")}".ToLower();
+            var serviceType = typeCollection.FirstOrDefault(_type => _type.Name.ToLower() == generatedName);
+
+            if (serviceType == null)
+            {
+                throw new InvalidOperationException($"No object type '{serviceName}' defined in loaded assemblies");
+            }
+
+            return serviceType;
+        }
+    }
+}

Application/Misc/SerializationHelpers.cs

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

Application/RCon/ConnectionState.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Net.Sockets;
+using System.Threading;
+
+namespace IW4MAdmin.Application.RCon
+{
+    /// <summary>
+    /// used to keep track of the udp connection state
+    /// </summary>
+    internal class ConnectionState
+    {
+        ~ConnectionState()
+        {
+            OnComplete.Dispose();
+            OnSentData.Dispose();
+            OnReceivedData.Dispose();
+        }
+
+        public int ConnectionAttempts { get; set; }
+        const int BufferSize = 4096;
+        public readonly byte[] ReceiveBuffer = new byte[BufferSize];
+        public readonly SemaphoreSlim OnComplete = new SemaphoreSlim(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;
+    }
+}

Application/RCon/RConConnection.cs

@@ -0,0 +1,363 @@
+using SharedLibraryCore;
+using SharedLibraryCore.Exceptions;
+using SharedLibraryCore.Interfaces;
+using SharedLibraryCore.RCon;
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Sockets;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+
+namespace IW4MAdmin.Application.RCon
+{
+    /// <summary>
+    /// implementation of IRConConnection
+    /// </summary>
+    public class RConConnection : IRConConnection
+    {
+        static readonly ConcurrentDictionary<EndPoint, ConnectionState> ActiveQueries = new ConcurrentDictionary<EndPoint, ConnectionState>();
+        public IPEndPoint Endpoint { get; private set; }
+        public string RConPassword { get; private set; }
+
+        private IRConParserConfiguration config;
+        private readonly ILogger _log;
+        private readonly Encoding _gameEncoding;
+
+        public RConConnection(string ipAddress, int port, string password, ILogger log, Encoding gameEncoding)
+        {
+            Endpoint = new IPEndPoint(IPAddress.Parse(ipAddress), port);
+            _gameEncoding = gameEncoding;
+            RConPassword = password;
+            _log = log;
+        }
+
+        public void SetConfiguration(IRConParserConfiguration config)
+        {
+            this.config = config;
+        }
+
+        public async Task<string[]> SendQueryAsync(StaticHelpers.QueryType type, string parameters = "")
+        {
+            if (!ActiveQueries.ContainsKey(this.Endpoint))
+            {
+                ActiveQueries.TryAdd(this.Endpoint, new ConnectionState());
+            }
+
+            var connectionState = ActiveQueries[this.Endpoint];
+
+#if DEBUG == true
+            _log.WriteDebug($"Waiting for semaphore to be released [{this.Endpoint}]");
+#endif
+            // enter the semaphore so only one query is sent at a time per server.
+            await connectionState.OnComplete.WaitAsync();
+
+            var timeSinceLastQuery = (DateTime.Now - connectionState.LastQuery).TotalMilliseconds;
+
+            if (timeSinceLastQuery < StaticHelpers.FloodProtectionInterval)
+            {
+                await Task.Delay(StaticHelpers.FloodProtectionInterval - (int)timeSinceLastQuery);
+            }
+
+            connectionState.LastQuery = DateTime.Now;
+
+#if DEBUG == true
+            _log.WriteDebug($"Semaphore has been released [{this.Endpoint}]");
+            _log.WriteDebug($"Query [{this.Endpoint},{type.ToString()},{parameters}]");
+#endif
+
+            byte[] payload = null;
+            bool waitForResponse = config.WaitForResponse;
+
+            string convertEncoding(string text)
+            {
+                byte[] convertedBytes = Utilities.EncodingType.GetBytes(text);
+                return _gameEncoding.GetString(convertedBytes);
+            }
+
+            try
+            {
+                string convertedRConPassword = convertEncoding(RConPassword);
+                string convertedParameters = convertEncoding(parameters);
+
+                switch (type)
+                {
+                    case StaticHelpers.QueryType.GET_DVAR:
+                        waitForResponse |= true;
+                        payload = string.Format(config.CommandPrefixes.RConGetDvar, convertedRConPassword, convertedParameters + '\0').Select(Convert.ToByte).ToArray();
+                        break;
+                    case StaticHelpers.QueryType.SET_DVAR:
+                        payload = string.Format(config.CommandPrefixes.RConSetDvar, convertedRConPassword, convertedParameters + '\0').Select(Convert.ToByte).ToArray();
+                        break;
+                    case StaticHelpers.QueryType.COMMAND:
+                        payload = string.Format(config.CommandPrefixes.RConCommand, convertedRConPassword, convertedParameters + '\0').Select(Convert.ToByte).ToArray();
+                        break;
+                    case StaticHelpers.QueryType.GET_STATUS:
+                        waitForResponse |= true;
+                        payload = (config.CommandPrefixes.RConGetStatus + '\0').Select(Convert.ToByte).ToArray();
+                        break;
+                    case StaticHelpers.QueryType.GET_INFO:
+                        waitForResponse |= true;
+                        payload = (config.CommandPrefixes.RConGetInfo + '\0').Select(Convert.ToByte).ToArray();
+                        break;
+                    case StaticHelpers.QueryType.COMMAND_STATUS:
+                        waitForResponse |= true;
+                        payload = string.Format(config.CommandPrefixes.RConCommand, convertedRConPassword, "status\0").Select(Convert.ToByte).ToArray();
+                        break;
+                }
+            }
+
+            // this happens when someone tries to send something that can't be converted into a 7 bit character set
+            // e.g: emoji -> windows-1252
+            catch (OverflowException)
+            {
+                connectionState.OnComplete.Release(1);
+                throw new NetworkException($"Invalid character encountered when converting encodings - {parameters}");
+            }
+
+            byte[][] response = null;
+
+        retrySend:
+            using (var socket = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp)
+            {
+                DontFragment = true,
+                Ttl = 100,
+                ExclusiveAddressUse = true,
+            })
+            {
+                connectionState.SendEventArgs.UserToken = socket;
+                connectionState.OnSentData.Reset();
+                connectionState.OnReceivedData.Reset();
+                connectionState.ConnectionAttempts++;
+                connectionState.BytesReadPerSegment.Clear();
+#if DEBUG == true
+                _log.WriteDebug($"Sending {payload.Length} bytes to [{this.Endpoint}] ({connectionState.ConnectionAttempts}/{StaticHelpers.AllowedConnectionFails})");
+#endif
+                try
+                {
+                    response = await SendPayloadAsync(payload, waitForResponse);
+
+                    if ((response.Length == 0 || response[0].Length == 0) && waitForResponse)
+                    {
+                        throw new NetworkException("Expected response but got 0 bytes back");
+                    }
+
+                    connectionState.ConnectionAttempts = 0;
+                }
+
+                catch
+                {
+                    if (connectionState.ConnectionAttempts < StaticHelpers.AllowedConnectionFails)
+                    {
+                        await Task.Delay(StaticHelpers.FloodProtectionInterval);
+                        goto retrySend;
+                    }
+
+                    throw new NetworkException(Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_COMMUNICATION"].FormatExt(Endpoint));
+                }
+
+                finally
+                {
+                    if (connectionState.OnComplete.CurrentCount == 0)
+                    {
+                        connectionState.OnComplete.Release(1);
+                    }
+                }
+            }
+
+            if (response.Length == 0)
+            {
+                _log.WriteWarning($"Received empty response for request [{type.ToString()}, {parameters}, {Endpoint.ToString()}]");
+                return new string[0];
+            }
+
+            string responseString = type == StaticHelpers.QueryType.COMMAND_STATUS ?
+               ReassembleSegmentedStatus(response) :
+               _gameEncoding.GetString(response[0]) + '\n';
+
+            // note: not all games respond if the pasword is wrong or not set
+            if (responseString.Contains("Invalid password") || responseString.Contains("rconpassword"))
+            {
+                throw new NetworkException(Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_RCON_INVALID"]);
+            }
+
+            if (responseString.Contains("rcon_password"))
+            {
+                throw new NetworkException(Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_RCON_NOTSET"]);
+            }
+
+            if (responseString.Contains(config.ServerNotRunningResponse))
+            {
+                throw new ServerException(Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_NOT_RUNNING"].FormatExt(Endpoint.ToString()));
+            }
+
+            string responseHeaderMatch = Regex.Match(responseString, config.CommandPrefixes.RConResponse).Value;
+            string[] headerSplit = responseString.Split(type == StaticHelpers.QueryType.GET_INFO ? config.CommandPrefixes.RconGetInfoResponseHeader : responseHeaderMatch);
+
+            if (headerSplit.Length != 2)
+            {
+                throw new NetworkException("Unexpected response header from server");
+            }
+
+            string[] splitResponse = headerSplit.Last().Split(new char[] { '\n' }, StringSplitOptions.RemoveEmptyEntries);
+            return splitResponse;
+        }
+
+        /// <summary>
+        /// reassembles broken status segments into the 'correct' ordering
+        /// <remarks>this is primarily for T7, and is really only reliable for 2 segments</remarks>
+        /// </summary>
+        /// <param name="segments">array of segmented byte arrays</param>
+        /// <returns></returns>
+        public string ReassembleSegmentedStatus(byte[][] segments)
+        {
+            var splitStatusStrings = new List<string>();
+
+            foreach (byte[] segment in segments)
+            {
+                string responseString = _gameEncoding.GetString(segment, 0, segment.Length);
+                var statusHeaderMatch = config.StatusHeader.PatternMatcher.Match(responseString);
+                if (statusHeaderMatch.Success)
+                {
+                    splitStatusStrings.Insert(0, responseString.TrimEnd('\0'));
+                }
+
+                else
+                {
+                    splitStatusStrings.Add(responseString.Replace(config.CommandPrefixes.RConResponse, "").TrimEnd('\0'));
+                }
+            }
+
+            return string.Join("", splitStatusStrings);
+        }
+
+        private async Task<byte[][]> SendPayloadAsync(byte[] payload, bool waitForResponse)
+        {
+            var connectionState = ActiveQueries[this.Endpoint];
+            var rconSocket = (Socket)connectionState.SendEventArgs.UserToken;
+
+            if (connectionState.ReceiveEventArgs.RemoteEndPoint == null &&
+                connectionState.SendEventArgs.RemoteEndPoint == null)
+            {
+                // setup the event handlers only once because we're reusing the event args
+                connectionState.SendEventArgs.Completed += OnDataSent;
+                connectionState.ReceiveEventArgs.Completed += OnDataReceived;
+                connectionState.SendEventArgs.RemoteEndPoint = this.Endpoint;
+                connectionState.ReceiveEventArgs.RemoteEndPoint = this.Endpoint;
+                connectionState.ReceiveEventArgs.DisconnectReuseSocket = true;
+                connectionState.SendEventArgs.DisconnectReuseSocket = true;
+            }
+
+            connectionState.SendEventArgs.SetBuffer(payload);
+
+            // send the data to the server
+            bool sendDataPending = rconSocket.SendToAsync(connectionState.SendEventArgs);
+
+            if (sendDataPending)
+            {
+                // the send has not been completed asyncronously
+                if (!await Task.Run(() => connectionState.OnSentData.Wait(StaticHelpers.SocketTimeout)))
+                {
+                    rconSocket.Close();
+                    throw new NetworkException("Timed out sending data", rconSocket);
+                }
+            }
+
+            if (!waitForResponse)
+            {
+                return new byte[0][];
+            }
+
+            connectionState.ReceiveEventArgs.SetBuffer(connectionState.ReceiveBuffer);
+
+            // get our response back
+            bool receiveDataPending = rconSocket.ReceiveFromAsync(connectionState.ReceiveEventArgs);
+
+            if (receiveDataPending)
+            {
+                if (!await Task.Run(() => connectionState.OnReceivedData.Wait(10000)))
+                {
+                    rconSocket.Close();
+                    throw new NetworkException("Timed out waiting for response", rconSocket);
+                }
+            }
+
+            rconSocket.Close();
+
+            var responseList = new List<byte[]>();
+            int totalBytesRead = 0;
+
+            foreach (int bytesRead in connectionState.BytesReadPerSegment)
+            {
+                responseList.Add(connectionState.ReceiveBuffer
+                    .Skip(totalBytesRead)
+                    .Take(bytesRead)
+                    .ToArray());
+
+                totalBytesRead += bytesRead;
+            }
+
+            return responseList.ToArray();
+        }
+
+        private void OnDataReceived(object sender, SocketAsyncEventArgs e)
+        {
+#if DEBUG == true
+            _log.WriteDebug($"Read {e.BytesTransferred} bytes from {e.RemoteEndPoint.ToString()}");
+#endif
+
+            // this occurs when we close the socket
+            if (e.BytesTransferred == 0)
+            {
+                ActiveQueries[this.Endpoint].OnReceivedData.Set();
+                return;
+            }
+
+            if (sender is Socket sock)
+            {
+                var state = ActiveQueries[this.Endpoint];
+                state.BytesReadPerSegment.Add(e.BytesTransferred);
+
+                try
+                {
+                    // we still have available data so the payload was segmented
+                    if (sock.Available > 0)
+                    {
+                        state.ReceiveEventArgs.SetBuffer(state.ReceiveBuffer, e.BytesTransferred, state.ReceiveBuffer.Length - e.BytesTransferred);
+
+                        if (!sock.ReceiveAsync(state.ReceiveEventArgs))
+                        {
+#if DEBUG == true
+                            _log.WriteDebug($"Read {state.ReceiveEventArgs.BytesTransferred} synchronous bytes from {e.RemoteEndPoint.ToString()}");
+#endif
+                            // we need to increment this here because the callback isn't executed if there's no pending IO
+                            state.BytesReadPerSegment.Add(state.ReceiveEventArgs.BytesTransferred);
+                            ActiveQueries[this.Endpoint].OnReceivedData.Set();
+                        }
+                    }
+
+                    else
+                    {
+                        ActiveQueries[this.Endpoint].OnReceivedData.Set();
+                    }
+                }
+
+                catch (ObjectDisposedException)
+                {
+                    ActiveQueries[this.Endpoint].OnReceivedData.Set();
+                }
+            }
+        }
+
+        private void OnDataSent(object sender, SocketAsyncEventArgs e)
+        {
+#if DEBUG == true
+            _log.WriteDebug($"Sent {e.Buffer?.Length} bytes to {e.ConnectSocket?.RemoteEndPoint?.ToString()}");
+#endif
+            ActiveQueries[this.Endpoint].OnSentData.Set();
+        }
+    }
+}

Application/RconParsers/BaseRConParser.cs

@@ -12,11 +12,11 @@ using static SharedLibraryCore.Server;
 
 namespace IW4MAdmin.Application.RconParsers
 {
-    class BaseRConParser : IRConParser
+    public class BaseRConParser : IRConParser
     {
-        public BaseRConParser()
+        public BaseRConParser(IParserRegexFactory parserRegexFactory)
         {
-            Configuration = new DynamicRConParserConfiguration()
+            Configuration = new DynamicRConParserConfiguration(parserRegexFactory)
             {
                 CommandPrefixes = new CommandPrefix()
                 {
@@ -31,10 +31,12 @@ namespace IW4MAdmin.Application.RconParsers
                     RConGetStatus = "ÿÿÿÿgetstatus",
                     RConGetInfo = "ÿÿÿÿgetinfo",
                     RConResponse = "ÿÿÿÿprint",
+                    RconGetInfoResponseHeader = "ÿÿÿÿinfoResponse"
                 },
+                ServerNotRunningResponse = "Server is not running."
             };
 
-            Configuration.Status.Pattern = @"^ *([0-9]+) +-?([0-9]+) +((?:[A-Z]+|[0-9]+)) +((?:[a-z]|[0-9]){8,32}|(?:[a-z]|[0-9]){8,32}|bot[0-9]+|(?:[0-9]+)) +(.{0,32}) +([0-9]+) +(\d+\.\d+\.\d+.\d+\:-*\d{1,5}|0+.0+:-*\d{1,5}|loopback) +(-*[0-9]+) +([0-9]+) *$";
+            Configuration.Status.Pattern = @"^ *([0-9]+) +-?([0-9]+) +((?:[A-Z]+|[0-9]+)) +((?:[a-z]|[0-9]){8,32}|(?:[a-z]|[0-9]){8,32}|bot[0-9]+|(?:[0-9]+)) *(.{0,32}) +([0-9]+) +(\d+\.\d+\.\d+.\d+\:-*\d{1,5}|0+.0+:-*\d{1,5}|loopback|unknown) +(-*[0-9]+) +([0-9]+) *$";
             Configuration.Status.AddMapping(ParserRegex.GroupType.RConClientNumber, 1);
             Configuration.Status.AddMapping(ParserRegex.GroupType.RConScore, 2);
             Configuration.Status.AddMapping(ParserRegex.GroupType.RConPing, 3);
@@ -48,133 +50,218 @@ namespace IW4MAdmin.Application.RconParsers
             Configuration.Dvar.AddMapping(ParserRegex.GroupType.RConDvarDefaultValue, 3);
             Configuration.Dvar.AddMapping(ParserRegex.GroupType.RConDvarLatchedValue, 4);
             Configuration.Dvar.AddMapping(ParserRegex.GroupType.RConDvarDomain, 5);
+
+            Configuration.StatusHeader.Pattern = "num +score +ping +guid +name +lastmsg +address +qport +rate *";
+            Configuration.GametypeStatus.Pattern = "";
+            Configuration.MapStatus.Pattern = @"map: (([a-z]|_|\d)+)";
+            Configuration.MapStatus.AddMapping(ParserRegex.GroupType.RConStatusMap, 1);
+
+            if (!Configuration.DefaultDvarValues.ContainsKey("mapname"))
+            {
+                Configuration.DefaultDvarValues.Add("mapname", "Unknown");
+            }
         }
 
         public IRConParserConfiguration Configuration { get; set; }
-
+        public virtual string Version { get; set; } = "CoD";
-        public string Version { get; set; } = "CoD";
         public Game GameName { get; set; } = Game.COD;
         public bool CanGenerateLogPath { get; set; } = true;
+        public string Name { get; set; } = "Call of Duty";
 
-        public async Task<string[]> ExecuteCommandAsync(Connection connection, string command)
+        public async Task<string[]> ExecuteCommandAsync(IRConConnection connection, string command)
         {
             var response = await connection.SendQueryAsync(StaticHelpers.QueryType.COMMAND, command);
             return response.Skip(1).ToArray();
         }
 
-        public async Task<Dvar<T>> GetDvarAsync<T>(Connection connection, string dvarName)
+        public async Task<Dvar<T>> GetDvarAsync<T>(IRConConnection connection, string dvarName, T fallbackValue = default)
         {
             string[] lineSplit = await connection.SendQueryAsync(StaticHelpers.QueryType.GET_DVAR, dvarName);
-            string response = string.Join('\n', lineSplit.Skip(1));
+            string response = string.Join('\n', lineSplit).TrimEnd('\0');
-
-            if (!lineSplit[0].Contains(Configuration.CommandPrefixes.RConResponse))
-            {
-                throw new DvarException($"Could not retrieve DVAR \"{dvarName}\"");
-            }
-
-            if (response.Contains("Unknown command"))
-            {
-                throw new DvarException($"DVAR \"{dvarName}\" does not exist");
-            }
-
             var match = Regex.Match(response, Configuration.Dvar.Pattern);
 
-            if (!match.Success)
+            if (response.Contains("Unknown command") ||
+                !match.Success)
             {
-                throw new DvarException($"Could not retrieve DVAR \"{dvarName}\"");
+                if (fallbackValue != null)
+                {
+                    return new Dvar<T>()
+                    {
+                        Name = dvarName,
+                        Value = fallbackValue
+                    };
+                }
+
+                throw new DvarException(Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_DVAR"].FormatExt(dvarName));
             }
 
-            string value = match.Groups[Configuration.Dvar.GroupMapping[ParserRegex.GroupType.RConDvarValue]].Value.StripColors();
+            string value = match.Groups[Configuration.Dvar.GroupMapping[ParserRegex.GroupType.RConDvarValue]].Value;
-            string defaultValue = match.Groups[Configuration.Dvar.GroupMapping[ParserRegex.GroupType.RConDvarDefaultValue]].Value.StripColors();
+            string defaultValue = match.Groups[Configuration.Dvar.GroupMapping[ParserRegex.GroupType.RConDvarDefaultValue]].Value;
-            string latchedValue = match.Groups[Configuration.Dvar.GroupMapping[ParserRegex.GroupType.RConDvarLatchedValue]].Value.StripColors();
+            string latchedValue = match.Groups[Configuration.Dvar.GroupMapping[ParserRegex.GroupType.RConDvarLatchedValue]].Value;
+
+            string removeTrailingColorCode(string input) => Regex.Replace(input, @"\^7$", "");
+
+            value = removeTrailingColorCode(value);
+            defaultValue = removeTrailingColorCode(defaultValue);
+            latchedValue = removeTrailingColorCode(latchedValue);
 
             return new Dvar<T>()
             {
-                Name = match.Groups[Configuration.Dvar.GroupMapping[ParserRegex.GroupType.RConDvarName]].Value.StripColors(),
+                Name = match.Groups[Configuration.Dvar.GroupMapping[ParserRegex.GroupType.RConDvarName]].Value,
-                Value = string.IsNullOrEmpty(value) ? default(T) : (T)Convert.ChangeType(value, typeof(T)),
+                Value = string.IsNullOrEmpty(value) ? default : (T)Convert.ChangeType(value, typeof(T)),
-                DefaultValue = string.IsNullOrEmpty(defaultValue) ? default(T) : (T)Convert.ChangeType(defaultValue, typeof(T)),
+                DefaultValue = string.IsNullOrEmpty(defaultValue) ? default : (T)Convert.ChangeType(defaultValue, typeof(T)),
-                LatchedValue = string.IsNullOrEmpty(latchedValue) ? default(T) : (T)Convert.ChangeType(latchedValue, typeof(T)),
+                LatchedValue = string.IsNullOrEmpty(latchedValue) ? default : (T)Convert.ChangeType(latchedValue, typeof(T)),
-                Domain = match.Groups[Configuration.Dvar.GroupMapping[ParserRegex.GroupType.RConDvarDomain]].Value.StripColors()
+                Domain = match.Groups[Configuration.Dvar.GroupMapping[ParserRegex.GroupType.RConDvarDomain]].Value
             };
         }
 
-        public async Task<List<EFClient>> GetStatusAsync(Connection connection)
+        public virtual async Task<(List<EFClient>, string, string)> GetStatusAsync(IRConConnection connection)
         {
             string[] response = await connection.SendQueryAsync(StaticHelpers.QueryType.COMMAND_STATUS);
-            return ClientsFromStatus(response);
+#if DEBUG
+            foreach (var line in response)
+            {
+                Console.WriteLine(line);
+            }
+#endif
+            return (ClientsFromStatus(response), MapFromStatus(response), GameTypeFromStatus(response));
         }
 
-        public async Task<bool> SetDvarAsync(Connection connection, string dvarName, object dvarValue)
+        private string MapFromStatus(string[] response)
         {
-            return (await connection.SendQueryAsync(StaticHelpers.QueryType.SET_DVAR, $"{dvarName} {dvarValue}")).Length > 0;
+            string map = null;
+            foreach (var line in response)
+            {
+                var regex = Regex.Match(line, Configuration.MapStatus.Pattern);
+                if (regex.Success)
+                {
+                    map = regex.Groups[Configuration.MapStatus.GroupMapping[ParserRegex.GroupType.RConStatusMap]].ToString();
+                }
+            }
+
+            return map;
+        }
+
+        private string GameTypeFromStatus(string[] response)
+        {
+            if (string.IsNullOrWhiteSpace(Configuration.GametypeStatus.Pattern))
+            {
+                return null;
+            }
+
+            string gametype = null;
+            foreach (var line in response)
+            {
+                var regex = Regex.Match(line, Configuration.GametypeStatus.Pattern);
+                if (regex.Success)
+                {
+                    gametype = regex.Groups[Configuration.GametypeStatus.GroupMapping[ParserRegex.GroupType.RConStatusGametype]].ToString();
+                }
+            }
+
+            return gametype;
+        }
+
+        public async Task<bool> SetDvarAsync(IRConConnection connection, string dvarName, object dvarValue)
+        {
+            string dvarString = (dvarValue is string str)
+                ? $"{dvarName} \"{str}\""
+                : $"{dvarName} {dvarValue.ToString()}";
+
+            return (await connection.SendQueryAsync(StaticHelpers.QueryType.SET_DVAR, dvarString)).Length > 0;
         }
 
         private List<EFClient> ClientsFromStatus(string[] Status)
         {
             List<EFClient> StatusPlayers = new List<EFClient>();
 
-            if (Status.Length < 4)
+            bool parsedHeader = false;
-            {
-                throw new ServerException("Unexpected status response received");
-            }
-
-            int validMatches = 0;
             foreach (string statusLine in Status)
             {
                 string responseLine = statusLine.Trim();
 
-                var regex = Regex.Match(responseLine, Configuration.Status.Pattern, RegexOptions.IgnoreCase);
+                if (Configuration.StatusHeader.PatternMatcher.Match(responseLine).Success)
-
-                if (regex.Success)
                 {
-                    validMatches++;
+                    parsedHeader = true;
-                    int clientNumber = int.Parse(regex.Groups[Configuration.Status.GroupMapping[ParserRegex.GroupType.RConClientNumber]].Value);
+                    continue;
-                    int score = int.Parse(regex.Groups[Configuration.Status.GroupMapping[ParserRegex.GroupType.RConScore]].Value);
+                }
+
+                var match = Configuration.Status.PatternMatcher.Match(responseLine);
+
+                if (match.Success)
+                {
+                    int clientNumber = int.Parse(match.Values[Configuration.Status.GroupMapping[ParserRegex.GroupType.RConClientNumber]]);
+                    int score = int.Parse(match.Values[Configuration.Status.GroupMapping[ParserRegex.GroupType.RConScore]]);
 
                     int ping = 999;
 
                     // their state can be CNCT, ZMBI etc
-                    if (regex.Groups[Configuration.Status.GroupMapping[ParserRegex.GroupType.RConPing]].Value.Length <= 3)
+                    if (match.Values[Configuration.Status.GroupMapping[ParserRegex.GroupType.RConPing]].Length <= 3)
                     {
-                        ping = int.Parse(regex.Groups[Configuration.Status.GroupMapping[ParserRegex.GroupType.RConPing]].Value);
+                        ping = int.Parse(match.Values[Configuration.Status.GroupMapping[ParserRegex.GroupType.RConPing]]);
                     }
 
-                    long networkId = regex.Groups[Configuration.Status.GroupMapping[ParserRegex.GroupType.RConNetworkId]].Value.ConvertLong();
+                    long networkId;
-                    string name = regex.Groups[Configuration.Status.GroupMapping[ParserRegex.GroupType.RConName]].Value.StripColors().Trim();
+                    string name = match.Values[Configuration.Status.GroupMapping[ParserRegex.GroupType.RConName]].TrimNewLine();
-                    int? ip = regex.Groups[Configuration.Status.GroupMapping[ParserRegex.GroupType.RConIpAddress]].Value.Split(':')[0].ConvertToIP();
+                    string networkIdString;
+
+                    try
+                    {
+                        networkIdString = match.Values[Configuration.Status.GroupMapping[ParserRegex.GroupType.RConNetworkId]];
+
+                        networkId = networkIdString.IsBotGuid() ?
+                            name.GenerateGuidFromString() :
+                            networkIdString.ConvertGuidToLong(Configuration.GuidNumberStyle);
+                    }
+
+                    catch (FormatException)
+                    {
+                        continue;
+                    }
+
+                    int? ip = match.Values[Configuration.Status.GroupMapping[ParserRegex.GroupType.RConIpAddress]].Split(':')[0].ConvertToIP();
 
                     var client = new EFClient()
                     {
                         CurrentAlias = new EFAlias()
                         {
-                            Name = name
+                            Name = name,
+                            IPAddress = ip
                         },
                         NetworkId = networkId,
                         ClientNumber = clientNumber,
-                        IPAddress = ip,
                         Ping = ping,
                         Score = score,
-                        IsBot = ip == null,
                         State = EFClient.ClientState.Connecting
                     };
 
-                    //// they've not fully connected yet
+                    client.SetAdditionalProperty("BotGuid", networkIdString);
-                    //if (!client.IsBot && ping == 999)
-                    //{
-                    //    continue;
-                    //}
 
                     StatusPlayers.Add(client);
                 }
             }
 
-            // this happens if status is requested while map is rotating
+            // this can happen if status is requested while map is rotating and we get a log dump back
-            if (Status.Length > 5 && validMatches == 0)
+            if (!parsedHeader)
             {
-                throw new ServerException("Server is rotating map");
+                throw new ServerException(Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_UNEXPECTED_STATUS"]);
             }
 
             return StatusPlayers;
         }
+
+        public string GetOverrideDvarName(string dvarName)
+        {
+            if (Configuration.OverrideDvarNameMapping.ContainsKey(dvarName))
+            {
+                return Configuration.OverrideDvarNameMapping[dvarName];
+            }
+
+            return dvarName;
+        }
+
+        public T GetDefaultDvarValue<T>(string dvarName) => Configuration.DefaultDvarValues.ContainsKey(dvarName) ?
+            (T)Convert.ChangeType(Configuration.DefaultDvarValues[dvarName], typeof(T)) :
+            default;
     }
 }

Application/RconParsers/DynamicRConParser.cs

@@ -1,4 +1,6 @@
-namespace IW4MAdmin.Application.RconParsers
+using SharedLibraryCore.Interfaces;
+
+namespace IW4MAdmin.Application.RconParsers
 {
     /// <summary>
     /// empty implementation of the IW4RConParser
@@ -6,5 +8,8 @@
     /// </summary>
     sealed internal class DynamicRConParser : BaseRConParser
     {
+        public DynamicRConParser(IParserRegexFactory parserRegexFactory) : base(parserRegexFactory)
+        {
+        }
     }
 }

Application/RconParsers/DynamicRConParserConfiguration.cs

@@ -1,6 +1,7 @@
-using SharedLibraryCore;
+using SharedLibraryCore.Interfaces;
-using SharedLibraryCore.Interfaces;
 using SharedLibraryCore.RCon;
+using System.Collections.Generic;
+using System.Globalization;
 
 namespace IW4MAdmin.Application.RconParsers
 {
@@ -8,11 +9,27 @@ namespace IW4MAdmin.Application.RconParsers
     /// generic implementation of the IRConParserConfiguration
     /// allows script plugins to generate dynamic RCon configurations
     /// </summary>
-    sealed internal class DynamicRConParserConfiguration : IRConParserConfiguration
+    public class DynamicRConParserConfiguration : IRConParserConfiguration
     {
         public CommandPrefix CommandPrefixes { get; set; }
-        public ParserRegex Status { get; set; } = new ParserRegex();
+        public ParserRegex Status { get; set; }
-        public ParserRegex Dvar { get; set; } = new ParserRegex();
+        public ParserRegex MapStatus { get; set; }
+        public ParserRegex GametypeStatus { get; set; }
+        public ParserRegex Dvar { get; set; }
+        public ParserRegex StatusHeader { get; set; }
+        public string ServerNotRunningResponse { get; set; }
         public bool WaitForResponse { get; set; } = true;
+        public NumberStyles GuidNumberStyle { get; set; } = NumberStyles.HexNumber;
+        public IDictionary<string, string> OverrideDvarNameMapping { get; set; } = new Dictionary<string, string>();
+        public IDictionary<string, string> DefaultDvarValues { get; set; } = new Dictionary<string, string>();
+
+        public DynamicRConParserConfiguration(IParserRegexFactory parserRegexFactory)
+        {
+            Status = parserRegexFactory.CreateParserRegex();
+            MapStatus = parserRegexFactory.CreateParserRegex();
+            GametypeStatus = parserRegexFactory.CreateParserRegex();
+            Dvar = parserRegexFactory.CreateParserRegex();
+            StatusHeader = parserRegexFactory.CreateParserRegex();
+        }
     }
 }

Application/SerialGameEventHandler.cs

@@ -0,0 +1,41 @@
+using SharedLibraryCore;
+using SharedLibraryCore.Events;
+using SharedLibraryCore.Interfaces;
+using System;
+using System.Linq;
+
+namespace IW4MAdmin.Application
+{
+    class SerialGameEventHandler : IEventHandler
+    {
+        private delegate void GameEventAddedEventHandler(object sender, GameEventArgs args);
+        private event GameEventAddedEventHandler GameEventAdded;
+
+        private static readonly GameEvent.EventType[] overrideEvents = new[]
+        {
+            GameEvent.EventType.Connect,
+            GameEvent.EventType.Disconnect,
+            GameEvent.EventType.Quit,
+            GameEvent.EventType.Stop
+        };
+
+        public SerialGameEventHandler()
+        {
+            GameEventAdded += GameEventHandler_GameEventAdded;
+        }
+
+        private async void GameEventHandler_GameEventAdded(object sender, GameEventArgs args)
+        {
+            await (sender as IManager).ExecuteEvent(args.Event);
+            EventApi.OnGameEvent(args.Event);
+        }
+
+        public void HandleEvent(IManager manager, GameEvent gameEvent)
+        {
+            if (manager.IsRunning || overrideEvents.Contains(gameEvent.Type))
+            {
+                GameEventAdded?.Invoke(manager, new GameEventArgs(null, false, gameEvent));
+            }
+        }
+    }
+}

DiscordWebhook/DiscordWebhook.py

@@ -1,214 +0,0 @@
-import requests
-import time
-import json
-import collections
-import os
-
-# the following classes model the discord webhook api parameters
-class WebhookAuthor():
-    def __init__(self, name=None, url=None, icon_url=None):
-        if name:
-            self.name = name
-        if url:
-            self.url = url
-        if icon_url:
-            self.icon_url = icon_url
-
-class WebhookField():
-    def __init__(self, name=None, value=None, inline=False):
-        if name:
-            self.name = name
-        if value:
-            self.value = value
-        if inline:
-            self.inline = inline
-
-class WebhookEmbed():
-    def __init__(self):
-        self.author = ''
-        self.title = ''
-        self.url = ''
-        self.description = ''
-        self.color = 0
-        self.fields = []
-        self.thumbnail = {}
-
-class WebhookParams():
-    def __init__(self, username=None, avatar_url=None, content=None):
-        self.username = ''
-        self.avatar_url = ''
-        self.content = ''
-        self.embeds = []
-
-    # quick way to convert all the objects to a nice json object
-    def to_json(self):
-        return json.dumps(self, default=lambda o: o.__dict__, sort_keys=True)
-
-# gets the relative link to a user's profile
-def get_client_profile(profile_id):
-    return u'{}/Client/ProfileAsync/{}'.format(base_url, profile_id)
-
-def get_client_profile_markdown(client_name, profile_id):
-    return u'[{}]({})'.format(client_name, get_client_profile(profile_id))
-
-#todo: exception handling for opening the file
-if os.getenv("DEBUG"):
-    config_file_name = 'config.dev.json'
-else:
-    config_file_name = 'config.json'
-
-with open(config_file_name) as json_config_file:
-    json_config = json.load(json_config_file)
-
-# this should be an URL to an IP or FQN to an IW4MAdmin instance
-# ie http://127.0.0.1 or http://IW4MAdmin.com
-base_url = json_config['IW4MAdminUrl']
-end_point = '/api/event'
-request_url = base_url + end_point
-# this should be the full discord webhook url
-# ie https://discordapp.com/api/webhooks/<id>/<token>
-discord_webhook_notification_url = json_config['DiscordWebhookNotificationUrl']
-discord_webhook_information_url = json_config['DiscordWebhookInformationUrl']
-# this should be the numerical id of the discord group
-# 12345678912345678
-notify_role_ids = json_config['NotifyRoleIds']
-
-def get_new_events():
-    events = []
-    response = requests.get(request_url)
-    data = response.json()
-    should_notify = False
-    
-    for event in data:
-        # commonly used event info items
-        event_type = event['eventType']['name']
-        server_name = event['ownerEntity']['name']
-
-        if event['originEntity']:
-            origin_client_name = event['originEntity']['name']
-            origin_client_id = int(event['originEntity']['id'])
-
-        if event['targetEntity']:
-            target_client_name = event['targetEntity']['name'] or ''
-            target_client_id = int(event['targetEntity']['id']) or 0
-
-        webhook_item = WebhookParams()
-        webhook_item_embed = WebhookEmbed()
-
-        #todo: the following don't need to be generated every time, as it says the same
-        webhook_item.username = 'IW4MAdmin'
-        webhook_item.avatar_url = 'https://raidmax.org/IW4MAdmin/img/iw4adminicon-3.png'
-        webhook_item_embed.color = 31436
-        webhook_item_embed.url = base_url
-        webhook_item_embed.thumbnail = { 'url' : 'https://raidmax.org/IW4MAdmin/img/iw4adminicon-3.png' }
-        webhook_item.embeds.append(webhook_item_embed)
-
-        # the server should be visible on all event types
-        server_field = WebhookField('Server', server_name)
-        webhook_item_embed.fields.append(server_field)
-
-        role_ids_string = ''
-        for id in notify_role_ids:
-            role_ids_string += '\r\n<@&{}>\r\n'.format(id)
-    
-        if event_type == 'Report':
-            report_reason = event['extraInfo']
-
-            report_reason_field = WebhookField('Reason', report_reason)
-            reported_by_field = WebhookField('By', get_client_profile_markdown(origin_client_name, origin_client_id))
-            reported_field = WebhookField('Reported Player',get_client_profile_markdown(target_client_name, target_client_id))
-
-            # add each fields to the embed
-            webhook_item_embed.title = 'Player Reported'
-            webhook_item_embed.fields.append(reported_field)
-            webhook_item_embed.fields.append(reported_by_field)
-            webhook_item_embed.fields.append(report_reason_field)
-
-            should_notify = True
-
-        elif event_type == 'Ban':
-            ban_reason = event['extraInfo']
-            ban_reason_field = WebhookField('Reason', ban_reason)
-            banned_by_field = WebhookField('By',  get_client_profile_markdown(origin_client_name, origin_client_id))
-            banned_field = WebhookField('Banned Player', get_client_profile_markdown(target_client_name, target_client_id))
-
-            # add each fields to the embed
-            webhook_item_embed.title = 'Player Banned'
-            webhook_item_embed.fields.append(banned_field)
-            webhook_item_embed.fields.append(banned_by_field)
-            webhook_item_embed.fields.append(ban_reason_field)
-
-            should_notify = True
-
-        elif event_type == 'Connect':
-            connected_field = WebhookField('Connected Player', get_client_profile_markdown(origin_client_name, origin_client_id))
-            webhook_item_embed.title = 'Player Connected'
-            webhook_item_embed.fields.append(connected_field)
-
-        elif event_type == 'Disconnect':
-            disconnected_field = WebhookField('Disconnected Player', get_client_profile_markdown(origin_client_name, origin_client_id))
-            webhook_item_embed.title = 'Player Disconnected'
-            webhook_item_embed.fields.append(disconnected_field)
-
-        elif event_type == 'Say':
-            say_client_field = WebhookField('Player', get_client_profile_markdown(origin_client_name, origin_client_id))
-            message_field = WebhookField('Message', event['extraInfo'])
-
-            webhook_item_embed.title = 'Message From Player'
-            webhook_item_embed.fields.append(say_client_field)
-            webhook_item_embed.fields.append(message_field)
-
-        #if event_type == 'ScriptKill' or event_type == 'Kill':
-        #    kill_str = '{} killed {}'.format(get_client_profile_markdown(origin_client_name, origin_client_id),
-        #                                                           get_client_profile_markdown(target_client_name, target_client_id))
-        #    killed_field = WebhookField('Kill Information', kill_str)
-        #    webhook_item_embed.title = 'Player Killed'
-        #    webhook_item_embed.fields.append(killed_field)
-
-        #todo: handle other events
-        else:
-            continue
-
-         #make sure there's at least one group to notify
-        if len(notify_role_ids) > 0:
-            # unfortunately only the content can be used to to notify members in groups
-            #embed content shows the role but doesn't notify
-            webhook_item.content = role_ids_string
-
-        events.append({'item' : webhook_item, 'notify' : should_notify})
-
-    return events
-
-# sends the data to the webhook location
-def execute_webhook(data):
-    for event in data:
-        event_json = event['item'].to_json()
-        url = None
-
-        if event['notify']:
-            url = discord_webhook_notification_url
-        else:
-            if len(discord_webhook_information_url)  > 0:
-                url = discord_webhook_information_url
-
-        if url :
-            response = requests.post(url,
-                data=event_json, 
-                headers={'Content-type' : 'application/json'})
-
-# grabs new events and executes the webhook fo each valid event
-def run():
-    failed_count = 1
-    print('starting polling for events')
-    while True:
-        try:
-            new_events = get_new_events()
-            execute_webhook(new_events)
-        except Exception as e:
-            print('failed to get new events ({})'.format(failed_count))
-            print(e)
-            failed_count += 1
-        time.sleep(5)
-
-if __name__ == "__main__":
-    run()

DiscordWebhook/DiscordWebhook.pyproj

@@ -1,99 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>15a81d6e-7502-46ce-8530-0647a380b5f4</ProjectGuid>
-    <ProjectHome>.</ProjectHome>
-    <StartupFile>DiscordWebhook.py</StartupFile>
-    <SearchPath>
-    </SearchPath>
-    <WorkingDirectory>.</WorkingDirectory>
-    <OutputPath>.</OutputPath>
-    <Name>DiscordWebhook</Name>
-    <SuppressCollectPythonCloudServiceFiles>true</SuppressCollectPythonCloudServiceFiles>
-    <RootNamespace>DiscordWebhook</RootNamespace>
-    <InterpreterId>MSBuild|env|$(MSBuildProjectFullPath)</InterpreterId>
-    <IsWindowsApplication>False</IsWindowsApplication>
-    <LaunchProvider>Standard Python launcher</LaunchProvider>
-    <EnableNativeCodeDebugging>False</EnableNativeCodeDebugging>
-    <Environment>DEBUG=True</Environment>
-    <PublishUrl>C:\Projects\IW4M-Admin\Publish\WindowsPrerelease\DiscordWebhook</PublishUrl>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <DebugSymbols>true</DebugSymbols>
-    <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <DebugSymbols>true</DebugSymbols>
-    <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Prerelease' ">
-    <DebugSymbols>true</DebugSymbols>
-    <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
-    <OutputPath>bin\Prerelease\</OutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="DiscordWebhook.py" />
-  </ItemGroup>
-  <ItemGroup>
-    <Interpreter Include="env\">
-      <Id>env</Id>
-      <Version>3.6</Version>
-      <Description>env (Python 3.6 (64-bit))</Description>
-      <InterpreterPath>Scripts\python.exe</InterpreterPath>
-      <WindowsInterpreterPath>Scripts\pythonw.exe</WindowsInterpreterPath>
-      <PathEnvironmentVariable>PYTHONPATH</PathEnvironmentVariable>
-      <Architecture>X64</Architecture>
-    </Interpreter>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="config.json">
-      <Publish>True</Publish>
-    </Content>
-    <Content Include="requirements.txt">
-      <Publish>True</Publish>
-    </Content>
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Python Tools\Microsoft.PythonTools.Web.targets" />
-  <!-- Uncomment the CoreCompile target to enable the Build command in
-       Visual Studio and specify your pre- and post-build commands in
-       the BeforeBuild and AfterBuild targets below. -->
-  <!--<Target Name="CoreCompile" />-->
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  <ProjectExtensions>
-    <VisualStudio>
-      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
-        <WebProjectProperties>
-          <AutoAssignPort>True</AutoAssignPort>
-          <UseCustomServer>True</UseCustomServer>
-          <CustomServerUrl>http://localhost</CustomServerUrl>
-          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
-        </WebProjectProperties>
-      </FlavorProperties>
-      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}" User="">
-        <WebProjectProperties>
-          <StartPageUrl>
-          </StartPageUrl>
-          <StartAction>CurrentPage</StartAction>
-          <AspNetDebugging>True</AspNetDebugging>
-          <SilverlightDebugging>False</SilverlightDebugging>
-          <NativeDebugging>False</NativeDebugging>
-          <SQLDebugging>False</SQLDebugging>
-          <ExternalProgram>
-          </ExternalProgram>
-          <StartExternalURL>
-          </StartExternalURL>
-          <StartCmdLineArguments>
-          </StartCmdLineArguments>
-          <StartWorkingDirectory>
-          </StartWorkingDirectory>
-          <EnableENC>False</EnableENC>
-          <AlwaysStartWebServerOnDebug>False</AlwaysStartWebServerOnDebug>
-        </WebProjectProperties>
-      </FlavorProperties>
-    </VisualStudio>
-  </ProjectExtensions>
-</Project>

DiscordWebhook/config.json

@@ -1,6 +0,0 @@
-{
-  "IW4MAdminUrl": "",
-  "DiscordWebhookNotificationUrl": "",
-  "DiscordWebhookInformationUrl": "",
-  "NotifyRoleIds": []
-}

DiscordWebhook/requirements.txt

@@ -1,7 +0,0 @@
-certifi>=2018.4.16
-chardet>=3.0.4
-idna>=2.7
-pip>=18.0
-requests>=2.19.1
-setuptools>=39.0.1
-urllib3>=1.23

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/_customcallbacks.gsc

@@ -0,0 +1,256 @@
+#include maps\mp\_utility;
+#include maps\mp\gametypes\_hud_util;
+#include common_scripts\utility;
+
+init()
+{
+	SetDvarIfUninitialized( "sv_customcallbacks", true );
+	SetDvarIfUninitialized( "sv_framewaittime", 0.05 );
+	SetDvarIfUninitialized( "sv_additionalwaittime", 0.1 );
+	SetDvarIfUninitialized( "sv_maxstoredframes", 12 );
+	SetDvarIfUninitialized( "sv_printradarupdates", 0 );
+	SetDvarIfUninitialized( "sv_printradar_updateinterval", 500 );
+	SetDvarIfUninitialized( "sv_iw4madmin_url", "http://127.0.0.1:1624" );
+	
+	level thread onPlayerConnect();
+	if (getDvarInt("sv_printradarupdates") == 1)
+	{
+		level thread runRadarUpdates();
+	}
+	
+	level waittill( "prematch_over" );
+	level.callbackPlayerKilled = ::Callback_PlayerKilled;
+	level.callbackPlayerDamage = ::Callback_PlayerDamage;
+	level.callbackPlayerDisconnect = ::Callback_PlayerDisconnect;
+}
+
+onPlayerConnect( player )
+{
+	for( ;; )
+	{
+		level waittill( "connected", player );	
+		player setClientDvar("cl_autorecord", 1);
+		player setClientDvar("cl_demosKeep", 200);
+		player thread waitForFrameThread();
+		player thread waitForAttack();
+	}
+}
+
+waitForAttack()
+{
+	self endon( "disconnect" );
+	
+	self.lastAttackTime = 0;
+	
+	for( ;; )
+	{
+		self notifyOnPlayerCommand( "player_shot", "+attack" );
+		self waittill( "player_shot" );
+		
+		self.lastAttackTime = getTime();
+	}
+}
+
+getHttpString( url )
+{
+    request = httpGet( url );
+    request waittill( "done", success, data );
+	request destroy();
+}
+
+runRadarUpdates()
+{
+	interval = int(getDvar("sv_printradar_updateinterval"));
+
+	for ( ;; )
+	{
+		for ( i = 0; i <= 17; i++ )
+		{
+			player = level.players[i];
+
+			if ( isDefined( player ) )
+			{
+				payload = player.guid + ";" + player.origin + ";" + player getPlayerAngles() + ";" + player.team + ";" + player.kills + ";" + player.deaths + ";" + player.score + ";" + player GetCurrentWeapon() + ";" + player.health + ";" + isAlive(player) + ";" + player.timePlayed["total"];
+				logPrint( "LiveRadar;" + payload + "\n" );
+			}	
+		}
+
+		wait( interval / 1000 );
+	}	
+}
+
+hitLocationToBone( hitloc )
+{
+	switch( hitloc )
+	{
+		case "helmet":
+			return "j_helmet";
+		case "head":
+			return "j_head";
+		case "neck":
+			return "j_neck";
+		case "torso_upper":
+			return "j_spineupper";
+		case "torso_lower":
+			return "j_spinelower";
+		case "right_arm_upper":
+			return "j_shoulder_ri";
+		case "left_arm_upper":
+			return "j_shoulder_le";
+		case "right_arm_lower":
+			return "j_elbow_ri";
+		case "left_arm_lower":
+			return "j_elbow_le";
+		case "right_hand":
+			return "j_wrist_ri";
+		case "left_hand":
+			return "j_wrist_le";
+		case "right_leg_upper":
+			return "j_hip_ri";
+		case "left_leg_upper":
+			return "j_hip_le";
+		case "right_leg_lower":
+			return "j_knee_ri";
+		case "left_leg_lower":
+			return "j_knee_le";
+		case "right_foot":
+			return "j_ankle_ri";
+		case "left_foot":
+			return "j_ankle_le";
+		default:
+			return "tag_origin";
+	}
+}
+
+waitForFrameThread()
+{
+	self endon( "disconnect" );
+	
+	self.currentAnglePosition = 0;
+	self.anglePositions = [];
+
+	for (i = 0; i < getDvarInt( "sv_maxstoredframes" ); i++)
+	{
+		self.anglePositions[i] = self getPlayerAngles();
+	}
+		
+	for( ;; )
+	{
+		self.anglePositions[self.currentAnglePosition] = self getPlayerAngles();
+		wait( getDvarFloat( "sv_framewaittime" ) );	
+		self.currentAnglePosition = (self.currentAnglePosition + 1) % getDvarInt( "sv_maxstoredframes" );
+	}
+}
+
+waitForAdditionalAngles( logString, beforeFrameCount, afterFrameCount )
+{
+	currentIndex = self.currentAnglePosition;
+	wait( 0.05 * afterFrameCount );
+	
+	self.angleSnapshot = [];
+	
+	for( j = 0; j < self.anglePositions.size; j++ )
+	{
+		self.angleSnapshot[j] = self.anglePositions[j];
+	}
+
+	anglesStr = "";
+	collectedFrames = 0;
+	i = currentIndex - beforeFrameCount;
+
+	while (collectedFrames < beforeFrameCount)
+	{
+		fixedIndex = i;
+		if (i < 0)
+		{
+			fixedIndex = self.angleSnapshot.size - abs(i);
+		}
+		anglesStr += self.angleSnapshot[int(fixedIndex)] + ":";
+		collectedFrames++;
+		i++;
+	}
+
+	if (i == currentIndex)
+	{
+		anglesStr += self.angleSnapshot[i] + ":";
+		i++;
+	}
+
+	collectedFrames = 0;
+
+	while (collectedFrames < afterFrameCount)
+	{
+		fixedIndex = i;
+		if (i > self.angleSnapshot.size - 1)
+		{
+			fixedIndex = i % self.angleSnapshot.size;
+		}
+		anglesStr += self.angleSnapshot[int(fixedIndex)] + ":";
+		collectedFrames++;
+		i++;
+	}
+
+	lastAttack = int(getTime()) - int(self.lastAttackTime);
+	isAlive = isAlive(self);
+
+	logPrint(logString + ";" + anglesStr + ";" + isAlive + ";" + lastAttack + "\n" ); 
+}
+
+vectorScale( vector, scale )
+{
+	return ( vector[0] * scale, vector[1] * scale, vector[2] * scale );
+}
+
+Process_Hit( type, attacker, sHitLoc, sMeansOfDeath, iDamage, sWeapon )
+{
+	if (sMeansOfDeath == "MOD_FALLING" || !isPlayer(attacker))
+	{
+		return;
+	}
+
+	victim = self;
+	_attacker = attacker;
+
+	if ( !isPlayer( attacker ) && isDefined( attacker.owner ) )
+	{
+		_attacker = attacker.owner;
+	}
+
+	else if( !isPlayer( attacker ) && sMeansOfDeath == "MOD_FALLING" )
+	{
+		_attacker = victim;
+	}
+	
+	location = victim GetTagOrigin( hitLocationToBone( sHitLoc ) );
+	isKillstreakKill = !isPlayer( attacker ) || isKillstreakWeapon( sWeapon );
+
+	logLine = "Script" + type + ";" + _attacker.guid + ";" + victim.guid + ";" + _attacker GetTagOrigin("tag_eye") + ";" + location + ";" + iDamage + ";" + sWeapon + ";" + sHitLoc + ";" + sMeansOfDeath + ";" + _attacker getPlayerAngles() + ";" + int(gettime()) + ";" + isKillstreakKill + ";" +  _attacker playerADS() + ";0;0";
+	attacker thread waitForAdditionalAngles( logLine, 2, 2 );
+}
+
+Callback_PlayerDamage( eInflictor, attacker, iDamage, iDFlags, sMeansOfDeath, sWeapon, vPoint, vDir, sHitLoc, psOffsetTime )
+{
+	if ( self.health - iDamage > 0 )
+	{
+		isFriendlyFire = level.teamBased && isDefined( attacker ) && ( self != attacker ) && isDefined( attacker.team ) && ( self.pers[ "team" ] == attacker.team );
+		
+		if ( !isFriendlyFire )
+		{
+			self Process_Hit( "Damage", attacker, sHitLoc, sMeansOfDeath, iDamage, sWeapon );
+		}
+	}
+
+	self maps\mp\gametypes\_damage::Callback_PlayerDamage( eInflictor, attacker, iDamage, iDFlags, sMeansOfDeath, sWeapon, vPoint, vDir, sHitLoc, psOffsetTime );
+}
+
+Callback_PlayerKilled( eInflictor, attacker, iDamage, sMeansOfDeath, sWeapon, vDir, sHitLoc, psOffsetTime, deathAnimDuration )
+{
+	Process_Hit( "Kill", attacker, sHitLoc, sMeansOfDeath, iDamage, sWeapon );
+	self maps\mp\gametypes\_damage::Callback_PlayerKilled( eInflictor, attacker, iDamage, sMeansOfDeath, sWeapon, vDir, sHitLoc, psOffsetTime, deathAnimDuration );
+}
+
+Callback_PlayerDisconnect()
+{
+	level notify( "disconnected", self );
+	self maps\mp\gametypes\_playerlogic::Callback_PlayerDisconnect();
+}

GameFiles/PT6/t6r/data/maps/mp/gametypes/_clientids.gsc.src

@@ -0,0 +1,283 @@
+#include maps\mp\_utility;
+#include maps\mp\gametypes\_hud_util;
+#include common_scripts\utility;
+
+init()
+{
+	level.clientid = 0;
+	level thread onplayerconnect();
+    level thread IW4MA_init();
+}
+
+onplayerconnect()
+{
+	for ( ;; )
+	{
+		level waittill( "connecting", player );
+		player.clientid = level.clientid;
+		level.clientid++;
+	}
+}
+
+
+IW4MA_init()
+{
+	SetDvarIfUninitialized( "sv_customcallbacks", true );
+	SetDvarIfUninitialized( "sv_framewaittime", 0.05 );
+	SetDvarIfUninitialized( "sv_additionalwaittime", 0.1 );
+	SetDvarIfUninitialized( "sv_maxstoredframes", 12 );
+	SetDvarIfUninitialized( "sv_printradarupdates", 0 );
+	SetDvarIfUninitialized( "sv_printradar_updateinterval", 500 );
+	SetDvarIfUninitialized( "sv_iw4madmin_url", "http://127.0.0.1:1624" );
+	
+	level thread IW4MA_onPlayerConnect();
+	if (getDvarInt("sv_printradarupdates") == 1)
+	{
+		level thread runRadarUpdates();
+	}
+	
+	level waittill( "prematch_over" );
+	level.callbackPlayerKilled = ::Callback_PlayerKilled;
+	level.callbackPlayerDamage = ::Callback_PlayerDamage;
+	level.callbackPlayerDisconnect = ::Callback_PlayerDisconnect;
+}
+
+//Does not exist in T6
+SetDvarIfUninitialized(dvar, val)
+{
+	curval = getDvar(dvar);
+	if (curval == "")
+		SetDvar(dvar,val);
+}
+
+IW4MA_onPlayerConnect( player )
+{
+	for( ;; )
+	{
+		level waittill( "connected", player );	
+		player thread waitForFrameThread();
+		//player thread waitForAttack();
+	}
+}
+
+
+//Does not work in T6
+/*waitForAttack()
+{
+	self endon( "disconnect" );
+	
+	self.lastAttackTime = 0;
+	
+	for( ;; )
+	{
+		self notifyOnPlayerCommand( "player_shot", "+attack" );
+		self waittill( "player_shot" );
+		
+		self.lastAttackTime = getTime();
+	}
+}*/
+
+runRadarUpdates()
+{
+	interval = int(getDvar("sv_printradar_updateinterval"));
+
+	for ( ;; )
+	{
+		for ( i = 0; i <= 17; i++ )
+		{
+			player = level.players[i];
+
+			if ( isDefined( player ) )
+			{
+				payload = player.guid + ";" + player.origin + ";" + player getPlayerAngles() + ";" + player.team + ";" + player.kills + ";" + player.deaths + ";" + player.score + ";" + player GetCurrentWeapon() + ";" + player.health + ";" + isAlive(player) + ";" + player.timePlayed["total"];
+				logPrint( "LiveRadar;" + payload + "\n" );
+			}	
+		}
+
+		wait( interval / 1000 );
+	}	
+}
+
+hitLocationToBone( hitloc )
+{
+	switch( hitloc )
+	{
+		case "helmet":
+			return "j_helmet";
+		case "head":
+			return "j_head";
+		case "neck":
+			return "j_neck";
+		case "torso_upper":
+			return "j_spineupper";
+		case "torso_lower":
+			return "j_spinelower";
+		case "right_arm_upper":
+			return "j_shoulder_ri";
+		case "left_arm_upper":
+			return "j_shoulder_le";
+		case "right_arm_lower":
+			return "j_elbow_ri";
+		case "left_arm_lower":
+			return "j_elbow_le";
+		case "right_hand":
+			return "j_wrist_ri";
+		case "left_hand":
+			return "j_wrist_le";
+		case "right_leg_upper":
+			return "j_hip_ri";
+		case "left_leg_upper":
+			return "j_hip_le";
+		case "right_leg_lower":
+			return "j_knee_ri";
+		case "left_leg_lower":
+			return "j_knee_le";
+		case "right_foot":
+			return "j_ankle_ri";
+		case "left_foot":
+			return "j_ankle_le";
+		default:
+			return "tag_origin";
+	}
+}
+
+waitForFrameThread()
+{
+	self endon( "disconnect" );
+	
+	self.currentAnglePosition = 0;
+	self.anglePositions = [];
+
+	for (i = 0; i < getDvarInt( "sv_maxstoredframes" ); i++)
+	{
+		self.anglePositions[i] = self getPlayerAngles();
+	}
+		
+	for( ;; )
+	{
+		self.anglePositions[self.currentAnglePosition] = self getPlayerAngles();
+		wait( getDvarFloat( "sv_framewaittime" ) );	
+		self.currentAnglePosition = (self.currentAnglePosition + 1) % getDvarInt( "sv_maxstoredframes" );
+	}
+}
+
+waitForAdditionalAngles( logString, beforeFrameCount, afterFrameCount )
+{
+	currentIndex = self.currentAnglePosition;
+	wait( 0.05 * afterFrameCount );
+	
+	self.angleSnapshot = [];
+	
+	for( j = 0; j < self.anglePositions.size; j++ )
+	{
+		self.angleSnapshot[j] = self.anglePositions[j];
+	}
+
+	anglesStr = "";
+	collectedFrames = 0;
+	i = currentIndex - beforeFrameCount;
+
+	while (collectedFrames < beforeFrameCount)
+	{
+		fixedIndex = i;
+		if (i < 0)
+		{
+			fixedIndex = self.angleSnapshot.size - abs(i);
+		}
+		anglesStr += self.angleSnapshot[int(fixedIndex)] + ":";
+		collectedFrames++;
+		i++;
+	}
+
+	if (i == currentIndex)
+	{
+		anglesStr += self.angleSnapshot[i] + ":";
+		i++;
+	}
+
+	collectedFrames = 0;
+
+	while (collectedFrames < afterFrameCount)
+	{
+		fixedIndex = i;
+		if (i > self.angleSnapshot.size - 1)
+		{
+			fixedIndex = i % self.angleSnapshot.size;
+		}
+		anglesStr += self.angleSnapshot[int(fixedIndex)] + ":";
+		collectedFrames++;
+		i++;
+	}
+
+	lastAttack = 100;//int(getTime()) - int(self.lastAttackTime);
+	isAlive = isAlive(self);
+
+	logPrint(logString + ";" + anglesStr + ";" + isAlive + ";" + lastAttack + "\n" ); 
+}
+
+vectorScale( vector, scale )
+{
+	return ( vector[0] * scale, vector[1] * scale, vector[2] * scale );
+}
+
+Process_Hit( type, attacker, sHitLoc, sMeansOfDeath, iDamage, sWeapon )
+{
+	if (sMeansOfDeath == "MOD_FALLING" || !isPlayer(attacker))
+	{
+		return;
+	}
+
+	victim = self;
+	_attacker = attacker;
+
+	if ( !isPlayer( attacker ) && isDefined( attacker.owner ) )
+	{
+		_attacker = attacker.owner;
+	}
+
+	else if( !isPlayer( attacker ) && sMeansOfDeath == "MOD_FALLING" )
+	{
+		_attacker = victim;
+	}
+	
+	location = victim GetTagOrigin( hitLocationToBone( sHitLoc ) );
+	isKillstreakKill = false;
+	if(!isPlayer(attacker))
+	{
+		isKillstreakKill = true;
+	}
+	if(maps/mp/killstreaks/_killstreaks::iskillstreakweapon(sWeapon))
+	{
+		isKillstreakKill = true;
+	}
+
+	logLine = "Script" + type + ";" + _attacker.guid + ";" + victim.guid + ";" + _attacker GetTagOrigin("tag_eye") + ";" + location + ";" + iDamage + ";" + sWeapon + ";" + sHitLoc + ";" + sMeansOfDeath + ";" + _attacker getPlayerAngles() + ";" + int(gettime()) + ";" + isKillstreakKill + ";" +  _attacker playerADS() + ";0;0";
+	attacker thread waitForAdditionalAngles( logLine, 2, 2 );
+}
+
+Callback_PlayerDamage( eInflictor, attacker, iDamage, iDFlags, sMeansOfDeath, sWeapon, vPoint, vDir, sHitLoc, psOffsetTime, boneIndex )
+{
+	if ( level.teamBased && isDefined( attacker ) && ( self != attacker ) && isDefined( attacker.team ) && ( self.pers[ "team" ] == attacker.team ) )
+	{
+		return;
+	}
+		
+	if ( self.health - iDamage > 0 )
+	{
+		self Process_Hit( "Damage", attacker, sHitLoc, sMeansOfDeath, iDamage, sWeapon );
+	}
+
+	self [[maps/mp/gametypes/_globallogic_player::callback_playerdamage]]( eInflictor, attacker, iDamage, iDFlags, sMeansOfDeath, sWeapon, vPoint, vDir, sHitLoc, psOffsetTime, boneIndex );
+}
+
+Callback_PlayerKilled(eInflictor, attacker, iDamage, sMeansOfDeath, sWeapon, vDir, sHitLoc, psOffsetTime, deathAnimDuration)
+{
+	Process_Hit( "Kill", attacker, sHitLoc, sMeansOfDeath, iDamage, sWeapon );
+	self [[maps/mp/gametypes/_globallogic_player::callback_playerkilled]]( eInflictor, attacker, iDamage, sMeansOfDeath, sWeapon, vDir, sHitLoc, psOffsetTime, deathAnimDuration );
+}
+
+Callback_PlayerDisconnect()
+{
+	level notify( "disconnected", self );
+	self [[maps/mp/gametypes/_globallogic_player::callback_playerdisconnect]]();
+}

GameLogServer/GameLogServer.pyproj

@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>42efda12-10d3-4c40-a210-9483520116bc</ProjectGuid>
-    <ProjectHome>.</ProjectHome>
-    <ProjectTypeGuids>{789894c7-04a9-4a11-a6b5-3f4435165112};{1b580a1a-fdb3-4b32-83e1-6407eb2722e6};{349c5851-65df-11da-9384-00065b846f21};{888888a0-9f3d-457c-b088-3a5042f75d52}</ProjectTypeGuids>
-    <StartupFile>runserver.py</StartupFile>
-    <SearchPath>
-    </SearchPath>
-    <WorkingDirectory>.</WorkingDirectory>
-    <LaunchProvider>Standard Python launcher</LaunchProvider>
-    <WebBrowserUrl>http://localhost</WebBrowserUrl>
-    <OutputPath>.</OutputPath>
-    <SuppressCollectPythonCloudServiceFiles>true</SuppressCollectPythonCloudServiceFiles>
-    <Name>GameLogServer</Name>
-    <RootNamespace>GameLogServer</RootNamespace>
-    <InterpreterId>MSBuild|log_env|$(MSBuildProjectFullPath)</InterpreterId>
-    <EnableNativeCodeDebugging>False</EnableNativeCodeDebugging>
-    <Environment>DEBUG=True</Environment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <DebugSymbols>true</DebugSymbols>
-    <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <DebugSymbols>true</DebugSymbols>
-    <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Prerelease' ">
-    <DebugSymbols>true</DebugSymbols>
-    <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
-    <OutputPath>bin\Prerelease\</OutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="GameLogServer\log_reader.py">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="GameLogServer\restart_resource.py" />
-    <Compile Include="GameLogServer\server.py">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="runserver.py" />
-    <Compile Include="GameLogServer\__init__.py" />
-    <Compile Include="GameLogServer\log_resource.py" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="GameLogServer\" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Stable.pubxml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Interpreter Include="env\">
-      <Id>env</Id>
-      <Version>3.6</Version>
-      <Description>env (Python 3.6 (64-bit))</Description>
-      <InterpreterPath>Scripts\python.exe</InterpreterPath>
-      <WindowsInterpreterPath>Scripts\pythonw.exe</WindowsInterpreterPath>
-      <PathEnvironmentVariable>PYTHONPATH</PathEnvironmentVariable>
-      <Architecture>X64</Architecture>
-    </Interpreter>
-    <Interpreter Include="log_env\">
-      <Id>log_env</Id>
-      <Version>3.6</Version>
-      <Description>log_env (Python 3.6 (64-bit))</Description>
-      <InterpreterPath>Scripts\python.exe</InterpreterPath>
-      <WindowsInterpreterPath>Scripts\pythonw.exe</WindowsInterpreterPath>
-      <PathEnvironmentVariable>PYTHONPATH</PathEnvironmentVariable>
-      <Architecture>X64</Architecture>
-    </Interpreter>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="requirements.txt" />
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Python Tools\Microsoft.PythonTools.Web.targets" />
-  <!-- Specify pre- and post-build commands in the BeforeBuild and 
-       AfterBuild targets below. -->
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  <ProjectExtensions>
-    <VisualStudio>
-      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
-        <WebProjectProperties>
-          <AutoAssignPort>True</AutoAssignPort>
-          <UseCustomServer>True</UseCustomServer>
-          <CustomServerUrl>http://localhost</CustomServerUrl>
-          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
-        </WebProjectProperties>
-      </FlavorProperties>
-      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}" User="">
-        <WebProjectProperties>
-          <StartPageUrl>
-          </StartPageUrl>
-          <StartAction>CurrentPage</StartAction>
-          <AspNetDebugging>True</AspNetDebugging>
-          <SilverlightDebugging>False</SilverlightDebugging>
-          <NativeDebugging>False</NativeDebugging>
-          <SQLDebugging>False</SQLDebugging>
-          <ExternalProgram>
-          </ExternalProgram>
-          <StartExternalURL>
-          </StartExternalURL>
-          <StartCmdLineArguments>
-          </StartCmdLineArguments>
-          <StartWorkingDirectory>
-          </StartWorkingDirectory>
-          <EnableENC>False</EnableENC>
-          <AlwaysStartWebServerOnDebug>False</AlwaysStartWebServerOnDebug>
-        </WebProjectProperties>
-      </FlavorProperties>
-    </VisualStudio>
-  </ProjectExtensions>
-</Project>

GameLogServer/GameLogServer/__init__.py

@@ -1,9 +0,0 @@
-"""
-The flask application package.
-"""
-
-from flask import Flask
-from flask_restful import Api
-
-app = Flask(__name__)
-api = Api(app)

GameLogServer/GameLogServer/log_reader.py

@@ -1,85 +0,0 @@
-import re
-import os
-import time
-
-class LogReader(object):
-    def __init__(self):
-        self.log_file_sizes = {}
-        # (if the time between checks is greater, ignore ) - in seconds
-        self.max_file_time_change = 30
-
-    def read_file(self, path):
-        # this removes old entries that are no longer valid
-        try:
-            self._clear_old_logs()
-        except Exception as e:
-            print('could not clear old logs')
-            print(e)
-
-        if os.name != 'nt':
-            path = re.sub(r'^[A-Z]\:', '', path)
-            path = re.sub(r'\\+', '/', path)
-
-        # prevent traversing directories
-        if re.search('r^.+\.\.\\.+$', path):
-            return False
-        # must be a valid log path and log file
-        if not re.search(r'^.+[\\|\/](.+)[\\|\/].+.log$', path):
-            return False
-
-        # get the new file size
-        new_file_size = self.file_length(path)
-          
-        # the log size was unable to be read (probably the wrong path)
-        if new_file_size < 0:
-            return False
-
-        # this is the first time the log has been requested
-        if path not in self.log_file_sizes:
-            self.log_file_sizes[path] = { 
-                'length' : new_file_size,
-                'read': time.time()
-            }
-            return ''
-
-        # grab the previous values
-        last_length = self.log_file_sizes[path]['length']
-        file_size_difference = new_file_size - last_length
-
-        # update the new size and actually read the data
-        self.log_file_sizes[path] = {
-            'length': new_file_size,
-            'read': time.time()
-        }
-
-        new_log_info = self.get_file_lines(path, file_size_difference)
-        return new_log_info
-
-    def get_file_lines(self, path, length):
-        try:
-            file_handle = open(path, 'rb')
-            file_handle.seek(-length, 2)
-            file_data = file_handle.read(length)
-            file_handle.close()
-            # using ignore errors omits the pesky 0xb2 bytes we're reading in for some reason
-            return file_data.decode('utf-8', errors='ignore')
-        except Exception as e:
-            print('could not read the log file at {0}, wanted to read {1} bytes'.format(path, length))
-            print(e)
-            return False
-
-    def _clear_old_logs(self):
-        expired_logs = [path for path in self.log_file_sizes if int(time.time() - self.log_file_sizes[path]['read']) > self.max_file_time_change]
-        for log in expired_logs:
-            print('removing expired log {0}'.format(log))
-            del self.log_file_sizes[log]
-        
-    def file_length(self, path):
-        try:
-            return os.stat(path).st_size
-        except Exception as e:
-            print('could not get the size of the log file at {0}'.format(path))
-            print(e)
-            return -1
-
-reader = LogReader()

GameLogServer/GameLogServer/log_resource.py

@@ -1,14 +0,0 @@
-from flask_restful import Resource
-from GameLogServer.log_reader import reader
-from base64 import urlsafe_b64decode
-
-class LogResource(Resource):
-    def get(self, path):
-        path = urlsafe_b64decode(path).decode('utf-8')
-        log_info = reader.read_file(path)
-
-        return {
-            'success' : log_info is not False,
-            'length':  0 if log_info is False else len(log_info),
-            'data': log_info
-        }

GameLogServer/GameLogServer/restart_resource.py

@@ -1,29 +0,0 @@
-#from flask_restful import Resource
-#from flask import request
-#import requests
-#import os
-#import subprocess
-#import re
-
-#def get_pid_of_server_windows(port):
-#    process = subprocess.Popen('netstat -aon', shell=True, stdout=subprocess.PIPE)
-#    output = process.communicate()[0]
-#    matches = re.search(' *(UDP) +([0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}):'+ str(port) + ' +[^\w]*([0-9]+)', output.decode('utf-8'))
-#    if matches is not None:
-#        return matches.group(3)
-#    else:
-#        return 0
-
-#class RestartResource(Resource):
-#    def get(self):
-#        try:
-#            response = requests.get('http://' + request.remote_addr + ':1624/api/restartapproved')
-#            if response.status_code == 200:
-#                pid = get_pid_of_server_windows(response.json()['port'])
-#                subprocess.check_output("Taskkill /PID %s /F" % pid)
-#            else:
-#                return {}, 400
-#        except Exception as e:
-#            print(e)
-#            return {}, 500
-#        return {}, 200

GameLogServer/GameLogServer/server.py

@@ -1,14 +0,0 @@
-from flask import Flask
-from flask_restful import Api
-from .log_resource import LogResource
-#from .restart_resource import RestartResource
-import logging
-
-app = Flask(__name__)
-
-def init():
-    log = logging.getLogger('werkzeug')
-    log.setLevel(logging.ERROR)
-    api = Api(app)
-    api.add_resource(LogResource, '/log/<string:path>')
-    #api.add_resource(RestartResource, '/restart')

GameLogServer/requirements.txt

@@ -1,12 +0,0 @@
-aniso8601==6.0.0
-Click==7.0
-Flask==1.0.2
-Flask-RESTful==0.3.7
-itsdangerous==1.1.0
-Jinja2==2.10
-MarkupSafe==1.1.1
-pip==10.0.1
-pytz==2018.9
-setuptools==39.0.1
-six==1.12.0
-Werkzeug==0.15.2

GameLogServer/runserver.py

@@ -1,15 +0,0 @@
-"""
-This script runs the GameLogServer application using a development server.
-"""
-
-from os import environ
-from GameLogServer.server import app, init
-
-if __name__ == '__main__':
-    HOST = environ.get('SERVER_HOST', '0.0.0.0')
-    try:
-        PORT = int(environ.get('SERVER_PORT', '1625'))
-    except ValueError:
-        PORT = 5555
-    init()
-    app.run('0.0.0.0', PORT, debug=False)

IW4MAdmin.sln

@@ -1,13 +1,15 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
+# Visual Studio Version 16
-VisualStudioVersion = 15.0.26730.16
+VisualStudioVersion = 16.0.29009.5
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Plugins", "Plugins", "{26E8B310-269E-46D4-A612-24601F16065F}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8C8F3945-0AEF-4949-A1F7-B18E952E50BC}"
 	ProjectSection(SolutionItems) = preProject
-		_commands.gsc = _commands.gsc
+		GameFiles\IW4x\userraw\scripts\_commands.gsc = GameFiles\IW4x\userraw\scripts\_commands.gsc
-		_customcallbacks.gsc = _customcallbacks.gsc
+		GameFiles\IW4x\userraw\scripts\_customcallbacks.gsc = GameFiles\IW4x\userraw\scripts\_customcallbacks.gsc
+		PostPublish.ps1 = PostPublish.ps1
+		pre-release-pipeline.yml = pre-release-pipeline.yml
 		README.md = README.md
 		RunPublishPre.cmd = RunPublishPre.cmd
 		RunPublishRelease.cmd = RunPublishRelease.cmd
@@ -28,33 +30,35 @@ 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("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "Master", "Master\Master.pyproj", "{F5051A32-6BD0-4128-ABBA-C202EE15FC5C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tests", "Plugins\Tests\Tests.csproj", "{B72DEBFB-9D48-4076-8FF5-1FD72A830845}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IW4ScriptCommands", "Plugins\IW4ScriptCommands\IW4ScriptCommands.csproj", "{6C706CE5-A206-4E46-8712-F8C48D526091}"
 EndProject
-Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "DiscordWebhook", "DiscordWebhook\DiscordWebhook.pyproj", "{15A81D6E-7502-46CE-8530-0647A380B5F4}"
-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
 		Plugins\ScriptPlugins\ParserCoD4x.js = Plugins\ScriptPlugins\ParserCoD4x.js
 		Plugins\ScriptPlugins\ParserIW4x.js = Plugins\ScriptPlugins\ParserIW4x.js
+		Plugins\ScriptPlugins\ParserPIW5.js = Plugins\ScriptPlugins\ParserPIW5.js
 		Plugins\ScriptPlugins\ParserPT6.js = Plugins\ScriptPlugins\ParserPT6.js
 		Plugins\ScriptPlugins\ParserRektT5M.js = Plugins\ScriptPlugins\ParserRektT5M.js
+		Plugins\ScriptPlugins\ParserT7.js = Plugins\ScriptPlugins\ParserT7.js
 		Plugins\ScriptPlugins\ParserTeknoMW3.js = Plugins\ScriptPlugins\ParserTeknoMW3.js
+		Plugins\ScriptPlugins\SampleScriptPluginCommand.js = Plugins\ScriptPlugins\SampleScriptPluginCommand.js
 		Plugins\ScriptPlugins\SharedGUIDKick.js = Plugins\ScriptPlugins\SharedGUIDKick.js
 		Plugins\ScriptPlugins\VPNDetection.js = Plugins\ScriptPlugins\VPNDetection.js
 	EndProjectSection
 EndProject
-Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "GameLogServer", "GameLogServer\GameLogServer.pyproj", "{42EFDA12-10D3-4C40-A210-9483520116BC}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Web", "Web", "{A848FCF1-8527-4AA8-A1AA-50D29695C678}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StatsWeb", "Plugins\Web\StatsWeb\StatsWeb.csproj", "{776B348B-F818-4A0F-A625-D0AF8BAD3E9B}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutomessageFeed", "Plugins\AutomessageFeed\AutomessageFeed.csproj", "{F5815359-CFC7-44B4-9A3B-C04BACAD5836}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LiveRadar", "Plugins\LiveRadar\LiveRadar.csproj", "{00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}"
+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
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -239,52 +243,6 @@ 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
-		{F5051A32-6BD0-4128-ABBA-C202EE15FC5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F5051A32-6BD0-4128-ABBA-C202EE15FC5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F5051A32-6BD0-4128-ABBA-C202EE15FC5C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F5051A32-6BD0-4128-ABBA-C202EE15FC5C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F5051A32-6BD0-4128-ABBA-C202EE15FC5C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F5051A32-6BD0-4128-ABBA-C202EE15FC5C}.Debug|x64.Build.0 = Debug|Any CPU
-		{F5051A32-6BD0-4128-ABBA-C202EE15FC5C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F5051A32-6BD0-4128-ABBA-C202EE15FC5C}.Debug|x86.Build.0 = Debug|Any CPU
-		{F5051A32-6BD0-4128-ABBA-C202EE15FC5C}.Prerelease|Any CPU.ActiveCfg = Prerelease|Any CPU
-		{F5051A32-6BD0-4128-ABBA-C202EE15FC5C}.Prerelease|Any CPU.Build.0 = Prerelease|Any CPU
-		{F5051A32-6BD0-4128-ABBA-C202EE15FC5C}.Prerelease|Mixed Platforms.ActiveCfg = Prerelease|Any CPU
-		{F5051A32-6BD0-4128-ABBA-C202EE15FC5C}.Prerelease|Mixed Platforms.Build.0 = Prerelease|Any CPU
-		{F5051A32-6BD0-4128-ABBA-C202EE15FC5C}.Prerelease|x64.ActiveCfg = Prerelease|Any CPU
-		{F5051A32-6BD0-4128-ABBA-C202EE15FC5C}.Prerelease|x64.Build.0 = Prerelease|Any CPU
-		{F5051A32-6BD0-4128-ABBA-C202EE15FC5C}.Prerelease|x86.ActiveCfg = Prerelease|Any CPU
-		{F5051A32-6BD0-4128-ABBA-C202EE15FC5C}.Prerelease|x86.Build.0 = Prerelease|Any CPU
-		{F5051A32-6BD0-4128-ABBA-C202EE15FC5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F5051A32-6BD0-4128-ABBA-C202EE15FC5C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F5051A32-6BD0-4128-ABBA-C202EE15FC5C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{F5051A32-6BD0-4128-ABBA-C202EE15FC5C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{F5051A32-6BD0-4128-ABBA-C202EE15FC5C}.Release|x64.ActiveCfg = Release|Any CPU
-		{F5051A32-6BD0-4128-ABBA-C202EE15FC5C}.Release|x64.Build.0 = Release|Any CPU
-		{F5051A32-6BD0-4128-ABBA-C202EE15FC5C}.Release|x86.ActiveCfg = Release|Any CPU
-		{F5051A32-6BD0-4128-ABBA-C202EE15FC5C}.Release|x86.Build.0 = Release|Any CPU
-		{B72DEBFB-9D48-4076-8FF5-1FD72A830845}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B72DEBFB-9D48-4076-8FF5-1FD72A830845}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B72DEBFB-9D48-4076-8FF5-1FD72A830845}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B72DEBFB-9D48-4076-8FF5-1FD72A830845}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B72DEBFB-9D48-4076-8FF5-1FD72A830845}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B72DEBFB-9D48-4076-8FF5-1FD72A830845}.Debug|x64.Build.0 = Debug|Any CPU
-		{B72DEBFB-9D48-4076-8FF5-1FD72A830845}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B72DEBFB-9D48-4076-8FF5-1FD72A830845}.Debug|x86.Build.0 = Debug|Any CPU
-		{B72DEBFB-9D48-4076-8FF5-1FD72A830845}.Prerelease|Any CPU.ActiveCfg = Debug|Any CPU
-		{B72DEBFB-9D48-4076-8FF5-1FD72A830845}.Prerelease|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B72DEBFB-9D48-4076-8FF5-1FD72A830845}.Prerelease|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B72DEBFB-9D48-4076-8FF5-1FD72A830845}.Prerelease|x64.ActiveCfg = Debug|Any CPU
-		{B72DEBFB-9D48-4076-8FF5-1FD72A830845}.Prerelease|x64.Build.0 = Debug|Any CPU
-		{B72DEBFB-9D48-4076-8FF5-1FD72A830845}.Prerelease|x86.ActiveCfg = Debug|Any CPU
-		{B72DEBFB-9D48-4076-8FF5-1FD72A830845}.Prerelease|x86.Build.0 = Debug|Any CPU
-		{B72DEBFB-9D48-4076-8FF5-1FD72A830845}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B72DEBFB-9D48-4076-8FF5-1FD72A830845}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{B72DEBFB-9D48-4076-8FF5-1FD72A830845}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{B72DEBFB-9D48-4076-8FF5-1FD72A830845}.Release|x64.ActiveCfg = Release|Any CPU
-		{B72DEBFB-9D48-4076-8FF5-1FD72A830845}.Release|x64.Build.0 = Release|Any CPU
-		{B72DEBFB-9D48-4076-8FF5-1FD72A830845}.Release|x86.ActiveCfg = Release|Any CPU
-		{B72DEBFB-9D48-4076-8FF5-1FD72A830845}.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
@@ -309,40 +267,6 @@ Global
 		{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
-		{15A81D6E-7502-46CE-8530-0647A380B5F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{15A81D6E-7502-46CE-8530-0647A380B5F4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{15A81D6E-7502-46CE-8530-0647A380B5F4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{15A81D6E-7502-46CE-8530-0647A380B5F4}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{15A81D6E-7502-46CE-8530-0647A380B5F4}.Prerelease|Any CPU.ActiveCfg = Prerelease|Any CPU
-		{15A81D6E-7502-46CE-8530-0647A380B5F4}.Prerelease|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{15A81D6E-7502-46CE-8530-0647A380B5F4}.Prerelease|x64.ActiveCfg = Release|Any CPU
-		{15A81D6E-7502-46CE-8530-0647A380B5F4}.Prerelease|x86.ActiveCfg = Release|Any CPU
-		{15A81D6E-7502-46CE-8530-0647A380B5F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{15A81D6E-7502-46CE-8530-0647A380B5F4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{15A81D6E-7502-46CE-8530-0647A380B5F4}.Release|x64.ActiveCfg = Release|Any CPU
-		{15A81D6E-7502-46CE-8530-0647A380B5F4}.Release|x86.ActiveCfg = Release|Any CPU
-		{42EFDA12-10D3-4C40-A210-9483520116BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{42EFDA12-10D3-4C40-A210-9483520116BC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{42EFDA12-10D3-4C40-A210-9483520116BC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{42EFDA12-10D3-4C40-A210-9483520116BC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{42EFDA12-10D3-4C40-A210-9483520116BC}.Debug|x64.Build.0 = Debug|Any CPU
-		{42EFDA12-10D3-4C40-A210-9483520116BC}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{42EFDA12-10D3-4C40-A210-9483520116BC}.Debug|x86.Build.0 = Debug|Any CPU
-		{42EFDA12-10D3-4C40-A210-9483520116BC}.Prerelease|Any CPU.ActiveCfg = Prerelease|Any CPU
-		{42EFDA12-10D3-4C40-A210-9483520116BC}.Prerelease|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{42EFDA12-10D3-4C40-A210-9483520116BC}.Prerelease|Mixed Platforms.Build.0 = Release|Any CPU
-		{42EFDA12-10D3-4C40-A210-9483520116BC}.Prerelease|x64.ActiveCfg = Release|Any CPU
-		{42EFDA12-10D3-4C40-A210-9483520116BC}.Prerelease|x64.Build.0 = Release|Any CPU
-		{42EFDA12-10D3-4C40-A210-9483520116BC}.Prerelease|x86.ActiveCfg = Release|Any CPU
-		{42EFDA12-10D3-4C40-A210-9483520116BC}.Prerelease|x86.Build.0 = Release|Any CPU
-		{42EFDA12-10D3-4C40-A210-9483520116BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{42EFDA12-10D3-4C40-A210-9483520116BC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{42EFDA12-10D3-4C40-A210-9483520116BC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{42EFDA12-10D3-4C40-A210-9483520116BC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{42EFDA12-10D3-4C40-A210-9483520116BC}.Release|x64.ActiveCfg = Release|Any CPU
-		{42EFDA12-10D3-4C40-A210-9483520116BC}.Release|x64.Build.0 = Release|Any CPU
-		{42EFDA12-10D3-4C40-A210-9483520116BC}.Release|x86.ActiveCfg = Release|Any CPU
-		{42EFDA12-10D3-4C40-A210-9483520116BC}.Release|x86.Build.0 = Release|Any CPU
 		{776B348B-F818-4A0F-A625-D0AF8BAD3E9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{776B348B-F818-4A0F-A625-D0AF8BAD3E9B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{776B348B-F818-4A0F-A625-D0AF8BAD3E9B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -375,8 +299,8 @@ Global
 		{F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Debug|x64.Build.0 = Debug|Any CPU
 		{F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Debug|x86.Build.0 = Debug|Any CPU
-		{F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Prerelease|Any CPU.ActiveCfg = Debug|Any CPU
+		{F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Prerelease|Any CPU.ActiveCfg = Prerelease|Any CPU
-		{F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Prerelease|Any CPU.Build.0 = Debug|Any CPU
+		{F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Prerelease|Any CPU.Build.0 = Prerelease|Any CPU
 		{F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Prerelease|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Prerelease|Mixed Platforms.Build.0 = Debug|Any CPU
 		{F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Prerelease|x64.ActiveCfg = Debug|Any CPU
@@ -391,6 +315,53 @@ Global
 		{F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Release|x64.Build.0 = Release|Any CPU
 		{F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Release|x86.ActiveCfg = Release|Any CPU
 		{F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Release|x86.Build.0 = Release|Any CPU
+		{00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}.Debug|x64.Build.0 = Debug|Any CPU
+		{00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}.Debug|x86.Build.0 = Debug|Any CPU
+		{00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}.Prerelease|Any CPU.ActiveCfg = Prerelease|Any CPU
+		{00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}.Prerelease|Any CPU.Build.0 = Prerelease|Any CPU
+		{00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}.Prerelease|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}.Prerelease|Mixed Platforms.Build.0 = Debug|Any CPU
+		{00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}.Prerelease|x64.ActiveCfg = Debug|Any CPU
+		{00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}.Prerelease|x64.Build.0 = Debug|Any CPU
+		{00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}.Prerelease|x86.ActiveCfg = Debug|Any CPU
+		{00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}.Prerelease|x86.Build.0 = Debug|Any CPU
+		{00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}.Release|x64.ActiveCfg = Release|Any CPU
+		{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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -400,12 +371,13 @@ 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}
-		{B72DEBFB-9D48-4076-8FF5-1FD72A830845} = {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}
 		{A848FCF1-8527-4AA8-A1AA-50D29695C678} = {26E8B310-269E-46D4-A612-24601F16065F}
 		{776B348B-F818-4A0F-A625-D0AF8BAD3E9B} = {A848FCF1-8527-4AA8-A1AA-50D29695C678}
 		{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}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {84F8F8E0-1F73-41E0-BD8D-BB6676E2EE87}

Master/Master.pyproj

@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>f5051a32-6bd0-4128-abba-c202ee15fc5c</ProjectGuid>
-    <ProjectHome>.</ProjectHome>
-    <ProjectTypeGuids>{789894c7-04a9-4a11-a6b5-3f4435165112};{1b580a1a-fdb3-4b32-83e1-6407eb2722e6};{349c5851-65df-11da-9384-00065b846f21};{888888a0-9f3d-457c-b088-3a5042f75d52}</ProjectTypeGuids>
-    <StartupFile>master\runserver.py</StartupFile>
-    <SearchPath>
-    </SearchPath>
-    <WorkingDirectory>.</WorkingDirectory>
-    <LaunchProvider>Standard Python launcher</LaunchProvider>
-    <WebBrowserUrl>http://localhost</WebBrowserUrl>
-    <OutputPath>.</OutputPath>
-    <SuppressCollectPythonCloudServiceFiles>true</SuppressCollectPythonCloudServiceFiles>
-    <Name>Master</Name>
-    <RootNamespace>Master</RootNamespace>
-    <InterpreterId>MSBuild|env_master|$(MSBuildProjectFullPath)</InterpreterId>
-    <IsWindowsApplication>False</IsWindowsApplication>
-    <PythonRunWebServerCommand>
-    </PythonRunWebServerCommand>
-    <PythonDebugWebServerCommand>
-    </PythonDebugWebServerCommand>
-    <PythonRunWebServerCommandType>script</PythonRunWebServerCommandType>
-    <PythonDebugWebServerCommandType>script</PythonDebugWebServerCommandType>
-    <EnableNativeCodeDebugging>False</EnableNativeCodeDebugging>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <DebugSymbols>true</DebugSymbols>
-    <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <DebugSymbols>true</DebugSymbols>
-    <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Prerelease' ">
-    <DebugSymbols>true</DebugSymbols>
-    <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
-    <OutputPath>bin\Prerelease\</OutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="master\context\base.py">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="master\context\history.py">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="master\context\__init__.py">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="master\models\instancemodel.py">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="master\models\servermodel.py">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="master\models\__init__.py">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="master\resources\authenticate.py">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="master\resources\history_graph.py">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="master\resources\instance.py">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="master\resources\localization.py">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="master\resources\null.py">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Master\resources\server.py">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="master\resources\version.py">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="master\resources\__init__.py">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="master\routes.py">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="master\runserver.py">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="master\schema\instanceschema.py">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="master\schema\serverschema.py">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="master\schema\__init__.py">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="master\__init__.py" />
-    <Compile Include="master\views.py" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="master\" />
-    <Folder Include="master\context\" />
-    <Folder Include="master\models\" />
-    <Folder Include="master\config\" />
-    <Folder Include="master\schema\" />
-    <Folder Include="Master\resources\" />
-    <Folder Include="master\static\" />
-    <Folder Include="master\templates\" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="master\config\master.json" />
-    <Content Include="master\templates\serverlist.html" />
-    <None Include="Release.pubxml" />
-    <Content Include="requirements.txt" />
-    <Content Include="master\templates\index.html" />
-    <Content Include="master\templates\layout.html" />
-  </ItemGroup>
-  <ItemGroup>
-    <Interpreter Include="env_master\">
-      <Id>env_master</Id>
-      <Version>3.6</Version>
-      <Description>env_master (Python 3.6 (64-bit))</Description>
-      <InterpreterPath>Scripts\python.exe</InterpreterPath>
-      <WindowsInterpreterPath>Scripts\pythonw.exe</WindowsInterpreterPath>
-      <PathEnvironmentVariable>PYTHONPATH</PathEnvironmentVariable>
-      <Architecture>X64</Architecture>
-    </Interpreter>
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Python Tools\Microsoft.PythonTools.Web.targets" />
-  <!-- Specify pre- and post-build commands in the BeforeBuild and 
-       AfterBuild targets below. -->
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  <ProjectExtensions>
-    <VisualStudio>
-      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
-        <WebProjectProperties>
-          <AutoAssignPort>True</AutoAssignPort>
-          <UseCustomServer>True</UseCustomServer>
-          <CustomServerUrl>http://localhost</CustomServerUrl>
-          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
-        </WebProjectProperties>
-      </FlavorProperties>
-      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}" User="">
-        <WebProjectProperties>
-          <StartPageUrl>
-          </StartPageUrl>
-          <StartAction>CurrentPage</StartAction>
-          <AspNetDebugging>True</AspNetDebugging>
-          <SilverlightDebugging>False</SilverlightDebugging>
-          <NativeDebugging>False</NativeDebugging>
-          <SQLDebugging>False</SQLDebugging>
-          <ExternalProgram>
-          </ExternalProgram>
-          <StartExternalURL>
-          </StartExternalURL>
-          <StartCmdLineArguments>
-          </StartCmdLineArguments>
-          <StartWorkingDirectory>
-          </StartWorkingDirectory>
-          <EnableENC>False</EnableENC>
-          <AlwaysStartWebServerOnDebug>False</AlwaysStartWebServerOnDebug>
-        </WebProjectProperties>
-      </FlavorProperties>
-    </VisualStudio>
-  </ProjectExtensions>
-</Project>

Master/master/__init__.py

@@ -1,19 +0,0 @@
-"""
-The flask application package.
-"""
-
-from flask import Flask
-from flask_restful import Resource, Api
-from flask_jwt_extended import JWTManager
-from master.context.base import Base
-
-app = Flask(__name__)
-app.config['JWT_SECRET_KEY'] = 'my key!'
-app.config['PROPAGATE_EXCEPTIONS'] = True
-jwt = JWTManager(app)
-api = Api(app)
-ctx = Base()
-#config = json.load(open('./master/config/master.json'))
-
-import master.routes
-import master.views

Master/master/config/master.json

@@ -1,4 +0,0 @@
-{
-  "current-version-stable": 2.1,
-  "current-version-prerelease": 2.1
-}

Master/master/context/__init__.py

@@ -1 +0,0 @@
-

Master/master/context/base.py

@@ -1,89 +0,0 @@
-from apscheduler.schedulers.background import BackgroundScheduler
-from apscheduler.triggers.interval import IntervalTrigger
-from master.context.history import History
-
-from master.schema.instanceschema import InstanceSchema
-
-import time
-
-class Base():
-    def __init__(self):
-        self.history = History()
-        self.instance_list = {}
-        self.token_list = {}
-        self.scheduler = BackgroundScheduler()
-        self.scheduler.start()
-        self.scheduler.add_job(
-            func=self._remove_staleinstances,
-            trigger=IntervalTrigger(seconds=60),
-            id='stale_instance_remover',
-            name='Remove stale instances if no heartbeat in 60 seconds',
-            replace_existing=True
-        )
-        self.scheduler.add_job(
-        func=self._update_history_count,
-        trigger=IntervalTrigger(seconds=30),
-        id='update history',
-        name='update client and instance count every 30 seconds',
-        replace_existing=True
-        )
-
-    def _update_history_count(self):
-        servers = [instance.servers for instance in self.instance_list.values()]
-        servers = [inner for outer in servers for inner in outer]
-        client_num = 0
-        # force it being a number
-        for server in servers:
-            client_num += server.clientnum
-        self.history.add_client_history(client_num)
-        self.history.add_instance_history(len(self.instance_list))
-        self.history.add_server_history(len(servers))
-
-    def _remove_staleinstances(self):
-        for key, value in list(self.instance_list.items()):
-            if int(time.time()) - value.last_heartbeat > 60:
-                print('[_remove_staleinstances] removing stale instance {id}'.format(id=key))
-                del self.instance_list[key]
-                del self.token_list[key]
-        print('[_remove_staleinstances] {count} active instances'.format(count=len(self.instance_list.items())))
-
-    def get_instances(self):
-        return self.instance_list.values()
-
-    def get_instance_count(self):
-        return self.instance_list.count
-
-    def get_instance(self, id):
-        return self.instance_list[id]
-
-    def instance_exists(self, instance_id):
-        if instance_id in self.instance_list.keys():
-            return instance_id
-        else:
-            False
-
-    def add_instance(self, instance):
-        if instance.id in self.instance_list:
-            print('[add_instance] instance {id} already added, updating instead'.format(id=instance.id))
-            return self.update_instance(instance)
-        else:
-            print('[add_instance] adding instance {id}'.format(id=instance.id))
-            self.instance_list[instance.id] = instance
-
-    def update_instance(self, instance):
-        if instance.id not in self.instance_list:
-            print('[update_instance] instance {id} not added, adding instead'.format(id=instance.id))
-            return self.add_instance(instance)
-        else:
-            print('[update_instance] updating instance {id}'.format(id=instance.id))
-            self.instance_list[instance.id] = instance
-
-    def add_token(self, instance_id, token):
-        print('[add_token] adding {token} for id {id}'.format(token=token, id=instance_id))
-        self.token_list[instance_id] = token
-
-    def get_token(self, instance_id):
-        try:
-            return self.token_list[instance_id]
-        except KeyError:
-            return False

Master/master/context/history.py

@@ -1,32 +0,0 @@
-import time
-from random import randint
-
-class History():
-    def __init__(self):
-        self.client_history = list()
-        self.instance_history = list()
-        self.server_history = list()
-
-    def add_client_history(self, client_num):
-        if len(self.client_history) > 2880:
-            self.client_history = self.client_history[1:]
-        self.client_history.append({
-            'count' : client_num,
-            'time' : int(time.time())
-        })
-
-    def add_server_history(self, server_num):
-        if len(self.server_history) > 2880:
-            self.server_history = self.server_history[1:]
-        self.server_history.append({
-             'count' : server_num,
-             'time' : int(time.time())
-        })
-  
-    def add_instance_history(self, instance_num):
-        if len(self.instance_history) > 2880:
-            self.instance_history = self.instance_history[1:]
-        self.instance_history.append({
-            'count' : instance_num,
-            'time' : int(time.time())
-        })

Master/master/models/__init__.py

@@ -1 +0,0 @@
-

Master/master/models/instancemodel.py

@@ -1,12 +0,0 @@
-import time
-
-class InstanceModel(object):
-    def __init__(self, id, version, uptime, servers):
-        self.id = id
-        self.version = version
-        self.uptime = uptime
-        self.servers = servers
-        self.last_heartbeat = int(time.time())
-
-    def __repr__(self):
-        return '<InstanceModel(id={id})>'.format(id=self.id)

Master/master/models/servermodel.py

@@ -1,16 +0,0 @@
-
-class ServerModel(object):
-    def __init__(self, id, port, game, hostname, clientnum, maxclientnum, map, gametype, ip, version):
-        self.id = id
-        self.port = port
-        self.version = version
-        self.game = game
-        self.hostname = hostname
-        self.clientnum = clientnum
-        self.maxclientnum = maxclientnum
-        self.map = map
-        self.gametype = gametype
-        self.ip = ip
-
-    def __repr__(self):
-        return '<ServerModel(id={id})>'.format(id=self.id)

Master/master/resources/__init__.py

@@ -1 +0,0 @@
-

Master/master/resources/authenticate.py

@@ -1,18 +0,0 @@
-from flask_restful import Resource
-from flask import request, jsonify
-from flask_jwt_extended import create_access_token
-from master import app, ctx
-import datetime
-
-
-class Authenticate(Resource):
-    def post(self):
-        instance_id = request.json['id']
-        #todo: see why this is failing
-        #if ctx.get_token(instance_id) is not False:
-        #    return { 'message' : 'that id already has a token'}, 401
-        #else:
-        expires = datetime.timedelta(days=30)
-        token = create_access_token(instance_id, expires_delta=expires)
-        ctx.add_token(instance_id, token)
-        return { 'access_token' : token }, 200

Master/master/resources/history_graph.py

@@ -1,49 +0,0 @@
-from flask_restful import Resource
-from pygal.style import Style
-from master import ctx
-import pygal
-import timeago
-from math import ceil
-
-class HistoryGraph(Resource):
-    def get(self, history_count):
-        try:
-            custom_style = Style(
-            background='transparent',
-            plot_background='transparent',
-            foreground='#6c757d',
-            foreground_strong='#6c757d',
-            foreground_subtle='#6c757d',
-            opacity='0.1',
-            opacity_hover='0.2',
-            transition='0ms',
-            colors=('#749363','#007acc'),
-            )
-
-            graph = pygal.Line(
-                stroke_style={'width': 0.4}, 
-                #show_dots=False, 
-                show_legend=False, 
-                fill=True, 
-                style=custom_style, 
-                disable_xml_declaration=True)
-            
-            instance_count = [history['time'] for history in ctx.history.instance_history][-history_count:]
-            
-            if len(instance_count) > 0:
-                graph.x_labels = [ timeago.format(instance_count[0])]
-
-            instance_counts = [history['count'] for history in ctx.history.instance_history][-history_count:]
-            client_counts = [history['count'] for history in ctx.history.client_history][-history_count:]
-            server_counts = [history['count'] for history in ctx.history.server_history][-history_count:]
-
-            graph.add('Client Count', client_counts)
-            graph.add('Instance Count', instance_counts)
-            return { 'message' :  graph.render().replace("<title>Pygal</title>", ""), 
-                     'data_points' : len(instance_count),
-                     'instance_count' : 0 if len(instance_counts) is 0 else instance_counts[-1],
-                     'client_count' : 0 if len(client_counts) is 0 else client_counts[-1],
-                     'server_count' : 0 if len(server_counts) is 0 else server_counts[-1]
-                   }, 200
-        except Exception as e:
-            return { 'message' : str(e) }, 500

Master/master/resources/instance.py

@@ -1,49 +0,0 @@
-from flask_restful import Resource
-from flask import request
-from flask_jwt_extended import jwt_required
-from marshmallow import ValidationError
-from master.schema.instanceschema import InstanceSchema
-from master import ctx
-import json
-from netaddr import IPAddress
-
-class Instance(Resource):
-    def get(self, id=None):
-        if id is None:
-            schema = InstanceSchema(many=True)
-            instances = schema.dump(ctx.get_instances())
-            return instances
-        else:
-            try:
-                instance = ctx.get_instance(id)
-                return InstanceSchema().dump(instance)
-            except KeyError:
-                return {'message' : 'instance not found'}, 404
-
-    @jwt_required
-    def put(self, id):
-        try:
-            for server in request.json['servers']:
-                if 'ip' not in server or IPAddress(server['ip']).is_private() or IPAddress(server['ip']).is_loopback():
-                    server['ip'] = request.remote_addr
-                if 'version' not in server:
-                    server['version'] = 'Unknown'
-            instance = InstanceSchema().load(request.json)
-        except ValidationError as err:
-            return {'message' : err.messages }, 400
-        ctx.update_instance(instance)
-        return { 'message' : 'instance updated successfully' }, 200
-
-    @jwt_required
-    def post(self):
-        try:
-            for server in request.json['servers']:
-               if 'ip' not in server or server['ip'] == 'localhost':
-                    server['ip'] = request.remote_addr
-               if 'version' not in server:
-                    server['version'] = 'Unknown'
-            instance = InstanceSchema().load(request.json)
-        except ValidationError as err:
-            return {'message' : err.messages }, 400
-        ctx.add_instance(instance)
-        return { 'message' : 'instance added successfully' }, 200

Master/master/resources/localization.py

@@ -1,59 +0,0 @@
-from flask_restful import Resource
-from flask import request, jsonify
-from flask_jwt_extended import create_access_token
-from master import app, ctx
-import datetime
-import urllib.request
-import csv
-from io import StringIO
-
-class Localization(Resource):
-    def list(self):
-        response = urllib.request.urlopen('https://docs.google.com/spreadsheets/d/e/2PACX-1vRQjCqPvd0Xqcn86WqpFqp_lx4KKpel9O4OV13NycmV8rmqycorgJQm-8qXMfw37QJHun3pqVZFUKG-/pub?gid=0&single=true&output=csv')
-        data = response.read().decode('utf-8')
-
-        localization = []
-        csv_data = csv.DictReader(StringIO(data))
-
-        for language in csv_data.fieldnames[1:]:
-            localization.append({
-                    'LocalizationName' : language,
-                     'LocalizationIndex' : {
-                     'Set' : {}
-                     }
-                })
-
-        for row in csv_data:
-            localization_string = row['STRING']
-            count = 0
-            for language in  csv_data.fieldnames[1:]:
-                localization[count]['LocalizationIndex']['Set'][localization_string] = row[language]
-                count += 1
-
-        return localization, 200
-
-    def get(self, language_tag=None):
-        response = urllib.request.urlopen('https://docs.google.com/spreadsheets/d/e/2PACX-1vRQjCqPvd0Xqcn86WqpFqp_lx4KKpel9O4OV13NycmV8rmqycorgJQm-8qXMfw37QJHun3pqVZFUKG-/pub?gid=0&single=true&output=csv')
-        data = response.read().decode('utf-8')
-
-        csv_data = csv.DictReader(StringIO(data))
-        
-
-        if language_tag != None:
-           valid_language_tag = next((l for l in csv_data.fieldnames[1:] if l == language_tag), None)
-           if valid_language_tag is None:
-               valid_language_tag = next((l for l in csv_data.fieldnames[1:] if l.startswith(language_tag[:2])), None)
-           if valid_language_tag is None:
-               valid_language_tag = 'en-US'   
-           localization = {
-                  'LocalizationName' : valid_language_tag,
-                  'LocalizationIndex' : {
-                  'Set' : {}
-                  }
-                }
-           for row in csv_data:
-               localization_string = row['STRING']
-               localization['LocalizationIndex']['Set'][localization_string] = row[valid_language_tag]
-           return localization, 200
-        else:
-           return self.list()[0][0], 200

Master/master/resources/null.py

@@ -1,11 +0,0 @@
-from flask_restful import Resource
-from master.models.servermodel import ServerModel
-from master.schema.serverschema import ServerSchema
-from master.models.instancemodel import InstanceModel
-from master.schema.instanceschema import InstanceSchema
-
-class Null(Resource):
-    def get(self):
-        server = ServerModel(1, 'T6M', 'test', 0, 18, 'mp_test', 'tdm')
-        instance = InstanceModel(1, 1.5, 132, [server])
-        return InstanceSchema().dump(instance)

Master/master/resources/server.py

@@ -1,6 +0,0 @@
-from flask_restful import Resource
-
-class Server(Resource):
-    """description of class"""
-
-

Master/master/resources/version.py

@@ -1,10 +0,0 @@
-from flask_restful import Resource
-import json
-
-class Version(Resource):
-    def get(self):
-        config = json.load(open('./master/config/master.json'))
-        return { 
-            'current-version-stable' : config['current-version-stable'],
-            'current-version-prerelease' : config['current-version-prerelease']
-         }, 200

Master/master/routes.py

@@ -1,17 +0,0 @@
-from master import api
-
-from master.resources.null import Null
-from master.resources.instance import Instance
-from master.resources.authenticate import Authenticate
-from master.resources.version import Version
-from master.resources.history_graph import HistoryGraph
-from master.resources.localization import Localization
-from master.resources.server import Server
-
-api.add_resource(Null, '/null')
-api.add_resource(Instance, '/instance/', '/instance/<string:id>')
-api.add_resource(Version, '/version')
-api.add_resource(Authenticate, '/authenticate')
-api.add_resource(HistoryGraph, '/history/', '/history/<int:history_count>')
-api.add_resource(Localization, '/localization/', '/localization/<string:language_tag>')
-api.add_resource(Server, '/server')

Master/master/runserver.py

@@ -1,9 +0,0 @@
-"""
-This script runs the Master application using a development server.
-"""
-
-from os import environ
-from master import app
-
-if __name__ == '__main__':
-    app.run(host='0.0.0.0', port=80, debug=True)

Master/master/schema/__init__.py

@@ -1 +0,0 @@
-

Master/master/schema/instanceschema.py

@@ -1,29 +0,0 @@
-from marshmallow import Schema, fields, post_load, validate
-from master.models.instancemodel import InstanceModel
-from master.schema.serverschema import ServerSchema
-
-class InstanceSchema(Schema):
-    id = fields.String(
-        required=True
-    )
-    version = fields.Float(
-        required=True,
-        validate=validate.Range(1.0, 10.0, 'invalid version number')
-    )
-    servers = fields.Nested(
-        ServerSchema,
-        many=True,
-        validate=validate.Length(0, 32, 'invalid server count')
-    )
-    uptime = fields.Int(
-        required=True,
-        validate=validate.Range(0, 2147483647, 'invalid uptime')
-    )
-    last_heartbeat = fields.Int(
-        required=False
-    )
-
-    @post_load
-    def make_instance(self, data):
-        return InstanceModel(**data)
-

Master/master/schema/serverschema.py

@@ -1,47 +0,0 @@
-from marshmallow import Schema, fields, post_load, validate
-from master.models.servermodel import ServerModel
-
-class ServerSchema(Schema):
-    id = fields.Int(
-        required=True,
-        validate=validate.Range(0, 25525525525565535, 'invalid id')
-    )
-    ip = fields.Str(
-        required=True
-    )
-    port = fields.Int(
-        required=True,
-        validate=validate.Range(1, 65535, 'invalid port')
-    )
-    version = fields.String(
-        required=False,
-        validate=validate.Length(0, 128, 'invalid server version')
-    )
-    game = fields.String(
-        required=True,
-        validate=validate.Length(1, 5, 'invalid game name')
-    )
-    hostname = fields.String(
-        required=True,
-        validate=validate.Length(1, 64, 'invalid hostname')
-    )
-    clientnum = fields.Int(
-        required=True,
-        validate=validate.Range(0, 128, 'invalid clientnum')
-    )
-    maxclientnum = fields.Int(
-        required=True,
-        validate=validate.Range(1, 128, 'invalid maxclientnum')
-    )
-    map = fields.String(
-        required=True,
-        validate=validate.Length(0, 64, 'invalid map name')
-    )
-    gametype = fields.String(
-        required=True,
-        validate=validate.Length(1, 16, 'invalid gametype')
-    )
-
-    @post_load
-    def make_instance(self, data):
-        return ServerModel(**data)

Master/master/templates/index.html

@@ -1,64 +0,0 @@
-{% extends "layout.html" %}
-
-{% block content %}
-<div class="row">
-    <div class="col-12">
-        <figure>
-            <div id="history_graph">{{history_graph|safe}}</div>
-            <figcaption class="float-right">
-                <span id="history_graph_zoom_out" class="h4 oi oi-zoom-out text-muted" style="cursor:pointer;"></span>
-                <span id="history_graph_zoom_in" class="h4 oi oi-zoom-in text-muted" style="cursor:pointer;"></span>
-            </figcaption>
-            <figcaption class="float-left">
-                <span class="h4 text-muted">{{instance_count}} instances</span>
-                <span class="h4 text-muted">&mdash; {{client_count}} clients</span>
-                <span class="h4 text-muted">&mdash; {{server_count}} servers</span>
-            </figcaption>
-        </figure>
-
-    </div>
-    <div class="col-12">
-
-    </div>
-</div>
-{% endblock %}
-
-{% block scripts %}
-<script type="text/javascript" src="http://kozea.github.com/pygal.js/latest/pygal-tooltips.min.js"></script>
-<script>
-    let dataPoints = {{data_points}};
-    let maxPoints = 2880;
-    maxPoints = Math.min(maxPoints, dataPoints);
-    let zoomLevel = Math.floor(maxPoints);
-    let performingZoom = false;
-
-    function updateHistoryGraph() {
-        perfomingZoom = true;
-        $.get('/history/' + zoomLevel)
-            .done(function (content) {
-                $('#history_graph').html(content.message);
-                //maxPoints = Math.min(maxPoints, dataPoints);
-                perfomingZoom = false;
-            });
-    }
-
-    //setInterval(updateHistoryGraph, 30000);
-
-    $('#history_graph_zoom_out').click(function () {
-        if (performingZoom === true) {
-            return false;
-        }
-        zoomLevel = Math.floor(zoomLevel * 2) <= maxPoints ? Math.floor(zoomLevel * 2) : maxPoints;
-        updateHistoryGraph();
-    });
-
-    $('#history_graph_zoom_in').click(function () {
-        if (performingZoom === true) {
-            return false;
-        }
-        zoomLevel = zoomLevel / 2 > 2 ? Math.ceil(zoomLevel / 2) : 2;
-        updateHistoryGraph();
-    });
-
-</script>
-{% endblock %}

Master/master/templates/layout.html

@@ -1,45 +0,0 @@
-<!DOCTYPE html>
-<html class="bg-dark">
-<head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>IW4MAdmin Master | {{ title }}</title>
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.0/css/bootstrap.min.css" integrity="sha384-9gVQ4dYFwwWSjIDZnLEWnxCjeSWFphJiwGPXr1jddIhOegiu1FwO5qRGvFXOdJZ4" crossorigin="anonymous">
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/open-iconic/1.1.1/font/css/open-iconic-bootstrap.min.css" integrity="sha256-BJ/G+e+y7bQdrYkS2RBTyNfBHpA9IuGaPmf9htub5MQ=" crossorigin="anonymous" />
-    <style type="text/css">
-        .active {
-            stroke-width: initial !important;
-        }
-
-        .oi:hover {
-            color: #fff !important;
-        }
-        .dot {
-            opacity: 0;
-            padding: 5px;
-        }
-
-        .dot:hover {
-            opacity: 1;
-        }
-
-        .tooltip-box {
-            fill: #343a40 !important;
-        }
-    </style>
-</head>
-
-<body class="bg-dark">
-
-    <div class="container body-content bg-dark">
-        {% block content %}{% endblock %}
-
-    </div>
-
-    <script src="https://code.jquery.com/jquery-3.3.1.min.js"
-            integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8="
-            crossorigin="anonymous"></script>
-    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script>
-    {% block scripts %}{% endblock %}
-</body>
-</html>

Master/master/templates/serverlist.html

@@ -1,113 +0,0 @@
-{% extends "layout.html" %}
-
-{% block content %}
-<!-- todo: move this! -->
-<style>
-    .server-row {
-        cursor: pointer;
-    }
-
-    .modal-content, .nav-item {
-        background-color: #212529;
-        color: #fff;
-    }
-
-    .modal-header, .modal-footer {
-        border-color: #32383e !important;
-    }
-
-    .modal-dark button.close, a.nav-link {
-        color: #fff;
-    }
-</style>
-
-<div class="modal modal-dark" id="serverModalCenter" tabindex="-1" role="dialog" aria-labelledby="serverModalCenterTitle" aria-hidden="true">
-    <div class="modal-dialog modal-dialog-centered" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h5 class="modal-title" id="serverModalTitle">Modal title</h5>
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                    <span aria-hidden="true">&times;</span>
-                </button>
-            </div>
-            <div class="modal-body">
-                <div class="h5" id="server_socket"></div>
-            </div>
-            <div class="modal-footer">
-                <button id="connect_button" type="button" class="btn btn-dark">Connect</button>
-                <button type="button" class="btn btn-dark" data-dismiss="modal">Close</button>
-            </div>
-        </div>
-    </div>
-</div>
-
-<div class="row">
-    <div class="col-12">
-        <nav>
-            <div class="nav nav-tabs" id="server_game_tabs" role="tablist">
-                {% for game in games %}
-                <a class="nav-item nav-link {{'active' if loop.first else ''}}" id="{{game}}_servers_tab" data-toggle="tab" href="#{{game}}_servers" role="tab" aria-controls="{{game}}_servers" aria-selected="{{'true' if loop.first else 'false' }}">{{game}}</a>
-                {% endfor %}
-            </div>
-        </nav>
-        <div class="tab-content" id="server_game_tabs_content">
-            {% for game, servers in games.items() %}
-
-            <div class="tab-pane {{'show active' if loop.first else ''}}" id="{{game}}_servers" role="tabpanel" aria-labelledby="{{game}}_servers_tab">
-
-                <table class="table table-dark table-striped table-hover table-responsive-lg">
-                    <thead>
-                        <tr>
-                            <th>Server Name</th>
-                            <th>Map Name</th>
-                            <th>Players</th>
-                            <th>Mode</th>
-                            <th class="text-center">Connect</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-
-                        {% for server in servers %}
-
-                        <tr class="server-row" data-toggle="modal" data-target="#serverModalCenter"
-                            data-ip="{{server.ip}}" data-port="{{server.port}}">
-                            <td data-hostname="{{server.hostname}}" class="server-hostname">{{server.hostname}}</td>
-                            <td data-map="{{server.map}} " class="server-map">{{server.map}}</td>
-                            <td data-clientnum="{{server.clientnum}}" data-maxclientnum="{{server.maxclientnum}}"
-                                class="server-clientnum">
-                                {{server.clientnum}}/{{server.maxclientnum}}
-                            </td>
-                            <td data-gametype="{{server.gametype}}" class="server-gametype">{{server.gametype}}</td>
-                            <td class="text-center"><span class="oi oi-play-circle"></span></td>
-                        </tr>
-
-                        {% endfor %}
-
-                    </tbody>
-                </table>
-            </div>
-
-            {% endfor %}
-        </div>
-        <div class="w-100 small text-right  text-muted">
-            <span>Developed by RaidMax</span><br />
-            <span>PRERELEASE</span>
-        </div>
-    </div>
-</div>
-    {% endblock %}
-
-    {% block scripts %}
-<script>
-    $(document).ready(() => {
-        $('.server-row').off('click');
-        $('.server-row').on('click', function (e) {
-            $('#serverModalTitle').text($(this).find('.server-hostname').text());
-            $('#server_socket').text(`/connect ${$(this).data('ip')}:${$(this).data('port')}`);
-        });
-
-        $('#connect_button').off('click');
-        $('#connect_button').on('click', (e) => alert('soon...'));
-    });
-</script>
-    {% endblock %}