refactor: removing sendasync from networkconnection (#672)

BREAKING CHANGE: Removed SendAsync from NetworkConnection. Use Send instead
MirageNet · Mar 8, 2021 · e79b00e · e79b00e
1 parent afef2d4
commit e79b00e
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 34 deletions.
diff --git a/Assets/Mirage/Runtime/INetworkConnection.cs b/Assets/Mirage/Runtime/INetworkConnection.cs
@@ -11,9 +11,7 @@ public interface IMessageSender
     {
         void Send<T>(T msg, int channelId = Channel.Reliable);
 
-        UniTask SendAsync<T>(T msg, int channelId = Channel.Reliable);
-
-        UniTask SendAsync(ArraySegment<byte> segment, int channelId = Channel.Reliable);
+        void Send(ArraySegment<byte> segment, int channelId = Channel.Reliable);
     }
 
     /// <summary>

diff --git a/Assets/Mirage/Runtime/NetworkBehaviour.cs b/Assets/Mirage/Runtime/NetworkBehaviour.cs
@@ -241,7 +241,7 @@ protected internal void SendServerRpcInternal(Type invokeClass, string cmdName,
                 payload = writer.ToArraySegment()
             };
 
-            Client.SendAsync(message, channelId).Forget();
+            Client.Send(message, channelId);
         }
 
         private void ValidateServerRpc(Type invokeClass, string cmdName, bool requireAuthority)
@@ -284,7 +284,7 @@ protected internal UniTask<T> SendServerRpcWithReturn<T>(Type invokeClass, strin
                 payload = writer.ToArraySegment()
             };
 
-            Client.SendAsync(message, channelId).Forget();
+            Client.Send(message, channelId);
 
             return task;
         }

diff --git a/Assets/Mirage/Runtime/NetworkClient.cs b/Assets/Mirage/Runtime/NetworkClient.cs
@@ -253,19 +253,14 @@ public void Disconnect()
         /// <param name="message"></param>
         /// <param name="channelId"></param>
         /// <returns>True if message was sent.</returns>
-        public UniTask SendAsync<T>(T message, int channelId = Channel.Reliable)
-        {
-            return Connection.SendAsync(message, channelId);
-        }
-
         public void Send<T>(T message, int channelId = Channel.Reliable)
         {
             Connection.Send(message, channelId);
         }
 
-        public UniTask SendAsync(ArraySegment<byte> segment, int channelId = Channel.Reliable)
+        public void Send(ArraySegment<byte> segment, int channelId = Channel.Reliable)
         {
-            return Connection.SendAsync(segment, channelId);
+            Connection.Send(segment, channelId);
         }
 
         internal void Update()

diff --git a/Assets/Mirage/Runtime/NetworkConnection.cs b/Assets/Mirage/Runtime/NetworkConnection.cs
@@ -179,18 +179,6 @@ public void ClearHandlers()
             messageHandlers.Clear();
         }
 
-        /// <summary>
-        /// This sends a network message to the connection.
-        /// </summary>
-        /// <typeparam name="T">The message type</typeparam>
-        /// <param name="msg">The message to send</param>
-        /// <param name="channelId">The transport layer channel to send on.</param>
-        /// <returns></returns>
-        public virtual void Send<T>(T msg, int channelId = Channel.Reliable)
-        {
-            SendAsync(msg, channelId).Forget();
-        }
-
         public static void Send<T>(IEnumerable<INetworkConnection> connections, T msg, int channelId = Channel.Reliable)
         {
             using (PooledNetworkWriter writer = NetworkWriterPool.GetWriter())
@@ -203,7 +191,7 @@ public static void Send<T>(IEnumerable<INetworkConnection> connections, T msg, i
                 foreach (INetworkConnection conn in connections)
                 {
                     // send to all connections, but don't wait for them
-                    conn.SendAsync(segment, channelId).Forget();
+                    conn.Send(segment, channelId);
                     count++;
                 }
 
@@ -212,28 +200,28 @@ public static void Send<T>(IEnumerable<INetworkConnection> connections, T msg, i
         }
 
         /// <summary>
-        /// This sends a network message to the connection. You can await it to check for errors
+        /// This sends a network message to the connection.
         /// </summary>
         /// <typeparam name="T">The message type</typeparam>
         /// <param name="msg">The message to send.</param>
         /// <param name="channelId">The transport layer channel to send on.</param>
         /// <returns></returns>
-        public virtual UniTask SendAsync<T>(T msg, int channelId = Channel.Reliable)
+        public virtual void Send<T>(T msg, int channelId = Channel.Reliable)
         {
             using (PooledNetworkWriter writer = NetworkWriterPool.GetWriter())
             {
                 // pack message and send allocation free
                 MessagePacker.Pack(msg, writer);
                 NetworkDiagnostics.OnSend(msg, channelId, writer.Length, 1);
-                return SendAsync(writer.ToArraySegment(), channelId);
+                Send(writer.ToArraySegment(), channelId);
             }
         }
 
         // internal because no one except Mirage should send bytes directly to
         // the client. they would be detected as a message. send messages instead.
-        public UniTask SendAsync(ArraySegment<byte> segment, int channelId = Channel.Reliable)
+        public void Send(ArraySegment<byte> segment, int channelId = Channel.Reliable)
         {
-            return connection.SendAsync(segment, channelId);
+            connection.SendAsync(segment, channelId);
         }
 
 
@@ -429,7 +417,7 @@ public void SendNotify<T>(T msg, object token, int channelId = Channel.Unreliabl
                 MessagePacker.Pack(notifyPacket, writer);
                 MessagePacker.Pack(msg, writer);
                 NetworkDiagnostics.OnSend(msg, channelId, writer.Length, 1);
-                SendAsync(writer.ToArraySegment(), channelId).Forget();
+                Send(writer.ToArraySegment(), channelId);
                 lastNotifySentTime = Time.unscaledTime;
             }
 

diff --git a/Assets/Mirage/Weaver/Processors/ReaderWriterProcessor.cs b/Assets/Mirage/Weaver/Processors/ReaderWriterProcessor.cs
@@ -221,15 +221,12 @@ private static bool IsMessageMethod(MethodReference method)
                 method.Is(typeof(MessagePacker), nameof(MessagePacker.GetId)) ||
                 method.Is(typeof(MessagePacker), nameof(MessagePacker.Unpack)) ||
                 method.Is<IMessageSender>(nameof(IMessageSender.Send)) ||
-                method.Is<IMessageSender>(nameof(IMessageSender.SendAsync)) ||
                 method.Is<IMessageSender>(nameof(IMessageReceiver.RegisterHandler)) ||
                 method.Is<IMessageSender>(nameof(IMessageReceiver.UnregisterHandler)) ||
                 method.Is<NetworkConnection>(nameof(NetworkConnection.Send)) ||
-                method.Is<NetworkConnection>(nameof(NetworkConnection.SendAsync)) ||
                 method.Is<NetworkConnection>(nameof(NetworkConnection.RegisterHandler)) ||
                 method.Is<NetworkConnection>(nameof(NetworkConnection.UnregisterHandler)) ||
                 method.Is<NetworkClient>(nameof(NetworkClient.Send)) ||
-                method.Is<NetworkClient>(nameof(NetworkClient.SendAsync)) ||
                 method.Is<NetworkServer>(nameof(NetworkServer.SendToAll)) ||
                 method.Is<INetworkServer>(nameof(INetworkServer.SendToAll));
         }