Update Wiki link

* - add support for game interface "file" bus mode for plutonium t6

* rename _integration_t6_filesystem_bus.gsc to _integration_t6_file_bus.gsc

* - remove visual studio's changes to solution, and fix file path for new _integration_t6_file_bus.gsc
- add new line to end of _integration_t6_file_bus.gsc

* add new line to end of solution

Application/Alerts/AlertManager.cs

@@ -55,7 +55,7 @@ public class AlertManager : IAlertManager
                 alerts = alerts.Concat(_states[client.ClientId].AsReadOnly());
             }
 
-            return alerts.OrderByDescending(alert => alert.OccuredAt);
+            return alerts.OrderByDescending(alert => alert.OccuredAt).ToList();
         }
         finally
         {

Application/Application.csproj

@@ -24,7 +24,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Jint" Version="3.0.0-beta-2047" />
+    <PackageReference Include="Jint" Version="3.0.0-beta-2049" />
     <PackageReference Include="MaxMind.GeoIP2" Version="5.1.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.8">
       <PrivateAssets>all</PrivateAssets>
@@ -32,11 +32,13 @@
     </PackageReference>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
     <PackageReference Include="RestEase" Version="1.5.7" />
+    <PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
+    <PackageReference Include="System.CommandLine.DragonFruit" Version="0.4.0-alpha.22272.1" />
     <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" />
   </ItemGroup>
 
   <PropertyGroup>
-    <ServerGarbageCollection>false</ServerGarbageCollection>
+    <ServerGarbageCollection>true</ServerGarbageCollection>
     <ConcurrentGarbageCollection>true</ConcurrentGarbageCollection>
     <TieredCompilation>true</TieredCompilation>
     <LangVersion>Latest</LangVersion>

Application/ApplicationManager.cs

@@ -581,9 +581,9 @@ namespace IW4MAdmin.Application
                 throw lastException;
             }
 
-            if (successServers != config.Servers.Length)
+            if (successServers != config.Servers.Length && !AppContext.TryGetSwitch("NoConfirmPrompt", out _))
             {
-                if (!Utilities.PromptBool(Utilities.CurrentLocalization.LocalizationIndex["MANAGER_START_WITH_ERRORS"]))
+                if (!Utilities.CurrentLocalization.LocalizationIndex["MANAGER_START_WITH_ERRORS"].PromptBool())
                 {
                     throw lastException;
                 }

Application/Commands/SetLogLevelCommand.cs

@@ -0,0 +1,80 @@
+using System;
+using System.Threading.Tasks;
+using Data.Models.Client;
+using Serilog.Core;
+using Serilog.Events;
+using SharedLibraryCore;
+using SharedLibraryCore.Commands;
+using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Interfaces;
+
+namespace IW4MAdmin.Application.Commands;
+
+public class SetLogLevelCommand : Command
+{
+    private readonly Func<string, LoggingLevelSwitch> _levelSwitchResolver;
+
+    public SetLogLevelCommand(CommandConfiguration config, ITranslationLookup layout, Func<string, LoggingLevelSwitch> levelSwitchResolver) : base(config, layout)
+    {
+        _levelSwitchResolver = levelSwitchResolver;
+
+        Name = "loglevel";
+        Alias = "ll";
+        Description = "set minimum logging level";
+        Permission = EFClient.Permission.Owner;
+        Arguments = new CommandArgument[]
+        {
+            new()
+            {
+                Name = "Log Level",
+                Required = true
+            },
+            new()
+            {
+                Name = "Override",
+                Required = false
+            },
+            new()
+            {
+                Name = "IsDevelopment",
+                Required = false
+            }
+        };
+
+    }
+
+    public override async Task ExecuteAsync(GameEvent gameEvent)
+    {
+        var args = gameEvent.Data.Split(" ");
+        if (!Enum.TryParse<LogEventLevel>(args[0], out var minLevel))
+        {
+            await gameEvent.Origin.TellAsync(new[]
+            {
+                $"Valid log values: {string.Join(",", Enum.GetValues<LogEventLevel>())}"
+            });
+            return;
+        }
+
+        var context = string.Empty;
+        
+        if (args.Length > 1)
+        {
+            context = args[1];
+        }
+
+        var loggingSwitch = _levelSwitchResolver(context);
+        loggingSwitch.MinimumLevel = minLevel;
+
+        if (args.Length > 2 && (args[2] == "1" || args[2].ToLower() == "true"))
+        {
+            AppContext.SetSwitch("IsDevelop", true);
+        }
+        else
+        {
+            AppContext.SetSwitch("IsDevelop", false);
+        }
+
+        await gameEvent.Origin.TellAsync(new[]
+            { $"Set minimum log level to {loggingSwitch.MinimumLevel.ToString()}" });
+    }
+}

Application/DefaultSettings.json

@@ -311,6 +311,10 @@
         {
           "Name": "tdm",
           "Alias": "Team Deathmatch"
+        },
+        {
+	  "Name": "zom",
+          "Alias": "Zombies"
         }
       ]
     },
@@ -1230,6 +1234,46 @@
         {
           "Alias": "Zoo",
           "Name": "mp_zoo"
+        },
+        {
+          "Alias": "Kino der Toten",
+          "Name": "zombie_theater"
+        },
+        {
+          "Alias": "Five",
+          "Name": "zombie_pentagon"
+        },
+        {
+          "Alias": "Ascension",
+          "Name": "zombie_cosmodrome"
+        },
+        {
+          "Alias": "Call of the Dead",
+          "Name":  "zombie_coast"
+        },
+        {
+          "Alias": "Shangri-La",
+          "Name":  "zombie_temple"
+        },
+        {
+          "Alias": "Moon", 
+          "Name":  "zombie_moon"
+        },
+        {
+          "Alias": "Nacht Der Untoten",
+          "Name": "zombie_cod5_prototype"
+        },
+        {
+          "Alias": "Verrückt",
+          "Name": "zombie_cod5_asylum"
+        },
+        {
+          "Alias": "Shi No Numa",
+          "Name": "zombie_cod5_sumpf"
+        },
+        {
+          "Alias": "Der Riese",
+          "Name": "zombie_cod5_factory"
         }	      
       ]
     },
