refactor: 优化代码格式.

Proxd-man/Monitor/OutboundMonitor.cs

@@ -12,7 +12,6 @@ namespace Proxd_man.Monitor;
 
 public class OutboundMonitor
 {
-
     private static readonly Uri HttpLatencyTestUrl = new("https://cp.cloudflare.com/generate_204");
     private static readonly Uri HttpBandwidthTestUrl = new("https://speed.cloudflare.com/__down?bytes=51200000");
 
@@ -23,7 +22,8 @@ public class OutboundMonitor
 
     private ProxdConfig Config => _configProvider.CurrentValue;
 
-    public OutboundMonitor(ILogger<OutboundMonitor> logger, IOptionsMonitor<ProxdConfig> configProvider, SubscribeManager subscribeManager, XrayCoreManager xrayCoreManager)
+    public OutboundMonitor(ILogger<OutboundMonitor> logger, IOptionsMonitor<ProxdConfig> configProvider,
+        SubscribeManager subscribeManager, XrayCoreManager xrayCoreManager)
     {
         _logger = logger;
         _configProvider = configProvider;
@@ -39,147 +39,135 @@ public class OutboundMonitor
 
     public async Task ReselectOutbound(IDictionary<SubscribeSource, List<BaseOutboundSetting>> subscribeOutbounds)
     {
-        try
+        _logger.LogInformation("开始重新选择代理...");
+        var outboundLatencies = new ConcurrentDictionary<BaseOutboundSetting, double>();
+        foreach (var (source, outboundSettings) in subscribeOutbounds)
         {
-            _logger.LogInformation("开始重新选择代理...");
+            _logger.LogDebug("开始测试订阅 {SubscribeName} 的代理...", source.Name);
-            var outboundLatencies = new ConcurrentDictionary<BaseOutboundSetting, double>();
+            List<Task> tasks = [];
-            foreach (var (source, outboundSettings) in subscribeOutbounds)
+            var semaphore = new SemaphoreSlim(4);
+            foreach (var outboundSetting in outboundSettings)
             {
-                _logger.LogDebug("开始测试订阅 {SubscribeName} 的代理...", source.Name);
+                var task = Task.Run(async () =>
-                List<Task> tasks = [];
-                var semaphore = new SemaphoreSlim(4);
-                foreach (var outboundSetting in outboundSettings)
                 {
-                    var task = Task.Run(async () =>
+                    if (outboundSetting.Address == null)
                     {
-                        if (outboundSetting.Address == null)
+                        _logger.LogDebug("跳过代理 {OutboundSettingName} ({OutboundSettingTag}), 因为 Address 为空",
+                            outboundSetting.Name, outboundSetting.GetTag());
+                        return;
+                    }
+
+                    await semaphore.WaitAsync();
+
+                    try
+                    {
+                        using var ping = new Ping();
+                        var pingReply = ping.Send(outboundSetting.Address, 5000);
+
+                        if (pingReply.Status != IPStatus.Success)
                         {
-                            _logger.LogDebug("跳过代理 {OutboundSettingName} ({OutboundSettingTag}), 因为 Address 为空",
+                            _logger.LogWarning(
-                                outboundSetting.Name, outboundSetting.GetTag());
+                                "无法 Ping 到代理 {OutboundSettingName} ({OutboundSettingTag}), 地址: {OutboundSettingAddress}, 错误: {PingReplyStatus}",
+                                outboundSetting.Name, outboundSetting.GetTag(), outboundSetting.Address,
+                                pingReply.Status);
                             return;
                         }
 
-                        await semaphore.WaitAsync();
+                        _logger.LogDebug(
+                            "Ping 到代理 {OutboundSettingName} ({OutboundSettingTag}) 成功, 地址: {OutboundSettingAddress}, 延迟: {PingReply.RoundtripTime}ms",
+                            outboundSetting.Name, outboundSetting.GetTag(), outboundSetting.Address,
+                            pingReply.RoundtripTime);
 
-                        try
+                        // 如果 Ping 成功, 则开始测试代理的延迟和带宽
+                        _logger.LogDebug(
+                            "开始测试代理 {OutboundSettingName} ({OutboundSettingTag}), 地址: {OutboundSettingAddress}",
+                            outboundSetting.Name, outboundSetting.GetTag(), outboundSetting.Address);
+
+                        // 随机选择一个端口进行测试
+                        var port = (ushort)new Random().Next(50000, 60000);
+
+                        using var outboundTestProcess =
+                            await _xrayCoreManager.CreateOutboundTestProcess(port, outboundSetting);
+                        if (!outboundTestProcess.Start())
                         {
-                            using var ping = new Ping();
+                            _logger.LogError("无法启动 Xray-Core 进程, 地址: {OutboundSettingAddress}",
-                            var pingReply = ping.Send(outboundSetting.Address, 5000);
+                                outboundSetting.Address);
+                        }
+                        else
+                        {
+                            _logger.LogDebug("Xray-Core 进程已启动, 地址: {OutboundSettingAddress}",
+                                outboundSetting.Address);
+                            _xrayCoreManager.RedirectXrayCoreProcessOutput(outboundTestProcess);
+                        }
 
-                            if (pingReply.Status != IPStatus.Success)
+                        // 等 Xray-Core 就绪.
-                            {
+                        await Task.Delay(200);
-                                _logger.LogWarning(
+                        _logger.LogDebug("Xray-Core 进程已就绪, 开始测试延迟...");
-                                    "无法 Ping 到代理 {OutboundSettingName} ({OutboundSettingTag}), 地址: {OutboundSettingAddress}, 错误: {PingReplyStatus}",
-                                    outboundSetting.Name, outboundSetting.GetTag(), outboundSetting.Address,
-                                    pingReply.Status);
-                                return;
-                            }
 
-                            _logger.LogDebug(
+                        // 先测试代理的延迟.
-                                "Ping 到代理 {OutboundSettingName} ({OutboundSettingTag}) 成功, 地址: {OutboundSettingAddress}, 延迟: {PingReply.RoundtripTime}ms",
+                        var (latencies, _) = await MeasureOutbound(port);
-                                outboundSetting.Name, outboundSetting.GetTag(), outboundSetting.Address,
+                        if (latencies.Count(l => l == -1) > 4)
-                                pingReply.RoundtripTime);
+                        {
-
+                            _logger.LogWarning(
-                            // 如果 Ping 成功, 则开始测试代理的延迟和带宽
+                                "代理 {OutboundSettingName} ({OutboundSettingTag}) 的延迟测试失败, 地址: {OutboundSettingAddress}",
-                            _logger.LogDebug(
-                                "开始测试代理 {OutboundSettingName} ({OutboundSettingTag}), 地址: {OutboundSettingAddress}",
                                 outboundSetting.Name, outboundSetting.GetTag(), outboundSetting.Address);
-
+                            return;
-                            // 随机选择一个端口进行测试
-                            var port = (ushort)new Random().Next(50000, 60000);
-                            var outboundTestProcess =
-                                await _xrayCoreManager.CreateOutboundTestProcess(port, outboundSetting);
-
-                            if (!outboundTestProcess.Start())
-                            {
-                                _logger.LogError("无法启动 Xray-Core 进程, 地址: {OutboundSettingAddress}",
-                                    outboundSetting.Address);
-                            }
-                            else
-                            {
-                                _logger.LogDebug("Xray-Core 进程已启动, 地址: {OutboundSettingAddress}",
-                                    outboundSetting.Address);
-                                _xrayCoreManager.RedirectXrayCoreProcessOutput(outboundTestProcess);
-                            }
-
-                            try
-                            {
-                                // 等 Xray-Core 就绪.
-                                await Task.Delay(200);
-                                _logger.LogDebug("Xray-Core 进程已就绪, 开始测试延迟...");
-
-                                // 先测试代理的延迟.
-                                var (latencies, _) = await MeasureOutbound(port);
-                                if (latencies.Count(l => l == -1) > 4)
-                                {
-                                    _logger.LogWarning(
-                                        "代理 {OutboundSettingName} ({OutboundSettingTag}) 的延迟测试失败, 地址: {OutboundSettingAddress}",
-                                        outboundSetting.Name, outboundSetting.GetTag(), outboundSetting.Address);
-                                    return;
-                                }
-
-                                // 计算平均延迟.
-                                var avgLatency = latencies.Where(l => l != -1).Average();
-                                outboundLatencies[outboundSetting] = avgLatency;
-                                _logger.LogDebug(
-                                    "代理 {OutboundSettingName} ({OutboundSettingTag}) 的平均延迟为 {AvgLatency}ms, 地址: {OutboundSettingAddress}",
-                                    outboundSetting.Name, outboundSetting.GetTag(), avgLatency,
-                                    outboundSetting.Address);
-                            }
-                            finally
-                            {
-                                outboundTestProcess.Kill();
-                            }
                         }
-                        catch (Exception e)
-                        {
-                            _logger.LogError(e, "测试代理 {OutboundSettingName} ({OutboundSettingTag}) 时发生错误, 跳过代理, 地址: {OutboundSettingAddress}",
-                                outboundSetting.Name, outboundSetting.GetTag(), outboundSetting.Address);
-                        }
-                        finally
-                        {
-                            semaphore.Release();
-                        }
-                    });
 
-                    tasks.Add(task);
+                        // 计算平均延迟.
-                }
+                        var avgLatency = latencies.Where(l => l != -1).Average();
+                        outboundLatencies[outboundSetting] = avgLatency;
+                        _logger.LogDebug(
+                            "代理 {OutboundSettingName} ({OutboundSettingTag}) 的平均延迟为 {AvgLatency}ms, 地址: {OutboundSettingAddress}",
+                            outboundSetting.Name, outboundSetting.GetTag(), avgLatency,
+                            outboundSetting.Address);
+                    }
+                    catch (Exception e)
+                    {
+                        _logger.LogError(e,
+                            "测试代理 {OutboundSettingName} ({OutboundSettingTag}) 时发生错误, 跳过代理, 地址: {OutboundSettingAddress}",
+                            outboundSetting.Name, outboundSetting.GetTag(), outboundSetting.Address);
+                    }
+                    finally
+                    {
+                        semaphore.Release();
+                    }
+                });
 
-                Task.WaitAll(tasks);
+                tasks.Add(task);
-                _logger.LogDebug("订阅 {SubscribeName} 的代理测试完成.", source.Name);
             }
 
-            var sortedOutboundSettings = outboundLatencies
+            Task.WaitAll(tasks);
-                .OrderBy(kv => kv.Value)
+            _logger.LogDebug("订阅 {SubscribeName} 的代理测试完成.", source.Name);
-                .ToList();
-            
-            // 展示延迟前10的节点名称和延迟
-            var index = 1;
-            var latenciesRanking = "---------------- 延迟排名 ----------------\n";
-            sortedOutboundSettings
-                .Take(10)
-                .ToList()
-                .ForEach(kv => latenciesRanking += $"{index++}. {kv.Key.Name} ({kv.Key.GetTag()}) [{kv.Key.Address}]: {kv.Value}ms\n");
-            _logger.LogInformation(latenciesRanking);
-
-            var bestOutbound = sortedOutboundSettings
-                .FirstOrDefault().Key;
-
-            if (bestOutbound != null)
-            {
-                _logger.LogInformation(
-                    "选择代理 {OutboundSettingName} ({OutboundSettingTag}) 作为新的出站代理, 地址: {OutboundSettingAddress}",
-                    bestOutbound.Name, bestOutbound.GetTag(), bestOutbound.Address);
-                await _xrayCoreManager.StartMainXrayCoreProcess(bestOutbound);
-            }
-            else
-            {
-                _logger.LogWarning("没有可用的代理.");
-            }
         }
-        catch (Exception e)
+
+        var sortedOutboundSettings = outboundLatencies
+            .OrderBy(kv => kv.Value)
+            .ToList();
+
+        // 展示延迟前10的节点名称和延迟
+        var index = 1;
+        var latenciesRanking = "";
+        sortedOutboundSettings
+            .Take(10)
+            .ToList()
+            .ForEach(kv =>
+                latenciesRanking += $"{index++}. {kv.Key.Name} ({kv.Key.GetTag()}) [{kv.Key.Address}]: {kv.Value}ms\n");
+        _logger.LogInformation("---------------- 延迟排名 ----------------\n{latenciesRanking}", latenciesRanking);
+
+        var bestOutbound = sortedOutboundSettings
+            .FirstOrDefault().Key;
+
+        if (bestOutbound != null)
         {
-            _logger.LogError(e, "重新选择代理时发生错误.");
+            _logger.LogInformation(
+                "选择代理 {OutboundSettingName} ({OutboundSettingTag}) 作为新的出站代理, 地址: {OutboundSettingAddress}",
+                bestOutbound.Name, bestOutbound.GetTag(), bestOutbound.Address);
+            await _xrayCoreManager.StartMainXrayCoreProcess(bestOutbound);
+        }
+        else
+        {
+            _logger.LogWarning("没有可用的代理.");
         }
     }
 
@@ -248,7 +236,8 @@ public class OutboundMonitor
         }
     }
 
-    private static async Task<(long[] latencies, long[] bandwidths)> MeasureOutbound(ushort port, bool withBandwidth = false, CancellationToken cancellationToken = default)
+    private static async Task<(long[] latencies, long[] bandwidths)> MeasureOutbound(ushort port,
+        bool withBandwidth = false, CancellationToken cancellationToken = default)
     {
         var proxy = new WebProxy(new Uri($"http://localhost:{port}"));
 
@@ -299,7 +288,8 @@ public class OutboundMonitor
         return latencies;
     }
 
-    private static async Task<long[]> MeasureHttpBandwidth(IWebProxy proxy, CancellationToken cancellationToken = default)
+    private static async Task<long[]> MeasureHttpBandwidth(IWebProxy proxy,
+        CancellationToken cancellationToken = default)
     {
         var httpClient = new HttpClient(new HttpClientHandler
         {