Feature/initial relay utp remove relay sdk calls (#1034)

* DST-528: Extracted Relay SDK calls out of UTP adapter for MLAPI; it now accepts a variable passed in via a setter method. Also updated the sample test project included to illustrate these changes.

* DST-528: Made some changes that address feedback comments; mainly restructured the manner that code external to UTPTransport passes in the requisite relay server data so that external code doesn't need to know about the internal data structures that UTPTransport uses.

* DST-528: Removing minor changes that were erroneously left in when taking other approaches.

* DST-528: Addressing minor code review changes.

* Revert "Revert "Feature/initial relay utp remove relay sdk calls (#1032)" (#1033)"

This reverts commit cd54529.

Author: thoward-unity

com.unity.multiplayer.transport.utp/Runtime/UTPTransport.cs

@@ -4,12 +4,6 @@
 using System.Threading.Tasks;
 using Unity.Networking.Transport;
 using Unity.Networking.Transport.Relay;
-#if ENABLE_RELAY_SERVICE
-using Unity.Services.Relay;
-using Unity.Services.Relay.Allocations;
-using Unity.Services.Relay.Models;
-using Unity.Services.Core;
-#endif
 
 using MLAPI.Transports.Tasks;
 using UnityEngine;
@@ -42,14 +36,11 @@ private enum State
         [SerializeField] private int m_MessageBufferSize = MaximumMessageLength;
         [SerializeField] private string m_ServerAddress = "127.0.0.1";
         [SerializeField] private ushort m_ServerPort = 7777;
-        [SerializeField] private int m_RelayMaxPlayers = 10;
-        [SerializeField] private string m_RelayServer = "https://relay-allocations.cloud.unity3d.com";
 
         private State m_State = State.Disconnected;
         private NetworkDriver m_Driver;
         private List<INetworkParameter> m_NetworkParameters;
         private byte[] m_MessageBuffer;
-        private string m_RelayJoinCode;
         private ulong m_ServerClientId;
 
         private NetworkPipeline m_UnreliableSequencedPipeline;
@@ -58,16 +49,20 @@ private enum State
 
         public override ulong ServerClientId => m_ServerClientId;
 
-        public string RelayJoinCode => m_RelayJoinCode;
-
         public ProtocolType Protocol => m_ProtocolType;
 
+        private RelayServerData m_RelayServerData;
+
         private void InitDriver()
         {
             if (m_NetworkParameters.Count > 0)
+            {
                 m_Driver = NetworkDriver.Create(m_NetworkParameters.ToArray());
+            }
             else
+            {
                 m_Driver = NetworkDriver.Create();
+            }
 
             m_UnreliableSequencedPipeline = m_Driver.CreatePipeline(typeof(UnreliableSequencedPipelineStage));
             m_ReliableSequencedPipeline = m_Driver.CreatePipeline(typeof(ReliableSequencedPipelineStage));
@@ -79,39 +74,8 @@ private void InitDriver()
         private void DisposeDriver()
         {
             if (m_Driver.IsCreated)
-                m_Driver.Dispose();
-        }
-
-        private static RelayAllocationId ConvertFromAllocationIdBytes(byte[] allocationIdBytes)
-        {
-            unsafe
             {
-                fixed (byte* ptr = allocationIdBytes)
-                {
-                    return RelayAllocationId.FromBytePointer(ptr, allocationIdBytes.Length);
-                }
-            }
-        }
-
-        private static RelayHMACKey ConvertFromHMAC(byte[] hmac)
-        {
-            unsafe
-            {
-                fixed (byte* ptr = hmac)
-                {
-                    return RelayHMACKey.FromBytePointer(ptr, RelayHMACKey.k_Length);
-                }
-            }
-        }
-
-        private static RelayConnectionData ConvertConnectionData(byte[] connectionData)
-        {
-            unsafe
-            {
-                fixed (byte* ptr = connectionData)
-                {
-                    return RelayConnectionData.FromBytePointer(ptr, RelayConnectionData.k_Length);
-                }
+                m_Driver.Dispose();
             }
         }
 
@@ -134,7 +98,9 @@ private NetworkPipeline SelectSendPipeline(NetworkChannel channel, int size)
                 case NetworkDelivery.ReliableFragmentedSequenced:
                     // No need to send on the fragmented pipeline if data is smaller than MTU.
                     if (size < NetworkParameterConstants.MTU)
+                    {
                         return m_ReliableSequencedPipeline;
+                    }
 
                     return m_ReliableSequencedFragmentedPipeline;
 
@@ -150,43 +116,17 @@ private IEnumerator ClientBindAndConnect(SocketTask task)
 
             if (m_ProtocolType == ProtocolType.RelayUnityTransport)
             {
-#if !ENABLE_RELAY_SERVICE
-                Debug.LogError("You must have Relay SDK installed via the UDash in order to use the relay transport");
-                yield return null;
-#else
-                var joinTask = RelayService.AllocationsApiClient.JoinRelayAsync(new JoinRelayRequest(new JoinRequest(m_RelayJoinCode)));
-
-                while(!joinTask.IsCompleted)
-                    yield return null;
-
-                if (joinTask.IsFaulted)
+                //This comparison is currently slow since RelayServerData does not implement a custom comparison operator that doesn't use
+                //reflection, but this does not live in the context of a performance-critical loop, it runs once at initial connection time.
+                if(m_RelayServerData.Equals(default(RelayServerData)))
                 {
-                    Debug.LogError("Join Relay request failed");
+                    Debug.LogError("You must call SetRelayServerData() at least once before calling StartRelayServer.");
                     task.IsDone = true;
                     task.Success = false;
                     yield break;
                 }
 
-                var allocation = joinTask.Result.Result.Data.Allocation;
-
-                serverEndpoint = NetworkEndPoint.Parse(allocation.RelayServer.IpV4, (ushort)allocation.RelayServer.Port);
-
-                var allocationId = ConvertFromAllocationIdBytes(allocation.AllocationIdBytes);
-
-                var connectionData = ConvertConnectionData(allocation.ConnectionData);
-                var hostConnectionData = ConvertConnectionData(allocation.HostConnectionData);
-                var key = ConvertFromHMAC(allocation.Key);
-
-                Debug.Log($"client: {allocation.ConnectionData[0]} {allocation.ConnectionData[1]}");
-                Debug.Log($"host: {allocation.HostConnectionData[0]} {allocation.HostConnectionData[1]}");
-
-                Debug.Log($"client: {allocation.AllocationId}");
-
-                var relayServerData = new RelayServerData(ref serverEndpoint, 0, ref allocationId, ref connectionData, ref hostConnectionData, ref key);
-                relayServerData.ComputeNewNonce();
-
-                m_NetworkParameters.Add(new RelayNetworkParameter{ ServerData = relayServerData });
-#endif
+                m_NetworkParameters.Add(new RelayNetworkParameter{ ServerData = m_RelayServerData });
             }
             else
             {
@@ -223,8 +163,6 @@ private IEnumerator ClientBindAndConnect(SocketTask task)
                 {
                     Debug.LogError("Client failed to connect to server");
                 }
-
-
             }
 
             task.IsDone = true;
@@ -256,69 +194,82 @@ private IEnumerator ServerBindAndListen(SocketTask task, NetworkEndPoint endPoin
                 {
                     Debug.LogError("Server failed to listen");
                 }
-
-
             }
 
             task.IsDone = true;
         }
 
-
-        private IEnumerator StartRelayServer(SocketTask task)
+        private static RelayAllocationId ConvertFromAllocationIdBytes(byte[] allocationIdBytes)
         {
-#if !ENABLE_RELAY_SERVICE
-            Debug.LogError("You must have Relay SDK installed via the UDash in order to use the relay transport");
-            yield return null;
-#else
-            var allocationTask = RelayService.AllocationsApiClient.CreateAllocationAsync(new CreateAllocationRequest(new AllocationRequest(m_RelayMaxPlayers)));
-
-            while(!allocationTask.IsCompleted)
+            unsafe
             {
-                yield return null;
+                fixed (byte* ptr = allocationIdBytes)
+                {
+                    return RelayAllocationId.FromBytePointer(ptr, allocationIdBytes.Length);
+                }
             }
+        }
 
-            if (allocationTask.IsFaulted)
+        private static RelayHMACKey ConvertFromHMAC(byte[] hmac)
+        {
+            unsafe
             {
-                Debug.LogError("Create allocation request failed");
-                task.IsDone = true;
-                task.Success = false;
-                yield break;
+                fixed (byte* ptr = hmac)
+                {
+                    return RelayHMACKey.FromBytePointer(ptr, RelayHMACKey.k_Length);
+                }
             }
+        }
 
-            var allocation = allocationTask.Result.Result.Data.Allocation;
-
-            var joinCodeTask = RelayService.AllocationsApiClient.CreateJoincodeAsync(new CreateJoincodeRequest(new JoinCodeRequest(allocation.AllocationId)));
+        private static RelayConnectionData ConvertConnectionData(byte[] connectionData)
+        {
+            unsafe
+            {
+                fixed (byte* ptr = connectionData)
+                {
+                    return RelayConnectionData.FromBytePointer(ptr, RelayConnectionData.k_Length);
+                }
+            }
+        }
 
-            while(!joinCodeTask.IsCompleted)
+        public void SetRelayServerData(string ipv4address, ushort port, byte[] allocationIdBytes, byte[] keyBytes, byte[] connectionDataBytes, byte[] hostConnectionDataBytes = null)
+        {
+            RelayConnectionData hostConnectionData;
+
+            var serverEndpoint = NetworkEndPoint.Parse(ipv4address, port);
+            var allocationId = ConvertFromAllocationIdBytes(allocationIdBytes);
+            var key = ConvertFromHMAC(keyBytes);
+            var connectionData = ConvertConnectionData(connectionDataBytes);
+            
+            if (hostConnectionDataBytes != null)
+            {
+                hostConnectionData = ConvertConnectionData(hostConnectionDataBytes);
+            }
+            else
             {
-                yield return null;
+                hostConnectionData = connectionData;
             }
+            m_RelayServerData = new RelayServerData(ref serverEndpoint, 0, ref allocationId, ref connectionData, ref hostConnectionData, ref key);
+            m_RelayServerData.ComputeNewNonce();
+        }
 
-            if (joinCodeTask.IsFaulted)
+        private IEnumerator StartRelayServer(SocketTask task)
+        {
+            //This comparison is currently slow since RelayServerData does not implement a custom comparison operator that doesn't use
+            //reflection, but this does not live in the context of a performance-critical loop, it runs once at initial connection time.
+            if (m_RelayServerData.Equals(default(RelayServerData)))
             {
-                Debug.LogError("Create join code request failed");
+                Debug.LogError("You must call SetRelayServerData() at least once before calling StartRelayServer.");
                 task.IsDone = true;
                 task.Success = false;
                 yield break;
             }
+            else
+            {
+                m_NetworkParameters.Add(new RelayNetworkParameter { ServerData = m_RelayServerData });
 
-            m_RelayJoinCode = joinCodeTask.Result.Result.Data.JoinCode;
-
-            var serverEndpoint = NetworkEndPoint.Parse(allocation.RelayServer.IpV4, (ushort)allocation.RelayServer.Port);
-            // Debug.Log($"Relay Server endpoint: {allocation.RelayServer.IpV4}:{(ushort)allocation.RelayServer.Port}");
-
-            var allocationId = ConvertFromAllocationIdBytes(allocation.AllocationIdBytes);
-            var connectionData = ConvertConnectionData(allocation.ConnectionData);
-            var key = ConvertFromHMAC(allocation.Key);
-
-
-            var relayServerData = new RelayServerData(ref serverEndpoint, 0, ref allocationId, ref connectionData, ref connectionData, ref key);
-            relayServerData.ComputeNewNonce();
-
-            m_NetworkParameters.Add(new RelayNetworkParameter{ ServerData = relayServerData });
-
-            yield return ServerBindAndListen(task, NetworkEndPoint.AnyIpv4);
-#endif
+                yield return ServerBindAndListen(task, NetworkEndPoint.AnyIpv4);
+            }
         }
 
         private bool AcceptConnection()
@@ -396,8 +347,15 @@ private void Update()
             if (m_Driver.IsCreated)
             {
                 m_Driver.ScheduleUpdate().Complete();
-                while(AcceptConnection() && m_Driver.IsCreated);
-                while(ProcessEvent() && m_Driver.IsCreated);
+                while(AcceptConnection() && m_Driver.IsCreated)
+                {
+                    ;
+                }
+
+                while (ProcessEvent() && m_Driver.IsCreated)
+                {
+                    ;
+                }
             }
 
         }
@@ -417,14 +375,6 @@ private static unsafe NetworkConnection ParseClientId(ulong mlapiConnectionId)
             return *(NetworkConnection*)&mlapiConnectionId;
         }
 
