Add some 2v2 module tests, mock time and delays

Author: nihlen

src/BF2WebAdmin.Common/DelayProvider.cs

@@ -0,0 +1,14 @@
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace BF2WebAdmin.Common;
+
+public interface IDelayProvider
+{
+    ValueTask DelayAsync(int timeMs, CancellationToken ct);
+}
+
+public class DelayProvider : IDelayProvider
+{
+    public async ValueTask DelayAsync(int timeMs, CancellationToken ct) => await Task.Delay(timeMs, ct);
+}

src/BF2WebAdmin.Common/TaskRunner.cs

@@ -0,0 +1,42 @@
+using System;
+using System.Diagnostics;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using Nihlen.Common.Telemetry;
+
+namespace BF2WebAdmin.Common;
+
+public interface ITaskRunner
+{
+    void RunBackgroundTask(string description, Func<Task> func, CancellationToken ct);
+}
+
+public class TaskRunner : ITaskRunner
+{
+    private readonly ILogger _logger;
+
+    public TaskRunner(ILogger logger)
+    {
+        _logger = logger;
+    }
+    
+    public void RunBackgroundTask(string description, Func<Task> func, CancellationToken ct)
+    {
+        _ = Task.Run(async () =>
+        {
+            using var activity = Telemetry.ActivitySource.StartActivity("BackgroundTask");
+            activity?.SetTag("bf2wa.task-description", description);
+
+            try
+            {
+                await func();
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Failed to complete background task: {Description}", description);
+                activity?.SetStatus(ActivityStatusCode.Error, $"Background task failed: {ex.Message}");
+            }
+        }, ct);
+    }
+}

src/BF2WebAdmin.Common/TimeProvider.cs

@@ -0,0 +1,15 @@
+using System;
+
+namespace BF2WebAdmin.Common;
+
+public interface ITimeProvider
+{
+    DateTime UtcNow { get; }
+    DateTimeOffset OffsetUtcNow { get; }
+}
+
+public class TimeProvider : ITimeProvider
+{
+    public DateTime UtcNow => DateTime.UtcNow;
+    public DateTimeOffset OffsetUtcNow => DateTimeOffset.UtcNow;
+}

src/BF2WebAdmin.Server/Abstractions/BaseModule.cs

@@ -88,22 +88,22 @@ protected async Task<string> SendRconCommandAsync(string command)
         return await rcon.SendAsync(command);
     }
 
-    protected void RunBackgroundTask(string description, Func<Task> func)
-    {
-        _ = Task.Run(async () =>
-        {
-            using var activity = Telemetry.ActivitySource.StartActivity("BackgroundTask");
-            activity?.SetTag("bf2wa.task-description", description);
-
-            try
-            {
-                await func();
-            }
-            catch (Exception ex)
-            {
-                Logger.LogError(ex, "Failed to complete background task: {Description}", description);
-                activity?.SetStatus(ActivityStatusCode.Error, $"Background task failed: {ex.Message}");
-            }
-        }, ModuleCancellationToken);
-    }
+    // protected void RunBackgroundTask(string description, Func<Task> func)
+    // {
+    //     _ = Task.Run(async () =>
+    //     {
+    //         using var activity = Telemetry.ActivitySource.StartActivity("BackgroundTask");
+    //         activity?.SetTag("bf2wa.task-description", description);
+    //
+    //         try
+    //         {
+    //             await func();
+    //         }
+    //         catch (Exception ex)
+    //         {
+    //             Logger.LogError(ex, "Failed to complete background task: {Description}", description);
+    //             activity?.SetStatus(ActivityStatusCode.Error, $"Background task failed: {ex.Message}");
+    //         }
+    //     }, ModuleCancellationToken);
+    // }
 }

src/BF2WebAdmin.Server/ModManager.cs

