hide token generation button for non-logged-in users

Co-Authored-By: fed <58637860+fedddddd@users.noreply.github.com>

Co-authored-by: fed <58637860+fedddddd@users.noreply.github.com>

.gitignore

@@ -224,7 +224,6 @@ bootstrap-custom.min.css
 bootstrap-custom.css
 **/Master/static
 **/Master/dev_env
-/WebfrontCore/Views/Plugins/*
 /WebfrontCore/wwwroot/**/dds
 /WebfrontCore/wwwroot/images/radar/*
 

Application/Alerts/AlertExtensions.cs

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

Application/Alerts/AlertManager.cs

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

Application/Application.csproj

@@ -24,7 +24,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Jint" Version="3.0.0-beta-2037" />
+    <PackageReference Include="Jint" Version="3.0.0-beta-2038" />
+    <PackageReference Include="MaxMind.GeoIP2" Version="5.1.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -63,6 +64,9 @@
     <None Update="Configuration\LoggingConfiguration.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Update="Resources\GeoLite2-Country.mmdb">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
 
   <Target Name="PreBuild" BeforeTargets="PreBuildEvent">

Application/ApplicationManager.cs

@@ -57,9 +57,9 @@ namespace IW4MAdmin.Application
         private readonly List<MessageToken> MessageTokens;
         private readonly ClientService ClientSvc;
         readonly PenaltyService PenaltySvc;
+        private readonly IAlertManager _alertManager;
         public IConfigurationHandler<ApplicationConfiguration> ConfigHandler;
         readonly IPageList PageList;
-        private readonly IMetaService _metaService;
         private readonly TimeSpan _throttleTimeout = new TimeSpan(0, 1, 0);
         private readonly CancellationTokenSource _tokenSource;
         private readonly Dictionary<string, Task<IList>> _operationLookup = new Dictionary<string, Task<IList>>();
@@ -81,15 +81,16 @@ namespace IW4MAdmin.Application
             ITranslationLookup translationLookup, IConfigurationHandler<CommandConfiguration> commandConfiguration,
             IConfigurationHandler<ApplicationConfiguration> appConfigHandler, IGameServerInstanceFactory serverInstanceFactory,
             IEnumerable<IPlugin> plugins, IParserRegexFactory parserRegexFactory, IEnumerable<IRegisterEvent> customParserEvents,
-            IEventHandler eventHandler, IScriptCommandFactory scriptCommandFactory, IDatabaseContextFactory contextFactory, IMetaService metaService,
+            IEventHandler eventHandler, IScriptCommandFactory scriptCommandFactory, IDatabaseContextFactory contextFactory,
             IMetaRegistration metaRegistration, IScriptPluginServiceResolver scriptPluginServiceResolver, ClientService clientService, IServiceProvider serviceProvider,
-            ChangeHistoryService changeHistoryService, ApplicationConfiguration appConfig, PenaltyService penaltyService)
+            ChangeHistoryService changeHistoryService, ApplicationConfiguration appConfig, PenaltyService penaltyService, IAlertManager alertManager)
         {
             MiddlewareActionHandler = actionHandler;
             _servers = new ConcurrentBag<Server>();
             MessageTokens = new List<MessageToken>();
             ClientSvc = clientService;
             PenaltySvc = penaltyService;
+            _alertManager = alertManager;
             ConfigHandler = appConfigHandler;
             StartTime = DateTime.UtcNow;
             PageList = new PageList();
@@ -97,7 +98,6 @@ namespace IW4MAdmin.Application
             AdditionalRConParsers = new List<IRConParser>() { new BaseRConParser(serviceProvider.GetRequiredService<ILogger<BaseRConParser>>(), parserRegexFactory) };
             TokenAuthenticator = new TokenAuthentication();
             _logger = logger;
-            _metaService = metaService;
             _tokenSource = new CancellationTokenSource();
             _commands = commands.ToList();
             _translationLookup = translationLookup;
@@ -510,6 +510,7 @@ namespace IW4MAdmin.Application
             #endregion
 
             _metaRegistration.Register();
+            await _alertManager.Initialize();
 
             #region CUSTOM_EVENTS
             foreach (var customEvent in _customParserEvents.SelectMany(_events => _events.Events))
@@ -589,16 +590,29 @@ namespace IW4MAdmin.Application
 
         public async Task Start() => await UpdateServerStates();
 
-        public void Stop()
+        public async Task Stop()
         {
+            foreach (var plugin in Plugins)
+            {
+                try
+                {
+                    await plugin.OnUnloadAsync().WithTimeout(Utilities.DefaultCommandTimeout);
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogError(ex, "Could not cleanly unload plugin {PluginName}", plugin.Name);
+                }
+            }   
+            
             _tokenSource.Cancel();
+            
             IsRunning = false;
         }
 
         public void Restart()
         {
             IsRestartRequested = true;
-            Stop();
+            Stop().GetAwaiter().GetResult();
         }
 
         [Obsolete]
@@ -618,9 +632,9 @@ namespace IW4MAdmin.Application
             return _servers.SelectMany(s => s.Clients).ToList().Where(p => p != null).ToList();
         }
 
-        public EFClient FindActiveClient(EFClient client) =>client.ClientNumber < 0 ?
+        public EFClient FindActiveClient(EFClient client) => client.ClientNumber < 0 ?
                 GetActiveClients()
-                    .FirstOrDefault(c => c.NetworkId == client.NetworkId) ?? client :
+                    .FirstOrDefault(c => c.NetworkId == client.NetworkId && c.GameName == client.GameName) ?? client :
                 client;
 
         public ClientService GetClientService()
@@ -686,5 +700,6 @@ namespace IW4MAdmin.Application
         }
 
         public void RemoveCommandByName(string commandName) => _commands.RemoveAll(_command => _command.Name == commandName);
+        public IAlertManager AlertManager => _alertManager;
     }
 }

Application/Commands/ClientTags/AddClientTagCommand.cs

@@ -0,0 +1,64 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Data.Models;
+using Data.Models.Client;
+using Microsoft.Extensions.Logging;
+using SharedLibraryCore;
+using SharedLibraryCore.Commands;
+using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Interfaces;
+
+namespace IW4MAdmin.Application.Commands.ClientTags
+{
+    public class AddClientTagCommand : Command
+    {
+        private readonly IMetaServiceV2 _metaService;
+
+        public AddClientTagCommand(ILogger<AddClientTagCommand> commandLogger, CommandConfiguration config,
+            ITranslationLookup layout, IMetaServiceV2 metaService) :
+            base(config, layout)
+        {
+            Name = "addclienttag";
+            Description = layout["COMMANDS_ADD_CLIENT_TAG_DESC"];
+            Alias = "act";
+            Permission = EFClient.Permission.Owner;
+            RequiresTarget = false;
+            Arguments = new[]
+            {
+                new CommandArgument
+                {
+                    Name = _translationLookup["COMMANDS_ARGUMENT_TAG"],
+                    Required = true
+                }
+            };
+
+            _metaService = metaService;
+            logger = commandLogger;
+        }
+
+        public override async Task ExecuteAsync(GameEvent gameEvent)
+        {
+            var existingTags = await _metaService.GetPersistentMetaValue<List<TagMeta>>(EFMeta.ClientTagNameV2) ??
+                               new List<TagMeta>();
+
+            var tagName = gameEvent.Data.Trim();
+
+            if (existingTags.Any(tag => tag.TagName == tagName))
+            {
+                logger.LogWarning("Tag with name {TagName} already exists", tagName);
+                return;
+            }
+
+            existingTags.Add(new TagMeta
+            {
+                Id = (existingTags.LastOrDefault()?.TagId ?? 0) + 1,
+                Value = tagName
+            });
+
+            await _metaService.SetPersistentMetaValue(EFMeta.ClientTagNameV2, existingTags,
+                gameEvent.Owner.Manager.CancellationToken);
+            gameEvent.Origin.Tell(_translationLookup["COMMANDS_ADD_CLIENT_TAG_SUCCESS"].FormatExt(gameEvent.Data));
+        }
+    }
+}

Application/Commands/ClientTags/ListClientTags.cs

@@ -1,17 +1,19 @@
-using System.Linq;
+using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using Data.Models;
 using Data.Models.Client;
+using SharedLibraryCore;
 using SharedLibraryCore.Configuration;
 using SharedLibraryCore.Interfaces;
 
-namespace SharedLibraryCore.Commands
+namespace IW4MAdmin.Application.Commands.ClientTags
 {
     public class ListClientTags : Command
     {
-        private readonly IMetaService _metaService;
+        private readonly IMetaServiceV2 _metaService;
 
-        public ListClientTags(CommandConfiguration config, ITranslationLookup layout, IMetaService metaService) : base(
+        public ListClientTags(CommandConfiguration config, ITranslationLookup layout, IMetaServiceV2 metaService) : base(
             config, layout)
         {
             Name = "listclienttags";
@@ -19,14 +21,18 @@ namespace SharedLibraryCore.Commands
             Alias = "lct";
             Permission = EFClient.Permission.Owner;
             RequiresTarget = false;
-
             _metaService = metaService;
         }
 
         public override async Task ExecuteAsync(GameEvent gameEvent)
         {
-            var tags = await _metaService.GetPersistentMeta(EFMeta.ClientTagName);
-            gameEvent.Origin.Tell(tags.Select(tag => tag.Value));
+            var tags = await _metaService.GetPersistentMetaValue<List<TagMeta>>(EFMeta.ClientTagNameV2);
+            
+            if (tags is not null)
+            {
+                await gameEvent.Origin.TellAsync(tags.Select(tag => tag.TagName),
+                    gameEvent.Owner.Manager.CancellationToken);
+            }
         }
     }
-}
+}

Application/Commands/ClientTags/RemoveClientTagCommand.cs

@@ -1,16 +1,20 @@
-using System.Threading.Tasks;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using System.Linq;
 using Data.Models;
 using Data.Models.Client;
+using SharedLibraryCore;
+using SharedLibraryCore.Commands;
 using SharedLibraryCore.Configuration;
 using SharedLibraryCore.Interfaces;
 
-namespace SharedLibraryCore.Commands
+namespace IW4MAdmin.Application.Commands.ClientTags
 {
     public class RemoveClientTag : Command
     {
-        private readonly IMetaService _metaService;
+        private readonly IMetaServiceV2 _metaService;
 
-        public RemoveClientTag(CommandConfiguration config, ITranslationLookup layout, IMetaService metaService) : base(
+        public RemoveClientTag(CommandConfiguration config, ITranslationLookup layout, IMetaServiceV2 metaService) : base(
             config, layout)
         {
             Name = "removeclienttag";
@@ -32,8 +36,13 @@ namespace SharedLibraryCore.Commands
 
         public override async Task ExecuteAsync(GameEvent gameEvent)
         {
-            await _metaService.RemovePersistentMeta(EFMeta.ClientTagName, gameEvent.Data);
+            var existingMeta = await _metaService.GetPersistentMetaValue<List<TagMeta>>(EFMeta.ClientTagNameV2,
+                gameEvent.Owner.Manager.CancellationToken);
+            existingMeta = existingMeta.Where(meta => meta.TagName != gameEvent.Data.Trim()).ToList();
+            await _metaService.SetPersistentMetaValue(EFMeta.ClientTagNameV2, existingMeta,
+                gameEvent.Owner.Manager.CancellationToken);
+            
             gameEvent.Origin.Tell(_translationLookup["COMMANDS_REMOVE_CLIENT_TAG_SUCCESS"].FormatExt(gameEvent.Data));
         }
     }
-}
+}

Application/Commands/ClientTags/SetClientTagCommand.cs

@@ -1,18 +1,22 @@
-using System.Linq;
+using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using Data.Models;
 using Data.Models.Client;
+using SharedLibraryCore;
+using SharedLibraryCore.Commands;
 using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Dtos;
 using SharedLibraryCore.Interfaces;
 
-namespace SharedLibraryCore.Commands
+namespace IW4MAdmin.Application.Commands.ClientTags
 {
     public class SetClientTagCommand : Command
     {
-        private readonly IMetaService _metaService;
+        private readonly IMetaServiceV2 _metaService;
 
 
-        public SetClientTagCommand(CommandConfiguration config, ITranslationLookup layout, IMetaService metaService) :
+        public SetClientTagCommand(CommandConfiguration config, ITranslationLookup layout, IMetaServiceV2 metaService) :
             base(config, layout)
         {
             Name = "setclienttag";
@@ -34,8 +38,10 @@ namespace SharedLibraryCore.Commands
 
         public override async Task ExecuteAsync(GameEvent gameEvent)
         {
-            var availableTags = await _metaService.GetPersistentMeta(EFMeta.ClientTagName);
-            var matchingTag = availableTags.FirstOrDefault(tag => tag.Value == gameEvent.Data);
+            var token = gameEvent.Owner.Manager.CancellationToken;
+            
+            var availableTags = await _metaService.GetPersistentMetaValue<List<LookupValue<string>>>(EFMeta.ClientTagNameV2, token);
+            var matchingTag = availableTags.FirstOrDefault(tag => tag.Value == gameEvent.Data.Trim());
 
             if (matchingTag == null)
             {
@@ -44,8 +50,9 @@ namespace SharedLibraryCore.Commands
             }
 
             gameEvent.Target.Tag = matchingTag.Value;
-            await _metaService.AddPersistentMeta(EFMeta.ClientTag, string.Empty, gameEvent.Target, matchingTag);
+            await _metaService.SetPersistentMetaForLookupKey(EFMeta.ClientTagV2, EFMeta.ClientTagNameV2, matchingTag.Id,
+                gameEvent.Target.ClientId, token);
             gameEvent.Origin.Tell(_translationLookup["COMMANDS_SET_CLIENT_TAG_SUCCESS"].FormatExt(matchingTag.Value));
         }
     }
-}
+}

Application/Commands/ClientTags/TagMeta.cs

@@ -0,0 +1,13 @@
+using System.Text.Json.Serialization;
+using SharedLibraryCore.Interfaces;
+
+namespace IW4MAdmin.Application.Commands.ClientTags;
+
+public class TagMeta : ILookupValue<string>
+{
+    [JsonIgnore] public int TagId => Id;
+    [JsonIgnore] public string TagName => Value;
+
+    public int Id { get; set; }
+    public string Value { get; set; }
+}

Application/Commands/ClientTags/UnsetClientTagCommand.cs

@@ -1,17 +1,18 @@
 using System.Threading.Tasks;
 using Data.Models;
 using Data.Models.Client;
+using SharedLibraryCore;
+using SharedLibraryCore.Commands;
 using SharedLibraryCore.Configuration;
 using SharedLibraryCore.Interfaces;
 
-namespace SharedLibraryCore.Commands
+namespace IW4MAdmin.Application.Commands.ClientTags
 {
     public class UnsetClientTagCommand : Command
     {
-        private readonly IMetaService _metaService;
+        private readonly IMetaServiceV2 _metaService;
 
-
-        public UnsetClientTagCommand(CommandConfiguration config, ITranslationLookup layout, IMetaService metaService) :
+        public UnsetClientTagCommand(CommandConfiguration config, ITranslationLookup layout, IMetaServiceV2 metaService) :
             base(config, layout)
         {
             Name = "unsetclienttag";
@@ -34,8 +35,9 @@ namespace SharedLibraryCore.Commands
         public override async Task ExecuteAsync(GameEvent gameEvent)
         {
             gameEvent.Target.Tag = null;
-            await _metaService.RemovePersistentMeta(EFMeta.ClientTag, gameEvent.Target);
+            await _metaService.RemovePersistentMeta(EFMeta.ClientTagV2, gameEvent.Target.ClientId,
+                gameEvent.Owner.Manager.CancellationToken);
             gameEvent.Origin.Tell(_translationLookup["COMMANDS_UNSET_CLIENT_TAG_SUCCESS"]);
         }
     }
-}
+}

Application/Commands/ListClientsCommand.cs

@@ -29,9 +29,9 @@ namespace IW4MAdmin.Application.Commands
                     $"[(Color::Accent){client.ClientPermission.Name}(Color::White){(string.IsNullOrEmpty(client.Tag) ? "" : $" {client.Tag}")}(Color::White)][(Color::Yellow)#{client.ClientNumber}(Color::White)] {client.Name}")
                 .ToArray();
 
-            gameEvent.Origin.Tell(clientList);
+            gameEvent.Origin.TellAsync(clientList, gameEvent.Owner.Manager.CancellationToken);
 
             return Task.CompletedTask;
         }
     }
-}
+}

Application/Commands/MapAndGameTypeCommand.cs

@@ -92,7 +92,7 @@ namespace IW4MAdmin.Application.Commands
 
             _logger.LogDebug("Changing map to {Map} and gametype {Gametype}", map, gametype);
 
-            await gameEvent.Owner.SetDvarAsync("g_gametype", gametype);
+            await gameEvent.Owner.SetDvarAsync("g_gametype", gametype, gameEvent.Owner.Manager.CancellationToken);
             gameEvent.Owner.Broadcast(_translationLookup["COMMANDS_MAP_SUCCESS"].FormatExt(map));
             await Task.Delay(gameEvent.Owner.Manager.GetApplicationSettings().Configuration().MapChangeDelaySeconds);
 

Application/Commands/OfflineMessageCommand.cs

@@ -1,11 +1,14 @@
 using System;
+using System.Linq;
 using System.Threading.Tasks;
 using Data.Abstractions;
 using Data.Models.Client;
 using Data.Models.Misc;
+using IW4MAdmin.Application.Alerts;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 using SharedLibraryCore;
+using SharedLibraryCore.Alerts;
 using SharedLibraryCore.Configuration;
 using SharedLibraryCore.Interfaces;
 using ILogger = Microsoft.Extensions.Logging.ILogger;
@@ -16,19 +19,66 @@ namespace IW4MAdmin.Application.Commands
     {
         private readonly IDatabaseContextFactory _contextFactory;
         private readonly ILogger _logger;
+        private readonly IAlertManager _alertManager;
         private const short MaxLength = 1024;
-        
+
         public OfflineMessageCommand(CommandConfiguration config, ITranslationLookup layout,
-            IDatabaseContextFactory contextFactory, ILogger<IDatabaseContextFactory> logger) : base(config, layout)
+            IDatabaseContextFactory contextFactory, ILogger<IDatabaseContextFactory> logger, IAlertManager alertManager)
+            : base(config, layout)
         {
             Name = "offlinemessage";
             Description = _translationLookup["COMMANDS_OFFLINE_MESSAGE_DESC"];
             Alias = "om";
             Permission = EFClient.Permission.Moderator;
             RequiresTarget = true;
-            
+
             _contextFactory = contextFactory;
             _logger = logger;
+            _alertManager = alertManager;
+
+            _alertManager.RegisterStaticAlertSource(async () =>
+            {
+                var context = contextFactory.CreateContext(false);
+                return await context.InboxMessages.Where(message => !message.IsDelivered)
+                    .Where(message => message.CreatedDateTime >= DateTime.UtcNow.AddDays(-7))
+                    .Where(message => message.DestinationClient.Level > EFClient.Permission.User)
+                    .Select(message => new Alert.AlertState
+                    {
+                        OccuredAt = message.CreatedDateTime,
+                        Message = message.Message,
+                        ExpiresAt = DateTime.UtcNow.AddDays(7),
+                        Category = Alert.AlertCategory.Message,
+                        Source = message.SourceClient.CurrentAlias.Name.StripColors(),
+                        SourceId = message.SourceClientId,
+                        RecipientId = message.DestinationClientId,
+                        ReferenceId = message.InboxMessageId,
+                        Type = nameof(EFInboxMessage)
+                    }).ToListAsync();
+            });
+
+            _alertManager.OnAlertConsumed += (_, state) =>
+            {
+                if (state.Category != Alert.AlertCategory.Message || state.ReferenceId is null)
+                {
+                    return;
+                }
+
+                try
+                {
+                    var context = contextFactory.CreateContext(true);
+                    foreach (var message in context.InboxMessages
+                                 .Where(message => message.InboxMessageId == state.ReferenceId.Value).ToList())
+                    {
+                        message.IsDelivered = true;
+                    }
+
+                    context.SaveChanges();
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogError(ex, "Could not update message state for alert {@Alert}", state);
+                }
+            };
         }
 
         public override async Task ExecuteAsync(GameEvent gameEvent)
@@ -38,23 +88,24 @@ namespace IW4MAdmin.Application.Commands
                 gameEvent.Origin.Tell(_translationLookup["COMMANDS_OFFLINE_MESSAGE_TOO_LONG"].FormatExt(MaxLength));
                 return;
             }
-            
+
             if (gameEvent.Target.ClientId == gameEvent.Origin.ClientId)
             {
                 gameEvent.Origin.Tell(_translationLookup["COMMANDS_OFFLINE_MESSAGE_SELF"].FormatExt(MaxLength));
                 return;
             }
-            
+
             if (gameEvent.Target.IsIngame)
             {
-                gameEvent.Origin.Tell(_translationLookup["COMMANDS_OFFLINE_MESSAGE_INGAME"].FormatExt(gameEvent.Target.Name));
+                gameEvent.Origin.Tell(_translationLookup["COMMANDS_OFFLINE_MESSAGE_INGAME"]
+                    .FormatExt(gameEvent.Target.Name));
                 return;
             }
-            
+
             await using var context = _contextFactory.CreateContext(enableTracking: false);
             var server = await context.Servers.FirstAsync(srv => srv.EndPoint == gameEvent.Owner.ToString());
 
-            var newMessage = new EFInboxMessage()
+            var newMessage = new EFInboxMessage
             {
                 SourceClientId = gameEvent.Origin.ClientId,
                 DestinationClientId = gameEvent.Target.ClientId,
@@ -62,6 +113,12 @@ namespace IW4MAdmin.Application.Commands
                 Message = gameEvent.Data,
             };
 
+            _alertManager.AddAlert(gameEvent.Target.BuildAlert(Alert.AlertCategory.Message)
+                .WithMessage(gameEvent.Data.Trim())
+                .FromClient(gameEvent.Origin)
+                .OfType(nameof(EFInboxMessage))
+                .ExpiresIn(TimeSpan.FromDays(7)));
+
             try
             {
                 context.Set<EFInboxMessage>().Add(newMessage);
@@ -75,4 +132,4 @@ namespace IW4MAdmin.Application.Commands
             }
         }
     }
-}
+}

Application/DefaultSettings.json

@@ -2021,7 +2021,7 @@
       "barrett": "Barrett .50cal",
       "mp44": "MP44",
       "remington700": "R700",
-      "rpd": "RDP",
+      "rpd": "RPD",
       "saw": " M249 SAW",
       "usp": "USP .45",
       "winchester1200": "W1200",
@@ -2083,6 +2083,126 @@
       "type99rifle": "Arisaka",
       "mosinrifle": "Mosin-Nagant",
       "ptrs41": "PTRS-41"
+    },
+	
+	"T6" : {
+        
+        "mp7": "MP7",
+        "pdw57": "PDW-57",
+        "vector": "Vector K10",
+        "insas": "MSMC",
+        "qcw05": "Chicom CQB",
+        "evoskorpion": "Skorpion EVO",
+        "peacekeeper": "Peacekeeper",
+        
+        "tar21": "MTAR",
+        "type95": "Type 25",
+        "sig556": "SWAT-556",
+        "sa58": "FAL-OSW",
+        "hk416": "M27",
+        "scar": "SCAR-H",
+        "saritch": "SMR",
+        "xm8": "M8A1",
+        "an94": "AN-94",
+        
+        "870mcs": "Remington-870 MCS",
+        "saiga12": "S12",
+        "ksg": "KSG",
+        "srm1216": "M1216",
+        
+        "mk48": "MK 48",
+        "qbb95": "QBB LSW",
+        "lsat": "LSAT",
+        "hamr": "HAMR",
+        
+        "svu": "SVU-AS",
+        "dsr50": "DSR 50",
+        "ballista": "Ballista",
+        "as50": "XPR-50",
+        
+        "fiveseven": "Five-Seven",
+        "fnp45": "TAC-45",
+        "beretta93r": "B23R",
+        "judge": "Executioner",
+        "kard": "KAP-40",
+        
+        "smaw": "SMAW",
+        "fhj18": "FHJ-18 AA",
+        "usrpg": "RPG",
+        
+        "riotshield": "Assault Shield",
+        "crossbow": "Crossbow",
+        "knife_ballistic": "Ballistic Knife",
+        "knife_held": "Knife",
+        "knife": "Knife",
+        
+        "frag_grenade": "Grenade",
+        "hatchet": "Combat Axe",
+        "sticky_grenade": "Semtex",
+        "satchel_charge": "C4",
+        "bouncingbetty": "Bouncing Betty",
+        "claymore": "Claymore",
+        
+        "smoke_center": "Smoke Grenade",
+        "concussion_grenade": "Concussion",
+        "emp_grenade": "EMP Grenade",
+        "sensor_grenade": "Sensor Grenade",
+        "flash_grenade": "Flashbang",
+        "proximity_grenade": "Shock Charge",
+        "pda_hack": "Black Hat",
+        "trophy_system": "Trophy System",
+        "tactical_insertion": "Tactical Insertion",
+        
+        "acog": "ACOG",
+        "stalker": "Stock",
+        "swayreduc": "Ballistics CPU",
+        "ir": "Dual Band",
+        "dw": "Dual Wield",
+        "extclip": "Extended Clip",
+        "halo": "EOTech",
+        "dualclip": "Fast Mag",
+        "fmj": "FMJ",
+        "grip": "Fore Grip",
+        "gl": "Grenade Launcher",
+        "dualoptic": "Hybrid Optic",
+        "is": "Iron Sights",
+        "steadyaim": "Laser Sight",
+        "extbarrel": "Long Barrel",
+        "mms": "MMS",
+        "fastads": "Quickdraw",
+        "rf": "Rapid Fire",
+        "reflex": "Reflex Sight",
+        "sf": "Select Fire",
+        "silencer": "Suppressor",
+        "tacknife": "Tactical Knife",
+        "stackfire": "Tri-Bolt",
+        "rangefinder": "Target Finder",
+        "vzoom": "Variable Zoom",
+        
+        "spyplane": "UAV",
+        "rcbomb": "RC-XD",
+        "missile_drone": "Hunter Killer",
+        "supplydrop": "Care Package",
+        "counteruav": "Counter-UAV",
+        "microwave_turret": "Guardian",
+        "remote_missile": "Hellstorm Missile",
+        "planemortar": "Lightning Strike",
+        "auto_turret": "Sentry Gun",
+        "minigun": "Death Machine",
+        "m32": "War Machine",
+        "qrdrone": "Dragonfire",
+        "ai_tank_drop": "AGR",
+        "comlink": "Stealth Chopper",
+        "spyplane_direction": "Orbital VSAT",
+        "helicopter_guard": "Escort Drone",
+        "emp": "EMP",
+        "straferun": "Warthog",
+        "remote_mortar": "Lodestar",
+        "player_gunner": "VTOL Warship",
+        "dogs": "K9 Unit",
+        "missile_swarm": "Swarm"
+        
     }
+	
   }
 }

Application/EventParsers/BaseEventParser.cs

@@ -49,6 +49,13 @@ 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);
+            Configuration.JoinTeam.AddMapping(ParserRegex.GroupType.OriginClientNumber, 3);
+            Configuration.JoinTeam.AddMapping(ParserRegex.GroupType.OriginTeam, 4);
+            Configuration.JoinTeam.AddMapping(ParserRegex.GroupType.OriginName, 5);
 
             Configuration.Damage.Pattern = @"^(D);(-?[A-Fa-f0-9_]{1,32}|bot[0-9]+|0);(-?[0-9]+);(axis|allies|world|none)?;([^;]{1,32});(-?[A-Fa-f0-9_]{1,32}|bot[0-9]+|0)?;(-?[0-9]+);(axis|allies|world|none)?;([^;]{1,32})?;((?:[0-9]+|[a-z]+|_|\+)+);([0-9]+);((?:[A-Z]|_)+);((?:[a-z]|_)+)$";
             Configuration.Damage.AddMapping(ParserRegex.GroupType.EventType, 1);
@@ -90,7 +97,8 @@ namespace IW4MAdmin.Application.EventParsers
                 {Configuration.Say, GameEvent.EventType.Say},
                 {Configuration.Kill, GameEvent.EventType.Kill},
                 {Configuration.MapChange, GameEvent.EventType.MapChange},
-                {Configuration.MapEnd, GameEvent.EventType.MapEnd}
+                {Configuration.MapEnd, GameEvent.EventType.MapEnd},
+                {Configuration.JoinTeam, GameEvent.EventType.JoinTeam}
             };
             
             _eventTypeMap = new Dictionary<string, GameEvent.EventType>
@@ -100,7 +108,8 @@ namespace IW4MAdmin.Application.EventParsers
                 {"K", GameEvent.EventType.Kill},
                 {"D", GameEvent.EventType.Damage},
                 {"J", GameEvent.EventType.PreConnect},
-                {"Q", GameEvent.EventType.PreDisconnect},
+                {"JT", GameEvent.EventType.JoinTeam},
+                {"Q", GameEvent.EventType.PreDisconnect}
             };
         }
 
@@ -322,6 +331,47 @@ namespace IW4MAdmin.Application.EventParsers
                 }
             }
 
+            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);

Application/EventParsers/DynamicEventParserConfiguration.cs

@@ -1,6 +1,8 @@
-using SharedLibraryCore.Interfaces;
+using System.Collections.Generic;
+using SharedLibraryCore.Interfaces;
 using System.Globalization;
 using SharedLibraryCore;
+using SharedLibraryCore.Database.Models;
 
 namespace IW4MAdmin.Application.EventParsers
 {
@@ -8,11 +10,12 @@ namespace IW4MAdmin.Application.EventParsers
     /// generic implementation of the IEventParserConfiguration
     /// allows script plugins to generate dynamic configurations
     /// </summary>
-    sealed internal class DynamicEventParserConfiguration : IEventParserConfiguration
+    internal sealed class DynamicEventParserConfiguration : IEventParserConfiguration
     {
         public string GameDirectory { get; set; }
         public ParserRegex Say { get; set; }
         public ParserRegex Join { get; set; }
+        public ParserRegex JoinTeam { get; set; }
         public ParserRegex Quit { get; set; }
         public ParserRegex Kill { get; set; }
         public ParserRegex Damage { get; set; }
@@ -22,10 +25,13 @@ namespace IW4MAdmin.Application.EventParsers
         public ParserRegex MapEnd { get; set; }
         public NumberStyles GuidNumberStyle { get; set; } = NumberStyles.HexNumber;
 
+        public Dictionary<string, EFClient.TeamType> TeamMapping { get; set; } = new();
+
         public DynamicEventParserConfiguration(IParserRegexFactory parserRegexFactory)
         {
             Say = parserRegexFactory.CreateParserRegex();
             Join = parserRegexFactory.CreateParserRegex();
+            JoinTeam = parserRegexFactory.CreateParserRegex();
             Quit = parserRegexFactory.CreateParserRegex();
             Kill = parserRegexFactory.CreateParserRegex();
             Damage = parserRegexFactory.CreateParserRegex();

Application/Factories/GameServerInstanceFactory.cs

@@ -14,7 +14,7 @@ namespace IW4MAdmin.Application.Factories
     internal class GameServerInstanceFactory : IGameServerInstanceFactory
     {
         private readonly ITranslationLookup _translationLookup;
-        private readonly IMetaService _metaService;
+        private readonly IMetaServiceV2 _metaService;
         private readonly IServiceProvider _serviceProvider;
 
         /// <summary>
@@ -23,7 +23,7 @@ namespace IW4MAdmin.Application.Factories
         /// <param name="translationLookup"></param>
         /// <param name="rconConnectionFactory"></param>
         public GameServerInstanceFactory(ITranslationLookup translationLookup,
-            IMetaService metaService,
+            IMetaServiceV2 metaService,
             IServiceProvider serviceProvider)
         {
             _translationLookup = translationLookup;
@@ -45,4 +45,4 @@ namespace IW4MAdmin.Application.Factories
                 _serviceProvider.GetRequiredService<ILookupCache<EFServer>>());
         }
     }
-}
+}

Application/IO/NetworkGameLogReader.cs

@@ -66,8 +66,8 @@ namespace IW4MAdmin.Application.IO
                         }
                         return Task.FromResult(Enumerable.Empty<GameEvent>());
                     }
-                    
-                    new Thread(() => ReadNetworkData(client)).Start();
+
+                    Task.Run(async () => await ReadNetworkData(client, _token), _token);
                 }
                 catch (Exception ex)
                 {
@@ -89,7 +89,7 @@ namespace IW4MAdmin.Application.IO
 
                 var lines = logData
                     .Split('\n')
-                    .Where(line => line.Length > 0);
+                    .Where(line => line.Length > 0 && !line.Contains('ÿ'));
 
                 foreach (var eventLine in lines)
                 {
@@ -111,9 +111,9 @@ namespace IW4MAdmin.Application.IO
             return Task.FromResult((IEnumerable<GameEvent>)events);
         }
 
-        private void ReadNetworkData(UdpClient client)
+        private async Task ReadNetworkData(UdpClient client, CancellationToken token)
         {
-            while (!_token.IsCancellationRequested)
+            while (!token.IsCancellationRequested)
             {
                 // get more data
                 IPEndPoint remoteEndpoint = null;
@@ -127,7 +127,13 @@ namespace IW4MAdmin.Application.IO
 
                 try
                 {
-                    bufferedData = client.Receive(ref remoteEndpoint);
+                    var result = await client.ReceiveAsync(_token);
+                    remoteEndpoint = result.RemoteEndPoint;
+                    bufferedData = result.Buffer;
+                }
+                catch (OperationCanceledException)
+                {
+                    _logger.LogDebug("Stopping network log receive");
                 }
                 catch (Exception ex)
                 {

Application/IW4MServer.cs

@@ -24,8 +24,10 @@ using Serilog.Context;
 using static SharedLibraryCore.Database.Models.EFClient;
 using Data.Models;
 using Data.Models.Server;
+using IW4MAdmin.Application.Alerts;
 using IW4MAdmin.Application.Commands;
 using Microsoft.EntityFrameworkCore;
+using SharedLibraryCore.Alerts;
 using static Data.Models.Client.EFClient;
 
 namespace IW4MAdmin
@@ -35,7 +37,7 @@ namespace IW4MAdmin
         private static readonly SharedLibraryCore.Localization.TranslationLookup loc = Utilities.CurrentLocalization.LocalizationIndex;
         public GameLogEventDetection LogEvent;
         private readonly ITranslationLookup _translationLookup;
-        private readonly IMetaService _metaService;
+        private readonly IMetaServiceV2 _metaService;
         private const int REPORT_FLAG_COUNT = 4;
         private long lastGameTime = 0;
 
@@ -49,7 +51,7 @@ namespace IW4MAdmin
             ServerConfiguration serverConfiguration,
             CommandConfiguration commandConfiguration,
             ITranslationLookup lookup,
-            IMetaService metaService, 
+            IMetaServiceV2 metaService, 
             IServiceProvider serviceProvider,
             IClientNoticeMessageFormatter messageFormatter,
             ILookupCache<EFServer> serverCache) : base(serviceProvider.GetRequiredService<ILogger<Server>>(), 
@@ -73,7 +75,7 @@ namespace IW4MAdmin
         {
             ServerLogger.LogDebug("Client slot #{clientNumber} now reserved", clientFromLog.ClientNumber);
 
-            EFClient client = await Manager.GetClientService().GetUnique(clientFromLog.NetworkId);
+            var client = await Manager.GetClientService().GetUnique(clientFromLog.NetworkId, GameName);
 
             // first time client is connecting to server
             if (client == null)
@@ -96,6 +98,8 @@ namespace IW4MAdmin
             client.ClientNumber = clientFromLog.ClientNumber;
             client.Score = clientFromLog.Score;
             client.Ping = clientFromLog.Ping;
+            client.Team = clientFromLog.Team;
+            client.TeamName = clientFromLog.TeamName;
             client.CurrentServer = this;
             client.State = ClientState.Connecting;
 
@@ -114,7 +118,7 @@ namespace IW4MAdmin
 
         public override async Task OnClientDisconnected(EFClient client)
         {
-            if (!GetClientsAsList().Any(_client => _client.NetworkId == client.NetworkId))
+            if (GetClientsAsList().All(eachClient => eachClient.NetworkId != client.NetworkId))
             {
                 using (LogContext.PushProperty("Server", ToString()))
                 {
@@ -304,8 +308,16 @@ namespace IW4MAdmin
                     if (!Manager.GetApplicationSettings().Configuration().IgnoreServerConnectionLost)
                     {
                         Console.WriteLine(loc["SERVER_ERROR_COMMUNICATION"].FormatExt($"{IP}:{Port}"));
+                        
+                        var alert = Alert.AlertState.Build().OfType(E.Type.ToString())
+                            .WithCategory(Alert.AlertCategory.Error)
+                            .FromSource("System")
+                            .WithMessage(loc["SERVER_ERROR_COMMUNICATION"].FormatExt($"{IP}:{Port}"))
+                            .ExpiresIn(TimeSpan.FromDays(1));
+                        
+                        Manager.AlertManager.AddAlert(alert);
                     }
-
+      
                     Throttled = true;
                 }
 
@@ -316,12 +328,20 @@ namespace IW4MAdmin
                     
                     if (!Manager.GetApplicationSettings().Configuration().IgnoreServerConnectionLost)
                     {
-                        Console.WriteLine(loc["MANAGER_CONNECTION_REST"].FormatExt($"[{IP}:{Port}]"));
+                        Console.WriteLine(loc["MANAGER_CONNECTION_REST"].FormatExt($"{IP}:{Port}"));
+                        
+                        var alert = Alert.AlertState.Build().OfType(E.Type.ToString())
+                            .WithCategory(Alert.AlertCategory.Information)
+                            .FromSource("System")
+                            .WithMessage(loc["MANAGER_CONNECTION_REST"].FormatExt($"{IP}:{Port}"))
+                            .ExpiresIn(TimeSpan.FromDays(1));
+
+                        Manager.AlertManager.AddAlert(alert);
                     }
 
                     if (!string.IsNullOrEmpty(CustomSayName))
                     {
-                        await this.SetDvarAsync("sv_sayname", CustomSayName);
+                        await this.SetDvarAsync("sv_sayname", CustomSayName, Manager.CancellationToken);
                     }
 
                     Throttled = false;
@@ -350,7 +370,8 @@ namespace IW4MAdmin
                             Time = DateTime.UtcNow
                         });
 
-                        var clientTag = await _metaService.GetPersistentMeta(EFMeta.ClientTag, E.Origin);
+                        var clientTag = await _metaService.GetPersistentMetaByLookup(EFMeta.ClientTagV2,
+                            EFMeta.ClientTagNameV2, E.Origin.ClientId, Manager.CancellationToken);
 
                         if (clientTag?.LinkedMeta != null)
                         {
@@ -428,6 +449,7 @@ namespace IW4MAdmin
                         Clients[E.Origin.ClientNumber] = E.Origin;
                         try
                         {
+                            E.Origin.GameName = (Reference.Game)GameName;
                             E.Origin = await OnClientConnected(E.Origin);
                             E.Target = E.Origin;
                         }
@@ -495,7 +517,7 @@ namespace IW4MAdmin
 
                     E.Target.SetLevel(Permission.User, E.Origin);
                     await Manager.GetPenaltyService().RemoveActivePenalties(E.Target.AliasLinkId, E.Target.NetworkId,
-                        E.Target.CurrentAlias?.IPAddress);
+                        E.Target.GameName, E.Target.CurrentAlias?.IPAddress);
                     await Manager.GetPenaltyService().Create(unflagPenalty);
                 }
 
@@ -505,7 +527,8 @@ namespace IW4MAdmin
                     {
                         Origin = E.Origin,
                         Target = E.Target,
-                        Reason = E.Data
+                        Reason = E.Data,
+                        ReportedOn = DateTime.UtcNow
                     });
 
                     var newReport = new EFPenalty()
@@ -568,8 +591,8 @@ namespace IW4MAdmin
                         Time = DateTime.UtcNow
                     });
 
-                    await _metaService.AddPersistentMeta("LastMapPlayed", CurrentMap.Alias, E.Origin);
-                    await _metaService.AddPersistentMeta("LastServerPlayed", E.Owner.Hostname, E.Origin);
+                    await _metaService.SetPersistentMeta("LastMapPlayed", CurrentMap.Alias, E.Origin.ClientId);
+                    await _metaService.SetPersistentMeta("LastServerPlayed", E.Owner.Hostname, E.Origin.ClientId);
                 }
 
                 else if (E.Type == GameEvent.EventType.PreDisconnect)
@@ -640,7 +663,7 @@ namespace IW4MAdmin
                             }
                         }
 
-                        ChatHistory.Add(new ChatInfo()
+                        ChatHistory.Add(new ChatInfo
                         {
                             Name = E.Origin.Name,
                             Message = message,
@@ -713,6 +736,11 @@ namespace IW4MAdmin
                         await E.Owner.ExecuteCommandAsync(E.Data);
                     }
                 }
+                
+                else if (E.Type == GameEvent.EventType.JoinTeam)
+                {
+                    E.Origin.UpdateTeam(E.Extra as string);
+                }
 
                 lock (ChatHistory)
                 {
@@ -735,7 +763,7 @@ namespace IW4MAdmin
 
         private async Task OnClientUpdate(EFClient origin)
         {
-            var client = Manager.GetActiveClients().FirstOrDefault(c => c.NetworkId == origin.NetworkId);
+            var client = GetClientsAsList().FirstOrDefault(c => c.NetworkId == origin.NetworkId);
 
             if (client == null)
             {
@@ -780,10 +808,16 @@ namespace IW4MAdmin
         /// array index 2 = updated clients
         /// </summary>
         /// <returns></returns>
-        async Task<List<EFClient>[]> PollPlayersAsync()
+        async Task<List<EFClient>[]> PollPlayersAsync(CancellationToken token)
         {
             var currentClients = GetClientsAsList();
-            var statusResponse = (await this.GetStatusAsync());
+            var statusResponse = await this.GetStatusAsync(token);
+
+            if (statusResponse is null)
+            {
+                return null;
+            }
+            
             var polledClients = statusResponse.Clients.AsEnumerable();
 
             if (Manager.GetApplicationSettings().Configuration().IgnoreBots)
@@ -895,22 +929,16 @@ namespace IW4MAdmin
 
                 await e.WaitAsync(Utilities.DefaultCommandTimeout, new CancellationTokenRegistration().Token);
             }
-
-            foreach (var plugin in Manager.Plugins)
-            {
-                await plugin.OnUnloadAsync();
-            }
         }
 
-        DateTime start = DateTime.Now;
-        DateTime playerCountStart = DateTime.Now;
-        DateTime lastCount = DateTime.Now;
+        private DateTime _lastMessageSent = DateTime.Now;
+        private DateTime _lastPlayerCount = DateTime.Now;
 
-        public override async Task<bool> ProcessUpdatesAsync(CancellationToken cts)
+        public override async Task<bool> ProcessUpdatesAsync(CancellationToken token)
         {
             try
             {
-                if (cts.IsCancellationRequested)
+                if (token.IsCancellationRequested)
                 {
                     await ShutdownInternal();
                     return true;
@@ -918,17 +946,24 @@ namespace IW4MAdmin
 
                 try
                 {
-                    if (Manager.GetApplicationSettings().Configuration().RConPollRate == int.MaxValue && Utilities.IsDevelopment)
+                    if (Manager.GetApplicationSettings().Configuration().RConPollRate == int.MaxValue &&
+                        Utilities.IsDevelopment)
                     {
                         return true;
                     }
 
-                    var polledClients = await PollPlayersAsync();
+                    var polledClients = await PollPlayersAsync(token);
 
-                    foreach (var disconnectingClient in polledClients[1].Where(_client => !_client.IsZombieClient /* ignores "fake" zombie clients */))
+                    if (polledClients is null)
+                    {
+                        return true;
+                    }
+
+                    foreach (var disconnectingClient in polledClients[1]
+                                 .Where(client => !client.IsZombieClient /* ignores "fake" zombie clients */))
                     {
                         disconnectingClient.CurrentServer = this;
-                        var e = new GameEvent()
+                        var e = new GameEvent
                         {
                             Type = GameEvent.EventType.PreDisconnect,
                             Origin = disconnectingClient,
@@ -941,23 +976,20 @@ namespace IW4MAdmin
                     }
 
                     // this are our new connecting clients
-                    foreach (var client in polledClients[0])
+                    foreach (var client in polledClients[0].Where(client =>
+                                 !string.IsNullOrEmpty(client.Name) && (client.Ping != 999 || client.IsBot)))
                     {
-                        // note: this prevents players in ZMBI state from being registered with no name
-                        if (string.IsNullOrEmpty(client.Name) || (client.Ping == 999 && !client.IsBot))
-                        {
-                            continue;
-                        }
-
                         client.CurrentServer = this;
-                        var e = new GameEvent()
+                        client.GameName = (Reference.Game)GameName;
+                        
+                        var e = new GameEvent
                         {
                             Type = GameEvent.EventType.PreConnect,
                             Origin = client,
                             Owner = this,
                             IsBlocking = true,
                             Extra = client.GetAdditionalProperty<string>("BotGuid"),
-                            Source = GameEvent.EventSource.Status
+                            Source = GameEvent.EventSource.Status,
                         };
 
                         Manager.AddEvent(e);
@@ -968,19 +1000,19 @@ namespace IW4MAdmin
                     foreach (var client in polledClients[2])
                     {
                         client.CurrentServer = this;
-                        var e = new GameEvent()
+                        var gameEvent = new GameEvent
                         {
                             Type = GameEvent.EventType.Update,
                             Origin = client,
                             Owner = this
                         };
 
-                        Manager.AddEvent(e);
+                        Manager.AddEvent(gameEvent);
                     }
 
                     if (Throttled)
                     {
-                        var _event = new GameEvent()
+                        var gameEvent = new GameEvent
                         {
                             Type = GameEvent.EventType.ConnectionRestored,
                             Owner = this,
@@ -988,65 +1020,52 @@ namespace IW4MAdmin
                             Target = Utilities.IW4MAdminClient(this)
                         };
 
-                        Manager.AddEvent(_event);
+                        Manager.AddEvent(gameEvent);
                     }
 
                     LastPoll = DateTime.Now;
                 }
 
-                catch (NetworkException e)
+                catch (NetworkException ex)
                 {
-                    if (!Throttled)
+                    if (Throttled)
                     {
-                        var _event = new GameEvent()
-                        {
-                            Type = GameEvent.EventType.ConnectionLost,
-                            Owner = this,
-                            Origin = Utilities.IW4MAdminClient(this),
-                            Target = Utilities.IW4MAdminClient(this),
-                            Extra = e,
-                            Data = ConnectionErrors.ToString()
-                        };
-
-                        Manager.AddEvent(_event);
+                        return true;
                     }
 
+                    var gameEvent = new GameEvent
+                    {
+                        Type = GameEvent.EventType.ConnectionLost,
+                        Owner = this,
+                        Origin = Utilities.IW4MAdminClient(this),
+                        Target = Utilities.IW4MAdminClient(this),
+                        Extra = ex,
+                        Data = ConnectionErrors.ToString()
+                    };
+
+                    Manager.AddEvent(gameEvent);
+                    return true;
+                }
+                finally
+                {
+                    RunServerCollection();
+                }
+
+                if (DateTime.Now - _lastMessageSent <=
+                    TimeSpan.FromSeconds(Manager.GetApplicationSettings().Configuration().AutoMessagePeriod) ||
+                    BroadcastMessages.Count <= 0 || ClientNum <= 0)
+                {
                     return true;
                 }
 
-                LastMessage = DateTime.Now - start;
-                lastCount = DateTime.Now;
-
-                var appConfig = _serviceProvider.GetService<ApplicationConfiguration>();
-                // update the player history 
-                if (lastCount - playerCountStart >= appConfig.ServerDataCollectionInterval)
-                {
-                    var maxItems = Math.Ceiling(appConfig.MaxClientHistoryTime.TotalMinutes /
-                                                appConfig.ServerDataCollectionInterval.TotalMinutes);
-                    while ( ClientHistory.Count > maxItems) 
-                    {
-                        ClientHistory.Dequeue();
-                    }
-
-                    ClientHistory.Enqueue(new PlayerHistory(ClientNum));
-                    playerCountStart = DateTime.Now;
-                }
-
                 // send out broadcast messages
-                if (LastMessage.TotalSeconds > Manager.GetApplicationSettings().Configuration().AutoMessagePeriod
-                    && BroadcastMessages.Count > 0
-                    && ClientNum > 0)
-                {
-                    string[] messages = (await this.ProcessMessageToken(Manager.GetMessageTokens(), BroadcastMessages[NextMessage])).Split(Environment.NewLine);
+                var messages =
+                    (await this.ProcessMessageToken(Manager.GetMessageTokens(), BroadcastMessages[NextMessage])).Split(
+                        Environment.NewLine);
+                await BroadcastAsync(messages, token: Manager.CancellationToken);
 
-                    foreach (string message in messages)
-                    {
-                        Broadcast(message);
-                    }
-
-                    NextMessage = NextMessage == (BroadcastMessages.Count - 1) ? 0 : NextMessage + 1;
-                    start = DateTime.Now;
-                }
+                NextMessage = NextMessage == BroadcastMessages.Count - 1 ? 0 : NextMessage + 1;
+                _lastMessageSent = DateTime.Now;
 
                 return true;
             }
