Code clean

v2rayN/ServiceLib.Tests/CoreConfig/CoreConfigTestFactory.cs

@@ -1,7 +1,7 @@
+using System.Reflection;
 using ServiceLib.Enums;
 using ServiceLib.Manager;
 using ServiceLib.Models;
-using System.Reflection;
 
 namespace ServiceLib.Tests.CoreConfig;
 
@@ -33,7 +33,10 @@ internal static class CoreConfigTestFactory
             UiItem =
                 new UIItem
                 {
-                    CurrentLanguage = "en", CurrentFontFamily = "sans", MainColumnItem = [], WindowSizeItem = []
+                    CurrentLanguage = "en",
+                    CurrentFontFamily = "sans",
+                    MainColumnItem = [],
+                    WindowSizeItem = []
                 },
             ConstItem = new ConstItem(),
             SpeedTestItem = new SpeedTestItem
@@ -51,7 +54,8 @@ internal static class CoreConfigTestFactory
             SystemProxyItem =
                 new SystemProxyItem
                 {
-                    SystemProxyExceptions = string.Empty, SystemProxyAdvancedProtocol = string.Empty
+                    SystemProxyExceptions = string.Empty,
+                    SystemProxyAdvancedProtocol = string.Empty
                 },
             WebDavItem = new WebDavItem(),
             CheckUpdateItem = new CheckUpdateItem(),
@@ -131,11 +135,15 @@ internal static class CoreConfigTestFactory
     {
         var node = new ProfileItem
         {
-            IndexId = indexId, ConfigType = EConfigType.PolicyGroup, CoreType = coreType, Remarks = remarks,
+            IndexId = indexId,
+            ConfigType = EConfigType.PolicyGroup,
+            CoreType = coreType,
+            Remarks = remarks,
         };
         node.SetProtocolExtra(node.GetProtocolExtra() with
         {
-            GroupType = nameof(EConfigType.PolicyGroup), ChildItems = string.Join(",", childIndexIds),
+            GroupType = nameof(EConfigType.PolicyGroup),
+            ChildItems = string.Join(",", childIndexIds),
         });
 
         return node;
@@ -146,11 +154,15 @@ internal static class CoreConfigTestFactory
     {
         var node = new ProfileItem
         {
-            IndexId = indexId, ConfigType = EConfigType.ProxyChain, CoreType = coreType, Remarks = remarks,
+            IndexId = indexId,
+            ConfigType = EConfigType.ProxyChain,
+            CoreType = coreType,
+            Remarks = remarks,
         };
         node.SetProtocolExtra(node.GetProtocolExtra() with
         {
-            GroupType = nameof(EConfigType.ProxyChain), ChildItems = string.Join(",", childIndexIds),
+            GroupType = nameof(EConfigType.ProxyChain),
+            ChildItems = string.Join(",", childIndexIds),
         });
 
         return node;

v2rayN/ServiceLib.Tests/Fmt/FmtHandlerTests.cs

@@ -1,7 +1,7 @@
 using AwesomeAssertions;
+using ServiceLib.Enums;
 using ServiceLib.Handler.Fmt;
 using ServiceLib.Models;
-using ServiceLib.Enums;
 using Xunit;
 
 namespace ServiceLib.Tests.Fmt;
@@ -92,7 +92,7 @@ public class FmtHandlerTests
         var uri = FmtHandler.GetShareUri(source);
 
         uri.Should().NotBeNullOrWhiteSpace();
-        (uri!.StartsWith(Global.ProtocolShares[source.ConfigType], StringComparison.OrdinalIgnoreCase)).Should()
+        uri!.StartsWith(Global.ProtocolShares[source.ConfigType], StringComparison.OrdinalIgnoreCase).Should()
             .BeTrue();
 
         var resolved = FmtHandler.ResolveConfig(uri, out var msg);

v2rayN/ServiceLib.UdpTest/Socks5UdpChannel.cs

@@ -239,7 +239,9 @@ public class Socks5UdpChannel(string socks5Host, int socks5TcpPort) : IDisposabl
 
         var clientAddrForSocks = new Socks5AddressData
         {
-            AddressType = Socks5AddressData.AddrTypeIPv4, Host = "0.0.0.0", Port = 0
+            AddressType = Socks5AddressData.AddrTypeIPv4,
+            Host = "0.0.0.0",
+            Port = 0
         };
         using var udpAssociateReqMs = new MemoryStream();
         udpAssociateReqMs.WriteByte(Socks5Version);
@@ -267,7 +269,7 @@ public class Socks5UdpChannel(string socks5Host, int socks5TcpPort) : IDisposabl
         return true;
     }
 
-    #endregion
+    #endregion SOCKS5 Connection Handling
 
     #region SOCKS5 Address Handling
 
@@ -298,6 +300,7 @@ public class Socks5UdpChannel(string socks5Host, int socks5TcpPort) : IDisposabl
                     }
 
                     break;
