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

@@ -242,3 +242,5 @@ launchSettings.json
 /WebfrontCore/wwwroot/font
 /Plugins/Tests/TestSourceFiles
 /Tests/ApplicationTests/Files/GameEvents.json
+/Tests/ApplicationTests/Files/replay.json
+/GameLogServer/game_log_server_env

Application/API/Master/Heartbeat.cs

@@ -1,72 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using RestEase;
-
-namespace IW4MAdmin.Application.API.Master
-{
-    /// <summary>
-    /// Defines the heartbeat functionality for IW4MAdmin
-    /// </summary>
-    public class Heartbeat
-    {
-        /// <summary>
-        /// Sends heartbeat to master server
-        /// </summary>
-        /// <param name="mgr"></param>
-        /// <param name="firstHeartbeat"></param>
-        /// <returns></returns>
-        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 = 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.Port,
-                                IPAddress = s.IP
-                            }).ToList()
-            };
-
-            Response<ResultMessage> response = null;
-
-            if (firstHeartbeat)
-            {
-                response = await api.AddInstance(instance);
-            }
-
-            else
-            {
-                response = await api.UpdateInstance(instance.Id, instance);
-            }
-
-            if (response.ResponseMessage.StatusCode != System.Net.HttpStatusCode.OK)
-            {
-                mgr.Logger.WriteWarning($"Response code from master is {response.ResponseMessage.StatusCode}, message is {response.StringContent}");
-            }
-        }
-    }
-}

Application/API/Master/IMasterApi.cs

@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
 using RestEase;
@@ -37,16 +35,6 @@ namespace IW4MAdmin.Application.API.Master
         public string Message { get; set; }
     }
 
-    public class Endpoint
-    {
-#if !DEBUG
-        private static readonly IMasterApi api = RestClient.For<IMasterApi>("http://api.raidmax.org:5000");
-#else
-        private static readonly IMasterApi api = RestClient.For<IMasterApi>("http://127.0.0.1");
-#endif
-        public static IMasterApi Get() => api;
-    }
-
     /// <summary>
     /// Defines the capabilities of the master API
     /// </summary>

Application/Application.csproj

@@ -10,7 +10,7 @@
     <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>
@@ -25,20 +25,20 @@
 
   <ItemGroup>
     <PackageReference Include="Jint" Version="3.0.0-beta-1632" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.3">
+    <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.3" />
-    <PackageReference Include="RestEase" Version="1.4.10" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.0" />
+    <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>false</ServerGarbageCollection>
     <ConcurrentGarbageCollection>true</ConcurrentGarbageCollection>
     <TieredCompilation>true</TieredCompilation>
-    <LangVersion>7.1</LangVersion>
+    <LangVersion>Latest</LangVersion>
     <StartupObject></StartupObject>
   </PropertyGroup>
 

Application/ApplicationManager.cs

@@ -1,5 +1,6 @@
 using IW4MAdmin.Application.API.Master;
 using IW4MAdmin.Application.EventParsers;
+using IW4MAdmin.Application.Extensions;
 using IW4MAdmin.Application.Misc;
 using IW4MAdmin.Application.RconParsers;
 using SharedLibraryCore;
@@ -12,6 +13,7 @@ using SharedLibraryCore.Dtos;
 using SharedLibraryCore.Exceptions;
 using SharedLibraryCore.Helpers;
 using SharedLibraryCore.Interfaces;
+using SharedLibraryCore.QueryHelper;
 using SharedLibraryCore.Services;
 using System;
 using System.Collections;
@@ -31,7 +33,7 @@ namespace IW4MAdmin.Application
         private readonly ConcurrentBag<Server> _servers;
         public List<Server> Servers => _servers.OrderByDescending(s => s.ClientNum).ToList();
         public ILogger Logger => GetLogger(0);
-        public bool Running { get; private set; }
+        public bool IsRunning { get; private set; }
         public bool IsInitialized { get; private set; }
         public DateTime StartTime { get; private set; }
         public string Version => Assembly.GetEntryAssembly().GetName().Version.ToString();
@@ -43,6 +45,7 @@ namespace IW4MAdmin.Application
         public string ExternalIPAddress { get; private set; }
         public bool IsRestartRequested { get; private set; }
         public IMiddlewareActionHandler MiddlewareActionHandler { get; }
+        public event EventHandler<GameEvent> OnGameEventExecuted;
         private readonly List<IManagerCommand> _commands;
         private readonly ILogger _logger;
         private readonly List<MessageToken> MessageTokens;
@@ -50,10 +53,9 @@ namespace IW4MAdmin.Application
         readonly AliasService AliasSvc;
         readonly PenaltyService PenaltySvc;
         public IConfigurationHandler<ApplicationConfiguration> ConfigHandler;
-        GameEventHandler Handler;
         readonly IPageList PageList;
         private readonly Dictionary<long, ILogger> _loggers = new Dictionary<long, ILogger>();
-        private readonly MetaService _metaService;
+        private readonly IMetaService _metaService;
         private readonly TimeSpan _throttleTimeout = new TimeSpan(0, 1, 0);
         private readonly CancellationTokenSource _tokenSource;
         private readonly Dictionary<string, Task<IList>> _operationLookup = new Dictionary<string, Task<IList>>();
@@ -62,26 +64,32 @@ namespace IW4MAdmin.Application
         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;
 
         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)
+            IEnumerable<IPlugin> plugins, IParserRegexFactory parserRegexFactory, IEnumerable<IRegisterEvent> customParserEvents,
+            IEventHandler eventHandler, IScriptCommandFactory scriptCommandFactory, IDatabaseContextFactory contextFactory, IMetaService metaService,
+            IMetaRegistration metaRegistration, IScriptPluginServiceResolver scriptPluginServiceResolver)
         {
             MiddlewareActionHandler = actionHandler;
             _servers = new ConcurrentBag<Server>();
             MessageTokens = new List<MessageToken>();
-            ClientSvc = new ClientService();
+            ClientSvc = new ClientService(contextFactory);
             AliasSvc = new AliasService();
             PenaltySvc = new PenaltyService();
             ConfigHandler = appConfigHandler;
             StartTime = DateTime.UtcNow;
             PageList = new PageList();
-            AdditionalEventParsers = new List<IEventParser>() { new BaseEventParser(parserRegexFactory, logger) };
+            AdditionalEventParsers = new List<IEventParser>() { new BaseEventParser(parserRegexFactory, logger, appConfigHandler.Configuration()) };
             AdditionalRConParsers = new List<IRConParser>() { new BaseRConParser(parserRegexFactory) };
             TokenAuthenticator = new TokenAuthentication();
             _logger = logger;
-            _metaService = new MetaService();
+            _metaService = metaService;
             _tokenSource = new CancellationTokenSource();
             _loggers.Add(0, logger);
             _commands = commands.ToList();
@@ -90,6 +98,10 @@ namespace IW4MAdmin.Application
             _serverInstanceFactory = serverInstanceFactory;
             _parserRegexFactory = parserRegexFactory;
             _customParserEvents = customParserEvents;
+            _eventHandler = eventHandler;
+            _scriptCommandFactory = scriptCommandFactory;
+            _metaRegistration = metaRegistration;
+            _scriptPluginServiceResolver = scriptPluginServiceResolver;
             Plugins = plugins;
         }
 
@@ -160,6 +172,8 @@ namespace IW4MAdmin.Application
         skip:
             // tell anyone waiting for the output that we're done
             newEvent.Complete();
+            OnGameEventExecuted?.Invoke(this, newEvent);
+
 #if DEBUG == true
             Logger.WriteDebug($"Exiting event process for {newEvent.Id}");
 #endif
@@ -255,7 +269,7 @@ namespace IW4MAdmin.Application
 
         public async Task Init()
         {
-            Running = true;
+            IsRunning = true;
             ExternalIPAddress = await Utilities.GetExternalIP();
 
             #region PLUGINS
@@ -265,12 +279,12 @@ namespace IW4MAdmin.Application
                 {
                     if (plugin is ScriptPlugin scriptPlugin)
                     {
-                        await scriptPlugin.Initialize(this);
+                        await scriptPlugin.Initialize(this, _scriptCommandFactory, _scriptPluginServiceResolver);
                         scriptPlugin.Watcher.Changed += async (sender, e) =>
                         {
                             try
                             {
-                                await scriptPlugin.Initialize(this);
+                                await scriptPlugin.Initialize(this, _scriptCommandFactory, _scriptPluginServiceResolver);
                             }
 
                             catch (Exception ex)
@@ -420,18 +434,25 @@ namespace IW4MAdmin.Application
 
             else
             {
-                var unsavedCommands = _commands.Where(_cmd => !cmdConfig.Commands.Keys.Contains(_cmd.GetType().Name));
+                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.GetType().Name,
+                cmdConfig.Commands.Add(cmd.CommandConfigNameForType(),
                 new CommandProperties()
                 {
                     Name = cmd.Name,
                     Alias = cmd.Alias,
-                    MinimumPermission = cmd.Permission
+                    MinimumPermission = cmd.Permission,
+                    AllowImpersonation = cmd.AllowImpersonation,
+                    SupportedGames = cmd.SupportedGames
                 });
             }
 
@@ -439,127 +460,7 @@ namespace IW4MAdmin.Application
             await _commandConfiguration.Save();
             #endregion
 
-            #region META
-            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
-                if (count > 1)
-                {
-                    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
+            _metaRegistration.Register();
 
             #region CUSTOM_EVENTS
             foreach (var customEvent in _customParserEvents.SelectMany(_events => _events.Events))
@@ -582,9 +483,6 @@ namespace IW4MAdmin.Application
 
             async Task Init(ServerConfiguration Conf)
             {
-                // setup the event handler after the class is initialized
-                Handler = new GameEventHandler(this);
-
                 try
                 {
                     // todo: this might not always be an IW4MServer
@@ -603,7 +501,7 @@ namespace IW4MAdmin.Application
                         Owner = ServerInstance
                     };
 
-                    Handler.AddEvent(e);
+                    AddEvent(e);
                     successServers++;
                 }
 
@@ -636,90 +534,12 @@ namespace IW4MAdmin.Application
             }
         }
 
-        private async Task SendHeartbeat()
-        {
-            bool connected = false;
-
-            while (!_tokenSource.IsCancellationRequested)
-            {
-                if (!connected)
-                {
-                    try
-                    {
-                        await Heartbeat.Send(this, true);
-                        connected = true;
-                    }
-
-                    catch (Exception e)
-                    {
-                        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)
-                            {
-                                connected = false;
-                            }
-                        }
-                    }
-
-                    catch (RestEase.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, _tokenSource.Token);
-                }
-                catch { break; }
-            }
-        }
-
-        public async Task Start()
-        {
-            await Task.WhenAll(new[]
-            {
-                SendHeartbeat(),
-                UpdateServerStates()
-            });
-        }
+        public async Task Start() => await UpdateServerStates();
 
         public void Stop()
         {
             _tokenSource.Cancel();
-            Running = false;
+            IsRunning = false;
         }
 
         public void Restart()
@@ -775,9 +595,9 @@ namespace IW4MAdmin.Application
             return ConfigHandler;
         }
 
-        public IEventHandler GetEventHandler()
+        public void AddEvent(GameEvent gameEvent)
         {
-            return Handler;
+            _eventHandler.HandleEvent(this, gameEvent);
         }
 
         public IPageList GetPageList()
@@ -795,7 +615,7 @@ namespace IW4MAdmin.Application
 
         public IEventParser GenerateDynamicEventParser(string name)
         {
-            return new DynamicEventParser(_parserRegexFactory, _logger)
+            return new DynamicEventParser(_parserRegexFactory, _logger, ConfigHandler.Configuration())
             {
                 Name = name
             };
@@ -811,5 +631,17 @@ namespace IW4MAdmin.Application
         {
             _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/PostPublish.bat

@@ -26,6 +26,10 @@ if not exist "%PublishDir%\Lib\" md "%PublishDir%\Lib\"
 move "%PublishDir%\*.dll" "%PublishDir%\Lib\"
 move "%PublishDir%\*.json" "%PublishDir%\Lib\"
 move "%PublishDir%\runtimes" "%PublishDir%\Lib\runtimes"
+move "%PublishDir%\ru" "%PublishDir%\Lib\ru"
+move "%PublishDir%\de" "%PublishDir%\Lib\de"
+move "%PublishDir%\pt" "%PublishDir%\Lib\pt"
+move "%PublishDir%\es" "%PublishDir%\Lib\es"
 if exist "%PublishDir%\refs" move "%PublishDir%\refs" "%PublishDir%\Lib\refs"
 
 echo making start scripts

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/EventParsers/BaseEventParser.cs

@@ -1,4 +1,5 @@
 using SharedLibraryCore;
+using SharedLibraryCore.Configuration;
 using SharedLibraryCore.Database.Models;
 using SharedLibraryCore.Interfaces;
 using System;
@@ -12,37 +13,39 @@ namespace IW4MAdmin.Application.EventParsers
     {
         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)
+        public BaseEventParser(IParserRegexFactory parserRegexFactory, ILogger logger, ApplicationConfiguration appConfig)
         {
             _customEventRegistrations = new Dictionary<string, (string, Func<string, IEventParserConfiguration, GameEvent, GameEvent>)>();
             _logger = logger;
+            _appConfig = appConfig;
 
             Configuration = new DynamicEventParserConfiguration(parserRegexFactory)
             {
                 GameDirectory = "main",
             };
 
-            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);
@@ -57,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);
@@ -118,11 +121,16 @@ namespace IW4MAdmin.Application.EventParsers
 
                     if (message.Length > 0)
                     {
-                        long originId = matchResult.Values[Configuration.Say.GroupMapping[ParserRegex.GroupType.OriginNetworkId]].ToString().ConvertGuidToLong(Configuration.GuidNumberStyle);
+                        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]]);
 
