fix: updating transport for mirror v26

MirrorNetworking · Oct 29, 2020 · 9b6bbe0 · 9b6bbe0
1 parent 2b15b22
commit 9b6bbe0
Show file tree

Hide file tree

Showing 6 changed files with 77 additions and 17 deletions.
diff --git a/DebugScripts/DebugServer.cs b/DebugScripts/DebugServer.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using UnityEngine;
 
 namespace Mirror.SimpleWeb
@@ -48,7 +47,11 @@ public void OnGUI()
             {
                 if (GUILayout.Button("Send Message"))
                 {
-                    transport.ServerSend(new List<int>() { 1 }, Channels.DefaultReliable, new ArraySegment<byte>(new byte[] { 1, 2, 4, 8 }));
+#if MIRROR_26_0_OR_NEWER
+                    transport.ServerSend(1, Channels.DefaultReliable, new ArraySegment<byte>(new byte[] { 1, 2, 4, 8 }));
+#else
+                    transport.ServerSend(new System.Collections.Generic.List<int>() { 1 }, Channels.DefaultReliable, new ArraySegment<byte>(new byte[] { 1, 2, 4, 8 }));
+#endif
                 }
             }
         }

diff --git a/source/Server/SimpleWebServer.cs b/source/Server/SimpleWebServer.cs
@@ -50,6 +50,13 @@ public void SendAll(List<int> connectionIds, ArraySegment<byte> source)
                 server.Send(id, buffer);
             }
         }
+        public void SendOne(int connectionId, ArraySegment<byte> source)
+        {
+            ArrayBuffer buffer = bufferPool.Take(source.Count);
+            buffer.CopyFrom(source);
+
+            server.Send(connectionId, buffer);
+        }
 
         public bool KickClient(int connectionId)
         {

diff --git a/source/SimpleWebTransport.cs b/source/SimpleWebTransport.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Net;
 using System.Security.Authentication;
 using UnityEngine;
@@ -116,7 +115,7 @@ public void ProcessMessages()
         string GetScheme() => sslEnabled ? SecureScheme : NormalScheme;
         public override bool ClientConnected()
         {
-            // not null and not NotConnected (we want to return true if connecting or disconnecting) 
+            // not null and not NotConnected (we want to return true if connecting or disconnecting)
             return client != null && client.ConnectionState != ClientState.NotConnected;
         }
 
@@ -164,6 +163,30 @@ public override void ClientDisconnect()
             client?.Disconnect();
         }
 
+#if MIRROR_26_0_OR_NEWER
+        public override void ClientSend(int channelId, ArraySegment<byte> segment)
+        {
+            if (!ClientConnected())
+            {
+                Debug.LogError("Not Connected");
+                return;
+            }
+
+            if (segment.Count > maxMessageSize)
+            {
+                Log.Error("Message greater than max size");
+                return;
+            }
+
+            if (segment.Count == 0)
+            {
+                Log.Error("Message count was zero");
+                return;
+            }
+
+            client.Send(segment);
+        }
+#else
         public override bool ClientSend(int channelId, ArraySegment<byte> segment)
         {
             if (!ClientConnected())
@@ -187,6 +210,7 @@ public override bool ClientSend(int channelId, ArraySegment<byte> segment)
             client.Send(segment);
             return true;
         }
+#endif
         #endregion
 
         #region Server
@@ -235,7 +259,32 @@ public override bool ServerDisconnect(int connectionId)
             return server.KickClient(connectionId);
         }
 
-        public override bool ServerSend(List<int> connectionIds, int channelId, ArraySegment<byte> segment)
+#if MIRROR_26_0_OR_NEWER
+        public override void ServerSend(int connectionId, int channelId, ArraySegment<byte> segment)
+        {
+            if (!ServerActive())
+            {
+                Debug.LogError("SimpleWebServer Not Active");
+                return;
+            }
+
+            if (segment.Count > maxMessageSize)
+            {
+                Log.Error("Message greater than max size");
+                return;
+            }
+
+            if (segment.Count == 0)
+            {
+                Log.Error("Message count was zero");
+                return;
+            }
+
+            server.SendOne(connectionId, segment);
+            return;
+        }
+#else
+        public override bool ServerSend(System.Collections.Generic.List<int> connectionIds, int channelId, ArraySegment<byte> segment)
         {
             if (!ServerActive())
             {
@@ -258,6 +307,7 @@ public override bool ServerSend(List<int> connectionIds, int channelId, ArraySeg
             server.SendAll(connectionIds, segment);
             return true;
         }
+#endif
 
         public override string ServerGetClientAddress(int connectionId)
         {

diff --git a/tests/Runtime/Client/ClientTests.cs b/tests/Runtime/Client/ClientTests.cs
@@ -233,9 +233,7 @@ public IEnumerator ErrorWhenMessageTooBig()
             ArraySegment<byte> segment = new ArraySegment<byte>(new byte[70_000]);
 
             LogAssert.Expect(LogType.Error, "ERROR: <color=red>Message greater than max size</color>");
-            bool result = client.ClientSend(Channels.DefaultReliable, segment);
-
-            Assert.IsFalse(result);
+            client.ClientSend(Channels.DefaultReliable, segment);
         }
 
         [UnityTest]
@@ -248,9 +246,7 @@ public IEnumerator ErrorWhenMessageTooSmall()
             ArraySegment<byte> segment = new ArraySegment<byte>();
 
             LogAssert.Expect(LogType.Error, "ERROR: <color=red>Message count was zero</color>");
-            bool result = client.ClientSend(Channels.DefaultReliable, segment);
-
-            Assert.IsFalse(result);
+            client.ClientSend(Channels.DefaultReliable, segment);
         }
     }
 }
diff --git a/tests/Runtime/Server/SendMessageTest.cs b/tests/Runtime/Server/SendMessageTest.cs
@@ -122,9 +122,7 @@ public IEnumerator ErrorWhenMessageTooBig()
             ArraySegment<byte> segment = new ArraySegment<byte>(new byte[70_000]);
 
             LogAssert.Expect(LogType.Error, "ERROR: <color=red>Message greater than max size</color>");
-            bool result = server.ServerSend(new List<int> { 1 }, Channels.DefaultReliable, segment);
-
-            Assert.IsFalse(result);
+            server.ServerSend(new List<int> { 1 }, Channels.DefaultReliable, segment);
         }
 
         [UnityTest]
@@ -135,9 +133,7 @@ public IEnumerator ErrorWhenMessageTooSmall()
             ArraySegment<byte> segment = new ArraySegment<byte>();
 
             LogAssert.Expect(LogType.Error, "ERROR: <color=red>Message count was zero</color>");
-            bool result = server.ServerSend(new List<int> { 1 }, Channels.DefaultReliable, segment);
-
-            Assert.IsFalse(result);
+            server.ServerSend(new List<int> { 1 }, Channels.DefaultReliable, segment);
         }
     }
 }
diff --git a/tests/Runtime/TestInstances.cs b/tests/Runtime/TestInstances.cs
@@ -39,6 +39,14 @@ public void Init()
         }
 
         public WaitUntil WaitForConnection => new WaitUntil(() => onConnect.Count >= 1);
+
+        public void ServerSend(System.Collections.Generic.List<int> connectionIds, int channelId, ArraySegment<byte> segment)
+        {
+            foreach (int id in connectionIds)
+            {
+                ServerSend(id, channelId, segment);
+            }
+        }
     }
     public class ClientTestInstance : SimpleWebTransport, NeedInitTestInstance
     {