@@ -1715,7 +1759,7 @@
           "Name": "zm_theater"
         },
 	{
-          "Alias": "Moom",
+          "Alias": "Moon",
           "Name": "zm_moon"
         },	
 	{

Application/EventParsers/BaseEventParser.cs

@@ -141,7 +141,7 @@ namespace IW4MAdmin.Application.EventParsers
 
             if (timeMatch.Success)
             {
-                if (timeMatch.Values[0].Contains(":"))
+                if (timeMatch.Values[0].Contains(':'))
                 {
                     gameTime = timeMatch
                         .Values
@@ -181,6 +181,16 @@ namespace IW4MAdmin.Application.EventParsers
                     return ParseMatchStartEvent(logLine, gameTime);
             }
             
+            if (logLine.StartsWith("GSE;"))
+            {
+                return new GameScriptEvent
+                {
+                    ScriptData = logLine,
+                    GameTime = gameTime,
+                    Source = GameEvent.EventSource.Log
+                };
+            }
+
             if (eventKey is null || !_customEventRegistrations.ContainsKey(eventKey))
             {
                 return GenerateDefaultEvent(logLine, gameTime);
@@ -578,11 +588,15 @@ namespace IW4MAdmin.Application.EventParsers
                 return null;
             }
 
-            var message = matchResult.Values[Configuration.Say.GroupMapping[ParserRegex.GroupType.Message]]
+            var message = new string(matchResult.Values[Configuration.Say.GroupMapping[ParserRegex.GroupType.Message]]
-                .Replace(Configuration.LocalizeText, "")
+                .Where(c => !char.IsControl(c)).ToArray());
-                .Trim();
 
-            if (message.Length <= 0)
+            if (message.StartsWith("/"))
+            {
+                message = message[1..];
+            }
+
+            if (String.IsNullOrEmpty(message))
             {
                 return null;
             }

Application/Extensions/StartupExtensions.cs

@@ -8,6 +8,7 @@ using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Serilog;
+using Serilog.Core;
 using Serilog.Events;
 using SharedLibraryCore;
 using SharedLibraryCore.Configuration;
@@ -17,7 +18,10 @@ namespace IW4MAdmin.Application.Extensions
 {
     public static class StartupExtensions
     {
-        private static ILogger _defaultLogger = null;
+        private static ILogger _defaultLogger;
+        private static readonly LoggingLevelSwitch LevelSwitch = new();
+        private static readonly LoggingLevelSwitch MicrosoftLevelSwitch = new();
+        private static readonly LoggingLevelSwitch SystemLevelSwitch = new();
 
         public static IServiceCollection AddBaseLogger(this IServiceCollection services,
             ApplicationConfiguration appConfig)
@@ -29,14 +33,21 @@ namespace IW4MAdmin.Application.Extensions
                     .Build();
 
                 var loggerConfig = new LoggerConfiguration()
-                    .ReadFrom.Configuration(configuration)
+                    .ReadFrom.Configuration(configuration);
-                    .MinimumLevel.Override("Microsoft", LogEventLevel.Warning);
+
+                LevelSwitch.MinimumLevel = Enum.Parse<LogEventLevel>(configuration["Serilog:MinimumLevel:Default"]);
+                MicrosoftLevelSwitch.MinimumLevel = Enum.Parse<LogEventLevel>(configuration["Serilog:MinimumLevel:Override:Microsoft"]);
+                SystemLevelSwitch.MinimumLevel = Enum.Parse<LogEventLevel>(configuration["Serilog:MinimumLevel:Override:System"]);
+
+                loggerConfig = loggerConfig.MinimumLevel.ControlledBy(LevelSwitch);
+                loggerConfig = loggerConfig.MinimumLevel.Override("Microsoft", MicrosoftLevelSwitch)
+                    .MinimumLevel.Override("System", SystemLevelSwitch);
 
                 if (Utilities.IsDevelopment)
                 {
                     loggerConfig = loggerConfig.WriteTo.Console(
                             outputTemplate:
-                            "[{Timestamp:yyyy-MM-dd HH:mm:ss.fff} {Server} {Level:u3}] {Message:lj}{NewLine}{Exception}")
+                            "[{Timestamp:HH:mm:ss} {Server} {Level:u3}] {Message:lj}{NewLine}{Exception}")
                             .MinimumLevel.Override("Microsoft", LogEventLevel.Information)
                             .MinimumLevel.Debug();
                 }
@@ -44,6 +55,15 @@ namespace IW4MAdmin.Application.Extensions
                 _defaultLogger = loggerConfig.CreateLogger();
             }
 
+            services.AddSingleton((string context) =>
+            {
+                return context.ToLower() switch
+                {
+                    "microsoft" => MicrosoftLevelSwitch,
+                    "system" => SystemLevelSwitch,
+                    _ => LevelSwitch
+                };
+            });
             services.AddLogging(builder => builder.AddSerilog(_defaultLogger, dispose: true));
             services.AddSingleton(new LoggerFactory()
                 .AddSerilog(_defaultLogger, true));

Application/IO/BaseConfigurationHandlerV2.cs

@@ -129,7 +129,7 @@ public class BaseConfigurationHandlerV2<TConfigurationType> : IConfigurationHand
                 await _onIo.WaitAsync();
             }
 
-            await using var fileStream = File.OpenWrite(_path);
+            await using var fileStream = File.Create(_path);
             await JsonSerializer.SerializeAsync(fileStream, configuration, _serializerOptions);
             await fileStream.DisposeAsync();
             _configurationInstance = configuration;

Application/IW4MServer.cs

@@ -53,6 +53,7 @@ namespace IW4MAdmin
         private readonly CommandConfiguration _commandConfiguration;
         private EFServer _cachedDatabaseServer;
         private readonly StatManager _statManager;
+        private readonly ApplicationConfiguration _appConfig;
 
         public IW4MServer(
             ServerConfiguration serverConfiguration,
@@ -77,6 +78,7 @@ namespace IW4MAdmin
             _serverCache = serverCache;
             _commandConfiguration = commandConfiguration;
             _statManager = serviceProvider.GetRequiredService<StatManager>();
+            _appConfig =  serviceProvider.GetService<ApplicationConfiguration>();
             
             IGameServerEventSubscriptions.MonitoringStarted += async (gameEvent, token) =>
             {
@@ -375,7 +377,6 @@ namespace IW4MAdmin
                     if (E.Origin.State != ClientState.Connected)
                     {
                         E.Origin.State = ClientState.Connected;
-                        E.Origin.LastConnection = DateTime.UtcNow;
                         E.Origin.Connections += 1;
 
                         ChatHistory.Add(new ChatInfo()
@@ -538,7 +539,7 @@ namespace IW4MAdmin
 
                     E.Target.SetLevel(Permission.User, E.Origin);
                     await Manager.GetPenaltyService().RemoveActivePenalties(E.Target.AliasLinkId, E.Target.NetworkId,
-                        E.Target.GameName, E.Target.CurrentAlias?.IPAddress);
+                        E.Target.GameName, E.Target.CurrentAlias?.IPAddress, new[] {EFPenalty.PenaltyType.Flag});
                     await Manager.GetPenaltyService().Create(unflagPenalty);
                     
                     Manager.QueueEvent(new ClientPenaltyRevokeEvent
@@ -1269,15 +1270,13 @@ namespace IW4MAdmin
 
         private void RunServerCollection()
         {
-            var appConfig = _serviceProvider.GetService<ApplicationConfiguration>();
+            if (DateTime.Now - _lastPlayerCount < _appConfig?.ServerDataCollectionInterval)
-           
-            if (DateTime.Now - _lastPlayerCount < appConfig?.ServerDataCollectionInterval)
             {
                 return;
             }
 
-            var maxItems = Math.Ceiling(appConfig.MaxClientHistoryTime.TotalMinutes /
+            var maxItems = Math.Ceiling(_appConfig!.MaxClientHistoryTime.TotalMinutes /
-                                        appConfig.ServerDataCollectionInterval.TotalMinutes);
+                                        _appConfig.ServerDataCollectionInterval.TotalMinutes);
                     
             while (ClientHistory.ClientCounts.Count > maxItems) 
             {

Application/Main.cs

@@ -38,6 +38,7 @@ using Microsoft.Extensions.Logging;
 using ILogger = Microsoft.Extensions.Logging.ILogger;
 using IW4MAdmin.Plugins.Stats.Client.Abstractions;
 using IW4MAdmin.Plugins.Stats.Client;
+using Microsoft.Extensions.Hosting;
 using Stats.Client.Abstractions;
 using Stats.Client;
 using Stats.Config;
@@ -57,9 +58,30 @@ namespace IW4MAdmin.Application
         /// entrypoint of the application
         /// </summary>
         /// <returns></returns>
-        public static async Task Main(string[] args)
+        public static async Task Main(bool noConfirm = false, int? maxConcurrentRequests = 25, int? requestQueueLimit = 25)
         {
             AppDomain.CurrentDomain.SetData("DataDirectory", Utilities.OperatingDirectory);
+            AppDomain.CurrentDomain.AssemblyResolve += (sender, eventArgs) =>
+            {
+                var libraryName = eventArgs.Name.Split(",").First();
+
+                var overrides = new[] { nameof(SharedLibraryCore), nameof(Stats) };
+                if (!overrides.Contains(libraryName))
+                {
+                    return AppDomain.CurrentDomain.GetAssemblies().FirstOrDefault(asm => asm.FullName == eventArgs.Name);
+                }
+                // added to be a bit more permissive with plugin references
+                return AppDomain.CurrentDomain.GetAssemblies()
+                    .FirstOrDefault(asm => asm.FullName?.StartsWith(libraryName) ?? false);
+            };
+
+            if (noConfirm)
+            {
+                AppContext.SetSwitch("NoConfirmPrompt", true);
+            }
+
+            Environment.SetEnvironmentVariable("MaxConcurrentRequests", (maxConcurrentRequests * Environment.ProcessorCount).ToString());
+            Environment.SetEnvironmentVariable("RequestQueueLimit", requestQueueLimit.ToString());
 
             Console.OutputEncoding = Encoding.UTF8;
             Console.ForegroundColor = ConsoleColor.Gray;
@@ -72,7 +94,7 @@ namespace IW4MAdmin.Application
             Console.WriteLine($" Version {Utilities.GetVersionAsString()}");
             Console.WriteLine("=====================================================");
 
-            await LaunchAsync(args);
+            await LaunchAsync();
         }
 
         /// <summary>
@@ -98,13 +120,13 @@ namespace IW4MAdmin.Application
         /// task that initializes application and starts the application monitoring and runtime tasks
         /// </summary>
         /// <returns></returns>
-        private static async Task LaunchAsync(string[] args)
+        private static async Task LaunchAsync()
         {
             restart:
             ITranslationLookup translationLookup = null;
             var logger = BuildDefaultLogger<Program>(new ApplicationConfiguration());
             Utilities.DefaultLogger = logger;
-            logger.LogInformation("Begin IW4MAdmin startup. Version is {Version} {@Args}", Version, args);
+            logger.LogInformation("Begin IW4MAdmin startup. Version is {Version}", Version);
             
             try
             {
@@ -125,8 +147,7 @@ namespace IW4MAdmin.Application
 
                 await _serverManager.Init();
 
-                _applicationTask = Task.WhenAll(RunApplicationTasksAsync(logger, _serviceProvider),
+                _applicationTask = RunApplicationTasksAsync(logger, _serverManager, _serviceProvider);
-                    _serverManager.Start());
                 
                 await _applicationTask;
                 logger.LogInformation("Shutdown completed successfully");
@@ -185,14 +206,49 @@ namespace IW4MAdmin.Application
         /// runs the core application tasks
         /// </summary>
         /// <returns></returns>
-        private static Task RunApplicationTasksAsync(ILogger logger, IServiceProvider serviceProvider)
+        private static Task RunApplicationTasksAsync(ILogger logger, ApplicationManager applicationManager,
+            IServiceProvider serviceProvider)
         {
-            var webfrontTask = _serverManager.GetApplicationSettings().Configuration().EnableWebFront
-                ? WebfrontCore.Program.GetWebHostTask(_serverManager.CancellationToken)
-                : Task.CompletedTask;
-
             var collectionService = serviceProvider.GetRequiredService<IServerDataCollector>();
             var versionChecker = serviceProvider.GetRequiredService<IMasterCommunication>();
+            var masterCommunicator = serviceProvider.GetRequiredService<IMasterCommunication>();
+            var webfrontLifetime = serviceProvider.GetRequiredService<IHostApplicationLifetime>();
+            using var onWebfrontErrored = new ManualResetEventSlim();
+            
+            var webfrontTask = _serverManager.GetApplicationSettings().Configuration().EnableWebFront
+                ? WebfrontCore.Program.GetWebHostTask(_serverManager.CancellationToken).ContinueWith(continuation =>
+                {
+                    if (!continuation.IsFaulted)
+                    {
+                        return;
+                    }
+
+                    logger.LogCritical("Unable to start webfront task. {Message}",
+                        continuation.Exception?.InnerException?.Message);
+
+                    logger.LogDebug(continuation.Exception, "Unable to start webfront task");
+                    
+                    onWebfrontErrored.Set();
+                    
+                })
+                : Task.CompletedTask;
+
+            if (_serverManager.GetApplicationSettings().Configuration().EnableWebFront)
+            {
+                try
+                {
+                    onWebfrontErrored.Wait(webfrontLifetime.ApplicationStarted);
+                }
+                catch
+                {
+                    // ignored when webfront successfully starts
+                }
+
+                if (onWebfrontErrored.IsSet)
+                {
+                    return Task.CompletedTask;
+                }
+            }
 
             // we want to run this one on a manual thread instead of letting the thread pool handle it,
             // because we can't exit early from waiting on console input, and it prevents us from restarting
@@ -203,10 +259,10 @@ namespace IW4MAdmin.Application
 
             var tasks = new[]
             {
+                applicationManager.Start(),
                 versionChecker.CheckVersion(),
                 webfrontTask,
-                serviceProvider.GetRequiredService<IMasterCommunication>()
+                masterCommunicator.RunUploadStatus(_serverManager.CancellationToken),
-                    .RunUploadStatus(_serverManager.CancellationToken),
                 collectionService.BeginCollectionAsync(cancellationToken: _serverManager.CancellationToken)
             };
 
@@ -377,6 +433,11 @@ namespace IW4MAdmin.Application
             var commandConfigHandler = new BaseConfigurationHandler<CommandConfiguration>("CommandConfiguration");
             commandConfigHandler.BuildAsync().GetAwaiter().GetResult();
 
+            if (appConfigHandler.Configuration()?.MasterUrl == new Uri("http://api.raidmax.org:5000"))
+            {
+                appConfigHandler.Configuration().MasterUrl = new ApplicationConfiguration().MasterUrl;
+            }
+
             var appConfig = appConfigHandler.Configuration();
             var masterUri = Utilities.IsDevelopment
                 ? new Uri("http://127.0.0.1:8080")

Application/Misc/RemoteAssemblyHandler.cs

@@ -13,10 +13,10 @@ namespace IW4MAdmin.Application.Misc
 {
     public class RemoteAssemblyHandler : IRemoteAssemblyHandler
     {
-        private const int keyLength = 32;
+        private const int KeyLength = 32;
-        private const int tagLength = 16;
+        private const int TagLength = 16;
-        private const int nonceLength = 12;
+        private const int NonceLength = 12;
-        private const int iterationCount = 10000;
+        private const int IterationCount = 10000;
 
         private readonly ApplicationConfiguration _appconfig;
         private readonly ILogger _logger;
@@ -30,7 +30,7 @@ namespace IW4MAdmin.Application.Misc
         public IEnumerable<Assembly> DecryptAssemblies(string[] encryptedAssemblies)
         {
             return DecryptContent(encryptedAssemblies)
-                .Select(decryptedAssembly => Assembly.Load(decryptedAssembly));
+                .Select(Assembly.Load);
         }
 
         public IEnumerable<string> DecryptScripts(string[] encryptedScripts)
@@ -38,24 +38,24 @@ namespace IW4MAdmin.Application.Misc
             return DecryptContent(encryptedScripts).Select(decryptedScript => Encoding.UTF8.GetString(decryptedScript));
         }
 
-        private byte[][] DecryptContent(string[] content)
+        private IEnumerable<byte[]> DecryptContent(string[] content)
         {
             if (string.IsNullOrEmpty(_appconfig.Id) || string.IsNullOrWhiteSpace(_appconfig.SubscriptionId))
             {
                 _logger.LogWarning($"{nameof(_appconfig.Id)} and {nameof(_appconfig.SubscriptionId)} must be provided to attempt loading remote assemblies/scripts");
-                return new byte[0][];
+                return Array.Empty<byte[]>();
             }
 
             var assemblies = content.Select(piece =>
             {
-                byte[] byteContent = Convert.FromBase64String(piece);
+                var byteContent = Convert.FromBase64String(piece);
-                byte[] encryptedContent = byteContent.Take(byteContent.Length - (tagLength + nonceLength)).ToArray();
+                var encryptedContent = byteContent.Take(byteContent.Length - (TagLength + NonceLength)).ToArray();
-                byte[] tag = byteContent.Skip(byteContent.Length - (tagLength + nonceLength)).Take(tagLength).ToArray();
+                var tag = byteContent.Skip(byteContent.Length - (TagLength + NonceLength)).Take(TagLength).ToArray();
-                byte[] nonce = byteContent.Skip(byteContent.Length - nonceLength).Take(nonceLength).ToArray();
+                var nonce = byteContent.Skip(byteContent.Length - NonceLength).Take(NonceLength).ToArray();
-                byte[] decryptedContent = new byte[encryptedContent.Length];
+                var decryptedContent = new byte[encryptedContent.Length];
 
-                var keyGen = new Rfc2898DeriveBytes(Encoding.UTF8.GetBytes(_appconfig.SubscriptionId), Encoding.UTF8.GetBytes(_appconfig.Id.ToString()), iterationCount, HashAlgorithmName.SHA512);
+                var keyGen = new Rfc2898DeriveBytes(Encoding.UTF8.GetBytes(_appconfig.SubscriptionId), Encoding.UTF8.GetBytes(_appconfig.Id), IterationCount, HashAlgorithmName.SHA512);
-                var encryption = new AesGcm(keyGen.GetBytes(keyLength));
+                var encryption = new AesGcm(keyGen.GetBytes(KeyLength));
 
                 try
                 {

Application/Misc/ServerDataViewer.cs

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

Application/Plugin/PluginImporter.cs

@@ -20,13 +20,21 @@ namespace IW4MAdmin.Application.Plugin
     public class PluginImporter : IPluginImporter
     {
         private IEnumerable<PluginSubscriptionContent> _pluginSubscription;
-        private static readonly string PluginDir = "Plugins";
+        private const string PluginDir = "Plugins";
         private const string PluginV2Match = "^ *((?:var|const|let) +init)|function init";
         private readonly ILogger _logger;
         private readonly IRemoteAssemblyHandler _remoteAssemblyHandler;
         private readonly IMasterApi _masterApi;
         private readonly ApplicationConfiguration _appConfig;
 
+        private static readonly Type[] FilterTypes =
+        {
+            typeof(IPlugin),
+            typeof(IPluginV2),
+            typeof(Command),
+            typeof(IBaseConfiguration)
+        };
+
         public PluginImporter(ILogger<PluginImporter> logger, ApplicationConfiguration appConfig, IMasterApi masterApi,
             IRemoteAssemblyHandler remoteAssemblyHandler)
         {
@@ -77,23 +85,30 @@ namespace IW4MAdmin.Application.Plugin
         public (IEnumerable<Type>, IEnumerable<Type>, IEnumerable<Type>) DiscoverAssemblyPluginImplementations()
         {
             var pluginDir = $"{Utilities.OperatingDirectory}{PluginDir}{Path.DirectorySeparatorChar}";
-            var pluginTypes = Enumerable.Empty<Type>();
+            var pluginTypes = new List<Type>();
-            var commandTypes = Enumerable.Empty<Type>();
+            var commandTypes = new List<Type>();
-            var configurationTypes = Enumerable.Empty<Type>();
+            var configurationTypes = new List<Type>();
 
-            if (Directory.Exists(pluginDir))
+            if (!Directory.Exists(pluginDir))
             {
+                return (pluginTypes, commandTypes, configurationTypes);
+            }
+
             var dllFileNames = Directory.GetFiles(pluginDir, "*.dll");
             _logger.LogDebug("Discovered {Count} potential plugin assemblies", dllFileNames.Length);
 
-                if (dllFileNames.Length > 0)
+            if (!dllFileNames.Any())
             {
-                    // we only want to load the most recent assembly in case of duplicates
+                return (pluginTypes, commandTypes, configurationTypes);
-                    var assemblies = dllFileNames.Select(name => Assembly.LoadFrom(name))
+            }
-                        .Union(GetRemoteAssemblies())
-                        .GroupBy(assembly => assembly.FullName).Select(assembly => assembly.OrderByDescending(asm => asm.GetName().Version).First());
 
-                    pluginTypes = assemblies
+            // we only want to load the most recent assembly in case of duplicates
+            var assemblies = dllFileNames.Select(Assembly.LoadFrom)
+                .Union(GetRemoteAssemblies())
+                .GroupBy(assembly => assembly.FullName).Select(assembly =>
+                    assembly.OrderByDescending(asm => asm.GetName().Version).First());
+
+            var eligibleAssemblyTypes = assemblies
                 .SelectMany(asm =>
                 {
                     try
@@ -104,47 +119,46 @@ namespace IW4MAdmin.Application.Plugin
                     {
                         return Enumerable.Empty<Type>();
                     }
-                        })
+                }).Where(type =>
-                        .Where(assemblyType => (assemblyType.GetInterface(nameof(IPlugin), false) ?? assemblyType.GetInterface(nameof(IPluginV2), false)) != null)
+                    FilterTypes.Any(filterType => type.GetInterface(filterType.Name, false) != null) ||
-                        .Where(assemblyType => !assemblyType.Namespace?.StartsWith(nameof(SharedLibraryCore)) ?? false);
+                    (type.IsClass && FilterTypes.Contains(type.BaseType)));
             
-                    _logger.LogDebug("Discovered {count} plugin implementations", pluginTypes.Count());
+            foreach (var assemblyType in eligibleAssemblyTypes)
-
-                    commandTypes = assemblies
-                        .SelectMany(asm =>{
-                            try
             {
-                                return asm.GetTypes();
+                var isPlugin =
-                            }
+                    (assemblyType.GetInterface(nameof(IPlugin), false) ??
-                            catch
+                     assemblyType.GetInterface(nameof(IPluginV2), false)) != null &&
-                            {
+                    (!assemblyType.Namespace?.StartsWith(nameof(SharedLibraryCore)) ?? false);
-                                return Enumerable.Empty<Type>();
-                            }
-                        })
-                        .Where(assemblyType => assemblyType.IsClass && assemblyType.BaseType == typeof(Command))
-                        .Where(assemblyType => !assemblyType.Namespace?.StartsWith(nameof(SharedLibraryCore)) ?? false);
 
-                    _logger.LogDebug("Discovered {Count} plugin commands", commandTypes.Count());
+                if (isPlugin)
-
-                    configurationTypes = assemblies
-                        .SelectMany(asm => {
-                            try
                 {
-                                return asm.GetTypes();
+                    pluginTypes.Add(assemblyType);
+                    continue;
                 }
-                            catch
-                            {
-                                return Enumerable.Empty<Type>();
-                            }
-                        })
-                        .Where(asmType =>
-                            asmType.IsClass && asmType.GetInterface(nameof(IBaseConfiguration), false) != null)
-                        .Where(assemblyType => !assemblyType.Namespace?.StartsWith(nameof(SharedLibraryCore)) ?? false);
 
-                    _logger.LogDebug("Discovered {Count} configuration implementations", configurationTypes.Count());
+                var isCommand = assemblyType.IsClass && assemblyType.BaseType == typeof(Command) &&
+                                (!assemblyType.Namespace?.StartsWith(nameof(SharedLibraryCore)) ?? false);
+
+                if (isCommand)
+                {
+                    commandTypes.Add(assemblyType);
+                    continue;
+                }
+
+                var isConfiguration = assemblyType.IsClass &&
+                                      assemblyType.GetInterface(nameof(IBaseConfiguration), false) != null &&
+                                      (!assemblyType.Namespace?.StartsWith(nameof(SharedLibraryCore)) ?? false);
+
+                if (isConfiguration)
+                {
+                    configurationTypes.Add(assemblyType);
                 }
             }
 
+            _logger.LogDebug("Discovered {Count} plugin implementations", pluginTypes.Count);
+            _logger.LogDebug("Discovered {Count} plugin command implementations", commandTypes.Count);
+            _logger.LogDebug("Discovered {Count} plugin configuration implementations", configurationTypes.Count);
+
             return (pluginTypes, commandTypes, configurationTypes);
         }
 
@@ -152,10 +166,11 @@ namespace IW4MAdmin.Application.Plugin
         {
             try
             {
-                if (_pluginSubscription == null)
+                _pluginSubscription ??= _masterApi
-                    _pluginSubscription = _masterApi.GetPluginSubscription(Guid.Parse(_appConfig.Id), _appConfig.SubscriptionId).Result;
+                    .GetPluginSubscription(Guid.Parse(_appConfig.Id), _appConfig.SubscriptionId).Result;
 
-                return _remoteAssemblyHandler.DecryptAssemblies(_pluginSubscription.Where(sub => sub.Type == PluginType.Binary).Select(sub => sub.Content).ToArray());
+                return _remoteAssemblyHandler.DecryptAssemblies(_pluginSubscription
+                    .Where(sub => sub.Type == PluginType.Binary).Select(sub => sub.Content).ToArray());
             }
 
             catch (Exception ex)
@@ -169,9 +184,11 @@ namespace IW4MAdmin.Application.Plugin
         {
             try
             {
-                _pluginSubscription ??= _masterApi.GetPluginSubscription(Guid.Parse(_appConfig.Id), _appConfig.SubscriptionId).Result;
+                _pluginSubscription ??= _masterApi
+                    .GetPluginSubscription(Guid.Parse(_appConfig.Id), _appConfig.SubscriptionId).Result;
 
-                return _remoteAssemblyHandler.DecryptScripts(_pluginSubscription.Where(sub => sub.Type == PluginType.Script).Select(sub => sub.Content).ToArray());
+                return _remoteAssemblyHandler.DecryptScripts(_pluginSubscription
+                    .Where(sub => sub.Type == PluginType.Script).Select(sub => sub.Content).ToArray());
             }
 
             catch (Exception ex)

Application/Plugin/Script/ScriptPluginHelper.cs

@@ -14,8 +14,8 @@ public class ScriptPluginHelper
 {
     private readonly IManager _manager;
     private readonly ScriptPluginV2 _scriptPlugin;
-    private readonly SemaphoreSlim _onRequestRunning = new(1, 5);
+    private readonly SemaphoreSlim _onRequestRunning = new(1, 1);
-    private const int RequestTimeout = 500;
+    private const int RequestTimeout = 5000;
 
     public ScriptPluginHelper(IManager manager, ScriptPluginV2 scriptPlugin)
     {
@@ -67,7 +67,7 @@ public class ScriptPluginHelper
             try
             {
                 await Task.Delay(delayMs, _manager.CancellationToken);
-                _scriptPlugin.ExecuteWithErrorHandling(_ => callback.DynamicInvoke(JsValue.Undefined));
+                _scriptPlugin.ExecuteWithErrorHandling(_ => callback.DynamicInvoke(JsValue.Undefined, new[] { JsValue.Undefined }));
             }
             catch
             {
@@ -76,6 +76,11 @@ public class ScriptPluginHelper
         });
     }
 
+    public void RegisterDynamicCommand(JsValue command)
+    {
+        _scriptPlugin.RegisterDynamicCommand(command.ToObject());
+    }
+
     private object RequestInternal(ScriptPluginWebRequest request)
     {
         var entered = false;

Application/Plugin/Script/ScriptPluginV2.cs

@@ -47,6 +47,7 @@ public class ScriptPluginV2 : IPluginV2
     private readonly List<string> _registeredCommandNames = new();
     private readonly List<string> _registeredInteractions = new();
     private readonly Dictionary<MethodInfo, List<object>> _registeredEvents = new();
+    private IManager _manager;
     private bool _firstInitialization = true;
 
     private record ScriptPluginDetails(string Name, string Author, string Version,
@@ -112,8 +113,15 @@ public class ScriptPluginV2 : IPluginV2
         }, _logger, _fileName, _onProcessingScript);
     }
 
+    public void RegisterDynamicCommand(object command)
+    {
+        var parsedCommand = ParseScriptCommandDetails(command);
+        RegisterCommand(_manager, parsedCommand.First());
+    }
+
     private async Task OnLoad(IManager manager, CancellationToken token)
     {
+        _manager = manager;
         var entered = false;
         try
         {
@@ -253,9 +261,13 @@ public class ScriptPluginV2 : IPluginV2
             command.Permission, command.TargetRequired,
             command.Arguments, Execute, command.SupportedGames);
 
+        manager.RemoveCommandByName(scriptCommand.Name);
         manager.AddAdditionalCommand(scriptCommand);
+        if (!_registeredCommandNames.Contains(scriptCommand.Name))
+        {
             _registeredCommandNames.Add(scriptCommand.Name);
         }
+    }
 
     private void ResetEngineState()
     {
@@ -480,6 +492,33 @@ public class ScriptPluginV2 : IPluginV2
     }
 
     private static ScriptPluginDetails AsScriptPluginInstance(dynamic source)
+    {
+        var commandDetails = ParseScriptCommandDetails(source);
+
+        var interactionDetails = Array.Empty<ScriptPluginInteractionDetails>();
+        if (HasProperty(source, "interactions") && source.interactions is dynamic[])
+        {
+            interactionDetails = ((dynamic[])source.interactions).Select(interaction =>
+            {
+                var name = HasProperty(interaction, "name") && interaction.name is string
+                    ? (string)interaction.name
+                    : string.Empty;
+                var action = HasProperty(interaction, "action") && interaction.action is Delegate
+                    ? (Delegate)interaction.action
+                    : null;
+
+                return new ScriptPluginInteractionDetails(name, action);
+            }).ToArray();
+        }
+
+        var name = HasProperty(source, "name") && source.name is string ? (string)source.name : string.Empty;
+        var author = HasProperty(source, "author") && source.author is string ? (string)source.author : string.Empty;
+        var version = HasProperty(source, "version") && source.version is string ? (string)source.author : string.Empty;
+
+        return new ScriptPluginDetails(name, author, version, commandDetails, interactionDetails);
+    }
+
+    private static ScriptPluginCommandDetails[] ParseScriptCommandDetails(dynamic source)
     {
         var commandDetails = Array.Empty<ScriptPluginCommandDetails>();
         if (HasProperty(source, "commands") && source.commands is dynamic[])
@@ -513,7 +552,7 @@ public class ScriptPluginV2 : IPluginV2
                                        (bool)command.targetRequired;
                 var supportedGames =
                     HasProperty(command, "supportedGames") && command.supportedGames is IEnumerable<object>
-                        ? ((IEnumerable<object>)command.supportedGames).Where(game => game?.ToString() is not null)
+                        ? ((IEnumerable<object>)command.supportedGames).Where(game => !string.IsNullOrEmpty(game?.ToString()))
                         .Select(game =>
                             Enum.Parse<Reference.Game>(game.ToString()!))
                         : Array.Empty<Reference.Game>();
@@ -523,31 +562,10 @@ public class ScriptPluginV2 : IPluginV2
 
                 return new ScriptPluginCommandDetails(name, description, alias, permission, isTargetRequired,
                     commandArgs, supportedGames, execute);
-
             }).ToArray();
         }
 
-        var interactionDetails = Array.Empty<ScriptPluginInteractionDetails>();
+        return commandDetails;
-        if (HasProperty(source, "interactions") && source.interactions is dynamic[])
-        {
-            interactionDetails = ((dynamic[])source.interactions).Select(interaction =>
-            {
-                var name = HasProperty(interaction, "name") && interaction.name is string
-                    ? (string)interaction.name
-                    : string.Empty;
-                var action = HasProperty(interaction, "action") && interaction.action is Delegate
-                    ? (Delegate)interaction.action
-                    : null;
-
-                return new ScriptPluginInteractionDetails(name, action);
-            }).ToArray();
-        }
-
-        var name = HasProperty(source, "name") && source.name is string ? (string)source.name : string.Empty;
-        var author = HasProperty(source, "author") && source.author is string ? (string)source.author : string.Empty;
-        var version = HasProperty(source, "version") && source.version is string ? (string)source.author : string.Empty;
-
-        return new ScriptPluginDetails(name, author, version, commandDetails, interactionDetails);
     }
 
     private static bool HasProperty(dynamic source, string name)

Application/QueryHelpers/ClientResourceQueryHelper.cs

@@ -8,9 +8,11 @@ using Data.Abstractions;
 using Data.Models;
 using Microsoft.EntityFrameworkCore;
 using SharedLibraryCore;
+using SharedLibraryCore.Configuration;
 using SharedLibraryCore.Dtos;
 using SharedLibraryCore.Helpers;
 using SharedLibraryCore.Interfaces;
+using WebfrontCore.Permissions;
 using WebfrontCore.QueryHelpers.Models;
 using EFClient = Data.Models.Client.EFClient;
 
@@ -18,6 +20,7 @@ namespace IW4MAdmin.Application.QueryHelpers;
 
 public class ClientResourceQueryHelper : IResourceQueryHelper<ClientResourceRequest, ClientResourceResponse>
 {
+    public ApplicationConfiguration _appConfig { get; }
     private readonly IDatabaseContextFactory _contextFactory;
     private readonly IGeoLocationService _geoLocationService;
 
@@ -27,8 +30,10 @@ public class ClientResourceQueryHelper : IResourceQueryHelper<ClientResourceRequ
         public EFAlias Alias { get; set; }
     }
 
-    public ClientResourceQueryHelper(IDatabaseContextFactory contextFactory, IGeoLocationService geoLocationService)
+    public ClientResourceQueryHelper(IDatabaseContextFactory contextFactory, IGeoLocationService geoLocationService,
+        ApplicationConfiguration appConfig)
     {
+        _appConfig = appConfig;
         _contextFactory = contextFactory;
         _geoLocationService = geoLocationService;
     }
@@ -75,7 +80,9 @@ public class ClientResourceQueryHelper : IResourceQueryHelper<ClientResourceRequ
 
         if (!string.IsNullOrWhiteSpace(query.ClientIp))
         {
-            clientAliases = SearchByIp(query, clientAliases);
+            clientAliases = SearchByIp(query, clientAliases,
+                _appConfig.HasPermission(query.RequesterPermission, WebfrontEntity.ClientIPAddress,
+                    WebfrontPermission.Read));
         }
 
         var iqGroupedClientAliases = clientAliases.GroupBy(a => new { a.Client.ClientId, a.Client.LastConnection });
@@ -203,7 +210,7 @@ public class ClientResourceQueryHelper : IResourceQueryHelper<ClientResourceRequ
     }
 
     private static IQueryable<ClientAlias> SearchByIp(ClientResourceRequest query,
-        IQueryable<ClientAlias> clientAliases)
+        IQueryable<ClientAlias> clientAliases, bool canSearchIP)
     {
         var ipString = query.ClientIp.Trim();
         var ipAddress = ipString.ConvertToIP();
@@ -213,7 +220,7 @@ public class ClientResourceQueryHelper : IResourceQueryHelper<ClientResourceRequ
             clientAliases = clientAliases.Where(clientAlias =>
                 clientAlias.Alias.IPAddress != null && clientAlias.Alias.IPAddress == ipAddress);
         }
-        else
+        else if(canSearchIP)
         {
             clientAliases = clientAliases.Where(clientAlias =>
                 EF.Functions.Like(clientAlias.Alias.SearchableIPAddress, $"{ipString}%"));

Application/RConParsers/BaseRConParser.cs

@@ -194,10 +194,14 @@ namespace IW4MAdmin.Application.RConParsers
             foreach (var line in response)
             {
                 var regex = Regex.Match(line, parserRegex.Pattern);
-                if (regex.Success && parserRegex.GroupMapping.ContainsKey(groupType))
+                
+                if (!regex.Success || !parserRegex.GroupMapping.ContainsKey(groupType))
                 {
-                    value = regex.Groups[parserRegex.GroupMapping[groupType]].ToString();
+                    continue;
                 }
+
+                value = regex.Groups[parserRegex.GroupMapping[groupType]].ToString();
+                break;
             }
 
             if (value == null)
@@ -304,7 +308,7 @@ namespace IW4MAdmin.Application.RConParsers
                     {
                         networkIdString = match.Values[Configuration.Status.GroupMapping[ParserRegex.GroupType.RConNetworkId]];
 
-                        networkId = networkIdString.IsBotGuid() || (ip == null && ping == 999) ?
+                        networkId = networkIdString.IsBotGuid() || (ip == null && ping is 999 or 0) ?
                             name.GenerateGuidFromString() :
                             networkIdString.ConvertGuidToLong(Configuration.GuidNumberStyle);
                     }

Data/Abstractions/IDataValueCache.cs

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

Data/Context/DatabaseContext.cs

@@ -153,6 +153,8 @@ namespace Data.Context
 
             modelBuilder.Entity<EFClientConnectionHistory>(ent => ent.HasIndex(history => history.CreatedDateTime));
 
+            modelBuilder.Entity<EFServerSnapshot>(ent => ent.HasIndex(snapshot => snapshot.CapturedAt));
+
             // force full name for database conversion
             modelBuilder.Entity<EFClient>().ToTable("EFClients");
             modelBuilder.Entity<EFAlias>().ToTable("EFAlias");

Data/Helpers/DataValueCache.cs

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

Data/Migrations/MySql/20230705133025_AddIndexToEFServerSnapshotCapturedAt.cs

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

Data/Migrations/MySql/MySqlDatabaseContextModelSnapshot.cs

@@ -814,6 +814,7 @@ namespace Data.Migrations.MySql
 
                     b.Property<string>("SearchableIPAddress")
                         .ValueGeneratedOnAddOrUpdate()
+                        .HasMaxLength(255)
                         .HasColumnType("varchar(255)")
                         .HasComputedColumnSql("((IPAddress & 255) || '.' || ((IPAddress >> 8) & 255)) || '.' || ((IPAddress >> 16) & 255) || '.' || ((IPAddress >> 24) & 255)", true);
 
@@ -1110,6 +1111,8 @@ namespace Data.Migrations.MySql
 
                     b.HasKey("ServerSnapshotId");
 
+                    b.HasIndex("CapturedAt");
+
                     b.HasIndex("MapId");
 
                     b.HasIndex("ServerId");

Data/Migrations/Postgresql/20230705133135_AddIndexToEFServerSnapshotCapturedAt.cs

@@ -0,0 +1,52 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Data.Migrations.Postgresql
+{
+    public partial class AddIndexToEFServerSnapshotCapturedAt : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<string>(
+                name: "SearchableIPAddress",
+                table: "EFAlias",
+                type: "character varying(255)",
+                maxLength: 255,
+                nullable: true,
+                computedColumnSql: "((IPAddress & 255) || '.' || ((IPAddress >> 8) & 255)) || '.' || ((IPAddress >> 16) & 255) || '.' || ((IPAddress >> 24) & 255)",
+                stored: true,
+                oldClrType: typeof(string),
+                oldType: "text",
+                oldNullable: true,
+                oldComputedColumnSql: "((IPAddress & 255) || '.' || ((IPAddress >> 8) & 255)) || '.' || ((IPAddress >> 16) & 255) || '.' || ((IPAddress >> 24) & 255)",
+                oldStored: true);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_EFServerSnapshot_CapturedAt",
+                table: "EFServerSnapshot",
+                column: "CapturedAt");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropIndex(
+                name: "IX_EFServerSnapshot_CapturedAt",
+                table: "EFServerSnapshot");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "SearchableIPAddress",
+                table: "EFAlias",
+                type: "text",
+                nullable: true,
+                computedColumnSql: "((IPAddress & 255) || '.' || ((IPAddress >> 8) & 255)) || '.' || ((IPAddress >> 16) & 255) || '.' || ((IPAddress >> 24) & 255)",
+                stored: true,
+                oldClrType: typeof(string),
+                oldType: "character varying(255)",
+                oldMaxLength: 255,
+                oldNullable: true,
+                oldComputedColumnSql: "((IPAddress & 255) || '.' || ((IPAddress >> 8) & 255)) || '.' || ((IPAddress >> 16) & 255) || '.' || ((IPAddress >> 24) & 255)",
+                oldStored: true);
+        }
+    }
+}

Data/Migrations/Postgresql/PostgresqlDatabaseContextModelSnapshot.cs

@@ -853,7 +853,8 @@ namespace Data.Migrations.Postgresql
 
                     b.Property<string>("SearchableIPAddress")
                         .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("text")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)")
                         .HasComputedColumnSql("((IPAddress & 255) || '.' || ((IPAddress >> 8) & 255)) || '.' || ((IPAddress >> 16) & 255) || '.' || ((IPAddress >> 24) & 255)", true);
 
                     b.Property<string>("SearchableName")
@@ -1163,6 +1164,8 @@ namespace Data.Migrations.Postgresql
 
                     b.HasKey("ServerSnapshotId");
 
+                    b.HasIndex("CapturedAt");
+
                     b.HasIndex("MapId");
 
                     b.HasIndex("ServerId");

Data/Migrations/Sqlite/20230705132822_AddIndexToEFServerSnapshotCapturedAt.cs

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

Data/Migrations/Sqlite/SqliteDatabaseContextModelSnapshot.cs

@@ -812,6 +812,7 @@ namespace Data.Migrations.Sqlite
 
                     b.Property<string>("SearchableIPAddress")
                         .ValueGeneratedOnAddOrUpdate()
+                        .HasMaxLength(255)
                         .HasColumnType("TEXT")
                         .HasComputedColumnSql("((IPAddress & 255) || '.' || ((IPAddress >> 8) & 255)) || '.' || ((IPAddress >> 16) & 255) || '.' || ((IPAddress >> 24) & 255)", true);
 
@@ -1108,6 +1109,8 @@ namespace Data.Migrations.Sqlite
 
                     b.HasKey("ServerSnapshotId");
 
+                    b.HasIndex("CapturedAt");
+
                     b.HasIndex("MapId");
 
                     b.HasIndex("ServerId");

Data/Models/Reference.cs

@@ -16,7 +16,8 @@
             T7 = 8,
             SHG1 = 9,
             CSGO = 10,
-            H1 = 11
+            H1 = 11,
+            L4D2 = 12,
         }
         
         public enum ConnectionType

DeploymentFiles/deployment-pipeline.yml

@@ -6,6 +6,7 @@ trigger:
     include:
     - release/pre
     - master
+    - develop
 
 pr: none
 
@@ -20,19 +21,21 @@ variables:
   buildConfiguration: Stable
   isPreRelease: false
 
-steps:
+jobs:
-- task: UseDotNet@2
+  - job: Build_Deploy
+    steps:
+    - task: UseDotNet@2
       displayName: 'Install .NET Core 6 SDK'
       inputs:
         packageType: 'sdk'
         version: '6.0.x'
         includePreviewVersions: true
     
-- task: NuGetToolInstaller@1
+    - task: NuGetToolInstaller@1
     
-- task: PowerShell@2
+    - task: PowerShell@2
       displayName: 'Setup Pre-Release configuration'
-  condition: eq(variables['Build.SourceBranch'], 'refs/heads/release/pre')
+      condition: or(eq(variables['Build.SourceBranch'], 'refs/heads/release/pre'), eq(variables['Build.SourceBranch'], 'refs/heads/develop'))
       inputs:
         targetType: 'inline'
         script: |
@@ -41,12 +44,12 @@ steps:
                 echo '##vso[task.setvariable variable=isPreRelease]true'
         failOnStderr: true
       
-- task: NuGetCommand@2
+    - task: NuGetCommand@2
       displayName: 'Restore nuget packages'
       inputs:
         restoreSolution: '$(solution)'
     
-- task: PowerShell@2
+    - task: PowerShell@2
       displayName: 'Preload external resources'
       inputs:
         targetType: 'inline'
@@ -59,7 +62,7 @@ steps:
         failOnStderr: true
         workingDirectory: '$(Build.Repository.LocalPath)\WebfrontCore\wwwroot'
     
-- task: VSBuild@1
+    - task: VSBuild@1
       displayName: 'Build projects'
       inputs:
         solution: '$(solution)'
@@ -67,7 +70,7 @@ steps:
         platform: '$(buildPlatform)'
         configuration: '$(buildConfiguration)'
           
-- task: PowerShell@2
+    - task: PowerShell@2
       displayName: 'Bundle JS Files'
       inputs:
         targetType: 'inline'
@@ -82,7 +85,7 @@ steps:
         failOnStderr: true
         workingDirectory: '$(Build.Repository.LocalPath)\WebfrontCore'
     
-- task: DotNetCoreCLI@2
+    - task: DotNetCoreCLI@2
       displayName: 'Publish projects'
       inputs:
         command: 'publish'
@@ -94,7 +97,7 @@ steps:
         zipAfterPublish: false
         modifyOutputPath: false
         
-- task: PowerShell@2
+    - task: PowerShell@2
       displayName: 'Run publish script 1'
       inputs:
         filePath: 'DeploymentFiles/PostPublish.ps1'
@@ -102,7 +105,7 @@ steps:
         failOnStderr: true
         workingDirectory: '$(Build.Repository.LocalPath)'
     
-- task: BatchScript@1
+    - task: BatchScript@1
       displayName: 'Run publish script 2'
       inputs:
         filename: 'Application\BuildScripts\PostPublish.bat'
@@ -110,7 +113,7 @@ steps:
         arguments: '$(outputFolder) $(Build.Repository.LocalPath)'
         failOnStandardError: true
         
-- task: PowerShell@2
+    - task: PowerShell@2
       displayName: 'Download dos2unix for line endings'
       inputs:
         targetType: 'inline'
@@ -118,7 +121,7 @@ steps:
         failOnStderr: true
         workingDirectory: '$(Build.Repository.LocalPath)\Application\BuildScripts'
             
-- task: CmdLine@2
+    - task: CmdLine@2
       displayName: 'Convert Linux start script line endings'
       inputs:
         script: |
@@ -129,35 +132,35 @@ steps:
           @echo IW4MAdmin-$(Build.BuildNumber) > $(Build.ArtifactStagingDirectory)\version_$(releaseType).txt
         workingDirectory: '$(Build.Repository.LocalPath)\Application\BuildScripts'
     
-- task: CopyFiles@2
+    - task: CopyFiles@2
       displayName: 'Move script plugins into publish directory'
       inputs:
         SourceFolder: '$(Build.Repository.LocalPath)\Plugins\ScriptPlugins'
         Contents: '*.js'
         TargetFolder: '$(outputFolder)\Plugins'
     
-- task: CopyFiles@2
+    - task: CopyFiles@2
       displayName: 'Move binary plugins into publish directory'
       inputs:
         SourceFolder: '$(Build.Repository.LocalPath)\BUILD\Plugins\'
         Contents: '*.dll'
         TargetFolder: '$(outputFolder)\Plugins'
     
-- task: CmdLine@2
+    - task: CmdLine@2
       displayName: 'Move webfront resources into publish directory'
       inputs:
        script: 'xcopy /s /y /f wwwroot $(outputFolder)\wwwroot'
        workingDirectory: '$(Build.Repository.LocalPath)\BUILD\Plugins'
        failOnStderr: true
     
-- task: CmdLine@2
+    - task: CmdLine@2
       displayName: 'Move gamescript files into publish directory'
       inputs:
        script: 'echo d | xcopy /s /y /f GameFiles $(outputFolder)\GameFiles'
        workingDirectory: '$(Build.Repository.LocalPath)'
        failOnStderr: true
 
-- task: ArchiveFiles@2
+    - task: ArchiveFiles@2
       displayName: 'Generate final zip file'
       inputs:
         rootFolderOrFile: '$(outputFolder)'
@@ -166,12 +169,20 @@ steps:
         archiveFile: '$(Build.ArtifactStagingDirectory)/IW4MAdmin-$(Build.BuildNumber).zip'
         replaceExistingArchive: true
     
-- task: PublishPipelineArtifact@1
+    - task: PublishPipelineArtifact@1
       inputs:
         targetPath: '$(Build.ArtifactStagingDirectory)/IW4MAdmin-$(Build.BuildNumber).zip'
         artifact: 'IW4MAdmin-$(Build.BuildNumber).zip'
         
-- task: FtpUpload@2
+    - task: PublishPipelineArtifact@1
+      displayName: 'Publish artifact for analysis'
+      inputs:
+        targetPath: '$(outputFolder)'
+        artifact: 'IW4MAdmin.$(buildConfiguration)'
+        publishLocation: 'pipeline'
+
+    - task: FtpUpload@2
+      condition: ne(variables['Build.SourceBranch'], 'refs/heads/develop')
       displayName: 'Upload zip file to website'
       inputs:
         credentialsOption: 'inputs'
@@ -186,7 +197,8 @@ steps:
         preservePaths: false
         trustSSL: false
     
-- task: FtpUpload@2
+    - task: FtpUpload@2
+      condition: ne(variables['Build.SourceBranch'], 'refs/heads/develop')
       displayName: 'Upload version info to website'
       inputs:
         credentialsOption: 'inputs'
@@ -201,7 +213,8 @@ steps:
         preservePaths: false
         trustSSL: false
     
-- task: GitHubRelease@1
+    - task: GitHubRelease@1
+      condition: ne(variables['Build.SourceBranch'], 'refs/heads/develop')
       displayName: 'Make GitHub release'
       inputs:
         gitHubConnection: 'github.com_RaidMax'
@@ -214,11 +227,12 @@ steps:
         assets: '$(Build.ArtifactStagingDirectory)/*.zip'
         isPreRelease: $(isPreRelease)
         releaseNotesSource: 'inline'
-    releaseNotesInline: 'todo'
+        releaseNotesInline: 'Automated rolling release - changelog below. [Updating Instructions](https://github.com/RaidMax/IW4M-Admin/wiki/Getting-Started#updating)'
         changeLogCompareToRelease: 'lastNonDraftRelease'
         changeLogType: 'commitBased'
     
-- task: PowerShell@2
+    - task: PowerShell@2
+      condition: ne(variables['Build.SourceBranch'], 'refs/heads/develop')
       displayName: 'Update master version'
       inputs:
         targetType: 'inline'
@@ -237,10 +251,3 @@ steps:
           }
           
           Invoke-RestMethod @params
-
-- task: PublishPipelineArtifact@1
-  displayName: 'Publish artifact for analysis'
-  inputs:
-    targetPath: '$(outputFolder)'
-    artifact: 'IW4MAdmin.$(buildConfiguration)'
-    publishLocation: 'pipeline'

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

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

GameFiles/GameInterface/_integration_base.gsc

@@ -1,6 +1,4 @@
 #include common_scripts\utility;
-#include maps\mp\_utility;
-#include maps\mp\gametypes\_hud_util;
 
 Init()
 {    
@@ -21,18 +19,43 @@ Setup()
 
     level.commonFunctions                           = spawnstruct();
     level.commonFunctions.setDvar                   = "SetDvarIfUninitialized";
-    level.commonFunctions.isBot        = "IsBot";
+    level.commonFunctions.getPlayerFromClientNum    = "GetPlayerFromClientNum";
+    level.commonFunctions.waittillNotifyOrTimeout   = "WaittillNotifyOrTimeout";
+    level.commonFunctions.getInboundData            = "GetInboundData";
+    level.commonFunctions.getOutboundData           = "GetOutboundData";
+    level.commonFunctions.setInboundData            = "SetInboundData";
+    level.commonFunctions.setOutboundData           = "SetOutboundData";
+
+    level.overrideMethods = [];
+    level.overrideMethods[level.commonFunctions.setDvar]                = scripts\_integration_base::NotImplementedFunction;
+    level.overrideMethods[level.commonFunctions.getPlayerFromClientNum] = ::_GetPlayerFromClientNum;
+    level.overrideMethods[level.commonFunctions.getInboundData]  = ::_GetInboundData;
+    level.overrideMethods[level.commonFunctions.getOutboundData] = ::_GetOutboundData;
+    level.overrideMethods[level.commonFunctions.setInboundData]  = ::_SetInboundData;
+    level.overrideMethods[level.commonFunctions.setOutboundData] = ::_SetOutboundData;
+
+    level.busMethods = [];
+    level.busMethods[level.commonFunctions.getInboundData]  = ::_GetInboundData;
+    level.busMethods[level.commonFunctions.getOutboundData] = ::_GetOutboundData;
+    level.busMethods[level.commonFunctions.setInboundData]  = ::_SetInboundData;
+    level.busMethods[level.commonFunctions.setOutboundData] = ::_SetOutboundData;
 
     level.commonKeys = spawnstruct();
+    level.commonKeys.enabled  = "sv_iw4madmin_integration_enabled";
+    level.commonKeys.busMode  = "sv_iw4madmin_integration_busmode";
+    level.commonKeys.busDir   = "sv_iw4madmin_integration_busdir";
+    level.eventBus.inLocation = "";
+    level.eventBus.outLocation = "";
 
     level.notifyTypes                                   = spawnstruct();
     level.notifyTypes.gameFunctionsInitialized          = "GameFunctionsInitialized";
+    level.notifyTypes.sharedFunctionsInitialized        = "SharedFunctionsInitialized";
     level.notifyTypes.integrationBootstrapInitialized   = "IntegrationBootstrapInitialized";
 
     level.clientDataKey = "clientData";
 
     level.eventTypes                            = spawnstruct();
-    level.eventTypes.localClientEvent           = "client_event";
+    level.eventTypes.eventAvailable             = "EventAvailable";
     level.eventTypes.clientDataReceived         = "ClientDataReceived";
     level.eventTypes.clientDataRequested        = "ClientDataRequested";
     level.eventTypes.setClientDataRequested     = "SetClientDataRequested";
@@ -50,12 +73,11 @@ Setup()
     level.clientCommandCallbacks = [];
     level.clientCommandRusAsTarget = [];
     level.logger = spawnstruct();
-    level.overrideMethods = [];
 
     level.iw4madminIntegrationDebug = GetDvarInt( "sv_iw4madmin_integration_debug" );
     InitializeLogger();
 
-    wait ( 0.05 ); // needed to give script engine time to propagate notifies
+    wait ( 0.05 * 2 ); // needed to give script engine time to propagate notifies
 
     level notify( level.notifyTypes.integrationBootstrapInitialized );
     level waittill( level.notifyTypes.gameFunctionsInitialized );
@@ -64,163 +86,58 @@ Setup()
 
     _SetDvarIfUninitialized( level.eventBus.inVar, "" );
     _SetDvarIfUninitialized( level.eventBus.outVar, "" );
-    _SetDvarIfUninitialized( "sv_iw4madmin_integration_enabled", 1 );
+    _SetDvarIfUninitialized( level.commonKeys.enabled, 1 );
+    _SetDvarIfUninitialized( level.commonKeys.busMode, "rcon" );
+    _SetDvarIfUninitialized( level.commonKeys.busdir, "" );
     _SetDvarIfUninitialized( "sv_iw4madmin_integration_debug", 0 );
+    _SetDvarIfUninitialized( "GroupSeparatorChar", "" );
+    _SetDvarIfUninitialized( "RecordSeparatorChar", "" );
+    _SetDvarIfUninitialized( "UnitSeparatorChar", "" );
 
-    if ( GetDvarInt( "sv_iw4madmin_integration_enabled" ) != 1 )
+    if ( GetDvarInt( level.commonKeys.enabled ) != 1 )
     {
         return;
     }
 
     // start long running tasks
-    level thread MonitorClientEvents();
+    thread MonitorEvents();
-    level thread MonitorBus();
+    thread MonitorBus();
-    level thread OnPlayerConnect();
 }
 
-//////////////////////////////////
+MonitorEvents()
-// Client Methods
-//////////////////////////////////
-
-OnPlayerConnect()
 {
-    level endon ( "game_ended" );
+    level endon( level.eventTypes.gameEnd );
 
     for ( ;; ) 
     {
-        level waittill( "connected", player );
+        level waittill( level.eventTypes.eventAvailable, event );
  
-        if ( _IsBot( player ) ) 
+        LogDebug( "Processing Event " + event.type + "-" + event.subtype );
-        {
-            // we don't want to track bots
-            continue;    
-        }
 
-        if ( !IsDefined( player.pers[level.clientDataKey] ) )
+        eventHandler = level.eventCallbacks[event.type];
-        {
-            player.pers[level.clientDataKey] = spawnstruct();
-        }
-        
-        player thread OnPlayerSpawned();
-        player thread OnPlayerJoinedTeam();
-        player thread OnPlayerJoinedSpectators();
-        player thread PlayerTrackingOnInterval();
-    }
-}
-
-OnPlayerSpawned()
-{
-    self endon( "disconnect" );
-
-    for ( ;; )
-    {
-        self waittill( "spawned_player" );
-        self PlayerSpawnEvents();
-    }
-}
-
-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() 
-{
-    for ( ;; )
-    {
-        level waittill( "game_ended" );
-        // note: you can run data code here but it's possible for 
-        // data to get truncated, so we will try a timer based approach for now
-    }
-}
-
-DisplayWelcomeData()
-{
-    self endon( "disconnect" );
-
-    clientData = self.pers[level.clientDataKey];
-    
-    if ( clientData.permissionLevel == "User" || clientData.permissionLevel == "Flagged" ) 
-    {
-        return;
-    } 
-    
-    self IPrintLnBold( "Welcome, your level is ^5" + clientData.permissionLevel );
-    wait( 2.0 );
-    self IPrintLnBold( "You were last seen ^5" + clientData.lastConnection );
-}
-
-PlayerSpawnEvents() 
-{
-    self endon( "disconnect" );
-
-    clientData = self.pers[level.clientDataKey];
-    
-    // this gives IW4MAdmin some time to register the player before making the request;
-    // although probably not necessary some users might have a slow database or poll rate
-    wait ( 2 );
-
-    if ( IsDefined( clientData.state ) && clientData.state == "complete" ) 
-    {
-        return;
-    }
-    
-    self RequestClientBasicData();
-}
-
-PlayerTrackingOnInterval() 
-{
-    self endon( "disconnect" );
-
-    for ( ;; )
-    {
-        wait ( 120 );
-        if ( IsAlive( self ) )
-        {
-            self SaveTrackingMetrics();
-        }
-    }
-}
-
-MonitorClientEvents()
-{
-    level endon( "game_ended" );
-
-    for ( ;; ) 
-    {
-        level waittill( level.eventTypes.localClientEvent, client );
- 
-        LogDebug( "Processing Event " + client.event.type + "-" + client.event.subtype );
-        
-        eventHandler = level.eventCallbacks[client.event.type];
 
         if ( IsDefined( eventHandler ) )
         {
-            client [[eventHandler]]( client.event );
+            if ( IsDefined( event.entity ) )
-            LogDebug( "notify client for " + client.event.type );
+            {
-            client notify( level.eventTypes.localClientEvent, client.event );
+                event.entity [[eventHandler]]( event );
+            }
+            else
+            {
+                [[eventHandler]]( event );
+            }
         }
 
-        client.eventData = [];
+        if ( IsDefined( event.entity ) )
+        {
+            LogDebug( "Notify client for " + event.type );
+            event.entity notify( event.type, event );
+        }
+        else
+        {
+            LogDebug( "Notify level for " + event.type );
+            level notify( event.type, event );
+        }
     }
 }
 
@@ -228,11 +145,13 @@ MonitorClientEvents()
 // Helper Methods
 //////////////////////////////////
 
-_IsBot( entity )
+NotImplementedFunction( a, b, c, d, e, f ) 
 {
-    // there already is a cgame function exists as "IsBot", for IW4, but unsure what all titles have it defined,
+    LogWarning( "Function not implemented" );
-    // so we are defining it here
+    if ( IsDefined ( a ) )
-    return IsDefined( entity.pers["isBot"] ) && entity.pers["isBot"];
+    {
+        LogWarning( a );
+    }
 }
 
 _SetDvarIfUninitialized( dvarName, dvarValue )
@@ -240,9 +159,44 @@ _SetDvarIfUninitialized( dvarName, dvarValue )
     [[level.overrideMethods[level.commonFunctions.setDvar]]]( dvarName, dvarValue );
 }
 
-NotImplementedFunction( a, b, c, d, e, f ) 
+_GetPlayerFromClientNum( clientNum )
 {
-    LogWarning( "Function not implemented" );
+    assertEx( clientNum >= 0, "clientNum cannot be negative" );
+
+    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;
+}
+
+_GetInboundData( location )
+{
+    return GetDvar( level.eventBus.inVar );
+}
+
+_GetOutboundData( location )
+{
+    return GetDvar( level.eventBus.outVar );
+}
+
+_SetInboundData( location, data )
+{
+    return SetDvar( level.eventBus.inVar, data );
+}
+
+_SetOutboundData( location, data )
+{
+    return SetDvar( level.eventBus.outVar, data );
 }
 
 // Not every game can output to console or even game log.
@@ -263,7 +217,7 @@ _Log( LogLevel, message )
 {
     for( i = 0; i < level.logger._logger.size; i++ )
     {
-        [[level.logger._logger[i]]]( LogLevel, message );
+        [[level.logger._logger[i]]]( LogLevel, GetSubStr( message, 0, 1000 ) );
     }
 }
 
@@ -325,13 +279,13 @@ RegisterLogger( logger )
 RequestClientMeta( metaKey )
 {
     getClientMetaEvent = BuildEventRequest( true, level.eventTypes.clientDataRequested, "Meta", self, metaKey );
-    level thread QueueEvent( getClientMetaEvent, level.eventTypes.clientDataRequested, self );
+    thread QueueEvent( getClientMetaEvent, level.eventTypes.clientDataRequested, self );
 }
 
 RequestClientBasicData()
 {
     getClientDataEvent = BuildEventRequest( true, level.eventTypes.clientDataRequested, "None", self, "" );
-    level thread QueueEvent( getClientDataEvent, level.eventTypes.clientDataRequested, self );
+    thread QueueEvent( getClientDataEvent, level.eventTypes.clientDataRequested, self );
 }
 
 IncrementClientMeta( metaKey, incrementValue, clientId )
@@ -344,51 +298,22 @@ 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;
+    data = [];
+    data["key"] = metaKey;
+    data["value"] = metaValue;
     clientNumber = -1;
 
     if ( IsDefined ( clientId ) )
     {
-        data = data + "|clientId=" + clientId;
+        data["clientId"] = clientId;
         clientNumber = -1;
     }
 
     if ( IsDefined( direction ) )
     {
-        data = data + "|direction=" + direction;
+        data["direction"] = direction;
     }
 
     if ( IsPlayer( self ) )
@@ -397,40 +322,7 @@ SetClientMeta( metaKey, metaValue, clientId, direction )
     }
 
     setClientMetaEvent = BuildEventRequest( true, level.eventTypes.setClientDataRequested, "Meta", clientNumber, data );
-    level thread QueueEvent( setClientMetaEvent, level.eventTypes.setClientDataRequested, self );
+    thread QueueEvent( setClientMetaEvent, level.eventTypes.setClientDataRequested, self );
-}
-
-SaveTrackingMetrics()
-{
-    if ( !IsDefined( self.persistentClientId ) )
-    {
-        return;
-    }
-
-    LogDebug( "Saving tracking metrics for " + self.persistentClientId );
-    
-    if ( !IsDefined( self.lastShotCount ) )
-    {
-        self.lastShotCount = 0;
-    }
-
-    currentShotCount = self [[level.overrideMethods["GetTotalShotsFired"]]]();
-    change = currentShotCount - self.lastShotCount;
-    self.lastShotCount = currentShotCount;
-
-    LogDebug( "Total Shots Fired increased by " + change );
-
-    if ( !IsDefined( change ) )
-    {
-        change = 0;
-    }
-    
-    if ( change == 0 )
-    {
-        return;
-    }
-
-    IncrementClientMeta( "TotalShotsFired", change, self.persistentClientId );
 }
 
 BuildEventRequest( responseExpected, eventType, eventSubtype, entOrId, data ) 
@@ -445,6 +337,11 @@ BuildEventRequest( responseExpected, eventType, eventSubtype, entOrId, data )
         eventSubtype = "None";
     }
 
