Serversync and toornament as internal modules.

EvoSC.sln

@@ -148,6 +148,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpectatorCamModeModule", "s
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpectatorCamModeModule.Tests", "tests\Modules\SpectatorCamModeModule.Tests\SpectatorCamModeModule.Tests.csproj", "{09A88256-8008-4085-A8E6-CA6DEFAC63E3}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServerSyncModule", "src\Modules\ServerSyncModule\ServerSyncModule.csproj", "{AB39B49E-729D-42EF-93DE-98AD6329AAEC}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ToornamentModule", "src\Modules\ToornamentModule\ToornamentModule.csproj", "{6F12A74A-BC4B-426D-B094-638FCB266FC6}"
+EndProject
 
 
 
@@ -447,6 +451,14 @@ Global
 		{09A88256-8008-4085-A8E6-CA6DEFAC63E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{09A88256-8008-4085-A8E6-CA6DEFAC63E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{09A88256-8008-4085-A8E6-CA6DEFAC63E3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AB39B49E-729D-42EF-93DE-98AD6329AAEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AB39B49E-729D-42EF-93DE-98AD6329AAEC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AB39B49E-729D-42EF-93DE-98AD6329AAEC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AB39B49E-729D-42EF-93DE-98AD6329AAEC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6F12A74A-BC4B-426D-B094-638FCB266FC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6F12A74A-BC4B-426D-B094-638FCB266FC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6F12A74A-BC4B-426D-B094-638FCB266FC6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6F12A74A-BC4B-426D-B094-638FCB266FC6}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -517,5 +529,7 @@ Global
 		{E4BF17BE-A517-4D3C-8DCA-DA99A100EBFE} = {6D75D6A2-6ECD-4DE4-96C5-CAD7D134407A}
 		{E9806703-6E24-4F05-A728-A04F7EB31749} = {DC47658A-F421-4BA4-B617-090A7DFB3900}
 		{09A88256-8008-4085-A8E6-CA6DEFAC63E3} = {6D75D6A2-6ECD-4DE4-96C5-CAD7D134407A}
+		{AB39B49E-729D-42EF-93DE-98AD6329AAEC} = {DC47658A-F421-4BA4-B617-090A7DFB3900}
+		{6F12A74A-BC4B-426D-B094-638FCB266FC6} = {DC47658A-F421-4BA4-B617-090A7DFB3900}
 	EndGlobalSection
 EndGlobal

src/EvoSC/EvoSC.csproj

@@ -12,12 +12,14 @@
         <PackageReference Include="linq2db" Version="5.3.2" />
         <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
         <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
+        <PackageReference Include="NATS.Client" Version="1.1.6" />
         <PackageReference Include="SonarAnalyzer.CSharp" Version="9.15.0.81779">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
         <PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
         <PackageReference Include="System.CommandLine.Rendering" Version="0.4.0-alpha.22272.1" />
+        <PackageReference Include="toornamentapi" Version="1.2.0" />
     </ItemGroup>
 
     <ItemGroup>
@@ -49,12 +51,14 @@
         <ProjectReference Include="..\Modules\MatchManagerModule\MatchManagerModule.csproj" />
         <ProjectReference Include="..\Modules\ASayModule\ASayModule.csproj" />
         <ProjectReference Include="..\Modules\ServerManagementModule\ServerManagementModule.csproj" />
+        <ProjectReference Include="..\Modules\ServerSyncModule\ServerSyncModule.csproj" />
         <ProjectReference Include="..\Modules\SpectatorCamModeModule\SpectatorCamModeModule.csproj" />
         <ProjectReference Include="..\Modules\SpectatorTargetInfoModule\SpectatorTargetInfoModule.csproj" />
         <ProjectReference Include="..\Modules\TeamChatModule\TeamChatModule.csproj" />
         <ProjectReference Include="..\Modules\TeamInfoModule\TeamInfoModule.csproj" />
         <ProjectReference Include="..\Modules\TeamSettingsModule\TeamSettingsModule.csproj" />
         <ProjectReference Include="..\Modules\GameModeUiModule\GameModeUiModule.csproj" />
+        <ProjectReference Include="..\Modules\ToornamentModule\ToornamentModule.csproj" />
         <ProjectReference Include="..\Modules\WorldRecordModule\WorldRecordModule.csproj" />
         <ProjectReference Include="..\Modules\MotdModule\MotdModule.csproj" />
         <ProjectReference Include="..\Modules\Player\Player.csproj" />

src/EvoSC/InternalModules.cs

@@ -1,4 +1,6 @@
 using EvoSC.Common.Interfaces;
+using EvoSC.Modules.EvoEsports.ServerSyncModule;
+using EvoSC.Modules.EvoEsports.ToornamentModule;
 using EvoSC.Modules.Interfaces;
 using EvoSC.Modules.Official.ASayModule;
 using EvoSC.Modules.Official.CurrentMapModule;
@@ -65,7 +67,9 @@ public static class InternalModules
         typeof(TeamSettingsModule),
         typeof(ServerManagementModule),
         typeof(TeamInfoModule),
-        typeof(TeamChatModule)
+        typeof(TeamChatModule),
+        typeof(ServerSyncModule),
+        typeof(ToornamentModule)
     ];
 
     /// <summary>

src/EvoSC/Properties/launchSettings.json

@@ -2,7 +2,10 @@
   "profiles": {
     "EvoSC": {
       "commandName": "Project",
-      "commandLineArgs": "run"
+      "commandLineArgs": "run",
+      "environmentVariables": {
+        "EVOSC_SERVERSYNCMODULE_NATSSETTINGS_HOST": "116.202.26.112"
+      }
     }
   }
 }

