[修改]1. 修改连接远程服务器的地址的参数为URI

Author: AlianBlank

Runtime/Network/Interface/INetworkChannel.cs

@@ -177,11 +177,9 @@ public interface INetworkChannel
         /// <summary>
         /// 连接到远程主机。
         /// </summary>
-        /// <param name="ipAddress">远程主机的 IP 地址。</param>
-        /// <param name="port">远程主机的端口号。</param>
+        /// <param name="address">远程主机的地址。</param>
         /// <param name="userData">用户自定义数据。</param>
-        /// <param name="isSsl">是否是加密</param>
-        void Connect(IPAddress ipAddress, int port, object userData = null, bool isSsl = false);
+        void Connect(Uri address, object userData = null);
 
         /// <summary>
         /// 设置忽略指定的消息包的发送和接收ID列表

Runtime/Network/Network/NetworkManager.NetworkChannelBase.cs

@@ -10,6 +10,7 @@
 using System.Collections.Generic;
 using System.Net;
 using System.Net.Sockets;
+using System.Security.Policy;
 using System.Threading.Tasks;
 using GameFrameX.Runtime;
 
@@ -544,20 +545,19 @@ public void SetRPCEndHandler(EventHandler<MessageObject> handler)
             /// <summary>
             /// 连接到远程主机。
             /// </summary>
-            /// <param name="ipAddress">远程主机的 IP 地址。</param>
-            /// <param name="port">远程主机的端口号。</param>
+            /// <param name="address">远程主机的地址。</param>
             /// <param name="userData">用户自定义数据。</param>
-            /// <param name="isSsl">是否加密</param>
             [UnityEngine.Scripting.Preserve]
-            public virtual void Connect(IPAddress ipAddress, int port, object userData = null, bool isSsl = false)
+            public virtual void Connect(Uri address, object userData = null)
             {
                 if (PSocket != null)
                 {
                     Close();
                     PSocket = null;
                 }
 
-                switch (ipAddress.AddressFamily)
+                EndPoint endPoint = new IPEndPoint(IPAddress.Parse(address.Host), address.Port);
+                switch (endPoint.AddressFamily)
                 {
                     case System.Net.Sockets.AddressFamily.InterNetwork:
                         PAddressFamily = AddressFamily.IPv4;
@@ -568,7 +568,7 @@ public virtual void Connect(IPAddress ipAddress, int port, object userData = nul
                         break;
 
                     default:
-                        string errorMessage = Utility.Text.Format("Not supported address family '{0}'.", ipAddress.AddressFamily);
+                        string errorMessage = Utility.Text.Format("Not supported address family '{0}'.", endPoint.AddressFamily);
                         if (NetworkChannelError != null)
                         {
                             NetworkChannelError(this, NetworkErrorCode.AddressFamilyError, SocketError.Success, errorMessage);

Runtime/Network/Network/SystemSocket/NetworkManager.SystemTcpNetworkChannel.cs

@@ -37,20 +37,18 @@ public SystemTcpNetworkChannel(string name, INetworkChannelHelper networkChannel
             /// <summary>
             /// 连接到远程主机。
             /// </summary>
-            /// <param name="ipAddress">远程主机的 IP 地址。</param>
-            /// <param name="port">远程主机的端口号。</param>
+            /// <param name="address">远程主机的地址。</param>
             /// <param name="userData">用户自定义数据。</param>
-            /// <param name="isSsl">是否是加密</param>
-            public override void Connect(IPAddress ipAddress, int port, object userData = null, bool isSsl = false)
+            public override void Connect(Uri address, object userData = null)
             {
                 if (PIsConnecting)
                 {
                     return;
                 }
 
-                m_ConnectedEndPoint = new IPEndPoint(ipAddress, port);
-                base.Connect(ipAddress, port, userData, isSsl);
-                PSystemNetSocket = new SystemNetSocket(ipAddress.AddressFamily, SocketType.Stream, ProtocolType.Tcp);
+                m_ConnectedEndPoint = new IPEndPoint(IPAddress.Parse(address.Host), address.Port);
+                base.Connect(address, userData);
+                PSystemNetSocket = new SystemNetSocket(m_ConnectedEndPoint.AddressFamily, SocketType.Stream, ProtocolType.Tcp);
                 PSocket = PSystemNetSocket;
                 if (PSocket == null)
                 {

Runtime/Network/Network/WebSocket/NetworkManager.WebSocketNetSocket.cs

@@ -14,11 +14,6 @@ private sealed class WebSocketNetSocket : INetworkSocket
         {
             private readonly IWebSocket _client;
 
-            /// <summary>
-            /// 是否是加密协议
-            /// </summary>
-            private readonly bool _isSSL = false;
-
             /// <summary>
             /// 是否正在连接
             /// </summary>
@@ -28,10 +23,9 @@ private sealed class WebSocketNetSocket : INetworkSocket
             private Action<byte[]> _action;
             private Action<string> _onCloseAction;
 
-            public WebSocketNetSocket(IPAddress ipAddress, int port, bool isSSL, Action<byte[]> action, Action<string> onCloseAction)
+            public WebSocketNetSocket(string url, Action<byte[]> action, Action<string> onCloseAction)
             {
-                _isSSL = isSSL;
-                _client = new UnityWebSocket.WebSocket("ws://" + ipAddress + ":" + port + "/" + (_isSSL ? "wss" : "ws"));
+                _client = new UnityWebSocket.WebSocket(url);
                 _action = action;
                 _onCloseAction = onCloseAction;
                 _client.OnOpen += OnOpen;

Runtime/Network/Network/WebSocket/NetworkManager.WebSocketNetworkChannel.cs

@@ -38,19 +38,18 @@ public WebSocketNetworkChannel(string name, INetworkChannelHelper networkChannel
             /// <summary>
             /// 连接到远程主机。
             /// </summary>
-            /// <param name="ipAddress">远程主机的 IP 地址。</param>
-            /// <param name="port">远程主机的端口号。</param>
+            /// <param name="address">远程主机的地址。</param>
             /// <param name="userData">用户自定义数据。</param>
             /// <param name="isSsl">是否是加密</param>
-            public override void Connect(IPAddress ipAddress, int port, object userData = null, bool isSsl = false)
+            public override void Connect(Uri address, object userData = null)
             {
                 if (PIsConnecting)
                 {
                     return;
                 }
 
-                base.Connect(ipAddress, port, userData, isSsl);
-                PSocket = new WebSocketNetSocket(ipAddress, port, isSsl, ReceiveCallback, CloseCallback);
+                base.Connect(address, userData);
+                PSocket = new WebSocketNetSocket(address.ToString(), ReceiveCallback, CloseCallback);
                 if (PSocket == null)
                 {
                     const string errorMessage = "Initialize network channel failure.";