+    if ( !IsDefined( entOrId ) )
+    {
+        entOrId = "-1";
+    }
+
     if ( IsPlayer( entOrId ) )
     {
         entOrId = entOrId getEntityNumber();
@@ -457,51 +354,64 @@ BuildEventRequest( responseExpected, eventType, eventSubtype, entOrId, data )
         request = "1";
     }
 
-    request = request + ";" + eventType + ";" + eventSubtype + ";" + entOrId + ";" + data;
+    data = BuildDataString( data );
+    groupSeparator = GetSubStr( GetDvar( "GroupSeparatorChar" ), 0, 1 );
+    request = request + groupSeparator + eventType + groupSeparator + eventSubtype + groupSeparator + entOrId + groupSeparator + data;
+
     return request;
 }
 
 MonitorBus()
 {
-    level endon( "game_ended" );
+    level endon( level.eventTypes.gameEnd );
+
+    level.eventBus.inLocation = level.eventBus.inVar + "_" + GetDvar( "net_port" );
+    level.eventBus.outLocation = level.eventBus.outVar + "_" + GetDvar( "net_port" );
+
+    [[level.overrideMethods[level.commonFunctions.SetInboundData]]]( level.eventBus.inLocation, "" );
+    [[level.overrideMethods[level.commonFunctions.SetOutboundData]]]( level.eventBus.outLocation, "" );
 
     for( ;; )
     {
         wait ( 0.1 );
 
         // check to see if IW4MAdmin is ready to receive more data
-        if ( getDvar( level.eventBus.inVar ) == "" ) 
+        inVal = [[level.busMethods[level.commonFunctions.getInboundData]]]( level.eventBus.inLocation );
+
+        if ( !IsDefined( inVal ) || inVal == "" )
         {
             level notify( "bus_ready" );
         }
 
-        eventString = getDvar( level.eventBus.outVar );
+        eventString = [[level.busMethods[level.commonFunctions.getOutboundData]]]( level.eventBus.outLocation );
 
-        if ( eventString == "" ) 
+        if ( !IsDefined( eventString ) || eventString == "" ) 
         {
             continue;
         }
+
         LogDebug( "-> " + eventString );
 
-        NotifyClientEvent( strtok( eventString, ";" ) );
+        groupSeparator = GetSubStr( GetDvar( "GroupSeparatorChar" ), 0, 1 );
+        NotifyEvent( strtok( eventString, groupSeparator ) );
 
-        SetDvar( level.eventBus.outVar, "" );
+        [[level.busMethods[level.commonFunctions.SetOutboundData]]]( level.eventBus.outLocation, "" );
     }
 }
 
 QueueEvent( request, eventType, notifyEntity ) 
 {
-    level endon( "game_ended" );
+    level endon( level.eventTypes.gameEnd );
 
     start = GetTime();
     maxWait = level.eventBus.timeout * 1000; // 30 seconds
     timedOut = "";
 
-    while ( GetDvar( level.eventBus.inVar ) != "" && ( GetTime() - start ) < maxWait )
+    while ( [[level.busMethods[level.commonFunctions.getInboundData]]]( level.eventBus.inLocation ) != "" && ( GetTime() - start ) < maxWait )
     {
-        level [[level.overrideMethods["waittill_notify_or_timeout"]]]( "bus_ready", 1 );
+        level [[level.overrideMethods[level.commonFunctions.waittillNotifyOrTimeout]]]( "bus_ready", 1 );
         
-        if ( GetDvar( level.eventBus.inVar ) != "" )
+        if ( [[level.busMethods[level.commonFunctions.getInboundData]]]( level.eventBus.inLocation ) != "" )
         {
             LogDebug( "A request is already in progress..." );
             timedOut = "set";
@@ -511,7 +421,7 @@ QueueEvent( request, eventType, notifyEntity )
         timedOut = "unset";
     }
 
-    if ( timedOut == "set")
+    if ( timedOut == "set" )
     {
         LogDebug( "Timed out waiting for response..." );
         
@@ -520,14 +430,14 @@ QueueEvent( request, eventType, notifyEntity )
             notifyEntity NotifyClientEventTimeout( eventType );
         }
         
-        SetDvar( level.eventBus.inVar, "" );
+        [[level.busMethods[level.commonFunctions.SetInboundData]]]( level.eventBus.inLocation, "" );
 
         return;
     }
 
-    LogDebug("<- " + request );
+    LogDebug( "<- " + request );
 
-    SetDvar( level.eventBus.inVar, request );
+    [[level.busMethods[level.commonFunctions.setInboundData]]]( level.eventBus.inLocation, request );
 }
 
 ParseDataString( data ) 
@@ -538,13 +448,13 @@ ParseDataString( data )
         return [];
     }
 
-    dataParts = strtok( data, "|" );
+    dataParts = strtok( data, GetSubStr( GetDvar( "RecordSeparatorChar" ), 0, 1 ) );
     dict = [];
 
     for ( i = 0; i < dataParts.size; i++ )
     {
         part = dataParts[i];
-        splitPart = strtok( part, "=" );
+        splitPart = strtok( part, GetSubStr( GetDvar( "UnitSeparatorChar" ), 0, 1 ) );
         key = splitPart[0];
         value = splitPart[1];
         dict[key] = value;
@@ -554,6 +464,26 @@ ParseDataString( data )
     return dict;
 }
 
+BuildDataString( data )
+{
+    if ( IsString( data ) )
+    {
+        return data;
+    }
+
+    dataString = "";
+    keys = GetArrayKeys( data );
+    unitSeparator = GetSubStr( GetDvar( "UnitSeparatorChar" ), 0, 1 );
+    recordSeparator = GetSubStr( GetDvar( "RecordSeparatorChar" ), 0, 1 );
+
+    for ( i = 0; i < keys.size; i++ )
+    {
+        dataString = dataString + keys[i] + unitSeparator + data[keys[i]] + recordSeparator;
+    }
+
+    return dataString;
+}
+
 NotifyClientEventTimeout( eventType ) 
 {
     // todo: make this actual eventing
@@ -563,23 +493,18 @@ NotifyClientEventTimeout( eventType )
     }
 }
 
-NotifyClientEvent( eventInfo )
+NotifyEvent( eventInfo )
 {
-    origin = getPlayerFromClientNum( int( eventInfo[3] ) );
+    origin = [[level.overrideMethods[level.commonFunctions.getPlayerFromClientNum]]]( int( eventInfo[3] ) );
-    target = getPlayerFromClientNum( int( eventInfo[4] ) );
+    target = [[level.overrideMethods[level.commonFunctions.getPlayerFromClientNum]]]( int( eventInfo[4] ) );
 
     event = spawnstruct();
     event.type = eventInfo[1];
     event.subtype = eventInfo[2];
-    event.data = eventInfo[5];
+    event.data = ParseDataString( eventInfo[5] );
     event.origin = origin;
     event.target = target;
 
-    if ( IsDefined( event.data ) )
-    {
-        LogDebug( "NotifyClientEvent->" + event.data );
-    }
-    
     if ( int( eventInfo[3] ) != -1 && !IsDefined( origin ) )
     {
         LogDebug( "origin is null but the slot id is " + int( eventInfo[3] ) );
@@ -589,41 +514,15 @@ NotifyClientEvent( eventInfo )
         LogDebug( "target is null but the slot id is " + int( eventInfo[4] ) );
     }
 
-    if ( IsDefined( target ) )
+    client = event.origin;
+
+    if ( !IsDefined( client ) )
     {
         client = event.target;
     }
-    else if ( IsDefined( origin ) )
-    {
-        client = event.origin;
-    }
-    else
-    {
-        LogDebug( "Neither origin or target are set but we are a Client Event, aborting" );
 
-        return;
+    event.entity = client;
-    }
+    level notify( level.eventTypes.eventAvailable, event );
-    
-    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 )
@@ -643,7 +542,7 @@ AddClientCommand( commandName, shouldRunAsTarget, callback, shouldOverwrite )
 
 OnClientDataReceived( event )
 {
-    event.data = ParseDataString( event.data );
+    assertEx( isDefined( self ), "player entity is not defined");
     clientData = self.pers[level.clientDataKey];
 
     if ( event.subtype == "Fail" ) 
@@ -663,7 +562,7 @@ OnClientDataReceived( event )
         metaKey = event.data[0];
         clientData.meta[metaKey] = event.data[metaKey];
 
- 	    LogDebug( "Meta Key=" + metaKey + ", Meta Value=" + event.data[metaKey] );
+ 	    LogDebug( "Meta Key=" + CoerceUndefined( metaKey ) + ", Meta Value=" + CoerceUndefined( event.data[metaKey] ) );
 
         return;
     }
@@ -675,13 +574,11 @@ OnClientDataReceived( event )
     clientData.performance = event.data["performance"];
     clientData.state = "complete";
     self.persistentClientId = event.data["clientId"];
-
-    self thread DisplayWelcomeData();
 }
 
 OnExecuteCommand( event ) 
 {
-    data = ParseDataString( event.data );
+    data = event.data;
     response = "";
 
     command = level.clientCommandCallbacks[event.subtype];
@@ -695,7 +592,14 @@ OnExecuteCommand( event )
 
     if ( IsDefined( command ) ) 
     {
-        response = executionContextEntity [[command]]( event, data );
+        if ( IsDefined( executionContextEntity ) )
+        {
+            response = executionContextEntity thread [[command]]( event, data );
+        }
+        else
+        {
+            thread [[command]]( event );
+        }
     }
     else
     {
@@ -711,6 +615,15 @@ OnExecuteCommand( event )
 
 OnSetClientDataCompleted( event )
 {
-    // IW4MAdmin let us know it persisted (success or fail)
+    LogDebug( "Set Client Data -> subtype = " + CoerceUndefined( event.subType ) + ", status = " + CoerceUndefined( event.data["status"] ) );
-    LogDebug( "Set Client Data -> subtype = " + event.subType + " status = " + event.data["status"] );
+}
+
+CoerceUndefined( object )
+{
+    if ( !IsDefined( object ) )
+    {
+        return "undefined";
+    }
+
+    return object;
 }

GameFiles/GameInterface/_integration_iw4x.gsc

@@ -2,24 +2,23 @@
 
 Init()
 {
-    level.eventBus.gamename = "IW4";
-
     thread Setup();
 }
 
 Setup()
 {
     level endon( "game_ended" );
+    waittillframeend;
     
-    // it's possible that the notify type has not been defined yet so we have to hard code it 
+    level waittill( level.notifyTypes.sharedFunctionsInitialized );
-    level waittill( "IntegrationBootstrapInitialized" );
+    level.eventBus.gamename = "IW4";
     
     scripts\_integration_base::RegisterLogger( ::Log2Console );
     
-    level.overrideMethods["GetTotalShotsFired"]                                    = ::GetTotalShotsFired;
+    level.overrideMethods[level.commonFunctions.getTotalShotsFired]                = ::GetTotalShotsFired;
-    level.overrideMethods[level.commonFunctions.setDvar]                           = ::_SetDvarIfUninitialized;
+    level.overrideMethods[level.commonFunctions.setDvar]                           = ::SetDvarIfUninitializedWrapper;
-    level.overrideMethods[level.commonFunctions.isBot]                             = ::IsTestClient;
+    level.overrideMethods[level.commonFunctions.isBot]                             = ::IsBotWrapper;
-    level.overrideMethods["waittill_notify_or_timeout"]                            = ::_waittill_notify_or_timeout;
+    level.overrideMethods[level.commonFunctions.getXuid]                           = ::GetXuidWrapper;
     level.overrideMethods[level.commonFunctions.changeTeam]                        = ::ChangeTeam;
     level.overrideMethods[level.commonFunctions.getTeamCounts]                     = ::CountPlayers;
     level.overrideMethods[level.commonFunctions.getMaxClients]                     = ::GetMaxClients;
@@ -28,17 +27,25 @@ Setup()
     level.overrideMethods[level.commonFunctions.getClientKillStreak]               = ::GetClientKillStreak;
     level.overrideMethods[level.commonFunctions.backupRestoreClientKillStreakData] = ::BackupRestoreClientKillStreakData;
     level.overrideMethods[level.commonFunctions.waitTillAnyTimeout]                = ::WaitTillAnyTimeout;
+    level.overrideMethods[level.commonFunctions.waittillNotifyOrTimeout]           = ::WaitillNotifyOrTimeoutWrapper;
+
+    level.overrideMethods[level.commonFunctions.getInboundData]  = ::GetInboundData;
+    level.overrideMethods[level.commonFunctions.getOutboundData] = ::GetOutboundData;
+    level.overrideMethods[level.commonFunctions.setInboundData]  = ::SetInboundData;
+    level.overrideMethods[level.commonFunctions.setOutboundData] = ::SetOutboundData;
 
     RegisterClientCommands();
     
     level notify( level.notifyTypes.gameFunctionsInitialized );
 
-    if ( GetDvarInt( "sv_iw4madmin_integration_enabled" ) != 1 )
+    scripts\_integration_base::_SetDvarIfUninitialized( level.commonKeys.busdir, GetDvar( "fs_homepath" ) + "userraw/" + "scriptdata" );
+    
+    if ( GetDvarInt( level.commonKeys.enabled ) != 1 )
     {
         return;
     }
     
-    level thread OnPlayerConnect();
+    thread OnPlayerConnect();
 }
 
 OnPlayerConnect()
@@ -49,7 +56,7 @@ OnPlayerConnect()
     {
         level waittill( "connected", player );
         
-        if ( player call [[ level.overrideMethods[ level.commonFunctions.isBot ] ]]() ) 
+        if ( player IsTestClient() ) 
         {
             // we don't want to track bots
             continue;
@@ -85,7 +92,7 @@ WaitForClientEvents()
 
     for ( ;; )
     {
-        self waittill( level.eventTypes.localClientEvent, event );
+        self waittill( level.eventTypes.eventAvailable, event );
 
 	    scripts\_integration_base::LogDebug( "Received client event " + event.type );
         
@@ -97,6 +104,26 @@ WaitForClientEvents()
     }
 }
 
+GetInboundData( location )
+{
+    return FileRead( location );
+}
+
+GetOutboundData( location )
+{
+    return FileRead( location );
+}
+
+SetInboundData( location, data )
+{
+    FileWrite( location, data, "write" );
+}
+
+SetOutboundData( location, data )
+{
+    FileWrite( location, data, "write" );
+}
+
 GetMaxClients()
 {
     return level.maxClients;
@@ -184,12 +211,7 @@ GetTotalShotsFired()
     return maps\mp\_utility::getPlayerStat( "mostshotsfired" );
 }
 
-_SetDvarIfUninitialized( dvar, value )
+WaitillNotifyOrTimeoutWrapper( _notify, timeout )
-{
-    SetDvarIfUninitialized( dvar, value );
-}
-
-_waittill_notify_or_timeout( _notify, timeout )
 {
     common_scripts\utility::waittill_notify_or_timeout( _notify, timeout );
 }
@@ -199,6 +221,21 @@ Log2Console( logLevel, message )
     PrintConsole( "[" + logLevel + "] " + message + "\n" );
 }
 
+SetDvarIfUninitializedWrapper( dvar, value )
+{
+    SetDvarIfUninitialized( dvar, value );
+}
+
+GetXuidWrapper()
+{
+    return self GetXUID();
+}
+
+IsBotWrapper( client )
+{
+    return client IsTestClient(); 
+}
+
 //////////////////////////////////
 // GUID helpers
 /////////////////////////////////
@@ -512,11 +549,7 @@ HideImpl()
 
 AlertImpl( event, data )
 {
-    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 );
-    }
-
     return "Sent alert to " + self.name; 
 }
 

GameFiles/GameInterface/_integration_iw5.gsc

@@ -1,92 +1,46 @@
 #include common_scripts\utility;
 
+#inline scripts\_integration_utility;
+
 Init()
 {
-    level.eventBus.gamename = "IW5";
-
     thread Setup();
 }
 
 Setup()
 {
     level endon( "game_ended" );
+    waittillframeend;
 
-    // it's possible that the notify type has not been defined yet so we have to hard code it 
+    level waittill( level.notifyTypes.sharedFunctionsInitialized );
-    level waittill( "IntegrationBootstrapInitialized" );
+    level.eventBus.gamename = "IW5";
 
-    scripts\mp\_integration_base::RegisterLogger( ::Log2Console );
+    scripts\_integration_base::RegisterLogger( ::Log2Console );
-    
-    level.overrideMethods["GetTotalShotsFired"] = ::GetTotalShotsFired;
-    level.overrideMethods["SetDvarIfUninitialized"] = ::_SetDvarIfUninitialized;
-    level.overrideMethods["waittill_notify_or_timeout"] = ::_waittill_notify_or_timeout;
-    level.overrideMethods[level.commonFunctions.isBot] = ::IsTestClient;
 
+    level.overrideMethods[level.commonFunctions.getTotalShotsFired]         = ::GetTotalShotsFired;
+    level.overrideMethods[level.commonFunctions.setDvar]                    = ::SetDvarIfUninitializedWrapper;
+    level.overrideMethods[level.commonFunctions.waittillNotifyOrTimeout]    = ::WaitillNotifyOrTimeoutWrapper;
+    level.overrideMethods[level.commonFunctions.isBot]                      = ::IsBotWrapper;
+    level.overrideMethods[level.commonFunctions.getXuid]                    = ::GetXuidWrapper;
+    level.overrideMethods[level.commonFunctions.waitTillAnyTimeout]      = ::WaitTillAnyTimeout;
     RegisterClientCommands();
 
     level notify( level.notifyTypes.gameFunctionsInitialized );
-    
-    if ( GetDvarInt( "sv_iw4madmin_integration_enabled" ) != 1 )
-    {
-        return;
-    }
-    
-    level thread OnPlayerConnect();
-}
-
-OnPlayerConnect()
-{
-    level endon ( "game_ended" );
-
-    for ( ;; )
-    {
-        level waittill( "connected", player );
-        
-        if ( player call [[ level.overrideMethods[ level.commonFunctions.isBot ] ]]() ) 
-        {
-            // we don't want to track bots
-            continue;    
-        }
-        
-        player thread SetPersistentData();
-        player thread WaitForClientEvents();
-    }
 }
 
 RegisterClientCommands() 
 {
-    scripts\mp\_integration_base::AddClientCommand( "GiveWeapon",     true,  ::GiveWeaponImpl );
+    scripts\_integration_base::AddClientCommand( "GiveWeapon",     true,  ::GiveWeaponImpl );
-    scripts\mp\_integration_base::AddClientCommand( "TakeWeapons",    true,  ::TakeWeaponsImpl );
+    scripts\_integration_base::AddClientCommand( "TakeWeapons",    true,  ::TakeWeaponsImpl );
-    scripts\mp\_integration_base::AddClientCommand( "SwitchTeams",    true,  ::TeamSwitchImpl );
+    scripts\_integration_base::AddClientCommand( "SwitchTeams",    true,  ::TeamSwitchImpl );
-    scripts\mp\_integration_base::AddClientCommand( "Hide",           false, ::HideImpl );
+    scripts\_integration_base::AddClientCommand( "Hide",           false, ::HideImpl );
-    scripts\mp\_integration_base::AddClientCommand( "Alert",          true,  ::AlertImpl );
+    scripts\_integration_base::AddClientCommand( "Alert",          true,  ::AlertImpl );
-    scripts\mp\_integration_base::AddClientCommand( "Goto",           false, ::GotoImpl );
+    scripts\_integration_base::AddClientCommand( "Goto",           false, ::GotoImpl );
-    scripts\mp\_integration_base::AddClientCommand( "Kill",           true,  ::KillImpl );
+    scripts\_integration_base::AddClientCommand( "Kill",           true,  ::KillImpl );
-    scripts\mp\_integration_base::AddClientCommand( "SetSpectator",   true,  ::SetSpectatorImpl );
+    scripts\_integration_base::AddClientCommand( "SetSpectator",   true,  ::SetSpectatorImpl );
-    scripts\mp\_integration_base::AddClientCommand( "LockControls",   true,  ::LockControlsImpl ); 
+    scripts\_integration_base::AddClientCommand( "LockControls",   true,  ::LockControlsImpl ); 
-    scripts\mp\_integration_base::AddClientCommand( "PlayerToMe",     true,  ::PlayerToMeImpl );
+    scripts\_integration_base::AddClientCommand( "PlayerToMe",     true,  ::PlayerToMeImpl );
-    scripts\mp\_integration_base::AddClientCommand( "NoClip",         false, ::NoClipImpl );
+    scripts\_integration_base::AddClientCommand( "NoClip",         false, ::NoClipImpl );
-}
-
-WaitForClientEvents()
-{
-    self endon( "disconnect" );
-    
-    // example of requesting a meta value
-    lastServerMetaKey = "LastServerPlayed";
-    // self scripts\mp\_integration_base::RequestClientMeta( lastServerMetaKey );
-
-    for ( ;; )
-    {
-        self waittill( level.eventTypes.localClientEvent, event );
-
-	    scripts\mp\_integration_base::LogDebug( "Received client event " + event.type );
-        
-        if ( event.type == level.eventTypes.clientDataReceived && event.data[0] == lastServerMetaKey )
-        {
-            clientData = self.pers[level.clientDataKey];
-            lastServerPlayed = clientData.meta[lastServerMetaKey];
-        }
-    }
 }
 
 GetTotalShotsFired()
@@ -94,12 +48,12 @@ GetTotalShotsFired()
     return maps\mp\_utility::getPlayerStat( "mostshotsfired" );
 }
 
-_SetDvarIfUninitialized( dvar, value )
+SetDvarIfUninitializedWrapper( dvar, value )
 {
     SetDvarIfUninitialized( dvar, value );
 }
 
-_waittill_notify_or_timeout( _notify, timeout )
+WaitillNotifyOrTimeoutWrapper( _notify, timeout )
 {
     common_scripts\utility::waittill_notify_or_timeout( _notify, timeout );
 }
@@ -109,135 +63,19 @@ Log2Console( logLevel, message )
     Print( "[" + logLevel + "] " + message + "\n" );
 }
 
-//////////////////////////////////
+IsBotWrapper( client )
-// GUID helpers
-/////////////////////////////////
-
-SetPersistentData() 
 {
-    self endon( "disconnect" );
+    return client IsTestClient(); 
-    
-    guidHigh = self GetPlayerData( "bests", "none" ); 
-    guidLow = self GetPlayerData( "awards", "none" );
-    persistentGuid = guidHigh + "," + guidLow;
-    guidIsStored = guidHigh != 0 && guidLow != 0;
-     
-    if ( guidIsStored )
-    {
-        // give IW4MAdmin time to collect IP
-        wait( 15 );
-        scripts\mp\_integration_base::LogDebug( "Uploading persistent guid " + persistentGuid );
-        scripts\mp\_integration_base::SetClientMeta( "PersistentClientGuid", persistentGuid );
-        return;
-    }
-    
-    guid = self SplitGuid();
-    
-    scripts\mp\_integration_base::LogDebug( "Persisting client guid " + guidHigh + "," + guidLow );
-    
-    self SetPlayerData( "bests", "none", guid["high"] );
-    self SetPlayerData( "awards", "none", guid["low"] );
 }
 
-SplitGuid()
+GetXuidWrapper()
 {
-    guid = self GetGuid();
+    return self GetXUID();
-    
-    if ( isDefined( self.guid ) )
-    {
-        guid = self.guid;
-    }
-    
-    firstPart = 0;
-    secondPart = 0;
-    stringLength = 17;
-    firstPartExp = 0;
-    secondPartExp = 0;
-    
-    for ( i = stringLength - 1; i > 0; i-- )
-    {
-        char = GetSubStr( guid, i - 1, i );
-        if ( char == "" ) 
-        {
-            char = "0";
-        }
-        
-        if ( i > stringLength / 2 )
-        {
-            value = GetIntForHexChar( char );
-            power = Pow( 16, secondPartExp );
-            secondPart = secondPart + ( value * power );
-            secondPartExp++;
-        }   
-        else
-        {
-            value = GetIntForHexChar( char );
-            power = Pow( 16, firstPartExp );
-            firstPart = firstPart + ( value * power );
-            firstPartExp++;
-        }
-    }
-    
-    split = [];
-    split["low"] = int( secondPart );
-    split["high"] = int( firstPart );
-
-    return split;
 }
 
-Pow( num, exponent )
+WaitTillAnyTimeout( timeOut, string1, string2, string3, string4, string5 )
 {
-    result = 1;
+    return common_scripts\utility::waittill_any_timeout( timeOut, string1, string2, string3, string4, string5 );
-    while( exponent != 0 )
-    {
-        result = result * num;
-        exponent--;
-    }
-    
-    return result;
-}
-
-GetIntForHexChar( char )
-{
-    char = ToLower( char );
-    // generated by co-pilot because I can't be bothered to make it more "elegant"
-    switch( char )
-    {
-        case "0":
-            return 0;
-        case "1":
-            return 1;
-        case "2":
-            return 2;
-        case "3":
-            return 3;
-        case "4":
-            return 4;
-        case "5":
-            return 5;
-        case "6":
-            return 6;
-        case "7":
-            return 7;
-        case "8":
-            return 8;
-        case "9":
-            return 9;
-        case "a":
-            return 10;
-        case "b":
-            return 11;
-        case "c":
-            return 12;
-        case "d":
-            return 13;
-        case "e":
-            return 14;
-        case "f":
-            return 15;
-        default:
-            return 0;
-    }
 }
 
 //////////////////////////////////