@@ -1058,26 +1077,56 @@ namespace IW4MAdmin
             }
 
             // this one is ok
-            catch (Exception e) when(e is ServerException || e is RConException)
+            catch (Exception e) when (e is ServerException || e is RConException)
             {
-                using(LogContext.PushProperty("Server", ToString()))
+                using (LogContext.PushProperty("Server", ToString()))
                 {
                     ServerLogger.LogWarning(e, "Undesirable exception occured during processing updates");
                 }
+
                 return false;
             }
 
             catch (Exception e)
             {
-                using(LogContext.PushProperty("Server", ToString()))
+                using (LogContext.PushProperty("Server", ToString()))
                 {
                     ServerLogger.LogError(e, "Unexpected exception occured during processing updates");
                 }
+
                 Console.WriteLine(loc["SERVER_ERROR_EXCEPTION"].FormatExt($"[{IP}:{Port}]"));
                 return false;
             }
         }
 
+        private void RunServerCollection()
+        {
+            var appConfig = _serviceProvider.GetService<ApplicationConfiguration>();
+           
+            if (DateTime.Now - _lastPlayerCount < appConfig?.ServerDataCollectionInterval)
+            {
+                return;
+            }
+
+            var maxItems = Math.Ceiling(appConfig.MaxClientHistoryTime.TotalMinutes /
+                                        appConfig.ServerDataCollectionInterval.TotalMinutes);
+                    
+            while (ClientHistory.ClientCounts.Count > maxItems) 
+            {
+                ClientHistory.ClientCounts.RemoveAt(0);
+            }
+
+            ClientHistory.ClientCounts.Add(new ClientCountSnapshot
+            {
+                ClientCount = ClientNum,
+                ConnectionInterrupted = Throttled,
+                Time = DateTime.UtcNow,
+                Map = CurrentMap.Name
+            });
+            
+            _lastPlayerCount = DateTime.Now;
+        }
+
         public async Task Initialize()
         {
             try
@@ -1109,7 +1158,7 @@ namespace IW4MAdmin
             RemoteConnection = RConConnectionFactory.CreateConnection(ResolvedIpEndPoint, Password, RconParser.RConEngine);
             RemoteConnection.SetConfiguration(RconParser);
 
-            var version = await this.GetMappedDvarValueOrDefaultAsync<string>("version");
+            var version = await this.GetMappedDvarValueOrDefaultAsync<string>("version", token: Manager.CancellationToken);
             Version = version.Value;
             GameName = Utilities.GetGame(version.Value ?? RconParser.Version);
 
@@ -1126,7 +1175,7 @@ namespace IW4MAdmin
                 Version = RconParser.Version;
             }
 
