feat: change request ID to be uint

Author: insthync

SimpleNetworkManager.NET/Messages/BaseRequestMessage.cs

@@ -7,7 +7,7 @@ namespace Insthync.SimpleNetworkManager.NET.Messages
     /// Base class for all request messages that expect a response.
     /// Provides correlation ID for matching requests with responses.
     /// Reserved keys:
-    /// 0 - RequestId (Guid)
+    /// 0 - RequestId (uint)
     /// </summary>
     public abstract class BaseRequestMessage : BaseMessage
     {
@@ -16,6 +16,6 @@ public abstract class BaseRequestMessage : BaseMessage
         /// Generated automatically when the request is created.
         /// </summary>
         [Key(0)]
-        public Guid RequestId { get; internal set; }
+        public uint RequestId { get; set; }
     }
 }

SimpleNetworkManager.NET/Messages/BaseRequestMessageHandler.cs

@@ -19,10 +19,10 @@ public virtual BaseMessage GetResponseMessageInstance()
 
         protected override sealed async UniTask HandleAsync(BaseClientConnection clientConnection, TRequest data)
         {
-            Guid requestId = data.RequestId;
+            uint requestId = data.RequestId;
             var response = await HandleRequestAsync(clientConnection, data);
             response.RequestId = requestId;
-            await clientConnection.SendMessageAsync(data);
+            await clientConnection.SendMessageAsync(response);
         }
 
         protected abstract UniTask<TResponse> HandleRequestAsync(BaseClientConnection clientConnection, TRequest request);

SimpleNetworkManager.NET/Messages/BaseResponseMessage.cs

@@ -7,7 +7,7 @@ namespace Insthync.SimpleNetworkManager.NET.Messages
     /// Base class for all response messages that correspond to a request.
     /// Provides correlation ID for matching responses with requests.
     /// Reserved keys:
-    /// 0 - RequestId (Guid)
+    /// 0 - RequestId (uint)
     /// 1 - Success (bool)
     /// 2 - ErrorMessage (string)
     /// </summary>
@@ -17,7 +17,7 @@ public abstract class BaseResponseMessage : BaseMessage
         /// Correlation ID that matches the original request's RequestId
         /// </summary>
         [Key(0)]
-        public Guid RequestId { get; internal set; }
+        public uint RequestId { get; set; }
 
         /// <summary>
         /// Indicates if the request was successful

SimpleNetworkManager.NET/Network/BaseClientConnection.cs

@@ -15,8 +15,11 @@ public abstract class BaseClientConnection : IDisposable
         private static uint s_connectionIdCounter = 0;
         private static ConcurrentQueue<uint> s_unassignedConnectionIds = new ConcurrentQueue<uint>();
 
+        private static uint s_requestIdCounter = 0;
+        private static ConcurrentQueue<uint> s_unassignedRequestIds = new ConcurrentQueue<uint>();
+
         protected readonly ILogger<BaseClientConnection> _logger;
-        protected readonly ConcurrentDictionary<Guid, BaseResponseMessage> _pendingResponses = new ConcurrentDictionary<Guid, BaseResponseMessage>();
+        protected readonly ConcurrentDictionary<uint, BaseResponseMessage> _pendingResponses;
         protected bool _disposed;
 
         public uint ConnectionId { get; protected set; }
@@ -31,21 +34,35 @@ public abstract class BaseClientConnection : IDisposable
         public BaseClientConnection(ILogger<BaseClientConnection> logger)
         {
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+            _pendingResponses = new ConcurrentDictionary<uint, BaseResponseMessage>();
+        }
+
+        private static uint GetNewConnectionId()
+        {
+            if (!s_unassignedConnectionIds.TryDequeue(out uint connectionId))
+                connectionId = Interlocked.Increment(ref s_connectionIdCounter);
+            return connectionId;
+        }
+
+        private static uint GetNewRequestId()
+        {
+            if (!s_unassignedRequestIds.TryDequeue(out uint requestId))
+                requestId = Interlocked.Increment(ref s_requestIdCounter);
+            return requestId;
         }
 
         public void AssignConnectionId()
         {
             if (ConnectionId > 0)
                 return;
-            if (!s_unassignedConnectionIds.TryDequeue(out uint connectionId))
-                connectionId = Interlocked.Increment(ref s_connectionIdCounter);
-            ConnectionId = connectionId;
+            ConnectionId = GetNewConnectionId();
         }
 
         public void UnassignConnectionId()
         {
             if (ConnectionId > 0)
                 s_unassignedConnectionIds.Enqueue(ConnectionId);
+            ConnectionId = 0;
         }
 
         public void OnMessageReceived(byte[] message)
@@ -76,7 +93,7 @@ public void OnDisconnected()
         internal async UniTask<TResponse> SendRequestAsync<TResponse>(BaseRequestMessage request)
             where TResponse : BaseResponseMessage
         {
-            Guid requestId = Guid.NewGuid();
+            uint requestId = GetNewRequestId();
             request.RequestId = requestId;
             await SendMessageAsync(request);
 
@@ -95,6 +112,7 @@ internal async UniTask<TResponse> SendRequestAsync<TResponse>(BaseRequestMessage
                 timeoutCountDown -= 100;
             }
             while (!_pendingResponses.TryRemove(requestId, out response));
+            s_unassignedRequestIds.Enqueue(requestId);
 
             if (response == null)
             {
@@ -113,7 +131,8 @@ internal void Responded(BaseResponseMessage? response)
         {
             if (response == null)
                 return;
-            _pendingResponses.TryAdd(response.RequestId, response);
+            uint requestId = response.RequestId;
+            _pendingResponses.TryAdd(requestId, response);
         }
 
         /// <summary>