增加HttpProxy类，移除ProxyInfo

Author: xljiulang

WebApiClient/Attributes/HttpActionAttributes/ProxyAttribute.cs

@@ -14,19 +14,9 @@ namespace WebApiClient.Attributes
     public class ProxyAttribute : ApiActionAttribute
     {
         /// <summary>
-        /// 域名或ip
+        /// http代理
         /// </summary>
-        private readonly string host;
-
-        /// <summary>
-        /// 端口
-        /// </summary>
-        private readonly int port;
-
-        /// <summary>
-        /// 凭证
-        /// </summary>
-        private readonly ICredentials credential;
+        private readonly HttpProxy httpProxy;
 
         /// <summary>
         /// http代理描述
@@ -35,8 +25,8 @@ public class ProxyAttribute : ApiActionAttribute
         /// <param name="port">端口</param>    
         /// <exception cref="ArgumentNullException"></exception>
         public ProxyAttribute(string host, int port)
-            : this(host, port, null, null)
         {
+            this.httpProxy = new HttpProxy(host, port);
         }
 
         /// <summary>
@@ -49,18 +39,7 @@ public ProxyAttribute(string host, int port)
         /// <exception cref="ArgumentNullException"></exception>
         public ProxyAttribute(string host, int port, string userName, string password)
         {
-            if (string.IsNullOrEmpty(host))
-            {
-                throw new ArgumentNullException(nameof(host));
-            }
-
-            this.host = host;
-            this.port = port;
-
-            if (string.IsNullOrEmpty(userName) == false && string.IsNullOrEmpty(password) == false)
-            {
-                this.credential = new NetworkCredential(userName, password);
-            }
+            this.httpProxy = new HttpProxy(host, port, userName, password);
         }
 
         /// <summary>
@@ -70,11 +49,7 @@ public ProxyAttribute(string host, int port, string userName, string password)
         /// <returns></returns>
         public override Task BeforeRequestAsync(ApiActionContext context)
         {
-            var proxy = new WebProxy(this.host, this.port)
-            {
-                Credentials = this.credential
-            };
-            context.HttpApiConfig.HttpClient.SetProxy(proxy);
+            context.HttpApiConfig.HttpClient.SetProxy(this.httpProxy);
             return ApiTask.CompletedTask;
         }
     }

WebApiClient/ProxyInfo.cs renamed to WebApiClient/HttpProxy.cs