-            var svRunning = await this.GetMappedDvarValueOrDefaultAsync<string>("sv_running");
+            var svRunning = await this.GetMappedDvarValueOrDefaultAsync<string>("sv_running", token: Manager.CancellationToken);
 
             if (!string.IsNullOrEmpty(svRunning.Value) && svRunning.Value != "1")
             {
@@ -1135,27 +1184,28 @@ namespace IW4MAdmin
 
             var infoResponse = RconParser.Configuration.CommandPrefixes.RConGetInfo != null ? await this.GetInfoAsync() : null;
 
-            string hostname = (await this.GetMappedDvarValueOrDefaultAsync<string>("sv_hostname", "hostname", infoResponse)).Value;
-            string mapname = (await this.GetMappedDvarValueOrDefaultAsync<string>("mapname", infoResponse: infoResponse)).Value;
-            int maxplayers = (await this.GetMappedDvarValueOrDefaultAsync<int>("sv_maxclients", infoResponse: infoResponse)).Value;
-            string gametype = (await this.GetMappedDvarValueOrDefaultAsync<string>("g_gametype", "gametype", infoResponse)).Value;
-            var basepath = await this.GetMappedDvarValueOrDefaultAsync<string>("fs_basepath");
-            var basegame = await this.GetMappedDvarValueOrDefaultAsync<string>("fs_basegame");
-            var homepath = await this.GetMappedDvarValueOrDefaultAsync<string>("fs_homepath");
-            var game = (await this.GetMappedDvarValueOrDefaultAsync<string>("fs_game", infoResponse: infoResponse));
-            var logfile = await this.GetMappedDvarValueOrDefaultAsync<string>("g_log");
-            var logsync = await this.GetMappedDvarValueOrDefaultAsync<int>("g_logsync");
-            var ip = await this.GetMappedDvarValueOrDefaultAsync<string>("net_ip");
-            var gamePassword = await this.GetMappedDvarValueOrDefaultAsync("g_password", overrideDefault: "");
+            var hostname = (await this.GetMappedDvarValueOrDefaultAsync<string>("sv_hostname", "hostname", infoResponse, token: Manager.CancellationToken)).Value;
+            var mapname = (await this.GetMappedDvarValueOrDefaultAsync<string>("mapname", infoResponse: infoResponse, token: Manager.CancellationToken)).Value;
+            var maxplayers = (await this.GetMappedDvarValueOrDefaultAsync<int>("sv_maxclients", infoResponse: infoResponse, token: Manager.CancellationToken)).Value;
+            var gametype = (await this.GetMappedDvarValueOrDefaultAsync<string>("g_gametype", "gametype", infoResponse, token: Manager.CancellationToken)).Value;
+            var basepath = await this.GetMappedDvarValueOrDefaultAsync<string>("fs_basepath", token: Manager.CancellationToken);
+            var basegame = await this.GetMappedDvarValueOrDefaultAsync<string>("fs_basegame", token: Manager.CancellationToken);
+            var homepath = await this.GetMappedDvarValueOrDefaultAsync<string>("fs_homepath", token: Manager.CancellationToken);
+            var game = await this.GetMappedDvarValueOrDefaultAsync<string>("fs_game", infoResponse: infoResponse, token: Manager.CancellationToken);
+            var logfile = await this.GetMappedDvarValueOrDefaultAsync<string>("g_log", token: Manager.CancellationToken);
+            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);
 
             if (Manager.GetApplicationSettings().Configuration().EnableCustomSayName)
             {
-                await this.SetDvarAsync("sv_sayname", Manager.GetApplicationSettings().Configuration().CustomSayName);
+                await this.SetDvarAsync("sv_sayname", Manager.GetApplicationSettings().Configuration().CustomSayName,
+                    Manager.CancellationToken);
             }
 
             try
             {
-                var website = await this.GetMappedDvarValueOrDefaultAsync<string>("_website");
+                var website = await this.GetMappedDvarValueOrDefaultAsync<string>("_website", token: Manager.CancellationToken);
 
                 // this occurs for games that don't give us anything back when
                 // the dvar is not set
@@ -1201,14 +1251,14 @@ namespace IW4MAdmin
 
                 if (logsync.Value == 0)
                 {
-                    await this.SetDvarAsync("g_logsync", 2); // set to 2 for continous in other games, clamps to 1 for IW4
+                    await this.SetDvarAsync("g_logsync", 2, Manager.CancellationToken); // set to 2 for continous in other games, clamps to 1 for IW4
                     needsRestart = true;
                 }
 
                 if (string.IsNullOrWhiteSpace(logfile.Value))
                 {
                     logfile.Value = "games_mp.log";
-                    await this.SetDvarAsync("g_log", logfile.Value);
+                    await this.SetDvarAsync("g_log", logfile.Value, Manager.CancellationToken);
                     needsRestart = true;
                 }
 
@@ -1220,7 +1270,7 @@ namespace IW4MAdmin
                 }
 
                 // this DVAR isn't set until the a map is loaded
-                await this.SetDvarAsync("logfile", 2);
+                await this.SetDvarAsync("logfile", 2, Manager.CancellationToken);
             }
 
             CustomCallback = await ScriptLoaded();
@@ -1480,7 +1530,7 @@ namespace IW4MAdmin
             ServerLogger.LogDebug("Creating unban penalty for {targetClient}", targetClient.ToString());
             targetClient.SetLevel(Permission.User, originClient);
             await Manager.GetPenaltyService().RemoveActivePenalties(targetClient.AliasLink.AliasLinkId,
-                targetClient.NetworkId, targetClient.CurrentAlias?.IPAddress);
+                targetClient.NetworkId, targetClient.GameName, targetClient.CurrentAlias?.IPAddress);
             await Manager.GetPenaltyService().Create(unbanPenalty);
         }
 

Application/Main.cs

@@ -27,6 +27,7 @@ using System.Threading.Tasks;
 using Data.Abstractions;
 using Data.Helpers;
 using Integrations.Source.Extensions;
+using IW4MAdmin.Application.Alerts;
 using IW4MAdmin.Application.Extensions;
 using IW4MAdmin.Application.Localization;
 using Microsoft.Extensions.Logging;
@@ -77,8 +78,12 @@ namespace IW4MAdmin.Application
         /// <param name="e"></param>
         private static async void OnCancelKey(object sender, ConsoleCancelEventArgs e)
         {
-            _serverManager?.Stop();
-            if (_applicationTask != null)
+            if (_serverManager is not null)
+            {
+                await _serverManager.Stop();
+            }
+
+            if (_applicationTask is not null)
             {
                 await _applicationTask;
             }
@@ -154,6 +159,11 @@ namespace IW4MAdmin.Application
                     Console.WriteLine(e.Message);
                 }
 
+                if (_serverManager is not null)
+                {
+                    await _serverManager?.Stop();
+                }
+
                 Console.WriteLine(exitMessage);
                 await Console.In.ReadAsync(new char[1], 0, 1);
                 return;
@@ -276,7 +286,7 @@ namespace IW4MAdmin.Application
 
             // register the native commands
             foreach (var commandType in typeof(SharedLibraryCore.Commands.QuitCommand).Assembly.GetTypes()
-                .Concat(typeof(Program).Assembly.GetTypes().Where(type => type.Namespace == "IW4MAdmin.Application.Commands"))
+                .Concat(typeof(Program).Assembly.GetTypes().Where(type => type.Namespace?.StartsWith("IW4MAdmin.Application.Commands") ?? false))
                 .Where(command => command.BaseType == typeof(Command)))
             {
                 defaultLogger.LogDebug("Registered native command type {Name}", commandType.Name);
@@ -346,7 +356,7 @@ namespace IW4MAdmin.Application
             await defaultConfigHandler.BuildAsync();
             var commandConfigHandler = new BaseConfigurationHandler<CommandConfiguration>("CommandConfiguration");
             await commandConfigHandler.BuildAsync();
-            var statsCommandHandler = new BaseConfigurationHandler<StatsConfiguration>();
+            var statsCommandHandler = new BaseConfigurationHandler<StatsConfiguration>("StatsPluginSettings");
             await statsCommandHandler.BuildAsync();
             var defaultConfig = defaultConfigHandler.Configuration();
             var appConfig = appConfigHandler.Configuration();
@@ -403,7 +413,10 @@ namespace IW4MAdmin.Application
                 .AddSingleton<IScriptCommandFactory, ScriptCommandFactory>()
                 .AddSingleton<IAuditInformationRepository, AuditInformationRepository>()
                 .AddSingleton<IEntityService<EFClient>, ClientService>()
+#pragma warning disable CS0618
                 .AddSingleton<IMetaService, MetaService>()
+#pragma warning restore CS0618
+                .AddSingleton<IMetaServiceV2, MetaServiceV2>()
                 .AddSingleton<ClientService>()
                 .AddSingleton<PenaltyService>()
                 .AddSingleton<ChangeHistoryService>()
@@ -435,6 +448,8 @@ namespace IW4MAdmin.Application
                 .AddSingleton<IServerDataViewer, ServerDataViewer>()
                 .AddSingleton<IServerDataCollector, ServerDataCollector>()
                 .AddSingleton<IEventPublisher, EventPublisher>()
+                .AddSingleton<IGeoLocationService>(new GeoLocationService(Path.Join(".", "Resources", "GeoLite2-Country.mmdb")))
+                .AddSingleton<IAlertManager, AlertManager>()
                 .AddTransient<IScriptPluginTimerHelper, ScriptPluginTimerHelper>()
                 .AddSingleton(translationLookup)
                 .AddDatabaseContextOptions(appConfig);

Application/Meta/MetaRegistration.cs

@@ -5,6 +5,7 @@ using SharedLibraryCore.Interfaces;
 using SharedLibraryCore.QueryHelper;
 using System;
 using System.Collections.Generic;
+using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using ILogger = Microsoft.Extensions.Logging.ILogger;
@@ -15,17 +16,22 @@ namespace IW4MAdmin.Application.Meta
     {
         private readonly ILogger _logger;
         private ITranslationLookup _transLookup;
-        private readonly IMetaService _metaService;
+        private readonly IMetaServiceV2 _metaService;
         private readonly IEntityService<EFClient> _clientEntityService;
         private readonly IResourceQueryHelper<ClientPaginationRequest, ReceivedPenaltyResponse> _receivedPenaltyHelper;
-        private readonly IResourceQueryHelper<ClientPaginationRequest, AdministeredPenaltyResponse> _administeredPenaltyHelper;
+
+        private readonly IResourceQueryHelper<ClientPaginationRequest, AdministeredPenaltyResponse>
+            _administeredPenaltyHelper;
+
         private readonly IResourceQueryHelper<ClientPaginationRequest, UpdatedAliasResponse> _updatedAliasHelper;
+
         private readonly IResourceQueryHelper<ClientPaginationRequest, ConnectionHistoryResponse>
             _connectionHistoryHelper;
+
         private readonly IResourceQueryHelper<ClientPaginationRequest, PermissionLevelChangedResponse>
             _permissionLevelHelper;
 
-        public MetaRegistration(ILogger<MetaRegistration> logger, IMetaService metaService,
+        public MetaRegistration(ILogger<MetaRegistration> logger, IMetaServiceV2 metaService,
             ITranslationLookup transLookup, IEntityService<EFClient> clientEntityService,
             IResourceQueryHelper<ClientPaginationRequest, ReceivedPenaltyResponse> receivedPenaltyHelper,
             IResourceQueryHelper<ClientPaginationRequest, AdministeredPenaltyResponse> administeredPenaltyHelper,
@@ -46,19 +52,26 @@ namespace IW4MAdmin.Application.Meta
 
         public void Register()
         {
-            _metaService.AddRuntimeMeta<ClientPaginationRequest, InformationResponse>(MetaType.Information, GetProfileMeta);
-            _metaService.AddRuntimeMeta<ClientPaginationRequest, ReceivedPenaltyResponse>(MetaType.ReceivedPenalty, GetReceivedPenaltiesMeta);
-            _metaService.AddRuntimeMeta<ClientPaginationRequest, AdministeredPenaltyResponse>(MetaType.Penalized, GetAdministeredPenaltiesMeta);
-            _metaService.AddRuntimeMeta<ClientPaginationRequest, UpdatedAliasResponse>(MetaType.AliasUpdate, GetUpdatedAliasMeta);
-            _metaService.AddRuntimeMeta<ClientPaginationRequest, ConnectionHistoryResponse>(MetaType.ConnectionHistory, GetConnectionHistoryMeta);
+            _metaService.AddRuntimeMeta<ClientPaginationRequest, InformationResponse>(MetaType.Information,
+                GetProfileMeta);
+            _metaService.AddRuntimeMeta<ClientPaginationRequest, ReceivedPenaltyResponse>(MetaType.ReceivedPenalty,
+                GetReceivedPenaltiesMeta);
+            _metaService.AddRuntimeMeta<ClientPaginationRequest, AdministeredPenaltyResponse>(MetaType.Penalized,
+                GetAdministeredPenaltiesMeta);
+            _metaService.AddRuntimeMeta<ClientPaginationRequest, UpdatedAliasResponse>(MetaType.AliasUpdate,
+                GetUpdatedAliasMeta);
+            _metaService.AddRuntimeMeta<ClientPaginationRequest, ConnectionHistoryResponse>(MetaType.ConnectionHistory,
+                GetConnectionHistoryMeta);
             _metaService.AddRuntimeMeta<ClientPaginationRequest, PermissionLevelChangedResponse>(
                 MetaType.PermissionLevel, GetPermissionLevelMeta);
         }
 
-        private async Task<IEnumerable<InformationResponse>> GetProfileMeta(ClientPaginationRequest request)
+        private async Task<IEnumerable<InformationResponse>> GetProfileMeta(ClientPaginationRequest request,
+            CancellationToken cancellationToken = default)
         {
             var metaList = new List<InformationResponse>();
-            var lastMapMeta = await _metaService.GetPersistentMeta("LastMapPlayed", new EFClient() { ClientId = request.ClientId });
+            var lastMapMeta =
+                await _metaService.GetPersistentMeta("LastMapPlayed", request.ClientId, cancellationToken);
 
             if (lastMapMeta != null)
             {
@@ -70,12 +83,12 @@ namespace IW4MAdmin.Application.Meta
                     Value = lastMapMeta.Value,
                     ShouldDisplay = true,
                     Type = MetaType.Information,
-                    Column = 1,
                     Order = 6
                 });
             }
 
-            var lastServerMeta = await _metaService.GetPersistentMeta("LastServerPlayed", new EFClient() { ClientId = request.ClientId });
+            var lastServerMeta =
+                await _metaService.GetPersistentMeta("LastServerPlayed", request.ClientId, cancellationToken);
 
             if (lastServerMeta != null)
             {
@@ -87,8 +100,7 @@ namespace IW4MAdmin.Application.Meta
                     Value = lastServerMeta.Value,
                     ShouldDisplay = true,
                     Type = MetaType.Information,
-                    Column = 0,
-                    Order = 6
+                    Order = 7
                 });
             }
 
@@ -96,7 +108,7 @@ namespace IW4MAdmin.Application.Meta
 
             if (client == null)
             {
-                _logger.LogWarning("No client found with id {clientId} when generating profile meta", request.ClientId);
+                _logger.LogWarning("No client found with id {ClientId} when generating profile meta", request.ClientId);
                 return metaList;
             }
 
@@ -106,8 +118,7 @@ namespace IW4MAdmin.Application.Meta
                 Key = _transLookup["WEBFRONT_PROFILE_META_PLAY_TIME"],
                 Value = TimeSpan.FromHours(client.TotalConnectionTime / 3600.0).HumanizeForCurrentCulture(),
                 ShouldDisplay = true,
-                Column = 1,
-                Order = 0,
+                Order = 8,
                 Type = MetaType.Information
             });
 
@@ -117,8 +128,7 @@ namespace IW4MAdmin.Application.Meta
                 Key = _transLookup["WEBFRONT_PROFILE_META_FIRST_SEEN"],
                 Value = (DateTime.UtcNow - client.FirstConnection).HumanizeForCurrentCulture(),
                 ShouldDisplay = true,
-                Column = 1,
-                Order = 1,
+                Order = 9,
                 Type = MetaType.Information
             });
 
@@ -128,8 +138,7 @@ namespace IW4MAdmin.Application.Meta
                 Key = _transLookup["WEBFRONT_PROFILE_META_LAST_SEEN"],
                 Value = (DateTime.UtcNow - client.LastConnection).HumanizeForCurrentCulture(),
                 ShouldDisplay = true,
-                Column = 1,
-                Order = 2,
+                Order = 10,
                 Type = MetaType.Information
             });
 
@@ -137,10 +146,10 @@ namespace IW4MAdmin.Application.Meta
             {
                 ClientId = client.ClientId,
                 Key = Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_CLIENT_META_CONNECTIONS"],
-                Value = client.Connections.ToString("#,##0", new System.Globalization.CultureInfo(Utilities.CurrentLocalization.LocalizationName)),
+                Value = client.Connections.ToString("#,##0",
+                    new System.Globalization.CultureInfo(Utilities.CurrentLocalization.LocalizationName)),
                 ShouldDisplay = true,
-                Column = 1,
-                Order = 3,
+                Order = 11,
                 Type = MetaType.Information
             });
 
@@ -148,42 +157,47 @@ namespace IW4MAdmin.Application.Meta
             {
                 ClientId = client.ClientId,
                 Key = Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_CLIENT_META_MASKED"],
-                Value = client.Masked ? Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_CLIENT_META_TRUE"] : Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_CLIENT_META_FALSE"],
+                Value = client.Masked
+                    ? Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_CLIENT_META_TRUE"]
+                    : Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_CLIENT_META_FALSE"],
                 IsSensitive = true,
-                Column = 1,
-                Order = 4,
+                Order = 12,
                 Type = MetaType.Information
             });
 
             return metaList;
         }
 
-        private async Task<IEnumerable<ReceivedPenaltyResponse>> GetReceivedPenaltiesMeta(ClientPaginationRequest request)
+        private async Task<IEnumerable<ReceivedPenaltyResponse>> GetReceivedPenaltiesMeta(
+            ClientPaginationRequest request, CancellationToken token = default)
         {
             var penalties = await _receivedPenaltyHelper.QueryResource(request);
             return penalties.Results;
         }
 
-        private async Task<IEnumerable<AdministeredPenaltyResponse>> GetAdministeredPenaltiesMeta(ClientPaginationRequest request)
+        private async Task<IEnumerable<AdministeredPenaltyResponse>> GetAdministeredPenaltiesMeta(
+            ClientPaginationRequest request, CancellationToken token = default)
         {
             var penalties = await _administeredPenaltyHelper.QueryResource(request);
             return penalties.Results;
         }
 
-        private async Task<IEnumerable<UpdatedAliasResponse>> GetUpdatedAliasMeta(ClientPaginationRequest request)
+        private async Task<IEnumerable<UpdatedAliasResponse>> GetUpdatedAliasMeta(ClientPaginationRequest request,
+            CancellationToken token = default)
         {
             var aliases = await _updatedAliasHelper.QueryResource(request);
             return aliases.Results;
         }
-        
-        private async Task<IEnumerable<ConnectionHistoryResponse>> GetConnectionHistoryMeta(ClientPaginationRequest request)
+
+        private async Task<IEnumerable<ConnectionHistoryResponse>> GetConnectionHistoryMeta(
+            ClientPaginationRequest request, CancellationToken token = default)
         {
             var connections = await _connectionHistoryHelper.QueryResource(request);
             return connections.Results;
         }
 
         private async Task<IEnumerable<PermissionLevelChangedResponse>> GetPermissionLevelMeta(
-            ClientPaginationRequest request)
+            ClientPaginationRequest request, CancellationToken token = default)
         {
             var permissionChanges = await _permissionLevelHelper.QueryResource(request);
             return permissionChanges.Results;

Application/Meta/PermissionLevelChangedResourceQueryHelper.cs

@@ -39,7 +39,8 @@ public class
                 PreviousPermissionLevelValue = change.PreviousValue,
                 CurrentPermissionLevelValue = change.CurrentValue,
                 When = change.TimeChanged,
-                ClientId = change.TargetEntityId
+                ClientId = change.TargetEntityId,
+                IsSensitive = true
             };
 
         return new ResourceQueryHelperResult<PermissionLevelChangedResponse>

Application/Meta/ReceivedPenaltyResourceQueryHelper.cs

@@ -11,6 +11,7 @@ using SharedLibraryCore.Dtos.Meta.Responses;
 using SharedLibraryCore.Helpers;
 using SharedLibraryCore.Interfaces;
 using SharedLibraryCore.QueryHelper;
+using SharedLibraryCore.Services;
 using ILogger = Microsoft.Extensions.Logging.ILogger;
 
 namespace IW4MAdmin.Application.Meta
@@ -19,13 +20,14 @@ namespace IW4MAdmin.Application.Meta
     /// implementation of IResourceQueryHelper
     /// used to pull in penalties applied to a given client id
     /// </summary>
