perf: caching remoteAddress

James-Frowen · Jun 8, 2023 · d2f63ba · d2f63ba
1 parent 92af868
commit d2f63ba
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 9 deletions.
diff --git a/source/Runtime/Common/Connection.cs b/source/Runtime/Common/Connection.cs
@@ -21,6 +21,11 @@ internal sealed class Connection : IDisposable
         /// <para>Only valid on server</para>
         /// </summary>
         public Request request;
+        /// <summary>
+        /// RemoteEndpoint address or address from request header
+        /// <para>Only valid on server</para>
+        /// </summary>
+        public string remoteAddress;
 
         public Stream stream;
         public Thread receiveThread;
@@ -100,5 +105,25 @@ public override string ToString()
                     return $"[Conn:{connId}, endPoint:n/a]";
                 }
         }
+
+        /// <summary>
+        /// Gets the address based on the <see cref="request"/> and RemoteEndPoint
+        /// <para>Called after ServerHandShake is accepted</para>
+        /// </summary>
+        /// <exception cref="NotImplementedException"></exception>
+        internal string CalculateAddress()
+        {
+            var headers = request.Headers;
+            if (headers.TryGetValue("X-Forwarded-For", out var forwardFor))
+            {
+                var ips = forwardFor.ToString().Split(',');
+                var actualClientIP = ips[0];
+                // Remove the port number from the address
+                string addressWithoutPort = remoteAddress.Split(':')[0];
+                return addressWithoutPort;
+            }
+
+            return client.Client.RemoteEndPoint.ToString();
+        }
     }
 }
diff --git a/source/Runtime/Server/ServerHandshake.cs b/source/Runtime/Server/ServerHandshake.cs
@@ -61,6 +61,7 @@ public bool TryHandshake(Connection conn)
                 AcceptHandshake(stream, msg);
 
                 conn.request = new Request(msg);
+                conn.remoteAddress = conn.CalculateAddress();
 
                 return true;
             }

diff --git a/source/Runtime/Server/WebSocketServer.cs b/source/Runtime/Server/WebSocketServer.cs
@@ -217,15 +217,7 @@ public string GetClientAddress(int id)
                 return null;
             }
 
-            var headers = conn.request.Headers;
-            if (headers.TryGetValue("X-Forwarded-For", out var forwardFor))
-            {
-                var ips = forwardFor.ToString().Split(',');
-                var actualClientIP = ips[0];
-                return actualClientIP;
-            }
-
-            return conn.client.Client.RemoteEndPoint.ToString();
+            return conn.remoteAddress;
         }
 
         public Request GetClientRequest(int id)