-                        // todo: these need to defined outside of here
-                        if (message[0] == '!' || message[0] == '@')
+                        if (message.StartsWith(_appConfig.CommandPrefix) || message.StartsWith(_appConfig.BroadcastCommandPrefix))
                         {
                             return new GameEvent()
                             {
@@ -132,7 +140,8 @@ namespace IW4MAdmin.Application.EventParsers
                                 Message = message,
                                 Extra = logLine,
                                 RequiredEntity = GameEvent.EventRequiredEntity.Origin,
-                                GameTime = gameTime
+                                GameTime = gameTime,
+                                Source = GameEvent.EventSource.Log
                             };
                         }
 
@@ -144,7 +153,8 @@ namespace IW4MAdmin.Application.EventParsers
                             Message = message,
                             Extra = logLine,
                             RequiredEntity = GameEvent.EventRequiredEntity.Origin,
-                            GameTime = gameTime
+                            GameTime = gameTime,
+                            Source = GameEvent.EventSource.Log
                         };
                     }
                 }
@@ -156,8 +166,18 @@ namespace IW4MAdmin.Application.EventParsers
 
                 if (match.Success)
                 {
-                    long originId = match.Values[Configuration.Kill.GroupMapping[ParserRegex.GroupType.OriginNetworkId]].ToString().ConvertGuidToLong(Configuration.GuidNumberStyle, 1);
-                    long targetId = match.Values[Configuration.Kill.GroupMapping[ParserRegex.GroupType.TargetNetworkId]].ToString().ConvertGuidToLong(Configuration.GuidNumberStyle, 1);
+                    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();
+
+                    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]]);
 
@@ -168,7 +188,8 @@ namespace IW4MAdmin.Application.EventParsers
                         Origin = new EFClient() { NetworkId = originId, ClientNumber = originClientNumber },
                         Target = new EFClient() { NetworkId = targetId, ClientNumber = targetClientNumber },
                         RequiredEntity = GameEvent.EventRequiredEntity.Origin | GameEvent.EventRequiredEntity.Target,
-                        GameTime = gameTime
+                        GameTime = gameTime,
+                        Source = GameEvent.EventSource.Log
                     };
                 }
             }
@@ -179,8 +200,18 @@ namespace IW4MAdmin.Application.EventParsers
 
                 if (match.Success)
                 {
-                    long originId = match.Values[Configuration.Damage.GroupMapping[ParserRegex.GroupType.OriginNetworkId]].ToString().ConvertGuidToLong(Configuration.GuidNumberStyle, 1);
-                    long targetId = match.Values[Configuration.Damage.GroupMapping[ParserRegex.GroupType.TargetNetworkId]].ToString().ConvertGuidToLong(Configuration.GuidNumberStyle, 1);
+                    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();
+
+                    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]]);
 
@@ -191,7 +222,8 @@ namespace IW4MAdmin.Application.EventParsers
                         Origin = new EFClient() { NetworkId = originId, ClientNumber = originClientNumber },
                         Target = new EFClient() { NetworkId = targetId, ClientNumber = targetClientNumber },
                         RequiredEntity = GameEvent.EventRequiredEntity.Origin | GameEvent.EventRequiredEntity.Target,
-                        GameTime = gameTime
+                        GameTime = gameTime,
+                        Source = GameEvent.EventSource.Log
                     };
                 }
             }
@@ -202,6 +234,13 @@ namespace IW4MAdmin.Application.EventParsers
 
                 if (match.Success)
                 {
+                    string originIdString = match.Values[Configuration.Join.GroupMapping[ParserRegex.GroupType.OriginNetworkId]].ToString();
+                    string originName = match.Values[Configuration.Join.GroupMapping[ParserRegex.GroupType.OriginName]].ToString();
+
+                    long networkId = originIdString.IsBotGuid() ?
+                        originName.GenerateGuidFromString() :
+                        originIdString.ConvertGuidToLong(Configuration.GuidNumberStyle);
+
                     return new GameEvent()
                     {
                         Type = GameEvent.EventType.PreConnect,
@@ -212,13 +251,15 @@ namespace IW4MAdmin.Application.EventParsers
                             {
                                 Name = match.Values[Configuration.Join.GroupMapping[ParserRegex.GroupType.OriginName]].ToString().TrimNewLine(),
                             },
-                            NetworkId = match.Values[Configuration.Join.GroupMapping[ParserRegex.GroupType.OriginNetworkId]].ToString().ConvertGuidToLong(Configuration.GuidNumberStyle),
+                            NetworkId = networkId,
                             ClientNumber = Convert.ToInt32(match.Values[Configuration.Join.GroupMapping[ParserRegex.GroupType.OriginClientNumber]].ToString()),
                             State = EFClient.ClientState.Connecting,
                         },
+                        Extra = originIdString,
                         RequiredEntity = GameEvent.EventRequiredEntity.None,
                         IsBlocking = true,
-                        GameTime = gameTime
+                        GameTime = gameTime,
+                        Source = GameEvent.EventSource.Log
                     };
                 }
             }
@@ -229,6 +270,13 @@ namespace IW4MAdmin.Application.EventParsers
 
                 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,
@@ -239,13 +287,14 @@ namespace IW4MAdmin.Application.EventParsers
                             {
                                 Name = match.Values[Configuration.Quit.GroupMapping[ParserRegex.GroupType.OriginName]].ToString().TrimNewLine()
                             },
-                            NetworkId = match.Values[Configuration.Quit.GroupMapping[ParserRegex.GroupType.OriginNetworkId]].ToString().ConvertGuidToLong(Configuration.GuidNumberStyle),
+                            NetworkId = networkId,
                             ClientNumber = Convert.ToInt32(match.Values[Configuration.Quit.GroupMapping[ParserRegex.GroupType.OriginClientNumber]].ToString()),
                             State = EFClient.ClientState.Disconnecting
                         },
                         RequiredEntity = GameEvent.EventRequiredEntity.None,
                         IsBlocking = true,
-                        GameTime = gameTime
+                        GameTime = gameTime,
+                        Source = GameEvent.EventSource.Log
                     };
                 }
             }
@@ -259,7 +308,8 @@ namespace IW4MAdmin.Application.EventParsers
                     Origin = Utilities.IW4MAdminClient(),
                     Target = Utilities.IW4MAdminClient(),
                     RequiredEntity = GameEvent.EventRequiredEntity.None,
-                    GameTime = gameTime
+                    GameTime = gameTime,
+                    Source = GameEvent.EventSource.Log
                 };
             }
 
@@ -275,7 +325,8 @@ namespace IW4MAdmin.Application.EventParsers
                     Target = Utilities.IW4MAdminClient(),
                     Extra = dump.DictionaryFromKeyValue(),
                     RequiredEntity = GameEvent.EventRequiredEntity.None,
-                    GameTime = gameTime
+                    GameTime = gameTime,
+                    Source = GameEvent.EventSource.Log
                 };
             }
 
@@ -290,7 +341,8 @@ namespace IW4MAdmin.Application.EventParsers
                         Type = GameEvent.EventType.Other,
                         Data = logLine,
                         Subtype = eventModifier.Item1,
-                        GameTime = gameTime
+                        GameTime = gameTime,
+                        Source = GameEvent.EventSource.Log
                     });
                 }
 
@@ -307,7 +359,8 @@ namespace IW4MAdmin.Application.EventParsers
                 Origin = Utilities.IW4MAdminClient(),
                 Target = Utilities.IW4MAdminClient(),
                 RequiredEntity = GameEvent.EventRequiredEntity.None,
-                GameTime = gameTime
+                GameTime = gameTime,
+                Source = GameEvent.EventSource.Log
             };
         }
 

Application/EventParsers/DynamicEventParser.cs

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

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/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

@@ -12,16 +12,20 @@ namespace IW4MAdmin.Application.Factories
     {
         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)
+        public GameServerInstanceFactory(ITranslationLookup translationLookup, IRConConnectionFactory rconConnectionFactory, IGameLogReaderFactory gameLogReaderFactory, IMetaService metaService)
         {
             _translationLookup = translationLookup;
             _rconConnectionFactory = rconConnectionFactory;
+            _gameLogReaderFactory = gameLogReaderFactory;
+            _metaService = metaService;
         }
 
         /// <summary>
@@ -32,7 +36,7 @@ namespace IW4MAdmin.Application.Factories
         /// <returns></returns>
         public Server CreateServer(ServerConfiguration config, IManager manager)
         {
-            return new IW4MServer(manager, config, _translationLookup, _rconConnectionFactory);
+            return new IW4MServer(manager, config, _translationLookup, _rconConnectionFactory, _gameLogReaderFactory, _metaService);
         }
     }
 }

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,18 +1,19 @@
 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 ApplicationManager Manager;
-        private readonly EventProfiler _profiler;
+        private readonly EventLog _eventLog;
         private static readonly GameEvent.EventType[] overrideEvents = new[]
         {
             GameEvent.EventType.Connect,
@@ -21,26 +22,12 @@ namespace IW4MAdmin.Application
             GameEvent.EventType.Stop
         };
 
-        public GameEventHandler(IManager mgr)
+        public GameEventHandler()
         {
-            Manager = (ApplicationManager)mgr;
-            _profiler = new EventProfiler(mgr.GetLogger(0));
+            _eventLog = new EventLog();
         }
 
-        private Task GameEventHandler_GameEventAdded(object sender, GameEventArgs args)
-        {
-#if DEBUG
-            var start = DateTime.Now;
-#endif
-            EventApi.OnGameEvent(sender, args);
-            return Manager.ExecuteEvent(args.Event);
-
-#if DEBUG
-            _profiler.Profile(start, DateTime.Now, args.Event);
-#endif
-        }
-
-        public void AddEvent(GameEvent gameEvent)
+        public void HandleEvent(IManager manager, GameEvent gameEvent)
         {
 #if DEBUG
             ThreadPool.GetMaxThreads(out int workerThreads, out int n);
@@ -48,13 +35,14 @@ namespace IW4MAdmin.Application
             gameEvent.Owner.Logger.WriteDebug($"There are {workerThreads - availableThreads} active threading tasks");
 
 #endif
-            if (Manager.Running || overrideEvents.Contains(gameEvent.Type))
+            if (manager.IsRunning || overrideEvents.Contains(gameEvent.Type))
             {
 #if DEBUG
                 gameEvent.Owner.Logger.WriteDebug($"Adding event with id {gameEvent.Id}");
 #endif
-                //GameEventAdded?.Invoke(this, new GameEventArgs(null, false, gameEvent));
-                Task.Run(() => GameEventHandler_GameEventAdded(this, new GameEventArgs(null, false, gameEvent)));
+
+                EventApi.OnGameEvent(gameEvent);
+                Task.Factory.StartNew(() => manager.ExecuteEvent(gameEvent));
             }
 #if DEBUG
             else

Application/IO/GameLogEventDetection.cs

@@ -13,17 +13,9 @@ namespace IW4MAdmin.Application.IO
         private readonly IGameLogReader _reader;
         private readonly bool _ignoreBots;
 
-        class EventState
+        public GameLogEventDetection(Server server, Uri[] gameLogUris, IGameLogReaderFactory gameLogReaderFactory)
         {
-            public ILogger Log { get; set; }
-            public string ServerId { get; set; }
-        }
-
-        public GameLogEventDetection(Server server, string gameLogPath, Uri gameLogServerUri, IGameLogReader reader = null)
-        {
-            _reader = gameLogServerUri != null 
-                ? reader ?? new GameLogReaderHttp(gameLogServerUri, gameLogPath, server.EventParser) 
-                : reader ?? new GameLogReader(gameLogPath, server.EventParser);
+            _reader = gameLogReaderFactory.CreateGameLogReader(gameLogUris, server.EventParser);
             _server = server;
             _ignoreBots = server?.Manager.GetApplicationSettings().Configuration().IgnoreBots ?? false;
         }
@@ -70,7 +62,7 @@ namespace IW4MAdmin.Application.IO
                 return;
             }
 