-    public class ReceivedPenaltyResourceQueryHelper : IResourceQueryHelper<ClientPaginationRequest, ReceivedPenaltyResponse>
+    public class
+        ReceivedPenaltyResourceQueryHelper : IResourceQueryHelper<ClientPaginationRequest, ReceivedPenaltyResponse>
     {
         private readonly ILogger _logger;
         private readonly IDatabaseContextFactory _contextFactory;
         private readonly ApplicationConfiguration _appConfig;
 
-        public ReceivedPenaltyResourceQueryHelper(ILogger<ReceivedPenaltyResourceQueryHelper> logger, 
+        public ReceivedPenaltyResourceQueryHelper(ILogger<ReceivedPenaltyResourceQueryHelper> logger,
             IDatabaseContextFactory contextFactory, ApplicationConfiguration appConfig)
         {
             _contextFactory = contextFactory;
@@ -33,28 +35,36 @@ namespace IW4MAdmin.Application.Meta
             _appConfig = appConfig;
         }
 
-        public async Task<ResourceQueryHelperResult<ReceivedPenaltyResponse>> QueryResource(ClientPaginationRequest query)
+        public async Task<ResourceQueryHelperResult<ReceivedPenaltyResponse>> QueryResource(
+            ClientPaginationRequest query)
         {
             var linkedPenaltyType = Utilities.LinkedPenaltyTypes();
             await using var ctx = _contextFactory.CreateContext(enableTracking: false);
 
             var linkId = await ctx.Clients.AsNoTracking()
-                    .Where(_client => _client.ClientId == query.ClientId)
-                    .Select(_client => new {_client.AliasLinkId, _client.CurrentAliasId })
-                    .FirstOrDefaultAsync();
+                .Where(_client => _client.ClientId == query.ClientId)
+                .Select(_client => new { _client.AliasLinkId, _client.CurrentAliasId })
+                .FirstOrDefaultAsync();
 
             var iqPenalties = ctx.Penalties.AsNoTracking()
                 .Where(_penalty => _penalty.OffenderId == query.ClientId ||
                                    linkedPenaltyType.Contains(_penalty.Type) && _penalty.LinkId == linkId.AliasLinkId);
 
             IQueryable<EFPenalty> iqIpLinkedPenalties = null;
-            
+            IQueryable<EFPenalty> identifierPenalties = null;
+
             if (!_appConfig.EnableImplicitAccountLinking)
             {
                 var usedIps = await ctx.Aliases.AsNoTracking()
-                    .Where(alias => (alias.LinkId == linkId.AliasLinkId || alias.AliasId == linkId.CurrentAliasId) && alias.IPAddress != null)
+                    .Where(alias =>
+                        (alias.LinkId == linkId.AliasLinkId || alias.AliasId == linkId.CurrentAliasId) &&
+                        alias.IPAddress != null)
                     .Select(alias => alias.IPAddress).ToListAsync();
 
+                   identifierPenalties = ctx.PenaltyIdentifiers.AsNoTracking().Where(identifier =>
+                        identifier.IPv4Address != null && usedIps.Contains(identifier.IPv4Address))
+                    .Select(id => id.Penalty);
+
                 var aliasedIds = await ctx.Aliases.AsNoTracking().Where(alias => usedIps.Contains(alias.IPAddress))
                     .Select(alias => alias.LinkId)
                     .ToListAsync();
@@ -65,13 +75,18 @@ namespace IW4MAdmin.Application.Meta
             }
 
             var iqAllPenalties = iqPenalties;
-            
+
             if (iqIpLinkedPenalties != null)
             {
                 iqAllPenalties = iqPenalties.Union(iqIpLinkedPenalties);
             }
 
-             var penalties = await iqAllPenalties
+            if (identifierPenalties != null)
+            {
+                iqAllPenalties = iqPenalties.Union(identifierPenalties);
+            }
+
+            var penalties = await iqAllPenalties
                 .Where(_penalty => _penalty.When < query.Before)
                 .OrderByDescending(_penalty => _penalty.When)
                 .Take(query.Count)
@@ -97,7 +112,7 @@ namespace IW4MAdmin.Application.Meta
             {
                 // todo: maybe actually count
                 RetrievedResultCount = penalties.Count,
-                Results = penalties
+                Results = penalties.Distinct()
             };
         }
     }

Application/Migration/ConfigurationMigration.cs

@@ -88,7 +88,7 @@ namespace IW4MAdmin.Application.Migration
 
         public static void RemoveObsoletePlugins20210322()
         {
-            var files = new[] {"StatsWeb.dll", "StatsWeb.Views.dll"};
+            var files = new[] {"StatsWeb.dll", "StatsWeb.Views.dll", "IW4ScriptCommands.dll"};
 
             foreach (var file in files)
             {

Application/Misc/AsyncResult.cs

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

Application/Misc/BaseConfigurationHandler.cs

@@ -27,6 +27,7 @@ namespace IW4MAdmin.Application.Misc
             _serializerOptions = new JsonSerializerOptions
             {
                 WriteIndented = true,
+                Encoder = System.Text.Encodings.Web.JavaScriptEncoder.UnsafeRelaxedJsonEscaping
             };
             _serializerOptions.Converters.Add(new JsonStringEnumConverter());
             _onSaving = new SemaphoreSlim(1, 1);

Application/Misc/EventPublisher.cs

@@ -29,7 +29,7 @@ namespace IW4MAdmin.Application.Misc
                     OnClientConnect?.Invoke(this, gameEvent);
                 }
 
-                if (gameEvent.Type == GameEvent.EventType.Disconnect)
+                if (gameEvent.Type == GameEvent.EventType.Disconnect && gameEvent.Origin.ClientId != 0)
                 {
                     OnClientDisconnect?.Invoke(this, gameEvent);
                 }
@@ -41,4 +41,4 @@ namespace IW4MAdmin.Application.Misc
             }
         }
     }
-}
+}

Application/Misc/GeoLocationResult.cs

@@ -0,0 +1,13 @@
+using SharedLibraryCore.Interfaces;
+
+namespace IW4MAdmin.Application.Misc;
+
+public class GeoLocationResult : IGeoLocationResult
+{
+    public string Country { get; set; }
+    public string CountryCode { get; set; }
+    public string Region { get; set; }
+    public string ASN { get; set; }
+    public string Timezone { get; set; }
+    public string Organization { get; set; }
+}

Application/Misc/GeoLocationService.cs

@@ -0,0 +1,40 @@
+using System;
+using System.Threading.Tasks;
+using MaxMind.GeoIP2;
+using MaxMind.GeoIP2.Responses;
+using SharedLibraryCore.Interfaces;
+
+namespace IW4MAdmin.Application.Misc;
+
+public class GeoLocationService : IGeoLocationService
+{
+    private readonly string _sourceAddress;
+    
+    public GeoLocationService(string sourceAddress)
+    {
+        _sourceAddress = sourceAddress;
+    }
+    
+    public Task<IGeoLocationResult> Locate(string address)
+    {
+        CountryResponse country = null;
+        
+        try
+        {
+            using var reader = new DatabaseReader(_sourceAddress);
+            reader.TryCountry(address, out country);
+        }
+        catch
+        {
+            // ignored
+        }
+
+        var response = new GeoLocationResult
+        {
+            Country = country?.Country.Name ?? "Unknown",
+            CountryCode = country?.Country.IsoCode ?? ""
+        };
+
+        return Task.FromResult((IGeoLocationResult)response);
+    }
+}

Application/Misc/MetaService.cs

@@ -18,6 +18,7 @@ namespace IW4MAdmin.Application.Misc
     /// implementation of IMetaService
     /// used to add and retrieve runtime and persistent meta
     /// </summary>
+    [Obsolete("Use MetaServiceV2")]
     public class MetaService : IMetaService
     {
         private readonly IDictionary<MetaType, List<dynamic>> _metaActions;

Application/Misc/MetaServiceV2.cs

@@ -0,0 +1,453 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json;
+using System.Threading;
+using System.Threading.Tasks;
+using Data.Abstractions;
+using Data.Models;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using SharedLibraryCore.Dtos;
+using SharedLibraryCore.Interfaces;
+using SharedLibraryCore.QueryHelper;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
+
+namespace IW4MAdmin.Application.Misc;
+
+public class MetaServiceV2 : IMetaServiceV2
+{
+    private readonly IDictionary<MetaType, List<dynamic>> _metaActions;
+    private readonly IDatabaseContextFactory _contextFactory;
+    private readonly ILogger _logger;
+
+    public MetaServiceV2(ILogger<MetaServiceV2> logger, IDatabaseContextFactory contextFactory)
+    {
+        _logger = logger;
+        _metaActions = new Dictionary<MetaType, List<dynamic>>();
+        _contextFactory = contextFactory;
+    }
+
+    public async Task SetPersistentMeta(string metaKey, string metaValue, int clientId,
+        CancellationToken token = default)
+    {
+        if (!ValidArgs(metaKey, clientId))
+        {
+            return;
+        }
+
+        await using var context = _contextFactory.CreateContext();
+
+        var existingMeta = await context.EFMeta
+            .Where(meta => meta.Key == metaKey)
+            .Where(meta => meta.ClientId == clientId)
+            .FirstOrDefaultAsync(token);
+
+        if (existingMeta != null)
+        {
+            _logger.LogDebug("Updating existing meta with key {Key} and id {Id}", existingMeta.Key,
+                existingMeta.MetaId);
+            existingMeta.Value = metaValue;
+            existingMeta.Updated = DateTime.UtcNow;
+        }
+
+        else
+        {
+            _logger.LogDebug("Adding new meta with key {Key}", metaKey);
+            context.EFMeta.Add(new EFMeta
+            {
+                ClientId = clientId,
+                Created = DateTime.UtcNow,
+                Key = metaKey,
+                Value = metaValue,
+            });
+        }
+
+        await context.SaveChangesAsync(token);
+    }
+
+    public async Task SetPersistentMetaValue<T>(string metaKey, T metaValue, int clientId,
+        CancellationToken token = default) where T : class
+    {
+        if (!ValidArgs(metaKey, clientId))
+        {
+            return;
+        }
+
+        string serializedValue;
+
+        try
+        {
+            serializedValue = JsonSerializer.Serialize(metaValue);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Could not serialize meta with key {Key}", metaKey);
+            return;
+        }
+
+        await SetPersistentMeta(metaKey, serializedValue, clientId, token);
+    }
+
+    public async Task SetPersistentMetaForLookupKey(string metaKey, string lookupKey, int lookupId, int clientId,
+        CancellationToken token = default)
+    {
+        if (!ValidArgs(metaKey, clientId))
+        {
+            return;
+        }
+
+        await using var context = _contextFactory.CreateContext();
+
+        var lookupMeta = await context.EFMeta.FirstOrDefaultAsync(meta => meta.Key == lookupKey, token);
+
+        if (lookupMeta is null)
+        {
+            _logger.LogWarning("No lookup meta exists for metaKey {MetaKey} and lookupKey {LookupKey}", metaKey,
+                lookupKey);
+            return;
+        }
+
+        var lookupValues = JsonSerializer.Deserialize<List<LookupValue<string>>>(lookupMeta.Value);
+
+        if (lookupValues is null)
+        {
+            return;
+        }
+
+        var foundLookup = lookupValues.FirstOrDefault(value => value.Id == lookupId);
+
+        if (foundLookup is null)
+        {
+            _logger.LogWarning("No lookup meta found for provided lookup id {MetaKey}, {LookupKey}, {LookupId}",
+                metaKey, lookupKey, lookupId);
+            return;
+        }
+
+        _logger.LogDebug("Setting meta for lookup {MetaKey}, {LookupKey}, {LookupId}",
+            metaKey, lookupKey, lookupId);
+
+        await SetPersistentMeta(metaKey, lookupId.ToString(), clientId, token);
+    }
+
+    public async Task IncrementPersistentMeta(string metaKey, int incrementAmount, int clientId,
+        CancellationToken token = default)
+    {
+        if (!ValidArgs(metaKey, clientId))
+        {
+            return;
+        }
+
+        var existingMeta = await GetPersistentMeta(metaKey, clientId, token);
+
+        if (!long.TryParse(existingMeta?.Value ?? "0", out var existingValue))
+        {
+            existingValue = 0;
+        }
+
+        var newValue = existingValue + incrementAmount;
+        await SetPersistentMeta(metaKey, newValue.ToString(), clientId, token);
+    }
+
+    public async Task DecrementPersistentMeta(string metaKey, int decrementAmount, int clientId,
+        CancellationToken token = default)
+    {
+        await IncrementPersistentMeta(metaKey, -decrementAmount, clientId, token);
+    }
+
+    public async Task<EFMeta> GetPersistentMeta(string metaKey, int clientId, CancellationToken token = default)
+    {
+        if (!ValidArgs(metaKey, clientId))
+        {
+            return null;
+        }
+
+        await using var ctx = _contextFactory.CreateContext(enableTracking: false);
+
+        return await ctx.EFMeta
+            .Where(meta => meta.Key == metaKey)
+            .Where(meta => meta.ClientId == clientId)
+            .Select(meta => new EFMeta
+            {
+                MetaId = meta.MetaId,
+                Key = meta.Key,
+                ClientId = meta.ClientId,
+                Value = meta.Value,
+            })
+            .FirstOrDefaultAsync(token);
+    }
+
+    public async Task<T> GetPersistentMetaValue<T>(string metaKey, int clientId, CancellationToken token = default)
+        where T : class
+    {
+        var meta = await GetPersistentMeta(metaKey, clientId, token);
+
+        if (meta is null)
+        {
+            return default;
+        }
+
+        try
+        {
+            return JsonSerializer.Deserialize<T>(meta.Value);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Could not deserialize meta with key {Key} and value {Value}", metaKey, meta.Value);
+            return default;
+        }
+    }
+
+    public async Task<EFMeta> GetPersistentMetaByLookup(string metaKey, string lookupKey, int clientId,
+        CancellationToken token = default)
+    {
+        await using var context = _contextFactory.CreateContext();
+
+        var metaValue = await GetPersistentMeta(metaKey, clientId, token);
+
+        if (metaValue is null)
+        {
+            _logger.LogDebug("No meta exists for key {Key}, clientId {ClientId}", metaKey, clientId);
+            return default;
+        }
+
+        var lookupMeta = await context.EFMeta.FirstOrDefaultAsync(meta => meta.Key == lookupKey, token);
+
+        if (lookupMeta is null)
+        {
+            _logger.LogWarning("No lookup meta exists for metaKey {MetaKey} and lookupKey {LookupKey}", metaKey,
+                lookupKey);
+            return default;
+        }
+
+        var lookupId = int.Parse(metaValue.Value);
+        var lookupValues = JsonSerializer.Deserialize<List<LookupValue<string>>>(lookupMeta.Value);
+
+        if (lookupValues is null)
+        {
+            return default;
+        }
+
+        var foundLookup = lookupValues.FirstOrDefault(value => value.Id == lookupId);
+
+        if (foundLookup is not null)
+        {
+            return new EFMeta
+            {
+                Created = metaValue.Created,
+                Updated = metaValue.Updated,
+                Extra = metaValue.Extra,
+                MetaId = metaValue.MetaId,
+                Value = foundLookup.Value
+            };
+        }
+
+        _logger.LogWarning("No lookup meta found for provided lookup id {MetaKey}, {LookupKey}, {LookupId}",
+            metaKey, lookupKey, lookupId);
+        return default;
+    }
+
+    public async Task RemovePersistentMeta(string metaKey, int clientId, CancellationToken token = default)
+    {
+        if (!ValidArgs(metaKey, clientId))
+        {
+            return;
+        }
+
+        await using var context = _contextFactory.CreateContext();
+
+        var existingMeta = await context.EFMeta
+            .FirstOrDefaultAsync(meta => meta.Key == metaKey && meta.ClientId == clientId, token);
+
+        if (existingMeta == null)
+        {
+            _logger.LogDebug("No meta with key {Key} found for client id {Id}", metaKey, clientId);
+            return;
+        }
+
+        _logger.LogDebug("Removing meta for key {Key} with id {Id}", metaKey, existingMeta.MetaId);
+        context.EFMeta.Remove(existingMeta);
+        await context.SaveChangesAsync(token);
+    }
+
+    public async Task SetPersistentMeta(string metaKey, string metaValue, CancellationToken token = default)
+    {
+        if (string.IsNullOrWhiteSpace(metaKey))
+        {
+            _logger.LogWarning("Cannot save meta with no key");
+            return;
+        }
+
+        await using var ctx = _contextFactory.CreateContext();
+
+        var existingMeta = await ctx.EFMeta
+            .Where(meta => meta.Key == metaKey)
+            .Where(meta => meta.ClientId == null)
+            .FirstOrDefaultAsync(token);
+
+        if (existingMeta is not null)
+        {
+            _logger.LogDebug("Updating existing meta with key {Key} and id {Id}", existingMeta.Key,
+                existingMeta.MetaId);
+
+            existingMeta.Value = metaValue;
+            existingMeta.Updated = DateTime.UtcNow;
+
+            await ctx.SaveChangesAsync(token);
+        }
+
+        else
+        {
+            _logger.LogDebug("Adding new meta with key {Key}", metaKey);
+
+            ctx.EFMeta.Add(new EFMeta
+            {
+                Created = DateTime.UtcNow,
+                Key = metaKey,
+                Value = metaValue
+            });
+
+            await ctx.SaveChangesAsync(token);
+        }
+    }
+
+    public async Task SetPersistentMetaValue<T>(string metaKey, T metaValue, CancellationToken token = default)
+        where T : class
+    {
+        if (string.IsNullOrWhiteSpace(metaKey))
+        {
+            _logger.LogWarning("Meta key is null, not setting");
+            return;
+        }
+
+        if (metaValue is null)
+        {
+            _logger.LogWarning("Meta value is null, not setting");
+            return;
+        }
+
+        string serializedMeta;
+        try
+        {
+            serializedMeta = JsonSerializer.Serialize(metaValue);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Could not serialize meta with {Key} and value {Value}", metaKey, metaValue);
+            return;
+        }
+
+        await SetPersistentMeta(metaKey, serializedMeta, token);
+    }
+
+    public async Task<EFMeta> GetPersistentMeta(string metaKey, CancellationToken token = default)
+    {
+        if (string.IsNullOrWhiteSpace(metaKey))
+        {
+            return null;
+        }
+
+        await using var context = _contextFactory.CreateContext(false);
+        return await context.EFMeta.FirstOrDefaultAsync(meta => meta.Key == metaKey, token);
+    }
+
+    public async Task<T> GetPersistentMetaValue<T>(string metaKey, CancellationToken token = default) where T : class
+    {
+        if (string.IsNullOrWhiteSpace(metaKey))
+        {
+            return default;
+        }
+
+        var meta = await GetPersistentMeta(metaKey, token);
+
+        if (meta is null)
+        {
+            return default;
+        }
+
+        try
+        {
+            return JsonSerializer.Deserialize<T>(meta.Value);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Could not serialize meta with key {Key} and value {Value}", metaKey, meta.Value);
+            return default;
+        }
+    }
+
+    public async Task RemovePersistentMeta(string metaKey, CancellationToken token = default)
+    {
+        if (string.IsNullOrWhiteSpace(metaKey))
+        {
+            return;
+        }
+
+        await using var context = _contextFactory.CreateContext(enableTracking: false);
+
+        var existingMeta = await context.EFMeta
+            .Where(meta => meta.Key == metaKey)
+            .Where(meta => meta.ClientId == null)
+            .FirstOrDefaultAsync(token);
+
+        if (existingMeta != null)
+        {
+            _logger.LogDebug("Removing meta for key {Key} with id {Id}", metaKey, existingMeta.MetaId);
+            context.Remove(existingMeta);
+            await context.SaveChangesAsync(token);
+        }
+    }
+
+    public void AddRuntimeMeta<T, TReturnType>(MetaType metaKey,
+        Func<T, CancellationToken, Task<IEnumerable<TReturnType>>> metaAction)
+        where T : PaginationRequest where TReturnType : IClientMeta
+    {
+        if (!_metaActions.ContainsKey(metaKey))
+        {
+            _metaActions.Add(metaKey, new List<dynamic> { metaAction });
+        }
+
+        else
+        {
+            _metaActions[metaKey].Add(metaAction);
+        }
+    }
+
+    public async Task<IEnumerable<IClientMeta>> GetRuntimeMeta(ClientPaginationRequest request, CancellationToken token = default)
+    {
+        var metas = await Task.WhenAll(_metaActions.Where(kvp => kvp.Key != MetaType.Information)
+            .Select(async kvp => await kvp.Value[0](request, token)));
+
+        return metas.SelectMany(m => (IEnumerable<IClientMeta>)m)
+            .OrderByDescending(m => m.When)
+            .Take(request.Count)
+            .ToList();
+    }
+
+    public async Task<IEnumerable<T>> GetRuntimeMeta<T>(ClientPaginationRequest request, MetaType metaType,  CancellationToken token = default)
+        where T : IClientMeta
+    {
+        if (metaType == MetaType.Information)
+        {
+            var allMeta = new List<T>();
+
+            var completedMeta = await Task.WhenAll(_metaActions[metaType].Select(async individualMetaRegistration =>
+                (IEnumerable<T>)await individualMetaRegistration(request, token)));
+
+            allMeta.AddRange(completedMeta.SelectMany(meta => meta));
+
+            return ProcessInformationMeta(allMeta);
+        }
+
+        var meta = await _metaActions[metaType][0](request, token) as IEnumerable<T>;
+
+        return meta;
+    }
+
+    private static IEnumerable<T> ProcessInformationMeta<T>(IEnumerable<T> meta) where T : IClientMeta
+    {
+        return meta;
+    }
+
+    private static bool ValidArgs(string key, int clientId) => !string.IsNullOrWhiteSpace(key) && clientId > 0;
+}

Application/Misc/ScriptPlugin.cs

@@ -276,6 +276,8 @@ namespace IW4MAdmin.Application.Misc
             {
                 _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;
@@ -341,7 +343,8 @@ namespace IW4MAdmin.Application.Misc
         /// <param name="commands">commands value from jint parser</param>
         /// <param name="scriptCommandFactory">factory to create the command from</param>
         /// <returns></returns>
-        private IEnumerable<IManagerCommand> GenerateScriptCommands(JsValue commands, IScriptCommandFactory scriptCommandFactory)
+        private IEnumerable<IManagerCommand> GenerateScriptCommands(JsValue commands,
+            IScriptCommandFactory scriptCommandFactory)
         {
             var commandList = new List<IManagerCommand>();
 
@@ -408,7 +411,7 @@ namespace IW4MAdmin.Application.Misc
 
                         _scriptEngine.SetValue("_event", gameEvent);
                         var jsEventObject = _scriptEngine.Evaluate("_event");
-                        
+
                         dynamicCommand.execute.Target.Invoke(_scriptEngine, jsEventObject);
                     }
 
@@ -422,7 +425,7 @@ namespace IW4MAdmin.Application.Misc
 
                         throw new PluginException("A runtime error occured while executing action for script plugin");
                     }
-                    
+
                     catch (Exception ex)
                     {
                         using (LogContext.PushProperty("Server", gameEvent.Owner?.ToString()))
@@ -451,6 +454,73 @@ namespace IW4MAdmin.Application.Misc
 
             return commandList;
         }
+
+        private void BeginGetDvar(Server server, string dvarName, Delegate onCompleted)
+        {
+            var tokenSource = new CancellationTokenSource();
+            tokenSource.CancelAfter(TimeSpan.FromSeconds(15));
+            
+            server.BeginGetDvar(dvarName, result =>
+            {
+                var shouldRelease = false;
+                try
+                {
+                    _onProcessing.Wait(tokenSource.Token);
+                    shouldRelease = true;
+                    var (success, value) = (ValueTuple<bool, string>)result.AsyncState;
+
+                    onCompleted.DynamicInvoke(JsValue.Undefined,
+                        new[]
+                        {
+                            JsValue.FromObject(_scriptEngine, server),
+                            JsValue.FromObject(_scriptEngine, dvarName),
+                            JsValue.FromObject(_scriptEngine, value),
+                            JsValue.FromObject(_scriptEngine, success)
+                        });
+                }
+
+                finally
+                {
+                    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));
+            
+            server.BeginSetDvar(dvarName, dvarValue, result =>
+            {
+                var shouldRelease = false;
+                try
+                {
+                    _onProcessing.Wait(tokenSource.Token);
+                    shouldRelease = true;
+                    var success = (bool)result.AsyncState;
+                    
+                    onCompleted.DynamicInvoke(JsValue.Undefined,
+                        new[]
+                        {
+                            JsValue.FromObject(_scriptEngine, server),
+                            JsValue.FromObject(_scriptEngine, dvarName),
+                            JsValue.FromObject(_scriptEngine, dvarValue),
+                            JsValue.FromObject(_scriptEngine, success)
+                        });
+                }
+                finally
+                {
+                    if (_onProcessing.CurrentCount == 0 && shouldRelease)
+                    {
+                        _onProcessing.Release();
+                    }
+                }
+            }, tokenSource.Token);
+        }
     }
 
     public class PermissionLevelToStringConverter : IObjectConverter

Application/Misc/ScriptPluginConfigurationWrapper.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
+using System.Text.Json;
 using System.Threading.Tasks;
 using IW4MAdmin.Application.Configuration;
 using Jint;
@@ -84,9 +85,9 @@ namespace IW4MAdmin.Application.Misc
 
             var item = _config[_pluginName][key];
 
-            if (item is JArray array)
+            if (item is JsonElement { ValueKind: JsonValueKind.Array } jElem)
             {
-                item = array.ToObject<List<dynamic>>();
+                item = jElem.Deserialize<List<dynamic>>();
             }
 
             return JsValue.FromObject(_scriptEngine, item);

Application/Misc/ServerDataCollector.cs

@@ -94,7 +94,8 @@ namespace IW4MAdmin.Application.Misc
                     PeriodBlock = (int) (DateTimeOffset.UtcNow - DateTimeOffset.UnixEpoch).TotalMinutes,
                     ServerId = await server.GetIdForServer(),
                     MapId = await GetOrCreateMap(server.CurrentMap.Name, (Reference.Game) server.GameName, token),
-                    ClientCount = server.ClientNum
+                    ClientCount = server.ClientNum,
+                    ConnectionInterrupted = server.Throttled,
                 }));
 
             return data;
