修复Unity测试

KumoKyaku · Oct 16, 2022 · 17d757a · 17d757a
1 parent 79073df
commit 17d757a
Show file tree

Hide file tree

Showing 5 changed files with 123 additions and 151 deletions.
diff --git a/Megumin.Remote/Transport/BaseTransport.cs b/Megumin.Remote/Transport/BaseTransport.cs
@@ -1,9 +1,16 @@
-namespace Megumin.Remote
+using Net.Remote;
+
+namespace Megumin.Remote
 {
     public class BaseTransport
     {
         public RpcRemote RemoteCore { get; set; }
         public System.Diagnostics.TraceListener TraceListener { get; set; }
+
+        public virtual bool ReConnectFrom(ITransportable transportable)
+        {
+            return true;
+        }
     }
 }
 

diff --git a/Megumin.Remote/Transport/TcpTransport.cs b/Megumin.Remote/Transport/TcpTransport.cs
@@ -192,18 +192,23 @@ public void Disconnect(bool triggerOnDisConnect = false, bool waitSendQueue = fa
         /// <para/> 只有方法2成立。重连后需要进行验证流程，需要收发消息甚至rpc功能，需要使用remote功能，所以1不成立。
         /// <para/> 收发消息后，socket ReceiveAsync已经挂起，socket已经和remote绑定，不能切换socket，所以方法3不成立。
         /// </remarks>
-        public virtual void ReConnectFrom(TcpTransport oldRemote)
+        public override bool ReConnectFrom(ITransportable transportable)
         {
-            if (oldRemote == null)
+            if (transportable is TcpTransport oldRemote)
             {
-                return;
+                oldRemote.StopSocketSend();
+                this.StopSocketSend();
+                //SendPipe 应该和 RpcLayer，待发送消息和rpc回调时对应关系。
+                //但是既不能将SendPipe 放到RpcRemote中，也不能将RpcLayer放到Transport中，只能这样将就。
+                SendPipe = oldRemote.SendPipe;
+                RemoteCore.RpcLayer = oldRemote.RemoteCore.RpcLayer;
+                StartSocketSend();
+                return true;
+            }
+            else
+            {
+                throw new ArgumentException();
             }
-
-            oldRemote.StopSocketSend();
-            this.StopSocketSend();
-            SendPipe = oldRemote.SendPipe;
-            RemoteCore = oldRemote.RemoteCore;
-            StartSocketSend();
         }
     }
 

diff --git a/NetRemoteStandard/ITransportable.cs b/NetRemoteStandard/ITransportable.cs
@@ -21,6 +21,13 @@ public interface ITransportable : IConnectable, ISocketSendable
         /// 当前是否正常工作
         /// </summary>
         bool IsVaild { get; }
+
+        /// <summary>
+        /// 断线重连
+        /// </summary>
+        /// <param name="transportable"></param>
+        /// <returns></returns>
+        bool ReConnectFrom(ITransportable transportable);
     }
 }