@@ -1,16 +1,13 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Net;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace WebApiClient
 {
     /// <summary>
-    /// 表示代理信息
+    /// 表示http代理信息
     /// </summary>
-    public class ProxyInfo
+    public class HttpProxy : IWebProxy
     {
         /// <summary>
         /// 获取代理服务器域名或ip
@@ -25,32 +22,37 @@ public class ProxyInfo
         /// <summary>
         /// 获取代理服务器账号
         /// </summary>
-        public string UserName { get; set; }
+        public string UserName { get; private set; }
 
         /// <summary>
         /// 获取代理服务器密码
         /// </summary>
-        public string Password { get; set; }
+        public string Password { get; private set; }
 
         /// <summary>
-        /// 代理信息
+        /// 获取或设置授权信息
+        /// </summary>
+        ICredentials IWebProxy.Credentials { get; set; }
+
+        /// <summary>
+        /// http代理信息
         /// </summary>
         /// <param name="proxyAddress">代理服务器地址</param>
         /// <exception cref="ArgumentNullException"></exception>
         /// <exception cref="ArgumentException"></exception>
         /// <exception cref="ArgumentOutOfRangeException"></exception>
         /// <exception cref="UriFormatException"></exception>
-        public ProxyInfo(string proxyAddress)
+        public HttpProxy(string proxyAddress)
             : this(new Uri(proxyAddress ?? throw new ArgumentNullException(nameof(proxyAddress))))
         {
         }
 
         /// <summary>
-        /// 代理信息
+        /// http代理信息
         /// </summary>
         /// <param name="proxyAddress">代理服务器地址</param>
         /// <exception cref="ArgumentNullException"></exception>
-        public ProxyInfo(Uri proxyAddress)
+        public HttpProxy(Uri proxyAddress)
         {
             if (proxyAddress == null)
             {
@@ -61,15 +63,35 @@ public ProxyInfo(Uri proxyAddress)
         }
 
         /// <summary>
-        /// 代理信息
+        /// http代理信息
+        /// </summary>
+        /// <param name="host">代理服务器域名或ip</param>
+        /// <param name="port">代理服务器端口</param>
+        /// <exception cref="ArgumentNullException"></exception>
+        public HttpProxy(string host, int port)
+            : this(host, port, null, null)
+        {
+        }
+
+        /// <summary>
+        /// http代理信息
         /// </summary>
         /// <param name="host">代理服务器域名或ip</param>
         /// <param name="port">代理服务器端口</param>
+        /// <param name="userName">代理服务器账号</param>
+        /// <param name="password">代理服务器密码</param>
         /// <exception cref="ArgumentNullException"></exception>
-        public ProxyInfo(string host, int port)
+        public HttpProxy(string host, int port, string userName, string password)
         {
             this.Host = host ?? throw new ArgumentNullException(nameof(host));
-            this.Port = Port;
+            this.Port = port;
+            this.UserName = userName;
+            this.Password = password;
+
+            if (string.IsNullOrEmpty(userName + password) == false)
+            {
+                ((IWebProxy)this).Credentials = new NetworkCredential(userName, password);
+            }
         }
 
         /// <summary>
@@ -79,7 +101,7 @@ public ProxyInfo(string host, int port)
         /// <param name="targetAddress">目标url地址</param>
         /// <exception cref="ArgumentNullException"></exception>
         /// <returns></returns>
-        public static ProxyInfo FromWebProxy(IWebProxy webProxy, Uri targetAddress)
+        public static HttpProxy FromWebProxy(IWebProxy webProxy, Uri targetAddress)
         {
             if (webProxy == null)
             {
@@ -92,15 +114,15 @@ public static ProxyInfo FromWebProxy(IWebProxy webProxy, Uri targetAddress)
             }
 
             var proxyAddress = webProxy.GetProxy(targetAddress);
-            var proxyInfo = new ProxyInfo(proxyAddress);
+            var httpProxy = new HttpProxy(proxyAddress);
 
             if (webProxy.Credentials != null)
             {
                 var credentials = webProxy.Credentials.GetCredential(null, null);
-                proxyInfo.UserName = credentials?.UserName;
-                proxyInfo.Password = credentials?.Password;
+                httpProxy.UserName = credentials?.UserName;
+                httpProxy.Password = credentials?.Password;
             }
-            return proxyInfo;
+            return httpProxy;
         }
 
         /// <summary>
@@ -109,7 +131,7 @@ public static ProxyInfo FromWebProxy(IWebProxy webProxy, Uri targetAddress)
         /// <param name="targetAddress">目标url地址</param>
         /// <exception cref="ArgumentNullException"></exception>
         /// <returns></returns>
-        public string ToHttpTunnelRequestString(Uri targetAddress)
+        public string ToTunnelRequestString(Uri targetAddress)
         {
             if (targetAddress == null)
             {
@@ -135,15 +157,23 @@ public string ToHttpTunnelRequestString(Uri targetAddress)
         }
 
         /// <summary>
-        /// 转换为web代理
+        /// 获取代理服务器地址
         /// </summary>
+        /// <param name="destination"></param>
         /// <returns></returns>
-        public IWebProxy ToWebProxy()
+        Uri IWebProxy.GetProxy(Uri destination)
         {
-            return new WebProxy(this.Host, this.Port)
-            {
-                Credentials = new NetworkCredential(this.UserName, this.Password)
-            };
+            return new Uri($"http://{this.Host}:{this.Port}/");
+        }
+
+        /// <summary>
+        /// 是否忽略代理
+        /// </summary>
+        /// <param name="host"></param>
+        /// <returns></returns>
+        bool IWebProxy.IsBypassed(Uri host)
+        {
+            return false;
         }
     }
 }

WebApiClient/Internal/SocketExtend.cs

@@ -21,7 +21,7 @@ static class SocketExtend
         /// <exception cref="ArgumentNullException"></exception>
         /// <exception cref="TimeoutException"></exception>
         /// <returns></returns>
-        public static async Task ConnectTaskAsync(this Socket socket, EndPoint remoteEndPoint, TimeSpan timeout)
+        public static async Task ConnectTaskAsync(this Socket socket, EndPoint remoteEndPoint, TimeSpan? timeout)
         {
             if (remoteEndPoint == null)
             {
@@ -72,7 +72,7 @@ private static void ConnectCompleted(object sender, SocketAsyncEventArgs e)
         /// <exception cref="SocketException"></exception>
         /// <exception cref="TimeoutException"></exception>
         /// <returns></returns>
-        public static async Task<int> ReceiveTaskAsync(this Socket socket, ArraySegment<byte> arraySegment, TimeSpan timeout)
+        public static async Task<int> ReceiveTaskAsync(this Socket socket, ArraySegment<byte> arraySegment, TimeSpan? timeout)
         {
             var taskSetter = new TaskSetter<int>(timeout);
             var asyncEventArg = new SocketAsyncEventArgs
@@ -125,17 +125,6 @@ private class TaskSetter<TResult> : IDisposable
             /// </summary>
             private readonly CancellationTokenSource tokenSource;
 
-            /// <summary>
-            /// 获取任务的返回值类型
-            /// </summary>
-            public Type ValueType
-            {
-                get
-                {
-                    return typeof(TResult);
-                }
-            }
-
             /// <summary>
             /// 获取任务对象
             /// </summary>
@@ -150,12 +139,15 @@ public Task<TResult> Task
             /// <summary>
             /// 任务行为
             /// </summary>
-            public TaskSetter(TimeSpan timeout)
+            public TaskSetter(TimeSpan? timeout)
             {
                 this.taskSource = new TaskCompletionSource<TResult>();
-                this.tokenSource = new CancellationTokenSource();
-                this.tokenSource.Token.Register(() => this.SetException(new TimeoutException()));
-                this.tokenSource.CancelAfter(timeout);
+                if (timeout.HasValue == true)
+                {
+                    this.tokenSource = new CancellationTokenSource();
+                    this.tokenSource.Token.Register(() => this.SetException(new TimeoutException()));
+                    this.tokenSource.CancelAfter(timeout.Value);
+                }
             }
 
             /// <summary>
@@ -165,7 +157,7 @@ public TaskSetter(TimeSpan timeout)
             /// <returns></returns>
             public bool SetResult(TResult value)
             {
-                this.tokenSource.Dispose();
+                this.tokenSource?.Dispose();
                 return this.taskSource.TrySetResult(value);
             }
 
@@ -176,7 +168,7 @@ public bool SetResult(TResult value)
             /// <returns></returns>
             public bool SetException(Exception ex)
             {
-                this.tokenSource.Dispose();
+                this.tokenSource?.Dispose();
                 return this.taskSource.TrySetException(ex);
             }
 
@@ -185,7 +177,7 @@ public bool SetException(Exception ex)
             /// </summary>
             public void Dispose()
             {
-                this.tokenSource.Dispose();
+                this.tokenSource?.Dispose();
             }
         }
     }