Upgraded Litenetlib

SubnauticaNitrox · Feb 26, 2024 · cd7a75e · cd7a75e
1 parent ffe3352
commit cd7a75e
Show file tree

Hide file tree

Showing 13 changed files with 41 additions and 40 deletions.
diff --git a/NitroxModel/NitroxModel.csproj b/NitroxModel/NitroxModel.csproj
@@ -7,7 +7,7 @@
 
     <ItemGroup>
         <PackageReference Include="Autofac" Version="4.9.4" />
-        <PackageReference Include="LiteNetLib" Version="1.0.1.1" />
+        <PackageReference Include="LiteNetLib" Version="1.2.0" />
         <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
         <PackageReference Include="Mono.Nat" Version="3.0.2" />
         <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />

diff --git a/NitroxServer/Communication/LiteNetLib/LiteNetLibConnection.cs b/NitroxServer/Communication/LiteNetLib/LiteNetLibConnection.cs
@@ -7,12 +7,12 @@
 
 namespace NitroxServer.Communication.LiteNetLib;
 
-public class LiteNetLibConnection : NitroxConnection, IEquatable<LiteNetLibConnection>
+public class LiteNetLibConnection : INitroxConnection, IEquatable<LiteNetLibConnection>
 {
     private readonly NetDataWriter dataWriter = new();
     private readonly NetPeer peer;
 
-    public IPEndPoint Endpoint => peer.EndPoint;
+    public IPEndPoint Endpoint => peer;
     public NitroxConnectionState State => peer.ConnectionState.ToNitrox();
 
     public LiteNetLibConnection(NetPeer peer)
@@ -33,7 +33,7 @@ public void SendPacket(Packet packet)
         }
         else
         {
-            Log.Warn($"Cannot send packet {packet?.GetType()} to a closed connection {peer.EndPoint}");
+            Log.Warn($"Cannot send packet {packet?.GetType()} to a closed connection {peer as IPEndPoint}");
         }
     }
 