@@ -246,10 +84,7 @@ GetIntForHexChar( char )
 
 GiveWeaponImpl( event, data )
 {
-    if ( !IsAlive( self ) )
+    _IS_ALIVE( self );
-    {
-        return self.name + "^7 is not alive";
-    }
 
     self IPrintLnBold( "You have been given a new weapon" );
     self GiveWeapon( data["weaponName"] );
@@ -260,10 +95,7 @@ GiveWeaponImpl( event, data )
 
 TakeWeaponsImpl()
 {
-    if ( !IsAlive( self ) )
+    _IS_ALIVE( self );
-    {
-        return self.name + "^7 is not alive";
-    }
 
     self TakeAllWeapons();
     self IPrintLnBold( "All your weapons have been taken" );
@@ -273,10 +105,7 @@ TakeWeaponsImpl()
 
 TeamSwitchImpl()
 {
-    if ( !IsAlive( self ) )
+    _IS_ALIVE( self );
-    {
-        return self + "^7 is not alive";
-    }
 
     team = level.allies;
 
@@ -294,10 +123,7 @@ TeamSwitchImpl()
 
 LockControlsImpl()
 {
-    if ( !IsAlive( self ) )
+    _IS_ALIVE( self );
-    {
-        return self.name + "^7 is not alive";
-    }
 
     if ( !IsDefined ( self.isControlLocked ) )
     {
@@ -334,6 +160,8 @@ LockControlsImpl()
 
 NoClipImpl()
 {
+    _VERIFY_PLAYER_ENT( self );
+
     if ( !IsAlive( self ) )
     {
         self IPrintLnBold( "You are not alive" );
@@ -379,10 +207,11 @@ NoClipImpl()
 
 HideImpl()
 {
+    _VERIFY_PLAYER_ENT( self );
+
     if ( !IsAlive( self ) )
     {
         self IPrintLnBold( "You are not alive" );
-        return;
     }
 
     if ( !IsDefined ( self.isHidden ) )
@@ -420,10 +249,7 @@ HideImpl()
 
 AlertImpl( event, data )
 {
-    if ( level.eventBus.gamename == "IW5" ) {
     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; 
 }
 
@@ -441,6 +267,8 @@ GotoImpl( event, data )
 
 GotoCoordImpl( data )
 {
+    _VERIFY_PLAYER_ENT( self );
+
     if ( !IsAlive( self ) )
     {
         self IPrintLnBold( "You are not alive" );
@@ -454,6 +282,8 @@ GotoCoordImpl( data )
 
 GotoPlayerImpl( target )
 {
+    _VERIFY_PLAYER_ENT( self );
+
     if ( !IsAlive( target ) )
     {
         self IPrintLnBold( target.name + " is not alive" );
@@ -466,10 +296,7 @@ GotoPlayerImpl( target )
 
 PlayerToMeImpl( event )
 {
-    if ( !IsAlive( self ) )
+    _IS_ALIVE( self );
-    {
-        return self.name + " is not alive";
-    }
 
     self SetOrigin( event.origin GetOrigin() );
     return "Moved here " + self.name;    
@@ -477,10 +304,7 @@ PlayerToMeImpl( event )
 
 KillImpl()
 {
-    if ( !IsAlive( self ) )
+    _IS_ALIVE( self );
-    {
-        return self.name + " is not alive";
-    }
 
     self Suicide();
     self IPrintLnBold( "You were killed by " + self.name );
@@ -490,6 +314,8 @@ KillImpl()
 
 SetSpectatorImpl()
 {
+    _VERIFY_PLAYER_ENT( self );
+
     if ( self.pers["team"] == "spectator" ) 
     {
         return self.name + " is already spectating";

GameFiles/GameInterface/_integration_shared.gsc

@@ -1,4 +1,3 @@
-
 Init()
 {
     thread Setup();
@@ -6,8 +5,11 @@ Init()
 
 Setup()
 {
+    wait ( 0.05 );
     level endon( "game_ended" );
     
+    level waittill( level.notifyTypes.integrationBootstrapInitialized );
+    
     level.commonFunctions.changeTeam                        = "ChangeTeam";
     level.commonFunctions.getTeamCounts                     = "GetTeamCounts";
     level.commonFunctions.getMaxClients                     = "GetMaxClients";
@@ -15,7 +17,10 @@ Setup()
     level.commonFunctions.getClientTeam                     = "GetClientTeam";
     level.commonFunctions.getClientKillStreak               = "GetClientKillStreak";
     level.commonFunctions.backupRestoreClientKillStreakData = "BackupRestoreClientKillStreakData";
+    level.commonFunctions.getTotalShotsFired                = "GetTotalShotsFired"; 
     level.commonFunctions.waitTillAnyTimeout                = "WaitTillAnyTimeout";
+    level.commonFunctions.isBot                             = "IsBot";
+    level.commonFunctions.getXuid                           = "GetXuid";
     
     level.overrideMethods[level.commonFunctions.changeTeam]                        = scripts\_integration_base::NotImplementedFunction;
     level.overrideMethods[level.commonFunctions.getTeamCounts]                     = scripts\_integration_base::NotImplementedFunction;
@@ -25,31 +30,52 @@ Setup()
     level.overrideMethods[level.commonFunctions.getClientKillStreak]               = scripts\_integration_base::NotImplementedFunction;
     level.overrideMethods[level.commonFunctions.backupRestoreClientKillStreakData] = scripts\_integration_base::NotImplementedFunction;
     level.overrideMethods[level.commonFunctions.waitTillAnyTimeout]                = scripts\_integration_base::NotImplementedFunction;
+    level.overrideMethods[level.commonFunctions.getXuid]                           = scripts\_integration_base::NotImplementedFunction;
+    level.overrideMethods[level.commonFunctions.isBot]                             = scripts\_integration_base::NotImplementedFunction;
     
     // these can be overridden per game if needed
     level.commonKeys.team1         = "allies"; 
     level.commonKeys.team2         = "axis";
     level.commonKeys.teamSpectator = "spectator";
+    level.commonKeys.autoBalance   = "sv_iw4madmin_autobalance";
     
     level.eventTypes.connect     = "connected";
     level.eventTypes.disconnect  = "disconnect";
     level.eventTypes.joinTeam    = "joined_team";
+    level.eventTypes.joinSpec    = "joined_spectators";
     level.eventTypes.spawned	 = "spawned_player";
     level.eventTypes.gameEnd     = "game_ended";
 
+    level.eventTypes.urlRequested             = "UrlRequested";
+    level.eventTypes.urlRequestCompleted      = "UrlRequestCompleted";
+    level.eventTypes.registerCommandRequested = "RegisterCommandRequested";
+    level.eventTypes.getCommandsRequested     = "GetCommandsRequested";
+    level.eventTypes.getBusModeRequested      = "GetBusModeRequested";
+
+    level.eventCallbacks[level.eventTypes.urlRequestCompleted]  = ::OnUrlRequestCompletedCallback;
+    level.eventCallbacks[level.eventTypes.getCommandsRequested] = ::OnCommandsRequestedCallback;
+    level.eventCallbacks[level.eventTypes.getBusModeRequested]  = ::OnBusModeRequestedCallback;
+    
     level.iw4madminIntegrationDefaultPerformance = 200;
+    level.notifyEntities = [];
+    level.customCommands = [];
     
-    if ( GetDvarInt( "sv_iw4madmin_integration_enabled" ) != 1 )
+    level notify( level.notifyTypes.sharedFunctionsInitialized );
+    level waittill( level.notifyTypes.gameFunctionsInitialized );
+
+    scripts\_integration_base::_SetDvarIfUninitialized( level.commonKeys.autoBalance, 0 ); 
+
+    if ( GetDvarInt( level.commonKeys.enabled ) != 1 )
     {
         return;
     }
     
-    if ( GetDvarInt( "sv_iw4madmin_autobalance" ) != 1 )
+    thread OnPlayerConnect();
-    {
+}
-        return;
-    }
 
-    level thread OnPlayerConnect();
+_IsBot( player )
+{
+    return [[level.overrideMethods[level.commonFunctions.isBot]]]( player );
 }
 
 OnPlayerConnect()
@@ -60,6 +86,27 @@ OnPlayerConnect()
     {
         level waittill( level.eventTypes.connect, player );
         
+        if ( _IsBot( player ) ) 
+        {
+            // 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();
+
+        if ( GetDvarInt( level.commonKeys.autoBalance ) != 1 || !IsDefined( [[level.overrideMethods[level.commonFunctions.getTeamBased]]]() ) ) 
+        {
+            continue;
+        }
+        
         if ( ![[level.overrideMethods[level.commonFunctions.getTeamBased]]]() ) 
         {
             continue;
@@ -68,13 +115,341 @@ OnPlayerConnect()
         teamToJoin = player GetTeamToJoin();
         player [[level.overrideMethods[level.commonFunctions.changeTeam]]]( teamToJoin );
         
-        player thread OnClientFirstSpawn();
+        player thread OnPlayerFirstSpawn();
-        player thread OnClientJoinedTeam();
+        player thread OnPlayerDisconnect();
-        player thread OnClientDisconnect();
     }
 }
 
-OnClientDisconnect()
+PlayerSpawnEvents() 
+{
+    self endon( level.eventTypes.disconnect );
+
+    clientData = self.pers[level.clientDataKey];
+    
+    // this gives IW4MAdmin some time to register the player before making the request;
+    // although probably not necessary some users might have a slow database or poll rate
+    wait ( 2 );
+
+    if ( IsDefined( clientData.state ) && clientData.state == "complete" ) 
+    {
+        return;
+    }
+    
+    self scripts\_integration_base::RequestClientBasicData();
+
+    self waittill( level.eventTypes.clientDataReceived, clientEvent );
+
+    if ( clientData.permissionLevel == "User" || clientData.permissionLevel == "Flagged" ) 
+    {
+        return;
+    } 
+
+    self IPrintLnBold( "Welcome, your level is ^5" + clientData.permissionLevel );
+    wait( 2.0 );
+    self IPrintLnBold( "You were last seen ^5" + clientData.lastConnection + " ago" );
+}
+
+
+PlayerTrackingOnInterval() 
+{
+    self endon( level.eventTypes.disconnect );
+
+    for ( ;; )
+    {
+        wait ( 120 );
+        if ( IsAlive( self ) )
+        {
+            self SaveTrackingMetrics();
+        }
+    }
+}
+
+SaveTrackingMetrics()
+{
+    if ( !IsDefined( self.persistentClientId ) )
+    {
+        return;
+    }
+
+    scripts\_integration_base::LogDebug( "Saving tracking metrics for " + self.persistentClientId );
+    
+    if ( !IsDefined( self.lastShotCount ) )
+    {
+        self.lastShotCount = 0;
+    }
+
+    currentShotCount = self [[level.overrideMethods["GetTotalShotsFired"]]]();
+    change = currentShotCount - self.lastShotCount;
+    self.lastShotCount = currentShotCount;
+
+    scripts\_integration_base::LogDebug( "Total Shots Fired increased by " + change );
+
+    if ( !IsDefined( change ) )
+    {
+        change = 0;
+    }
+    
+    if ( change == 0 )
+    {
+        return;
+    }
+
+    scripts\_integration_base::IncrementClientMeta( "TotalShotsFired", change, self.persistentClientId );
+}
+
+OnBusModeRequestedCallback( event )
+{
+    data = [];
+    data["mode"] = GetDvar( level.commonKeys.busMode );
+    data["directory"] = GetDvar( level.commonKeys.busDir );
+    data["inLocation"] = level.eventBus.inLocation;
+    data["outLocation"] = level.eventBus.outLocation;
+
+    scripts\_integration_base::LogDebug( "Bus mode requested" );
+
+    busModeRequest = scripts\_integration_base::BuildEventRequest( false, level.eventTypes.getBusModeRequested, "", undefined, data );
+    scripts\_integration_base::QueueEvent( busModeRequest, level.eventTypes.getBusModeRequested, undefined );
+
+    scripts\_integration_base::LogDebug( "Bus mode updated" );
+
+    if ( GetDvar( level.commonKeys.busMode ) == "file" && GetDvar( level.commonKeys.busDir ) != "" )
+    {
+        level.busMethods[level.commonFunctions.getInboundData]  = level.overrideMethods[level.commonFunctions.getInboundData]; 
+        level.busMethods[level.commonFunctions.getOutboundData] = level.overrideMethods[level.commonFunctions.getOutboundData];
+        level.busMethods[level.commonFunctions.setInboundData]  = level.overrideMethods[level.commonFunctions.setInboundData]; 
+        level.busMethods[level.commonFunctions.setOutboundData] = level.overrideMethods[level.commonFunctions.setOutboundData];
+    }
+}
+
+// #region register script command
+
+OnCommandsRequestedCallback( event )
+{
+    scripts\_integration_base::LogDebug( "Get commands requested" );
+    thread SendCommands( event.data["name"] );
+}
+
+SendCommands( commandName )
+{
+    level endon( level.eventTypes.gameEnd );
+
+    for ( i = 0; i < level.customCommands.size; i++ )
+    {
+        data = level.customCommands[i];
+
+        if ( IsDefined( commandName ) && commandName != data["name"] )
+        {
+            continue;        
+        }
+
+        scripts\_integration_base::LogDebug( "Sending custom command " + ( i + 1 ) + "/" + level.customCommands.size + ": " + data["name"] );
+        commandRegisterRequest = scripts\_integration_base::BuildEventRequest( false, level.eventTypes.registerCommandRequested, "", undefined, data );
+        // not threading here as there might be a lot of commands to register
+        scripts\_integration_base::QueueEvent( commandRegisterRequest, level.eventTypes.registerCommandRequested, undefined );
+    }
+}
+
+RegisterScriptCommandObject( command )
+{
+    RegisterScriptCommand( command.eventKey, command.name, command.alias, command.description, command.minPermission, command.supportedGames, command.requiresTarget, command.handler );
+}
+
+RegisterScriptCommand( eventKey, name, alias, description, minPermission, supportedGames, requiresTarget, handler )
+{
+    if ( !IsDefined( eventKey ) )
+    {
+        scripts\_integration_base::LogError( "eventKey must be provided for script command" );
+        return;
+    }
+
+    data = [];
+
+    data["eventKey"] = eventKey;
+
+    if ( IsDefined( name ) )
+    {
+        data["name"] = name;
+    }
+    else
+    {
+        scripts\_integration_base::LogError( "name must be provided for script command" );
+        return;
+    }
+
+    if ( IsDefined( alias ) )
+    {
+        data["alias"] = alias;
+    }
+
+    if ( IsDefined( description ) )
+    {
+        data["description"] = description;
+    }
+
+    if ( IsDefined( minPermission ) )
+    {
+        data["minPermission"] = minPermission;
+    }
+    
+    if ( IsDefined( supportedGames ) )
+    {
+        data["supportedGames"] = supportedGames;
+    }
+
+    data["requiresTarget"] = false;
+
+    if ( IsDefined( requiresTarget ) )
+    {
+        data["requiresTarget"] = requiresTarget;
+    }
+
+    if ( IsDefined( handler ) )
+    {
+        level.clientCommandCallbacks[eventKey + "Execute"] = handler;
+        level.clientCommandRusAsTarget[eventKey + "Execute"] = data["requiresTarget"];
+    }
+    else
+    {
+        scripts\_integration_base::LogWarning( "handler not defined for script command " + name );
+    }
+
+    level.customCommands[level.customCommands.size] = data;
+}
+
+// #end region
+
+// #region web requests
+
+RequestUrlObject( request )
+{
+    return RequestUrl( request.url, request.method, request.body, request.headers, request );
+}
+
+RequestUrl( url, method, body, headers, webNotify )
+{
+    if ( !IsDefined( webNotify ) )
+    {
+        webNotify = SpawnStruct();
+        webNotify.url = url;
+        webNotify.method = method;
+        webNotify.body = body;
+        webNotify.headers = headers;
+    }
+
+    webNotify.index = GetNextNotifyEntity();
+
+    scripts\_integration_base::LogDebug( "next notify index is " + webNotify.index );
+    level.notifyEntities[webNotify.index] = webNotify;
+
+    data = [];
+    data["url"] = webNotify.url;
+    data["entity"] = webNotify.index;
+
+    if ( IsDefined( method ) )
+    {
+        data["method"] = method;
+    }
+
+    if ( IsDefined( body ) )
+    {
+        data["body"] = body;
+    }
+
+    if ( IsDefined( headers ) )
+    {
+        headerString = "";
+
+        keys = GetArrayKeys( headers );
+        for ( i = 0; i < keys.size; i++ )
+        {
+            headerString = headerString + keys[i] + ":" + headers[keys[i]] + ",";
+        }
+
+        data["headers"] = headerString;
+    }
+
+    webNotifyEvent = scripts\_integration_base::BuildEventRequest( true, level.eventTypes.urlRequested, "", webNotify.index, data );
+    thread scripts\_integration_base::QueueEvent( webNotifyEvent, level.eventTypes.urlRequested, webNotify );
+    webNotify thread WaitForUrlRequestComplete();
+
+    return webNotify;
+}
+
+WaitForUrlRequestComplete()
+{
+    level endon( level.eventTypes.gameEnd );
+
+    timeoutResult = self [[level.overrideMethods[level.commonFunctions.waitTillAnyTimeout]]]( 30, level.eventTypes.urlRequestCompleted );
+
+    if ( timeoutResult == level.eventBus.timeoutKey )
+    {
+        scripts\_integration_base::LogWarning( "Request to " + self.url  + " timed out" );
+        self notify ( level.eventTypes.urlRequestCompleted, "error" );
+    }
+
+    scripts\_integration_base::LogDebug( "Request to " + self.url  + " completed" );
+
+    level.notifyEntities[self.index] = undefined;
+}
+
+OnUrlRequestCompletedCallback( event )
+{
+    if ( !IsDefined( event ) || !IsDefined( event.data ) )
+    {
+        scripts\_integration_base::LogWarning( "Incomplete data for url request callback. [1]" );
+        return;
+    }
+
+    notifyEnt = event.data["entity"];
+    response = event.data["response"];
+
+    if ( !IsDefined( notifyEnt ) || !IsDefined( response ) )
+    {
+        scripts\_integration_base::LogWarning( "Incomplete data for url request callback. [2] " + scripts\_integration_base::CoerceUndefined( notifyEnt ) + " , " +  scripts\_integration_base::CoerceUndefined( response ) );
+        return;
+    }
+
+    webNotify = level.notifyEntities[int( notifyEnt )];
+    
+    if ( !IsDefined( webNotify.response ) )
+    {
+        webNotify.response = response;
+    }
+    else
+    {
+        webNotify.response = webNotify.response + response;
+    }
+
+    if ( int( event.data["remaining"] ) != 0 ) 
+    {
+        scripts\_integration_base::LogDebug( "Additional data available for url request " + notifyEnt + " (" + event.data["remaining"] + " chunks remaining)" );
+        return;
+    }
+
+    scripts\_integration_base::LogDebug( "Notifying " + notifyEnt + " that url request completed"  );
+    webNotify notify( level.eventTypes.urlRequestCompleted, webNotify.response );
+}
+
+GetNextNotifyEntity()
+{
+    max = level.notifyEntities.size + 1;
+
+    for ( i = 0; i < max; i++ )
+    {
+        if ( !IsDefined( level.notifyEntities[i] ) )
+        {
+            return i;
+        }
+    }
+
+    return max;
+}
+
+// #end region
+
+// #region team balance
+
+OnPlayerDisconnect()
 {
     level endon( level.eventTypes.gameEnd );
     self endon( "disconnect_logic_end" );
@@ -89,7 +464,7 @@ OnClientDisconnect()
     }
 }
 
-OnClientJoinedTeam()
+OnPlayerJoinedTeam()
 {
     self endon( level.eventTypes.disconnect );
 
@@ -97,6 +472,14 @@ OnClientJoinedTeam()
     {
         self waittill( level.eventTypes.joinTeam );
 
+        wait( 0.25 ); 
+        LogPrint( GenerateJoinTeamString( false ) );
+
+        if ( GetDvarInt( level.commonKeys.autoBalance ) != 1 )
+        {
+            continue;
+        }
+
         if ( IsDefined( self.wasAutoBalanced ) && self.wasAutoBalanced )
         {
             self.wasAutoBalanced = false;
@@ -124,12 +507,34 @@ OnClientJoinedTeam()
     }
 }
 
-OnClientFirstSpawn()
+OnPlayerSpawned()
+{
+    self endon( level.eventTypes.disconnect );
+
+    for ( ;; )
+    {
+        self waittill( level.eventTypes.spawned );
+        self thread PlayerSpawnEvents();
+    }
+}
+
+OnPlayerJoinedSpectators()
+{
+    self endon( level.eventTypes.disconnect );
+
+    for( ;; )
+    {
+        self waittill( level.eventTypes.joinSpec );
+        LogPrint( GenerateJoinTeamString( true ) );
+    }
+}
+
+OnPlayerFirstSpawn()
 {
     self endon( level.eventTypes.disconnect );
     timeoutResult = self [[level.overrideMethods[level.commonFunctions.waitTillAnyTimeout]]]( 30, level.eventTypes.spawned );
 
-    if ( timeoutResult != "timeout" )
+    if ( timeoutResult != level.eventBus.timeoutKey )
     {
        return;
     }
@@ -324,7 +729,7 @@ GetClosestPerformanceClientForTeam( sourceTeam, excluded )
 
         else if ( candidateValue < closest )
         {
-            scripts\_integration_base::LogDebug( candidateValue + " is the new best value ");
+            scripts\_integration_base::LogDebug( candidateValue + " is the new best value " );
             choice = players[i];
             closest = candidateValue;
         }
@@ -449,3 +854,36 @@ GetClientPerformanceOrDefault()
 
     return performance;
 }
+
+GenerateJoinTeamString( isSpectator ) 
+{
+    team = self.team;
+
+    if ( IsDefined( self.joining_team ) )
+    {
+        team = self.joining_team;
+    }
+    else
+    {
+        if ( isSpectator || !IsDefined( team ) ) 
+        {
+            team = "spectator";
+        }
+    }
+
+    guid = self [[level.overrideMethods[level.commonFunctions.getXuid]]]();
+
+    if ( guid == "0" )
+    {
+        guid = self.guid;
+    }
+
+    if ( !IsDefined( guid ) || guid == "0" )
+    {
+        guid = "undefined";
+    }
+
+    return "JT;" + guid + ";" + self getEntityNumber() + ";" + team + ";" + self.name + "\n";
+}
+
+// #end region

GameFiles/GameInterface/_integration_t5.gsc

@@ -2,90 +2,43 @@
 
 Init()
 {
-    level.eventBus.gamename = "T5";
-
     thread Setup();
 }
 
 Setup()
 {
     level endon( "game_ended" );
+    waittillframeend;
     
-    // it's possible that the notify type has not been defined yet so we have to hard code it 
+    level waittill( level.notifyTypes.sharedFunctionsInitialized );
-    level waittill( "IntegrationBootstrapInitialized" );
+    level.eventBus.gamename = "T5";
     
-    scripts\mp\_integration_base::RegisterLogger( ::Log2Console );
+    scripts\_integration_base::RegisterLogger( ::Log2Console );
     
-    level.overrideMethods["GetTotalShotsFired"] = ::GetTotalShotsFired;
+    level.overrideMethods[level.commonFunctions.getTotalShotsFired]      = ::GetTotalShotsFired;
-    level.overrideMethods["SetDvarIfUninitialized"] = ::_SetDvarIfUninitialized;
+    level.overrideMethods[level.commonFunctions.setDvar]                 = ::SetDvarIfUninitializedWrapper;
-    level.overrideMethods["waittill_notify_or_timeout"] = ::_waittill_notify_or_timeout;
+    level.overrideMethods[level.commonFunctions.waittillNotifyOrTimeout] = ::WaitillNotifyOrTimeoutWrapper;
+    level.overrideMethods[level.commonFunctions.isBot]                   = ::IsBotWrapper;
+    level.overrideMethods[level.commonFunctions.getXuid]                 = ::GetXuidWrapper;
     
     RegisterClientCommands();
     
     level notify( level.notifyTypes.gameFunctionsInitialized );
-    
-    if ( GetDvarInt( "sv_iw4madmin_integration_enabled" ) != 1 )
-    {
-        return;
-    }
-    
-    level thread OnPlayerConnect();
-}
-
-OnPlayerConnect()
-{
-    level endon ( "game_ended" );
-
-    for ( ;; )
-    {
-        level waittill( "connected", player );
-        
-        if ( scripts\mp\_integration_base::_IsBot( player ) ) 
-        {
-            // we don't want to track bots
-            continue;    
-        }
-        
-        //player thread SetPersistentData();
-        player thread WaitForClientEvents();
-    }
 }
 
 RegisterClientCommands() 
 {
-    scripts\mp\_integration_base::AddClientCommand( "GiveWeapon",     true,  ::GiveWeaponImpl );
+    scripts\_integration_base::AddClientCommand( "GiveWeapon",     true,  ::GiveWeaponImpl );
-    scripts\mp\_integration_base::AddClientCommand( "TakeWeapons",    true,  ::TakeWeaponsImpl );
+    scripts\_integration_base::AddClientCommand( "TakeWeapons",    true,  ::TakeWeaponsImpl );
-    scripts\mp\_integration_base::AddClientCommand( "SwitchTeams",    true,  ::TeamSwitchImpl );
+    scripts\_integration_base::AddClientCommand( "SwitchTeams",    true,  ::TeamSwitchImpl );
-    scripts\mp\_integration_base::AddClientCommand( "Hide",           false, ::HideImpl );
+    scripts\_integration_base::AddClientCommand( "Hide",           false, ::HideImpl );
-    scripts\mp\_integration_base::AddClientCommand( "Alert",          true,  ::AlertImpl );
+    scripts\_integration_base::AddClientCommand( "Alert",          true,  ::AlertImpl );
-    scripts\mp\_integration_base::AddClientCommand( "Goto",           false, ::GotoImpl );
+    scripts\_integration_base::AddClientCommand( "Goto",           false, ::GotoImpl );
-    scripts\mp\_integration_base::AddClientCommand( "Kill",           true,  ::KillImpl );
+    scripts\_integration_base::AddClientCommand( "Kill",           true,  ::KillImpl );
-    scripts\mp\_integration_base::AddClientCommand( "SetSpectator",   true,  ::SetSpectatorImpl );
+    scripts\_integration_base::AddClientCommand( "SetSpectator",   true,  ::SetSpectatorImpl );
-    scripts\mp\_integration_base::AddClientCommand( "LockControls",   true,  ::LockControlsImpl );
+    scripts\_integration_base::AddClientCommand( "LockControls",   true,  ::LockControlsImpl );
-    scripts\mp\_integration_base::AddClientCommand( "PlayerToMe",     true,  ::PlayerToMeImpl );
+    scripts\_integration_base::AddClientCommand( "PlayerToMe",     true,  ::PlayerToMeImpl );
-    scripts\mp\_integration_base::AddClientCommand( "NoClip",         false, ::NoClipImpl );
+    scripts\_integration_base::AddClientCommand( "NoClip",         false, ::NoClipImpl );
-}
-
-WaitForClientEvents()
-{
-    self endon( "disconnect" );
-    
-    // example of requesting a meta value
-    lastServerMetaKey = "LastServerPlayed";
-    // self scripts\mp\_integration_base::RequestClientMeta( lastServerMetaKey );
-
-    for ( ;; )
-    {
-        self waittill( level.eventTypes.localClientEvent, event );
-
-	    scripts\mp\_integration_base::LogDebug( "Received client event " + event.type );
-        
-        if ( event.type == level.eventTypes.clientDataReceived && event.data[0] == lastServerMetaKey )
-        {
-            clientData = self.pers[level.clientDataKey];
-            lastServerPlayed = clientData.meta[lastServerMetaKey];
-        }
-    }
 }
 
 GetTotalShotsFired()
@@ -93,12 +46,12 @@ GetTotalShotsFired()
     return maps\mp\gametypes\_persistence::statGet( "total_shots" );
 }
 
-_SetDvarIfUninitialized(dvar, value)
+SetDvarIfUninitializedWrapper( dvar, value )
 {
-    maps\mp\_utility::set_dvar_if_unset(dvar, value);
+    maps\mp\_utility::set_dvar_if_unset( dvar, value );
 }
 
-_waittill_notify_or_timeout( msg, timer )
+WaitillNotifyOrTimeoutWrapper( msg, timer )
 {
 	self endon( msg );
 	wait( timer );
@@ -111,7 +64,6 @@ Log2Console( logLevel, message )
 
 God()
 {
-
     if ( !IsDefined( self.godmode ) )
     {
         self.godmode = false;
@@ -129,137 +81,16 @@ God()
     }
 }
 
-//////////////////////////////////
+IsBotWrapper( client )
-// GUID helpers
-/////////////////////////////////
-
-/*SetPersistentData() 
 {
-    self endon( "disconnect" );
+    return client maps\mp\_utility::is_bot();
-    
-    guidHigh = self GetPlayerData( "bests", "none" ); 
-    guidLow = self GetPlayerData( "awards", "none" );
-    persistentGuid = guidHigh + "," + guidLow;
-    guidIsStored = guidHigh != 0 && guidLow != 0;
-     
-    if ( guidIsStored )
-    {
-        // give IW4MAdmin time to collect IP
-        wait( 15 );
-        scripts\mp\_integration_base::LogDebug( "Uploading persistent guid " + persistentGuid );
-        scripts\mp\_integration_base::SetClientMeta( "PersistentClientGuid", persistentGuid );
-        return;
-    }
-    
-    guid = self SplitGuid();
-    
-    scripts\mp\_integration_base::LogDebug( "Persisting client guid " + guidHigh + "," + guidLow );
-    
-    self SetPlayerData( "bests", "none", guid["high"] );
-    self SetPlayerData( "awards", "none", guid["low"] );
 }
 
-SplitGuid()
+GetXuidWrapper()
 {
-    guid = self GetGuid();
+    return self GetGuid();
-    
-    if ( isDefined( self.guid ) )
-    {
-        guid = self.guid;
-    }
-    
-    firstPart = 0;
-    secondPart = 0;
-    stringLength = 17;
-    firstPartExp = 0;
-    secondPartExp = 0;
-    
-    for ( i = stringLength - 1; i > 0; i-- )
-    {
-        char = GetSubStr( guid, i - 1, i );
-        if ( char == "" ) 
-        {
-            char = "0";
-        }
-        
-        if ( i > stringLength / 2 )
-        {
-            value = GetIntForHexChar( char );
-            power = Pow( 16, secondPartExp );
-            secondPart = secondPart + ( value * power );
-            secondPartExp++;
-        }   
-        else
-        {
-            value = GetIntForHexChar( char );
-            power = Pow( 16, firstPartExp );
-            firstPart = firstPart + ( value * power );
-            firstPartExp++;
-        }
-    }
-    
-    split = [];
-    split["low"] = int( secondPart );
-    split["high"] = int( firstPart );
-
-    return split;
 }
 
-Pow( num, exponent )
-{
-    result = 1;
-    while( exponent != 0 )
-    {
-        result = result * num;
-        exponent--;
-    }
-    
-    return result;
-}
-
-GetIntForHexChar( char )
-{
-    char = ToLower( char );
-    // generated by co-pilot because I can't be bothered to make it more "elegant"
-    switch( char )
-    {
-        case "0":
-            return 0;
-        case "1":
-            return 1;
-        case "2":
-            return 2;
-        case "3":
-            return 3;
-        case "4":
-            return 4;
-        case "5":
-            return 5;
-        case "6":
-            return 6;
-        case "7":
-            return 7;
-        case "8":
-            return 8;
-        case "9":
-            return 9;
-        case "a":
-            return 10;
-        case "b":
-            return 11;
-        case "c":
-            return 12;
-        case "d":
-            return 13;
-        case "e":
-            return 14;
-        case "f":
-            return 15;
-        default:
-            return 0;
-    }
-}*/
-
 //////////////////////////////////
 // Command Implementations
 /////////////////////////////////
@@ -395,7 +226,7 @@ NoClipImpl( event, data )
 
     self IPrintLnBold( "NoClip enabled" );*/
 
-    scripts\mp\_integration_base::LogWarning( "NoClip is not supported on T5!" );
+    scripts\_integration_base::LogWarning( "NoClip is not supported on T5!" );
 
 }
 

GameFiles/GameInterface/_integration_t5zm.gsc

@@ -0,0 +1,384 @@
+#include common_scripts\utility;
+
+Init()
+{
+    thread Setup();
+}
+
+Setup()
+{
+    level endon( "end_game" );
+    waittillframeend;
+    
+    level waittill( level.notifyTypes.sharedFunctionsInitialized );
+    level.eventBus.gamename = "T5";
+    level.eventTypes.gameEnd = "end_game";
+    
+    scripts\_integration_base::RegisterLogger( ::Log2Console );
+    
+    level.overrideMethods[level.commonFunctions.getTotalShotsFired]      = ::GetTotalShotsFired;
+    level.overrideMethods[level.commonFunctions.setDvar]                 = ::SetDvarIfUninitializedWrapper;
+    level.overrideMethods[level.commonFunctions.waittillNotifyOrTimeout] = ::WaitillNotifyOrTimeoutWrapper;
+    level.overrideMethods[level.commonFunctions.isBot]                   = ::IsBotWrapper;
+    level.overrideMethods[level.commonFunctions.getXuid]                 = ::GetXuidWrapper;
+    level.overrideMethods[level.commonFunction.getPlayerFromClientNum]   = ::_GetPlayerFromClientNum;
+    
+    RegisterClientCommands();
+    
+    level notify( level.notifyTypes.gameFunctionsInitialized );
+}
+
+RegisterClientCommands() 
+{
+    scripts\_integration_base::AddClientCommand( "GiveWeapon",     true,  ::GiveWeaponImpl );
+    scripts\_integration_base::AddClientCommand( "TakeWeapons",    true,  ::TakeWeaponsImpl );
+    scripts\_integration_base::AddClientCommand( "SwitchTeams",    true,  ::TeamSwitchImpl );
+    scripts\_integration_base::AddClientCommand( "Hide",           false, ::HideImpl );
+    scripts\_integration_base::AddClientCommand( "Alert",          true,  ::AlertImpl );
+    scripts\_integration_base::AddClientCommand( "Goto",           false, ::GotoImpl );
+    scripts\_integration_base::AddClientCommand( "Kill",           true,  ::KillImpl );
+    scripts\_integration_base::AddClientCommand( "SetSpectator",   true,  ::SetSpectatorImpl );
+    scripts\_integration_base::AddClientCommand( "LockControls",   true,  ::LockControlsImpl );
+    scripts\_integration_base::AddClientCommand( "PlayerToMe",     true,  ::PlayerToMeImpl );
+    scripts\_integration_base::AddClientCommand( "NoClip",         false, ::NoClipImpl );
+}
+
+GetTotalShotsFired()
+{
+    return 0; //ZM has no shot tracking. TODO: add tracking function for event weapon_fired
+}
+
+SetDvarIfUninitializedWrapper( dvar, value )
+{
+	if ( GetDvar( dvar ) == "" )
+	{
+		SetDvar( dvar, value );
+		return value;
+	}
+	
+	return GetDvar( dvar );
+}
+
+WaitillNotifyOrTimeoutWrapper( msg, timer )
+{
+	self endon( msg );
+	wait( timer );
+}
+
+Log2Console( logLevel, message ) 
+{
+    Print( "[" + logLevel + "] " + message + "\n" );
+}
+
+God()
+{
+    if ( !IsDefined( self.godmode ) )
+    {
+        self.godmode = false;
+    }
+    
+    if (!self.godmode )
+    {
+        self enableInvulnerability();
+        self.godmode = true;
+    }
+    else
+    {
+        self.godmode = false;
+        self disableInvulnerability();
+    }
+}
+
+IsBotWrapper( client )
+{
+    return ( IsDefined ( client.pers["isBot"] ) && client.pers["isBot"] != 0 );
+}
+
+GetXuidWrapper()
+{
+    return self GetXUID();
+}
+
+_GetPlayerFromClientNum( clientNum )
+{
+    if ( clientNum < 0 )
+    {
+        return undefined;
+    }
+    
+    players = GetPlayers( "all" );
+    
+    for ( i = 0; i < players.size; i++ )
+    {
+        scripts\_integration_base::LogDebug( i+"/"+players.size+ "=" + players[i].name );
+
+        if ( players[i] getEntityNumber() == clientNum )
+        {
+            return players[i];
+        }
+    }
+    
+    return undefined;
+}
+
+//////////////////////////////////
+// Command Implementations
+/////////////////////////////////
+
+GiveWeaponImpl( event, data )
+{
+    if ( !IsAlive( self ) )
+    {
+        return self.name + "^7 is not alive";
+    }
+    
+    self IPrintLnBold( "You have been given a new weapon" );
+    self GiveWeapon( data["weaponName"] );
+    self SwitchToWeapon( data["weaponName"] );
+    
+    return self.name + "^7 has been given ^5" + data["weaponName"]; 
+}
+
+TakeWeaponsImpl( event, data )
+{
+    if ( !IsAlive( self ) )
+    {
+        return self.name + "^7 is not alive";
+    }
+    
+    self TakeAllWeapons();
+    self IPrintLnBold( "All your weapons have been taken" );
+    
+    return "Took weapons from " + self.name;
+}
+
+TeamSwitchImpl( event, data )
+{
+    if ( !IsAlive( self ) )
+    {
+        return self + "^7 is not alive";
+    }
+    
+    team = level.allies;
+    
+    if ( self.team == "allies" ) 
+    {
+        team = level.axis;
+    }
+    
+    self IPrintLnBold( "You are being team switched" );
+    wait( 2 );
+    self [[team]]();
+
+    return self.name + "^7 switched to " + self.team;
+}
+
+LockControlsImpl( event, data )
+{
+    if ( !IsAlive( self ) )
+    {
+        return self.name + "^7 is not alive";
+    }
+
+    if ( !IsDefined ( self.isControlLocked ) )
+    {
+        self.isControlLocked = false;
+    }
+
+    if ( !self.isControlLocked )
+    {
+        self freezeControls( true );
+        self God();
+        self Hide();
+
+        info = [];
+        info[ "alertType" ] = "Alert!";
+        info[ "message" ] = "You have been frozen!";
+        
+        self AlertImpl( undefined, info );
+
+        self.isControlLocked = true;
+        
+        return self.name + "\'s controls are locked";
+    }
+    else
+    {
+        self freezeControls( false );
+        self God();
+        self Show();
+
+        self.isControlLocked = false;
+
+        return self.name + "\'s controls are unlocked";
+    }
+}
+
+NoClipImpl( event, data )
+{
+    /*if ( !IsAlive( self ) )
+    {
+        self IPrintLnBold( "You are not alive" );
+    }
+    
+    if ( !IsDefined ( self.isNoClipped ) )
+    {
+        self.isNoClipped = false;
+    }
+
+    if ( !self.isNoClipped )
+    {
+        self SetClientDvar( "sv_cheats", 1 );
+        self SetClientDvar( "cg_thirdperson", 1 );
+        self SetClientDvar( "sv_cheats", 0 );
+        
+        self God();
+        self Noclip();
+        self Hide();
+        
+        self.isNoClipped = true;
+        
+        self IPrintLnBold( "NoClip enabled" );
+    }
+    else
+    {
+        self SetClientDvar( "sv_cheats", 1 );
+        self SetClientDvar( "cg_thirdperson", 1 );
+        self SetClientDvar( "sv_cheats", 0 );
+        
+        self God();
+        self Noclip();
+        self Hide();
+        
+        self.isNoClipped = false;
+        
+        self IPrintLnBold( "NoClip disabled" );
+    }
+
+    self IPrintLnBold( "NoClip enabled" );*/
+
+    scripts\_integration_base::LogWarning( "NoClip is not supported on T5!" );
+
+}
+
+HideImpl( event, data )
+{
+    if ( !IsAlive( self ) )
+    {
+        self IPrintLnBold( "You are not alive" );
+        return;
+    }
+    
+    if ( !IsDefined ( self.isHidden ) )
+    {
+        self.isHidden = false;
+    }
+
+    if ( !self.isHidden )
+    {
+        self SetClientDvar( "sv_cheats", 1 );
+        self SetClientDvar( "cg_thirdperson", 1 );
+        self SetClientDvar( "sv_cheats", 0 );
+        
+        self God();
+        self Hide();
+        
+        self.isHidden = true;
+        
+        self IPrintLnBold( "Hide enabled" );
+    }
+    else
+    {
+        self SetClientDvar( "sv_cheats", 1 );
+        self SetClientDvar( "cg_thirdperson", 0 );
+        self SetClientDvar( "sv_cheats", 0 );
+        
+        self God();
+        self Show();
+        
+        self.isHidden = false;
+        
+        self IPrintLnBold( "Hide disabled" );
+    }
+}
+
+AlertImpl( event, data )
+{
+    //self thread maps\mp\gametypes\_hud_message::oldNotifyMessage( data["alertType"], data["message"], undefined, ( 1, 0, 0 ), "mpl_sab_ui_suitcasebomb_timer", 7.5 );
+    self IPrintLnBold( data["message"] );
+
+    return "Sent alert to " + self.name; 
+}
+
+GotoImpl( event, data )
+{
+    if ( IsDefined( event.target ) )
+    {
+        return self GotoPlayerImpl( event.target );
+    }
+    else
+    {
+        return self GotoCoordImpl( data );
+    }
+}
+
+GotoCoordImpl( data )
+{
+    if ( !IsAlive( self ) )
+    {
+        self IPrintLnBold( "You are not alive" );
+        return;
+    }
+
+    position = ( int( data["x"] ), int( data["y"] ), int( data["z"]) );
+    self SetOrigin( position );
+    self IPrintLnBold( "Moved to " + "("+ position[0] + "," + position[1] + "," + position[2] + ")" );
+}
+
+GotoPlayerImpl( target )
+{
+    if ( !IsAlive( target ) )
+    {
+        self IPrintLnBold( target.name + " is not alive" );
+        return;
+    }
+
+    self SetOrigin( target GetOrigin() );
+    self IPrintLnBold( "Moved to " + target.name );
+}
+
+PlayerToMeImpl( event, data )
+{
+    if ( !IsAlive( self ) )
+    {
+        return self.name + " is not alive";
+    }
+
+    self SetOrigin( event.origin GetOrigin() );
+    return "Moved here " + self.name;    
+}
+
+KillImpl( event, data )
+{
+    if ( !IsAlive( self ) )
+    {
+        return self.name + " is not alive";
+    }
+
+    self Suicide();
+    self IPrintLnBold( "You were killed by " + self.name );
+
+    return "You killed " + self.name;
+}
+
+SetSpectatorImpl( event, data )
+{
+    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";
+}

GameFiles/GameInterface/_integration_t6.gsc

@@ -0,0 +1,395 @@
+#include common_scripts\utility;
+#include maps\mp\_utility;
+
+Init()
+{
+    thread Setup();
+}
+
+Setup()
+{
+    level endon( "game_ended" );
+    level endon( "end_game" );
+    waittillframeend;
+    
+    level waittill( level.notifyTypes.sharedFunctionsInitialized );
+    level.eventBus.gamename = "T6";
+
+    if ( sessionmodeiszombiesgame() )
+    {
+        level.eventTypes.gameEnd = "end_game";
+    }
+    
+    scripts\_integration_base::RegisterLogger( ::Log2Console );
+    
+    level.overrideMethods[level.commonFunctions.getTotalShotsFired]      = ::GetTotalShotsFired;
+    level.overrideMethods[level.commonFunctions.setDvar]                 = ::SetDvarIfUninitializedWrapper;
+    level.overrideMethods[level.commonFunctions.waittillNotifyOrTimeout] = ::WaitillNotifyOrTimeoutWrapper;
+    level.overrideMethods[level.commonFunctions.isBot]                   = ::IsBotWrapper;
+    level.overrideMethods[level.commonFunctions.getXuid]                 = ::GetXuidWrapper;
+    level.overrideMethods[level.commonFunctions.waitTillAnyTimeout]      = ::WaitTillAnyTimeout;
+    
+    RegisterClientCommands();
+        
+    level notify( level.notifyTypes.gameFunctionsInitialized );
+}
+
+RegisterClientCommands() 
+{
+    scripts\_integration_base::AddClientCommand( "GiveWeapon",     true,  ::GiveWeaponImpl );
+    scripts\_integration_base::AddClientCommand( "TakeWeapons",    true,  ::TakeWeaponsImpl );
+    scripts\_integration_base::AddClientCommand( "SwitchTeams",    true,  ::TeamSwitchImpl );
+    scripts\_integration_base::AddClientCommand( "Hide",           false, ::HideImpl );
+    scripts\_integration_base::AddClientCommand( "Alert",          true,  ::AlertImpl );
+    scripts\_integration_base::AddClientCommand( "Goto",           false, ::GotoImpl );
+    scripts\_integration_base::AddClientCommand( "Kill",           true,  ::KillImpl );
+    scripts\_integration_base::AddClientCommand( "SetSpectator",   true,  ::SetSpectatorImpl );
+    scripts\_integration_base::AddClientCommand( "LockControls",   true,  ::LockControlsImpl );
+    scripts\_integration_base::AddClientCommand( "PlayerToMe",     true,  ::PlayerToMeImpl );
+    scripts\_integration_base::AddClientCommand( "NoClip",         false, ::NoClipImpl );
+}
+
+GetTotalShotsFired()
+{
+    return self.pers["total_shots"];
+}
+
+SetDvarIfUninitializedWrapper( dvar, value )
+{
+    maps\mp\_utility::set_dvar_if_unset( dvar, value );
+}
+
+WaitillNotifyOrTimeoutWrapper( msg, timer )
+{
+	self endon( msg );
+	wait( timer );
+}
+
+Log2Console( logLevel, message ) 
+{
+    Print( "[" + logLevel + "] " + message + "\n" );
+}
+
+God()
+{
+    if ( !IsDefined( self.godmode ) )
+    {
+        self.godmode = false;
+    }
+    
+    if (!self.godmode )
+    {
+        self enableInvulnerability();
+        self.godmode = true;
+    }
+    else
+    {
+        self.godmode = false;
+        self disableInvulnerability();
+    }
+}
+
+IsBotWrapper( client )
+{
+    return client maps\mp\_utility::is_bot();
+}
+
+GetXuidWrapper()
+{
+    return self GetXUID();
+}
+
+WaitTillAnyTimeout( timeOut, string1, string2, string3, string4, string5 )
+{
+    return common_scripts\utility::waittill_any_timeout( timeOut, string1, string2, string3, string4, string5 );
+}
+
+//////////////////////////////////
+// Command Implementations
+/////////////////////////////////
+
+GiveWeaponImpl( event, data )
+{
+    if ( !IsAlive( self ) )
+    {
+        return self.name + "^7 is not alive";
+    }
+    
+    if ( isDefined( level.player_too_many_weapons_monitor ) && level.player_too_many_weapons_monitor )
+    {
+        level.player_too_many_weapons_monitor = false;
+        self notify( "stop_player_too_many_weapons_monitor" );
+    }
+    
+    self IPrintLnBold( "You have been given a new weapon" );
+    self GiveWeapon( data["weaponName"] );
+    self SwitchToWeapon( data["weaponName"] );
+    
+    return self.name + "^7 has been given ^5" + data["weaponName"]; 
+}
+
+TakeWeaponsImpl( event, data )
+{
+    if ( !IsAlive( self ) )
+    {
+        return self.name + "^7 is not alive";
+    }
+    
+    self TakeAllWeapons();
+    self IPrintLnBold( "All your weapons have been taken" );
+    
+    return "Took weapons from " + self.name;
+}
+
+TeamSwitchImpl( event, data )
+{
+    if ( !IsAlive( self ) )
+    {
+        return self + "^7 is not alive";
+    }
+    
+    team = level.allies;
+    
+    if ( self.team == "allies" ) 
+    {
+        team = level.axis;
+    }
+    
+    self IPrintLnBold( "You are being team switched" );
+    wait( 2 );
+    self [[team]]();
+
+    return self.name + "^7 switched to " + self.team;
+}
+
+LockControlsImpl( event, data )
+{
+    if ( !IsAlive( self ) )
+    {
+        return self.name + "^7 is not alive";
+    }
+
+    if ( !IsDefined ( self.isControlLocked ) )
+    {
+        self.isControlLocked = false;
+    }
+
+    if ( !self.isControlLocked )
+    {
+        self freezeControls( true );
+        self God();
+        self Hide();
+
+        info = [];
+        info[ "alertType" ] = "Alert!";
+        info[ "message" ] = "You have been frozen!";
+        
+        self AlertImpl( undefined, info );
+
+        self.isControlLocked = true;
+        
+        return self.name + "\'s controls are locked";
+    }
+    else
+    {
+        self freezeControls( false );
+        self God();
+        self Show();
+
+        self.isControlLocked = false;
+
+        return self.name + "\'s controls are unlocked";
+    }
+}
+
+NoClipImpl( event, data )
+{
+    /*if ( !IsAlive( self ) )
+    {
+        self IPrintLnBold( "You are not alive" );
+    }
+    
+    if ( !IsDefined ( self.isNoClipped ) )
+    {
+        self.isNoClipped = false;
+    }
+
+    if ( !self.isNoClipped )
+    {
+        self SetClientDvar( "sv_cheats", 1 );
+        self SetClientDvar( "cg_thirdperson", 1 );
+        self SetClientDvar( "sv_cheats", 0 );
+        
+        self God();
+        self Noclip();
+        self Hide();
+        
+        self.isNoClipped = true;
+        
+        self IPrintLnBold( "NoClip enabled" );
+    }
+    else
+    {
+        self SetClientDvar( "sv_cheats", 1 );
+        self SetClientDvar( "cg_thirdperson", 1 );
+        self SetClientDvar( "sv_cheats", 0 );
+        
+        self God();
+        self Noclip();
+        self Hide();
+        
+        self.isNoClipped = false;
+        
+        self IPrintLnBold( "NoClip disabled" );
+    }
+
+    self IPrintLnBold( "NoClip enabled" );*/
+
+    scripts\_integration_base::LogWarning( "NoClip is not supported on T6!" );
+
+}
+
+HideImpl( event, data )
+{
+    if ( !IsAlive( self ) )
+    {
+        self IPrintLnBold( "You are not alive" );
+        return;
+    }
+    
+    if ( !IsDefined ( self.isHidden ) )
+    {
+        self.isHidden = false;
+    }
+
+    if ( !self.isHidden )
+    {
+        self SetClientDvar( "sv_cheats", 1 );
+        self SetClientDvar( "cg_thirdperson", 1 );
+        self SetClientDvar( "sv_cheats", 0 );
+        
+        self God();
+        self Hide();
+        
+        self.isHidden = true;
+        
+        self IPrintLnBold( "Hide enabled" );
+    }
+    else
+    {
+        self SetClientDvar( "sv_cheats", 1 );
+        self SetClientDvar( "cg_thirdperson", 0 );
+        self SetClientDvar( "sv_cheats", 0 );
+        
+        self God();
+        self Show();
+        
+        self.isHidden = false;
+        
+        self IPrintLnBold( "Hide disabled" );
+    }
+}
+
+AlertImpl( event, data )
+{
+	self thread oldNotifyMessage( data["alertType"], data["message"], undefined, ( 1, 0, 0 ), "mpl_sab_ui_suitcasebomb_timer", 7.5 );
+    return "Sent alert to " + self.name; 
+}
+
+GotoImpl( event, data )
+{
+    if ( IsDefined( event.target ) )
+    {
+        return self GotoPlayerImpl( event.target );
+    }
+    else
+    {
+        return self GotoCoordImpl( data );
+    }
+}
+
+GotoCoordImpl( data )
+{
+    if ( !IsAlive( self ) )
+    {
+        self IPrintLnBold( "You are not alive" );
+        return;
+    }
+
+    position = ( int( data["x"] ), int( data["y"] ), int( data["z"]) );
+    self SetOrigin( position );
+    self IPrintLnBold( "Moved to " + "("+ position[0] + "," + position[1] + "," + position[2] + ")" );
+}
+
+GotoPlayerImpl( target )
+{
+    if ( !IsAlive( target ) )
+    {
+        self IPrintLnBold( target.name + " is not alive" );
+        return;
+    }
+
+    self SetOrigin( target GetOrigin() );
+    self IPrintLnBold( "Moved to " + target.name );
+}
+
+PlayerToMeImpl( event, data )
+{
+    if ( !IsAlive( self ) )
+    {
+        return self.name + " is not alive";
+    }
+
+    self SetOrigin( event.origin GetOrigin() );
+    return "Moved here " + self.name;    
+}
+
+KillImpl( event, data )
+{
+    if ( !IsAlive( self ) )
+    {
+        return self.name + " is not alive";
+    }
+
+    self Suicide();
+    self IPrintLnBold( "You were killed by " + self.name );
+
+    return "You killed " + self.name;
+}
+
+SetSpectatorImpl( event, data )
+{
+    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";
+}
+
+
+//////////////////////////////////
+// T6 specific functions
+/////////////////////////////////
+
+/*
+1:1 the same on MP and ZM but in different includes. Since we probably want to be able to send Alerts on non teambased wagermatches use our own copy.
+*/
+oldnotifymessage( titletext, notifytext, iconname, glowcolor, sound, duration )
+{
+	/*if ( level.wagermatch && !level.teambased )
+	{
+		return;
+	}*/
+	notifydata = spawnstruct();
+	notifydata.titletext = titletext;
+	notifydata.notifytext = notifytext;
+	notifydata.iconname = iconname;
+	notifydata.sound = sound;
+	notifydata.duration = duration;
+	self.startmessagenotifyqueue[ self.startmessagenotifyqueue.size ] = notifydata;
+	self notify( "received award" );
+}

GameFiles/GameInterface/_integration_t6_file_bus.gsc

@@ -0,0 +1,73 @@
+/*********************************************************************************
+ * DISCLAIMER:                                                                   *
+ *                                                                               *
+ * This script is optional and not required for                                  *
+ * standard functionality. To use this script, a third-party                     *
+ * plugin named "t6-gsc-utils" must be installed on the                          *
+ * game server in the "*\storage\t6\plugins" folder                              *
+ *                                                                               *
+ * The "t6-gsc-utils" plugin can be obtained from the GitHub                     *
+ * repository at:                                                                *
+ * https://github.com/fedddddd/t6-gsc-utils                                      *
+ *                                                                               *
+ * Please make sure to install the plugin before running this                    *
+ * script.                                                                       *
+ *********************************************************************************/
+
+/*********************************************************************************
+ * FUNCTIONALITY:                                                                *
+ *                                                                               *
+ * This script extends the game interface to support the "file"                  *
+ * bus mode for Plutonium T6, which allows the game server and IW4M-Admin        *
+ * to communicate via files, rather than over rcon using                         *
+ * dvars.                                                                        *
+ *                                                                               *
+ * By enabling the "file" bus mode, IW4M-Admin can send                          *
+ * commands and receive responses from the game server by                        *
+ * reading and writing to specific files. This provides a                        *
+ * flexible and efficient communication channel.                                 *
+ *                                                                               *
+ * Make sure to configure the server to use the "file" bus                       *
+ * mode and set the appropriate file path to                                     *
+ * establish the communication between IW4M-Admin and the                        *
+ * game server.                                                                  *
+ *                                                                               *
+ * The wiki page for the setup of the game interface, and the bus mode           *
+ * can be found on GitHub at:                                                    *
+ * https://github.com/RaidMax/IW4M-Admin/wiki/GameInterface#configuring-bus-mode *
+ *********************************************************************************/
+
+Init()
+{
+	thread Setup();
+}
+
+Setup()
+{
+	level waittill( level.notifyTypes.sharedFunctionsInitialized );
+	level.overrideMethods[level.commonFunctions.getInboundData]  = ::GetInboundData;
+	level.overrideMethods[level.commonFunctions.getOutboundData] = ::GetOutboundData;
+	level.overrideMethods[level.commonFunctions.setInboundData]  = ::SetInboundData;
+	level.overrideMethods[level.commonFunctions.setOutboundData] = ::SetOutboundData;
+	scripts\_integration_base::_SetDvarIfUninitialized( level.commonKeys.busdir, GetDvar( "fs_homepath" ) );
+}
+
+GetInboundData( location )
+{
+	return readFile( location );
+}
+
+GetOutboundData( location )
+{
+	return readFile( location );
+}
+
+SetInboundData( location, data )
+{
+	writeFile( location, data );
+}
+
+SetOutboundData( location, data )
+{
+	writeFile( location, data );
+}

GameFiles/GameInterface/_integration_t6zm_helper.gsc

@@ -0,0 +1,93 @@
+Init()
+{
+    level.startmessagedefaultduration = 2;
+    level.regulargamemessages = spawnstruct();
+    level.regulargamemessages.waittime = 6;
+
+    thread OnPlayerConnect();
+}
+
+OnPlayerConnect()
+{
+    for ( ;; )
+    {
+        level waittill( "connecting", player );
+        player thread DisplayPopupsWaiter();
+    }
+}
+
+DisplayPopupsWaiter()
+{
+    self endon( "disconnect" );
+    self.ranknotifyqueue = [];
+
+    if ( !IsDefined( self.pers[ "challengeNotifyQueue" ] ) )
+    {
+        self.pers[ "challengeNotifyQueue" ] = [];
+    }
+    if ( !IsDefined( self.pers[ "contractNotifyQueue" ] ) )
+    {
+        self.pers[ "contractNotifyQueue" ] = [];
+    }
+
+    self.messagenotifyqueue = [];
+    self.startmessagenotifyqueue = [];
+    self.wagernotifyqueue = [];
+
+    while ( !level.gameended )
+    {
+        if ( self.startmessagenotifyqueue.size == 0 && self.messagenotifyqueue.size == 0 )
+        {
+            self waittill( "received award" );
+        }
+
+        waittillframeend;
+
+        if ( level.gameended )
+        {
+            return;
+        }
+        else
+        {
+            if ( self.startmessagenotifyqueue.size > 0 )
+            {
+                nextnotifydata = self.startmessagenotifyqueue[ 0 ];
+                arrayremoveindex( self.startmessagenotifyqueue, 0, 0 );
+                if ( IsDefined( nextnotifydata.duration ) )
+                {
+                    duration = nextnotifydata.duration;
+                }
+                else
+                {
+                    duration = level.startmessagedefaultduration;
+                }
+
+                self maps\mp\gametypes_zm\_hud_message::shownotifymessage( nextnotifydata, duration );
+                wait ( duration );
+
+                continue;
+            }
+            else if ( self.messagenotifyqueue.size > 0 )
+            {
+                nextnotifydata = self.messagenotifyqueue[ 0 ];
+                arrayremoveindex( self.messagenotifyqueue, 0, 0 );
+
+                if ( IsDefined( nextnotifydata.duration ) )
+                {
+                    duration = nextnotifydata.duration;
+                }
+                else
+                {
+                    duration = level.regulargamemessages.waittime;
+                }
+
+                self maps\mp\gametypes_zm\_hud_message::shownotifymessage( nextnotifydata, duration );
+                continue;
+            }
+            else
+            {
+                wait ( 1 );
+            }
+        }
+    }
+}

GameFiles/GameInterface/_integration_utility.gsh

@@ -0,0 +1,40 @@
+/*
+* This file contains reusable preprocessor directives meant to be used on
+* Plutonium & AlterWare clients that are up to date with the latest version.
+* Older versions of Plutonium or other clients do not have support for loading
+* or parsing "gsh" files.
+*/
+
+/*
+* Turn off assertions by removing the following define
+* gsc-tool will only emit assertions if developer_script dvar is set to 1
+* In short, you should not need to remove this define. Just turn them off
+* by using the dvar
+*/
+
+#define _INTEGRATION_DEBUG
+
+#ifdef _INTEGRATION_DEBUG
+
+#define _VERIFY( cond, msg ) \
+    assertEx( cond, msg )
+
+#else
+
+// This works as an "empty" define here with gsc-tool
+#define _VERIFY( cond, msg )
+
+#endif
+
+// This function is meant to be used inside "client commands"
+// If the client is not alive it shall return an error message
+#define _IS_ALIVE( ent ) \
+    _VERIFY( ent, "player entity is not defined" ); \
+    if ( !IsAlive( ent ) ) \
+    { \
+        return ent.name + "^7 is not alive"; \
+    }
+
+// This function should be used to verify if a player entity is defined
+#define _VERIFY_PLAYER_ENT( ent ) \
+    _VERIFY( ent, "player entity is not defined" )

GameFiles/GameInterface/example_module.gsc

@@ -0,0 +1,88 @@
+Init()
+{
+    // this gives the game interface time to setup
+    waittillframeend;
+    thread ModuleSetup();
+}
+
+ModuleSetup()
+{
+    // waiting until the game specific functions are ready
+    level waittill( level.notifyTypes.gameFunctionsInitialized );
+
+    RegisterCustomCommands();
+}
+
+RegisterCustomCommands()
+{
+    command = SpawnStruct();
+    
+    // unique key for each command (how iw4madmin identifies the command)
+    command.eventKey = "PrintLineCommand";
+
+    // name of the command (cannot conflict with existing command names)
+    command.name = "println";
+    
+    // short version of the command (cannot conflcit with existing command aliases)
+    command.alias = "pl";
+
+    // description of what the command does
+    command.description = "prints line to game";
+    
+    // minimum permision required to execute
+    // valid values: User, Trusted, Moderator, Administrator, SeniorAdmin, Owner
+    command.minPermission = "Trusted";
+
+    // games the command is supported on
+    // separate with comma or don't define for all
+    // valid values: IW3, IW4, IW5, IW6, T4, T5, T6, T7, SHG1, CSGO, H1
+    command.supportedGames = "IW4,IW5,T5,T6";
+
+    // indicates if a target player must be provided to execvute on
+    command.requiresTarget = false;
+
+    // code to run when the command is executed
+    command.handler = ::PrintLnCommandCallback;
+    
+    // register the command with integration to be send to iw4madmin
+    scripts\_integration_shared::RegisterScriptCommandObject( command );
+
+    // you can also register via parameters
+    scripts\_integration_shared::RegisterScriptCommand( "AffirmationCommand", "affirm", "af", "provide affirmations", "User", undefined, false, ::AffirmationCommandCallback );
+}
+
+PrintLnCommandCallback( event )
+{
+    if ( IsDefined( event.data["args"] ) )
+    {
+        IPrintLnBold( event.data["args"] );
+        return;
+    }
+
+    scripts\_integration_base::LogDebug( "No data was provided for PrintLnCallback" );
+}
+
+AffirmationCommandCallback( event, _ )
+{
+    level endon( level.eventTypes.gameEnd );
+
+    request         = SpawnStruct();
+    request.url     = "https://www.affirmations.dev";
+    request.method  = "GET";
+
+    // If making a post request you can also provide more data
+    // request.body = "Body of the post message";
+    // request.headers = [];
+    // request.headers["Authorization"] = "api-key";
+
+    scripts\_integration_shared::RequestUrlObject( request );
+    request waittill( level.eventTypes.urlRequestCompleted, response );
+
+    // horrible json parsing.. but it's just an example
+    parsedResponse = strtok( response, "\"" );
+
+    if ( IsPlayer( self ) )
+    {
+        self IPrintLnBold ( "^5" + parsedResponse[parsedResponse.size - 2] );
+    }
+}

GameFiles/README.MD

@@ -3,14 +3,7 @@
 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 Guide
-## Installation Plutonium IW5
 
 
-Move `_integration.gsc` to `%localappdata%\Plutonium\storage\iw5\scripts\`
+The documentation can be found here: [GameInterface](https://github.com/RaidMax/IW4M-Admin/wiki/GameInterface)
-
-
-## Installation IW4x
-
-
-Move `_integration.gsc` to `IW4x/userraw/scripts`, `IW4x` being the root folder of your game server.

GameFiles/deploy.bat

@@ -1,14 +1,21 @@
 @echo off
 
 ECHO "Pluto IW5"
-xcopy /y .\GameInterface\_integration_base.gsc "%LOCALAPPDATA%\Plutonium\storage\iw5\scripts\mp"
+xcopy /y .\GameInterface\_integration_base.gsc "%LOCALAPPDATA%\Plutonium\storage\iw5\scripts"
-xcopy /y .\GameInterface\_integration_iw5.gsc "%LOCALAPPDATA%\Plutonium\storage\iw5\scripts\mp"
+xcopy /y .\GameInterface\_integration_shared.gsc "%LOCALAPPDATA%\Plutonium\storage\iw5\scripts"
+xcopy /y .\GameInterface\_integration_iw5.gsc "%LOCALAPPDATA%\Plutonium\storage\iw5\scripts"
+xcopy /y .\GameInterface\_integration_utility.gsh "%LOCALAPPDATA%\Plutonium\storage\iw5\scripts"
 xcopy /y .\AntiCheat\IW5\storage\iw5\scripts\_customcallbacks.gsc "%LOCALAPPDATA%\Plutonium\storage\iw5\scripts\mp"
 
 ECHO "Pluto T5"
-xcopy /y .\GameInterface\_integration_base.gsc "%LOCALAPPDATA%\Plutonium\storage\t5\scripts\mp"
+xcopy /y .\GameInterface\_integration_base.gsc "%LOCALAPPDATA%\Plutonium\storage\t5\scripts"
+xcopy /y .\GameInterface\_integration_shared.gsc "%LOCALAPPDATA%\Plutonium\storage\t5\scripts"
 xcopy /y .\GameInterface\_integration_t5.gsc "%LOCALAPPDATA%\Plutonium\storage\t5\scripts\mp"
+xcopy /y .\GameInterface\_integration_t5zm.gsc "%LOCALAPPDATA%\Plutonium\storage\t5\scripts\sp\zom"
 
 ECHO "Pluto T6"
+xcopy /y .\GameInterface\_integration_base.gsc "%LOCALAPPDATA%\Plutonium\storage\t6\scripts"
+xcopy /y .\GameInterface\_integration_shared.gsc "%LOCALAPPDATA%\Plutonium\storage\t6\scripts"
+xcopy /y .\GameInterface\_integration_t6.gsc "%LOCALAPPDATA%\Plutonium\storage\t6\scripts"
+xcopy /y .\GameInterface\_integration_t6zm_helper.gsc "%LOCALAPPDATA%\Plutonium\storage\t6\scripts\zm"
 xcopy /y .\AntiCheat\PT6\storage\t6\scripts\mp\_customcallbacks.gsc "%LOCALAPPDATA%\Plutonium\storage\t6\scripts\mp"
-xcopy /y .\AntiCheat\PT6\storage\t6\scripts\mp\_customcallbacks.gsc.src "%LOCALAPPDATA%\Plutonium\storage\t6\scripts\mp"

IW4MAdmin.sln

@@ -52,6 +52,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ScriptPlugins", "ScriptPlug
 		Plugins\ScriptPlugins\ParserH1MOD.js = Plugins\ScriptPlugins\ParserH1MOD.js
 		Plugins\ScriptPlugins\ParserPlutoniumT5.js = Plugins\ScriptPlugins\ParserPlutoniumT5.js
 		Plugins\ScriptPlugins\ServerBanner.js = Plugins\ScriptPlugins\ServerBanner.js
+		Plugins\ScriptPlugins\ParserBOIII.js = Plugins\ScriptPlugins\ParserBOIII.js
+		Plugins\ScriptPlugins\ParserL4D2SM.js = Plugins\ScriptPlugins\ParserL4D2SM.js
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutomessageFeed", "Plugins\AutomessageFeed\AutomessageFeed.csproj", "{F5815359-CFC7-44B4-9A3B-C04BACAD5836}"
@@ -71,6 +73,9 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mute", "Plugins\Mute\Mute.csproj", "{259824F3-D860-4233-91D6-FF73D4DD8B18}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GameFiles", "GameFiles", "{6CBF412C-EFEE-45F7-80FD-AC402C22CDB9}"
+	ProjectSection(SolutionItems) = preProject
+		GameFiles\deploy.bat = GameFiles\deploy.bat
+	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GameInterface", "GameInterface", "{5C2BE2A8-EA1D-424F-88E1-7FC33EEC2E55}"
 	ProjectSection(SolutionItems) = preProject
@@ -79,6 +84,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GameInterface", "GameInterf
 		GameFiles\GameInterface\_integration_iw5.gsc = GameFiles\GameInterface\_integration_iw5.gsc
 		GameFiles\GameInterface\_integration_shared.gsc = GameFiles\GameInterface\_integration_shared.gsc
 		GameFiles\GameInterface\_integration_t5.gsc = GameFiles\GameInterface\_integration_t5.gsc
+		GameFiles\GameInterface\_integration_t5zm.gsc = GameFiles\GameInterface\_integration_t5zm.gsc
+		GameFiles\GameInterface\_integration_t6.gsc = GameFiles\GameInterface\_integration_t6.gsc
+		GameFiles\GameInterface\_integration_t6zm_helper.gsc = GameFiles\GameInterface\_integration_t6zm_helper.gsc
+		GameFiles\GameInterface\example_module.gsc = GameFiles\GameInterface\example_module.gsc
+		GameFiles\GameInterface\_integration_t6_file_bus.gsc = GameFiles\GameInterface\_integration_t6_file_bus.gsc
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AntiCheat", "AntiCheat", "{AB83BAC0-C539-424A-BF00-78487C10753C}"

Integrations/Cod/CodRConConnection.cs

@@ -8,6 +8,7 @@ using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
+using Integrations.Cod.SecureRcon;
 using Microsoft.Extensions.Logging;
 using Serilog.Context;
 using SharedLibraryCore;
@@ -24,6 +25,7 @@ namespace Integrations.Cod
     public class CodRConConnection : IRConConnection
     {
         private static readonly ConcurrentDictionary<EndPoint, ConnectionState> ActiveQueries = new();
+        private const string PkPattern = "-----BEGIN PRIVATE KEY-----";
         public IPEndPoint Endpoint { get; }
         public string RConPassword { get; }
 
@@ -125,7 +127,7 @@ namespace Integrations.Cod
                 }
                 catch (OperationCanceledException)
                 {
-                    _log.LogDebug("Waiting for flood protect did not complete before timeout timeout {Count}",
+                    _log.LogDebug("Waiting for flood protect did not complete before timeout {Count}",
                         connectionState.OnComplete.CurrentCount);
                     throw new RConException("Timed out waiting for flood protect to expire", true);
                 }
@@ -152,32 +154,28 @@ namespace Integrations.Cod
                 {
                     case StaticHelpers.QueryType.GET_DVAR:
                         waitForResponse = true;
-                        payload = string
+                        payload = BuildPayload(_config.CommandPrefixes.RConGetDvar, convertedRConPassword,
-                            .Format(_config.CommandPrefixes.RConGetDvar, convertedRConPassword,
+                            convertedParameters);
-                                convertedParameters + '\0').Select(Convert.ToByte).ToArray();
                         break;
                     case StaticHelpers.QueryType.SET_DVAR:
-                        payload = string
+                        payload = BuildPayload(_config.CommandPrefixes.RConSetDvar, convertedRConPassword,
-                            .Format(_config.CommandPrefixes.RConSetDvar, convertedRConPassword,
+                            convertedParameters);
-                                convertedParameters + '\0').Select(Convert.ToByte).ToArray();
                         break;
                     case StaticHelpers.QueryType.COMMAND:
-                        payload = string
+                        payload = BuildPayload(_config.CommandPrefixes.RConCommand, convertedRConPassword,
-                            .Format(_config.CommandPrefixes.RConCommand, convertedRConPassword,
+                            convertedParameters);
-                                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(Helpers.SafeConversion).ToArray();
                         break;
                     case StaticHelpers.QueryType.GET_INFO:
                         waitForResponse = true;
-                        payload = (_config.CommandPrefixes.RConGetInfo + '\0').Select(Convert.ToByte).ToArray();
+                        payload = (_config.CommandPrefixes.RConGetInfo + '\0').Select(Helpers.SafeConversion).ToArray();
                         break;
                     case StaticHelpers.QueryType.COMMAND_STATUS:
                         waitForResponse = true;
-                        payload = string.Format(_config.CommandPrefixes.RConCommand, convertedRConPassword, "status\0")
+                        payload = BuildPayload(_config.CommandPrefixes.RConCommand, convertedRConPassword, "status");
-                            .Select(Convert.ToByte).ToArray();
                         break;
                 }
             }
@@ -322,6 +320,27 @@ namespace Integrations.Cod
             return validatedResponse;
         }
 
+        private byte[] BuildPayload(string queryTemplate, string convertedRConPassword, string convertedParameters)
+        {
+            byte[] payload;
+            if (!RConPassword.StartsWith(PkPattern))
+            {
+                payload = string
+                    .Format(queryTemplate, convertedRConPassword,
+                        convertedParameters + '\0').Select(Helpers.SafeConversion).ToArray();
+            }
+            else
+            {
+                var textContent = string
+                    .Format(queryTemplate, "", convertedParameters)
+                    .Replace("rcon", "rconSafe ")
+                    .Replace("  ", "").Split(" ");
+                payload = Helpers.BuildSafeRconPayload(textContent[0], textContent[1], RConPassword);
+            }
+
+            return payload;
+        }
+
         private async Task<byte[][]> SendPayloadAsync(Socket rconSocket, byte[] payload, bool waitForResponse,
             CancellationToken token = default)
         {
@@ -375,8 +394,18 @@ namespace Integrations.Cod
         private async Task ReceiveAndStoreSocketData(Socket rconSocket, CancellationToken token,
             ConnectionState connectionState)
         {
-            var result = await rconSocket.ReceiveFromAsync(connectionState.ReceiveBuffer,
+            SocketReceiveFromResult result;
+            try
+            {
+                result = await rconSocket.ReceiveFromAsync(connectionState.ReceiveBuffer,
                     SocketFlags.None, Endpoint, token);
+            }
+            // windows quirk that occurs when remote server returns ICMP port unreachable
+            catch (SocketException ex) when (ex.SocketErrorCode == SocketError.ConnectionReset)
+            {
+                await Task.Delay(Timeout.Infinite, token);
+                return;
+            }
 
             if (result.ReceivedBytes == 0)
             {

Integrations/Cod/Integrations.Cod.csproj

@@ -16,4 +16,8 @@
       <ProjectReference Include="..\..\SharedLibraryCore\SharedLibraryCore.csproj" />
     </ItemGroup>
 
+    <ItemGroup>
+      <PackageReference Include="protobuf-net" Version="3.2.26" />
+    </ItemGroup>
+
 </Project>

Integrations/Cod/SecureRcon/Helpers.cs

@@ -0,0 +1,57 @@
+using System;
+using System.IO;
+using System.Linq;
+using System.Security.Cryptography;
+using ProtoBuf;
+
+namespace Integrations.Cod.SecureRcon;
+
+public static class Helpers
+{
+    private static byte[] ToSerializedMessage(this SecureCommand command)
+    {
+        using var ms = new MemoryStream();
+        Serializer.Serialize(ms, command);
+        return ms.ToArray();
+    }
+    
+    private static byte[] SignData(byte[] data, string privateKey)
+    {
+        using var rsa = new RSACryptoServiceProvider();
+        rsa.ImportFromPem(privateKey);
+        var rsaFormatter = new RSAPKCS1SignatureFormatter(rsa);
+        rsaFormatter.SetHashAlgorithm("SHA512");
+        var hash = SHA512.Create();
+        var hashedData = hash.ComputeHash(data);
+        var signature = rsaFormatter.CreateSignature(hashedData);
+
+        return signature;
+    }
+    
+    public static byte SafeConversion(char c)
+    {
+        try
+        {
+            return Convert.ToByte(c);
+        }
+
+        catch
+        {
+            return (byte)'.';
+        }
+    }
+
+    public static byte[] BuildSafeRconPayload(string prefix, string command, string signingKey)
+    {
+        var message = command.Select(SafeConversion).ToArray();
+        var header = (prefix + "\n").Select(SafeConversion).ToArray();
+
+        var secureCommand = new SecureCommand
+        {
+            SecMessage = message,
+            Signature = SignData(message, signingKey)
+        };
+
+        return header.Concat(secureCommand.ToSerializedMessage()).ToArray();
+    }
+}

Integrations/Cod/SecureRcon/SecureCommand.cs

@@ -0,0 +1,13 @@
+using ProtoBuf;
+
+namespace Integrations.Cod.SecureRcon;
+
+[ProtoContract]
+public class SecureCommand
+{
+    [ProtoMember(1)] 
+    public byte[] SecMessage { get; set; }
+    
+    [ProtoMember(2)]
+    public byte[] Signature { get; set; }
+}

Integrations/Source/SourceRConConnection.cs

@@ -104,7 +104,7 @@ namespace Integrations.Source
                 }
 
                 var split = response.TrimEnd('\n').Split('\n');
-                return split.Take(split.Length - 1).ToArray();
+                return split.Take(Math.Max(1, split.Length - 1)).ToArray();
             }
 
             catch (TaskCanceledException)

Plugins/ScriptPlugins/GameInterface.js

@@ -2,34 +2,61 @@
 const inDvar = 'sv_iw4madmin_in';
 const outDvar = 'sv_iw4madmin_out';
 const integrationEnabledDvar = 'sv_iw4madmin_integration_enabled';
-const pollingRate = 300;
+const groupSeparatorChar = '\x1d';
+const recordSeparatorChar = '\x1e';
+const unitSeparatorChar = '\x1f';
 
-const init = (registerNotify, serviceResolver, config) => {
+let busFileIn = '';
+let busFileOut = '';
+let busMode = 'rcon';
+let busDir = '';
+
+const init = (registerNotify, serviceResolver, config, scriptHelper) => {
     registerNotify('IManagementEventSubscriptions.ClientStateInitialized', (clientEvent, _) => plugin.onClientEnteredMatch(clientEvent));
     registerNotify('IGameServerEventSubscriptions.ServerValueReceived', (serverValueEvent, _) => plugin.onServerValueReceived(serverValueEvent));
     registerNotify('IGameServerEventSubscriptions.ServerValueSetCompleted', (serverValueEvent, _) => plugin.onServerValueSetCompleted(serverValueEvent));
     registerNotify('IGameServerEventSubscriptions.MonitoringStarted', (monitorStartEvent, _) => plugin.onServerMonitoringStart(monitorStartEvent));
+    registerNotify('IGameEventSubscriptions.MatchStarted', (matchStartEvent, _) => plugin.onMatchStart(matchStartEvent));
     registerNotify('IManagementEventSubscriptions.ClientPenaltyAdministered', (penaltyEvent, _) => plugin.onPenalty(penaltyEvent));
 
-    plugin.onLoad(serviceResolver, config);
+    plugin.onLoad(serviceResolver, config, scriptHelper);
     return plugin;
 };
 
 const plugin = {
     author: 'RaidMax',
-    version: '2.0',
+    version: '2.1',
     name: 'Game Interface',
     serviceResolver: null,
     eventManager: null,
     logger: null,
     commands: null,
+    scriptHelper: null,
+    configWrapper: null,
+    config: {
+        pollingRate: 300
+    },
 
-    onLoad: function (serviceResolver, config) {
+    onLoad: function (serviceResolver, configWrapper, scriptHelper) {
         this.serviceResolver = serviceResolver;
         this.eventManager = serviceResolver.resolveService('IManager');
         this.logger = serviceResolver.resolveService('ILogger', ['ScriptPluginV2']);
         this.commands = commands;
-        this.config = config;
+        this.configWrapper = configWrapper;
+        this.scriptHelper = scriptHelper;
+
+        const storedConfig = this.configWrapper.getValue('config', newConfig => {
+            if (newConfig) {
+                plugin.logger.logInformation('{Name} config reloaded.', plugin.name);
+                plugin.config = newConfig;
+            }
+        });
+
+        if (storedConfig != null) {
+            this.config = storedConfig
+        } else {
+            this.configWrapper.setValue('config', this.config);
+        }
     },
 
     onClientEnteredMatch: function (clientEvent) {
@@ -65,6 +92,9 @@ const plugin = {
     },
 
     onServerValueSetCompleted: async function (serverValueEvent) {
+        this.logger.logDebug('Set {dvarName}={dvarValue} success={success} from {server}', serverValueEvent.valueName,
+            serverValueEvent.value, serverValueEvent.success, serverValueEvent.server.id);
+        
         if (serverValueEvent.valueName !== inDvar && serverValueEvent.valueName !== outDvar) {
             this.logger.logDebug('Ignoring set complete of {name}', serverValueEvent.valueName);
             return;
@@ -87,9 +117,7 @@ const plugin = {
             const input = serverState.inQueue.shift();
 
             // if we queued an event then the next loop will be at the value set complete
-            if (await this.processEventMessage(input, serverValueEvent.server)) {
+            await this.processEventMessage(input, serverValueEvent.server);
-                // return;
-            }
         }
 
         this.logger.logDebug('loop complete');
@@ -97,6 +125,15 @@ const plugin = {
         this.requestGetDvar(inDvar, serverValueEvent.server);
     },
     
+    onServerMonitoringStart: function (monitorStartEvent) {
+        this.initializeServer(monitorStartEvent.server);
+    },
+
+    onMatchStart: function (matchStartEvent) {
+        busMode = 'rcon';
+        this.sendEventMessage(matchStartEvent.server, true, 'GetBusModeRequested', null, null, null, {});
+    },
+
     initializeServer: function (server) {
         servers[server.id] = {
             enabled: false,
@@ -126,6 +163,11 @@ const plugin = {
         serverState.running = true;
         serverState.initializationInProgress = false;
         
+        // todo: this might not work for all games
+        responseEvent.server.rconParser.configuration.floodProtectInterval = 150;
+
+        this.sendEventMessage(responseEvent.server, true, 'GetBusModeRequested', null, null, null, {});
+        this.sendEventMessage(responseEvent.server, true, 'GetCommandsRequested', null, null, null, {});
         this.requestGetDvar(inDvar, responseEvent.server);
     },
 
@@ -136,7 +178,9 @@ const plugin = {
         const serverState = servers[responseEvent.server.id];
         serverState.outQueue.shift();
 
-        if (responseEvent.server.connectedClients.count === 0) {
+        const utilities = importNamespace('SharedLibraryCore.Utilities');
+
+        if (responseEvent.server.connectedClients.count === 0 && !utilities.isDevelopment) {
             // no clients connected so we don't need to query
             serverState.running = false;
             return;
@@ -179,8 +223,8 @@ const plugin = {
         let messageQueued = false;
         const event = parseEvent(input);
 
-        this.logger.logDebug('Processing input... {eventType} {subType} {data} {clientNumber}', event.eventType,
+        this.logger.logDebug('Processing input... {eventType} {subType} {@data} {clientNumber}', event.eventType,
-            event.subType, event.data.toString(), event.clientNumber);
+            event.subType, event.data, event.clientNumber);
 
         const metaService = this.serviceResolver.ResolveService('IMetaServiceV2');
         const threading = importNamespace('System.Threading');
@@ -208,7 +252,7 @@ const plugin = {
                     data = {
                         level: client.level,
                         clientId: client.clientId,
-                        lastConnection: client.lastConnection,
+                        lastConnection: client.timeSinceLastConnectionString,
                         tag: tagMeta?.value ?? '',
                         performance: clientStats?.performance ?? 200.0
                     };
@@ -287,17 +331,74 @@ const plugin = {
             }
         }
 
+        if (event.eventType === 'UrlRequested') {
+            const urlRequest = this.parseUrlRequest(event);
+
+            this.logger.logDebug('Making gamescript web request {@Request}', urlRequest);
+
+            this.scriptHelper.requestUrl(urlRequest, response => {
+                this.logger.logDebug('Got response for gamescript web request - {Response}', response);
+
+                if (typeof response !== 'string' && !(response instanceof String)) {
+                    response = JSON.stringify(response);
+                }
+                
+                const max = 10;
+                this.logger.logDebug(`response length ${response.length}`);
+                
+                let quoteReplace = '\\"';
+                // todo: may be more than just T6
+                if (server.gameCode === 'T6') {
+                    quoteReplace = '\\\\"';
+                }
+                
+                let chunks = chunkString(response.replace(/"/gm, quoteReplace).replace(/[\n|\t]/gm, ''), 800);
+                if (chunks.length > max) {
+                    this.logger.logWarning(`Response chunks greater than max (${max}). Data truncated!`);
+                    chunks = chunks.slice(0, max);
+                }
+                this.logger.logDebug(`chunk size ${chunks.length}`);
+                
+                for (let i = 0; i < chunks.length; i++) {
+                    this.sendEventMessage(server, false, 'UrlRequestCompleted', null, null,
+                        null, { entity: event.data.entity, remaining: chunks.length - (i + 1), response: chunks[i]});
+                }
+            });
+        }
+        
+        if (event.eventType === 'RegisterCommandRequested') {
+            this.registerDynamicCommand(event);
+        }
+        
+        if (event.eventType === 'GetBusModeRequested') {
+            if (event.data?.directory && event.data?.mode) {
+                busMode = event.data.mode;
+                busDir = event.data.directory.replace('\'', '').replace('"', '');
+                if (event.data?.inLocation && event.data?.outLocation) {
+                    busFileIn = event.data?.inLocation;
+                    busFileOut = event.data?.outLocation;
+                }
+                this.logger.logDebug('Setting bus mode to {mode} {dir}', busMode, busDir);
+            }
+        }
+
         tokenSource.dispose();
         return messageQueued;
     },
 
     sendEventMessage: function (server, responseExpected, event, subtype, origin, target, data) {
         let targetClientNumber = -1;
+        let originClientNumber = -1;
+
         if (target != null) {
-            targetClientNumber = target.ClientNumber;
+            targetClientNumber = target.clientNumber;
         }
 
-        const output = `${responseExpected ? '1' : '0'};${event};${subtype};${origin.ClientNumber};${targetClientNumber};${buildDataString(data)}`;
+        if (origin != null) {
+            originClientNumber = origin.clientNumber
+        }
+
+        const output = `${responseExpected ? '1' : '0'}${groupSeparatorChar}${event}${groupSeparatorChar}${subtype}${groupSeparatorChar}${originClientNumber}${groupSeparatorChar}${targetClientNumber}${groupSeparatorChar}${buildDataString(data)}`;
         this.logger.logDebug('Queuing output for server {output}', output);
 
         servers[server.id].commandQueue.push(output);
@@ -305,9 +406,40 @@ const plugin = {
 
     requestGetDvar: function (dvarName, server) {
         const serverState = servers[server.id];
+
+        if (dvarName !== integrationEnabledDvar && busMode === 'file') {
+            this.scriptHelper.requestNotifyAfterDelay(250, () => {
+                const io = importNamespace('System.IO');
+                serverState.outQueue.push({});
+                try {
+                    const content = io.File.ReadAllText(`${busDir}/${fileForDvar(dvarName)}`);
+                    plugin.onServerValueReceived({
+                        server: server,
+                        source: server,
+                        success: true,
+                        response: {
+                            name: dvarName,
+                            value: content
+                        }
+                    });
+                } catch (e) {
+                    plugin.logger.logError('Could not get bus data {exception}', e.toString());
+                    plugin.onServerValueReceived({
+                        server: server,
+                        success: false,
+                        response: {
+                            name: dvarName
+                        }
+                    });
+                }
+            });
+            
+            return;
+        }
+        
         const serverEvents = importNamespace('SharedLibraryCore.Events.Server');
         const requestEvent = new serverEvents.ServerValueRequestEvent(dvarName, server);
-        requestEvent.delayMs = pollingRate;
+        requestEvent.delayMs = this.config.pollingRate;
         requestEvent.timeoutMs = 2000;
         requestEvent.source = this.name;
 
@@ -317,7 +449,7 @@ const plugin = {
             const diff = new Date().getTime() - end.getTime();
 
             if (diff < extraDelay) {
-                requestEvent.delayMs = (extraDelay - diff) + pollingRate;
+                requestEvent.delayMs = (extraDelay - diff) + this.config.pollingRate;
                 this.logger.logDebug('Increasing delay time to {Delay}ms due to recent map change', requestEvent.delayMs);
             }
         }
@@ -336,9 +468,38 @@ const plugin = {
     requestSetDvar: function (dvarName, dvarValue, server) {
         const serverState = servers[server.id];
         
+        if ( busMode === 'file' ) {
+            this.scriptHelper.requestNotifyAfterDelay(250, async () => {
+                const io = importNamespace('System.IO');
+                try {
+                    const path = `${busDir}/${fileForDvar(dvarName)}`;
+                    plugin.logger.logDebug('writing {value} to {file}', dvarValue, path);
+                    io.File.WriteAllText(path, dvarValue);
+                    serverState.outQueue.push({});
+                    await plugin.onServerValueSetCompleted({
+                        server: server,
+                        source: server,
+                        success: true,
+                        value: dvarValue,
+                        valueName: dvarName,
+                    });
+                } catch (e) {
+                    plugin.logger.logError('Could not set bus data {exception}', e.toString());
+                    await plugin.onServerValueSetCompleted({
+                        server: server,
+                        success: false,
+                        valueName: dvarName,
+                        value: dvarValue
+                    });
+                }
+            })
+            
+            return;
+        }
+
         const serverEvents = importNamespace('SharedLibraryCore.Events.Server');
         const requestEvent = new serverEvents.ServerValueSetRequestEvent(dvarName, dvarValue, server);
-        requestEvent.delayMs = pollingRate;
+        requestEvent.delayMs = this.config.pollingRate;
         requestEvent.timeoutMs = 2000;
         requestEvent.source = this.name;
 
@@ -348,7 +509,7 @@ const plugin = {
             const diff = new Date().getTime() - end.getTime();
 
             if (diff < extraDelay) {
-                requestEvent.delayMs = (extraDelay - diff) + pollingRate;
+                requestEvent.delayMs = (extraDelay - diff) + this.config.pollingRate;
                 this.logger.logDebug('Increasing delay time to {Delay}ms due to recent map change', requestEvent.delayMs);
             }
         }
@@ -365,8 +526,64 @@ const plugin = {
         }
     },
 
-    onServerMonitoringStart: function (monitorStartEvent) {
+    parseUrlRequest: function(event) {
-        this.initializeServer(monitorStartEvent.server);
+        const url = event.data?.url;
+
+        if (url === undefined) {
+            this.logger.logWarning('No url provided for gamescript web request - {Event}', event);
+            return;
+        }
+
+        const body = event.data?.body;
+        const method = event.data?.method || 'GET';
+        const contentType = event.data?.contentType || 'text/plain';
+        const headers = event.data?.headers;
+
+        const dictionary = System.Collections.Generic.Dictionary(System.String, System.String);
+        const headerDict = new dictionary();
+
+        if (headers) {
+            const eachHeader = headers.split(',');
+
+            for (let eachKeyValue of eachHeader) {
+                const keyValueSplit = eachKeyValue.split(':');
+                if (keyValueSplit.length === 2) {
+                    headerDict.add(keyValueSplit[0], keyValueSplit[1]);
+                }
+            }
+        }
+
+        const script = importNamespace('IW4MAdmin.Application.Plugin.Script');
+        return new script.ScriptPluginWebRequest(url, body, method, contentType, headerDict);
+    },
+    
+    registerDynamicCommand: function(event) {
+        const commandWrapper = {
+            commands: [{
+                name: event.data['name'] || 'DEFAULT',
+                description: event.data['description'] || 'DEFAULT',
+                alias: event.data['alias'] || 'DEFAULT',
+                permission: event.data['minPermission'] || 'DEFAULT',
+                targetRequired: (event.data['targetRequired'] || '0') === '1',
+                supportedGames: (event.data['supportedGames'] || '').split(','),
+
+                execute: (gameEvent) => {
+                    if (!validateEnabled(gameEvent.owner, gameEvent.origin)) {
+                        return;
+                    }
+                    
+                    if (gameEvent.data === '--reload' && gameEvent.origin.level === 'Owner') {
+                        this.sendEventMessage(gameEvent.owner, true, 'GetCommandsRequested', null, null, null, { name: gameEvent.extra.name });
+                    } else {
+                        sendScriptCommand(gameEvent.owner, `${event.data['eventKey']}Execute`, gameEvent.origin, gameEvent.target, {
+                            args: gameEvent.data
+                        });
+                    }
+                }
+            }]
+        }
+        
+        this.scriptHelper.registerDynamicCommand(commandWrapper);
     }
 };
 
@@ -385,7 +602,7 @@ const commands = [{
             required: true
         }
     ],
-    supportedGames: ['IW4', 'IW5', 'T5'],
+    supportedGames: ['IW4', 'IW5', 'T5', 'T6'],
     execute: (gameEvent) => {
         if (!validateEnabled(gameEvent.owner, gameEvent.origin)) {
             return;
@@ -405,7 +622,7 @@ const commands = [{
             name: 'player',
             required: true
         }],
-        supportedGames: ['IW4', 'IW5', 'T5'],
+        supportedGames: ['IW4', 'IW5', 'T5', 'T6'],
         execute: (gameEvent) => {
             if (!validateEnabled(gameEvent.owner, gameEvent.origin)) {
                 return;
@@ -423,7 +640,7 @@ const commands = [{
             name: 'player',
             required: true
         }],
-        supportedGames: ['IW4', 'IW5', 'T5'],
+        supportedGames: ['IW4', 'IW5', 'T5', 'T6'],
         execute: (gameEvent) => {
             if (!validateEnabled(gameEvent.owner, gameEvent.origin)) {
                 return;
@@ -441,7 +658,7 @@ const commands = [{
             name: 'player',
             required: true
         }],
-        supportedGames: ['IW4', 'IW5', 'T5'],
+        supportedGames: ['IW4', 'IW5', 'T5', 'T6'],
         execute: (gameEvent) => {
             if (!validateEnabled(gameEvent.owner, gameEvent.origin)) {
                 return;
@@ -471,7 +688,7 @@ const commands = [{
         permission: 'SeniorAdmin',
         targetRequired: false,
         arguments: [],
-        supportedGames: ['IW4', 'IW5', 'T5'],
+        supportedGames: ['IW4', 'IW5', 'T5', 'T6'],
         execute: (gameEvent) => {
             if (!validateEnabled(gameEvent.owner, gameEvent.origin)) {
                 return;
@@ -494,7 +711,7 @@ const commands = [{
                 required: true
             }
         ],
-        supportedGames: ['IW4', 'IW5', 'T5'],
+        supportedGames: ['IW4', 'IW5', 'T5', 'T6'],
         execute: (gameEvent) => {
             if (!validateEnabled(gameEvent.owner, gameEvent.origin)) {
                 return;
@@ -515,7 +732,7 @@ const commands = [{
             name: 'player',
             required: true
         }],
-        supportedGames: ['IW4', 'IW5', 'T5'],
+        supportedGames: ['IW4', 'IW5', 'T5', 'T6'],
         execute: (gameEvent) => {
             if (!validateEnabled(gameEvent.owner, gameEvent.origin)) {
                 return;
@@ -533,7 +750,7 @@ const commands = [{
             name: 'player',
             required: true
         }],
-        supportedGames: ['IW4', 'IW5', 'T5'],
+        supportedGames: ['IW4', 'IW5', 'T5', 'T6'],
         execute: (gameEvent) => {
             if (!validateEnabled(gameEvent.owner, gameEvent.origin)) {
                 return;
@@ -560,7 +777,7 @@ const commands = [{
                 required: true
             }
         ],
-        supportedGames: ['IW4', 'IW5', 'T5'],
+        supportedGames: ['IW4', 'IW5', 'T5', 'T6'],
         execute: (gameEvent) => {
             if (!validateEnabled(gameEvent.owner, gameEvent.origin)) {
                 return;
@@ -584,7 +801,7 @@ const commands = [{
             name: 'player',
             required: true
         }],
-        supportedGames: ['IW4', 'IW5', 'T5'],
+        supportedGames: ['IW4', 'IW5', 'T5', 'T6'],
         execute: (gameEvent) => {
             if (!validateEnabled(gameEvent.owner, gameEvent.origin)) {
                 return;
@@ -602,7 +819,7 @@ const commands = [{
             name: 'player',
             required: true
         }],
-        supportedGames: ['IW4', 'IW5', 'T5'],
+        supportedGames: ['IW4', 'IW5', 'T5', 'T6'],
         execute: (gameEvent) => {
             if (!validateEnabled(gameEvent.owner, gameEvent.origin)) {
                 return;
@@ -634,7 +851,7 @@ const parseEvent = (input) => {
         return {};
     }
 
-    const eventInfo = input.split(';');
+    const eventInfo = input.split(groupSeparatorChar);
 
     return {
         eventType: eventInfo[1],
@@ -652,7 +869,7 @@ const buildDataString = data => {
     let formattedData = '';
 
     for (let [key, value] of Object.entries(data)) {
-        formattedData += `${key}=${value}|`;
+        formattedData += `${key}${unitSeparatorChar}${value}${recordSeparatorChar}`;
     }
 
     return formattedData.slice(0, -1);
@@ -664,11 +881,11 @@ const parseDataString = data => {
     }
 
     const dict = {};
-    const split = data.split('|');
+    const split = data.split(recordSeparatorChar);
 
     for (let i = 0; i < split.length; i++) {
         const segment = split[i];
-        const keyValue = segment.split('=');
+        const keyValue = segment.split(unitSeparatorChar);
         if (keyValue.length !== 2) {
             continue;
         }
@@ -689,3 +906,20 @@ const validateEnabled = (server, origin) => {
 const isEmpty = (value) => {
     return value == null || false || value === '' || value === 'null';
 };
+
+const chunkString = (str, chunkSize) => {
+    const result = [];
+    for (let i = 0; i < str.length; i += chunkSize) {
+        result.push(str.slice(i, i + chunkSize));
+    }
+
+    return result;
+}
+
+const fileForDvar = (dvar) => {
+    if (dvar === inDvar) {
+        return busFileIn;
+    }
+    
+    return busFileOut;
+}

Plugins/ScriptPlugins/ParserBOIII.js

@@ -43,7 +43,7 @@ var plugin = {
         eventParser.Version = '[local] ship win64 CODBUILD8-764 (3421987) Mon Dec 16 10:44:20 2019 10d27bef';
         eventParser.GameName = 8; // BO3
         eventParser.Configuration.GameDirectory = 'usermaps';
-        eventParser.Configuration.Say.Pattern = '^(chat|chatteam);(?:[0-9]+);([0-9]+);([0-9]+);(.+);(.*)$';
+        eventParser.Configuration.Say.Pattern = '^(chat|chatteam);(?:[0-9]+);([a-f0-9]+);([0-9]+);(.+);(.*)$';
     },
 
     onUnloadAsync: function() {},

Plugins/ScriptPlugins/ParserCSGO.js

@@ -22,10 +22,10 @@ const plugin = {
         rconParser.Configuration.MapStatus.AddMapping(111, 1);
         
         rconParser.Configuration.HostnameStatus.Pattern = '^hostname: +(.+)$';
-        rconParser.Configuration.MapStatus.AddMapping(113, 1);
+        rconParser.Configuration.HostnameStatus.AddMapping(113, 1);
 
         rconParser.Configuration.MaxPlayersStatus.Pattern = '^players *: +\\d+ humans, \\d+ bots \\((\\d+).+';
-        rconParser.Configuration.MapStatus.AddMapping(114, 1);
+        rconParser.Configuration.MaxPlayersStatus.AddMapping(114, 1);
 
         rconParser.Configuration.Dvar.Pattern = '^"(.+)" = "(.+)" (?:\\( def. "(.*)" \\))?(?: |\\w)+- (.+)$';
         rconParser.Configuration.Dvar.AddMapping(106, 1);

Plugins/ScriptPlugins/ParserCSGOSM.js

@@ -3,7 +3,7 @@ let eventParser;
 
 const plugin = {
     author: 'RaidMax',
-    version: 0.6,
+    version: 0.7,
     name: 'CS:GO (SourceMod) Parser',
     engine: 'Source',
     isParser: true,
@@ -22,10 +22,10 @@ const plugin = {
         rconParser.Configuration.MapStatus.AddMapping(111, 1);
 
         rconParser.Configuration.HostnameStatus.Pattern = '^hostname: +(.+)$';
-        rconParser.Configuration.MapStatus.AddMapping(113, 1);
+        rconParser.Configuration.HostnameStatus.AddMapping(113, 1);
 
         rconParser.Configuration.MaxPlayersStatus.Pattern = '^players *: +\\d+ humans, \\d+ bots \\((\\d+).+';
-        rconParser.Configuration.MapStatus.AddMapping(114, 1);
+        rconParser.Configuration.MaxPlayersStatus.AddMapping(114, 1);
 
         rconParser.Configuration.Dvar.Pattern = '^"(.+)" = "(.+)" (?:\\( def. "(.*)" \\))?(?: |\\w)+- (.+)$';
         rconParser.Configuration.Dvar.AddMapping(106, 1);

Plugins/ScriptPlugins/ParserL4D2SM.js

@@ -0,0 +1,135 @@
+let rconParser;
+let eventParser;
+
+const plugin = {
+    author: 'RaidMax',
+    version: 0.1,
+    name: 'L4D2 (SourceMod) Parser',
+    engine: 'Source',
+    isParser: true,
+
+    onEventAsync: function (gameEvent, server) {
+    },
+
+    onLoadAsync: function (manager) {
+        rconParser              = manager.GenerateDynamicRConParser(this.name);
+        eventParser             = manager.GenerateDynamicEventParser(this.name);
+        rconParser.RConEngine   = this.engine;
+
+        rconParser.Configuration.StatusHeader.Pattern = '# userid name uniqueid connected ping loss state rate adr';
+
+        rconParser.Configuration.MapStatus.Pattern = '^map *: +(.+)$';
+        rconParser.Configuration.MapStatus.AddMapping(111, 1);
+
+        rconParser.Configuration.HostnameStatus.Pattern = '^hostname: +(.+)$';
+        rconParser.Configuration.HostnameStatus.AddMapping(113, 1);
+
+        rconParser.Configuration.MaxPlayersStatus.Pattern = '^players *: +\\d+ humans, \\d+ bots \\((\\d+).+';
+        rconParser.Configuration.MaxPlayersStatus.AddMapping(114, 1);
+
+        rconParser.Configuration.Dvar.Pattern = '^\\"(.+)\\" (?:=|is) \\"(.+)\\"(?: (?:\\( def. \\"(.*)\\" \\)))?$';
+        rconParser.Configuration.Dvar.AddMapping(106, 1);
+        rconParser.Configuration.Dvar.AddMapping(107, 2);
+        rconParser.Configuration.Dvar.AddMapping(108, 3);
+        rconParser.Configuration.Dvar.AddMapping(109, 3);
+
+        rconParser.Configuration.Status.Pattern = '^#\\s*(\\d+) (\\d+) "(.+)" (\\S+) +(\\d+:\\d+(?::\\d+)?) (\\d+) (\\S+) (\\S+) (\\d+) (\\d+\\.\\d+\\.\\d+\\.\\d+:\\d+)$';
+        rconParser.Configuration.Status.AddMapping(100, 2);
+        rconParser.Configuration.Status.AddMapping(101, -1);
+        rconParser.Configuration.Status.AddMapping(102, 6);
+        rconParser.Configuration.Status.AddMapping(103, 4)
+        rconParser.Configuration.Status.AddMapping(104, 3);
+        rconParser.Configuration.Status.AddMapping(105, 10);
+        rconParser.Configuration.Status.AddMapping(200, 1);
+
+        rconParser.Configuration.DefaultDvarValues.Add('sv_running', '1');
+        rconParser.Configuration.DefaultDvarValues.Add('bugfix_no_version', this.engine);
+        rconParser.Configuration.DefaultDvarValues.Add('fs_basepath', '');
+        rconParser.Configuration.DefaultDvarValues.Add('fs_basegame', '');
+        rconParser.Configuration.DefaultDvarValues.Add('fs_homepath', '');
+        rconParser.Configuration.DefaultDvarValues.Add('g_log', '');
+        rconParser.Configuration.DefaultDvarValues.Add('net_ip', 'localhost');
+        rconParser.Configuration.DefaultDvarValues.Add('g_gametype', '');
+        rconParser.Configuration.DefaultDvarValues.Add('fs_game', '');
+
+        rconParser.Configuration.OverrideDvarNameMapping.Add('sv_hostname', 'hostname');
+        rconParser.Configuration.OverrideDvarNameMapping.Add('mapname', 'host_map');
+        rconParser.Configuration.OverrideDvarNameMapping.Add('sv_maxclients', 'maxplayers');
+        rconParser.Configuration.OverrideDvarNameMapping.Add('g_password', 'sv_password');
+        rconParser.Configuration.OverrideDvarNameMapping.Add('version', 'bugfix_no_version');
+
+        rconParser.Configuration.ColorCodeMapping.Clear();
+        rconParser.Configuration.ColorCodeMapping.Add('White', '\x01');
+        rconParser.Configuration.ColorCodeMapping.Add('Red', '\x07');
+        rconParser.Configuration.ColorCodeMapping.Add('LightRed', '\x0F');
+        rconParser.Configuration.ColorCodeMapping.Add('DarkRed', '\x02');
+        rconParser.Configuration.ColorCodeMapping.Add('Blue', '\x0B');
+        rconParser.Configuration.ColorCodeMapping.Add('DarkBlue', '\x0C');
+        rconParser.Configuration.ColorCodeMapping.Add('Purple', '\x03');
+        rconParser.Configuration.ColorCodeMapping.Add('Orchid', '\x0E');
+        rconParser.Configuration.ColorCodeMapping.Add('Yellow', '\x09');
+        rconParser.Configuration.ColorCodeMapping.Add('Gold', '\x10');
+        rconParser.Configuration.ColorCodeMapping.Add('LightGreen', '\x05');
+        rconParser.Configuration.ColorCodeMapping.Add('Green', '\x04');
+        rconParser.Configuration.ColorCodeMapping.Add('Lime', '\x06');
+        rconParser.Configuration.ColorCodeMapping.Add('Grey', '\x08');
+        rconParser.Configuration.ColorCodeMapping.Add('Grey2', '\x0D');
+        // only adding there here for the default accent color
+        rconParser.Configuration.ColorCodeMapping.Add('Cyan', '\x0B');
+
+        rconParser.Configuration.NoticeLineSeparator    = '. ';
+        rconParser.Configuration.DefaultRConPort        = 27015;
+        rconParser.CanGenerateLogPath                   = false;
+
+        rconParser.Configuration.CommandPrefixes.RConGetInfo    = undefined;
+        rconParser.Configuration.CommandPrefixes.Kick           = 'sm_kick #{0} {1}';
+        rconParser.Configuration.CommandPrefixes.Ban            = 'sm_kick #{0} {1}';
+        rconParser.Configuration.CommandPrefixes.TempBan        = 'sm_kick #{0} {1}';
+        rconParser.Configuration.CommandPrefixes.Say            = 'sm_say {0}';
+        rconParser.Configuration.CommandPrefixes.Tell           = 'sm_psay #{0} "{1}"';
+
+        eventParser.Configuration.Say.Pattern = '^"(.+)<(\\d+)><(.+)><(.*?)>" (?:say|say_team) "(.*)"$';
+        eventParser.Configuration.Say.AddMapping(5, 1);
+        eventParser.Configuration.Say.AddMapping(3, 2);
+        eventParser.Configuration.Say.AddMapping(1, 3);
+        eventParser.Configuration.Say.AddMapping(7, 4);
+        eventParser.Configuration.Say.AddMapping(13, 5);
+
+        eventParser.Configuration.Kill.Pattern = '^"(.+)<(\\d+)><(.+)><(.*)>" \\[-?\\d+ -?\\d+ -?\\d+\\] killed "(.+)<(\\d+)><(.+)><(.*)>" \\[-?\\d+ -?\\d+ -?\\d+\\] with "(\\S*)" *(?:\\((\\w+)((?: ).+)?\\))?$';
+        eventParser.Configuration.Kill.AddMapping(5, 1);
+        eventParser.Configuration.Kill.AddMapping(3, 2);
+        eventParser.Configuration.Kill.AddMapping(1, 3);
+        eventParser.Configuration.Kill.AddMapping(7, 4);
+        eventParser.Configuration.Kill.AddMapping(6, 5);
+        eventParser.Configuration.Kill.AddMapping(4, 6);
+        eventParser.Configuration.Kill.AddMapping(2, 7);
+        eventParser.Configuration.Kill.AddMapping(8, 8);
+        eventParser.Configuration.Kill.AddMapping(9, 9);
+        eventParser.Configuration.Kill.AddMapping(12, 10);
+
+        eventParser.Configuration.MapEnd.Pattern = '^World triggered "Match_Start" on "(.+)"$';
+
+        eventParser.Configuration.JoinTeam.Pattern = '^"(.+)<(\\d+)><(.*)>" switched from team <(.+)> to <(.+)>$';
+        eventParser.Configuration.JoinTeam.AddMapping(5, 1);
+        eventParser.Configuration.JoinTeam.AddMapping(3, 2);
+        eventParser.Configuration.JoinTeam.AddMapping(1, 3);
+        eventParser.Configuration.JoinTeam.AddMapping(7, 5);
+
+        eventParser.Configuration.TeamMapping.Add('CT', 2);
+        eventParser.Configuration.TeamMapping.Add('TERRORIST', 3);
+
+        eventParser.Configuration.Time.Pattern = '^L [01]\\d/[0-3]\\d/\\d+ - [0-2]\\d:[0-5]\\d:[0-5]\\d:';
+
+        rconParser.Version      = 'L4D2SM';
+        rconParser.GameName     = 12; // L4D2
+        eventParser.Version     = 'L4D2SM';
+        eventParser.GameName    = 12; // L4D2
+        eventParser.URLProtocolFormat = 'steam://connect/{{ip}}:{{port}}';
+    },
+
+    onUnloadAsync: function () {
+    },
+
+    onTickAsync: function (server) {
+    }
+};

Plugins/Stats/Dtos/ChatSearchQuery.cs

@@ -25,10 +25,24 @@ namespace Stats.Dtos
         /// </summary>
         public DateTime? SentAfter { get; set; }
 
+        /// <summary>
+        /// The time associated with SentAfter date
+        /// </summary>
+        public string SentAfterTime { get; set; }
+
+        public DateTime? SentAfterDateTime => SentAfter?.Add(string.IsNullOrEmpty(SentAfterTime) ? TimeSpan.Zero : TimeSpan.Parse(SentAfterTime));
+
         /// <summary>
         /// only look for messages sent before this date0
         /// </summary>
-        public DateTime SentBefore { get; set; } = DateTime.UtcNow;
+        public DateTime SentBefore { get; set; } = DateTime.UtcNow.Date;
+
+        public string SentBeforeTime { get; set; }
+
+        public DateTime? SentBeforeDateTime =>
+            SentBefore.Add(string.IsNullOrEmpty(SentBeforeTime) ? TimeSpan.Zero : TimeSpan.Parse(SentBeforeTime));
+        
+        public bool IsExactMatch { get; set; }
         
         /// <summary>
         /// indicates if the chat is on the meta page

Plugins/Stats/Extensions.cs

@@ -13,7 +13,6 @@ namespace IW4MAdmin.Plugins.Stats
     {
         private const int ZScoreRange = 3;
         private const int RankIconDivisions = 24;
-        private const int MaxMessages = 100;
 
         public class LogParams
         {
@@ -127,70 +126,5 @@ namespace IW4MAdmin.Plugins.Stats
 
             return 0;
         }
-
-        /// <summary>
-        ///  todo: lets abstract this out to a generic buildable query
-        ///  this is just a dirty PoC
-        /// </summary>
-        /// <param name="query"></param>
-        /// <returns></returns>
-        public static ChatSearchQuery ParseSearchInfo(this string query, int count, int offset)
-        {
-            string[] filters = query.Split('|');
-            var searchRequest = new ChatSearchQuery
-            {
-                Filter = query,
-                Count = count,
-                Offset = offset
-            };
-
-            // sanity checks
-            searchRequest.Count = Math.Min(searchRequest.Count, MaxMessages);
-            searchRequest.Count = Math.Max(searchRequest.Count, 0);
-            searchRequest.Offset = Math.Max(searchRequest.Offset, 0);
-
-            if (filters.Length > 1)
-            {
-                if (filters[0].ToLower() != "chat")
-                {
-                    throw new ArgumentException("Query is not compatible with chat");
-                }
-
-                foreach (string filter in filters.Skip(1))
-                {
-                    string[] args = filter.Split(' ');
-
-                    if (args.Length > 1)
-                    {
-                        string recombinedArgs = string.Join(' ', args.Skip(1));
-                        switch (args[0].ToLower())
-                        {
-                            case "before":
-                                searchRequest.SentBefore = DateTime.Parse(recombinedArgs);
-                                break;
-                            case "after":
-                                searchRequest.SentAfter = DateTime.Parse(recombinedArgs);
-                                break;
-                            case "server":
-                                searchRequest.ServerId = args[1];
-                                break;
-                            case "client":
-                                searchRequest.ClientId = int.Parse(args[1]);
-                                break;
-                            case "contains":
-                                searchRequest.MessageContains = string.Join(' ', args.Skip(1));
-                                break;
-                            case "sort":
-                                searchRequest.Direction = Enum.Parse<SortDirection>(args[1], ignoreCase: true);
-                                break;
-                        }
-                    }
-                }
-
-                return searchRequest;
-            }
-
-            throw new ArgumentException("No filters specified for chat search");
-        }
     }
 }

Plugins/Stats/Helpers/ChatResourceQueryHelper.cs

@@ -53,11 +53,11 @@ namespace Stats.Helpers
             }
 
             var iqMessages = context.Set<EFClientMessage>()
-                .Where(message => message.TimeSent < query.SentBefore);
+                .Where(message => message.TimeSent < query.SentBeforeDateTime);
 
-            if (query.SentAfter is not null)
+            if (query.SentAfterDateTime is not null)
             {
-                iqMessages = iqMessages.Where(message => message.TimeSent >= query.SentAfter);
+                iqMessages = iqMessages.Where(message => message.TimeSent >= query.SentAfterDateTime);
             }
 
             if (query.ClientId is not null)
@@ -72,7 +72,10 @@ namespace Stats.Helpers
 
             if (!string.IsNullOrEmpty(query.MessageContains))
             {
-                iqMessages = iqMessages.Where(message => EF.Functions.Like(message.Message.ToLower(), $"%{query.MessageContains.ToLower()}%"));
+                iqMessages = query.IsExactMatch
+                    ? iqMessages.Where(message => message.Message.ToLower() == query.MessageContains.ToLower())
+                    : iqMessages.Where(message =>
+                        EF.Functions.Like(message.Message.ToLower(), $"%{query.MessageContains.ToLower()}%"));
             }
 
             var iqResponse = iqMessages

Plugins/Stats/Plugin.cs

@@ -469,6 +469,8 @@ public class Plugin : IPluginV2
                 ClientId = request.ClientId,
                 Before = request.Before,
                 SentBefore = request.Before ?? DateTime.UtcNow,
+                SentAfter = request.After,
+                After = request.After,
                 Count = request.Count,
                 IsProfileMeta = true
             };

README.md

@@ -56,4 +56,4 @@ Feel free to join the **IW4MAdmin** [Discord](https://discord.gg/ZZFK5p3)
 If you come across an issue,  bug, or feature request please post an [issue](https://github.com/RaidMax/IW4M-Admin/issues)
 
 
-#### Explore the [wiki](https://github.com/RaidMax/IW4M-Admin/wiki) to find more information.
+#### Explore the [wiki](https://git.rimmyscorner.com/Parasyn/IW4M-Admin/wiki) to find more information.

SharedLibraryCore/BaseController.cs

@@ -178,7 +178,8 @@ namespace SharedLibraryCore
             ViewBag.ReportCount = Manager.GetServers().Sum(server =>
                 server.Reports.Count(report => DateTime.UtcNow - report.ReportedOn <= TimeSpan.FromHours(24)));
             ViewBag.PermissionsSet = PermissionsSet;
-            ViewBag.Alerts = AlertManager.RetrieveAlerts(Client).ToList();
+            ViewBag.Alerts = AlertManager.RetrieveAlerts(Client);
+            ViewBag.Manager = Manager;
 
             base.OnActionExecuting(context);
         }

SharedLibraryCore/Configuration/ApplicationConfiguration.cs

@@ -206,7 +206,7 @@ namespace SharedLibraryCore.Configuration
             : ManualWebfrontUrl;
 
         [ConfigurationIgnore] public bool IgnoreServerConnectionLost { get; set; }
-        [ConfigurationIgnore] public Uri MasterUrl { get; set; } = new("http://api.raidmax.org:5000");
+        [ConfigurationIgnore] public Uri MasterUrl { get; set; } = new("https://master.iw4.zip");
 
         public IBaseConfiguration Generate()
         {

SharedLibraryCore/Configuration/Validation/ApplicationConfigurationValidator.cs

@@ -67,7 +67,7 @@ namespace SharedLibraryCore.Configuration.Validation
 
             RuleFor(_app => _app.MasterUrl)
                 .NotNull()
-                .Must(_url => _url != null && _url.Scheme == Uri.UriSchemeHttp);
+                .Must(_url => _url != null && (_url.Scheme == Uri.UriSchemeHttp || _url.Scheme == Uri.UriSchemeHttps));
 
             RuleFor(_app => _app.CommandPrefix)
                 .NotEmpty();

SharedLibraryCore/Dtos/ClientHistoryInfo.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Text.Json.Serialization;
 
 namespace SharedLibraryCore.Dtos
 {
@@ -11,11 +12,17 @@ namespace SharedLibraryCore.Dtos
 
     public class ClientCountSnapshot
     {
+        [JsonIgnore]
         public DateTime Time { get; set; }
+        [JsonPropertyName("ts")]
         public string TimeString => Time.ToString("yyyy-MM-ddTHH:mm:ssZ");
+        [JsonPropertyName("cc")]
         public int ClientCount { get; set; }
+        [JsonPropertyName("ci")]
         public bool ConnectionInterrupted { get;set; }
+        [JsonIgnore]
         public string Map { get; set; }
+        [JsonPropertyName("ma")]
         public string MapAlias { get; set; }
     }
 }

SharedLibraryCore/Dtos/IW4MAdminInfo.cs

@@ -1,5 +1,5 @@
 using System;
-using static SharedLibraryCore.Server;
+using Data.Models;
 
 namespace SharedLibraryCore.Dtos
 {
@@ -15,11 +15,11 @@ namespace SharedLibraryCore.Dtos
         /// <summary>
         ///     specifies the game name filter
         /// </summary>
-        public Game? Game { get; set; }
+        public Reference.Game? Game { get; set; }
 
         /// <summary>
         ///     collection of unique game names being monitored
         /// </summary>
-        public Game[] ActiveServerGames { get; set; }
+        public Reference.Game[] ActiveServerGames { get; set; }
     }
 }

SharedLibraryCore/Interfaces/Events/IGameServerEventSubscriptions.cs

@@ -78,7 +78,7 @@ public interface IGameServerEventSubscriptions
         return coreEvent switch
         {
             MonitorStartEvent monitoringStartEvent => MonitoringStarted?.InvokeAsync(monitoringStartEvent, token) ?? Task.CompletedTask,
-            MonitorStopEvent monitorStopEvent => MonitoringStopped?.InvokeAsync(monitorStopEvent, token) ?? Task.CompletedTask,
+            MonitorStopEvent monitorStopEvent => MonitoringStopped?.InvokeAsync(monitorStopEvent, CancellationToken.None) ?? Task.CompletedTask,
             ConnectionInterruptEvent connectionInterruptEvent => ConnectionInterrupted?.InvokeAsync(connectionInterruptEvent, token) ?? Task.CompletedTask,
             ConnectionRestoreEvent connectionRestoreEvent => ConnectionRestored?.InvokeAsync(connectionRestoreEvent, token) ?? Task.CompletedTask,
             ClientDataUpdateEvent clientDataUpdateEvent => ClientDataUpdated?.InvokeAsync(clientDataUpdateEvent, token) ?? Task.CompletedTask,

SharedLibraryCore/Interfaces/IServerDataViewer.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
+using Data.Models;
 using SharedLibraryCore.Dtos;
 
 namespace SharedLibraryCore.Interfaces
@@ -15,19 +16,21 @@ namespace SharedLibraryCore.Interfaces
         ///     Retrieves the max concurrent clients over a give time period for all servers or given server id
         /// </summary>
         /// <param name="serverId">ServerId to query on</param>
+        /// <param name="gameCode"><see cref="Reference.Game"/></param>
         /// <param name="overPeriod">how far in the past to search</param>
         /// <param name="token">CancellationToken</param>
         /// <returns></returns>
-        Task<(int?, DateTime?)> MaxConcurrentClientsAsync(long? serverId = null, TimeSpan? overPeriod = null,
+        Task<(int?, DateTime?)> MaxConcurrentClientsAsync(long? serverId = null, Reference.Game? gameCode = null, TimeSpan? overPeriod = null,
             CancellationToken token = default);
 
         /// <summary>
         ///     Gets the total number of clients connected and total clients connected in the given time frame
         /// </summary>
         /// <param name="overPeriod">how far in the past to search</param>
+        /// <param name="gameCode"><see cref="Reference.Game"/></param>
         /// <param name="token">CancellationToken</param>
         /// <returns></returns>
-        Task<(int, int)> ClientCountsAsync(TimeSpan? overPeriod = null, CancellationToken token = default);
+        Task<(int, int)> ClientCountsAsync(TimeSpan? overPeriod = null, Reference.Game? gameCode = null, CancellationToken token = default);
 
         /// <summary>
         ///     Retrieves the client count and history over the given period

SharedLibraryCore/PartialEntities/EFClient.cs

@@ -117,6 +117,9 @@ namespace SharedLibraryCore.Database.Models
         [NotMapped] public TeamType Team { get; set; }
         [NotMapped] public string TeamName { get; set; }
 
+        [NotMapped]
+        public string TimeSinceLastConnectionString => (DateTime.UtcNow - LastConnection).HumanizeForCurrentCulture();
+
         [NotMapped]
         // this is kinda dirty, but I need localizable level names
         public ClientPermission ClientPermission => new ClientPermission

SharedLibraryCore/Server.cs

@@ -35,7 +35,8 @@ namespace SharedLibraryCore
             T7 = 8,
             SHG1 = 9,
             CSGO = 10,
-            H1 = 11
+            H1 = 11,
+            L4D2 = 12
         }
 
         // only here for performance

SharedLibraryCore/Services/PenaltyService.cs

@@ -215,7 +215,8 @@ namespace SharedLibraryCore.Services
             return await activePenaltiesIds.Select(ids => ids.Penalty).ToListAsync();
         }
 
-        public virtual async Task RemoveActivePenalties(int aliasLinkId, long networkId, Reference.Game game, int? ipAddress = null)
+        public virtual async Task RemoveActivePenalties(int aliasLinkId, long networkId, Reference.Game game, int? ipAddress = null,
+            EFPenalty.PenaltyType[] penaltyTypes = null)
         {
             await using var context = _contextFactory.CreateContext();
             var now = DateTime.UtcNow;
@@ -226,6 +227,7 @@ namespace SharedLibraryCore.Services
             {
                 var ids = activePenalties.Select(penalty => penalty.PenaltyId);
                 await context.Penalties.Where(penalty => ids.Contains(penalty.PenaltyId))
+                    .Where(pen => penaltyTypes == null || penaltyTypes.Contains(pen.Type))
                     .ForEachAsync(penalty =>
                     {
                         penalty.Active = false;

SharedLibraryCore/Utilities.cs

@@ -50,8 +50,8 @@ namespace SharedLibraryCore
         public static char[] DirectorySeparatorChars = { '\\', '/' };
         public static char CommandPrefix { get; set; } = '!';
 
-        public static string ToStandardFormat(this DateTime? time) => time?.ToString("yyyy-MM-dd H:mm:ss UTC");
+        public static string ToStandardFormat(this DateTime? time) => time?.ToString("yyyy-MM-dd HH:mm:ss UTC");
-        public static string ToStandardFormat(this DateTime time) => time.ToString("yyyy-MM-dd H:mm:ss UTC");
+        public static string ToStandardFormat(this DateTime time) => time.ToString("yyyy-MM-dd HH:mm:ss UTC");
 
         public static EFClient IW4MAdminClient(Server server = null)
         {
@@ -195,7 +195,7 @@ namespace SharedLibraryCore
             }
 
             var output = str;
-            var colorCodeMatches = Regex.Matches(output, @"\(Color::(.{1,16})\)",
+            var colorCodeMatches = Regex.Matches(output, @"\(Color::(\w{1,16})\)",
                 RegexOptions.IgnoreCase | RegexOptions.Compiled);
             foreach (var match in colorCodeMatches.Where(m => m.Success))
             {
@@ -1145,7 +1145,7 @@ namespace SharedLibraryCore
         /// </summary>
         /// <returns></returns>
         public static bool IsDevelopment =>
-            Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") == "Development";
+            Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") == "Development" || AppContext.TryGetSwitch("IsDevelop", out _);
 
         /// <summary>
         ///     replaces any directory separator chars with the platform specific character

WebfrontCore/Controllers/API/Info.cs

@@ -2,6 +2,7 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Data.Models;
 using Microsoft.AspNetCore.Mvc;
 using SharedLibraryCore;
 using SharedLibraryCore.Interfaces;
@@ -21,13 +22,13 @@ public class Info : BaseController
     }
     
     [HttpGet]
-    public async Task<IActionResult> Get(int period = 24, CancellationToken token = default)
+    public async Task<IActionResult> Get(int period = 24, Reference.Game? game = null, CancellationToken token = default)
     {
         // todo: this is hardcoded currently because the cache doesn't take into consideration the duration, so 
         // we could impact the webfront usage too
         var duration = TimeSpan.FromHours(24);
         var (totalClients, totalRecentClients) =
-            await _serverDataViewer.ClientCountsAsync(duration, token);
+            await _serverDataViewer.ClientCountsAsync(duration, game, token);
         var (maxConcurrent, maxConcurrentTime) = await _serverDataViewer.MaxConcurrentClientsAsync(overPeriod: duration, token: token);
         var response = new InfoResponse
         {

WebfrontCore/Controllers/API/Server.cs

@@ -1,8 +1,12 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using SharedLibraryCore;
+using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Dtos;
 using SharedLibraryCore.Interfaces;
 using WebfrontCore.Controllers.API.Models;
 
@@ -12,9 +16,14 @@ namespace WebfrontCore.Controllers.API
     [Route("api/[controller]")]
     public class Server : BaseController
     {
+        private readonly IServerDataViewer _serverDataViewer;
+        private readonly ApplicationConfiguration _applicationConfiguration;
 
-        public Server(IManager manager) : base(manager)
+        public Server(IManager manager, IServerDataViewer serverDataViewer,
+            ApplicationConfiguration applicationConfiguration) : base(manager)
         {
+            _serverDataViewer = serverDataViewer;
+            _applicationConfiguration = applicationConfiguration;
         }
         
         [HttpGet]
@@ -110,5 +119,48 @@ namespace WebfrontCore.Controllers.API
                 completedEvent.Output
             });
         }
+
+        [HttpGet("{id}/history")]
+        public async Task<IActionResult> GetClientHistory(string id)
+        {
+            var foundServer = Manager.GetServers().FirstOrDefault(server => server.Id == id);
+            
+            if (foundServer == null)
+            {
+                return new NotFoundResult();
+            }
+            
+            var clientHistory = (await _serverDataViewer.ClientHistoryAsync(_applicationConfiguration.MaxClientHistoryTime,
+                                        CancellationToken.None))?
+                                    .FirstOrDefault(history => history.ServerId == foundServer.LegacyDatabaseId) ??
+                                new ClientHistoryInfo
+                                {
+                                    ServerId = foundServer.LegacyDatabaseId,
+                                    ClientCounts = new List<ClientCountSnapshot>()
+                                };
+            
+            var counts = clientHistory.ClientCounts?.AsEnumerable() ?? Enumerable.Empty<ClientCountSnapshot>();
+
+            if (foundServer.ClientHistory.ClientCounts.Any())
+            {
+                counts = counts.Union(foundServer.ClientHistory.ClientCounts.Where(history =>
+                        history.Time > (clientHistory.ClientCounts?.LastOrDefault()?.Time ?? DateTime.MinValue)))
+                    .Where(history => history.Time >= DateTime.UtcNow - _applicationConfiguration.MaxClientHistoryTime);
+            }
+
+            if (ViewBag.Maps?.Count == 0)
+            {
+                return Json(counts.ToList());
+            }
+
+            var clientCountSnapshots = counts.ToList();
+            foreach (var count in clientCountSnapshots)
+            {
+                count.MapAlias = foundServer.Maps.FirstOrDefault(map => map.Name == count.Map)?.Alias ??
+                                 count.Map;
+            }
+
+            return Json(clientCountSnapshots);
+        }
     }
 }

WebfrontCore/Controllers/Client/ClientController.cs

@@ -250,6 +250,7 @@ namespace WebfrontCore.Controllers
             ViewBag.Title = Localization["WEBFRONT_SEARCH_RESULTS_TITLE"];
             ViewBag.ClientResourceRequest = request;
 
+            request.RequesterPermission = Client.Level;
             var response = await _clientResourceHelper.QueryResource(request);
             return request.Offset > 0
                 ? PartialView("Find/_AdvancedFindList", response.Results)

WebfrontCore/Controllers/Client/Legacy/StatsController.cs

@@ -17,6 +17,7 @@ using Microsoft.Extensions.Logging;
 using ILogger = Microsoft.Extensions.Logging.ILogger;
 using Data.Abstractions;
 using Stats.Config;
+using WebfrontCore.QueryHelpers.Models;
 
 namespace IW4MAdmin.Plugins.Web.StatsWeb.Controllers
 {
@@ -121,7 +122,7 @@ namespace IW4MAdmin.Plugins.Web.StatsWeb.Controllers
         }
 
         [HttpGet("Message/Find")]
-        public async Task<IActionResult> FindMessage([FromQuery] string query)
+        public async Task<IActionResult> FindMessage([FromQuery] ChatResourceRequest query)
         {
             ViewBag.Localization = _translationLookup;
             ViewBag.EnableColorCodes = _manager.GetApplicationSettings().Configuration().EnableColorCodes;
@@ -130,53 +131,15 @@ namespace IW4MAdmin.Plugins.Web.StatsWeb.Controllers
             ViewBag.Title = _translationLookup["WEBFRONT_STATS_MESSAGES_TITLE"];
             ViewBag.Error = null;
             ViewBag.IsFluid = true;
-            ChatSearchQuery searchRequest = null;
         
-            try
+            var result = query != null ? await _chatResourceQueryHelper.QueryResource(query) : null;
-            {
-                searchRequest = query.ParseSearchInfo(int.MaxValue, 0);
-            }
-
-            catch (ArgumentException e)
-            {
-                _logger.LogWarning(e, "Could not parse chat message search query {query}", query);
-                ViewBag.Error = e;
-            }
-
-            catch (FormatException e)
-            {
-                _logger.LogWarning(e, "Could not parse chat message search query filter format {query}", query);
-                ViewBag.Error = e;
-            }
-
-            var result = searchRequest != null ? await _chatResourceQueryHelper.QueryResource(searchRequest) : null;
             return View("~/Views/Client/Message/Find.cshtml", result);
         }
 
         [HttpGet("Message/FindNext")]
-        public async Task<IActionResult> FindNextMessages([FromQuery] string query, [FromQuery] int count,
+        public async Task<IActionResult> FindNextMessages(ChatResourceRequest query)
-            [FromQuery] int offset)
         {
-            ChatSearchQuery searchRequest;
+            var result = await _chatResourceQueryHelper.QueryResource(query);
-
-            try
-            {
-                searchRequest = query.ParseSearchInfo(count, offset);
-            }
-
-            catch (ArgumentException e)
-            {
-                _logger.LogWarning(e, "Could not parse chat message search query {query}", query);
-                throw;
-            }
-
-            catch (FormatException e)
-            {
-                _logger.LogWarning(e, "Could not parse chat message search query filter format {query}", query);
-                throw;
-            }
-
-            var result = await _chatResourceQueryHelper.QueryResource(searchRequest);
             return PartialView("~/Views/Client/Message/_Item.cshtml", result.Results);
         }
 

WebfrontCore/Controllers/DynamicFileController.cs

@@ -1,50 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-using SharedLibraryCore;
-using SharedLibraryCore.Interfaces;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace WebfrontCore.Controllers
-{
-    [Route("dynamic")]
-    public class DynamicFileController : BaseController
-    {
-        private static readonly IDictionary<string, string> _fileCache = new Dictionary<string, string>();
-
-        public DynamicFileController(IManager manager) : base(manager)
-        {
-
-        }
-
-        [Route("css/{fileName}")]
-        public async Task<IActionResult> Css(string fileName)
-        {
-            if (fileName.EndsWith(".css"))
-            {
-                if (Utilities.IsDevelopment)
-                {
-                    var path = Path.Join(Utilities.OperatingDirectory, "..", "..", "..", "..", "WebfrontCore", "wwwroot", "css", fileName);
-                    string cssData = await System.IO.File.ReadAllTextAsync(path);
-                    cssData = await Manager.MiddlewareActionHandler.Execute(cssData, "custom_css_accent");
-                    return Content(cssData, "text/css");
-                }
-
-                if (!_fileCache.ContainsKey(fileName))
-                {
-
-                    string path = $"wwwroot{Path.DirectorySeparatorChar}css{Path.DirectorySeparatorChar}{fileName}";
-                    string data = await System.IO.File.ReadAllTextAsync(path);
-                    data = await Manager.MiddlewareActionHandler.Execute(data, "custom_css_accent");
-                    _fileCache.Add(fileName, data);
-                }
-
-                return Content(_fileCache[fileName], "text/css");
-            }
-
-            return StatusCode(400);
-        }
-    }
-}

WebfrontCore/Controllers/HomeController.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using Microsoft.AspNetCore.Diagnostics;
 using Microsoft.AspNetCore.Mvc;
 using SharedLibraryCore;
@@ -7,8 +8,8 @@ using SharedLibraryCore.Interfaces;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Data.Models;
 using Microsoft.Extensions.Logging;
-using static SharedLibraryCore.Server;
 using ILogger = Microsoft.Extensions.Logging.ILogger;
 
 namespace WebfrontCore.Controllers
@@ -18,35 +19,44 @@ namespace WebfrontCore.Controllers
         private readonly ITranslationLookup _translationLookup;
         private readonly ILogger _logger;
         private readonly IServerDataViewer _serverDataViewer;
+        private readonly ILookup<Type, string> _pluginTypeNames;
 
         public HomeController(ILogger<HomeController> logger, IManager manager, ITranslationLookup translationLookup,
-            IServerDataViewer serverDataViewer) : base(manager)
+            IServerDataViewer serverDataViewer, IEnumerable<IPlugin> v1Plugins, IEnumerable<IPluginV2> v2Plugins) : base(manager)
         {
             _logger = logger;
             _translationLookup = translationLookup;
             _serverDataViewer = serverDataViewer;
+            _pluginTypeNames = v1Plugins.Select(plugin => (plugin.GetType(), plugin.Name))
+                .Concat(v2Plugins.Select(plugin => (plugin.GetType(), plugin.Name)))
+                .ToLookup(selector => selector.Item1, selector => selector.Name);
         }
 
-        public async Task<IActionResult> Index(Game? game = null, CancellationToken cancellationToken = default)
+        public async Task<IActionResult> Index(Reference.Game? game = null,
+            CancellationToken cancellationToken = default)
         {
             ViewBag.Description = Localization["WEBFRONT_DESCRIPTION_HOME"];
             ViewBag.Title = Localization["WEBFRONT_HOME_TITLE"];
             ViewBag.Keywords = Localization["WEBFRONT_KEWORDS_HOME"];
 
-            var servers = Manager.GetServers().Where(_server => !game.HasValue || _server.GameName == game);
+            var servers = Manager.GetServers().Where(server => game is null || server.GameName == (Server.Game?)game)
-            var (clientCount, time) = await _serverDataViewer.MaxConcurrentClientsAsync(token: cancellationToken);
+                .ToList();
-            var (count, recentCount) = await _serverDataViewer.ClientCountsAsync(token: cancellationToken);
+            var (clientCount, time) =
+                await _serverDataViewer.MaxConcurrentClientsAsync(gameCode: game, token: cancellationToken);
+            var (count, recentCount) =
+                await _serverDataViewer.ClientCountsAsync(gameCode: game, token: cancellationToken);
 
-            var model = new IW4MAdminInfo()
+            var model = new IW4MAdminInfo
             {
-                TotalAvailableClientSlots = servers.Sum(_server => _server.MaxClients),
+                TotalAvailableClientSlots = servers.Sum(server => server.MaxClients),
-                TotalOccupiedClientSlots = servers.SelectMany(_server => _server.GetClientsAsList()).Count(),
+                TotalOccupiedClientSlots = servers.SelectMany(server => server.GetClientsAsList()).Count(),
                 TotalClientCount = count,
                 RecentClientCount = recentCount,
                 MaxConcurrentClients = clientCount ?? 0,
                 MaxConcurrentClientsTime = time ?? DateTime.UtcNow,
                 Game = game,
-                ActiveServerGames = Manager.GetServers().Select(_server => _server.GameName).Distinct().ToArray()
+                ActiveServerGames = Manager.GetServers().Select(server => (Reference.Game)server.GameName).Distinct()
+                    .ToArray()
             };
 
             return View(model);
@@ -91,9 +101,9 @@ namespace WebfrontCore.Controllers
                     }
 
                     var pluginType = command.GetType().Assembly.GetTypes()
-                        .FirstOrDefault(type => typeof(IPlugin).IsAssignableFrom(type));
+                        .FirstOrDefault(type => typeof(IPlugin).IsAssignableFrom(type) || typeof(IPluginV2).IsAssignableFrom(type));
-                    return Manager.Plugins.FirstOrDefault(plugin => plugin.GetType() == pluginType)?.Name ??
+
-                           _translationLookup["WEBFRONT_HELP_COMMAND_NATIVE"];
+                    return _pluginTypeNames[pluginType].FirstOrDefault() ?? _translationLookup["WEBFRONT_HELP_COMMAND_NATIVE"];
                 })
                 .Select(group => (group.Key, group.AsEnumerable()));
 

WebfrontCore/Middleware/CustomCssAccentMiddlewareAction.cs

@@ -1,104 +0,0 @@
-using SharedLibraryCore.Interfaces;
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Globalization;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace WebfrontCore.Middleware
-{
-    public class CustomCssAccentMiddlewareAction : IMiddlewareAction<string>
-    {
-        private readonly List<ColorMap> ColorReplacements = new List<ColorMap>();
-
-        private class ColorMap
-        {
-            public Color Original { get; set; }
-            public Color Replacement { get; set; }
-        }
-
-        public CustomCssAccentMiddlewareAction(string originalPrimaryColor, string originalSecondaryColor, string primaryColor, string secondaryColor)
-        {
-            primaryColor = string.IsNullOrWhiteSpace(primaryColor) ? originalPrimaryColor : primaryColor;
-            secondaryColor = string.IsNullOrWhiteSpace(secondaryColor) ? originalSecondaryColor : secondaryColor;
-            try
-            {
-                ColorReplacements.AddRange(new[]
-                {
-                    new ColorMap()
-                    {
-                        Original = Color.FromArgb(Convert.ToInt32(originalPrimaryColor.Substring(1).ToString(), 16)),
-                        Replacement = Color.FromArgb(Convert.ToInt32(primaryColor.Substring(1).ToString(), 16))
-                    },
-                    new ColorMap()
-                    {
-                        Original = Color.FromArgb(Convert.ToInt32(originalSecondaryColor.Substring(1).ToString(), 16)),
-                        Replacement = Color.FromArgb(Convert.ToInt32(secondaryColor.Substring(1).ToString(), 16))
-                    }
-                });
-            }
-
-            catch (FormatException)
-            {
-
-            }
-        }
-
-        public Task<string> Invoke(string original)
-        {
-            foreach (var color in ColorReplacements)
-            {
-                foreach (var shade in new[] { 0, -19, -25 })
-                {
-                    original = original
-                        .Replace(ColorToHex(LightenDarkenColor(color.Original, shade)), ColorToHex(LightenDarkenColor(color.Replacement, shade)), StringComparison.OrdinalIgnoreCase)
-                        .Replace(ColorToDec(LightenDarkenColor(color.Original, shade)), ColorToDec(LightenDarkenColor(color.Replacement, shade)), StringComparison.OrdinalIgnoreCase);
-                }
-            }
-
-            return Task.FromResult(original);
-        }
-
-        /// <summary>
-        /// converts color to the hex string representation
-        /// </summary>
-        /// <param name="color"></param>
-        /// <returns></returns>
-        private string ColorToHex(Color color) => $"#{color.R.ToString("X2")}{color.G.ToString("X2")}{color.B.ToString("X2")}";
-
-        /// <summary>
-        /// converts color to the rgb tuples representation
-        /// </summary>
-        /// <param name="color"></param>
-        /// <returns></returns>
-        private string ColorToDec(Color color) => $"{(int)color.R}, {(int)color.G}, {(int)color.B}";
-
-        /// <summary>
-        /// lightens or darkens a color on the given amount
-        /// Based off SASS darken/lighten function
-        /// </summary>
-        /// <param name="color"></param>
-        /// <param name="amount"></param>
-        /// <returns></returns>
-        private Color LightenDarkenColor(Color color, float amount)
-        {
-            int r = color.R + (int)((amount / 100.0f) * color.R);
-
-            if (r > 255) r = 255;
-            else if (r < 0) r = 0;
-
-            int g = color.G + (int)((amount / 100.0f) * color.G);
-
-            if (g > 255) g = 255;
-            else if (g < 0) g = 0;
-
-            int b = color.B + (int)((amount / 100.0f) * color.B);
-
-            if (b > 255) b = 255;
-            else if (b < 0) b = 0;
-
-            return Color.FromArgb(r, g, b);
-        }
-    }
-}

WebfrontCore/Program.cs

@@ -6,7 +6,6 @@ using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.DependencyInjection;
 using SharedLibraryCore.Configuration;
 using SharedLibraryCore.Interfaces;
-using WebfrontCore.Middleware;
 
 namespace WebfrontCore
 {
@@ -24,11 +23,6 @@ namespace WebfrontCore
 
         public static Task GetWebHostTask(CancellationToken cancellationToken)
         {
-            var config = _webHost.Services.GetRequiredService<ApplicationConfiguration>();
-            Manager.MiddlewareActionHandler.Register(null,
-                new CustomCssAccentMiddlewareAction("#007ACC", "#fd7e14", config.WebfrontPrimaryColor,
-                    config.WebfrontSecondaryColor), "custom_css_accent");
-            
             return _webHost?.RunAsync(cancellationToken);
         }
         
@@ -41,7 +35,12 @@ namespace WebfrontCore
                 .UseContentRoot(SharedLibraryCore.Utilities.OperatingDirectory)
 #endif
                 .UseUrls(bindUrl)
-                .UseKestrel()
+                .UseKestrel(cfg =>
+                {
+                    cfg.Limits.MaxConcurrentConnections =
+                        int.Parse(Environment.GetEnvironmentVariable("MaxConcurrentRequests") ?? "1");
+                    cfg.Limits.KeepAliveTimeout = TimeSpan.FromSeconds(30);
+                })
                 .ConfigureServices(registerDependenciesAction)
                 .UseStartup<Startup>()
                 .Build();

WebfrontCore/QueryHelpers/Models/ChatResourceRequest.cs

@@ -0,0 +1,9 @@
+using Stats.Dtos;
+
+namespace WebfrontCore.QueryHelpers.Models;
+
+public class ChatResourceRequest : ChatSearchQuery
+{
+    public bool HasData => !string.IsNullOrEmpty(MessageContains) || !string.IsNullOrEmpty(ServerId) ||
+                           ClientId is not null || SentAfterDateTime is not null;
+}

WebfrontCore/QueryHelpers/Models/ClientResourceRequest.cs

@@ -16,4 +16,9 @@ public class ClientResourceRequest : ClientPaginationRequest
     public EFClient.Permission? ClientLevel { get; set; }
     public Reference.Game? GameName { get; set; }
     public bool IncludeGeolocationData { get; set; } = true;
+    
+    public EFClient.Permission RequesterPermission { get; set; } = EFClient.Permission.User;
+    
+    public bool HasData => !string.IsNullOrEmpty(ClientName) || !string.IsNullOrEmpty(ClientIp) ||
+                                                                         !string.IsNullOrEmpty(ClientGuid) || ClientLevel is not null || GameName is not null;
 }

WebfrontCore/Startup.cs

@@ -4,7 +4,6 @@ using FluentValidation.AspNetCore;
 using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Mvc.ApplicationParts;
 using Microsoft.AspNetCore.Mvc.Razor;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
@@ -24,9 +23,6 @@ using System.Reflection;
 using System.Threading.Tasks;
 using Data.Abstractions;
 using Data.Helpers;
-using IW4MAdmin.Plugins.Stats.Helpers;
-using Stats.Client.Abstractions;
-using Stats.Config;
 using WebfrontCore.Controllers.API.Validation;
 using WebfrontCore.Middleware;
 using WebfrontCore.QueryHelpers;
@@ -51,6 +47,12 @@ namespace WebfrontCore
                     });
             });
             
+            services.AddStackPolicy(options =>
+            {
+                options.MaxConcurrentRequests = int.Parse(Environment.GetEnvironmentVariable("MaxConcurrentRequests") ?? "1");
+                options.RequestQueueLimit = int.Parse(Environment.GetEnvironmentVariable("RequestQueueLimit") ?? "1");
+            });
+
             IEnumerable<Assembly> pluginAssemblies()
             {
                 string pluginDir = $"{Utilities.OperatingDirectory}Plugins{Path.DirectorySeparatorChar}";
@@ -132,6 +134,7 @@ namespace WebfrontCore
                 app.UseMiddleware<IPWhitelist>(serviceProvider.GetService<ILogger<IPWhitelist>>(), serviceProvider.GetRequiredService<ApplicationConfiguration>().WebfrontConnectionWhitelist);
             }
 
+            app.UseConcurrencyLimiter();
             app.UseStaticFiles();
             app.UseAuthentication();
             app.UseCors("AllowAll");

WebfrontCore/ViewComponents/ServerListViewComponent.cs

@@ -1,70 +1,43 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
 using Microsoft.AspNetCore.Mvc;
 using SharedLibraryCore;
 using SharedLibraryCore.Dtos;
 using System.Linq;
-using System.Threading;
 using Data.Models;
 using Data.Models.Client.Stats;
 using IW4MAdmin.Plugins.Stats.Helpers;
 using SharedLibraryCore.Configuration;
-using SharedLibraryCore.Interfaces;
-using static SharedLibraryCore.Server;
 
 namespace WebfrontCore.ViewComponents
 {
     public class ServerListViewComponent : ViewComponent
     {
-        private readonly IServerDataViewer _serverDataViewer;
-        private readonly ApplicationConfiguration _appConfig;
         private readonly DefaultSettings _defaultSettings;
 
-        public ServerListViewComponent(IServerDataViewer serverDataViewer,
+        public ServerListViewComponent(DefaultSettings defaultSettings)
-            ApplicationConfiguration applicationConfiguration, DefaultSettings defaultSettings)
         {
-            _serverDataViewer = serverDataViewer;
-            _appConfig = applicationConfiguration;
             _defaultSettings = defaultSettings;
         }
 
-        public IViewComponentResult Invoke(Game? game)
+        public IViewComponentResult Invoke(Reference.Game? game)
         {
             if (game.HasValue)
             {
-                ViewBag.Maps = _defaultSettings.Maps.FirstOrDefault(map => map.Game == game)?.Maps.ToList() ??
+                ViewBag.Maps = _defaultSettings.Maps?.FirstOrDefault(map => map.Game == (Server.Game)game)?.Maps
-                               new List<Map>();
+                                   ?.ToList() ?? new List<Map>();
             }
             else
             {
-                ViewBag.Maps = _defaultSettings.Maps.SelectMany(maps => maps.Maps).ToList();
+                ViewBag.Maps = _defaultSettings.Maps?.SelectMany(maps => maps.Maps).ToList();
             }
 
-            var servers = Program.Manager.GetServers().Where(server => !game.HasValue || server.GameName == game);
+            var servers = Program.Manager.GetServers()
+                .Where(server => game is null || server.GameName == (Server.Game)game);
 
             var serverInfo = new List<ServerInfo>();
 
             foreach (var server in servers)
             {
-                var serverId = server.GetIdForServer().Result;
-                var clientHistory = _serverDataViewer.ClientHistoryAsync(_appConfig.MaxClientHistoryTime,
-                                            CancellationToken.None).Result?
-                                        .FirstOrDefault(history => history.ServerId == serverId) ??
-                                    new ClientHistoryInfo
-                                    {
-                                        ServerId = serverId,
-                                        ClientCounts = new List<ClientCountSnapshot>()
-                                    };
-
-                var counts = clientHistory.ClientCounts?.AsEnumerable() ?? Enumerable.Empty<ClientCountSnapshot>();
-
-                if (server.ClientHistory.ClientCounts.Any())
-                {
-                    counts = counts.Union(server.ClientHistory.ClientCounts.Where(history =>
-                            history.Time > (clientHistory.ClientCounts?.LastOrDefault()?.Time ?? DateTime.MinValue)))
-                        .Where(history => history.Time >= DateTime.UtcNow - _appConfig.MaxClientHistoryTime);
-                }
-
                 serverInfo.Add(new ServerInfo
                 {
                     Name = server.Hostname,
@@ -76,11 +49,7 @@ namespace WebfrontCore.ViewComponents
                     MaxClients = server.MaxClients,
                     PrivateClientSlots = server.PrivateClientSlots,
                     GameType = server.GametypeName,
-                    ClientHistory = new ClientHistoryInfo
+                    ClientHistory = new ClientHistoryInfo(),
-                    {
-                        ServerId = server.EndPoint,
-                        ClientCounts = counts.ToList()
-                    },
                     Players = server.GetClientsAsList()
                         .Select(client => new PlayerInfo
                         {

WebfrontCore/Views/About/Index.cshtml

@@ -70,7 +70,7 @@
             }
 
             var start = 1;
-            <h5 class="text-primary mt-0">
+            <h5 class="text-primary mt-0 mb-0">
                 <color-code value="@serverName"></color-code>
             </h5>
             @foreach (var rule in rules)
@@ -86,6 +86,7 @@
                 </div>
                 start++;
             }
+            <div class="mb-20"></div>
         }
     </div>
 </div>

WebfrontCore/Views/Client/Message/Find.cshtml

@@ -26,14 +26,14 @@ else
         </tbody>
     </table>
 
-    <div id="loaderLoad" class="mt-10 m-auto text-center d-none d-lg-block">
+    <div id="loaderLoad" class="mt-10 m-auto text-center">
         <i class="loader-load-more oi oi-chevron-bottom"></i>
     </div>
 
     @section scripts {
         <script>
         $(document).ready(function () {
-            initLoader('/Message/FindNext?query=@ViewBag.Query', '#message_table_body', @Model.RetrievedResultCount, @ViewBag.QueryLimit);
+            initLoader(`/Message/FindNext${window.location.search}`, '#message_table_body', @Model.RetrievedResultCount, 30);
         });
         </script>
     }

WebfrontCore/Views/Server/_Server.cshtml

@@ -82,8 +82,7 @@
     }
 
     <div class="server-history">
-        <div class="server-history-row m-auto bg-dark-dm bg-light-lm rounded-bottom" style="position:relative; width: 100%" id="server_history_@Model.ID" data-serverid="@Model.ID"
+        <div class="server-history-row m-auto bg-dark-dm bg-light-lm rounded-bottom" style="position:relative; width: 100%" id="server_history_@Model.ID" data-serverid="@Model.ID" data-server-endpoint="@Model.Endpoint"
-             data-clienthistory='@Html.Raw(Json.Serialize(Model.ClientHistory))'
              data-clienthistory-ex='@Html.Raw(Json.Serialize(Model.ClientHistory.ClientCounts))'
              data-online="@Model.Online">
             <canvas id="server_history_canvas_@Model.ID" class="rounded-bottom" height="100"></canvas>

WebfrontCore/Views/Shared/Partials/Search/_ChatSearch.cshtml

@@ -0,0 +1,88 @@
+@using WebfrontCore.QueryHelpers.Models
+@using SharedLibraryCore.Interfaces
+@using System.Globalization
+@using Microsoft.AspNetCore.Mvc.TagHelpers
+@model string
+@{
+    var existingChatFilter = ViewBag.Query as ChatResourceRequest;
+    var manager = ViewBag.Manager as IManager;
+}
+
+<div id="chatSearchWrapper@(Model)" data-has-data="@(existingChatFilter?.HasData ?? false)" >
+    <div class="form-group">
+        <label for="messageContains@(Model)">@ViewBag.Localization["WEBFRONT_ACTION_LABEL_MESSAGE"]</label>
+        <div class="d-flex">
+            <input type="text" class="form-control" name="messageContains" id="messageContains@(Model)}"
+                   placeholder="Contains" value="@existingChatFilter?.MessageContains"/>
+            <div class="custom-control ml-10 align-self-center">
+                <div class="custom-switch">
+                    @if (existingChatFilter?.IsExactMatch ?? false)
+                    {
+                        <input type="checkbox" id="isExactMatch@(Model)" name="isExactMatch" value="true"
+                               checked="checked">
+                    }
+                    else
+                    {
+                        <input type="checkbox" id="isExactMatch@(Model)" name="isExactMatch" value="true">
+                    }
+
+                    <label for="isExactMatch@(Model)">@ViewBag.Localization["WEBFRONT_ADVANCED_SEARCH_LABEL_EXACT"]</label>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div class="form-group">
+        <label for="serverId@(Model)" class="w-quarter">@ViewBag.Localization["WEBFRONT_BAN_MGMT_FORM_ID"]</label>
+        <label for="clientId@(Model)" class="">@ViewBag.Localization["WEBFRONT_CONTEXT_MENU_GLOBAL_SERVER"]</label>
+
+        <div class="d-flex">
+            <input type="text" class="form-control w-quarter" name="clientId" id="clientId@(Model)}"
+                   placeholder="Id" value="@existingChatFilter?.ClientId"/>
+            <select class="form-control w-three-quarter ml-10" id="serverId@(Model)" name="serverId">
+                <option value="">@ViewBag.Localization["WEBFRONT_ADVANCED_SEARCH_SELECT_PERMISSIONS_ANY"]</option>
+                @foreach (var server in manager!.GetServers())
+                {
+                    <option value="@server.Id" selected="@(server.Id == existingChatFilter?.ServerId)">
+                        [@server.GameName.ToString()] @server.ServerName.StripColors()
+                    </option>
+                }
+            </select>
+        </div>
+    </div>
+
+    <div class="form-group">
+        <label for="sentAfter@(Model)">@ViewBag.Localization["WEBFRONT_ADVANCED_SEARCH_LABEL_SENT_AFTER"]</label>
+        @{
+            var afterDate = existingChatFilter?.SentAfterDateTime ?? DateTime.UtcNow.AddHours(-1);
+        }
+        <div class="d-flex">
+            <input type="text" class="form-control date-picker-input w-half" name="sentAfter"
+                   id="sentAfter@(Model)" data-date="@afterDate.ToString("s", CultureInfo.InvariantCulture)"
+                   value="@afterDate.ToString("s", CultureInfo.InvariantCulture)"/>
+            <input type="time" class="form-control w-half ml-10" name="sentAfterTime"
+                   id="sentAfterTime@(Model)"
+                   style="color-scheme: dark;"
+                   value="@afterDate.ToString("HH:mm")"/>
+
+        </div>
+    </div>
+
+    <div class="form-group">
+        <label for="sentAfter@(Model)">@ViewBag.Localization["WEBFRONT_ADVANCED_SEARCH_LABEL_SENT_BEFORE"]</label>
+        @{
+            var beforeDate = existingChatFilter?.SentBeforeDateTime ?? DateTime.UtcNow;
+        }
+        <div class="d-flex">
+            <input type="text" class="form-control date-picker-input w-half" name="sentBefore"
+                   id="sentBefore@(Model)" data-date="@beforeDate.ToString("s", CultureInfo.InvariantCulture)"
+                   value="@beforeDate.ToString("s", CultureInfo.InvariantCulture)"/>
+            <input type="time" class="form-control w-half ml-10" name="sentBeforeTime"
+                   id="sentBeforeTime@(Model)"
+                   style="color-scheme: dark;"
+                   value="@beforeDate.ToString("HH:mm")"/>
+        </div>
+    </div>
+
+    <input type="submit" class="btn btn-primary" value="@ViewBag.Localization["WEBFRONT_ADVANCED_SEARCH_BUTTON_SUBMIT"]"/>
+</div>

WebfrontCore/Views/Shared/Partials/Search/_ClientSearch.cshtml

@@ -0,0 +1,116 @@
+@using WebfrontCore.QueryHelpers.Models
+@using System.Globalization
+@using Data.Models
+@using Data.Models.Client
+@using Microsoft.AspNetCore.Mvc.TagHelpers
+@using SharedLibraryCore.Dtos
+@model string
+@{
+    var existingClientFilter = ViewBag.ClientResourceRequest as ClientResourceRequest;
+}
+
+<div id="clientSearchWrapper@(Model)" data-has-data="@(existingClientFilter?.HasData ?? false)" >
+    <div class="form-group">
+        <label for="clientName@(Model)">@ViewBag.Localization["WEBFRONT_ADVANCED_SEARCH_LABEL_NAME"]</label>
+        <div class="d-flex">
+            <input type="text" class="form-control" name="clientName" id="clientName@(Model)"
+                   placeholder="Unknown Soldier" value="@existingClientFilter?.ClientName"/>
+            <div class="custom-control ml-10 align-self-center">
+                <div class="custom-switch">
+                    @if (existingClientFilter?.IsExactClientName ?? false)
+                    {
+                        <input type="checkbox" id="isExactClientName@(Model)" name="isExactClientName" value="true"
+                               checked="checked">
+                    }
+                    else
+                    {
+                        <input type="checkbox" id="isExactClientName@(Model)" name="isExactClientName" value="true">
+                    }
+                    <label for="isExactClientName@(Model)">@ViewBag.Localization["WEBFRONT_ADVANCED_SEARCH_LABEL_EXACT"]</label>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div class="form-group">
+        <label for="clientIP@(Model)">@ViewBag.Localization["WEBFRONT_ADVANCED_SEARCH_LABEL_IP"]</label>
+        <div class="d-flex">
+            <input type="text" class="form-control" name="clientIP" id="clientIP@(Model)" placeholder="1.1.1.1"
+                   value="@existingClientFilter?.ClientIp">
+            <div class="custom-control ml-10 align-self-center">
+                <div class="custom-switch">
+                    @if (existingClientFilter?.IsExactClientIp ?? false)
+                    {
+                        <input type="checkbox" id="isExactClientIP@(Model)" name="isExactClientIP" value="true"
+                               checked="checked">
+                    }
+                    else
+                    {
+                        <input type="checkbox" id="isExactClientIP@(Model)" name="isExactClientIP" value="true">
+                    }
+                    <label for="isExactClientIP@(Model)">@ViewBag.Localization["WEBFRONT_ADVANCED_SEARCH_LABEL_EXACT"]</label>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div class="form-group">
+        <label for="clientGuid@(Model)">GUID <span class="text-primary">&bull;</span> XUID <span class="text-primary">&bull;</span> NetworkID</label>
+        <input type="text" class="form-control" name="clientGuid" id="clientGuid@(Model)"
+               placeholder="110000100000001" value="@existingClientFilter?.ClientGuid"/>
+    </div>
+
+    <div class="form-group">
+        <label for="clientLevel@(Model)" class="w-half">@ViewBag.Localization["WEBFRONT_ADVANCED_SEARCH_LABEL_PERMISSION"]</label>
+        <label for="clientGameName@(Model)">@ViewBag.Localization["WEBFRONT_ADVANCED_SEARCH_LABEL_GAME"]</label>
+
+        <div class="d-flex">
+            <select class="form-control w-half" id="clientLevel@(Model)" name="clientLevel">
+                <option value="">@ViewBag.Localization["WEBFRONT_ADVANCED_SEARCH_SELECT_PERMISSIONS_ANY"]</option>
+                @foreach (EFClient.Permission permission in Enum.GetValues(typeof(EFClient.Permission)))
+                {
+                    <option value="@((int)permission)" selected="@(permission == existingClientFilter?.ClientLevel)">
+                        @permission.ToLocalizedLevelName()
+                    </option>
+                }
+            </select>
+            <select class="form-control w-half ml-10" id="clientGameName@(Model)" name="gameName">
+                <option value="">@ViewBag.Localization["WEBFRONT_ADVANCED_SEARCH_SELECT_PERMISSIONS_ANY"]</option>
+                @foreach (Reference.Game game in Enum.GetValues(typeof(Reference.Game)))
+                {
+                    <option value="@((int)game)" selected="@(game == existingClientFilter?.GameName)">
+                        @ViewBag.Localization["GAME_" + game]
+                    </option>
+                }
+            </select>
+        </div>
+    </div>
+
+    <div class="form-group">
+        <label for="clientConnected@(Model)">@ViewBag.Localization["WEBFRONT_ADVANCED_SEARCH_LABEL_CONNECTED_SINCE"]</label>
+        <div class="d-flex">
+            @{ var presetDate = (existingClientFilter?.ClientConnected ?? DateTime.UtcNow.AddYears(-1)).ToString("s", CultureInfo.InvariantCulture); }
+            <input type="text" class="form-control date-picker-input w-half" name="clientConnected"
+                   id="clientConnected@(Model)" data-date="@presetDate"
+                   value="@presetDate"/>
+
+            <div class="custom-control ml-10 align-self-center">
+                <div class="custom-switch">
+                    @if ((existingClientFilter?.Direction ?? SortDirection.Descending) is SortDirection.Descending)
+                    {
+                        <input type="checkbox" id="resultOrder@(Model)" name="direction"
+                               value="@((int)SortDirection.Ascending)">
+                    }
+                    else
+                    {
+                        <input type="checkbox" id="resultOrder@(Model)" name="direction"
+                               value="@((int)SortDirection.Ascending)" checked="checked">
+                    }
+                    <label for="resultOrder@(Model)">@ViewBag.Localization["WEBFRONT_ADVANCED_SEARCH_LABEL_OLDEST_FIRST"]</label>
+                </div>
+            </div>
+        </div>
+    </div>
+    
+    <input type="submit" class="btn btn-primary" value="@ViewBag.Localization["WEBFRONT_ADVANCED_SEARCH_BUTTON_SUBMIT"]"/>
+</div>

WebfrontCore/Views/Shared/Partials/_SearchResourceFilter.cshtml

@@ -1,126 +1,21 @@
-@using Data.Models.Client
-@using SharedLibraryCore.Dtos
-@using WebfrontCore.QueryHelpers.Models
-@using Data.Models
-@using System.Globalization
 @model string
-@{
+
-    var existingClientFilter = ViewBag.ClientResourceRequest as ClientResourceRequest;
-}
 <h6 class="dropdown-header">@ViewBag.Localization["WEBFRONT_ADVANCED_SEARCH_TITLE"]</h6>
 <div class="dropdown-divider"></div>
 <div class="dropdown-content">
-    <form asp-controller="Client" asp-action="AdvancedFind" method="get" id="advancedSearchDropdownContent@(Model)" onsubmit="showLoader()">
+
-        <div class="form-group">
+    <div class="form-group" id="searchTypeSelectorParent">
         <label for="searchType@(Model)">@ViewBag.Localization["WEBFRONT_ADVANCED_SEARCH_LABEL_FOR"]</label>
         <br/>
-            <select class="form-control" id="searchType@(Model)" name="searchType" disabled="disabled">
+        <select class="form-control" id="searchType@(Model)" name="searchType">
             <option value="client">@ViewBag.Localization["WEBFRONT_ADVANCED_SEARCH_SELECT_TYPE_PLAYERS"]</option>
+            <option value="chat">@ViewBag.Localization["WEBFRONT_ADVANCED_SEARCH_SELECT_TYPE_CHAT"]</option>
         </select>
     </div>
-
+    <form asp-controller="Client" asp-action="AdvancedFind" method="get" id="advancedSearchDropdownContent@(Model)" onsubmit="showLoader()">
-        <div class="form-group">
+        <partial name="Search/_ClientSearch.cshtml" model="@Model"/>
-            <label for="clientName@(Model)">@ViewBag.Localization["WEBFRONT_ADVANCED_SEARCH_LABEL_NAME"]</label>
+    </form>
-            <div class="d-flex">
+    <form asp-controller="Stats" asp-action="FindMessage" method="get" onsubmit="showLoader()">
-                <input type="text" class="form-control" name="clientName" id="clientName@(Model)"
+        <partial name="Search/_ChatSearch.cshtml" model="@Model"/>
-                       placeholder="Unknown Soldier" value="@existingClientFilter?.ClientName"/>
-                <div class="custom-control ml-10 align-self-center">
-                    <div class="custom-switch">
-                        @if (existingClientFilter?.IsExactClientName ?? false)
-                        {
-                            <input type="checkbox" id="isExactClientName@(Model)" name="isExactClientName" value="true"
-                                   checked="checked">
-                        }
-                        else
-                        {
-                            <input type="checkbox" id="isExactClientName@(Model)" name="isExactClientName" value="true">
-                        }
-                        <label for="isExactClientName@(Model)">@ViewBag.Localization["WEBFRONT_ADVANCED_SEARCH_LABEL_EXACT"]</label>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <div class="form-group">
-            <label for="clientIP@(Model)">@ViewBag.Localization["WEBFRONT_ADVANCED_SEARCH_LABEL_IP"]</label>
-            <div class="d-flex">
-                <input type="text" class="form-control" name="clientIP" id="clientIP@(Model)" placeholder="1.1.1.1"
-                       value="@existingClientFilter?.ClientIp">
-                <div class="custom-control ml-10 align-self-center">
-                    <div class="custom-switch">
-                        @if (existingClientFilter?.IsExactClientIp ?? false)
-                        {
-                            <input type="checkbox" id="isExactClientIP@(Model)" name="isExactClientIP" value="true"
-                                   checked="checked">
-                        }
-                        else
-                        {
-                            <input type="checkbox" id="isExactClientIP@(Model)" name="isExactClientIP" value="true">
-                        }
-                        <label for="isExactClientIP@(Model)">@ViewBag.Localization["WEBFRONT_ADVANCED_SEARCH_LABEL_EXACT"]</label>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <div class="form-group">
-            <label for="clientGuid@(Model)">GUID <span class="text-primary">&bull;</span> XUID <span class="text-primary">&bull;</span> NetworkID</label>
-            <input type="text" class="form-control" name="clientGuid" id="clientGuid@(Model)"
-                   placeholder="110000100000001" value="@existingClientFilter?.ClientGuid"/>
-        </div>
-
-        <div class="form-group">
-            <label for="clientLevel@(Model)" class="w-half">@ViewBag.Localization["WEBFRONT_ADVANCED_SEARCH_LABEL_PERMISSION"]</label>
-            <label for="clientGameName@(Model)">@ViewBag.Localization["WEBFRONT_ADVANCED_SEARCH_LABEL_GAME"]</label>
-
-            <div class="d-flex">
-                <select class="form-control w-half" id="clientLevel@(Model)" name="clientLevel">
-                    <option value="">@ViewBag.Localization["WEBFRONT_ADVANCED_SEARCH_SELECT_PERMISSIONS_ANY"]</option>
-                    @foreach (EFClient.Permission permission in Enum.GetValues(typeof(EFClient.Permission)))
-                    {
-                        <option value="@((int)permission)" selected="@(permission == existingClientFilter?.ClientLevel)">
-                            @permission.ToLocalizedLevelName()
-                        </option>
-                    }
-                </select>
-                <select class="form-control w-half ml-10" id="clientGameName@(Model)" name="gameName">
-                    <option value="">@ViewBag.Localization["WEBFRONT_ADVANCED_SEARCH_SELECT_PERMISSIONS_ANY"]</option>
-                    @foreach (Reference.Game game in Enum.GetValues(typeof(Reference.Game)))
-                    {
-                        <option value="@((int)game)" selected="@(game == existingClientFilter?.GameName)">
-                            @ViewBag.Localization["GAME_" + game]
-                        </option>
-                    }
-                </select>
-            </div>
-        </div>
-
-        <div class="form-group">
-            <label for="clientConnected@(Model)">@ViewBag.Localization["WEBFRONT_ADVANCED_SEARCH_LABEL_CONNECTED_SINCE"]</label>
-            <div class="d-flex">
-                @{ var presetDate = (existingClientFilter?.ClientConnected ?? DateTime.UtcNow.AddYears(-1)).ToString("s", CultureInfo.InvariantCulture); }
-                <input type="text" class="form-control date-picker-input w-half" name="clientConnected"
-                       id="clientConnected@(Model)" data-date="@presetDate"
-                       value="@presetDate"/>
-
-                <div class="custom-control ml-10 align-self-center">
-                    <div class="custom-switch">
-                        @if ((existingClientFilter?.Direction ?? SortDirection.Descending) is SortDirection.Descending)
-                        {
-                            <input type="checkbox" id="resultOrder@(Model)" name="direction"
-                                   value="@((int)SortDirection.Ascending)">
-                        }
-                        else
-                        {
-                            <input type="checkbox" id="resultOrder@(Model)" name="direction"
-                                   value="@((int)SortDirection.Ascending)" checked="checked">
-                        }
-                        <label for="resultOrder@(Model)">@ViewBag.Localization["WEBFRONT_ADVANCED_SEARCH_LABEL_OLDEST_FIRST"]</label>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <input type="submit" class="btn btn-primary" value="@ViewBag.Localization["WEBFRONT_ADVANCED_SEARCH_BUTTON_SUBMIT"]"/>
     </form>
 </div>

WebfrontCore/WebfrontCore.csproj

@@ -25,7 +25,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <ServerGarbageCollection>false</ServerGarbageCollection>
+    <ServerGarbageCollection>true</ServerGarbageCollection>
     <ConcurrentGarbageCollection>true</ConcurrentGarbageCollection>
     <TieredCompilation>true</TieredCompilation>
     <LangVersion>Latest</LangVersion>
@@ -47,6 +47,7 @@
   <ItemGroup>
     <PackageReference Include="BuildWebCompiler2022" Version="1.14.10" />
     <PackageReference Include="FluentValidation.AspNetCore" Version="11.2.2" />
+    <PackageReference Include="Microsoft.AspNetCore.ConcurrencyLimiter" Version="6.0.16" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="6.0.8" />
     <PackageReference Include="Microsoft.Web.LibraryManager.Build" Version="2.1.175" />
   </ItemGroup>

WebfrontCore/wwwroot/css/src/main.scss

@@ -361,7 +361,7 @@ table {
   background-color: var(--lm-base-body-bg-color);
   padding: 0.5rem;
   height: 90%;
-  overflow: scroll;
+  overflow-y: scroll;
 }
 
 .dark-mode .on-this-page-nav {

WebfrontCore/wwwroot/js/search.js

@@ -1,28 +1,4 @@
 $(document).ready(function () {
-    $('.form-inline').submit(function (e) {
-        const id = $(e.currentTarget).find('input');
-        if ($(id).val().length < 3) {
-            e.preventDefault();
-            $(id)
-                .addClass('input-text-danger')
-                .delay(25)
-                .queue(function () {
-                    $(this).addClass('input-border-transition').dequeue();
-                })
-                .delay(1000)
-                .queue(function () {
-                    $(this).removeClass('input-text-danger').dequeue();
-                })
-                .delay(500)
-                .queue(function () {
-                    $(this).removeClass('input-border-transition').dequeue();
-                });
-        } else if ($(id).val().startsWith("chat|")) {
-            e.preventDefault();
-            window.location = "/Message/Find?query=" + $(id).val();
-        }
-    });
-
     $('.date-picker-input').each((index, selector) => {
         new Datepicker(selector, {
             buttonClass: 'btn',
@@ -31,5 +7,37 @@
             prevArrow: '<',
             orientation: 'auto top'
         });
-    })
+    });
+
+    const clientSearchWrapper = $('*[id^="clientSearchWrapper"]');
+    const chatSearchWrapper = $('*[id^="chatSearchWrapper"]');
+    const searchTypeSelector = $('#searchTypeSelectorParent select');
+    let isClients = false;
+
+    searchTypeSelector.on('change', function () {
+        if (isClients) {
+            clientSearchWrapper.removeClass('d-none');
+            chatSearchWrapper.addClass('d-none');
+        } else {
+            chatSearchWrapper.removeClass('d-none');
+            clientSearchWrapper.addClass('d-none');
+        }
+        isClients = !isClients;
+    });
+
+    const isDefault = clientSearchWrapper.data('has-data') !== 'True' && chatSearchWrapper.data('has-data') !== 'True';
+
+    if (isDefault) {
+        isClients = false;
+        searchTypeSelector.val('client').change();
+    } else {
+        if (clientSearchWrapper.data('has-data') === 'True') {
+            isClients = false;
+            searchTypeSelector.val('client').change();
+        }
+        if (chatSearchWrapper.data('has-data') === 'True') {
+            isClients = true;
+            searchTypeSelector.val('chat').change();
+        }
+    }
 });

WebfrontCore/wwwroot/js/server.js

@@ -27,25 +27,25 @@ function getPlayerHistoryChart(playerHistory, i, width, maxClients) {
     let lastMap = '';
 
     playerHistory.forEach((elem, i) => {
-        if (elem.map !== lastMap) {
+        if (elem.ma !== lastMap) {
             mapChange.push(i);
-            lastMap = elem.map;
+            lastMap = elem;
         }
 
         if (elem.connectionInterrupted) {
             offlineTime.push({
                 clientCount: maxClients,
-                timeString: elem.timeString
+                timeString: elem.ts
             });
 
             onlineTime.push({
                 clientCount: 0,
-                timeString: elem.timeString
+                timeString: elem.ts
             })
         } else {
             offlineTime.push({
                 clientCount: 0,
-                timeString: elem.timeString
+                timeString: elem.ts
             });
 
             onlineTime.push(elem)
@@ -60,9 +60,9 @@ function getPlayerHistoryChart(playerHistory, i, width, maxClients) {
     return new Chart(document.getElementById(`server_history_canvas_${i}`), {
         type: 'line',
         data: {
-            labels: playerHistory.map(history => history.timeString),
+            labels: playerHistory.map(history => history.ts),
             datasets: [{
-                data: onlineTime.map(history => history.clientCount),
+                data: onlineTime.map(history => history.cc),
                 backgroundColor: fillColor,
                 borderColor: primaryColor,
                 borderWidth: 2,
@@ -70,7 +70,7 @@ function getPlayerHistoryChart(playerHistory, i, width, maxClients) {
                 hoverBorderWidth: 2
             },
                 {
-                    data: offlineTime.map(history => history.clientCount),
+                    data: offlineTime.map(history => history.cc),
                     backgroundColor: createDiagonalPattern(offlineFillColor),
                     borderColor: offlineFillColor,
                     borderWidth: 2,
@@ -88,7 +88,7 @@ function getPlayerHistoryChart(playerHistory, i, width, maxClients) {
                 callbacks: {
                     // todo: localization at some point
                     title: context => moment(context[0].label).local().calendar(),
-                    label: context => context.datasetIndex !== 1 ? `${context.value} ${_localization['WEBFRONT_SCRIPT_SERVER_PLAYERS']} | ${playerHistory[context.index].mapAlias}` : context.value === '0' ? '' : _localization['WEBFRONT_SCRIPT_SERVER_UNREACHABLE'],
+                    label: context => context.datasetIndex !== 1 ? `${context.value} ${_localization['WEBFRONT_SCRIPT_SERVER_PLAYERS']} | ${playerHistory[context.index].ma}` : context.value === '0' ? '' : _localization['WEBFRONT_SCRIPT_SERVER_UNREACHABLE'],
                 },
                 mode: 'nearest',
                 intersect: false,
@@ -153,13 +153,14 @@ $(document).ready(function () {
         $(this).parent().parent().find('.server-header-ip-address').show();
     });
 
-    $('.server-history-row').each(function (index, element) {
+    $('.server-history-row').each(async function (index, element) {
-        let clientHistory = $(this).data('clienthistory-ex');
         const serverId = $(this).data('serverid');
+        const serverEp = $(this).data('server-endpoint');
         setInterval(() => refreshClientActivity(serverId), 2000 + (index * 100));
         let maxClients = parseInt($('#server_header_' + serverId + ' .server-maxclients').text());
         let width = $('.server-header').first().width();
-        getPlayerHistoryChart(clientHistory, serverId, width, maxClients);
+        const clientHistory = await fetch(`/api/server/${serverEp}/history`);
+        getPlayerHistoryChart(await clientHistory.json(), serverId, width, maxClients);
     });
 
     $('.moment-date').each((index, element) => {