+
                 case AddrTypeDomain:
                     if (string.IsNullOrEmpty(Host))
                     {
@@ -311,6 +314,7 @@ public class Socks5UdpChannel(string socks5Host, int socks5TcpPort) : IDisposabl
                     }
 
                     break;
+
                 case AddrTypeIPv6:
                     if (IPAddress.TryParse(Host, out var ip6) && ip6.AddressFamily == AddressFamily.InterNetworkV6)
                     {
@@ -322,6 +326,7 @@ public class Socks5UdpChannel(string socks5Host, int socks5TcpPort) : IDisposabl
                     }
 
                     break;
+
                 default:
                     throw new NotSupportedException($"SOCKS5 address type {AddressType} not supported.");
             }
@@ -355,6 +360,7 @@ public class Socks5UdpChannel(string socks5Host, int socks5TcpPort) : IDisposabl
 
                         addr.Host = new IPAddress(ipv4Bytes).ToString();
                         break;
+
                     case AddrTypeDomain:
                         var lenByte = new byte[1];
                         if (await stream.ReadAsync(lenByte.AsMemory(0, 1), ct).ConfigureAwait(false) < 1)
@@ -379,6 +385,7 @@ public class Socks5UdpChannel(string socks5Host, int socks5TcpPort) : IDisposabl
                         }
 
                         break;
+
                     case AddrTypeIPv6:
                         var ipv6Bytes = new byte[16];
                         if (await stream.ReadAsync(ipv6Bytes.AsMemory(0, 16), ct).ConfigureAwait(false) < 16)
@@ -388,6 +395,7 @@ public class Socks5UdpChannel(string socks5Host, int socks5TcpPort) : IDisposabl
 
                         addr.Host = new IPAddress(ipv6Bytes).ToString();
                         break;
+
                     default:
                         return null;
                 }

v2rayN/ServiceLib.UdpTest/Tester/DnsService.cs