src/Modules/ServerSyncModule/Controllers/ServerSyncController.cs

@@ -0,0 +1,71 @@
+using EvoSC.Common.Controllers;
+using EvoSC.Common.Controllers.Attributes;
+using EvoSC.Common.Events.Attributes;
+using EvoSC.Common.Interfaces;
+using EvoSC.Common.Interfaces.Controllers;
+using EvoSC.Common.Interfaces.Services;
+using EvoSC.Common.Remote;
+using EvoSC.Common.Remote.EventArgsModels;
+using EvoSC.Common.Util;
+using EvoSC.Modules.EvoEsports.ServerSyncModule.Events;
+using EvoSC.Modules.EvoEsports.ServerSyncModule.Events.Args;
+using EvoSC.Modules.EvoEsports.ServerSyncModule.Interfaces;
+using GbxRemoteNet.Events;
+
+namespace EvoSC.Modules.EvoEsports.ServerSyncModule.Controllers;
+
+[Controller]
+public class ServerSyncController : EvoScController<IEventControllerContext>
+{
+    private readonly IServerClient _server;
+    private readonly ISyncService _sync;
+    private readonly IPlayerManagerService _players;
+
+    public ServerSyncController(IServerClient server, ISyncService sync, IPlayerManagerService players)
+    {
+        _server = server;
+        _sync = sync;
+        _players = players;
+    }
+
+    [Subscribe(ServerSyncEvents.ChatMessage)]
+    public async Task OnRemoteChatMessageAsync(object sender, ChatStateMessageEventArgs args)
+    {
+        var player = await _players.GetOnlinePlayerAsync(args.ChatMessage.AccountId);
+        var chatMessage = FormattingUtils.FormatPlayerChatMessage(player, args.ChatMessage.Message, false);
+        await _server.Chat.SendChatMessageAsync(chatMessage);
+    }
+
+    [Subscribe(GbxRemoteEvent.PlayerChat)]
+    public async Task OnLocalChatMessageAsync(object sender, PlayerChatGbxEventArgs args)
+    {
+        var player = await _players.GetOnlinePlayerAsync(PlayerUtils.ConvertLoginToAccountId(args.Login));
+        await _sync.PublishChatMessageAsync(player, args.Text);
+    }
+
+    [Subscribe(GbxRemoteEvent.EndMap)]
+    public Task OnEndMapAsync(object sender, MapGbxEventArgs args) =>
+        _sync.PublishMapFinishedAsync();
+
+    [Subscribe(ModeScriptEvent.EndRoundStart)]
+    public Task OnEndRoundAsync(object sender, RoundEventArgs args) =>
+        _sync.PublishEndRoundAsync();
+
+    [Subscribe(GbxRemoteEvent.EndMatch)]
+    public Task OnEndMatchAsync(object sender, EndMatchGbxEventArgs args) =>
+        _sync.PublishEndMatchAsync();
+
+    [Subscribe(ModeScriptEvent.WayPoint)]
+    public async Task OnWayPointAsync(object sender, WayPointEventArgs args)
+    {
+        var player = await _players.GetOnlinePlayerAsync(PlayerUtils.ConvertLoginToAccountId(args.Login));
+        await _sync.PublishWayPointAsync(player, args.RaceTime, args.CheckpointInRace, args.CurrentRaceCheckpoints,
+            args.IsEndRace, args.Speed);
+    }
+
+    [Subscribe(ModeScriptEvent.Scores)]
+    public async Task OnScoresAsync(object sender, ScoresEventArgs args)
+    {
+        await _sync.PublishScoresAsync(args.Players, args.Teams, args.WinnerTeam, args.WinnerPlayer, args.Section, args.UseTeams);
+    }
+}

