refactor: making NetworkClient implement IMessageSender (MirageNet#671)

* refactor: splitting IMessageHandler into multiple interfaces * adding comments * fixing typo * updating weaver to use new interfaces * refactor: making NetworkClient implement IMessageSender * removing calls to INetworkClient because they are now in IMessageSender
James-Frowen · Mar 8, 2021 · 84830b9 · 84830b9
1 parent 0522edf
commit 84830b9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/Assets/Mirage/Runtime/INetworkClient.cs b/Assets/Mirage/Runtime/INetworkClient.cs
@@ -1,9 +1,8 @@
-using Cysharp.Threading.Tasks;
 using UnityEngine.Events;
 
 namespace Mirage
 {
-    public interface INetworkClient
+    public interface INetworkClient : IMessageSender
     {
 
         /// <summary>
@@ -38,9 +37,5 @@ public interface INetworkClient
         bool IsLocalClient { get; }
 
         void Disconnect();
-
-        void Send<T>(T message, int channelId = Channel.Reliable);
-
-        UniTask SendAsync<T>(T message, int channelId = Channel.Reliable);
     }
 }
diff --git a/Assets/Mirage/Runtime/NetworkClient.cs b/Assets/Mirage/Runtime/NetworkClient.cs
@@ -260,7 +260,12 @@ public UniTask SendAsync<T>(T message, int channelId = Channel.Reliable)
 
         public void Send<T>(T message, int channelId = Channel.Reliable)
         {
-            Connection.SendAsync(message, channelId).Forget();
+            Connection.Send(message, channelId);
+        }
+
+        public UniTask SendAsync(ArraySegment<byte> segment, int channelId = Channel.Reliable)
+        {
+            return Connection.SendAsync(segment, channelId);
         }
 
         internal void Update()

diff --git a/Assets/Mirage/Weaver/Processors/ReaderWriterProcessor.cs b/Assets/Mirage/Weaver/Processors/ReaderWriterProcessor.cs
@@ -228,8 +228,6 @@ private static bool IsMessageMethod(MethodReference method)
                 method.Is<NetworkConnection>(nameof(NetworkConnection.SendAsync)) ||
                 method.Is<NetworkConnection>(nameof(NetworkConnection.RegisterHandler)) ||
                 method.Is<NetworkConnection>(nameof(NetworkConnection.UnregisterHandler)) ||
-                method.Is<INetworkClient>(nameof(INetworkClient.Send)) ||
-                method.Is<INetworkClient>(nameof(INetworkClient.SendAsync)) ||
                 method.Is<NetworkClient>(nameof(NetworkClient.Send)) ||
                 method.Is<NetworkClient>(nameof(NetworkClient.SendAsync)) ||
                 method.Is<NetworkServer>(nameof(NetworkServer.SendToAll)) ||