中间件重命名

Armin1995 · Jun 11, 2021 · a2ea783 · a2ea783
1 parent ea70ddd
commit a2ea783
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 77 deletions.
diff --git a/FastGithub/GithubOptions.cs b/FastGithub/GithubOptions.cs
@@ -8,6 +8,6 @@ class GithubOptions
 
         public TimeSpan PortScanTimeout { get; set; } = TimeSpan.FromSeconds(1d);
 
-        public TimeSpan HttpTestTimeout { get; set; } = TimeSpan.FromSeconds(5d);
+        public TimeSpan HttpsScanTimeout { get; set; } = TimeSpan.FromSeconds(5d);
     }
 }
diff --git a/FastGithub/IPv4CIDR.cs b/FastGithub/IPv4CIDR.cs
@@ -19,7 +19,7 @@ public IPv4CIDR(IPAddress ipAddress, int mask)
         {
             this.IPAddress = ipAddress;
             this.Mask = mask;
-            this.Size = (int)(uint.MaxValue << mask >> mask);
+            this.Size = Math.Abs((int)(uint.MaxValue << mask >> mask));
         }
 
         public IEnumerable<IPAddress> GetAllIPAddress()
@@ -45,6 +45,17 @@ private static IPAddress Add(IPAddress ip, int value)
             return new IPAddress(span);
         }
 
+        public static IEnumerable<IPv4CIDR> From(IEnumerable<string> cidrs)
+        {
+            foreach (var item in cidrs)
+            {
+                if (TryParse(item, out var value))
+                {
+                    yield return value;
+                }
+            }
+        }
+
         public static bool TryParse(ReadOnlySpan<char> cidr, [MaybeNullWhen(false)] out IPv4CIDR value)
         {
             value = null;

diff --git a/FastGithub/Meta.cs b/FastGithub/Meta.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Net;
 using System.Text.Json.Serialization;
 
@@ -37,25 +38,19 @@ class Meta
 
         public IEnumerable<DomainAddress> ToDomainAddress()
         {
-            foreach (var item in this.Web)
+            foreach (var cidr in IPv4CIDR.From(this.Web).OrderBy(item => item.Size))
             {
-                if (IPv4CIDR.TryParse(item, out var cidr))
+                foreach (var address in cidr.GetAllIPAddress())
                 {
-                    foreach (var address in cidr.GetAllIPAddress())
-                    {
-                        yield return new DomainAddress("github.com", address);
-                    }
+                    yield return new DomainAddress("github.com", address);
                 }
             }
 
-            foreach (var item in this.Api)
+            foreach (var cidr in IPv4CIDR.From(this.Api).OrderBy(item => item.Size))
             {
-                if (IPv4CIDR.TryParse(item, out var cidr))
+                foreach (var address in cidr.GetAllIPAddress())
                 {
-                    foreach (var address in cidr.GetAllIPAddress())
-                    {
-                        yield return new DomainAddress("api.github.com", address);
-                    }
+                    yield return new DomainAddress("api.github.com", address);
                 }
             }
         }

diff --git a/FastGithub/Middlewares/HttpTestMiddleware.cs b/FastGithub/Middlewares/HttpTestMiddleware.cs
diff --git a/FastGithub/Program.cs b/FastGithub/Program.cs
@@ -34,14 +34,14 @@ public static IHostBuilder CreateHostBuilder(string[] args)
                         .AddTransient<GithubService>()
 
                         .AddSingleton<PortScanMiddleware>()
-                        .AddSingleton<HttpTestMiddleware>()
+                        .AddSingleton<HttpsScanMiddleware>()
                         .AddSingleton<ConcurrentMiddleware>()
                         .AddSingleton(serviceProvider =>
                         {
                             return new GithubBuilder(serviceProvider, ctx => Task.CompletedTask)
                                 .Use<ConcurrentMiddleware>()
                                 .Use<PortScanMiddleware>()
-                                .Use<HttpTestMiddleware>()
+                                .Use<HttpsScanMiddleware>()
                                 .Build();
                         })
                         .AddHostedService<GithubHostedService>()

diff --git a/FastGithub/appsettings.json b/FastGithub/appsettings.json
@@ -2,7 +2,7 @@
   "Github": {
     "MetaUri": "https://gitee.com/jiulang/fast-github/raw/master/FastGithub/meta.json", // ip资源文件uri    
     "PortScanTimeout": "00:00:01", // 端口扫描超时时间
-    "HttpTestTimeout": "00:00:05" // http测试超时时间
+    "HttpsScanTimeout": "00:00:05" // https扫描超时时间
   },
   "Logging": {
     "LogLevel": {