-        public void SetRelayJoinCode(string value)
-        {
-            if (m_State == State.Disconnected)
-            {
-                m_RelayJoinCode = value;
-            }
-        }
-
         public override void DisconnectLocalClient()
         {
             Debug.Assert(m_State == State.Connected, "DisconnectLocalClient should be called on a connected client");
@@ -462,20 +412,13 @@ public override void Init()
 
             m_NetworkParameters = new List<INetworkParameter>();
 
-
             // If we want to be able to actually handle messages MaximumMessageLength bytes in
             // size, we need to allow a bit more than that in FragmentationUtility since this needs
             // to account for headers and such. 128 bytes is plenty enough for such overhead.
             var maxFragmentationCapacity = MaximumMessageLength + 128;
             m_NetworkParameters.Add(new FragmentationUtility.Parameters(){PayloadCapacity = maxFragmentationCapacity});
 
             m_MessageBuffer = new byte[m_MessageBufferSize];
-#if ENABLE_RELAY_SERVICE
-            if (m_ProtocolType == ProtocolType.RelayUnityTransport) {
-                Unity.Services.Relay.RelayService.Configuration.BasePath = m_RelayServer;
-                UnityServices.Initialize();
-            }
-#endif
         }
 
         public override NetworkEvent PollEvent(out ulong clientId, out NetworkChannel networkChannel, out ArraySegment<byte> payload, out float receiveTime)