src/Modules/ServerSyncModule/Events/Args/ChatStateMessageEventArgs.cs

@@ -0,0 +1,9 @@
+using EvoSC.Modules.EvoEsports.ServerSyncModule.Interfaces.StateMessages;
+using EvoSC.Modules.EvoEsports.ServerSyncModule.Models.StateMessages;
+
+namespace EvoSC.Modules.EvoEsports.ServerSyncModule.Events.Args;
+
+public class ChatStateMessageEventArgs : EventArgs
+{
+    public required IChatStateStateMessage ChatMessage { get; init; }
+}

src/Modules/ServerSyncModule/Events/Args/MapFinishedStateEventArgs.cs

@@ -0,0 +1,6 @@
+namespace EvoSC.Modules.EvoEsports.ServerSyncModule.Events.Args;
+
+public class MapFinishedStateEventArgs : EventArgs
+{
+
+}

src/Modules/ServerSyncModule/Events/Args/Nats/NatsMessageEventArgs.cs

@@ -0,0 +1,13 @@
+using NATS.Client;
+
+namespace EvoSC.Modules.EvoEsports.ServerSyncModule.Events.Args.Nats;
+
+public class NatsMessageEventArgs : EventArgs
+{
+    public required Msg Message { get; init; }
+}
+
+public class NatsMessageEventArgs<T> : NatsMessageEventArgs
+{
+    public T? Data { get; init; }
+}

src/Modules/ServerSyncModule/Events/Args/PlayerStateUpdateEventArgs.cs

@@ -0,0 +1,8 @@
+using EvoSC.Modules.EvoEsports.ServerSyncModule.Interfaces.StateMessages;
+
+namespace EvoSC.Modules.EvoEsports.ServerSyncModule.Events.Args;
+
+public class PlayerStateUpdateEventArgs : EventArgs
+{
+    public required IPlayerStateUpdateMessage PlayerState { get; set; }
+}

src/Modules/ServerSyncModule/Events/Args/WaypointUpdateEventArgs.cs

@@ -0,0 +1,8 @@
+using EvoSC.Modules.EvoEsports.ServerSyncModule.Interfaces.StateMessages;
+
+namespace EvoSC.Modules.EvoEsports.ServerSyncModule.Events.Args;
+
+public class WaypointUpdateEventArgs : EventArgs
+{
+    public required IWaypointStateMessage WaypointState { get; set; }
+}

src/Modules/ServerSyncModule/Events/ServerSyncEvents.cs

@@ -0,0 +1,19 @@
+namespace EvoSC.Modules.EvoEsports.ServerSyncModule.Events;
+
+public enum ServerSyncEvents
+{
+    /// <summary>
+    /// Always triggered whenever a message is received.
+    /// </summary>
+    PlayerStateUpdate,
+
+    /// <summary>
+    /// When a new chat message has been sent from one of the other servers.
+    /// </summary>
+    ChatMessage,
+
+    /// <summary>
+    /// When the map was finished on a server.
+    /// </summary>
+    MapFinished
+}

src/Modules/ServerSyncModule/Interfaces/IKeyValueStoreService.cs

