Merge pull request #273 from easy-games/feature/region-matchmaking

ZeroParticle · web-flow · commit 46beed1e544b · 2025-01-28T13:50:39.000-08:00
Add udp ping tool, code cleanup
diff --git a/Editor/Easy.Airship.Editor.asmdef b/Editor/Easy.Airship.Editor.asmdef
@@ -59,7 +59,13 @@
         "GUID:34b86c7776fb64479aa6cc8114a663f0",
         "GUID:72872094b21c16e48b631b2224833d49",
         "GUID:30817c1a0e6d646d99c048fc403f5979",
-        "GUID:77ccaf49895b0d64e87cd4b4faf83c49"
+        "GUID:77ccaf49895b0d64e87cd4b4faf83c49",
+        "GUID:6806a62c384838046a3c66c44f06d75f",
+        "GUID:325984b52e4128546bc7558552f8b1d2",
+        "GUID:627104647b9c04b4ebb8978a92ecac63",
+        "GUID:6e5063adab271564ba0098a06a8cebda",
+        "GUID:3b5390adca4e2bb4791cb930316d6f3e",
+        "GUID:725ee7191c021de4dbf9269590ded755"
     ],
     "includePlatforms": [
         "Editor"
diff --git a/Runtime/Code/Airship/Resources/Scripts/Editor/Airship.Airship.Editor.asmdef b/Runtime/Code/Airship/Resources/Scripts/Editor/Airship.Airship.Editor.asmdef
@@ -48,7 +48,16 @@
         "GUID:1d82bdf40e2465b44b34adf79595e74c",
         "GUID:7ab3663edede26740845931880bf22af",
         "GUID:e10a6a15f18d241fa88984ee1739200c",
-        "GUID:34b86c7776fb64479aa6cc8114a663f0"
+        "GUID:34b86c7776fb64479aa6cc8114a663f0",
+        "GUID:6806a62c384838046a3c66c44f06d75f",
+        "GUID:30817c1a0e6d646d99c048fc403f5979",
+        "GUID:325984b52e4128546bc7558552f8b1d2",
+        "GUID:72872094b21c16e48b631b2224833d49",
+        "GUID:627104647b9c04b4ebb8978a92ecac63",
+        "GUID:6e5063adab271564ba0098a06a8cebda",
+        "GUID:3b5390adca4e2bb4791cb930316d6f3e",
+        "GUID:725ee7191c021de4dbf9269590ded755",
+        "GUID:77ccaf49895b0d64e87cd4b4faf83c49"
     ],
     "includePlatforms": [
         "Editor"
diff --git a/Runtime/Code/Bundles/Airship.Bundles.asmdef b/Runtime/Code/Bundles/Airship.Bundles.asmdef
@@ -16,7 +16,10 @@
         "GUID:5a902c5989fd2e74c9e7050e78d83db3",
         "GUID:199bc21c5ec6a3e41b1d67e225a7bd04",
         "GUID:15fc0a57446b3144c949da3e2b9737a9",
-        "GUID:30817c1a0e6d646d99c048fc403f5979"
+        "GUID:30817c1a0e6d646d99c048fc403f5979",
+        "GUID:ec266f293c0b4f6c9d06847488a52a0c",
+        "GUID:325984b52e4128546bc7558552f8b1d2",
+        "GUID:72872094b21c16e48b631b2224833d49"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],
diff --git a/Runtime/Code/Easy.Airship.asmdef b/Runtime/Code/Easy.Airship.asmdef
@@ -47,7 +47,11 @@
         "GUID:72872094b21c16e48b631b2224833d49",
         "GUID:627104647b9c04b4ebb8978a92ecac63",
         "GUID:6e5063adab271564ba0098a06a8cebda",
-        "GUID:77ccaf49895b0d64e87cd4b4faf83c49"
+        "GUID:77ccaf49895b0d64e87cd4b4faf83c49",
+        "GUID:6806a62c384838046a3c66c44f06d75f",
+        "GUID:325984b52e4128546bc7558552f8b1d2",
+        "GUID:3b5390adca4e2bb4791cb930316d6f3e",
+        "GUID:725ee7191c021de4dbf9269590ded755"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],
diff --git a/Runtime/Code/GameCoordinator.meta b/Runtime/Code/GameCoordinator.meta
diff --git a/Runtime/Code/GameCoordinator/GameCoordinatorCore.cs b/Runtime/Code/GameCoordinator/GameCoordinatorCore.cs
diff --git a/Runtime/Code/GameCoordinator/GameCoordinatorCore.cs.meta b/Runtime/Code/GameCoordinator/GameCoordinatorCore.cs.meta
diff --git a/Runtime/Code/GameCoordinator/MatchMaking.cs b/Runtime/Code/GameCoordinator/MatchMaking.cs
diff --git a/Runtime/Code/GameCoordinator/MatchMaking.cs.meta b/Runtime/Code/GameCoordinator/MatchMaking.cs.meta
diff --git a/Runtime/Code/Luau/Airship.LuauCore.asmdef b/Runtime/Code/Luau/Airship.LuauCore.asmdef
@@ -19,7 +19,9 @@
         "GUID:30817c1a0e6d646d99c048fc403f5979",
         "GUID:72872094b21c16e48b631b2224833d49",
         "GUID:df380645f10b7bc4b97d4f5eb6303d95",