-            var events = await _reader.ReadEventsFromLog(_server, fileDiff, previousFileSize);
+            var events = await _reader.ReadEventsFromLog(fileDiff, previousFileSize);
 
             foreach (var gameEvent in events)
             {
@@ -84,9 +76,9 @@ namespace IW4MAdmin.Application.IO
                     // 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 != 1)
+                        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);
+                            gameEvent.Origin = _server.GetClientsAsList().First(_client => _client.NetworkId == gameEvent.Origin?.NetworkId);;
                         }
 
                         if ((gameEvent.RequiredEntity & GameEvent.EventRequiredEntity.Target) == GameEvent.EventRequiredEntity.Target)
@@ -104,7 +96,7 @@ namespace IW4MAdmin.Application.IO
                             gameEvent.Target.CurrentServer = _server;
                         }
 
-                        _server.Manager.GetEventHandler().AddEvent(gameEvent);
+                        _server.Manager.AddEvent(gameEvent);
                     }
                 }
 

Application/IO/GameLogReader.cs

@@ -13,18 +13,20 @@ namespace IW4MAdmin.Application.IO
     {
         private readonly IEventParser _parser;
         private readonly string _logFile;
+        private readonly ILogger _logger;
 
         public long Length => new FileInfo(_logFile).Length;
 
         public int UpdateInterval => 300;
 
-        public GameLogReader(string logFile, IEventParser parser)
+        public GameLogReader(string logFile, IEventParser parser, ILogger logger)
         {
             _logFile = logFile;
             _parser = parser;
+            _logger = logger;
         }
 
-        public async Task<IEnumerable<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>();
@@ -34,7 +36,7 @@ namespace IW4MAdmin.Application.IO
             {
                 byte[] buff = new byte[fileSizeDiff];
                 fs.Seek(startPosition, SeekOrigin.Begin);
-                await fs.ReadAsync(buff, 0, (int)fileSizeDiff, server.Manager.CancellationToken);
+                await fs.ReadAsync(buff, 0, (int)fileSizeDiff);
                 var stringBuilder = new StringBuilder();
                 char[] charBuff = Utilities.EncodingType.GetChars(buff);
 
@@ -71,9 +73,9 @@ namespace IW4MAdmin.Application.IO
 
                 catch (Exception e)
                 {
-                    server.Logger.WriteWarning("Could not properly parse event line");
-                    server.Logger.WriteDebug(e.Message);
-                    server.Logger.WriteDebug(eventLine);
+                    _logger.WriteWarning("Could not properly parse event line");
+                    _logger.WriteDebug(e.Message);
+                    _logger.WriteDebug(eventLine);
                 }
             }
 

Application/IO/GameLogReaderHttp.cs

@@ -5,43 +5,42 @@ using SharedLibraryCore.Interfaces;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Net.Http;
 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
     {
         private readonly IEventParser _eventParser;
         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;
-            _logServerApi = RestClient.For<IGameLogServer>(gameLogServerUri);
+            _logServerApi = RestClient.For<IGameLogServer>(gameLogServerUris[0].ToString());
+            _safeLogPath = gameLogServerUris[1].LocalPath.ToBase64UrlSafeString();
+            _logger = logger;
         }
 
         public long Length => -1;
 
         public int UpdateInterval => 500;
 
-        public async Task<IEnumerable<GameEvent>> ReadEventsFromLog(Server server, long fileSizeDiff, long startPosition)
+        public async Task<IEnumerable<GameEvent>> ReadEventsFromLog(long fileSizeDiff, long startPosition)
         {
             var events = new List<GameEvent>();
-            string b64Path = logPath;
-            var response = await _logServerApi.Log(b64Path, lastKey);
+            var response = await _logServerApi.Log(_safeLogPath, lastKey);
             lastKey = response.NextKey;
 
             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;
             }
 
@@ -63,9 +62,9 @@ namespace IW4MAdmin.Application.IO
 
                     catch (Exception e)
                     {
-                        server.Logger.WriteError("Could not properly parse event line from http");
-                        server.Logger.WriteDebug(e.Message);
-                        server.Logger.WriteDebug(eventLine);
+                        _logger.WriteError("Could not properly parse event line from http");
+                        _logger.WriteDebug(e.Message);
+                        _logger.WriteDebug(eventLine);
                     }
                 }
             }

Application/IW4MServer.cs

@@ -7,12 +7,12 @@ using SharedLibraryCore.Dtos;
 using SharedLibraryCore.Exceptions;
 using SharedLibraryCore.Helpers;
 using SharedLibraryCore.Interfaces;
-using SharedLibraryCore.Services;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
+using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
@@ -25,15 +25,17 @@ namespace IW4MAdmin
         private static readonly SharedLibraryCore.Localization.TranslationLookup loc = Utilities.CurrentLocalization.LocalizationIndex;
         public GameLogEventDetection LogEvent;
         private readonly ITranslationLookup _translationLookup;
+        private readonly IMetaService _metaService;
         private const int REPORT_FLAG_COUNT = 4;
         private int lastGameTime = 0;
 
         public int Id { get; private set; }
 
         public IW4MServer(IManager mgr, ServerConfiguration cfg, ITranslationLookup lookup,
-            IRConConnectionFactory connectionFactory) : base(mgr, connectionFactory, cfg)
+            IRConConnectionFactory connectionFactory, IGameLogReaderFactory gameLogReaderFactory, IMetaService metaService) : base(cfg, mgr, connectionFactory, gameLogReaderFactory)
         {
             _translationLookup = lookup;
+            _metaService = metaService;
         }
 
         override public async Task<EFClient> OnClientConnected(EFClient clientFromLog)
@@ -77,7 +79,7 @@ namespace IW4MAdmin
                 Type = GameEvent.EventType.Connect
             };
 
-            Manager.GetEventHandler().AddEvent(e);
+            Manager.AddEvent(e);
             return client;
         }
 
@@ -104,7 +106,7 @@ namespace IW4MAdmin
                     Type = GameEvent.EventType.Disconnect
                 };
 
-                Manager.GetEventHandler().AddEvent(e);
+                Manager.AddEvent(e);
 #if DEBUG == true
             }
 #endif
@@ -138,12 +140,13 @@ namespace IW4MAdmin
                 {
                     try
                     {
-                        C = await SharedLibraryCore.Commands.CommandProcessing.ValidateCommand(E);
+                        C = await SharedLibraryCore.Commands.CommandProcessing.ValidateCommand(E, Manager.GetApplicationSettings().Configuration());
                     }
 
                     catch (CommandException e)
                     {
                         Logger.WriteInfo(e.Message);
+                        E.FailReason = GameEvent.EventFailReason.Invalid;
                     }
 
                     if (C != null)
@@ -185,16 +188,23 @@ namespace IW4MAdmin
                             return;
                         }
 
-                        await _plugin.OnEventAsync(E, this);
+                        using (var tokenSource = new CancellationTokenSource())
+                        {
+                            tokenSource.CancelAfter(Utilities.DefaultCommandTimeout);
+                            await (_plugin.OnEventAsync(E, this)).WithWaitCancellation(tokenSource.Token);
+                        }
                     }
                     catch (Exception Except)
                     {
                         Logger.WriteError($"{loc["SERVER_PLUGIN_ERROR"]} [{_plugin.Name}]");
                         Logger.WriteDebug(Except.GetExceptionInfo());
                     }
-                });
+                }).ToArray();
 
-                Parallel.ForEach(pluginTasks, async (_task) => await _task);
+                if (pluginTasks.Any())
+                {
+                    await Task.WhenAny(pluginTasks);
+                }
             }
 
             catch (Exception e)
@@ -216,8 +226,11 @@ namespace IW4MAdmin
 
                 if (lastException != null)
                 {
-                    Logger.WriteDebug("Last Exception is not null");
-                    throw lastException;
+                    bool notifyDisconnects = !Manager.GetApplicationSettings().Configuration().IgnoreServerConnectionLost;
+                    if (notifyDisconnects || (!notifyDisconnects && lastException as NetworkException == null))
+                    {
+                        throw lastException;
+                    }
                 }
             }
         }
@@ -250,7 +263,7 @@ namespace IW4MAdmin
 
             if (E.Type == GameEvent.EventType.ConnectionRestored)
             {
-                if (Throttled)
+                if (Throttled && !Manager.GetApplicationSettings().Configuration().IgnoreServerConnectionLost)
                 {
                     Logger.WriteVerbose(loc["MANAGER_CONNECTION_REST"].FormatExt($"[{IP}:{Port}]"));
                 }
@@ -292,6 +305,12 @@ namespace IW4MAdmin
                     return false;
                 }
 
+                if (E.Origin.CurrentServer == null)
+                {
+                    Logger.WriteWarning($"preconnecting client {E.Origin} did not have a current server specified");
+                    E.Origin.CurrentServer = this;
+                }
+
                 var existingClient = GetClientsAsList().FirstOrDefault(_client => _client.Equals(E.Origin));
 
                 // they're already connected
@@ -303,7 +322,9 @@ namespace IW4MAdmin
 
                 // this happens for some reason rarely where the client spots get out of order
                 // possible a connect/reconnect game event before we get to process it here 
-                else if (existingClient != null && existingClient.ClientNumber != E.Origin.ClientNumber)
+                // it appears that new games decide to switch client slots between maps (even if the clients aren't disconnecting)
+                // bots can have duplicate names which causes conflicting GUIDs
+                else if (existingClient != null && existingClient.ClientNumber != E.Origin.ClientNumber && !E.Origin.IsBot)
                 {
                     Logger.WriteWarning($"client {E.Origin} is trying to connect in client slot {E.Origin.ClientNumber}, but they are already registed in client slot {existingClient.ClientNumber}, swapping...");
                     // we need to remove them so the client spots can swap
@@ -332,7 +353,7 @@ namespace IW4MAdmin
                         return false;
                     }
 
-                    if (E.Origin.Level > EFClient.Permission.Moderator)
+                    if (E.Origin.Level > Permission.Moderator)
                     {
                         E.Origin.Tell(string.Format(loc["SERVER_REPORT_COUNT"], E.Owner.Reports.Count));
                     }
@@ -361,7 +382,7 @@ namespace IW4MAdmin
                     Expires = expires,
                     Offender = E.Target,
                     Offense = E.Data,
-                    Punisher = E.Origin,
+                    Punisher = E.ImpersonationOrigin ?? E.Origin,
                     When = DateTime.UtcNow,
                     Link = E.Target.AliasLink
                 };
@@ -378,7 +399,7 @@ namespace IW4MAdmin
                     Expires = DateTime.UtcNow,
                     Offender = E.Target,
                     Offense = E.Data,
-                    Punisher = E.Origin,
+                    Punisher = E.ImpersonationOrigin ?? E.Origin,
                     When = DateTime.UtcNow,
                     Link = E.Target.AliasLink
                 };
@@ -403,7 +424,7 @@ namespace IW4MAdmin
                     Expires = DateTime.UtcNow,
                     Offender = E.Target,
                     Offense = E.Message,
-                    Punisher = E.Origin,
+                    Punisher = E.ImpersonationOrigin ?? E.Origin,
                     Active = true,
                     When = DateTime.UtcNow,
                     Link = E.Target.AliasLink
@@ -422,28 +443,28 @@ namespace IW4MAdmin
 
             else if (E.Type == GameEvent.EventType.TempBan)
             {
-                await TempBan(E.Data, (TimeSpan)E.Extra, E.Target, E.Origin); ;
+                await TempBan(E.Data, (TimeSpan)E.Extra, E.Target, E.ImpersonationOrigin ?? E.Origin); ;
             }
 
             else if (E.Type == GameEvent.EventType.Ban)
             {
                 bool isEvade = E.Extra != null ? (bool)E.Extra : false;
-                await Ban(E.Data, E.Target, E.Origin, isEvade);
+                await Ban(E.Data, E.Target, E.ImpersonationOrigin ?? E.Origin, isEvade);
             }
 
             else if (E.Type == GameEvent.EventType.Unban)
             {
-                await Unban(E.Data, E.Target, E.Origin);
+                await Unban(E.Data, E.Target, E.ImpersonationOrigin ?? E.Origin);
             }
 
             else if (E.Type == GameEvent.EventType.Kick)
             {
-                await Kick(E.Data, E.Target, E.Origin);
+                await Kick(E.Data, E.Target, E.ImpersonationOrigin ?? E.Origin);
             }
 
             else if (E.Type == GameEvent.EventType.Warn)
             {
-                await Warn(E.Data, E.Target, E.Origin);
+                await Warn(E.Data, E.Target, E.ImpersonationOrigin ?? E.Origin);
             }
 
             else if (E.Type == GameEvent.EventType.Disconnect)
