Fix dependency loop, Fix dedi-master message serialisation

BeatTogether · Apr 6, 2024 · ca4ac43 · ca4ac43
1 parent 17c3760
commit ca4ac43
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 16 deletions.
diff --git a/BeatTogether.DedicatedServer.Interface/Responses/CreateMatchmakingServerResponse.cs b/BeatTogether.DedicatedServer.Interface/Responses/CreateMatchmakingServerResponse.cs
@@ -9,9 +9,9 @@ public enum CreateMatchmakingServerError
 
     public record CreateMatchmakingServerResponse(
         CreateMatchmakingServerError Error,
-        string? RemoteEndPoint = null,
-        byte[]? Random = null,
-        byte[]? PublicKey = null)
+        string RemoteEndPoint,
+        byte[] Random,
+        byte[] PublicKey)
     {
         public bool Success => Error == default;
     }

diff --git a/BeatTogether.DedicatedServer.Kernel/BeatTogether.DedicatedServer.Kernel.csproj b/BeatTogether.DedicatedServer.Kernel/BeatTogether.DedicatedServer.Kernel.csproj
@@ -21,7 +21,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\BeatTogether.DedicatedServer.Ignorance\BeatTogether.DedicatedServer.Ignorance.csproj" />
     <ProjectReference Include="..\BeatTogether.DedicatedServer.Messaging\BeatTogether.DedicatedServer.Messaging.csproj" />
   </ItemGroup>
 

diff --git a/BeatTogether.DedicatedServer.Kernel/DedicatedInstance.cs b/BeatTogether.DedicatedServer.Kernel/DedicatedInstance.cs
@@ -19,6 +19,7 @@
 using BeatTogether.DedicatedServer.Messaging.Util;
 using Serilog;
 using BeatTogether.DedicatedServer.Ignorance.IgnoranceCore;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace BeatTogether.DedicatedServer.Kernel
 {
@@ -46,8 +47,8 @@ public sealed class DedicatedInstance : ENetServer, IDedicatedInstance
 
         private readonly IPlayerRegistry _playerRegistry;
         private readonly IServiceProvider _serviceProvider;
-        private readonly IPacketDispatcher PacketDispatcher;
-        private readonly PacketSource ConnectedMessageSource;
+        private IPacketDispatcher PacketDispatcher;
+        private PacketSource ConnectedMessageSource;
 
 
         private byte _connectionIdCount = 0;
@@ -64,16 +65,12 @@ public sealed class DedicatedInstance : ENetServer, IDedicatedInstance
         public DedicatedInstance(
             InstanceConfiguration configuration,
             IPlayerRegistry playerRegistry,
-            IPacketDispatcher packetDispatcher,
-            PacketSource connectedMessageSource,
             IServiceProvider serviceProvider)
             : base (configuration.Port)
         {
             _configuration = configuration;
             _playerRegistry = playerRegistry;
             _serviceProvider = serviceProvider;
-            PacketDispatcher = packetDispatcher;
-            ConnectedMessageSource = connectedMessageSource;
         }
 
         #region Public Methods
@@ -93,8 +90,8 @@ public async Task Start(CancellationToken cancellationToken = default)
             if (IsRunning)
                 return;
 
-            //PacketDispatcher = _serviceProvider.GetRequiredService<IPacketDispatcher>();
-            //ConnectedMessageSource = _serviceProvider.GetRequiredService<PacketSource>();
+            PacketDispatcher = _serviceProvider.GetRequiredService<IPacketDispatcher>();
+            ConnectedMessageSource = _serviceProvider.GetRequiredService<PacketSource>();
 
             _startTime = DateTime.UtcNow.Ticks;
 

diff --git a/BeatTogether.DedicatedServer.Kernel/ENet/ENetServer.cs b/BeatTogether.DedicatedServer.Kernel/ENet/ENetServer.cs
@@ -16,7 +16,7 @@
 namespace BeatTogether.DedicatedServer.Kernel.ENet
 {
     /// <summary>
-    /// Temporary secondary server/socket for ENet (1.31+) connectivity.
+    /// Server/socket for ENet (1.31+) connectivity.
     /// </summary>
     public class ENetServer : IDisposable
     {

diff --git a/BeatTogether.DedicatedServer.Kernel/Extensions/HostBuilderExtensions.cs b/BeatTogether.DedicatedServer.Kernel/Extensions/HostBuilderExtensions.cs
@@ -35,7 +35,7 @@ public static IHostBuilder UseDedicatedInstances(this IHostBuilder hostBuilder)
                         .AddDedicatedServerMessaging()
                         .AddScoped<DedicatedInstance>()
                         .AddExisting<IDedicatedInstance, DedicatedInstance>()
-                        .AddExisting<ENetServer, DedicatedInstance>()
+                        .AddExisting<ENetServer, DedicatedInstance>() //Used to be like this for lnl
                         //.AddScoped<IHandshakeSessionRegistry, HandshakeSessionRegistry>()
                         .AddScoped<IPlayerRegistry, PlayerRegistry>()
                         //.AddScoped<UnconnectedMessageSource, UnconnectedSource>()

diff --git a/BeatTogether.DedicatedServer.Messaging/BeatTogether.DedicatedServer.Messaging.csproj b/BeatTogether.DedicatedServer.Messaging/BeatTogether.DedicatedServer.Messaging.csproj
@@ -12,4 +12,8 @@
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
   </ItemGroup>
 
+    <ItemGroup>
+	    <ProjectReference Include="..\BeatTogether.DedicatedServer.Ignorance\BeatTogether.DedicatedServer.Ignorance.csproj" />
+    </ItemGroup>
+
 </Project>
diff --git a/BeatTogether.DedicatedServer.Node/InstanceFactory.cs b/BeatTogether.DedicatedServer.Node/InstanceFactory.cs
@@ -49,7 +49,6 @@ bool AllowNE
             var scope = _serviceProvider.CreateScope();
 
             var instanceConfig = scope.ServiceProvider.GetRequiredService<InstanceConfiguration>();
-            //instanceConfig.LiteNetPort = (int)liteNetPort!;
             instanceConfig.Port = (int)Port!;
             instanceConfig.Secret = secret;
             instanceConfig.ServerOwnerId = managerId;

diff --git a/BeatTogether.DedicatedServer.Node/NodeService.cs b/BeatTogether.DedicatedServer.Node/NodeService.cs
@@ -72,7 +72,9 @@ public async Task<CreateMatchmakingServerResponse> CreateMatchmakingServer(Creat
             await matchmakingServer.Start();
             return new CreateMatchmakingServerResponse(
                 CreateMatchmakingServerError.None,
-                $"{_configuration.HostName}:{matchmakingServer.Port}"
+                $"{_configuration.HostName}:{matchmakingServer.Port}",
+                 Array.Empty<byte>(),
+                 Array.Empty<byte>()
             );
         }