Merge branch 'release/pre' of github.com:RaidMax/IW4M-Admin into release/pre

* BaseEvent: Deal with all sorts of special characters sent by the engine

Application/API/Master/IMasterApi.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using IW4MAdmin.Application.Misc;
+using IW4MAdmin.Application.Plugin;
 using Newtonsoft.Json;
 using RestEase;
 using SharedLibraryCore.Helpers;

Application/Alerts/AlertManager.cs

@@ -2,6 +2,7 @@
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using SharedLibraryCore.Alerts;
 using SharedLibraryCore.Configuration;
@@ -15,6 +16,7 @@ public class AlertManager : IAlertManager
     private readonly ApplicationConfiguration _appConfig;
     private readonly ConcurrentDictionary<int, List<Alert.AlertState>> _states = new();
     private readonly List<Func<Task<IEnumerable<Alert.AlertState>>>> _staticSources = new();
+    private readonly SemaphoreSlim _onModifyingAlerts = new(1, 1);
 
     public AlertManager(ApplicationConfiguration appConfig)
     {
@@ -38,8 +40,9 @@ public class AlertManager : IAlertManager
 
     public IEnumerable<Alert.AlertState> RetrieveAlerts(EFClient client)
     {
-        lock (_states)
+        try
         {
+            _onModifyingAlerts.Wait();
             var alerts = Enumerable.Empty<Alert.AlertState>();
             if (client.Level > Data.Models.Client.EFClient.Permission.Trusted)
             {
@@ -54,12 +57,20 @@ public class AlertManager : IAlertManager
 
             return alerts.OrderByDescending(alert => alert.OccuredAt);
         }
+        finally
+        {
+            if (_onModifyingAlerts.CurrentCount == 0)
+            {
+                _onModifyingAlerts.Release(1);
+            }
+        }
     }
 
     public void MarkAlertAsRead(Guid alertId)
     {
-        lock (_states)
+        try
         {
+            _onModifyingAlerts.Wait();
             foreach (var items in _states.Values)
             {
                 var matchingEvent = items.FirstOrDefault(item => item.AlertId == alertId);
@@ -73,12 +84,20 @@ public class AlertManager : IAlertManager
                 OnAlertConsumed?.Invoke(this, matchingEvent);
             }
         }
+        finally
+        {
+            if (_onModifyingAlerts.CurrentCount == 0)
+            {
+                _onModifyingAlerts.Release(1);
+            }
+        }
     }
 
     public void MarkAllAlertsAsRead(int recipientId)
     {
-        lock (_states)
+        try
         {
+            _onModifyingAlerts.Wait();
             foreach (var items in _states.Values)
             {
                 items.RemoveAll(item =>
@@ -93,12 +112,20 @@ public class AlertManager : IAlertManager
                 });
             }
         }
+        finally
+        {
+            if (_onModifyingAlerts.CurrentCount == 0)
+            {
+                _onModifyingAlerts.Release(1);
+            }
+        }
     }
 
     public void AddAlert(Alert.AlertState alert)
     {
-        lock (_states)
+        try
         {
+            _onModifyingAlerts.Wait();
             if (alert.RecipientId is null)
             {
                 _states[0].Add(alert);
@@ -119,6 +146,14 @@ public class AlertManager : IAlertManager
 
             PruneOldAlerts();
         }
+        finally
+        {
+            if (_onModifyingAlerts.CurrentCount == 0)
+            {
+                _onModifyingAlerts.Release(1);
+            }
+        }
+        
     }
 
     public void RegisterStaticAlertSource(Func<Task<IEnumerable<Alert.AlertState>>> alertSource)

Application/Application.csproj

@@ -24,7 +24,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Jint" Version="3.0.0-beta-2038" />
+    <PackageReference Include="Jint" Version="3.0.0-beta-2047" />
     <PackageReference Include="MaxMind.GeoIP2" Version="5.1.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.8">
       <PrivateAssets>all</PrivateAssets>

Application/ApplicationManager.cs

@@ -16,6 +16,7 @@ using System.Collections;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Collections.Immutable;
+using System.Globalization;
 using System.Linq;
 using System.Reflection;
 using System.Text;
@@ -23,11 +24,18 @@ using System.Threading;
 using System.Threading.Tasks;
 using Data.Abstractions;
 using Data.Context;
+using Data.Models;
+using IW4MAdmin.Application.Configuration;
 using IW4MAdmin.Application.Migration;
+using IW4MAdmin.Application.Plugin.Script;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Serilog.Context;
+using SharedLibraryCore.Events;
+using SharedLibraryCore.Events.Management;
+using SharedLibraryCore.Events.Server;
 using SharedLibraryCore.Formatting;
+using SharedLibraryCore.Interfaces.Events;
 using static SharedLibraryCore.GameEvent;
 using ILogger = Microsoft.Extensions.Logging.ILogger;
 using ObsoleteLogger = SharedLibraryCore.Interfaces.ILogger;
@@ -49,7 +57,7 @@ namespace IW4MAdmin.Application
         public IList<Func<GameEvent, bool>> CommandInterceptors { get; set; } =
             new List<Func<GameEvent, bool>>();
         public ITokenAuthentication TokenAuthenticator { get; }
-        public CancellationToken CancellationToken => _tokenSource.Token;
+        public CancellationToken CancellationToken => _isRunningTokenSource.Token;
         public string ExternalIPAddress { get; private set; }
         public bool IsRestartRequested { get; private set; }
         public IMiddlewareActionHandler MiddlewareActionHandler { get; }
@@ -63,29 +71,30 @@ namespace IW4MAdmin.Application
         public IConfigurationHandler<ApplicationConfiguration> ConfigHandler;
         readonly IPageList PageList;
         private readonly TimeSpan _throttleTimeout = new TimeSpan(0, 1, 0);
-        private CancellationTokenSource _tokenSource;
+        private CancellationTokenSource _isRunningTokenSource;
+        private CancellationTokenSource _eventHandlerTokenSource;
         private readonly Dictionary<string, Task<IList>> _operationLookup = new Dictionary<string, Task<IList>>();
         private readonly ITranslationLookup _translationLookup;
         private readonly IConfigurationHandler<CommandConfiguration> _commandConfiguration;
         private readonly IGameServerInstanceFactory _serverInstanceFactory;
         private readonly IParserRegexFactory _parserRegexFactory;
         private readonly IEnumerable<IRegisterEvent> _customParserEvents;
-        private readonly IEventHandler _eventHandler;
+        private readonly ICoreEventHandler _coreEventHandler;
         private readonly IScriptCommandFactory _scriptCommandFactory;
         private readonly IMetaRegistration _metaRegistration;
         private readonly IScriptPluginServiceResolver _scriptPluginServiceResolver;
         private readonly IServiceProvider _serviceProvider;
         private readonly ChangeHistoryService _changeHistoryService;
         private readonly ApplicationConfiguration _appConfig;
-        public ConcurrentDictionary<long, GameEvent> ProcessingEvents { get; } = new ConcurrentDictionary<long, GameEvent>();
+        public ConcurrentDictionary<long, GameEvent> ProcessingEvents { get; } = new();
 
         public ApplicationManager(ILogger<ApplicationManager> logger, IMiddlewareActionHandler actionHandler, IEnumerable<IManagerCommand> commands,
             ITranslationLookup translationLookup, IConfigurationHandler<CommandConfiguration> commandConfiguration,
             IConfigurationHandler<ApplicationConfiguration> appConfigHandler, IGameServerInstanceFactory serverInstanceFactory,
             IEnumerable<IPlugin> plugins, IParserRegexFactory parserRegexFactory, IEnumerable<IRegisterEvent> customParserEvents,
-            IEventHandler eventHandler, IScriptCommandFactory scriptCommandFactory, IDatabaseContextFactory contextFactory,
+            ICoreEventHandler coreEventHandler, IScriptCommandFactory scriptCommandFactory, IDatabaseContextFactory contextFactory,
             IMetaRegistration metaRegistration, IScriptPluginServiceResolver scriptPluginServiceResolver, ClientService clientService, IServiceProvider serviceProvider,
-            ChangeHistoryService changeHistoryService, ApplicationConfiguration appConfig, PenaltyService penaltyService, IAlertManager alertManager)
+            ChangeHistoryService changeHistoryService, ApplicationConfiguration appConfig, PenaltyService penaltyService, IAlertManager alertManager, IInteractionRegistration interactionRegistration, IEnumerable<IPluginV2> v2PLugins)
         {
             MiddlewareActionHandler = actionHandler;
             _servers = new ConcurrentBag<Server>();
@@ -100,14 +109,14 @@ namespace IW4MAdmin.Application
             AdditionalRConParsers = new List<IRConParser> { new BaseRConParser(serviceProvider.GetRequiredService<ILogger<BaseRConParser>>(), parserRegexFactory) };
             TokenAuthenticator = new TokenAuthentication();
             _logger = logger;
-            _tokenSource = new CancellationTokenSource();
+            _isRunningTokenSource = new CancellationTokenSource();
             _commands = commands.ToList();
             _translationLookup = translationLookup;
             _commandConfiguration = commandConfiguration;
             _serverInstanceFactory = serverInstanceFactory;
             _parserRegexFactory = parserRegexFactory;
             _customParserEvents = customParserEvents;
-            _eventHandler = eventHandler;
+            _coreEventHandler = coreEventHandler;
             _scriptCommandFactory = scriptCommandFactory;
             _metaRegistration = metaRegistration;
             _scriptPluginServiceResolver = scriptPluginServiceResolver;
@@ -115,13 +124,17 @@ namespace IW4MAdmin.Application
             _changeHistoryService = changeHistoryService;
             _appConfig = appConfig;
             Plugins = plugins;
+            InteractionRegistration = interactionRegistration;
+            
+            IManagementEventSubscriptions.ClientPersistentIdReceived += OnClientPersistentIdReceived;
         }
 
         public IEnumerable<IPlugin> Plugins { get; }
+        public IInteractionRegistration InteractionRegistration { get; }
 
         public async Task ExecuteEvent(GameEvent newEvent)
         {
-            ProcessingEvents.TryAdd(newEvent.Id, newEvent);
+            ProcessingEvents.TryAdd(newEvent.IncrementalId, newEvent);
             
             // the event has failed already
             if (newEvent.Failed)
@@ -139,12 +152,12 @@ namespace IW4MAdmin.Application
 
             catch (TaskCanceledException)
             {
-                _logger.LogDebug("Received quit signal for event id {eventId}, so we are aborting early", newEvent.Id);
+                _logger.LogDebug("Received quit signal for event id {EventId}, so we are aborting early", newEvent.IncrementalId);
             }
 
             catch (OperationCanceledException)
             {
-                _logger.LogDebug("Received quit signal for event id {eventId}, so we are aborting early", newEvent.Id);
+                _logger.LogDebug("Received quit signal for event id {EventId}, so we are aborting early", newEvent.IncrementalId);
             }
 
             // this happens if a plugin requires login
@@ -183,11 +196,11 @@ namespace IW4MAdmin.Application
             }
 
             skip:
-            if (newEvent.Type == EventType.Command && newEvent.ImpersonationOrigin == null)
+            if (newEvent.Type == EventType.Command && newEvent.ImpersonationOrigin == null && newEvent.CorrelationId is not null)
             {
                 var correlatedEvents =
                     ProcessingEvents.Values.Where(ev =>
-                            ev.CorrelationId == newEvent.CorrelationId && ev.Id != newEvent.Id)
+                            ev.CorrelationId == newEvent.CorrelationId && ev.IncrementalId != newEvent.IncrementalId)
                         .ToList();
 
                 await Task.WhenAll(correlatedEvents.Select(ev =>
@@ -196,14 +209,16 @@ namespace IW4MAdmin.Application
 
                 foreach (var correlatedEvent in correlatedEvents)
                 {
-                    ProcessingEvents.Remove(correlatedEvent.Id, out _);
+                    ProcessingEvents.Remove(correlatedEvent.IncrementalId, out _);
                 }
             }
 
             // we don't want to remove events that are correlated to command
-            if (ProcessingEvents.Values.ToList()?.Count(gameEvent => gameEvent.CorrelationId == newEvent.CorrelationId) == 1)
+            if (ProcessingEvents.Values.Count(gameEvent =>
+                    newEvent.CorrelationId is not null && newEvent.CorrelationId == gameEvent.CorrelationId) == 1 ||
+                newEvent.CorrelationId is null)
             {
-                ProcessingEvents.Remove(newEvent.Id, out _);
+                ProcessingEvents.Remove(newEvent.IncrementalId, out _);
             }
 
             // tell anyone waiting for the output that we're done
@@ -223,77 +238,58 @@ namespace IW4MAdmin.Application
 
         public IReadOnlyList<IManagerCommand> Commands => _commands.ToImmutableList();
 
-        public async Task UpdateServerStates()
+        private Task UpdateServerStates()
         {
-            // store the server hash code and task for it
-            var runningUpdateTasks = new Dictionary<long, (Task task, CancellationTokenSource tokenSource, DateTime startTime)>();
-
-            while (!_tokenSource.IsCancellationRequested)
+            var index = 0;
+            return Task.WhenAll(_servers.Select(server =>
             {
-                // select the server ids that have completed the update task
-                var serverTasksToRemove = runningUpdateTasks
-                    .Where(ut => ut.Value.task.Status == TaskStatus.RanToCompletion ||
-                                 ut.Value.task.Status == TaskStatus.Canceled || // we want to cancel if a task takes longer than 5 minutes
-                                 ut.Value.task.Status == TaskStatus.Faulted || DateTime.Now - ut.Value.startTime > TimeSpan.FromMinutes(5))
-                    .Select(ut => ut.Key)
-                    .ToList();
+                var thisIndex = index;
+                Interlocked.Increment(ref index);
+                return ProcessUpdateHandler(server, thisIndex);
+            }));
+        }
 
-                // remove the update tasks as they have completed
-                foreach (var serverId in serverTasksToRemove.Where(serverId => runningUpdateTasks.ContainsKey(serverId)))
-                {
-                    if (!runningUpdateTasks[serverId].tokenSource.Token.IsCancellationRequested)
-                    {
-                        runningUpdateTasks[serverId].tokenSource.Cancel();
-                    }
-
-                    runningUpdateTasks.Remove(serverId);
-                }
-
-                // select the servers where the tasks have completed
-                var serverIds = Servers.Select(s => s.EndPoint).Except(runningUpdateTasks.Select(r => r.Key)).ToList();
-                foreach (var server in Servers.Where(s => serverIds.Contains(s.EndPoint)))
-                {
-                    var tokenSource = new CancellationTokenSource();
-                    runningUpdateTasks.Add(server.EndPoint, (Task.Run(async () =>
-                    {
-                        try
-                        {
-                            if (runningUpdateTasks.ContainsKey(server.EndPoint))
-                            {
-                                await server.ProcessUpdatesAsync(_tokenSource.Token)
-                                    .WithWaitCancellation(runningUpdateTasks[server.EndPoint].tokenSource.Token);
-                            }
-                        }
-
-                        catch (Exception e)
-                        {
-                            using (LogContext.PushProperty("Server", server.ToString()))
-                            {
-                                _logger.LogError(e, "Failed to update status");
-                            }
-                        }
-
-                        finally
-                        {
-                            server.IsInitialized = true;
-                        }
-                    }, tokenSource.Token), tokenSource, DateTime.Now));
-                }
+        private async Task ProcessUpdateHandler(Server server, int index)
+        {
+            const int delayScalar = 50; // Task.Delay is inconsistent enough there's no reason to try to prevent collisions
+            var timeout = TimeSpan.FromMinutes(2);
 
+            while (!_isRunningTokenSource.IsCancellationRequested)
+            {
                 try
                 {
-                    await Task.Delay(ConfigHandler.Configuration().RConPollRate, _tokenSource.Token);
+                    var delayFactor = Math.Min(_appConfig.RConPollRate, delayScalar * index);
+                    await Task.Delay(delayFactor, _isRunningTokenSource.Token);
+
+                    using var timeoutTokenSource = new CancellationTokenSource();
+                    timeoutTokenSource.CancelAfter(timeout);
+                    using var linkedTokenSource =
+                        CancellationTokenSource.CreateLinkedTokenSource(timeoutTokenSource.Token,
+                            _isRunningTokenSource.Token);
+                    await server.ProcessUpdatesAsync(linkedTokenSource.Token);
+
+                    await Task.Delay(Math.Max(1000, _appConfig.RConPollRate - delayFactor),
+                        _isRunningTokenSource.Token);
                 }
-                // if a cancellation is received, we want to return immediately after shutting down
-                catch
+                catch (OperationCanceledException)
                 {
-                    foreach (var server in Servers.Where(s => serverIds.Contains(s.EndPoint)))
+                    // ignored
+                }
+                catch (Exception ex)
+                {
+                    using (LogContext.PushProperty("Server", server.Id))
                     {
-                        await server.ProcessUpdatesAsync(_tokenSource.Token);
+                        _logger.LogError(ex, "Failed to update status");
                     }
-                    break;
+                }
+                finally
+                {
+                    server.IsInitialized = true;
                 }
             }
+            
+            // run the final updates to clean up server
+            await server.ProcessUpdatesAsync(_isRunningTokenSource.Token);
         }
 
         public async Task Init()
@@ -304,25 +300,34 @@ namespace IW4MAdmin.Application
             #region DATABASE
             _logger.LogInformation("Beginning database migration sync");
             Console.WriteLine(_translationLookup["MANAGER_MIGRATION_START"]);
-            await ContextSeed.Seed(_serviceProvider.GetRequiredService<IDatabaseContextFactory>(), _tokenSource.Token);
-            await DatabaseHousekeeping.RemoveOldRatings(_serviceProvider.GetRequiredService<IDatabaseContextFactory>(), _tokenSource.Token);
+            await ContextSeed.Seed(_serviceProvider.GetRequiredService<IDatabaseContextFactory>(), _isRunningTokenSource.Token);
+            await DatabaseHousekeeping.RemoveOldRatings(_serviceProvider.GetRequiredService<IDatabaseContextFactory>(), _isRunningTokenSource.Token);
             _logger.LogInformation("Finished database migration sync");
             Console.WriteLine(_translationLookup["MANAGER_MIGRATION_END"]);
             #endregion
+            
+            #region EVENTS                        
+            IGameServerEventSubscriptions.ServerValueRequested += OnServerValueRequested;
+            IGameServerEventSubscriptions.ServerValueSetRequested += OnServerValueSetRequested;
+            IGameServerEventSubscriptions.ServerCommandExecuteRequested += OnServerCommandExecuteRequested;
+            await IManagementEventSubscriptions.InvokeLoadAsync(this, CancellationToken);
+            # endregion
 
             #region PLUGINS
             foreach (var plugin in Plugins)
             {
                 try
                 {
-                    if (plugin is ScriptPlugin scriptPlugin)
+                    if (plugin is ScriptPlugin scriptPlugin && !plugin.IsParser)
                     {
-                        await scriptPlugin.Initialize(this, _scriptCommandFactory, _scriptPluginServiceResolver);
+                        await scriptPlugin.Initialize(this, _scriptCommandFactory, _scriptPluginServiceResolver, 
+                            _serviceProvider.GetService<IConfigurationHandlerV2<ScriptPluginConfiguration>>());
                         scriptPlugin.Watcher.Changed += async (sender, e) =>
                         {
                             try
                             {
-                                await scriptPlugin.Initialize(this, _scriptCommandFactory, _scriptPluginServiceResolver);
+                                await scriptPlugin.Initialize(this, _scriptCommandFactory, _scriptPluginServiceResolver, 
+                                    _serviceProvider.GetService<IConfigurationHandlerV2<ScriptPluginConfiguration>>());
                             }
 
                             catch (Exception ex)
@@ -388,13 +393,11 @@ namespace IW4MAdmin.Application
                 if (string.IsNullOrEmpty(_appConfig.Id))
                 {
                     _appConfig.Id = Guid.NewGuid().ToString();
-                    await ConfigHandler.Save();
                 }
 
                 if (string.IsNullOrEmpty(_appConfig.WebfrontBindUrl))
                 {
                     _appConfig.WebfrontBindUrl = "http://0.0.0.0:1624";
-                    await ConfigHandler.Save();
                 }
 
 #pragma warning disable 618
@@ -439,8 +442,8 @@ namespace IW4MAdmin.Application
 
                         serverConfig.ModifyParsers();
                     }
-                    await ConfigHandler.Save();
                 }
+                await ConfigHandler.Save();
             }
 
             if (_appConfig.Servers.Length == 0)
@@ -465,7 +468,7 @@ namespace IW4MAdmin.Application
             #endregion
 
             #region COMMANDS
-            if (await ClientSvc.HasOwnerAsync(_tokenSource.Token))
+            if (await ClientSvc.HasOwnerAsync(_isRunningTokenSource.Token))
             {
                 _commands.RemoveAll(_cmd => _cmd.GetType() == typeof(OwnerCommand));
             }
@@ -523,7 +526,7 @@ namespace IW4MAdmin.Application
                 }
             }
             #endregion
-
+            
             Console.WriteLine(_translationLookup["MANAGER_COMMUNICATION_INFO"]);
             await InitializeServers();
             IsInitialized = true;
@@ -540,26 +543,23 @@ namespace IW4MAdmin.Application
                 try
                 {
                     // todo: this might not always be an IW4MServer
-                    var ServerInstance = _serverInstanceFactory.CreateServer(Conf, this) as IW4MServer;
-                    using (LogContext.PushProperty("Server", ServerInstance.ToString()))
+                    var serverInstance = _serverInstanceFactory.CreateServer(Conf, this) as IW4MServer;
+                    using (LogContext.PushProperty("Server", serverInstance!.ToString()))
                     {
                         _logger.LogInformation("Beginning server communication initialization");
-                        await ServerInstance.Initialize();
+                        await serverInstance.Initialize();
 
-                        _servers.Add(ServerInstance);
-                        Console.WriteLine(Utilities.CurrentLocalization.LocalizationIndex["MANAGER_MONITORING_TEXT"].FormatExt(ServerInstance.Hostname.StripColors()));
-                        _logger.LogInformation("Finishing initialization and now monitoring [{Server}]", ServerInstance.Hostname);
+                        _servers.Add(serverInstance);
+                        Console.WriteLine(Utilities.CurrentLocalization.LocalizationIndex["MANAGER_MONITORING_TEXT"].FormatExt(serverInstance.Hostname.StripColors()));
+                        _logger.LogInformation("Finishing initialization and now monitoring [{Server}]", serverInstance.Hostname);
                     }
 
-                    // add the start event for this server
-                    var e = new GameEvent()
+                    QueueEvent(new MonitorStartEvent
                     {
-                        Type = EventType.Start,
-                        Data = $"{ServerInstance.GameName} started",
-                        Owner = ServerInstance
-                    };
-
-                    AddEvent(e);
+                        Server = serverInstance,
+                        Source = this
+                    });                    
+                    
                     successServers++;
                 }
 
@@ -590,11 +590,27 @@ namespace IW4MAdmin.Application
             }
         }
 
-        public async Task Start() => await UpdateServerStates();
+        public async Task Start()
+        {
+            _eventHandlerTokenSource = new CancellationTokenSource();
+            
+            var eventHandlerThread = new Thread(() =>
+            {
+                _coreEventHandler.StartProcessing(_eventHandlerTokenSource.Token);
+            })
+            {
+                Name = nameof(CoreEventHandler)
+            };
+
+            eventHandlerThread.Start();
+            await UpdateServerStates();
+            _eventHandlerTokenSource.Cancel();
+            eventHandlerThread.Join();
+        }
 
         public async Task Stop()
         {
-            foreach (var plugin in Plugins)
+            foreach (var plugin in Plugins.Where(plugin => !plugin.IsParser))
             {
                 try
                 {
@@ -604,18 +620,32 @@ namespace IW4MAdmin.Application
                 {
                     _logger.LogError(ex, "Could not cleanly unload plugin {PluginName}", plugin.Name);
                 }
-            }   
-            
-            _tokenSource.Cancel();
-            
+            }
+
+            _isRunningTokenSource.Cancel();
+
             IsRunning = false;
         }
 
-        public void Restart()
+        public async Task Restart()
         {
             IsRestartRequested = true;
-            Stop().GetAwaiter().GetResult();
-            _tokenSource = new CancellationTokenSource();
+            await Stop();
+            
+            using var subscriptionTimeoutToken = new CancellationTokenSource();
+            subscriptionTimeoutToken.CancelAfter(Utilities.DefaultCommandTimeout);
+
+            await IManagementEventSubscriptions.InvokeUnloadAsync(this, subscriptionTimeoutToken.Token);
+
+            IGameEventSubscriptions.ClearEventInvocations();
+            IGameServerEventSubscriptions.ClearEventInvocations();
+            IManagementEventSubscriptions.ClearEventInvocations();
+            
+            _isRunningTokenSource.Dispose();
+            _isRunningTokenSource = new CancellationTokenSource();
+            
+            _eventHandlerTokenSource.Dispose();
+            _eventHandlerTokenSource = new CancellationTokenSource();
         }
 
         [Obsolete]
@@ -657,9 +687,14 @@ namespace IW4MAdmin.Application
 
         public void AddEvent(GameEvent gameEvent)
         {
-            _eventHandler.HandleEvent(this, gameEvent);
+            _coreEventHandler.QueueEvent(this, gameEvent);
         }
 
+        public void QueueEvent(CoreEvent coreEvent)
+        {
+            _coreEventHandler.QueueEvent(this, coreEvent);
+        }
+        
         public IPageList GetPageList()
         {
             return PageList;
@@ -694,15 +729,166 @@ namespace IW4MAdmin.Application
 
         public void AddAdditionalCommand(IManagerCommand command)
         {
-            if (_commands.Any(_command => _command.Name == command.Name || _command.Alias == command.Alias))
+            lock (_commands)
             {
-                throw new InvalidOperationException($"Duplicate command name or alias ({command.Name}, {command.Alias})");
-            }
+                if (_commands.Any(cmd => cmd.Name == command.Name || cmd.Alias == command.Alias))
+                {
+                    throw new InvalidOperationException(
+                        $"Duplicate command name or alias ({command.Name}, {command.Alias})");
+                }
 
-            _commands.Add(command);
+                _commands.Add(command);
+            }
         }
 
         public void RemoveCommandByName(string commandName) => _commands.RemoveAll(_command => _command.Name == commandName);
         public IAlertManager AlertManager => _alertManager;
+        
+        private async Task OnServerValueRequested(ServerValueRequestEvent requestEvent, CancellationToken token)
+        {
+            if (requestEvent.Server is not IW4MServer server)
+            {
+                return;
+            }
+
+            Dvar<string> serverValue = null;
+            try
+            {
+                if (requestEvent.DelayMs.HasValue)
+                {
+                    await Task.Delay(requestEvent.DelayMs.Value, token);
+                }
+
+                var waitToken = token;
+                using var timeoutTokenSource = new CancellationTokenSource();
+                using var linkedTokenSource =
+                    CancellationTokenSource.CreateLinkedTokenSource(timeoutTokenSource.Token, token);
+                
+                if (requestEvent.TimeoutMs is not null)
+                {
+                    timeoutTokenSource.CancelAfter(requestEvent.TimeoutMs.Value);
+                    waitToken = linkedTokenSource.Token;
+                }
+
+                serverValue =
+                    await server.GetDvarAsync(requestEvent.ValueName, requestEvent.FallbackValue, waitToken);
+            }
+            catch
+            {
+                //  ignored
+            }
+            finally
+            {
+                QueueEvent(new ServerValueReceiveEvent
+                {
+                    Server = server,
+                    Source = server,
+                    Response = serverValue ?? new Dvar<string> { Name = requestEvent.ValueName },
+                    Success = serverValue is not null
+                });
+            }
+        }
+
+        private Task OnServerValueSetRequested(ServerValueSetRequestEvent requestEvent, CancellationToken token)
+        {
+            return ExecuteWrapperForServerQuery(requestEvent, token, async (innerEvent) =>
+            {
+                if (innerEvent.DelayMs.HasValue)
+                {
+                    await Task.Delay(innerEvent.DelayMs.Value, token);
+                }
+
+                if (innerEvent.TimeoutMs is not null)
+                {
+                    using var timeoutTokenSource = new CancellationTokenSource(innerEvent.TimeoutMs.Value);
+                    using var linkedTokenSource =
+                        CancellationTokenSource.CreateLinkedTokenSource(timeoutTokenSource.Token, token);
+                    token = linkedTokenSource.Token;
+                }
+
+                await innerEvent.Server.SetDvarAsync(innerEvent.ValueName, innerEvent.Value, token);
+            }, (completed, innerEvent) =>
+            {
+                QueueEvent(new ServerValueSetCompleteEvent
+                {
+                    Server = innerEvent.Server,
+                    Source = innerEvent.Server,
+                    Success = completed,
+                    Value = innerEvent.Value,
+                    ValueName = innerEvent.ValueName
+                });
+                return Task.CompletedTask;
+            });
+        }
+
+        private Task OnServerCommandExecuteRequested(ServerCommandRequestExecuteEvent executeEvent, CancellationToken token)
+        {
+            return ExecuteWrapperForServerQuery(executeEvent, token, async (innerEvent) =>
+            {
+                if (innerEvent.DelayMs.HasValue)
+                {
+                    await Task.Delay(innerEvent.DelayMs.Value, token);
+                }
+
+                if (innerEvent.TimeoutMs is not null)
+                {
+                    using var timeoutTokenSource = new CancellationTokenSource(innerEvent.TimeoutMs.Value);
+                    using var linkedTokenSource =
+                        CancellationTokenSource.CreateLinkedTokenSource(timeoutTokenSource.Token, token);
+                    token = linkedTokenSource.Token;
+                }
+
+                await innerEvent.Server.ExecuteCommandAsync(innerEvent.Command, token);
+            }, (_, __) => Task.CompletedTask);
+        }
+
+        private async Task ExecuteWrapperForServerQuery<TEventType>(TEventType serverEvent, CancellationToken token,
+            Func<TEventType, Task> action, Func<bool, TEventType, Task> complete) where TEventType : GameServerEvent
+        {
+            if (serverEvent.Server is not IW4MServer)
+            {
+                return;
+            }
+
+            var completed = false;
+            try
+            {
+                await action(serverEvent);
+                completed = true;
+            }
+            catch
+            {
+                //  ignored
+            }
+            finally
+            {
+                await complete(completed, serverEvent);
+            }
+        }
+
+        private async Task OnClientPersistentIdReceived(ClientPersistentIdReceiveEvent receiveEvent, CancellationToken token)
+        {
+            var parts = receiveEvent.PersistentId.Split(",");
+
+            if (parts.Length == 2 && int.TryParse(parts[0], out var high) &&
+                int.TryParse(parts[1], out var low))
+            {
+                var guid = long.Parse(high.ToString("X") + low.ToString("X"), NumberStyles.HexNumber);
+
+                var penalties = await PenaltySvc
+                    .GetActivePenaltiesByIdentifier(null, guid, receiveEvent.Client.GameName);
+                var banPenalty =
+                    penalties.FirstOrDefault(penalty => penalty.Type == EFPenalty.PenaltyType.Ban);
+
+                if (banPenalty is not null && receiveEvent.Client.Level != Data.Models.Client.EFClient.Permission.Banned)
+                {
+                    _logger.LogInformation(
+                        "Banning {Client} as they have have provided a persistent clientId of {PersistentClientId}, which is banned",
+                        receiveEvent.Client, guid);
+                    receiveEvent.Client.Ban(_translationLookup["SERVER_BAN_EVADE"].FormatExt(guid),
+                        receiveEvent.Client.CurrentServer.AsConsoleClient(), true);
+                }
+            }
+        }
     }
 }

Application/BuildScripts/DownloadTranslations.ps1

@@ -7,6 +7,6 @@ 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
+    $response = Invoke-WebRequest $url -UseBasicParsing
     Out-File -FilePath $filePath -InputObject $response.Content -Encoding utf8
-}
+}

Application/Commands/HelpCommand.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -33,7 +34,7 @@ namespace IW4MAdmin.Application.Commands
             };
         }
 
-        public override Task ExecuteAsync(GameEvent gameEvent)
+        public override async Task ExecuteAsync(GameEvent gameEvent)
         {
             var searchTerm = gameEvent.Data.Trim();
             var availableCommands = gameEvent.Owner.Manager.Commands.Distinct().Where(command =>
@@ -70,24 +71,25 @@ namespace IW4MAdmin.Application.Commands
                     });
 
                 var helpResponse = new StringBuilder();
+                var messageList = new List<string>();
 
                 foreach (var item in commandStrings)
                 {
                     helpResponse.Append(item.response);
+                    
                     if (item.index == 0 || item.index % 4 != 0)
                     {
                         continue;
                     }
 
-                    gameEvent.Origin.Tell(helpResponse.ToString());
+                    messageList.Add(helpResponse.ToString());
                     helpResponse = new StringBuilder();
                 }
 
-                gameEvent.Origin.Tell(helpResponse.ToString());
-                gameEvent.Origin.Tell(_translationLookup["COMMANDS_HELP_MOREINFO"]);
-            }
+                messageList.Add(helpResponse.ToString());
 
-            return Task.CompletedTask;
+                await gameEvent.Origin.TellAsync(messageList);
+            }
         }
     }
-}
+}

Application/Commands/ReadMessageCommand.cs

@@ -49,20 +49,13 @@ namespace IW4MAdmin.Application.Commands
                     return;
                 }
 
-                var index = 1;
-                foreach (var inboxItem in inboxItems)
+                await gameEvent.Origin.TellAsync(inboxItems.Select((inboxItem, index) =>
                 {
-                    await gameEvent.Origin.Tell(_translationLookup["COMMANDS_READ_MESSAGE_SUCCESS"]
-                            .FormatExt($"{index}/{inboxItems.Count}", inboxItem.SourceClient.CurrentAlias.Name))
-                        .WaitAsync();
+                    var header = _translationLookup["COMMANDS_READ_MESSAGE_SUCCESS"]
+                        .FormatExt($"{index + 1}/{inboxItems.Count}", inboxItem.SourceClient.CurrentAlias.Name);
 
-                    foreach (var messageFragment in inboxItem.Message.FragmentMessageForDisplay())
-                    {
-                        await gameEvent.Origin.Tell(messageFragment).WaitAsync();
-                    }
-
-                    index++;
-                }
+                    return new[] { header }.Union(inboxItem.Message.FragmentMessageForDisplay());
+                }).SelectMany(item => item));
 
                 inboxItems.ForEach(item => { item.IsDelivered = true; });
 

Application/CoreEventHandler.cs

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

Application/DefaultSettings.json

@@ -69,6 +69,39 @@
     }
   ],
   "Gametypes": [
+    {
+      "Game": "IW3",
+      "Gametypes": [
+        {
+          "Name": "ctf",
+          "Alias": "Capture The Flag"
+        },
+        {
+          "Name": "dm",
+          "Alias": "Free For All"
+        },
+        {
+          "Name": "dom",
+          "Alias": "Domination"
+        },
+        {
+          "Name": "koth",
+          "Alias": "Headquarters"
+        },
+        {
+          "Name": "sab",
+          "Alias": "Sabotage"
+        },
+        {
+          "Name": "sd",
+          "Alias": "Search & Destroy"
+        },
+        {
+          "Name": "war",
+          "Alias": "Team Deathmatch"
+        }
+      ]
+    },
     {
       "Game": "IW4",
       "Gametypes": [
@@ -152,20 +185,24 @@
         {
           "Name": "twar",
           "Alias": "War"
-        }
+        },
+	{
+          "Name": "cmp",
+          "Alias": "Zombies"
+        }	      
       ]
     },
     {
       "Game": "IW5",
       "Gametypes": [
-        {
-          "Name": "tdm",
-          "Alias": "Team Deathmatch"
-        },
         {
           "Name": "dom",
           "Alias": "Domination"
         },
+        {
+          "Name": "conf",
+          "Alias": "Kill Confirmed"
+        },
         {
           "Name": "ctf",
           "Alias": "Capture The Flag"
@@ -175,37 +212,29 @@
           "Alias": "Demolition"
         },
         {
-          "Name": "dz",
-          "Alias": "Drop Zone"
-        },
-        {
-          "Name": "ffa",
+          "Name": "dm",
           "Alias": "Free For All"
         },
         {
-          "Name": "gg",
-          "Alias": "Gun Game"
+          "Name": "grnd",
+          "Alias": "Drop Zone"
         },
         {
-          "Name": "hq",
-          "Alias": "Headquarters"
+          "Name": "gun",
+          "Alias": "Gun Game"
         },
         {
           "Name": "koth",
           "Alias": "Headquarters"
         },
         {
-          "Name": "inf",
+          "Name": "infect",
           "Alias": "Infected"
         },
         {
-          "Name": "jug",
+          "Name": "jugg",
           "Alias": "Juggernaut"
         },
-        {
-          "Name": "kc",
-          "Alias": "Kill Confirmed"
-        },
         {
           "Name": "oic",
           "Alias": "One In The Chamber"
@@ -223,8 +252,12 @@
           "Alias": "Team Defender"
         },
         {
-          "Name": "tj",
+          "Name": "tjugg",
           "Alias": "Team Juggernaut"
+        },
+        {
+          "Name": "war",
+          "Alias": "Team Deathmatch"
         }
       ]
     },
@@ -408,7 +441,15 @@
         {
           "Name": "tdm",
           "Alias": "Team Deathmatch"
-        }
+        },
+        {
+          "Name": "zclassic",
+          "Alias": "Zombies Classic"
+        },
+	{
+          "Name": "zstandard",
+          "Alias": "Zombies"
+        }      
       ]
     },
     {
@@ -509,7 +550,11 @@
         {
           "Name": "hc_tdm",
           "Alias": "Hardcore Team Deathmatch"
-        }
+        },
+	{
+          "Name": "zclassic",
+          "Alias": "Zombies Classic"
+        }	      
       ]
     },
     {
@@ -799,7 +844,23 @@
         {
           "Alias": "Upheaval",
           "Name": "mp_suburban"
-        }
+        },
+        {
+          "Alias": "Nacht Der Untoten",
+          "Name": "nazi_zombie_prototype"
+        },
+        {
+          "Alias": "Verrückt",
+          "Name": "nazi_zombie_asylum"
+        },
+        {
+          "Alias": "Shi No Numa",
+          "Name": "nazi_zombie_sumpf"
+        },
+        {
+          "Alias": "Der Riese",
+          "Name": "nazi_zombie_factory"
+        }	      
       ]
     },
     {
@@ -984,7 +1045,83 @@
         {
           "Alias": "Village",
           "Name": "co_hunted"
-        }
+        },
+        {
+          "Alias": "Broadcast",
+          "Name": "mp_broadcast"
+        },
+        {
+          "Alias": "Showdown",
+          "Name": "mp_showdown"
+        },
+        {
+          "Alias": "Ambush",
+          "Name": "mp_convoy"
+        },
+        {
+          "Alias": "District",
+          "Name": "mp_citystreets"
+        },
+        {
+          "Alias": "Backlot",
+          "Name": "mp_backlot"
+        },
+        {
+          "Alias": "Pipeline",
+          "Name": "mp_pipeline"
+        },
+        {
+          "Alias": "Chinatown",
+          "Name": "mp_carentan"
+        },
+        {
+          "Alias": "Winter Crash",
+          "Name": "mp_crash_snow"
+        },
+        {
+          "Alias": "Countdown",
+          "Name": "mp_countdown"
+        },
+        {
+          "Alias": "Downpour",
+          "Name": "mp_farm"
+        },
+        {
+          "Alias": "Dome",
+          "Name": "mp_dome"
+        },
+        {
+          "Alias": "Hardhat",
+          "Name": "mp_hardhat"
+        },
+        {
+          "Alias": "Resistance",
+          "Name": "mp_paris"
+        },
+        {
+          "Alias": "Seatown",
+          "Name": "mp_seatown"
+        },
+	{
+          "Alias": "Mission",
+          "Name": "mp_bravo"
+        },
+        {
+          "Alias": "Underground",
+          "Name": "mp_underground"
+        },
+        {
+          "Alias": "Arkaden",
+          "Name": "mp_plaza2"
+        },
+        {
+          "Alias": "Village",
+          "Name": "mp_village"
+        },
+        {
+          "Alias": "Lockdown",
+          "Name": "mp_alpha"
+        }	      
       ]
     },
     {
@@ -1540,6 +1677,70 @@
         {
           "Alias": "Outlaw",
           "Name": "mp_western"
+        },
+	{
+          "Alias": "Fringe Night",
+          "Name": "mp_veiled_heyday"
+        },
+	{
+          "Alias": "Redwood Snow",
+          "Name": "mp_redwood_ice"
+        },
+	{
+          "Alias": "Shadows of Evil",
+          "Name": "zm_zod"
+        },
+	{
+          "Alias": "Der Eisendrache",
+          "Name": "zm_castle"
+        },
+	{
+          "Alias": "Zetsubou No Shima",
+          "Name": "zm_island"
+        },
+	{
+          "Alias": "Gorod Krovi",
+          "Name": "zm_stalingrad"
+        },
+	{
+          "Alias": "Revelations",
+          "Name": "zm_genesis"
+        },
+	{
+          "Alias": "Ascension",
+          "Name": "zm_cosmodrome"
+        },
+	{
+          "Alias": "Kino der Toten",
+          "Name": "zm_theater"
+        },
+	{
+          "Alias": "Moon",
+          "Name": "zm_moon"
+        },	
+	{
+          "Alias": "Nacht der Untoten",
+          "Name": "zm_prototype"
+        },
+	{
+          "Alias": "Origins",
+          "Name": "zm_tomb"
+        },
+	{
+          "Alias": "Shangri-La",
+          "Name": "zm_temple"
+        },	
+	{
+          "Alias": "Shi No Numa",
+          "Name": "zm_sumpf"
+        },
+	{
+          "Alias": "The Giant",
+          "Name": "zm_factory"
+        },
+	{
+          "Alias": "Verrückt",
+          "Name": "zm_asylum"
         }
       ]
     },

Application/EventParsers/BaseEventParser.cs

@@ -7,6 +7,8 @@ using System.Collections.Generic;
 using System.Linq;
 using Data.Models;
 using Microsoft.Extensions.Logging;
+using SharedLibraryCore.Events.Game;
+using static System.Int32;
 using static SharedLibraryCore.Server;
 using ILogger = Microsoft.Extensions.Logging.ILogger;
 
@@ -14,21 +16,26 @@ namespace IW4MAdmin.Application.EventParsers
 {
     public class BaseEventParser : IEventParser
     {
-        private readonly Dictionary<string, (string, Func<string, IEventParserConfiguration, GameEvent, GameEvent>)> _customEventRegistrations;
+        private readonly Dictionary<string, (string, Func<string, IEventParserConfiguration, GameEvent, GameEvent>)>
+            _customEventRegistrations;
+
         private readonly ILogger _logger;
         private readonly ApplicationConfiguration _appConfig;
         private readonly Dictionary<ParserRegex, GameEvent.EventType> _regexMap;
         private readonly Dictionary<string, GameEvent.EventType> _eventTypeMap;
 
-        public BaseEventParser(IParserRegexFactory parserRegexFactory, ILogger logger, ApplicationConfiguration appConfig)
+        public BaseEventParser(IParserRegexFactory parserRegexFactory, ILogger logger,
+            ApplicationConfiguration appConfig)
         {
-            _customEventRegistrations = new Dictionary<string, (string, Func<string, IEventParserConfiguration, GameEvent, GameEvent>)>();
+            _customEventRegistrations =
+                new Dictionary<string, (string, Func<string, IEventParserConfiguration, GameEvent, GameEvent>)>();
             _logger = logger;
             _appConfig = appConfig;
 
             Configuration = new DynamicEventParserConfiguration(parserRegexFactory)
             {
                 GameDirectory = "main",
+                LocalizeText = "\x15",
             };
 
             Configuration.Say.Pattern = @"^(say|sayteam);(-?[A-Fa-f0-9_]{1,32}|bot[0-9]+|0);([0-9]+);([^;]*);(.*)$";
@@ -49,7 +56,7 @@ namespace IW4MAdmin.Application.EventParsers
             Configuration.Join.AddMapping(ParserRegex.GroupType.OriginNetworkId, 2);
             Configuration.Join.AddMapping(ParserRegex.GroupType.OriginClientNumber, 3);
             Configuration.Join.AddMapping(ParserRegex.GroupType.OriginName, 4);
-            
+
             Configuration.JoinTeam.Pattern = @"^(JT);(-?[A-Fa-f0-9_]{1,32}|bot[0-9]+|0);([0-9]+);(\w+);(.+)$";
             Configuration.JoinTeam.AddMapping(ParserRegex.GroupType.EventType, 1);
             Configuration.JoinTeam.AddMapping(ParserRegex.GroupType.OriginNetworkId, 2);
@@ -57,7 +64,8 @@ namespace IW4MAdmin.Application.EventParsers
             Configuration.JoinTeam.AddMapping(ParserRegex.GroupType.OriginTeam, 4);
             Configuration.JoinTeam.AddMapping(ParserRegex.GroupType.OriginName, 5);
 
-            Configuration.Damage.Pattern = @"^(D);(-?[A-Fa-f0-9_]{1,32}|bot[0-9]+|0);(-?[0-9]+);(axis|allies|world|none)?;([^;]{1,32});(-?[A-Fa-f0-9_]{1,32}|bot[0-9]+|0)?;(-?[0-9]+);(axis|allies|world|none)?;([^;]{1,32})?;((?:[0-9]+|[a-z]+|_|\+)+);([0-9]+);((?:[A-Z]|_)+);((?:[a-z]|_)+)$";
+            Configuration.Damage.Pattern =
+                @"^(D);(-?[A-Fa-f0-9_]{1,32}|bot[0-9]+|0);(-?[0-9]+);(axis|allies|world|none)?;([^;]{1,32});(-?[A-Fa-f0-9_]{1,32}|bot[0-9]+|0)?;(-?[0-9]+);(axis|allies|world|none)?;([^;]{1,32})?;((?:[0-9]+|[a-z]+|_|\+)+);([0-9]+);((?:[A-Z]|_)+);((?:[a-z]|_)+)$";
             Configuration.Damage.AddMapping(ParserRegex.GroupType.EventType, 1);
             Configuration.Damage.AddMapping(ParserRegex.GroupType.TargetNetworkId, 2);
             Configuration.Damage.AddMapping(ParserRegex.GroupType.TargetClientNumber, 3);
@@ -72,7 +80,8 @@ namespace IW4MAdmin.Application.EventParsers
             Configuration.Damage.AddMapping(ParserRegex.GroupType.MeansOfDeath, 12);
             Configuration.Damage.AddMapping(ParserRegex.GroupType.HitLocation, 13);
 
-            Configuration.Kill.Pattern = @"^(K);(-?[A-Fa-f0-9_]{1,32}|bot[0-9]+|0);(-?[0-9]+);(axis|allies|world|none)?;([^;]{1,32});(-?[A-Fa-f0-9_]{1,32}|bot[0-9]+|0)?;(-?[0-9]+);(axis|allies|world|none)?;([^;]{1,32})?;((?:[0-9]+|[a-z]+|_|\+)+);([0-9]+);((?:[A-Z]|_)+);((?:[a-z]|_)+)$";
+            Configuration.Kill.Pattern =
+                @"^(K);(-?[A-Fa-f0-9_]{1,32}|bot[0-9]+|0);(-?[0-9]+);(axis|allies|world|none)?;([^;]{1,32});(-?[A-Fa-f0-9_]{1,32}|bot[0-9]+|0)?;(-?[0-9]+);(axis|allies|world|none)?;([^;]{1,32})?;((?:[0-9]+|[a-z]+|_|\+)+);([0-9]+);((?:[A-Z]|_)+);((?:[a-z]|_)+)$";
             Configuration.Kill.AddMapping(ParserRegex.GroupType.EventType, 1);
             Configuration.Kill.AddMapping(ParserRegex.GroupType.TargetNetworkId, 2);
             Configuration.Kill.AddMapping(ParserRegex.GroupType.TargetClientNumber, 3);
@@ -94,24 +103,24 @@ namespace IW4MAdmin.Application.EventParsers
 
             _regexMap = new Dictionary<ParserRegex, GameEvent.EventType>
             {
-                {Configuration.Say, GameEvent.EventType.Say},
-                {Configuration.Kill, GameEvent.EventType.Kill},
-                {Configuration.MapChange, GameEvent.EventType.MapChange},
-                {Configuration.MapEnd, GameEvent.EventType.MapEnd},
-                {Configuration.JoinTeam, GameEvent.EventType.JoinTeam}
+                { Configuration.Say, GameEvent.EventType.Say },
+                { Configuration.Kill, GameEvent.EventType.Kill },
+                { Configuration.MapChange, GameEvent.EventType.MapChange },
+                { Configuration.MapEnd, GameEvent.EventType.MapEnd },
+                { Configuration.JoinTeam, GameEvent.EventType.JoinTeam }
             };
-            
+
             _eventTypeMap = new Dictionary<string, GameEvent.EventType>
             {
-                {"say", GameEvent.EventType.Say},
-                {"sayteam", GameEvent.EventType.Say},
-                {"chat", GameEvent.EventType.Say},
-                {"chatteam", GameEvent.EventType.Say},
-                {"K", GameEvent.EventType.Kill},
-                {"D", GameEvent.EventType.Damage},
-                {"J", GameEvent.EventType.PreConnect},
-                {"JT", GameEvent.EventType.JoinTeam},
-                {"Q", GameEvent.EventType.PreDisconnect}
+                { "say", GameEvent.EventType.Say },
+                { "sayteam", GameEvent.EventType.SayTeam },
+                { "chat", GameEvent.EventType.Say },
+                { "chatteam", GameEvent.EventType.SayTeam },
+                { "K", GameEvent.EventType.Kill },
+                { "D", GameEvent.EventType.Damage },
+                { "J", GameEvent.EventType.PreConnect },
+                { "JT", GameEvent.EventType.JoinTeam },
+                { "Q", GameEvent.EventType.PreDisconnect }
             };
         }
 
@@ -125,28 +134,6 @@ namespace IW4MAdmin.Application.EventParsers
 
         public string Name { get; set; } = "Call of Duty";
 
-        private (GameEvent.EventType type, string eventKey) GetEventTypeFromLine(string logLine)
-        {
-            var lineSplit = logLine.Split(';');
-            if (lineSplit.Length > 1)
-            {
-                var type = lineSplit[0];
-                return _eventTypeMap.ContainsKey(type) ? (_eventTypeMap[type], type): (GameEvent.EventType.Unknown, lineSplit[0]);
-            }
-
-            foreach (var (key, value) in _regexMap)
-            {
-                var result = key.PatternMatcher.Match(logLine);
-                if (result.Success)
-                {
-                    return (value, null);
-                }
-            }
-
-            return (GameEvent.EventType.Unknown, null);
-        }
-        
-
         public virtual GameEvent GenerateGameEvent(string logLine)
         {
             var timeMatch = Configuration.Time.PatternMatcher.Match(logLine);
@@ -154,7 +141,7 @@ namespace IW4MAdmin.Application.EventParsers
 
             if (timeMatch.Success)
             {
-                if (timeMatch.Values[0].Contains(":"))
+                if (timeMatch.Values[0].Contains(':'))
                 {
                     gameTime = timeMatch
                         .Values
@@ -162,299 +149,54 @@ namespace IW4MAdmin.Application.EventParsers
                         // this converts the timestamp into seconds passed
                         .Select((value, index) => long.Parse(value.ToString()) * (index == 0 ? 60 : 1))
                         .Sum();
-         
                 }
                 else
                 {
                     gameTime = long.Parse(timeMatch.Values[0]);
                 }
-                
+
                 // we want to strip the time from the log line
-                logLine = logLine.Substring(timeMatch.Values.First().Length).Trim();
+                logLine = logLine[timeMatch.Values.First().Length..].Trim();
             }
 
-            var eventParseResult = GetEventTypeFromLine(logLine);
-            var eventType = eventParseResult.type;
+            var (eventType, eventKey) = GetEventTypeFromLine(logLine);
+
+            switch (eventType)
+            {
+                case GameEvent.EventType.Say or GameEvent.EventType.SayTeam:
+                    return ParseMessageEvent(logLine, gameTime, eventType) ?? GenerateDefaultEvent(logLine, gameTime);
+                case GameEvent.EventType.Kill:
+                    return ParseKillEvent(logLine, gameTime) ?? GenerateDefaultEvent(logLine, gameTime);
+                case GameEvent.EventType.Damage:
+                    return ParseDamageEvent(logLine, gameTime) ?? GenerateDefaultEvent(logLine, gameTime);
+                case GameEvent.EventType.PreConnect:
+                    return ParseClientEnterMatchEvent(logLine, gameTime) ?? GenerateDefaultEvent(logLine, gameTime);
+                case GameEvent.EventType.JoinTeam:
+                    return ParseJoinTeamEvent(logLine, gameTime) ?? GenerateDefaultEvent(logLine, gameTime);
+                case GameEvent.EventType.PreDisconnect:
+                    return ParseClientExitMatchEvent(logLine, gameTime) ?? GenerateDefaultEvent(logLine, gameTime);
+                case GameEvent.EventType.MapEnd:
+                    return ParseMatchEndEvent(logLine, gameTime);
+                case GameEvent.EventType.MapChange:
+                    return ParseMatchStartEvent(logLine, gameTime);
+            }
             
-            _logger.LogDebug(logLine);
-
-            if (eventType == GameEvent.EventType.Say)
+            if (logLine.StartsWith("GSE;"))
             {
-                var matchResult = Configuration.Say.PatternMatcher.Match(logLine);
-
-                if (matchResult.Success)
+                return new GameScriptEvent
                 {
-                    var message = matchResult.Values[Configuration.Say.GroupMapping[ParserRegex.GroupType.Message]]
-                        .Replace("\x15", "")
-                        .Trim();
-
-                    if (message.Length > 0)
-                    {
-                        var originIdString = matchResult.Values[Configuration.Say.GroupMapping[ParserRegex.GroupType.OriginNetworkId]];
-                        var originName = matchResult.Values[Configuration.Say.GroupMapping[ParserRegex.GroupType.OriginName]];
-
-                        var originId = originIdString.IsBotGuid() ?
-                            originName.GenerateGuidFromString() :
-                            originIdString.ConvertGuidToLong(Configuration.GuidNumberStyle);
-
-                        var clientNumber = int.Parse(matchResult.Values[Configuration.Say.GroupMapping[ParserRegex.GroupType.OriginClientNumber]]);
-
-                        if (message.StartsWith(_appConfig.CommandPrefix) || message.StartsWith(_appConfig.BroadcastCommandPrefix))
-                        {
-                            return new GameEvent()
-                            {
-                                Type = GameEvent.EventType.Command,
-                                Data = message,
-                                Origin = new EFClient() { NetworkId = originId, ClientNumber = clientNumber },
-                                Message = message,
-                                Extra = logLine,
-                                RequiredEntity = GameEvent.EventRequiredEntity.Origin,
-                                GameTime = gameTime,
-                                Source = GameEvent.EventSource.Log
-                            };
-                        }
-
-                        return new GameEvent()
-                        {
-                            Type = GameEvent.EventType.Say,
-                            Data = message,
-                            Origin = new EFClient() { NetworkId = originId, ClientNumber = clientNumber },
-                            Message = message,
-                            Extra = logLine,
-                            RequiredEntity = GameEvent.EventRequiredEntity.Origin,
-                            GameTime = gameTime,
-                            Source = GameEvent.EventSource.Log
-                        };
-                    }
-                }
-            }
-
-            if (eventType == GameEvent.EventType.Kill)
-            {
-                var match = Configuration.Kill.PatternMatcher.Match(logLine);
-
-                if (match.Success)
-                {
-                    var originIdString = match.Values[Configuration.Kill.GroupMapping[ParserRegex.GroupType.OriginNetworkId]];
-                    var targetIdString = match.Values[Configuration.Kill.GroupMapping[ParserRegex.GroupType.TargetNetworkId]];
-                    var originName = match.Values[Configuration.Kill.GroupMapping[ParserRegex.GroupType.OriginName]];
-                    var targetName = match.Values[Configuration.Kill.GroupMapping[ParserRegex.GroupType.TargetName]];
-
-                    var originId = originIdString.IsBotGuid() ?
-                        originName.GenerateGuidFromString() :
-                        originIdString.ConvertGuidToLong(Configuration.GuidNumberStyle, Utilities.WORLD_ID);
-                    var targetId = targetIdString.IsBotGuid() ?
-                        targetName.GenerateGuidFromString() :
-                        targetIdString.ConvertGuidToLong(Configuration.GuidNumberStyle, Utilities.WORLD_ID);
-
-                    var originClientNumber = int.Parse(match.Values[Configuration.Kill.GroupMapping[ParserRegex.GroupType.OriginClientNumber]]);
-                    var targetClientNumber = int.Parse(match.Values[Configuration.Kill.GroupMapping[ParserRegex.GroupType.TargetClientNumber]]);
-
-                    return new GameEvent()
-                    {
-                        Type = GameEvent.EventType.Kill,
-                        Data = logLine,
-                        Origin = new EFClient() { NetworkId = originId, ClientNumber = originClientNumber },
-                        Target = new EFClient() { NetworkId = targetId, ClientNumber = targetClientNumber },
-                        RequiredEntity = GameEvent.EventRequiredEntity.Origin | GameEvent.EventRequiredEntity.Target,
-                        GameTime = gameTime,
-                        Source = GameEvent.EventSource.Log
-                    };
-                }
-            }
-
-            if (eventType == GameEvent.EventType.Damage)
-            {
-                var match = Configuration.Damage.PatternMatcher.Match(logLine);
-
-                if (match.Success)
-                {
-                    var originIdString = match.Values[Configuration.Damage.GroupMapping[ParserRegex.GroupType.OriginNetworkId]];
-                    var targetIdString = match.Values[Configuration.Damage.GroupMapping[ParserRegex.GroupType.TargetNetworkId]];
-                    var originName = match.Values[Configuration.Damage.GroupMapping[ParserRegex.GroupType.OriginName]];
-                    var targetName = match.Values[Configuration.Damage.GroupMapping[ParserRegex.GroupType.TargetName]];
-
-                    var originId = originIdString.IsBotGuid() ?
-                        originName.GenerateGuidFromString() :
-                        originIdString.ConvertGuidToLong(Configuration.GuidNumberStyle, Utilities.WORLD_ID);
-                    var targetId = targetIdString.IsBotGuid() ?
-                        targetName.GenerateGuidFromString() :
-                        targetIdString.ConvertGuidToLong(Configuration.GuidNumberStyle, Utilities.WORLD_ID);
-
-                    var originClientNumber = int.Parse(match.Values[Configuration.Damage.GroupMapping[ParserRegex.GroupType.OriginClientNumber]]);
-                    var targetClientNumber = int.Parse(match.Values[Configuration.Damage.GroupMapping[ParserRegex.GroupType.TargetClientNumber]]);
-
-                    return new GameEvent()
-                    {
-                        Type = GameEvent.EventType.Damage,
-                        Data = logLine,
-                        Origin = new EFClient() { NetworkId = originId, ClientNumber = originClientNumber },
-                        Target = new EFClient() { NetworkId = targetId, ClientNumber = targetClientNumber },
-                        RequiredEntity = GameEvent.EventRequiredEntity.Origin | GameEvent.EventRequiredEntity.Target,
-                        GameTime = gameTime,
-                        Source = GameEvent.EventSource.Log
-                    };
-                }
-            }
-
-            if (eventType == GameEvent.EventType.PreConnect)
-            {
-                var match = Configuration.Join.PatternMatcher.Match(logLine);
-
-                if (match.Success)
-                {
-                    var originIdString = match.Values[Configuration.Join.GroupMapping[ParserRegex.GroupType.OriginNetworkId]];
-                    var originName = match.Values[Configuration.Join.GroupMapping[ParserRegex.GroupType.OriginName]];
-
-                    var networkId = originIdString.IsBotGuid() ?
-                        originName.GenerateGuidFromString() :
-                        originIdString.ConvertGuidToLong(Configuration.GuidNumberStyle);
-
-                    return new GameEvent()
-                    {
-                        Type = GameEvent.EventType.PreConnect,
-                        Data = logLine,
-                        Origin = new EFClient()
-                        {
-                            CurrentAlias = new EFAlias()
-                            {
-                                Name = match.Values[Configuration.Join.GroupMapping[ParserRegex.GroupType.OriginName]].TrimNewLine(),
-                            },
-                            NetworkId = networkId,
-                            ClientNumber = Convert.ToInt32(match.Values[Configuration.Join.GroupMapping[ParserRegex.GroupType.OriginClientNumber]]),
-                            State = EFClient.ClientState.Connecting,
-                        },
-                        Extra = originIdString,
-                        RequiredEntity = GameEvent.EventRequiredEntity.None,
-                        IsBlocking = true,
-                        GameTime = gameTime,
-                        Source = GameEvent.EventSource.Log
-                    };
-                }
-            }
-
-            if (eventType == GameEvent.EventType.JoinTeam)
-            {
-                var match = Configuration.JoinTeam.PatternMatcher.Match(logLine);
-
-                if (match.Success)
-                {
-                    var originIdString = match.Values[Configuration.JoinTeam.GroupMapping[ParserRegex.GroupType.OriginNetworkId]];
-                    var originName = match.Values[Configuration.JoinTeam.GroupMapping[ParserRegex.GroupType.OriginName]];
-                    var team = match.Values[Configuration.JoinTeam.GroupMapping[ParserRegex.GroupType.OriginTeam]];
-
-                    if (Configuration.TeamMapping.ContainsKey(team))
-                    {
-                        team = Configuration.TeamMapping[team].ToString();
-                    }
-
-                    var networkId = originIdString.IsBotGuid() ?
-                        originName.GenerateGuidFromString() :
-                        originIdString.ConvertGuidToLong(Configuration.GuidNumberStyle);
-                    
-                    return new GameEvent
-                    {
-                        Type = GameEvent.EventType.JoinTeam,
-                        Data = logLine,
-                        Origin = new EFClient
-                        {
-                            CurrentAlias = new EFAlias
-                            {
-                                Name = match.Values[Configuration.JoinTeam.GroupMapping[ParserRegex.GroupType.OriginName]].TrimNewLine(),
-                            },
-                            NetworkId = networkId,
-                            ClientNumber = Convert.ToInt32(match.Values[Configuration.JoinTeam.GroupMapping[ParserRegex.GroupType.OriginClientNumber]]),
-                            State = EFClient.ClientState.Connected,
-                        },
-                        Extra = team,
-                        RequiredEntity = GameEvent.EventRequiredEntity.Origin,
-                        GameTime = gameTime,
-                        Source = GameEvent.EventSource.Log
-                    };
-                }
-            }
-
-            if (eventType == GameEvent.EventType.PreDisconnect)
-            {
-                var match = Configuration.Quit.PatternMatcher.Match(logLine);
-
-                if (match.Success)
-                {
-                    var originIdString = match.Values[Configuration.Quit.GroupMapping[ParserRegex.GroupType.OriginNetworkId]];
-                    var originName = match.Values[Configuration.Quit.GroupMapping[ParserRegex.GroupType.OriginName]];
-
-                    var networkId = originIdString.IsBotGuid() ?
-                        originName.GenerateGuidFromString() :
-                        originIdString.ConvertGuidToLong(Configuration.GuidNumberStyle);
-
-                    return new GameEvent()
-                    {
-                        Type = GameEvent.EventType.PreDisconnect,
-                        Data = logLine,
-                        Origin = new EFClient()
-                        {
-                            CurrentAlias = new EFAlias()
-                            {
-                                Name = match.Values[Configuration.Quit.GroupMapping[ParserRegex.GroupType.OriginName]].TrimNewLine()
-                            },
-                            NetworkId = networkId,
-                            ClientNumber = Convert.ToInt32(match.Values[Configuration.Quit.GroupMapping[ParserRegex.GroupType.OriginClientNumber]]),
-                            State = EFClient.ClientState.Disconnecting
-                        },
-                        RequiredEntity = GameEvent.EventRequiredEntity.None,
-                        IsBlocking = true,
-                        GameTime = gameTime,
-                        Source = GameEvent.EventSource.Log
-                    };
-                }
-            }
-
-            if (eventType == GameEvent.EventType.MapEnd)
-            {
-                return new GameEvent()
-                {
-                    Type = GameEvent.EventType.MapEnd,
-                    Data = logLine,
-                    Origin = Utilities.IW4MAdminClient(),
-                    Target = Utilities.IW4MAdminClient(),
-                    RequiredEntity = GameEvent.EventRequiredEntity.None,
+                    ScriptData = logLine,
                     GameTime = gameTime,
                     Source = GameEvent.EventSource.Log
                 };
             }
 
-            if (eventType == GameEvent.EventType.MapChange)
+            if (eventKey is null || !_customEventRegistrations.ContainsKey(eventKey))
             {
-                var dump = logLine.Replace("InitGame: ", "");
-
-                return new GameEvent()
-                {
-                    Type = GameEvent.EventType.MapChange,
-                    Data = logLine,
-                    Origin = Utilities.IW4MAdminClient(),
-                    Target = Utilities.IW4MAdminClient(),
-                    Extra = dump.DictionaryFromKeyValue(),
-                    RequiredEntity = GameEvent.EventRequiredEntity.None,
-                    GameTime = gameTime,
-                    Source = GameEvent.EventSource.Log
-                };
+                return GenerateDefaultEvent(logLine, gameTime);
             }
 
-            if (eventParseResult.eventKey == null || !_customEventRegistrations.ContainsKey(eventParseResult.eventKey))
-            {
-                return new GameEvent()
-                {
-                    Type = GameEvent.EventType.Unknown,
-                    Data = logLine,
-                    Origin = Utilities.IW4MAdminClient(),
-                    Target = Utilities.IW4MAdminClient(),
-                    RequiredEntity = GameEvent.EventRequiredEntity.None,
-                    GameTime = gameTime,
-                    Source = GameEvent.EventSource.Log
-                };
-            }
-
-            var eventModifier = _customEventRegistrations[eventParseResult.eventKey];
+            var eventModifier = _customEventRegistrations[eventKey];
 
             try
             {
@@ -468,12 +210,17 @@ namespace IW4MAdmin.Application.EventParsers
                 });
             }
 
-            catch (Exception e)
+            catch (Exception ex)
             {
-                _logger.LogError(e, "Could not handle custom event generation");
+                _logger.LogError(ex, "Could not handle custom log event generation");
             }
 
-            return new GameEvent()
+            return GenerateDefaultEvent(logLine, gameTime);
+        }
+
+        private static GameEvent GenerateDefaultEvent(string logLine, long gameTime)
+        {
+            return new GameEvent
             {
                 Type = GameEvent.EventType.Unknown,
                 Data = logLine,
@@ -485,8 +232,455 @@ namespace IW4MAdmin.Application.EventParsers
             };
         }
 
+        private static GameEvent ParseMatchStartEvent(string logLine, long gameTime)
+        {
+            var dump = logLine.Replace("InitGame: ", "").DictionaryFromKeyValue();
+
+            return new MatchStartEvent
+            {
+                Type = GameEvent.EventType.MapChange,
+                Data = logLine,
+                Origin = Utilities.IW4MAdminClient(),
+                Target = Utilities.IW4MAdminClient(),
+                Extra = dump,
+                RequiredEntity = GameEvent.EventRequiredEntity.None,
+                GameTime = gameTime,
+                Source = GameEvent.EventSource.Log,
+
+                // V2
+                SessionData = dump
+            };
+        }
+
+        private static GameEvent ParseMatchEndEvent(string logLine, long gameTime)
+        {
+            return new MatchEndEvent
+            {
+                Type = GameEvent.EventType.MapEnd,
+                Data = logLine,
+                Origin = Utilities.IW4MAdminClient(),
+                Target = Utilities.IW4MAdminClient(),
+                RequiredEntity = GameEvent.EventRequiredEntity.None,
+                GameTime = gameTime,
+                Source = GameEvent.EventSource.Log,
+
+                // V2
+                SessionData = logLine
+            };
+        }
+
+        private GameEvent ParseClientExitMatchEvent(string logLine, long gameTime)
+        {
+            var match = Configuration.Quit.PatternMatcher.Match(logLine);
+
+            if (!match.Success)
+            {
+                return null;
+            }
+
+            var originIdString =
+                match.Values[Configuration.Quit.GroupMapping[ParserRegex.GroupType.OriginNetworkId]];
+            var originName = match.Values[Configuration.Quit.GroupMapping[ParserRegex.GroupType.OriginName]]
+                ?.TrimNewLine();
+            var originClientNumber =
+                Convert.ToInt32(
+                    match.Values[Configuration.Join.GroupMapping[ParserRegex.GroupType.OriginClientNumber]]);
+
+            var networkId = originIdString.IsBotGuid()
+                ? originName.GenerateGuidFromString()
+                : originIdString.ConvertGuidToLong(Configuration.GuidNumberStyle);
+
+            return new ClientExitMatchEvent
+            {
+                Type = GameEvent.EventType.PreDisconnect,
+                Data = logLine,
+                Origin = new EFClient
+                {
+                    CurrentAlias = new EFAlias
+                    {
+                        Name = originName
+                    },
+                    NetworkId = networkId,
+                    ClientNumber = originClientNumber,
+                    State = EFClient.ClientState.Disconnecting
+                },
+                RequiredEntity = GameEvent.EventRequiredEntity.None,
+                IsBlocking = true,
+                GameTime = gameTime,
+                Source = GameEvent.EventSource.Log,
+
+                // V2
+                ClientName = originName,
+                ClientNetworkId = originIdString,
+                ClientSlotNumber = originClientNumber
+            };
+        }
+
+        private GameEvent ParseJoinTeamEvent(string logLine, long gameTime)
+        {
+            var match = Configuration.JoinTeam.PatternMatcher.Match(logLine);
+
+            if (!match.Success)
+            {
+                return null;
+            }
+
+            var originIdString =
+                match.Values[Configuration.JoinTeam.GroupMapping[ParserRegex.GroupType.OriginNetworkId]];
+            var originName = match.Values[Configuration.JoinTeam.GroupMapping[ParserRegex.GroupType.OriginName]]
+                ?.TrimNewLine();
+            var team = match.Values[Configuration.JoinTeam.GroupMapping[ParserRegex.GroupType.OriginTeam]];
+            var clientSlotNumber =
+                Parse(match.Values[
+                    Configuration.JoinTeam.GroupMapping[ParserRegex.GroupType.OriginClientNumber]]);
+
+            if (Configuration.TeamMapping.ContainsKey(team))
+            {
+                team = Configuration.TeamMapping[team].ToString();
+            }
+
+            var networkId = originIdString.IsBotGuid()
+                ? originName.GenerateGuidFromString()
+                : originIdString.ConvertGuidToLong(Configuration.GuidNumberStyle);
+
+            return new ClientJoinTeamEvent
+            {
+                Type = GameEvent.EventType.JoinTeam,
+                Data = logLine,
+                Origin = new EFClient
+                {
+                    CurrentAlias = new EFAlias
+                    {
+                        Name = originName
+                    },
+                    NetworkId = networkId,
+                    ClientNumber = clientSlotNumber,
+                    State = EFClient.ClientState.Connected,
+                },
+                Extra = team,
+                RequiredEntity = GameEvent.EventRequiredEntity.Origin,
+                GameTime = gameTime,
+                Source = GameEvent.EventSource.Log,
+
+                // V2
+                TeamName = team,
+                ClientName = originName,
+                ClientNetworkId = originIdString,
+                ClientSlotNumber = clientSlotNumber
+            };
+        }
+
+        private GameEvent ParseClientEnterMatchEvent(string logLine, long gameTime)
+        {
+            var match = Configuration.Join.PatternMatcher.Match(logLine);
+
+            if (!match.Success)
+            {
+                return null;
+            }
+
+            var originIdString = match.Values[Configuration.Join.GroupMapping[ParserRegex.GroupType.OriginNetworkId]];
+            var originName = match.Values[Configuration.Join.GroupMapping[ParserRegex.GroupType.OriginName]]
+                .TrimNewLine();
+            var originClientNumber =
+                Convert.ToInt32(
+                    match.Values[Configuration.Join.GroupMapping[ParserRegex.GroupType.OriginClientNumber]]);
+
+            var networkId = originIdString.IsBotGuid()
+                ? originName.GenerateGuidFromString()
+                : originIdString.ConvertGuidToLong(Configuration.GuidNumberStyle);
+
+            return new ClientEnterMatchEvent
+            {
+                Type = GameEvent.EventType.PreConnect,
+                Data = logLine,
+                Origin = new EFClient
+                {
+                    CurrentAlias = new EFAlias
+                    {
+                        Name = originName
+                    },
+                    NetworkId = networkId,
+                    ClientNumber = originClientNumber,
+                    State = EFClient.ClientState.Connecting,
+                },
+                Extra = originIdString,
+                RequiredEntity = GameEvent.EventRequiredEntity.None,
+                IsBlocking = true,
+                GameTime = gameTime,
+                Source = GameEvent.EventSource.Log,
+
+                // V2
+                ClientName = originName,
+                ClientNetworkId = originIdString,
+                ClientSlotNumber = originClientNumber
+            };
+        }
+
+        #region DAMAGE
+
+        private GameEvent ParseDamageEvent(string logLine, long gameTime)
+        {
+            var match = Configuration.Damage.PatternMatcher.Match(logLine);
+
+            if (!match.Success)
+            {
+                return null;
+            }
+
+            var originIdString = match.Values[Configuration.Damage.GroupMapping[ParserRegex.GroupType.OriginNetworkId]];
+            var targetIdString = match.Values[Configuration.Damage.GroupMapping[ParserRegex.GroupType.TargetNetworkId]];
+
+            var originName = match.Values[Configuration.Damage.GroupMapping[ParserRegex.GroupType.OriginName]]
+                ?.TrimNewLine();
+            var targetName = match.Values[Configuration.Damage.GroupMapping[ParserRegex.GroupType.TargetName]]
+                ?.TrimNewLine();
+
+            var originId = originIdString.IsBotGuid()
+                ? originName.GenerateGuidFromString()
+                : originIdString.ConvertGuidToLong(Configuration.GuidNumberStyle, Utilities.WORLD_ID);
+            var targetId = targetIdString.IsBotGuid()
+                ? targetName.GenerateGuidFromString()
+                : targetIdString.ConvertGuidToLong(Configuration.GuidNumberStyle, Utilities.WORLD_ID);
+
+            var originClientNumber =
+                Parse(match.Values[Configuration.Damage.GroupMapping[ParserRegex.GroupType.OriginClientNumber]]);
+            var targetClientNumber =
+                Parse(match.Values[Configuration.Damage.GroupMapping[ParserRegex.GroupType.TargetClientNumber]]);
+
+            var originTeamName =
+                match.Values[Configuration.Damage.GroupMapping[ParserRegex.GroupType.OriginTeam]];
+            var targetTeamName =
+                match.Values[Configuration.Damage.GroupMapping[ParserRegex.GroupType.TargetTeam]];
+
+            if (Configuration.TeamMapping.ContainsKey(originTeamName))
+            {
+                originTeamName = Configuration.TeamMapping[originTeamName].ToString();
+            }
+
+            if (Configuration.TeamMapping.ContainsKey(targetTeamName))
+            {
+                targetTeamName = Configuration.TeamMapping[targetTeamName].ToString();
+            }
+
+            var weaponName = match.Values[Configuration.Damage.GroupMapping[ParserRegex.GroupType.Weapon]];
+            TryParse(match.Values[Configuration.Damage.GroupMapping[ParserRegex.GroupType.Damage]],
+                out var damage);
+            var meansOfDeath =
+                match.Values[Configuration.Damage.GroupMapping[ParserRegex.GroupType.MeansOfDeath]];
+            var hitLocation =
+                match.Values[Configuration.Damage.GroupMapping[ParserRegex.GroupType.HitLocation]];
+
+            return new ClientDamageEvent
+            {
+                Type = GameEvent.EventType.Damage,
+                Data = logLine,
+                Origin = new EFClient { NetworkId = originId, ClientNumber = originClientNumber },
+                Target = new EFClient { NetworkId = targetId, ClientNumber = targetClientNumber },
+                RequiredEntity = GameEvent.EventRequiredEntity.Origin | GameEvent.EventRequiredEntity.Target,
+                GameTime = gameTime,
+                Source = GameEvent.EventSource.Log,
+
+                // V2
+                ClientName = originName,
+                ClientNetworkId = originIdString,
+                ClientSlotNumber = originClientNumber,
+                AttackerTeamName = originTeamName,
+                VictimClientName = targetName,
+                VictimNetworkId = targetIdString,
+                VictimClientSlotNumber = targetClientNumber,
+                VictimTeamName = targetTeamName,
+                WeaponName = weaponName,
+                Damage = damage,
+                MeansOfDeath = meansOfDeath,
+                HitLocation = hitLocation
+            };
+        }
+
+        private GameEvent ParseKillEvent(string logLine, long gameTime)
+        {
+            var match = Configuration.Kill.PatternMatcher.Match(logLine);
+
+            if (!match.Success)
+            {
+                return null;
+            }
+
+            var originIdString = match.Values[Configuration.Kill.GroupMapping[ParserRegex.GroupType.OriginNetworkId]];
+            var targetIdString = match.Values[Configuration.Kill.GroupMapping[ParserRegex.GroupType.TargetNetworkId]];
+
+            var originName = match.Values[Configuration.Kill.GroupMapping[ParserRegex.GroupType.OriginName]]
+                ?.TrimNewLine();
+            var targetName = match.Values[Configuration.Kill.GroupMapping[ParserRegex.GroupType.TargetName]]
+                ?.TrimNewLine();
+
+            var originId = originIdString.IsBotGuid()
+                ? originName.GenerateGuidFromString()
+                : originIdString.ConvertGuidToLong(Configuration.GuidNumberStyle, Utilities.WORLD_ID);
+            var targetId = targetIdString.IsBotGuid()
+                ? targetName.GenerateGuidFromString()
+                : targetIdString.ConvertGuidToLong(Configuration.GuidNumberStyle, Utilities.WORLD_ID);
+
+            var originClientNumber =
+                Parse(match.Values[Configuration.Kill.GroupMapping[ParserRegex.GroupType.OriginClientNumber]]);
+            var targetClientNumber =
+                Parse(match.Values[Configuration.Kill.GroupMapping[ParserRegex.GroupType.TargetClientNumber]]);
+
+            var originTeamName =
+                match.Values[Configuration.Kill.GroupMapping[ParserRegex.GroupType.OriginTeam]];
+            var targetTeamName =
+                match.Values[Configuration.Kill.GroupMapping[ParserRegex.GroupType.TargetTeam]];
+
+            if (Configuration.TeamMapping.ContainsKey(originTeamName))
+            {
+                originTeamName = Configuration.TeamMapping[originTeamName].ToString();
+            }
+
+            if (Configuration.TeamMapping.ContainsKey(targetTeamName))
+            {
+                targetTeamName = Configuration.TeamMapping[targetTeamName].ToString();
+            }
+
+            var weaponName = match.Values[Configuration.Kill.GroupMapping[ParserRegex.GroupType.Weapon]];
+            TryParse(match.Values[Configuration.Kill.GroupMapping[ParserRegex.GroupType.Damage]],
+                out var damage);
+            var meansOfDeath =
+                match.Values[Configuration.Kill.GroupMapping[ParserRegex.GroupType.MeansOfDeath]];
+            var hitLocation =
+                match.Values[Configuration.Kill.GroupMapping[ParserRegex.GroupType.HitLocation]];
+
+            return new ClientKillEvent
+            {
+                Type = GameEvent.EventType.Kill,
+                Data = logLine,
+                Origin = new EFClient { NetworkId = originId, ClientNumber = originClientNumber },
+                Target = new EFClient { NetworkId = targetId, ClientNumber = targetClientNumber },
+                RequiredEntity = GameEvent.EventRequiredEntity.Origin | GameEvent.EventRequiredEntity.Target,
+                GameTime = gameTime,
+                Source = GameEvent.EventSource.Log,
+
+                // V2
+                ClientName = originName,
+                ClientNetworkId = originIdString,
+                ClientSlotNumber = originClientNumber,
+                AttackerTeamName = originTeamName,
+                VictimClientName = targetName,
+                VictimNetworkId = targetIdString,
+                VictimClientSlotNumber = targetClientNumber,
+                VictimTeamName = targetTeamName,
+                WeaponName = weaponName,
+                Damage = damage,
+                MeansOfDeath = meansOfDeath,
+                HitLocation = hitLocation
+            };
+        }
+
+        #endregion
+
+        #region MESSAGE
+
+        private GameEvent ParseMessageEvent(string logLine, long gameTime, GameEvent.EventType eventType)
+        {
+            var matchResult = Configuration.Say.PatternMatcher.Match(logLine);
+
+            if (!matchResult.Success)
+            {
+                return null;
+            }
+
+            var message = new string(matchResult.Values[Configuration.Say.GroupMapping[ParserRegex.GroupType.Message]]
+                .Where(c => !char.IsControl(c)).ToArray());
+
+            if (message.StartsWith("/"))
+            {
+                message = message[1..];
+            }
+
+            if (String.IsNullOrEmpty(message))
+            {
+                return null;
+            }
+
+            var originIdString =
+                matchResult.Values[Configuration.Say.GroupMapping[ParserRegex.GroupType.OriginNetworkId]];
+            var originName = matchResult.Values[Configuration.Say.GroupMapping[ParserRegex.GroupType.OriginName]]
+                ?.TrimNewLine();
+            var clientNumber =
+                Parse(matchResult.Values[Configuration.Say.GroupMapping[ParserRegex.GroupType.OriginClientNumber]]);
+
+            var originId = originIdString.IsBotGuid()
+                ? originName.GenerateGuidFromString()
+                : originIdString.ConvertGuidToLong(Configuration.GuidNumberStyle);
+
+
+            if (message.StartsWith(_appConfig.CommandPrefix) || message.StartsWith(_appConfig.BroadcastCommandPrefix))
+            {
+                return new ClientCommandEvent
+                {
+                    Type = GameEvent.EventType.Command,
+                    Data = message,
+                    Origin = new EFClient { NetworkId = originId, ClientNumber = clientNumber },
+                    Message = message,
+                    Extra = logLine,
+                    RequiredEntity = GameEvent.EventRequiredEntity.Origin,
+                    GameTime = gameTime,
+                    Source = GameEvent.EventSource.Log,
+
+                    //V2
+                    ClientName = originName,
+                    ClientNetworkId = originIdString,
+                    ClientSlotNumber = clientNumber,
+                    IsTeamMessage = eventType == GameEvent.EventType.SayTeam
+                };
+            }
+
+            return new ClientMessageEvent
+            {
+                Type = GameEvent.EventType.Say,
+                Data = message,
+                Origin = new EFClient { NetworkId = originId, ClientNumber = clientNumber },
+                Message = message,
+                Extra = logLine,
+                RequiredEntity = GameEvent.EventRequiredEntity.Origin,
+                GameTime = gameTime,
+                Source = GameEvent.EventSource.Log,
+
+                //V2
+                ClientName = originName,
+                ClientNetworkId = originIdString,
+                ClientSlotNumber = clientNumber,
+                IsTeamMessage = eventType == GameEvent.EventType.SayTeam
+            };
+        }
+
+        #endregion
+
+        private (GameEvent.EventType type, string eventKey) GetEventTypeFromLine(string logLine)
+        {
+            var lineSplit = logLine.Split(';');
+            if (lineSplit.Length > 1)
+            {
+                var type = lineSplit[0];
+                return _eventTypeMap.ContainsKey(type)
+                    ? (_eventTypeMap[type], type)
+                    : (GameEvent.EventType.Unknown, lineSplit[0]);
+            }
+
+            foreach (var (key, value) in _regexMap)
+            {
+                var result = key.PatternMatcher.Match(logLine);
+                if (result.Success)
+                {
+                    return (value, null);
+                }
+            }
+
+            return (GameEvent.EventType.Unknown, null);
+        }
+
         /// <inheritdoc/>
-        public void RegisterCustomEvent(string eventSubtype, string eventTriggerValue, Func<string, IEventParserConfiguration, GameEvent, GameEvent> eventModifier)
+        public void RegisterCustomEvent(string eventSubtype, string eventTriggerValue,
+            Func<string, IEventParserConfiguration, GameEvent, GameEvent> eventModifier)
         {
             if (string.IsNullOrWhiteSpace(eventSubtype))
             {

Application/EventParsers/DynamicEventParserConfiguration.cs

@@ -14,6 +14,7 @@ namespace IW4MAdmin.Application.EventParsers
     {
         public string GameDirectory { get; set; }
         public ParserRegex Say { get; set; }
+        public string LocalizeText { get; set; }
         public ParserRegex Join { get; set; }
         public ParserRegex JoinTeam { get; set; }
         public ParserRegex Quit { get; set; }

Application/Extensions/CommandExtensions.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
-using IW4MAdmin.Application.Misc;
 using SharedLibraryCore.Interfaces;
 using System.Linq;
+using IW4MAdmin.Application.Plugin.Script;
 using SharedLibraryCore;
 using SharedLibraryCore.Configuration;
 

Application/Extensions/ScriptPluginExtensions.cs

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

Application/Factories/ScriptCommandFactory.cs

@@ -1,13 +1,13 @@
-using IW4MAdmin.Application.Misc;
-using SharedLibraryCore;
+using SharedLibraryCore;
 using SharedLibraryCore.Commands;
 using SharedLibraryCore.Configuration;
 using SharedLibraryCore.Interfaces;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
+using Data.Models;
 using Data.Models.Client;
+using IW4MAdmin.Application.Plugin.Script;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 
@@ -31,16 +31,11 @@ namespace IW4MAdmin.Application.Factories
 
         /// <inheritdoc/>
         public IManagerCommand CreateScriptCommand(string name, string alias, string description, string permission, 
-            bool isTargetRequired, IEnumerable<(string, bool)> args, Func<GameEvent, Task> executeAction, Server.Game[] supportedGames)
+            bool isTargetRequired, IEnumerable<CommandArgument> args, Func<GameEvent, Task> executeAction, IEnumerable<Reference.Game> supportedGames)
         {
             var permissionEnum = Enum.Parse<EFClient.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,
+            return new ScriptCommand(name, alias, description, isTargetRequired, permissionEnum, args, executeAction,
                 _config, _transLookup, _serviceProvider.GetRequiredService<ILogger<ScriptCommand>>(), supportedGames);
         }
     }

Application/GameEventHandler.cs

@@ -1,46 +0,0 @@
-using IW4MAdmin.Application.Misc;
-using SharedLibraryCore;
-using SharedLibraryCore.Events;
-using SharedLibraryCore.Interfaces;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Logging;
-using ILogger = Microsoft.Extensions.Logging.ILogger;
-
-namespace IW4MAdmin.Application
-{
-    public class GameEventHandler : IEventHandler
-    {
-        private readonly EventLog _eventLog;
-        private readonly ILogger _logger;
-        private readonly IEventPublisher _eventPublisher;
-        private static readonly GameEvent.EventType[] overrideEvents = new[]
-        {
-            GameEvent.EventType.Connect,
-            GameEvent.EventType.Disconnect,
-            GameEvent.EventType.Quit,
-            GameEvent.EventType.Stop
-        };
-
-        public GameEventHandler(ILogger<GameEventHandler> logger, IEventPublisher eventPublisher)
-        {
-            _eventLog = new EventLog();
-            _logger = logger;
-            _eventPublisher = eventPublisher;
-        }
-
-        public void HandleEvent(IManager manager, GameEvent gameEvent)
-        {
-            if (manager.IsRunning || overrideEvents.Contains(gameEvent.Type))
-            {
-                EventApi.OnGameEvent(gameEvent);
-                _eventPublisher.Publish(gameEvent);
-                Task.Factory.StartNew(() => manager.ExecuteEvent(gameEvent));
-            }
-            else
-            {
-                _logger.LogDebug("Skipping event as we're shutting down {eventId}", gameEvent.Id);
-            }
-        }
-    }
-}

Application/IO/BaseConfigurationHandlerV2.cs

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

Application/IO/ConfigurationWatcher.cs

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

Application/IW4MServer.cs

@@ -9,7 +9,7 @@ using SharedLibraryCore.Helpers;
 using SharedLibraryCore.Interfaces;
 using System;
 using System.Collections.Generic;
-using System.Globalization;
+using System.Collections.ObjectModel;
 using System.IO;
 using System.Linq;
 using System.Net;
@@ -27,8 +27,13 @@ using Data.Models;
 using Data.Models.Server;
 using IW4MAdmin.Application.Alerts;
 using IW4MAdmin.Application.Commands;
+using IW4MAdmin.Application.Plugin.Script;
+using IW4MAdmin.Plugins.Stats.Helpers;
 using Microsoft.EntityFrameworkCore;
 using SharedLibraryCore.Alerts;
+using SharedLibraryCore.Events.Management;
+using SharedLibraryCore.Events.Server;
+using SharedLibraryCore.Interfaces.Events;
 using static Data.Models.Client.EFClient;
 
 namespace IW4MAdmin
@@ -42,11 +47,13 @@ namespace IW4MAdmin
         private const int REPORT_FLAG_COUNT = 4;
         private long lastGameTime = 0;
 
-        public int Id { get; private set; }
         private readonly IServiceProvider _serviceProvider;
         private readonly IClientNoticeMessageFormatter _messageFormatter;
         private readonly ILookupCache<EFServer> _serverCache;
         private readonly CommandConfiguration _commandConfiguration;
+        private EFServer _cachedDatabaseServer;
+        private readonly StatManager _statManager;
+        private readonly ApplicationConfiguration _appConfig;
 
         public IW4MServer(
             ServerConfiguration serverConfiguration,
@@ -70,6 +77,19 @@ namespace IW4MAdmin
             _messageFormatter = messageFormatter;
             _serverCache = serverCache;
             _commandConfiguration = commandConfiguration;
+            _statManager = serviceProvider.GetRequiredService<StatManager>();
+            _appConfig =  serviceProvider.GetService<ApplicationConfiguration>();
+            
+            IGameServerEventSubscriptions.MonitoringStarted += async (gameEvent, token) =>
+            {
+                if (gameEvent.Server.Id != Id)
+                {
+                    return;
+                }
+
+                await EnsureServerAdded();
+                await _statManager.EnsureServerAdded(gameEvent.Server, token);
+            };
         }
 
         public override async Task<EFClient> OnClientConnected(EFClient clientFromLog)
@@ -106,7 +126,7 @@ namespace IW4MAdmin
 
             Clients[client.ClientNumber] = client;
             ServerLogger.LogDebug("End PreConnect for {client}", client.ToString());
-            var e = new GameEvent()
+            var e = new GameEvent
             {
                 Origin = client,
                 Owner = this,
@@ -114,6 +134,11 @@ namespace IW4MAdmin
             };
 
             Manager.AddEvent(e);
+            Manager.QueueEvent(new ClientStateInitializeEvent
+            {
+                Client = client,
+                Source = this,
+            });
             return client;
         }
 
@@ -208,10 +233,17 @@ namespace IW4MAdmin
                         ServerLogger.LogInformation("Executing command {Command} for {Client}", cmd.Name,
                             E.Origin.ToString());
                         await cmd.ExecuteAsync(E);
+                        Manager.QueueEvent(new ClientExecuteCommandEvent
+                        {
+                            Command = cmd,
+                            Client = E.Origin,
+                            Source = this,
+                            CommandText = E.Data
+                        });
                     }
 
-                    var pluginTasks = Manager.Plugins
-                        .Select(async plugin => await CreatePluginTask(plugin, E));
+                    var pluginTasks = Manager.Plugins.Where(plugin => !plugin.IsParser)
+                        .Select(plugin => CreatePluginTask(plugin, E));
                     
                     await Task.WhenAll(pluginTasks);
                 }
@@ -248,7 +280,7 @@ namespace IW4MAdmin
 
             try
             {
-                await plugin.OnEventAsync(gameEvent, this).WithWaitCancellation(tokenSource.Token);
+                await plugin.OnEventAsync(gameEvent, this);
             }
             catch (OperationCanceledException)
             {
@@ -275,29 +307,7 @@ namespace IW4MAdmin
             {
                 ServerLogger.LogDebug("processing event of type {type}", E.Type);
 
-                if (E.Type == GameEvent.EventType.Start)
-                {
-                    var existingServer = (await _serverCache
-                        .FirstAsync(server => server.Id == EndPoint));
-
-                    var serverId = await GetIdForServer(E.Owner);
-
-                    if (existingServer == null)
-                    {
-                        var server = new EFServer()
-                        {
-                            Port = Port,
-                            EndPoint = ToString(),
-                            ServerId = serverId,
-                            GameName = (Reference.Game?)GameName,
-                            HostName = Hostname
-                        };
-
-                        await _serverCache.AddAsync(server);
-                    }
-                }
-                
-                else if (E.Type == GameEvent.EventType.ConnectionLost)
+                if (E.Type == GameEvent.EventType.ConnectionLost)
                 {
                     var exception = E.Extra as Exception;
                     ServerLogger.LogError(exception,
@@ -305,12 +315,12 @@ namespace IW4MAdmin
 
                     if (!Manager.GetApplicationSettings().Configuration().IgnoreServerConnectionLost)
                     {
-                        Console.WriteLine(loc["SERVER_ERROR_COMMUNICATION"].FormatExt($"{IP}:{Port}"));
+                        Console.WriteLine(loc["SERVER_ERROR_COMMUNICATION"].FormatExt($"{ListenAddress}:{ListenPort}"));
                         
                         var alert = Alert.AlertState.Build().OfType(E.Type.ToString())
                             .WithCategory(Alert.AlertCategory.Error)
                             .FromSource("System")
-                            .WithMessage(loc["SERVER_ERROR_COMMUNICATION"].FormatExt($"{IP}:{Port}"))
+                            .WithMessage(loc["SERVER_ERROR_COMMUNICATION"].FormatExt($"{ListenAddress}:{ListenPort}"))
                             .ExpiresIn(TimeSpan.FromDays(1));
                         
                         Manager.AlertManager.AddAlert(alert);
@@ -322,16 +332,16 @@ namespace IW4MAdmin
                 else if (E.Type == GameEvent.EventType.ConnectionRestored)
                 {
                     ServerLogger.LogInformation(
-                        "Connection restored with {server}", ToString());
+                        "Connection restored with {Server}", ToString());
                     
                     if (!Manager.GetApplicationSettings().Configuration().IgnoreServerConnectionLost)
                     {
-                        Console.WriteLine(loc["MANAGER_CONNECTION_REST"].FormatExt($"{IP}:{Port}"));
+                        Console.WriteLine(loc["MANAGER_CONNECTION_REST"].FormatExt($"{ListenAddress}:{ListenPort}"));
                         
                         var alert = Alert.AlertState.Build().OfType(E.Type.ToString())
                             .WithCategory(Alert.AlertCategory.Information)
                             .FromSource("System")
-                            .WithMessage(loc["MANAGER_CONNECTION_REST"].FormatExt($"{IP}:{Port}"))
+                            .WithMessage(loc["MANAGER_CONNECTION_REST"].FormatExt($"{ListenAddress}:{ListenPort}"))
                             .ExpiresIn(TimeSpan.FromDays(1));
 
                         Manager.AlertManager.AddAlert(alert);
@@ -348,9 +358,18 @@ namespace IW4MAdmin
                 else if (E.Type == GameEvent.EventType.ChangePermission)
                 {
                     var newPermission = (Permission) E.Extra;
+                    var oldPermission = E.Target.Level;
                     ServerLogger.LogInformation("{origin} is setting {target} to permission level {newPermission}",
                         E.Origin.ToString(), E.Target.ToString(), newPermission);
                     await Manager.GetClientService().UpdateLevel(newPermission, E.Target, E.Origin);
+                    
+                    Manager.QueueEvent(new ClientPermissionChangeEvent
+                    {
+                        Client = E.Origin,
+                        Source = this, 
+                        OldPermission = oldPermission,
+                        NewPermission = newPermission
+                    });
                 }
 
                 else if (E.Type == GameEvent.EventType.Connect)
@@ -498,6 +517,12 @@ namespace IW4MAdmin
 
                     await Manager.GetPenaltyService().Create(newPenalty);
                     E.Target.SetLevel(Permission.Flagged, E.Origin);
+                    
+                    Manager.QueueEvent(new ClientPenaltyEvent
+                    {
+                        Client = E.Target,
+                        Penalty = newPenalty
+                    });
                 }
 
                 else if (E.Type == GameEvent.EventType.Unflag)
@@ -517,6 +542,12 @@ namespace IW4MAdmin
                     await Manager.GetPenaltyService().RemoveActivePenalties(E.Target.AliasLinkId, E.Target.NetworkId,
                         E.Target.GameName, E.Target.CurrentAlias?.IPAddress);
                     await Manager.GetPenaltyService().Create(unflagPenalty);
+                    
+                    Manager.QueueEvent(new ClientPenaltyRevokeEvent
+                    {
+                        Client = E.Target,
+                        Penalty = unflagPenalty
+                    });
                 }
 
                 else if (E.Type == GameEvent.EventType.Report)
@@ -552,6 +583,13 @@ namespace IW4MAdmin
                             Utilities.CurrentLocalization.LocalizationIndex["SERVER_AUTO_FLAG_REPORT"]
                                 .FormatExt(reportNum), Utilities.IW4MAdminClient(E.Owner));
                     }
+                    
+                    Manager.QueueEvent(new ClientPenaltyEvent
+                    {
+                        Client = E.Target,
+                        Penalty = newReport,
+                        Source = this
+                    });
                 }
 
                 else if (E.Type == GameEvent.EventType.TempBan)
@@ -673,7 +711,7 @@ namespace IW4MAdmin
 
                 else if (E.Type == GameEvent.EventType.MapChange)
                 {
-                    ServerLogger.LogInformation("New map loaded - {clientCount} active players", ClientNum);
+                    ServerLogger.LogInformation("New map loaded - {ClientCount} active players", ClientNum);
 
                     // iw4 doesn't log the game info
                     if (E.Extra == null)
@@ -689,12 +727,12 @@ namespace IW4MAdmin
                         {
                             if (dict.ContainsKey("gametype"))
                             {
-                                Gametype = dict["gametype"];
+                                UpdateGametype(dict["gametype"]);
                             }
 
                             if (dict.ContainsKey("hostname"))
                             {
-                                Hostname = dict["hostname"];
+                                UpdateHostname(dict["hostname"]);
                             }
 
                             var newMapName = dict.ContainsKey("mapname")
@@ -707,24 +745,30 @@ namespace IW4MAdmin
                     else
                     {
                         var dict = (Dictionary<string, string>)E.Extra;
+                        
                         if (dict.ContainsKey("g_gametype"))
                         {
-                            Gametype = dict["g_gametype"];
+                            UpdateGametype(dict["g_gametype"]);
                         }
 
                         if (dict.ContainsKey("sv_hostname"))
                         {
-                            Hostname = dict["sv_hostname"];
+                            UpdateHostname(dict["sv_hostname"]);
                         }
 
                         if (dict.ContainsKey("sv_maxclients"))
                         {
-                            MaxClients = int.Parse(dict["sv_maxclients"]);
+                            UpdateMaxPlayers(int.Parse(dict["sv_maxclients"]));
                         }
 
                         else if (dict.ContainsKey("com_maxclients"))
                         {
-                            MaxClients = int.Parse(dict["com_maxclients"]);
+                            UpdateMaxPlayers(int.Parse(dict["com_maxclients"]));
+                        }
+                        
+                        else if (dict.ContainsKey("com_maxplayers"))
+                        {
+                            UpdateMaxPlayers(int.Parse(dict["com_maxplayers"]));
                         }
 
                         if (dict.ContainsKey("mapname"))
@@ -737,6 +781,8 @@ namespace IW4MAdmin
                     {
                         lastGameTime = E.GameTime.Value;
                     }
+
+                    MatchStartTime = DateTime.Now;
                 }
 
                 else if (E.Type == GameEvent.EventType.MapEnd)
@@ -747,6 +793,8 @@ namespace IW4MAdmin
                     {
                         lastGameTime = E.GameTime.Value;
                     }
+
+                    MatchEndTime = DateTime.Now;
                 }
 
                 else if (E.Type == GameEvent.EventType.Tell)
@@ -766,34 +814,6 @@ namespace IW4MAdmin
                 {
                     E.Origin.UpdateTeam(E.Extra as string);
                 }
-                
-                else if (E.Type == GameEvent.EventType.MetaUpdated)
-                {
-                    if (E.Extra is "PersistentClientGuid")
-                    {
-                        var parts = E.Data.Split(",");
-
-                        if (parts.Length == 2 && int.TryParse(parts[0], out var high) &&
-                            int.TryParse(parts[1], out var low))
-                        {
-                            var guid = long.Parse(high.ToString("X") + low.ToString("X"), NumberStyles.HexNumber);
-
-                            var penalties = await Manager.GetPenaltyService()
-                                .GetActivePenaltiesByIdentifier(null, guid, (Reference.Game)GameName);
-                            var banPenalty =
-                                penalties.FirstOrDefault(penalty => penalty.Type == EFPenalty.PenaltyType.Ban);
-
-                            if (banPenalty is not null && E.Origin.Level != Permission.Banned)
-                            {
-                                ServerLogger.LogInformation(
-                                    "Banning {Client} as they have have provided a persistent clientId of {PersistentClientId}, which is banned",
-                                    E.Origin.ToString(), guid);
-                                E.Origin.Ban(loc["SERVER_BAN_EVADE"].FormatExt(guid),
-                                    Utilities.IW4MAdminClient(this), true);
-                            }
-                        }
-                    }
-                }
 
                 lock (ChatHistory)
                 {
@@ -814,6 +834,53 @@ namespace IW4MAdmin
             }
         }
 
+        public async Task EnsureServerAdded()
+        {
+            var gameServer = await _serverCache
+                .FirstAsync(server => server.EndPoint == base.Id);
+            
+            if (gameServer == null)
+            {
+                gameServer = new EFServer
+                {
+                    Port = ListenPort,
+                    EndPoint = base.Id,
+                    ServerId = BuildLegacyDatabaseId(),
+                    GameName = (Reference.Game?)GameName,
+                    HostName = ServerName
+                };
+
+                await _serverCache.AddAsync(gameServer);
+            }
+
+            await using var context = _serviceProvider.GetRequiredService<IDatabaseContextFactory>()
+                .CreateContext(enableTracking: false);
+
+            context.Servers.Attach(gameServer);
+
+            // we want to set the gamename up if it's never been set, or it changed
+            if (!gameServer.GameName.HasValue || gameServer.GameName.Value != GameCode)
+            {
+                gameServer.GameName = GameCode;
+                context.Entry(gameServer).Property(property => property.GameName).IsModified = true;
+            }
+
+            if (gameServer.HostName == null || gameServer.HostName != ServerName)
+            {
+                gameServer.HostName = ServerName;
+                context.Entry(gameServer).Property(property => property.HostName).IsModified = true;
+            }
+
+            if (gameServer.IsPasswordProtected != !string.IsNullOrEmpty(GamePassword))
+            {
+                gameServer.IsPasswordProtected = !string.IsNullOrEmpty(GamePassword);
+                context.Entry(gameServer).Property(property => property.IsPasswordProtected).IsModified = true;
+            }
+
+            await context.SaveChangesAsync();
+            _cachedDatabaseServer = gameServer;
+        }
+
         private async Task OnClientUpdate(EFClient origin)
         {
             var client = GetClientsAsList().FirstOrDefault(c => c.NetworkId == origin.NetworkId);
@@ -863,6 +930,12 @@ namespace IW4MAdmin
         /// <returns></returns>
         async Task<List<EFClient>[]> PollPlayersAsync(CancellationToken token)
         {
+            if (DateTime.Now - (MatchEndTime ?? MatchStartTime) < TimeSpan.FromSeconds(15))
+            {
+                ServerLogger.LogDebug("Skipping status poll attempt because the match ended recently");
+                return null;
+            }
+ 
             var currentClients = GetClientsAsList();
             var statusResponse = await this.GetStatusAsync(token);
 
@@ -870,7 +943,7 @@ namespace IW4MAdmin
             {
                 return null;
             }
-            
+
             var polledClients = statusResponse.Clients.AsEnumerable();
 
             if (Manager.GetApplicationSettings().Configuration().IgnoreBots)
@@ -897,41 +970,55 @@ namespace IW4MAdmin
         public override async Task<long> GetIdForServer(Server server = null)
         {
             server ??= this;
-            
-            if ($"{server.IP}:{server.Port.ToString()}" == "66.150.121.184:28965")
-            {
-                return 886229536;
-            }
 
-            // todo: this is not stable and will need to be migrated again...
-            long id = HashCode.Combine(server.IP, server.Port);
-            id = id < 0 ? Math.Abs(id) : id;
-
-            var serverId = (await _serverCache
-                    .FirstAsync(_server => _server.ServerId == server.EndPoint ||
-                                                                    _server.EndPoint == server.ToString() ||
-                                                                    _server.ServerId == id))?.ServerId;
-
-            return !serverId.HasValue ? id : serverId.Value;
+            return (await _serverCache.FirstAsync(cachedServer =>
+                cachedServer.EndPoint == server.Id || cachedServer.ServerId == server.EndPoint)).ServerId;
         }
 
-        private void UpdateMap(string mapname)
+        private long BuildLegacyDatabaseId()
         {
-            if (!string.IsNullOrEmpty(mapname))
+            long id = HashCode.Combine(ListenAddress, ListenPort);
+            return id < 0 ? Math.Abs(id) : id;
+        }
+
+        private void UpdateMap(string mapName)
+        {
+            if (string.IsNullOrEmpty(mapName))
             {
-                CurrentMap = Maps.Find(m => m.Name == mapname) ?? new Map()
-                {
-                    Alias = mapname,
-                    Name = mapname
-                };
+                return;
+            }
+            
+            var foundMap = Maps.Find(m => m.Name == mapName) ?? new Map
+            {
+                Alias = mapName,
+                Name = mapName
+            };
+
+            if (foundMap == CurrentMap)
+            {
+                return;
+            }
+
+            CurrentMap = foundMap;
+            
+            using(LogContext.PushProperty("Server", Id))
+            {
+                ServerLogger.LogDebug("Updating map to {@CurrentMap}", CurrentMap);
             }
         }
 
         private void UpdateGametype(string gameType)
         {
-            if (!string.IsNullOrEmpty(gameType))
+            if (string.IsNullOrEmpty(gameType))
             {
-                Gametype = gameType;
+                return;
+            }
+            
+            Gametype = gameType;
+
+            using(LogContext.PushProperty("Server", Id))
+            {
+                ServerLogger.LogDebug("Updating gametype to {Gametype}", gameType);
             }
         }
 
@@ -942,7 +1029,7 @@ namespace IW4MAdmin
                 return;
             }
             
-            using(LogContext.PushProperty("Server", ToString()))
+            using(LogContext.PushProperty("Server", Id))
             {
                 ServerLogger.LogDebug("Updating hostname to {HostName}", hostname);
             }
@@ -957,7 +1044,7 @@ namespace IW4MAdmin
                 return;
             }
             
-            using(LogContext.PushProperty("Server", ToString()))
+            using(LogContext.PushProperty("Server", Id))
             {
                 ServerLogger.LogDebug("Updating max clients to {MaxPlayers}", maxPlayers);
             }
@@ -971,7 +1058,7 @@ namespace IW4MAdmin
             {
                 await client.OnDisconnect();
 
-                var e = new GameEvent()
+                var e = new GameEvent
                 {
                     Type = GameEvent.EventType.Disconnect,
                     Owner = this,
@@ -982,6 +1069,14 @@ namespace IW4MAdmin
 
                 await e.WaitAsync(Utilities.DefaultCommandTimeout, new CancellationTokenRegistration().Token);
             }
+
+            using var tokenSource = new CancellationTokenSource();
+            tokenSource.CancelAfter(Utilities.DefaultCommandTimeout);
+            
+            Manager.QueueEvent(new MonitorStopEvent
+            {
+                Server = this
+            });
         }
 
         private DateTime _lastMessageSent = DateTime.Now;
@@ -1063,6 +1158,16 @@ namespace IW4MAdmin
                         Manager.AddEvent(gameEvent);
                     }
 
+                    if (polledClients[2].Any())
+                    {
+                        Manager.QueueEvent(new ClientDataUpdateEvent
+                        {
+                            Clients = new ReadOnlyCollection<EFClient>(polledClients[2]),
+                            Server = this,
+                            Source = this,
+                        });
+                    }
+
                     if (Throttled)
                     {
                         var gameEvent = new GameEvent
@@ -1074,6 +1179,12 @@ namespace IW4MAdmin
                         };
 
                         Manager.AddEvent(gameEvent);
+                        
+                        Manager.QueueEvent(new ConnectionRestoreEvent
+                        {
+                            Server = this,
+                            Source = this
+                        });
                     }
 
                     LastPoll = DateTime.Now;
@@ -1097,6 +1208,12 @@ namespace IW4MAdmin
                     };
 
                     Manager.AddEvent(gameEvent);
+                    Manager.QueueEvent(new ConnectionInterruptEvent
+                    {
+                        Server = this,
+                        Source = this
+                    });
+                    
                     return true;
                 }
                 finally
@@ -1147,22 +1264,20 @@ namespace IW4MAdmin
                     ServerLogger.LogError(e, "Unexpected exception occured during processing updates");
                 }
 
-                Console.WriteLine(loc["SERVER_ERROR_EXCEPTION"].FormatExt($"[{IP}:{Port}]"));
+                Console.WriteLine(loc["SERVER_ERROR_EXCEPTION"].FormatExt($"[{ListenAddress}:{ListenPort}]"));
                 return false;
             }
         }
 
         private void RunServerCollection()
         {
-            var appConfig = _serviceProvider.GetService<ApplicationConfiguration>();
-           
-            if (DateTime.Now - _lastPlayerCount < appConfig?.ServerDataCollectionInterval)
+            if (DateTime.Now - _lastPlayerCount < _appConfig?.ServerDataCollectionInterval)
             {
                 return;
             }
 
-            var maxItems = Math.Ceiling(appConfig.MaxClientHistoryTime.TotalMinutes /
-                                        appConfig.ServerDataCollectionInterval.TotalMinutes);
+            var maxItems = Math.Ceiling(_appConfig!.MaxClientHistoryTime.TotalMinutes /
+                                        _appConfig.ServerDataCollectionInterval.TotalMinutes);
                     
             while (ClientHistory.ClientCounts.Count > maxItems) 
             {
@@ -1186,13 +1301,13 @@ namespace IW4MAdmin
             {
                 ResolvedIpEndPoint =
                     new IPEndPoint(
-                        (await Dns.GetHostAddressesAsync(IP)).First(address =>
-                            address.AddressFamily == AddressFamily.InterNetwork), Port);
+                        (await Dns.GetHostAddressesAsync(ListenAddress)).First(address =>
+                            address.AddressFamily == AddressFamily.InterNetwork), ListenPort);
             }
             catch (Exception ex)
             {
-                ServerLogger.LogWarning(ex, "Could not resolve hostname or IP for RCon connection {IP}:{Port}", IP, Port);
-                ResolvedIpEndPoint = new IPEndPoint(IPAddress.Parse(IP), Port);
+                ServerLogger.LogWarning(ex, "Could not resolve hostname or IP for RCon connection {Address}:{Port}", ListenAddress, ListenPort);
+                ResolvedIpEndPoint = new IPEndPoint(IPAddress.Parse(ListenAddress), ListenPort);
             }
 
             RconParser = Manager.AdditionalRConParsers
@@ -1249,10 +1364,12 @@ namespace IW4MAdmin
             var logsync = await this.GetMappedDvarValueOrDefaultAsync<int>("g_logsync", token: Manager.CancellationToken);
             var ip = await this.GetMappedDvarValueOrDefaultAsync<string>("net_ip", token: Manager.CancellationToken);
             var gamePassword = await this.GetMappedDvarValueOrDefaultAsync("g_password", overrideDefault: "", token: Manager.CancellationToken);
+            var privateClients = await this.GetMappedDvarValueOrDefaultAsync("sv_privateClients", overrideDefault: 0,
+                token: Manager.CancellationToken);
 
             if (Manager.GetApplicationSettings().Configuration().EnableCustomSayName)
             {
-                await this.SetDvarAsync("sv_sayname", Manager.GetApplicationSettings().Configuration().CustomSayName,
+                await this.SetDvarAsync("sv_sayname", CustomSayName,
                     Manager.CancellationToken);
             }
 
@@ -1290,12 +1407,14 @@ namespace IW4MAdmin
             }
 
             WorkingDirectory = basepath.Value;
-            this.Hostname = hostname;
-            this.MaxClients = maxplayers;
-            this.FSGame = game.Value;
-            this.Gametype = gametype;
-            this.IP = ip.Value == "localhost" ? ServerConfig.IPAddress : ip.Value ?? ServerConfig.IPAddress;
-            this.GamePassword = gamePassword.Value;
+            Hostname = hostname;
+            MaxClients = maxplayers;
+            FSGame = game.Value;
+            Gametype = gametype;
+            IP = ip.Value is "localhost" or "0.0.0.0" ? ServerConfig.IPAddress : ip.Value ?? ServerConfig.IPAddress;
+            GamePassword = gamePassword.Value;
+            PrivateClientSlots = privateClients.Value;
+            
             UpdateMap(mapname);
 
             if (RconParser.CanGenerateLogPath && string.IsNullOrEmpty(ServerConfig.ManualLogPath))
@@ -1457,6 +1576,12 @@ namespace IW4MAdmin
                     .FormatExt(activeClient.Warnings, activeClient.Name, reason);
                 activeClient.CurrentServer.Broadcast(message);
             }
+            
+            Manager.QueueEvent(new ClientPenaltyEvent
+            {
+                Client = targetClient,
+                Penalty = newPenalty
+            });
         }
 
         public override async Task Kick(string reason, EFClient targetClient, EFClient originClient, EFPenalty previousPenalty)
@@ -1495,8 +1620,20 @@ namespace IW4MAdmin
                 ServerLogger.LogDebug("Executing tempban kick command for {ActiveClient}", activeClient.ToString());
                 await activeClient.CurrentServer.ExecuteCommandAsync(formattedKick);
             }
+
+            Manager.QueueEvent(new ClientPenaltyEvent
+            {
+                Client = targetClient,
+                Penalty = newPenalty
+            });
         }
 
+        public override Task<string[]> ExecuteCommandAsync(string command, CancellationToken token = default) =>
+            Utilities.ExecuteCommandAsync(this, command, token);
+
+        public override Task SetDvarAsync(string name, object value, CancellationToken token = default) =>
+            Utilities.SetDvarAsync(this, name, value, token);
+
         public override async Task TempBan(string reason, TimeSpan length, EFClient targetClient, EFClient originClient)
         {
             // ensure player gets kicked if command not performed on them in the same server
@@ -1528,6 +1665,12 @@ namespace IW4MAdmin
                 ServerLogger.LogDebug("Executing tempban kick command for {ActiveClient}", activeClient.ToString());
                 await activeClient.CurrentServer.ExecuteCommandAsync(formattedKick);
             }
+            
+            Manager.QueueEvent(new ClientPenaltyEvent
+            {
+                Client = targetClient,
+                Penalty = newPenalty
+            });
         }
 
         public override async Task Ban(string reason, EFClient targetClient, EFClient originClient, bool isEvade = false)
@@ -1563,6 +1706,12 @@ namespace IW4MAdmin
                     _messageFormatter.BuildFormattedMessage(RconParser.Configuration, newPenalty));
                 await activeClient.CurrentServer.ExecuteCommandAsync(formattedString);
             }
+            
+            Manager.QueueEvent(new ClientPenaltyEvent
+            {
+                Client = targetClient,
+                Penalty = newPenalty
+            });
         }
 
         public override async Task Unban(string reason, EFClient targetClient, EFClient originClient)
@@ -1584,6 +1733,12 @@ namespace IW4MAdmin
             await Manager.GetPenaltyService().RemoveActivePenalties(targetClient.AliasLink.AliasLinkId,
                 targetClient.NetworkId, targetClient.GameName, targetClient.CurrentAlias?.IPAddress);
             await Manager.GetPenaltyService().Create(unbanPenalty);
+            
+            Manager.QueueEvent(new ClientPenaltyRevokeEvent
+            {
+                Client = targetClient,
+                Penalty = unbanPenalty
+            });
         }
 
         public override void InitializeTokens()
@@ -1593,5 +1748,7 @@ namespace IW4MAdmin
             Manager.GetMessageTokens().Add(new MessageToken("NEXTMAP", (Server s) => SharedLibraryCore.Commands.NextMapCommand.GetNextMap(s, _translationLookup)));
             Manager.GetMessageTokens().Add(new MessageToken("ADMINS", (Server s) => Task.FromResult(ListAdminsCommand.OnlineAdmins(s, _translationLookup))));
         }
+
+        public override long LegacyDatabaseId => _cachedDatabaseServer.ServerId;
     }
 }

Application/Main.cs

@@ -29,15 +29,21 @@ using Data.Helpers;
 using Integrations.Source.Extensions;
 using IW4MAdmin.Application.Alerts;
 using IW4MAdmin.Application.Extensions;
+using IW4MAdmin.Application.IO;
 using IW4MAdmin.Application.Localization;
+using IW4MAdmin.Application.Plugin;
+using IW4MAdmin.Application.Plugin.Script;
+using IW4MAdmin.Application.QueryHelpers;
 using Microsoft.Extensions.Logging;
 using ILogger = Microsoft.Extensions.Logging.ILogger;
 using IW4MAdmin.Plugins.Stats.Client.Abstractions;
 using IW4MAdmin.Plugins.Stats.Client;
+using Microsoft.Extensions.Hosting;
 using Stats.Client.Abstractions;
 using Stats.Client;
 using Stats.Config;
 using Stats.Helpers;
+using WebfrontCore.QueryHelpers.Models;
 
 namespace IW4MAdmin.Application
 {
@@ -46,7 +52,7 @@ namespace IW4MAdmin.Application
         public static BuildNumber Version { get; } = BuildNumber.Parse(Utilities.GetVersionAsString());
         private static ApplicationManager _serverManager;
         private static Task _applicationTask;
-        private static ServiceProvider _serviceProvider;
+        private static IServiceProvider _serviceProvider;
 
         /// <summary>
         /// entrypoint of the application
@@ -107,23 +113,23 @@ namespace IW4MAdmin.Application
                 ConfigurationMigration.MoveConfigFolder10518(null);
                 ConfigurationMigration.CheckDirectories();
                 ConfigurationMigration.RemoveObsoletePlugins20210322();
+                
                 logger.LogDebug("Configuring services...");
-                var services = await ConfigureServices(args);
-                _serviceProvider = services.BuildServiceProvider();
-                var versionChecker = _serviceProvider.GetRequiredService<IMasterCommunication>();
-                _serverManager = (ApplicationManager) _serviceProvider.GetRequiredService<IManager>();
-                translationLookup = _serviceProvider.GetRequiredService<ITranslationLookup>();
 
-                _applicationTask = RunApplicationTasksAsync(logger, services);
-                var tasks = new[]
-                {
-                    versionChecker.CheckVersion(),
-                    _applicationTask
-                };
+                var configHandler = new BaseConfigurationHandler<ApplicationConfiguration>("IW4MAdminSettings");
+                await configHandler.BuildAsync();
+                _serviceProvider = WebfrontCore.Program.InitializeServices(ConfigureServices,
+                    (configHandler.Configuration() ?? new ApplicationConfiguration()).WebfrontBindUrl);
+              
+                _serverManager = (ApplicationManager)_serviceProvider.GetRequiredService<IManager>();
+                translationLookup = _serviceProvider.GetRequiredService<ITranslationLookup>();
 
                 await _serverManager.Init();
 
-                await Task.WhenAll(tasks);
+                _applicationTask = RunApplicationTasksAsync(logger, _serverManager, _serviceProvider);
+                
+                await _applicationTask;
+                logger.LogInformation("Shutdown completed successfully");
             }
 
             catch (Exception e)
@@ -173,21 +179,55 @@ namespace IW4MAdmin.Application
             {
                 goto restart;
             }
-
-            await _serviceProvider.DisposeAsync();
         }
 
         /// <summary>
         /// runs the core application tasks
         /// </summary>
         /// <returns></returns>
-        private static async Task RunApplicationTasksAsync(ILogger logger, IServiceCollection services)
+        private static Task RunApplicationTasksAsync(ILogger logger, ApplicationManager applicationManager,
+            IServiceProvider serviceProvider)
         {
+            var collectionService = serviceProvider.GetRequiredService<IServerDataCollector>();
+            var versionChecker = serviceProvider.GetRequiredService<IMasterCommunication>();
+            var masterCommunicator = serviceProvider.GetRequiredService<IMasterCommunication>();
+            var webfrontLifetime = serviceProvider.GetRequiredService<IHostApplicationLifetime>();
+            using var onWebfrontErrored = new ManualResetEventSlim();
+            
             var webfrontTask = _serverManager.GetApplicationSettings().Configuration().EnableWebFront
-                ? WebfrontCore.Program.Init(_serverManager, _serviceProvider, services, _serverManager.CancellationToken)
+                ? WebfrontCore.Program.GetWebHostTask(_serverManager.CancellationToken).ContinueWith(continuation =>
+                {
+                    if (!continuation.IsFaulted)
+                    {
+                        return;
+                    }
+
+                    logger.LogCritical("Unable to start webfront task. {Message}",
+                        continuation.Exception?.InnerException?.Message);
+
+                    logger.LogDebug(continuation.Exception, "Unable to start webfront task");
+                    
+                    onWebfrontErrored.Set();
+                    
+                })
                 : Task.CompletedTask;
 
-            var collectionService = _serviceProvider.GetRequiredService<IServerDataCollector>();
+            if (_serverManager.GetApplicationSettings().Configuration().EnableWebFront)
+            {
+                try
+                {
+                    onWebfrontErrored.Wait(webfrontLifetime.ApplicationStarted);
+                }
+                catch
+                {
+                    // ignored when webfront successfully starts
+                }
+
+                if (onWebfrontErrored.IsSet)
+                {
+                    return Task.CompletedTask;
+                }
+            }
 
             // we want to run this one on a manual thread instead of letting the thread pool handle it,
             // because we can't exit early from waiting on console input, and it prevents us from restarting
@@ -198,18 +238,15 @@ namespace IW4MAdmin.Application
 
             var tasks = new[]
             {
+                applicationManager.Start(),
+                versionChecker.CheckVersion(),
                 webfrontTask,
-                _serverManager.Start(),
-                _serviceProvider.GetRequiredService<IMasterCommunication>()
-                    .RunUploadStatus(_serverManager.CancellationToken),
+                masterCommunicator.RunUploadStatus(_serverManager.CancellationToken),
                 collectionService.BeginCollectionAsync(cancellationToken: _serverManager.CancellationToken)
             };
 
             logger.LogDebug("Starting webfront and input tasks");
-            await Task.WhenAll(tasks);
-
-            logger.LogInformation("Shutdown completed successfully");
-            Console.WriteLine(Utilities.CurrentLocalization.LocalizationIndex["MANAGER_SHUTDOWN_SUCCESS"]);
+            return Task.WhenAll(tasks);
         }
         
         /// <summary>
@@ -297,8 +334,21 @@ namespace IW4MAdmin.Application
             var (plugins, commands, configurations) = pluginImporter.DiscoverAssemblyPluginImplementations();
             foreach (var pluginType in plugins)
             {
-                defaultLogger.LogDebug("Registered plugin type {Name}", pluginType.FullName);
-                serviceCollection.AddSingleton(typeof(IPlugin), pluginType);
+                var isV2 = pluginType.GetInterface(nameof(IPluginV2), false) != null;
+
+                defaultLogger.LogDebug("Registering plugin type {Name}", pluginType.FullName);
+
+                serviceCollection.AddSingleton(!isV2 ? typeof(IPlugin) : typeof(IPluginV2), pluginType);
+
+                try
+                {
+                    var registrationMethod = pluginType.GetMethod(nameof(IPluginV2.RegisterDependencies));
+                    registrationMethod?.Invoke(null, new object[] { serviceCollection });
+                }
+                catch (Exception ex)
+                {
+                    defaultLogger.LogError(ex, "Could not register plugin of type {Type}", pluginType.Name);
+                }
             }
 
             // register the plugin commands
@@ -319,10 +369,13 @@ namespace IW4MAdmin.Application
                 serviceCollection.AddSingleton(genericInterfaceType, handlerInstance);
             }
 
-            // register any script plugins
-            foreach (var plugin in pluginImporter.DiscoverScriptPlugins())
+            var scriptPlugins = pluginImporter.DiscoverScriptPlugins();
+
+            foreach (var scriptPlugin in scriptPlugins)
             {
-                serviceCollection.AddSingleton(plugin);
+                serviceCollection.AddSingleton(scriptPlugin.Item1, sp =>
+                    sp.GetRequiredService<IScriptPluginFactory>()
+                        .CreateScriptPlugin(scriptPlugin.Item1, scriptPlugin.Item2));
             }
 
             // register any eventable types
@@ -343,22 +396,22 @@ namespace IW4MAdmin.Application
         /// <summary>
         /// Configures the dependency injection services
         /// </summary>
-        private static async Task<IServiceCollection> ConfigureServices(string[] args)
+        private static void ConfigureServices(IServiceCollection serviceCollection)
         {
             // todo: this is a quick fix
             AppContext.SetSwitch("Npgsql.EnableLegacyTimestampBehavior", true);
 
-            // setup the static resources (config/master api/translations)
-            var serviceCollection = new ServiceCollection();
+            serviceCollection.AddConfiguration<ApplicationConfiguration>("IW4MAdminSettings")
+                .AddConfiguration<DefaultSettings>()
+                .AddConfiguration<CommandConfiguration>()
+                .AddConfiguration<StatsConfiguration>("StatsPluginSettings");
+            
+            // for legacy purposes. update at some point
             var appConfigHandler = new BaseConfigurationHandler<ApplicationConfiguration>("IW4MAdminSettings");
-            await appConfigHandler.BuildAsync();
-            var defaultConfigHandler = new BaseConfigurationHandler<DefaultSettings>("DefaultSettings");
-            await defaultConfigHandler.BuildAsync();
+            appConfigHandler.BuildAsync().GetAwaiter().GetResult();
             var commandConfigHandler = new BaseConfigurationHandler<CommandConfiguration>("CommandConfiguration");
-            await commandConfigHandler.BuildAsync();
-            var statsCommandHandler = new BaseConfigurationHandler<StatsConfiguration>("StatsPluginSettings");
-            await statsCommandHandler.BuildAsync();
-            var defaultConfig = defaultConfigHandler.Configuration();
+            commandConfigHandler.BuildAsync().GetAwaiter().GetResult();
+            
             var appConfig = appConfigHandler.Configuration();
             var masterUri = Utilities.IsDevelopment
                 ? new Uri("http://127.0.0.1:8080")
@@ -370,12 +423,12 @@ namespace IW4MAdmin.Application
             };
             var masterRestClient = RestClient.For<IMasterApi>(httpClient);
             var translationLookup = Configure.Initialize(Utilities.DefaultLogger, masterRestClient, appConfig);
-
+            
             if (appConfig == null)
             {
                 appConfig = (ApplicationConfiguration) new ApplicationConfiguration().Generate();
                 appConfigHandler.Set(appConfig);
-                await appConfigHandler.Save();
+                appConfigHandler.Save().GetAwaiter().GetResult();
             }
 
             // register override level names
@@ -388,17 +441,10 @@ namespace IW4MAdmin.Application
             }
 
             // build the dependency list
-            HandlePluginRegistration(appConfig, serviceCollection, masterRestClient);
-
             serviceCollection
                 .AddBaseLogger(appConfig)
-                .AddSingleton(defaultConfig)
-                .AddSingleton<IServiceCollection>(serviceCollection)
-                .AddSingleton<IConfigurationHandler<DefaultSettings>, BaseConfigurationHandler<DefaultSettings>>()
                 .AddSingleton((IConfigurationHandler<ApplicationConfiguration>) appConfigHandler)
                 .AddSingleton<IConfigurationHandler<CommandConfiguration>>(commandConfigHandler)
-                .AddSingleton(appConfig)
-                .AddSingleton(statsCommandHandler.Configuration() ?? new StatsConfiguration())
                 .AddSingleton(serviceProvider =>
                     serviceProvider.GetRequiredService<IConfigurationHandler<CommandConfiguration>>()
                         .Configuration() ?? new CommandConfiguration())
@@ -431,6 +477,7 @@ namespace IW4MAdmin.Application
                 .AddSingleton<IResourceQueryHelper<ChatSearchQuery, MessageResponse>, ChatResourceQueryHelper>()
                 .AddSingleton<IResourceQueryHelper<ClientPaginationRequest, ConnectionHistoryResponse>, ConnectionsResourceQueryHelper>()
                 .AddSingleton<IResourceQueryHelper<ClientPaginationRequest, PermissionLevelChangedResponse>, PermissionLevelChangedResourceQueryHelper>()
+                .AddSingleton<IResourceQueryHelper<ClientResourceRequest, ClientResourceResponse>, ClientResourceQueryHelper>()
                 .AddTransient<IParserPatternMatcher, ParserPatternMatcher>()
                 .AddSingleton<IRemoteAssemblyHandler, RemoteAssemblyHandler>()
                 .AddSingleton<IMasterCommunication, MasterCommunication>()
@@ -447,26 +494,22 @@ namespace IW4MAdmin.Application
                 .AddSingleton(typeof(IDataValueCache<,>), typeof(DataValueCache<,>))
                 .AddSingleton<IServerDataViewer, ServerDataViewer>()
                 .AddSingleton<IServerDataCollector, ServerDataCollector>()
-                .AddSingleton<IEventPublisher, EventPublisher>()
                 .AddSingleton<IGeoLocationService>(new GeoLocationService(Path.Join(".", "Resources", "GeoLite2-Country.mmdb")))
                 .AddSingleton<IAlertManager, AlertManager>()
+#pragma warning disable CS0618
                 .AddTransient<IScriptPluginTimerHelper, ScriptPluginTimerHelper>()
+#pragma warning restore CS0618
                 .AddSingleton<IInteractionRegistration, InteractionRegistration>()
+                .AddSingleton<IRemoteCommandService, RemoteCommandService>()
+                .AddSingleton(new ConfigurationWatcher())
+                .AddSingleton(typeof(IConfigurationHandlerV2<>), typeof(BaseConfigurationHandlerV2<>))
+                .AddSingleton<IScriptPluginFactory, ScriptPluginFactory>()
                 .AddSingleton(translationLookup)
                 .AddDatabaseContextOptions(appConfig);
-
-            if (args.Contains("serialevents"))
-            {
-                serviceCollection.AddSingleton<IEventHandler, SerialGameEventHandler>();
-            }
-            else
-            {
-                serviceCollection.AddSingleton<IEventHandler, GameEventHandler>();
-            }
-
+           
+            serviceCollection.AddSingleton<ICoreEventHandler, CoreEventHandler>();
             serviceCollection.AddSource();
-
-            return serviceCollection;
+            HandlePluginRegistration(appConfig, serviceCollection, masterRestClient);
         }
 
         private static ILogger BuildDefaultLogger<T>(ApplicationConfiguration appConfig)

Application/Meta/PermissionLevelChangedResourceQueryHelper.cs

@@ -27,7 +27,8 @@ public class
         await using var context = _contextFactory.CreateContext();
 
         var auditEntries = context.EFChangeHistory.Where(change => change.TargetEntityId == query.ClientId)
-            .Where(change => change.TypeOfChange == EFChangeHistory.ChangeType.Permission);
+            .Where(change => change.TypeOfChange == EFChangeHistory.ChangeType.Permission)
+            .OrderByDescending(change => change.TimeChanged);
 
         var audits = from change in auditEntries
             join client in context.Clients

Application/Misc/BaseConfigurationHandler.cs

@@ -49,8 +49,10 @@ namespace IW4MAdmin.Application.Misc
         {
             try
             {
+                await _onSaving.WaitAsync();
                 await using var fileStream = File.OpenRead(FileName);
                 _configuration = await JsonSerializer.DeserializeAsync<T>(fileStream, _serializerOptions);
+                await fileStream.DisposeAsync();
             }
 
             catch (FileNotFoundException)
@@ -66,6 +68,13 @@ namespace IW4MAdmin.Application.Misc
                     ConfigurationFileName = FileName
                 };
             }
+            finally
+            {
+                if (_onSaving.CurrentCount == 0)
+                {
+                    _onSaving.Release(1);
+                }
+            }
         }
 
         public async Task Save()
@@ -76,6 +85,7 @@ namespace IW4MAdmin.Application.Misc
 
                 await using var fileStream = File.Create(FileName);
                 await JsonSerializer.SerializeAsync(fileStream, _configuration, _serializerOptions);
+                await fileStream.DisposeAsync();
             }
 
             finally

Application/Misc/EventLog.cs

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

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

Application/Misc/GeoLocationService.cs

@@ -22,7 +22,7 @@ public class GeoLocationService : IGeoLocationService
         try
         {
             using var reader = new DatabaseReader(_sourceAddress);
-            reader.TryCountry(address, out country);
+            country = reader.Country(address);
         }
         catch
         {

Application/Misc/InteractionRegistration.cs

@@ -5,6 +5,7 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Data.Models;
+using IW4MAdmin.Application.Plugin.Script;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using SharedLibraryCore.Interfaces;
@@ -28,6 +29,13 @@ public class InteractionRegistration : IInteractionRegistration
 
     public void RegisterScriptInteraction(string interactionName, string source, Delegate interactionRegistration)
     {
+        if (string.IsNullOrWhiteSpace(source))
+        {
+            throw new ArgumentException("Script interaction source cannot be null");
+        }
+        
+        _logger.LogDebug("Registering script interaction {InteractionName} from {Source}", interactionName, source);
+        
         var plugin = _serviceProvider.GetRequiredService<IEnumerable<IPlugin>>()
             .FirstOrDefault(plugin => plugin.Name == source);
 
@@ -36,17 +44,17 @@ public class InteractionRegistration : IInteractionRegistration
             return;
         }
 
-        var wrappedDelegate = (int? clientId, Reference.Game? game, CancellationToken token) =>
+        Task<IInteractionData> WrappedDelegate(int? clientId, Reference.Game? game, CancellationToken token) =>
             Task.FromResult(
-                scriptPlugin.WrapDelegate<IInteractionData>(interactionRegistration, clientId, game, token));
+                scriptPlugin.WrapDelegate<IInteractionData>(interactionRegistration, token, clientId, game, token));
 
         if (!_interactions.ContainsKey(interactionName))
         {
-            _interactions.TryAdd(interactionName, wrappedDelegate);
+            _interactions.TryAdd(interactionName, WrappedDelegate);
         }
         else
         {
-            _interactions[interactionName] = wrappedDelegate;
+            _interactions[interactionName] = WrappedDelegate;
         }
     }
 
@@ -54,43 +62,36 @@ public class InteractionRegistration : IInteractionRegistration
     {
         if (!_interactions.ContainsKey(interactionName))
         {
+            _logger.LogDebug("Registering interaction {InteractionName}", interactionName);
             _interactions.TryAdd(interactionName, interactionRegistration);
         }
         else
         {
+            _logger.LogDebug("Updating interaction {InteractionName}", interactionName);
             _interactions[interactionName] = interactionRegistration;
         }
     }
 
     public void UnregisterInteraction(string interactionName)
     {
-        if (_interactions.ContainsKey(interactionName))
+        if (!_interactions.ContainsKey(interactionName))
         {
-            _interactions.TryRemove(interactionName, out _);
+            return;
         }
+
+        _logger.LogDebug("Unregistering interaction {InteractionName}", interactionName);
+        _interactions.TryRemove(interactionName, out _);
     }
 
-    public async Task<IEnumerable<IInteractionData>> GetInteractions(int? clientId = null,
+    public async Task<IEnumerable<IInteractionData>> GetInteractions(string interactionPrefix = null,
+        int? clientId = null,
         Reference.Game? game = null, CancellationToken token = default)
     {
-        return (await Task.WhenAll(_interactions.Select(async kvp =>
-        {
-            try
-            {
-                return await kvp.Value(clientId, game, token);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogWarning(ex,
-                    "Could not get interaction for interaction {InteractionName} and ClientId {ClientId}", kvp.Key,
-                    clientId);
-                return null;
-            }
-        }))).Where(interaction => interaction is not null);
+        return await GetInteractionsInternal(interactionPrefix, clientId, game, token);
     }
 
-    public async Task<string> ProcessInteraction(string interactionId, int? clientId = null,
-        Reference.Game? game = null, CancellationToken token = default)
+    public async Task<string> ProcessInteraction(string interactionId, int originId, int? targetId = null,
+        Reference.Game? game = null, IDictionary<string, string> meta = null, CancellationToken token = default)
     {
         if (!_interactions.ContainsKey(interactionId))
         {
@@ -99,11 +100,11 @@ public class InteractionRegistration : IInteractionRegistration
 
         try
         {
-            var interaction = await _interactions[interactionId](clientId, game, token);
+            var interaction = await _interactions[interactionId](targetId, game, token);
 
             if (interaction.Action is not null)
             {
-                return await interaction.Action(clientId, game, token);
+                return await interaction.Action(originId, targetId, game, meta, token);
             }
 
             if (interaction.ScriptAction is not null)
@@ -115,18 +116,56 @@ public class InteractionRegistration : IInteractionRegistration
                         continue;
                     }
 
-                    return scriptPlugin.ExecuteAction<string>(interaction.ScriptAction, clientId, game, token);
+                    return scriptPlugin.ExecuteAction<string>(interaction.ScriptAction, token, originId, targetId, game, meta,
+                        token);
+                }
+                
+                foreach (var plugin in _serviceProvider.GetRequiredService<IEnumerable<IPluginV2>>())
+                {
+                    if (plugin is not ScriptPluginV2 scriptPlugin || scriptPlugin.Name != interaction.Source)
+                    {
+                        continue;
+                    }
+
+                    return scriptPlugin
+                        .QueryWithErrorHandling(interaction.ScriptAction, originId, targetId, game, meta, token)
+                        ?.ToString();
                 }
             }
         }
         catch (Exception ex)
         {
             _logger.LogWarning(ex,
-                "Could not process interaction for interaction {InteractionName} and ClientId {ClientId}",
-                interactionId,
-                clientId);
+                "Could not process interaction for {InteractionName} and OriginId {ClientId}",
+                interactionId, originId);
         }
 
         return null;
     }
+
+    private async Task<IEnumerable<IInteractionData>> GetInteractionsInternal(string prefix = null,
+        int? clientId = null, Reference.Game? game = null, CancellationToken token = default)
+    {
+        var interactions = _interactions
+            .Where(interaction => string.IsNullOrWhiteSpace(prefix) || interaction.Key.StartsWith(prefix)).Select(
+                async kvp =>
+                {
+                    try
+                    {
+                        return await kvp.Value(clientId, game, token);
+                    }
+                    catch (Exception ex)
+                    {
+                        _logger.LogWarning(ex,
+                            "Could not get interaction for {InteractionName} and ClientId {ClientId}",
+                            kvp.Key,
+                            clientId);
+                        return null;
+                    }
+                });
+
+        return (await Task.WhenAll(interactions))
+            .Where(interaction => interaction is not null)
+            .ToList();
+    }
 }

Application/Misc/MasterCommunication.cs

@@ -103,17 +103,15 @@ namespace IW4MAdmin.Application.Misc
                         await UploadStatus();
                     }
                 }
-
                 catch (Exception ex)
                 {
-                    _logger.LogWarning(ex, "Could not send heartbeat");
+                    _logger.LogWarning("Could not send heartbeat - {Message}", ex.Message);
                 }
 
                 try
                 {
                     await Task.Delay(Interval, token);
                 }
-
                 catch
                 {
                     break;
@@ -149,13 +147,13 @@ namespace IW4MAdmin.Application.Misc
                                 Map = s.CurrentMap.Name,
                                 MaxClientNum = s.MaxClients,
                                 Id = s.EndPoint,
-                                Port = (short)s.Port,
-                                IPAddress = s.IP
+                                Port = (short)s.ListenPort,
+                                IPAddress = s.ListenAddress
                             }).ToList(),
                 WebfrontUrl = _appConfig.WebfrontUrl
             };
 
-            Response<ResultMessage> response = null;
+            Response<ResultMessage> response;
 
             if (_firstHeartBeat)
             {
@@ -170,7 +168,7 @@ namespace IW4MAdmin.Application.Misc
 
             if (response.ResponseMessage.StatusCode != System.Net.HttpStatusCode.OK)
             {
-                _logger.LogWarning("Non success response code from master is {statusCode}, message is {message}", response.ResponseMessage.StatusCode, response.StringContent);
+                _logger.LogWarning("Non success response code from master is {StatusCode}, message is {Message}", response.ResponseMessage.StatusCode, response.StringContent);
             }
         }
     }

Application/Misc/MetaServiceV2.cs

@@ -7,10 +7,7 @@ using System.Threading.Tasks;
 using Data.Abstractions;
 using Data.Models;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using SharedLibraryCore;
-using SharedLibraryCore.Database.Models;
 using SharedLibraryCore.Dtos;
 using SharedLibraryCore.Interfaces;
 using SharedLibraryCore.QueryHelper;
@@ -22,7 +19,6 @@ public class MetaServiceV2 : IMetaServiceV2
 {
     private readonly IDictionary<MetaType, List<dynamic>> _metaActions;
     private readonly IDatabaseContextFactory _contextFactory;
-    private readonly IServiceProvider _serviceProvider;
     private readonly ILogger _logger;
 
     public MetaServiceV2(ILogger<MetaServiceV2> logger, IDatabaseContextFactory contextFactory, IServiceProvider serviceProvider)
@@ -30,7 +26,6 @@ public class MetaServiceV2 : IMetaServiceV2
         _logger = logger;
         _metaActions = new Dictionary<MetaType, List<dynamic>>();
         _contextFactory = contextFactory;
-        _serviceProvider = serviceProvider;
     }
 
     public async Task SetPersistentMeta(string metaKey, string metaValue, int clientId,
@@ -69,26 +64,6 @@ public class MetaServiceV2 : IMetaServiceV2
         }
 
         await context.SaveChangesAsync(token);
-            
-            
-        var manager = _serviceProvider.GetRequiredService<IManager>();
-        var matchingClient = manager.GetActiveClients().FirstOrDefault(client => client.ClientId == clientId);
-        var server = matchingClient?.CurrentServer ?? manager.GetServers().FirstOrDefault();
-
-        if (server is not null)
-        {
-            manager.AddEvent(new GameEvent
-            {
-                Type = GameEvent.EventType.MetaUpdated,
-                Origin = matchingClient ?? new EFClient
-                {
-                    ClientId = clientId
-                },
-                Data = metaValue,
-                Extra = metaKey,
-                Owner = server
-            });
-        }
     }
 
     public async Task SetPersistentMetaValue<T>(string metaKey, T metaValue, int clientId,

Application/Misc/RemoteCommandService.cs

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

Application/Misc/ScriptPluginConfigurationWrapper.cs

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

Application/Misc/ServerDataCollector.cs

@@ -12,8 +12,10 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 using SharedLibraryCore;
 using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Events.Management;
 using ILogger = Microsoft.Extensions.Logging.ILogger;
 using SharedLibraryCore.Interfaces;
+using SharedLibraryCore.Interfaces.Events;
 
 namespace IW4MAdmin.Application.Misc
 {
@@ -24,28 +26,20 @@ namespace IW4MAdmin.Application.Misc
         private readonly IManager _manager;
         private readonly IDatabaseContextFactory _contextFactory;
         private readonly ApplicationConfiguration _appConfig;
-        private readonly IEventPublisher _eventPublisher;
 
         private bool _inProgress;
         private TimeSpan _period;
 
         public ServerDataCollector(ILogger<ServerDataCollector> logger, ApplicationConfiguration appConfig,
-            IManager manager, IDatabaseContextFactory contextFactory, IEventPublisher eventPublisher)
+            IManager manager, IDatabaseContextFactory contextFactory)
         {
             _logger = logger;
             _appConfig = appConfig;
             _manager = manager;
             _contextFactory = contextFactory;
-            _eventPublisher = eventPublisher;
 
-            _eventPublisher.OnClientConnect += SaveConnectionInfo;
-            _eventPublisher.OnClientDisconnect += SaveConnectionInfo;
-        }
-
-        ~ServerDataCollector()
-        {
-            _eventPublisher.OnClientConnect -= SaveConnectionInfo;
-            _eventPublisher.OnClientDisconnect -= SaveConnectionInfo;
+            IManagementEventSubscriptions.ClientStateAuthorized += SaveConnectionInfo;
+            IManagementEventSubscriptions.ClientStateDisposed += SaveConnectionInfo;
         }
 
         public async Task BeginCollectionAsync(TimeSpan? period = null, CancellationToken cancellationToken = default)
@@ -131,18 +125,19 @@ namespace IW4MAdmin.Application.Misc
             await context.SaveChangesAsync(token);
         }
 
-        private void SaveConnectionInfo(object sender, GameEvent gameEvent)
+        private async Task SaveConnectionInfo(ClientStateEvent stateEvent, CancellationToken token)
         {
-            using var context = _contextFactory.CreateContext(enableTracking: false);
+            await using var context = _contextFactory.CreateContext(enableTracking: false);
             context.ConnectionHistory.Add(new EFClientConnectionHistory
             {
-                ClientId = gameEvent.Origin.ClientId,
-                ServerId = gameEvent.Owner.GetIdForServer().Result,
-                ConnectionType = gameEvent.Type == GameEvent.EventType.Connect
+                ClientId = stateEvent.Client.ClientId,
+                ServerId = await stateEvent.Client.CurrentServer.GetIdForServer(),
+                ConnectionType = stateEvent is ClientStateAuthorizeEvent
                     ? Reference.ConnectionType.Connect
                     : Reference.ConnectionType.Disconnect
             });
-            context.SaveChanges();
+
+            await context.SaveChangesAsync();
         }
     }
 }

Application/Misc/ServerDataViewer.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Data.Abstractions;
+using Data.Models;
 using Data.Models.Client;
 using Data.Models.Client.Stats;
 using Data.Models.Server;
@@ -40,21 +41,31 @@ namespace IW4MAdmin.Application.Misc
         }
 
         public async Task<(int?, DateTime?)> 
-            MaxConcurrentClientsAsync(long? serverId = null, TimeSpan? overPeriod = null,
+            MaxConcurrentClientsAsync(long? serverId = null, Reference.Game? gameCode = null, TimeSpan? overPeriod = null,
             CancellationToken token = default)
         {
-            _snapshotCache.SetCacheItem(async (snapshots, cancellationToken) =>
+            _snapshotCache.SetCacheItem(async (snapshots, ids, cancellationToken) =>
             {
+                Reference.Game? game = null;
+                long? id = null;
+
+                if (ids.Any())
+                {
+                    game = (Reference.Game?)ids.First();
+                    id = (long?)ids.Last();
+                }
+
                 var oldestEntry = overPeriod.HasValue
                     ? DateTime.UtcNow - overPeriod.Value
                     : DateTime.UtcNow.AddDays(-1);
-                
+
                 int? maxClients;
                 DateTime? maxClientsTime;
 
-                if (serverId != null)
+                if (id != null)
                 {
-                    var clients = await snapshots.Where(snapshot => snapshot.ServerId == serverId)
+                    var clients = await snapshots.Where(snapshot => snapshot.ServerId == id)
+                        .Where(snapshot => game == null || snapshot.Server.GameName == game)
                         .Where(snapshot => snapshot.CapturedAt >= oldestEntry)
                         .OrderByDescending(snapshot => snapshot.ClientCount)
                         .Select(snapshot => new
@@ -71,15 +82,16 @@ namespace IW4MAdmin.Application.Misc
                 else
                 {
                     var clients = await snapshots.Where(snapshot => snapshot.CapturedAt >= oldestEntry)
+                        .Where(snapshot => game == null || snapshot.Server.GameName == game)
                         .GroupBy(snapshot => snapshot.PeriodBlock)
                         .Select(grp => new
                         {
-                            ClientCount = grp.Sum(snapshot => (int?) snapshot.ClientCount),
-                            Time = grp.Max(snapshot => (DateTime?) snapshot.CapturedAt)
+                            ClientCount = grp.Sum(snapshot => (int?)snapshot.ClientCount),
+                            Time = grp.Max(snapshot => (DateTime?)snapshot.CapturedAt)
                         })
                         .OrderByDescending(snapshot => snapshot.ClientCount)
                         .FirstOrDefaultAsync(cancellationToken);
-                    
+
                     maxClients = clients?.ClientCount;
                     maxClientsTime = clients?.Time;
                 }
@@ -87,11 +99,12 @@ namespace IW4MAdmin.Application.Misc
                 _logger.LogDebug("Max concurrent clients since {Start} is {Clients}", oldestEntry, maxClients);
 
                 return (maxClients, maxClientsTime);
-            }, nameof(MaxConcurrentClientsAsync), _cacheTimeSpan, true);
+            }, nameof(MaxConcurrentClientsAsync), new object[] { gameCode, serverId }, _cacheTimeSpan, true);
 
             try
             {
-                return await _snapshotCache.GetCacheItem(nameof(MaxConcurrentClientsAsync), token);
+                return await _snapshotCache.GetCacheItem(nameof(MaxConcurrentClientsAsync),
+                    new object[] { gameCode, serverId }, token);
             }
             catch (Exception ex)
             {
@@ -100,22 +113,30 @@ namespace IW4MAdmin.Application.Misc
             }
         }
 
-        public async Task<(int, int)> ClientCountsAsync(TimeSpan? overPeriod = null, CancellationToken token = default)
+        public async Task<(int, int)> ClientCountsAsync(TimeSpan? overPeriod = null, Reference.Game? gameCode = null, CancellationToken token = default)
         {
-            _serverStatsCache.SetCacheItem(async (set, cancellationToken) =>
+            _serverStatsCache.SetCacheItem(async (set, ids, cancellationToken) =>
             {
-                var count = await set.CountAsync(cancellationToken);
+                Reference.Game? game = null;
+                
+                if (ids.Any())
+                {
+                    game = (Reference.Game?)ids.First();
+                }
+                
+                var count = await set.CountAsync(item => game == null || item.GameName == game,
+                    cancellationToken);
                 var startOfPeriod =
                     DateTime.UtcNow.AddHours(-overPeriod?.TotalHours ?? -24);
-                var recentCount = await set.CountAsync(client => client.LastConnection >= startOfPeriod,
+                var recentCount = await set.CountAsync(client => (game == null || client.GameName == game) && client.LastConnection >= startOfPeriod,
                     cancellationToken);
 
                 return (count, recentCount);
-            }, nameof(_serverStatsCache), _cacheTimeSpan, true);
+            }, nameof(_serverStatsCache), new object[] { gameCode }, _cacheTimeSpan, true);
 
             try
             {
-                return await _serverStatsCache.GetCacheItem(nameof(_serverStatsCache), token);
+                return await _serverStatsCache.GetCacheItem(nameof(_serverStatsCache), new object[] { gameCode }, token);
             }
             catch (Exception ex)
             {
@@ -166,21 +187,28 @@ namespace IW4MAdmin.Application.Misc
 
         public async Task<int> RankedClientsCountAsync(long? serverId = null, CancellationToken token = default)
         {
-            _rankedClientsCache.SetCacheItem(async (set, cancellationToken) =>
+            _rankedClientsCache.SetCacheItem((set, ids, cancellationToken) =>
             {
+                long? id = null;
+                
+                if (ids.Any())
+                {
+                    id = (long?)ids.First();
+                }
+                
                 var fifteenDaysAgo = DateTime.UtcNow.AddDays(-15);
-                return await set
+                return set
                     .Where(rating => rating.Newest)
-                    .Where(rating => rating.ServerId == serverId)
+                    .Where(rating => rating.ServerId == id)
                     .Where(rating => rating.CreatedDateTime >= fifteenDaysAgo)
                     .Where(rating => rating.Client.Level != EFClient.Permission.Banned)
                     .Where(rating => rating.Ranking != null)
                     .CountAsync(cancellationToken);
-            }, nameof(_rankedClientsCache), serverId is null ? null: new[] { (object)serverId },  _cacheTimeSpan);
+            }, nameof(_rankedClientsCache), new object[] { serverId }, _cacheTimeSpan);
             
             try
             {
-                return await _rankedClientsCache.GetCacheItem(nameof(_rankedClientsCache), serverId, token);
+                return await _rankedClientsCache.GetCacheItem(nameof(_rankedClientsCache), new object[] { serverId }, token);
             }
             catch (Exception ex)
             {

Application/Plugin/PluginImporter.cs

@@ -1,17 +1,17 @@
 using System;
-using System.IO;
 using System.Collections.Generic;
-using System.Reflection;
-using SharedLibraryCore.Interfaces;
+using System.IO;
 using System.Linq;
-using SharedLibraryCore;
+using System.Reflection;
+using System.Text.RegularExpressions;
 using IW4MAdmin.Application.API.Master;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
+using SharedLibraryCore;
 using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Interfaces;
 using ILogger = Microsoft.Extensions.Logging.ILogger;
 
-namespace IW4MAdmin.Application.Misc
+namespace IW4MAdmin.Application.Plugin
 {
     /// <summary>
     /// implementation of IPluginImporter
@@ -20,13 +20,15 @@ namespace IW4MAdmin.Application.Misc
     public class PluginImporter : IPluginImporter
     {
         private IEnumerable<PluginSubscriptionContent> _pluginSubscription;
-        private static readonly string PLUGIN_DIR = "Plugins";
+        private static readonly string PluginDir = "Plugins";
+        private const string PluginV2Match = "^ *((?:var|const|let) +init)|function init";
         private readonly ILogger _logger;
         private readonly IRemoteAssemblyHandler _remoteAssemblyHandler;
         private readonly IMasterApi _masterApi;
         private readonly ApplicationConfiguration _appConfig;
 
-        public PluginImporter(ILogger<PluginImporter> logger, ApplicationConfiguration appConfig, IMasterApi masterApi, IRemoteAssemblyHandler remoteAssemblyHandler)
+        public PluginImporter(ILogger<PluginImporter> logger, ApplicationConfiguration appConfig, IMasterApi masterApi,
+            IRemoteAssemblyHandler remoteAssemblyHandler)
         {
             _logger = logger;
             _masterApi = masterApi;
@@ -38,25 +40,34 @@ namespace IW4MAdmin.Application.Misc
         /// discovers all the script plugins in the plugins dir
         /// </summary>
         /// <returns></returns>
-        public IEnumerable<IPlugin> DiscoverScriptPlugins()
+        public IEnumerable<(Type, string)> DiscoverScriptPlugins()
         {
-            var pluginDir = $"{Utilities.OperatingDirectory}{PLUGIN_DIR}{Path.DirectorySeparatorChar}";
+            var pluginDir = $"{Utilities.OperatingDirectory}{PluginDir}{Path.DirectorySeparatorChar}";
 
             if (!Directory.Exists(pluginDir))
             {
-                return Enumerable.Empty<IPlugin>();
+                return Enumerable.Empty<(Type, string)>();
             }
 
             var scriptPluginFiles =
                 Directory.GetFiles(pluginDir, "*.js").AsEnumerable().Union(GetRemoteScripts()).ToList();
 
-            _logger.LogDebug("Discovered {count} potential script plugins", scriptPluginFiles.Count);
-
-            return scriptPluginFiles.Select(fileName =>
+            var bothVersionPlugins = scriptPluginFiles.Select(fileName =>
             {
-                _logger.LogDebug("Discovered script plugin {fileName}", fileName);
-                return new ScriptPlugin(_logger, fileName);
+                _logger.LogDebug("Discovered script plugin {FileName}", fileName);
+                try
+                {
+                    var fileContents = File.ReadAllLines(fileName);
+                    var isValidV2 = fileContents.Any(line => Regex.IsMatch(line, PluginV2Match));
+                    return isValidV2 ? (typeof(IPluginV2), fileName) : (typeof(IPlugin), fileName);
+                }
+                catch
+                {
+                    return (typeof(IPlugin), fileName);
+                }
             }).ToList();
+
+            return bothVersionPlugins;
         }
 
         /// <summary>
@@ -65,7 +76,7 @@ namespace IW4MAdmin.Application.Misc
         /// <returns></returns>
         public (IEnumerable<Type>, IEnumerable<Type>, IEnumerable<Type>) DiscoverAssemblyPluginImplementations()
         {
-            var pluginDir = $"{Utilities.OperatingDirectory}{PLUGIN_DIR}{Path.DirectorySeparatorChar}";
+            var pluginDir = $"{Utilities.OperatingDirectory}{PluginDir}{Path.DirectorySeparatorChar}";
             var pluginTypes = Enumerable.Empty<Type>();
             var commandTypes = Enumerable.Empty<Type>();
             var configurationTypes = Enumerable.Empty<Type>();
@@ -73,45 +84,47 @@ namespace IW4MAdmin.Application.Misc
             if (Directory.Exists(pluginDir))
             {
                 var dllFileNames = Directory.GetFiles(pluginDir, "*.dll");
-                _logger.LogDebug("Discovered {count} potential plugin assemblies", dllFileNames.Length);
+                _logger.LogDebug("Discovered {Count} potential plugin assemblies", dllFileNames.Length);
 
                 if (dllFileNames.Length > 0)
                 {
                     // we only want to load the most recent assembly in case of duplicates
-                    var assemblies = dllFileNames.Select(_name => Assembly.LoadFrom(_name))
+                    var assemblies = dllFileNames.Select(name => Assembly.LoadFrom(name))
                         .Union(GetRemoteAssemblies())
-                        .GroupBy(_assembly => _assembly.FullName).Select(_assembly => _assembly.OrderByDescending(_assembly => _assembly.GetName().Version).First());
+                        .GroupBy(assembly => assembly.FullName).Select(assembly => assembly.OrderByDescending(asm => asm.GetName().Version).First());
 
                     pluginTypes = assemblies
-                        .SelectMany(_asm =>
+                        .SelectMany(asm =>
                         {
                             try
                             {
-                                return _asm.GetTypes();
+                                return asm.GetTypes();
                             }
                             catch
                             {
                                 return Enumerable.Empty<Type>();
                             }
                         })
-                        .Where(_assemblyType => _assemblyType.GetInterface(nameof(IPlugin), false) != null);
+                        .Where(assemblyType => (assemblyType.GetInterface(nameof(IPlugin), false) ?? assemblyType.GetInterface(nameof(IPluginV2), false)) != null)
+                        .Where(assemblyType => !assemblyType.Namespace?.StartsWith(nameof(SharedLibraryCore)) ?? false);
 
                     _logger.LogDebug("Discovered {count} plugin implementations", pluginTypes.Count());
 
                     commandTypes = assemblies
-                        .SelectMany(_asm =>{
+                        .SelectMany(asm =>{
                             try
                             {
-                                return _asm.GetTypes();
+                                return asm.GetTypes();
                             }
                             catch
                             {
                                 return Enumerable.Empty<Type>();
                             }
                         })
-                        .Where(_assemblyType => _assemblyType.IsClass && _assemblyType.BaseType == typeof(Command));
+                        .Where(assemblyType => assemblyType.IsClass && assemblyType.BaseType == typeof(Command))
+                        .Where(assemblyType => !assemblyType.Namespace?.StartsWith(nameof(SharedLibraryCore)) ?? false);
 
-                    _logger.LogDebug("Discovered {count} plugin commands", commandTypes.Count());
+                    _logger.LogDebug("Discovered {Count} plugin commands", commandTypes.Count());
 
                     configurationTypes = assemblies
                         .SelectMany(asm => {
@@ -125,9 +138,10 @@ namespace IW4MAdmin.Application.Misc
                             }
                         })
                         .Where(asmType =>
-                            asmType.IsClass && asmType.GetInterface(nameof(IBaseConfiguration), false) != null);
+                            asmType.IsClass && asmType.GetInterface(nameof(IBaseConfiguration), false) != null)
+                        .Where(assemblyType => !assemblyType.Namespace?.StartsWith(nameof(SharedLibraryCore)) ?? false);
 
-                    _logger.LogDebug("Discovered {count} configuration implementations", configurationTypes.Count());
+                    _logger.LogDebug("Discovered {Count} configuration implementations", configurationTypes.Count());
                 }
             }
 
@@ -155,8 +169,7 @@ namespace IW4MAdmin.Application.Misc
         {
             try
             {
-                if (_pluginSubscription == null)
-                    _pluginSubscription = _masterApi.GetPluginSubscription(Guid.Parse(_appConfig.Id), _appConfig.SubscriptionId).Result;
+                _pluginSubscription ??= _masterApi.GetPluginSubscription(Guid.Parse(_appConfig.Id), _appConfig.SubscriptionId).Result;
 
                 return _remoteAssemblyHandler.DecryptScripts(_pluginSubscription.Where(sub => sub.Type == PluginType.Script).Select(sub => sub.Content).ToArray());
             }

Application/Plugin/Script/ScriptCommand.cs

@@ -1,14 +1,17 @@
-using SharedLibraryCore;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Data.Models;
+using Data.Models.Client;
+using Microsoft.Extensions.Logging;
+using SharedLibraryCore;
 using SharedLibraryCore.Commands;
 using SharedLibraryCore.Configuration;
 using SharedLibraryCore.Interfaces;
-using System;
-using System.Threading.Tasks;
-using Data.Models.Client;
-using Microsoft.Extensions.Logging;
 using ILogger = Microsoft.Extensions.Logging.ILogger;
 
-namespace IW4MAdmin.Application.Misc
+namespace IW4MAdmin.Application.Plugin.Script
 {
     /// <summary>
     /// generic script command implementation
@@ -20,8 +23,8 @@ namespace IW4MAdmin.Application.Misc
 
         public ScriptCommand(string name, string alias, string description, bool isTargetRequired,
             EFClient.Permission permission,
-            CommandArgument[] args, Func<GameEvent, Task> executeAction, CommandConfiguration config,
-            ITranslationLookup layout, ILogger<ScriptCommand> logger, Server.Game[] supportedGames)
+            IEnumerable<CommandArgument> args, Func<GameEvent, Task> executeAction, CommandConfiguration config,
+            ITranslationLookup layout, ILogger<ScriptCommand> logger, IEnumerable<Reference.Game> supportedGames)
             : base(config, layout)
         {
             _executeAction = executeAction;
@@ -31,8 +34,8 @@ namespace IW4MAdmin.Application.Misc
             Description = description;
             RequiresTarget = isTargetRequired;
             Permission = permission;
-            Arguments = args;
-            SupportedGames = supportedGames;
+            Arguments = args.ToArray();
+            SupportedGames = supportedGames?.Select(game => (Server.Game)game).ToArray();
         }
 
         public override async Task ExecuteAsync(GameEvent e)
@@ -48,7 +51,7 @@ namespace IW4MAdmin.Application.Misc
             }
             catch (Exception ex)
             {
-                _logger.LogError(ex, "Failed to execute ScriptCommand action for command {command} {@event}", Name, e);
+                _logger.LogError(ex, "Failed to execute ScriptCommand action for command {Command} {@Event}", Name, e);
             }
         }
     }

Application/Plugin/Script/ScriptPlugin.cs

@@ -1,24 +1,30 @@
 using System;
-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.Runtime.CompilerServices;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using Data.Models;
+using IW4MAdmin.Application.Configuration;
+using IW4MAdmin.Application.Extensions;
+using IW4MAdmin.Application.Misc;
+using Jint;
+using Jint.Native;
+using Jint.Runtime;
 using Jint.Runtime.Interop;
+using Microsoft.CSharp.RuntimeBinder;
 using Microsoft.Extensions.Logging;
 using Serilog.Context;
+using SharedLibraryCore;
+using SharedLibraryCore.Commands;
+using SharedLibraryCore.Database.Models;
+using SharedLibraryCore.Exceptions;
+using SharedLibraryCore.Interfaces;
 using ILogger = Microsoft.Extensions.Logging.ILogger;
 
-namespace IW4MAdmin.Application.Misc
+namespace IW4MAdmin.Application.Plugin.Script
 {
     /// <summary>
     /// implementation of IPlugin
@@ -42,7 +48,6 @@ namespace IW4MAdmin.Application.Misc
         private Engine _scriptEngine;
         private readonly string _fileName;
         private readonly SemaphoreSlim _onProcessing = new(1, 1);
-        private readonly SemaphoreSlim _onDvarActionComplete = new(1, 1);
         private bool _successfullyLoaded;
         private readonly List<string> _registeredCommandNames;
         private readonly ILogger _logger;
@@ -54,7 +59,7 @@ namespace IW4MAdmin.Application.Misc
             Watcher = new FileSystemWatcher
             {
                 Path = workingDirectory ?? $"{Utilities.OperatingDirectory}Plugins{Path.DirectorySeparatorChar}",
-                NotifyFilter = NotifyFilters.Size,
+                NotifyFilter = NotifyFilters.LastWrite,
                 Filter = _fileName.Split(Path.DirectorySeparatorChar).Last()
             };
 
@@ -69,7 +74,7 @@ namespace IW4MAdmin.Application.Misc
         }
 
         public async Task Initialize(IManager manager, IScriptCommandFactory scriptCommandFactory,
-            IScriptPluginServiceResolver serviceResolver)
+            IScriptPluginServiceResolver serviceResolver, IConfigurationHandlerV2<ScriptPluginConfiguration> configHandler)
         {
             try
             {
@@ -111,24 +116,35 @@ namespace IW4MAdmin.Application.Misc
                     }
                 }
 
+                _scriptEngine?.Dispose();
                 _scriptEngine = new Engine(cfg =>
-                    cfg.AllowClr(new[]
+                    cfg.AddExtensionMethods(typeof(Utilities), typeof(Enumerable), typeof(Queryable),
+                            typeof(ScriptPluginExtensions))
+                        .AllowClr(new[]
                         {
                             typeof(System.Net.Http.HttpClient).Assembly,
                             typeof(EFClient).Assembly,
                             typeof(Utilities).Assembly,
                             typeof(Encoding).Assembly,
-                            typeof(CancellationTokenSource).Assembly
+                            typeof(CancellationTokenSource).Assembly,
+                            typeof(Data.Models.Client.EFClient).Assembly,
+                            typeof(IW4MAdmin.Plugins.Stats.Plugin).Assembly
                         })
                         .CatchClrExceptions()
                         .AddObjectConverter(new PermissionLevelToStringConverter()));
 
                 _scriptEngine.Execute(script);
+                if (!_scriptEngine.GetValue("init").IsUndefined())
+                {
+                    // this is a v2 plugin and we don't want to try to load it
+                    Watcher.EnableRaisingEvents = false;
+                    Watcher.Dispose();
+                    return;
+                }
                 _scriptEngine.SetValue("_localization", Utilities.CurrentLocalization);
                 _scriptEngine.SetValue("_serviceResolver", serviceResolver);
-                _scriptEngine.SetValue("_lock", _onProcessing);
                 dynamic pluginObject = _scriptEngine.Evaluate("plugin").ToObject();
-
+                
                 Author = pluginObject.author;
                 Name = pluginObject.name;
                 Version = (float)pluginObject.version;
@@ -162,11 +178,19 @@ namespace IW4MAdmin.Application.Misc
                     }
                 }
 
+                async Task<bool> OnLoadTask()
+                {
+                    await OnLoadAsync(manager);
+                    return true;
+                }
+
+                var loadComplete = false;
+                
                 try
                 {
                     if (pluginObject.isParser)
                     {
-                        await OnLoadAsync(manager);
+                        loadComplete = await OnLoadTask();
                         IsParser = true;
                         var eventParser = (IEventParser)_scriptEngine.Evaluate("eventParser").ToObject();
                         var rconParser = (IRConParser)_scriptEngine.Evaluate("rconParser").ToObject();
@@ -177,32 +201,35 @@ namespace IW4MAdmin.Application.Misc
 
                 catch (RuntimeBinderException)
                 {
-                    var configWrapper = new ScriptPluginConfigurationWrapper(Name, _scriptEngine);
-                    await configWrapper.InitializeAsync();
-                    _scriptEngine.SetValue("_configHandler", configWrapper);
-                    await OnLoadAsync(manager);
+                    var configWrapper = new ScriptPluginConfigurationWrapper(Name, _scriptEngine, configHandler);
+
+                    if (!loadComplete)
+                    {
+                        _scriptEngine.SetValue("_configHandler", configWrapper);
+                        loadComplete = await OnLoadTask();
+                    }
                 }
 
-                if (!firstRun)
+                if (!firstRun && !loadComplete)
                 {
-                    await OnLoadAsync(manager);
+                    loadComplete = await OnLoadTask();
                 }
 
-                _successfullyLoaded = true;
+                _successfullyLoaded = loadComplete;
             }
             catch (JavaScriptException ex)
             {
                 _logger.LogError(ex,
-                    "Encountered JavaScript runtime error while executing {MethodName} for script plugin {Plugin} at {@LocationInfo}",
-                    nameof(Initialize), Path.GetFileName(_fileName), ex.Location);
+                    "Encountered JavaScript runtime error while executing {MethodName} for script plugin {Plugin} at {@LocationInfo} StackTrace={StackTrace}",
+                    nameof(Initialize), Path.GetFileName(_fileName), ex.Location, ex.JavaScriptStackTrace);
 
                 throw new PluginException("An error occured while initializing script plugin");
             }
             catch (Exception ex) when (ex.InnerException is JavaScriptException jsEx)
             {
                 _logger.LogError(ex,
-                    "Encountered JavaScript runtime error while executing {MethodName} for script plugin {Plugin} initialization {@LocationInfo}",
-                    nameof(Initialize), _fileName, jsEx.Location);
+                    "Encountered JavaScript runtime error while executing {MethodName} for script plugin {Plugin} initialization {@LocationInfo} StackTrace={StackTrace}",
+                    nameof(Initialize), _fileName, jsEx.Location, jsEx.JavaScriptStackTrace);
 
                 throw new PluginException("An error occured while initializing script plugin");
             }
@@ -230,42 +257,23 @@ namespace IW4MAdmin.Application.Misc
                 return;
             }
 
+            var shouldRelease = false;
+
             try
             {
-                await _onProcessing.WaitAsync();
-                _scriptEngine.SetValue("_gameEvent", gameEvent);
-                _scriptEngine.SetValue("_server", server);
-                _scriptEngine.SetValue("_IW4MAdminClient", Utilities.IW4MAdminClient(server));
-                _scriptEngine.Evaluate("plugin.onEventAsync(_gameEvent, _server)");
-            }
-
-            catch (JavaScriptException ex)
-            {
-                using (LogContext.PushProperty("Server", server.ToString()))
+                await _onProcessing.WaitAsync(Utilities.DefaultCommandTimeout / 2);
+                shouldRelease = true;
+                WrapJavaScriptErrorHandling(() =>
                 {
-                    _logger.LogError(ex,
-                        "Encountered JavaScript runtime error while executing {MethodName} for script plugin {Plugin} with event type {EventType} {@LocationInfo}",
-                        nameof(OnEventAsync), Path.GetFileName(_fileName), gameEvent.Type, ex.Location);
-                }
-
-                throw new PluginException("An error occured while executing action for script plugin");
+                    _scriptEngine.SetValue("_gameEvent", gameEvent);
+                    _scriptEngine.SetValue("_server", server);
+                    _scriptEngine.SetValue("_IW4MAdminClient", Utilities.IW4MAdminClient(server));
+                    return _scriptEngine.Evaluate("plugin.onEventAsync(_gameEvent, _server)");
+                }, new { EventType = gameEvent.Type }, server);
             }
-
-            catch (Exception ex)
-            {
-                using (LogContext.PushProperty("Server", server.ToString()))
-                {
-                    _logger.LogError(ex,
-                        "Encountered error while running {MethodName} for script plugin {Plugin} with event type {EventType}",
-                        nameof(OnEventAsync), _fileName, gameEvent.Type);
-                }
-
-                throw new PluginException("An error occured while executing action for script plugin");
-            }
-
             finally
             {
-                if (_onProcessing.CurrentCount == 0)
+                if (_onProcessing.CurrentCount == 0 && shouldRelease)
                 {
                     _onProcessing.Release(1);
                 }
@@ -274,79 +282,36 @@ namespace IW4MAdmin.Application.Misc
 
         public Task OnLoadAsync(IManager manager)
         {
-            try
+            _logger.LogDebug("OnLoad executing for {Name}", Name);
+
+            WrapJavaScriptErrorHandling(() =>
             {
-                _logger.LogDebug("OnLoad executing for {Name}", Name);
                 _scriptEngine.SetValue("_manager", manager);
-                _scriptEngine.SetValue("getDvar", BeginGetDvar);
-                _scriptEngine.SetValue("setDvar", BeginSetDvar);
-                _scriptEngine.Evaluate("plugin.onLoadAsync(_manager)");
-
-                return Task.CompletedTask;
-            }
-            catch (JavaScriptException ex)
-            {
-                _logger.LogError(ex,
-                    "Encountered JavaScript runtime error while executing {MethodName} for script plugin {Plugin} at {@LocationInfo}",
-                    nameof(OnLoadAsync), Path.GetFileName(_fileName), ex.Location);
-
-                throw new PluginException("A runtime error occured while executing action for script plugin");
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex,
-                    "Encountered JavaScript runtime error while executing {MethodName} for script plugin {Plugin}",
-                    nameof(OnLoadAsync), Path.GetFileName(_fileName));
-
-                throw new PluginException("An error occured while executing action for script plugin");
-            }
-        }
-
-        public async Task OnTickAsync(Server server)
-        {
-            _scriptEngine.SetValue("_server", server);
-            await Task.FromResult(_scriptEngine.Evaluate("plugin.onTickAsync(_server)"));
-        }
-
-        public Task OnUnloadAsync()
-        {
-            if (!_successfullyLoaded)
-            {
-                return Task.CompletedTask;
-            }
-
-            try
-            {
-                _scriptEngine.Evaluate("plugin.onUnloadAsync()");
-            }
-            catch (JavaScriptException ex)
-            {
-                _logger.LogError(ex,
-                    "Encountered JavaScript runtime error while executing {MethodName} for script plugin {Plugin} at {@LocationInfo}",
-                    nameof(OnUnloadAsync), Path.GetFileName(_fileName), ex.Location);
-
-                throw new PluginException("A runtime error occured while executing action for script plugin");
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex,
-                    "Encountered JavaScript runtime error while executing {MethodName} for script plugin {Plugin}",
-                    nameof(OnUnloadAsync), Path.GetFileName(_fileName));
-
-                throw new PluginException("An error occured while executing action for script plugin");
-            }
+                return _scriptEngine.Evaluate("plugin.onLoadAsync(_manager)");
+            });
 
             return Task.CompletedTask;
         }
 
-        public T ExecuteAction<T>(Delegate action, params object[] param)
+        public Task OnTickAsync(Server server)
         {
+            return Task.CompletedTask;
+        }
+
+        public async Task OnUnloadAsync()
+        {
+            if (!_successfullyLoaded)
+            {
+                return;
+            }
+
             try
             {
-                _onProcessing.Wait();
-                var args = param.Select(p => JsValue.FromObject(_scriptEngine, p)).ToArray();
-                var result = action.DynamicInvoke(JsValue.Undefined, args);
-                return (T)(result as JsValue)?.ToObject();
+                await _onProcessing.WaitAsync();
+
+                _logger.LogDebug("OnUnload executing for {Name}", Name);
+
+                WrapJavaScriptErrorHandling(() => _scriptEngine.Evaluate("plugin.onUnloadAsync()"));
             }
             finally
             {
@@ -356,18 +321,69 @@ namespace IW4MAdmin.Application.Misc
                 }
             }
         }
-        
-        public T WrapDelegate<T>(Delegate act, params object[] args)
+
+        public T ExecuteAction<T>(Delegate action, CancellationToken token, params object[] param)
         {
+            var shouldRelease = false;
+            
             try
             {
-                _onProcessing.Wait();
-                return (T)(act.DynamicInvoke(JsValue.Null,
-                    args.Select(arg => JsValue.FromObject(_scriptEngine, arg)).ToArray()) as ObjectWrapper)?.ToObject();
+                using var forceTimeout = new CancellationTokenSource(5000);
+                using var combined = CancellationTokenSource.CreateLinkedTokenSource(forceTimeout.Token, token);
+                _onProcessing.Wait(combined.Token);
+                shouldRelease = true;
+                
+                _logger.LogDebug("Executing action for {Name}", Name);
+                
+                return WrapJavaScriptErrorHandling(T() =>
+                    {
+                        var args = param.Select(p => JsValue.FromObject(_scriptEngine, p)).ToArray();
+                        var result = action.DynamicInvoke(JsValue.Undefined, args);
+                        return (T)(result as JsValue)?.ToObject();
+                    },
+         new
+                    {
+                        Params = string.Join(", ",
+                            param?.Select(eachParam => $"Type={eachParam?.GetType().Name} Value={eachParam}") ??
+                            Enumerable.Empty<string>())
+                    });
             }
             finally
             {
-                if (_onProcessing.CurrentCount == 0)
+                if (_onProcessing.CurrentCount == 0 && shouldRelease)
+                {
+                    _onProcessing.Release(1);
+                }
+            }
+        }
+
+        public T WrapDelegate<T>(Delegate act, CancellationToken token, params object[] args)
+        {
+            var shouldRelease = false;
+            
+            try
+            {
+                using var forceTimeout = new CancellationTokenSource(5000);
+                using var combined = CancellationTokenSource.CreateLinkedTokenSource(forceTimeout.Token, token);
+                _onProcessing.Wait(combined.Token);
+                shouldRelease = true;
+
+                _logger.LogDebug("Wrapping delegate action for {Name}", Name);
+
+                return WrapJavaScriptErrorHandling(
+                    T() => (T)(act.DynamicInvoke(JsValue.Null,
+                            args.Select(arg => JsValue.FromObject(_scriptEngine, arg)).ToArray()) as ObjectWrapper)
+                        ?.ToObject(),
+                    new
+                    {
+                        Params = string.Join(", ",
+                            args?.Select(eachParam => $"Type={eachParam?.GetType().Name} Value={eachParam}") ??
+                            Enumerable.Empty<string>())
+                    });
+            }
+            finally
+            {
+                if (_onProcessing.CurrentCount == 0 && shouldRelease)
                 {
                     _onProcessing.Release(1);
                 }
@@ -392,11 +408,17 @@ namespace IW4MAdmin.Application.Misc
                 string name = dynamicCommand.name;
                 string alias = dynamicCommand.alias;
                 string description = dynamicCommand.description;
+
+                if (dynamicCommand.permission is Data.Models.Client.EFClient.Permission perm)
+                {
+                    dynamicCommand.permission = perm.ToString();
+                }
+
                 string permission = dynamicCommand.permission;
-                List<Server.Game> supportedGames = null;
+                List<Reference.Game> supportedGames = null;
                 var targetRequired = false;
 
-                var args = new List<(string, bool)>();
+                var args = new List<CommandArgument>();
                 dynamic arguments = null;
 
                 try
@@ -423,7 +445,7 @@ namespace IW4MAdmin.Application.Misc
                 {
                     foreach (var arg in dynamicCommand.arguments)
                     {
-                        args.Add((arg.name, (bool)arg.required));
+                        args.Add(new CommandArgument { Name = arg.name, Required = (bool)arg.required });
                     }
                 }
 
@@ -431,8 +453,8 @@ namespace IW4MAdmin.Application.Misc
                 {
                     foreach (var game in dynamicCommand.supportedGames)
                     {
-                        supportedGames ??= new List<Server.Game>();
-                        supportedGames.Add(Enum.Parse(typeof(Server.Game), game.ToString()));
+                        supportedGames ??= new List<Reference.Game>();
+                        supportedGames.Add(Enum.Parse(typeof(Reference.Game), game.ToString()));
                     }
                 }
                 catch (RuntimeBinderException)
@@ -475,7 +497,6 @@ namespace IW4MAdmin.Application.Misc
                         throw new PluginException("An error occured while executing action for script plugin");
                     }
 
-
                     finally
                     {
                         if (_onProcessing.CurrentCount == 0)
@@ -486,139 +507,46 @@ namespace IW4MAdmin.Application.Misc
                 }
 
                 commandList.Add(scriptCommandFactory.CreateScriptCommand(name, alias, description, permission,
-                    targetRequired, args, Execute, supportedGames?.ToArray()));
+                    targetRequired, args, Execute, supportedGames));
             }
 
             return commandList;
         }
 
-        private void BeginGetDvar(Server server, string dvarName, Delegate onCompleted)
+        private T WrapJavaScriptErrorHandling<T>(Func<T> work, object additionalData = null, Server server = null,
+            [CallerMemberName] string methodName = "")
         {
-            void OnComplete(IAsyncResult result)
+            using (LogContext.PushProperty("Server", server?.ToString()))
             {
                 try
                 {
-                    var (success, value) = (ValueTuple<bool, string>)result.AsyncState;
-
-                    _logger.LogDebug("Waiting for onDvarActionComplete -> get");
-                    _onDvarActionComplete.Wait();
-                    _logger.LogDebug("Completed wait for onDvarActionComplete -> get");
-
-                    onCompleted.DynamicInvoke(JsValue.Undefined,
-                        new[]
-                        {
-                            JsValue.FromObject(_scriptEngine, server),
-                            JsValue.FromObject(_scriptEngine, dvarName),
-                            JsValue.FromObject(_scriptEngine, value),
-                            JsValue.FromObject(_scriptEngine, success)
-                        });
+                    return work();
                 }
                 catch (JavaScriptException ex)
                 {
-                    using (LogContext.PushProperty("Server", server.ToString()))
-                    {
-                        _logger.LogError(ex, "Could complete BeginGetDvar for {Filename} {@Location}",
-                            Path.GetFileName(_fileName), ex.Location);
-                    }
+                    _logger.LogError(ex,
+                        "Encountered JavaScript runtime error while executing {MethodName} for script plugin {Plugin} at {@LocationInfo} StackTrace={StackTrace} {@AdditionalData}",
+                        methodName, Path.GetFileName(_fileName), ex.Location, ex.StackTrace, additionalData);
+
+                    throw new PluginException("A runtime error occured while executing action for script plugin");
+                }
+                catch (Exception ex) when (ex.InnerException is JavaScriptException jsEx)
+                {
+                    _logger.LogError(ex,
+                        "Encountered JavaScript runtime error while executing {MethodName} for script plugin {Plugin} initialization {@LocationInfo} StackTrace={StackTrace} {@AdditionalData}",
+                        methodName, _fileName, jsEx.Location, jsEx.JavaScriptStackTrace, additionalData);
+
+                    throw new PluginException("A runtime error occured while executing action for script plugin");
                 }
                 catch (Exception ex)
                 {
-                    _logger.LogError(ex, "Could not complete {BeginGetDvar} for {Class}", nameof(BeginGetDvar), Name);
-                }
-                finally
-                {
-                    if (_onDvarActionComplete.CurrentCount == 0)
-                    {
-                        _onDvarActionComplete.Release();
-                    }
+                    _logger.LogError(ex,
+                        "Encountered JavaScript runtime error while executing {MethodName} for script plugin {Plugin}",
+                        methodName, Path.GetFileName(_fileName));
+
+                    throw new PluginException("An error occured while executing action for script plugin");
                 }
             }
-
-            var tokenSource = new CancellationTokenSource();
-            tokenSource.CancelAfter(TimeSpan.FromSeconds(15));
-            
-            server.BeginGetDvar(dvarName, result =>
-            {
-                var shouldRelease = false;
-                try
-                {
-                    _onProcessing.Wait(tokenSource.Token);
-                    shouldRelease = true;
-                }
-
-                finally
-                {
-                    OnComplete(result);
-
-                    if (_onProcessing.CurrentCount == 0 && shouldRelease)
-                    {
-                        _onProcessing.Release();
-                    }
-                }
-            }, tokenSource.Token);
-        }
-
-        private void BeginSetDvar(Server server, string dvarName, string dvarValue, Delegate onCompleted)
-        {
-            var tokenSource = new CancellationTokenSource();
-            tokenSource.CancelAfter(TimeSpan.FromSeconds(15));
-            
-            void OnComplete(IAsyncResult result)
-            {
-                try
-                {
-                    var success = (bool)result.AsyncState;
-                    
-                    _logger.LogDebug("Waiting for onDvarActionComplete -> set");
-                    _onDvarActionComplete.Wait();
-                    _logger.LogDebug("Completed wait for onDvarActionComplete -> set");
-                    onCompleted.DynamicInvoke(JsValue.Undefined,
-                        new[]
-                        {
-                            JsValue.FromObject(_scriptEngine, server),
-                            JsValue.FromObject(_scriptEngine, dvarName),
-                            JsValue.FromObject(_scriptEngine, dvarValue),
-                            JsValue.FromObject(_scriptEngine, success)
-                        });
-                }
-                catch (JavaScriptException ex)
-                {
-                    using (LogContext.PushProperty("Server", server.ToString()))
-                    {
-                        _logger.LogError(ex, "Could complete BeginSetDvar for {Filename} {@Location}",
-                            Path.GetFileName(_fileName), ex.Location);
-                    }
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError(ex, "Could not complete {BeginSetDvar} for {Class}", nameof(BeginSetDvar), Name);
-                }
-                finally
-                {
-                    if (_onDvarActionComplete.CurrentCount == 0)
-                    {
-                        _onDvarActionComplete.Release();
-                    }
-                }
-            }
-            
-            server.BeginSetDvar(dvarName, dvarValue, result =>
-            {
-                var shouldRelease = false;
-                try
-                {
-                    _onProcessing.Wait(tokenSource.Token);
-                    shouldRelease = true;
-                }
-                finally
-                {
-                    OnComplete(result);
-                    if (_onProcessing.CurrentCount == 0 && shouldRelease)
-                    {
-                        _onProcessing.Release();
-                    }
-                }
-            }, tokenSource.Token);
         }
     }
 
@@ -632,7 +560,6 @@ namespace IW4MAdmin.Application.Misc
                 return true;
             }
 
-
             result = JsValue.Null;
             return false;
         }

Application/Plugin/Script/ScriptPluginConfigurationWrapper.cs

@@ -0,0 +1,130 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text.Json;
+using System.Threading.Tasks;
+using IW4MAdmin.Application.Configuration;
+using Jint;
+using Jint.Native;
+using Jint.Native.Json;
+using SharedLibraryCore.Interfaces;
+
+namespace IW4MAdmin.Application.Plugin.Script;
+
+public class ScriptPluginConfigurationWrapper
+{
+    public event Action<JsValue, Delegate> ConfigurationUpdated;
+    
+    private readonly ScriptPluginConfiguration _config;
+    private readonly IConfigurationHandlerV2<ScriptPluginConfiguration> _configHandler;
+    private readonly Engine _scriptEngine;
+    private readonly JsonParser _engineParser;
+    private readonly List<(string, Delegate)> _updateCallbackActions = new();
+    private string _pluginName;
+
+    public ScriptPluginConfigurationWrapper(string pluginName, Engine scriptEngine, IConfigurationHandlerV2<ScriptPluginConfiguration> configHandler)
+    {
+        _pluginName = pluginName;
+        _scriptEngine = scriptEngine;
+        _configHandler = configHandler;
+        _configHandler.Updated += OnConfigurationUpdated; 
+        _config = configHandler.Get("ScriptPluginSettings", new ScriptPluginConfiguration()).GetAwaiter().GetResult();
+        _engineParser = new JsonParser(_scriptEngine);
+    }
+
+    ~ScriptPluginConfigurationWrapper()
+    {
+        _configHandler.Updated -= OnConfigurationUpdated;
+    }
+    
+    public void SetName(string name)
+    {
+        _pluginName = name;
+    }
+
+    public async Task SetValue(string key, object value)
+    {
+        var castValue = value;
+
+        if (value is double doubleValue)
+        {
+            castValue = AsInteger(doubleValue) ?? value;
+        }
+
+        if (value is object[] array && array.All(item => item is double d && AsInteger(d) != null))
+        {
+            castValue = array.Select(item => AsInteger((double)item)).ToArray();
+        }
+
+        if (!_config.ContainsKey(_pluginName))
+        {
+            _config.Add(_pluginName, new Dictionary<string, object>());
+        }
+
+        var plugin = _config[_pluginName];
+
+        if (plugin.ContainsKey(key))
+        {
+            plugin[key] = castValue;
+        }
+
+        else
+        {
+            plugin.Add(key, castValue);
+        }
+
+        await _configHandler.Set(_config);
+    }
+    
+    public JsValue GetValue(string key) => GetValue(key, null);
+
+    public JsValue GetValue(string key, Delegate updateCallback)
+    {
+        if (!_config.ContainsKey(_pluginName))
+        {
+            return JsValue.Undefined;
+        }
+
+        if (!_config[_pluginName].ContainsKey(key))
+        {
+            return JsValue.Undefined;
+        }
+
+        var item = _config[_pluginName][key];
+
+        if (item is JsonElement { ValueKind: JsonValueKind.Array } jElem)
+        {
+            item = jElem.Deserialize<List<dynamic>>();
+        }
+
+        if (updateCallback is not null)
+        {
+            _updateCallbackActions.Add((key, updateCallback));
+        }
+
+        try
+        {
+            return _engineParser.Parse(item!.ToString()!);
+        }
+        catch
+        {
+            // ignored
+        }
+        
+        return JsValue.FromObject(_scriptEngine, item);
+    }
+        
+    private static int? AsInteger(double value)
+    {
+        return int.TryParse(value.ToString(CultureInfo.InvariantCulture), out var parsed) ? parsed : null;
+    }
+    
+    private void OnConfigurationUpdated(ScriptPluginConfiguration config)
+    {
+        foreach (var callback in _updateCallbackActions)
+        {
+            ConfigurationUpdated?.Invoke(GetValue(callback.Item1), callback.Item2);
+        }
+    }
+}

Application/Plugin/Script/ScriptPluginFactory.cs

@@ -0,0 +1,32 @@
+using System;
+using IW4MAdmin.Application.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using SharedLibraryCore.Interfaces;
+
+namespace IW4MAdmin.Application.Plugin.Script;
+
+public class ScriptPluginFactory : IScriptPluginFactory
+{
+    private readonly IServiceProvider _serviceProvider;
+
+    public ScriptPluginFactory(IServiceProvider serviceProvider)
+    {
+        _serviceProvider = serviceProvider;
+    }
+
+    public object CreateScriptPlugin(Type type, string fileName)
+    {
+        if (type == typeof(IPlugin))
+        {
+            return new ScriptPlugin(_serviceProvider.GetRequiredService<ILogger<ScriptPlugin>>(),
+                fileName);
+        }
+
+        return new ScriptPluginV2(fileName, _serviceProvider.GetRequiredService<ILogger<ScriptPluginV2>>(),
+            _serviceProvider.GetRequiredService<IScriptPluginServiceResolver>(),
+            _serviceProvider.GetRequiredService<IScriptCommandFactory>(),
+            _serviceProvider.GetRequiredService<IConfigurationHandlerV2<ScriptPluginConfiguration>>(),
+            _serviceProvider.GetRequiredService<IInteractionRegistration>());
+    }
+}

Application/Plugin/Script/ScriptPluginHelper.cs

@@ -0,0 +1,138 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Net.Http;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Jint.Native;
+using SharedLibraryCore.Interfaces;
+
+namespace IW4MAdmin.Application.Plugin.Script;
+
+public class ScriptPluginHelper
+{
+    private readonly IManager _manager;
+    private readonly ScriptPluginV2 _scriptPlugin;
+    private readonly SemaphoreSlim _onRequestRunning = new(1, 5);
+    private const int RequestTimeout = 500;
+
+    public ScriptPluginHelper(IManager manager, ScriptPluginV2 scriptPlugin)
+    {
+        _manager = manager;
+        _scriptPlugin = scriptPlugin;
+    }
+
+    public void GetUrl(string url, Delegate callback)
+    {
+        RequestUrl(new ScriptPluginWebRequest(url), callback);
+    }
+    
+    public void GetUrl(string url, string bearerToken, Delegate callback)
+    {
+        var headers = new Dictionary<string, string> { { "Authorization", $"Bearer {bearerToken}" } };
+        RequestUrl(new ScriptPluginWebRequest(url, Headers: headers), callback);
+    }
+    
+    public void PostUrl(string url, string body, string bearerToken, Delegate callback)
+    {
+        var headers = new Dictionary<string, string> { { "Authorization", $"Bearer {bearerToken}" } };
+        RequestUrl(
+            new ScriptPluginWebRequest(url, body, "POST", Headers: headers), callback);
+    }
+
+    public void RequestUrl(ScriptPluginWebRequest request, Delegate callback)
+    {
+        Task.Run(() =>
+        {
+            try
+            {
+                var response = RequestInternal(request);
+                _scriptPlugin.ExecuteWithErrorHandling(scriptEngine =>
+                {
+                    callback.DynamicInvoke(JsValue.Undefined, new[] { JsValue.FromObject(scriptEngine, response) });
+                });
+            }
+            catch
+            {
+                // ignored
+            }
+        });
+    }
+
+    public void RequestNotifyAfterDelay(int delayMs, Delegate callback)
+    {
+        Task.Run(async () =>
+        {
+            try
+            {
+                await Task.Delay(delayMs, _manager.CancellationToken);
+                _scriptPlugin.ExecuteWithErrorHandling(_ => callback.DynamicInvoke(JsValue.Undefined));
+            }
+            catch
+            {
+                //  ignored
+            }
+        });
+    }
+
+    private object RequestInternal(ScriptPluginWebRequest request)
+    {
+        var entered = false;
+        using var tokenSource = new CancellationTokenSource(RequestTimeout);
+        using var client = new HttpClient();
+
+        try
+        {
+            _onRequestRunning.Wait(tokenSource.Token);
+            
+            entered = true;
+            var requestMessage = new HttpRequestMessage(new HttpMethod(request.Method), request.Url);
+
+            if (request.Body is not null)
+            {
+                requestMessage.Content = new StringContent(request.Body.ToString() ?? string.Empty, Encoding.Default,
+                    request.ContentType ?? "text/plain");
+            }
+
+            if (request.Headers is not null)
+            {
+                foreach (var (key, value) in request.Headers)
+                {
+                    if (!string.IsNullOrWhiteSpace(key))
+                    {
+                        requestMessage.Headers.Add(key, value);
+                    }
+                }
+            }
+
+            var response = client.Send(requestMessage, tokenSource.Token);
+            using var reader = new StreamReader(response.Content.ReadAsStream());
+            return reader.ReadToEnd();
+        }
+        catch (HttpRequestException ex)
+        {
+            return new
+            {
+                ex.StatusCode,
+                ex.Message,
+                IsError = true
+            };
+        }
+        catch (Exception ex)
+        {
+            return new
+            {
+                ex.Message,
+                IsError = true
+            };
+        }
+        finally
+        {
+            if (entered)
+            {
+                _onRequestRunning.Release(1);
+            }
+        }
+    }
+}

Application/Plugin/Script/ScriptPluginServiceResolver.cs

@@ -1,8 +1,8 @@
-using SharedLibraryCore.Interfaces;
-using System;
+using System;
 using System.Linq;
+using SharedLibraryCore.Interfaces;
 
-namespace IW4MAdmin.Application.Misc
+namespace IW4MAdmin.Application.Plugin.Script
 {
     /// <summary>
     /// implementation of IScriptPluginServiceResolver
@@ -25,7 +25,7 @@ namespace IW4MAdmin.Application.Misc
         public object ResolveService(string serviceName, string[] genericParameters)
         {
             var serviceType = DetermineRootType(serviceName, genericParameters.Length);
-            var genericTypes = genericParameters.Select(_genericTypeParam => DetermineRootType(_genericTypeParam));
+            var genericTypes = genericParameters.Select(genericTypeParam => DetermineRootType(genericTypeParam));
             var resolvedServiceType = serviceType.MakeGenericType(genericTypes.ToArray());
             return _serviceProvider.GetService(resolvedServiceType);
         }
@@ -34,8 +34,8 @@ namespace IW4MAdmin.Application.Misc
         {
             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);
+            var generatedName = $"{serviceName}{(genericParamCount == 0 ? "" : $"`{genericParamCount}")}".ToLower();
+            var serviceType = typeCollection.FirstOrDefault(type => type.Name.ToLower() == generatedName);
 
             if (serviceType == null)
             {

Application/Plugin/Script/ScriptPluginTimerHelper.cs

@@ -6,18 +6,22 @@ using Microsoft.Extensions.Logging;
 using SharedLibraryCore.Interfaces;
 using ILogger = Microsoft.Extensions.Logging.ILogger;
 
-namespace IW4MAdmin.Application.Misc;
+namespace IW4MAdmin.Application.Plugin.Script;
 
+[Obsolete("This architecture is superseded by the request notify delay architecture")]
 public class ScriptPluginTimerHelper : IScriptPluginTimerHelper
 {
     private Timer _timer;
     private Action _actions;
     private Delegate _jsAction;
     private string _actionName;
+    private int _interval = DefaultInterval;
+    private long _waitingCount;
     private const int DefaultDelay = 0;
     private const int DefaultInterval = 1000;
+    private const int MaxWaiting = 10;
     private readonly ILogger _logger;
-    private readonly ManualResetEventSlim _onRunningTick = new();
+    private readonly SemaphoreSlim _onRunningTick = new(1, 1);
     private SemaphoreSlim _onDependentAction;
 
     public ScriptPluginTimerHelper(ILogger<ScriptPluginTimerHelper> logger)
@@ -31,6 +35,7 @@ public class ScriptPluginTimerHelper : IScriptPluginTimerHelper
         {
             Stop();
         }
+
         _onRunningTick.Dispose();
     }
 
@@ -50,13 +55,13 @@ public class ScriptPluginTimerHelper : IScriptPluginTimerHelper
         {
             throw new ArgumentException("Timer interval must be at least 20ms");
         }
-        
+
         Stop();
-        
+
         _logger.LogDebug("Starting script timer...");
 
-        _onRunningTick.Set();
         _timer ??= new Timer(callback => _actions(), null, delay, interval);
+        _interval = interval;
         IsRunning = true;
     }
 
@@ -76,7 +81,7 @@ public class ScriptPluginTimerHelper : IScriptPluginTimerHelper
         {
             return;
         }
-        
+
         _logger.LogDebug("Stopping script timer...");
         _timer.Change(Timeout.Infinite, Timeout.Infinite);
         _timer.Dispose();
@@ -100,54 +105,90 @@ public class ScriptPluginTimerHelper : IScriptPluginTimerHelper
 
         _jsAction = action;
         _actionName = actionName;
-        _actions = OnTick;
+        _actions = OnTickInternal;
     }
 
-    private void ReleaseThreads()
+    private void ReleaseThreads(bool releaseOnRunning, bool releaseOnDependent)
     {
-        _onRunningTick.Set();
-
-        if (_onDependentAction?.CurrentCount != 0)
+        if (releaseOnRunning && _onRunningTick.CurrentCount == 0)
         {
-            return;
+            _logger.LogDebug("-Releasing OnRunning for timer");
+            _onRunningTick.Release(1);
+        }
+
+        if (releaseOnDependent && _onDependentAction?.CurrentCount == 0)
+        {
+            _onDependentAction?.Release(1);
         }
-        _logger.LogDebug("-Releasing OnTick for timer");
-        _onDependentAction?.Release(1);
     }
-    private void OnTick()
+
+    private async void OnTickInternal()
     {
+        var releaseOnRunning = false;
+        var releaseOnDependent = false;
+
         try
         {
-            if (!_onRunningTick.IsSet)
+            try
+            {
+                if (Interlocked.Read(ref _waitingCount) > MaxWaiting)
+                {
+                    _logger.LogWarning("Reached max number of waiting count ({WaitingCount}) for {OnTick}",
+                        _waitingCount, nameof(OnTickInternal));
+                    return;
+                }
+
+                Interlocked.Increment(ref _waitingCount);
+                using var tokenSource1 = new CancellationTokenSource();
+                tokenSource1.CancelAfter(TimeSpan.FromMilliseconds(_interval));
+                await _onRunningTick.WaitAsync(tokenSource1.Token);
+                releaseOnRunning = true;
+            }
+            catch (OperationCanceledException)
             {
                 _logger.LogDebug("Previous {OnTick} is still running, so we are skipping this one",
-                    nameof(OnTick));
+                    nameof(OnTickInternal));
                 return;
             }
 
-            _onRunningTick.Reset();
+            using var tokenSource = new CancellationTokenSource();
+            tokenSource.CancelAfter(TimeSpan.FromSeconds(5));
+
+            try
+            {
+                // the js engine is not thread safe so we need to ensure we're not executing OnTick and OnEventAsync simultaneously
+                if (_onDependentAction is not null)
+                {
+                    await _onDependentAction.WaitAsync(tokenSource.Token);
+                    releaseOnDependent = true;
+                }
+            }
+            catch (OperationCanceledException)
+            {
+                _logger.LogWarning("Dependent action did not release in allotted time so we are cancelling this tick");
+                return;
+            }
 
-            // the js engine is not thread safe so we need to ensure we're not executing OnTick and OnEventAsync simultaneously
-            _onDependentAction?.Wait();
             _logger.LogDebug("+Running OnTick for timer");
             var start = DateTime.Now;
             _jsAction.DynamicInvoke(JsValue.Undefined, new[] { JsValue.Undefined });
             _logger.LogDebug("OnTick took {Time}ms", (DateTime.Now - start).TotalMilliseconds);
-            ReleaseThreads();
         }
-
-        catch (Exception ex) when (ex.InnerException is JavaScriptException jsex)
+        catch (Exception ex) when (ex.InnerException is JavaScriptException jsx)
         {
-            _logger.LogError(jsex,
-                "Could not execute timer tick for script action {ActionName} [@{LocationInfo}]", _actionName,
-                jsex.Location);
-            ReleaseThreads();
+            _logger.LogError(jsx,
+                "Could not execute timer tick for script action {ActionName} [{@LocationInfo}] [{@StackTrace}]",
+                _actionName,
+                jsx.Location, jsx.JavaScriptStackTrace);
         }
         catch (Exception ex)
         {
             _logger.LogError(ex, "Could not execute timer tick for script action {ActionName}", _actionName);
-            _onRunningTick.Set();
-            ReleaseThreads();
+        }
+        finally
+        {
+            ReleaseThreads(releaseOnRunning, releaseOnDependent);
+            Interlocked.Decrement(ref _waitingCount);
         }
     }
 

Application/Plugin/Script/ScriptPluginV2.cs

@@ -0,0 +1,579 @@
+using System;
+using System.Collections.Generic;
+using System.Dynamic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Data.Models;
+using IW4MAdmin.Application.Configuration;
+using IW4MAdmin.Application.Extensions;
+using Jint;
+using Jint.Native;
+using Jint.Runtime;
+using Jint.Runtime.Interop;
+using Microsoft.Extensions.Logging;
+using Serilog.Context;
+using SharedLibraryCore;
+using SharedLibraryCore.Commands;
+using SharedLibraryCore.Database.Models;
+using SharedLibraryCore.Events.Server;
+using SharedLibraryCore.Exceptions;
+using SharedLibraryCore.Interfaces;
+using SharedLibraryCore.Interfaces.Events;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
+using JavascriptEngine = Jint.Engine;
+
+namespace IW4MAdmin.Application.Plugin.Script;
+
+public class ScriptPluginV2 : IPluginV2
+{
+    public string Name { get; private set; } = string.Empty;
+    public string Author { get; private set; } = string.Empty;
+    public string Version { get; private set; }
+
+    private readonly string _fileName;
+    private readonly ILogger<ScriptPluginV2> _logger;
+    private readonly IScriptPluginServiceResolver _pluginServiceResolver;
+    private readonly IScriptCommandFactory _scriptCommandFactory;
+    private readonly IConfigurationHandlerV2<ScriptPluginConfiguration> _configHandler;
+    private readonly IInteractionRegistration _interactionRegistration;
+    private readonly SemaphoreSlim _onProcessingScript = new(1, 1);
+    private readonly SemaphoreSlim _onLoadingFile = new(1, 1);
+    private readonly FileSystemWatcher _scriptWatcher;
+    private readonly List<string> _registeredCommandNames = new();
+    private readonly List<string> _registeredInteractions = new();
+    private readonly Dictionary<MethodInfo, List<object>> _registeredEvents = new();
+    private bool _firstInitialization = true;
+
+    private record ScriptPluginDetails(string Name, string Author, string Version,
+        ScriptPluginCommandDetails[] Commands, ScriptPluginInteractionDetails[] Interactions);
+
+    private record ScriptPluginCommandDetails(string Name, string Description, string Alias, string Permission,
+        bool TargetRequired, CommandArgument[] Arguments, IEnumerable<Reference.Game> SupportedGames, Delegate Execute);
+
+    private JavascriptEngine ScriptEngine
+    {
+        get
+        {
+            lock (ActiveEngines)
+            {
+                return ActiveEngines[$"{GetHashCode()}-{_nextEngineId}"];
+            }
+        }
+    }
+
+    private record ScriptPluginInteractionDetails(string Name, Delegate Action);
+
+    private ScriptPluginConfigurationWrapper _scriptPluginConfigurationWrapper;
+    private int _nextEngineId;
+    private static readonly Dictionary<string, JavascriptEngine> ActiveEngines = new();
+
+    public ScriptPluginV2(string fileName, ILogger<ScriptPluginV2> logger,
+        IScriptPluginServiceResolver pluginServiceResolver, IScriptCommandFactory scriptCommandFactory,
+        IConfigurationHandlerV2<ScriptPluginConfiguration> configHandler,
+        IInteractionRegistration interactionRegistration)
+    {
+        _fileName = fileName;
+        _logger = logger;
+        _pluginServiceResolver = pluginServiceResolver;
+        _scriptCommandFactory = scriptCommandFactory;
+        _configHandler = configHandler;
+        _interactionRegistration = interactionRegistration;
+        _scriptWatcher = new FileSystemWatcher
+        {
+            Path = Path.Join(Utilities.OperatingDirectory, "Plugins"),
+            NotifyFilter = NotifyFilters.LastWrite,
+            Filter = _fileName.Split(Path.DirectorySeparatorChar).Last()
+        };
+
+        IManagementEventSubscriptions.Load += OnLoad;
+    }
+
+    public void ExecuteWithErrorHandling(Action<Engine> work)
+    {
+        WrapJavaScriptErrorHandling(() =>
+        {
+            work(ScriptEngine);
+            return true;
+        }, _logger, _fileName, _onProcessingScript);
+    }
+
+    public object QueryWithErrorHandling(Delegate action, params object[] args)
+    {
+        return WrapJavaScriptErrorHandling(() =>
+        {
+            var jsArgs = args?.Select(param => JsValue.FromObject(ScriptEngine, param)).ToArray();
+            var result = action.DynamicInvoke(JsValue.Undefined, jsArgs);
+            return result;
+        }, _logger, _fileName, _onProcessingScript);
+    }
+
+    private async Task OnLoad(IManager manager, CancellationToken token)
+    {
+        var entered = false;
+        try
+        {
+            await _onLoadingFile.WaitAsync(token);
+            entered = true;
+
+            _logger.LogDebug("{Method} executing for {Plugin}", nameof(OnLoad), _fileName);
+
+            if (new FileInfo(_fileName).Length == 0L)
+            {
+                return;
+            }
+
+            _scriptWatcher.EnableRaisingEvents = false;
+
+            UnregisterScriptEntities(manager);
+            ResetEngineState();
+
+            if (_firstInitialization)
+            {
+                _scriptWatcher.Changed += async (_, _) => await OnLoad(manager, token);
+                _firstInitialization = false;
+            }
+
+            await using var stream =
+                new FileStream(_fileName, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
+            using var reader = new StreamReader(stream, Encoding.Default);
+            var pluginScript = await reader.ReadToEndAsync();
+
+            var pluginDetails = WrapJavaScriptErrorHandling(() =>
+            {
+                if (IsEngineDisposed(GetHashCode(), _nextEngineId))
+                {
+                    return null;
+                }
+
+                ScriptEngine.Execute(pluginScript);
+#pragma warning disable CS8974
+                var initResult = ScriptEngine.Call("init", JsValue.FromObject(ScriptEngine, EventCallbackWrapper),
+                    JsValue.FromObject(ScriptEngine, _pluginServiceResolver),
+                    JsValue.FromObject(ScriptEngine, _scriptPluginConfigurationWrapper),
+                    JsValue.FromObject(ScriptEngine, new ScriptPluginHelper(manager, this)));
+#pragma warning restore CS8974
+
+                if (initResult.IsNull() || initResult.IsUndefined())
+                {
+                    return null;
+                }
+
+                return AsScriptPluginInstance(initResult.ToObject());
+            }, _logger, _fileName, _onProcessingScript);
+
+            if (pluginDetails is null)
+            {
+                _logger.LogInformation("No valid script plugin signature found for {FilePath}", _fileName);
+                return;
+            }
+
+            foreach (var command in pluginDetails.Commands)
+            {
+                RegisterCommand(manager, command);
+
+                _logger.LogDebug("Registered script plugin command {Command} for {Plugin}", command.Name,
+                    pluginDetails.Name);
+            }
+
+            foreach (var interaction in pluginDetails.Interactions)
+            {
+                RegisterInteraction(interaction);
+
+                _logger.LogDebug("Registered script plugin interaction {Interaction} for {Plugin}", interaction.Name,
+                    pluginDetails.Name);
+            }
+
+            Name = pluginDetails.Name;
+            Author = pluginDetails.Author;
+            Version = pluginDetails.Version;
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Unexpected error encountered loading script plugin {Name}", _fileName);
+        }
+        finally
+        {
+            if (entered)
+            {
+                _onLoadingFile.Release(1);
+                _scriptWatcher.EnableRaisingEvents = true;
+            }
+
+            _logger.LogDebug("{Method} completed for {Plugin}", nameof(OnLoad), _fileName);
+        }
+    }
+
+    private void RegisterInteraction(ScriptPluginInteractionDetails interaction)
+    {
+        Task<IInteractionData> Action(int? targetId, Reference.Game? game, CancellationToken token) =>
+            WrapJavaScriptErrorHandling(() =>
+            {
+                if (IsEngineDisposed(GetHashCode(), _nextEngineId))
+                {
+                    return null;
+                }
+
+                var args = new object[] { targetId, game, token }.Select(arg => JsValue.FromObject(ScriptEngine, arg))
+                    .ToArray();
+
+                if (interaction.Action.DynamicInvoke(JsValue.Undefined, args) is not ObjectWrapper result)
+                {
+                    throw new PluginException("Invalid interaction object returned");
+                }
+
+                return Task.FromResult((IInteractionData)result.ToObject());
+            }, _logger, _fileName, _onProcessingScript);
+
+        _interactionRegistration.RegisterInteraction(interaction.Name, Action);
+        _registeredInteractions.Add(interaction.Name);
+    }
+
+    private void RegisterCommand(IManager manager, ScriptPluginCommandDetails command)
+    {
+        Task Execute(GameEvent gameEvent) =>
+            WrapJavaScriptErrorHandling(() =>
+            {
+                if (IsEngineDisposed(GetHashCode(), _nextEngineId))
+                {
+                    return null;
+                }
+
+                command.Execute.DynamicInvoke(JsValue.Undefined,
+                    new[] { JsValue.FromObject(ScriptEngine, gameEvent) });
+                return Task.CompletedTask;
+            }, _logger, _fileName, _onProcessingScript);
+
+        var scriptCommand = _scriptCommandFactory.CreateScriptCommand(command.Name, command.Alias,
+            command.Description,
+            command.Permission, command.TargetRequired,
+            command.Arguments, Execute, command.SupportedGames);
+
+        manager.AddAdditionalCommand(scriptCommand);
+        _registeredCommandNames.Add(scriptCommand.Name);
+    }
+
+    private void ResetEngineState()
+    {
+        JavascriptEngine oldEngine = null;
+
+        lock (ActiveEngines)
+        {
+            if (ActiveEngines.ContainsKey($"{GetHashCode()}-{_nextEngineId}"))
+            {
+                oldEngine = ActiveEngines[$"{GetHashCode()}-{_nextEngineId}"];
+                _logger.LogDebug("Removing script engine from active list {HashCode}", _nextEngineId);
+                ActiveEngines.Remove($"{GetHashCode()}-{_nextEngineId}");
+            }
+        }
+
+        Interlocked.Increment(ref _nextEngineId);
+        oldEngine?.Dispose();
+        var newEngine = new JavascriptEngine(cfg =>
+            cfg.AddExtensionMethods(typeof(Utilities), typeof(Enumerable), typeof(Queryable),
+                    typeof(ScriptPluginExtensions), typeof(LoggerExtensions))
+                .AllowClr(typeof(System.Net.Http.HttpClient).Assembly, typeof(EFClient).Assembly,
+                    typeof(Utilities).Assembly, typeof(Encoding).Assembly, typeof(CancellationTokenSource).Assembly,
+                    typeof(Data.Models.Client.EFClient).Assembly, typeof(IW4MAdmin.Plugins.Stats.Plugin).Assembly, typeof(ScriptPluginWebRequest).Assembly)
+                .CatchClrExceptions()
+                .AddObjectConverter(new EnumsToStringConverter()));
+
+        lock (ActiveEngines)
+        {
+            _logger.LogDebug("Adding script engine to active list {HashCode}", _nextEngineId);
+            ActiveEngines.Add($"{GetHashCode()}-{_nextEngineId}", newEngine);
+        }
+
+        _scriptPluginConfigurationWrapper =
+            new ScriptPluginConfigurationWrapper(_fileName.Split(Path.DirectorySeparatorChar).Last(), ScriptEngine,
+                _configHandler);
+
+        _scriptPluginConfigurationWrapper.ConfigurationUpdated += (configValue, callbackAction) =>
+        {
+            WrapJavaScriptErrorHandling(() =>
+            {
+                callbackAction.DynamicInvoke(JsValue.Undefined, new[] { configValue });
+                return Task.CompletedTask;
+            }, _logger, _fileName, _onProcessingScript);
+        };
+    }
+
+    private void UnregisterScriptEntities(IManager manager)
+    {
+        foreach (var commandName in _registeredCommandNames)
+        {
+            manager.RemoveCommandByName(commandName);
+            _logger.LogDebug("Unregistered script plugin command {Command} for {Plugin}", commandName, Name);
+        }
+
+        _registeredCommandNames.Clear();
+
+        foreach (var interactionName in _registeredInteractions)
+        {
+            _interactionRegistration.UnregisterInteraction(interactionName);
+        }
+
+        _registeredInteractions.Clear();
+
+        foreach (var (removeMethod, subscriptions) in _registeredEvents)
+        {
+            foreach (var subscription in subscriptions)
+            {
+                removeMethod.Invoke(null, new[] { subscription });
+            }
+
+            subscriptions.Clear();
+        }
+
+        _registeredEvents.Clear();
+    }
+
+    private void EventCallbackWrapper(string eventCallbackName, Delegate javascriptAction)
+    {
+        var eventCategory = eventCallbackName.Split(".")[0];
+
+        var eventCategoryType = eventCategory switch
+        {
+            nameof(IManagementEventSubscriptions) => typeof(IManagementEventSubscriptions),
+            nameof(IGameEventSubscriptions) => typeof(IGameEventSubscriptions),
+            nameof(IGameServerEventSubscriptions) => typeof(IGameServerEventSubscriptions),
+            _ => null
+        };
+
+        if (eventCategoryType is null)
+        {
+            _logger.LogWarning("{EventCategory} is not a valid subscription category", eventCategory);
+            return;
+        }
+
+        var eventName = eventCallbackName.Split(".")[1];
+        var eventAddMethod = eventCategoryType.GetMethods()
+            .FirstOrDefault(method => method.Name.StartsWith($"add_{eventName}"));
+        var eventRemoveMethod = eventCategoryType.GetMethods()
+            .FirstOrDefault(method => method.Name.StartsWith($"remove_{eventName}"));
+
+        if (eventAddMethod is null || eventRemoveMethod is null)
+        {
+            _logger.LogWarning("{EventName} is not a valid subscription event", eventName);
+            return;
+        }
+
+        var genericType = eventAddMethod.GetParameters()[0].ParameterType.GetGenericArguments()[0];
+
+        var eventWrapper =
+            typeof(ScriptPluginV2).GetMethod(nameof(BuildEventWrapper), BindingFlags.Static | BindingFlags.NonPublic)!
+                .MakeGenericMethod(genericType)
+                .Invoke(null,
+                    new object[]
+                        { _logger, _fileName, javascriptAction, GetHashCode(), _nextEngineId, _onProcessingScript });
+
+        eventAddMethod.Invoke(null, new[] { eventWrapper });
+
+        if (!_registeredEvents.ContainsKey(eventRemoveMethod))
+        {
+            _registeredEvents.Add(eventRemoveMethod, new List<object> { eventWrapper });
+        }
+        else
+        {
+            _registeredEvents[eventRemoveMethod].Add(eventWrapper);
+        }
+    }
+
+    private static Func<TEventType, CancellationToken, Task> BuildEventWrapper<TEventType>(ILogger logger,
+        string fileName, Delegate javascriptAction, int hashCode, int engineId, SemaphoreSlim onProcessingScript)
+    {
+        return (coreEvent, token) =>
+        {
+            return WrapJavaScriptErrorHandling(() =>
+                {
+                    if (IsEngineDisposed(hashCode, engineId))
+                    {
+                        return Task.CompletedTask;
+                    }
+
+                    JavascriptEngine engine;
+
+                    lock (ActiveEngines)
+                    {
+                        engine = ActiveEngines[$"{hashCode}-{engineId}"];
+                    }
+
+                    var args = new object[] { coreEvent, token }
+                        .Select(param => JsValue.FromObject(engine, param))
+                        .ToArray();
+                    javascriptAction.DynamicInvoke(JsValue.Undefined, args);
+                    return Task.CompletedTask;
+                }, logger, fileName, onProcessingScript, (coreEvent as GameServerEvent)?.Server,
+                additionalData: coreEvent.GetType().Name);
+        };
+    }
+
+    private static bool IsEngineDisposed(int hashCode, int engineId)
+    {
+        lock (ActiveEngines)
+        {
+            return !ActiveEngines.ContainsKey($"{hashCode}-{engineId}");
+        }
+    }
+
+    private static TResultType WrapJavaScriptErrorHandling<TResultType>(Func<TResultType> work, ILogger logger,
+        string fileName, SemaphoreSlim onProcessingScript, IGameServer server = null, object additionalData = null,
+        bool throwException = false,
+        [CallerMemberName] string methodName = "")
+    {
+        using (LogContext.PushProperty("Server", server?.Id))
+        {
+            var waitCompleted = false;
+            try
+            {
+                onProcessingScript.Wait();
+                waitCompleted = true;
+                return work();
+            }
+            catch (JavaScriptException ex)
+            {
+                logger.LogError(ex,
+                    "Encountered JavaScript runtime error while executing {MethodName} for script plugin {Plugin} at {@LocationInfo} StackTrace={StackTrace} {@AdditionalData}",
+                    methodName, Path.GetFileName(fileName), ex.Location, ex.StackTrace, additionalData);
+
+                if (throwException)
+                {
+                    throw new PluginException("A runtime error occured while executing action for script plugin");
+                }
+            }
+            catch (Exception ex) when (ex.InnerException is JavaScriptException jsEx)
+            {
+                logger.LogError(ex,
+                    "Encountered JavaScript runtime error while executing {MethodName} for script plugin {Plugin} initialization {@LocationInfo} StackTrace={StackTrace} {@AdditionalData}",
+                    methodName, fileName, jsEx.Location, jsEx.JavaScriptStackTrace, additionalData);
+
+                if (throwException)
+                {
+                    throw new PluginException("A runtime error occured while executing action for script plugin");
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.LogError(ex,
+                    "Encountered JavaScript runtime error while executing {MethodName} for script plugin {Plugin}",
+                    methodName, Path.GetFileName(fileName));
+
+                if (throwException)
+                {
+                    throw new PluginException("An error occured while executing action for script plugin");
+                }
+            }
+            finally
+            {
+                if (waitCompleted)
+                {
+                    onProcessingScript.Release(1);
+                }
+            }
+        }
+
+        return default;
+    }
+
+    private static ScriptPluginDetails AsScriptPluginInstance(dynamic source)
+    {
+        var commandDetails = Array.Empty<ScriptPluginCommandDetails>();
+        if (HasProperty(source, "commands") && source.commands is dynamic[])
+        {
+            commandDetails = ((dynamic[])source.commands).Select(command =>
+            {
+                var commandArgs = Array.Empty<CommandArgument>();
+                if (HasProperty(command, "arguments") && command.arguments is dynamic[])
+                {
+                    commandArgs = ((dynamic[])command.arguments).Select(argument => new CommandArgument
+                    {
+                        Name = HasProperty(argument, "name") ? argument.name : string.Empty,
+                        Required = HasProperty(argument, "required") && argument.required is bool &&
+                                   (bool)argument.required
+                    }).ToArray();
+                }
+
+                var name = HasProperty(command, "name") && command.name is string
+                    ? (string)command.name
+                    : string.Empty;
+                var description = HasProperty(command, "description") && command.description is string
+                    ? (string)command.description
+                    : string.Empty;
+                var alias = HasProperty(command, "alias") && command.alias is string
+                    ? (string)command.alias
+                    : string.Empty;
+                var permission = HasProperty(command, "permission") && command.permission is string
+                    ? (string)command.permission
+                    : string.Empty;
+                var isTargetRequired = HasProperty(command, "targetRequired") && command.targetRequired is bool &&
+                                       (bool)command.targetRequired;
+                var supportedGames =
+                    HasProperty(command, "supportedGames") && command.supportedGames is IEnumerable<object>
+                        ? ((IEnumerable<object>)command.supportedGames).Where(game => game?.ToString() is not null)
+                        .Select(game =>
+                            Enum.Parse<Reference.Game>(game.ToString()!))
+                        : Array.Empty<Reference.Game>();
+                var execute = HasProperty(command, "execute") && command.execute is Delegate
+                    ? (Delegate)command.execute
+                    : (GameEvent _) => Task.CompletedTask;
+
+                return new ScriptPluginCommandDetails(name, description, alias, permission, isTargetRequired,
+                    commandArgs, supportedGames, execute);
+
+            }).ToArray();
+        }
+
+        var interactionDetails = Array.Empty<ScriptPluginInteractionDetails>();
+        if (HasProperty(source, "interactions") && source.interactions is dynamic[])
+        {
+            interactionDetails = ((dynamic[])source.interactions).Select(interaction =>
+            {
+                var name = HasProperty(interaction, "name") && interaction.name is string
+                    ? (string)interaction.name
+                    : string.Empty;
+                var action = HasProperty(interaction, "action") && interaction.action is Delegate
+                    ? (Delegate)interaction.action
+                    : null;
+
+                return new ScriptPluginInteractionDetails(name, action);
+            }).ToArray();
+        }
+
+        var name = HasProperty(source, "name") && source.name is string ? (string)source.name : string.Empty;
+        var author = HasProperty(source, "author") && source.author is string ? (string)source.author : string.Empty;
+        var version = HasProperty(source, "version") && source.version is string ? (string)source.author : string.Empty;
+
+        return new ScriptPluginDetails(name, author, version, commandDetails, interactionDetails);
+    }
+
+    private static bool HasProperty(dynamic source, string name)
+    {
+        Type objType = source.GetType();
+
+        if (objType == typeof(ExpandoObject))
+        {
+            return ((IDictionary<string, object>)source).ContainsKey(name);
+        }
+
+        return objType.GetProperty(name) != null;
+    }
+
+    public class EnumsToStringConverter : IObjectConverter
+    {
+        public bool TryConvert(Engine engine, object value, out JsValue result)
+        {
+            if (value is Enum)
+            {
+                result = value.ToString();
+                return true;
+            }
+
+            result = JsValue.Null;
+            return false;
+        }
+    }
+}

Application/Plugin/Script/ScriptPluginWebRequest.cs

@@ -0,0 +1,6 @@
+using System.Collections.Generic;
+
+namespace IW4MAdmin.Application.Plugin.Script;
+
+public record ScriptPluginWebRequest(string Url, object Body = null, string Method = "GET", string ContentType = "text/plain",
+    Dictionary<string, string> Headers = null);

Application/QueryHelpers/ClientResourceQueryHelper.cs

@@ -0,0 +1,290 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Threading.Tasks;
+using Data.Abstractions;
+using Data.Models;
+using Microsoft.EntityFrameworkCore;
+using SharedLibraryCore;
+using SharedLibraryCore.Dtos;
+using SharedLibraryCore.Helpers;
+using SharedLibraryCore.Interfaces;
+using WebfrontCore.QueryHelpers.Models;
+using EFClient = Data.Models.Client.EFClient;
+
+namespace IW4MAdmin.Application.QueryHelpers;
+
+public class ClientResourceQueryHelper : IResourceQueryHelper<ClientResourceRequest, ClientResourceResponse>
+{
+    private readonly IDatabaseContextFactory _contextFactory;
+    private readonly IGeoLocationService _geoLocationService;
+
+    private class ClientAlias
+    {
+        public EFClient Client { get; set; }
+        public EFAlias Alias { get; set; }
+    }
+
+    public ClientResourceQueryHelper(IDatabaseContextFactory contextFactory, IGeoLocationService geoLocationService)
+    {
+        _contextFactory = contextFactory;
+        _geoLocationService = geoLocationService;
+    }
+
+    public async Task<ResourceQueryHelperResult<ClientResourceResponse>> QueryResource(ClientResourceRequest query)
+    {
+        await using var context = _contextFactory.CreateContext(false);
+        var iqAliases = context.Aliases.AsQueryable();
+        var iqClients = context.Clients.AsQueryable();
+
+        var iqClientAliases = iqClients.Join(iqAliases, client => client.AliasLinkId, alias => alias.LinkId,
+            (client, alias) => new ClientAlias { Client = client, Alias = alias });
+
+        return await StartFromClient(query, iqClientAliases, iqClients);
+    }
+
+    private async Task<ResourceQueryHelperResult<ClientResourceResponse>> StartFromClient(ClientResourceRequest query,
+        IQueryable<ClientAlias> clientAliases, IQueryable<EFClient> iqClients)
+    {
+        if (!string.IsNullOrWhiteSpace(query.ClientGuid))
+        {
+            clientAliases = SearchByGuid(query, clientAliases);
+        }
+
+        if (query.ClientLevel is not null)
+        {
+            clientAliases = SearchByLevel(query, clientAliases);
+        }
+
+        if (query.ClientConnected is not null)
+        {
+            clientAliases = SearchByLastConnection(query, clientAliases);
+        }
+
+        if (query.GameName is not null)
+        {
+            clientAliases = SearchByGame(query, clientAliases);
+        }
+
+        if (!string.IsNullOrWhiteSpace(query.ClientName))
+        {
+            clientAliases = SearchByName(query, clientAliases);
+        }
+
+        if (!string.IsNullOrWhiteSpace(query.ClientIp))
+        {
+            clientAliases = SearchByIp(query, clientAliases);
+        }
+
+        var iqGroupedClientAliases = clientAliases.GroupBy(a => new { a.Client.ClientId, a.Client.LastConnection });
+
+        iqGroupedClientAliases = query.Direction == SortDirection.Descending
+            ? iqGroupedClientAliases.OrderByDescending(clientAlias => clientAlias.Key.LastConnection)
+            : iqGroupedClientAliases.OrderBy(clientAlias => clientAlias.Key.LastConnection);
+
+        var clientIds = iqGroupedClientAliases.Select(g => g.Key.ClientId)
+            .Skip(query.Offset)
+            .Take(query.Count);
+
+        // this pulls in more records than we need, but it's more efficient than ordering grouped entities
+        var clientLookups = await clientAliases
+            .Where(clientAlias => clientIds.Contains(clientAlias.Client.ClientId))
+            .Select(clientAlias => new ClientResourceResponse
+            {
+                ClientId = clientAlias.Client.ClientId,
+                AliasId = clientAlias.Alias.AliasId,
+                LinkId = clientAlias.Client.AliasLinkId,
+                CurrentClientName = clientAlias.Client.CurrentAlias.Name,
+                MatchedClientName = clientAlias.Alias.Name,
+                CurrentClientIp = clientAlias.Client.CurrentAlias.IPAddress,
+                MatchedClientIp = clientAlias.Alias.IPAddress,
+                ClientLevel = clientAlias.Client.Level.ToLocalizedLevelName(),
+                ClientLevelValue = clientAlias.Client.Level,
+                LastConnection = clientAlias.Client.LastConnection,
+                Game = clientAlias.Client.GameName
+            })
+            .ToListAsync();
+
+        var groupClients = clientLookups.GroupBy(x => x.ClientId);
+
+        var orderedClients = query.Direction == SortDirection.Descending
+            ? groupClients.OrderByDescending(SearchByAliasLocal(query.ClientName, query.ClientIp))
+            : groupClients.OrderBy(SearchByAliasLocal(query.ClientName, query.ClientIp));
+
+        var clients = orderedClients.Select(client => client.First()).ToList();
+        await ProcessAliases(query, clients);
+
+        return new ResourceQueryHelperResult<ClientResourceResponse>
+        {
+            Results = clients
+        };
+    }
+
+    private async Task ProcessAliases(ClientResourceRequest query, IEnumerable<ClientResourceResponse> clients)
+    {
+        await Parallel.ForEachAsync(clients, new ParallelOptions { MaxDegreeOfParallelism = 15 },
+            async (client, token) =>
+            {
+                if (!query.IncludeGeolocationData || client.CurrentClientIp is null)
+                {
+                    return;
+                }
+
+                var geolocationData = await _geoLocationService.Locate(client.CurrentClientIp.ConvertIPtoString());
+                client.ClientCountryCode = geolocationData.CountryCode;
+
+                if (!string.IsNullOrWhiteSpace(client.ClientCountryCode))
+                {
+                    client.ClientCountryDisplayName = geolocationData.Country;
+                }
+            });
+    }
+
+    private static Func<IGrouping<int, ClientResourceResponse>, DateTime> SearchByAliasLocal(string clientName,
+        string ipAddress)
+    {
+        return group =>
+        {
+            ClientResourceResponse match = null;
+            var lowercaseClientName = clientName?.ToLower();
+
+            if (!string.IsNullOrWhiteSpace(lowercaseClientName))
+            {
+                match = group.ToList().FirstOrDefault(SearchByNameLocal(lowercaseClientName));
+            }
+
+            if (match is null && !string.IsNullOrWhiteSpace(ipAddress))
+            {
+                match = group.ToList().FirstOrDefault(SearchByIpLocal(ipAddress));
+            }
+
+            return (match ?? group.First()).LastConnection;
+        };
+    }
+
+    private static Func<ClientResourceResponse, bool> SearchByNameLocal(string clientName)
+    {
+        return clientResourceResponse =>
+            clientResourceResponse.MatchedClientName.Contains(clientName);
+    }
+
+    private static Func<ClientResourceResponse, bool> SearchByIpLocal(string clientIp)
+    {
+        return clientResourceResponse => clientResourceResponse.MatchedClientIp.ConvertIPtoString().Contains(clientIp);
+    }
+
+    private static IQueryable<ClientAlias> SearchByName(ClientResourceRequest query,
+        IQueryable<ClientAlias> clientAliases)
+    {
+        var lowerCaseQueryName = query.ClientName.ToLower();
+
+        clientAliases = clientAliases.Where(query.IsExactClientName
+            ? ExactNameMatch(lowerCaseQueryName)
+            : LikeNameMatch(lowerCaseQueryName));
+
+        return clientAliases;
+    }
+
+    private static Expression<Func<ClientAlias, bool>> LikeNameMatch(string lowerCaseQueryName)
+    {
+        return clientAlias => EF.Functions.Like(
+            clientAlias.Alias.SearchableName,
+            $"%{lowerCaseQueryName}%") || EF.Functions.Like(
+            clientAlias.Alias.Name.ToLower(),
+            $"%{lowerCaseQueryName}%");
+    }
+
+    private static Expression<Func<ClientAlias, bool>> ExactNameMatch(string lowerCaseQueryName)
+    {
+        return clientAlias =>
+            lowerCaseQueryName == clientAlias.Alias.Name || lowerCaseQueryName == clientAlias.Alias.SearchableName;
+    }
+
+    private static IQueryable<ClientAlias> SearchByIp(ClientResourceRequest query,
+        IQueryable<ClientAlias> clientAliases)
+    {
+        var ipString = query.ClientIp.Trim();
+        var ipAddress = ipString.ConvertToIP();
+
+        if (ipAddress != null && ipString.Split('.').Length == 4 && query.IsExactClientIp)
+        {
+            clientAliases = clientAliases.Where(clientAlias =>
+                clientAlias.Alias.IPAddress != null && clientAlias.Alias.IPAddress == ipAddress);
+        }
+        else
+        {
+            clientAliases = clientAliases.Where(clientAlias =>
+                EF.Functions.Like(clientAlias.Alias.SearchableIPAddress, $"{ipString}%"));
+        }
+
+        return clientAliases;
+    }
+
+    private static IQueryable<ClientAlias> SearchByGuid(ClientResourceRequest query,
+        IQueryable<ClientAlias> clients)
+    {
+        var guidString = query.ClientGuid.Trim();
+        var parsedGuids = new List<long>();
+        long guid = 0;
+
+        try
+        {
+            guid = guidString.ConvertGuidToLong(NumberStyles.HexNumber, false, 0);
+        }
+        catch
+        {
+            // ignored
+        }
+
+        if (guid != 0)
+        {
+            parsedGuids.Add(guid);
+        }
+
+        try
+        {
+            guid = guidString.ConvertGuidToLong(NumberStyles.Integer, false, 0);
+        }
+        catch
+        {
+            // ignored
+        }
+
+        if (guid != 0)
+        {
+            parsedGuids.Add(guid);
+        }
+
+        if (!parsedGuids.Any())
+        {
+            return clients;
+        }
+
+        clients = clients.Where(client => parsedGuids.Contains(client.Client.NetworkId));
+        return clients;
+    }
+
+    private static IQueryable<ClientAlias> SearchByLevel(ClientResourceRequest query, IQueryable<ClientAlias> clients)
+    {
+        clients = clients.Where(clientAlias => clientAlias.Client.Level == query.ClientLevel);
+
+        return clients;
+    }
+
+    private static IQueryable<ClientAlias> SearchByLastConnection(ClientResourceRequest query,
+        IQueryable<ClientAlias> clients)
+    {
+        clients = clients.Where(clientAlias => clientAlias.Client.LastConnection >= query.ClientConnected);
+
+        return clients;
+    }
+
+    private static IQueryable<ClientAlias> SearchByGame(ClientResourceRequest query, IQueryable<ClientAlias> clients)
+    {
+        clients = clients.Where(clientAlias => clientAlias.Client.GameName == query.GameName);
+
+        return clients;
+    }
+}

Application/RConParsers/BaseRConParser.cs

@@ -147,7 +147,7 @@ namespace IW4MAdmin.Application.RConParsers
         {
             GetDvarAsync<string>(connection, dvarName, token: token).ContinueWith(action =>
             {
-                if (action.Exception is null && !action.IsCanceled)
+                if (action.IsCompletedSuccessfully)
                 {
                     callback?.Invoke(new AsyncResult
                     {

Application/SerialGameEventHandler.cs

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

Data/Abstractions/IDataValueCache.cs

@@ -11,10 +11,11 @@ namespace Data.Abstractions
         void SetCacheItem(Func<DbSet<TEntityType>, CancellationToken, Task<TReturnType>> itemGetter, string keyName,
             TimeSpan? expirationTime = null, bool autoRefresh = false);
 
-        void SetCacheItem(Func<DbSet<TEntityType>, CancellationToken, Task<TReturnType>> itemGetter, string keyName,
+        void SetCacheItem(Func<DbSet<TEntityType>, IEnumerable<object>, CancellationToken, Task<TReturnType>> itemGetter, string keyName,
             IEnumerable<object> ids = null, TimeSpan? expirationTime = null, bool autoRefresh = false);
 
         Task<TReturnType> GetCacheItem(string keyName, CancellationToken token = default);
-        Task<TReturnType> GetCacheItem(string keyName, object id = null, CancellationToken token = default);
+        
+        Task<TReturnType> GetCacheItem(string keyName, IEnumerable<object> ids = null, CancellationToken token = default);
     }
 }

Data/Context/DatabaseContext.cs

@@ -32,6 +32,7 @@ namespace Data.Context
         public DbSet<EFClientMessage> ClientMessages { get; set; }
         
         public DbSet<EFServerStatistics> ServerStatistics { get; set; }
+        public DbSet<EFClientStatistics> ClientStatistics { get; set; }
         public DbSet<EFHitLocation> HitLocations { get; set; }
         public DbSet<EFClientHitStatistic> HitStatistics { get; set; }
         public DbSet<EFWeapon> Weapons { get; set; }
@@ -87,7 +88,8 @@ namespace Data.Context
             // make network id unique
             modelBuilder.Entity<EFClient>(entity =>
             {
-                entity.HasIndex(e => e.NetworkId);
+                entity.HasIndex(client => client.NetworkId);
+                entity.HasIndex(client => client.LastConnection);
                 entity.HasAlternateKey(client => new
                 {
                     client.NetworkId,
@@ -129,6 +131,7 @@ namespace Data.Context
                 ent.HasIndex(_alias => _alias.SearchableName);
                 ent.HasIndex(_alias => new {_alias.Name, _alias.IPAddress});
                 ent.Property(alias => alias.SearchableIPAddress)
+                    .HasMaxLength(255)
                     .HasComputedColumnSql(@"((IPAddress & 255) || '.' || ((IPAddress >> 8) & 255)) || '.' || ((IPAddress >> 16) & 255) || '.' || ((IPAddress >> 24) & 255)", stored: true);
                 ent.HasIndex(alias => alias.SearchableIPAddress);
             });

Data/Data.csproj

@@ -8,7 +8,7 @@
     <PackageId>RaidMax.IW4MAdmin.Data</PackageId>
     <Title>RaidMax.IW4MAdmin.Data</Title>
     <Authors />
-    <PackageVersion>2022.10.11.1</PackageVersion>
+    <PackageVersion>1.2.0</PackageVersion>
   </PropertyGroup>
   
   <ItemGroup>

Data/Helpers/DataValueCache.cs

@@ -18,7 +18,7 @@ namespace Data.Helpers
         private readonly IDatabaseContextFactory _contextFactory;
 
         private readonly ConcurrentDictionary<string, Dictionary<object, CacheState<TReturnType>>> _cacheStates = new();
-        private readonly object _defaultKey = new();
+        private readonly string _defaultKey = null;
 
         private bool _autoRefresh;
         private const int DefaultExpireMinutes = 15;
@@ -29,7 +29,7 @@ namespace Data.Helpers
             public string Key { get; set; }
             public DateTime LastRetrieval { get; set; }
             public TimeSpan ExpirationTime { get; set; }
-            public Func<DbSet<TEntityType>, CancellationToken, Task<TCacheType>> Getter { get; set; }
+            public Func<DbSet<TEntityType>, IEnumerable<object>, CancellationToken, Task<TCacheType>> Getter { get; set; }
             public TCacheType Value { get; set; }
             public bool IsSet { get; set; }
 
@@ -53,53 +53,58 @@ namespace Data.Helpers
         public void SetCacheItem(Func<DbSet<TEntityType>, CancellationToken, Task<TReturnType>> getter, string key,
             TimeSpan? expirationTime = null, bool autoRefresh = false)
         {
-            SetCacheItem(getter, key, null, expirationTime, autoRefresh);
+            SetCacheItem((set, _, token) => getter(set, token), key, null, expirationTime, autoRefresh);
         }
 
-        public void SetCacheItem(Func<DbSet<TEntityType>, CancellationToken, Task<TReturnType>> getter, string key,
+        public void SetCacheItem(Func<DbSet<TEntityType>, IEnumerable<object>, CancellationToken, Task<TReturnType>> getter, string key,
             IEnumerable<object> ids = null, TimeSpan? expirationTime = null, bool autoRefresh = false)
         {
             ids ??= new[] { _defaultKey };
-            
+
             if (!_cacheStates.ContainsKey(key))
             {
                 _cacheStates.TryAdd(key, new Dictionary<object, CacheState<TReturnType>>());
             }
 
-            foreach (var id in ids)
+            var cacheInstance = _cacheStates[key];
+            var id = GenerateKeyFromIds(ids);
+
+            lock (_cacheStates)
             {
-                if (_cacheStates[key].ContainsKey(id))
-                {
-                    continue;
-                }
-
-                var state = new CacheState<TReturnType>
-                {
-                    Key = key,
-                    Getter = getter,
-                    ExpirationTime = expirationTime ?? TimeSpan.FromMinutes(DefaultExpireMinutes)
-                };
-
-                _cacheStates[key].Add(id, state);
-
-                _autoRefresh = autoRefresh;
-                
-
-                if (!_autoRefresh || expirationTime == TimeSpan.MaxValue)
+                if (cacheInstance.ContainsKey(id))
                 {
                     return;
                 }
-                
-                _timer = new Timer(state.ExpirationTime.TotalMilliseconds);
-                _timer.Elapsed += async (sender, args) => await RunCacheUpdate(state, CancellationToken.None);
-                _timer.Start();
             }
+
+            var state = new CacheState<TReturnType>
+            {
+                Key = key,
+                Getter = getter,
+                ExpirationTime = expirationTime ?? TimeSpan.FromMinutes(DefaultExpireMinutes)
+            };
+
+            lock (_cacheStates)
+            {
+                cacheInstance.Add(id, state);
+            }
+
+            _autoRefresh = autoRefresh;
+
+            if (!_autoRefresh || expirationTime == TimeSpan.MaxValue)
+            {
+                return;
+            }
+
+            _timer = new Timer(state.ExpirationTime.TotalMilliseconds);
+            _timer.Elapsed += async (sender, args) => await RunCacheUpdate(state, ids, CancellationToken.None);
+            _timer.Start();
         }
 
-        public async Task<TReturnType> GetCacheItem(string keyName, CancellationToken cancellationToken = default) =>
-            await GetCacheItem(keyName, null, cancellationToken);
+        public Task<TReturnType> GetCacheItem(string keyName, CancellationToken cancellationToken = default) =>
+            GetCacheItem(keyName, null, cancellationToken);
 
-        public async Task<TReturnType> GetCacheItem(string keyName, object id = null,
+        public async Task<TReturnType> GetCacheItem(string keyName, IEnumerable<object> ids = null,
             CancellationToken cancellationToken = default)
         {
             if (!_cacheStates.ContainsKey(keyName))
@@ -107,26 +112,33 @@ namespace Data.Helpers
                 throw new ArgumentException("No cache found for key {key}", keyName);
             }
 
-            var state = id is null ? _cacheStates[keyName].Values.First() : _cacheStates[keyName][id];
+            var cacheInstance = _cacheStates[keyName];
+
+            CacheState<TReturnType> state;
+            
+            lock (_cacheStates)
+            {
+                state = ids is null ? cacheInstance.Values.First() : _cacheStates[keyName][GenerateKeyFromIds(ids)];
+            }
 
             // when auto refresh is off we want to check the expiration and value
             // when auto refresh is on, we want to only check the value, because it'll be refreshed automatically
             if ((state.IsExpired || !state.IsSet) && !_autoRefresh || _autoRefresh && !state.IsSet)
             {
-                await RunCacheUpdate(state, cancellationToken);
+                await RunCacheUpdate(state, ids, cancellationToken);
             }
 
             return state.Value;
         }
-
-        private async Task RunCacheUpdate(CacheState<TReturnType> state, CancellationToken token)
+        
+        private async Task RunCacheUpdate(CacheState<TReturnType> state, IEnumerable<object> ids, CancellationToken token)
         {
             try
             {
                 _logger.LogDebug("Running update for {ClassName} {@State}", GetType().Name, state);
                 await using var context = _contextFactory.CreateContext(false);
                 var set = context.Set<TEntityType>();
-                var value = await state.Getter(set, token);
+                var value = await state.Getter(set, ids, token);
                 state.Value = value;
                 state.IsSet = true;
                 state.LastRetrieval = DateTime.Now;
@@ -136,5 +148,8 @@ namespace Data.Helpers
                 _logger.LogError(ex, "Could not get cached value for {Key}", state.Key);
             }
         }
+
+        private static string GenerateKeyFromIds(IEnumerable<object> ids) =>
+            string.Join("_", ids.Select(id => id?.ToString() ?? "null"));
     }
 }

Data/Helpers/LookupCache.cs

@@ -8,107 +8,94 @@ using System.Threading;
 using System.Threading.Tasks;
 using ILogger = Microsoft.Extensions.Logging.ILogger;
 
-namespace Data.Helpers
+namespace Data.Helpers;
+
+public class LookupCache<T> : ILookupCache<T> where T : class, IUniqueId
 {
-    public class LookupCache<T> : ILookupCache<T> where T : class, IUniqueId
+    private readonly ILogger _logger;
+    private readonly IDatabaseContextFactory _contextFactory;
+    private Dictionary<long, T> _cachedItems;
+    private readonly SemaphoreSlim _onOperation = new(1, 1);
+
+    public LookupCache(ILogger<LookupCache<T>> logger, IDatabaseContextFactory contextFactory)
     {
-        private readonly ILogger _logger;
-        private readonly IDatabaseContextFactory _contextFactory;
-        private Dictionary<long, T> _cachedItems;
-        private readonly SemaphoreSlim _onOperation = new SemaphoreSlim(1, 1);
+        _logger = logger;
+        _contextFactory = contextFactory;
+    }
 
-        public LookupCache(ILogger<LookupCache<T>> logger, IDatabaseContextFactory contextFactory)
+    public async Task<T> AddAsync(T item)
+    {
+        await _onOperation.WaitAsync();
+        T existingItem = null;
+
+        if (_cachedItems.ContainsKey(item.Id))
         {
-            _logger = logger;
-            _contextFactory = contextFactory;
+            existingItem = _cachedItems[item.Id];
         }
 
-        public async Task<T> AddAsync(T item)
+        if (existingItem != null)
         {
-            await _onOperation.WaitAsync();
-            T existingItem = null;
+            _logger.LogDebug("Cached item already added for {Type} {Id} {Value}", typeof(T).Name, item.Id,
+                item.Value);
+            _onOperation.Release();
+            return existingItem;
+        }
 
-            if (_cachedItems.ContainsKey(item.Id))
+        try
+        {
+            _logger.LogDebug("Adding new {Type} with {Id} {Value}", typeof(T).Name, item.Id, item.Value);
+            await using var context = _contextFactory.CreateContext();
+            context.Set<T>().Add(item);
+            await context.SaveChangesAsync();
+            _cachedItems.Add(item.Id, item);
+            return item;
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Could not add item to cache for {Type}", typeof(T).Name);
+            throw new Exception("Could not add item to cache");
+        }
+        finally
+        {
+            if (_onOperation.CurrentCount == 0)
             {
-                existingItem = _cachedItems[item.Id];
-            }
-
-            if (existingItem != null)
-            {
-                _logger.LogDebug("Cached item already added for {type} {id} {value}", typeof(T).Name, item.Id,
-                    item.Value);
                 _onOperation.Release();
-                return existingItem;
-            }
-
-            try
-            {
-                _logger.LogDebug("Adding new {type} with {id} {value}", typeof(T).Name, item.Id, item.Value);
-                await using var context = _contextFactory.CreateContext();
-                context.Set<T>().Add(item);
-                await context.SaveChangesAsync();
-                _cachedItems.Add(item.Id, item);
-                return item;
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Could not add item to cache for {type}", typeof(T).Name);
-                throw new Exception("Could not add item to cache");
-            }
-            finally
-            {
-                if (_onOperation.CurrentCount == 0)
-                {
-                    _onOperation.Release();
-                }
-            }
-        }
-
-        public async Task<T> FirstAsync(Func<T, bool> query)
-        {
-            await _onOperation.WaitAsync();
-
-            try
-            {
-                var cachedResult = _cachedItems.Values.Where(query);
-
-                if (cachedResult.Any())
-                {
-                    return cachedResult.FirstOrDefault();
-                }
-            }
-
-            catch
-            {
-            }
-
-            finally
-            {
-                if (_onOperation.CurrentCount == 0)
-                {
-                    _onOperation.Release(1);
-                }
-            }
-
-            return null;
-        }
-
-        public IEnumerable<T> GetAll()
-        {
-            return _cachedItems.Values;
-        }
-
-        public async Task InitializeAsync()
-        {
-            try
-            {
-                await using var context = _contextFactory.CreateContext(false);
-                _cachedItems = await context.Set<T>().ToDictionaryAsync(item => item.Id);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Could not initialize caching for {cacheType}", typeof(T).Name);
             }
         }
     }
+
+    public async Task<T> FirstAsync(Func<T, bool> query)
+    {
+        try
+        {
+            await _onOperation.WaitAsync();
+            var cachedResult = _cachedItems.Values.Where(query);
+            return cachedResult.FirstOrDefault();
+        }
+        finally
+        {
+            if (_onOperation.CurrentCount == 0)
+            {
+                _onOperation.Release(1);
+            }
+        }
+    }
+
+    public IEnumerable<T> GetAll()
+    {
+        return _cachedItems.Values;
+    }
+
+    public async Task InitializeAsync()
+    {
+        try
+        {
+            await using var context = _contextFactory.CreateContext(false);
+            _cachedItems = await context.Set<T>().ToDictionaryAsync(item => item.Id);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Could not initialize caching for {CacheType}", typeof(T).Name);
+        }
+    }
 }

Data/Migrations/MySql/20220404151444_AddSearchableIPToEFAlias.Designer.cs

@@ -808,7 +808,8 @@ namespace Data.Migrations.MySql
 
                     b.Property<string>("SearchableIPAddress")
                         .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("longtext")
+                        .HasMaxLength(255)
+                        .HasColumnType("varchar(255)")
                         .HasComputedColumnSql("((IPAddress & 255) || '.' || ((IPAddress >> 8) & 255)) || '.' || ((IPAddress >> 16) & 255) || '.' || ((IPAddress >> 24) & 255)", true);
 
                     b.Property<string>("SearchableName")

Data/Migrations/MySql/20220404151444_AddSearchableIPToEFAlias.cs

@@ -11,7 +11,8 @@ namespace Data.Migrations.MySql
             migrationBuilder.AddColumn<string>(
                 name: "SearchableIPAddress",
                 table: "EFAlias",
-                type: "longtext",
+                type: "varchar(255)",
+                maxLength: 255,
                 nullable: true,
                 computedColumnSql: "CONCAT((IPAddress & 255), \".\", ((IPAddress >> 8) & 255), \".\", ((IPAddress >> 16) & 255), \".\", ((IPAddress >> 24) & 255))",
                 stored: true)

Data/Migrations/MySql/20220404192417_AddIndexToSearchableIPToEFAlias.Designer.cs

@@ -808,6 +808,7 @@ namespace Data.Migrations.MySql
 
                     b.Property<string>("SearchableIPAddress")
                         .ValueGeneratedOnAddOrUpdate()
+                        .HasMaxLength(255)
                         .HasColumnType("varchar(255)")
                         .HasComputedColumnSql("((IPAddress & 255) || '.' || ((IPAddress >> 8) & 255)) || '.' || ((IPAddress >> 16) & 255) || '.' || ((IPAddress >> 24) & 255)", true);
 

Data/Migrations/MySql/20230124030137_AddLastConnectionIndexEFClient.cs

@@ -0,0 +1,24 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Data.Migrations.MySql
+{
+    public partial class AddLastConnectionIndexEFClient : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateIndex(
+                name: "IX_EFClients_LastConnection",
+                table: "EFClients",
+                column: "LastConnection");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropIndex(
+                name: "IX_EFClients_LastConnection",
+                table: "EFClients");
+        }
+    }
+}

Data/Migrations/MySql/MySqlDatabaseContextModelSnapshot.cs

@@ -96,6 +96,8 @@ namespace Data.Migrations.MySql
 
                     b.HasIndex("CurrentAliasId");
 
+                    b.HasIndex("LastConnection");
+
                     b.HasIndex("NetworkId");
 
                     b.ToTable("EFClients", (string)null);

Data/Migrations/Postgresql/20230124030240_AddLastConnectionIndexEFClient.cs

@@ -0,0 +1,24 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Data.Migrations.Postgresql
+{
+    public partial class AddLastConnectionIndexEFClient : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateIndex(
+                name: "IX_EFClients_LastConnection",
+                table: "EFClients",
+                column: "LastConnection");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropIndex(
+                name: "IX_EFClients_LastConnection",
+                table: "EFClients");
+        }
+    }
+}

Data/Migrations/Postgresql/PostgresqlDatabaseContextModelSnapshot.cs

@@ -103,6 +103,8 @@ namespace Data.Migrations.Postgresql
 
                     b.HasIndex("CurrentAliasId");
 
+                    b.HasIndex("LastConnection");
+
                     b.HasIndex("NetworkId");
 
                     b.ToTable("EFClients", (string)null);

Data/Migrations/Sqlite/20230124025802_AddLastConnectionIndexEFClient.cs

@@ -0,0 +1,24 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Data.Migrations.Sqlite
+{
+    public partial class AddLastConnectionIndexEFClient : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateIndex(
+                name: "IX_EFClients_LastConnection",
+                table: "EFClients",
+                column: "LastConnection");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropIndex(
+                name: "IX_EFClients_LastConnection",
+                table: "EFClients");
+        }
+    }
+}

Data/Migrations/Sqlite/SqliteDatabaseContextModelSnapshot.cs

@@ -94,6 +94,8 @@ namespace Data.Migrations.Sqlite
 
                     b.HasIndex("CurrentAliasId");
 
+                    b.HasIndex("LastConnection");
+
                     b.HasIndex("NetworkId");
 
                     b.ToTable("EFClients", (string)null);

Data/Models/EFPenalty.cs

@@ -18,6 +18,9 @@ namespace Data.Models
             Unban,
             Any,
             Unflag,
+            Mute,
+            TempMute,
+            Unmute,
             Other = 100
         }
 

DeploymentFiles/PostPublish.ps1

@@ -9,7 +9,7 @@ foreach($localization in $localizations)
 {
     $url = "http://api.raidmax.org:5000/localization/{0}" -f $localization
     $filePath = "{0}\Localization\IW4MAdmin.{1}.json" -f $PublishDir, $localization
-    $response = Invoke-WebRequest $url
+    $response = Invoke-WebRequest $url -UseBasicParsing
     Out-File -FilePath $filePath -InputObject $response.Content -Encoding utf8
 }
 
@@ -20,4 +20,4 @@ Minor = $versionInfo.ProductMinorPart
 Build = $versionInfo.ProductBuildPart  
 Revision = $versionInfo.ProductPrivatePart
 }
-$json | ConvertTo-Json | Out-File -FilePath ("{0}\VersionInformation.json" -f $PublishDir) -Encoding ASCII
+$json | ConvertTo-Json | Out-File -FilePath ("{0}\VersionInformation.json" -f $PublishDir) -Encoding ASCII

DeploymentFiles/UpdateIW4MAdmin.ps1

@@ -39,7 +39,7 @@ else
 
 Write-Output "Retrieving latest version info..."
 
-$releaseInfo = (Invoke-WebRequest $releasesUri | ConvertFrom-Json) | Select -First 1
+$releaseInfo = (Invoke-WebRequest $releasesUri -UseBasicParsing | ConvertFrom-Json) | Select -First 1
 $asset = $releaseInfo.assets | Where-Object name -like $assetPattern | Select -First 1
 $downloadUri = $asset.browser_download_url
 $filename = Split-Path $downloadUri -leaf
@@ -55,7 +55,7 @@ if (!$Silent)
 
 Write-Output "Downloading update. This might take a moment..."
 
-$fileDownload = Invoke-WebRequest -Uri $downloadUri
+$fileDownload = Invoke-WebRequest -Uri $downloadUri -UseBasicParsing
 if ($fileDownload.StatusDescription -ne "OK")
 {
     throw "Could not update IW4MAdmin. ($fileDownload.StatusDescription)"

GameFiles/AntiCheat/IW4x/userraw/scripts/_customcallbacks.gsc

@@ -41,24 +41,17 @@ waitForAttack()
 {
 	self endon( "disconnect" );
 	
+	self notifyOnPlayerCommand( "player_shot", "+attack" );
 	self.lastAttackTime = 0;
 	
 	for( ;; )
 	{
-		self notifyOnPlayerCommand( "player_shot", "+attack" );
 		self waittill( "player_shot" );
 		
 		self.lastAttackTime = getTime();
 	}
 }
 
-getHttpString( url )
-{
-    request = httpGet( url );
-    request waittill( "done", success, data );
-	request destroy();
-}
-
 runRadarUpdates()
 {
 	interval = getDvarInt( "sv_printradar_updateinterval", 500 );

GameFiles/AntiCheat/IW5/storage/iw5/scripts/_customcallbacks.gsc

@@ -40,11 +40,11 @@ waitForAttack()
 {
 	self endon( "disconnect" );
 	
+	self notifyOnPlayerCommand( "player_shot", "+attack" );
 	self.lastAttackTime = 0;
 	
 	for( ;; )
 	{
-		self notifyOnPlayerCommand( "player_shot", "+attack" );
 		self waittill( "player_shot" );
 		
 		self.lastAttackTime = getTime();

GameFiles/AntiCheat/PT6/storage/t6/scripts/mp/_customcallbacks.gsc.src

@@ -41,17 +41,16 @@ onPlayerConnect( player )
 	}
 }
 
-
 //Got added to T6 on April 2020
 waitForAttack()
 {
 	self endon( "disconnect" );
 
+	self notifyOnPlayerCommand( "player_shot", "+attack" );
 	self.lastAttackTime = 0;
 
 	for( ;; )
 	{
-		self notifyOnPlayerCommand( "player_shot", "+attack" );
 		self waittill( "player_shot" );
 
 		self.lastAttackTime = getTime();

GameFiles/GameInterface/_integration_base.gsc

@@ -4,7 +4,7 @@
 
 Init()
 {    
-    level thread Setup();
+    thread Setup();
 }
 
 Setup()
@@ -19,8 +19,11 @@ Setup()
     level.eventBus.timeoutKey   = "timeout";
     level.eventBus.timeout      = 30;
     
-    level.commonFunctions           = spawnstruct();
-    level.commonFunctions.SetDvar   = "SetDvarIfUninitialized";
+    level.commonFunctions              = spawnstruct();
+    level.commonFunctions.setDvar      = "SetDvarIfUninitialized";
+    level.commonFunctions.isBot        = "IsBot";
+
+    level.commonKeys = spawnstruct();
     
     level.notifyTypes                                   = spawnstruct();
     level.notifyTypes.gameFunctionsInitialized          = "GameFunctionsInitialized";
@@ -116,17 +119,6 @@ OnPlayerSpawned()
     }
 }
 
-OnPlayerDisconnect()
-{
-    self endon ( "disconnect" );
-
-    for ( ;; )
-    {
-        self waittill( "disconnect" );
-        self SaveTrackingMetrics();
-    }
-}
-
 OnPlayerJoinedTeam()
 {
     self endon( "disconnect" );
@@ -245,7 +237,12 @@ _IsBot( entity )
 
 _SetDvarIfUninitialized( dvarName, dvarValue )
 {
-    [[level.overrideMethods[level.commonFunctions.SetDvar]]]( dvarName, dvarValue );
+    [[level.overrideMethods[level.commonFunctions.setDvar]]]( dvarName, dvarValue );
+}
+
+NotImplementedFunction( a, b, c, d, e, f ) 
+{
+    LogWarning( "Function not implemented" );
 }
 
 // Not every game can output to console or even game log.
@@ -675,6 +672,7 @@ OnClientDataReceived( event )
     clientData.clientId = event.data["clientId"];
     clientData.lastConnection = event.data["lastConnection"];
     clientData.tag = event.data["tag"];
+    clientData.performance = event.data["performance"];
     clientData.state = "complete";
     self.persistentClientId = event.data["clientId"];
 

GameFiles/GameInterface/_integration_iw4x.gsc

@@ -4,7 +4,7 @@ Init()
 {
     level.eventBus.gamename = "IW4";
 
-    level thread Setup();
+    thread Setup();
 }
 
 Setup()
@@ -16,9 +16,18 @@ Setup()
     
     scripts\_integration_base::RegisterLogger( ::Log2Console );
     
-    level.overrideMethods["GetTotalShotsFired"] = ::GetTotalShotsFired;
-    level.overrideMethods["SetDvarIfUninitialized"] = ::_SetDvarIfUninitialized;
-    level.overrideMethods["waittill_notify_or_timeout"] = ::_waittill_notify_or_timeout;
+    level.overrideMethods["GetTotalShotsFired"]                                    = ::GetTotalShotsFired;
+    level.overrideMethods[level.commonFunctions.setDvar]                           = ::_SetDvarIfUninitialized;
+    level.overrideMethods[level.commonFunctions.isBot]                             = ::IsTestClient;
+    level.overrideMethods["waittill_notify_or_timeout"]                            = ::_waittill_notify_or_timeout;
+    level.overrideMethods[level.commonFunctions.changeTeam]                        = ::ChangeTeam;
+    level.overrideMethods[level.commonFunctions.getTeamCounts]                     = ::CountPlayers;
+    level.overrideMethods[level.commonFunctions.getMaxClients]                     = ::GetMaxClients;
+    level.overrideMethods[level.commonFunctions.getTeamBased]                      = ::GetTeamBased;
+    level.overrideMethods[level.commonFunctions.getClientTeam]                     = ::GetClientTeam;
+    level.overrideMethods[level.commonFunctions.getClientKillStreak]               = ::GetClientKillStreak;
+    level.overrideMethods[level.commonFunctions.backupRestoreClientKillStreakData] = ::BackupRestoreClientKillStreakData;
+    level.overrideMethods[level.commonFunctions.waitTillAnyTimeout]                = ::WaitTillAnyTimeout;
     
     RegisterClientCommands();
     
@@ -40,7 +49,7 @@ OnPlayerConnect()
     {
         level waittill( "connected", player );
         
-        if ( scripts\_integration_base::_IsBot( player ) ) 
+        if ( player call [[ level.overrideMethods[ level.commonFunctions.isBot ] ]]() ) 
         {
             // we don't want to track bots
             continue;    
@@ -88,6 +97,88 @@ WaitForClientEvents()
     }
 }
 
+GetMaxClients()
+{
+    return level.maxClients;
+}
+
+GetTeamBased()
+{
+    return level.teamBased;
+}
+
+CountPlayers()
+{
+    return maps\mp\gametypes\_teams::CountPlayers();
+}
+
+GetClientTeam()
+{
+    if ( IsDefined( self.pers["team"] ) && self.pers["team"] == "allies" )
+    {
+        return "allies";
+    }
+    
+    else if ( IsDefined( self.pers["team"] ) && self.pers["team"] == "axis" )
+    {
+        return "axis";
+    }
+    
+    else
+    {
+        return "none";
+    }
+}
+
+GetClientKillStreak()
+{
+    return int( self.pers["cur_kill_streak"] );
+}
+
+BackupRestoreClientKillStreakData( restore ) 
+{
+    if ( restore )
+    {
+        foreach ( index, streakStruct in self.pers["killstreaks_backup"] )
+        {
+		    self.pers["killstreaks"][index] =  self.pers["killstreaks_backup"][index];
+        }
+    }
+
+    else 
+    {
+        self.pers["killstreaks_backup"] = [];
+        
+        foreach ( index, streakStruct in self.pers["killstreaks"] )
+        {
+            self.pers["killstreaks_backup"][index] = self.pers["killstreaks"][index];
+        }
+    }
+}
+
+WaitTillAnyTimeout( timeOut, string1, string2, string3, string4, string5 )
+{
+    return common_scripts\utility::waittill_any_timeout( timeOut, string1, string2, string3, string4, string5 );
+}
+
+ChangeTeam( team )
+{
+    switch ( team )
+    {
+        case "allies":
+            self [[level.allies]]();
+            break;
+    
+        case "axis":
+            self [[level.axis]]();
+            break;
+
+        case "spectator":
+            self [[level.spectator]]();
+            break;
+    }
+}
+
 GetTotalShotsFired()
 {
     return maps\mp\_utility::getPlayerStat( "mostshotsfired" );
@@ -351,7 +442,9 @@ NoClipImpl()
         self SetClientDvar( "sv_cheats", 0 );
         
         self God();
-        self Noclip();
+
+        self.clientflags |= 1; // IW4x specific
+
         self Hide();
         
         self.isNoClipped = true;
@@ -365,7 +458,9 @@ NoClipImpl()
         self SetClientDvar( "sv_cheats", 0 );
         
         self God();
-        self Noclip();
+
+        self.clientflags &= ~1; // IW4x specific
+
         self Show();
         
         self.isNoClipped = false;

GameFiles/GameInterface/_integration_iw5.gsc

@@ -4,7 +4,7 @@ Init()
 {
     level.eventBus.gamename = "IW5";
 
-    level thread Setup();
+    thread Setup();
 }
 
 Setup()
@@ -19,6 +19,7 @@ Setup()
     level.overrideMethods["GetTotalShotsFired"] = ::GetTotalShotsFired;
     level.overrideMethods["SetDvarIfUninitialized"] = ::_SetDvarIfUninitialized;
     level.overrideMethods["waittill_notify_or_timeout"] = ::_waittill_notify_or_timeout;
+    level.overrideMethods[level.commonFunctions.isBot] = ::IsTestClient;
     
     RegisterClientCommands();
     
@@ -40,7 +41,7 @@ OnPlayerConnect()
     {
         level waittill( "connected", player );
         
-        if ( scripts\mp\_integration_base::_IsBot( player ) ) 
+        if ( player call [[ level.overrideMethods[ level.commonFunctions.isBot ] ]]() ) 
         {
             // we don't want to track bots
             continue;    

GameFiles/GameInterface/_integration_shared.gsc

@@ -0,0 +1,451 @@
+
+Init()
+{
+    thread Setup();
+}
+
+Setup()
+{
+    level endon( "game_ended" );
+    
+    level.commonFunctions.changeTeam                        = "ChangeTeam";
+    level.commonFunctions.getTeamCounts                     = "GetTeamCounts";
+    level.commonFunctions.getMaxClients                     = "GetMaxClients";
+    level.commonFunctions.getTeamBased                      = "GetTeamBased";
+    level.commonFunctions.getClientTeam                     = "GetClientTeam";
+    level.commonFunctions.getClientKillStreak               = "GetClientKillStreak";
+    level.commonFunctions.backupRestoreClientKillStreakData = "BackupRestoreClientKillStreakData";
+    level.commonFunctions.waitTillAnyTimeout                = "WaitTillAnyTimeout";
+    
+    level.overrideMethods[level.commonFunctions.changeTeam]                        = scripts\_integration_base::NotImplementedFunction;
+    level.overrideMethods[level.commonFunctions.getTeamCounts]                     = scripts\_integration_base::NotImplementedFunction;
+    level.overrideMethods[level.commonFunctions.getTeamBased]                      = scripts\_integration_base::NotImplementedFunction;
+    level.overrideMethods[level.commonFunctions.getMaxClients]                     = scripts\_integration_base::NotImplementedFunction;
+    level.overrideMethods[level.commonFunctions.getClientTeam]                     = scripts\_integration_base::NotImplementedFunction;
+    level.overrideMethods[level.commonFunctions.getClientKillStreak]               = scripts\_integration_base::NotImplementedFunction;
+    level.overrideMethods[level.commonFunctions.backupRestoreClientKillStreakData] = scripts\_integration_base::NotImplementedFunction;
+    level.overrideMethods[level.commonFunctions.waitTillAnyTimeout]                = scripts\_integration_base::NotImplementedFunction;
+    
+    // these can be overridden per game if needed
+    level.commonKeys.team1         = "allies"; 
+    level.commonKeys.team2         = "axis";
+    level.commonKeys.teamSpectator = "spectator";
+    
+    level.eventTypes.connect     = "connected";
+    level.eventTypes.disconnect  = "disconnect";
+    level.eventTypes.joinTeam    = "joined_team";
+    level.eventTypes.spawned	 = "spawned_player";
+    level.eventTypes.gameEnd     = "game_ended";
+    
+    level.iw4madminIntegrationDefaultPerformance = 200;
+    
+    if ( GetDvarInt( "sv_iw4madmin_integration_enabled" ) != 1 )
+    {
+        return;
+    }
+
+    if ( GetDvarInt( "sv_iw4madmin_autobalance" ) != 1 )
+    {
+        return;
+    }
+    
+    level thread OnPlayerConnect();
+}
+
+OnPlayerConnect()
+{
+    level endon( level.eventTypes.gameEnd );
+
+    for ( ;; )
+    {
+        level waittill( level.eventTypes.connect, player );
+
+        if ( ![[level.overrideMethods[level.commonFunctions.getTeamBased]]]() ) 
+        {
+            continue;
+        }
+        
+        teamToJoin = player GetTeamToJoin();
+        player [[level.overrideMethods[level.commonFunctions.changeTeam]]]( teamToJoin );
+        
+        player thread OnClientFirstSpawn();
+        player thread OnClientJoinedTeam();
+        player thread OnClientDisconnect();
+    }
+}
+
+OnClientDisconnect()
+{
+    level endon( level.eventTypes.gameEnd );
+    self endon( "disconnect_logic_end" );
+
+    for ( ;; )
+    {
+        self waittill( level.eventTypes.disconnect );
+        scripts\_integration_base::LogDebug( "client is disconnecting" );
+
+        OnTeamSizeChanged();
+        self notify( "disconnect_logic_end" );
+    }
+}
+
+OnClientJoinedTeam()
+{
+    self endon( level.eventTypes.disconnect );
+
+    for( ;; )
+    {
+        self waittill( level.eventTypes.joinTeam );
+
+        if ( IsDefined( self.wasAutoBalanced ) && self.wasAutoBalanced )
+        {
+            self.wasAutoBalanced = false;
+            continue;
+        }
+        
+        newTeam = self [[level.overrideMethods[level.commonFunctions.getClientTeam]]]();
+        scripts\_integration_base::LogDebug( self.name + " switched to " + newTeam );
+        
+        if ( newTeam != level.commonKeys.team1 && newTeam != level.commonKeys.team2 )
+        {
+            OnTeamSizeChanged();
+            scripts\_integration_base::LogDebug( "not force balancing " + self.name + " because they switched to spec"  );
+            continue;
+        }
+        
+        properTeam = self GetTeamToJoin();
+        if ( newTeam != properTeam )
+        {
+            self [[level.overrideMethods[level.commonFunctions.backupRestoreClientKillStreakData]]]( false );
+            self [[level.overrideMethods[level.commonFunctions.changeTeam]]]( properTeam );
+            wait ( 0.1 );
+            self [[level.overrideMethods[level.commonFunctions.backupRestoreClientKillStreakData]]]( true );
+        } 		
+    }
+}
+
+OnClientFirstSpawn()
+{
+    self endon( level.eventTypes.disconnect );
+    timeoutResult = self [[level.overrideMethods[level.commonFunctions.waitTillAnyTimeout]]]( 30, level.eventTypes.spawned );
+
+    if ( timeoutResult != "timeout" )
+    {
+       return;
+    }
+
+    scripts\_integration_base::LogDebug( "moving " + self.name + " to spectator because they did not spawn within expected duration" );
+    self [[level.overrideMethods[level.commonFunctions.changeTeam]]]( level.commonKeys.teamSpectator );
+}
+
+OnTeamSizeChanged()
+{
+    if ( level.players.size < 3 )
+    {
+        scripts\_integration_base::LogDebug( "not enough clients to autobalance" );
+        return;
+    }
+
+    if ( !IsDefined( GetSmallerTeam( 1 ) ) )
+    {
+        scripts\_integration_base::LogDebug( "teams are not unbalanced enough to auto balance" );
+        return;
+    }
+    
+    toSwap = FindClientToSwap();
+    curentTeam = toSwap [[level.overrideMethods[level.commonFunctions.getClientTeam]]]();
+    otherTeam = level.commonKeys.team1;
+
+    if ( curentTeam == otherTeam ) 
+    {
+        otherTeam = level.commonKeys.team2;
+    }
+
+    toSwap.wasAutoBalanced = true;
+    
+    if ( !IsDefined( toSwap.autoBalanceCount ) )
+    {
+        toSwap.autoBalanceCount = 1;
+    }
+    else
+    {
+        toSwap.autoBalanceCount++;
+    }
+
+    toSwap [[level.overrideMethods[level.commonFunctions.backupRestoreClientKillStreakData]]]( false );
+    scripts\_integration_base::LogDebug( "swapping " + toSwap.name + " from " + curentTeam + " to " + otherTeam );
+    toSwap [[level.overrideMethods[level.commonFunctions.changeTeam]]]( otherTeam );
+    wait ( 0.1 ); // give the killstreak on team switch clear event time to execute
+    toSwap [[level.overrideMethods[level.commonFunctions.backupRestoreClientKillStreakData]]]( true );
+}
+
+FindClientToSwap()
+{
+    smallerTeam = GetSmallerTeam( 1 );
+    teamPool = level.commonKeys.team1;
+
+    if ( IsDefined( smallerTeam ) )
+    {
+        if ( smallerTeam == teamPool )
+        {
+            teamPool = level.commonKeys.team2;
+        }
+    }
+    else
+    {
+        teamPerformances = GetTeamPerformances();
+        team1Perf = teamPerformances[level.commonKeys.team1];
+        team2Perf = teamPerformances[level.commonKeys.team2];
+        teamPool = level.commonKeys.team1;
+
+        if ( team2Perf > team1Perf )
+        {
+            teamPool = level.commonKeys.team2;
+        }
+    }
+
+    client = GetBestSwapCandidate( teamPool );
+
+    if ( !IsDefined( client ) )
+    {
+        scripts\_integration_base::LogDebug( "could not find candidate to swap teams" );
+    }
+    else
+    {
+        scripts\_integration_base::LogDebug( "best candidate to swap teams is " + client.name );
+    }
+
+    return client;
+}
+
+GetBestSwapCandidate( team )
+{
+    candidates = [];
+    maxClients = [[level.overrideMethods[level.commonFunctions.getMaxClients]]]();
+
+    for ( i = 0; i < maxClients; i++ )
+    {
+        candidates[i] = GetClosestPerformanceClientForTeam( team, candidates );
+    }
+
+    candidate = undefined;
+    
+    foundCandidate = false;
+    for ( i = 0; i < maxClients; i++ )
+    {
+        if ( !IsDefined( candidates[i] ) )
+        {
+            continue;
+        }
+
+        candidate = candidates[i];
+        candidateKillStreak = candidate [[level.overrideMethods[level.commonFunctions.getClientKillStreak]]]();
+
+        scripts\_integration_base::LogDebug( "candidate killstreak is " + candidateKillStreak );
+        
+        if ( candidateKillStreak > 3 )
+        {
+            scripts\_integration_base::LogDebug( "skipping candidate selection for " + candidate.name + " because their kill streak is too high" );
+            continue;
+        }
+
+        if ( IsDefined( candidate.autoBalanceCount ) && candidate.autoBalanceCount > 2 )
+        {
+            scripts\_integration_base::LogDebug( "skipping candidate selection for " + candidate.name + " they have been swapped too many times" );
+            continue;
+        }
+
+        foundCandidate = true;
+        break;
+    }
+
+    if ( foundCandidate )
+    {
+        return candidate;
+    }
+
+    return undefined;
+}
+
+GetClosestPerformanceClientForTeam( sourceTeam, excluded )
+{
+    if ( !IsDefined( excluded ) )
+    {
+        excluded = [];
+    }
+
+    otherTeam = level.commonKeys.team1;
+
+    if ( sourceTeam == otherTeam ) 
+    {
+        otherTeam = level.commonKeys.team2;
+    }
+
+    teamPerformances = GetTeamPerformances();
+    players = level.players;
+    choice = undefined;
+    closest = 9999999;
+
+    for ( i = 0; i < players.size; i++ )
+    {
+        isExcluded = false;
+        
+        for ( j = 0; j < excluded.size; j++ )
+        {
+            if ( excluded[j] == players[i] )
+            {
+                isExcluded = true;
+                break;
+            }
+        }
+
+        if ( isExcluded )
+        {
+            continue;
+        }
+
+        if ( players[i] [[level.overrideMethods[level.commonFunctions.getClientTeam]]]() != sourceTeam )
+        {
+            continue;
+        }
+
+        clientPerformance = players[i] GetClientPerformanceOrDefault();
+        sourceTeamNewPerformance = teamPerformances[sourceTeam] - clientPerformance;
+        otherTeamNewPerformance = teamPerformances[otherTeam] + clientPerformance;
+        candidateValue = Abs( sourceTeamNewPerformance - otherTeamNewPerformance );
+
+        scripts\_integration_base::LogDebug( "perf=" + clientPerformance + " candidateValue=" + candidateValue + " src=" + sourceTeamNewPerformance + " dst=" + otherTeamNewPerformance );
+
+        if ( !IsDefined( choice ) )
+        {
+            choice = players[i];
+            closest = candidateValue;
+        } 
+
+        else if ( candidateValue < closest )
+        {
+            scripts\_integration_base::LogDebug( candidateValue + " is the new best value ");
+            choice = players[i];
+            closest = candidateValue;
+        }
+    }
+
+    scripts\_integration_base::LogDebug( choice.name + " is the best candidate to swap" + " with closest=" + closest );
+    return choice;
+}
+
+GetTeamToJoin()
+{
+    smallerTeam = GetSmallerTeam( 1 );
+
+    if ( IsDefined( smallerTeam ) )
+    {
+        return smallerTeam;
+    }
+    
+    teamPerformances = GetTeamPerformances( self );
+    
+    if ( teamPerformances[level.commonKeys.team1] < teamPerformances[level.commonKeys.team2] )
+    {
+        scripts\_integration_base::LogDebug( "Team1 performance is lower, so selecting Team1" );
+        return level.commonKeys.team1;
+    }
+    
+    else
+    {
+        scripts\_integration_base::LogDebug( "Team2 performance is lower, so selecting Team2" );
+        return level.commonKeys.team2;
+    }
+}
+
+GetSmallerTeam( minDiff )
+{
+    teamCounts = [[level.overrideMethods[level.commonFunctions.getTeamCounts]]]();
+    team1Count = teamCounts[level.commonKeys.team1];
+    team2Count = teamCounts[level.commonKeys.team2];
+    maxClients = [[level.overrideMethods[level.commonFunctions.getMaxClients]]]();
+
+    if ( team1Count == team2Count )
+    {
+        return undefined;
+    }
+    
+    if ( team2Count == maxClients / 2 )
+    {
+        scripts\_integration_base::LogDebug( "Team2 is full, so selecting Team1" );
+        return level.commonKeys.team1;
+    }
+    
+    if ( team1Count == maxClients / 2 )
+    {
+        scripts\_integration_base::LogDebug( "Team1 is full, so selecting Team2" );
+        return level.commonKeys.team2;
+    }
+    
+    sizeDiscrepancy = Abs( team1Count - team2Count );
+    
+    if ( sizeDiscrepancy > minDiff ) 
+    {
+        scripts\_integration_base::LogDebug( "Team size differs by more than 1" );
+        
+        if ( team1Count < team2Count )
+        {
+            scripts\_integration_base::LogDebug( "Team1 is smaller, so selecting Team1" );
+            return level.commonKeys.team1;
+        }
+        
+        else
+        {
+            scripts\_integration_base::LogDebug( "Team2 is smaller, so selecting Team2" );
+            return level.commonKeys.team2;
+        }
+    }
+
+    return undefined;
+}
+
+GetTeamPerformances( ignoredClient )
+{
+    players = level.players;
+    
+    team1 = 0;
+    team2 = 0;
+    
+    for ( i = 0; i < players.size; i++ )
+    {
+        if ( IsDefined( ignoredClient ) && players[i] == ignoredClient )
+        {
+            continue;
+        }
+        
+        performance = players[i] GetClientPerformanceOrDefault();
+        clientTeam = players[i] [[level.overrideMethods[level.commonFunctions.getClientTeam]]]();
+        
+        if ( clientTeam == level.commonKeys.team1 )
+        {
+            team1 = team1 + performance;
+        }
+        else
+        {
+            team2 = team2 + performance;
+        }
+    }
+    
+    result = [];
+    result[level.commonKeys.team1] = team1;
+    result[level.commonKeys.team2] = team2;
+    return result;
+}
+
+GetClientPerformanceOrDefault()
+{
+    clientData = self.pers[level.clientDataKey];
+    performance = level.iw4madminIntegrationDefaultPerformance;
+        
+    if ( IsDefined( clientData ) && IsDefined( clientData.performance ) ) 
+    {
+        performance = int( clientData.performance );
+    }
+
+    return performance;
+}

GameFiles/GameInterface/_integration_t5.gsc

@@ -4,7 +4,7 @@ Init()
 {
     level.eventBus.gamename = "T5";
 
-    level thread Setup();
+    thread Setup();
 }
 
 Setup()

IW4MAdmin.sln

@@ -40,8 +40,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ScriptPlugins", "ScriptPlug
 		Plugins\ScriptPlugins\ParserT4.js = Plugins\ScriptPlugins\ParserT4.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
 		Plugins\ScriptPlugins\ParserPlutoniumT4.js = Plugins\ScriptPlugins\ParserPlutoniumT4.js
 		Plugins\ScriptPlugins\ParserS1x.js = Plugins\ScriptPlugins\ParserS1x.js
@@ -53,6 +51,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ScriptPlugins", "ScriptPlug
 		Plugins\ScriptPlugins\BanBroadcasting.js = Plugins\ScriptPlugins\BanBroadcasting.js
 		Plugins\ScriptPlugins\ParserH1MOD.js = Plugins\ScriptPlugins\ParserH1MOD.js
 		Plugins\ScriptPlugins\ParserPlutoniumT5.js = Plugins\ScriptPlugins\ParserPlutoniumT5.js
+		Plugins\ScriptPlugins\ServerBanner.js = Plugins\ScriptPlugins\ServerBanner.js
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutomessageFeed", "Plugins\AutomessageFeed\AutomessageFeed.csproj", "{F5815359-CFC7-44B4-9A3B-C04BACAD5836}"
@@ -77,6 +76,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GameInterface", "GameInterf
 	ProjectSection(SolutionItems) = preProject
 		GameFiles\GameInterface\_integration_base.gsc = GameFiles\GameInterface\_integration_base.gsc
 		GameFiles\GameInterface\_integration_iw4x.gsc = GameFiles\GameInterface\_integration_iw4x.gsc
+		GameFiles\GameInterface\_integration_iw5.gsc = GameFiles\GameInterface\_integration_iw5.gsc
+		GameFiles\GameInterface\_integration_shared.gsc = GameFiles\GameInterface\_integration_shared.gsc
+		GameFiles\GameInterface\_integration_t5.gsc = GameFiles\GameInterface\_integration_t5.gsc
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AntiCheat", "AntiCheat", "{AB83BAC0-C539-424A-BF00-78487C10753C}"

Integrations/Cod/CodRConConnection.cs

@@ -56,6 +56,11 @@ namespace Integrations.Cod
             {
                 return await SendQueryAsyncInternal(type, parameters, token);
             }
+            catch (RConException ex) when (ex.IsOperationCancelled)
+            {
+                _log.LogDebug(ex, "Could not complete RCon request");
+                throw;
+            }
             catch (Exception ex)
             {
                 using (LogContext.PushProperty("Server", Endpoint.ToString()))
@@ -67,10 +72,7 @@ namespace Integrations.Cod
             }
             finally
             {
-                using (LogContext.PushProperty("Server", Endpoint.ToString()))
-                {
-                    _log.LogDebug("Releasing OnComplete {Count}", ActiveQueries[Endpoint].OnComplete.CurrentCount);
-                }
+                _log.LogDebug("Releasing OnComplete {Count}", ActiveQueries[Endpoint].OnComplete.CurrentCount);
 
                 if (ActiveQueries[Endpoint].OnComplete.CurrentCount == 0)
                 {
@@ -89,7 +91,11 @@ namespace Integrations.Cod
 
             if (!ActiveQueries.TryGetValue(Endpoint, out var connectionState))
             {
-                _log.LogError("Could not retrieve connection state");
+                using (LogContext.PushProperty("Server", Endpoint.ToString()))
+                {
+                    _log.LogError("Could not retrieve connection state");
+                }
+
                 throw new InvalidOperationException("Could not get connection state");
             }
 
@@ -104,7 +110,7 @@ namespace Integrations.Cod
             {
                 _log.LogDebug("OnComplete did not complete before timeout {Count}",
                     connectionState.OnComplete.CurrentCount);
-                throw new RConException("Timed out waiting for access to rcon socket");
+                throw new RConException("Timed out waiting for access to rcon socket", true);
             }
 
             var timeSinceLastQuery = (DateTime.Now - connectionState.LastQuery).TotalMilliseconds;
@@ -119,9 +125,9 @@ namespace Integrations.Cod
                 }
                 catch (OperationCanceledException)
                 {
-                    _log.LogDebug("Waiting for flood protect did not complete before timeout timeout {Count}",
+                    _log.LogDebug("Waiting for flood protect did not complete before timeout {Count}",
                         connectionState.OnComplete.CurrentCount);
-                    throw new RConException("Timed out waiting for flood protect to expire");
+                    throw new RConException("Timed out waiting for flood protect to expire", true);
                 }
             }
 
@@ -145,7 +151,7 @@ namespace Integrations.Cod
                 switch (type)
                 {
                     case StaticHelpers.QueryType.GET_DVAR:
-                        waitForResponse |= true;
+                        waitForResponse = true;
                         payload = string
                             .Format(_config.CommandPrefixes.RConGetDvar, convertedRConPassword,
                                 convertedParameters + '\0').Select(Convert.ToByte).ToArray();
@@ -161,15 +167,15 @@ namespace Integrations.Cod
                                 convertedParameters + '\0').Select(Convert.ToByte).ToArray();
                         break;
                     case StaticHelpers.QueryType.GET_STATUS:
-                        waitForResponse |= true;
+                        waitForResponse = true;
                         payload = (_config.CommandPrefixes.RConGetStatus + '\0').Select(Convert.ToByte).ToArray();
                         break;
                     case StaticHelpers.QueryType.GET_INFO:
-                        waitForResponse |= true;
+                        waitForResponse = true;
                         payload = (_config.CommandPrefixes.RConGetInfo + '\0').Select(Convert.ToByte).ToArray();
                         break;
                     case StaticHelpers.QueryType.COMMAND_STATUS:
-                        waitForResponse |= true;
+                        waitForResponse = true;
                         payload = string.Format(_config.CommandPrefixes.RConCommand, convertedRConPassword, "status\0")
                             .Select(Convert.ToByte).ToArray();
                         break;
@@ -189,20 +195,9 @@ namespace Integrations.Cod
                 throw new RConException("Invalid character encountered when converting encodings");
             }
 
-            byte[][] response = null;
+            byte[][] response;
 
             retrySend:
-            if (connectionState.ConnectionAttempts > 1)
-            {
-                using (LogContext.PushProperty("Server", Endpoint.ToString()))
-                {
-                    _log.LogInformation(
-                        "Retrying RCon message ({ConnectionAttempts}/{AllowedConnectionFailures} attempts) with parameters {Payload}",
-                        connectionState.ConnectionAttempts,
-                        _retryAttempts, parameters);
-                }
-            }
-
             using (var socket = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp)
                    {
                        DontFragment = false,
@@ -210,53 +205,43 @@ namespace Integrations.Cod
                        ExclusiveAddressUse = true,
                    })
             {
-                // wait for send to be ready
-                try
+                if (!token.IsCancellationRequested)
                 {
-                    await connectionState.OnSentData.WaitAsync(token);
-                }
-                catch (OperationCanceledException)
-                {
-                    _log.LogDebug("OnSent did not complete in time");
-                    throw new RConException("Timed out waiting for access to RCon send socket");
+                    connectionState.ConnectionAttempts++;
                 }
 
-                // wait for receive to be ready
-                try
-                {
-                    await connectionState.OnReceivedData.WaitAsync(token);
-                }
-                catch (OperationCanceledException)
-                {
-                    _log.LogDebug("OnReceived did not complete in time");
-                    if (connectionState.OnSentData.CurrentCount == 0)
-                    {
-                        connectionState.OnSentData.Release();
-                    }
-
-                    throw new RConException("Timed out waiting for access to RCon receive socket");
-                }
-
-                connectionState.SendEventArgs.UserToken = new ConnectionUserToken
-                {
-                    Socket = socket,
-                    CancellationToken = token
-                };
-
-                connectionState.ConnectionAttempts++;
-                connectionState.BytesReadPerSegment.Clear();
+                connectionState.ReceivedBytes.Clear();
 
                 _log.LogDebug(
-                    "Sending {PayloadLength} bytes to [{Endpoint}] ({ConnectionAttempts}/{AllowedConnectionFailures})",
-                    payload.Length, Endpoint, connectionState.ConnectionAttempts, _retryAttempts);
+                    "Sending {PayloadLength} bytes to [{Endpoint}] ({ConnectionAttempts}/{AllowedConnectionFailures}) parameters {Payload}",
+                    payload.Length, Endpoint, connectionState.ConnectionAttempts, _retryAttempts, parameters);
 
                 try
                 {
                     connectionState.LastQuery = DateTime.Now;
-                    var timeout = _parser.OverrideTimeoutForCommand(parameters);
-                    waitForResponse = waitForResponse && timeout.HasValue;
-                    response = await SendPayloadAsync(payload, waitForResponse,
-                        timeout ?? TimeSpan.Zero, token);
+                    var retryTimeout = StaticHelpers.SocketTimeout(connectionState.ConnectionAttempts);
+                    var overrideTimeout = _parser.OverrideTimeoutForCommand(parameters);
+                    var maxTimeout = !overrideTimeout.HasValue || overrideTimeout == TimeSpan.Zero
+                        ? retryTimeout
+                        : overrideTimeout.Value;
+
+                    using var internalTokenSource = new CancellationTokenSource(maxTimeout);
+                    using var chainedTokenSource =
+                        CancellationTokenSource.CreateLinkedTokenSource(token, internalTokenSource.Token);
+
+                    if (connectionState.ConnectionAttempts > 1)
+                    {
+                        using (LogContext.PushProperty("Server", Endpoint.ToString()))
+                        {
+                            _log.LogInformation(
+                                "Retrying RCon message ({ConnectionAttempts}/{AllowedConnectionFailures} attempts, {Timeout}ms timeout) with parameters {Payload}",
+                                connectionState.ConnectionAttempts, _retryAttempts,
+                                maxTimeout.TotalMilliseconds, parameters);
+                        }
+                    }
+
+                    waitForResponse = waitForResponse && overrideTimeout.HasValue;
+                    response = await SendPayloadAsync(socket, payload, waitForResponse, chainedTokenSource.Token);
 
                     if ((response?.Length == 0 || response[0].Length == 0) && waitForResponse)
                     {
@@ -269,26 +254,23 @@ namespace Integrations.Cod
 
                 catch (OperationCanceledException)
                 {
+                    _log.LogDebug("OperationCanceledException when waiting for payload send to complete");
+
                     // if we timed out due to the cancellation token,
                     // we don't want to count that as an attempt
-                    _log.LogDebug("OperationCanceledException when waiting for payload send to complete");
-                    connectionState.ConnectionAttempts = 0;
-                }
-                catch
-                {
-                    // we want to retry with a delay
-                    if (connectionState.ConnectionAttempts < _retryAttempts)
+                    if (token.IsCancellationRequested)
                     {
-                        try
+                        if (connectionState.ConnectionAttempts > 0)
                         {
-                            await Task.Delay(StaticHelpers.SocketTimeout(connectionState.ConnectionAttempts), token);
-                        }
-                        catch (OperationCanceledException)
-                        {
-                            _log.LogDebug("OperationCancelled while waiting for retry");
-                            throw;
+                            connectionState.ConnectionAttempts--;
                         }
 
+                        throw new RConException("Timed out waiting on retry delay for RCon socket",
+                            token.IsCancellationRequested);
+                    }
+
+                    if (connectionState.ConnectionAttempts < _retryAttempts)
+                    {
                         goto retrySend;
                     }
 
@@ -302,25 +284,24 @@ namespace Integrations.Cod
                     connectionState.ConnectionAttempts = 0;
                     throw new NetworkException("Reached maximum retry attempts to send RCon data to server");
                 }
-                finally
+                catch (Exception ex)
                 {
-                    try
-                    {
-                        if (connectionState.OnSentData.CurrentCount == 0)
-                        {
-                            connectionState.OnSentData.Release();
-                        }
+                    _log.LogDebug(ex, "RCon Exception");
 
-                        if (connectionState.OnReceivedData.CurrentCount == 0)
-                        {
-                            connectionState.OnReceivedData.Release();
-                        }
-                    }
-                    catch
+                    if (connectionState.ConnectionAttempts < _retryAttempts)
                     {
-                        // ignored because we can have the socket operation cancelled (which releases the semaphore) but 
-                        // this thread is not notified because it's an event
+                        goto retrySend;
                     }
+
+                    using (LogContext.PushProperty("Server", Endpoint.ToString()))
+                    {
+                        _log.LogWarning(
+                            "Made {ConnectionAttempts} attempts to send RCon data to server, but received no response",
+                            connectionState.ConnectionAttempts);
+                    }
+
+                    connectionState.ConnectionAttempts = 0;
+                    throw new NetworkException("Reached maximum retry attempts to send RCon data to server");
                 }
             }
 
@@ -336,6 +317,91 @@ namespace Integrations.Cod
                 ? ReassembleSegmentedStatus(response)
                 : RecombineMessages(response);
 
+            var validatedResponse = ValidateResponse(type, responseString);
+
+            return validatedResponse;
+        }
+
+        private async Task<byte[][]> SendPayloadAsync(Socket rconSocket, byte[] payload, bool waitForResponse,
+            CancellationToken token = default)
+        {
+            var connectionState = ActiveQueries[Endpoint];
+
+            if (rconSocket is null)
+            {
+                _log.LogDebug("Invalid state");
+                throw new InvalidOperationException("State is not valid for socket operation");
+            }
+
+            var sentByteCount = await rconSocket.SendToAsync(payload, SocketFlags.None, Endpoint, token);
+            var complete = sentByteCount == payload.Length;
+
+            if (!complete)
+            {
+                using (LogContext.PushProperty("Server", Endpoint.ToString()))
+                {
+                    _log.LogWarning("Could not send data to remote RCon socket on attempt #{ConnectionAttempts}",
+                        connectionState.ConnectionAttempts);
+                }
+
+                rconSocket.Close();
+                throw new NetworkException("Could not send data to remote RCon socket", rconSocket);
+            }
+
+            if (!waitForResponse)
+            {
+                return Array.Empty<byte[]>();
+            }
+
+            _log.LogDebug("Waiting to asynchronously receive data on attempt #{ConnectionAttempts}",
+                connectionState.ConnectionAttempts);
+
+            await ReceiveAndStoreSocketData(rconSocket, token, connectionState);
+
+            if (_parser.GameName is Server.Game.IW3 or Server.Game.T4)
+            {
+                await Task.Delay(100, token); // CoD4x shenanigans 
+            }
+
+            while (rconSocket.Available > 0)
+            {
+                await ReceiveAndStoreSocketData(rconSocket, token, connectionState);
+            }
+
+            rconSocket.Close();
+            return GetResponseData(connectionState);
+        }
+
+        private async Task ReceiveAndStoreSocketData(Socket rconSocket, CancellationToken token,
+            ConnectionState connectionState)
+        {
+            SocketReceiveFromResult result;
+            try
+            {
+                result = await rconSocket.ReceiveFromAsync(connectionState.ReceiveBuffer,
+                    SocketFlags.None, Endpoint, token);
+            }
+            // windows quirk that occurs when remote server returns ICMP port unreachable
+            catch (SocketException ex) when (ex.SocketErrorCode == SocketError.ConnectionReset)
+            {
+                await Task.Delay(Timeout.Infinite, token);
+                return;
+            }
+
+            if (result.ReceivedBytes == 0)
+            {
+                return;
+            }
+
+            var storageBuffer = new byte[result.ReceivedBytes];
+            Array.Copy(connectionState.ReceiveBuffer, storageBuffer, storageBuffer.Length);
+            connectionState.ReceivedBytes.Add(storageBuffer);
+        }
+
+        #region Helpers
+
+        private string[] ValidateResponse(StaticHelpers.QueryType type, string responseString)
+        {
             // note: not all games respond if the password is wrong or not set
             if (responseString.Contains("Invalid password", StringComparison.InvariantCultureIgnoreCase) ||
                 responseString.Contains("rconpassword"))
@@ -359,21 +425,19 @@ namespace Integrations.Cod
                 ? _config.CommandPrefixes.RconGetInfoResponseHeader
                 : responseHeaderMatch);
 
-            if (headerSplit.Length != 2)
+            if (headerSplit.Length == 2)
             {
-                using (LogContext.PushProperty("Server", Endpoint.ToString()))
-                {
-                    _log.LogWarning("Invalid response header from server. Expected {Expected}, but got {Response}",
-                        _config.CommandPrefixes.RConResponse, headerSplit.FirstOrDefault());
-                }
-
-                throw new RConException("Unexpected response header from server");
+                return headerSplit.Last().Split(new[] { '\n' }, StringSplitOptions.RemoveEmptyEntries)
+                    .Select(line => line.StartsWith("^7") ? line[2..] : line).ToArray();
             }
 
-            var splitResponse = headerSplit.Last().Split(new[] { '\n' }, StringSplitOptions.RemoveEmptyEntries)
-                .Select(line => line.StartsWith("^7") ? line[2..] : line).ToArray();
-            
-            return splitResponse;
+            using (LogContext.PushProperty("Server", Endpoint.ToString()))
+            {
+                _log.LogWarning("Invalid response header from server. Expected {Expected}, but got {Response}",
+                    _config.CommandPrefixes.RConResponse, headerSplit.FirstOrDefault());
+            }
+
+            throw new RConException("Unexpected response header from server");
         }
 
         /// <summary>
@@ -404,7 +468,7 @@ namespace Integrations.Cod
 
             return string.Join("", splitStatusStrings);
         }
-
+        
         /// <summary>
         /// Recombines multiple game messages into one
         /// </summary>
@@ -433,269 +497,11 @@ namespace Integrations.Cod
             return builder.ToString();
         }
 
-        private async Task<byte[][]> SendPayloadAsync(byte[] payload, bool waitForResponse, TimeSpan overrideTimeout,
-            CancellationToken token = default)
-        {
-            var connectionState = ActiveQueries[Endpoint];
-            var rconSocket = ((ConnectionUserToken)connectionState.SendEventArgs.UserToken)?.Socket;
-
-            if (rconSocket is null)
-            {
-                _log.LogDebug("Invalid state");
-                throw new InvalidOperationException("State is not valid for socket operation");
-            }
-
-            if (connectionState.ReceiveEventArgs.RemoteEndPoint == null &&
-                connectionState.SendEventArgs.RemoteEndPoint == null)
-            {
-                // setup the event handlers only once because we're reusing the event args
-                connectionState.SendEventArgs.Completed += OnDataSent;
-                connectionState.ReceiveEventArgs.Completed += OnDataReceived;
-                connectionState.ReceiveEventArgs.UserToken = connectionState.SendEventArgs.UserToken;
-                connectionState.SendEventArgs.RemoteEndPoint = Endpoint;
-                connectionState.ReceiveEventArgs.RemoteEndPoint = Endpoint;
-                connectionState.ReceiveEventArgs.DisconnectReuseSocket = true;
-                connectionState.SendEventArgs.DisconnectReuseSocket = true;
-            }
-
-            if (connectionState.ReceiveEventArgs.UserToken is ConnectionUserToken { CancellationToken.IsCancellationRequested: true })
-            {
-                // after a graceful restart we need to reset the receive user token as the cancellation has been updated
-                connectionState.ReceiveEventArgs.UserToken = connectionState.SendEventArgs.UserToken;
-            }
-
-            connectionState.SendEventArgs.SetBuffer(payload);
-
-            // send the data to the server
-            var sendDataPending = rconSocket.SendToAsync(connectionState.SendEventArgs);
-
-            if (sendDataPending)
-            {
-                // the send has not been completed asynchronously
-                // this really shouldn't ever happen because it's UDP
-                var complete = await connectionState.OnSentData.WaitAsync(StaticHelpers.SocketTimeout(4), token);
-
-                if (!complete)
-                {
-                    using (LogContext.PushProperty("Server", Endpoint.ToString()))
-                    {
-                        _log.LogWarning("Socket timed out while sending RCon data on attempt {Attempt}",
-                            connectionState.ConnectionAttempts);
-                    }
-
-                    rconSocket.Close();
-                    throw new NetworkException("Timed out sending RCon data", rconSocket);
-                }
-            }
-
-            if (!waitForResponse)
-            {
-                return Array.Empty<byte[]>();
-            }
-
-            connectionState.ReceiveEventArgs.SetBuffer(connectionState.ReceiveBuffer);
-
-            // get our response back
-            var receiveDataPending = rconSocket.ReceiveFromAsync(connectionState.ReceiveEventArgs);
-
-            if (receiveDataPending)
-            {
-                _log.LogDebug("Waiting to asynchronously receive data on attempt #{ConnectionAttempts}",
-                    connectionState.ConnectionAttempts);
-
-                var completed = false;
-
-                try
-                {
-                    completed = await connectionState.OnReceivedData.WaitAsync(
-                        new[]
-                        {
-                            StaticHelpers.SocketTimeout(connectionState.ConnectionAttempts),
-                            overrideTimeout
-                        }.Max(), token);
-                }
-                catch (OperationCanceledException)
-                {
-                    // ignored
-                }
-
-                if (!completed)
-                {
-                    if (connectionState.ConnectionAttempts > 1) // this reduces some spam for unstable connections
-                    {
-                        using (LogContext.PushProperty("Server", Endpoint.ToString()))
-                        {
-                            _log.LogWarning(
-                                "Socket timed out while waiting for RCon response on attempt {Attempt} with timeout delay of {Timeout}",
-                                connectionState.ConnectionAttempts,
-                                StaticHelpers.SocketTimeout(connectionState.ConnectionAttempts));
-                        }
-                    }
-
-                    rconSocket.Close();
-                    _log.LogDebug("OnDataReceived did not complete in allocated time");
-                    throw new NetworkException("Timed out receiving RCon response", rconSocket);
-                }
-            }
-
-            rconSocket.Close();
-            return GetResponseData(connectionState);
-        }
-
         private static byte[][] GetResponseData(ConnectionState connectionState)
         {
-            var responseList = new List<byte[]>();
-            var totalBytesRead = 0;
-
-            foreach (var bytesRead in connectionState.BytesReadPerSegment)
-            {
-                responseList.Add(connectionState.ReceiveBuffer
-                    .Skip(totalBytesRead)
-                    .Take(bytesRead)
-                    .ToArray());
-
-                totalBytesRead += bytesRead;
-            }
-
-            return responseList.ToArray();
-        }
-
-        private void OnDataReceived(object sender, SocketAsyncEventArgs e)
-        {
-            _log.LogDebug("Read {BytesTransferred} bytes from {Endpoint}", e.BytesTransferred,
-                e.RemoteEndPoint?.ToString());
-
-            // this occurs when we close the socket
-            if (e.BytesTransferred == 0)
-            {
-                _log.LogDebug("No bytes were transmitted so the connection was probably closed");
-
-                var semaphore = ActiveQueries[Endpoint].OnReceivedData;
-
-                try
-                {
-                    if (semaphore.CurrentCount == 0)
-                    {
-                        semaphore.Release();
-                    }
-                }
-                catch
-                {
-                    // ignored because we can have the socket operation cancelled (which releases the semaphore) but 
-                    // this thread is not notified because it's an event
-                }
-
-                return;
-            }
-
-            var state = ActiveQueries[Endpoint];
-            var cancellationRequested = ((ConnectionUserToken)e.UserToken)?.CancellationToken.IsCancellationRequested ??
-                                        false;
-
-            if (sender is not Socket sock || cancellationRequested)
-            {
-                var semaphore = ActiveQueries[Endpoint].OnReceivedData;
-
-                try
-                {
-                    if (semaphore.CurrentCount == 0)
-                    {
-                        semaphore.Release();
-                    }
-                }
-                catch
-                {
-                    // ignored because we can have the socket operation cancelled (which releases the semaphore) but 
-                    // this thread is not notified because it's an event
-                }
-
-                return;
-            }
-
-            state.BytesReadPerSegment.Add(e.BytesTransferred);
-
-            // I don't even want to know why this works for getting more data from Cod4x
-            // but I'm leaving it in here as long as it doesn't break anything.
-            // it's very stupid...
-            Thread.Sleep(150);
-
-            try
-            {
-                var totalBytesTransferred = e.BytesTransferred;
-                _log.LogDebug("{Total} total bytes transferred with {Available} bytes remaining", totalBytesTransferred,
-                    sock.Available);
-
-                // we still have available data so the payload was segmented
-                while (sock.Available > 0)
-                {
-                    _log.LogDebug("{Available} more bytes to be read", sock.Available);
-
-                    var bufferSpaceAvailable = sock.Available + totalBytesTransferred - state.ReceiveBuffer.Length;
-                    if (bufferSpaceAvailable >= 0)
-                    {
-                        _log.LogWarning(
-                            "Not enough buffer space to store incoming data {BytesNeeded} additional bytes required",
-                            bufferSpaceAvailable);
-                        continue;
-                    }
-
-                    state.ReceiveEventArgs.SetBuffer(state.ReceiveBuffer, totalBytesTransferred, sock.Available);
-                    if (sock.ReceiveAsync(state.ReceiveEventArgs))
-                    {
-                        _log.LogDebug("Remaining bytes are async");
-                        continue;
-                    }
-
-                    _log.LogDebug("Read {BytesTransferred} synchronous bytes from {Endpoint}",
-                        state.ReceiveEventArgs.BytesTransferred, e.RemoteEndPoint?.ToString());
-
-                    // we need to increment this here because the callback isn't executed if there's no pending IO
-                    state.BytesReadPerSegment.Add(state.ReceiveEventArgs.BytesTransferred);
-                    totalBytesTransferred += state.ReceiveEventArgs.BytesTransferred;
-                }
-            }
-
-            catch (ObjectDisposedException)
-            {
-                _log.LogDebug("Socket was disposed while receiving data");
-            }
-
-            finally
-            {
-                var semaphore = ActiveQueries[Endpoint].OnReceivedData;
-                try
-                {
-                    if (semaphore.CurrentCount == 0)
-                    {
-                        semaphore.Release();
-                    }
-                }
-                catch
-                {
-                    // ignored because we can have the socket operation cancelled (which releases the semaphore) but 
-                    // this thread is not notified because it's an event
-                }
-            }
-        }
-
-        private void OnDataSent(object sender, SocketAsyncEventArgs e)
-        {
-            _log.LogDebug("Sent {ByteCount} bytes to {Endpoint}", e.Buffer?.Length,
-                e.ConnectSocket?.RemoteEndPoint?.ToString());
-
-            var semaphore = ActiveQueries[Endpoint].OnSentData;
-            try
-            {
-                if (semaphore.CurrentCount == 0)
-                {
-                    semaphore.Release();
-                }
-            }
-            catch
-            {
-                // ignored because we can have the socket operation cancelled (which releases the semaphore) but 
-                // this thread is not notified because it's an event
-            }
+            return connectionState.ReceivedBytes.ToArray();
         }
+        
+        #endregion
     }
 }

Integrations/Cod/ConnectionState.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Net.Sockets;
 using System.Threading;
 
 namespace Integrations.Cod
@@ -13,26 +12,13 @@ namespace Integrations.Cod
         ~ConnectionState()
         {
             OnComplete.Dispose();
-            OnSentData.Dispose();
-            OnReceivedData.Dispose();
         }
 
         public int ConnectionAttempts { get; set; }
         private const int BufferSize = 16384;
         public readonly byte[] ReceiveBuffer = new byte[BufferSize];
         public readonly SemaphoreSlim OnComplete = new(1, 1);
-        public readonly SemaphoreSlim OnSentData = new(1, 1);
-        public readonly SemaphoreSlim OnReceivedData = new (1, 1);
-       
-        public List<int> BytesReadPerSegment { get; set; } = new();
-        public SocketAsyncEventArgs SendEventArgs { get; set; } = new();
-        public SocketAsyncEventArgs ReceiveEventArgs { get; set; } = new();
+        public List<byte[]> ReceivedBytes { get; } = new();
         public DateTime LastQuery { get; set; } = DateTime.Now;
     }
-
-    internal class ConnectionUserToken
-    {
-        public Socket Socket { get; set; }
-        public CancellationToken CancellationToken { get; set; }
-    }
 }

Plugins/AutomessageFeed/AutoMessageFeedConfiguration.cs

@@ -0,0 +1,17 @@
+using SharedLibraryCore.Interfaces;
+
+namespace IW4MAdmin.Plugins.AutoMessageFeed;
+
+public class AutoMessageFeedConfiguration : IBaseConfiguration
+{
+    public bool EnableFeed { get; set; }
+    public string FeedUrl { get; set; }
+    public int MaxFeedItems { get; set; }
+
+    public IBaseConfiguration Generate()
+    {
+        return this;
+    }
+
+    public string Name() => "AutomessageFeedConfiguration";
+}

Plugins/AutomessageFeed/AutomessageFeed.csproj

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

Plugins/AutomessageFeed/Configuration.cs

@@ -1,18 +0,0 @@
-using SharedLibraryCore.Interfaces;
-
-namespace AutomessageFeed
-{
-    class Configuration : IBaseConfiguration
-    {
-        public bool EnableFeed { get; set; }
-        public string FeedUrl { get; set; }
-        public int MaxFeedItems { get; set; }
-
-        public IBaseConfiguration Generate()
-        {
-            return this;
-        }
-
-        public string Name() => "AutomessageFeedConfiguration";
-    }
-}

Plugins/AutomessageFeed/Plugin.cs

@@ -1,88 +1,77 @@
 using SharedLibraryCore;
 using SharedLibraryCore.Interfaces;
-using System;
 using System.Threading.Tasks;
 using Microsoft.SyndicationFeed.Rss;
-using SharedLibraryCore.Configuration;
 using System.Xml;
 using Microsoft.SyndicationFeed;
 using System.Collections.Generic;
 using SharedLibraryCore.Helpers;
 using System.Text.RegularExpressions;
+using Microsoft.Extensions.DependencyInjection;
+using SharedLibraryCore.Interfaces.Events;
 
-namespace AutomessageFeed
+namespace IW4MAdmin.Plugins.AutoMessageFeed;
+
+public class Plugin : IPluginV2
 {
-    public class Plugin : IPlugin
+    public string Name => "Automessage Feed";
+    public string Version => Utilities.GetVersionAsString();
+    public string Author => "RaidMax";
+
+    private int _currentFeedItem;
+    private readonly AutoMessageFeedConfiguration _configuration;
+
+    public static void RegisterDependencies(IServiceCollection serviceCollection)
     {
-        public string Name => "Automessage Feed";
+        serviceCollection.AddConfiguration<AutoMessageFeedConfiguration>("AutomessageFeedPluginSettings");
+    }
 
-        public float Version => (float)Utilities.GetVersionAsDouble();
+    public Plugin(AutoMessageFeedConfiguration configuration)
+    {
+        _configuration = configuration;
 
-        public string Author => "RaidMax";
-
-        private int _currentFeedItem;
-        private readonly IConfigurationHandler<Configuration> _configurationHandler;
-
-        public Plugin(IConfigurationHandlerFactory configurationHandlerFactory)
+        if (configuration.EnableFeed)
         {
-            _configurationHandler = configurationHandlerFactory.GetConfigurationHandler<Configuration>("AutomessageFeedPluginSettings");
-        }
-
-        private async Task<string> GetNextFeedItem(Server server)
-        {
-            var items = new List<string>();
-
-            using (var reader = XmlReader.Create(_configurationHandler.Configuration().FeedUrl, new XmlReaderSettings() { Async = true }))
+            IManagementEventSubscriptions.Load += (manager, _) =>
             {
-                var feedReader = new RssFeedReader(reader);
-
-                while (await feedReader.Read())
-                {
-                    switch (feedReader.ElementType)
-                    {
-                        case SyndicationElementType.Item:
-                            var item = await feedReader.ReadItem();
-                            items.Add(Regex.Replace(item.Title, @"\<.+\>.*\</.+\>", ""));
-                            break;
-                    }
-                }
-            }
-
-            if (_currentFeedItem < items.Count && (_configurationHandler.Configuration().MaxFeedItems == 0 || _currentFeedItem < _configurationHandler.Configuration().MaxFeedItems))
-            {
-                _currentFeedItem++;
-                return items[_currentFeedItem - 1];
-            }
-
-            _currentFeedItem = 0;
-            return Utilities.CurrentLocalization.LocalizationIndex["PLUGINS_AUTOMESSAGEFEED_NO_ITEMS"];
-        }
-
-        public Task OnEventAsync(GameEvent E, Server S)
-        {
-            return Task.CompletedTask;
-        }
-
-        public async Task OnLoadAsync(IManager manager)
-        {
-            await _configurationHandler.BuildAsync();
-            if (_configurationHandler.Configuration() == null)
-            {
-                _configurationHandler.Set((Configuration)new Configuration().Generate());
-                await _configurationHandler.Save();
-            }
-
-            manager.GetMessageTokens().Add(new MessageToken("FEED", GetNextFeedItem));
-        }
-
-        public Task OnTickAsync(Server S)
-        {
-            throw new NotImplementedException();
-        }
-
-        public Task OnUnloadAsync()
-        {
-            return Task.CompletedTask;
+                manager.GetMessageTokens().Add(new MessageToken("FEED", GetNextFeedItem));
+                return Task.CompletedTask;
+            };
         }
     }
+
+    private async Task<string> GetNextFeedItem(Server server)
+    {
+        if (!_configuration.EnableFeed)
+        {
+            return null;
+        }
+            
+        var items = new List<string>();
+
+        using (var reader = XmlReader.Create(_configuration.FeedUrl, new XmlReaderSettings { Async = true }))
+        {
+            var feedReader = new RssFeedReader(reader);
+
+            while (await feedReader.Read())
+            {
+                if (feedReader.ElementType != SyndicationElementType.Item)
+                {
+                    continue;
+                }
+
+                var item = await feedReader.ReadItem();
+                items.Add(Regex.Replace(item.Title, @"\<.+\>.*\</.+\>", ""));
+            }
+        }
+
+        if (_currentFeedItem < items.Count && (_configuration.MaxFeedItems == 0 || _currentFeedItem < _configuration.MaxFeedItems))
+        {
+            _currentFeedItem++;
+            return items[_currentFeedItem - 1];
+        }
+
+        _currentFeedItem = 0;
+        return Utilities.CurrentLocalization.LocalizationIndex["PLUGINS_AUTOMESSAGEFEED_NO_ITEMS"];
+    }
 }

Plugins/LiveRadar/Configuration/LiveRadarConfiguration.cs

@@ -1,391 +1,390 @@
 using SharedLibraryCore.Interfaces;
 using System.Collections.Generic;
 
-namespace LiveRadar.Configuration
+namespace IW4MAdmin.Plugins.LiveRadar.Configuration;
+
+public class LiveRadarConfiguration : IBaseConfiguration
 {
-    class LiveRadarConfiguration : IBaseConfiguration
+    public List<MapInfo> Maps { get; set; }
+
+    public IBaseConfiguration Generate()
     {
-        public List<MapInfo> Maps { get; set; }
-
-        public IBaseConfiguration Generate()
+        Maps = new List<MapInfo>()
         {
-            Maps = new List<MapInfo>()
+            new MapInfo()
             {
-                new MapInfo()
-                {
-                    Name = "mp_afghan",
-                    MaxLeft = 4600, // ymax
-                    MaxRight = -1100, // ymin
-                    MaxBottom = -1400, // xmin
-                    MaxTop = 4600, // xmax
-                    Left = 52, // pxmin
-                    Right = 898, // pxmax
-                    Bottom = 930, // pymax
-                    Top = 44 // pymin
-                },
+                Name = "mp_afghan",
+                MaxLeft = 4600, // ymax
+                MaxRight = -1100, // ymin
+                MaxBottom = -1400, // xmin
+                MaxTop = 4600, // xmax
+                Left = 52, // pxmin
+                Right = 898, // pxmax
+                Bottom = 930, // pymax
+                Top = 44 // pymin
+            },
 
-                new MapInfo()
-                {
-                    Name = "mp_rust",
-                    Top = 212,
-                    Bottom = 812,
-                    Left = 314,
-                    Right = 856,
-                    MaxRight = -225,
-                    MaxLeft = 1809,
-                    MaxTop = 1773,
-                    MaxBottom = -469
-                },
+            new MapInfo()
+            {
+                Name = "mp_rust",
+                Top = 212,
+                Bottom = 812,
+                Left = 314,
+                Right = 856,
+                MaxRight = -225,
+                MaxLeft = 1809,
+                MaxTop = 1773,
+                MaxBottom = -469
+            },
 
-                new MapInfo()
-                {
-                    Name = "mp_terminal",
-                    Top = 174,
-                    Bottom = 846,
-                    Left = 18,
-                    Right = 1011,
-                    MaxTop = 2929,
-                    MaxBottom = -513,
-                    MaxLeft = 7521,
-                    MaxRight = 2447
-                },
+            new MapInfo()
+            {
+                Name = "mp_terminal",
+                Top = 174,
+                Bottom = 846,
+                Left = 18,
+                Right = 1011,
+                MaxTop = 2929,
+                MaxBottom = -513,
+                MaxLeft = 7521,
+                MaxRight = 2447
+            },
 
-                new MapInfo()
-                {
-                    Name = "mp_subbase",
-                    MaxLeft =  1841,
-                    MaxRight =  -3817,
-                    MaxBottom =  -1585,
-                    MaxTop =  2593,
-                    Left =  18,
-                    Right =  968,
-                    Bottom =  864,
-                    Top =  160,
-                    ViewPositionRotation = 180,
-                },
+            new MapInfo()
+            {
+                Name = "mp_subbase",
+                MaxLeft =  1841,
+                MaxRight =  -3817,
+                MaxBottom =  -1585,
+                MaxTop =  2593,
+                Left =  18,
+                Right =  968,
+                Bottom =  864,
+                Top =  160,
+                ViewPositionRotation = 180,
+            },
 
-                new MapInfo()
-                {
-                    Name = "mp_estate",
-                    Top = 52,
-                    Bottom = 999,
-                    Left = 173,
-                    Right = 942,
-                    MaxTop = 2103,
-                    MaxBottom = -5077,
-                    MaxLeft = 4437,
-                    MaxRight = -1240,
-                    Rotation = 143,
-                    CenterX = -1440,
-                    CenterY = 1920,
-                    Scaler = 0.85f,
-                    ViewPositionRotation = 180
-                },
+            new MapInfo()
+            {
+                Name = "mp_estate",
+                Top = 52,
+                Bottom = 999,
+                Left = 173,
+                Right = 942,
+                MaxTop = 2103,
+                MaxBottom = -5077,
+                MaxLeft = 4437,
+                MaxRight = -1240,
+                Rotation = 143,
+                CenterX = -1440,
+                CenterY = 1920,
+                Scaler = 0.85f,
+                ViewPositionRotation = 180
+            },
 
-                new  MapInfo()
-                {
-                    Name = "mp_highrise",
-                    MaxBottom = -3909,
-                    MaxTop =  1649,
-                    MaxRight = 5111,
-                    MaxLeft = 8906,
-                    Left =  108,
-                    Right =  722,
-                    Top = 66,
-                    Bottom = 974,
-                },
+            new  MapInfo()
+            {
+                Name = "mp_highrise",
+                MaxBottom = -3909,
+                MaxTop =  1649,
+                MaxRight = 5111,
+                MaxLeft = 8906,
+                Left =  108,
+                Right =  722,
+                Top = 66,
+                Bottom = 974,
+            },
 
-                new MapInfo()
-                {
-                    Name = "mp_quarry",
-                    MaxBottom =  -5905,
-                    MaxTop =  -1423,
-                    MaxRight = -2095,
-                    MaxLeft = 3217,
-                    Left =  126,
-                    Right =  968,
-                    Top = 114,
-                    Bottom = 824
-                },
+            new MapInfo()
+            {
+                Name = "mp_quarry",
+                MaxBottom =  -5905,
+                MaxTop =  -1423,
+                MaxRight = -2095,
+                MaxLeft = 3217,
+                Left =  126,
+                Right =  968,
+                Top = 114,
+                Bottom = 824
+            },
 
-                new MapInfo()
-                {
-                    Name = "mp_boneyard",
-                    MaxBottom =  -1756,
-                    MaxTop =  2345,
-                    MaxRight = -715,
-                    MaxLeft = 1664,
-                    Left =  248,
-                    Right =  728,
-                    Top = 68,
-                    Bottom = 897
-                },
+            new MapInfo()
+            {
+                Name = "mp_boneyard",
+                MaxBottom =  -1756,
+                MaxTop =  2345,
+                MaxRight = -715,
+                MaxLeft = 1664,
+                Left =  248,
+                Right =  728,
+                Top = 68,
+                Bottom = 897
+            },
 
-                new MapInfo()
-                {
-                    Name = "mp_brecourt",
-                    MaxBottom =  -3797,
-                    MaxTop =  4240,
-                    MaxRight = -3876,
-                    MaxLeft = 2575,
-                    Left =  240,
-                    Right =  846,
-                    Top = 180,
-                    Bottom = 934
-                },
+            new MapInfo()
+            {
+                Name = "mp_brecourt",
+                MaxBottom =  -3797,
+                MaxTop =  4240,
+                MaxRight = -3876,
+                MaxLeft = 2575,
+                Left =  240,
+                Right =  846,
+                Top = 180,
+                Bottom = 934
+            },
 
-                new MapInfo()
-                {
-                    Name = "mp_checkpoint",
-                    MaxBottom =  -2273,
-                    MaxTop =  2153,
-                    MaxRight = -3457,
-                    MaxLeft = 2329,
-                    Left =  30,
-                    Right =  1010,
-                    Top = 136,
-                    Bottom = 890
-                },
+            new MapInfo()
+            {
+                Name = "mp_checkpoint",
+                MaxBottom =  -2273,
+                MaxTop =  2153,
+                MaxRight = -3457,
+                MaxLeft = 2329,
+                Left =  30,
+                Right =  1010,
+                Top = 136,
+                Bottom = 890
+            },
 
-                new MapInfo()
-                {
-                    Name = "mp_derail",
-                    MaxBottom =  -2775,
-                    MaxTop =  3886,
-                    MaxRight = -3807,
-                    MaxLeft = 4490,
-                    Left =  130,
-                    Right =  892,
-                    Top = 210,
-                    Bottom = 829
-                },
+            new MapInfo()
+            {
+                Name = "mp_derail",
+                MaxBottom =  -2775,
+                MaxTop =  3886,
+                MaxRight = -3807,
+                MaxLeft = 4490,
+                Left =  130,
+                Right =  892,
+                Top = 210,
+                Bottom = 829
+            },
 
-                new MapInfo()
-                {
-                    Name = "mp_favela",
-                    MaxBottom =  -2017,
-                    MaxTop =  1769,
-                    MaxRight = -1239,
-                    MaxLeft = 2998,
-                    Left =  120,
-                    Right =  912,
-                    Top = 174,
-                    Bottom = 878
-                },
+            new MapInfo()
+            {
+                Name = "mp_favela",
+                MaxBottom =  -2017,
+                MaxTop =  1769,
+                MaxRight = -1239,
+                MaxLeft = 2998,
+                Left =  120,
+                Right =  912,
+                Top = 174,
+                Bottom = 878
+            },
 
-                new MapInfo()
-                {
-                    Name = "mp_invasion",
-                    MaxBottom =  -3673,
-                    MaxTop =  2540,
-                    MaxRight = -3835,
-                    MaxLeft = 980,
-                    Left =  20,
-                    Right =  808,
-                    Top = 0,
-                    Bottom = 1006
-                },
+            new MapInfo()
+            {
+                Name = "mp_invasion",
+                MaxBottom =  -3673,
+                MaxTop =  2540,
+                MaxRight = -3835,
+                MaxLeft = 980,
+                Left =  20,
+                Right =  808,
+                Top = 0,
+                Bottom = 1006
+            },
 
-                new MapInfo()
-                {
-                    Name = "mp_nightshift",
-                    MaxBottom =  -2497,
-                    MaxTop =  1977,
-                    MaxRight = -2265,
-                    MaxLeft = 945,
-                    Left =  246,
-                    Right = 826,
-                    Top = 104,
-                    Bottom = 916
-                },
+            new MapInfo()
+            {
+                Name = "mp_nightshift",
+                MaxBottom =  -2497,
+                MaxTop =  1977,
+                MaxRight = -2265,
+                MaxLeft = 945,
+                Left =  246,
+                Right = 826,
+                Top = 104,
+                Bottom = 916
+            },
 
-                new MapInfo()
-                {
-                    Name = "mp_rundown",
-                    MaxBottom = -2304,
-                    MaxTop =  3194,
-                    MaxRight = -3558,
-                    MaxLeft = 3361,
-                    Left =  32,
-                    Right =  1030,
-                    Top = 96,
-                    Bottom = 892
-                },
+            new MapInfo()
+            {
+                Name = "mp_rundown",
+                MaxBottom = -2304,
+                MaxTop =  3194,
+                MaxRight = -3558,
+                MaxLeft = 3361,
+                Left =  32,
+                Right =  1030,
+                Top = 96,
+                Bottom = 892
+            },
 
-                new MapInfo()
-                {
-                    Name = "mp_underpass",
-                    MaxBottom =  -601,
-                    MaxTop =  3761,
-                    MaxRight = -1569,
-                    MaxLeft = 3615,
-                    Left =  42,
-                    Right =  978,
-                    Top = 157,
-                    Bottom = 944
-                },
+            new MapInfo()
+            {
+                Name = "mp_underpass",
+                MaxBottom =  -601,
+                MaxTop =  3761,
+                MaxRight = -1569,
+                MaxLeft = 3615,
+                Left =  42,
+                Right =  978,
+                Top = 157,
+                Bottom = 944
+            },
 
-                new MapInfo()
-                {
-                    Name = "mp_abandon",
-                    MaxBottom = -1290,
-                    MaxTop =    3855,
-                    MaxRight =  -2907,
-                    MaxLeft =   2723,
-                    Left =  6,
-                    Right = 1016,
-                    Top =   32,
-                    Bottom =    945
-                },
+            new MapInfo()
+            {
+                Name = "mp_abandon",
+                MaxBottom = -1290,
+                MaxTop =    3855,
+                MaxRight =  -2907,
+                MaxLeft =   2723,
+                Left =  6,
+                Right = 1016,
+                Top =   32,
+                Bottom =    945
+            },
 
-                new MapInfo()
-                {
-                    Name = "mp_compact",
-                    MaxBottom = 0,
-                    MaxTop =    4264,
-                    MaxRight =  -1552,
-                    MaxLeft =   3344,
-                    Left =  35,
-                    Right = 1003,
-                    Top =   94,
-                    Bottom =    935
-                },
+            new MapInfo()
+            {
+                Name = "mp_compact",
+                MaxBottom = 0,
+                MaxTop =    4264,
+                MaxRight =  -1552,
+                MaxLeft =   3344,
+                Left =  35,
+                Right = 1003,
+                Top =   94,
+                Bottom =    935
+            },
 
-                new MapInfo()
-                {
-                    Name = "mp_complex",
-                    MaxBottom = -2869,
-                    MaxTop =    2867,
-                    MaxRight =  -4204,
-                    MaxLeft =   -1218,
-                    Left =  282,
-                    Right = 749,
-                    Top =  48,
-                    Bottom =    991
-                },
+            new MapInfo()
+            {
+                Name = "mp_complex",
+                MaxBottom = -2869,
+                MaxTop =    2867,
+                MaxRight =  -4204,
+                MaxLeft =   -1218,
+                Left =  282,
+                Right = 749,
+                Top =  48,
+                Bottom =    991
+            },
 
 
-                new MapInfo()
-                {
-                    Name = "mp_crash",
-                    MaxBottom = -953,
-                    MaxTop =    1811,
-                    MaxRight =  -2129,
-                    MaxLeft =   2277,
-                    Left =  52,
-                    Right = 1017,
-                    Top =   201,
-                    Bottom =    807
-                },
+            new MapInfo()
+            {
+                Name = "mp_crash",
+                MaxBottom = -953,
+                MaxTop =    1811,
+                MaxRight =  -2129,
+                MaxLeft =   2277,
+                Left =  52,
+                Right = 1017,
+                Top =   201,
+                Bottom =    807
+            },
 
-                new MapInfo()
-                {
-                    Name = "mp_fuel2",
-                    MaxBottom = -2218,
-                    MaxTop =    4324,
-                    MaxRight =  -3115,
-                    MaxLeft =   3193,
-                    Left =  39,
-                    Right = 888,
-                    Top =   24,
-                    Bottom =    906
-                },
+            new MapInfo()
+            {
+                Name = "mp_fuel2",
+                MaxBottom = -2218,
+                MaxTop =    4324,
+                MaxRight =  -3115,
+                MaxLeft =   3193,
+                Left =  39,
+                Right = 888,
+                Top =   24,
+                Bottom =    906
+            },
 
-                new MapInfo()
-                {
-                    Name = "mp_overgrown",
-                    MaxBottom = -2052,
-                    MaxTop =    3236,
-                    MaxRight =  -5393,
-                    MaxLeft =   808,
-                    Left =  17,
-                    Right = 1024,
-                    Top =   0,
-                    Bottom =    847
-                },
+            new MapInfo()
+            {
+                Name = "mp_overgrown",
+                MaxBottom = -2052,
+                MaxTop =    3236,
+                MaxRight =  -5393,
+                MaxLeft =   808,
+                Left =  17,
+                Right = 1024,
+                Top =   0,
+                Bottom =    847
+            },
 
-                new MapInfo()
-                {
-                    Name = "mp_storm",
-                    MaxBottom = -2317,
-                    MaxTop =    2537,
-                    MaxRight =  -2223,
-                    MaxLeft =   2097,
-                    Left =  79,
-                    Right = 932,
-                    Top =   20,
-                    Bottom =    995
-                },
+            new MapInfo()
+            {
+                Name = "mp_storm",
+                MaxBottom = -2317,
+                MaxTop =    2537,
+                MaxRight =  -2223,
+                MaxLeft =   2097,
+                Left =  79,
+                Right = 932,
+                Top =   20,
+                Bottom =    995
+            },
 
-                new MapInfo()
-                {
-                    Name = "mp_strike",
-                    MaxBottom = -2504,
-                    MaxTop =    3359,
-                    MaxRight =  -3105,
-                    MaxLeft =   2822,
-                    Left =  40,
-                    Right = 969,
-                    Top =   36,
-                    Bottom =    955
-                },
+            new MapInfo()
+            {
+                Name = "mp_strike",
+                MaxBottom = -2504,
+                MaxTop =    3359,
+                MaxRight =  -3105,
+                MaxLeft =   2822,
+                Left =  40,
+                Right = 969,
+                Top =   36,
+                Bottom =    955
+            },
 
-                new MapInfo()
-                {
-                    Name = "mp_trailerpark",
-                    MaxBottom = -2709,
-                    MaxTop =    2027,
-                    MaxRight =  -1719,
-                    MaxLeft =   1666,
-                    Left =  152,
-                    Right = 785,
-                    Top =   50,
-                    Bottom =    931
-                },
+            new MapInfo()
+            {
+                Name = "mp_trailerpark",
+                MaxBottom = -2709,
+                MaxTop =    2027,
+                MaxRight =  -1719,
+                MaxLeft =   1666,
+                Left =  152,
+                Right = 785,
+                Top =   50,
+                Bottom =    931
+            },
 
-                new MapInfo()
-                {
-                    Name = "mp_vacant",
-                    MaxBottom = -2089,
-                    MaxTop =    1652,
-                    MaxRight =  -1393,
-                    MaxLeft =   1789,
-                    Left =  122,
-                    Right = 909,
-                    Top =   16,
-                    Bottom =    951
-                },
+            new MapInfo()
+            {
+                Name = "mp_vacant",
+                MaxBottom = -2089,
+                MaxTop =    1652,
+                MaxRight =  -1393,
+                MaxLeft =   1789,
+                Left =  122,
+                Right = 909,
+                Top =   16,
+                Bottom =    951
+            },
 
-                new MapInfo()
-                {
-                    Name = "mp_nuked",
-                    MaxLeft = 1211,
-                    MaxRight = -557,
-                    MaxBottom = -2110,
-                    MaxTop = 2092,
-                    Left = 340,
-                    Right = 698,
-                    Bottom = 930, 
-                    Top = 92 
-                },
+            new MapInfo()
+            {
+                Name = "mp_nuked",
+                MaxLeft = 1211,
+                MaxRight = -557,
+                MaxBottom = -2110,
+                MaxTop = 2092,
+                Left = 340,
+                Right = 698,
+                Bottom = 930, 
+                Top = 92 
+            },
 
-                new MapInfo()
-                {
-                    Name = "mp_killhouse",
-                    MaxLeft = 4276,
-                    MaxRight = 2973,
-                    MaxBottom = -1164,
-                    MaxTop = 1392,
-                    Left = 319,
-                    Right = 758,
-                    Bottom = 937,
-                    Top = 87
-                }
-            };
+            new MapInfo()
+            {
+                Name = "mp_killhouse",
+                MaxLeft = 4276,
+                MaxRight = 2973,
+                MaxBottom = -1164,
+                MaxTop = 1392,
+                Left = 319,
+                Right = 758,
+                Bottom = 937,
+                Top = 87
+            }
+        };
 
-            return this;
-        }
-
-        public string Name() => "LiveRadar";
+        return this;
     }
+
+    public string Name() => "LiveRadar";
 }

Plugins/LiveRadar/Controllers/RadarController.cs

@@ -1,26 +1,24 @@
-using LiveRadar.Configuration;
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using SharedLibraryCore;
 using SharedLibraryCore.Dtos;
 using SharedLibraryCore.Interfaces;
 using System.Linq;
 using System.Threading.Tasks;
+using IW4MAdmin.Plugins.LiveRadar.Configuration;
 using Microsoft.AspNetCore.Http;
 
-namespace LiveRadar.Web.Controllers
+namespace IW4MAdmin.Plugins.LiveRadar.Web.Controllers
 {
     public class RadarController : BaseController
     {
         private readonly IManager _manager;
-        private static LiveRadarConfiguration _config;
-        private readonly IConfigurationHandler<LiveRadarConfiguration> _configurationHandler;
+        private readonly LiveRadarConfiguration _config;
 
-        public RadarController(IManager manager, IConfigurationHandlerFactory configurationHandlerFactory) :
+        public RadarController(IManager manager, LiveRadarConfiguration config) :
             base(manager)
         {
             _manager = manager;
-            _configurationHandler =
-                configurationHandlerFactory.GetConfigurationHandler<LiveRadarConfiguration>("LiveRadarConfiguration");
+            _config = config;
         }
 
         [HttpGet]
@@ -32,8 +30,9 @@ namespace LiveRadar.Web.Controllers
                 .Select(server => new ServerInfo
                 {
                     Name = server.Hostname,
-                    IPAddress = server.IP,
-                    Port = server.Port
+                    IPAddress = server.ListenAddress,
+                    Port = server.ListenPort,
+                    Game = server.GameCode
                 });
 
             ViewBag.Title = Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_RADAR_TITLE"];
@@ -45,7 +44,7 @@ namespace LiveRadar.Web.Controllers
 
         [HttpGet]
         [Route("Radar/{serverId}/Map")]
-        public async Task<IActionResult> Map(string serverId = null)
+        public IActionResult Map(string serverId = null)
         {
             var server = serverId == null
                 ? _manager.GetServers().FirstOrDefault()
@@ -56,12 +55,6 @@ namespace LiveRadar.Web.Controllers
                 return NotFound();
             }
 
-            if (_config == null)
-            {
-                await _configurationHandler.BuildAsync();
-                _config = _configurationHandler.Configuration() ?? new LiveRadarConfiguration();
-            }
-
             var map = _config.Maps.FirstOrDefault(map => map.Name == server.CurrentMap.Name);
 
             if (map == null)

Plugins/LiveRadar/Events/LiveRadarEvent.cs

@@ -0,0 +1,38 @@
+using SharedLibraryCore;
+using SharedLibraryCore.Database.Models;
+using SharedLibraryCore.Interfaces;
+using System.Collections.Generic;
+using SharedLibraryCore.Events.Game;
+using EventGeneratorCallback = System.ValueTuple<string, string,
+    System.Func<string, SharedLibraryCore.Interfaces.IEventParserConfiguration,
+        SharedLibraryCore.GameEvent,
+        SharedLibraryCore.GameEvent>>;
+
+namespace IW4MAdmin.Plugins.LiveRadar.Events;
+
+public class Script : IRegisterEvent
+{
+    private const string EventLiveRadar = "LiveRadar";
+
+    private EventGeneratorCallback LiveRadar()
+    {
+        return (EventLiveRadar, EventLiveRadar, (eventLine, _, _) =>
+                {
+                    var radarEvent = new LiveRadarEvent
+                    {
+                        Type = GameEvent.EventType.Other,
+                        Subtype = EventLiveRadar,
+                        Origin = new EFClient { NetworkId = 0 },
+                        ScriptData = eventLine
+                    };
+                    return radarEvent;
+                }
+            );
+    }
+
+    public IEnumerable<EventGeneratorCallback> Events => new[] { LiveRadar() };
+}
+
+public class LiveRadarEvent : GameScriptEvent
+{
+}

Plugins/LiveRadar/Events/Script.cs

@@ -1,33 +0,0 @@
-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="2022.10.11.1" PrivateAssets="All" />
+    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2023.4.5.1" PrivateAssets="All" />
   </ItemGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">

Plugins/LiveRadar/MapInfo.cs

@@ -1,31 +1,26 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+namespace IW4MAdmin.Plugins.LiveRadar;
 
-namespace LiveRadar
+public class MapInfo
 {
-    public class MapInfo
-    {
-        public string Name { get; set; }
-        public string Alias { get; set; }
-        // distance from the edge of the minimap image
-        // to the "playable" area
-        public int Top { get; set; }
-        public int Bottom { get; set; }
-        public int Left { get; set; }
-        public int Right { get; set; }
-        // maximum coordinate values for the map
-        public int MaxTop { get; set; }
-        public int MaxBottom { get; set; }
-        public int MaxLeft { get; set; }
-        public int MaxRight { get; set; }
-        public float Rotation { get; set; }
-        public float ViewPositionRotation { get; set; }
-        public float CenterX { get; set; }
-        public float CenterY { get; set; }
-        public float Scaler { get; set; } = 1.0f;
+    public string Name { get; set; }
+    public string Alias { get; set; }
+    // distance from the edge of the minimap image
+    // to the "playable" area
+    public int Top { get; set; }
+    public int Bottom { get; set; }
+    public int Left { get; set; }
+    public int Right { get; set; }
+    // maximum coordinate values for the map
+    public int MaxTop { get; set; }
+    public int MaxBottom { get; set; }
+    public int MaxLeft { get; set; }
+    public int MaxRight { get; set; }
+    public float Rotation { get; set; }
+    public float ViewPositionRotation { get; set; }
+    public float CenterX { get; set; }
+    public float CenterY { get; set; }
+    public float Scaler { get; set; } = 1.0f;
 
-        public int Width => MaxLeft - MaxRight;
-        public int Height => MaxTop - MaxBottom;
-    }
+    public int Width => MaxLeft - MaxRight;
+    public int Height => MaxTop - MaxBottom;
 }

Plugins/LiveRadar/Plugin.cs

@@ -1,132 +1,145 @@
-using LiveRadar.Configuration;
-using SharedLibraryCore;
+using SharedLibraryCore;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
+using Data.Models;
+using IW4MAdmin.Plugins.LiveRadar.Configuration;
+using IW4MAdmin.Plugins.LiveRadar.Events;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Events.Game;
+using SharedLibraryCore.Events.Server;
 using SharedLibraryCore.Interfaces;
+using SharedLibraryCore.Interfaces.Events;
 using ILogger = Microsoft.Extensions.Logging.ILogger;
 
-namespace LiveRadar
+namespace IW4MAdmin.Plugins.LiveRadar;
+
+public class Plugin : IPluginV2
 {
-    public class Plugin : IPlugin
+    public string Name => "Live Radar";
+
+    public string Version => Utilities.GetVersionAsString();
+
+    public string Author => "RaidMax";
+
+    private bool _addedPage;
+    private readonly Dictionary<string, long> _botGuidLookups;
+    private readonly object _lockObject = new();
+    private readonly ILogger _logger;
+    private readonly ApplicationConfiguration _appConfig;
+
+    public static void RegisterDependencies(IServiceCollection serviceCollection)
     {
-        public string Name => "Live Radar";
+        serviceCollection.AddConfiguration<LiveRadarConfiguration>();
+    }
 
-        public float Version => (float)Utilities.GetVersionAsDouble();
+    public Plugin(ILogger<Plugin> logger, ApplicationConfiguration appConfig)
+    {
+        _botGuidLookups = new Dictionary<string, long>();
+        _logger = logger;
+        _appConfig = appConfig;
+        
+        IGameServerEventSubscriptions.MonitoringStarted += OnMonitoringStarted;
+        IGameEventSubscriptions.ClientEnteredMatch += OnClientEnteredMatch;
+        IGameEventSubscriptions.ScriptEventTriggered += OnScriptEvent;
+    }
 
-        public string Author => "RaidMax";
-
-        private readonly IConfigurationHandler<LiveRadarConfiguration> _configurationHandler;
-        private readonly Dictionary<string, long> _botGuidLookups;
-        private bool addedPage;
-        private readonly object lockObject = new object();
-        private readonly ILogger _logger;
-        private readonly ApplicationConfiguration _appConfig;
-
-        public Plugin(ILogger<Plugin> logger, IConfigurationHandlerFactory configurationHandlerFactory, ApplicationConfiguration appConfig)
+    private Task OnScriptEvent(GameScriptEvent scriptEvent, CancellationToken token)
+    {
+        if (scriptEvent is not LiveRadarEvent radarEvent)
         {
-            _configurationHandler = configurationHandlerFactory.GetConfigurationHandler<LiveRadarConfiguration>("LiveRadarConfiguration");
-            _botGuidLookups = new Dictionary<string, long>();
-            _logger = logger;
-            _appConfig = appConfig;
+            return Task.CompletedTask;
+        }
+        
+        try
+        {
+            var originalBotGuid = radarEvent.ScriptData.Split(";")[1];
+            
+            if (originalBotGuid.IsBotGuid() && _appConfig.IgnoreBots)
+            {
+                return Task.CompletedTask;
+            }
+                    
+            var botKey = $"BotGuid_{originalBotGuid}";
+            long generatedBotGuid;
+
+            lock (_lockObject)
+            {
+                var hasBotKey = _botGuidLookups.ContainsKey(botKey);
+
+                if (!hasBotKey && originalBotGuid.IsBotGuid())
+                {
+                    // edge case where the bot guid has not been registered yet
+                    return Task.CompletedTask;
+                }
+
+                generatedBotGuid = hasBotKey
+                    ? _botGuidLookups[botKey]
+                    : (originalBotGuid ?? "0").ConvertGuidToLong(NumberStyles.HexNumber);
+            }
+
+            var radarUpdate = RadarEvent.Parse(scriptEvent.ScriptData, generatedBotGuid);
+            var client =
+                radarEvent.Owner.ConnectedClients.FirstOrDefault(client => client.NetworkId == radarUpdate.Guid);
+
+            if (client != null)
+            {
+                radarUpdate.Name = client.Name.StripColors();
+                client.SetAdditionalProperty("LiveRadar", radarUpdate);
+            }
         }
 
-        public Task OnEventAsync(GameEvent E, Server S)
+        catch (Exception e)
+        {
+            _logger.LogError(e, "Could not parse live radar output: {Data}", e.Data);
+        }
+        
+        return Task.CompletedTask;
+    }
+
+    private Task OnClientEnteredMatch(ClientEnterMatchEvent clientEvent, CancellationToken token)
+    {
+        if (!clientEvent.Client.IsBot)
+        {
+            return Task.CompletedTask;
+        }
+
+        var botKey = $"BotGuid_{clientEvent.ClientNetworkId}";
+        lock (_lockObject)
+        {
+            if (!_botGuidLookups.ContainsKey(botKey))
+            {
+                _botGuidLookups.Add(botKey, clientEvent.Client.NetworkId);
+            }
+        }
+
+        return Task.CompletedTask;
+    }
+
+    private Task OnMonitoringStarted(MonitorStartEvent monitorEvent, CancellationToken token)
+    {
+        lock (_lockObject)
         {
             // if it's an IW4 game, with custom callbacks, we want to 
             // enable the live radar page
-            lock (lockObject)
+            var shouldRegisterPage = monitorEvent.Server.GameCode != Reference.Game.IW4 ||
+                                     !monitorEvent.Server.IsLegacyGameIntegrationEnabled ||
+                                     _addedPage;
+            if (shouldRegisterPage)
             {
-                if (E.Type == GameEvent.EventType.Start &&
-                    S.GameName == Server.Game.IW4 &&
-                    S.CustomCallback &&
-                    !addedPage)
-                {
-                    E.Owner.Manager.GetPageList().Pages.Add(Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_RADAR_TITLE"], "/Radar");
-                    addedPage = true;
-                }
+                return Task.CompletedTask;
             }
 
-            if (E.Type == GameEvent.EventType.PreConnect && E.Origin.IsBot)
-            {
-                string botKey = $"BotGuid_{E.Extra}";
-                lock (lockObject)
-                {
-                    if (!_botGuidLookups.ContainsKey(botKey))
-                    {
-                        _botGuidLookups.Add(botKey, E.Origin.NetworkId);
-                    }
-                }
-            }
-
-            if (E.Type == GameEvent.EventType.Other && E.Subtype == "LiveRadar")
-            {
-                try
-                {
-                    if (((string) E.Extra).IsBotGuid() && _appConfig.IgnoreBots)
-                    {
-                        return Task.CompletedTask;
-                    }
-                    
-                    string botKey = $"BotGuid_{E.Extra}";
-                    long generatedBotGuid;
-
-                    lock (lockObject)
-                    {
-                        var hasBotKey = _botGuidLookups.ContainsKey(botKey);
-
-                        if (!hasBotKey && ((string)E.Extra).IsBotGuid())
-                        {
-                            // edge case where the bot guid has not been registered yet
-                            return Task.CompletedTask;
-                        }
-                        
-                        generatedBotGuid = hasBotKey
-                            ? _botGuidLookups[botKey] 
-                            : (E.Extra.ToString() ?? "0").ConvertGuidToLong(NumberStyles.HexNumber);
-                    }
-
-                    var radarUpdate = RadarEvent.Parse(E.Data, generatedBotGuid);
-                    var client = S.Manager.GetActiveClients().FirstOrDefault(_client => _client.NetworkId == radarUpdate.Guid);
-
-                    if (client != null)
-                    {
-                        radarUpdate.Name = client.Name.StripColors();
-                        client.SetAdditionalProperty("LiveRadar", radarUpdate);
-                    }
-                }
-
-                catch (Exception e)
-                {
-                    _logger.LogError(e, "Could not parse live radar output: {data}", e.Data);
-                }
-            }
-
-            return Task.CompletedTask;
+            (monitorEvent.Source as IManager)?.GetPageList().Pages
+                .Add(Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_RADAR_TITLE"], "/Radar");
+            _addedPage = true;
         }
 
-        public async Task OnLoadAsync(IManager manager)
-        {
-            await _configurationHandler.BuildAsync();
-            if (_configurationHandler.Configuration() == null)
-            {
-                _configurationHandler.Set((LiveRadarConfiguration)new LiveRadarConfiguration().Generate());
-                await _configurationHandler.Save();
-            }
-        }
-
-        public Task OnTickAsync(Server S)
-        {
-            return Task.CompletedTask;
-        }
-
-        public Task OnUnloadAsync()
-        {
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
 }

Plugins/LiveRadar/RadarEvent.cs

@@ -5,60 +5,59 @@ using System.Linq;
 // ReSharper disable CompareOfFloatsByEqualityOperator
 #pragma warning disable CS0659
 
-namespace LiveRadar
+namespace IW4MAdmin.Plugins.LiveRadar;
+
+public class RadarEvent
 {
-    public class RadarEvent
+    public string Name { get; set; }
+    public long Guid { get; set; }
+    public Vector3 Location { get; set; }
+    public Vector3 ViewAngles { get; set; }
+    public string Team { get; set; }
+    public int Kills { get; set; }
+    public int Deaths { get; set; }
+    public int Score { get; set; }
+    public int PlayTime { get; set; }
+    public string Weapon { get; set; }
+    public int Health { get; set; }
+    public bool IsAlive { get; set; }
+    public Vector3 RadianAngles => new Vector3(ViewAngles.X.ToRadians(), ViewAngles.Y.ToRadians(), ViewAngles.Z.ToRadians());
+    public int Id => GetHashCode();
+
+    public override bool Equals(object obj)
     {
-        public string Name { get; set; }
-        public long Guid { get; set; }
-        public Vector3 Location { get; set; }
-        public Vector3 ViewAngles { get; set; }
-        public string Team { get; set; }
-        public int Kills { get; set; }
-        public int Deaths { get; set; }
-        public int Score { get; set; }
-        public int PlayTime { get; set; }
-        public string Weapon { get; set; }
-        public int Health { get; set; }
-        public bool IsAlive { get; set; }
-        public Vector3 RadianAngles => new Vector3(ViewAngles.X.ToRadians(), ViewAngles.Y.ToRadians(), ViewAngles.Z.ToRadians());
-        public int Id => GetHashCode();
-
-        public override bool Equals(object obj)
+        if (obj is RadarEvent re)
         {
-            if (obj is RadarEvent re)
-            {
-                return re.ViewAngles.X == ViewAngles.X &&
-                    re.ViewAngles.Y == ViewAngles.Y &&
-                    re.ViewAngles.Z == ViewAngles.Z &&
-                    re.Location.X == Location.X &&
-                    re.Location.Y == Location.Y &&
-                    re.Location.Z == Location.Z;
-            }
-
-            return false;
+            return re.ViewAngles.X == ViewAngles.X &&
+                   re.ViewAngles.Y == ViewAngles.Y &&
+                   re.ViewAngles.Z == ViewAngles.Z &&
+                   re.Location.X == Location.X &&
+                   re.Location.Y == Location.Y &&
+                   re.Location.Z == Location.Z;
         }
 
-        public static RadarEvent Parse(string input, long generatedBotGuid)
+        return false;
+    }
+
+    public static RadarEvent Parse(string input, long generatedBotGuid)
+    {
+        var items = input.Split(';').Skip(1).ToList();
+
+        var parsedEvent = new RadarEvent()
         {
-            var items = input.Split(';').Skip(1).ToList();
+            Guid = generatedBotGuid,
+            Location = Vector3.Parse(items[1]),
+            ViewAngles = Vector3.Parse(items[2]).FixIW4Angles(),
+            Team = items[3],
+            Kills = int.Parse(items[4]),
+            Deaths = int.Parse(items[5]),
+            Score = int.Parse(items[6]),
+            Weapon = items[7],
+            Health = int.Parse(items[8]),
+            IsAlive = items[9] == "1",
+            PlayTime = Convert.ToInt32(items[10])
+        };
 
-            var parsedEvent = new RadarEvent()
-            {
-                Guid = generatedBotGuid,
-                Location = Vector3.Parse(items[1]),
-                ViewAngles = Vector3.Parse(items[2]).FixIW4Angles(),
-                Team = items[3],
-                Kills = int.Parse(items[4]),
-                Deaths = int.Parse(items[5]),
-                Score = int.Parse(items[6]),
-                Weapon = items[7],
-                Health = int.Parse(items[8]),
-                IsAlive = items[9] == "1",
-                PlayTime = Convert.ToInt32(items[10])
-            };
-
-            return parsedEvent;
-        }
+        return parsedEvent;
     }
 }

Plugins/Login/Commands/LoginCommand.cs

@@ -10,8 +10,13 @@ namespace IW4MAdmin.Plugins.Login.Commands
 {
     public class LoginCommand : Command
     {
-        public LoginCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config, translationLookup)
+        private readonly LoginConfiguration _loginConfig;
+        private readonly LoginStates _loginStates;
+
+        public LoginCommand(CommandConfiguration config, ITranslationLookup translationLookup, LoginConfiguration loginConfig, LoginStates loginStates) : base(config, translationLookup)
         {
+            _loginConfig = loginConfig;
+            _loginStates = loginStates;
             Name = "login";
             Description = _translationLookup["PLUGINS_LOGIN_COMMANDS_LOGIN_DESC"];
             Alias = "li";
@@ -29,6 +34,12 @@ namespace IW4MAdmin.Plugins.Login.Commands
 
         public override async Task ExecuteAsync(GameEvent gameEvent)
         {
+            if (!_loginConfig.RequirePrivilegedClientLogin)
+            {
+                gameEvent.Origin.Tell(_translationLookup["PLUGINS_LOGIN_COMMANDS_LOGIN_DISABLED"]);
+                return;
+            }
+            
             var success = gameEvent.Owner.Manager.TokenAuthenticator.AuthorizeToken(new TokenIdentifier
             {
                 ClientId = gameEvent.Origin.ClientId,
@@ -43,7 +54,7 @@ namespace IW4MAdmin.Plugins.Login.Commands
 
             if (success)
             {
-                Plugin.AuthorizedClients[gameEvent.Origin.ClientId] = true;
+                _loginStates.AuthorizedClients[gameEvent.Origin.ClientId] = true;
             }
 
             _ = success ?

Plugins/Login/Login.csproj

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

Plugins/Login/LoginConfiguration.cs

@@ -1,9 +1,8 @@
-using SharedLibraryCore;
-using SharedLibraryCore.Interfaces;
+using SharedLibraryCore.Interfaces;
 
 namespace IW4MAdmin.Plugins.Login
 {
-    class Configuration : IBaseConfiguration
+    public class LoginConfiguration : IBaseConfiguration
     {
         public bool RequirePrivilegedClientLogin { get; set; }
 

Plugins/Login/LoginStates.cs

@@ -0,0 +1,9 @@
+using System.Collections.Concurrent;
+
+namespace IW4MAdmin.Plugins.Login;
+
+public class LoginStates
+{
+    public ConcurrentDictionary<int, bool> AuthorizedClients { get; } = new();
+    public const string LoginKey = "IsLoggedIn";
+}

Plugins/Login/Plugin.cs

@@ -1,94 +1,94 @@
-using System.Collections.Concurrent;
-using System.Reflection;
+using System.Threading;
 using System.Threading.Tasks;
 using IW4MAdmin.Plugins.Login.Commands;
+using Microsoft.Extensions.DependencyInjection;
 using SharedLibraryCore;
 using SharedLibraryCore.Commands;
-using SharedLibraryCore.Database.Models;
-using SharedLibraryCore.Exceptions;
+using SharedLibraryCore.Events.Management;
 using SharedLibraryCore.Interfaces;
+using SharedLibraryCore.Interfaces.Events;
+using EFClient = Data.Models.Client.EFClient;
 
-namespace IW4MAdmin.Plugins.Login
+namespace IW4MAdmin.Plugins.Login;
+
+public class Plugin : IPluginV2
 {
-    public class Plugin : IPlugin
+    public string Name => "Login";
+    public string Version => Utilities.GetVersionAsString();
+    public string Author => "RaidMax";
+    
+    private readonly LoginStates _loginStates;
+
+    public Plugin(LoginConfiguration configuration, LoginStates loginStates)
     {
-        public string Name => "Login";
-
-        public float Version => Assembly.GetExecutingAssembly().GetName().Version.Major + Assembly.GetExecutingAssembly().GetName().Version.Minor / 10.0f;
-
-        public string Author => "RaidMax";
-
-        public static ConcurrentDictionary<int, bool> AuthorizedClients { get; private set; }
-        private readonly IConfigurationHandler<Configuration> _configHandler;
-
-        public Plugin(IConfigurationHandlerFactory configurationHandlerFactory)
+        _loginStates = loginStates;
+        if (!(configuration?.RequirePrivilegedClientLogin ?? false))
         {
-            _configHandler = configurationHandlerFactory.GetConfigurationHandler<Configuration>("LoginPluginSettings");
+            return;
         }
 
-        public Task OnEventAsync(GameEvent gameEvent, Server server)
+        IManagementEventSubscriptions.Load += OnLoad;
+        IManagementEventSubscriptions.ClientStateInitialized += OnClientStateInitialized;
+        IManagementEventSubscriptions.ClientStateDisposed += (clientEvent, token) =>
         {
-            if (gameEvent.IsRemote || _configHandler.Configuration().RequirePrivilegedClientLogin == false)
-                return Task.CompletedTask;
-
-            if (gameEvent.Type == GameEvent.EventType.Connect)
-            {
-                AuthorizedClients.TryAdd(gameEvent.Origin.ClientId, false);
-                gameEvent.Origin.SetAdditionalProperty("IsLoggedIn", false);
-            }
-
-            if (gameEvent.Type == GameEvent.EventType.Disconnect)
-            {
-                AuthorizedClients.TryRemove(gameEvent.Origin.ClientId, out _);
-            }
-            
+            _loginStates.AuthorizedClients.TryRemove(clientEvent.Client.ClientId, out _);
             return Task.CompletedTask;
-        }
+        };
+    }
 
-        public async Task OnLoadAsync(IManager manager)
+    public static void RegisterDependencies(IServiceCollection serviceCollection)
+    {
+        serviceCollection.AddConfiguration<LoginConfiguration>("LoginPluginSettings");
+        serviceCollection.AddSingleton(new LoginStates());
+    }
+
+    private Task OnClientStateInitialized(ClientStateInitializeEvent clientEvent, CancellationToken token)
+    {
+        _loginStates.AuthorizedClients.TryAdd(clientEvent.Client.ClientId, false);
+        clientEvent.Client.SetAdditionalProperty(LoginStates.LoginKey, false);
+
+        return Task.CompletedTask;
+    }
+
+    private Task OnLoad(IManager manager, CancellationToken token)
+    {
+        manager.CommandInterceptors.Add(gameEvent =>
         {
-            AuthorizedClients = new ConcurrentDictionary<int, bool>();
-
-            manager.CommandInterceptors.Add(gameEvent =>
+            if (gameEvent.Type != GameEvent.EventType.Command || gameEvent.Extra is null || gameEvent.IsRemote)
             {
-                if (gameEvent.Type != GameEvent.EventType.Command)
-                {
-                    return true;
-                }
-
-                if (gameEvent.Origin.Level < EFClient.Permission.Moderator ||
-                    gameEvent.Origin.Level == EFClient.Permission.Console)
-                    return true;
-
-                if (gameEvent.Extra.GetType() == typeof(SetPasswordCommand) &&
-                    gameEvent.Origin?.Password == null)
-                    return true;
-
-                if (gameEvent.Extra.GetType() == typeof(LoginCommand))
-                    return true;
-
-                if (gameEvent.Extra.GetType() == typeof(RequestTokenCommand))
-                    return true;
-
-                if (!AuthorizedClients[gameEvent.Origin.ClientId])
-                {
-                    return false;
-                }
-
-                gameEvent.Origin.SetAdditionalProperty("IsLoggedIn", true);
                 return true;
-            });
-
-            await _configHandler.BuildAsync();
-            if (_configHandler.Configuration() == null)
-            {
-                _configHandler.Set((Configuration)new Configuration().Generate());
-                await _configHandler.Save();
             }
-        }
 
-        public Task OnTickAsync(Server S) => Task.CompletedTask;
+            if (gameEvent.Origin.Level is < EFClient.Permission.Moderator or EFClient.Permission.Console)
+            {
+                return true;
+            }
 
-        public Task OnUnloadAsync() => Task.CompletedTask;
+            if (gameEvent.Extra.GetType() == typeof(SetPasswordCommand) &&
+                gameEvent.Origin?.Password == null)
+            {
+                return true;
+            }
+
+            if (gameEvent.Extra.GetType() == typeof(LoginCommand))
+            {
+                return true;
+            }
+
+            if (gameEvent.Extra.GetType() == typeof(RequestTokenCommand))
+            {
+                return true;
+            }
+
+            if (!_loginStates.AuthorizedClients[gameEvent.Origin.ClientId])
+            {
+                return false;
+            }
+
+            gameEvent.Origin.SetAdditionalProperty(LoginStates.LoginKey, true);
+            return true;
+        });
+
+        return Task.CompletedTask;
     }
 }

Plugins/Mute/Commands/MuteCommand.cs

@@ -4,13 +4,16 @@ using SharedLibraryCore.Commands;
 using SharedLibraryCore.Configuration;
 using SharedLibraryCore.Interfaces;
 
-namespace Mute.Commands;
+namespace IW4MAdmin.Plugins.Mute.Commands;
 
 public class MuteCommand : Command
 {
-    public MuteCommand(CommandConfiguration config, ITranslationLookup translationLookup) : base(config,
+    private readonly MuteManager _muteManager;
+
+    public MuteCommand(CommandConfiguration config, ITranslationLookup translationLookup, MuteManager muteManager) : base(config,
         translationLookup)
     {
+        _muteManager = muteManager;
         Name = "mute";
         Description = translationLookup["PLUGINS_MUTE_COMMANDS_MUTE_DESC"];
         Alias = "mu";
@@ -23,20 +26,33 @@ public class MuteCommand : Command
             {
                 Name = translationLookup["COMMANDS_ARGS_PLAYER"],
                 Required = true
+            },
+            new CommandArgument
+            {
+                Name = translationLookup["COMMANDS_ARGS_REASON"],
+                Required = true
             }
         };
     }
 
-    private readonly MuteManager _muteManager = new();
-
     public override async Task ExecuteAsync(GameEvent gameEvent)
     {
-        if (await _muteManager.Mute(gameEvent))
+        if (gameEvent.Origin.ClientId == gameEvent.Target.ClientId)
         {
-            gameEvent.Origin.Tell($"{_translationLookup["PLUGINS_MUTE_MUTED"]} {gameEvent.Target.Name}");
+            gameEvent.Origin.Tell(_translationLookup["COMMANDS_DENY_SELF_TARGET"]);
             return;
         }
 
-        gameEvent.Origin.Tell($"{_translationLookup["PLUGINS_MUTE_UNMUTED"]} {gameEvent.Target.Name}");
+        if (await _muteManager.Mute(gameEvent.Owner, gameEvent.Origin, gameEvent.Target, null, gameEvent.Data))
+        {
+            gameEvent.Origin.Tell(_translationLookup["PLUGINS_MUTE_COMMANDS_MUTE_MUTED"]
+                .FormatExt(gameEvent.Target.CleanedName));
+            gameEvent.Target.Tell(_translationLookup["PLUGINS_MUTE_COMMANDS_MUTE_TARGET_MUTED"]
+                .FormatExt(gameEvent.Data));
+            return;
+        }
+
+        gameEvent.Origin.Tell(_translationLookup["PLUGINS_MUTE_COMMANDS_MUTE_NOT_UNMUTED"]
+            .FormatExt(gameEvent.Target.CleanedName));
     }
 }

Plugins/Mute/Commands/MuteInfoCommand.cs

@@ -0,0 +1,53 @@
+using Data.Models.Client;
+using Humanizer;
+using SharedLibraryCore;
+using SharedLibraryCore.Commands;
+using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Interfaces;
+
+namespace IW4MAdmin.Plugins.Mute.Commands;
+
+public class MuteInfoCommand : Command
+{
+    private readonly MuteManager _muteManager;
+
+    public MuteInfoCommand(CommandConfiguration config, ITranslationLookup translationLookup, MuteManager muteManager) : base(config,
+        translationLookup)
+    {
+        _muteManager = muteManager;
+        Name = "muteinfo";
+        Description = translationLookup["PLUGINS_MUTE_COMMANDS_MUTEINFO_DESC"];
+        Alias = "mi";
+        Permission = EFClient.Permission.Moderator;
+        RequiresTarget = true;
+        SupportedGames = Plugin.SupportedGames;
+        Arguments = new[]
+        {
+            new CommandArgument
+            {
+                Name = translationLookup["COMMANDS_ARGS_PLAYER"],
+                Required = true
+            }
+        };
+    }
+
+    public override async Task ExecuteAsync(GameEvent gameEvent)
+    {
+        var currentMuteMeta = await _muteManager.GetCurrentMuteState(gameEvent.Target);
+        switch (currentMuteMeta.MuteState)
+        {
+            case MuteState.Muted when currentMuteMeta.Expiration is null:
+                gameEvent.Origin.Tell(_translationLookup["PLUGINS_MUTE_COMMANDS_MUTEINFO_SUCCESS"]
+                    .FormatExt(gameEvent.Target.Name, currentMuteMeta.Reason));
+                return;
+            case MuteState.Muted when currentMuteMeta.Expiration.HasValue && currentMuteMeta.Expiration.Value > DateTime.UtcNow:
+                var remainingTime = (currentMuteMeta.Expiration.Value - DateTime.UtcNow).HumanizeForCurrentCulture();
+                gameEvent.Origin.Tell(_translationLookup["PLUGINS_MUTE_COMMANDS_MUTEINFO_TM_SUCCESS"]
+                    .FormatExt(gameEvent.Target.Name, currentMuteMeta.Reason, remainingTime));
+                return;
+            default:
+                gameEvent.Origin.Tell(_translationLookup["PLUGINS_MUTE_COMMANDS_MUTEINFO_NONE"]);
+                break;
+        }
+    }
+}

Plugins/Mute/Commands/TempMuteCommand.cs

@@ -0,0 +1,75 @@
+using System.Text.RegularExpressions;
+using Data.Models.Client;
+using SharedLibraryCore;
+using SharedLibraryCore.Commands;
+using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Interfaces;
+
+namespace IW4MAdmin.Plugins.Mute.Commands;
+
+public class TempMuteCommand : Command
+{
+    private readonly MuteManager _muteManager;
+    private const string TempBanRegex = @"([0-9]+\w+)\ (.+)";
+
+    public TempMuteCommand(CommandConfiguration config, ITranslationLookup translationLookup, MuteManager muteManager) : base(config,
+        translationLookup)
+    {
+        _muteManager = muteManager;
+        Name = "tempmute";
+        Description = translationLookup["PLUGINS_MUTE_COMMANDS_TEMPMUTE_DESC"];
+        Alias = "tm";
+        Permission = EFClient.Permission.Moderator;
+        RequiresTarget = true;
+        SupportedGames = Plugin.SupportedGames;
+        Arguments = new[]
+        {
+            new CommandArgument
+            {
+                Name = translationLookup["COMMANDS_ARGS_PLAYER"],
+                Required = true
+            },
+            new CommandArgument
+            {
+                Name = translationLookup["COMMANDS_ARGS_DURATION"],
+                Required = true
+            },
+            new CommandArgument
+            {
+                Name = translationLookup["COMMANDS_ARGS_REASON"],
+                Required = true
+            }
+        };
+    }
+
+    public override async Task ExecuteAsync(GameEvent gameEvent)
+    {
+        if (gameEvent.Origin.ClientId == gameEvent.Target.ClientId)
+        {
+            gameEvent.Origin.Tell(_translationLookup["COMMANDS_DENY_SELF_TARGET"]);
+            return;
+        }
+        
+        var match = Regex.Match(gameEvent.Data, TempBanRegex);
+        if (match.Success)
+        {
+            var expiration = DateTime.UtcNow + match.Groups[1].ToString().ParseTimespan();
+            var reason = match.Groups[2].ToString();
+
+            if (await _muteManager.Mute(gameEvent.Owner, gameEvent.Origin, gameEvent.Target, expiration, reason))
+            {
+                gameEvent.Origin.Tell(_translationLookup["PLUGINS_MUTE_COMMANDS_TEMPMUTE_TEMPMUTED"]
+                    .FormatExt(gameEvent.Target.CleanedName));
+                gameEvent.Target.Tell(_translationLookup["PLUGINS_MUTE_COMMANDS_TEMPMUTE_TARGET_TEMPMUTED"]
+                    .FormatExt(expiration.HumanizeForCurrentCulture(), reason));
+                return;
+            }
+
+            gameEvent.Origin.Tell(_translationLookup["PLUGINS_MUTE_COMMANDS_MUTE_NOT_UNMUTED"]
+                .FormatExt(gameEvent.Target.CleanedName));
+            return;
+        }
+
+        gameEvent.Origin.Tell(_translationLookup["PLUGINS_MUTE_COMMANDS_TEMPMUTE_BAD_FORMAT"]);
+    }
+}

Plugins/Mute/Commands/UnmuteCommand.cs

@@ -0,0 +1,58 @@
+using Data.Models.Client;
+using SharedLibraryCore;
+using SharedLibraryCore.Commands;
+using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Interfaces;
+
+namespace IW4MAdmin.Plugins.Mute.Commands;
+
+public class UnmuteCommand : Command
+{
+    private readonly MuteManager _muteManager;
+
+    public UnmuteCommand(CommandConfiguration config, ITranslationLookup translationLookup, MuteManager muteManager) : base(config,
+        translationLookup)
+    {
+        _muteManager = muteManager;
+        Name = "unmute";
+        Description = translationLookup["PLUGINS_MUTE_COMMANDS_UNMUTE_DESC"];
+        Alias = "um";
+        Permission = EFClient.Permission.Moderator;
+        RequiresTarget = true;
+        SupportedGames = Plugin.SupportedGames;
+        Arguments = new[]
+        {
+            new CommandArgument
+            {
+                Name = translationLookup["COMMANDS_ARGS_PLAYER"],
+                Required = true
+            },
+            new CommandArgument
+            {
+                Name = translationLookup["COMMANDS_ARGS_REASON"],
+                Required = true
+            }
+        };
+    }
+
+    public override async Task ExecuteAsync(GameEvent gameEvent)
+    {
+        if (gameEvent.Origin.ClientId == gameEvent.Target.ClientId)
+        {
+            gameEvent.Origin.Tell(_translationLookup["COMMANDS_DENY_SELF_TARGET"]);
+            return;
+        }
+
+        if (await _muteManager.Unmute(gameEvent.Owner, gameEvent.Origin, gameEvent.Target, gameEvent.Data))
+        {
+            gameEvent.Origin.Tell(_translationLookup["PLUGINS_MUTE_COMMANDS_UNMUTE_UNMUTED"]
+                .FormatExt(gameEvent.Target.CleanedName));
+            gameEvent.Target.Tell(_translationLookup["PLUGINS_MUTE_COMMANDS_UNMUTE_TARGET_UNMUTED"]
+                .FormatExt(gameEvent.Data));
+            return;
+        }
+
+        gameEvent.Origin.Tell(_translationLookup["PLUGINS_MUTE_COMMANDS_UNMUTE_NOT_MUTED"]
+            .FormatExt(gameEvent.Target.CleanedName));
+    }
+}

Plugins/Mute/DataManager.cs

@@ -1,38 +0,0 @@
-using Data.Models.Client;
-using SharedLibraryCore.Interfaces;
-using static System.Enum;
-
-namespace Mute;
-
-public class DataManager
-{
-    public DataManager(IMetaServiceV2 metaService)
-    {
-        _metaService = metaService;
-    }
-
-    private readonly IMetaServiceV2 _metaService;
-
-    public async Task<MuteState> ReadPersistentData(EFClient client)
-    {
-        var clientMuteState = client.GetAdditionalProperty<MuteState?>(Plugin.MuteKey) ??
-                              Parse<MuteState>((await _metaService.GetPersistentMeta(Plugin.MuteKey, client.ClientId))?
-                                  .Value ?? nameof(MuteState.Unmuted));
-
-        client.SetAdditionalProperty(Plugin.MuteKey, clientMuteState);
-        return clientMuteState;
-    }
-
-    public async Task WritePersistentData(EFClient client, MuteState state)
-    {
-        await _metaService.SetPersistentMeta(Plugin.MuteKey, state.ToString(), client.ClientId);
-        client.SetAdditionalProperty(Plugin.MuteKey, state);
-    }
-}
-
-public enum MuteState
-{
-    Muted,
-    Unmuting,
-    Unmuted
-}

Plugins/Mute/Mute.csproj

@@ -11,9 +11,9 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.10.11.1" PrivateAssets="All"/>
+        <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2023.4.5.1" PrivateAssets="All" />
     </ItemGroup>
-
+    
     <Target Name="PostBuild" AfterTargets="PostBuildEvent">
         <Exec Command="dotnet publish $(ProjectPath) -c $(ConfigurationName) -o $(ProjectDir)..\..\Build\Plugins --no-build --no-restore --no-dependencies" />
     </Target>

Plugins/Mute/MuteManager.cs

@@ -1,21 +1,206 @@
-using SharedLibraryCore;
+using Data.Abstractions;
+using Data.Models;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using SharedLibraryCore;
+using SharedLibraryCore.Database.Models;
+using SharedLibraryCore.Interfaces;
+using static System.Enum;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
 
-namespace Mute;
+namespace IW4MAdmin.Plugins.Mute;
 
 public class MuteManager
 {
-    public async Task<bool> Mute(GameEvent gameEvent)
-    {
-        if (await Plugin.DataManager.ReadPersistentData(gameEvent.Target) == MuteState.Muted)
-        {
-            await gameEvent.Owner.ExecuteCommandAsync($"unmute {gameEvent.Target.ClientNumber}");
-            await Plugin.DataManager.WritePersistentData(gameEvent.Target,
-                gameEvent.Target.IsIngame ? MuteState.Unmuted : MuteState.Unmuting);
-            return false;
-        }
+    private readonly IMetaServiceV2 _metaService;
+    private readonly ITranslationLookup _translationLookup;
+    private readonly ILogger _logger;
+    private readonly IDatabaseContextFactory _databaseContextFactory;
+    private readonly SemaphoreSlim _onMuteAction = new(1, 1);
+
+    public MuteManager(ILogger<MuteManager> logger, IDatabaseContextFactory databaseContextFactory,
+        IMetaServiceV2 metaService, ITranslationLookup translationLookup)
+    {
+        _logger = logger;
+        _databaseContextFactory = databaseContextFactory;
+        _metaService = metaService;
+        _translationLookup = translationLookup;
+    }
+
+    public static bool IsExpiredMute(MuteStateMeta muteStateMeta) =>
+        muteStateMeta.Expiration is not null && muteStateMeta.Expiration < DateTime.UtcNow;
+
+    public async Task<MuteStateMeta> GetCurrentMuteState(EFClient client)
+    {
+        try
+        {
+            await _onMuteAction.WaitAsync();
+            var clientMuteMeta = await ReadPersistentDataV2(client);
+            if (clientMuteMeta is not null) return clientMuteMeta;
+
+            // Return null if the client doesn't have old or new meta.
+            var muteState = await ReadPersistentDataV1(client);
+            clientMuteMeta = new MuteStateMeta
+            {
+                Reason = muteState is null ? string.Empty : _translationLookup["PLUGINS_MUTE_MIGRATED"],
+                Expiration = muteState switch
+                {
+                    null => DateTime.UtcNow,
+                    MuteState.Muted => null,
+                    _ => DateTime.UtcNow
+                },
+                MuteState = muteState ?? MuteState.Unmuted,
+                CommandExecuted = true
+            };
+
+            // Migrate old mute meta, else, client has no state, so set a generic one, but don't write it to database.
+            if (muteState is not null)
+            {
+                clientMuteMeta.CommandExecuted = false;
+                await WritePersistentData(client, clientMuteMeta);
+                await CreatePenalty(muteState.Value, Utilities.IW4MAdminClient(), client, clientMuteMeta.Expiration,
+                    clientMuteMeta.Reason);
+            }
+            else
+            {
+                client.SetAdditionalProperty(Plugin.MuteKey, clientMuteMeta);
+            }
+
+            return clientMuteMeta;
+        }
+        finally
+        {
+            if (_onMuteAction.CurrentCount == 0) _onMuteAction.Release();
+        }
+    }
+
+    public async Task<bool> Mute(Server server, EFClient origin, EFClient target, DateTime? dateTime, string reason)
+    {
+        var clientMuteMeta = await GetCurrentMuteState(target);
+        if (clientMuteMeta.MuteState is MuteState.Muted && clientMuteMeta.CommandExecuted) return false;
+
+        clientMuteMeta = new MuteStateMeta
+        {
+            Expiration = dateTime,
+            MuteState = MuteState.Muted,
+            Reason = reason,
+            CommandExecuted = false
+        };
+        await WritePersistentData(target, clientMuteMeta);
+
+        await CreatePenalty(MuteState.Muted, origin, target, dateTime, reason);
+
+        // Handle game command
+        var client = server.GetClientsAsList().FirstOrDefault(client => client.NetworkId == target.NetworkId);
+        await PerformGameCommand(server, client, clientMuteMeta);
 
-        await gameEvent.Owner.ExecuteCommandAsync($"muteClient {gameEvent.Target.ClientNumber}");
-        await Plugin.DataManager.WritePersistentData(gameEvent.Target, MuteState.Muted);
         return true;
     }
+
+    public async Task<bool> Unmute(Server server, EFClient origin, EFClient target, string reason)
+    {
+        var clientMuteMeta = await GetCurrentMuteState(target);
+        if (clientMuteMeta.MuteState is MuteState.Unmuted && clientMuteMeta.CommandExecuted) return false;
+        if (!target.IsIngame && clientMuteMeta.MuteState is MuteState.Unmuting) return false;
+
+        if (clientMuteMeta.MuteState is not MuteState.Unmuting && origin.ClientId != 1)
+        {
+            await CreatePenalty(MuteState.Unmuted, origin, target, DateTime.UtcNow, reason);
+        }
+
+        await ExpireMutePenalties(target);
+
+        clientMuteMeta = new MuteStateMeta
+        {
+            Expiration = DateTime.UtcNow,
+            MuteState = target.IsIngame ? MuteState.Unmuted : MuteState.Unmuting,
+            Reason = reason,
+            CommandExecuted = false
+        };
+        await WritePersistentData(target, clientMuteMeta);
+
+        // Handle game command
+        var client = server.GetClientsAsList().FirstOrDefault(client => client.NetworkId == target.NetworkId);
+        await PerformGameCommand(server, client, clientMuteMeta);
+
+        return true;
+    }
+
+    private async Task CreatePenalty(MuteState muteState, EFClient origin, EFClient target, DateTime? dateTime,
+        string reason)
+    {
+        var newPenalty = new EFPenalty
+        {
+            Type = muteState is MuteState.Unmuted ? EFPenalty.PenaltyType.Unmute :
+                dateTime is null ? EFPenalty.PenaltyType.Mute : EFPenalty.PenaltyType.TempMute,
+            Expires = muteState is MuteState.Unmuted ? DateTime.UtcNow : dateTime,
+            Offender = target,
+            Offense = reason,
+            Punisher = origin,
+            Link = target.AliasLink
+        };
+        _logger.LogDebug("Creating new {MuteState} Penalty for {Target} with reason {Reason}",
+            nameof(muteState), target.Name, reason);
+        await newPenalty.TryCreatePenalty(Plugin.Manager.GetPenaltyService(), _logger);
+    }
+
+    private async Task ExpireMutePenalties(EFClient client)
+    {
+        await using var context = _databaseContextFactory.CreateContext();
+        var mutePenalties = await context.Penalties
+            .Where(penalty => penalty.OffenderId == client.ClientId &&
+                              (penalty.Type == EFPenalty.PenaltyType.Mute ||
+                               penalty.Type == EFPenalty.PenaltyType.TempMute) &&
+                              (penalty.Expires == null || penalty.Expires > DateTime.UtcNow))
+            .ToListAsync();
+
+        foreach (var mutePenalty in mutePenalties)
+        {
+            mutePenalty.Expires = DateTime.UtcNow;
+        }
+
+        await context.SaveChangesAsync();
+    }
+
+    public static async Task PerformGameCommand(Server server, EFClient? client, MuteStateMeta muteStateMeta)
+    {
+        if (client is null || !client.IsIngame) return;
+
+        switch (muteStateMeta.MuteState)
+        {
+            case MuteState.Muted:
+                await server.ExecuteCommandAsync($"muteClient {client.ClientNumber}");
+                muteStateMeta.CommandExecuted = true;
+                break;
+            case MuteState.Unmuted:
+                await server.ExecuteCommandAsync($"unmute {client.ClientNumber}");
+                muteStateMeta.CommandExecuted = true;
+                break;
+        }
+    }
+
+    private async Task<MuteState?> ReadPersistentDataV1(EFClient client) => TryParse<MuteState>(
+        (await _metaService.GetPersistentMeta(Plugin.MuteKey, client.ClientId))?.Value,
+        out var muteState)
+        ? muteState
+        : null;
+
+    private async Task<MuteStateMeta?> ReadPersistentDataV2(EFClient client)
+    {
+        // Get meta from client
+        var clientMuteMeta = client.GetAdditionalProperty<MuteStateMeta>(Plugin.MuteKey);
+        if (clientMuteMeta is not null) return clientMuteMeta;
+
+        // Get meta from database and store in client if exists
+        clientMuteMeta = await _metaService.GetPersistentMetaValue<MuteStateMeta>(Plugin.MuteKey, client.ClientId);
+        if (clientMuteMeta is not null) client.SetAdditionalProperty(Plugin.MuteKey, clientMuteMeta);
+
+        return clientMuteMeta;
+    }
+
+    private async Task WritePersistentData(EFClient client, MuteStateMeta clientMuteMeta)
+    {
+        client.SetAdditionalProperty(Plugin.MuteKey, clientMuteMeta);
+        await _metaService.SetPersistentMetaValue(Plugin.MuteKey, clientMuteMeta, client.ClientId);
+    }
 }

Plugins/Mute/MuteStateMeta.cs

@@ -0,0 +1,18 @@
+using System.Text.Json.Serialization;
+
+namespace IW4MAdmin.Plugins.Mute;
+
+public class MuteStateMeta
+{
+    public string? Reason { get; set; }
+    public DateTime? Expiration { get; set; }
+    public MuteState MuteState { get; set; }
+    [JsonIgnore] public bool CommandExecuted { get; set; }
+}
+
+public enum MuteState
+{
+    Muted,
+    Unmuting,
+    Unmuted
+}