@@ -455,8 +476,8 @@ namespace IW4MAdmin
                     Time = DateTime.UtcNow
                 });
 
-                await new MetaService().AddPersistentMeta("LastMapPlayed", CurrentMap.Alias, E.Origin);
-                await new MetaService().AddPersistentMeta("LastServerPlayed", E.Owner.Hostname, E.Origin);
+                await _metaService.AddPersistentMeta("LastMapPlayed", CurrentMap.Alias, E.Origin);
+                await _metaService.AddPersistentMeta("LastServerPlayed", E.Owner.Hostname, E.Origin);
             }
 
             else if (E.Type == GameEvent.EventType.PreDisconnect)
@@ -520,14 +541,18 @@ namespace IW4MAdmin
                                 .First(_qm => _qm.Game == GameName)
                                 .Messages[E.Data.Substring(1)];
                         }
-                        catch { }
+                        catch
+                        {
+                            message = E.Data.Substring(1);
+                        }
                     }
 
                     ChatHistory.Add(new ChatInfo()
                     {
                         Name = E.Origin.Name,
                         Message = message,
-                        Time = DateTime.UtcNow
+                        Time = DateTime.UtcNow,
+                        IsHidden = !string.IsNullOrEmpty(GamePassword)
                     });
                 }
             }
@@ -590,13 +615,10 @@ namespace IW4MAdmin
 
             if (E.Type == GameEvent.EventType.Broadcast)
             {
-#if DEBUG == false
-                // this is a little ugly but I don't want to change the abstract class
-                if (E.Data != null)
+                if (!Utilities.IsDevelopment && E.Data != null) // hides broadcast when in development mode
                 {
                     await E.Owner.ExecuteCommandAsync(E.Data);
                 }
-#endif
             }
 
             lock (ChatHistory)
@@ -647,7 +669,8 @@ namespace IW4MAdmin
                 }
             }
 
-            else if (client.IPAddress != null && client.State == ClientState.Disconnecting)
+            else if ((client.IPAddress != null && client.State == ClientState.Disconnecting) ||
+                client.Level == Permission.Banned)
             {
                 Logger.WriteWarning($"{client} state is Unknown (probably kicked), but they are still connected. trying to kick again...");
                 await client.CanConnect(client.IPAddress);
@@ -682,6 +705,7 @@ namespace IW4MAdmin
             var updatedClients = polledClients.Except(connectingClients).Except(disconnectingClients);
 
             UpdateMap(statusResponse.Item2);
+            UpdateGametype(statusResponse.Item3);
 
             return new List<EFClient>[]
             {
@@ -703,6 +727,14 @@ namespace IW4MAdmin
             }
         }
 
+        private void UpdateGametype(string gameType)
+        {
+            if (!string.IsNullOrEmpty(gameType))
+            {
+                Gametype = gameType;
+            }
+        }
+
         private async Task ShutdownInternal()
         {
             foreach (var client in GetClientsAsList())
@@ -716,7 +748,7 @@ namespace IW4MAdmin
                     Origin = client
                 };
 
-                Manager.GetEventHandler().AddEvent(e);
+                Manager.AddEvent(e);
 
                 await e.WaitAsync(Utilities.DefaultCommandTimeout, new CancellationTokenRegistration().Token);
             }
@@ -753,16 +785,18 @@ namespace IW4MAdmin
 
                     var polledClients = await PollPlayersAsync();
 
-                    foreach (var disconnectingClient in polledClients[1])
+                    foreach (var disconnectingClient in polledClients[1].Where(_client => !_client.IsZombieClient /* ignores "fake" zombie clients */))
                     {
+                        disconnectingClient.CurrentServer = this;
                         var e = new GameEvent()
                         {
                             Type = GameEvent.EventType.PreDisconnect,
                             Origin = disconnectingClient,
-                            Owner = this
+                            Owner = this,
+                            Source = GameEvent.EventSource.Status
                         };
 
-                        Manager.GetEventHandler().AddEvent(e);
+                        Manager.AddEvent(e);
                         await e.WaitAsync(Utilities.DefaultCommandTimeout, Manager.CancellationToken);
                     }
 
@@ -775,21 +809,25 @@ namespace IW4MAdmin
                             continue;
                         }
 
+                        client.CurrentServer = this;
                         var e = new GameEvent()
                         {
                             Type = GameEvent.EventType.PreConnect,
                             Origin = client,
                             Owner = this,
-                            IsBlocking = true
+                            IsBlocking = true,
+                            Extra = client.GetAdditionalProperty<string>("BotGuid"),
+                            Source = GameEvent.EventSource.Status
                         };
 
-                        Manager.GetEventHandler().AddEvent(e);
+                        Manager.AddEvent(e);
                         await e.WaitAsync(Utilities.DefaultCommandTimeout, Manager.CancellationToken);
                     }
 
                     // these are the clients that have updated
                     foreach (var client in polledClients[2])
                     {
+                        client.CurrentServer = this;
                         var e = new GameEvent()
                         {
                             Type = GameEvent.EventType.Update,
@@ -797,10 +835,10 @@ namespace IW4MAdmin
                             Owner = this
                         };
 
-                        Manager.GetEventHandler().AddEvent(e);
+                        Manager.AddEvent(e);
                     }
 
-                    if (ConnectionErrors > 0 && notifyDisconnects)
+                    if (ConnectionErrors > 0)
                     {
                         var _event = new GameEvent()
                         {
@@ -810,7 +848,7 @@ namespace IW4MAdmin
                             Target = Utilities.IW4MAdminClient(this)
                         };
 
-                        Manager.GetEventHandler().AddEvent(_event);
+                        Manager.AddEvent(_event);
                     }
 
                     ConnectionErrors = 0;
@@ -820,7 +858,7 @@ namespace IW4MAdmin
                 catch (NetworkException e)
                 {
                     ConnectionErrors++;
-                    if (ConnectionErrors == 3 && notifyDisconnects)
+                    if (ConnectionErrors == 3)
                     {
                         var _event = new GameEvent()
                         {
@@ -832,7 +870,7 @@ namespace IW4MAdmin
                             Data = ConnectionErrors.ToString()
                         };
 
-                        Manager.GetEventHandler().AddEvent(_event);
+                        Manager.AddEvent(_event);
                     }
                     return true;
                 }
@@ -913,7 +951,7 @@ namespace IW4MAdmin
 
             RemoteConnection.SetConfiguration(RconParser.Configuration);
 
-            var version = await this.GetDvarAsync<string>("version");
+            var version = await this.GetMappedDvarValueOrDefaultAsync<string>("version");
             Version = version.Value;
             GameName = Utilities.GetGame(version?.Value ?? RconParser.Version);
 
@@ -930,8 +968,7 @@ namespace IW4MAdmin
                 Version = RconParser.Version;
             }
 
-            // these T7 specific things aren't ideal , but it's a quick fix
-            var svRunning = await this.GetDvarAsync("sv_running", GameName == Game.T7 ? "1" : null);
+            var svRunning = await this.GetMappedDvarValueOrDefaultAsync<string>("sv_running");
 
             if (!string.IsNullOrEmpty(svRunning.Value) && svRunning.Value != "1")
             {
@@ -939,29 +976,18 @@ namespace IW4MAdmin
             }
 
             var infoResponse = RconParser.Configuration.CommandPrefixes.RConGetInfo != null ? await this.GetInfoAsync() : null;
-            // this is normally slow, but I'm only doing it because different games have different prefixes
-            var hostname = infoResponse == null ?
-                (await this.GetDvarAsync<string>("sv_hostname")).Value :
-                infoResponse.Where(kvp => kvp.Key.Contains("hostname")).Select(kvp => kvp.Value).First();
-            var mapname = infoResponse == null ?
-                (await this.GetDvarAsync("mapname", "Unknown")).Value :
-                infoResponse["mapname"];
-            int maxplayers = (GameName == Game.IW4) ?  // gotta love IW4 idiosyncrasies
-                (await this.GetDvarAsync<int>("party_maxplayers")).Value :
-                infoResponse == null || !infoResponse.ContainsKey("sv_maxclients") ?
-                (await this.GetDvarAsync<int>("sv_maxclients")).Value :
-                Convert.ToInt32(infoResponse["sv_maxclients"]);
-            var gametype = infoResponse == null ?
-                (await this.GetDvarAsync("g_gametype", GameName == Game.T7 ? "" : null)).Value :
-                infoResponse.Where(kvp => kvp.Key.Contains("gametype")).Select(kvp => kvp.Value).First();
-            var basepath = await this.GetDvarAsync("fs_basepath", GameName == Game.T7 ? "" : null);
-            var basegame = await this.GetDvarAsync("fs_basegame", GameName == Game.T7 ? "" : null);
-            var game = infoResponse == null || !infoResponse.ContainsKey("fs_game") ?
-                (await this.GetDvarAsync("fs_game", GameName == Game.T7 ? "" : null)).Value :
-                infoResponse["fs_game"];
-            var logfile = await this.GetDvarAsync<string>("g_log");
-            var logsync = await this.GetDvarAsync<int>("g_logsync");
-            var ip = await this.GetDvarAsync<string>("net_ip");
+
+            string hostname = (await this.GetMappedDvarValueOrDefaultAsync<string>("sv_hostname", "hostname", infoResponse)).Value;
+            string mapname = (await this.GetMappedDvarValueOrDefaultAsync<string>("mapname", infoResponse: infoResponse)).Value;
+            int maxplayers = (await this.GetMappedDvarValueOrDefaultAsync<int>("sv_maxclients", infoResponse: infoResponse)).Value;
+            string gametype = (await this.GetMappedDvarValueOrDefaultAsync<string>("g_gametype", "gametype", infoResponse)).Value;
+            var basepath = (await this.GetMappedDvarValueOrDefaultAsync<string>("fs_basepath"));
+            var basegame = (await this.GetMappedDvarValueOrDefaultAsync<string>("fs_basegame"));
+            var game = (await this.GetMappedDvarValueOrDefaultAsync<string>("fs_game", infoResponse: infoResponse));
+            var logfile = await this.GetMappedDvarValueOrDefaultAsync<string>("g_log");
+            var logsync = await this.GetMappedDvarValueOrDefaultAsync<int>("g_logsync");
+            var ip = await this.GetMappedDvarValueOrDefaultAsync<string>("net_ip");
+            var gamePassword = await this.GetMappedDvarValueOrDefaultAsync("g_password", overrideDefault: "");
 
             if (Manager.GetApplicationSettings().Configuration().EnableCustomSayName)
             {
@@ -970,7 +996,7 @@ namespace IW4MAdmin
 
             try
             {
-                var website = await this.GetDvarAsync<string>("_website");
+                var website = await this.GetMappedDvarValueOrDefaultAsync<string>("_website");
 
                 // this occurs for games that don't give us anything back when
                 // the dvar is not set
@@ -992,9 +1018,10 @@ namespace IW4MAdmin
             WorkingDirectory = basepath.Value;
             this.Hostname = hostname;
             this.MaxClients = maxplayers;
-            this.FSGame = game;
+            this.FSGame = game.Value;
             this.Gametype = gametype;
             this.IP = ip.Value == "localhost" ? ServerConfig.IPAddress : ip.Value ?? ServerConfig.IPAddress;
+            this.GamePassword = gamePassword.Value;
             UpdateMap(mapname);
 
             if (RconParser.CanGenerateLogPath)
@@ -1044,7 +1071,7 @@ namespace IW4MAdmin
                     BaseGameDirectory = basegame.Value,
                     BasePathDirectory = basepath.Value,
                     GameDirectory = EventParser.Configuration.GameDirectory ?? "",
-                    ModDirectory = game ?? "",
+                    ModDirectory = game.Value ?? "",
                     LogFile = logfile.Value,
                     IsWindows = RuntimeInformation.IsOSPlatform(OSPlatform.Windows)
                 };
@@ -1057,13 +1084,30 @@ namespace IW4MAdmin
                 }
             }
 
-            LogEvent = new GameLogEventDetection(this, LogPath, ServerConfig.GameLogServerUrl);
+            LogEvent = new GameLogEventDetection(this, GenerateUriForLog(LogPath, ServerConfig.GameLogServerUrl?.AbsoluteUri), gameLogReaderFactory);
             Logger.WriteInfo($"Log file is {LogPath}");
 
             _ = Task.Run(() => LogEvent.PollForChanges());
-#if !DEBUG
-            Broadcast(loc["BROADCAST_ONLINE"]);
-#endif
+
+            if (!Utilities.IsDevelopment)
+            {
+                Broadcast(loc["BROADCAST_ONLINE"]);
+            }
+        }
+
+        public Uri[] GenerateUriForLog(string logPath, string gameLogServerUrl)
+        {
+            var logUri = new Uri(logPath);
+
+            if (string.IsNullOrEmpty(gameLogServerUrl))
+            {
+                return new[] { logUri };
+            }
+
+            else
+            {
+                return new[] { new Uri(gameLogServerUrl), logUri };
+            }
         }
 
         public static string GenerateLogPath(LogPathGeneratorInfo logInfo)