@@ -4,6 +4,7 @@ public class DnsService : IUdpTest
 {
     private const int DnsDefaultPort = 53;
     private const string DnsDefaultServer = "8.8.8.8"; // Google Public DNS
+
     private static readonly byte[] DnsQueryPacket =
     [
         // Header: ID=0x1234, Standard query with RD set, QDCOUNT=1

v2rayN/ServiceLib.UdpTest/Tester/IUdpTest.cs

@@ -3,7 +3,10 @@ namespace ServiceLib.UdpTest.Tester;
 public interface IUdpTest
 {
     public byte[] BuildUdpRequestPacket();
+
     public bool VerifyAndExtractUdpResponse(byte[] udpResponseBytes);
+
     public ushort GetDefaultTargetPort();
+
     public string GetDefaultTargetHost();
 }

v2rayN/ServiceLib.UdpTest/Tester/McBeService.cs

@@ -4,6 +4,7 @@ public class McBeService : IUdpTest
 {
     private const int McBeDefaultPort = 19132;
     private const string McBeDefaultServer = "pms.mc-complex.com";
+
     // 0x01 | client alive time in ms (unsigned long long) | magic | client GUID
     private static readonly byte[] McBeQueryPacket =
     [
@@ -18,11 +19,13 @@ public class McBeService : IUdpTest
         0x66, 0x0E, 0xAB, 0xBC, 0x61, 0x0D, 0x1F, 0x4E,
         0xA4, 0x40, 0x8C, 0x65, 0xC1, 0xBE, 0xF5, 0x4B
     ];
+
     private static readonly byte[] McBeMagicBytes =
     [
         0x00, 0xFF, 0xFF, 0x00, 0xFE, 0xFE, 0xFE, 0xFE,
         0xFD, 0xFD, 0xFD, 0xFD, 0x12, 0x34, 0x56, 0x78
     ];
+
     private static readonly List<string> ValidGameModes =
     [
         "Survival",

v2rayN/ServiceLib.UdpTest/Tester/StunService.cs

@@ -4,6 +4,7 @@ public class StunService : IUdpTest
 {
     private const int StunDefaultPort = 3478;
     private const string StunDefaultServer = "stun.voztovoice.org";
+
     private static readonly byte[] StunBindingRequestPacket =
     [
         // STUN Binding Request

v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs

@@ -5,6 +5,7 @@ namespace ServiceLib.Handler.Fmt;
 public class BaseFmt
 {
     private static readonly string[] _allowInsecureArray = new[] { "insecure", "allowInsecure", "allow_insecure" };
+
     private static string UrlEncodeSafe(string? value) => Utils.UrlEncode(value ?? string.Empty);
 
     protected static string GetIpv6(string address)

v2rayN/ServiceLib/Models/SingboxConfig.cs

@@ -237,6 +237,7 @@ public class Transport4Sbox
 public class Headers4Sbox
 {
     public string? Host { get; set; }
+
     [JsonPropertyName("User-Agent")]
     public string UserAgent { get; set; }
 }

v2rayN/ServiceLib/Models/V2rayConfig.cs

@@ -500,12 +500,16 @@ public class MaskSettings4Ray
 {
     public string? password { get; set; }
     public string? domain { get; set; }
+
     // fragment
     public string? packets { get; set; }
+
     public string? length { get; set; }
     public string? delay { get; set; }
+
     // noise
     public int? reset { get; set; }
+
     public List<NoiseMask4Ray>? noise { get; set; }
 }
 
@@ -533,6 +537,7 @@ public class AccountsItem4Ray
 public class Sockopt4Ray
 {
     public string? dialerProxy { get; set; }
+
     [JsonPropertyName("interface")]
     public string? Interface { get; set; }
 }

v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayOutboundService.cs

@@ -548,6 +548,7 @@ public partial class CoreConfigV2rayService
                     FillOutboundMux(outbound);
 
                     break;
+
                 case nameof(ETransport.grpc):
                     GrpcSettings4Ray grpcSettings = new()
                     {

v2rayN/ServiceLib/Services/UpdateService.cs

@@ -299,7 +299,6 @@ public class UpdateService(Config config, Func<bool, string, Task> updateFunc)
 
             return url;
         }
-
         else if (Utils.IsLinux())
         {
             var arch = RuntimeInformation.ProcessArchitecture;
@@ -314,7 +313,6 @@ public class UpdateService(Config config, Func<bool, string, Task> updateFunc)
                 _ => null,
             };
         }
-        
         else if (Utils.IsMacOS())
         {
             return RuntimeInformation.ProcessArchitecture switch

v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml.cs

@@ -338,21 +338,27 @@ public partial class AddServerWindow : WindowBase<AddServerViewModel>
             case nameof(ETransport.raw):
                 gridTransportRaw.IsVisible = true;
                 break;
+
             case nameof(ETransport.kcp):
                 gridTransportKcp.IsVisible = true;
                 break;
+
             case nameof(ETransport.ws):
                 gridTransportWs.IsVisible = true;
                 break;
+
             case nameof(ETransport.httpupgrade):
                 gridTransportHttpupgrade.IsVisible = true;
                 break;
+
             case nameof(ETransport.xhttp):
                 gridTransportXhttp.IsVisible = true;
                 break;
+
             case nameof(ETransport.grpc):
                 gridTransportGrpc.IsVisible = true;
                 break;
+
             default:
                 gridTransportRaw.IsVisible = true;
                 break;

v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml.cs

@@ -64,7 +64,10 @@ public partial class RoutingSettingWindow : WindowBase<RoutingSettingViewModel>
 
     private void RoutingSettingWindow_Closing(object? sender, WindowClosingEventArgs e)
     {
-        if (_closed) return;
+        if (_closed)
+        {
+            return;
+        }
 
         // DomainStrategy is auto-saved reactively; just ensure the caller knows changes were made
         if (ViewModel?.IsModified == true)

v2rayN/v2rayN/ViewModels/ThemeSettingViewModel.cs

@@ -137,7 +137,7 @@ public class ThemeSettingViewModel : MyReactiveObject
 
     private void ModifyFontSize()
     {
-        double size = (long)CurrentFontSize;
+        double size = CurrentFontSize;
         if (size < Global.MinFontSize)
         {
             return;

v2rayN/v2rayN/Views/AddServerWindow.xaml.cs

@@ -340,21 +340,27 @@ public partial class AddServerWindow
             case nameof(ETransport.raw):
                 gridTransportRaw.Visibility = Visibility.Visible;
                 break;
+
             case nameof(ETransport.kcp):
                 gridTransportKcp.Visibility = Visibility.Visible;
                 break;
+
             case nameof(ETransport.ws):
                 gridTransportWs.Visibility = Visibility.Visible;
                 break;
+
             case nameof(ETransport.httpupgrade):
                 gridTransportHttpupgrade.Visibility = Visibility.Visible;
                 break;
+
             case nameof(ETransport.xhttp):
                 gridTransportXhttp.Visibility = Visibility.Visible;
                 break;
+
             case nameof(ETransport.grpc):
                 gridTransportGrpc.Visibility = Visibility.Visible;
                 break;
+
             default:
                 gridTransportRaw.Visibility = Visibility.Visible;
                 break;

v2rayN/v2rayN/Views/MainWindow.xaml.cs

@@ -170,10 +170,10 @@ public partial class MainWindow
 
     private void OnProgramStarted(object state, bool timeout)
     {
-        Application.Current?.Dispatcher.Invoke((Action)(() =>
+        Application.Current?.Dispatcher.Invoke(() =>
         {
             ShowHideWindow(true);
-        }));
+        });
     }
 
     private async Task DelegateSnackMsg(string content)