[同步]1. 同步主库代码。时间为 2025-04-21 05:40:09 版本号：f68fe7960b000d7d808dd4bb954a36e5d24d4188

Author: AlianBlank

src/GameFrameX.SuperSocket.Client.Proxy/ProxyConnectorBase.cs

@@ -1,42 +1,42 @@
-using System.Net;
-
-namespace GameFrameX.SuperSocket.Client.Proxy
-{
-    public abstract class ProxyConnectorBase : ConnectorBase
-    {
-        private EndPoint _proxyEndPoint;
-
-        public ProxyConnectorBase(EndPoint proxyEndPoint)
-        {
-            _proxyEndPoint = proxyEndPoint;
-        }
-
-        protected abstract ValueTask<ConnectState> ConnectProxyAsync(EndPoint remoteEndPoint, ConnectState state, CancellationToken cancellationToken);
-
-        protected override async ValueTask<ConnectState> ConnectAsync(EndPoint remoteEndPoint, ConnectState state, CancellationToken cancellationToken)
-        {
-            var socketConnector = new SocketConnector() as IConnector;
-            var proxyEndPoint = _proxyEndPoint;
-
-            ConnectState result;
-
-            try
-            {
-                result = await socketConnector.ConnectAsync(proxyEndPoint, null, cancellationToken);
-
-                if (!result.Result)
-                    return result;
-            }
-            catch (Exception e)
-            {
-                return new ConnectState
-                {
-                    Result = false,
-                    Exception = e
-                };
-            }
-
-            return await ConnectProxyAsync(remoteEndPoint, state, cancellationToken);
-        }
-    }
+using System.Net;
+
+namespace GameFrameX.SuperSocket.Client.Proxy
+{
+    public abstract class ProxyConnectorBase : ConnectorBase
+    {
+        private EndPoint _proxyEndPoint;
+
+        public ProxyConnectorBase(EndPoint proxyEndPoint)
+        {
+            _proxyEndPoint = proxyEndPoint;
+        }
+
+        protected abstract ValueTask<ConnectState> ConnectProxyAsync(EndPoint remoteEndPoint, ConnectState state, CancellationToken cancellationToken);
+
+        protected override async ValueTask<ConnectState> ConnectAsync(EndPoint remoteEndPoint, ConnectState state, CancellationToken cancellationToken)
+        {
+            var socketConnector = new SocketConnector() as IConnector;
+            var proxyEndPoint = _proxyEndPoint;
+
+            ConnectState result;
+
+            try
+            {
+                result = await socketConnector.ConnectAsync(proxyEndPoint, null, cancellationToken);
+
+                if (!result.Result)
+                    return result;
+            }
+            catch (Exception e)
+            {
+                return new ConnectState
+                {
+                    Result = false,
+                    Exception = e
+                };
+            }
+
+            return await ConnectProxyAsync(remoteEndPoint, result, cancellationToken);
+        }
+    }
 }

src/GameFrameX.SuperSocket.Client.Proxy/Socks5Connector.cs

@@ -8,34 +8,61 @@
 namespace GameFrameX.SuperSocket.Client.Proxy
 {
     /// <summary>
-    /// https://tools.ietf.org/html/rfc1928
-    /// https://en.wikipedia.org/wiki/SOCKS
+    /// Represents a connector for SOCKS5 proxy connections.
     /// </summary>
+    /// <remarks>
+    /// Implements the SOCKS5 protocol as defined in RFC 1928.
+    /// </remarks>
     public class Socks5Connector : ProxyConnectorBase
     {
         private string _username;
 
         private string _password;
 
-        readonly static byte[] _authenHandshakeRequest = new byte[] { 0x05, 0x02, 0x00, 0x02 };
+        private readonly byte[] _authenHandshakeRequest;
+        private static readonly byte[] Handshake = new byte[] { 0x05, 0x01, 0x00 };
+        private static readonly byte[] AuthenHandshake = new byte[] { 0x05, 0x02, 0x00, 0x02 };
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Socks5Connector"/> class with the specified proxy endpoint.
+        /// </summary>
+        /// <param name="proxyEndPoint">The endpoint of the SOCKS5 proxy server.</param>
         public Socks5Connector(EndPoint proxyEndPoint)
             : base(proxyEndPoint)
         {
+            _authenHandshakeRequest = Handshake;
         }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Socks5Connector"/> class with the specified proxy endpoint, username, and password.
+        /// </summary>
+        /// <param name="proxyEndPoint">The endpoint of the SOCKS5 proxy server.</param>
+        /// <param name="username">The username for authentication.</param>
+        /// <param name="password">The password for authentication.</param>
         public Socks5Connector(EndPoint proxyEndPoint, string username, string password)
             : this(proxyEndPoint)
         {
             _username = username;
             _password = password;
+            _authenHandshakeRequest = AuthenHandshake;
         }
 
         protected override async ValueTask<ConnectState> ConnectProxyAsync(EndPoint remoteEndPoint, ConnectState state, CancellationToken cancellationToken)
         {
             var connection = state.CreateConnection(new ConnectionOptions { ReadAsDemand = true });
 
-            var packStream = connection.GetPackageStream(new Socks5AuthPipelineFilter());
+            var pipeLineFilter = new Socks5AuthPipelineFilter();
+
+            if (string.IsNullOrWhiteSpace(_username) || string.IsNullOrWhiteSpace(_password))
+            {
+                pipeLineFilter.AuthStep = 1;
+            }
+            else
+            {
+                pipeLineFilter.AuthStep = 0;
+            }
+
+            var packStream = connection.GetPackageStream(pipeLineFilter);
 
             await connection.SendAsync(_authenHandshakeRequest);
 
@@ -227,7 +254,7 @@ private byte[] GetEndPointBytes(EndPoint remoteEndPoint)
 
                 port = endPoint.Port;
 
-                var maxLen = 7 + Encoding.ASCII.GetMaxByteCount(endPoint.Host.Length);
+                var maxLen = 6 + Encoding.ASCII.GetMaxByteCount(endPoint.Host.Length);
                 buffer = new byte[maxLen];
 
                 buffer[3] = 0x03;

src/GameFrameX.SuperSocket.Client/ConnectState.cs

@@ -1,8 +1,7 @@
-using System;
-using System.IO;
 using System.Net.Sockets;
 using GameFrameX.SuperSocket.Connection;
-using GameFrameX.SuperSocket.ProtoBase;
+using GameFrameX.SuperSocket.Connection.Sockets;
+using Microsoft.Extensions.ObjectPool;
 
 namespace GameFrameX.SuperSocket.Client
 {
@@ -29,6 +28,13 @@ private ConnectState(bool cancelled)
 
         public static readonly ConnectState CancelledState = new ConnectState(false);
 
+        private static Lazy<ObjectPool<SocketSender>> _socketSenderPool = new Lazy<ObjectPool<SocketSender>>(() =>
+        {
+            var policy = new DefaultPooledObjectPolicy<SocketSender>();
+            var pool = new DefaultObjectPool<SocketSender>(policy, EasyClient.SocketSenderPoolSize ?? EasyClient.DefaultSocketSenderPoolSize);
+            return pool;
+        });
+
         public IConnection CreateConnection(ConnectionOptions connectionOptions)
         {
             var stream = this.Stream;
@@ -40,7 +46,7 @@ public IConnection CreateConnection(ConnectionOptions connectionOptions)
             }
             else
             {
-                return new TcpPipeConnection(socket, connectionOptions);
+                return new TcpPipeConnection(socket, connectionOptions, _socketSenderPool.Value);
             }
         }
     }