@@ -144,4 +145,4 @@ namespace IW4MAdmin.Application.Misc
             context.SaveChanges();
         }
     }
-}
+}

Application/Misc/ServerDataViewer.cs

@@ -5,6 +5,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Data.Abstractions;
 using Data.Models.Client;
+using Data.Models.Client.Stats;
 using Data.Models.Server;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
@@ -22,18 +23,20 @@ namespace IW4MAdmin.Application.Misc
         private readonly IDataValueCache<EFServerSnapshot, (int?, DateTime?)> _snapshotCache;
         private readonly IDataValueCache<EFClient, (int, int)> _serverStatsCache;
         private readonly IDataValueCache<EFServerSnapshot, List<ClientHistoryInfo>> _clientHistoryCache;
+        private readonly IDataValueCache<EFClientRankingHistory, int> _rankedClientsCache;
 
         private readonly TimeSpan? _cacheTimeSpan =
             Utilities.IsDevelopment ? TimeSpan.FromSeconds(30) : (TimeSpan?) TimeSpan.FromMinutes(10);
 
         public ServerDataViewer(ILogger<ServerDataViewer> logger, IDataValueCache<EFServerSnapshot, (int?, DateTime?)> snapshotCache,
             IDataValueCache<EFClient, (int, int)> serverStatsCache,
-            IDataValueCache<EFServerSnapshot, List<ClientHistoryInfo>> clientHistoryCache)
+            IDataValueCache<EFServerSnapshot, List<ClientHistoryInfo>> clientHistoryCache, IDataValueCache<EFClientRankingHistory, int> rankedClientsCache)
         {
             _logger = logger;
             _snapshotCache = snapshotCache;
             _serverStatsCache = serverStatsCache;
             _clientHistoryCache = clientHistoryCache;
+            _rankedClientsCache = rankedClientsCache;
         }
 
         public async Task<(int?, DateTime?)> 
@@ -135,7 +138,9 @@ namespace IW4MAdmin.Application.Misc
                         {
                             snapshot.ServerId,
                             snapshot.CapturedAt,
-                            snapshot.ClientCount
+                            snapshot.ClientCount,
+                            snapshot.ConnectionInterrupted,
+                            MapName = snapshot.Map.Name,
                         })
                     .OrderBy(snapshot => snapshot.CapturedAt)
                     .ToListAsync(cancellationToken);
@@ -143,8 +148,8 @@ namespace IW4MAdmin.Application.Misc
                 return history.GroupBy(snapshot => snapshot.ServerId).Select(byServer => new ClientHistoryInfo
                 {
                     ServerId = byServer.Key,
-                    ClientCounts = byServer.Select(snapshot => new ClientCountSnapshot()
-                        {Time = snapshot.CapturedAt, ClientCount = snapshot.ClientCount}).ToList()
+                    ClientCounts = byServer.Select(snapshot => new ClientCountSnapshot
+                        { Time = snapshot.CapturedAt, ClientCount = snapshot.ClientCount, ConnectionInterrupted = snapshot.ConnectionInterrupted ?? false, Map = snapshot.MapName}).ToList()
                 }).ToList();
             }, nameof(_clientHistoryCache), TimeSpan.MaxValue);
 
@@ -158,5 +163,30 @@ namespace IW4MAdmin.Application.Misc
                 return Enumerable.Empty<ClientHistoryInfo>();
             }
         }
+
+        public async Task<int> RankedClientsCountAsync(long? serverId = null, CancellationToken token = default)
+        {
+            _rankedClientsCache.SetCacheItem(async (set, cancellationToken) =>
+            {
+                var fifteenDaysAgo = DateTime.UtcNow.AddDays(-15);
+                return await set
+                    .Where(rating => rating.Newest)
+                    .Where(rating => rating.ServerId == serverId)
+                    .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);
+            
+            try
+            {
+                return await _rankedClientsCache.GetCacheItem(nameof(_rankedClientsCache), serverId, token);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Could not retrieve data for {Name}", nameof(RankedClientsCountAsync));
+                return 0;
+            }
+        }
     }
-}
+}

Application/Misc/TokenAuthentication.cs

@@ -9,40 +9,42 @@ namespace IW4MAdmin.Application.Misc
 {
     internal class TokenAuthentication : ITokenAuthentication
     {
-        private readonly ConcurrentDictionary<long, TokenState> _tokens;
+        private readonly ConcurrentDictionary<string, TokenState> _tokens;
         private readonly RandomNumberGenerator _random;
-        private static readonly TimeSpan TimeoutPeriod = new TimeSpan(0, 0, 120);
+        private static readonly TimeSpan TimeoutPeriod = new(0, 0, 120);
         private const short TokenLength = 4;
 
         public TokenAuthentication()
         {
-            _tokens = new ConcurrentDictionary<long, TokenState>();
+            _tokens = new ConcurrentDictionary<string, TokenState>();
             _random = RandomNumberGenerator.Create();
         }
 
-        public bool AuthorizeToken(long networkId, string token)
+        public bool AuthorizeToken(ITokenIdentifier authInfo)
         {
-            var authorizeSuccessful = _tokens.ContainsKey(networkId) && _tokens[networkId].Token == token;
+            var key = BuildKey(authInfo);
+            var authorizeSuccessful = _tokens.ContainsKey(key) && _tokens[key].Token == key;
 
             if (authorizeSuccessful)
             {
-                _tokens.TryRemove(networkId, out _);
+                _tokens.TryRemove(key, out _);
             }
 
             return authorizeSuccessful;
         }
 
-        public TokenState GenerateNextToken(long networkId)
+        public TokenState GenerateNextToken(ITokenIdentifier authInfo)
         {
             TokenState state;
+            var genKey = BuildKey(authInfo);
 
-            if (_tokens.ContainsKey(networkId))
+            if (_tokens.ContainsKey(genKey))
             {
-                state = _tokens[networkId];
+                state = _tokens[genKey];
 
-                if ((DateTime.Now - state.RequestTime) > TimeoutPeriod)
+                if (DateTime.Now - state.RequestTime > TimeoutPeriod)
                 {
-                    _tokens.TryRemove(networkId, out _);
+                    _tokens.TryRemove(genKey, out _);
                 }
 
                 else
@@ -53,12 +55,11 @@ namespace IW4MAdmin.Application.Misc
 
             state = new TokenState
             {
-                NetworkId = networkId,
                 Token = _generateToken(),
                 TokenDuration = TimeoutPeriod
             };
 
-            _tokens.TryAdd(networkId, state);
+            _tokens.TryAdd(genKey, state);
 
             // perform some housekeeping so we don't have built up tokens if they're not ever used
             foreach (var (key, value) in _tokens)
@@ -96,5 +97,7 @@ namespace IW4MAdmin.Application.Misc
             _random.Dispose();
             return token.ToString();
         }
+
+        private string BuildKey(ITokenIdentifier authInfo) => $"{authInfo.NetworkId}_${authInfo.Game}";
     }
 }

Application/RConParsers/BaseRConParser.cs

@@ -7,8 +7,10 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
+using System.Threading;
 using System.Threading.Tasks;
 using Data.Models;
+using IW4MAdmin.Application.Misc;
 using Microsoft.Extensions.Logging;
 using static SharedLibraryCore.Server;
 using ILogger = Microsoft.Extensions.Logging.ILogger;
@@ -18,6 +20,7 @@ namespace IW4MAdmin.Application.RConParsers
     public class BaseRConParser : IRConParser
     {
         private readonly ILogger _logger;
+        private static string _botIpIndicator = "00000000.";
         
         public BaseRConParser(ILogger<BaseRConParser> logger, IParserRegexFactory parserRegexFactory)
         {
@@ -77,19 +80,20 @@ namespace IW4MAdmin.Application.RConParsers
         public string RConEngine { get; set; } = "COD";
         public bool IsOneLog { get; set; }
 
-        public async Task<string[]> ExecuteCommandAsync(IRConConnection connection, string command)
+        public async Task<string[]> ExecuteCommandAsync(IRConConnection connection, string command, CancellationToken token = default)
         {
-            var response = await connection.SendQueryAsync(StaticHelpers.QueryType.COMMAND, command);
+            command = command.FormatMessageForEngine(Configuration?.ColorCodeMapping);
+            var response = await connection.SendQueryAsync(StaticHelpers.QueryType.COMMAND, command, token);
             return response.Where(item => item != Configuration.CommandPrefixes.RConResponse).ToArray();
         }
 
-        public async Task<Dvar<T>> GetDvarAsync<T>(IRConConnection connection, string dvarName, T fallbackValue = default)
+        public async Task<Dvar<T>> GetDvarAsync<T>(IRConConnection connection, string dvarName, T fallbackValue = default, CancellationToken token = default)
         {
             string[] lineSplit;
 
             try
             {
-                lineSplit = await connection.SendQueryAsync(StaticHelpers.QueryType.GET_DVAR, dvarName);
+                lineSplit = await connection.SendQueryAsync(StaticHelpers.QueryType.GET_DVAR, dvarName, token);
             }
             catch
             {
@@ -98,10 +102,10 @@ namespace IW4MAdmin.Application.RConParsers
                     throw;
                 }
 
-                lineSplit = new string[0];
+                lineSplit = Array.Empty<string>();
             }
 
-            string response = string.Join('\n', lineSplit).TrimEnd('\0');
+            var response = string.Join('\n', lineSplit).TrimEnd('\0');
             var match = Regex.Match(response, Configuration.Dvar.Pattern);
 
             if (response.Contains("Unknown command") ||
@@ -109,7 +113,7 @@ namespace IW4MAdmin.Application.RConParsers
             {
                 if (fallbackValue != null)
                 {
-                    return new Dvar<T>()
+                    return new Dvar<T>
                     {
                         Name = dvarName,
                         Value = fallbackValue
@@ -119,17 +123,17 @@ namespace IW4MAdmin.Application.RConParsers
                 throw new DvarException(Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_DVAR"].FormatExt(dvarName));
             }
 
-            string value = match.Groups[Configuration.Dvar.GroupMapping[ParserRegex.GroupType.RConDvarValue]].Value;
-            string defaultValue = match.Groups[Configuration.Dvar.GroupMapping[ParserRegex.GroupType.RConDvarDefaultValue]].Value;
-            string latchedValue = match.Groups[Configuration.Dvar.GroupMapping[ParserRegex.GroupType.RConDvarLatchedValue]].Value;
+            var value = match.Groups[Configuration.Dvar.GroupMapping[ParserRegex.GroupType.RConDvarValue]].Value;
+            var defaultValue = match.Groups[Configuration.Dvar.GroupMapping[ParserRegex.GroupType.RConDvarDefaultValue]].Value;
+            var latchedValue = match.Groups[Configuration.Dvar.GroupMapping[ParserRegex.GroupType.RConDvarLatchedValue]].Value;
 
-            string removeTrailingColorCode(string input) => Regex.Replace(input, @"\^7$", "");
+            string RemoveTrailingColorCode(string input) => Regex.Replace(input, @"\^7$", "");
 
-            value = removeTrailingColorCode(value);
-            defaultValue = removeTrailingColorCode(defaultValue);
-            latchedValue = removeTrailingColorCode(latchedValue);
+            value = RemoveTrailingColorCode(value);
+            defaultValue = RemoveTrailingColorCode(defaultValue);
+            latchedValue = RemoveTrailingColorCode(latchedValue);
 
-            return new Dvar<T>()
+            return new Dvar<T>
             {
                 Name = dvarName,
                 Value = string.IsNullOrEmpty(value) ? default : (T)Convert.ChangeType(value, typeof(T)),
@@ -139,10 +143,36 @@ namespace IW4MAdmin.Application.RConParsers
             };
         }
 
-        public virtual async Task<IStatusResponse> GetStatusAsync(IRConConnection connection)
+        public void BeginGetDvar(IRConConnection connection, string dvarName, AsyncCallback callback, CancellationToken token = default)
         {
-            var response = await connection.SendQueryAsync(StaticHelpers.QueryType.COMMAND_STATUS);
-            _logger.LogDebug("Status Response {response}", string.Join(Environment.NewLine, response));
+            GetDvarAsync<string>(connection, dvarName, token: token).ContinueWith(action =>
+            {
+                if (action.Exception is null)
+                {
+                    callback?.Invoke(new AsyncResult
+                    {
+                        IsCompleted = true,
+                        AsyncState = (true, action.Result.Value)
+                    });
+                }
+
+                else
+                {
+                    callback?.Invoke(new AsyncResult
+                    {
+                        IsCompleted = true,
+                        AsyncState = (false, (string)null)
+                    });
+                }
+            }, token);
+        }
+
+        public virtual async Task<IStatusResponse> GetStatusAsync(IRConConnection connection, CancellationToken token = default)
+        {
+            var response = await connection.SendQueryAsync(StaticHelpers.QueryType.COMMAND_STATUS, "status", token);
+            
+            _logger.LogDebug("Status Response {Response}", string.Join(Environment.NewLine, response));
+            
             return new StatusResponse
             {
                 Clients = ClientsFromStatus(response).ToArray(),
@@ -183,13 +213,38 @@ namespace IW4MAdmin.Application.RConParsers
             return (T)Convert.ChangeType(value, typeof(T));
         }
 
-        public async Task<bool> SetDvarAsync(IRConConnection connection, string dvarName, object dvarValue)
+        public async Task<bool> SetDvarAsync(IRConConnection connection, string dvarName, object dvarValue, CancellationToken token = default)
         {
-            string dvarString = (dvarValue is string str)
+            var dvarString = (dvarValue is string str)
                 ? $"{dvarName} \"{str}\""
                 : $"{dvarName} {dvarValue}";
 
-            return (await connection.SendQueryAsync(StaticHelpers.QueryType.SET_DVAR, dvarString)).Length > 0;
+            return (await connection.SendQueryAsync(StaticHelpers.QueryType.SET_DVAR, dvarString, token)).Length > 0;
+        }
+
+        public void BeginSetDvar(IRConConnection connection, string dvarName, object dvarValue, AsyncCallback callback,
+            CancellationToken token = default)
+        {
+            SetDvarAsync(connection, dvarName, dvarValue, token).ContinueWith(action =>
+            {
+                if (action.Exception is null)
+                {
+                    callback?.Invoke(new AsyncResult
+                    {
+                        IsCompleted = true,
+                        AsyncState = true
+                    });
+                }
+
+                else
+                {
+                    callback?.Invoke(new AsyncResult
+                    {
+                        IsCompleted = true,
+                        AsyncState = false
+                    });
+                }
+            }, token);
         }
 
         private List<EFClient> ClientsFromStatus(string[] Status)
@@ -236,8 +291,15 @@ namespace IW4MAdmin.Application.RConParsers
                     long networkId;
                     var name = match.Values[Configuration.Status.GroupMapping[ParserRegex.GroupType.RConName]].TrimNewLine();
                     string networkIdString;
+                    
                     var ip = match.Values[Configuration.Status.GroupMapping[ParserRegex.GroupType.RConIpAddress]].Split(':')[0].ConvertToIP();
 
+                    if (match.Values[Configuration.Status.GroupMapping[ParserRegex.GroupType.RConIpAddress]]
+                        .Contains(_botIpIndicator))
+                    {
+                        ip = System.Net.IPAddress.Broadcast.ToString().ConvertToIP();
+                    }
+
                     try
                     {
                         networkIdString = match.Values[Configuration.Status.GroupMapping[ParserRegex.GroupType.RConNetworkId]];
@@ -252,9 +314,9 @@ namespace IW4MAdmin.Application.RConParsers
                         continue;
                     }
 
-                    var client = new EFClient()
+                    var client = new EFClient
                     {
-                        CurrentAlias = new EFAlias()
+                        CurrentAlias = new EFAlias
                         {
                             Name = name,
                             IPAddress = ip

Application/RConParsers/DynamicRConParserConfiguration.cs

@@ -46,7 +46,7 @@ namespace IW4MAdmin.Application.RConParsers
             {ColorCodes.White.ToString(), "^7"},
             {ColorCodes.Map.ToString(), "^8"},
             {ColorCodes.Grey.ToString(), "^9"},
-            {ColorCodes.Wildcard.ToString(), ":^"},
+            {ColorCodes.Wildcard.ToString(), "^:"}
         };
 
         public DynamicRConParserConfiguration(IParserRegexFactory parserRegexFactory)

Data/Abstractions/IDataValueCache.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
@@ -9,6 +10,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,
+            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);
     }
-}
+}

Data/Context/DatabaseContext.cs

@@ -85,7 +85,15 @@ namespace Data.Context
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
             // make network id unique
-            modelBuilder.Entity<EFClient>(entity => { entity.HasIndex(e => e.NetworkId).IsUnique(); });
+            modelBuilder.Entity<EFClient>(entity =>
+            {
+                entity.HasIndex(e => e.NetworkId);
+                entity.HasAlternateKey(client => new
+                {
+                    client.NetworkId,
+                    client.GameName
+                });
+            });
 
             modelBuilder.Entity<EFPenalty>(entity =>
             {
@@ -120,6 +128,9 @@ namespace Data.Context
                 ent.Property(_alias => _alias.SearchableName).HasMaxLength(24);
                 ent.HasIndex(_alias => _alias.SearchableName);
                 ent.HasIndex(_alias => new {_alias.Name, _alias.IPAddress});
+                ent.Property(alias => alias.SearchableIPAddress)
+                    .HasComputedColumnSql(@"((IPAddress & 255) || '.' || ((IPAddress >> 8) & 255)) || '.' || ((IPAddress >> 16) & 255) || '.' || ((IPAddress >> 24) & 255)", stored: true);
+                ent.HasIndex(alias => alias.SearchableIPAddress);
             });
 
             modelBuilder.Entity<EFMeta>(ent =>

Data/Helpers/DataValueCache.cs

@@ -1,5 +1,7 @@
 using System;
 using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Data.Abstractions;
@@ -15,8 +17,8 @@ namespace Data.Helpers
         private readonly ILogger _logger;
         private readonly IDatabaseContextFactory _contextFactory;
 
-        private readonly ConcurrentDictionary<string, CacheState<TReturnType>> _cacheStates =
-            new ConcurrentDictionary<string, CacheState<TReturnType>>();
+        private readonly ConcurrentDictionary<string, Dictionary<object, CacheState<TReturnType>>> _cacheStates = new();
+        private readonly object _defaultKey = new();
 
         private bool _autoRefresh;
         private const int DefaultExpireMinutes = 15;
@@ -51,41 +53,61 @@ namespace Data.Helpers
         public void SetCacheItem(Func<DbSet<TEntityType>, CancellationToken, Task<TReturnType>> getter, string key,
             TimeSpan? expirationTime = null, bool autoRefresh = false)
         {
-            if (_cacheStates.ContainsKey(key))
-            {
-                _logger.LogDebug("Cache key {Key} is already added", key);
-                return;
-            }
-
-            var state = new CacheState<TReturnType>
-            {
-                Key = key,
-                Getter = getter,
-                ExpirationTime = expirationTime ?? TimeSpan.FromMinutes(DefaultExpireMinutes)
-            };
-
-            _autoRefresh = autoRefresh;
-
-            _cacheStates.TryAdd(key, state);
-
-            if (!_autoRefresh || expirationTime == TimeSpan.MaxValue)
-            {
-                return;
-            }
-
-            _timer = new Timer(state.ExpirationTime.TotalMilliseconds);
-            _timer.Elapsed += async (sender, args) => await RunCacheUpdate(state, CancellationToken.None);
-            _timer.Start();
+            SetCacheItem(getter, key, null, expirationTime, autoRefresh);
         }
 
-        public async Task<TReturnType> GetCacheItem(string keyName, CancellationToken cancellationToken = default)
+        public void SetCacheItem(Func<DbSet<TEntityType>, 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)
+            {
+                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)
+                {
+                    return;
+                }
+                
+                _timer = new Timer(state.ExpirationTime.TotalMilliseconds);
+                _timer.Elapsed += async (sender, args) => await RunCacheUpdate(state, CancellationToken.None);
+                _timer.Start();
+            }
+        }
+
+        public async Task<TReturnType> GetCacheItem(string keyName, CancellationToken cancellationToken = default) =>
+            await GetCacheItem(keyName, null, cancellationToken);
+
+        public async Task<TReturnType> GetCacheItem(string keyName, object id = null,
+            CancellationToken cancellationToken = default)
         {
             if (!_cacheStates.ContainsKey(keyName))
             {
                 throw new ArgumentException("No cache found for key {key}", keyName);
             }
 
-            var state = _cacheStates[keyName];
+            var state = id is null ? _cacheStates[keyName].Values.First() : _cacheStates[keyName][id];
 
             // 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
@@ -115,4 +137,4 @@ namespace Data.Helpers
             }
         }
     }
-}
+}

Data/Migrations/MySql/20220329213440_AddConnectionInterruptedToEFServerSnapshot.cs

@@ -0,0 +1,25 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Data.Migrations.MySql
+{
+    public partial class AddConnectionInterruptedToEFServerSnapshot : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<bool>(
+                name: "ConnectionInterrupted",
+                table: "EFServerSnapshot",
+                type: "tinyint(1)",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "ConnectionInterrupted",
+                table: "EFServerSnapshot");
+        }
+    }
+}

Data/Migrations/MySql/20220404151444_AddSearchableIPToEFAlias.cs

@@ -0,0 +1,28 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Data.Migrations.MySql
+{
+    public partial class AddSearchableIPToEFAlias : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "SearchableIPAddress",
+                table: "EFAlias",
+                type: "longtext",
+                nullable: true,
+                computedColumnSql: "CONCAT((IPAddress & 255), \".\", ((IPAddress >> 8) & 255), \".\", ((IPAddress >> 16) & 255), \".\", ((IPAddress >> 24) & 255))",
+                stored: true)
+                .Annotation("MySql:CharSet", "utf8mb4");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "SearchableIPAddress",
+                table: "EFAlias");
+        }
+    }
+}

Data/Migrations/MySql/20220404192417_AddIndexToSearchableIPToEFAlias.cs

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

Data/Migrations/MySql/20220422202702_AddGameToEFClient.cs

@@ -0,0 +1,25 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Data.Migrations.MySql
+{
+    public partial class AddGameToEFClient : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "GameName",
+                table: "EFClients",
+                type: "int",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "GameName",
+                table: "EFClients");
+        }
+    }
+}

Data/Migrations/MySql/20220609135128_AddIndexToEFRankingHistoryCreatedDatetime.cs

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

Data/Migrations/MySql/20220613192602_AddAlternateKeyToEFClients.cs

@@ -0,0 +1,63 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Data.Migrations.MySql
+{
+    public partial class AddAlternateKeyToEFClients : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropIndex(
+                name: "IX_EFClients_NetworkId",
+                table: "EFClients");
+            
+            migrationBuilder.Sql("UPDATE `EFClients` set `GameName` = 0 WHERE `GameName` IS NULL");
+
+            migrationBuilder.AlterColumn<int>(
+                name: "GameName",
+                table: "EFClients",
+                type: "int",
+                nullable: false,
+                defaultValue: 0,
+                oldClrType: typeof(int),
+                oldType: "int",
+                oldNullable: true);
+
+            migrationBuilder.AddUniqueConstraint(
+                name: "AK_EFClients_NetworkId_GameName",
+                table: "EFClients",
+                columns: new[] { "NetworkId", "GameName" });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_EFClients_NetworkId",
+                table: "EFClients",
+                column: "NetworkId");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropUniqueConstraint(
+                name: "AK_EFClients_NetworkId_GameName",
+                table: "EFClients");
+
+            migrationBuilder.DropIndex(
+                name: "IX_EFClients_NetworkId",
+                table: "EFClients");
+
+            migrationBuilder.AlterColumn<int>(
+                name: "GameName",
+                table: "EFClients",
+                type: "int",
+                nullable: true,
+                oldClrType: typeof(int),
+                oldType: "int");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_EFClients_NetworkId",
+                table: "EFClients",
+                column: "NetworkId",
+                unique: true);
+        }
+    }
+}