-        "GUID:15fc0a57446b3144c949da3e2b9737a9"
+        "GUID:15fc0a57446b3144c949da3e2b9737a9",
+        "GUID:ec266f293c0b4f6c9d06847488a52a0c",
+        "GUID:325984b52e4128546bc7558552f8b1d2"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],
diff --git a/Runtime/Code/Network/UdpPingTool.cs b/Runtime/Code/Network/UdpPingTool.cs
@@ -0,0 +1,72 @@
+using System;
+using System.Diagnostics;
+using System.Net;
+using System.Net.Sockets;
+using System.Text;
+using System.Threading.Tasks;
+using Debug = UnityEngine.Debug;
+
+namespace Assets.Luau.Network
+{
+    [LuauAPI]
+    public class UdpPingTool
+    {
+        private const int BufferSize = 32; // Size of the UDP packet.
+        private const int TimeoutMilliseconds = 5000; // Timeout for the ping response.
+
+        public static async Task<long> GetPing(string serverUrl)
+        {
+            if (string.IsNullOrWhiteSpace(serverUrl))
+            {
+                throw new ArgumentException("Server URL cannot be null or empty.", nameof(serverUrl));
+            }
+            var parts = serverUrl.Split(':');
+            if (parts.Length != 2 || !IPAddress.TryParse(parts[0], out var ipAddress) || !int.TryParse(parts[1], out var port))
+            {
+                throw new ArgumentException("Invalid server URL format. Expected format: IP:Port", nameof(serverUrl));
+            }
+
+            using (var udpClient = new UdpClient())
+            {
+                udpClient.Client.ReceiveTimeout = TimeoutMilliseconds;
+                var endpoint = new IPEndPoint(ipAddress, port);
+
+                var uniqueId = Guid.NewGuid().ToString(); // Generate a unique ID for this ping.
+                var buffer = Encoding.ASCII.GetBytes(uniqueId); // Send the unique ID as the ping message.
+                var stopwatch = new Stopwatch();
+
+                try
+                {
+                    var receiveTask = udpClient.ReceiveAsync(); // start waiting before we send the packet to avoid race condition
+                    await udpClient.SendAsync(buffer, buffer.Length, endpoint);
+                    
+                    stopwatch.Start();
+                    if (await Task.WhenAny(receiveTask, Task.Delay(TimeoutMilliseconds)) == receiveTask)
+                    {
+                        var response = receiveTask.Result;
+
+                        stopwatch.Stop();
+
+                        // Check if the response matches the sent unique ID.
+                        if (Encoding.ASCII.GetString(response.Buffer) == uniqueId)
+                        {
+                            return stopwatch.ElapsedMilliseconds;
+                        }
+                        else
+                        {
+                            throw new Exception("Invalid response received from server.");
+                        }
+                    }
+                    else
+                    {
+                        throw new TimeoutException("Ping request timed out.");
+                    }
+                }
+                catch (Exception ex)
+                {
+                    throw new Exception($"Error during ping: {ex.Message}", ex);
+                }
+            }
+        }
+    }
+}
diff --git a/Runtime/Code/Network/UdpPingTool.cs.meta b/Runtime/Code/Network/UdpPingTool.cs.meta
diff --git a/Runtime/Code/PoolManager/Airship.PoolManager.asmdef b/Runtime/Code/PoolManager/Airship.PoolManager.asmdef
@@ -14,7 +14,12 @@
         "GUID:199bc21c5ec6a3e41b1d67e225a7bd04",
         "GUID:894a6cc6ed5cd2645bb542978cbed6a9",
         "GUID:33b0850c3f930a440abe6b01a9898921",
-        "GUID:103be11cab738ef4d849a96eca5df2eb"
+        "GUID:103be11cab738ef4d849a96eca5df2eb",
+        "GUID:a7ffa74110914b76bbe3b751b4e05b45",
+        "GUID:ec266f293c0b4f6c9d06847488a52a0c",
+        "GUID:30817c1a0e6d646d99c048fc403f5979",
+        "GUID:325984b52e4128546bc7558552f8b1d2",
+        "GUID:72872094b21c16e48b631b2224833d49"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],
diff --git a/Runtime/Code/RemoteConsole/Airship.RemoteConsole.asmdef b/Runtime/Code/RemoteConsole/Airship.RemoteConsole.asmdef
@@ -11,7 +11,8 @@
         "GUID:894a6cc6ed5cd2645bb542978cbed6a9",
         "GUID:33b0850c3f930a440abe6b01a9898921",
         "GUID:103be11cab738ef4d849a96eca5df2eb",