@@ -510,7 +453,9 @@ public override void Send(ulong clientId, ArraySegment<byte> data, NetworkChanne
                 }
 
                 if (m_Driver.EndSend(writer) == size)
+                {
                     return;
+                }
             }
 
             Debug.LogError("Error sending the message");
@@ -519,7 +464,9 @@ public override void Send(ulong clientId, ArraySegment<byte> data, NetworkChanne
         public override SocketTasks StartClient()
         {
             if (m_Driver.IsCreated)
+            {
                 return SocketTask.Fault.AsTasks();
+            }
 
             var task = SocketTask.Working;
             StartCoroutine(ClientBindAndConnect(task));
@@ -529,7 +476,9 @@ public override SocketTasks StartClient()
         public override SocketTasks StartServer()
         {
             if (m_Driver.IsCreated)
+            {
                 return SocketTask.Fault.AsTasks();
+            }
 
             var task = SocketTask.Working;
             switch (m_ProtocolType)

com.unity.multiplayer.transport.utp/Runtime/com.unity.multiplayer.transport.utp.asmdef

@@ -6,9 +6,7 @@
         "Unity.Jobs",
         "Unity.Burst",
         "Unity.Multiplayer.MLAPI.Runtime",
-        "Unity.Networking.Transport",
-        "Unity.Services.Relay",
-        "Unity.Services.Core"
+        "Unity.Networking.Transport"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],
@@ -17,12 +15,6 @@
     "precompiledReferences": [],
     "autoReferenced": true,
     "defineConstraints": [],
-    "versionDefines": [
-        {
-            "name": "com.unity.services.relay",
-            "expression": "0.0.1-preview.3",
-            "define": "ENABLE_RELAY_SERVICE"
-        }
-    ],
+    "versionDefines": [],
     "noEngineReferences": false
 }