增加ToValidator方法

Author: xljiulang

Demo/Program.cs

@@ -28,15 +28,19 @@ static void Main(string[] args)
         /// </summary>
         static async void ScanProxy()
         {
+            var timeout = TimeSpan.FromMilliseconds(500d);
             var target = new Uri("http://www.baidu.com");
-            var proxys = HttpProxy.Range(IPAddress.Parse("221.122.13.1"), 8080, 9999);
 
-            var tasks = proxys.Select(async p =>
+            var proxyValidators = HttpProxy
+                .Range(IPAddress.Parse("221.122.13.1"), 8080, 9999)
+                .Select(p => p.ToValidator());
+
+            var tasks = proxyValidators.Select(async v =>
             {
                 Interlocked.Increment(ref totalProxyCount);
-                if (await ProxyValidator.ValidateAsync(p, target, TimeSpan.FromMilliseconds(500d)) == HttpStatusCode.OK)
+                if (await v.ValidateAsync(target, timeout) == HttpStatusCode.OK)
                 {
-                    Console.WriteLine($"{DateTime.Now.ToString("HH:mm:ss.fff")}：扫描到代理服务：{p}");
+                    Console.WriteLine($"{DateTime.Now.ToString("HH:mm:ss.fff")}：扫描到代理服务：{v}");
                 }
                 var completed = Interlocked.Increment(ref completedProxyCount);
                 Console.Title = $"代理扫描进度：{completed}/{Interlocked.Read(ref totalProxyCount)}";

WebApiClient/HttpProxy.cs

@@ -131,32 +131,6 @@ private void SetCredentialsByInterface(ICredentials value)
             this.credentials = value;
         }
 
-        /// <summary>
-        /// 从IWebProxy实例转换获得
-        /// </summary>
-        /// <param name="webProxy">IWebProxy</param>
-        /// <param name="targetAddress">目标url地址</param>
-        /// <exception cref="ArgumentNullException"></exception>
-        /// <returns></returns>
-        public static HttpProxy FromWebProxy(IWebProxy webProxy, Uri targetAddress)
-        {
-            if (webProxy == null)
-            {
-                throw new ArgumentNullException(nameof(webProxy));
-            }
-
-            if (targetAddress == null)
-            {
-                throw new ArgumentNullException(nameof(targetAddress));
-            }
-
-            var proxyAddress = webProxy.GetProxy(targetAddress);
-            var httpProxy = new HttpProxy(proxyAddress);
-            httpProxy.SetCredentialsByInterface(webProxy.Credentials);
-
-            return httpProxy;
-        }
-
         /// <summary>
         /// 转换Http Tunnel请求字符串
         /// </summary>      
@@ -217,6 +191,42 @@ public override string ToString()
             return $"http://{this.Host}:{this.Port}/";
         }
 
+        /// <summary>
+        /// 转换为代理验证器
+        /// </summary>
+        /// <returns></returns>
+        public ProxyValidator ToValidator()
+        {
+            return new ProxyValidator(this);
+        }
+
+        /// <summary>
+        /// 从IWebProxy实例转换获得
+        /// </summary>
+        /// <param name="webProxy">IWebProxy</param>
+        /// <param name="targetAddress">目标url地址</param>
+        /// <exception cref="ArgumentNullException"></exception>
+        /// <returns></returns>
+        public static HttpProxy FromWebProxy(IWebProxy webProxy, Uri targetAddress)
+        {
+            if (webProxy == null)
+            {
+                throw new ArgumentNullException(nameof(webProxy));
+            }
+
+            if (targetAddress == null)
+            {
+                throw new ArgumentNullException(nameof(targetAddress));
+            }
+
+            var proxyAddress = webProxy.GetProxy(targetAddress);
+            var httpProxy = new HttpProxy(proxyAddress);
+            httpProxy.SetCredentialsByInterface(webProxy.Credentials);
+
+            return httpProxy;
+        }
+
+
         /// <summary>
         /// 指定ip范围构建http代理服务
         /// </summary>

WebApiClient/ProxyValidator.cs

@@ -15,9 +15,9 @@ namespace WebApiClient
     public class ProxyValidator
     {
         /// <summary>
-        /// 代理
+        /// 获取代理
         /// </summary>
-        private readonly IWebProxy webProxy;
+        public IWebProxy WebProxy { get; private set; }
 
         /// <summary>
         /// 代理验证器
@@ -37,7 +37,7 @@ public ProxyValidator(string proxyHost, int proxyPort)
         /// <exception cref="ArgumentNullException"></exception>
         public ProxyValidator(IWebProxy webProxy)
         {
-            this.webProxy = webProxy ?? throw new ArgumentNullException(nameof(webProxy));
+            this.WebProxy = webProxy ?? throw new ArgumentNullException(nameof(webProxy));
         }
 
         /// <summary>
@@ -53,7 +53,7 @@ public HttpStatusCode Validate(Uri targetAddress, TimeSpan? timeout = null)
             {
                 throw new ArgumentNullException(nameof(targetAddress));
             }
-            return Validate(this.webProxy, targetAddress, timeout);
+            return Validate(this.WebProxy, targetAddress, timeout);
         }
 
         /// <summary>
@@ -69,7 +69,16 @@ public Task<HttpStatusCode> ValidateAsync(Uri targetAddress, TimeSpan? timeout =
             {
                 throw new ArgumentNullException(nameof(targetAddress));
             }
-            return ValidateAsync(this.webProxy, targetAddress, timeout);
+            return ValidateAsync(this.WebProxy, targetAddress, timeout);
+        }
+
+        /// <summary>
+        /// 转换为字符串
+        /// </summary>
+        /// <returns></returns>
+        public override string ToString()
+        {
+            return this.WebProxy.ToString();
         }
 
         /// <summary>