Data/Migrations/MySql/MySqlDatabaseContextModelSnapshot.cs

@@ -64,6 +64,9 @@ namespace Data.Migrations.MySql
                     b.Property<DateTime>("FirstConnection")
                         .HasColumnType("datetime(6)");
 
+                    b.Property<int>("GameName")
+                        .HasColumnType("int");
+
                     b.Property<DateTime>("LastConnection")
                         .HasColumnType("datetime(6)");
 
@@ -87,12 +90,13 @@ namespace Data.Migrations.MySql
 
                     b.HasKey("ClientId");
 
+                    b.HasAlternateKey("NetworkId", "GameName");
+
                     b.HasIndex("AliasLinkId");
 
                     b.HasIndex("CurrentAliasId");
 
-                    b.HasIndex("NetworkId")
-                        .IsUnique();
+                    b.HasIndex("NetworkId");
 
                     b.ToTable("EFClients", (string)null);
                 });
@@ -453,6 +457,8 @@ namespace Data.Migrations.MySql
 
                     b.HasIndex("ClientId");
 
+                    b.HasIndex("CreatedDateTime");
+
                     b.HasIndex("Ranking");
 
                     b.HasIndex("ServerId");
@@ -804,6 +810,11 @@ namespace Data.Migrations.MySql
                         .HasMaxLength(24)
                         .HasColumnType("varchar(24)");
 
+                    b.Property<string>("SearchableIPAddress")
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("varchar(255)")
+                        .HasComputedColumnSql("((IPAddress & 255) || '.' || ((IPAddress >> 8) & 255)) || '.' || ((IPAddress >> 16) & 255) || '.' || ((IPAddress >> 24) & 255)", true);
+
                     b.Property<string>("SearchableName")
                         .HasMaxLength(24)
                         .HasColumnType("varchar(24)");
@@ -816,6 +827,8 @@ namespace Data.Migrations.MySql
 
                     b.HasIndex("Name");
 
+                    b.HasIndex("SearchableIPAddress");
+
                     b.HasIndex("SearchableName");
 
                     b.HasIndex("Name", "IPAddress");
@@ -1081,6 +1094,9 @@ namespace Data.Migrations.MySql
                     b.Property<int>("ClientCount")
                         .HasColumnType("int");
 
+                    b.Property<bool?>("ConnectionInterrupted")
+                        .HasColumnType("tinyint(1)");
+
                     b.Property<int>("MapId")
                         .HasColumnType("int");
 

Data/Migrations/Postgresql/20220329213521_AddConnectionInterruptedToEFServerSnapshot.cs

@@ -0,0 +1,25 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Data.Migrations.Postgresql
+{
+    public partial class AddConnectionInterruptedToEFServerSnapshot : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<bool>(
+                name: "ConnectionInterrupted",
+                table: "EFServerSnapshot",
+                type: "boolean",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "ConnectionInterrupted",
+                table: "EFServerSnapshot");
+        }
+    }
+}

Data/Migrations/Postgresql/20220404185627_AddSearchableIPToEFAlias.cs

@@ -0,0 +1,27 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Data.Migrations.Postgresql
+{
+    public partial class AddSearchableIPToEFAlias : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "SearchableIPAddress",
+                table: "EFAlias",
+                type: "text",
+                nullable: true,
+                computedColumnSql: "CASE WHEN \"IPAddress\" IS NULL THEN 'NULL'::text ELSE (\"IPAddress\" & 255)::text || '.'::text || ((\"IPAddress\" >> 8) & 255)::text || '.'::text || ((\"IPAddress\" >> 16) & 255)::text || '.'::text || ((\"IPAddress\" >> 24) & 255)::text END",
+                stored: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "SearchableIPAddress",
+                table: "EFAlias");
+        }
+    }
+}

Data/Migrations/Postgresql/20220404192553_AddIndexToSearchableIPToEFAlias.cs

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

Data/Migrations/Postgresql/20220422203121_AddGameToEFClient.cs

@@ -0,0 +1,25 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Data.Migrations.Postgresql
+{
+    public partial class AddGameToEFClient : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "GameName",
+                table: "EFClients",
+                type: "integer",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "GameName",
+                table: "EFClients");
+        }
+    }
+}

Data/Migrations/Postgresql/20220609135210_AddIndexToEFRankingHistoryCreatedDatetime.cs

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

Data/Migrations/Postgresql/20220613181913_AddAlternateKeyToEFClients.cs

@@ -0,0 +1,63 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Data.Migrations.Postgresql
+{
+    public partial class AddAlternateKeyToEFClients : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropIndex(
+                name: "IX_EFClients_NetworkId",
+                table: "EFClients");
+
+            migrationBuilder.Sql("UPDATE \"EFClients\" SET \"GameName\" = 0 WHERE \"GameName\" IS NULL");
+
+            migrationBuilder.AlterColumn<int>(
+                name: "GameName",
+                table: "EFClients",
+                type: "integer",
+                nullable: false,
+                defaultValue: 0,
+                oldClrType: typeof(int),
+                oldType: "integer",
+                oldNullable: true);
+
+            migrationBuilder.AddUniqueConstraint(
+                name: "AK_EFClients_NetworkId_GameName",
+                table: "EFClients",
+                columns: new[] { "NetworkId", "GameName" });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_EFClients_NetworkId",
+                table: "EFClients",
+                column: "NetworkId");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropUniqueConstraint(
+                name: "AK_EFClients_NetworkId_GameName",
+                table: "EFClients");
+
+            migrationBuilder.DropIndex(
+                name: "IX_EFClients_NetworkId",
+                table: "EFClients");
+
+            migrationBuilder.AlterColumn<int>(
+                name: "GameName",
+                table: "EFClients",
+                type: "integer",
+                nullable: true,
+                oldClrType: typeof(int),
+                oldType: "integer");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_EFClients_NetworkId",
+                table: "EFClients",
+                column: "NetworkId",
+                unique: true);
+        }
+    }
+}

Data/Migrations/Postgresql/PostgresqlDatabaseContextModelSnapshot.cs

@@ -71,6 +71,9 @@ namespace Data.Migrations.Postgresql
                     b.Property<DateTime>("FirstConnection")
                         .HasColumnType("timestamp without time zone");
 
+                    b.Property<int>("GameName")
+                        .HasColumnType("integer");
+
                     b.Property<DateTime>("LastConnection")
                         .HasColumnType("timestamp without time zone");
 
@@ -94,12 +97,13 @@ namespace Data.Migrations.Postgresql
 
                     b.HasKey("ClientId");
 
+                    b.HasAlternateKey("NetworkId", "GameName");
+
                     b.HasIndex("AliasLinkId");
 
                     b.HasIndex("CurrentAliasId");
 
-                    b.HasIndex("NetworkId")
-                        .IsUnique();
+                    b.HasIndex("NetworkId");
 
                     b.ToTable("EFClients", (string)null);
                 });
@@ -472,6 +476,8 @@ namespace Data.Migrations.Postgresql
 
                     b.HasIndex("ClientId");
 
+                    b.HasIndex("CreatedDateTime");
+
                     b.HasIndex("Ranking");
 
                     b.HasIndex("ServerId");
@@ -843,6 +849,11 @@ namespace Data.Migrations.Postgresql
                         .HasMaxLength(24)
                         .HasColumnType("character varying(24)");
 
+                    b.Property<string>("SearchableIPAddress")
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("text")
+                        .HasComputedColumnSql("((IPAddress & 255) || '.' || ((IPAddress >> 8) & 255)) || '.' || ((IPAddress >> 16) & 255) || '.' || ((IPAddress >> 24) & 255)", true);
+
                     b.Property<string>("SearchableName")
                         .HasMaxLength(24)
                         .HasColumnType("character varying(24)");
@@ -855,6 +866,8 @@ namespace Data.Migrations.Postgresql
 
                     b.HasIndex("Name");
 
+                    b.HasIndex("SearchableIPAddress");
+
                     b.HasIndex("SearchableName");
 
                     b.HasIndex("Name", "IPAddress");
@@ -1134,6 +1147,9 @@ namespace Data.Migrations.Postgresql
                     b.Property<int>("ClientCount")
                         .HasColumnType("integer");
 
+                    b.Property<bool?>("ConnectionInterrupted")
+                        .HasColumnType("boolean");
+
                     b.Property<int>("MapId")
                         .HasColumnType("integer");
 

Data/Migrations/Sqlite/20220329163928_AddConnectionInterruptedToEFServerSnapshot.cs

@@ -0,0 +1,25 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Data.Migrations.Sqlite
+{
+    public partial class AddConnectionInterruptedToEFServerSnapshot : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<bool>(
+                name: "ConnectionInterrupted",
+                table: "EFServerSnapshot",
+                type: "INTEGER",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "ConnectionInterrupted",
+                table: "EFServerSnapshot");
+        }
+    }
+}

Data/Migrations/Sqlite/20220402211115_AddSearchableIPToEFAlias.cs

@@ -0,0 +1,26 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Data.Migrations.Sqlite
+{
+    public partial class AddSearchableIPToEFAlias : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "SearchableIPAddress",
+                table: "EFAlias",
+                type: "TEXT",
+                nullable: true,
+                computedColumnSql: "((IPAddress & 255) || '.' || ((IPAddress >> 8) & 255)) || '.' || ((IPAddress >> 16) & 255) || '.' || ((IPAddress >> 24) & 255)");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "SearchableIPAddress",
+                table: "EFAlias");
+        }
+    }
+}

Data/Migrations/Sqlite/20220404192319_AddIndexToSearchableIPToEFAlias.cs

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

Data/Migrations/Sqlite/20220422202315_AddGameToEFClient.cs

@@ -0,0 +1,25 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Data.Migrations.Sqlite
+{
+    public partial class AddGameToEFClient : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "GameName",
+                table: "EFClients",
+                type: "INTEGER",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "GameName",
+                table: "EFClients");
+        }
+    }
+}

Data/Migrations/Sqlite/20220609022511_AddIndexToEFRankingHistoryCreatedDatetime.cs

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

Data/Migrations/Sqlite/20220613160952_AddAlternateKeyToEFClients.cs

@@ -0,0 +1,61 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Data.Migrations.Sqlite
+{
+    public partial class AddAlternateKeyToEFClients : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropIndex(
+                name: "IX_EFClients_NetworkId",
+                table: "EFClients");
+
+            migrationBuilder.AlterColumn<int>(
+                name: "GameName",
+                table: "EFClients",
+                type: "INTEGER",
+                nullable: false,
+                defaultValue: 0,
+                oldClrType: typeof(int),
+                oldType: "INTEGER",
+                oldNullable: true);
+
+            migrationBuilder.AddUniqueConstraint(
+                name: "AK_EFClients_NetworkId_GameName",
+                table: "EFClients",
+                columns: new[] { "NetworkId", "GameName" });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_EFClients_NetworkId",
+                table: "EFClients",
+                column: "NetworkId");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropUniqueConstraint(
+                name: "AK_EFClients_NetworkId_GameName",
+                table: "EFClients");
+
+            migrationBuilder.DropIndex(
+                name: "IX_EFClients_NetworkId",
+                table: "EFClients");
+
+            migrationBuilder.AlterColumn<int>(
+                name: "GameName",
+                table: "EFClients",
+                type: "INTEGER",
+                nullable: true,
+                oldClrType: typeof(int),
+                oldType: "INTEGER");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_EFClients_NetworkId",
+                table: "EFClients",
+                column: "NetworkId",
+                unique: true);
+        }
+    }
+}

Data/Migrations/Sqlite/SqliteDatabaseContextModelSnapshot.cs

@@ -62,6 +62,9 @@ namespace Data.Migrations.Sqlite
                     b.Property<DateTime>("FirstConnection")
                         .HasColumnType("TEXT");
 
+                    b.Property<int>("GameName")
+                        .HasColumnType("INTEGER");
+
                     b.Property<DateTime>("LastConnection")
                         .HasColumnType("TEXT");
 
@@ -85,12 +88,13 @@ namespace Data.Migrations.Sqlite
 
                     b.HasKey("ClientId");
 
+                    b.HasAlternateKey("NetworkId", "GameName");
+
                     b.HasIndex("AliasLinkId");
 
                     b.HasIndex("CurrentAliasId");
 
-                    b.HasIndex("NetworkId")
-                        .IsUnique();
+                    b.HasIndex("NetworkId");
 
                     b.ToTable("EFClients", (string)null);
                 });
@@ -451,6 +455,8 @@ namespace Data.Migrations.Sqlite
 
                     b.HasIndex("ClientId");
 
+                    b.HasIndex("CreatedDateTime");
+
                     b.HasIndex("Ranking");
 
                     b.HasIndex("ServerId");
@@ -802,6 +808,11 @@ namespace Data.Migrations.Sqlite
                         .HasMaxLength(24)
                         .HasColumnType("TEXT");
 
+                    b.Property<string>("SearchableIPAddress")
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("TEXT")
+                        .HasComputedColumnSql("((IPAddress & 255) || '.' || ((IPAddress >> 8) & 255)) || '.' || ((IPAddress >> 16) & 255) || '.' || ((IPAddress >> 24) & 255)", true);
+
                     b.Property<string>("SearchableName")
                         .HasMaxLength(24)
                         .HasColumnType("TEXT");
@@ -814,6 +825,8 @@ namespace Data.Migrations.Sqlite
 
                     b.HasIndex("Name");
 
+                    b.HasIndex("SearchableIPAddress");
+
                     b.HasIndex("SearchableName");
 
                     b.HasIndex("Name", "IPAddress");
@@ -1079,6 +1092,9 @@ namespace Data.Migrations.Sqlite
                     b.Property<int>("ClientCount")
                         .HasColumnType("INTEGER");
 
+                    b.Property<bool?>("ConnectionInterrupted")
+                        .HasColumnType("INTEGER");
+
                     b.Property<int>("MapId")
                         .HasColumnType("INTEGER");
 

Data/Models/Client/EFClient.cs

@@ -63,6 +63,7 @@ namespace Data.Models.Client
         public DateTime FirstConnection { get; set; }
         [Required]
         public DateTime LastConnection { get; set; }
+        public Reference.Game GameName { get; set; } = Reference.Game.UKN;
         public bool Masked { get; set; }
         [Required]
         public int AliasLinkId { get; set; }

Data/Models/Configuration/StatsModelConfiguration.cs

@@ -86,7 +86,8 @@ namespace Data.Models.Configuration
                 entity.HasIndex(ranking => ranking.Ranking);
                 entity.HasIndex(ranking => ranking.ZScore);
                 entity.HasIndex(ranking => ranking.UpdatedDateTime);
+                entity.HasIndex(ranking => ranking.CreatedDateTime);
             });
         }
     }
-}
+}

Data/Models/EFAlias.cs

@@ -19,6 +19,7 @@ namespace Data.Models
         public string SearchableName { get; set; }
         [Required]
         public int? IPAddress { get; set; }
+        public string SearchableIPAddress { get; set; }
         [Required]
         public DateTime DateAdded { get; set; }
 

Data/Models/EFMeta.cs

@@ -10,8 +10,8 @@ namespace Data.Models
     /// </summary>
     public class EFMeta : SharedEntity
     {
-        public const string ClientTagName = nameof(ClientTagName);
-        public const string ClientTag = nameof(ClientTag);
+        public const string ClientTagNameV2 = nameof(ClientTagNameV2);
+        public const string ClientTagV2 = nameof(ClientTagV2);
 
         [Key]
         public int MetaId { get; set; }

Data/Models/Reference.cs

@@ -15,7 +15,8 @@
             T6 = 7,
             T7 = 8,
             SHG1 = 9,
-            CSGO = 10
+            CSGO = 10,
+            H1 = 11
         }
         
         public enum ConnectionType
@@ -24,4 +25,4 @@
             Disconnect
         }
     }
-}
+}

Data/Models/Server/EFServerSnapshot.cs

@@ -32,5 +32,7 @@ namespace Data.Models.Server
         public EFMap Map { get; set; }
         
         public int ClientCount { get; set; }
+        
+        public bool? ConnectionInterrupted {get;set;}
     }
-}
+}

DeploymentFiles/deployment-pipeline.yml

@@ -53,7 +53,9 @@ steps:
     script: |
             Write-Host 'Build Configuration is $(buildConfiguration), Release Type is $(releaseType)'
             md -Force lib\open-iconic\font\css
-            wget https://raw.githubusercontent.com/iconic/open-iconic/master/font/css/open-iconic-bootstrap.scss -o lib\open-iconic\font\css\open-iconic-bootstrap.scss
+            wget https://raw.githubusercontent.com/iconic/open-iconic/master/font/css/open-iconic-bootstrap.scss -o lib\open-iconic\font\css\open-iconic-bootstrap-override.scss
+            cd lib\open-iconic\font\css
+            (Get-Content open-iconic-bootstrap-override.scss).replace('../fonts/', '/font/') | Set-Content open-iconic-bootstrap-override.scss
     failOnStderr: true
     workingDirectory: '$(Build.Repository.LocalPath)\WebfrontCore\wwwroot'
 
@@ -75,6 +77,7 @@ steps:
       Write-Host 'Unzipping download'
       Expand-Archive -LiteralPath $(Build.Repository.LocalPath)\dotnet-bundle.zip -DestinationPath $(Build.Repository.LocalPath)
       Write-Host 'Executing dotnet-bundle'
+      $(Build.Repository.LocalPath)\dotnet-bundle.exe clean $(Build.Repository.LocalPath)\WebfrontCore\bundleconfig.json
       $(Build.Repository.LocalPath)\dotnet-bundle.exe $(Build.Repository.LocalPath)\WebfrontCore\bundleconfig.json
     failOnStderr: true
     workingDirectory: '$(Build.Repository.LocalPath)\WebfrontCore'

GameFiles/README.MD

