Merge branch 'develop-2.0.0' into feat/attachable-networkbehaviour-and-object-controller

Author: NoelStephensUnity

com.unity.netcode.gameobjects/CHANGELOG.md

@@ -10,6 +10,7 @@ Additional documentation and release notes are available at [Multiplayer Documen
 
 ### Added
 
+- Added mappings between `ClientId` and `TransportId`. (#3516)
 - Added `NetworkPrefabInstanceHandlerWithData<T>`, a variant of `INetworkPrefabInstanceHandler` that provides access to custom instantiation data directly within the `Instantiate()` method. (#3430)
 
 ### Fixed

com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs

@@ -1467,6 +1467,20 @@ private void HostServerInitialize()
             ConnectionManager.InvokeOnClientConnectedCallback(LocalClientId);
         }
 
+        /// <summary>
+        /// Get the TransportId from the associated ClientId.
+        /// </summary>
+        /// <param name="clientId">The ClientId to get the TransportId from</param>
+        /// <returns>The TransportId associated with the given ClientId</returns>
+        public ulong GetTransportIdFromClientId(ulong clientId) => ConnectionManager.ClientIdToTransportId(clientId);
+
+        /// <summary>
+        /// Get the ClientId from the associated TransportId.
+        /// </summary>
+        /// <param name="transportId">The TransportId to get the ClientId from</param>
+        /// <returns>The ClientId from the associated TransportId</returns>
+        public ulong GetClientIdFromTransportId(ulong transportId) => ConnectionManager.TransportIdToClientId(transportId);
+
         /// <summary>
         /// Disconnects the remote client.
         /// </summary>

testproject/Assets/Tests/Runtime/NetworkManagerTests.cs

@@ -9,9 +9,28 @@
 
 namespace TestProject.RuntimeTests
 {
+    public class NetworkManagerTests : NetcodeIntegrationTest
+    {
+        protected override int NumberOfClients => 2;
+
+        [Test]
+        public void ValidateTransportAndClientIds()
+        {
+            var transportId = m_ServerNetworkManager.GetTransportIdFromClientId(m_ServerNetworkManager.LocalClientId);
+            Assert.IsTrue(m_ServerNetworkManager.GetTransportIdFromClientId(m_ServerNetworkManager.LocalClientId) == m_ServerNetworkManager.ConnectionManager.ServerTransportId);
+            Assert.IsTrue(m_ServerNetworkManager.GetClientIdFromTransportId(transportId) == m_ServerNetworkManager.LocalClientId);
+
+            foreach (var client in m_ClientNetworkManagers)
+            {
+                transportId = m_ServerNetworkManager.GetTransportIdFromClientId(client.LocalClientId);
+                Assert.AreEqual(client.LocalClientId, m_ServerNetworkManager.GetClientIdFromTransportId(transportId), "Server and client transport IDs don't match.");
+            }
+        }
+    }
+
     [TestFixture(UseSceneManagement.SceneManagementDisabled)]
     [TestFixture(UseSceneManagement.SceneManagementEnabled)]
-    public class NetworkManagerTests : NetcodeIntegrationTest
+    public class NetworkManagerSceneTests : NetcodeIntegrationTest
     {
         private const string k_SceneToLoad = "InSceneNetworkObject";
         protected override int NumberOfClients => 0;
@@ -33,7 +52,7 @@ public enum UseSceneManagement
 
         private bool m_UseSceneManagement;
 
-        public NetworkManagerTests(UseSceneManagement useSceneManagement)
+        public NetworkManagerSceneTests(UseSceneManagement useSceneManagement)
         {
             m_UseSceneManagement = useSceneManagement == UseSceneManagement.SceneManagementEnabled;
         }