@@ -1165,7 +1209,7 @@ namespace IW4MAdmin
                     Owner = this
                 };
 
-                Manager.GetEventHandler().AddEvent(e);
+                Manager.AddEvent(e);
 
                 string formattedKick = string.Format(RconParser.Configuration.CommandPrefixes.Kick, targetClient.ClientNumber, $"{loc["SERVER_KICK_TEXT"]} - ^5{Reason}^7");
                 await targetClient.CurrentServer.ExecuteCommandAsync(formattedKick);
@@ -1196,6 +1240,7 @@ namespace IW4MAdmin
             if (targetClient.IsIngame)
             {
                 string formattedKick = string.Format(RconParser.Configuration.CommandPrefixes.Kick, targetClient.ClientNumber, $"^7{loc["SERVER_TB_TEXT"]}- ^5{Reason}");
+                Logger.WriteDebug($"Executing tempban kick command for {targetClient}");
                 await targetClient.CurrentServer.ExecuteCommandAsync(formattedKick);
             }
         }

Application/Localization/Configure.cs

@@ -11,7 +11,7 @@ namespace IW4MAdmin.Application.Localization
 {
     public class Configure
     {
-        public static ITranslationLookup Initialize(bool useLocalTranslation, 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");
@@ -20,8 +20,7 @@ namespace IW4MAdmin.Application.Localization
             {
                 try
                 {
-                    var api = Endpoint.Get();
-                    var localization = api.GetLocalization(currentLocale).Result;
+                    var localization = apiInstance.GetLocalization(currentLocale).Result;
                     Utilities.CurrentLocalization = localization;
                     return localization.LocalizationIndex;
                 }

Application/Main.cs

@@ -1,14 +1,24 @@
-using IW4MAdmin.Application.EventParsers;
+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.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.Linq;
 using System.Text;
@@ -22,14 +32,13 @@ namespace IW4MAdmin.Application
         public static BuildNumber Version { get; private set; } = BuildNumber.Parse(Utilities.GetVersionAsString());
         public static ApplicationManager ServerManager;
         private static Task ApplicationTask;
-        private static readonly BuildNumber _fallbackVersion = BuildNumber.Parse("99.99.99.99");
         private static ServiceProvider serviceProvider;
 
         /// <summary>
         /// entrypoint of the application
         /// </summary>
         /// <returns></returns>
-        public static async Task Main()
+        public static async Task Main(string[] args)
         {
             AppDomain.CurrentDomain.SetData("DataDirectory", Utilities.OperatingDirectory);
 
@@ -44,7 +53,7 @@ namespace IW4MAdmin.Application
             Console.WriteLine($" Version {Utilities.GetVersionAsString()}");
             Console.WriteLine("=====================================================");
 
-            await LaunchAsync();
+            await LaunchAsync(args);
         }
 
         /// <summary>
@@ -63,7 +72,7 @@ namespace IW4MAdmin.Application
         /// task that initializes application and starts the application monitoring and runtime tasks
         /// </summary>
         /// <returns></returns>
-        private static async Task LaunchAsync()
+        private static async Task LaunchAsync(string[] args)
         {
         restart:
             ITranslationLookup translationLookup = null;
@@ -73,14 +82,15 @@ namespace IW4MAdmin.Application
                 ConfigurationMigration.MoveConfigFolder10518(null);
                 ConfigurationMigration.CheckDirectories();
 
-                var services = ConfigureServices();
+                var services = ConfigureServices(args);
                 serviceProvider = services.BuildServiceProvider();
+                var versionChecker = serviceProvider.GetRequiredService<IMasterCommunication>();
                 ServerManager = (ApplicationManager)serviceProvider.GetRequiredService<IManager>();
                 translationLookup = serviceProvider.GetRequiredService<ITranslationLookup>();
 
                 ServerManager.Logger.WriteInfo(Utilities.CurrentLocalization.LocalizationIndex["MANAGER_VERSION"].FormatExt(Version));
 
-                await CheckVersion(translationLookup);
+                await versionChecker.CheckVersion();
                 await ServerManager.Init();
             }
 
@@ -125,7 +135,11 @@ namespace IW4MAdmin.Application
                 await ApplicationTask;
             }
 
-            catch { }
+            catch (Exception e) 
+            {
+                string failMessage = translationLookup == null ? "Failed to initalize IW4MAdmin" : translationLookup["MANAGER_INIT_FAIL"];
+                Console.WriteLine($"{failMessage}: {e.GetExceptionInfo()}");
+            }
 
             if (ServerManager.IsRestartRequested)
             {
@@ -154,6 +168,7 @@ namespace IW4MAdmin.Application
             {
                 ServerManager.Start(),
                 webfrontTask,
+                serviceProvider.GetRequiredService<IMasterCommunication>().RunUploadStatus(ServerManager.CancellationToken)
             };
 
             await Task.WhenAll(tasks);
@@ -161,68 +176,6 @@ namespace IW4MAdmin.Application
             ServerManager.Logger.WriteVerbose(Utilities.CurrentLocalization.LocalizationIndex["MANAGER_SHUTDOWN_SUCCESS"]);
         }
 
-        /// <summary>
-        /// checks for latest version of the application
-        /// notifies user if an update is available
-        /// </summary>
-        /// <returns></returns>
-        private static async Task CheckVersion(ITranslationLookup translationLookup)
-        {
-            var api = API.Master.Endpoint.Get();
-            var loc = translationLookup;
-
-            var version = new API.Master.VersionInfo()
-            {
-                CurrentVersionStable = _fallbackVersion
-            };
-
-            try
-            {
-                version = await api.GetVersion(1);
-            }
-
-            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 == _fallbackVersion)
-            {
-                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()}]");
-                Console.WriteLine(loc["MANAGER_VERSION_CURRENT"].FormatExt($"[v{Version.ToString()}]"));
-                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()}-pr]");
-                Console.WriteLine(loc["MANAGER_VERSION_CURRENT"].FormatExt($"[v{Version.ToString()}-pr]"));
-                Console.ForegroundColor = ConsoleColor.Gray;
-            }
-#endif
-            else
-            {
-                Console.ForegroundColor = ConsoleColor.Green;
-                Console.WriteLine(loc["MANAGER_VERSION_SUCCESS"]);
-                Console.ForegroundColor = ConsoleColor.Gray;
-            }
-        }
 
         /// <summary>
         /// reads input from the console and executes entered commands on the default server
@@ -230,6 +183,12 @@ namespace IW4MAdmin.Application
         /// <returns></returns>
         private static async Task ReadConsoleInput()
         {
+            if (Console.IsInputRedirected)
+            {
+                ServerManager.Logger.WriteInfo("Disabling console input as it has been redirected");
+                return;
+            }
+
             string lastCommand;
             var Origin = Utilities.IW4MAdminClient(ServerManager.Servers[0]);
 
@@ -251,7 +210,7 @@ namespace IW4MAdmin.Application
                                 Owner = ServerManager.Servers[0]
                             };
 
-                            ServerManager.GetEventHandler().AddEvent(E);
+                            ServerManager.AddEvent(E);
                             await E.WaitAsync(Utilities.DefaultCommandTimeout, ServerManager.CancellationToken);
                             Console.Write('>');
                         }
@@ -265,7 +224,7 @@ namespace IW4MAdmin.Application
         /// <summary>
         /// Configures the dependency injection services
         /// </summary>
-        private static IServiceCollection ConfigureServices()
+        private static IServiceCollection ConfigureServices(string[] args)
         {
             var defaultLogger = new Logger("IW4MAdmin-Manager");
             var pluginImporter = new PluginImporter(defaultLogger);
@@ -274,7 +233,7 @@ namespace IW4MAdmin.Application
             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())
+                .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>()
@@ -283,14 +242,41 @@ namespace IW4MAdmin.Application
                 .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<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>();
+            }
 
             // register the native commands
             foreach (var commandType in typeof(SharedLibraryCore.Commands.QuitCommand).Assembly.GetTypes()

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/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/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/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

@@ -1,8 +1,12 @@
 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;
@@ -34,6 +38,7 @@ namespace IW4MAdmin.Application.Misc
         private readonly string _fileName;
         private readonly SemaphoreSlim _onProcessing;
         private bool successfullyLoaded;
+        private readonly List<string> _registeredCommandNames;
 
         public ScriptPlugin(string filename, string workingDirectory = null)
         {
@@ -47,6 +52,7 @@ namespace IW4MAdmin.Application.Misc
 
             Watcher.EnableRaisingEvents = true;
             _onProcessing = new SemaphoreSlim(1, 1);
+            _registeredCommandNames = new List<string>();
         }
 
         ~ScriptPlugin()
@@ -55,7 +61,7 @@ namespace IW4MAdmin.Application.Misc
             _onProcessing.Dispose();
         }
 
-        public async Task Initialize(IManager manager)
+        public async Task Initialize(IManager manager, IScriptCommandFactory scriptCommandFactory, IScriptPluginServiceResolver serviceResolver)
         {
             await _onProcessing.WaitAsync();
 
@@ -75,6 +81,14 @@ namespace IW4MAdmin.Application.Misc
                 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;
@@ -100,12 +114,33 @@ namespace IW4MAdmin.Application.Misc
 
                 _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
@@ -130,6 +165,11 @@ namespace IW4MAdmin.Application.Misc
                 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;
@@ -193,5 +233,78 @@ namespace IW4MAdmin.Application.Misc
                 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/RConConnection.cs

@@ -9,6 +9,7 @@ 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
@@ -193,7 +194,8 @@ namespace IW4MAdmin.Application.RCon
                 throw new ServerException(Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_NOT_RUNNING"].FormatExt(Endpoint.ToString()));
             }
 
-            string[] headerSplit = responseString.Split(type == StaticHelpers.QueryType.GET_INFO ? config.CommandPrefixes.RconGetInfoResponseHeader : config.CommandPrefixes.RConResponse);
+            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)
             {

Application/RconParsers/BaseRConParser.cs

@@ -14,8 +14,6 @@ namespace IW4MAdmin.Application.RconParsers
 {
     public class BaseRConParser : IRConParser
     {
-        private const int MAX_FAULTY_STATUS_LINES = 7;
-
         public BaseRConParser(IParserRegexFactory parserRegexFactory)
         {
             Configuration = new DynamicRConParserConfiguration(parserRegexFactory)
@@ -54,12 +52,17 @@ namespace IW4MAdmin.Application.RconParsers
             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 Game GameName { get; set; } = Game.COD;
         public bool CanGenerateLogPath { get; set; } = true;
@@ -112,7 +115,7 @@ namespace IW4MAdmin.Application.RconParsers
             };
         }
 
-        public virtual async Task<(List<EFClient>, string)> GetStatusAsync(IRConConnection connection)
+        public virtual async Task<(List<EFClient>, string, string)> GetStatusAsync(IRConConnection connection)
         {
             string[] response = await connection.SendQueryAsync(StaticHelpers.QueryType.COMMAND_STATUS);
 #if DEBUG
@@ -121,7 +124,7 @@ namespace IW4MAdmin.Application.RconParsers
                 Console.WriteLine(line);
             }
 #endif
-            return (ClientsFromStatus(response), MapFromStatus(response));
+            return (ClientsFromStatus(response), MapFromStatus(response), GameTypeFromStatus(response));
         }
 
         private string MapFromStatus(string[] response)
@@ -139,6 +142,26 @@ namespace IW4MAdmin.Application.RconParsers
             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)
@@ -179,9 +202,16 @@ namespace IW4MAdmin.Application.RconParsers
                     }
 
                     long networkId;
+                    string name = match.Values[Configuration.Status.GroupMapping[ParserRegex.GroupType.RConName]].TrimNewLine();
+                    string networkIdString;
+
                     try
                     {
-                        networkId = match.Values[Configuration.Status.GroupMapping[ParserRegex.GroupType.RConNetworkId]].ConvertGuidToLong(Configuration.GuidNumberStyle);
+                        networkIdString = match.Values[Configuration.Status.GroupMapping[ParserRegex.GroupType.RConNetworkId]];
+
+                        networkId = networkIdString.IsBotGuid() ?
+                            name.GenerateGuidFromString() :
+                            networkIdString.ConvertGuidToLong(Configuration.GuidNumberStyle);
                     }
 
                     catch (FormatException)
@@ -189,7 +219,6 @@ namespace IW4MAdmin.Application.RconParsers
                         continue;
                     }
 
-                    string name = match.Values[Configuration.Status.GroupMapping[ParserRegex.GroupType.RConName]].TrimNewLine();
                     int? ip = match.Values[Configuration.Status.GroupMapping[ParserRegex.GroupType.RConIpAddress]].Split(':')[0].ConvertToIP();
 
                     var client = new EFClient()