@@ -0,0 +1,16 @@
+# Game Interface
+
+Allows integration of IW4M-Admin to GSC, mainly used for special commands that need to use GSC in order to work.
+But can also be used to read / write metadata from / to a profile and to get the player permission level.
+
+
+## Installation Plutonium IW5
+
+
+Move `_integration.gsc` to `%localappdata%\Plutonium\storage\iw5\scripts\`
+
+
+## Installation IW4x
+
+
+Move `_integration.gsc` to `IW4x/userraw/scripts`, `IW4x` being the root folder of your game server.

GameFiles/_integration.gsc

@@ -1,7 +1,6 @@
 #include common_scripts\utility;
 #include maps\mp\_utility;
 #include maps\mp\gametypes\_hud_util;
-#include maps\mp\gametypes\_playerlogic;
 
 init()
 {
@@ -12,6 +11,7 @@ init()
     level.eventBus.failKey      = "fail";
     level.eventBus.timeoutKey   = "timeout";
     level.eventBus.timeout      = 30;
+    level.eventBus.gamename     = getDvar( "gamename" ); // We want to do a few small detail different on IW5 compared to IW4, nothing where 2 files would make sense.
     
     level.clientDataKey = "clientData";
 
@@ -22,6 +22,8 @@ init()
     level.eventTypes.setClientDataRequested     = "SetClientDataRequested";
     level.eventTypes.setClientDataCompleted     = "SetClientDataCompleted";
     level.eventTypes.executeCommandRequested    = "ExecuteCommandRequested";
+    
+    level.iw4adminIntegrationDebug = false;
                                                                              
     SetDvarIfUninitialized( level.eventBus.inVar, "" );
     SetDvarIfUninitialized( level.eventBus.outVar, "" );
@@ -33,18 +35,26 @@ init()
     level.eventCallbacks[level.eventTypes.clientDataReceived]       = ::OnClientDataReceived;
     level.eventCallbacks[level.eventTypes.executeCommandRequested]  = ::OnExecuteCommand; 
     level.eventCallbacks[level.eventTypes.setClientDataCompleted]   = ::OnSetClientDataCompleted;
+
+    level.clientCommandCallbacks = [];
+    level.clientCommandRusAsTarget = [];
     
     if ( GetDvarInt( "sv_iw4madmin_integration_enabled" ) != 1 )
     {
         return;
     }
     
+    InitializeGameMethods();
+    RegisterClientCommands();
+    
     // start long running tasks
     level thread MonitorClientEvents();
     level thread MonitorBus();
     level thread OnPlayerConnect();
 }
 
+
+
 //////////////////////////////////
 // Client Methods
 //////////////////////////////////
@@ -59,14 +69,27 @@ OnPlayerConnect()
         
         level.iw4adminIntegrationDebug = GetDvarInt( "sv_iw4madmin_integration_debug" );
         
+        if ( isDefined(player.pers["isBot"]) && player.pers["isBot"] ) 
+        {
+            // we don't want to track bots
+            continue;    
+        }
+        
         if ( !isDefined( player.pers[level.clientDataKey] ) )
         {
             player.pers[level.clientDataKey] = spawnstruct();
         }
         
         player thread OnPlayerSpawned();
+        player thread OnPlayerJoinedTeam();
+        player thread OnPlayerJoinedSpectators();
         player thread PlayerTrackingOnInterval();
-        player ToggleNightMode();
+        
+        // only toggle if it's enabled
+        if ( IsDefined( level.nightModeEnabled ) && level.nightModeEnabled )
+        {
+            player ToggleNightMode();
+        }
     }
 }
 
@@ -92,6 +115,30 @@ OnPlayerDisconnect()
     }
 }
 
+OnPlayerJoinedTeam()
+{
+    self endon( "disconnect" );
+
+    for( ;; )
+    {
+        self waittill( "joined_team" );
+        // join spec and join team occur at the same moment - out of order logging would be problematic
+        wait( 0.25 ); 
+        LogPrint( GenerateJoinTeamString( false ) );
+    }
+}
+
+OnPlayerJoinedSpectators()
+{
+    self endon( "disconnect" );
+
+    for( ;; )
+    {
+        self waittill( "joined_spectators" );
+        LogPrint( GenerateJoinTeamString( true ) );
+    }
+}
+
 OnGameEnded() 
 {
     level endon ( "disconnect" );
@@ -123,6 +170,11 @@ DisplayWelcomeData()
 PlayerConnectEvents() 
 {
     self endon( "disconnect" );
+
+    if ( IsDefined( self.isHidden ) && self.isHidden )
+    {
+        self HideImpl();
+    }
     
     clientData = self.pers[level.clientDataKey];
     
@@ -165,7 +217,7 @@ MonitorClientEvents()
  
         if ( level.iw4adminIntegrationDebug == 1 )
         {
-            self IPrintLn( "Processing Event " + client.event.type + "-" + client.event.subtype );
+            IPrintLn( "Processing Event " + client.event.type + "-" + client.event.subtype );
         }
         
         eventHandler = level.eventCallbacks[client.event.type];
@@ -183,6 +235,53 @@ MonitorClientEvents()
 // Helper Methods
 //////////////////////////////////
 
+RegisterClientCommands() 
+{
+    AddClientCommand( "GiveWeapon",     true,  ::GiveWeaponImpl );
+    AddClientCommand( "TakeWeapons",    true,  ::TakeWeaponsImpl );
+    AddClientCommand( "SwitchTeams",    true,  ::TeamSwitchImpl );
+    AddClientCommand( "Hide",           false, ::HideImpl );
+    AddClientCommand( "Unhide",         false, ::UnhideImpl );
+    AddClientCommand( "Alert",          true,  ::AlertImpl );
+    AddClientCommand( "Goto",           false, ::GotoImpl );
+    AddClientCommand( "Kill",           true,  ::KillImpl );
+    AddClientCommand( "SetSpectator",   true,  ::SetSpectatorImpl );
+    AddClientCommand( "NightMode",      false, ::NightModeImpl ); //This really should be a level command
+    AddClientCommand( "LockControls",   true,  ::LockControlsImpl ); 
+    AddClientCommand( "UnlockControls", true,  ::UnlockControlsImpl );
+    AddClientCommand( "PlayerToMe",     true,  ::PlayerToMeImpl );
+    AddClientCommand( "NoClip",         false, ::NoClipImpl );
+    AddClientCommand( "NoClipOff",      false, ::NoClipOffImpl );
+}
+
+InitializeGameMethods() 
+{
+    level.overrideMethods = [];
+    level.overrideMethods["god"] = ::_god;
+    level.overrideMethods["noclip"] = ::UnsupportedFunc;
+    
+    if ( isDefined( ::God ) )
+    {
+        level.overrideMethods["god"] = ::God;
+    }
+    
+    if ( isDefined( ::NoClip ) )
+    {
+        level.overrideMethods["noclip"] = ::NoClip;
+    }
+
+    if ( level.eventBus.gamename == "IW5" ) 
+    { //PlutoIW5 only allows Godmode and NoClip if cheats are on..
+        level.overrideMethods["god"] = ::IW5_God;
+        level.overrideMethods["noclip"] = ::IW5_NoClip;
+    }
+}
+
+UnsupportedFunc()
+{ 
+    self IPrintLnBold( "Function is not supported!" );
+}
+
 RequestClientMeta( metaKey )
 {
     getClientMetaEvent = BuildEventRequest( true, level.eventTypes.clientDataRequested, "Meta", self, metaKey );
@@ -205,6 +304,37 @@ DecrementClientMeta( metaKey, decrementValue, clientId )
     SetClientMeta( metaKey, decrementValue, clientId, "decrement" );
 }
 
+GenerateJoinTeamString( isSpectator ) 
+{
+    team = self.team;
+
+    if ( IsDefined( self.joining_team ) )
+    {
+        team = self.joining_team;
+    }
+    else
+    {
+        if ( isSpectator || !IsDefined( team ) ) 
+        {
+            team = "spectator";
+        }
+    }
+
+    guid = self GetXuid();
+
+    if ( guid == "0" )
+    {
+        guid = self.guid;
+    }
+
+    if ( !IsDefined( guid ) || guid == "0" )
+    {
+        guid = "undefined";
+    }
+
+    return "JT;" + guid + ";" + self getEntityNumber() + ";" + team + ";" + self.name + "\n";
+}
+
 SetClientMeta( metaKey, metaValue, clientId, direction )
 {
     data = "key=" + metaKey + "|value=" + metaValue;
@@ -415,14 +545,65 @@ NotifyClientEvent( eventInfo )
     if ( level.iw4adminIntegrationDebug == 1 )
     {
         IPrintLn( "NotifyClientEvent->" + event.data );
+        if( int( eventInfo[3] ) != -1 && !isDefined( origin ) )
+        {
+            IPrintLn( "origin is null but the slot id is " + int( eventInfo[3] ) );
+        }
+        if( int( eventInfo[4] ) != -1 && !isDefined( target ) )
+        {
+            IPrintLn( "target is null but the slot id is " + int( eventInfo[4] ) );
+        }
     }
 
-    client = event.origin;
+    if( isDefined( target ) )
+    {
+        client = event.target;
+    }
+    else if( isDefined( origin ) )
+    {
+        client = event.origin;
+    }
+    else
+    {
+        if ( level.iw4adminIntegrationDebug == 1 )
+        {
+            IPrintLn( "Neither origin or target are set but we are a Client Event, aborting" );
+        }
+        
+        return;
+    }
     client.event = event;
 
     level notify( level.eventTypes.localClientEvent, client );
 }
 
+GetPlayerFromClientNum( clientNum )
+{
+    if ( clientNum < 0 )
+        return undefined;
+    
+    for ( i = 0; i < level.players.size; i++ )
+    {
+        if ( level.players[i] getEntityNumber() == clientNum )
+        {
+            return level.players[i];
+        }
+    }
+    return undefined;
+}
+
+AddClientCommand( commandName, shouldRunAsTarget, callback, shouldOverwrite )
+{
+    if ( isDefined( level.clientCommandCallbacks[commandName] ) && isDefined( shouldOverwrite ) && !shouldOverwrite ) {
+
+        return;
+    }
+    level.clientCommandCallbacks[commandName] = callback;
+    level.clientCommandRusAsTarget[commandName] = shouldRunAsTarget == true; //might speed up things later in case someone gives us a string or number instead of a boolean
+}
+
+
+
 //////////////////////////////////
 // Event Handlers
 /////////////////////////////////
@@ -469,42 +650,18 @@ OnExecuteCommand( event )
     data = ParseDataString( event.data );
     response = "";
 
-    switch ( event.subtype ) 
+    command = level.clientCommandCallbacks[event.subtype];
+    runAsTarget = level.clientCommandRusAsTarget[event.subtype];
+    executionContextEntity = event.origin;
+    if ( runAsTarget ) {
+        executionContextEntity = event.target;
+    }
+    if ( isDefined( command ) ) {
+        response = executionContextEntity [[command]]( event, data );
+    }
+    else if ( level.iw4adminIntegrationDebug == 1 )
     {
-        case "GiveWeapon":
-            response = event.target GiveWeaponImpl( data );
-            break;
-        case "TakeWeapons":
-            response = event.target TakeWeaponsImpl();
-            break;
-        case "SwitchTeams":
-            response = event.target TeamSwitchImpl();
-            break;
-        case "Hide":
-            response = self HideImpl();
-            break;
-        case "Unhide":
-            response = self UnhideImpl();
-            break;
-        case "Alert":
-            response = event.target AlertImpl( data );
-            break;
-        case "Goto":
-            if ( IsDefined( event.target ) )
-            {
-                response = self GotoPlayerImpl( event.target );
-            }
-            else
-            {
-                response = self GotoImpl( event.data );
-            }
-            break;
-        case "Kill":
-            response = event.target KillImpl();
-            break;
-        case "NightMode":
-            NightModeImpl();
-            break;
+        IPrintLn( "Unkown Client command->" +  event.subtype);
     }
     
     // send back the response to the origin, but only if they're not the target
@@ -527,7 +684,7 @@ OnSetClientDataCompleted( event )
 // Command Implementations
 /////////////////////////////////
 
-GiveWeaponImpl( data )
+GiveWeaponImpl( event, data )
 {
     if ( !IsAlive( self ) )
     {
@@ -558,7 +715,7 @@ TeamSwitchImpl()
 {
     if ( !IsAlive( self ) )
     {
-        return self.name + "^7 is not alive";
+        return self + "^7 is not alive";
     }
     
     team = level.allies;
@@ -575,6 +732,93 @@ TeamSwitchImpl()
     return self.name + "^7 switched to " + self.team;
 }
 
+LockControlsImpl()
+{
+    if ( !IsAlive( self ) )
+    {
+        return self.name + "^7 is not alive";
+    }
+    
+
+    self freezeControls( true );
+    self call [[level.overrideMethods["god"]]]( true );
+    self Hide();
+
+    info = [];
+    info[ "alertType" ] = "Alert!";
+    info[ "message" ] = "You have been frozen!";
+    
+    self AlertImpl( undefined, info );
+
+    return self.name + "\'s controls are locked";
+}
+
+UnlockControlsImpl()
+{
+    if ( !IsAlive( self ) )
+    {
+        return self.name + "^7 is not alive";
+    }
+    
+    self freezeControls( false );
+    self call [[level.overrideMethods["god"]]]( false );
+    self Show();
+
+    return self.name + "\'s controls are unlocked";
+}
+
+NoClipImpl()
+{
+    if ( !IsAlive( self ) )
+    {
+        self IPrintLnBold( "You are not alive" );
+        // Due to bug when sometimes disabling noclip game thinks you're dead
+        // removing the return and allowing them to go back into noclip is probably better.
+        //return; 
+    }
+
+    self SetClientDvar( "sv_cheats", 1 );
+    self SetClientDvar( "cg_thirdperson", 1 );
+    self SetClientDvar( "sv_cheats", 0 );
+
+    self call [[level.overrideMethods["god"]]]( true );
+    self call [[level.overrideMethods["noclip"]]]( true );
+    self Hide();
+
+    self.isNoClipped = true;
+
+    self IPrintLnBold( "NoClip enabled" );
+}
+
+NoClipOffImpl()
+{
+    if ( !IsDefined( self.isNoClipped ) || !self.isNoClipped ) 
+    {
+        self IPrintLnBold( "You are not no-clipped" );
+        return;
+    }
+
+    self SetClientDvar( "sv_cheats", 1 );
+    self SetClientDvar( "cg_thirdperson", 0 );
+    self SetClientDvar( "sv_cheats", 0 );
+
+    self call [[level.overrideMethods["god"]]]( false );
+    self call [[level.overrideMethods["noclip"]]]( false );
+    self Show();
+
+    self IPrintLnBold( "NoClip disabled" );
+
+    if ( !IsAlive( self ) && self.isNoClipped )
+    {
+        // Sometimes you will bug exiting noclip where the game thinks you're dead
+        // but you're not. You will retain godmode but be able to run around and kill people. 
+        // So, it's important to let the user know.
+        self IPrintLnBold( "^1You are bugged! ^4Swap team." );
+    }
+
+    self.isNoClipped = false;
+}
+
 HideImpl()
 {
     if ( !IsAlive( self ) )
@@ -583,22 +827,21 @@ HideImpl()
         return;
     }
 
-    if ( IsDefined( self.isHidden ) && self.isHidden )
+    self SetClientDvar( "sv_cheats", 1 );
+    self SetClientDvar( "cg_thirdperson", 1 );
+    self SetClientDvar( "sv_cheats", 0 );
+
+    if ( !IsDefined( self.savedHealth ) || self.health < 1000 )
     {
-        self IPrintLnBold( "You are already hidden" );
-        return;
+        self.savedHealth = self.health;
+        self.savedMaxHealth = self.maxhealth;
     }
 
-    self SetClientDvar( "sv_cheats", 1 );
-	self SetClientDvar( "cg_thirdperson", 1 );
-	self SetClientDvar( "sv_cheats", 0 );
-
-    self.savedHealth = self.health;
-    self.health = 9999;
-    self.isHidden = true;
-    
+    self call [[level.overrideMethods["god"]]]( true );
     self Hide();
 
+    self.isHidden = true;
+
     self IPrintLnBold( "You are now ^5hidden ^7from other players" );
 }
 
@@ -609,25 +852,49 @@ UnhideImpl()
         self IPrintLnBold( "You are not alive" );
         return;
     }
+    
+    if ( !IsDefined( self.isHidden ) || !self.isHidden ) 
+    {
+        self IPrintLnBold( "You are not hidden" );
+        return;
+    }
 
-	self SetClientDvar( "sv_cheats", 1 );
-	self SetClientDvar( "cg_thirdperson", 0 );
-	self SetClientDvar( "sv_cheats", 0 );
-
-    self.health = self.savedHealth;
-    self.isHidden = false;
+    self SetClientDvar( "sv_cheats", 1 );
+    self SetClientDvar( "cg_thirdperson", 0 );
+    self SetClientDvar( "sv_cheats", 0 );
 
+    self call [[level.overrideMethods["god"]]]( false );
     self Show();
+
+    self.isHidden = false;
+    
     self IPrintLnBold( "You are now ^5visible ^7to other players" );
 }
 
-AlertImpl( data )
+AlertImpl( event, data )
 {
-    self thread maps\mp\gametypes\_hud_message::oldNotifyMessage( data["alertType"], data["message"], "compass_waypoint_target", ( 1, 0, 0 ), "ui_mp_nukebomb_timer", 7.5 );
+    if ( level.eventBus.gamename == "IW4" ) {
+        self thread maps\mp\gametypes\_hud_message::oldNotifyMessage( data["alertType"], data["message"], "compass_waypoint_target", ( 1, 0, 0 ), "ui_mp_nukebomb_timer", 7.5 );
+    }
+    if ( level.eventBus.gamename == "IW5" ) { //IW5's notification are a bit different...
+        self thread maps\mp\gametypes\_hud_message::oldNotifyMessage( data["alertType"], data["message"], undefined, ( 1, 0, 0 ), "ui_mp_nukebomb_timer", 7.5 );
+    }
     return "Sent alert to " + self.name; 
 }
 
-GotoImpl( data )
+GotoImpl( event, data )
+{
+    if ( IsDefined( event.target ) )
+    {
+        return self GotoPlayerImpl( event.target );
+    }
+    else
+    {
+        return self GotoCoordImpl( data );
+    }
+}
+
+GotoCoordImpl( data )
 {
     if ( !IsAlive( self ) )
     {
@@ -652,6 +919,18 @@ GotoPlayerImpl( target )
     self IPrintLnBold( "Moved to " + target.name );
 }
 
+PlayerToMeImpl( event )
+{
+    if ( !IsAlive( self ) )
+    {
+        return self.name + " is not alive";
+    }
+
+    self SetOrigin( event.origin GetOrigin() );
+    return "Moved here " + self.name;    
+}
+
+
 KillImpl()
 {
     if ( !IsAlive( self ) )
@@ -707,3 +986,61 @@ ToggleNightMode()
     self SetClientDvar( "fx_draw", fxDraw );
     self SetClientDvar( "sv_cheats", 0 );
 }
+
+SetSpectatorImpl()
+{
+    if ( self.pers["team"] == "spectator" ) 
+    {
+        return self.name + " is already spectating";
+    }
+    
+    self [[level.spectator]]();
+    self IPrintLnBold( "You have been moved to spectator" );
+    
+    return self.name + " has been moved to spectator";
+}
+
+//////////////////////////////////
+// Function Overrides
+//////////////////////////////////
+
+_god( isEnabled ) 
+{
+    if ( isEnabled == true ) 
+    {
+        if ( !IsDefined( self.savedHealth ) || self.health < 1000  )
+        {
+            self.savedHealth = self.health;
+            self.savedMaxHealth = self.maxhealth;
+        }
+        
+        self.maxhealth = 99999;
+        self.health = 99999;
+    }
+    
+    else 
+    {
+        if ( !IsDefined( self.savedHealth ) || !IsDefined( self.savedMaxHealth ) )
+        {
+            return;
+        }
+        
+        self.health = self.savedHealth;
+        self.maxhealth = self.savedMaxHealth;
+    }
+}
+
+
+IW5_God()
+{
+    SetDvar( "sv_cheats", 1 );
+    self God();
+    SetDvar( "sv_cheats", 0 );
+}
+
+IW5_NoClip()
+{
+    SetDvar( "sv_cheats", 1 );
+    self NoClip();
+    SetDvar( "sv_cheats", 0 );
+}

IW4MAdmin.sln

@@ -13,7 +13,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		version.txt = version.txt
 		DeploymentFiles\UpdateIW4MAdmin.ps1 = DeploymentFiles\UpdateIW4MAdmin.ps1
 		DeploymentFiles\UpdateIW4MAdmin.sh = DeploymentFiles\UpdateIW4MAdmin.sh
-		GameFiles\IW4x\userraw\scripts\_integration.gsc = GameFiles\IW4x\userraw\scripts\_integration.gsc
+		GameFiles\_integration.gsc = GameFiles\_integration.gsc
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharedLibraryCore", "SharedLibraryCore\SharedLibraryCore.csproj", "{AA0541A2-8D51-4AD9-B0AC-3D1F5B162481}"
@@ -51,6 +51,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ScriptPlugins", "ScriptPlug
 		Plugins\ScriptPlugins\ParserCSGOSM.js = Plugins\ScriptPlugins\ParserCSGOSM.js
 		Plugins\ScriptPlugins\ParserPlutoniumT4COZM.js = Plugins\ScriptPlugins\ParserPlutoniumT4COZM.js
 		Plugins\ScriptPlugins\GameInterface.js = Plugins\ScriptPlugins\GameInterface.js
+		Plugins\ScriptPlugins\SubnetBan.js = Plugins\ScriptPlugins\SubnetBan.js
+		Plugins\ScriptPlugins\BanBroadcasting.js = Plugins\ScriptPlugins\BanBroadcasting.js
+		Plugins\ScriptPlugins\ParserH1MOD.js = Plugins\ScriptPlugins\ParserH1MOD.js
+		Plugins\ScriptPlugins\ParserPlutoniumT5.js = Plugins\ScriptPlugins\ParserPlutoniumT5.js
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutomessageFeed", "Plugins\AutomessageFeed\AutomessageFeed.csproj", "{F5815359-CFC7-44B4-9A3B-C04BACAD5836}"

Integrations/Cod/CodRConConnection.cs

@@ -23,17 +23,18 @@ namespace Integrations.Cod
     /// </summary>
     public class CodRConConnection : IRConConnection
     {
-        static readonly ConcurrentDictionary<EndPoint, ConnectionState> ActiveQueries = new ConcurrentDictionary<EndPoint, ConnectionState>();
+        private static readonly ConcurrentDictionary<EndPoint, ConnectionState> ActiveQueries = new();
         public IPEndPoint Endpoint { get; }
         public string RConPassword { get; }
 
-        private IRConParser parser;
-        private IRConParserConfiguration config;
+        private IRConParser _parser;
+        private IRConParserConfiguration _config;
         private readonly ILogger _log;
         private readonly Encoding _gameEncoding;
         private readonly int _retryAttempts;
 
-        public CodRConConnection(IPEndPoint ipEndpoint, string password, ILogger<CodRConConnection> log, Encoding gameEncoding, int retryAttempts)
+        public CodRConConnection(IPEndPoint ipEndpoint, string password, ILogger<CodRConConnection> log,
+            Encoding gameEncoding, int retryAttempts)
         {
             RConPassword = password;
             _gameEncoding = gameEncoding;
@@ -44,73 +45,133 @@ namespace Integrations.Cod
 
         public void SetConfiguration(IRConParser parser)
         {
-            this.parser = parser;
-            config = parser.Configuration;
+            _parser = parser;
+            _config = parser.Configuration;
         }
 
-        public async Task<string[]> SendQueryAsync(StaticHelpers.QueryType type, string parameters = "")
+        public async Task<string[]> SendQueryAsync(StaticHelpers.QueryType type, string parameters = "",
+            CancellationToken token = default)
         {
-            if (!ActiveQueries.ContainsKey(this.Endpoint))
+            try
             {
-                ActiveQueries.TryAdd(this.Endpoint, new ConnectionState());
+                return await SendQueryAsyncInternal(type, parameters, token);
+            }
+            catch (Exception ex)
+            {
+                using (LogContext.PushProperty("Server", Endpoint.ToString()))
+                {
+                    _log.LogWarning(ex, "Could not complete RCon request");
+                }
+
+                throw;
+            }
+            finally
+            {
+                using (LogContext.PushProperty("Server", Endpoint.ToString()))
+                {
+                    _log.LogDebug("Releasing OnComplete {Count}", ActiveQueries[Endpoint].OnComplete.CurrentCount);
+                }
+
+                if (ActiveQueries[Endpoint].OnComplete.CurrentCount == 0)
+                {
+                    ActiveQueries[Endpoint].OnComplete.Release();
+                }
+            }
+        }
+
+        private async Task<string[]> SendQueryAsyncInternal(StaticHelpers.QueryType type, string parameters = "",
+            CancellationToken token = default)
+        {
+            if (!ActiveQueries.ContainsKey(Endpoint))
+            {
+                ActiveQueries.TryAdd(Endpoint, new ConnectionState());
             }
 
-            var connectionState = ActiveQueries[this.Endpoint];
+            if (!ActiveQueries.TryGetValue(Endpoint, out var connectionState))
+            {
+                _log.LogError("Could not retrieve connection state");
+                throw new InvalidOperationException("Could not get connection state");
+            }
 
-            _log.LogDebug("Waiting for semaphore to be released [{endpoint}]", Endpoint);
+            _log.LogDebug("Waiting for semaphore to be released [{Endpoint}]", Endpoint);
 
             // enter the semaphore so only one query is sent at a time per server.
-            await connectionState.OnComplete.WaitAsync();
+            try
+            {
+                await connectionState.OnComplete.WaitAsync(token);
+            }
+            catch (OperationCanceledException)
+            {
+                _log.LogDebug("OnComplete did not complete before timeout {Count}",
+                    connectionState.OnComplete.CurrentCount);
+                throw new RConException("Timed out waiting for access to rcon socket");
+            }
 
             var timeSinceLastQuery = (DateTime.Now - connectionState.LastQuery).TotalMilliseconds;
 
-            if (timeSinceLastQuery < config.FloodProtectInterval)
+            if (timeSinceLastQuery < _config.FloodProtectInterval)
             {
-                await Task.Delay(config.FloodProtectInterval - (int)timeSinceLastQuery);
+                try
+                {
+                    var delay = _config.FloodProtectInterval - (int)timeSinceLastQuery;
+                    _log.LogDebug("Delaying for {Delay}ms", delay);
+                    await Task.Delay(delay, token);
+                }
+                catch (OperationCanceledException)
+                {
+                    _log.LogDebug("Waiting for flood protect did not complete before timeout timeout {Count}",
+                        connectionState.OnComplete.CurrentCount);
+                    throw new RConException("Timed out waiting for flood protect to expire");
+                }
             }
 
-            connectionState.LastQuery = DateTime.Now;
-
-            _log.LogDebug("Semaphore has been released [{endpoint}]", Endpoint);
-            _log.LogDebug("Query {@queryInfo}", new { endpoint=Endpoint.ToString(), type, parameters });
+            _log.LogDebug("Semaphore has been released [{Endpoint}]", Endpoint);
+            _log.LogDebug("Query {@QueryInfo}", new { endpoint = Endpoint.ToString(), type, parameters });
 
             byte[] payload = null;
-            bool waitForResponse = config.WaitForResponse;
+            var waitForResponse = _config.WaitForResponse;
 
-            string convertEncoding(string text)
+            string ConvertEncoding(string text)
             {
-                byte[] convertedBytes = Utilities.EncodingType.GetBytes(text);
+                var convertedBytes = Utilities.EncodingType.GetBytes(text);
                 return _gameEncoding.GetString(convertedBytes);
             }
 
             try
             {
-                string convertedRConPassword = convertEncoding(RConPassword);
-                string convertedParameters = convertEncoding(parameters);
+                var convertedRConPassword = ConvertEncoding(RConPassword);
+                var convertedParameters = ConvertEncoding(parameters);
 
                 switch (type)
                 {
                     case StaticHelpers.QueryType.GET_DVAR:
                         waitForResponse |= true;
-                        payload = string.Format(config.CommandPrefixes.RConGetDvar, convertedRConPassword, convertedParameters + '\0').Select(Convert.ToByte).ToArray();
+                        payload = string
+                            .Format(_config.CommandPrefixes.RConGetDvar, convertedRConPassword,
+                                convertedParameters + '\0').Select(Convert.ToByte).ToArray();
                         break;
                     case StaticHelpers.QueryType.SET_DVAR:
-                        payload = string.Format(config.CommandPrefixes.RConSetDvar, convertedRConPassword, convertedParameters + '\0').Select(Convert.ToByte).ToArray();
+                        payload = string
+                            .Format(_config.CommandPrefixes.RConSetDvar, convertedRConPassword,
+                                convertedParameters + '\0').Select(Convert.ToByte).ToArray();
                         break;
                     case StaticHelpers.QueryType.COMMAND:
-                        payload = string.Format(config.CommandPrefixes.RConCommand, convertedRConPassword, convertedParameters + '\0').Select(Convert.ToByte).ToArray();
+                        payload = string
+                            .Format(_config.CommandPrefixes.RConCommand, convertedRConPassword,
+                                convertedParameters + '\0').Select(Convert.ToByte).ToArray();
                         break;
                     case StaticHelpers.QueryType.GET_STATUS:
                         waitForResponse |= true;
-                        payload = (config.CommandPrefixes.RConGetStatus + '\0').Select(Convert.ToByte).ToArray();
+                        payload = (_config.CommandPrefixes.RConGetStatus + '\0').Select(Convert.ToByte).ToArray();
                         break;
                     case StaticHelpers.QueryType.GET_INFO:
                         waitForResponse |= true;
-                        payload = (config.CommandPrefixes.RConGetInfo + '\0').Select(Convert.ToByte).ToArray();
+                        payload = (_config.CommandPrefixes.RConGetInfo + '\0').Select(Convert.ToByte).ToArray();
                         break;
                     case StaticHelpers.QueryType.COMMAND_STATUS:
                         waitForResponse |= true;
-                        payload = string.Format(config.CommandPrefixes.RConCommand, convertedRConPassword, "status\0").Select(Convert.ToByte).ToArray();
+                        payload = string.Format(_config.CommandPrefixes.RConCommand, convertedRConPassword, "status\0")
+                            .Select(Convert.ToByte).ToArray();
                         break;
                 }
             }
@@ -119,14 +180,13 @@ namespace Integrations.Cod
             // e.g: emoji -> windows-1252
             catch (OverflowException ex)
             {
-                connectionState.OnComplete.Release(1);
                 using (LogContext.PushProperty("Server", Endpoint.ToString()))
                 {
-                    _log.LogError(ex, "Could not convert RCon data payload to desired encoding {encoding} {params}",
+                    _log.LogError(ex, "Could not convert RCon data payload to desired encoding {Encoding} {Params}",
                         _gameEncoding.EncodingName, parameters);
                 }
 
-                throw new RConException($"Invalid character encountered when converting encodings");
+                throw new RConException("Invalid character encountered when converting encodings");
             }
 
             byte[][] response = null;
@@ -137,92 +197,146 @@ namespace Integrations.Cod
                 using (LogContext.PushProperty("Server", Endpoint.ToString()))
                 {
                     _log.LogInformation(
-                        "Retrying RCon message ({connectionAttempts}/{allowedConnectionFailures} attempts) with parameters {payload}", 
-                        connectionState.ConnectionAttempts, 
+                        "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,
-                Ttl = 100,
-                ExclusiveAddressUse = true,
-            })
-            {
-                connectionState.SendEventArgs.UserToken = socket;
-                connectionState.ConnectionAttempts++;
-                await connectionState.OnSentData.WaitAsync();
-                await connectionState.OnReceivedData.WaitAsync();
-                connectionState.BytesReadPerSegment.Clear();
-                bool exceptionCaught = false;
 
-                _log.LogDebug("Sending {payloadLength} bytes to [{endpoint}] ({connectionAttempts}/{allowedConnectionFailures})",
-                payload.Length, Endpoint, connectionState.ConnectionAttempts, _retryAttempts);
+            using (var socket = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp)
+                   {
+                       DontFragment = false,
+                       Ttl = 100,
+                       ExclusiveAddressUse = true,
+                   })
+            {
+                // wait for send to be ready
+                try
+                {
+                    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");
+                }
+
+                // 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();
+
+                _log.LogDebug(
+                    "Sending {PayloadLength} bytes to [{Endpoint}] ({ConnectionAttempts}/{AllowedConnectionFailures})",
+                    payload.Length, Endpoint, connectionState.ConnectionAttempts, _retryAttempts);
 
                 try
                 {
-                    
-                    response = await SendPayloadAsync(payload, waitForResponse, parser.OverrideTimeoutForCommand(parameters));
+                    connectionState.LastQuery = DateTime.Now;
+                    response = await SendPayloadAsync(payload, waitForResponse,
+                        _parser.OverrideTimeoutForCommand(parameters), token);
 
-                    if ((response.Length == 0 || response[0].Length == 0) && waitForResponse)
+                    if ((response?.Length == 0 || response[0].Length == 0) && waitForResponse)
                     {
+                        _log.LogDebug("0 bytes received from rcon request");
                         throw new RConException("Expected response but got 0 bytes back");
                     }
 
                     connectionState.ConnectionAttempts = 0;
                 }
 
+                catch (OperationCanceledException)
+                {
+                    // 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)
                     {
-                        exceptionCaught = true;
-                        await Task.Delay(StaticHelpers.SocketTimeout(connectionState.ConnectionAttempts));
+                        try
+                        {
+                            await Task.Delay(StaticHelpers.SocketTimeout(connectionState.ConnectionAttempts), token);
+                        }
+                        catch (OperationCanceledException)
+                        {
+                            _log.LogDebug("OperationCancelled while waiting for retry");
+                            throw;
+                        }
+
                         goto retrySend;
                     }
 
                     using (LogContext.PushProperty("Server", Endpoint.ToString()))
                     {
                         _log.LogWarning(
-                            "Made {connectionAttempts} attempts to send RCon data to server, but received no response",
+                            "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");
                 }
-
                 finally
                 {
-                    // we don't want to release if we're going to retry the query
-                    if (connectionState.OnComplete.CurrentCount == 0 && !exceptionCaught)
+                    try
                     {
-                        connectionState.OnComplete.Release(1);
-                    }
+                        if (connectionState.OnSentData.CurrentCount == 0)
+                        {
+                            connectionState.OnSentData.Release();
+                        }
 
-                    if (connectionState.OnSentData.CurrentCount == 0)
-                    {
-                        connectionState.OnSentData.Release();
+                        if (connectionState.OnReceivedData.CurrentCount == 0)
+                        {
+                            connectionState.OnReceivedData.Release();
+                        }
                     }
-
-                    if (connectionState.OnReceivedData.CurrentCount == 0)
+                    catch
                     {
-                        connectionState.OnReceivedData.Release();
+                        // ignored because we can have the socket operation cancelled (which releases the semaphore) but 
+                        // this thread is not notified because it's an event
                     }
                 }
             }
 
+            // at this point we can run in parallel and the next request can start because we have our data
             if (response.Length == 0)
             {
-                _log.LogDebug("Received empty response for RCon request {@query}", new { endpoint=Endpoint.ToString(), type, parameters });
-                return new string[0];
+                _log.LogDebug("Received empty response for RCon request {@Query}",
+                    new { endpoint = Endpoint.ToString(), type, parameters });
+                return Array.Empty<string>();
             }
 
-            string responseString = type == StaticHelpers.QueryType.COMMAND_STATUS ?
-               ReassembleSegmentedStatus(response) : RecombineMessages(response);
+            var responseString = type == StaticHelpers.QueryType.COMMAND_STATUS
+                ? ReassembleSegmentedStatus(response)
+                : RecombineMessages(response);
 
-            // note: not all games respond if the pasword is wrong or not set
-            if (responseString.Contains("Invalid password") || responseString.Contains("rconpassword"))
+            // note: not all games respond if the password is wrong or not set
+            if (responseString.Contains("Invalid password", StringComparison.InvariantCultureIgnoreCase) ||
+                responseString.Contains("rconpassword"))
             {
                 throw new RConException(Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_RCON_INVALID"]);
             }
@@ -232,26 +346,31 @@ namespace Integrations.Cod
                 throw new RConException(Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_RCON_NOTSET"]);
             }
 
-            if (responseString.Contains(config.ServerNotRunningResponse))
+            if (responseString.Contains(_config.ServerNotRunningResponse))
             {
-                throw new ServerException(Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_NOT_RUNNING"].FormatExt(Endpoint.ToString()));
+                throw new ServerException(Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_NOT_RUNNING"]
+                    .FormatExt(Endpoint.ToString()));
             }
 
-            string responseHeaderMatch = Regex.Match(responseString, config.CommandPrefixes.RConResponse).Value;
-            string[] headerSplit = responseString.Split(type == StaticHelpers.QueryType.GET_INFO ? config.CommandPrefixes.RconGetInfoResponseHeader : responseHeaderMatch);
+            var responseHeaderMatch = Regex.Match(responseString, _config.CommandPrefixes.RConResponse).Value;
+            var headerSplit = responseString.Split(type == StaticHelpers.QueryType.GET_INFO
+                ? _config.CommandPrefixes.RconGetInfoResponseHeader
+                : responseHeaderMatch);
 
             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());
+                    _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");
             }
 
-            string[] splitResponse = headerSplit.Last().Split(new char[] { '\n' }, StringSplitOptions.RemoveEmptyEntries);
+            var splitResponse = headerSplit.Last().Split(new[] { '\n' }, StringSplitOptions.RemoveEmptyEntries)
+                .Select(line => line.StartsWith("^7") ? line[2..] : line).ToArray();
+            
             return splitResponse;
         }
 
@@ -261,14 +380,14 @@ namespace Integrations.Cod
         /// </summary>
         /// <param name="segments">array of segmented byte arrays</param>
         /// <returns></returns>
-        public string ReassembleSegmentedStatus(byte[][] segments)
+        private string ReassembleSegmentedStatus(IEnumerable<byte[]> segments)
         {
             var splitStatusStrings = new List<string>();
 
-            foreach (byte[] segment in segments)
+            foreach (var segment in segments)
             {
-                string responseString = _gameEncoding.GetString(segment, 0, segment.Length);
-                var statusHeaderMatch = config.StatusHeader.PatternMatcher.Match(responseString);
+                var responseString = _gameEncoding.GetString(segment, 0, segment.Length);
+                var statusHeaderMatch = _config.StatusHeader.PatternMatcher.Match(responseString);
                 if (statusHeaderMatch.Success)
                 {
                     splitStatusStrings.Insert(0, responseString.TrimEnd('\0'));
@@ -276,7 +395,8 @@ namespace Integrations.Cod
 
                 else
                 {
-                    splitStatusStrings.Add(responseString.Replace(config.CommandPrefixes.RConResponse, "").TrimEnd('\0'));
+                    splitStatusStrings.Add(responseString.Replace(_config.CommandPrefixes.RConResponse, "")
+                        .TrimEnd('\0'));
                 }
             }
 
@@ -288,34 +408,40 @@ namespace Integrations.Cod
         /// </summary>
         /// <param name="payload"></param>
         /// <returns></returns>
-        private string RecombineMessages(byte[][] payload)
+        private string RecombineMessages(IReadOnlyList<byte[]> payload)
         {
-            if (payload.Length == 1)
+            if (payload.Count == 1)
             {
                 return _gameEncoding.GetString(payload[0]).TrimEnd('\n') + '\n';
             }
 
-            else
+            var builder = new StringBuilder();
+            for (var i = 0; i < payload.Count; i++)
             {
-                var builder = new StringBuilder();
-                for (int i = 0; i < payload.Length; i++)
+                var message = _gameEncoding.GetString(payload[i]).TrimEnd('\n') + '\n';
+                if (i > 0)
                 {
-                    string message = _gameEncoding.GetString(payload[i]).TrimEnd('\n') + '\n';
-                    if (i > 0)
-                    {
-                        message = message.Replace(config.CommandPrefixes.RConResponse, "");
-                    }
-                    builder.Append(message);
+                    message = message.Replace(_config.CommandPrefixes.RConResponse, "");
                 }
-                builder.Append('\n');
-                return builder.ToString();
+
+                builder.Append(message);
             }
+
+            builder.Append('\n');
+            return builder.ToString();
         }
 
-        private async Task<byte[][]> SendPayloadAsync(byte[] payload, bool waitForResponse, TimeSpan overrideTimeout)
+        private async Task<byte[][]> SendPayloadAsync(byte[] payload, bool waitForResponse, TimeSpan overrideTimeout,
+            CancellationToken token = default)
         {
-            var connectionState = ActiveQueries[this.Endpoint];
-            var rconSocket = (Socket)connectionState.SendEventArgs.UserToken;
+            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)
@@ -323,8 +449,9 @@ namespace Integrations.Cod
                 // setup the event handlers only once because we're reusing the event args
                 connectionState.SendEventArgs.Completed += OnDataSent;
                 connectionState.ReceiveEventArgs.Completed += OnDataReceived;
-                connectionState.SendEventArgs.RemoteEndPoint = this.Endpoint;
-                connectionState.ReceiveEventArgs.RemoteEndPoint = this.Endpoint;
+                connectionState.ReceiveEventArgs.UserToken = connectionState.SendEventArgs.UserToken;
+                connectionState.SendEventArgs.RemoteEndPoint = Endpoint;
+                connectionState.ReceiveEventArgs.RemoteEndPoint = Endpoint;
                 connectionState.ReceiveEventArgs.DisconnectReuseSocket = true;
                 connectionState.SendEventArgs.DisconnectReuseSocket = true;
             }
@@ -332,20 +459,22 @@ namespace Integrations.Cod
             connectionState.SendEventArgs.SetBuffer(payload);
 
             // send the data to the server
-            bool sendDataPending = rconSocket.SendToAsync(connectionState.SendEventArgs);
+            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
-                
-                if(!await connectionState.OnSentData.WaitAsync(StaticHelpers.SocketTimeout(1)))
+                var complete = await connectionState.OnSentData.WaitAsync(StaticHelpers.SocketTimeout(4), token);
+
+                if (!complete)
                 {
-                    using(LogContext.PushProperty("Server", Endpoint.ToString()))
+                    using (LogContext.PushProperty("Server", Endpoint.ToString()))
                     {
-                        _log.LogWarning("Socket timed out while sending RCon data on attempt {attempt}",
+                        _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);
                 }
@@ -359,45 +488,58 @@ namespace Integrations.Cod
             connectionState.ReceiveEventArgs.SetBuffer(connectionState.ReceiveBuffer);
 
             // get our response back
-            bool receiveDataPending = rconSocket.ReceiveFromAsync(connectionState.ReceiveEventArgs);
+            var receiveDataPending = rconSocket.ReceiveFromAsync(connectionState.ReceiveEventArgs);
 
             if (receiveDataPending)
             {
-                _log.LogDebug("Waiting to asynchronously receive data on attempt #{connectionAttempts}", connectionState.ConnectionAttempts);
-                if (!await connectionState.OnReceivedData.WaitAsync(
-                    new[]
-                    {
-                        StaticHelpers.SocketTimeout(connectionState.ConnectionAttempts), 
-                        overrideTimeout
-                    }.Max()))
+                _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}",
+                                "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 byte[][] GetResponseData(ConnectionState connectionState)
+        private static byte[][] GetResponseData(ConnectionState connectionState)
         {
             var responseList = new List<byte[]>();
-            int totalBytesRead = 0;
+            var totalBytesRead = 0;
 
-            foreach (int bytesRead in connectionState.BytesReadPerSegment)
+            foreach (var bytesRead in connectionState.BytesReadPerSegment)
             {
                 responseList.Add(connectionState.ReceiveBuffer
                     .Skip(totalBytesRead)
@@ -412,34 +554,56 @@ namespace Integrations.Cod
 
         private void OnDataReceived(object sender, SocketAsyncEventArgs e)
         {
-            _log.LogDebug("Read {bytesTransferred} bytes from {endpoint}", e.BytesTransferred, e.RemoteEndPoint);
+            _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[this.Endpoint].OnReceivedData;
-                if (semaphore.CurrentCount == 0)
+
+                var semaphore = ActiveQueries[Endpoint].OnReceivedData;
+
+                try
                 {
-                    semaphore.Release();
+                    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;
             }
 
-            if (sender is not Socket sock)
+            var state = ActiveQueries[Endpoint];
+            var cancellationRequested = ((ConnectionUserToken)e.UserToken)?.CancellationToken.IsCancellationRequested ??
+                                        false;
+
+            if (sender is not Socket sock || cancellationRequested)
             {
-                var semaphore = ActiveQueries[this.Endpoint].OnReceivedData;
-                if (semaphore.CurrentCount == 0)
+                var semaphore = ActiveQueries[Endpoint].OnReceivedData;
+
+                try
                 {
-                    semaphore.Release();
+                    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[this.Endpoint];
+
             state.BytesReadPerSegment.Add(e.BytesTransferred);
 
             // I don't even want to know why this works for getting more data from Cod4x
@@ -450,32 +614,33 @@ namespace Integrations.Cod
             try
             {
                 var totalBytesTransferred = e.BytesTransferred;
-                _log.LogDebug("{total} total bytes transferred with {available} bytes remaining", totalBytesTransferred,
+                _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);
+                    _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",
+                            "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);
+                    _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;
@@ -489,22 +654,39 @@ namespace Integrations.Cod
 
             finally
             {
-                var semaphore = ActiveQueries[this.Endpoint].OnReceivedData;
-                if (semaphore.CurrentCount == 0)
+                var semaphore = ActiveQueries[Endpoint].OnReceivedData;
+                try
                 {
-                    semaphore.Release();
+                    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);
-            
-            var semaphore = ActiveQueries[this.Endpoint].OnSentData;
-            if (semaphore.CurrentCount == 0)
+            _log.LogDebug("Sent {ByteCount} bytes to {Endpoint}", e.Buffer?.Length,
+                e.ConnectSocket?.RemoteEndPoint?.ToString());
+
+            var semaphore = ActiveQueries[Endpoint].OnSentData;
+            try
             {
-                semaphore.Release();
+                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
             }
         }
     }

Integrations/Cod/ConnectionState.cs

@@ -20,13 +20,19 @@ namespace Integrations.Cod
         public int ConnectionAttempts { get; set; }
         private const int BufferSize = 16384;
         public readonly byte[] ReceiveBuffer = new byte[BufferSize];
-        public readonly SemaphoreSlim OnComplete = new SemaphoreSlim(1, 1);
+        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 List<int>();
-        public SocketAsyncEventArgs SendEventArgs { get; set; } = new SocketAsyncEventArgs();
-        public SocketAsyncEventArgs ReceiveEventArgs { get; set; } = new SocketAsyncEventArgs();
+        public List<int> BytesReadPerSegment { get; set; } = new();
+        public SocketAsyncEventArgs SendEventArgs { get; set; } = new();
+        public SocketAsyncEventArgs ReceiveEventArgs { get; set; } = new();
         public DateTime LastQuery { get; set; } = DateTime.Now;
     }
+
+    internal class ConnectionUserToken
+    {
+        public Socket Socket { get; set; }
+        public CancellationToken CancellationToken { get; set; }
+    }
 }

Integrations/Source/SourceRConConnection.cs

@@ -48,12 +48,12 @@ namespace Integrations.Source
             _activeQuery.Dispose();
         }
 
-        public async Task<string[]> SendQueryAsync(StaticHelpers.QueryType type, string parameters = "")
+        public async Task<string[]> SendQueryAsync(StaticHelpers.QueryType type, string parameters = "",  CancellationToken token = default)
         {
             try
             {
-                await _activeQuery.WaitAsync();
-                await WaitForAvailable();
+                await _activeQuery.WaitAsync(token);
+                await WaitForAvailable(token);
 
                 if (_needNewSocket)
                 {
@@ -66,7 +66,7 @@ namespace Integrations.Source
                         // ignored
                     }
 
-                    await Task.Delay(ConnectionTimeout);
+                    await Task.Delay(ConnectionTimeout, token);
                     _rconClient = _rconClientFactory.CreateClient(_ipEndPoint);
                     _authenticated = false;
                     _needNewSocket = false;
@@ -147,12 +147,12 @@ namespace Integrations.Source
             }
         }
 
-        private async Task WaitForAvailable()
+        private async Task WaitForAvailable(CancellationToken token)
         {
             var diff = DateTime.Now - _lastQuery;
             if (diff < FloodDelay)
             {
-                await Task.Delay(FloodDelay - diff);
+                await Task.Delay(FloodDelay - diff, token);
             }
         }
 

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.2.22.1" PrivateAssets="All" />
+    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.6.15.1" PrivateAssets="All" />
   </ItemGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">

Plugins/AutomessageFeed/Configuration.cs

@@ -1,5 +1,4 @@
-using SharedLibraryCore;
-using SharedLibraryCore.Interfaces;
+using SharedLibraryCore.Interfaces;
 
 namespace AutomessageFeed
 {
@@ -11,16 +10,6 @@ namespace AutomessageFeed
 
         public IBaseConfiguration Generate()
         {
-            EnableFeed = Utilities.PromptBool(Utilities.CurrentLocalization.LocalizationIndex["PLUGINS_AUTOMESSAGEFEED_PROMPT_ENABLE"]);
-
-            if (EnableFeed)
-            {
-                FeedUrl = Utilities.PromptString(Utilities.CurrentLocalization.LocalizationIndex["PLUGINS_AUTOMESSAGEFEED_URL"]);
-                MaxFeedItems = Utilities.PromptInt(Utilities.CurrentLocalization.LocalizationIndex["PLUGINS_AUTOMESSAGEFEED_PROMPT_MAXITEMS"],
-                    Utilities.CurrentLocalization.LocalizationIndex["PLUGINS_AUTOMESSAGEFEED_PROMPT_MAXITEMS_DESC"],
-                    0, int.MaxValue, 0);
-            }
-
             return this;
         }
 

Plugins/LiveRadar/Controllers/RadarController.cs

@@ -15,7 +15,8 @@ namespace LiveRadar.Web.Controllers
         private static LiveRadarConfiguration _config;
         private readonly IConfigurationHandler<LiveRadarConfiguration> _configurationHandler;
 
-        public RadarController(IManager manager, IConfigurationHandlerFactory configurationHandlerFactory) : base(manager)
+        public RadarController(IManager manager, IConfigurationHandlerFactory configurationHandlerFactory) :
+            base(manager)
         {
             _manager = manager;
             _configurationHandler =
@@ -23,29 +24,33 @@ namespace LiveRadar.Web.Controllers
         }
 
         [HttpGet]
-        [Route("Radar/{serverId}")]
-        public IActionResult Index(long? serverId = null)
+        [Route("Radar/{serverId?}")]
+        public IActionResult Index(string serverId = null)
         {
-            ViewBag.IsFluid = true;
-            ViewBag.Title = Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_RADAR_TITLE"];
-            ViewBag.ActiveServerId = serverId ?? _manager.GetServers().FirstOrDefault()?.EndPoint;
-            ViewBag.Servers = _manager.GetServers()
-                .Where(_server => _server.GameName == Server.Game.IW4)
-                .Select(_server => new ServerInfo()
+            var servers = _manager.GetServers()
+                .Where(server => server.GameName == Server.Game.IW4)
+                .Select(server => new ServerInfo
                 {
-                    Name = _server.Hostname,
-                    ID = _server.EndPoint
+                    Name = server.Hostname,
+                    IPAddress = server.IP,
+                    Port = server.Port
                 });
 
-            return View();
+            ViewBag.Title = Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_RADAR_TITLE"];
+            ViewBag.SelectedServerId = string.IsNullOrEmpty(serverId) ? servers.FirstOrDefault()?.Endpoint : serverId;
+
+            // ReSharper disable once Mvc.ViewNotResolved
+            return View("~/Views/Plugins/LiveRadar/Radar/Index.cshtml", servers);
         }
 
         [HttpGet]
         [Route("Radar/{serverId}/Map")]
-        public async Task<IActionResult> Map(long? serverId = null)
+        public async Task<IActionResult> Map(string serverId = null)
         {
-            var server = serverId == null ? _manager.GetServers().FirstOrDefault() : _manager.GetServers().FirstOrDefault(_server => _server.EndPoint == serverId);
-            
+            var server = serverId == null
+                ? _manager.GetServers().FirstOrDefault()
+                : _manager.GetServers().FirstOrDefault(server => server.ToString() == serverId);
+
             if (server == null)
             {
                 return NotFound();
@@ -56,15 +61,15 @@ namespace LiveRadar.Web.Controllers
                 await _configurationHandler.BuildAsync();
                 _config = _configurationHandler.Configuration() ?? new LiveRadarConfiguration();
             }
-            
-            var map = _config.Maps.FirstOrDefault(_map => _map.Name == server.CurrentMap.Name);
+
+            var map = _config.Maps.FirstOrDefault(map => map.Name == server.CurrentMap.Name);
 
             if (map == null)
             {
                 // occurs if we don't recognize the map
                 return StatusCode(StatusCodes.Status422UnprocessableEntity);
             }
-            
+
             map.Alias = server.CurrentMap.Alias;
             return Json(map);
         }
@@ -72,27 +77,21 @@ namespace LiveRadar.Web.Controllers
         [HttpGet]
         [Route("Radar/{serverId}/Data")]
         [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
-        public IActionResult Data(long? serverId = null)
+        public IActionResult Data(string serverId = null)
         {
-            var server = serverId == null ? _manager.GetServers()[0] : _manager.GetServers().First(_server => _server.EndPoint == serverId);
-            var radarInfo = server.GetClientsAsList().Select(_client => _client.GetAdditionalProperty<RadarEvent>("LiveRadar")).ToList();
-            return Json(radarInfo);
-        }
-
-        [HttpGet]
-        [Route("Radar/Update")]
-        public IActionResult Update(string payload)
-        {
-            /*var radarUpdate = RadarEvent.Parse(payload);
-            var client = _manager.GetActiveClients().FirstOrDefault(_client => _client.NetworkId == radarUpdate.Guid);
-
-            if (client != null)
+            var server = serverId == null
+                ? _manager.GetServers().FirstOrDefault()
+                : _manager.GetServers().FirstOrDefault(server => server.ToString() == serverId);
+            
+            if (server == null)
             {
-                radarUpdate.Name = client.Name.StripColors();
-                client.SetAdditionalProperty("LiveRadar", radarUpdate);
-            }*/
-
-            return Ok();
+                return NotFound();
+            }
+            
+            var radarInfo = server.GetClientsAsList()
+                .Select(client => client.GetAdditionalProperty<RadarEvent>("LiveRadar")).ToList();
+            
+            return Json(radarInfo);
         }
     }
 }

Plugins/LiveRadar/LiveRadar.csproj

@@ -15,15 +15,8 @@
     <StartupObject />
   </PropertyGroup>
 
-
   <ItemGroup>
-    <Content Update="Views\_ViewImports.cshtml">
-      <CopyToPublishDirectory>Never</CopyToPublishDirectory>
-    </Content>
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.2.22.1" PrivateAssets="All" />
+    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2022.6.15.1" PrivateAssets="All" />
   </ItemGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">

Plugins/LiveRadar/Plugin.cs

@@ -46,7 +46,7 @@ namespace LiveRadar
                     S.CustomCallback &&
                     !addedPage)
                 {
-                    E.Owner.Manager.GetPageList().Pages.Add(Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_RADAR_TITLE"], "/Radar/All");
+                    E.Owner.Manager.GetPageList().Pages.Add(Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_RADAR_TITLE"], "/Radar");
                     addedPage = true;
                 }
             }
@@ -77,7 +77,15 @@ namespace LiveRadar
 
                     lock (lockObject)
                     {
-                        generatedBotGuid = _botGuidLookups.ContainsKey(botKey) 
+                        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);
                     }