@@ -49,7 +49,7 @@ public void SendPacket(Packet packet)
 
     public override bool Equals(object obj)
     {
-        if (ReferenceEquals(null, obj))
+        if (obj is null)
         {
             return false;
         }

diff --git a/NitroxServer/Communication/LiteNetLib/LiteNetLibServer.cs b/NitroxServer/Communication/LiteNetLib/LiteNetLibServer.cs
@@ -131,7 +131,7 @@ private void NetworkDataReceived(NetPeer peer, NetDataReader reader, byte channe
         {
             reader.GetBytes(packetData, packetDataLength);
             Packet packet = Packet.Deserialize(packetData);
-            NitroxConnection connection = GetConnection(peer.Id);
+            INitroxConnection connection = GetConnection(peer.Id);
             ProcessIncomingData(connection, packet);
         }
         finally
@@ -140,9 +140,9 @@ private void NetworkDataReceived(NetPeer peer, NetDataReader reader, byte channe
         }
     }
 
-    private NitroxConnection GetConnection(int remoteIdentifier)
+    private INitroxConnection GetConnection(int remoteIdentifier)
     {
-        NitroxConnection connection;
+        INitroxConnection connection;
         lock (connectionsByRemoteIdentifier)
         {
             connectionsByRemoteIdentifier.TryGetValue(remoteIdentifier, out connection);

diff --git a/NitroxServer/Communication/NitroxConnection.cs b/NitroxServer/Communication/NitroxConnection.cs
@@ -1,13 +1,14 @@
-using System.Net;
+using System.Net;
 using NitroxModel.Packets;
 using NitroxModel.Packets.Processors.Abstract;
 
-namespace NitroxServer.Communication
+namespace NitroxServer.Communication;
+
+public interface INitroxConnection : IProcessorContext
 {
-    public interface NitroxConnection : IProcessorContext
-    {
-        IPEndPoint Endpoint { get; }
-        NitroxConnectionState State { get; }
-        void SendPacket(Packet packet);
-    }
+    IPEndPoint Endpoint { get; }
+
+    NitroxConnectionState State { get; }
+
+    void SendPacket(Packet packet);
 }
diff --git a/NitroxServer/Communication/NitroxServer.cs b/NitroxServer/Communication/NitroxServer.cs
@@ -23,7 +23,7 @@ static NitroxServer()
 
         protected readonly PacketHandler packetHandler;
         protected readonly EntitySimulation entitySimulation;
-        protected readonly Dictionary<int, NitroxConnection> connectionsByRemoteIdentifier = new();
+        protected readonly Dictionary<int, INitroxConnection> connectionsByRemoteIdentifier = new();
         protected readonly PlayerManager playerManager;
 
         public NitroxServer(PacketHandler packetHandler, PlayerManager playerManager, EntitySimulation entitySimulation, ServerConfig serverConfig)
@@ -42,7 +42,7 @@ public NitroxServer(PacketHandler packetHandler, PlayerManager playerManager, En
 
         public abstract void Stop();
 
-        protected void ClientDisconnected(NitroxConnection connection)
+        protected void ClientDisconnected(INitroxConnection connection)
         {
             Player player = playerManager.GetPlayer(connection);
 
@@ -67,7 +67,7 @@ protected void ClientDisconnected(NitroxConnection connection)
             }
         }
 
-        protected void ProcessIncomingData(NitroxConnection connection, Packet packet)
+        protected void ProcessIncomingData(INitroxConnection connection, Packet packet)
         {
             try
             {

diff --git a/NitroxServer/Communication/Packets/PacketHandler.cs b/NitroxServer/Communication/Packets/PacketHandler.cs
@@ -22,7 +22,7 @@ public PacketHandler(PlayerManager playerManager, DefaultServerPacketProcessor p
             defaultServerPacketProcessor = packetProcessor;
         }
 
-        public void Process(Packet packet, NitroxConnection connection)
+        public void Process(Packet packet, INitroxConnection connection)
         {
             Player player = playerManager.GetPlayer(connection);
             if (player == null)
@@ -61,7 +61,7 @@ private void ProcessAuthenticated(Packet packet, Player player)
             }
         }
 
-        private void ProcessUnauthenticated(Packet packet, NitroxConnection connection)
+        private void ProcessUnauthenticated(Packet packet, INitroxConnection connection)
         {
             Type packetType = packet.GetType();
             if (!packetProcessorUnauthCache.TryGetValue(packetType, out PacketProcessor processor))

diff --git a/NitroxServer/Communication/Packets/Processors/Abstract/UnauthenticatedPacketProcessor.cs b/NitroxServer/Communication/Packets/Processors/Abstract/UnauthenticatedPacketProcessor.cs
@@ -7,9 +7,9 @@ public abstract class UnauthenticatedPacketProcessor<T> : PacketProcessor where
     {
         public override void ProcessPacket(Packet packet, IProcessorContext connection)
         {
-            Process((T)packet, (NitroxConnection)connection);
+            Process((T)packet, (INitroxConnection)connection);
         }
 
-        public abstract void Process(T packet, NitroxConnection connection);
+        public abstract void Process(T packet, INitroxConnection connection);
     }
 }
diff --git a/NitroxServer/Communication/Packets/Processors/MultiplayerSessionPolicyRequestProcessor.cs b/NitroxServer/Communication/Packets/Processors/MultiplayerSessionPolicyRequestProcessor.cs
@@ -14,7 +14,7 @@ public MultiplayerSessionPolicyRequestProcessor(ServerConfig config)
         }
 
         // This will extend in the future when we look into different options for auth
-        public override void Process(MultiplayerSessionPolicyRequest packet, NitroxConnection connection)
+        public override void Process(MultiplayerSessionPolicyRequest packet, INitroxConnection connection)
         {
             Log.Info("Providing session policies...");
             connection.SendPacket(new MultiplayerSessionPolicy(packet.CorrelationId, config.DisableConsole, config.MaxConnections, config.IsPasswordRequired));

diff --git a/...xServer/Communication/Packets/Processors/MultiplayerSessionReservationRequestProcessor.cs b/...xServer/Communication/Packets/Processors/MultiplayerSessionReservationRequestProcessor.cs
@@ -14,7 +14,7 @@ public MultiplayerSessionReservationRequestProcessor(PlayerManager playerManager
             this.playerManager = playerManager;
         }
 
-        public override void Process(MultiplayerSessionReservationRequest packet, NitroxConnection connection)
+        public override void Process(MultiplayerSessionReservationRequest packet, INitroxConnection connection)
         {
             Log.Info($"Processing reservation request from {packet.AuthenticationContext.Username}");
 

diff --git a/NitroxServer/Communication/Packets/Processors/PlayerJoiningMultiplayerSessionProcessor.cs b/NitroxServer/Communication/Packets/Processors/PlayerJoiningMultiplayerSessionProcessor.cs
@@ -35,7 +35,7 @@ public PlayerJoiningMultiplayerSessionProcessor(ScheduleKeeper scheduleKeeper, S
             this.buildingManager = buildingManager;
         }
 
-        public override void Process(PlayerJoiningMultiplayerSession packet, NitroxConnection connection)
+        public override void Process(PlayerJoiningMultiplayerSession packet, INitroxConnection connection)
         {
             Player player = playerManager.PlayerConnected(connection, packet.ReservationKey, out bool wasBrandNewPlayer);
             NitroxId assignedEscapePodId = world.EscapePodManager.AssignPlayerToEscapePod(player.Id, out Optional<EscapePodWorldEntity> newlyCreatedEscapePod);

diff --git a/NitroxServer/GameLogic/InitialSyncTimerData.cs b/NitroxServer/GameLogic/InitialSyncTimerData.cs
@@ -11,7 +11,7 @@ namespace NitroxServer.GameLogic
     /// </summary>
     internal class InitialSyncTimerData
     {
-        public readonly NitroxConnection Connection;
+        public readonly INitroxConnection Connection;
         public readonly AuthenticationContext Context;
         public readonly int MaxCounter;
 
@@ -25,7 +25,7 @@ internal class InitialSyncTimerData
         /// </summary>
         public bool Disposing = false;
 
-        public InitialSyncTimerData(NitroxConnection connection, AuthenticationContext context, int initialSyncTimeout)
+        public InitialSyncTimerData(INitroxConnection connection, AuthenticationContext context, int initialSyncTimeout)
         {
             Connection = connection;
             Context = context;

diff --git a/NitroxServer/GameLogic/PlayerManager.cs b/NitroxServer/GameLogic/PlayerManager.cs
@@ -20,11 +20,11 @@ namespace NitroxServer.GameLogic
     public class PlayerManager
     {
         private readonly ThreadSafeDictionary<string, Player> allPlayersByName;
-        private readonly ThreadSafeDictionary<NitroxConnection, ConnectionAssets> assetsByConnection = new();
+        private readonly ThreadSafeDictionary<INitroxConnection, ConnectionAssets> assetsByConnection = new();
         private readonly ThreadSafeDictionary<string, PlayerContext> reservations = new();
         private readonly ThreadSafeSet<string> reservedPlayerNames = new("Player"); // "Player" is often used to identify the local player and should not be used by any user
 
-        private ThreadSafeQueue<KeyValuePair<NitroxConnection, MultiplayerSessionReservationRequest>> JoinQueue { get; set; } = new();
+        private ThreadSafeQueue<KeyValuePair<INitroxConnection, MultiplayerSessionReservationRequest>> JoinQueue { get; set; } = new();
         private bool PlayerCurrentlyJoining { get; set; }
 
         private Timer initialSyncTimer;
@@ -56,7 +56,7 @@ public IEnumerable<Player> GetAllPlayers()
         }
 
         public MultiplayerSessionReservation ReservePlayerContext(
-            NitroxConnection connection,
+            INitroxConnection connection,
             PlayerSettings playerSettings,
             AuthenticationContext authenticationContext,
             string correlationId)
@@ -88,7 +88,7 @@ public MultiplayerSessionReservation ReservePlayerContext(
                     return new MultiplayerSessionReservation(correlationId, MultiplayerSessionReservationState.REJECTED);
                 }
 
-                JoinQueue.Enqueue(new KeyValuePair<NitroxConnection, MultiplayerSessionReservationRequest>(
+                JoinQueue.Enqueue(new KeyValuePair<INitroxConnection, MultiplayerSessionReservationRequest>(
                                       connection,
                                       new MultiplayerSessionReservationRequest(correlationId, playerSettings, authenticationContext)));
 
@@ -175,13 +175,13 @@ private void InitialSyncTimerElapsed(object state)
             }
         }
 
-        public void NonPlayerDisconnected(NitroxConnection connection)
+        public void NonPlayerDisconnected(INitroxConnection connection)
         {
             // Remove any requests sent by the connection from the join queue
             JoinQueue = new(JoinQueue.Where(pair => !Equals(pair.Key, connection)));
         }
 
-        public Player PlayerConnected(NitroxConnection connection, string reservationKey, out bool wasBrandNewPlayer)
+        public Player PlayerConnected(INitroxConnection connection, string reservationKey, out bool wasBrandNewPlayer)
         {
             PlayerContext playerContext = reservations[reservationKey];
             Validate.NotNull(playerContext);
@@ -229,7 +229,7 @@ public Player PlayerConnected(NitroxConnection connection, string reservationKey
             return player;
         }
 
-        public void PlayerDisconnected(NitroxConnection connection)
+        public void PlayerDisconnected(INitroxConnection connection)
         {
             assetsByConnection.TryGetValue(connection, out ConnectionAssets assetPackage);
             if (assetPackage == null)
@@ -273,8 +273,8 @@ public void FinishProcessingReservation(Player player = null)
             // Tell next client that it can start joining.
             if (JoinQueue.Count > 0)
             {
-                KeyValuePair<NitroxConnection, MultiplayerSessionReservationRequest> keyValuePair = JoinQueue.Dequeue();
-                NitroxConnection requestConnection = keyValuePair.Key;
+                KeyValuePair<INitroxConnection, MultiplayerSessionReservationRequest> keyValuePair = JoinQueue.Dequeue();
+                INitroxConnection requestConnection = keyValuePair.Key;
                 MultiplayerSessionReservationRequest reservationRequest = keyValuePair.Value;
 
                 MultiplayerSessionReservation reservation = ReservePlayerContext(requestConnection,
@@ -301,7 +301,7 @@ public bool TryGetPlayerByName(string playerName, out Player foundPlayer)
             return false;
         }
 
-        public Player GetPlayer(NitroxConnection connection)
+        public Player GetPlayer(INitroxConnection connection)
         {
             if (!assetsByConnection.TryGetValue(connection, out ConnectionAssets assetPackage))
             {

diff --git a/NitroxServer/Player.cs b/NitroxServer/Player.cs
@@ -21,7 +21,7 @@ public class Player : IProcessorContext
         public ThreadSafeList<NitroxTechType> UsedItems { get; }
         public Optional<NitroxId>[] QuickSlotsBindingIds { get; set; }
 
-        public NitroxConnection Connection { get; set; }
+        public INitroxConnection Connection { get; set; }
         public PlayerSettings PlayerSettings => PlayerContext.PlayerSettings;
         public PlayerContext PlayerContext { get; set; }
         public ushort Id { get; }
@@ -42,7 +42,7 @@ public class Player : IProcessorContext
 
         public PlayerWorldEntity Entity { get; set; }
 
-        public Player(ushort id, string name, bool isPermaDeath, PlayerContext playerContext, NitroxConnection connection,
+        public Player(ushort id, string name, bool isPermaDeath, PlayerContext playerContext, INitroxConnection connection,
                       NitroxVector3 position, NitroxQuaternion rotation, NitroxId playerId, Optional<NitroxId> subRootId, Perms perms, PlayerStatsData stats, NitroxGameMode gameMode,
                       IEnumerable<NitroxTechType> usedItems, Optional<NitroxId>[] quickSlotsBindingIds,
                       IEnumerable<EquippedItemData> equippedItems, IEnumerable<EquippedItemData> modules, IDictionary<string, float> personalCompletedGoalsWithTimestamp, IDictionary<string, PingInstancePreference> pingInstancePreferences, IList<int> pinnedRecipePreferences)