Revert "Fixed NatHelper"

This reverts commit 1675b79.
stayintarkov · Feb 2, 2024 · 667132d · 667132d
1 parent 1675b79
commit 667132d
Showing 1 changed file with 43 additions and 40 deletions.
diff --git a/Source/Networking/NatHelper.cs b/Source/Networking/NatHelper.cs
@@ -90,60 +90,63 @@ private void WebSocket_OnError(object sender, WebSocketSharp.ErrorEventArgs e)
 
         private void ProcessMessage(string message)
         {
-            JObject msgObj = JObject.Parse(message);
 
-            if(msgObj.ContainsKey("requestId") && msgObj.ContainsKey("requestType"))
-            {
-                var requestId = msgObj["requestId"].ToString();
-                var requestType = msgObj["requestType"].ToString();
-                var profileId = msgObj["profileId"].ToString();
+                JObject msgObj = JObject.Parse(message);
 
-                if (requestType == "getEndPointsRequest")
+                if(msgObj.ContainsKey("requestId") && msgObj.ContainsKey("requestType"))
                 {
-                    var getServerEndPointsResponse = new Dictionary<string, object>
+                    var requestId = msgObj["requestId"].ToString();
+                    var requestType = msgObj["requestType"].ToString();
+                    var profileId = msgObj["profileId"].ToString();
+
+                    if (requestType == "getEndPointsRequest")
                     {
-                        { "requestId", requestId },
-                        { "requestType", "getEndPointsResponse" },
-                        { "profileId", profileId },
-                        { "publicEndPoints", PublicEndPoints }
-                    };
+                        var getServerEndPointsResponse = new Dictionary<string, object>
+                        {
+                            { "requestId", requestId },
+                            { "requestType", "getEndPointsResponse" },
+                            { "profileId", profileId },
+                            { "publicEndPoints", PublicEndPoints }
+                        };
+
+                        WebSocket.Send(JsonConvert.SerializeObject(getServerEndPointsResponse));
+                    }
 
-                    WebSocket.Send(JsonConvert.SerializeObject(getServerEndPointsResponse));
-                }
+                    if (requestType == "natPunchRequest")
+                    {
+                        var publicEndPoints = msgObj["publicEndPoints"].ToObject<Dictionary<string, string>>();
 
-                if (requestType == "natPunchRequest")
-                {
-                    var publicEndPoints = msgObj["publicEndPoints"].ToObject<Dictionary<string, string>>();
+                        if (publicEndPoints.ContainsKey("stun"))
+                        {
+                            PunchNat(publicEndPoints["stun"]);
+                        }
 
-                    if (publicEndPoints.ContainsKey("stun"))
-                    {
-                        PunchNat(publicEndPoints["stun"]);
+                        var natPunchResponse = new Dictionary<string, object>
+                        {
+                            { "requestId", requestId },
+                            { "requestType", "natPunchResponse" },
+                            { "profileId", profileId },
+                        };
+
+                        WebSocket.Send(JsonConvert.SerializeObject(natPunchResponse));
                     }
 
-                    var natPunchResponse = new Dictionary<string, object>
+                    if (requestType == "getEndPointsResponse")
                     {
-                        { "requestId", requestId },
-                        { "requestType", "natPunchResponse" },
-                        { "profileId", profileId },
-                    };
-
-                    WebSocket.Send(JsonConvert.SerializeObject(natPunchResponse));
-                }
+                        var publicEndPoints = msgObj["publicEndPoints"].ToObject<Dictionary<string, string>>();
 
-                if (requestType == "getEndPointsResponse")
-                {
-                    var publicEndPoints = msgObj["publicEndPoints"].ToObject<Dictionary<string, string>>();
+                        if(RequestCompletionSourceList.ContainsKey(requestId))
+                            RequestCompletionSourceList[requestId].SetResult(publicEndPoints);
+                    }
 
-                    if(RequestCompletionSourceList.ContainsKey(requestId))
-                        RequestCompletionSourceList[requestId].SetResult(publicEndPoints);
+                    if (requestType == "natPunchResponse")
+                    {
+                        if (RequestCompletionSourceList.ContainsKey(requestId))
+                            RequestCompletionSourceList[requestId].SetResult(true);
+                    }
                 }
 
-                if (requestType == "natPunchResponse")
-                {
-                    if (RequestCompletionSourceList.ContainsKey(requestId))
-                        RequestCompletionSourceList[requestId].SetResult(true);
-                }
-            }
+
         }
 
         public async Task<Dictionary<string, string>> GetEndpointsRequestAsync(string serverId, string profileId)