PR, Palworld Support (Tested on Minecraft and PalWorld)

src/CoreRCON/Constants.cs

@@ -16,7 +16,12 @@ internal class Constants
         /// <summary>
         /// The size of the header of an RCON packet.
         /// </summary>
-        internal const int PACKET_HEADER_SIZE = 12;
+        internal const int PACKET_HEADER_SIZE = 8;
+
+        /// <summary>
+        /// The size of the header of an RCON packet.
+        /// </summary>
+        internal const int PACKET_PADDING_SIZE = 2;
 
         /// <summary>
         /// Special response value when you send a Response.Response to the server.

src/CoreRCON/PacketFormats/RCONPacket.cs

@@ -68,14 +68,15 @@ internal static RCONPacket FromBytes(byte[] buffer)
         /// <returns>Byte array with each field.</returns>
         internal byte[] ToBytes()
         {
-            int bodyLength = Encoding.UTF8.GetByteCount(Body) + 1;
-            int totalLength = Constants.PACKET_HEADER_SIZE + bodyLength;
-            byte[] packetBytes = new byte[totalLength];
+            int bodyLength = Encoding.UTF8.GetByteCount(Body);
+            int size = Constants.PACKET_HEADER_SIZE + Constants.PACKET_PADDING_SIZE + bodyLength;
+
+            byte[] packetBytes = new byte[size+4];
             Span<byte> packetSpan = packetBytes;
 
             // Write packet size
             // Packet size parameter does not include the size of the size parameter itself
-            BinaryPrimitives.WriteInt32LittleEndian(packetSpan, totalLength - 4);
+            BinaryPrimitives.WriteInt32LittleEndian(packetSpan, size);
             packetSpan = packetSpan.Slice(4);
 
             // Write ID
@@ -84,12 +85,12 @@ internal byte[] ToBytes()
 
             // Write type
             BinaryPrimitives.WriteInt32LittleEndian(packetSpan, (int)Type);
-            packetSpan = packetSpan.Slice(4);
 
             // Write body
-            Encoding.UTF8.GetBytes(Body, 0, Body.Length, packetBytes, Constants.PACKET_HEADER_SIZE);
-            packetSpan[bodyLength - 1] = 0; // Null terminator for the body
-            packetBytes[totalLength - 1] = 0; // Null terminator for the package
+            Encoding.UTF8.GetBytes(Body, 0, Body.Length, packetBytes, 12);
+
+            packetBytes[packetBytes.Length - 2] = 0; // Null terminator for the body
+            packetBytes[packetBytes.Length - 1] = 0; // Null terminator for the package
 
             return packetBytes;
         }

src/CoreRCON/RCON.cs

@@ -28,6 +28,7 @@ public partial class RCON(
         string password,
         uint timeout = 10000,
         bool sourceMultiPacketSupport = false,
+        bool strictCommandPacketIdMatching = true,
         ILogger logger = null) : IDisposable
     {
         // Allows us to keep track of when authentication succeeds, so we can block Connect from returning until it does.
@@ -71,8 +72,8 @@ public partial class RCON(
         /// <param name="host">Server address</param>
         /// <param name="port">Server port</param>
         public RCON(IPAddress host, ushort port, string password, uint timeout = 10000,
-            bool sourceMultiPacketSupport = false, ILogger logger = null)
-            : this(new IPEndPoint(host, port), password, timeout, sourceMultiPacketSupport, logger)
+            bool sourceMultiPacketSupport = false, bool strictCommandPacketIdMatching = true, ILogger logger = null)
+            : this(new IPEndPoint(host, port), password, timeout, sourceMultiPacketSupport,strictCommandPacketIdMatching, logger)
         { }
 
         /// <summary>
@@ -316,6 +317,7 @@ public async Task<string> SendCommandAsync(string command, TimeSpan? overrideTim
                 throw new SocketException();
             }
 
+
             using var activity = Tracing.ActivitySource.StartActivity("SendCommand", ActivityKind.Client);
             activity?.AddTag(Tracing.Tags.Address, _endpoint.Address.ToString());
             activity?.AddTag(Tracing.Tags.Port, _endpoint.Port.ToString());
@@ -367,39 +369,48 @@ public async Task<string> SendCommandAsync(string command, TimeSpan? overrideTim
         private void RCONPacketReceived(RCONPacket packet)
         {
             _logger?.LogTrace("RCON packet received: {}", packet.Id);
+
+            TaskCompletionSource<string> taskSource;
             // Call pending result and remove from map
-            if (_pendingCommands.TryGetValue(packet.Id, out TaskCompletionSource<string> taskSource))
+            if (!_pendingCommands.TryGetValue(packet.Id, out taskSource))
             {
-                if (_multiPacket)
+                _logger?.LogWarning("Received packet with no matching command id: {} body: {}", packet.Id, packet.Body);
+                // The server did not respect our id
+                if (!strictCommandPacketIdMatching && packet.Id == 0)
                 {
-                    //Read any previous messages 
-                    _incomingBuffer.TryGetValue(packet.Id, out string body);
-
-                    if (packet.Body == Constants.MULTI_PACKET_END_RESPONSE)
-                    {
-                        //Avoid yielding
-                        taskSource.SetResult(body ?? string.Empty);
-                        _pendingCommands.TryRemove(packet.Id, out _);
-                        _incomingBuffer.Remove(packet.Id);
-                    }
-                    else
-                    {
-                        //Append to previous messages
-                        _incomingBuffer[packet.Id] = body + packet.Body;
-                    }
+                    // Get the most recently sent command
+                    taskSource = _pendingCommands
+                        .OrderBy(cmd => cmd.Key)
+                        .Select(cmd => cmd.Value)
+                        .FirstOrDefault();
                 }
-                else
+            }
+
+            if (_multiPacket)
+            {
+                //Read any previous messages 
+                _incomingBuffer.TryGetValue(packet.Id, out string body);
+
+                if (packet.Body == Constants.MULTI_PACKET_END_RESPONSE)
                 {
                     //Avoid yielding
-                    taskSource.SetResult(packet.Body);
+                    taskSource.SetResult(body ?? string.Empty);
                     _pendingCommands.TryRemove(packet.Id, out _);
+                    _incomingBuffer.Remove(packet.Id);
+                }
+                else
+                {
+                    //Append to previous messages
+                    _incomingBuffer[packet.Id] = body + packet.Body;
                 }
             }
             else
             {
-                _logger?.LogWarning("Received packet with no matching command id: {} body: {}", packet.Id, packet.Body);
+                //Avoid yielding
+                taskSource.SetResult(packet.Body);
+                _pendingCommands.TryRemove(packet.Id, out _);
             }
-
+            
             OnPacketReceived?.Invoke(packet);
         }
 

src/RconShell/Program.cs

@@ -76,7 +76,7 @@ static async Task Main(string[] args)
                 port
             );
 
-            rcon = new RCON(endpoint, password, 0);
+            rcon = new RCON(endpoint, password, 0, strictCommandPacketIdMatching: false);
             await rcon.ConnectAsync();
             bool connected = true;
             Console.WriteLine("Connected");

src/RconTest/RconTest.cs

@@ -54,7 +54,7 @@ public async Task testInitAsync()
             });
             ILogger<RCON> logger = loggerFactory.CreateLogger<RCON>();
 
-            rconClient = new RCON(_ip, _port, _password, 1000, false, logger);
+            rconClient = new RCON(_ip, _port, _password, 1000, false, true, logger);
             await rconClient.ConnectAsync();
         }