@@ -206,13 +235,7 @@ namespace IW4MAdmin.Application.RconParsers
                         State = EFClient.ClientState.Connecting
                     };
 
-#if DEBUG
-                    if (client.NetworkId < 1000 && client.NetworkId > 0)
-                    {
-                        client.IPAddress = 2147483646;
-                        client.Ping = 0;
-                    }
-#endif
+                    client.SetAdditionalProperty("BotGuid", networkIdString);
 
                     StatusPlayers.Add(client);
                 }
@@ -226,5 +249,19 @@ namespace IW4MAdmin.Application.RconParsers
 
             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/DynamicRConParserConfiguration.cs

@@ -1,6 +1,6 @@
-using IW4MAdmin.Application.Factories;
-using SharedLibraryCore.Interfaces;
+using SharedLibraryCore.Interfaces;
 using SharedLibraryCore.RCon;
+using System.Collections.Generic;
 using System.Globalization;
 
 namespace IW4MAdmin.Application.RconParsers
@@ -14,16 +14,20 @@ namespace IW4MAdmin.Application.RconParsers
         public CommandPrefix CommandPrefixes { get; set; }
         public ParserRegex Status { get; set; }
         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/_customcallbacks.gsc

@@ -230,14 +230,14 @@ Process_Hit( type, attacker, sHitLoc, sMeansOfDeath, iDamage, sWeapon )
 
 Callback_PlayerDamage( eInflictor, attacker, iDamage, iDFlags, sMeansOfDeath, sWeapon, vPoint, vDir, sHitLoc, psOffsetTime )
 {
-	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 );
+		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 );

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,118 +0,0 @@
-import re
-import os
-import time
-import random
-import string
-
-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, retrieval_key):
-        # 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 self._generate_bad_response()
-
-        # must be a valid log path and log file
-        if not re.search(r'^.+[\\|\/](.+)[\\|\/].+.log$', path):
-            return self._generate_bad_response()
-
-        # 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 self._generate_bad_response()
-
-        next_retrieval_key = self._generate_key()
-
-        # this is the first time the key has been requested, so we need to the next one
-        if retrieval_key not in self.log_file_sizes or int(time.time() - self.log_file_sizes[retrieval_key]['read']) > self.max_file_time_change:
-            print('retrieval key "%s" does not exist or is outdated' % retrieval_key)
-            last_log_info = {
-                'size' : new_file_size,
-                'previous_key' : None
-            }
-        else:
-            last_log_info = self.log_file_sizes[retrieval_key]
-
-        print('next key is %s' % next_retrieval_key)
-        expired_key = last_log_info['previous_key']
-        print('expired key is %s' % expired_key)
-
-        # grab the previous value
-        last_size = last_log_info['size']
-        file_size_difference = new_file_size - last_size
-
-        #print('generating info for next key %s' % next_retrieval_key)
-
-        # update the new size
-        self.log_file_sizes[next_retrieval_key] = {
-            'size' : new_file_size,
-            'read': time.time(),
-            'next_key': next_retrieval_key,
-            'previous_key': retrieval_key
-        }
-
-        if expired_key in self.log_file_sizes:
-            print('deleting expired key %s' % expired_key)
-            del self.log_file_sizes[expired_key]
-
-        #print('reading %i bytes starting at %i' % (file_size_difference, last_size))
-
-        new_log_content = self.get_file_lines(path, last_size, file_size_difference)
-        return {
-            'content': new_log_content,
-            'next_key': next_retrieval_key
-        }
-
-    def get_file_lines(self, path, start_position, length_to_read):
-        try:
-            file_handle = open(path, 'rb')
-            file_handle.seek(start_position)
-            file_data = file_handle.read(length_to_read)
-            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_to_read))
-            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 key in expired_logs:
-            print('removing expired log with key {0}'.format(key))
-            del self.log_file_sizes[key]
-
-    def _generate_bad_response(self):
-        return {
-            'content': None,
-            'next_key': None
-        }
-
-    def _generate_key(self):
-        return ''.join(random.choices(string.ascii_uppercase + string.digits, k=8))
-        
-    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,16 +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, retrieval_key):
-        path = urlsafe_b64decode(path).decode('utf-8')
-        log_info = reader.read_file(path, retrieval_key)
-        content = log_info['content']
-
-        return {
-            'success' : content is not None,
-            'length':  0 if content is None else len(content),
-            'data': content,
-            'next_key': log_info['next_key']
-        }

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>/<string:retrieval_key>')
-    #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.16.0

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

@@ -8,8 +8,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		GameFiles\IW4x\userraw\scripts\_commands.gsc = GameFiles\IW4x\userraw\scripts\_commands.gsc
 		GameFiles\IW4x\userraw\scripts\_customcallbacks.gsc = GameFiles\IW4x\userraw\scripts\_customcallbacks.gsc
-		azure-pipelines.yml = azure-pipelines.yml
 		PostPublish.ps1 = PostPublish.ps1
+		pre-release-pipeline.yml = pre-release-pipeline.yml
 		README.md = README.md
 		RunPublishPre.cmd = RunPublishPre.cmd
 		RunPublishRelease.cmd = RunPublishRelease.cmd
@@ -30,14 +30,11 @@ 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("{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
@@ -45,12 +42,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ScriptPlugins", "ScriptPlug
 		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}"
@@ -247,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
@@ -317,28 +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
-		{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
@@ -443,7 +371,6 @@ 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}

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) > 20160:
-            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) > 20160:
-            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) > 20160:
-            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, 128, '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,60 +0,0 @@
-{% extends "layout.html" %}
-
-{% block content %}
-<div class="row">
-    <div class="col-12 col-sm-8 ml-auto mr-auto">
-        <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>
-{% 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 %}

Master/master/views.py

@@ -1,35 +0,0 @@
-"""
-Routes and views for the flask application.
-"""
-
-from datetime import datetime
-from flask import render_template
-from master import app, ctx
-from master.resources.history_graph import HistoryGraph
-from collections import defaultdict
-
-@app.route('/')
-def home():
-    _history_graph = HistoryGraph().get(2880)
-    return render_template(
-        'index.html',
-        title='API Overview',
-        history_graph = _history_graph[0]['message'],
-        data_points = _history_graph[0]['data_points'],
-        instance_count = _history_graph[0]['instance_count'],
-        client_count = _history_graph[0]['client_count'],
-        server_count = _history_graph[0]['server_count']
-    )
-
-@app.route('/servers')
-def servers():
-    servers = defaultdict(list)
-    if len(ctx.instance_list.values()) > 0:
-        ungrouped_servers = [server for instance  in  ctx.instance_list.values() for server in instance.servers]
-        for server in ungrouped_servers:
-            servers[server.game].append(server)
-    return render_template(
-        'serverlist.html',
-        title = 'Server List',
-        games = servers
-    )

Master/requirements.txt

@@ -1,26 +0,0 @@
-aniso8601==3.0.2
-APScheduler==3.5.3
-certifi==2018.10.15
-chardet==3.0.4
-click==6.7
-Flask==1.0.2
-Flask-JWT==0.3.2
-Flask-JWT-Extended==3.8.1
-Flask-RESTful==0.3.6
-idna==2.7
-itsdangerous==0.24
-Jinja2==2.10
-MarkupSafe==1.0
-marshmallow==3.0.0b8
-pip==9.0.3
-psutil==5.4.8
-pygal==2.4.0
-PyJWT==1.4.2
-pytz==2018.7
-requests==2.20.0
-setuptools==40.5.0
-six==1.11.0
-timeago==1.0.8
-tzlocal==1.5.1
-urllib3==1.24
-Werkzeug==0.15.3

Plugins/AutomessageFeed/AutomessageFeed.csproj

@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.SyndicationFeed.ReaderWriter" Version="1.0.2" />
-    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2.2.8" PrivateAssets="All" />
+    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2.4.9" PrivateAssets="All" />
   </ItemGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">

Plugins/IW4ScriptCommands/IW4ScriptCommands.csproj

@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2.2.8" PrivateAssets="All" />
+    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2.4.9" PrivateAssets="All" />
   </ItemGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">

Plugins/LiveRadar/Controllers/RadarController.cs

@@ -74,14 +74,14 @@ namespace LiveRadar.Web.Controllers
         [Route("Radar/Update")]
         public IActionResult Update(string payload)
         {
-            var radarUpdate = RadarEvent.Parse(payload);
+            /*var radarUpdate = RadarEvent.Parse(payload);
             var client = _manager.GetActiveClients().FirstOrDefault(_client => _client.NetworkId == radarUpdate.Guid);
 
             if (client != null)
             {
                 radarUpdate.Name = client.Name.StripColors();
                 client.SetAdditionalProperty("LiveRadar", radarUpdate);
-            }
+            }*/
 
             return Ok();
         }

Plugins/LiveRadar/Events/Script.cs

@@ -0,0 +1,33 @@
+using SharedLibraryCore;
+using SharedLibraryCore.Database.Models;
+using SharedLibraryCore.Interfaces;
+using System.Collections.Generic;
+using EventGeneratorCallback = System.ValueTuple<string, string,
+    System.Func<string, SharedLibraryCore.Interfaces.IEventParserConfiguration,
+    SharedLibraryCore.GameEvent,
+    SharedLibraryCore.GameEvent>>;
+
+namespace LiveRadar.Events
+{
+    public class Script : IRegisterEvent
+    {
+        private const string EVENT_LIVERADAR = "LiveRadar";
+        private EventGeneratorCallback LiveRadar()
+        {
+            return (EVENT_LIVERADAR, EVENT_LIVERADAR, (string eventLine, IEventParserConfiguration config, GameEvent autoEvent) =>
+            {
+                string[] lineSplit = eventLine.Split(";");
+
+                autoEvent.Type = GameEvent.EventType.Other;
+                autoEvent.Subtype = EVENT_LIVERADAR;
+                autoEvent.Origin = new EFClient() { NetworkId = 0 };
+                autoEvent.Extra = lineSplit[1]; // guid
+
+                return autoEvent;
+            }
+            );
+        }
+
+        public IEnumerable<EventGeneratorCallback> Events => new[] { LiveRadar() };
+    }
+}

Plugins/LiveRadar/LiveRadar.csproj

@@ -16,7 +16,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2.2.8" PrivateAssets="All" />
+    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2.4.9" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup>

Plugins/LiveRadar/Plugin.cs

@@ -3,6 +3,7 @@ using SharedLibraryCore;
 using SharedLibraryCore.Configuration;
 using SharedLibraryCore.Interfaces;
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 
@@ -17,12 +18,14 @@ namespace LiveRadar
         public string Author => "RaidMax";
 
         private readonly IConfigurationHandler<LiveRadarConfiguration> _configurationHandler;
+        private readonly Dictionary<string, long> _botGuidLookups;
         private bool addedPage;
-        private object lockObject;
+        private readonly object lockObject = new object();
 
         public Plugin(IConfigurationHandlerFactory configurationHandlerFactory)
         {
             _configurationHandler = configurationHandlerFactory.GetConfigurationHandler<LiveRadarConfiguration>("LiveRadarConfiguration");
+            _botGuidLookups = new Dictionary<string, long>();
         }
 
         public Task OnEventAsync(GameEvent E, Server S)
@@ -41,28 +44,45 @@ namespace LiveRadar
                 }
             }
 
-            if (E.Type == GameEvent.EventType.Unknown)
+            if (E.Type == GameEvent.EventType.PreConnect && E.Origin.IsBot)
             {
-                if (E.Data?.StartsWith("LiveRadar") ?? false)
+                string botKey = $"BotGuid_{E.Extra}";
+                lock (lockObject)
                 {
-                    try
+                    if (!_botGuidLookups.ContainsKey(botKey))
                     {
-                        var radarUpdate = RadarEvent.Parse(E.Data);
-                        var client = S.Manager.GetActiveClients().FirstOrDefault(_client => _client.NetworkId == radarUpdate.Guid);
+                        _botGuidLookups.Add(botKey, E.Origin.NetworkId);
+                    }
+                }
+            }
 
