From 7e8b4055559b2b2aa91c7309d05efc31f8dc7dd8 Mon Sep 17 00:00:00 2001 From: 2dust <31833384+2dust@users.noreply.github.com> Date: Thu, 6 Mar 2025 12:21:21 +0800 Subject: [PATCH] AI-optimized code --- .../CoreConfig/CoreConfigClashService.cs | 24 ++++++++----------- .../Statistics/StatisticsSingboxService.cs | 9 ++++--- .../Statistics/StatisticsXrayService.cs | 8 ++++--- 3 files changed, 19 insertions(+), 22 deletions(-) diff --git a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigClashService.cs b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigClashService.cs index da17183c..4358b5a9 100644 --- a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigClashService.cs +++ b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigClashService.cs @@ -44,7 +44,7 @@ namespace ServiceLib.Services.CoreConfig File.Delete(fileName); } - string addressFileName = node.Address; + var addressFileName = node.Address; if (addressFileName.IsNullOrEmpty()) { ret.Msg = ResUI.FailedGetDefaultConfiguration; @@ -60,9 +60,9 @@ namespace ServiceLib.Services.CoreConfig return ret; } - string tagYamlStr1 = "!"; - string tagYamlStr2 = "__strn__"; - string tagYamlStr3 = "!!str"; + var tagYamlStr1 = "!"; + var tagYamlStr2 = "__strn__"; + var tagYamlStr3 = "!!str"; var txtFile = File.ReadAllText(addressFileName); txtFile = txtFile.Replace(tagYamlStr1, tagYamlStr2); @@ -121,7 +121,9 @@ namespace ServiceLib.Services.CoreConfig { var tunContent = YamlUtils.FromYaml>(tun); if (tunContent != null) + { fileContent["tun"] = tunContent["tun"]; + } } } @@ -202,8 +204,8 @@ namespace ServiceLib.Services.CoreConfig private void ModifyContentMerge(Dictionary fileContent, string key, object value) { - bool blPrepend = false; - bool blRemoved = false; + var blPrepend = false; + var blRemoved = false; if (key.StartsWith("prepend-")) { blPrepend = true; @@ -244,17 +246,11 @@ namespace ServiceLib.Services.CoreConfig if (blPrepend) { lstValue.Reverse(); - foreach (var item in lstValue) - { - lstOri.Insert(0, item); - } + lstValue.ForEach(item => lstOri.Insert(0, item)); } else { - foreach (var item in lstValue) - { - lstOri.Add(item); - } + lstValue.ForEach(item => lstOri.Add(item)); } } diff --git a/v2rayN/ServiceLib/Services/Statistics/StatisticsSingboxService.cs b/v2rayN/ServiceLib/Services/Statistics/StatisticsSingboxService.cs index 078e9a5e..b09402a0 100644 --- a/v2rayN/ServiceLib/Services/Statistics/StatisticsSingboxService.cs +++ b/v2rayN/ServiceLib/Services/Statistics/StatisticsSingboxService.cs @@ -5,7 +5,7 @@ namespace ServiceLib.Services.Statistics { public class StatisticsSingboxService { - private Config _config; + private readonly Config _config; private bool _exitFlag; private ClientWebSocket? webSocket; private Action? _updateFunc; @@ -18,7 +18,7 @@ namespace ServiceLib.Services.Statistics _updateFunc = updateFunc; _exitFlag = false; - Task.Run(Run); + _ = Task.Run(Run); } private async Task Init() @@ -68,8 +68,7 @@ namespace ServiceLib.Services.Statistics } if (webSocket != null) { - if (webSocket.State == WebSocketState.Aborted - || webSocket.State == WebSocketState.Closed) + if (webSocket.State is WebSocketState.Aborted or WebSocketState.Closed) { webSocket.Abort(); webSocket = null; @@ -89,7 +88,7 @@ namespace ServiceLib.Services.Statistics var result = Encoding.UTF8.GetString(buffer, 0, res.Count); if (result.IsNotEmpty()) { - ParseOutput(result, out ulong up, out ulong down); + ParseOutput(result, out var up, out var down); _updateFunc?.Invoke(new ServerSpeedItem() { diff --git a/v2rayN/ServiceLib/Services/Statistics/StatisticsXrayService.cs b/v2rayN/ServiceLib/Services/Statistics/StatisticsXrayService.cs index 92ced15e..d74a3e48 100644 --- a/v2rayN/ServiceLib/Services/Statistics/StatisticsXrayService.cs +++ b/v2rayN/ServiceLib/Services/Statistics/StatisticsXrayService.cs @@ -4,7 +4,7 @@ namespace ServiceLib.Services.Statistics { private const long linkBase = 1024; private ServerSpeedItem _serverSpeedItem = new(); - private Config _config; + private readonly Config _config; private bool _exitFlag; private Action? _updateFunc; private string Url => $"{Global.HttpProtocol}{Global.Loopback}:{AppHandler.Instance.StatePort}/debug/vars"; @@ -15,7 +15,7 @@ namespace ServiceLib.Services.Statistics _updateFunc = updateFunc; _exitFlag = false; - Task.Run(Run); + _ = Task.Run(Run); } public void Close() @@ -60,11 +60,13 @@ namespace ServiceLib.Services.Statistics } ServerSpeedItem server = new(); - foreach (string key in source.stats.outbound.Keys) + foreach (var key in source.stats.outbound.Keys.Cast()) { var value = source.stats.outbound[key]; if (value == null) + { continue; + } var state = JsonUtils.Deserialize(value.ToString()); if (key.StartsWith(Global.ProxyTag))