-        "GUID:30817c1a0e6d646d99c048fc403f5979"
+        "GUID:30817c1a0e6d646d99c048fc403f5979",
+        "GUID:325984b52e4128546bc7558552f8b1d2"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],
diff --git a/Runtime/Code/TSCodeGen/Editor/CsToTs/CsToTs.asmdef b/Runtime/Code/TSCodeGen/Editor/CsToTs/CsToTs.asmdef
@@ -5,7 +5,18 @@
         "GUID:ec266f293c0b4f6c9d06847488a52a0c",
         "GUID:21b0c8d1703a94250bfac916590cea4f",
         "GUID:a7ffa74110914b76bbe3b751b4e05b45",
-        "GUID:5966039ae77c64b44bc04472c1ae63bb"
+        "GUID:5966039ae77c64b44bc04472c1ae63bb",
+        "GUID:3b7e0a4d14cc4c4b98380d63986903e1",
+        "GUID:9a16190c3a18e8a4b84be0d37f3b4bd4",
+        "GUID:5a902c5989fd2e74c9e7050e78d83db3",
+        "GUID:8db43d2f2329593428db90e3b3a6034c",
+        "GUID:30817c1a0e6d646d99c048fc403f5979",
+        "GUID:325984b52e4128546bc7558552f8b1d2",
+        "GUID:72872094b21c16e48b631b2224833d49",
+        "GUID:199bc21c5ec6a3e41b1d67e225a7bd04",
+        "GUID:894a6cc6ed5cd2645bb542978cbed6a9",
+        "GUID:33b0850c3f930a440abe6b01a9898921",
+        "GUID:103be11cab738ef4d849a96eca5df2eb"
     ],
     "includePlatforms": [
         "Editor"
diff --git a/Runtime/Code/TSCodeGen/TypeGenerator.cs b/Runtime/Code/TSCodeGen/TypeGenerator.cs
@@ -13,6 +13,7 @@
 using Code.UI.Canvas;
 using CsToTs;
 using Airship.DevConsole;
+using Assets.Luau.Network;
 using Code.RemoteConsole;
 using Code.VoiceChat;
 using ElRaccoone.Tweens;
@@ -126,6 +127,7 @@ private static void GenerateTypes() {
             typeof(MainMenuLoadingScreen),
             typeof(HttpManager),
             typeof(InternalHttpManager),
+            typeof(UdpPingTool),
             typeof(CrossSceneState),
             typeof(Toggle),
             typeof(HorizontalLayoutGroup),
diff --git a/Runtime/Code/VoxelWorld/Airship.VoxelWorld.asmdef b/Runtime/Code/VoxelWorld/Airship.VoxelWorld.asmdef
@@ -25,7 +25,9 @@
         "GUID:5a902c5989fd2e74c9e7050e78d83db3",
         "GUID:4c25c05f410a3a447a75c3b0909152ef",
         "GUID:199bc21c5ec6a3e41b1d67e225a7bd04",
-        "GUID:30817c1a0e6d646d99c048fc403f5979"
+        "GUID:30817c1a0e6d646d99c048fc403f5979",
+        "GUID:325984b52e4128546bc7558552f8b1d2",
+        "GUID:72872094b21c16e48b631b2224833d49"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],
diff --git a/Runtime/Code/VoxelWorld/Editor/Airship.VoxelWorld.Editor.asmdef b/Runtime/Code/VoxelWorld/Editor/Airship.VoxelWorld.Editor.asmdef
@@ -49,7 +49,17 @@
         "GUID:e10a6a15f18d241fa88984ee1739200c",
         "GUID:34b86c7776fb64479aa6cc8114a663f0",
         "GUID:3a606f2661ec46f1ba271183f65a2f4c",
-        "GUID:30817c1a0e6d646d99c048fc403f5979"
+        "GUID:30817c1a0e6d646d99c048fc403f5979",
+        "GUID:6806a62c384838046a3c66c44f06d75f",
+        "GUID:325984b52e4128546bc7558552f8b1d2",
+        "GUID:72872094b21c16e48b631b2224833d49",
+        "GUID:627104647b9c04b4ebb8978a92ecac63",
+        "GUID:6e5063adab271564ba0098a06a8cebda",
+        "GUID:3b5390adca4e2bb4791cb930316d6f3e",
+        "GUID:725ee7191c021de4dbf9269590ded755",
+        "GUID:5c1ff9bd975acec488150743d53a93ca",
+        "GUID:c5ecc461727906345a35491a0440694f",
+        "GUID:77ccaf49895b0d64e87cd4b4faf83c49"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],
diff --git a/ThirdParty/Mirror/Authenticators/Mirror.Authenticators.asmdef b/ThirdParty/Mirror/Authenticators/Mirror.Authenticators.asmdef
@@ -2,7 +2,8 @@
     "name": "Mirror.Authenticators",
     "rootNamespace": "",
     "references": [
-        "GUID:30817c1a0e6d646d99c048fc403f5979"
+        "GUID:30817c1a0e6d646d99c048fc403f5979",
+        "GUID:325984b52e4128546bc7558552f8b1d2"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],
diff --git a/ThirdParty/Mirror/Components/Mirror.Components.asmdef b/ThirdParty/Mirror/Components/Mirror.Components.asmdef
@@ -2,7 +2,8 @@
     "name": "Mirror.Components",
     "rootNamespace": "",
     "references": [
-        "GUID:30817c1a0e6d646d99c048fc403f5979"
+        "GUID:30817c1a0e6d646d99c048fc403f5979",
+        "GUID:325984b52e4128546bc7558552f8b1d2"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],
diff --git a/ThirdParty/Mirror/Editor/Mirror.Editor.asmdef b/ThirdParty/Mirror/Editor/Mirror.Editor.asmdef
@@ -4,7 +4,8 @@
     "references": [
         "GUID:30817c1a0e6d646d99c048fc403f5979",
         "GUID:72872094b21c16e48b631b2224833d49",
-        "GUID:1d0b9d21c3ff546a4aa32399dfd33474"
+        "GUID:1d0b9d21c3ff546a4aa32399dfd33474",
+        "GUID:325984b52e4128546bc7558552f8b1d2"
     ],
     "includePlatforms": [
         "Editor"
diff --git a/ThirdParty/Mirror/Editor/Weaver/Unity.Mirror.CodeGen.asmdef b/ThirdParty/Mirror/Editor/Weaver/Unity.Mirror.CodeGen.asmdef
@@ -2,7 +2,8 @@
     "name": "Unity.Mirror.CodeGen",
     "rootNamespace": "",
     "references": [
-        "GUID:30817c1a0e6d646d99c048fc403f5979"
+        "GUID:30817c1a0e6d646d99c048fc403f5979",
+        "GUID:325984b52e4128546bc7558552f8b1d2"
     ],
     "includePlatforms": [
         "Editor"
diff --git a/ThirdParty/Mirror/Examples/Mirror.Examples.asmdef b/ThirdParty/Mirror/Examples/Mirror.Examples.asmdef
@@ -5,7 +5,11 @@
         "GUID:30817c1a0e6d646d99c048fc403f5979",
         "GUID:72872094b21c16e48b631b2224833d49",
         "GUID:627104647b9c04b4ebb8978a92ecac63",
-        "GUID:6055be8ebefd69e48b49212b09b47b2f"
+        "GUID:6055be8ebefd69e48b49212b09b47b2f",
+        "GUID:6806a62c384838046a3c66c44f06d75f",
+        "GUID:325984b52e4128546bc7558552f8b1d2",
+        "GUID:3b5390adca4e2bb4791cb930316d6f3e",
+        "GUID:725ee7191c021de4dbf9269590ded755"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],
diff --git a/ThirdParty/Mirror/Transports/Encryption/Editor/EncryptionTransportEditor.asmdef b/ThirdParty/Mirror/Transports/Encryption/Editor/EncryptionTransportEditor.asmdef
@@ -2,7 +2,12 @@
     "name": "EncryptionTransportEditor",
     "rootNamespace": "",
     "references": [
-        "GUID:627104647b9c04b4ebb8978a92ecac63"
+        "GUID:627104647b9c04b4ebb8978a92ecac63",
+        "GUID:6806a62c384838046a3c66c44f06d75f",
+        "GUID:30817c1a0e6d646d99c048fc403f5979",
+        "GUID:325984b52e4128546bc7558552f8b1d2",
+        "GUID:3b5390adca4e2bb4791cb930316d6f3e",
+        "GUID:725ee7191c021de4dbf9269590ded755"
     ],
     "includePlatforms": [
         "Editor"
diff --git a/ThirdParty/Mirror/Transports/KCP/kcp2k/KCP.asmdef b/ThirdParty/Mirror/Transports/KCP/kcp2k/KCP.asmdef
diff --git a/ThirdParty/Mirror/Transports/Mirror.Transports.asmdef b/ThirdParty/Mirror/Transports/Mirror.Transports.asmdef