-                        if (client != null)
-                        {
-                            radarUpdate.Name = client.Name.StripColors();
-                            client.SetAdditionalProperty("LiveRadar", radarUpdate);
-                        }
+            if (E.Type == GameEvent.EventType.Other && E.Subtype == "LiveRadar")
+            {
+                try
+                {
+                    string botKey = $"BotGuid_{E.Extra}";
+                    long generatedBotGuid;
+
+                    lock (lockObject)
+                    {
+                        generatedBotGuid = _botGuidLookups.ContainsKey(botKey) ? _botGuidLookups[botKey] : 0;
                     }
 
-                    catch (Exception e)
+                    var radarUpdate = RadarEvent.Parse(E.Data, generatedBotGuid);
+                    var client = S.Manager.GetActiveClients().FirstOrDefault(_client => _client.NetworkId == radarUpdate.Guid);
+
+                    if (client != null)
                     {
-                        S.Logger.WriteWarning($"Could not parse live radar output: {e.Data}");
-                        S.Logger.WriteDebug(e.GetExceptionInfo());
+                        radarUpdate.Name = client.Name.StripColors();
+                        client.SetAdditionalProperty("LiveRadar", radarUpdate);
                     }
                 }
+
+                catch (Exception e)
+                {
+                    S.Logger.WriteWarning($"Could not parse live radar output: {e.Data}");
+                    S.Logger.WriteDebug(e.GetExceptionInfo());
+                }
             }
 
             return Task.CompletedTask;

Plugins/LiveRadar/RadarEvent.cs

@@ -1,9 +1,7 @@
 using SharedLibraryCore;
 using SharedLibraryCore.Helpers;
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace LiveRadar
 {
@@ -39,13 +37,13 @@ namespace LiveRadar
             return false;
         }
 