@@ -0,0 +1,37 @@
+using NATS.Client.KeyValue;
+
+namespace EvoSC.Modules.EvoEsports.ServerSyncModule.Interfaces;
+
+public interface IKeyValueStoreService
+{
+    /// <summary>
+    /// Creates a new key value entry.
+    /// </summary>
+    /// <param name="key"></param>
+    /// <param name="value"></param>
+    /// <returns>Revision number of the key</returns>
+    ulong CreateEntry(string key, byte[] value);
+
+    /// <summary>
+    /// Updates an existing key value entry.
+    /// </summary>
+    /// <param name="key"></param>
+    /// <param name="value"></param>
+    /// <param name="revision"></param>
+    void UpdateEntry(string key, byte[] value, ulong revision);
+
+    /// <summary>
+    /// Gets an existing key value entry.
+    /// </summary>
+    /// <param name="key"></param>
+    /// <param name="revision"></param>
+    /// <returns>Key and value of the entry</returns>
+    KeyValueEntry GetEntry(string key, ulong revision);
+
+    /// <summary>
+    /// Deletes an existing key value entry.
+    /// </summary>
+    /// <param name="key"></param>
+    /// <param name="revision"></param>
+    void DeleteEntry(string key, ulong revision);
+}

src/Modules/ServerSyncModule/Interfaces/INatsConnectionService.cs

@@ -0,0 +1,74 @@
+using EvoSC.Modules.EvoEsports.ServerSyncModule.Events.Args;
+using EvoSC.Modules.EvoEsports.ServerSyncModule.Events.Args.Nats;
+using EvoSC.Modules.EvoEsports.ServerSyncModule.Interfaces.StateMessages;
+using EvoSC.Modules.EvoEsports.ServerSyncModule.Services;
+using NATS.Client;
+using NATS.Client.JetStream;
+using NATS.Client.KeyValue;
+
+namespace EvoSC.Modules.EvoEsports.ServerSyncModule.Interfaces;
+
+public interface INatsConnectionService
+{
+    /// <summary>
+    /// Connection to the NATS server.
+    /// </summary>
+    public IConnection Connection { get; }
+
+    /// <summary>
+    /// The stream context.
+    /// </summary>
+    public IJetStream JetStream { get; }
+
+    /// <summary>
+    /// The key value context.
+    /// </summary>
+    public IKeyValue KeyValue { get; }
+
+    /// <summary>
+    /// The ID/Name of the current client.
+    /// </summary>
+    public string ClientId { get; }
+
+    /// <summary>
+    /// Establish a connection to NATS.
+    /// </summary>
+    /// <returns></returns>
+    internal Task ConnectAsync();
+
+    /// <summary>
+    /// Disconnect from NATS.
+    /// </summary>
+    /// <returns></returns>
+    internal Task DisconnectAsync();
+
+    /// <summary>
+    /// Publish a state message to the NATS stream.
+    /// </summary>
+    /// <param name="subject">The subject to publish to.</param>
+    /// <param name="message">The message to publish.</param>
+    /// <typeparam name="TStateMsg"></typeparam>
+    /// <returns></returns>
+    public Task PublishStateAsync<TStateMsg>(string subject, TStateMsg message) where TStateMsg : IStateMessage;
+
+    /// <summary>
+    /// Publish a state message to the NATS stream.
+    /// </summary>
+    /// <param name="subject">The subject to publish to.</param>
+    /// <param name="message">The message to publish.</param>
+    /// <typeparam name="TStateMsg"></typeparam>
+    /// <returns></returns>
+    public Task PublishStateAsync<TStateMsg>(Enum subject, TStateMsg message) where TStateMsg : IStateMessage;
+
+    /// <summary>
+    /// When a player state update message has been received.
+    /// </summary>
+    public event EventHandler<NatsMessageEventArgs<IPlayerStateUpdateMessage>> PlayerStateUpdated;
+
+    /// <summary>
+    /// When a chat message has been received.
+    /// </summary>
+    public event EventHandler<NatsMessageEventArgs<IChatStateStateMessage>> ChatMessageReceived;
+
+    public event EventHandler<NatsMessageEventArgs<IStateMessage>> MapFinishedReceived;
+}

src/Modules/ServerSyncModule/Interfaces/IServerState.cs

@@ -0,0 +1,9 @@
+namespace EvoSC.Modules.EvoEsports.ServerSyncModule.Interfaces;
+
+public interface IServerState
+{
+    /// <summary>
+    /// The time at which this state change occurred.
+    /// </summary>
+    public DateTime Timestamp { get; set; }
+}