@@ -191,6 +191,10 @@ private void ConfigureDependencies()
         serviceCollection.AddSingleton<IHubContext<ServerHub, IServerHubClient>>(sp => _globalServices.GetRequiredService<IHubContext<ServerHub, IServerHubClient>>());
         serviceCollection.AddSingleton<MassTransit.IBus>(sp => _globalServices.GetService<MassTransit.IBus>());
         serviceCollection.AddSingleton<IGameStreamService, RabbitMqGameStreamService>();
+        serviceCollection.AddSingleton<ILogger>(_ => _logger);
+        serviceCollection.AddSingleton<ITaskRunner, TaskRunner>();
+        serviceCollection.AddSingleton<IDelayProvider, DelayProvider>();
+        serviceCollection.AddSingleton<ITimeProvider, TimeProvider>();
         //serviceCollection.AddSingleton<IGameStreamService>(sp => _globalServices.GetRequiredService<RabbitMqGameStreamService>());
         //serviceCollection.AddSingleton<IGameStreamService>(sp => _globalServices.GetRequiredService<RedisGameStreamService>());
 

src/BF2WebAdmin.Server/Modules/BF2/DiscordModule.cs

@@ -2,6 +2,7 @@
 using System.Diagnostics.Metrics;
 using System.Text;
 using System.Threading.Channels;
+using BF2WebAdmin.Common;
 using BF2WebAdmin.Common.Entities.Game;
 using BF2WebAdmin.Server.Abstractions;
 using BF2WebAdmin.Server.Commands;
@@ -42,6 +43,7 @@ public class DiscordModule : BaseModule,
 
     private readonly IGameServer _game;
     private readonly IGameStreamService _gameStreamService;
+    private readonly ITaskRunner _taskRunner;
     private readonly IDictionary<int, bool> _newPlayers = new Dictionary<int, bool>();
     private readonly Channel<(ISocketMessageChannel Channel, string? Text, Embed? Embed)> _discordMessageChannel;
     private IEnumerable<SocketTextChannel> _adminChannels;
@@ -229,10 +231,11 @@ public class DiscordModule : BaseModule,
 
     private ServerInfo.DiscordBotConfig Config => _game.ServerInfo.DiscordBot;
 
-    public DiscordModule(IGameServer server, IGameStreamService gameStreamService, ILogger<DiscordModule> logger, CancellationTokenSource cts) : base(server, logger, cts)
+    public DiscordModule(IGameServer server, IGameStreamService gameStreamService, ITaskRunner taskRunner, ILogger<DiscordModule> logger, CancellationTokenSource cts) : base(server, logger, cts)
     {
         _game = server;
         _gameStreamService = gameStreamService;
+        _taskRunner = taskRunner;
 
         if (string.IsNullOrWhiteSpace(server.ServerInfo.DiscordBot?.Token))
             return;
@@ -251,7 +254,7 @@ public DiscordModule(IGameServer server, IGameStreamService gameStreamService, I
         }
 
         // TODO: Start async in an event callback - proper?
-        RunBackgroundTask("Discord Bot", StartBotAsync);
+        _taskRunner.RunBackgroundTask("Discord Bot", StartBotAsync, ModuleCancellationToken);
     }
 
     private async Task StartBotAsync()
@@ -418,7 +421,7 @@ private static string GetTeamFlag(string teamName)
 
     private async Task UpdateActivityNameAsync()
     {
-        RunBackgroundTask("Update Discord bot activity name", async () =>
+        _taskRunner.RunBackgroundTask("Update Discord bot activity name", async () =>
         {
             if (_game.SocketState == SocketState.Disconnected)
             {
@@ -435,7 +438,7 @@ private async Task UpdateActivityNameAsync()
                 var name = $"{_game.Players.Count()}/{_game.MaxPlayers} - {_game.Map?.Name ?? "Unknown"}";
                 await _discord.SetActivityAsync(_streamUrl is null ? new Game(name) : new StreamingGame(name, _streamUrl));
             }
-        });
+        }, ModuleCancellationToken);
     }
 
     // Used to prevent FakeGameServer spam when fast forwarding