-        public static RadarEvent Parse(string input)
+        public static RadarEvent Parse(string input, long generatedBotGuid)
         {
             var items = input.Split(';').Skip(1).ToList();
 
             var parsedEvent = new RadarEvent()
             {
-                Guid = items[0].ConvertGuidToLong(System.Globalization.NumberStyles.HexNumber),
+                Guid = generatedBotGuid,
                 Location = Vector3.Parse(items[1]),
                 ViewAngles = Vector3.Parse(items[2]).FixIW4Angles(),
                 Team = items[3],

Plugins/LiveRadar/Views/Radar/Index.cshtml

@@ -81,7 +81,7 @@
         weapons["wa2000"] = "wa2000";
         weapons["m21"] = "m14ebr";
         weapons["cheytac"] = "cheytac";
-        weapons["dragunov"] = "hud_dragunovsvd";
+        weapons["dragunov"] = "dragunovsvd";
 
         weapons["beretta"] = "m9beretta";
         weapons["usp"] = "usp_45";

Plugins/Login/Login.csproj

@@ -23,7 +23,7 @@
   </Target>
 
   <ItemGroup>
-    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2.2.8" PrivateAssets="All" />
+    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2.4.9" PrivateAssets="All" />
   </ItemGroup>
 
 </Project>

Plugins/ProfanityDeterment/Configuration.cs

@@ -16,9 +16,23 @@ namespace IW4MAdmin.Plugins.ProfanityDeterment
         {
             OffensiveWords = new List<string>()
             {
-                @"\s*n+.*i+.*g+.*e+.*r+\s*",
-                @"\s*n+.*i+.*g+.*a+\s*",
-                @"\s*f+u+.*c+.*k+.*\s*"
+                @"(ph|f)[a@]g[s\$]?",
+                @"(ph|f)[a@]gg[i1]ng",
+                @"(ph|f)[a@]gg?[o0][t\+][s\$]?",
+                @"(ph|f)[a@]gg[s\$]",
+                @"(ph|f)[e3][l1][l1]?[a@][t\+][i1][o0]",
+                @"(ph|f)u(c|k|ck|q)",
+                @"(ph|f)u(c|k|ck|q)[s\$]?",
+                @"(c|k|ck|q)un[t\+][l1][i1](c|k|ck|q)",
+                @"(c|k|ck|q)un[t\+][l1][i1](c|k|ck|q)[e3]r",
+                @"(c|k|ck|q)un[t\+][l1][i1](c|k|ck|q)[i1]ng",
+                @"b[i1][t\+]ch[s\$]?",
+                @"b[i1][t\+]ch[e3]r[s\$]?",
+                @"b[i1][t\+]ch[e3][s\$]",
+                @"b[i1][t\+]ch[i1]ng?",
+                @"n[i1]gg?[e3]r[s\$]?",
+                @"[s\$]h[i1][t\+][s\$]?",
+                @"[s\$][l1]u[t\+][s\$]?"
             };
 
             var loc = Utilities.CurrentLocalization.LocalizationIndex;

Plugins/ProfanityDeterment/ProfanityDeterment.csproj

@@ -16,7 +16,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2.2.8" PrivateAssets="All" />
+    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2.4.9" PrivateAssets="All" />
   </ItemGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">

Plugins/ScriptPlugins/ActionOnReport.js

@@ -0,0 +1,51 @@
+let plugin = {
+    author: 'RaidMax',
+    version: 1.0,
+    name: 'Action on Report',
+    enabled: false, // indicates if the plugin is enabled
+    reportAction: 'TempBan', // can be TempBan or Ban
+    maxReportCount: 5, // how many reports before action is taken
+    tempBanDurationMinutes: 60, // how long to temporarily ban the player
+    eventTypes: { 'report': 103 },
+    permissionTypes: { 'trusted': 2 },
+
+    onEventAsync: function (gameEvent, server) {
+        if (!this.enabled) {
+            return;
+        }
+
+        if (gameEvent.Type === this.eventTypes['report']) {
+            if (!gameEvent.Target.IsIngame || gameEvent.Target.Level >= this.permissionTypes['trusted']) {
+                server.Logger.WriteInfo(`Ignoring report for client (id) ${gameEvent.Target.ClientId} because they are privileged or not ingame`);
+                return;
+            }
+
+            let reportCount = this.reportCounts[gameEvent.Target.NetworkId] === undefined ? 0 : this.reportCounts[gameEvent.Target.NetworkId];
+            reportCount++;
+            this.reportCounts[gameEvent.Target.NetworkId] = reportCount;
+
+            if (reportCount >= this.maxReportCount) {
+                switch (this.reportAction) {
+                    case 'TempBan':
+                        server.Logger.WriteInfo(`TempBanning client (id) ${gameEvent.Target.ClientId} because they received ${reportCount} reports`);
+                        gameEvent.Target.TempBan(_localization.LocalizationIndex['PLUGINS_REPORT_ACTION'], System.TimeSpan.FromMinutes(this.tempBanDurationMinutes), _IW4MAdminClient);
+                        break;
+                    case 'Ban':
+                        server.Logger.WriteInfo(`Banning client (id) ${gameEvent.Target.ClientId} because they received ${reportCount} reports`);
+                        gameEvent.Target.Ban(_localization.LocalizationIndex['PLUGINS_REPORT_ACTION'], _IW4MAdminClient, false);
+                        break;
+                }
+            }
+        }
+    },
+
+    onLoadAsync: function (manager) {
+        this.reportCounts = {};
+    },
+
+    onUnloadAsync: function () {
+    },
+
+    onTickAsync: function (server) {
+    }
+};

Plugins/ScriptPlugins/ParserCoD4x.js

@@ -15,7 +15,7 @@ var plugin = {
         eventParser = manager.GenerateDynamicEventParser(this.name);
 
         rconParser.Configuration.StatusHeader.Pattern = 'num +score +ping +playerid +steamid +name +lastmsg +address +qport +rate *';
-        rconParser.Configuration.Status.Pattern = '^ *([0-9]+) +-?([0-9]+) +((?:[A-Z]+|[0-9]+)) +((?:[a-z]|[0-9]){16,32}|(?:[a-z]|[0-9]){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]+) *$'
+        rconParser.Configuration.Status.Pattern = '^ *([0-9]+) +-?([0-9]+) +((?:[A-Z]+|[0-9]+)) +((?:[a-z]|[0-9]{16,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]+) *$';
         rconParser.Configuration.Status.AddMapping(104, 6); // RConName
         rconParser.Configuration.Status.AddMapping(105, 8); // RConIPAddress
 

Plugins/ScriptPlugins/ParserPIW5.js

@@ -3,7 +3,7 @@ var eventParser;
 
 var plugin = {
     author: 'RaidMax',
-    version: 0.2,
+    version: 0.5,
     name: 'Plutonium IW5 Parser',
     isParser: true,
 
@@ -28,7 +28,7 @@ var plugin = {
         rconParser.Configuration.CanGenerateLogPath = true;
 
         rconParser.Configuration.StatusHeader.Pattern = 'num +score +bot +ping +guid +name +lastmsg +address +qport +rate *';
-        rconParser.Configuration.Status.Pattern = '^ *([0-9]+) +([0-9]+) +(?:[0-1]{1}) +([0-9]+) +([A-F0-9]+) +(.+?) +(?:[0-9]+) +(\\d+\\.\\d+\\.\\d+\\.\\d+\\:-?\\d{1,5}|0+\\.0+:-?\\d{1,5}|loopback) +(?:-?[0-9]+) +(?:[0-9]+) *$';
+        rconParser.Configuration.Status.Pattern = '^ *([0-9]+) +-?([0-9]+) +(?:[0-1]{1}) +([0-9]{1,4}|[A-Z]{4}) +([a-f|A-F|0-9]{16}) +(.+?) +(?:[0-9]+) +(\\d+\\.\\d+\\.\\d+\\.\\d+\\:-?\\d{1,5}|0+\\.0+:-?\\d{1,5}|loopback) +(?:-?[0-9]+) +(?:[0-9]+) *$';
         rconParser.Configuration.Status.AddMapping(100, 1);
         rconParser.Configuration.Status.AddMapping(101, 2);
         rconParser.Configuration.Status.AddMapping(102, 3);
@@ -42,6 +42,7 @@ var plugin = {
         eventParser.GameName = 3; // IW5
 
         eventParser.Configuration.GameDirectory = '';
+        eventParser.URLProtocolFormat = 'plutonium://play/iw5mp/{{ip}}:{{port}}';
     },
 
     onUnloadAsync: function () {

Plugins/ScriptPlugins/ParserPT6.js

@@ -3,7 +3,7 @@ var eventParser;
 
 var plugin = {
     author: 'RaidMax, Xerxes',
-    version: 0.7,
+    version: 0.8,
     name: 'Plutonium T6 Parser',
     isParser: true,
 
@@ -20,6 +20,7 @@ var plugin = {
         rconParser.Configuration.CommandPrefixes.Ban         = 'clientkick_for_reason {0} "{1}"';
         rconParser.Configuration.CommandPrefixes.TempBan     = 'clientkick_for_reason {0} "{1}"';
         rconParser.Configuration.CommandPrefixes.RConGetDvar = '\xff\xff\xff\xffrcon {0} get {1}';
+        rconParser.Configuration.CommandPrefixes.RConGetInfo = undefined;  // adding this in here temporarily until getInfo is fixed in new T6 version
 
         rconParser.Configuration.Dvar.Pattern = '^(.+) is "(.+)?"$';
         rconParser.Configuration.Dvar.AddMapping(106, 1);
@@ -27,7 +28,7 @@ var plugin = {
         rconParser.Configuration.WaitForResponse = false;
 
         rconParser.Configuration.StatusHeader.Pattern = 'num +score +bot +ping +guid +name +lastmsg +address +qport +rate *';
-        rconParser.Configuration.Status.Pattern = '^ *([0-9]+) +([0-9]+) +(?:[0-1]{1}) +([0-9]+) +([A-F0-9]+) +(.+?) +(?:[0-9]+) +(\\d+\\.\\d+\\.\\d+\\.\\d+\\:-?\\d{1,5}|0+\\.0+:-?\\d{1,5}|loopback) +(?:-?[0-9]+) +(?:[0-9]+) *$';
+        rconParser.Configuration.Status.Pattern = '^ *([0-9]+) +([0-9]+) +(?:[0-1]{1}) +([0-9]+) +([A-F0-9]+|0) +(.+?) +(?:[0-9]+) +(\\d+\\.\\d+\\.\\d+\\.\\d+\\:-?\\d{1,5}|0+\\.0+:-?\\d{1,5}|loopback) +(?:-?[0-9]+) +(?:[0-9]+) *$';
         rconParser.Configuration.Status.AddMapping(100, 1);
         rconParser.Configuration.Status.AddMapping(101, 2);
         rconParser.Configuration.Status.AddMapping(102, 3);

Plugins/ScriptPlugins/ParserT7.js

@@ -3,7 +3,7 @@ var eventParser;
 
 var plugin = {
     author: 'RaidMax',
-    version: 0.1,
+    version: 0.3,
     name: 'Black Ops 3 Parser',
     isParser: true,
 
@@ -14,7 +14,7 @@ var plugin = {
         rconParser = manager.GenerateDynamicRConParser(this.name);
         eventParser = manager.GenerateDynamicEventParser(this.name);
 
-        rconParser.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}) +(\\d+\\.\\d+\\.\\d+.\\d+\\:-*\\d{1,5}|0+.0+:-*\\d{1,5}|loopback|unknown)(?:\\([0-9]+\\)) +(-*[0-9]+) *$'
+        rconParser.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}) +(\\d+\\.\\d+\\.\\d+.\\d+\\:-*\\d{1,5}|0+.0+:-*\\d{1,5}|loopback|unknown)(?:\\([0-9]+\\)) +(-*[0-9]+) *$';
         rconParser.Configuration.StatusHeader.Pattern           = 'num +score +ping +xuid +name +address +qport';
         rconParser.Configuration.CommandPrefixes.Kick           = 'clientkick {0}';
         rconParser.Configuration.CommandPrefixes.Ban            = 'clientkick {0}';
@@ -23,9 +23,20 @@ var plugin = {
         rconParser.Configuration.CommandPrefixes.RConGetDvar    = '\xff\xff\xff\xff\x00{0} {1}';
         rconParser.Configuration.CommandPrefixes.RConSetDvar    = '\xff\xff\xff\xff\x00{0} set {1}';
         rconParser.Configuration.CommandPrefixes.RConResponse   = '\xff\xff\xff\xff\x01';
+        rconParser.Configuration.GametypeStatus.Pattern         = 'Gametype: (.+)';
+        rconParser.Configuration.MapStatus.Pattern              = 'Map: (.+)';
         rconParser.Configuration.CommandPrefixes.RConGetInfo    = undefined; // disables this, because it's useless on T7
+        rconParser.Configuration.ServerNotRunningResponse       = 'this is here to prevent a hiberating server from being detected as not running';
+
+        rconParser.Configuration.OverrideDvarNameMapping.Add('sv_hostname', 'live_steam_server_name');
+        rconParser.Configuration.DefaultDvarValues.Add('sv_running', '1');
+        rconParser.Configuration.DefaultDvarValues.Add('g_gametype', '');
+        rconParser.Configuration.DefaultDvarValues.Add('fs_basepath', '');
+        rconParser.Configuration.DefaultDvarValues.Add('fs_basegame', '');
+        rconParser.Configuration.DefaultDvarValues.Add('fs_game', '');
 
         rconParser.Configuration.Status.AddMapping(105, 6); // ip address
+        rconParser.Configuration.GametypeStatus.AddMapping(112, 1); // gametype
         rconParser.Version = '[local] ship win64 CODBUILD8-764 (3421987) Mon Dec 16 10:44:20 2019 10d27bef';
         rconParser.GameName = 8; // BO3
         rconParser.CanGenerateLogPath = false;
@@ -34,7 +45,6 @@ var plugin = {
         eventParser.GameName = 8; // BO3
         eventParser.Configuration.GameDirectory = 'usermaps';
         eventParser.Configuration.Say.Pattern = '^(chat|chatteam);(?:[0-9]+);([0-9]+);([0-9]+);(.+);(.*)$';
-
     },
 
     onUnloadAsync: function () {
@@ -42,4 +52,4 @@ var plugin = {
 
     onTickAsync: function (server) {
     }
-};
+};

Plugins/ScriptPlugins/ParserTeknoMW3.js

@@ -3,7 +3,7 @@ var eventParser;
 
 var plugin = {
     author: 'RaidMax',
-    version: 0.3,
+    version: 0.7,
     name: 'Tekno MW3 Parser',
     isParser: true,
 
@@ -14,11 +14,12 @@ var plugin = {
         rconParser = manager.GenerateDynamicRConParser(this.name);
         eventParser = manager.GenerateDynamicEventParser(this.name);
 
-        rconParser.Configuration.Status.Pattern = '^ *([0-9]+) +([0-9]+) +((?:[A-Z]+|[0-9]+)) +((?:[A-Z]|[0-9]){16,32})\t +(.{0,16}) +([0-9]+) +(\\d+\\.\\d+\\.\\d+\\.\\d+\\:-?\\d{1,5}|0+\\.0+\\:-?\\d{1,5}|loopback) *$';
+        rconParser.Configuration.Status.Pattern = '^ *([0-9]+) +([0-9]+) +((?:[A-Z]+|[0-9]+)) +((?:[A-Z]|[0-9]){16,32}|0)\t +(.{0,16}) +([0-9]+) +(\\d+\\.\\d+\\.\\d+\\.\\d+\\:-?\\d{1,5}|0+\\.0+\\:-?\\d{1,5}|loopback) *$';
+        rconParser.Configuration.StatusHeader.Pattern = 'num +score +ping +guid +name +lastmsg +address';
         rconParser.Configuration.Status.AddMapping(104, 5); // RConName
         rconParser.Configuration.Status.AddMapping(103, 4); // RConNetworkId
         rconParser.Configuration.CommandPrefixes.RConGetInfo = undefined;
-        rconParser.Configuration.CommandPrefixes.RConResponse = '\xff\xff\xff\xff';
+        rconParser.Configuration.CommandPrefixes.RConResponse = '\xff\xff\xff\xff(print)?';
         rconParser.Configuration.CommandPrefixes.Tell = 'tell {0} {1}';
         rconParser.Configuration.CommandPrefixes.Say = 'say {0}';
         rconParser.Configuration.CommandPrefixes.Kick = 'dropclient {0} "{1}"';
@@ -26,6 +27,10 @@ var plugin = {
         rconParser.Configuration.CommandPrefixes.TempBan = 'tempbanclient {0} "{1}"';
         rconParser.Configuration.Dvar.AddMapping(107, 1); // RCon DvarValue
         rconParser.Configuration.Dvar.Pattern = '^(.*)$';
+
+        rconParser.Configuration.DefaultDvarValues.Add('sv_running', '1');
+        rconParser.Configuration.OverrideDvarNameMapping.Add('_website', 'sv_clanWebsite');
+
         rconParser.Version = 'IW5 MP 1.4 build 382 latest Thu Jan 19 2012 11:09:49AM win-x86';
         rconParser.GameName = 3; // IW5
         rconParser.CanGenerateLogPath = false;

Plugins/ScriptPlugins/SampleScriptPluginCommand.js

@@ -0,0 +1,58 @@
+let commands = [{
+    // required
+    name: "pingpong",
+    // required
+    description: "pongs a ping",
+    // required
+    alias: "pp",
+    // required
+    permission: "User",
+    // optional (defaults to false)
+    targetRequired: false,
+    // optional
+    arguments: [{
+        name: "times to ping",
+        required: true
+    }],
+    // required
+    execute: (gameEvent) => {
+        // parse the first argument (number of times)
+        let times = parseInt(gameEvent.Data);
+
+        // we only want to allow ping pong up to 5 times
+        if (times > 5 || times <= 0) {
+            gameEvent.Origin.Tell("You can only ping pong between 1 and 5 times");
+            return;
+        }
+
+        // we want to print out a pong message for the number of times they requested
+        for (var i = 0; i < times; i++) {
+            gameEvent.Origin.Tell(`^${i}pong #${i + 1}^7`);
+
+            // don't want to wait if it's the last pong
+            if (i < times - 1) {
+                System.Threading.Tasks.Task.Delay(1000).Wait();
+            }
+        }
+    }
+}];
+
+let plugin = {
+    author: 'RaidMax',
+    version: 1.0,
+    name: 'Ping Pong Sample Command Plugin',
+
+    onEventAsync: function (gameEvent, server) {
+    },
+
+    onLoadAsync: function (manager) {
+        this.logger = _serviceResolver.ResolveService("ILogger");
+        this.logger.WriteDebug("sample plugin loaded");
+    },
+
+    onUnloadAsync: function () {
+    },
+
+    onTickAsync: function (server) {
+    }
+};

Plugins/Stats/Cheat/Detection.cs

@@ -20,7 +20,8 @@ namespace IW4MAdmin.Plugins.Stats.Cheat
             Offset,
             Strain,
             Recoil,
-            Snap
+            Snap,
+            Button
         };
 
         public ChangeTracking<EFACSnapshot> Tracker { get; private set; }
@@ -38,11 +39,12 @@ namespace IW4MAdmin.Plugins.Stats.Cheat
         ILogger Log;
         Strain Strain;
         readonly DateTime ConnectionTime = DateTime.UtcNow;
-        private double sessionAverageRecoilAmount;
+        private double mapAverageRecoilAmount;
         private double sessionAverageSnapAmount;
         private int sessionSnapHits;
         private EFClientKill lastHit;
         private int validRecoilHitCount;
+        private int validButtonHitCount;
 
         private class HitInfo
         {
@@ -282,18 +284,30 @@ namespace IW4MAdmin.Plugins.Stats.Cheat
 
             #region RECOIL
             float hitRecoilAverage = 0;
-            if (!Plugin.Config.Configuration().RecoilessWeapons.Any(_weaponRegex => Regex.IsMatch(hit.Weapon.ToString(), _weaponRegex)))
+            bool shouldIgnoreDetection = false;
+            try
+            {
+                shouldIgnoreDetection = Plugin.Config.Configuration().AnticheatConfiguration.IgnoredDetectionSpecification[hit.GameName][DetectionType.Recoil]
+                    .Any(_weaponRegex => Regex.IsMatch(hit.Weapon.ToString(), _weaponRegex));
+            }
+
+            catch (KeyNotFoundException)
+            {
+
+            }
+
+            if (!shouldIgnoreDetection)
             {
                 validRecoilHitCount++;
                 hitRecoilAverage = (hit.AnglesList.Sum(_angle => _angle.Z) + hit.ViewAngles.Z) / (hit.AnglesList.Count + 1);
-                sessionAverageRecoilAmount = (sessionAverageRecoilAmount * (validRecoilHitCount - 1) + hitRecoilAverage) / validRecoilHitCount;
+                mapAverageRecoilAmount = (mapAverageRecoilAmount * (validRecoilHitCount - 1) + hitRecoilAverage) / validRecoilHitCount;
 
-                if (validRecoilHitCount >= Thresholds.LowSampleMinKills && Kills > Thresholds.LowSampleMinKillsRecoil && sessionAverageRecoilAmount == 0)
+                if (validRecoilHitCount >= Thresholds.LowSampleMinKills && Kills > Thresholds.LowSampleMinKillsRecoil && mapAverageRecoilAmount == 0)
                 {
                     results.Add(new DetectionPenaltyResult()
                     {
                         ClientPenalty = EFPenalty.PenaltyType.Ban,
-                        Value = sessionAverageRecoilAmount,
+                        Value = mapAverageRecoilAmount,
                         HitCount = HitCount,
                         Type = DetectionType.Recoil
                     });
@@ -301,6 +315,37 @@ namespace IW4MAdmin.Plugins.Stats.Cheat
             }
             #endregion
 
+            #region BUTTON
+            try
+            {
+                shouldIgnoreDetection = false;
+                shouldIgnoreDetection = Plugin.Config.Configuration().AnticheatConfiguration.IgnoredDetectionSpecification[hit.GameName][DetectionType.Button]
+                    .Any(_weaponRegex => Regex.IsMatch(hit.Weapon.ToString(), _weaponRegex));
+            }
+
+            catch (KeyNotFoundException)
+            {
+
+            }
+
+            if (!shouldIgnoreDetection)
+            {
+                validButtonHitCount++;
+            }
+
+            double lastDiff = hit.TimeOffset - hit.TimeSinceLastAttack;
+            if (validButtonHitCount > 0 && lastDiff <= 0)
+            {
+                results.Add(new DetectionPenaltyResult()
+                {
+                    ClientPenalty = EFPenalty.PenaltyType.Ban,
+                    Value = lastDiff,
+                    HitCount = HitCount,
+                    Type = DetectionType.Button
+                });
+            }
+            #endregion
+
             #region SESSION_RATIOS
             if (Kills >= Thresholds.LowSampleMinKills)
             {
@@ -384,7 +429,19 @@ namespace IW4MAdmin.Plugins.Stats.Cheat
             #region CHEST_ABDOMEN_RATIO_SESSION
             int chestHits = HitLocationCount[IW4Info.HitLocation.torso_upper].Count;
 
-            if (chestHits >= Thresholds.MediumSampleMinKills)
+            try
+            {
+                shouldIgnoreDetection = false; // reset previous value
+                shouldIgnoreDetection = Plugin.Config.Configuration().AnticheatConfiguration.IgnoredDetectionSpecification[hit.GameName][DetectionType.Chest]
+                    .Any(_weaponRegex => Regex.IsMatch(hit.Weapon.ToString(), _weaponRegex));
+            }
+
+            catch (KeyNotFoundException)
+            {
+
+            }
+
+            if (chestHits >= Thresholds.MediumSampleMinKills && !shouldIgnoreDetection)
             {
                 double marginOfError = Thresholds.GetMarginOfError(chestHits);
                 double lerpAmount = Math.Min(1.0, (chestHits - Thresholds.MediumSampleMinKills) / (double)(Thresholds.HighSampleMinKills - Thresholds.LowSampleMinKills));
@@ -466,5 +523,11 @@ namespace IW4MAdmin.Plugins.Stats.Cheat
 
             return results;
         }
+
+        public void OnMapChange()
+        {
+            mapAverageRecoilAmount = 0;
+            validRecoilHitCount = 0;
+        }
     }
 }