up 7.10.5

https://github.com/2dust/v2rayN/issues/6886

v2rayN/AmazTool/Program.cs

@@ -1,10 +1,7 @@
-namespace AmazTool
+namespace AmazTool
 {
     internal static class Program
     {
-        /// <summary>
-        /// 应用程序的主入口点。
-        /// </summary>
         [STAThread]
         private static void Main(string[] args)
         {
@@ -26,4 +23,4 @@
             UpgradeApp.Upgrade(argData);
         }
     }
-}
+}

v2rayN/AmazTool/UpgradeApp.cs

@@ -60,7 +60,10 @@ namespace AmazTool
 
                         var lst = entry.FullName.Split(splitKey);
                         if (lst.Length == 1)
+                        {
                             continue;
+                        }
+
                         var fullName = string.Join(splitKey, lst[1..lst.Length]);
 
                         if (string.Equals(Utils.GetExePath(), Utils.GetPath(fullName), StringComparison.OrdinalIgnoreCase))
@@ -75,7 +78,16 @@ namespace AmazTool
                         {
                             continue;
                         }
-                        entry.ExtractToFile(entryOutputPath, true);
+
+                        try
+                        {
+                            entry.ExtractToFile(entryOutputPath, true);
+                        }
+                        catch
+                        {
+                            Thread.Sleep(1000);
+                            entry.ExtractToFile(entryOutputPath, true);
+                        }
 
                         Console.WriteLine(entryOutputPath);
                     }

v2rayN/AmazTool/Utils.cs

@@ -1,4 +1,4 @@
-using System.Diagnostics;
+using System.Diagnostics;
 
 namespace AmazTool
 {
@@ -16,7 +16,7 @@ namespace AmazTool
 
         public static string GetPath(string fileName)
         {
-            string startupPath = StartupPath();
+            var startupPath = StartupPath();
             if (string.IsNullOrEmpty(fileName))
             {
                 return startupPath;
@@ -49,4 +49,4 @@ namespace AmazTool
             }
         }
     }
-}
+}

v2rayN/Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
 
     <PropertyGroup>
-        <Version>7.10.0</Version>
+        <Version>7.10.5</Version>
     </PropertyGroup>
 
     <PropertyGroup>

v2rayN/Directory.Packages.props

@@ -5,26 +5,26 @@
     <CentralPackageVersionOverrideEnabled>false</CentralPackageVersionOverrideEnabled>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.2.4" />
-    <PackageVersion Include="Avalonia.Desktop" Version="11.2.4" />
-    <PackageVersion Include="Avalonia.Diagnostics" Version="11.2.4" />
-    <PackageVersion Include="Avalonia.ReactiveUI" Version="11.2.4" />
-    <PackageVersion Include="CliWrap" Version="3.8.1" />
-    <PackageVersion Include="Downloader" Version="3.3.3" />
-    <PackageVersion Include="H.NotifyIcon.Wpf" Version="2.2.0" />
+    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.2.5" />
+    <PackageVersion Include="Avalonia.Desktop" Version="11.2.5" />
+    <PackageVersion Include="Avalonia.Diagnostics" Version="11.2.5" />
+    <PackageVersion Include="Avalonia.ReactiveUI" Version="11.2.5" />
+    <PackageVersion Include="CliWrap" Version="3.8.2" />
+    <PackageVersion Include="Downloader" Version="3.3.4" />
+    <PackageVersion Include="H.NotifyIcon.Wpf" Version="2.3.0" />
     <PackageVersion Include="MaterialDesignThemes" Version="5.2.1" />
     <PackageVersion Include="MessageBox.Avalonia" Version="3.2.0" />
     <PackageVersion Include="QRCoder" Version="1.6.0" />
     <PackageVersion Include="ReactiveUI" Version="20.1.63" />
     <PackageVersion Include="ReactiveUI.Fody" Version="19.5.41" />
     <PackageVersion Include="ReactiveUI.WPF" Version="20.1.63" />
-    <PackageVersion Include="Semi.Avalonia" Version="11.2.1.4" />
-    <PackageVersion Include="Semi.Avalonia.DataGrid" Version="11.2.1.4" />
+    <PackageVersion Include="Semi.Avalonia" Version="11.2.1.5" />
+    <PackageVersion Include="Semi.Avalonia.DataGrid" Version="11.2.1.5" />
     <PackageVersion Include="Splat.NLog" Version="15.3.1" />
     <PackageVersion Include="sqlite-net-pcl" Version="1.9.172" />
-    <PackageVersion Include="TaskScheduler" Version="2.12.0" />
+    <PackageVersion Include="TaskScheduler" Version="2.12.1" />
     <PackageVersion Include="WebDav.Client" Version="2.8.0" />
     <PackageVersion Include="YamlDotNet" Version="16.3.0" />
     <PackageVersion Include="ZXing.Net.Bindings.SkiaSharp" Version="0.16.14" />
   </ItemGroup>
-</Project>
+</Project>

v2rayN/ServiceLib/Common/DownloaderHelper.cs

@@ -10,7 +10,7 @@ namespace ServiceLib.Common
 
         public async Task<string?> DownloadStringAsync(IWebProxy? webProxy, string url, string? userAgent, int timeout)
         {
-            if (Utils.IsNullOrEmpty(url))
+            if (url.IsNullOrEmpty())
             {
                 return null;
             }
@@ -18,7 +18,7 @@ namespace ServiceLib.Common
             Uri uri = new(url);
             //Authorization Header
             var headers = new WebHeaderCollection();
-            if (Utils.IsNotEmpty(uri.UserInfo))
+            if (uri.UserInfo.IsNotEmpty())
             {
                 headers.Add(HttpRequestHeader.Authorization, "Basic " + Utils.Base64Encode(uri.UserInfo));
             }
@@ -56,7 +56,7 @@ namespace ServiceLib.Common
 
         public async Task DownloadDataAsync4Speed(IWebProxy webProxy, string url, IProgress<string> progress, int timeout)
         {
-            if (Utils.IsNullOrEmpty(url))
+            if (url.IsNullOrEmpty())
             {
                 throw new ArgumentNullException(nameof(url));
             }
@@ -86,7 +86,7 @@ namespace ServiceLib.Common
             //};
             downloader.DownloadProgressChanged += (sender, value) =>
             {
-                var ts = (DateTime.Now - totalDatetime);
+                var ts = DateTime.Now - totalDatetime;
                 if (progress != null && ts.Seconds > totalSecond)
                 {
                     hasValue = true;
@@ -119,11 +119,11 @@ namespace ServiceLib.Common
 
         public async Task DownloadFileAsync(IWebProxy? webProxy, string url, string fileName, IProgress<double> progress, int timeout)
         {
-            if (Utils.IsNullOrEmpty(url))
+            if (url.IsNullOrEmpty())
             {
                 throw new ArgumentNullException(nameof(url));
             }
-            if (Utils.IsNullOrEmpty(fileName))
+            if (fileName.IsNullOrEmpty())
             {
                 throw new ArgumentNullException(nameof(fileName));
             }
@@ -146,10 +146,7 @@ namespace ServiceLib.Common
             var progressPercentage = 0;
             var hasValue = false;
             await using var downloader = new Downloader.DownloadService(downloadOpt);
-            downloader.DownloadStarted += (sender, value) =>
-            {
-                progress?.Report(0);
-            };
+            downloader.DownloadStarted += (sender, value) => progress?.Report(0);
             downloader.DownloadProgressChanged += (sender, value) =>
             {
                 hasValue = true;

v2rayN/ServiceLib/Common/FileManager.cs

@@ -1,4 +1,4 @@
-using System.Formats.Tar;
+using System.Formats.Tar;
 using System.IO.Compression;
 using System.Text;
 
@@ -99,7 +99,7 @@ namespace ServiceLib.Common
                     }
                     try
                     {
-                        if (Utils.IsNotEmpty(ignoredName) && entry.Name.Contains(ignoredName))
+                        if (ignoredName.IsNotEmpty() && entry.Name.Contains(ignoredName))
                         {
                             continue;
                         }
@@ -163,18 +163,20 @@ namespace ServiceLib.Common
 
             // Check if the source directory exists
             if (!dir.Exists)
+            {
                 throw new DirectoryNotFoundException($"Source directory not found: {dir.FullName}");
+            }
 
             // Cache directories before we start copying
             var dirs = dir.GetDirectories();
 
             // Create the destination directory
-            Directory.CreateDirectory(destinationDir);
+            _ = Directory.CreateDirectory(destinationDir);
 
             // Get the files in the source directory and copy to the destination directory
             foreach (var file in dir.GetFiles())
             {
-                if (Utils.IsNotEmpty(ignoredName) && file.Name.Contains(ignoredName))
+                if (ignoredName.IsNotEmpty() && file.Name.Contains(ignoredName))
                 {
                     continue;
                 }
@@ -187,7 +189,7 @@ namespace ServiceLib.Common
                 {
                     continue;
                 }
-                file.CopyTo(targetFilePath, overwrite);
+                _ = file.CopyTo(targetFilePath, overwrite);
             }
 
             // If recursive and copying subdirectories, recursively call this method
@@ -222,4 +224,4 @@ namespace ServiceLib.Common
             }
         }
     }
-}
+}

v2rayN/ServiceLib/Common/HttpClientHelper.cs

@@ -18,12 +18,17 @@ namespace ServiceLib.Common
         public static HttpClientHelper Instance => _instance.Value;
         private readonly HttpClient httpClient;
 
-        private HttpClientHelper(HttpClient httpClient) => this.httpClient = httpClient;
+        private HttpClientHelper(HttpClient httpClient)
+        {
+            this.httpClient = httpClient;
+        }
 
         public async Task<string?> TryGetAsync(string url)
         {
-            if (Utils.IsNullOrEmpty(url))
+            if (url.IsNullOrEmpty())
+            {
                 return null;
+            }
 
             try
             {
@@ -38,15 +43,19 @@ namespace ServiceLib.Common
 
         public async Task<string?> GetAsync(string url)
         {
-            if (Utils.IsNullOrEmpty(url))
+            if (url.IsNullOrEmpty())
+            {
                 return null;
+            }
             return await httpClient.GetStringAsync(url);
         }
 
         public async Task<string?> GetAsync(HttpClient client, string url, CancellationToken token = default)
         {
-            if (Utils.IsNullOrEmpty(url))
+            if (url.IsNullOrEmpty())
+            {
                 return null;
+            }
             return await client.GetStringAsync(url, token);
         }
 
@@ -55,13 +64,13 @@ namespace ServiceLib.Common
             var jsonContent = JsonUtils.Serialize(headers);
             var content = new StringContent(jsonContent, Encoding.UTF8, MediaTypeNames.Application.Json);
 
-            var result = await httpClient.PutAsync(url, content);
+            await httpClient.PutAsync(url, content);
         }
 
         public async Task PatchAsync(string url, Dictionary<string, string> headers)
         {
             var myContent = JsonUtils.Serialize(headers);
-            var buffer = System.Text.Encoding.UTF8.GetBytes(myContent);
+            var buffer = Encoding.UTF8.GetBytes(myContent);
             var byteContent = new ByteArrayContent(buffer);
             byteContent.Headers.ContentType = new MediaTypeHeaderValue("application/json");
 
@@ -78,12 +87,16 @@ namespace ServiceLib.Common
             ArgumentNullException.ThrowIfNull(url);
             ArgumentNullException.ThrowIfNull(fileName);
             if (File.Exists(fileName))
+            {
                 File.Delete(fileName);
+            }
 
             using var response = await client.GetAsync(url, HttpCompletionOption.ResponseHeadersRead, token);
 
             if (!response.IsSuccessStatusCode)
+            {
                 throw new Exception(response.StatusCode.ToString());
+            }
 
             var total = response.Content.Headers.ContentLength ?? -1L;
             var canReportProgress = total != -1 && progress != null;
@@ -102,7 +115,9 @@ namespace ServiceLib.Common
                 totalRead += read;
 
                 if (read == 0)
+                {
                     break;
+                }
                 await file.WriteAsync(buffer.AsMemory(0, read), token);
 
                 if (canReportProgress)
@@ -123,7 +138,7 @@ namespace ServiceLib.Common
 
         public async Task DownloadDataAsync4Speed(HttpClient client, string url, IProgress<string> progress, CancellationToken token = default)
         {
-            if (Utils.IsNullOrEmpty(url))
+            if (url.IsNullOrEmpty())
             {
                 throw new ArgumentNullException(nameof(url));
             }
@@ -173,7 +188,7 @@ namespace ServiceLib.Common
 
                     totalRead += read;
 
-                    var ts = (DateTime.Now - totalDatetime);
+                    var ts = DateTime.Now - totalDatetime;
                     if (progress != null && ts.Seconds > totalSecond)
                     {
                         totalSecond = ts.Seconds;

v2rayN/ServiceLib/Common/Job.cs

@@ -15,27 +15,29 @@ namespace ServiceLib.Common
         public Job()
         {
             handle = CreateJobObject(IntPtr.Zero, null);
-            IntPtr extendedInfoPtr = IntPtr.Zero;
-            JOBOBJECT_BASIC_LIMIT_INFORMATION info = new()
+            var extendedInfoPtr = IntPtr.Zero;
+            var info = new JOBOBJECT_BASIC_LIMIT_INFORMATION
             {
                 LimitFlags = 0x2000
             };
 
-            JOBOBJECT_EXTENDED_LIMIT_INFORMATION extendedInfo = new()
+            var extendedInfo = new JOBOBJECT_EXTENDED_LIMIT_INFORMATION
             {
                 BasicLimitInformation = info
             };
 
             try
             {
-                int length = Marshal.SizeOf(typeof(JOBOBJECT_EXTENDED_LIMIT_INFORMATION));
+                var length = Marshal.SizeOf(typeof(JOBOBJECT_EXTENDED_LIMIT_INFORMATION));
                 extendedInfoPtr = Marshal.AllocHGlobal(length);
                 Marshal.StructureToPtr(extendedInfo, extendedInfoPtr, false);
 
                 if (!SetInformationJobObject(handle, JobObjectInfoType.ExtendedLimitInformation, extendedInfoPtr,
                         (uint)length))
+                {
                     throw new Exception(string.Format("Unable to set information.  Error: {0}",
                         Marshal.GetLastWin32Error()));
+                }
             }
             finally
             {
@@ -48,7 +50,7 @@ namespace ServiceLib.Common
 
         public bool AddProcess(IntPtr processHandle)
         {
-            bool succ = AssignProcessToJobObject(handle, processHandle);
+            var succ = AssignProcessToJobObject(handle, processHandle);
 
             if (!succ)
             {
@@ -76,7 +78,9 @@ namespace ServiceLib.Common
         private void Dispose(bool disposing)
         {
             if (disposed)
+            {
                 return;
+            }
             disposed = true;
 
             if (disposing)
@@ -104,7 +108,7 @@ namespace ServiceLib.Common
         private static extern IntPtr CreateJobObject(IntPtr a, string? lpName);
 
         [DllImport("kernel32.dll", SetLastError = true)]
-        private static extern bool SetInformationJobObject(IntPtr hJob, JobObjectInfoType infoType, IntPtr lpJobObjectInfo, UInt32 cbJobObjectInfoLength);
+        private static extern bool SetInformationJobObject(IntPtr hJob, JobObjectInfoType infoType, IntPtr lpJobObjectInfo, uint cbJobObjectInfoLength);
 
         [DllImport("kernel32.dll", SetLastError = true)]
         private static extern bool AssignProcessToJobObject(IntPtr job, IntPtr process);
@@ -121,34 +125,34 @@ namespace ServiceLib.Common
     [StructLayout(LayoutKind.Sequential)]
     internal struct IO_COUNTERS
     {
-        public UInt64 ReadOperationCount;
-        public UInt64 WriteOperationCount;
-        public UInt64 OtherOperationCount;
-        public UInt64 ReadTransferCount;
-        public UInt64 WriteTransferCount;
-        public UInt64 OtherTransferCount;
+        public ulong ReadOperationCount;
+        public ulong WriteOperationCount;
+        public ulong OtherOperationCount;
+        public ulong ReadTransferCount;
+        public ulong WriteTransferCount;
+        public ulong OtherTransferCount;
     }
 
     [StructLayout(LayoutKind.Sequential)]
     internal struct JOBOBJECT_BASIC_LIMIT_INFORMATION
     {
-        public Int64 PerProcessUserTimeLimit;
-        public Int64 PerJobUserTimeLimit;
-        public UInt32 LimitFlags;
+        public long PerProcessUserTimeLimit;
+        public long PerJobUserTimeLimit;
+        public uint LimitFlags;
         public UIntPtr MinimumWorkingSetSize;
         public UIntPtr MaximumWorkingSetSize;
-        public UInt32 ActiveProcessLimit;
+        public uint ActiveProcessLimit;
         public UIntPtr Affinity;
-        public UInt32 PriorityClass;
-        public UInt32 SchedulingClass;
+        public uint PriorityClass;
+        public uint SchedulingClass;
     }
 
     [StructLayout(LayoutKind.Sequential)]
     public struct SECURITY_ATTRIBUTES
     {
-        public UInt32 nLength;
+        public uint nLength;
         public IntPtr lpSecurityDescriptor;
-        public Int32 bInheritHandle;
+        public int bInheritHandle;
     }
 
     [StructLayout(LayoutKind.Sequential)]

v2rayN/ServiceLib/Common/Logging.cs

@@ -28,7 +28,9 @@ namespace ServiceLib.Common
         public static void SaveLog(string strContent)
         {
             if (!LogManager.IsLoggingEnabled())
+            {
                 return;
+            }
 
             LogManager.GetLogger("Log1").Info(strContent);
         }
@@ -36,7 +38,9 @@ namespace ServiceLib.Common
         public static void SaveLog(string strTitle, Exception ex)
         {
             if (!LogManager.IsLoggingEnabled())
+            {
                 return;
+            }
 
             var logger = LogManager.GetLogger("Log2");
             logger.Debug($"{strTitle},{ex.Message}");

v2rayN/ServiceLib/Common/ProcUtils.cs

@@ -8,7 +8,7 @@ public static class ProcUtils
 
     public static void ProcessStart(string? fileName, string arguments = "")
     {
-        ProcessStart(fileName, arguments, null);
+        _ = ProcessStart(fileName, arguments, null);
     }
 
     public static int? ProcessStart(string? fileName, string arguments, string? dir)
@@ -38,7 +38,7 @@ public static class ProcUtils
                     WorkingDirectory = dir ?? string.Empty
                 }
             };
-            proc.Start();
+            _ = proc.Start();
             return dir is null ? null : proc.Id;
         }
         catch (Exception ex)
@@ -60,7 +60,7 @@ public static class ProcUtils
                 FileName = Utils.GetExePath().AppendQuotes(),
                 Verb = blAdmin ? "runas" : null,
             };
-            Process.Start(startInfo);
+            _ = Process.Start(startInfo);
         }
         catch (Exception ex)
         {
@@ -138,7 +138,9 @@ public static class ProcUtils
         fileName = null;
         processName = null;
         if (!review)
+        {
             return;
+        }
         try
         {
             procId = proc?.Id;

v2rayN/ServiceLib/Common/QRCodeHelper.cs

@@ -60,7 +60,7 @@ namespace ServiceLib.Common
             var reader = new BarcodeReader();
             var result = reader.Decode(bitmap);
 
-            if (result != null && Utils.IsNotEmpty(result.Text))
+            if (result != null && result.Text.IsNotEmpty())
             {
                 return result.Text;
             }

v2rayN/ServiceLib/Common/SemanticVersion.cs

@@ -1,29 +1,29 @@
-namespace ServiceLib.Common
+namespace ServiceLib.Common
 {
     public class SemanticVersion
     {
-        private int major;
-        private int minor;
-        private int patch;
-        private string version;
+        private readonly int major;
+        private readonly int minor;
+        private readonly int patch;
+        private readonly string version;
 
         public SemanticVersion(int major, int minor, int patch)
         {
             this.major = major;
             this.minor = minor;
             this.patch = patch;
-            this.version = $"{major}.{minor}.{patch}";
+            version = $"{major}.{minor}.{patch}";
         }
 
         public SemanticVersion(string? version)
         {
             try
             {
-                if (version.IsNullOrEmpty())
+                if (string.IsNullOrEmpty(version))
                 {
-                    this.major = 0;
-                    this.minor = 0;
-                    this.patch = 0;
+                    major = 0;
+                    minor = 0;
+                    patch = 0;
                     return;
                 }
                 this.version = version.RemovePrefix('v');
@@ -31,15 +31,15 @@
                 var parts = this.version.Split('.');
                 if (parts.Length == 2)
                 {
-                    this.major = int.Parse(parts.First());
-                    this.minor = int.Parse(parts.Last());
-                    this.patch = 0;
+                    major = int.Parse(parts.First());
+                    minor = int.Parse(parts.Last());
+                    patch = 0;
                 }
                 else if (parts.Length is 3 or 4)
                 {
-                    this.major = int.Parse(parts[0]);
-                    this.minor = int.Parse(parts[1]);
-                    this.patch = int.Parse(parts[2]);
+                    major = int.Parse(parts[0]);
+                    minor = int.Parse(parts[1]);
+                    patch = int.Parse(parts[2]);
                 }
                 else
                 {
@@ -48,9 +48,9 @@
             }
             catch
             {
-                this.major = 0;
-                this.minor = 0;
-                this.patch = 0;
+                major = 0;
+                minor = 0;
+                patch = 0;
             }
         }
 
@@ -58,7 +58,7 @@
         {
             if (obj is SemanticVersion other)
             {
-                return this.major == other.major && this.minor == other.minor && this.patch == other.patch;
+                return major == other.major && minor == other.minor && patch == other.patch;
             }
             else
             {
@@ -68,7 +68,7 @@
 
         public override int GetHashCode()
         {
-            return this.major.GetHashCode() ^ this.minor.GetHashCode() ^ this.patch.GetHashCode();
+            return major.GetHashCode() ^ minor.GetHashCode() ^ patch.GetHashCode();
         }
 
         /// <summary>
@@ -77,18 +77,18 @@
         /// <returns>major.minor.patch</returns>
         public override string ToString()
         {
-            return this.version;
+            return version;
         }
 
         public string ToVersionString(string? prefix = null)
         {
             if (prefix == null)
             {
-                return this.version;
+                return version;
             }
             else
             {
-                return $"{prefix}{this.version}";
+                return $"{prefix}{version}";
             }
         }
 
@@ -108,31 +108,31 @@
 
         private bool GreaterEquals(SemanticVersion other)
         {
-            if (this.major < other.major)
+            if (major < other.major)
             {
                 return false;
             }
-            else if (this.major > other.major)
+            else if (major > other.major)
             {
                 return true;
             }
             else
             {
-                if (this.minor < other.minor)
+                if (minor < other.minor)
                 {
                     return false;
                 }
-                else if (this.minor > other.minor)
+                else if (minor > other.minor)
                 {
                     return true;
                 }
                 else
                 {
-                    if (this.patch < other.patch)
+                    if (patch < other.patch)
                     {
                         return false;
                     }
-                    else if (this.patch > other.patch)
+                    else if (patch > other.patch)
                     {
                         return true;
                     }
@@ -146,31 +146,31 @@
 
         private bool LessEquals(SemanticVersion other)
         {
-            if (this.major < other.major)
+            if (major < other.major)
             {
                 return true;
             }
-            else if (this.major > other.major)
+            else if (major > other.major)
             {
                 return false;
             }
             else
             {
-                if (this.minor < other.minor)
+                if (minor < other.minor)
                 {
                     return true;
                 }
-                else if (this.minor > other.minor)
+                else if (minor > other.minor)
                 {
                     return false;
                 }
                 else
                 {
-                    if (this.patch < other.patch)
+                    if (patch < other.patch)
                     {
                         return true;
                     }
-                    else if (this.patch > other.patch)
+                    else if (patch > other.patch)
                     {
                         return false;
                     }
@@ -184,4 +184,4 @@
 
         #endregion Private
     }
-}
+}

v2rayN/ServiceLib/Common/SqliteHelper.cs

@@ -7,7 +7,7 @@ namespace ServiceLib.Common
     {
         private static readonly Lazy<SQLiteHelper> _instance = new(() => new());
         public static SQLiteHelper Instance => _instance.Value;
-        private string _connstr;
+        private readonly string _connstr;
         private SQLiteConnection _db;
         private SQLiteAsyncConnection _dbAsync;
         private readonly string _configDB = "guiNDB.db";

v2rayN/ServiceLib/Common/StringEx.cs

@@ -6,7 +6,7 @@ namespace ServiceLib.Common
     {
         public static bool IsNullOrEmpty([NotNullWhen(false)] this string? value)
         {
-            return string.IsNullOrEmpty(value);
+            return string.IsNullOrEmpty(value) || string.IsNullOrWhiteSpace(value);
         }
 
         public static bool IsNullOrWhiteSpace([NotNullWhen(false)] this string? value)
@@ -22,7 +22,9 @@ namespace ServiceLib.Common
         public static bool BeginWithAny(this string s, IEnumerable<char> chars)
         {
             if (s.IsNullOrEmpty())
+            {
                 return false;
+            }
             return chars.Contains(s.First());
         }
 
@@ -36,7 +38,9 @@ namespace ServiceLib.Common
             while (reader.ReadLine() is { } line)
             {
                 if (line.IsWhiteSpace())
+                {
                     continue;
+                }
                 yield return line;
             }
         }
@@ -70,5 +74,10 @@ namespace ServiceLib.Common
         {
             return string.IsNullOrEmpty(value) ? string.Empty : $"\"{value}\"";
         }
+
+        public static int ToInt(this string? value, int defaultValue = 0)
+        {
+            return int.TryParse(value, out var result) ? result : defaultValue;
+        }
     }
 }

v2rayN/ServiceLib/Common/Utils.cs

@@ -20,85 +20,69 @@ namespace ServiceLib.Common
         #region 转换函数
 
         /// <summary>
-        /// 转逗号分隔的字符串
+        /// Convert to comma-separated string
         /// </summary>
         /// <param name="lst"></param>
         /// <param name="wrap"></param>
         /// <returns></returns>
         public static string List2String(List<string>? lst, bool wrap = false)
         {
+            if (lst == null || lst.Count == 0)
+            {
+                return string.Empty;
+            }
+
+            var separator = wrap ? "," + Environment.NewLine : ",";
+
             try
             {
-                if (lst == null)
-                {
-                    return string.Empty;
-                }
-                if (wrap)
-                {
-                    return string.Join("," + Environment.NewLine, lst);
-                }
-                else
-                {
-                    return string.Join(",", lst);
-                }
+                return string.Join(separator, lst);
             }
             catch (Exception ex)
             {
                 Logging.SaveLog(_tag, ex);
+                return string.Empty;
             }
-
-            return string.Empty;
         }
 
         /// <summary>
-        /// 逗号分隔的字符串
+        /// Comma-separated string
         /// </summary>
         /// <param name="str"></param>
         /// <returns></returns>
         public static List<string>? String2List(string? str)
         {
+            if (string.IsNullOrWhiteSpace(str))
+            {
+                return null;
+            }
+
             try
             {
-                if (str == null)
-                {
-                    return null;
-                }
-
-                str = str.Replace(Environment.NewLine, "");
+                str = str.Replace(Environment.NewLine, string.Empty);
                 return new List<string>(str.Split(',', StringSplitOptions.RemoveEmptyEntries));
             }
             catch (Exception ex)
             {
                 Logging.SaveLog(_tag, ex);
+                return null;
             }
-
-            return null;
         }
 
         /// <summary>
-        /// 逗号分隔的字符串,先排序后转List
+        /// Comma-separated string, sorted and then converted to List
         /// </summary>
         /// <param name="str"></param>
         /// <returns></returns>
         public static List<string>? String2ListSorted(string str)
         {
-            try
-            {
-                str = str.Replace(Environment.NewLine, "");
-                List<string> list = new(str.Split(',', StringSplitOptions.RemoveEmptyEntries));
-                list.Sort();
-                return list;
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(_tag, ex);
-            }
-
-            return null;
+            var lst = String2List(str);
+            lst?.Sort();
+            return lst;
         }
 
         /// <summary>
-        /// Base64编码
+        /// Base64 Encode
         /// </summary>
         /// <param name="plainText"></param>
         /// <returns></returns>
@@ -118,7 +102,7 @@ namespace ServiceLib.Common
         }
 
         /// <summary>
-        /// Base64解码
+        /// Base64 Decode
         /// </summary>
         /// <param name="plainText"></param>
         /// <returns></returns>
@@ -127,7 +111,10 @@ namespace ServiceLib.Common
             try
             {
                 if (plainText.IsNullOrEmpty())
+                {
                     return "";
+                }
+
                 plainText = plainText.Trim()
                     .Replace(Environment.NewLine, "")
                     .Replace("\n", "")
@@ -152,18 +139,6 @@ namespace ServiceLib.Common
             return string.Empty;
         }
 
-        public static int ToInt(object? obj)
-        {
-            try
-            {
-                return Convert.ToInt32(obj ?? string.Empty);
-            }
-            catch
-            {
-                return 0;
-            }
-        }
-
         public static bool ToBool(object obj)
         {
             try
@@ -188,55 +163,25 @@ namespace ServiceLib.Common
             }
         }
 
-        private static void ToHumanReadable(long amount, out double result, out string unit)
-        {
-            var factor = 1024u;
-            //long KBs = amount / factor;
-            var KBs = amount;
-            if (KBs > 0)
-            {
-                // multi KB
-                var MBs = KBs / factor;
-                if (MBs > 0)
-                {
-                    // multi MB
-                    var GBs = MBs / factor;
-                    if (GBs > 0)
-                    {
-                        // multi GB
-                        var TBs = GBs / factor;
-                        if (TBs > 0)
-                        {
-                            result = TBs + ((GBs % factor) / (factor + 0.0));
-                            unit = "TB";
-                            return;
-                        }
-
-                        result = GBs + ((MBs % factor) / (factor + 0.0));
-                        unit = "GB";
-                        return;
-                    }
-
-                    result = MBs + ((KBs % factor) / (factor + 0.0));
-                    unit = "MB";
-                    return;
-                }
-
-                result = KBs + ((amount % factor) / (factor + 0.0));
-                unit = "KB";
-                return;
-            }
-            else
-            {
-                result = amount;
-                unit = "B";
-            }
-        }
-
         public static string HumanFy(long amount)
         {
-            ToHumanReadable(amount, out var result, out var unit);
-            return $"{result:f1} {unit}";
+            if (amount <= 0)
+            {
+                return $"{amount:f1} B";
+            }
+
+            string[] units = ["KB", "MB", "GB", "TB", "PB"];
+            var unitIndex = 0;
+            double size = amount;
+
+            // Loop and divide by 1024 until a suitable unit is found
+            while (size >= 1024 && unitIndex < units.Length - 1)
+            {
+                size /= 1024;
+                unitIndex++;
+            }
+
+            return $"{size:f1} {units[unitIndex]}";
         }
 
         public static string UrlEncode(string url)
@@ -252,7 +197,7 @@ namespace ServiceLib.Common
         public static NameValueCollection ParseQueryString(string query)
         {
             var result = new NameValueCollection(StringComparer.OrdinalIgnoreCase);
-            if (IsNullOrEmpty(query))
+            if (query.IsNullOrEmpty())
             {
                 return result;
             }
@@ -280,15 +225,54 @@ namespace ServiceLib.Common
 
         public static string GetMd5(string str)
         {
-            var byteOld = Encoding.UTF8.GetBytes(str);
-            var byteNew = MD5.HashData(byteOld);
-            StringBuilder sb = new(32);
-            foreach (var b in byteNew)
+            if (string.IsNullOrEmpty(str))
             {
-                sb.Append(b.ToString("x2"));
+                return string.Empty;
             }
 
-            return sb.ToString();
+            try
+            {
+                var byteOld = Encoding.UTF8.GetBytes(str);
+                var byteNew = MD5.HashData(byteOld);
+                StringBuilder sb = new(32);
+                foreach (var b in byteNew)
+                {
+                    sb.Append(b.ToString("x2"));
+                }
+
+                return sb.ToString();
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(_tag, ex);
+                return string.Empty;
+            }
+        }
+
+        public static string GetFileHash(string filePath)
+        {
+            if (string.IsNullOrEmpty(filePath))
+            {
+                return string.Empty;
+            }
+
+            if (!File.Exists(filePath))
+            {
+                return string.Empty;
+            }
+
+            try
+            {
+                using var md5 = MD5.Create();
+                using var stream = File.OpenRead(filePath);
+                var hash = md5.ComputeHash(stream);
+                return BitConverter.ToString(hash).Replace("-", "").ToLowerInvariant();
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(_tag, ex);
+                return string.Empty;
+            }
         }
 
         /// <summary>
@@ -298,7 +282,7 @@ namespace ServiceLib.Common
         /// <returns></returns>
         public static string GetPunycode(string url)
         {
-            if (Utils.IsNullOrEmpty(url))
+            if (url.IsNullOrEmpty())
             {
                 return url;
             }
@@ -331,7 +315,7 @@ namespace ServiceLib.Common
 
         public static string Convert2Comma(string text)
         {
-            if (IsNullOrEmpty(text))
+            if (text.IsNullOrEmpty())
             {
                 return text;
             }
@@ -344,7 +328,7 @@ namespace ServiceLib.Common
         #region 数据检查
 
         /// <summary>
-        /// 判断输入的是否是数字
+        /// Determine if the input is a number
         /// </summary>
         /// <param name="oText"></param>
         /// <returns></returns>
@@ -353,28 +337,13 @@ namespace ServiceLib.Common
             return oText.All(char.IsNumber);
         }
 
-        public static bool IsNullOrEmpty(string? text)
-        {
-            if (string.IsNullOrWhiteSpace(text))
-            {
-                return true;
-            }
-
-            return text == "null";
-        }
-
-        public static bool IsNotEmpty(string? text)
-        {
-            return !string.IsNullOrEmpty(text);
-        }
-
         /// <summary>
-        /// 验证Domain地址是否合法
+        /// Validate if the domain address is valid
         /// </summary>
         /// <param name="domain"></param>
         public static bool IsDomain(string? domain)
         {
-            if (IsNullOrEmpty(domain))
+            if (domain.IsNullOrEmpty())
             {
                 return false;
             }
@@ -491,7 +460,7 @@ namespace ServiceLib.Common
         }
 
         /// <summary>
-        /// 取得版本
+        /// Get version
         /// </summary>
         /// <returns></returns>
         public static string GetVersion(bool blFull = true)
@@ -529,7 +498,7 @@ namespace ServiceLib.Common
         }
 
         /// <summary>
-        /// 取得GUID
+        /// GUID
         /// </summary>
         /// <returns></returns>
         public static string GetGuid(bool full = true)
@@ -634,13 +603,20 @@ namespace ServiceLib.Common
         {
             try
             {
+                var basePath = GetBaseDirectory();
                 //When this file exists, it is equivalent to having no permission to read and write
-                if (File.Exists(Path.Combine(GetBaseDirectory(), "NotStoreConfigHere.txt")))
+                if (File.Exists(Path.Combine(basePath, "NotStoreConfigHere.txt")))
                 {
                     return false;
                 }
 
-                var tempPath = Path.Combine(GetBaseDirectory(), "guiTemps");
+                //Check if it is installed by Windows WinGet
+                if (IsWindows() && basePath.Contains("Users") && basePath.Contains("WinGet"))
+                {
+                    return false;
+                }
+
+                var tempPath = Path.Combine(basePath, "guiTemps");
                 if (!Directory.Exists(tempPath))
                 {
                     Directory.CreateDirectory(tempPath);
@@ -660,7 +636,7 @@ namespace ServiceLib.Common
         public static string GetPath(string fileName)
         {
             var startupPath = StartupPath();
-            if (IsNullOrEmpty(fileName))
+            if (fileName.IsNullOrEmpty())
             {
                 return startupPath;
             }
@@ -696,7 +672,7 @@ namespace ServiceLib.Common
                 Directory.CreateDirectory(tempPath);
             }
 
-            if (IsNullOrEmpty(filename))
+            if (filename.IsNullOrEmpty())
             {
                 return tempPath;
             }
@@ -725,7 +701,7 @@ namespace ServiceLib.Common
                 Directory.CreateDirectory(tempPath);
             }
 
-            if (Utils.IsNullOrEmpty(filename))
+            if (filename.IsNullOrEmpty())
             {
                 return tempPath;
             }
@@ -752,7 +728,7 @@ namespace ServiceLib.Common
                 }
             }
 
-            if (IsNullOrEmpty(filename))
+            if (filename.IsNullOrEmpty())
             {
                 return tempPath;
             }
@@ -770,7 +746,7 @@ namespace ServiceLib.Common
                 Directory.CreateDirectory(tempPath);
             }
 
-            if (Utils.IsNullOrEmpty(filename))
+            if (filename.IsNullOrEmpty())
             {
                 return tempPath;
             }
@@ -788,7 +764,7 @@ namespace ServiceLib.Common
                 Directory.CreateDirectory(tempPath);
             }
 
-            if (Utils.IsNullOrEmpty(filename))
+            if (filename.IsNullOrEmpty())
             {
                 return tempPath;
             }
@@ -806,7 +782,7 @@ namespace ServiceLib.Common
                 Directory.CreateDirectory(tempPath);
             }
 
-            if (Utils.IsNullOrEmpty(filename))
+            if (filename.IsNullOrEmpty())
             {
                 return tempPath;
             }

v2rayN/ServiceLib/Common/WindowsUtils.cs

@@ -15,7 +15,7 @@ namespace ServiceLib.Common
             {
                 regKey = Registry.CurrentUser.OpenSubKey(path, false);
                 var value = regKey?.GetValue(name) as string;
-                return Utils.IsNullOrEmpty(value) ? def : value;
+                return value.IsNullOrEmpty() ? def : value;
             }
             catch (Exception ex)
             {
@@ -34,7 +34,7 @@ namespace ServiceLib.Common
             try
             {
                 regKey = Registry.CurrentUser.CreateSubKey(path);
-                if (Utils.IsNullOrEmpty(value.ToString()))
+                if (value.ToString().IsNullOrEmpty())
                 {
                     regKey?.DeleteValue(name, false);
                 }
@@ -63,7 +63,7 @@ namespace ServiceLib.Common
                 var arg = $$""" /remove-device  "SWD\Wintun\{{{guid}}}" """;
 
                 // Try to remove the device
-                await Utils.GetCliWrapOutput(pnpUtilPath, arg);
+                _ = await Utils.GetCliWrapOutput(pnpUtilPath, arg);
             }
             catch (Exception ex)
             {

v2rayN/ServiceLib/Common/YamlUtils.cs

@@ -1,4 +1,4 @@
-using YamlDotNet.Core;
+using YamlDotNet.Core;
 using YamlDotNet.Serialization;
 using YamlDotNet.Serialization.NamingConventions;
 
@@ -62,9 +62,6 @@ namespace ServiceLib.Common
 
         public static string? PreprocessYaml(string str)
         {
-            var deserializer = new DeserializerBuilder()
-                .WithNamingConvention(PascalCaseNamingConvention.Instance)
-                .Build();
             try
             {
                 var mergingParser = new MergingParser(new Parser(new StringReader(str)));
@@ -80,4 +77,4 @@ namespace ServiceLib.Common
 
         #endregion YAML
     }
-}
+}

v2rayN/ServiceLib/Global.cs

@@ -265,7 +265,8 @@ namespace ServiceLib
             "utp",
             "wechat-video",
             "dtls",
-            "wireguard"
+            "wireguard",
+            "dns"
         ];
 
         public static readonly List<string> CoreTypes =

v2rayN/ServiceLib/Handler/AppHandler.cs

@@ -80,8 +80,6 @@ namespace ServiceLib.Handler
             Logging.SaveLog($"v2rayN start up | {Utils.GetRuntimeInfo()}");
             Logging.LoggingEnabled(_config.GuiItem.EnableLog);
 
-            ClearExpiredFiles();
-
             return true;
         }
 
@@ -92,16 +90,6 @@ namespace ServiceLib.Handler
             return true;
         }
 
-        private void ClearExpiredFiles()
-        {
-            Task.Run(() =>
-            {
-                FileManager.DeleteExpiredFiles(Utils.GetLogPath(), DateTime.Now.AddMonths(-1));
-                FileManager.DeleteExpiredFiles(Utils.GetTempPath(), DateTime.Now.AddMonths(-1));
-                FileManager.DeleteExpiredFiles(Utils.GetBinConfigPath(), DateTime.Now.AddHours(-1));
-            });
-        }
-
         #endregion Init
 
         #region Config
@@ -143,7 +131,7 @@ namespace ServiceLib.Handler
 
         public async Task<List<ProfileItem>?> ProfileItems(string subid)
         {
-            if (Utils.IsNullOrEmpty(subid))
+            if (subid.IsNullOrEmpty())
             {
                 return await SQLiteHelper.Instance.TableAsync<ProfileItem>().ToListAsync();
             }
@@ -165,11 +153,11 @@ namespace ServiceLib.Handler
                         from ProfileItem a
                         left join SubItem b on a.subid = b.id
                         where 1=1 ";
-            if (Utils.IsNotEmpty(subid))
+            if (subid.IsNotEmpty())
             {
                 sql += $" and a.subid = '{subid}'";
             }
-            if (Utils.IsNotEmpty(filter))
+            if (filter.IsNotEmpty())
             {
                 if (filter.Contains('\''))
                 {
@@ -183,7 +171,7 @@ namespace ServiceLib.Handler
 
         public async Task<ProfileItem?> GetProfileItem(string indexId)
         {
-            if (Utils.IsNullOrEmpty(indexId))
+            if (indexId.IsNullOrEmpty())
             {
                 return null;
             }
@@ -192,7 +180,7 @@ namespace ServiceLib.Handler
 
         public async Task<ProfileItem?> GetProfileItemViaRemarks(string? remarks)
         {
-            if (Utils.IsNullOrEmpty(remarks))
+            if (remarks.IsNullOrEmpty())
             {
                 return null;
             }

v2rayN/ServiceLib/Handler/AutoStartupHandler.cs

@@ -85,7 +85,7 @@ namespace ServiceLib.Handler
         /// <exception cref="ArgumentNullException"></exception>
         public static void AutoStartTaskService(string taskName, string fileName, string description)
         {
-            if (Utils.IsNullOrEmpty(taskName))
+            if (taskName.IsNullOrEmpty())
             {
                 return;
             }
@@ -93,7 +93,7 @@ namespace ServiceLib.Handler
             var logonUser = WindowsIdentity.GetCurrent().Name;
             using var taskService = new Microsoft.Win32.TaskScheduler.TaskService();
             var tasks = taskService.RootFolder.GetTasks(new Regex(taskName));
-            if (Utils.IsNullOrEmpty(fileName))
+            if (fileName.IsNullOrEmpty())
             {
                 foreach (var t in tasks)
                 {
@@ -109,7 +109,7 @@ namespace ServiceLib.Handler
             task.Settings.RunOnlyIfIdle = false;
             task.Settings.IdleSettings.StopOnIdleEnd = false;
             task.Settings.ExecutionTimeLimit = TimeSpan.Zero;
-            task.Triggers.Add(new Microsoft.Win32.TaskScheduler.LogonTrigger { UserId = logonUser, Delay = TimeSpan.FromSeconds(10) });
+            task.Triggers.Add(new Microsoft.Win32.TaskScheduler.LogonTrigger { UserId = logonUser, Delay = TimeSpan.FromSeconds(30) });
             task.Principal.RunLevel = Microsoft.Win32.TaskScheduler.TaskRunLevel.Highest;
             task.Actions.Add(new Microsoft.Win32.TaskScheduler.ExecAction(fileName.AppendQuotes(), null, Path.GetDirectoryName(fileName)));
 

v2rayN/ServiceLib/Handler/ClashApiHandler.cs

@@ -7,13 +7,13 @@ namespace ServiceLib.Handler
         private static readonly Lazy<ClashApiHandler> instance = new(() => new());
         public static ClashApiHandler Instance => instance.Value;
 
+        private static readonly string _tag = "ClashApiHandler";
         private Dictionary<string, ProxiesItem>? _proxies;
         public Dictionary<string, object> ProfileContent { get; set; }
-        private static readonly string _tag = "ClashApiHandler";
 
-        public async Task<Tuple<ClashProxies, ClashProviders>?> GetClashProxiesAsync(Config config)
+        public async Task<Tuple<ClashProxies, ClashProviders>?> GetClashProxiesAsync()
         {
-            for (var i = 0; i < 5; i++)
+            for (var i = 0; i < 3; i++)
             {
                 var url = $"{GetApiUrl()}/proxies";
                 var result = await HttpClientHelper.Instance.TryGetAsync(url);
@@ -37,38 +37,30 @@ namespace ServiceLib.Handler
 
         public void ClashProxiesDelayTest(bool blAll, List<ClashProxyModel> lstProxy, Action<ClashProxyModel?, string> updateFunc)
         {
-            Task.Run(() =>
+            Task.Run(async () =>
             {
                 if (blAll)
                 {
-                    for (var i = 0; i < 5; i++)
-                    {
-                        if (_proxies != null)
-                        {
-                            break;
-                        }
-                        Task.Delay(5000).Wait();
-                    }
                     if (_proxies == null)
                     {
-                        return;
+                        await GetClashProxiesAsync();
                     }
                     lstProxy = new List<ClashProxyModel>();
-                    foreach (KeyValuePair<string, ProxiesItem> kv in _proxies)
+                    foreach (var kv in _proxies ?? [])
                     {
-                        if (Global.notAllowTestType.Contains(kv.Value.type.ToLower()))
+                        if (Global.notAllowTestType.Contains(kv.Value.type?.ToLower()))
                         {
                             continue;
                         }
                         lstProxy.Add(new ClashProxyModel()
                         {
                             Name = kv.Value.name,
-                            Type = kv.Value.type.ToLower(),
+                            Type = kv.Value.type?.ToLower(),
                         });
                     }
                 }
 
-                if (lstProxy == null)
+                if (lstProxy is not { Count: > 0 })
                 {
                     return;
                 }
@@ -90,9 +82,8 @@ namespace ServiceLib.Handler
                         updateFunc?.Invoke(it, result);
                     }));
                 }
-                Task.WaitAll(tasks.ToArray());
-
-                Task.Delay(1000).Wait();
+                await Task.WhenAll(tasks);
+                await Task.Delay(1000);
                 updateFunc?.Invoke(null, "");
             });
         }
@@ -158,7 +149,7 @@ namespace ServiceLib.Handler
             }
         }
 
-        public async Task<ClashConnections?> GetClashConnectionsAsync(Config config)
+        public async Task<ClashConnections?> GetClashConnectionsAsync()
         {
             try
             {

v2rayN/ServiceLib/Handler/ConfigHandler.cs

@@ -22,7 +22,7 @@ namespace ServiceLib.Handler
         {
             Config? config = null;
             var result = EmbedUtils.LoadResource(Utils.GetConfigPath(_configRes));
-            if (Utils.IsNotEmpty(result))
+            if (result.IsNotEmpty())
             {
                 config = JsonUtils.Deserialize<Config>(result);
             }
@@ -67,7 +67,7 @@ namespace ServiceLib.Handler
             }
 
             config.RoutingBasicItem ??= new();
-            if (Utils.IsNullOrEmpty(config.RoutingBasicItem.DomainStrategy))
+            if (config.RoutingBasicItem.DomainStrategy.IsNullOrEmpty())
             {
                 config.RoutingBasicItem.DomainStrategy = Global.DomainStrategies.First();
             }
@@ -103,7 +103,7 @@ namespace ServiceLib.Handler
             };
             config.UiItem.MainColumnItem ??= new();
 
-            if (Utils.IsNullOrEmpty(config.UiItem.CurrentLanguage))
+            if (config.UiItem.CurrentLanguage.IsNullOrEmpty())
             {
                 config.UiItem.CurrentLanguage = Thread.CurrentThread.CurrentCulture.TwoLetterISOLanguageName.Equals("zh", StringComparison.CurrentCultureIgnoreCase)
                     ? Global.Languages.First()
@@ -117,11 +117,11 @@ namespace ServiceLib.Handler
             {
                 config.SpeedTestItem.SpeedTestTimeout = 10;
             }
-            if (Utils.IsNullOrEmpty(config.SpeedTestItem.SpeedTestUrl))
+            if (config.SpeedTestItem.SpeedTestUrl.IsNullOrEmpty())
             {
                 config.SpeedTestItem.SpeedTestUrl = Global.SpeedTestUrls.First();
             }
-            if (Utils.IsNullOrEmpty(config.SpeedTestItem.SpeedPingTestUrl))
+            if (config.SpeedTestItem.SpeedPingTestUrl.IsNullOrEmpty())
             {
                 config.SpeedTestItem.SpeedPingTestUrl = Global.SpeedPingTestUrl;
             }
@@ -217,6 +217,7 @@ namespace ServiceLib.Handler
                 item.Remarks = profileItem.Remarks;
                 item.Address = profileItem.Address;
                 item.Port = profileItem.Port;
+                item.Ports = profileItem.Ports;
 
                 item.Id = profileItem.Id;
                 item.AlterId = profileItem.AlterId;
@@ -353,7 +354,7 @@ namespace ServiceLib.Handler
         /// <returns></returns>
         public static async Task<int> SetDefaultServerIndex(Config config, string? indexId)
         {
-            if (Utils.IsNullOrEmpty(indexId))
+            if (indexId.IsNullOrEmpty())
             {
                 return -1;
             }
@@ -505,7 +506,7 @@ namespace ServiceLib.Handler
 
             profileItem.Address = newFileName;
             profileItem.ConfigType = EConfigType.Custom;
-            if (Utils.IsNullOrEmpty(profileItem.Remarks))
+            if (profileItem.Remarks.IsNullOrEmpty())
             {
                 profileItem.Remarks = $"import custom@{DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss")}";
             }
@@ -623,7 +624,7 @@ namespace ServiceLib.Handler
 
             profileItem.Address = profileItem.Address.TrimEx();
             profileItem.Id = profileItem.Id.TrimEx();
-            if (Utils.IsNullOrEmpty(profileItem.StreamSecurity))
+            if (profileItem.StreamSecurity.IsNullOrEmpty())
             {
                 profileItem.StreamSecurity = Global.StreamSecurity;
             }
@@ -653,7 +654,7 @@ namespace ServiceLib.Handler
             profileItem.Path = profileItem.Path.TrimEx();
             profileItem.Network = string.Empty;
 
-            if (Utils.IsNullOrEmpty(profileItem.StreamSecurity))
+            if (profileItem.StreamSecurity.IsNullOrEmpty())
             {
                 profileItem.StreamSecurity = Global.StreamSecurity;
             }
@@ -688,11 +689,11 @@ namespace ServiceLib.Handler
                 profileItem.HeaderType = Global.TuicCongestionControls.FirstOrDefault()!;
             }
 
-            if (Utils.IsNullOrEmpty(profileItem.StreamSecurity))
+            if (profileItem.StreamSecurity.IsNullOrEmpty())
             {
                 profileItem.StreamSecurity = Global.StreamSecurity;
             }
-            if (Utils.IsNullOrEmpty(profileItem.Alpn))
+            if (profileItem.Alpn.IsNullOrEmpty())
             {
                 profileItem.Alpn = "h3";
             }
@@ -857,7 +858,7 @@ namespace ServiceLib.Handler
             {
                 return -1;
             }
-            if (Utils.IsNotEmpty(profileItem.Security) && profileItem.Security != Global.None)
+            if (profileItem.Security.IsNotEmpty() && profileItem.Security != Global.None)
             {
                 profileItem.Security = Global.None;
             }
@@ -870,13 +871,19 @@ namespace ServiceLib.Handler
         public static async Task<Tuple<int, int>> DedupServerList(Config config, string subId)
         {
             var lstProfile = await AppHandler.Instance.ProfileItems(subId);
+            if (lstProfile == null)
+            {
+                return new Tuple<int, int>(0, 0);
+            }
 
             List<ProfileItem> lstKeep = new();
             List<ProfileItem> lstRemove = new();
             if (!config.GuiItem.KeepOlderDedupl)
+            {
                 lstProfile.Reverse();
+            }
 
-            foreach (ProfileItem item in lstProfile)
+            foreach (var item in lstProfile)
             {
                 if (!lstKeep.Exists(i => CompareProfileItem(i, item, false)))
                 {
@@ -896,7 +903,7 @@ namespace ServiceLib.Handler
         {
             profileItem.ConfigVersion = 2;
 
-            if (Utils.IsNotEmpty(profileItem.StreamSecurity))
+            if (profileItem.StreamSecurity.IsNotEmpty())
             {
                 if (profileItem.StreamSecurity != Global.StreamSecurity
                      && profileItem.StreamSecurity != Global.StreamSecurityReality)
@@ -905,24 +912,24 @@ namespace ServiceLib.Handler
                 }
                 else
                 {
-                    if (Utils.IsNullOrEmpty(profileItem.AllowInsecure))
+                    if (profileItem.AllowInsecure.IsNullOrEmpty())
                     {
                         profileItem.AllowInsecure = config.CoreBasicItem.DefAllowInsecure.ToString().ToLower();
                     }
-                    if (Utils.IsNullOrEmpty(profileItem.Fingerprint) && profileItem.StreamSecurity == Global.StreamSecurityReality)
+                    if (profileItem.Fingerprint.IsNullOrEmpty() && profileItem.StreamSecurity == Global.StreamSecurityReality)
                     {
                         profileItem.Fingerprint = config.CoreBasicItem.DefFingerprint;
                     }
                 }
             }
 
-            if (Utils.IsNotEmpty(profileItem.Network) && !Global.Networks.Contains(profileItem.Network))
+            if (profileItem.Network.IsNotEmpty() && !Global.Networks.Contains(profileItem.Network))
             {
                 profileItem.Network = Global.DefaultNetwork;
             }
 
             var maxSort = -1;
-            if (Utils.IsNullOrEmpty(profileItem.IndexId))
+            if (profileItem.IndexId.IsNullOrEmpty())
             {
                 profileItem.IndexId = Utils.GetGuid(false);
                 maxSort = ProfileExHandler.Instance.GetMaxSort();
@@ -943,7 +950,7 @@ namespace ServiceLib.Handler
             return 0;
         }
 
-        private static bool CompareProfileItem(ProfileItem o, ProfileItem n, bool remarks)
+        private static bool CompareProfileItem(ProfileItem? o, ProfileItem? n, bool remarks)
         {
             if (o == null || n == null)
             {
@@ -951,22 +958,27 @@ namespace ServiceLib.Handler
             }
 
             return o.ConfigType == n.ConfigType
-                && o.Address == n.Address
-                && o.Port == n.Port
-                && o.Id == n.Id
-                && o.Security == n.Security
-                && o.Network == n.Network
-                && o.HeaderType == n.HeaderType
-                && o.RequestHost == n.RequestHost
-                && o.Path == n.Path
-                && (o.ConfigType == EConfigType.Trojan || o.StreamSecurity == n.StreamSecurity)
-                && o.Flow == n.Flow
-                && o.Sni == n.Sni
-                && o.Alpn == n.Alpn
-                && o.Fingerprint == n.Fingerprint
-                && o.PublicKey == n.PublicKey
-                && o.ShortId == n.ShortId
-                && (!remarks || o.Remarks == n.Remarks);
+                   && AreEqual(o.Address, n.Address)
+                   && o.Port == n.Port
+                   && AreEqual(o.Id, n.Id)
+                   && AreEqual(o.Security, n.Security)
+                   && AreEqual(o.Network, n.Network)
+                   && AreEqual(o.HeaderType, n.HeaderType)
+                   && AreEqual(o.RequestHost, n.RequestHost)
+                   && AreEqual(o.Path, n.Path)
+                   && (o.ConfigType == EConfigType.Trojan || o.StreamSecurity == n.StreamSecurity)
+                   && AreEqual(o.Flow, n.Flow)
+                   && AreEqual(o.Sni, n.Sni)
+                   && AreEqual(o.Alpn, n.Alpn)
+                   && AreEqual(o.Fingerprint, n.Fingerprint)
+                   && AreEqual(o.PublicKey, n.PublicKey)
+                   && AreEqual(o.ShortId, n.ShortId)
+                   && (!remarks || o.Remarks == n.Remarks);
+
+            static bool AreEqual(string? a, string? b)
+            {
+                return string.Equals(a, b) || (string.IsNullOrEmpty(a) && string.IsNullOrEmpty(b));
+            }
         }
 
         private static async Task<int> RemoveProfileItem(Config config, string indexId)
@@ -1004,8 +1016,7 @@ namespace ServiceLib.Handler
                 return result;
             }
 
-            var fileName = configPath;
-            if (!File.Exists(fileName))
+            if (!File.Exists(configPath))
             {
                 return result;
             }
@@ -1083,14 +1094,14 @@ namespace ServiceLib.Handler
         /// <returns>成功导入的数量</returns>
         private static async Task<int> AddBatchServersCommon(Config config, string strData, string subid, bool isSub)
         {
-            if (Utils.IsNullOrEmpty(strData))
+            if (strData.IsNullOrEmpty())
             {
                 return -1;
             }
 
             var subFilter = string.Empty;
             //remove sub items
-            if (isSub && Utils.IsNotEmpty(subid))
+            if (isSub && subid.IsNotEmpty())
             {
                 await RemoveServersViaSubid(config, subid, isSub);
                 subFilter = (await AppHandler.Instance.GetSubItem(subid))?.Filter ?? "";
@@ -1121,7 +1132,7 @@ namespace ServiceLib.Handler
                 }
 
                 //exist sub items //filter
-                if (isSub && Utils.IsNotEmpty(subid) && Utils.IsNotEmpty(subFilter))
+                if (isSub && subid.IsNotEmpty() && subFilter.IsNotEmpty())
                 {
                     if (!Regex.IsMatch(profileItem.Remarks, subFilter))
                     {
@@ -1162,7 +1173,7 @@ namespace ServiceLib.Handler
 
         private static async Task<int> AddBatchServers4Custom(Config config, string strData, string subid, bool isSub)
         {
-            if (Utils.IsNullOrEmpty(strData))
+            if (strData.IsNullOrEmpty())
             {
                 return -1;
             }
@@ -1184,7 +1195,7 @@ namespace ServiceLib.Handler
             }
             if (lstProfiles != null && lstProfiles.Count > 0)
             {
-                if (isSub && Utils.IsNotEmpty(subid))
+                if (isSub && subid.IsNotEmpty())
                 {
                     await RemoveServersViaSubid(config, subid, isSub);
                 }
@@ -1235,12 +1246,12 @@ namespace ServiceLib.Handler
             {
                 profileItem = NaiveproxyFmt.ResolveFull(strData, subRemarks);
             }
-            if (profileItem is null || Utils.IsNullOrEmpty(profileItem.Address))
+            if (profileItem is null || profileItem.Address.IsNullOrEmpty())
             {
                 return -1;
             }
 
-            if (isSub && Utils.IsNotEmpty(subid))
+            if (isSub && subid.IsNotEmpty())
             {
                 await RemoveServersViaSubid(config, subid, isSub);
             }
@@ -1260,12 +1271,12 @@ namespace ServiceLib.Handler
 
         private static async Task<int> AddBatchServers4SsSIP008(Config config, string strData, string subid, bool isSub)
         {
-            if (Utils.IsNullOrEmpty(strData))
+            if (strData.IsNullOrEmpty())
             {
                 return -1;
             }
 
-            if (isSub && Utils.IsNotEmpty(subid))
+            if (isSub && subid.IsNotEmpty())
             {
                 await RemoveServersViaSubid(config, subid, isSub);
             }
@@ -1292,13 +1303,13 @@ namespace ServiceLib.Handler
 
         public static async Task<int> AddBatchServers(Config config, string strData, string subid, bool isSub)
         {
-            if (Utils.IsNullOrEmpty(strData))
+            if (strData.IsNullOrEmpty())
             {
                 return -1;
             }
             List<ProfileItem>? lstOriSub = null;
             ProfileItem? activeProfile = null;
-            if (isSub && Utils.IsNotEmpty(subid))
+            if (isSub && subid.IsNotEmpty())
             {
                 lstOriSub = await AppHandler.Instance.ProfileItems(subid);
                 activeProfile = lstOriSub?.FirstOrDefault(t => t.IndexId == config.IndexId);
@@ -1423,7 +1434,7 @@ namespace ServiceLib.Handler
                 item.Memo = subItem.Memo;
             }
 
-            if (Utils.IsNullOrEmpty(item.Id))
+            if (item.Id.IsNullOrEmpty())
             {
                 item.Id = Utils.GetGuid(false);
 
@@ -1456,7 +1467,7 @@ namespace ServiceLib.Handler
         /// <returns></returns>
         public static async Task<int> RemoveServersViaSubid(Config config, string subid, bool isSub)
         {
-            if (Utils.IsNullOrEmpty(subid))
+            if (subid.IsNullOrEmpty())
             {
                 return -1;
             }
@@ -1507,7 +1518,7 @@ namespace ServiceLib.Handler
 
         public static async Task<int> SaveRoutingItem(Config config, RoutingItem item)
         {
-            if (Utils.IsNullOrEmpty(item.Id))
+            if (item.Id.IsNullOrEmpty())
             {
                 item.Id = Utils.GetGuid(false);
             }
@@ -1530,7 +1541,7 @@ namespace ServiceLib.Handler
         /// <returns></returns>
         public static async Task<int> AddBatchRoutingRules(RoutingItem routingItem, string strData)
         {
-            if (Utils.IsNullOrEmpty(strData))
+            if (strData.IsNullOrEmpty())
             {
                 return -1;
             }
@@ -1548,7 +1559,7 @@ namespace ServiceLib.Handler
             routingItem.RuleNum = lstRules.Count;
             routingItem.RuleSet = JsonUtils.Serialize(lstRules, false);
 
-            if (Utils.IsNullOrEmpty(routingItem.Id))
+            if (routingItem.Id.IsNullOrEmpty())
             {
                 routingItem.Id = Utils.GetGuid(false);
             }
@@ -1667,7 +1678,7 @@ namespace ServiceLib.Handler
 
         public static async Task<int> InitRouting(Config config, bool blImportAdvancedRules = false)
         {
-            if (string.IsNullOrEmpty(config.ConstItem.RouteRulesTemplateSourceUrl))
+            if (config.ConstItem.RouteRulesTemplateSourceUrl.IsNullOrEmpty())
             {
                 await InitBuiltinRouting(config, blImportAdvancedRules);
             }
@@ -1683,7 +1694,7 @@ namespace ServiceLib.Handler
         {
             var downloadHandle = new DownloadService();
             var templateContent = await downloadHandle.TryDownloadString(config.ConstItem.RouteRulesTemplateSourceUrl, true, "");
-            if (string.IsNullOrEmpty(templateContent))
+            if (templateContent.IsNullOrEmpty())
                 return await InitBuiltinRouting(config, blImportAdvancedRules); // fallback
 
             var template = JsonUtils.Deserialize<RoutingTemplate>(templateContent);
@@ -1700,14 +1711,14 @@ namespace ServiceLib.Handler
             {
                 var item = template.RoutingItems[i];
 
-                if (string.IsNullOrEmpty(item.Url) && string.IsNullOrEmpty(item.RuleSet))
+                if (item.Url.IsNullOrEmpty() && item.RuleSet.IsNullOrEmpty())
                     continue;
 
-                var ruleSetsString = !string.IsNullOrEmpty(item.RuleSet)
+                var ruleSetsString = !item.RuleSet.IsNullOrEmpty()
                     ? item.RuleSet
                     : await downloadHandle.TryDownloadString(item.Url, true, "");
 
-                if (string.IsNullOrEmpty(ruleSetsString))
+                if (ruleSetsString.IsNullOrEmpty())
                     continue;
 
                 item.Remarks = $"{template.Version}-{item.Remarks}";
@@ -1819,7 +1830,7 @@ namespace ServiceLib.Handler
                 return -1;
             }
 
-            if (Utils.IsNullOrEmpty(item.Id))
+            if (item.Id.IsNullOrEmpty())
             {
                 item.Id = Utils.GetGuid(false);
             }
@@ -1840,17 +1851,17 @@ namespace ServiceLib.Handler
 
             var downloadHandle = new DownloadService();
             var templateContent = await downloadHandle.TryDownloadString(url, true, "");
-            if (string.IsNullOrEmpty(templateContent))
+            if (templateContent.IsNullOrEmpty())
                 return currentItem;
 
             var template = JsonUtils.Deserialize<DNSItem>(templateContent);
             if (template == null)
                 return currentItem;
 
-            if (!string.IsNullOrEmpty(template.NormalDNS))
+            if (!template.NormalDNS.IsNullOrEmpty())
                 template.NormalDNS = await downloadHandle.TryDownloadString(template.NormalDNS, true, "");
 
-            if (!string.IsNullOrEmpty(template.TunDNS))
+            if (!template.TunDNS.IsNullOrEmpty())
                 template.TunDNS = await downloadHandle.TryDownloadString(template.TunDNS, true, "");
 
             template.Id = currentItem.Id;

v2rayN/ServiceLib/Handler/CoreConfigHandler.cs

@@ -33,7 +33,7 @@ namespace ServiceLib.Handler
             {
                 return result;
             }
-            if (Utils.IsNotEmpty(fileName) && result.Data != null)
+            if (fileName.IsNotEmpty() && result.Data != null)
             {
                 await File.WriteAllTextAsync(fileName, result.Data.ToString());
             }

v2rayN/ServiceLib/Handler/CoreHandler.cs

@@ -240,7 +240,7 @@ namespace ServiceLib.Handler
         private async Task<Process?> RunProcess(CoreInfo? coreInfo, string configPath, bool displayLog, bool mayNeedSudo)
         {
             var fileName = CoreInfoHandler.Instance.GetCoreExecFile(coreInfo, out var msg);
-            if (Utils.IsNullOrEmpty(fileName))
+            if (fileName.IsNullOrEmpty())
             {
                 UpdateFunc(false, msg);
                 return null;
@@ -274,13 +274,13 @@ namespace ServiceLib.Handler
                 {
                     proc.OutputDataReceived += (sender, e) =>
                     {
-                        if (Utils.IsNullOrEmpty(e.Data))
+                        if (e.Data.IsNullOrEmpty())
                             return;
                         UpdateFunc(false, e.Data + Environment.NewLine);
                     };
                     proc.ErrorDataReceived += (sender, e) =>
                     {
-                        if (Utils.IsNullOrEmpty(e.Data))
+                        if (e.Data.IsNullOrEmpty())
                             return;
                         UpdateFunc(false, e.Data + Environment.NewLine);
                     };

v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs

@@ -16,12 +16,12 @@ namespace ServiceLib.Handler.Fmt
 
         protected static int GetStdTransport(ProfileItem item, string? securityDef, ref Dictionary<string, string> dicQuery)
         {
-            if (Utils.IsNotEmpty(item.Flow))
+            if (item.Flow.IsNotEmpty())
             {
                 dicQuery.Add("flow", item.Flow);
             }
 
-            if (Utils.IsNotEmpty(item.StreamSecurity))
+            if (item.StreamSecurity.IsNotEmpty())
             {
                 dicQuery.Add("security", item.StreamSecurity);
             }
@@ -32,27 +32,27 @@ namespace ServiceLib.Handler.Fmt
                     dicQuery.Add("security", securityDef);
                 }
             }
-            if (Utils.IsNotEmpty(item.Sni))
+            if (item.Sni.IsNotEmpty())
             {
                 dicQuery.Add("sni", item.Sni);
             }
-            if (Utils.IsNotEmpty(item.Alpn))
+            if (item.Alpn.IsNotEmpty())
             {
                 dicQuery.Add("alpn", Utils.UrlEncode(item.Alpn));
             }
-            if (Utils.IsNotEmpty(item.Fingerprint))
+            if (item.Fingerprint.IsNotEmpty())
             {
                 dicQuery.Add("fp", Utils.UrlEncode(item.Fingerprint));
             }
-            if (Utils.IsNotEmpty(item.PublicKey))
+            if (item.PublicKey.IsNotEmpty())
             {
                 dicQuery.Add("pbk", Utils.UrlEncode(item.PublicKey));
             }
-            if (Utils.IsNotEmpty(item.ShortId))
+            if (item.ShortId.IsNotEmpty())
             {
                 dicQuery.Add("sid", Utils.UrlEncode(item.ShortId));
             }
-            if (Utils.IsNotEmpty(item.SpiderX))
+            if (item.SpiderX.IsNotEmpty())
             {
                 dicQuery.Add("spx", Utils.UrlEncode(item.SpiderX));
             }
@@ -61,21 +61,21 @@ namespace ServiceLib.Handler.Fmt
                 dicQuery.Add("allowInsecure", "1");
             }
 
-            dicQuery.Add("type", Utils.IsNotEmpty(item.Network) ? item.Network : nameof(ETransport.tcp));
+            dicQuery.Add("type", item.Network.IsNotEmpty() ? item.Network : nameof(ETransport.tcp));
 
             switch (item.Network)
             {
                 case nameof(ETransport.tcp):
-                    dicQuery.Add("headerType", Utils.IsNotEmpty(item.HeaderType) ? item.HeaderType : Global.None);
-                    if (Utils.IsNotEmpty(item.RequestHost))
+                    dicQuery.Add("headerType", item.HeaderType.IsNotEmpty() ? item.HeaderType : Global.None);
+                    if (item.RequestHost.IsNotEmpty())
                     {
                         dicQuery.Add("host", Utils.UrlEncode(item.RequestHost));
                     }
                     break;
 
                 case nameof(ETransport.kcp):
-                    dicQuery.Add("headerType", Utils.IsNotEmpty(item.HeaderType) ? item.HeaderType : Global.None);
-                    if (Utils.IsNotEmpty(item.Path))
+                    dicQuery.Add("headerType", item.HeaderType.IsNotEmpty() ? item.HeaderType : Global.None);
+                    if (item.Path.IsNotEmpty())
                     {
                         dicQuery.Add("seed", Utils.UrlEncode(item.Path));
                     }
@@ -83,30 +83,30 @@ namespace ServiceLib.Handler.Fmt
 
                 case nameof(ETransport.ws):
                 case nameof(ETransport.httpupgrade):
-                    if (Utils.IsNotEmpty(item.RequestHost))
+                    if (item.RequestHost.IsNotEmpty())
                     {
                         dicQuery.Add("host", Utils.UrlEncode(item.RequestHost));
                     }
-                    if (Utils.IsNotEmpty(item.Path))
+                    if (item.Path.IsNotEmpty())
                     {
                         dicQuery.Add("path", Utils.UrlEncode(item.Path));
                     }
                     break;
 
                 case nameof(ETransport.xhttp):
-                    if (Utils.IsNotEmpty(item.RequestHost))
+                    if (item.RequestHost.IsNotEmpty())
                     {
                         dicQuery.Add("host", Utils.UrlEncode(item.RequestHost));
                     }
-                    if (Utils.IsNotEmpty(item.Path))
+                    if (item.Path.IsNotEmpty())
                     {
                         dicQuery.Add("path", Utils.UrlEncode(item.Path));
                     }
-                    if (Utils.IsNotEmpty(item.HeaderType) && Global.XhttpMode.Contains(item.HeaderType))
+                    if (item.HeaderType.IsNotEmpty() && Global.XhttpMode.Contains(item.HeaderType))
                     {
                         dicQuery.Add("mode", Utils.UrlEncode(item.HeaderType));
                     }
-                    if (Utils.IsNotEmpty(item.Extra))
+                    if (item.Extra.IsNotEmpty())
                     {
                         dicQuery.Add("extra", Utils.UrlEncode(item.Extra));
                     }
@@ -115,24 +115,24 @@ namespace ServiceLib.Handler.Fmt
                 case nameof(ETransport.http):
                 case nameof(ETransport.h2):
                     dicQuery["type"] = nameof(ETransport.http);
-                    if (Utils.IsNotEmpty(item.RequestHost))
+                    if (item.RequestHost.IsNotEmpty())
                     {
                         dicQuery.Add("host", Utils.UrlEncode(item.RequestHost));
                     }
-                    if (Utils.IsNotEmpty(item.Path))
+                    if (item.Path.IsNotEmpty())
                     {
                         dicQuery.Add("path", Utils.UrlEncode(item.Path));
                     }
                     break;
 
                 case nameof(ETransport.quic):
-                    dicQuery.Add("headerType", Utils.IsNotEmpty(item.HeaderType) ? item.HeaderType : Global.None);
+                    dicQuery.Add("headerType", item.HeaderType.IsNotEmpty() ? item.HeaderType : Global.None);
                     dicQuery.Add("quicSecurity", Utils.UrlEncode(item.RequestHost));
                     dicQuery.Add("key", Utils.UrlEncode(item.Path));
                     break;
 
                 case nameof(ETransport.grpc):
-                    if (Utils.IsNotEmpty(item.Path))
+                    if (item.Path.IsNotEmpty())
                     {
                         dicQuery.Add("authority", Utils.UrlEncode(item.RequestHost));
                         dicQuery.Add("serviceName", Utils.UrlEncode(item.Path));
@@ -215,7 +215,9 @@ namespace ServiceLib.Handler.Fmt
             foreach (var item in s)
             {
                 if (str.Contains(item, StringComparison.OrdinalIgnoreCase))
+                {
                     return true;
+                }
             }
             return false;
         }

v2rayN/ServiceLib/Handler/Fmt/FmtHandler.cs

@@ -37,7 +37,7 @@
             try
             {
                 string str = config.TrimEx();
-                if (Utils.IsNullOrEmpty(str))
+                if (str.IsNullOrEmpty())
                 {
                     msg = ResUI.FailedReadConfiguration;
                     return null;

v2rayN/ServiceLib/Handler/Fmt/Hysteria2Fmt.cs

@@ -24,6 +24,8 @@ namespace ServiceLib.Handler.Fmt
             item.Path = Utils.UrlDecode(query["obfs-password"] ?? "");
             item.AllowInsecure = (query["insecure"] ?? "") == "1" ? "true" : "false";
 
+            item.Ports = Utils.UrlDecode(query["mport"] ?? "").Replace('-', ':');
+
             return item;
         }
 
@@ -34,25 +36,29 @@ namespace ServiceLib.Handler.Fmt
             string url = string.Empty;
 
             string remark = string.Empty;
-            if (Utils.IsNotEmpty(item.Remarks))
+            if (item.Remarks.IsNotEmpty())
             {
                 remark = "#" + Utils.UrlEncode(item.Remarks);
             }
             var dicQuery = new Dictionary<string, string>();
-            if (Utils.IsNotEmpty(item.Sni))
+            if (item.Sni.IsNotEmpty())
             {
                 dicQuery.Add("sni", item.Sni);
             }
-            if (Utils.IsNotEmpty(item.Alpn))
+            if (item.Alpn.IsNotEmpty())
             {
                 dicQuery.Add("alpn", Utils.UrlEncode(item.Alpn));
             }
-            if (Utils.IsNotEmpty(item.Path))
+            if (item.Path.IsNotEmpty())
             {
                 dicQuery.Add("obfs", "salamander");
                 dicQuery.Add("obfs-password", Utils.UrlEncode(item.Path));
             }
             dicQuery.Add("insecure", item.AllowInsecure.ToLower() == "true" ? "1" : "0");
+            if (item.Ports.IsNotEmpty())
+            {
+                dicQuery.Add("mport", Utils.UrlEncode(item.Ports.Replace(':', '-')));
+            }
 
             return ToUri(EConfigType.Hysteria2, item.Address, item.Port, item.Id, dicQuery, remark);
         }

v2rayN/ServiceLib/Handler/Fmt/ShadowsocksFmt.cs

@@ -27,11 +27,11 @@ namespace ServiceLib.Handler.Fmt
         public static string? ToUri(ProfileItem? item)
         {
             if (item == null)
+            {
                 return null;
-            string url = string.Empty;
-
-            string remark = string.Empty;
-            if (Utils.IsNotEmpty(item.Remarks))
+            }
+            var remark = string.Empty;
+            if (item.Remarks.IsNotEmpty())
             {
                 remark = "#" + Utils.UrlEncode(item.Remarks);
             }
@@ -53,12 +53,14 @@ namespace ServiceLib.Handler.Fmt
         {
             var match = UrlFinder.Match(result);
             if (!match.Success)
+            {
                 return null;
+            }
 
             ProfileItem item = new();
             var base64 = match.Groups["base64"].Value.TrimEnd('/');
             var tag = match.Groups["tag"].Value;
-            if (Utils.IsNotEmpty(tag))
+            if (tag.IsNotEmpty())
             {
                 item.Remarks = Utils.UrlDecode(tag);
             }
@@ -72,11 +74,13 @@ namespace ServiceLib.Handler.Fmt
                 return null;
             }
             if (!details.Success)
+            {
                 return null;
+            }
             item.Security = details.Groups["method"].Value;
             item.Id = details.Groups["password"].Value;
             item.Address = details.Groups["hostname"].Value;
-            item.Port = Utils.ToInt(details.Groups["port"].Value);
+            item.Port = details.Groups["port"].Value.ToInt();
             return item;
         }
 
@@ -84,7 +88,9 @@ namespace ServiceLib.Handler.Fmt
         {
             var parsedUrl = Utils.TryUri(result);
             if (parsedUrl == null)
+            {
                 return null;
+            }
 
             ProfileItem item = new()
             {
@@ -96,7 +102,7 @@ namespace ServiceLib.Handler.Fmt
             //2022-blake3
             if (rawUserInfo.Contains(':'))
             {
-                string[] userInfoParts = rawUserInfo.Split(new[] { ':' }, 2);
+                var userInfoParts = rawUserInfo.Split(new[] { ':' }, 2);
                 if (userInfoParts.Length != 2)
                 {
                     return null;
@@ -107,8 +113,8 @@ namespace ServiceLib.Handler.Fmt
             else
             {
                 // parse base64 UserInfo
-                string userInfo = Utils.Base64Decode(rawUserInfo);
-                string[] userInfoParts = userInfo.Split(new[] { ':' }, 2);
+                var userInfo = Utils.Base64Decode(rawUserInfo);
+                var userInfoParts = userInfo.Split(new[] { ':' }, 2);
                 if (userInfoParts.Length != 2)
                 {
                     return null;
@@ -122,7 +128,7 @@ namespace ServiceLib.Handler.Fmt
             {
                 //obfs-host exists
                 var obfsHost = queryParameters["plugin"]?.Split(';').FirstOrDefault(t => t.Contains("obfs-host"));
-                if (queryParameters["plugin"].Contains("obfs=http") && Utils.IsNotEmpty(obfsHost))
+                if (queryParameters["plugin"].Contains("obfs=http") && obfsHost.IsNotEmpty())
                 {
                     obfsHost = obfsHost?.Replace("obfs-host=", "");
                     item.Network = Global.DefaultNetwork;
@@ -162,7 +168,7 @@ namespace ServiceLib.Handler.Fmt
                         Security = it.method,
                         Id = it.password,
                         Address = it.server,
-                        Port = Utils.ToInt(it.server_port)
+                        Port = it.server_port.ToInt()
                     };
                     lst.Add(ssItem);
                 }

v2rayN/ServiceLib/Handler/Fmt/SingboxFmt.cs

@@ -1,55 +1,48 @@
-namespace ServiceLib.Handler.Fmt
+namespace ServiceLib.Handler.Fmt
 {
     public class SingboxFmt : BaseFmt
     {
         public static List<ProfileItem>? ResolveFullArray(string strData, string? subRemarks)
         {
-            var configObjects = JsonUtils.Deserialize<Object[]>(strData);
-            if (configObjects != null && configObjects.Length > 0)
+            var configObjects = JsonUtils.Deserialize<object[]>(strData);
+            if (configObjects is not { Length: > 0 })
             {
-                List<ProfileItem> lstResult = [];
-                foreach (var configObject in configObjects)
-                {
-                    var objectString = JsonUtils.Serialize(configObject);
-                    var singboxCon = JsonUtils.Deserialize<SingboxConfig>(objectString);
-                    if (singboxCon?.inbounds?.Count > 0
-                        && singboxCon.outbounds?.Count > 0
-                        && singboxCon.route != null)
-                    {
-                        var fileName = WriteAllText(objectString);
-
-                        var profileIt = new ProfileItem
-                        {
-                            CoreType = ECoreType.sing_box,
-                            Address = fileName,
-                            Remarks = subRemarks ?? "singbox_custom",
-                        };
-                        lstResult.Add(profileIt);
-                    }
-                }
-                return lstResult;
+                return null;
             }
-            return null;
+
+            List<ProfileItem> lstResult = [];
+            foreach (var configObject in configObjects)
+            {
+                var objectString = JsonUtils.Serialize(configObject);
+                var profileIt = ResolveFull(objectString, subRemarks);
+                if (profileIt != null)
+                {
+                    lstResult.Add(profileIt);
+                }
+            }
+            return lstResult;
         }
 
         public static ProfileItem? ResolveFull(string strData, string? subRemarks)
         {
-            var singboxConfig = JsonUtils.Deserialize<SingboxConfig>(strData);
-            if (singboxConfig?.inbounds?.Count > 0
-                && singboxConfig.outbounds?.Count > 0
-                && singboxConfig.route != null)
+            var config = JsonUtils.ParseJson(strData);
+            if (config?["inbounds"] == null
+                || config["outbounds"] == null
+                || config["route"] == null
+                || config["dns"] == null)
             {
-                var fileName = WriteAllText(strData);
-                var profileItem = new ProfileItem
-                {
-                    CoreType = ECoreType.sing_box,
-                    Address = fileName,
-                    Remarks = subRemarks ?? "singbox_custom"
-                };
-
-                return profileItem;
+                return null;
             }
-            return null;
+
+            var fileName = WriteAllText(strData);
+            var profileItem = new ProfileItem
+            {
+                CoreType = ECoreType.sing_box,
+                Address = fileName,
+                Remarks = subRemarks ?? "singbox_custom"
+            };
+
+            return profileItem;
         }
     }
-}
+}

v2rayN/ServiceLib/Handler/Fmt/SocksFmt.cs

@@ -24,11 +24,11 @@ namespace ServiceLib.Handler.Fmt
         public static string? ToUri(ProfileItem? item)
         {
             if (item == null)
+            {
                 return null;
-            var url = string.Empty;
-
+            }
             var remark = string.Empty;
-            if (Utils.IsNotEmpty(item.Remarks))
+            if (item.Remarks.IsNotEmpty())
             {
                 remark = "#" + Utils.UrlEncode(item.Remarks);
             }
@@ -77,7 +77,7 @@ namespace ServiceLib.Handler.Fmt
                 return null;
             }
             item.Address = arr1[1][..indexPort];
-            item.Port = Utils.ToInt(arr1[1][(indexPort + 1)..]);
+            item.Port = arr1[1][(indexPort + 1)..].ToInt();
             item.Security = arr21.First();
             item.Id = arr21[1];
 
@@ -88,7 +88,9 @@ namespace ServiceLib.Handler.Fmt
         {
             var parsedUrl = Utils.TryUri(result);
             if (parsedUrl == null)
+            {
                 return null;
+            }
 
             ProfileItem item = new()
             {

v2rayN/ServiceLib/Handler/Fmt/TrojanFmt.cs

@@ -13,7 +13,9 @@ namespace ServiceLib.Handler.Fmt
 
             var url = Utils.TryUri(str);
             if (url == null)
+            {
                 return null;
+            }
 
             item.Address = url.IdnHost;
             item.Port = url.Port;
@@ -21,7 +23,7 @@ namespace ServiceLib.Handler.Fmt
             item.Id = Utils.UrlDecode(url.UserInfo);
 
             var query = Utils.ParseQueryString(url.Query);
-            ResolveStdTransport(query, ref item);
+            _ = ResolveStdTransport(query, ref item);
 
             return item;
         }
@@ -29,16 +31,16 @@ namespace ServiceLib.Handler.Fmt
         public static string? ToUri(ProfileItem? item)
         {
             if (item == null)
+            {
                 return null;
-            string url = string.Empty;
-
-            string remark = string.Empty;
-            if (Utils.IsNotEmpty(item.Remarks))
+            }
+            var remark = string.Empty;
+            if (item.Remarks.IsNotEmpty())
             {
                 remark = "#" + Utils.UrlEncode(item.Remarks);
             }
             var dicQuery = new Dictionary<string, string>();
-            GetStdTransport(item, null, ref dicQuery);
+            _ = GetStdTransport(item, null, ref dicQuery);
 
             return ToUri(EConfigType.Trojan, item.Address, item.Port, item.Id, dicQuery, remark);
         }

v2rayN/ServiceLib/Handler/Fmt/TuicFmt.cs

@@ -13,7 +13,9 @@ namespace ServiceLib.Handler.Fmt
 
             var url = Utils.TryUri(str);
             if (url == null)
+            {
                 return null;
+            }
 
             item.Address = url.IdnHost;
             item.Port = url.Port;
@@ -36,20 +38,21 @@ namespace ServiceLib.Handler.Fmt
         public static string? ToUri(ProfileItem? item)
         {
             if (item == null)
+            {
                 return null;
-            string url = string.Empty;
+            }
 
-            string remark = string.Empty;
-            if (Utils.IsNotEmpty(item.Remarks))
+            var remark = string.Empty;
+            if (item.Remarks.IsNotEmpty())
             {
                 remark = "#" + Utils.UrlEncode(item.Remarks);
             }
             var dicQuery = new Dictionary<string, string>();
-            if (Utils.IsNotEmpty(item.Sni))
+            if (item.Sni.IsNotEmpty())
             {
                 dicQuery.Add("sni", item.Sni);
             }
-            if (Utils.IsNotEmpty(item.Alpn))
+            if (item.Alpn.IsNotEmpty())
             {
                 dicQuery.Add("alpn", Utils.UrlEncode(item.Alpn));
             }

v2rayN/ServiceLib/Handler/Fmt/V2rayFmt.cs

@@ -1,56 +1,49 @@
-namespace ServiceLib.Handler.Fmt
+namespace ServiceLib.Handler.Fmt
 {
     public class V2rayFmt : BaseFmt
     {
         public static List<ProfileItem>? ResolveFullArray(string strData, string? subRemarks)
         {
-            var configObjects = JsonUtils.Deserialize<Object[]>(strData);
-            if (configObjects != null && configObjects.Length > 0)
+            var configObjects = JsonUtils.Deserialize<object[]>(strData);
+            if (configObjects is not { Length: > 0 })
             {
-                List<ProfileItem> lstResult = [];
-                foreach (var configObject in configObjects)
-                {
-                    var objectString = JsonUtils.Serialize(configObject);
-                    var v2rayCon = JsonUtils.Deserialize<V2rayConfig>(objectString);
-                    if (v2rayCon?.inbounds?.Count > 0
-                        && v2rayCon.outbounds?.Count > 0
-                        && v2rayCon.routing != null)
-                    {
-                        var fileName = WriteAllText(objectString);
-
-                        var profileIt = new ProfileItem
-                        {
-                            CoreType = ECoreType.Xray,
-                            Address = fileName,
-                            Remarks = v2rayCon.remarks ?? subRemarks ?? "v2ray_custom",
-                        };
-                        lstResult.Add(profileIt);
-                    }
-                }
-                return lstResult;
+                return null;
             }
-            return null;
+
+            List<ProfileItem> lstResult = [];
+            foreach (var configObject in configObjects)
+            {
+                var objectString = JsonUtils.Serialize(configObject);
+                var profileIt = ResolveFull(objectString, subRemarks);
+                if (profileIt != null)
+                {
+                    lstResult.Add(profileIt);
+                }
+            }
+
+            return lstResult;
         }
 
         public static ProfileItem? ResolveFull(string strData, string? subRemarks)
         {
-            var v2rayConfig = JsonUtils.Deserialize<V2rayConfig>(strData);
-            if (v2rayConfig?.inbounds?.Count > 0
-                && v2rayConfig.outbounds?.Count > 0
-                && v2rayConfig.routing != null)
+            var config = JsonUtils.ParseJson(strData);
+            if (config?["inbounds"] == null
+                || config["outbounds"] == null
+                || config["routing"] == null)
             {
-                var fileName = WriteAllText(strData);
-
-                var profileItem = new ProfileItem
-                {
-                    CoreType = ECoreType.Xray,
-                    Address = fileName,
-                    Remarks = v2rayConfig.remarks ?? subRemarks ?? "v2ray_custom"
-                };
-
-                return profileItem;
+                return null;
             }
-            return null;
+
+            var fileName = WriteAllText(strData);
+
+            var profileItem = new ProfileItem
+            {
+                CoreType = ECoreType.Xray,
+                Address = fileName,
+                Remarks = config?["remarks"]?.ToString() ?? subRemarks ?? "v2ray_custom"
+            };
+
+            return profileItem;
         }
     }
-}
+}

v2rayN/ServiceLib/Handler/Fmt/VLESSFmt.cs

@@ -14,7 +14,9 @@ namespace ServiceLib.Handler.Fmt
 
             var url = Utils.TryUri(str);
             if (url == null)
+            {
                 return null;
+            }
 
             item.Address = url.IdnHost;
             item.Port = url.Port;
@@ -24,7 +26,7 @@ namespace ServiceLib.Handler.Fmt
             var query = Utils.ParseQueryString(url.Query);
             item.Security = query["encryption"] ?? Global.None;
             item.StreamSecurity = query["security"] ?? "";
-            ResolveStdTransport(query, ref item);
+            _ = ResolveStdTransport(query, ref item);
 
             return item;
         }
@@ -32,16 +34,17 @@ namespace ServiceLib.Handler.Fmt
         public static string? ToUri(ProfileItem? item)
         {
             if (item == null)
+            {
                 return null;
-            string url = string.Empty;
+            }
 
-            string remark = string.Empty;
-            if (Utils.IsNotEmpty(item.Remarks))
+            var remark = string.Empty;
+            if (item.Remarks.IsNotEmpty())
             {
                 remark = "#" + Utils.UrlEncode(item.Remarks);
             }
             var dicQuery = new Dictionary<string, string>();
-            if (Utils.IsNotEmpty(item.Security))
+            if (item.Security.IsNotEmpty())
             {
                 dicQuery.Add("encryption", item.Security);
             }
@@ -49,7 +52,7 @@ namespace ServiceLib.Handler.Fmt
             {
                 dicQuery.Add("encryption", Global.None);
             }
-            GetStdTransport(item, Global.None, ref dicQuery);
+            _ = GetStdTransport(item, Global.None, ref dicQuery);
 
             return ToUri(EConfigType.VLESS, item.Address, item.Port, item.Id, dicQuery, remark);
         }

v2rayN/ServiceLib/Handler/Fmt/VmessFmt.cs

@@ -20,10 +20,10 @@ namespace ServiceLib.Handler.Fmt
         public static string? ToUri(ProfileItem? item)
         {
             if (item == null)
+            {
                 return null;
-            string url = string.Empty;
-
-            VmessQRCode vmessQRCode = new()
+            }
+            var vmessQRCode = new VmessQRCode
             {
                 v = item.ConfigVersion,
                 ps = item.Remarks.TrimEx(),
@@ -42,7 +42,7 @@ namespace ServiceLib.Handler.Fmt
                 fp = item.Fingerprint
             };
 
-            url = JsonUtils.Serialize(vmessQRCode);
+            var url = JsonUtils.Serialize(vmessQRCode);
             url = Utils.Base64Encode(url);
             url = $"{Global.ProtocolShares[EConfigType.VMess]}{url}";
 
@@ -60,7 +60,7 @@ namespace ServiceLib.Handler.Fmt
             result = result[Global.ProtocolShares[EConfigType.VMess].Length..];
             result = Utils.Base64Decode(result);
 
-            VmessQRCode? vmessQRCode = JsonUtils.Deserialize<VmessQRCode>(result);
+            var vmessQRCode = JsonUtils.Deserialize<VmessQRCode>(result);
             if (vmessQRCode == null)
             {
                 msg = ResUI.FailedConversionConfiguration;
@@ -78,12 +78,12 @@ namespace ServiceLib.Handler.Fmt
             item.AlterId = vmessQRCode.aid;
             item.Security = Utils.ToString(vmessQRCode.scy);
 
-            item.Security = Utils.IsNotEmpty(vmessQRCode.scy) ? vmessQRCode.scy : Global.DefaultSecurity;
-            if (Utils.IsNotEmpty(vmessQRCode.net))
+            item.Security = vmessQRCode.scy.IsNotEmpty() ? vmessQRCode.scy : Global.DefaultSecurity;
+            if (vmessQRCode.net.IsNotEmpty())
             {
                 item.Network = vmessQRCode.net;
             }
-            if (Utils.IsNotEmpty(vmessQRCode.type))
+            if (vmessQRCode.type.IsNotEmpty())
             {
                 item.HeaderType = vmessQRCode.type;
             }
@@ -100,7 +100,7 @@ namespace ServiceLib.Handler.Fmt
 
         public static ProfileItem? ResolveStdVmess(string str)
         {
-            ProfileItem item = new()
+            var item = new ProfileItem
             {
                 ConfigType = EConfigType.VMess,
                 Security = "auto"
@@ -108,7 +108,9 @@ namespace ServiceLib.Handler.Fmt
 
             var url = Utils.TryUri(str);
             if (url == null)
+            {
                 return null;
+            }
 
             item.Address = url.IdnHost;
             item.Port = url.Port;

v2rayN/ServiceLib/Handler/Fmt/WireguardFmt.cs

@@ -13,7 +13,9 @@ namespace ServiceLib.Handler.Fmt
 
             var url = Utils.TryUri(str);
             if (url == null)
+            {
                 return null;
+            }
 
             item.Address = url.IdnHost;
             item.Port = url.Port;
@@ -33,29 +35,30 @@ namespace ServiceLib.Handler.Fmt
         public static string? ToUri(ProfileItem? item)
         {
             if (item == null)
+            {
                 return null;
-            string url = string.Empty;
+            }
 
-            string remark = string.Empty;
-            if (Utils.IsNotEmpty(item.Remarks))
+            var remark = string.Empty;
+            if (item.Remarks.IsNotEmpty())
             {
                 remark = "#" + Utils.UrlEncode(item.Remarks);
             }
 
             var dicQuery = new Dictionary<string, string>();
-            if (Utils.IsNotEmpty(item.PublicKey))
+            if (item.PublicKey.IsNotEmpty())
             {
                 dicQuery.Add("publickey", Utils.UrlEncode(item.PublicKey));
             }
-            if (Utils.IsNotEmpty(item.Path))
+            if (item.Path.IsNotEmpty())
             {
                 dicQuery.Add("reserved", Utils.UrlEncode(item.Path));
             }
-            if (Utils.IsNotEmpty(item.RequestHost))
+            if (item.RequestHost.IsNotEmpty())
             {
                 dicQuery.Add("address", Utils.UrlEncode(item.RequestHost));
             }
-            if (Utils.IsNotEmpty(item.ShortId))
+            if (item.ShortId.IsNotEmpty())
             {
                 dicQuery.Add("mtu", Utils.UrlEncode(item.ShortId));
             }

v2rayN/ServiceLib/Handler/PacHandler.cs

@@ -15,7 +15,7 @@ namespace ServiceLib.Handler
 
         public static async Task Start(string configPath, int httpPort, int pacPort)
         {
-            _needRestart = (configPath != _configPath || httpPort != _httpPort || pacPort != _pacPort || !_isRunning);
+            _needRestart = configPath != _configPath || httpPort != _httpPort || pacPort != _pacPort || !_isRunning;
 
             _configPath = configPath;
             _httpPort = httpPort;
@@ -33,6 +33,13 @@ namespace ServiceLib.Handler
         private static async Task InitText()
         {
             var path = Path.Combine(_configPath, "pac.txt");
+
+            // Delete the old pac file
+            if (File.Exists(path) && Utils.GetFileHash(path).Equals("b590c07280f058ef05d5394aa2f927fe"))
+            {
+                File.Delete(path);
+            }
+
             if (!File.Exists(path))
             {
                 var pac = EmbedUtils.GetEmbedText(Global.PacFileName);
@@ -70,7 +77,7 @@ namespace ServiceLib.Handler
                         }
 
                         var client = await _tcpListener.AcceptTcpClientAsync();
-                        await Task.Run(() => { WriteContent(client); });
+                        await Task.Run(() => WriteContent(client));
                     }
                     catch
                     {
@@ -90,7 +97,9 @@ namespace ServiceLib.Handler
         public static void Stop()
         {
             if (_tcpListener == null)
+            {
                 return;
+            }
             try
             {
                 _isRunning = false;

v2rayN/ServiceLib/Handler/ProfileExHandler.cs

@@ -20,14 +20,6 @@ namespace ServiceLib.Handler
         public async Task Init()
         {
             await InitData();
-            _ = Task.Run(async () =>
-            {
-                while (true)
-                {
-                    await Task.Delay(1000 * 600);
-                    await SaveQueueIndexIds();
-                }
-            });
         }
 
         public async Task<ConcurrentBag<ProfileExItem>> GetProfileExs()
@@ -44,7 +36,7 @@ namespace ServiceLib.Handler
 
         private void IndexIdEnqueue(string indexId)
         {
-            if (Utils.IsNotEmpty(indexId) && !_queIndexIds.Contains(indexId))
+            if (indexId.IsNotEmpty() && !_queIndexIds.Contains(indexId))
             {
                 _queIndexIds.Enqueue(indexId);
             }

v2rayN/ServiceLib/Handler/SysProxy/ProxySettingWindows.cs

@@ -60,7 +60,7 @@ namespace ServiceLib.Handler.SysProxy
             try
             {
                 // set proxy for LAN
-                bool result = SetConnectionProxy(null, strProxy, exceptions, type);
+                var result = SetConnectionProxy(null, strProxy, exceptions, type);
                 // set proxy for dial up connections
                 var connections = EnumerateRasEntries();
                 foreach (var connection in connections)
@@ -71,27 +71,27 @@ namespace ServiceLib.Handler.SysProxy
             }
             catch
             {
-                SetProxyFallback(strProxy, exceptions, type);
+                _ = SetProxyFallback(strProxy, exceptions, type);
                 return false;
             }
         }
 
         private static bool SetConnectionProxy(string? connectionName, string? strProxy, string? exceptions, int type)
         {
-            InternetPerConnOptionList list = new();
+            var list = new InternetPerConnOptionList();
 
-            int optionCount = 1;
+            var optionCount = 1;
             if (type == 1) // No proxy
             {
                 optionCount = 1;
             }
             else if (type is 2 or 4) // named proxy or autoproxy script URL
             {
-                optionCount = string.IsNullOrEmpty(exceptions) ? 2 : 3;
+                optionCount = exceptions.IsNullOrEmpty() ? 2 : 3;
             }
 
-            int m_Int = (int)PerConnFlags.PROXY_TYPE_DIRECT;
-            PerConnOption m_Option = PerConnOption.INTERNET_PER_CONN_FLAGS;
+            var m_Int = (int)PerConnFlags.PROXY_TYPE_DIRECT;
+            var m_Option = PerConnOption.INTERNET_PER_CONN_FLAGS;
             if (type == 2) // named proxy
             {
                 m_Int = (int)(PerConnFlags.PROXY_TYPE_DIRECT | PerConnFlags.PROXY_TYPE_PROXY);
@@ -103,11 +103,9 @@ namespace ServiceLib.Handler.SysProxy
                 m_Option = PerConnOption.INTERNET_PER_CONN_AUTOCONFIG_URL;
             }
 
-            //int optionCount = Utile.IsNullOrEmpty(strProxy) ? 1 : (Utile.IsNullOrEmpty(exceptions) ? 2 : 3);
-            InternetConnectionOption[] options = new InternetConnectionOption[optionCount];
+            var options = new InternetConnectionOption[optionCount];
             // USE a proxy server ...
             options[0].m_Option = PerConnOption.INTERNET_PER_CONN_FLAGS;
-            //options[0].m_Value.m_Int = (int)((optionCount < 2) ? PerConnFlags.PROXY_TYPE_DIRECT : (PerConnFlags.PROXY_TYPE_DIRECT | PerConnFlags.PROXY_TYPE_PROXY));
             options[0].m_Value.m_Int = m_Int;
             // use THIS proxy server
             if (optionCount > 1)
@@ -135,20 +133,20 @@ namespace ServiceLib.Handler.SysProxy
             list.dwOptionCount = options.Length;
             list.dwOptionError = 0;
 
-            int optSize = Marshal.SizeOf(typeof(InternetConnectionOption));
+            var optSize = Marshal.SizeOf(typeof(InternetConnectionOption));
             // make a pointer out of all that ...
-            nint optionsPtr = Marshal.AllocCoTaskMem(optSize * options.Length); // !! remember to deallocate memory 4
+            var optionsPtr = Marshal.AllocCoTaskMem(optSize * options.Length); // !! remember to deallocate memory 4
             // copy the array over into that spot in memory ...
-            for (int i = 0; i < options.Length; ++i)
+            for (var i = 0; i < options.Length; ++i)
             {
                 if (Environment.Is64BitOperatingSystem)
                 {
-                    nint opt = new(optionsPtr.ToInt64() + (i * optSize));
+                    var opt = new nint(optionsPtr.ToInt64() + (i * optSize));
                     Marshal.StructureToPtr(options[i], opt, false);
                 }
                 else
                 {
-                    nint opt = new(optionsPtr.ToInt32() + (i * optSize));
+                    var opt = new nint(optionsPtr.ToInt32() + (i * optSize));
                     Marshal.StructureToPtr(options[i], opt, false);
                 }
             }
@@ -156,14 +154,14 @@ namespace ServiceLib.Handler.SysProxy
             list.options = optionsPtr;
 
             // and then make a pointer out of the whole list
-            nint ipcoListPtr = Marshal.AllocCoTaskMem(list.dwSize); // !! remember to deallocate memory 5
+            var ipcoListPtr = Marshal.AllocCoTaskMem(list.dwSize); // !! remember to deallocate memory 5
             Marshal.StructureToPtr(list, ipcoListPtr, false);
 
             // and finally, call the API method!
-            bool isSuccess = NativeMethods.InternetSetOption(nint.Zero,
+            var isSuccess = NativeMethods.InternetSetOption(nint.Zero,
                InternetOption.INTERNET_OPTION_PER_CONNECTION_OPTION,
                ipcoListPtr, list.dwSize);
-            int returnvalue = 0; // ERROR_SUCCESS
+            var returnvalue = 0; // ERROR_SUCCESS
             if (!isSuccess)
             {  // get the error codes, they might be helpful
                 returnvalue = Marshal.GetLastPInvokeError();
@@ -171,13 +169,15 @@ namespace ServiceLib.Handler.SysProxy
             else
             {
                 // Notify the system that the registry settings have been changed and cause them to be refreshed
-                NativeMethods.InternetSetOption(nint.Zero, InternetOption.INTERNET_OPTION_SETTINGS_CHANGED, nint.Zero, 0);
-                NativeMethods.InternetSetOption(nint.Zero, InternetOption.INTERNET_OPTION_REFRESH, nint.Zero, 0);
+                _ = NativeMethods.InternetSetOption(nint.Zero, InternetOption.INTERNET_OPTION_SETTINGS_CHANGED, nint.Zero, 0);
+                _ = NativeMethods.InternetSetOption(nint.Zero, InternetOption.INTERNET_OPTION_REFRESH, nint.Zero, 0);
             }
 
             // FREE the data ASAP
             if (list.szConnection != nint.Zero)
+            {
                 Marshal.FreeHGlobal(list.szConnection); // release mem 3
+            }
             if (optionCount > 1)
             {
                 Marshal.FreeHGlobal(options[1].m_Value.m_StringPtr); // release mem 1
@@ -204,18 +204,18 @@ namespace ServiceLib.Handler.SysProxy
         /// <exception cref="ApplicationException">Error message with win32 error code</exception>
         private static IEnumerable<string> EnumerateRasEntries()
         {
-            int entries = 0;
+            var entries = 0;
             // attempt to query with 1 entry buffer
-            RASENTRYNAME[] rasEntryNames = new RASENTRYNAME[1];
-            int bufferSize = Marshal.SizeOf(typeof(RASENTRYNAME));
+            var rasEntryNames = new RASENTRYNAME[1];
+            var bufferSize = Marshal.SizeOf(typeof(RASENTRYNAME));
             rasEntryNames[0].dwSize = Marshal.SizeOf(typeof(RASENTRYNAME));
 
-            uint result = NativeMethods.RasEnumEntries(null, null, rasEntryNames, ref bufferSize, ref entries);
+            var result = NativeMethods.RasEnumEntries(null, null, rasEntryNames, ref bufferSize, ref entries);
             // increase buffer if the buffer is not large enough
             if (result == (uint)ErrorCode.ERROR_BUFFER_TOO_SMALL)
             {
                 rasEntryNames = new RASENTRYNAME[bufferSize / Marshal.SizeOf(typeof(RASENTRYNAME))];
-                for (int i = 0; i < rasEntryNames.Length; i++)
+                for (var i = 0; i < rasEntryNames.Length; i++)
                 {
                     rasEntryNames[i].dwSize = Marshal.SizeOf(typeof(RASENTRYNAME));
                 }
@@ -225,7 +225,7 @@ namespace ServiceLib.Handler.SysProxy
             if (result == 0)
             {
                 var entryNames = new List<string>();
-                for (int i = 0; i < entries; i++)
+                for (var i = 0; i < entries; i++)
                 {
                     entryNames.Add(rasEntryNames[i].szEntryName);
                 }

v2rayN/ServiceLib/Handler/SysProxy/SysProxyHandler.cs

@@ -75,7 +75,7 @@
             }
 
             strProxy = string.Empty;
-            if (Utils.IsNullOrEmpty(config.SystemProxyItem.SystemProxyAdvancedProtocol))
+            if (config.SystemProxyItem.SystemProxyAdvancedProtocol.IsNullOrEmpty())
             {
                 strProxy = $"{Global.Loopback}:{port}";
             }

v2rayN/ServiceLib/Handler/TaskHandler.cs

@@ -1,4 +1,4 @@
-namespace ServiceLib.Handler
+namespace ServiceLib.Handler
 {
     public class TaskHandler
     {
@@ -7,66 +7,92 @@
 
         public void RegUpdateTask(Config config, Action<bool, string> updateFunc)
         {
-            Task.Run(() => UpdateTaskRunSubscription(config, updateFunc));
-            Task.Run(() => UpdateTaskRunGeo(config, updateFunc));
+            Task.Run(() => ScheduledTasks(config, updateFunc));
+        }
+
+        private async Task ScheduledTasks(Config config, Action<bool, string> updateFunc)
+        {
+            Logging.SaveLog("Setup Scheduled Tasks");
+
+            var numOfExecuted = 1;
+            while (true)
+            {
+                //1 minute
+                await Task.Delay(1000 * 60);
+
+                //Execute once 1 minute
+                await UpdateTaskRunSubscription(config, updateFunc);
+
+                //Execute once 20 minute
+                if (numOfExecuted % 20 == 0)
+                {
+                    //Logging.SaveLog("Execute save config");
+
+                    await ConfigHandler.SaveConfig(config);
+                    await ProfileExHandler.Instance.SaveTo();
+                }
+
+                //Execute once 1 hour
+                if (numOfExecuted % 60 == 0)
+                {
+                    //Logging.SaveLog("Execute delete expired files");
+
+                    FileManager.DeleteExpiredFiles(Utils.GetBinConfigPath(), DateTime.Now.AddHours(-1));
+                    FileManager.DeleteExpiredFiles(Utils.GetLogPath(), DateTime.Now.AddMonths(-1));
+                    FileManager.DeleteExpiredFiles(Utils.GetTempPath(), DateTime.Now.AddMonths(-1));
+
+                    //Check once 1 hour
+                    await UpdateTaskRunGeo(config, numOfExecuted / 60, updateFunc);
+                }
+
+                numOfExecuted++;
+            }
         }
 
         private async Task UpdateTaskRunSubscription(Config config, Action<bool, string> updateFunc)
         {
-            await Task.Delay(60000);
-            Logging.SaveLog("UpdateTaskRunSubscription");
+            var updateTime = ((DateTimeOffset)DateTime.Now).ToUnixTimeSeconds();
+            var lstSubs = (await AppHandler.Instance.SubItems())?
+                .Where(t => t.AutoUpdateInterval > 0)
+                .Where(t => updateTime - t.UpdateTime >= t.AutoUpdateInterval * 60)
+                .ToList();
 
-            var updateHandle = new UpdateService();
-            while (true)
+            if (lstSubs is not { Count: > 0 })
             {
-                var updateTime = ((DateTimeOffset)DateTime.Now).ToUnixTimeSeconds();
-                var lstSubs = (await AppHandler.Instance.SubItems())
-                            .Where(t => t.AutoUpdateInterval > 0)
-                            .Where(t => updateTime - t.UpdateTime >= t.AutoUpdateInterval * 60)
-                            .ToList();
+                return;
+            }
 
-                foreach (var item in lstSubs)
+            Logging.SaveLog("Execute update subscription");
+            var updateHandle = new UpdateService();
+
+            foreach (var item in lstSubs)
+            {
+                await updateHandle.UpdateSubscriptionProcess(config, item.Id, true, (bool success, string msg) =>
                 {
-                    await updateHandle.UpdateSubscriptionProcess(config, item.Id, true, (bool success, string msg) =>
-                        {
-                            updateFunc?.Invoke(success, msg);
-                            if (success)
-                                Logging.SaveLog("subscription" + msg);
-                        });
-                    item.UpdateTime = updateTime;
-                    await ConfigHandler.AddSubItem(config, item);
-
-                    await Task.Delay(5000);
-                }
-                await Task.Delay(60000);
+                    updateFunc?.Invoke(success, msg);
+                    if (success)
+                    {
+                        Logging.SaveLog($"Update subscription end. {msg}");
+                    }
+                });
+                item.UpdateTime = updateTime;
+                await ConfigHandler.AddSubItem(config, item);
+                await Task.Delay(1000);
             }
         }
 
-        private async Task UpdateTaskRunGeo(Config config, Action<bool, string> updateFunc)
+        private async Task UpdateTaskRunGeo(Config config, int hours, Action<bool, string> updateFunc)
         {
-            var autoUpdateGeoTime = DateTime.Now;
-
-            //await Task.Delay(1000 * 120);
-            Logging.SaveLog("UpdateTaskRunGeo");
-
-            var updateHandle = new UpdateService();
-            while (true)
+            if (config.GuiItem.AutoUpdateInterval > 0 && hours > 0 && hours % config.GuiItem.AutoUpdateInterval == 0)
             {
-                await Task.Delay(1000 * 3600);
+                Logging.SaveLog("Execute update geo files");
 
-                var dtNow = DateTime.Now;
-                if (config.GuiItem.AutoUpdateInterval > 0)
+                var updateHandle = new UpdateService();
+                await updateHandle.UpdateGeoFileAll(config, (bool success, string msg) =>
                 {
-                    if ((dtNow - autoUpdateGeoTime).Hours % config.GuiItem.AutoUpdateInterval == 0)
-                    {
-                        await updateHandle.UpdateGeoFileAll(config, (bool success, string msg) =>
-                        {
-                            updateFunc?.Invoke(false, msg);
-                        });
-                        autoUpdateGeoTime = dtNow;
-                    }
-                }
+                    updateFunc?.Invoke(false, msg);
+                });
             }
         }
     }
-}
+}

v2rayN/ServiceLib/Handler/WebDavHandler.cs

@@ -8,7 +8,7 @@ namespace ServiceLib.Handler
         private static readonly Lazy<WebDavHandler> _instance = new(() => new());
         public static WebDavHandler Instance => _instance.Value;
 
-        private Config? _config;
+        private readonly Config? _config;
         private WebDavClient? _client;
         private string? _lastDescription;
         private string _webDir = Global.AppName + "_backup";
@@ -62,7 +62,9 @@ namespace ServiceLib.Handler
         private async Task<bool> TryCreateDir()
         {
             if (_client is null)
+            {
                 return false;
+            }
             try
             {
                 var result2 = await _client.Mkcol(_webDir);

v2rayN/ServiceLib/Models/ConfigItems.cs

@@ -197,6 +197,7 @@ namespace ServiceLib.Models
     {
         public int UpMbps { get; set; }
         public int DownMbps { get; set; }
+        public int HopInterval { get; set; } = 30;
     }
 
     [Serializable]

v2rayN/ServiceLib/Models/ProfileItem.cs

@@ -1,4 +1,4 @@
-using SQLite;
+using SQLite;
 
 namespace ServiceLib.Models
 {
@@ -48,12 +48,12 @@ namespace ServiceLib.Models
 
         public List<string>? GetAlpn()
         {
-            return Utils.IsNullOrEmpty(Alpn) ? null : Utils.String2List(Alpn);
+            return Alpn.IsNullOrEmpty() ? null : Utils.String2List(Alpn);
         }
 
         public string GetNetwork()
         {
-            if (Utils.IsNullOrEmpty(Network) || !Global.Networks.Contains(Network))
+            if (Network.IsNullOrEmpty() || !Global.Networks.Contains(Network))
             {
                 return Global.DefaultNetwork;
             }
@@ -64,11 +64,11 @@ namespace ServiceLib.Models
 
         [PrimaryKey]
         public string IndexId { get; set; }
-
         public EConfigType ConfigType { get; set; }
         public int ConfigVersion { get; set; }
         public string Address { get; set; }
         public int Port { get; set; }
+        public string Ports { get; set; }
         public string Id { get; set; }
         public int AlterId { get; set; }
         public string Security { get; set; }
@@ -93,4 +93,4 @@ namespace ServiceLib.Models
         public string SpiderX { get; set; }
         public string Extra { get; set; }
     }
-}
+}

v2rayN/ServiceLib/Models/SingboxConfig.cs

@@ -1,4 +1,4 @@
-namespace ServiceLib.Models
+namespace ServiceLib.Models
 {
     public class SingboxConfig
     {
@@ -101,21 +101,23 @@
         public string tag { get; set; }
         public string? server { get; set; }
         public int? server_port { get; set; }
-        public string uuid { get; set; }
-        public string security { get; set; }
+        public List<string>? server_ports { get; set; }
+        public string? uuid { get; set; }
+        public string? security { get; set; }
         public int? alter_id { get; set; }
-        public string flow { get; set; }
+        public string? flow { get; set; }
+        public string? hop_interval { get; set; }
         public int? up_mbps { get; set; }
         public int? down_mbps { get; set; }
-        public string auth_str { get; set; }
+        public string? auth_str { get; set; }
         public int? recv_window_conn { get; set; }
         public int? recv_window { get; set; }
         public bool? disable_mtu_discovery { get; set; }
         public string? detour { get; set; }
-        public string method { get; set; }
-        public string username { get; set; }
-        public string password { get; set; }
-        public string congestion_control { get; set; }
+        public string? method { get; set; }
+        public string? username { get; set; }
+        public string? password { get; set; }
+        public string? congestion_control { get; set; }
         public string? version { get; set; }
         public string? network { get; set; }
         public string? packet_encoding { get; set; }
@@ -252,4 +254,4 @@
         public string? download_detour { get; set; }
         public string? update_interval { get; set; }
     }
-}
+}

v2rayN/ServiceLib/Models/V2rayConfig.cs

@@ -291,6 +291,8 @@ namespace ServiceLib.Models
         public object request { get; set; }
 
         public object response { get; set; }
+
+        public string? domain { get; set; }
     }
 
     public class KcpSettings4Ray

v2rayN/ServiceLib/Resx/ResUI.Designer.cs

@@ -2483,7 +2483,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Address(Ip,Ipv6) 的本地化字符串。
+        ///   查找类似 Address(Ipv4,Ipv6) 的本地化字符串。
         /// </summary>
         public static string TbLocalAddress {
             get {
@@ -2536,6 +2536,24 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Server port range 的本地化字符串。
+        /// </summary>
+        public static string TbPorts7 {
+            get {
+                return ResourceManager.GetString("TbPorts7", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Will cover the port, separate with commas (,) 的本地化字符串。
+        /// </summary>
+        public static string TbPorts7Tips {
+            get {
+                return ResourceManager.GetString("TbPorts7Tips", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Socks port 的本地化字符串。
         /// </summary>

v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx

@@ -1319,7 +1319,7 @@
     <value>Previous proxy remarks</value>
   </data>
   <data name="TbLocalAddress" xml:space="preserve">
-    <value>آدرس (IP, IPv6)</value>
+    <value>آدرس (IPv4, IPv6)</value>
   </data>
   <data name="TbReserved" xml:space="preserve">
     <value>Reserved(2,3,4)</value>
@@ -1396,4 +1396,10 @@
   <data name="RemoveInvalidServerResultTip" xml:space="preserve">
     <value>Removed {0} invalid test results.</value>
   </data>
+  <data name="TbPorts7" xml:space="preserve">
+    <value>Server port range</value>
+  </data>
+  <data name="TbPorts7Tips" xml:space="preserve">
+    <value>Will cover the port, separate with commas (,)</value>
+  </data>
 </root>

v2rayN/ServiceLib/Resx/ResUI.hu.resx

@@ -1100,7 +1100,7 @@
     <value>Fenntartva (2,3,4)</value>
   </data>
   <data name="TbLocalAddress" xml:space="preserve">
-    <value>Cím (Ip,Ipv6)</value>
+    <value>Cím (Ipv4,Ipv6)</value>
   </data>
   <data name="TbPath7" xml:space="preserve">
     <value>obfs jelszó</value>
@@ -1396,4 +1396,10 @@
   <data name="RemoveInvalidServerResultTip" xml:space="preserve">
     <value>Removed {0} invalid test results.</value>
   </data>
+  <data name="TbPorts7" xml:space="preserve">
+    <value>Server port range</value>
+  </data>
+  <data name="TbPorts7Tips" xml:space="preserve">
+    <value>Will cover the port, separate with commas (,)</value>
+  </data>
 </root>

v2rayN/ServiceLib/Resx/ResUI.resx

@@ -1100,7 +1100,7 @@
     <value>Reserved(2,3,4)</value>
   </data>
   <data name="TbLocalAddress" xml:space="preserve">
-    <value>Address(Ip,Ipv6)</value>
+    <value>Address(Ipv4,Ipv6)</value>
   </data>
   <data name="TbPath7" xml:space="preserve">
     <value>obfs password</value>
@@ -1396,4 +1396,10 @@
   <data name="RemoveInvalidServerResultTip" xml:space="preserve">
     <value>Removed {0} invalid test results.</value>
   </data>
-</root>
+  <data name="TbPorts7" xml:space="preserve">
+    <value>Server port range</value>
+  </data>
+  <data name="TbPorts7Tips" xml:space="preserve">
+    <value>Will cover the port, separate with commas (,)</value>
+  </data>
+</root>

v2rayN/ServiceLib/Resx/ResUI.ru.resx

@@ -1052,7 +1052,7 @@
     <value>obfs password</value>
   </data>
   <data name="TbLocalAddress" xml:space="preserve">
-    <value>Address(Ip,Ipv6)</value>
+    <value>Address(Ipv4,Ipv6)</value>
   </data>
   <data name="TbSettingsDomainStrategy4Out" xml:space="preserve">
     <value>Default domain strategy for outbound</value>
@@ -1396,4 +1396,10 @@
   <data name="RemoveInvalidServerResultTip" xml:space="preserve">
     <value>Removed {0} invalid test results.</value>
   </data>
+  <data name="TbPorts7" xml:space="preserve">
+    <value>Server port range</value>
+  </data>
+  <data name="TbPorts7Tips" xml:space="preserve">
+    <value>Will cover the port, separate with commas (,)</value>
+  </data>
 </root>

v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx

@@ -1097,7 +1097,7 @@
     <value>Reserved(2,3,4)</value>
   </data>
   <data name="TbLocalAddress" xml:space="preserve">
-    <value>Address(Ip,Ipv6)</value>
+    <value>Address(Ipv4,Ipv6)</value>
   </data>
   <data name="TbPath7" xml:space="preserve">
     <value>混淆密码(obfs password)</value>
@@ -1393,4 +1393,10 @@
   <data name="RemoveInvalidServerResultTip" xml:space="preserve">
     <value>移除无效测试结果 {0} 个。</value>
   </data>
+  <data name="TbPorts7" xml:space="preserve">
+    <value>跳跃端口范围</value>
+  </data>
+  <data name="TbPorts7Tips" xml:space="preserve">
+    <value>会覆盖端口，多组时用逗号(,)隔开</value>
+  </data>
 </root>

v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx

@@ -1326,7 +1326,7 @@
     <value>Reserved(2,3,4)</value>
   </data>
   <data name="TbLocalAddress" xml:space="preserve">
-    <value>Address(Ip,Ipv6)</value>
+    <value>Address(Ipv4,Ipv6)</value>
   </data>
   <data name="TbSettingsUseSystemHosts" xml:space="preserve">
     <value>使用系統hosts</value>
@@ -1394,4 +1394,10 @@
   <data name="RemoveInvalidServerResultTip" xml:space="preserve">
     <value>移除無效測試結果 {0} 個。</value>
   </data>
+  <data name="TbPorts7" xml:space="preserve">
+    <value>跳躍端口範圍</value>
+  </data>
+  <data name="TbPorts7Tips" xml:space="preserve">
+    <value>會覆蓋端口，多組時用逗號(,)隔開</value>
+  </data>
 </root>

v2rayN/ServiceLib/Sample/proxy_set_linux_sh

@@ -80,13 +80,19 @@ set_kde_proxy() {
 
 # Detect the current desktop environment
 detect_desktop_environment() {
-    if [ "$XDG_CURRENT_DESKTOP" == "GNOME" ] || [ "$XDG_CURRENT_DESKTOP" == "ubuntu:GNOME" ] || [ "$XDG_SESSION_DESKTOP" == "GNOME" ] || [ "$XDG_SESSION_DESKTOP" == "ubuntu:GNOME" ]; then
+    if [[ "$XDG_CURRENT_DESKTOP" == *"GNOME"* ]] || [[ "$XDG_SESSION_DESKTOP" == *"GNOME"* ]]; then
         echo "gnome"
-    elif [ "$XDG_CURRENT_DESKTOP" == "KDE" ] || [ "$XDG_CURRENT_DESKTOP" == "plasma" ] || [ "$XDG_SESSION_DESKTOP" == "KDE" ] || [ "$XDG_SESSION_DESKTOP" == "plasma" ]; then
-        echo "kde"
-    else
-        echo "unsupported"
+        return
     fi
+
+    local KDE_ENVIRONMENTS=("KDE" "plasma")
+    for ENV in "${KDE_ENVIRONMENTS[@]}"; do
+        if [ "$XDG_CURRENT_DESKTOP" == "$ENV" ] || [ "$XDG_SESSION_DESKTOP" == "$ENV" ]; then
+            echo "kde"
+            return
+        fi
+    done
+    echo "unsupported"
 }
 
 # Main script logic

v2rayN/ServiceLib/Services/CoreConfig/CoreConfigClashService.cs

@@ -44,8 +44,8 @@ namespace ServiceLib.Services.CoreConfig
                     File.Delete(fileName);
                 }
 
-                string addressFileName = node.Address;
-                if (Utils.IsNullOrEmpty(addressFileName))
+                var addressFileName = node.Address;
+                if (addressFileName.IsNullOrEmpty())
                 {
                     ret.Msg = ResUI.FailedGetDefaultConfiguration;
                     return ret;
@@ -60,9 +60,9 @@ namespace ServiceLib.Services.CoreConfig
                     return ret;
                 }
 
-                string tagYamlStr1 = "!<str>";
-                string tagYamlStr2 = "__strn__";
-                string tagYamlStr3 = "!!str";
+                var tagYamlStr1 = "!<str>";
+                var tagYamlStr2 = "__strn__";
+                var tagYamlStr3 = "!!str";
                 var txtFile = File.ReadAllText(addressFileName);
                 txtFile = txtFile.Replace(tagYamlStr1, tagYamlStr2);
 
@@ -117,11 +117,13 @@ namespace ServiceLib.Services.CoreConfig
                 if (_config.TunModeItem.EnableTun)
                 {
                     var tun = EmbedUtils.GetEmbedText(Global.ClashTunYaml);
-                    if (Utils.IsNotEmpty(tun))
+                    if (tun.IsNotEmpty())
                     {
                         var tunContent = YamlUtils.FromYaml<Dictionary<string, object>>(tun);
                         if (tunContent != null)
+                        {
                             fileContent["tun"] = tunContent["tun"];
+                        }
                     }
                 }
 
@@ -202,8 +204,8 @@ namespace ServiceLib.Services.CoreConfig
 
         private void ModifyContentMerge(Dictionary<string, object> 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));
             }
         }
 

v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs

@@ -36,7 +36,7 @@ namespace ServiceLib.Services.CoreConfig
                 ret.Msg = ResUI.InitialConfiguration;
 
                 string result = EmbedUtils.GetEmbedText(Global.SingboxSampleClient);
-                if (Utils.IsNullOrEmpty(result))
+                if (result.IsNullOrEmpty())
                 {
                     ret.Msg = ResUI.FailedGetDefaultConfiguration;
                     return ret;
@@ -93,7 +93,7 @@ namespace ServiceLib.Services.CoreConfig
 
                 var result = EmbedUtils.GetEmbedText(Global.SingboxSampleClient);
                 var txtOutbound = EmbedUtils.GetEmbedText(Global.SingboxSampleOutbound);
-                if (Utils.IsNullOrEmpty(result) || txtOutbound.IsNullOrEmpty())
+                if (result.IsNullOrEmpty() || txtOutbound.IsNullOrEmpty())
                 {
                     ret.Msg = ResUI.FailedGetDefaultConfiguration;
                     return ret;
@@ -138,7 +138,7 @@ namespace ServiceLib.Services.CoreConfig
                     var item = await AppHandler.Instance.GetProfileItem(it.IndexId);
                     if (it.ConfigType is EConfigType.VMess or EConfigType.VLESS)
                     {
-                        if (item is null || Utils.IsNullOrEmpty(item.Id) || !Utils.IsGuidByParse(item.Id))
+                        if (item is null || item.Id.IsNullOrEmpty() || !Utils.IsGuidByParse(item.Id))
                         {
                             continue;
                         }
@@ -261,7 +261,7 @@ namespace ServiceLib.Services.CoreConfig
                 ret.Msg = ResUI.InitialConfiguration;
 
                 var result = EmbedUtils.GetEmbedText(Global.SingboxSampleClient);
-                if (Utils.IsNullOrEmpty(result))
+                if (result.IsNullOrEmpty())
                 {
                     ret.Msg = ResUI.FailedGetDefaultConfiguration;
                     return ret;
@@ -317,7 +317,7 @@ namespace ServiceLib.Services.CoreConfig
 
                 string result = EmbedUtils.GetEmbedText(Global.SingboxSampleClient);
                 string txtOutbound = EmbedUtils.GetEmbedText(Global.SingboxSampleOutbound);
-                if (Utils.IsNullOrEmpty(result) || txtOutbound.IsNullOrEmpty())
+                if (result.IsNullOrEmpty() || txtOutbound.IsNullOrEmpty())
                 {
                     ret.Msg = ResUI.FailedGetDefaultConfiguration;
                     return ret;
@@ -354,7 +354,7 @@ namespace ServiceLib.Services.CoreConfig
                     }
                     if (it.ConfigType is EConfigType.VMess or EConfigType.VLESS)
                     {
-                        if (Utils.IsNullOrEmpty(item.Id) || !Utils.IsGuidByParse(item.Id))
+                        if (item.Id.IsNullOrEmpty() || !Utils.IsGuidByParse(item.Id))
                         {
                             continue;
                         }
@@ -443,7 +443,7 @@ namespace ServiceLib.Services.CoreConfig
                 }
 
                 string addressFileName = node.Address;
-                if (Utils.IsNullOrEmpty(addressFileName))
+                if (addressFileName.IsNullOrEmpty())
                 {
                     ret.Msg = ResUI.FailedGetDefaultConfiguration;
                     return ret;
@@ -560,10 +560,10 @@ namespace ServiceLib.Services.CoreConfig
                     inbound.listen_port = AppHandler.Instance.GetLocalPort(EInboundProtocol.socks);
                     inbound.sniff = _config.Inbound.First().SniffingEnabled;
                     inbound.sniff_override_destination = _config.Inbound.First().RouteOnly ? false : _config.Inbound.First().SniffingEnabled;
-                    inbound.domain_strategy = Utils.IsNullOrEmpty(_config.RoutingBasicItem.DomainStrategy4Singbox) ? null : _config.RoutingBasicItem.DomainStrategy4Singbox;
+                    inbound.domain_strategy = _config.RoutingBasicItem.DomainStrategy4Singbox.IsNullOrEmpty() ? null : _config.RoutingBasicItem.DomainStrategy4Singbox;
 
                     var routing = await ConfigHandler.GetDefaultRouting(_config);
-                    if (Utils.IsNotEmpty(routing.DomainStrategy4Singbox))
+                    if (routing.DomainStrategy4Singbox.IsNotEmpty())
                     {
                         inbound.domain_strategy = routing.DomainStrategy4Singbox;
                     }
@@ -583,7 +583,7 @@ namespace ServiceLib.Services.CoreConfig
                             singboxConfig.inbounds.Add(inbound3);
 
                             //auth
-                            if (Utils.IsNotEmpty(_config.Inbound.First().User) && Utils.IsNotEmpty(_config.Inbound.First().Pass))
+                            if (_config.Inbound.First().User.IsNotEmpty() && _config.Inbound.First().Pass.IsNotEmpty())
                             {
                                 inbound3.users = new() { new() { username = _config.Inbound.First().User, password = _config.Inbound.First().Pass } };
                             }
@@ -601,7 +601,7 @@ namespace ServiceLib.Services.CoreConfig
                     {
                         _config.TunModeItem.Mtu = Global.TunMtus.First();
                     }
-                    if (Utils.IsNullOrEmpty(_config.TunModeItem.Stack))
+                    if (_config.TunModeItem.Stack.IsNullOrEmpty())
                     {
                         _config.TunModeItem.Stack = Global.TunStacks.First();
                     }
@@ -674,8 +674,8 @@ namespace ServiceLib.Services.CoreConfig
                     case EConfigType.SOCKS:
                         {
                             outbound.version = "5";
-                            if (Utils.IsNotEmpty(node.Security)
-                              && Utils.IsNotEmpty(node.Id))
+                            if (node.Security.IsNotEmpty()
+                              && node.Id.IsNotEmpty())
                             {
                                 outbound.username = node.Security;
                                 outbound.password = node.Id;
@@ -684,8 +684,8 @@ namespace ServiceLib.Services.CoreConfig
                         }
                     case EConfigType.HTTP:
                         {
-                            if (Utils.IsNotEmpty(node.Security)
-                              && Utils.IsNotEmpty(node.Id))
+                            if (node.Security.IsNotEmpty()
+                              && node.Id.IsNotEmpty())
                             {
                                 outbound.username = node.Security;
                                 outbound.password = node.Id;
@@ -698,7 +698,7 @@ namespace ServiceLib.Services.CoreConfig
 
                             outbound.packet_encoding = "xudp";
 
-                            if (Utils.IsNullOrEmpty(node.Flow))
+                            if (node.Flow.IsNullOrEmpty())
                             {
                                 await GenOutboundMux(node, outbound);
                             }
@@ -719,7 +719,7 @@ namespace ServiceLib.Services.CoreConfig
                         {
                             outbound.password = node.Id;
 
-                            if (Utils.IsNotEmpty(node.Path))
+                            if (node.Path.IsNotEmpty())
                             {
                                 outbound.obfs = new()
                                 {
@@ -730,6 +730,16 @@ namespace ServiceLib.Services.CoreConfig
 
                             outbound.up_mbps = _config.HysteriaItem.UpMbps > 0 ? _config.HysteriaItem.UpMbps : null;
                             outbound.down_mbps = _config.HysteriaItem.DownMbps > 0 ? _config.HysteriaItem.DownMbps : null;
+                            if (node.Ports.IsNotEmpty())
+                            {
+                                outbound.server_port = null;
+                                outbound.server_ports = node.Ports.Split(',')
+                                    .Where(p => p.Trim().IsNotEmpty())
+                                    .Select(p => p.Replace('-', ':'))
+                                    .ToList();
+                                outbound.hop_interval = _config.HysteriaItem.HopInterval > 0 ? $"{_config.HysteriaItem.HopInterval}s" : null;
+                            }
+
                             break;
                         }
                     case EConfigType.TUIC:
@@ -745,7 +755,7 @@ namespace ServiceLib.Services.CoreConfig
                             outbound.peer_public_key = node.PublicKey;
                             outbound.reserved = Utils.String2List(node.Path)?.Select(int.Parse).ToList();
                             outbound.local_address = Utils.String2List(node.RequestHost);
-                            outbound.mtu = Utils.ToInt(node.ShortId.IsNullOrEmpty() ? Global.TunMtus.First() : node.ShortId);
+                            outbound.mtu = node.ShortId.IsNullOrEmpty() ? Global.TunMtus.First() : node.ShortId.ToInt();
                             break;
                         }
                 }
@@ -765,7 +775,7 @@ namespace ServiceLib.Services.CoreConfig
         {
             try
             {
-                if (_config.CoreBasicItem.MuxEnabled && Utils.IsNotEmpty(_config.Mux4SboxItem.Protocol))
+                if (_config.CoreBasicItem.MuxEnabled && _config.Mux4SboxItem.Protocol.IsNotEmpty())
                 {
                     var mux = new Multiplex4Sbox()
                     {
@@ -791,11 +801,11 @@ namespace ServiceLib.Services.CoreConfig
                 if (node.StreamSecurity == Global.StreamSecurityReality || node.StreamSecurity == Global.StreamSecurity)
                 {
                     var server_name = string.Empty;
-                    if (Utils.IsNotEmpty(node.Sni))
+                    if (node.Sni.IsNotEmpty())
                     {
                         server_name = node.Sni;
                     }
-                    else if (Utils.IsNotEmpty(node.RequestHost))
+                    else if (node.RequestHost.IsNotEmpty())
                     {
                         server_name = Utils.String2List(node.RequestHost)?.First();
                     }
@@ -806,7 +816,7 @@ namespace ServiceLib.Services.CoreConfig
                         insecure = Utils.ToBool(node.AllowInsecure.IsNullOrEmpty() ? _config.CoreBasicItem.DefAllowInsecure.ToString().ToLower() : node.AllowInsecure),
                         alpn = node.GetAlpn(),
                     };
-                    if (Utils.IsNotEmpty(node.Fingerprint))
+                    if (node.Fingerprint.IsNotEmpty())
                     {
                         tls.utls = new Utls4Sbox()
                         {
@@ -844,8 +854,8 @@ namespace ServiceLib.Services.CoreConfig
                 {
                     case nameof(ETransport.h2):
                         transport.type = nameof(ETransport.http);
-                        transport.host = Utils.IsNullOrEmpty(node.RequestHost) ? null : Utils.String2List(node.RequestHost);
-                        transport.path = Utils.IsNullOrEmpty(node.Path) ? null : node.Path;
+                        transport.host = node.RequestHost.IsNullOrEmpty() ? null : Utils.String2List(node.RequestHost);
+                        transport.path = node.Path.IsNullOrEmpty() ? null : node.Path;
                         break;
 
                     case nameof(ETransport.tcp):   //http
@@ -859,16 +869,16 @@ namespace ServiceLib.Services.CoreConfig
                             else
                             {
                                 transport.type = nameof(ETransport.http);
-                                transport.host = Utils.IsNullOrEmpty(node.RequestHost) ? null : Utils.String2List(node.RequestHost);
-                                transport.path = Utils.IsNullOrEmpty(node.Path) ? null : node.Path;
+                                transport.host = node.RequestHost.IsNullOrEmpty() ? null : Utils.String2List(node.RequestHost);
+                                transport.path = node.Path.IsNullOrEmpty() ? null : node.Path;
                             }
                         }
                         break;
 
                     case nameof(ETransport.ws):
                         transport.type = nameof(ETransport.ws);
-                        transport.path = Utils.IsNullOrEmpty(node.Path) ? null : node.Path;
-                        if (Utils.IsNotEmpty(node.RequestHost))
+                        transport.path = node.Path.IsNullOrEmpty() ? null : node.Path;
+                        if (node.RequestHost.IsNotEmpty())
                         {
                             transport.headers = new()
                             {
@@ -879,8 +889,8 @@ namespace ServiceLib.Services.CoreConfig
 
                     case nameof(ETransport.httpupgrade):
                         transport.type = nameof(ETransport.httpupgrade);
-                        transport.path = Utils.IsNullOrEmpty(node.Path) ? null : node.Path;
-                        transport.host = Utils.IsNullOrEmpty(node.RequestHost) ? null : node.RequestHost;
+                        transport.path = node.Path.IsNullOrEmpty() ? null : node.Path;
+                        transport.host = node.RequestHost.IsNullOrEmpty() ? null : node.RequestHost;
 
                         break;
 
@@ -1075,7 +1085,7 @@ namespace ServiceLib.Services.CoreConfig
                     outbound = item.OutboundTag,
                 };
 
-                if (Utils.IsNotEmpty(item.Port))
+                if (item.Port.IsNotEmpty())
                 {
                     if (item.Port.Contains("-"))
                     {
@@ -1083,10 +1093,10 @@ namespace ServiceLib.Services.CoreConfig
                     }
                     else
                     {
-                        rule.port = new List<int> { Utils.ToInt(item.Port) };
+                        rule.port = new List<int> { item.Port.ToInt() };
                     }
                 }
-                if (Utils.IsNotEmpty(item.Network))
+                if (item.Network.IsNotEmpty())
                 {
                     rule.network = Utils.String2List(item.Network);
                 }
@@ -1231,11 +1241,11 @@ namespace ServiceLib.Services.CoreConfig
                 var strDNS = string.Empty;
                 if (_config.TunModeItem.EnableTun)
                 {
-                    strDNS = Utils.IsNullOrEmpty(item?.TunDNS) ? EmbedUtils.GetEmbedText(Global.TunSingboxDNSFileName) : item?.TunDNS;
+                    strDNS = string.IsNullOrEmpty(item?.TunDNS) ? EmbedUtils.GetEmbedText(Global.TunSingboxDNSFileName) : item?.TunDNS;
                 }
                 else
                 {
-                    strDNS = Utils.IsNullOrEmpty(item?.NormalDNS) ? EmbedUtils.GetEmbedText(Global.DNSSingboxNormalFileName) : item?.NormalDNS;
+                    strDNS = string.IsNullOrEmpty(item?.NormalDNS) ? EmbedUtils.GetEmbedText(Global.DNSSingboxNormalFileName) : item?.NormalDNS;
                 }
 
                 var dns4Sbox = JsonUtils.Deserialize<Dns4Sbox>(strDNS);
@@ -1264,9 +1274,9 @@ namespace ServiceLib.Services.CoreConfig
             dns4Sbox.servers.Add(new()
             {
                 tag = tag,
-                address = Utils.IsNullOrEmpty(dNSItem?.DomainDNSAddress) ? Global.SingboxDomainDNSAddress.FirstOrDefault() : dNSItem?.DomainDNSAddress,
+                address = string.IsNullOrEmpty(dNSItem?.DomainDNSAddress) ? Global.SingboxDomainDNSAddress.FirstOrDefault() : dNSItem?.DomainDNSAddress,
                 detour = Global.DirectTag,
-                strategy = Utils.IsNullOrEmpty(dNSItem?.DomainStrategy4Freedom) ? null : dNSItem?.DomainStrategy4Freedom,
+                strategy = string.IsNullOrEmpty(dNSItem?.DomainStrategy4Freedom) ? null : dNSItem?.DomainStrategy4Freedom,
             });
             dns4Sbox.rules.Insert(0, new()
             {
@@ -1280,7 +1290,7 @@ namespace ServiceLib.Services.CoreConfig
             });
 
             var lstDomain = singboxConfig.outbounds
-                           .Where(t => Utils.IsNotEmpty(t.server) && Utils.IsDomain(t.server))
+                           .Where(t => t.server.IsNotEmpty() && Utils.IsDomain(t.server))
                            .Select(t => t.server)
                            .Distinct()
                            .ToList();
@@ -1384,10 +1394,10 @@ namespace ServiceLib.Services.CoreConfig
             List<Ruleset4Sbox> customRulesets = [];
 
             var routing = await ConfigHandler.GetDefaultRouting(_config);
-            if (Utils.IsNotEmpty(routing.CustomRulesetPath4Singbox))
+            if (routing.CustomRulesetPath4Singbox.IsNotEmpty())
             {
                 var result = EmbedUtils.LoadResource(routing.CustomRulesetPath4Singbox);
-                if (Utils.IsNotEmpty(result))
+                if (result.IsNotEmpty())
                 {
                     customRulesets = (JsonUtils.Deserialize<List<Ruleset4Sbox>>(result) ?? [])
                         .Where(t => t.tag != null)
@@ -1404,7 +1414,7 @@ namespace ServiceLib.Services.CoreConfig
             singboxConfig.route.rule_set = [];
             foreach (var item in new HashSet<string>(ruleSets))
             {
-                if (Utils.IsNullOrEmpty(item))
+                if (item.IsNullOrEmpty())
                 { continue; }
                 var customRuleset = customRulesets.FirstOrDefault(t => t.tag != null && t.tag.Equals(item));
                 if (customRuleset is null)

v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs

@@ -37,7 +37,7 @@ namespace ServiceLib.Services.CoreConfig
                 ret.Msg = ResUI.InitialConfiguration;
 
                 var result = EmbedUtils.GetEmbedText(Global.V2raySampleClient);
-                if (Utils.IsNullOrEmpty(result))
+                if (result.IsNullOrEmpty())
                 {
                     ret.Msg = ResUI.FailedGetDefaultConfiguration;
                     return ret;
@@ -93,7 +93,7 @@ namespace ServiceLib.Services.CoreConfig
 
                 string result = EmbedUtils.GetEmbedText(Global.V2raySampleClient);
                 string txtOutbound = EmbedUtils.GetEmbedText(Global.V2raySampleOutbound);
-                if (Utils.IsNullOrEmpty(result) || txtOutbound.IsNullOrEmpty())
+                if (result.IsNullOrEmpty() || txtOutbound.IsNullOrEmpty())
                 {
                     ret.Msg = ResUI.FailedGetDefaultConfiguration;
                     return ret;
@@ -135,7 +135,7 @@ namespace ServiceLib.Services.CoreConfig
                     }
                     if (it.ConfigType is EConfigType.VMess or EConfigType.VLESS)
                     {
-                        if (Utils.IsNullOrEmpty(item.Id) || !Utils.IsGuidByParse(item.Id))
+                        if (item.Id.IsNullOrEmpty() || !Utils.IsGuidByParse(item.Id))
                         {
                             continue;
                         }
@@ -182,12 +182,24 @@ namespace ServiceLib.Services.CoreConfig
                         rule.balancerTag = balancer.tag;
                     }
                 }
-                v2rayConfig.routing.rules.Add(new()
+                if (v2rayConfig.routing.domainStrategy == "IPIfNonMatch")
                 {
-                    network = "tcp,udp",
-                    balancerTag = balancer.tag,
-                    type = "field"
-                });
+                    v2rayConfig.routing.rules.Add(new()
+                    {
+                        ip = ["0.0.0.0/0", "::/0"],
+                        balancerTag = balancer.tag,
+                        type = "field"
+                    });
+                }
+                else
+                {
+                    v2rayConfig.routing.rules.Add(new()
+                    {
+                        network = "tcp,udp",
+                        balancerTag = balancer.tag,
+                        type = "field"
+                    });
+                }
 
                 ret.Success = true;
                 ret.Data = JsonUtils.Serialize(v2rayConfig);
@@ -216,7 +228,7 @@ namespace ServiceLib.Services.CoreConfig
 
                 var result = EmbedUtils.GetEmbedText(Global.V2raySampleClient);
                 var txtOutbound = EmbedUtils.GetEmbedText(Global.V2raySampleOutbound);
-                if (Utils.IsNullOrEmpty(result) || txtOutbound.IsNullOrEmpty())
+                if (result.IsNullOrEmpty() || txtOutbound.IsNullOrEmpty())
                 {
                     ret.Msg = ResUI.FailedGetDefaultConfiguration;
                     return ret;
@@ -261,7 +273,7 @@ namespace ServiceLib.Services.CoreConfig
                     var item = await AppHandler.Instance.GetProfileItem(it.IndexId);
                     if (it.ConfigType is EConfigType.VMess or EConfigType.VLESS)
                     {
-                        if (item is null || Utils.IsNullOrEmpty(item.Id) || !Utils.IsGuidByParse(item.Id))
+                        if (item is null || item.Id.IsNullOrEmpty() || !Utils.IsGuidByParse(item.Id))
                         {
                             continue;
                         }
@@ -371,7 +383,7 @@ namespace ServiceLib.Services.CoreConfig
                 }
 
                 var result = EmbedUtils.GetEmbedText(Global.V2raySampleClient);
-                if (Utils.IsNullOrEmpty(result))
+                if (result.IsNullOrEmpty())
                 {
                     ret.Msg = ResUI.FailedGetDefaultConfiguration;
                     return ret;
@@ -465,7 +477,7 @@ namespace ServiceLib.Services.CoreConfig
                         v2rayConfig.inbounds.Add(inbound3);
 
                         //auth
-                        if (Utils.IsNotEmpty(_config.Inbound.First().User) && Utils.IsNotEmpty(_config.Inbound.First().Pass))
+                        if (_config.Inbound.First().User.IsNotEmpty() && _config.Inbound.First().Pass.IsNotEmpty())
                         {
                             inbound3.settings.auth = "password";
                             inbound3.settings.accounts = new List<AccountsItem4Ray> { new AccountsItem4Ray() { user = _config.Inbound.First().User, pass = _config.Inbound.First().Pass } };
@@ -487,7 +499,7 @@ namespace ServiceLib.Services.CoreConfig
         private Inbounds4Ray GetInbound(InItem inItem, EInboundProtocol protocol, bool bSocks)
         {
             string result = EmbedUtils.GetEmbedText(Global.V2raySampleInbound);
-            if (Utils.IsNullOrEmpty(result))
+            if (result.IsNullOrEmpty())
             {
                 return new();
             }
@@ -515,12 +527,12 @@ namespace ServiceLib.Services.CoreConfig
                 if (v2rayConfig.routing?.rules != null)
                 {
                     v2rayConfig.routing.domainStrategy = _config.RoutingBasicItem.DomainStrategy;
-                    v2rayConfig.routing.domainMatcher = Utils.IsNullOrEmpty(_config.RoutingBasicItem.DomainMatcher) ? null : _config.RoutingBasicItem.DomainMatcher;
+                    v2rayConfig.routing.domainMatcher = _config.RoutingBasicItem.DomainMatcher.IsNullOrEmpty() ? null : _config.RoutingBasicItem.DomainMatcher;
 
                     var routing = await ConfigHandler.GetDefaultRouting(_config);
                     if (routing != null)
                     {
-                        if (Utils.IsNotEmpty(routing.DomainStrategy))
+                        if (routing.DomainStrategy.IsNotEmpty())
                         {
                             v2rayConfig.routing.domainStrategy = routing.DomainStrategy;
                         }
@@ -551,11 +563,11 @@ namespace ServiceLib.Services.CoreConfig
                 {
                     return 0;
                 }
-                if (Utils.IsNullOrEmpty(rule.port))
+                if (rule.port.IsNullOrEmpty())
                 {
                     rule.port = null;
                 }
-                if (Utils.IsNullOrEmpty(rule.network))
+                if (rule.network.IsNullOrEmpty())
                 {
                     rule.network = null;
                 }
@@ -582,7 +594,7 @@ namespace ServiceLib.Services.CoreConfig
                     var it = JsonUtils.DeepCopy(rule);
                     it.ip = null;
                     it.type = "field";
-                    for (int k = it.domain.Count - 1; k >= 0; k--)
+                    for (var k = it.domain.Count - 1; k >= 0; k--)
                     {
                         if (it.domain[k].StartsWith("#"))
                         {
@@ -603,7 +615,7 @@ namespace ServiceLib.Services.CoreConfig
                 }
                 if (!hasDomainIp)
                 {
-                    if (Utils.IsNotEmpty(rule.port)
+                    if (rule.port.IsNotEmpty()
                         || rule.protocol?.Count > 0
                         || rule.inboundTag?.Count > 0
                         )
@@ -714,8 +726,8 @@ namespace ServiceLib.Services.CoreConfig
                             serversItem.method = null;
                             serversItem.password = null;
 
-                            if (Utils.IsNotEmpty(node.Security)
-                                && Utils.IsNotEmpty(node.Id))
+                            if (node.Security.IsNotEmpty()
+                                && node.Id.IsNotEmpty())
                             {
                                 SocksUsersItem4Ray socksUsersItem = new()
                                 {
@@ -868,11 +880,11 @@ namespace ServiceLib.Services.CoreConfig
                         alpn = node.GetAlpn(),
                         fingerprint = node.Fingerprint.IsNullOrEmpty() ? _config.CoreBasicItem.DefFingerprint : node.Fingerprint
                     };
-                    if (Utils.IsNotEmpty(sni))
+                    if (sni.IsNotEmpty())
                     {
                         tlsSettings.serverName = sni;
                     }
-                    else if (Utils.IsNotEmpty(host))
+                    else if (host.IsNotEmpty())
                     {
                         tlsSettings.serverName = Utils.String2List(host)?.First();
                     }
@@ -915,9 +927,10 @@ namespace ServiceLib.Services.CoreConfig
                         kcpSettings.writeBufferSize = _config.KcpItem.WriteBufferSize;
                         kcpSettings.header = new Header4Ray
                         {
-                            type = node.HeaderType
+                            type = node.HeaderType,
+                            domain = host.IsNullOrEmpty() ? null : host
                         };
-                        if (Utils.IsNotEmpty(path))
+                        if (path.IsNotEmpty())
                         {
                             kcpSettings.seed = path;
                         }
@@ -928,16 +941,16 @@ namespace ServiceLib.Services.CoreConfig
                         WsSettings4Ray wsSettings = new();
                         wsSettings.headers = new Headers4Ray();
 
-                        if (Utils.IsNotEmpty(host))
+                        if (host.IsNotEmpty())
                         {
                             wsSettings.host = host;
                             wsSettings.headers.Host = host;
                         }
-                        if (Utils.IsNotEmpty(path))
+                        if (path.IsNotEmpty())
                         {
                             wsSettings.path = path;
                         }
-                        if (Utils.IsNotEmpty(useragent))
+                        if (useragent.IsNotEmpty())
                         {
                             wsSettings.headers.UserAgent = useragent;
                         }
@@ -948,11 +961,11 @@ namespace ServiceLib.Services.CoreConfig
                     case nameof(ETransport.httpupgrade):
                         HttpupgradeSettings4Ray httpupgradeSettings = new();
 
-                        if (Utils.IsNotEmpty(path))
+                        if (path.IsNotEmpty())
                         {
                             httpupgradeSettings.path = path;
                         }
-                        if (Utils.IsNotEmpty(host))
+                        if (host.IsNotEmpty())
                         {
                             httpupgradeSettings.host = host;
                         }
@@ -964,19 +977,19 @@ namespace ServiceLib.Services.CoreConfig
                         streamSettings.network = ETransport.xhttp.ToString();
                         XhttpSettings4Ray xhttpSettings = new();
 
-                        if (Utils.IsNotEmpty(path))
+                        if (path.IsNotEmpty())
                         {
                             xhttpSettings.path = path;
                         }
-                        if (Utils.IsNotEmpty(host))
+                        if (host.IsNotEmpty())
                         {
                             xhttpSettings.host = host;
                         }
-                        if (Utils.IsNotEmpty(node.HeaderType) && Global.XhttpMode.Contains(node.HeaderType))
+                        if (node.HeaderType.IsNotEmpty() && Global.XhttpMode.Contains(node.HeaderType))
                         {
                             xhttpSettings.mode = node.HeaderType;
                         }
-                        if (Utils.IsNotEmpty(node.Extra))
+                        if (node.Extra.IsNotEmpty())
                         {
                             xhttpSettings.extra = JsonUtils.ParseJson(node.Extra);
                         }
@@ -989,7 +1002,7 @@ namespace ServiceLib.Services.CoreConfig
                     case nameof(ETransport.h2):
                         HttpSettings4Ray httpSettings = new();
 
-                        if (Utils.IsNotEmpty(host))
+                        if (host.IsNotEmpty())
                         {
                             httpSettings.host = Utils.String2List(host);
                         }
@@ -1012,7 +1025,7 @@ namespace ServiceLib.Services.CoreConfig
                         streamSettings.quicSettings = quicsettings;
                         if (node.StreamSecurity == Global.StreamSecurity)
                         {
-                            if (Utils.IsNotEmpty(sni))
+                            if (sni.IsNotEmpty())
                             {
                                 streamSettings.tlsSettings.serverName = sni;
                             }
@@ -1026,7 +1039,7 @@ namespace ServiceLib.Services.CoreConfig
                     case nameof(ETransport.grpc):
                         GrpcSettings4Ray grpcSettings = new()
                         {
-                            authority = Utils.IsNullOrEmpty(host) ? null : host,
+                            authority = host.IsNullOrEmpty() ? null : host,
                             serviceName = path,
                             multiMode = node.HeaderType == Global.GrpcMultiMode,
                             idle_timeout = _config.GrpcItem.IdleTimeout,
@@ -1057,7 +1070,7 @@ namespace ServiceLib.Services.CoreConfig
                             request = request.Replace("$requestUserAgent$", $"{useragent.AppendQuotes()}");
                             //Path
                             string pathHttp = @"/";
-                            if (Utils.IsNotEmpty(path))
+                            if (path.IsNotEmpty())
                             {
                                 string[] arrPath = path.Split(',');
                                 pathHttp = string.Join(",".AppendQuotes(), arrPath);
@@ -1084,13 +1097,13 @@ namespace ServiceLib.Services.CoreConfig
                 var item = await AppHandler.Instance.GetDNSItem(ECoreType.Xray);
                 var normalDNS = item?.NormalDNS;
                 var domainStrategy4Freedom = item?.DomainStrategy4Freedom;
-                if (Utils.IsNullOrEmpty(normalDNS))
+                if (normalDNS.IsNullOrEmpty())
                 {
                     normalDNS = EmbedUtils.GetEmbedText(Global.DNSV2rayNormalFileName);
                 }
 
                 //Outbound Freedom domainStrategy
-                if (Utils.IsNotEmpty(domainStrategy4Freedom))
+                if (domainStrategy4Freedom.IsNotEmpty())
                 {
                     var outbound = v2rayConfig.outbounds.FirstOrDefault(t => t is { protocol: "freedom", tag: Global.DirectTag });
                     if (outbound != null)
@@ -1155,7 +1168,7 @@ namespace ServiceLib.Services.CoreConfig
                 {
                     var dnsServer = new DnsServer4Ray()
                     {
-                        address = Utils.IsNullOrEmpty(dNSItem?.DomainDNSAddress) ? Global.DomainDNSAddress.FirstOrDefault() : dNSItem?.DomainDNSAddress,
+                        address = string.IsNullOrEmpty(dNSItem?.DomainDNSAddress) ? Global.DomainDNSAddress.FirstOrDefault() : dNSItem?.DomainDNSAddress,
                         domains = [node.Address]
                     };
                     servers.AsArray().Add(JsonUtils.SerializeToNode(dnsServer));
@@ -1215,7 +1228,7 @@ namespace ServiceLib.Services.CoreConfig
         {
             //fragment proxy
             if (_config.CoreBasicItem.EnableFragment
-                && Utils.IsNotEmpty(v2rayConfig.outbounds.First().streamSettings?.security))
+                && v2rayConfig.outbounds.First().streamSettings?.security.IsNullOrEmpty() == false)
             {
                 var fragmentOutbound = new Outbounds4Ray
                 {

v2rayN/ServiceLib/Services/DownloadService.cs

@@ -23,14 +23,7 @@ namespace ServiceLib.Services
                 SetSecurityProtocol(AppHandler.Instance.Config.GuiItem.EnableSecurityProtocolTls13);
 
                 var progress = new Progress<string>();
-                progress.ProgressChanged += (sender, value) =>
-                {
-                    if (updateFunc != null)
-                    {
-                        string msg = $"{value}";
-                        updateFunc?.Invoke(false, msg);
-                    }
-                };
+                progress.ProgressChanged += (sender, value) => updateFunc?.Invoke(false, $"{value}");
 
                 await DownloaderHelper.Instance.DownloadDataAsync4Speed(webProxy,
                       url,
@@ -56,10 +49,7 @@ namespace ServiceLib.Services
                 UpdateCompleted?.Invoke(this, new RetResult(false, $"{ResUI.Downloading}   {url}"));
 
                 var progress = new Progress<double>();
-                progress.ProgressChanged += (sender, value) =>
-                {
-                    UpdateCompleted?.Invoke(this, new RetResult(value > 100, $"...{value}%"));
-                };
+                progress.ProgressChanged += (sender, value) => UpdateCompleted?.Invoke(this, new RetResult(value > 100, $"...{value}%"));
 
                 var webProxy = await GetWebProxy(blProxy);
                 await DownloaderHelper.Instance.DownloadFileAsync(webProxy,
@@ -108,7 +98,7 @@ namespace ServiceLib.Services
             try
             {
                 var result1 = await DownloadStringAsync(url, blProxy, userAgent, 15);
-                if (Utils.IsNotEmpty(result1))
+                if (result1.IsNotEmpty())
                 {
                     return result1;
                 }
@@ -126,7 +116,7 @@ namespace ServiceLib.Services
             try
             {
                 var result2 = await DownloadStringViaDownloader(url, blProxy, userAgent, 15);
-                if (Utils.IsNotEmpty(result2))
+                if (result2.IsNotEmpty())
                 {
                     return result2;
                 }
@@ -160,7 +150,7 @@ namespace ServiceLib.Services
                     UseProxy = webProxy != null
                 });
 
-                if (Utils.IsNullOrEmpty(userAgent))
+                if (userAgent.IsNullOrEmpty())
                 {
                     userAgent = Utils.GetVersion(false);
                 }
@@ -168,7 +158,7 @@ namespace ServiceLib.Services
 
                 Uri uri = new(url);
                 //Authorization Header
-                if (Utils.IsNotEmpty(uri.UserInfo))
+                if (uri.UserInfo.IsNotEmpty())
                 {
                     client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic", Utils.Base64Encode(uri.UserInfo));
                 }
@@ -201,7 +191,7 @@ namespace ServiceLib.Services
 
                 var webProxy = await GetWebProxy(blProxy);
 
-                if (Utils.IsNullOrEmpty(userAgent))
+                if (userAgent.IsNullOrEmpty())
                 {
                     userAgent = Utils.GetVersion(false);
                 }
@@ -263,7 +253,7 @@ namespace ServiceLib.Services
                 for (var i = 0; i < 2; i++)
                 {
                     var timer = Stopwatch.StartNew();
-                    await client.GetAsync(url, cts.Token);
+                    await client.GetAsync(url, cts.Token).ConfigureAwait(false);
                     timer.Stop();
                     oneTime.Add((int)timer.Elapsed.TotalMilliseconds);
                     await Task.Delay(100);

v2rayN/ServiceLib/Services/SpeedtestService.cs

@@ -25,8 +25,6 @@ namespace ServiceLib.Services
                 await RunAsync(actionType, selecteds);
                 await ProfileExHandler.Instance.SaveTo();
                 UpdateFunc("", ResUI.SpeedtestingCompleted);
-
-                FileManager.DeleteExpiredFiles(Utils.GetBinConfigPath(), DateTime.Now.AddHours(-1));
             });
         }
 
@@ -143,8 +141,7 @@ namespace ServiceLib.Services
                     }
                 }));
             }
-            Task.WaitAll([.. tasks]);
-            await Task.CompletedTask;
+            await Task.WhenAll(tasks);
         }
 
         private async Task RunRealPingBatchAsync(List<ServerTestItem> lstSelected, string exitLoopKey, int pageSize = 0)
@@ -218,7 +215,7 @@ namespace ServiceLib.Services
                         await DoRealPing(downloadHandle, it);
                     }));
                 }
-                Task.WaitAll(tasks.ToArray());
+                await Task.WhenAll(tasks);
             }
             catch (Exception ex)
             {
@@ -293,7 +290,7 @@ namespace ServiceLib.Services
                     }
                 }));
             }
-            Task.WaitAll(tasks.ToArray());
+            await Task.WhenAll(tasks);
         }
 
         private async Task<int> DoRealPing(DownloadService downloadHandle, ServerTestItem it)

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<ServerSpeedItem>? _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;
@@ -87,9 +86,9 @@ namespace ServiceLib.Services.Statistics
                         while (!res.CloseStatus.HasValue)
                         {
                             var result = Encoding.UTF8.GetString(buffer, 0, res.Count);
-                            if (Utils.IsNotEmpty(result))
+                            if (result.IsNotEmpty())
                             {
-                                ParseOutput(result, out ulong up, out ulong down);
+                                ParseOutput(result, out var up, out var down);
 
                                 _updateFunc?.Invoke(new ServerSpeedItem()
                                 {

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<ServerSpeedItem>? _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<string>())
                 {
                     var value = source.stats.outbound[key];
                     if (value == null)
+                    {
                         continue;
+                    }
                     var state = JsonUtils.Deserialize<V2rayMetricsVarsLink>(value.ToString());
 
                     if (key.StartsWith(Global.ProxyTag))

v2rayN/ServiceLib/Services/UpdateService.cs

@@ -123,7 +123,7 @@ namespace ServiceLib.Services
                 var url = item.Url.TrimEx();
                 var userAgent = item.UserAgent.TrimEx();
                 var hashCode = $"{item.Remarks}->";
-                if (Utils.IsNullOrEmpty(id) || Utils.IsNullOrEmpty(url) || (Utils.IsNotEmpty(subId) && item.Id != subId))
+                if (id.IsNullOrEmpty() || url.IsNullOrEmpty() || (subId.IsNotEmpty() && item.Id != subId))
                 {
                     //_updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgNoValidSubscription}");
                     continue;
@@ -149,9 +149,9 @@ namespace ServiceLib.Services
                 //one url
                 url = Utils.GetPunycode(url);
                 //convert
-                if (Utils.IsNotEmpty(item.ConvertTarget))
+                if (item.ConvertTarget.IsNotEmpty())
                 {
-                    var subConvertUrl = Utils.IsNullOrEmpty(config.ConstItem.SubConvertUrl) ? Global.SubConvertUrls.FirstOrDefault() : config.ConstItem.SubConvertUrl;
+                    var subConvertUrl = config.ConstItem.SubConvertUrl.IsNullOrEmpty() ? Global.SubConvertUrls.FirstOrDefault() : config.ConstItem.SubConvertUrl;
                     url = string.Format(subConvertUrl!, Utils.UrlEncode(url));
                     if (!url.Contains("target="))
                     {
@@ -163,15 +163,15 @@ namespace ServiceLib.Services
                     }
                 }
                 var result = await downloadHandle.TryDownloadString(url, blProxy, userAgent);
-                if (blProxy && Utils.IsNullOrEmpty(result))
+                if (blProxy && result.IsNullOrEmpty())
                 {
                     result = await downloadHandle.TryDownloadString(url, false, userAgent);
                 }
 
                 //more url
-                if (Utils.IsNullOrEmpty(item.ConvertTarget) && Utils.IsNotEmpty(item.MoreUrl.TrimEx()))
+                if (item.ConvertTarget.IsNullOrEmpty() && item.MoreUrl.TrimEx().IsNotEmpty())
                 {
-                    if (Utils.IsNotEmpty(result) && Utils.IsBase64String(result))
+                    if (result.IsNotEmpty() && Utils.IsBase64String(result))
                     {
                         result = Utils.Base64Decode(result);
                     }
@@ -180,17 +180,17 @@ namespace ServiceLib.Services
                     foreach (var it in lstUrl)
                     {
                         var url2 = Utils.GetPunycode(it);
-                        if (Utils.IsNullOrEmpty(url2))
+                        if (url2.IsNullOrEmpty())
                         {
                             continue;
                         }
 
                         var result2 = await downloadHandle.TryDownloadString(url2, blProxy, userAgent);
-                        if (blProxy && Utils.IsNullOrEmpty(result2))
+                        if (blProxy && result2.IsNullOrEmpty())
                         {
                             result2 = await downloadHandle.TryDownloadString(url2, false, userAgent);
                         }
-                        if (Utils.IsNotEmpty(result2))
+                        if (result2.IsNotEmpty())
                         {
                             if (Utils.IsBase64String(result2))
                             {
@@ -204,7 +204,7 @@ namespace ServiceLib.Services
                     }
                 }
 
-                if (Utils.IsNullOrEmpty(result))
+                if (result.IsNullOrEmpty())
                 {
                     _updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgSubscriptionDecodingFailed}");
                 }
@@ -287,7 +287,7 @@ namespace ServiceLib.Services
             {
                 var url = coreInfo?.ReleaseApiUrl;
                 var result = await downloadHandle.TryDownloadString(url, true, Global.AppName);
-                if (Utils.IsNullOrEmpty(result))
+                if (result.IsNullOrEmpty())
                 {
                     return new RetResult(false, "");
                 }

v2rayN/ServiceLib/ViewModels/AddServer2ViewModel.cs

@@ -42,14 +42,14 @@ namespace ServiceLib.ViewModels
 
         private async Task SaveServerAsync()
         {
-            string remarks = SelectedSource.Remarks;
-            if (Utils.IsNullOrEmpty(remarks))
+            var remarks = SelectedSource.Remarks;
+            if (remarks.IsNullOrEmpty())
             {
                 NoticeHandler.Instance.Enqueue(ResUI.PleaseFillRemarks);
                 return;
             }
 
-            if (Utils.IsNullOrEmpty(SelectedSource.Address))
+            if (SelectedSource.Address.IsNullOrEmpty())
             {
                 NoticeHandler.Instance.Enqueue(ResUI.FillServerAddressCustom);
                 return;
@@ -69,7 +69,7 @@ namespace ServiceLib.ViewModels
 
         public async Task BrowseServer(string fileName)
         {
-            if (Utils.IsNullOrEmpty(fileName))
+            if (fileName.IsNullOrEmpty())
             {
                 return;
             }
@@ -80,7 +80,7 @@ namespace ServiceLib.ViewModels
             if (await ConfigHandler.AddCustomServer(_config, item, false) == 0)
             {
                 NoticeHandler.Instance.Enqueue(ResUI.SuccessfullyImportedCustomServer);
-                if (Utils.IsNotEmpty(item.IndexId))
+                if (item.IndexId.IsNotEmpty())
                 {
                     SelectedSource = JsonUtils.DeepCopy(item);
                 }
@@ -95,7 +95,7 @@ namespace ServiceLib.ViewModels
         private async Task EditServer()
         {
             var address = SelectedSource.Address;
-            if (Utils.IsNullOrEmpty(address))
+            if (address.IsNullOrEmpty())
             {
                 NoticeHandler.Instance.Enqueue(ResUI.FillServerAddressCustom);
                 return;

v2rayN/ServiceLib/ViewModels/AddServerViewModel.cs

@@ -41,19 +41,19 @@ namespace ServiceLib.ViewModels
 
         private async Task SaveServerAsync()
         {
-            if (Utils.IsNullOrEmpty(SelectedSource.Remarks))
+            if (SelectedSource.Remarks.IsNullOrEmpty())
             {
                 NoticeHandler.Instance.Enqueue(ResUI.PleaseFillRemarks);
                 return;
             }
 
-            if (Utils.IsNullOrEmpty(SelectedSource.Address))
+            if (SelectedSource.Address.IsNullOrEmpty())
             {
                 NoticeHandler.Instance.Enqueue(ResUI.FillServerAddress);
                 return;
             }
             var port = SelectedSource.Port.ToString();
-            if (Utils.IsNullOrEmpty(port) || !Utils.IsNumeric(port)
+            if (port.IsNullOrEmpty() || !Utils.IsNumeric(port)
                 || SelectedSource.Port <= 0 || SelectedSource.Port >= Global.MaxPort)
             {
                 NoticeHandler.Instance.Enqueue(ResUI.FillCorrectServerPort);
@@ -61,21 +61,20 @@ namespace ServiceLib.ViewModels
             }
             if (SelectedSource.ConfigType == EConfigType.Shadowsocks)
             {
-                if (Utils.IsNullOrEmpty(SelectedSource.Id))
+                if (SelectedSource.Id.IsNullOrEmpty())
                 {
                     NoticeHandler.Instance.Enqueue(ResUI.FillPassword);
                     return;
                 }
-                if (Utils.IsNullOrEmpty(SelectedSource.Security))
+                if (SelectedSource.Security.IsNullOrEmpty())
                 {
                     NoticeHandler.Instance.Enqueue(ResUI.PleaseSelectEncryption);
                     return;
                 }
             }
-            if (SelectedSource.ConfigType != EConfigType.SOCKS
-                && SelectedSource.ConfigType != EConfigType.HTTP)
+            if (SelectedSource.ConfigType is not EConfigType.SOCKS and not EConfigType.HTTP)
             {
-                if (Utils.IsNullOrEmpty(SelectedSource.Id))
+                if (SelectedSource.Id.IsNullOrEmpty())
                 {
                     NoticeHandler.Instance.Enqueue(ResUI.FillUUID);
                     return;

v2rayN/ServiceLib/ViewModels/BackupAndRestoreViewModel.cs

@@ -50,7 +50,7 @@ namespace ServiceLib.ViewModels
         {
             DisplayOperationMsg();
             _config.WebDavItem = SelectedSource;
-            await ConfigHandler.SaveConfig(_config);
+            _ = await ConfigHandler.SaveConfig(_config);
 
             var result = await WebDavHandler.Instance.CheckConnection();
             if (result)
@@ -114,7 +114,7 @@ namespace ServiceLib.ViewModels
         public async Task LocalRestore(string fileName)
         {
             DisplayOperationMsg();
-            if (Utils.IsNullOrEmpty(fileName))
+            if (fileName.IsNullOrEmpty())
             {
                 return;
             }
@@ -151,7 +151,7 @@ namespace ServiceLib.ViewModels
                 {
                     if (Utils.UpgradeAppExists(out var upgradeFileName))
                     {
-                        ProcUtils.ProcessStart(upgradeFileName, Global.RebootAs, Utils.StartupPath());
+                        _ = ProcUtils.ProcessStart(upgradeFileName, Global.RebootAs, Utils.StartupPath());
                     }
                 }
                 service?.Shutdown(true);
@@ -164,7 +164,7 @@ namespace ServiceLib.ViewModels
 
         private async Task<bool> CreateZipFileFromDirectory(string fileName)
         {
-            if (Utils.IsNullOrEmpty(fileName))
+            if (fileName.IsNullOrEmpty())
             {
                 return false;
             }

v2rayN/ServiceLib/ViewModels/CheckUpdateViewModel.cs

@@ -74,6 +74,14 @@ namespace ServiceLib.ViewModels
         }
 
         private async Task CheckUpdate()
+        {
+            await Task.Run(async () =>
+            {
+                await CheckUpdateTask();
+            });
+        }
+
+        private async Task CheckUpdateTask()
         {
             _lstUpdated.Clear();
             _lstUpdated = _checkUpdateModel.Where(x => x.IsSelected == true)

v2rayN/ServiceLib/ViewModels/ClashConnectionsViewModel.cs

@@ -32,7 +32,7 @@ namespace ServiceLib.ViewModels
 
             var canEditRemove = this.WhenAnyValue(
              x => x.SelectedSource,
-             selectedSource => selectedSource != null && Utils.IsNotEmpty(selectedSource.Id));
+             selectedSource => selectedSource != null && selectedSource.Id.IsNotEmpty());
 
             this.WhenAnyValue(
                x => x.AutoRefresh,
@@ -53,38 +53,18 @@ namespace ServiceLib.ViewModels
 
         private async Task Init()
         {
-            var lastTime = DateTime.Now;
-
-            Observable.Interval(TimeSpan.FromSeconds(5))
-              .Subscribe(async x =>
-              {
-                  if (!(AutoRefresh && _config.UiItem.ShowInTaskbar && _config.IsRunningCore(ECoreType.sing_box)))
-                  {
-                      return;
-                  }
-                  var dtNow = DateTime.Now;
-                  if (_config.ClashUIItem.ConnectionsRefreshInterval > 0)
-                  {
-                      if ((dtNow - lastTime).Minutes % _config.ClashUIItem.ConnectionsRefreshInterval == 0)
-                      {
-                          await GetClashConnections();
-                          lastTime = dtNow;
-                      }
-                      Task.Delay(1000).Wait();
-                  }
-              });
-            await Task.CompletedTask;
+            await DelayTestTask();
         }
 
         private async Task GetClashConnections()
         {
-            var ret = await ClashApiHandler.Instance.GetClashConnectionsAsync(_config);
+            var ret = await ClashApiHandler.Instance.GetClashConnectionsAsync();
             if (ret == null)
             {
                 return;
             }
 
-            _updateView?.Invoke(EViewAction.DispatcherRefreshConnections, ret?.connections);
+            _ = _updateView?.Invoke(EViewAction.DispatcherRefreshConnections, ret?.connections);
         }
 
         public void RefreshConnections(List<ConnectionItem>? connections)
@@ -95,28 +75,29 @@ namespace ServiceLib.ViewModels
             var lstModel = new List<ClashConnectionModel>();
             foreach (var item in connections ?? new())
             {
-                var host = $"{(Utils.IsNullOrEmpty(item.metadata.host) ? item.metadata.destinationIP : item.metadata.host)}:{item.metadata.destinationPort}";
+                var host = $"{(item.metadata.host.IsNullOrEmpty() ? item.metadata.destinationIP : item.metadata.host)}:{item.metadata.destinationPort}";
                 if (HostFilter.IsNotEmpty() && !host.Contains(HostFilter))
                 {
                     continue;
                 }
 
-                ClashConnectionModel model = new();
-
-                model.Id = item.id;
-                model.Network = item.metadata.network;
-                model.Type = item.metadata.type;
-                model.Host = host;
-                var sp = (dtNow - item.start);
-                model.Time = sp.TotalSeconds < 0 ? 1 : sp.TotalSeconds;
-                model.Elapsed = sp.ToString(@"hh\:mm\:ss");
-                item.chains?.Reverse();
-                model.Chain = $"{item.rule} , {string.Join("->", item.chains ?? new())}";
+                var model = new ClashConnectionModel
+                {
+                    Id = item.id,
+                    Network = item.metadata.network,
+                    Type = item.metadata.type,
+                    Host = host,
+                    Time = (dtNow - item.start).TotalSeconds < 0 ? 1 : (dtNow - item.start).TotalSeconds,
+                    Elapsed = (dtNow - item.start).ToString(@"hh\:mm\:ss"),
+                    Chain = $"{item.rule} , {string.Join("->", item.chains ?? new())}"
+                };
 
                 lstModel.Add(model);
             }
             if (lstModel.Count <= 0)
-            { return; }
+            {
+                return;
+            }
 
             _connectionItems.AddRange(lstModel);
         }
@@ -140,5 +121,35 @@ namespace ServiceLib.ViewModels
             await ClashApiHandler.Instance.ClashConnectionClose(id);
             await GetClashConnections();
         }
+
+        public async Task DelayTestTask()
+        {
+            _ = Task.Run(async () =>
+            {
+                var numOfExecuted = 1;
+                while (true)
+                {
+                    await Task.Delay(1000 * 5);
+                    numOfExecuted++;
+                    if (!(AutoRefresh && _config.UiItem.ShowInTaskbar && _config.IsRunningCore(ECoreType.sing_box)))
+                    {
+                        continue;
+                    }
+
+                    if (_config.ClashUIItem.ConnectionsRefreshInterval <= 0)
+                    {
+                        continue;
+                    }
+
+                    if (numOfExecuted % _config.ClashUIItem.ConnectionsRefreshInterval != 0)
+                    {
+                        continue;
+                    }
+                    await GetClashConnections();
+                }
+            });
+
+            await Task.CompletedTask;
+        }
     }
 }

v2rayN/ServiceLib/ViewModels/ClashProxiesViewModel.cs

@@ -13,7 +13,7 @@ namespace ServiceLib.ViewModels
     {
         private Dictionary<string, ProxiesItem>? _proxies;
         private Dictionary<string, ProvidersItem>? _providers;
-        private int _delayTimeout = 99999999;
+        private readonly int _delayTimeout = 99999999;
 
         private IObservableCollection<ClashProxyModel> _proxyGroups = new ObservableCollectionExtended<ClashProxyModel>();
         private IObservableCollection<ClashProxyModel> _proxyDetails = new ObservableCollectionExtended<ClashProxyModel>();
@@ -28,8 +28,8 @@ namespace ServiceLib.ViewModels
         public ClashProxyModel SelectedDetail { get; set; }
 
         public ReactiveCommand<Unit, Unit> ProxiesReloadCmd { get; }
-        public ReactiveCommand<Unit, Unit> ProxiesDelaytestCmd { get; }
-        public ReactiveCommand<Unit, Unit> ProxiesDelaytestPartCmd { get; }
+        public ReactiveCommand<Unit, Unit> ProxiesDelayTestCmd { get; }
+        public ReactiveCommand<Unit, Unit> ProxiesDelayTestPartCmd { get; }
         public ReactiveCommand<Unit, Unit> ProxiesSelectActivityCmd { get; }
 
         [Reactive]
@@ -50,12 +50,12 @@ namespace ServiceLib.ViewModels
             {
                 await ProxiesReload();
             });
-            ProxiesDelaytestCmd = ReactiveCommand.CreateFromTask(async () =>
+            ProxiesDelayTestCmd = ReactiveCommand.CreateFromTask(async () =>
             {
                 await ProxiesDelayTest(true);
             });
 
-            ProxiesDelaytestPartCmd = ReactiveCommand.CreateFromTask(async () =>
+            ProxiesDelayTestPartCmd = ReactiveCommand.CreateFromTask(async () =>
             {
                 await ProxiesDelayTest(false);
             });
@@ -72,13 +72,13 @@ namespace ServiceLib.ViewModels
 
             this.WhenAnyValue(
                x => x.SelectedGroup,
-               y => y != null && Utils.IsNotEmpty(y.Name))
+               y => y != null && y.Name.IsNotEmpty())
                    .Subscribe(c => RefreshProxyDetails(c));
 
             this.WhenAnyValue(
                x => x.RuleModeSelected,
                y => y >= 0)
-                   .Subscribe(async c => await DoRulemodeSelected(c));
+                   .Subscribe(async c => await DoRuleModeSelected(c));
 
             this.WhenAnyValue(
                x => x.SortingSelected,
@@ -95,11 +95,10 @@ namespace ServiceLib.ViewModels
 
         private async Task Init()
         {
-            await ProxiesReload();
-            _ = DelayTestTask();
+            await DelayTestTask();
         }
 
-        private async Task DoRulemodeSelected(bool c)
+        private async Task DoRuleModeSelected(bool c)
         {
             if (!c)
             {
@@ -135,22 +134,12 @@ namespace ServiceLib.ViewModels
             RefreshProxyDetails(c);
         }
 
-        private void UpdateHandler(bool notify, string msg)
-        {
-            NoticeHandler.Instance.SendMessageEx(msg);
-        }
-
         public async Task ProxiesReload()
         {
             await GetClashProxies(true);
             await ProxiesDelayTest();
         }
 
-        public async Task ProxiesDelayTest()
-        {
-            await ProxiesDelayTest(true);
-        }
-
         #region proxy function
 
         private async Task SetRuleMode(ERuleMode mode)
@@ -169,7 +158,7 @@ namespace ServiceLib.ViewModels
 
         private async Task GetClashProxies(bool refreshUI)
         {
-            var ret = await ClashApiHandler.Instance.GetClashProxiesAsync(_config);
+            var ret = await ClashApiHandler.Instance.GetClashProxiesAsync();
             if (ret?.Item1 == null || ret.Item2 == null)
             {
                 return;
@@ -193,7 +182,7 @@ namespace ServiceLib.ViewModels
             {
                 foreach (var it in proxyGroups)
                 {
-                    if (Utils.IsNullOrEmpty(it.name) || !_proxies.ContainsKey(it.name))
+                    if (it.name.IsNullOrEmpty() || !_proxies.ContainsKey(it.name))
                     {
                         continue;
                     }
@@ -218,8 +207,8 @@ namespace ServiceLib.ViewModels
                 {
                     continue;
                 }
-                var item = _proxyGroups.Where(t => t.Name == kv.Key).FirstOrDefault();
-                if (item != null && Utils.IsNotEmpty(item.Name))
+                var item = _proxyGroups.FirstOrDefault(t => t.Name == kv.Key);
+                if (item != null && item.Name.IsNotEmpty())
                 {
                     continue;
                 }
@@ -256,7 +245,7 @@ namespace ServiceLib.ViewModels
                 return;
             }
             var name = SelectedGroup?.Name;
-            if (Utils.IsNullOrEmpty(name))
+            if (name.IsNullOrEmpty())
             {
                 return;
             }
@@ -266,29 +255,23 @@ namespace ServiceLib.ViewModels
             }
 
             _proxies.TryGetValue(name, out var proxy);
-            if (proxy == null || proxy.all == null)
+            if (proxy?.all == null)
             {
                 return;
             }
             var lstDetails = new List<ClashProxyModel>();
             foreach (var item in proxy.all)
             {
-                var IsActive = item == proxy.now;
-
                 var proxy2 = TryGetProxy(item);
                 if (proxy2 == null)
                 {
                     continue;
                 }
-                int delay = -1;
-                if (proxy2.history.Count > 0)
-                {
-                    delay = proxy2.history[proxy2.history.Count - 1].delay;
-                }
+                var delay = proxy2.history?.Count > 0 ? proxy2.history.Last().delay : -1;
 
                 lstDetails.Add(new ClashProxyModel()
                 {
-                    IsActive = IsActive,
+                    IsActive = item == proxy.now,
                     Name = item,
                     Type = proxy2.type,
                     Delay = delay <= 0 ? _delayTimeout : delay,
@@ -341,21 +324,21 @@ namespace ServiceLib.ViewModels
 
         public async Task SetActiveProxy()
         {
-            if (SelectedGroup == null || Utils.IsNullOrEmpty(SelectedGroup.Name))
+            if (SelectedGroup == null || SelectedGroup.Name.IsNullOrEmpty())
             {
                 return;
             }
-            if (SelectedDetail == null || Utils.IsNullOrEmpty(SelectedDetail.Name))
+            if (SelectedDetail == null || SelectedDetail.Name.IsNullOrEmpty())
             {
                 return;
             }
             var name = SelectedGroup.Name;
-            if (Utils.IsNullOrEmpty(name))
+            if (name.IsNullOrEmpty())
             {
                 return;
             }
             var nameNode = SelectedDetail.Name;
-            if (Utils.IsNullOrEmpty(nameNode))
+            if (nameNode.IsNullOrEmpty())
             {
                 return;
             }
@@ -369,7 +352,7 @@ namespace ServiceLib.ViewModels
             await ClashApiHandler.Instance.ClashSetActiveProxy(name, nameNode);
 
             selectedProxy.now = nameNode;
-            var group = _proxyGroups.Where(it => it.Name == SelectedGroup.Name).FirstOrDefault();
+            var group = _proxyGroups.FirstOrDefault(it => it.Name == SelectedGroup.Name);
             if (group != null)
             {
                 group.Now = nameNode;
@@ -381,18 +364,11 @@ namespace ServiceLib.ViewModels
             NoticeHandler.Instance.Enqueue(ResUI.OperationSuccess);
         }
 
-        private async Task ProxiesDelayTest(bool blAll)
+        private async Task ProxiesDelayTest(bool blAll = true)
         {
-            //UpdateHandler(false, "Clash Proxies Latency Test");
-
-            ClashApiHandler.Instance.ClashProxiesDelayTest(blAll, _proxyDetails.ToList(), async (item, result) =>
+            ClashApiHandler.Instance.ClashProxiesDelayTest(blAll, _proxyDetails.ToList(), (item, result) =>
             {
-                if (item == null)
-                {
-                    await GetClashProxies(true);
-                    return;
-                }
-                if (Utils.IsNullOrEmpty(result))
+                if (item == null || result.IsNullOrEmpty())
                 {
                     return;
                 }
@@ -405,27 +381,29 @@ namespace ServiceLib.ViewModels
         public void ProxiesDelayTestResult(SpeedTestResult result)
         {
             //UpdateHandler(false, $"{item.name}={result}");
-            var detail = _proxyDetails.Where(it => it.Name == result.IndexId).FirstOrDefault();
-            if (detail != null)
+            var detail = _proxyDetails.FirstOrDefault(it => it.Name == result.IndexId);
+            if (detail == null)
             {
-                var dicResult = JsonUtils.Deserialize<Dictionary<string, object>>(result.Delay);
-                if (dicResult != null && dicResult.ContainsKey("delay"))
-                {
-                    detail.Delay = Convert.ToInt32(dicResult["delay"].ToString());
-                    detail.DelayName = $"{detail.Delay}ms";
-                }
-                else if (dicResult != null && dicResult.ContainsKey("message"))
-                {
-                    detail.Delay = _delayTimeout;
-                    detail.DelayName = $"{dicResult["message"]}";
-                }
-                else
-                {
-                    detail.Delay = _delayTimeout;
-                    detail.DelayName = string.Empty;
-                }
-                _proxyDetails.Replace(detail, JsonUtils.DeepCopy(detail));
+                return;
             }
+
+            var dicResult = JsonUtils.Deserialize<Dictionary<string, object>>(result.Delay);
+            if (dicResult != null && dicResult.TryGetValue("delay", out var value))
+            {
+                detail.Delay = Convert.ToInt32(value.ToString());
+                detail.DelayName = $"{detail.Delay}ms";
+            }
+            else if (dicResult != null && dicResult.TryGetValue("message", out var value1))
+            {
+                detail.Delay = _delayTimeout;
+                detail.DelayName = $"{value1}";
+            }
+            else
+            {
+                detail.Delay = _delayTimeout;
+                detail.DelayName = string.Empty;
+            }
+            _proxyDetails.Replace(detail, JsonUtils.DeepCopy(detail));
         }
 
         #endregion proxy function
@@ -434,30 +412,28 @@ namespace ServiceLib.ViewModels
 
         public async Task DelayTestTask()
         {
-            var lastTime = DateTime.Now;
             _ = Task.Run(async () =>
-            {
-                while (true)
-                {
-                    await Task.Delay(1000 * 60);
-
-                    if (!(AutoRefresh && _config.UiItem.ShowInTaskbar && _config.IsRunningCore(ECoreType.sing_box)))
-                    {
-                        continue;
-                    }
-                    if (_config.ClashUIItem.ProxiesAutoDelayTestInterval <= 0)
-                    {
-                        continue;
-                    }
-                    var dtNow = DateTime.Now;
-                    if ((dtNow - lastTime).Minutes % _config.ClashUIItem.ProxiesAutoDelayTestInterval != 0)
-                    {
-                        continue;
-                    }
-                    await ProxiesDelayTest();
-                    lastTime = dtNow;
-                }
-            });
+              {
+                  var numOfExecuted = 1;
+                  while (true)
+                  {
+                      await Task.Delay(1000 * 60);
+                      numOfExecuted++;
+                      if (!(AutoRefresh && _config.UiItem.ShowInTaskbar && _config.IsRunningCore(ECoreType.sing_box)))
+                      {
+                          continue;
+                      }
+                      if (_config.ClashUIItem.ProxiesAutoDelayTestInterval <= 0)
+                      {
+                          continue;
+                      }
+                      if (numOfExecuted % _config.ClashUIItem.ProxiesAutoDelayTestInterval != 0)
+                      {
+                          continue;
+                      }
+                      await ProxiesDelayTest();
+                  }
+              });
             await Task.CompletedTask;
         }
 

v2rayN/ServiceLib/ViewModels/DNSSettingViewModel.cs

@@ -6,15 +6,15 @@ namespace ServiceLib.ViewModels
 {
     public class DNSSettingViewModel : MyReactiveObject
     {
-        [Reactive] public bool useSystemHosts { get; set; }
-        [Reactive] public string domainStrategy4Freedom { get; set; }
-        [Reactive] public string domainDNSAddress { get; set; }
-        [Reactive] public string normalDNS { get; set; }
+        [Reactive] public bool UseSystemHosts { get; set; }
+        [Reactive] public string DomainStrategy4Freedom { get; set; }
+        [Reactive] public string DomainDNSAddress { get; set; }
+        [Reactive] public string NormalDNS { get; set; }
 
-        [Reactive] public string domainStrategy4Freedom2 { get; set; }
-        [Reactive] public string domainDNSAddress2 { get; set; }
-        [Reactive] public string normalDNS2 { get; set; }
-        [Reactive] public string tunDNS2 { get; set; }
+        [Reactive] public string DomainStrategy4Freedom2 { get; set; }
+        [Reactive] public string DomainDNSAddress2 { get; set; }
+        [Reactive] public string NormalDNS2 { get; set; }
+        [Reactive] public string TunDNS2 { get; set; }
 
         public ReactiveCommand<Unit, Unit> SaveCmd { get; }
         public ReactiveCommand<Unit, Unit> ImportDefConfig4V2rayCmd { get; }
@@ -31,14 +31,14 @@ namespace ServiceLib.ViewModels
 
             ImportDefConfig4V2rayCmd = ReactiveCommand.CreateFromTask(async () =>
             {
-                normalDNS = EmbedUtils.GetEmbedText(Global.DNSV2rayNormalFileName);
+                NormalDNS = EmbedUtils.GetEmbedText(Global.DNSV2rayNormalFileName);
                 await Task.CompletedTask;
             });
 
             ImportDefConfig4SingboxCmd = ReactiveCommand.CreateFromTask(async () =>
             {
-                normalDNS2 = EmbedUtils.GetEmbedText(Global.DNSSingboxNormalFileName);
-                tunDNS2 = EmbedUtils.GetEmbedText(Global.TunSingboxDNSFileName);
+                NormalDNS2 = EmbedUtils.GetEmbedText(Global.DNSSingboxNormalFileName);
+                TunDNS2 = EmbedUtils.GetEmbedText(Global.TunSingboxDNSFileName);
                 await Task.CompletedTask;
             });
 
@@ -48,47 +48,47 @@ namespace ServiceLib.ViewModels
         private async Task Init()
         {
             var item = await AppHandler.Instance.GetDNSItem(ECoreType.Xray);
-            useSystemHosts = item.UseSystemHosts;
-            domainStrategy4Freedom = item?.DomainStrategy4Freedom ?? string.Empty;
-            domainDNSAddress = item?.DomainDNSAddress ?? string.Empty;
-            normalDNS = item?.NormalDNS ?? string.Empty;
+            UseSystemHosts = item.UseSystemHosts;
+            DomainStrategy4Freedom = item?.DomainStrategy4Freedom ?? string.Empty;
+            DomainDNSAddress = item?.DomainDNSAddress ?? string.Empty;
+            NormalDNS = item?.NormalDNS ?? string.Empty;
 
             var item2 = await AppHandler.Instance.GetDNSItem(ECoreType.sing_box);
-            domainStrategy4Freedom2 = item2?.DomainStrategy4Freedom ?? string.Empty;
-            domainDNSAddress2 = item2?.DomainDNSAddress ?? string.Empty;
-            normalDNS2 = item2?.NormalDNS ?? string.Empty;
-            tunDNS2 = item2?.TunDNS ?? string.Empty;
+            DomainStrategy4Freedom2 = item2?.DomainStrategy4Freedom ?? string.Empty;
+            DomainDNSAddress2 = item2?.DomainDNSAddress ?? string.Empty;
+            NormalDNS2 = item2?.NormalDNS ?? string.Empty;
+            TunDNS2 = item2?.TunDNS ?? string.Empty;
         }
 
         private async Task SaveSettingAsync()
         {
-            if (Utils.IsNotEmpty(normalDNS))
+            if (NormalDNS.IsNotEmpty())
             {
-                var obj = JsonUtils.ParseJson(normalDNS);
+                var obj = JsonUtils.ParseJson(NormalDNS);
                 if (obj != null && obj["servers"] != null)
                 {
                 }
                 else
                 {
-                    if (normalDNS.Contains('{') || normalDNS.Contains('}'))
+                    if (NormalDNS.Contains('{') || NormalDNS.Contains('}'))
                     {
                         NoticeHandler.Instance.Enqueue(ResUI.FillCorrectDNSText);
                         return;
                     }
                 }
             }
-            if (Utils.IsNotEmpty(normalDNS2))
+            if (NormalDNS2.IsNotEmpty())
             {
-                var obj2 = JsonUtils.Deserialize<Dns4Sbox>(normalDNS2);
+                var obj2 = JsonUtils.Deserialize<Dns4Sbox>(NormalDNS2);
                 if (obj2 == null)
                 {
                     NoticeHandler.Instance.Enqueue(ResUI.FillCorrectDNSText);
                     return;
                 }
             }
-            if (Utils.IsNotEmpty(tunDNS2))
+            if (TunDNS2.IsNotEmpty())
             {
-                var obj2 = JsonUtils.Deserialize<Dns4Sbox>(tunDNS2);
+                var obj2 = JsonUtils.Deserialize<Dns4Sbox>(TunDNS2);
                 if (obj2 == null)
                 {
                     NoticeHandler.Instance.Enqueue(ResUI.FillCorrectDNSText);
@@ -97,21 +97,21 @@ namespace ServiceLib.ViewModels
             }
 
             var item = await AppHandler.Instance.GetDNSItem(ECoreType.Xray);
-            item.DomainStrategy4Freedom = domainStrategy4Freedom;
-            item.DomainDNSAddress = domainDNSAddress;
-            item.UseSystemHosts = useSystemHosts;
-            item.NormalDNS = normalDNS;
+            item.DomainStrategy4Freedom = DomainStrategy4Freedom;
+            item.DomainDNSAddress = DomainDNSAddress;
+            item.UseSystemHosts = UseSystemHosts;
+            item.NormalDNS = NormalDNS;
             await ConfigHandler.SaveDNSItems(_config, item);
 
             var item2 = await AppHandler.Instance.GetDNSItem(ECoreType.sing_box);
-            item2.DomainStrategy4Freedom = domainStrategy4Freedom2;
-            item2.DomainDNSAddress = domainDNSAddress2;
-            item2.NormalDNS = JsonUtils.Serialize(JsonUtils.ParseJson(normalDNS2));
-            item2.TunDNS = JsonUtils.Serialize(JsonUtils.ParseJson(tunDNS2));
+            item2.DomainStrategy4Freedom = DomainStrategy4Freedom2;
+            item2.DomainDNSAddress = DomainDNSAddress2;
+            item2.NormalDNS = JsonUtils.Serialize(JsonUtils.ParseJson(NormalDNS2));
+            item2.TunDNS = JsonUtils.Serialize(JsonUtils.ParseJson(TunDNS2));
             await ConfigHandler.SaveDNSItems(_config, item2);
 
             NoticeHandler.Instance.Enqueue(ResUI.OperationSuccess);
-            _updateView?.Invoke(EViewAction.CloseWindow, null);
+            _ = _updateView?.Invoke(EViewAction.CloseWindow, null);
         }
     }
 }

v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs

@@ -421,7 +421,7 @@ namespace ServiceLib.ViewModels
 
         public async Task ScanImageResult(string fileName)
         {
-            if (Utils.IsNullOrEmpty(fileName))
+            if (fileName.IsNullOrEmpty())
             {
                 return;
             }
@@ -432,7 +432,7 @@ namespace ServiceLib.ViewModels
 
         private async Task AddScanResultAsync(string? result)
         {
-            if (Utils.IsNullOrEmpty(result))
+            if (result.IsNullOrEmpty())
             {
                 NoticeHandler.Instance.Enqueue(ResUI.NoValidQRcodeFound);
             }

v2rayN/ServiceLib/ViewModels/OptionSettingViewModel.cs

@@ -266,7 +266,7 @@ namespace ServiceLib.ViewModels
 
         private async Task SaveSettingAsync()
         {
-            if (Utils.IsNullOrEmpty(localPort.ToString()) || !Utils.IsNumeric(localPort.ToString())
+            if (localPort.ToString().IsNullOrEmpty() || !Utils.IsNumeric(localPort.ToString())
                || localPort <= 0 || localPort >= Global.MaxPort)
             {
                 NoticeHandler.Instance.Enqueue(ResUI.FillLocalListeningPort);

v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs

@@ -267,7 +267,7 @@ namespace ServiceLib.ViewModels
 
         public void SetSpeedTestResult(SpeedTestResult result)
         {
-            if (Utils.IsNullOrEmpty(result.IndexId))
+            if (result.IndexId.IsNullOrEmpty())
             {
                 NoticeHandler.Instance.SendMessageEx(result.Delay);
                 NoticeHandler.Instance.Enqueue(result.Delay);
@@ -279,13 +279,13 @@ namespace ServiceLib.ViewModels
                 return;
             }
 
-            if (Utils.IsNotEmpty(result.Delay))
+            if (result.Delay.IsNotEmpty())
             {
                 int.TryParse(result.Delay, out var temp);
                 item.Delay = temp;
                 item.DelayVal = result.Delay ?? string.Empty;
             }
-            if (Utils.IsNotEmpty(result.Speed))
+            if (result.Speed.IsNotEmpty())
             {
                 item.SpeedVal = result.Speed ?? string.Empty;
             }
@@ -350,7 +350,7 @@ namespace ServiceLib.ViewModels
                 return;
             }
             _serverFilter = ServerFilter;
-            if (Utils.IsNullOrEmpty(_serverFilter))
+            if (_serverFilter.IsNullOrEmpty())
             {
                 RefreshServers();
             }
@@ -448,7 +448,7 @@ namespace ServiceLib.ViewModels
 
         private async Task<List<ProfileItem>?> GetProfileItems(bool latest)
         {
-            var lstSelecteds = new List<ProfileItem>();
+            var lstSelected = new List<ProfileItem>();
             if (SelectedProfiles == null || SelectedProfiles.Count <= 0)
             {
                 return null;
@@ -462,21 +462,21 @@ namespace ServiceLib.ViewModels
                     var item = await AppHandler.Instance.GetProfileItem(profile.IndexId);
                     if (item is not null)
                     {
-                        lstSelecteds.Add(item);
+                        lstSelected.Add(item);
                     }
                 }
             }
             else
             {
-                lstSelecteds = JsonUtils.Deserialize<List<ProfileItem>>(JsonUtils.Serialize(orderProfiles));
+                lstSelected = JsonUtils.Deserialize<List<ProfileItem>>(JsonUtils.Serialize(orderProfiles));
             }
 
-            return lstSelecteds;
+            return lstSelected;
         }
 
         public async Task EditServerAsync(EConfigType eConfigType)
         {
-            if (Utils.IsNullOrEmpty(SelectedProfile?.IndexId))
+            if (string.IsNullOrEmpty(SelectedProfile?.IndexId))
             {
                 return;
             }
@@ -509,8 +509,8 @@ namespace ServiceLib.ViewModels
 
         public async Task RemoveServerAsync()
         {
-            var lstSelecteds = await GetProfileItems(true);
-            if (lstSelecteds == null)
+            var lstSelected = await GetProfileItems(true);
+            if (lstSelected == null)
             {
                 return;
             }
@@ -518,11 +518,11 @@ namespace ServiceLib.ViewModels
             {
                 return;
             }
-            var exists = lstSelecteds.Exists(t => t.IndexId == _config.IndexId);
+            var exists = lstSelected.Exists(t => t.IndexId == _config.IndexId);
 
-            await ConfigHandler.RemoveServers(_config, lstSelecteds);
+            await ConfigHandler.RemoveServers(_config, lstSelected);
             NoticeHandler.Instance.Enqueue(ResUI.OperationSuccess);
-            if (lstSelecteds.Count == _profileItems.Count)
+            if (lstSelected.Count == _profileItems.Count)
             {
                 _profileItems.Clear();
             }
@@ -536,19 +536,22 @@ namespace ServiceLib.ViewModels
         private async Task RemoveDuplicateServer()
         {
             var tuple = await ConfigHandler.DedupServerList(_config, _config.SubIndexId);
-            RefreshServers();
-            Reload();
+            if (tuple.Item1 > 0 || tuple.Item2 > 0)
+            {
+                RefreshServers();
+                Reload();
+            }
             NoticeHandler.Instance.Enqueue(string.Format(ResUI.RemoveDuplicateServerResult, tuple.Item1, tuple.Item2));
         }
 
         private async Task CopyServer()
         {
-            var lstSelecteds = await GetProfileItems(false);
-            if (lstSelecteds == null)
+            var lstSelected = await GetProfileItems(false);
+            if (lstSelected == null)
             {
                 return;
             }
-            if (await ConfigHandler.CopyServer(_config, lstSelecteds) == 0)
+            if (await ConfigHandler.CopyServer(_config, lstSelected) == 0)
             {
                 RefreshServers();
                 NoticeHandler.Instance.Enqueue(ResUI.OperationSuccess);
@@ -557,16 +560,16 @@ namespace ServiceLib.ViewModels
 
         public async Task SetDefaultServer()
         {
-            if (Utils.IsNullOrEmpty(SelectedProfile?.IndexId))
+            if (string.IsNullOrEmpty(SelectedProfile?.IndexId))
             {
                 return;
             }
             await SetDefaultServer(SelectedProfile.IndexId);
         }
 
-        public async Task SetDefaultServer(string indexId)
+        public async Task SetDefaultServer(string? indexId)
         {
-            if (Utils.IsNullOrEmpty(indexId))
+            if (indexId.IsNullOrEmpty())
             {
                 return;
             }
@@ -594,11 +597,7 @@ namespace ServiceLib.ViewModels
             {
                 return;
             }
-            if (SelectedServer == null)
-            {
-                return;
-            }
-            if (Utils.IsNullOrEmpty(SelectedServer.ID))
+            if (SelectedServer == null || SelectedServer.ID.IsNullOrEmpty())
             {
                 return;
             }
@@ -614,7 +613,7 @@ namespace ServiceLib.ViewModels
                 return;
             }
             var url = FmtHandler.GetShareUri(item);
-            if (Utils.IsNullOrEmpty(url))
+            if (url.IsNullOrEmpty())
             {
                 return;
             }
@@ -624,13 +623,13 @@ namespace ServiceLib.ViewModels
 
         private async Task SetDefaultMultipleServer(ECoreType coreType)
         {
-            var lstSelecteds = await GetProfileItems(true);
-            if (lstSelecteds == null)
+            var lstSelected = await GetProfileItems(true);
+            if (lstSelected == null)
             {
                 return;
             }
 
-            var ret = await ConfigHandler.AddCustomServer4Multiple(_config, lstSelecteds, coreType);
+            var ret = await ConfigHandler.AddCustomServer4Multiple(_config, lstSelected, coreType);
             if (ret.Success != true)
             {
                 NoticeHandler.Instance.Enqueue(ResUI.OperationFailed);
@@ -649,7 +648,7 @@ namespace ServiceLib.ViewModels
 
         public async Task SortServer(string colName)
         {
-            if (Utils.IsNullOrEmpty(colName))
+            if (colName.IsNullOrEmpty())
             {
                 return;
             }
@@ -679,19 +678,18 @@ namespace ServiceLib.ViewModels
                 return;
             }
 
-            var lstSelecteds = await GetProfileItems(true);
-            if (lstSelecteds == null)
+            var lstSelected = await GetProfileItems(true);
+            if (lstSelected == null)
             {
                 return;
             }
 
-            await ConfigHandler.MoveToGroup(_config, lstSelecteds, SelectedMoveToGroup.Id);
+            await ConfigHandler.MoveToGroup(_config, lstSelected, SelectedMoveToGroup.Id);
             NoticeHandler.Instance.Enqueue(ResUI.OperationSuccess);
 
             RefreshServers();
             SelectedMoveToGroup = null;
             SelectedMoveToGroup = new();
-            //Reload();
         }
 
         public async Task MoveServer(EMove eMove)
@@ -703,7 +701,7 @@ namespace ServiceLib.ViewModels
                 return;
             }
 
-            int index = _lstProfile.IndexOf(item);
+            var index = _lstProfile.IndexOf(item);
             if (index < 0)
             {
                 return;
@@ -732,14 +730,14 @@ namespace ServiceLib.ViewModels
             {
                 SelectedProfiles = _profileItems;
             }
-            var lstSelecteds = await GetProfileItems(false);
-            if (lstSelecteds == null)
+            var lstSelected = await GetProfileItems(false);
+            if (lstSelected == null)
             {
                 return;
             }
 
             _speedtestService ??= new SpeedtestService(_config, (SpeedTestResult result) => _updateView?.Invoke(EViewAction.DispatcherSpeedTest, result));
-            _speedtestService?.RunLoop(actionType, lstSelecteds);
+            _speedtestService?.RunLoop(actionType, lstSelected);
         }
 
         public void ServerSpeedtestStop()
@@ -776,7 +774,7 @@ namespace ServiceLib.ViewModels
 
         public async Task Export2ClientConfigResult(string fileName, ProfileItem item)
         {
-            if (Utils.IsNullOrEmpty(fileName))
+            if (fileName.IsNullOrEmpty())
             {
                 return;
             }
@@ -793,17 +791,17 @@ namespace ServiceLib.ViewModels
 
         public async Task Export2ShareUrlAsync(bool blEncode)
         {
-            var lstSelecteds = await GetProfileItems(true);
-            if (lstSelecteds == null)
+            var lstSelected = await GetProfileItems(true);
+            if (lstSelected == null)
             {
                 return;
             }
 
             StringBuilder sb = new();
-            foreach (var it in lstSelecteds)
+            foreach (var it in lstSelected)
             {
                 var url = FmtHandler.GetShareUri(it);
-                if (Utils.IsNullOrEmpty(url))
+                if (url.IsNullOrEmpty())
                 {
                     continue;
                 }

v2rayN/ServiceLib/ViewModels/RoutingRuleDetailsViewModel.cs

@@ -78,8 +78,8 @@ namespace ServiceLib.ViewModels
               || SelectedSource.Ip?.Count > 0
               || SelectedSource.Protocol?.Count > 0
               || SelectedSource.Process?.Count > 0
-              || Utils.IsNotEmpty(SelectedSource.Port)
-              || Utils.IsNotEmpty(SelectedSource.Network);
+              || SelectedSource.Port.IsNotEmpty()
+              || SelectedSource.Network.IsNotEmpty();
 
             if (!hasRule)
             {

v2rayN/ServiceLib/ViewModels/RoutingRuleSettingViewModel.cs

@@ -224,7 +224,7 @@ namespace ServiceLib.ViewModels
         private async Task SaveRoutingAsync()
         {
             string remarks = SelectedRouting.Remarks;
-            if (Utils.IsNullOrEmpty(remarks))
+            if (remarks.IsNullOrEmpty())
             {
                 NoticeHandler.Instance.Enqueue(ResUI.PleaseFillRemarks);
                 return;
@@ -252,13 +252,13 @@ namespace ServiceLib.ViewModels
 
         public async Task ImportRulesFromFileAsync(string fileName)
         {
-            if (Utils.IsNullOrEmpty(fileName))
+            if (fileName.IsNullOrEmpty())
             {
                 return;
             }
 
             var result = EmbedUtils.LoadResource(fileName);
-            if (Utils.IsNullOrEmpty(result))
+            if (result.IsNullOrEmpty())
             {
                 return;
             }
@@ -288,7 +288,7 @@ namespace ServiceLib.ViewModels
         private async Task ImportRulesFromUrl()
         {
             var url = SelectedRouting.Url;
-            if (Utils.IsNullOrEmpty(url))
+            if (url.IsNullOrEmpty())
             {
                 NoticeHandler.Instance.Enqueue(ResUI.MsgNeedUrl);
                 return;
@@ -311,7 +311,7 @@ namespace ServiceLib.ViewModels
             {
                 blReplace = true;
             }
-            if (Utils.IsNullOrEmpty(clipboardData))
+            if (clipboardData.IsNullOrEmpty())
             {
                 return -1;
             }

v2rayN/ServiceLib/ViewModels/RoutingSettingViewModel.cs

@@ -18,13 +18,13 @@ namespace ServiceLib.ViewModels
         public IList<RoutingItemModel> SelectedSources { get; set; }
 
         [Reactive]
-        public string domainStrategy { get; set; }
+        public string DomainStrategy { get; set; }
 
         [Reactive]
-        public string domainMatcher { get; set; }
+        public string DomainMatcher { get; set; }
 
         [Reactive]
-        public string domainStrategy4Singbox { get; set; }
+        public string DomainStrategy4Singbox { get; set; }
 
         public ReactiveCommand<Unit, Unit> RoutingAdvancedAddCmd { get; }
         public ReactiveCommand<Unit, Unit> RoutingAdvancedRemoveCmd { get; }
@@ -74,9 +74,9 @@ namespace ServiceLib.ViewModels
         {
             SelectedSource = new();
 
-            domainStrategy = _config.RoutingBasicItem.DomainStrategy;
-            domainMatcher = _config.RoutingBasicItem.DomainMatcher;
-            domainStrategy4Singbox = _config.RoutingBasicItem.DomainStrategy4Singbox;
+            DomainStrategy = _config.RoutingBasicItem.DomainStrategy;
+            DomainMatcher = _config.RoutingBasicItem.DomainMatcher;
+            DomainStrategy4Singbox = _config.RoutingBasicItem.DomainStrategy4Singbox;
 
             await ConfigHandler.InitBuiltinRouting(_config);
             await RefreshRoutingItems();
@@ -91,11 +91,7 @@ namespace ServiceLib.ViewModels
             var routings = await AppHandler.Instance.RoutingItems();
             foreach (var item in routings)
             {
-                bool def = false;
-                if (item.Id == _config.RoutingBasicItem.RoutingIndexId)
-                {
-                    def = true;
-                }
+                var def = item.Id == _config.RoutingBasicItem.RoutingIndexId;
 
                 var it = new RoutingItemModel()
                 {
@@ -114,9 +110,9 @@ namespace ServiceLib.ViewModels
 
         private async Task SaveRoutingAsync()
         {
-            _config.RoutingBasicItem.DomainStrategy = domainStrategy;
-            _config.RoutingBasicItem.DomainMatcher = domainMatcher;
-            _config.RoutingBasicItem.DomainStrategy4Singbox = domainStrategy4Singbox;
+            _config.RoutingBasicItem.DomainStrategy = DomainStrategy;
+            _config.RoutingBasicItem.DomainMatcher = DomainMatcher;
+            _config.RoutingBasicItem.DomainStrategy4Singbox = DomainStrategy4Singbox;
 
             if (await ConfigHandler.SaveConfig(_config) == 0)
             {

v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs

@@ -301,7 +301,7 @@ namespace ServiceLib.ViewModels
             {
                 return;
             }
-            if (Utils.IsNullOrEmpty(SelectedServer.ID))
+            if (SelectedServer.ID.IsNullOrEmpty())
             {
                 return;
             }

v2rayN/ServiceLib/ViewModels/SubEditViewModel.cs

@@ -27,7 +27,7 @@ namespace ServiceLib.ViewModels
         private async Task SaveSubAsync()
         {
             var remarks = SelectedSource.Remarks;
-            if (Utils.IsNullOrEmpty(remarks))
+            if (remarks.IsNullOrEmpty())
             {
                 NoticeHandler.Instance.Enqueue(ResUI.PleaseFillRemarks);
                 return;

v2rayN/v2rayN.Desktop/App.axaml.cs

@@ -23,7 +23,7 @@ public partial class App : Application
 
         var ViewModel = new StatusBarViewModel(null);
         Locator.CurrentMutable.RegisterLazySingleton(() => ViewModel, typeof(StatusBarViewModel));
-        this.DataContext = ViewModel;
+        DataContext = ViewModel;
     }
 
     public override void OnFrameworkInitializationCompleted()
@@ -65,7 +65,9 @@ public partial class App : Application
                 var clipboardData = await AvaUtils.GetClipboardData(desktop.MainWindow);
                 var service = Locator.Current.GetService<MainWindowViewModel>();
                 if (service != null)
+                {
                     _ = service.AddServerViaClipboardAsync(clipboardData);
+                }
             }
         }
     }
@@ -74,7 +76,9 @@ public partial class App : Application
     {
         var service = Locator.Current.GetService<MainWindowViewModel>();
         if (service != null)
+        {
             await service.MyAppExitAsync(true);
+        }
         service?.Shutdown(true);
     }
 }

v2rayN/v2rayN.Desktop/Common/UI.cs

@@ -19,7 +19,9 @@ namespace v2rayN.Desktop.Common
         {
             var sp = GetStorageProvider(owner);
             if (sp is null)
+            {
                 return null;
+            }
 
             // Start async operation to open the dialog.
             var files = await sp.OpenFilePickerAsync(new FilePickerOpenOptions
@@ -35,7 +37,9 @@ namespace v2rayN.Desktop.Common
         {
             var sp = GetStorageProvider(owner);
             if (sp is null)
+            {
                 return null;
+            }
 
             // Start async operation to open the dialog.
             var files = await sp.SaveFilePickerAsync(new FilePickerSaveOptions

v2rayN/v2rayN.Desktop/Controls/AutoCompleteBox.cs

@@ -27,7 +27,9 @@ public class AutoCompleteBox : Avalonia.Controls.AutoCompleteBox
     {
         base.OnGotFocus(e);
         if (IsDropDownOpen)
+        {
             return;
+        }
         SetCurrentValue(IsDropDownOpenProperty, true);
     }
 

v2rayN/v2rayN.Desktop/Converters/DelayColorConverter.cs

@@ -8,14 +8,14 @@ namespace v2rayN.Desktop.Converters
     {
         public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
         {
-            int.TryParse(value?.ToString(), out var delay);
+            _ = int.TryParse(value?.ToString(), out var delay);
 
-            if (delay <= 0)
-                return new SolidColorBrush(Colors.Red);
-            if (delay <= 500)
-                return new SolidColorBrush(Colors.Green);
-            else
-                return new SolidColorBrush(Colors.IndianRed);
+            return delay switch
+            {
+                <= 0 => new SolidColorBrush(Colors.Red),
+                <= 500 => new SolidColorBrush(Colors.Green),
+                _ => new SolidColorBrush(Colors.IndianRed)
+            };
         }
 
         public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)

v2rayN/v2rayN.Desktop/Handler/HotkeyHandler.cs

@@ -49,7 +49,7 @@ namespace v2rayN.Desktop.Handler
                 }
 
                 var vKey = KeyInterop.VirtualKeyFromKey((Key)item.KeyCode);
-                var modifiers = Modifiers.NoRepeat;
+                var modifiers = Modifiers.None;
                 if (item.Control)
                 {
                     modifiers |= Modifiers.Control;

v2rayN/v2rayN.Desktop/Program.cs

@@ -25,8 +25,8 @@ internal class Program
         if (Utils.IsWindows())
         {
             var exePathKey = Utils.GetMd5(Utils.GetExePath());
-            var rebootas = (Args ?? Array.Empty<string>()).Any(t => t == Global.RebootAs);
-            ProgramStarted = new EventWaitHandle(false, EventResetMode.AutoReset, exePathKey, out bool bCreatedNew);
+            var rebootas = (Args ?? []).Any(t => t == Global.RebootAs);
+            ProgramStarted = new EventWaitHandle(false, EventResetMode.AutoReset, exePathKey, out var bCreatedNew);
             if (!rebootas && !bCreatedNew)
             {
                 ProgramStarted.Set();

v2rayN/v2rayN.Desktop/ViewModels/ThemeSettingViewModel.cs

@@ -69,7 +69,7 @@ namespace v2rayN.Desktop.ViewModels
                     y => y != null && !y.IsNullOrEmpty())
                 .Subscribe(c =>
                 {
-                    if (Utils.IsNotEmpty(CurrentLanguage) && _config.UiItem.CurrentLanguage != CurrentLanguage)
+                    if (CurrentLanguage.IsNotEmpty() && _config.UiItem.CurrentLanguage != CurrentLanguage)
                     {
                         _config.UiItem.CurrentLanguage = CurrentLanguage;
                         Thread.CurrentThread.CurrentUICulture = new(CurrentLanguage);

v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml

@@ -308,7 +308,7 @@
                 <Grid
                     x:Name="gridHysteria2"
                     Grid.Row="2"
-                    ColumnDefinitions="180,Auto"
+                    ColumnDefinitions="180,Auto,Auto"
                     IsVisible="False"
                     RowDefinitions="Auto,Auto,Auto,Auto">
 
@@ -337,6 +337,26 @@
                         Grid.Column="1"
                         Width="400"
                         Margin="{StaticResource Margin4}" />
+
+                    <TextBlock
+                        Grid.Row="3"
+                        Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
+                        VerticalAlignment="Center"
+                        Text="{x:Static resx:ResUI.TbPorts7}" />
+                    <TextBox
+                        x:Name="txtPorts7"
+                        Grid.Row="3"
+                        Grid.Column="1"
+                        Width="400"
+                        Margin="{StaticResource Margin4}"
+                        Watermark="1000:2000,3000:4000" />
+                    <TextBlock
+                        Grid.Row="3"
+                        Grid.Column="2"
+                        Margin="{StaticResource Margin4}"
+                        VerticalAlignment="Center"
+                        Text="{x:Static resx:ResUI.TbPorts7Tips}" />
                 </Grid>
                 <Grid
                     x:Name="gridTuic"
@@ -429,7 +449,8 @@
                         Grid.Row="3"
                         Grid.Column="1"
                         Width="400"
-                        Margin="{StaticResource Margin4}" />
+                        Margin="{StaticResource Margin4}"
+                        Watermark="2,3,4" />
 
                     <TextBlock
                         Grid.Row="4"
@@ -442,7 +463,8 @@
                         Grid.Row="4"
                         Grid.Column="1"
                         Width="400"
-                        Margin="{StaticResource Margin4}" />
+                        Margin="{StaticResource Margin4}"
+                        Watermark="Ipv4,Ipv6" />
 
                     <TextBlock
                         Grid.Row="5"
@@ -456,7 +478,8 @@
                         Grid.Column="1"
                         Width="200"
                         Margin="{StaticResource Margin4}"
-                        HorizontalAlignment="Left" />
+                        HorizontalAlignment="Left"
+                        Watermark="1500" />
                 </Grid>
 
                 <Separator

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

@@ -178,6 +178,7 @@ namespace v2rayN.Desktop.Views
                     case EConfigType.Hysteria2:
                         this.Bind(ViewModel, vm => vm.SelectedSource.Id, v => v.txtId7.Text).DisposeWith(disposables);
                         this.Bind(ViewModel, vm => vm.SelectedSource.Path, v => v.txtPath7.Text).DisposeWith(disposables);
+                        this.Bind(ViewModel, vm => vm.SelectedSource.Ports, v => v.txtPorts7.Text).DisposeWith(disposables);
                         break;
 
                     case EConfigType.TUIC:
@@ -271,7 +272,7 @@ namespace v2rayN.Desktop.Views
             cmbHeaderType.Items.Clear();
 
             var network = cmbNetwork.SelectedItem.ToString();
-            if (Utils.IsNullOrEmpty(network))
+            if (network.IsNullOrEmpty())
             {
                 cmbHeaderType.Items.Add(Global.None);
                 return;
@@ -312,7 +313,7 @@ namespace v2rayN.Desktop.Views
         private void SetTips()
         {
             var network = cmbNetwork.SelectedItem.ToString();
-            if (Utils.IsNullOrEmpty(network))
+            if (network.IsNullOrEmpty())
             {
                 network = Global.DefaultNetwork;
             }

v2rayN/v2rayN.Desktop/Views/ClashProxiesView.axaml.cs

@@ -27,9 +27,9 @@ namespace v2rayN.Desktop.Views
                 this.Bind(ViewModel, vm => vm.SelectedDetail, v => v.lstProxyDetails.SelectedItem).DisposeWith(disposables);
 
                 this.BindCommand(ViewModel, vm => vm.ProxiesReloadCmd, v => v.menuProxiesReload).DisposeWith(disposables);
-                this.BindCommand(ViewModel, vm => vm.ProxiesDelaytestCmd, v => v.menuProxiesDelaytest).DisposeWith(disposables);
+                this.BindCommand(ViewModel, vm => vm.ProxiesDelayTestCmd, v => v.menuProxiesDelaytest).DisposeWith(disposables);
 
-                this.BindCommand(ViewModel, vm => vm.ProxiesDelaytestPartCmd, v => v.menuProxiesDelaytestPart).DisposeWith(disposables);
+                this.BindCommand(ViewModel, vm => vm.ProxiesDelayTestPartCmd, v => v.menuProxiesDelaytestPart).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.ProxiesSelectActivityCmd, v => v.menuProxiesSelectActivity).DisposeWith(disposables);
 
                 this.Bind(ViewModel, vm => vm.RuleModeSelected, v => v.cmbRulemode.SelectedIndex).DisposeWith(disposables);

v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml.cs

@@ -36,15 +36,15 @@ namespace v2rayN.Desktop.Views
 
             this.WhenActivated(disposables =>
             {
-                this.Bind(ViewModel, vm => vm.useSystemHosts, v => v.togUseSystemHosts.IsChecked).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.domainStrategy4Freedom, v => v.cmbdomainStrategy4Freedom.SelectedValue).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.domainDNSAddress, v => v.cmbdomainDNSAddress.SelectedValue).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.normalDNS, v => v.txtnormalDNS.Text).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.UseSystemHosts, v => v.togUseSystemHosts.IsChecked).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.DomainStrategy4Freedom, v => v.cmbdomainStrategy4Freedom.SelectedValue).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.DomainDNSAddress, v => v.cmbdomainDNSAddress.SelectedValue).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.NormalDNS, v => v.txtnormalDNS.Text).DisposeWith(disposables);
 
-                this.Bind(ViewModel, vm => vm.domainStrategy4Freedom2, v => v.cmbdomainStrategy4Out.SelectedValue).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.domainDNSAddress2, v => v.cmbdomainDNSAddress2.SelectedValue).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.normalDNS2, v => v.txtnormalDNS2.Text).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.tunDNS2, v => v.txttunDNS2.Text).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.DomainStrategy4Freedom2, v => v.cmbdomainStrategy4Out.SelectedValue).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.DomainDNSAddress2, v => v.cmbdomainDNSAddress2.SelectedValue).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.NormalDNS2, v => v.txtnormalDNS2.Text).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.TunDNS2, v => v.txttunDNS2.Text).DisposeWith(disposables);
 
                 this.BindCommand(ViewModel, vm => vm.SaveCmd, v => v.btnSave).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.ImportDefConfig4V2rayCmd, v => v.btnImportDefConfig4V2ray).DisposeWith(disposables);

v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs

@@ -461,8 +461,8 @@ namespace v2rayN.Desktop.Views
 
         private void StorageUI(string? n = null)
         {
-            _config.UiItem.MainWidth = Utils.ToInt(this.Width);
-            _config.UiItem.MainHeight = Utils.ToInt(this.Height);
+            _config.UiItem.MainWidth = this.Width;
+            _config.UiItem.MainHeight = this.Height;
 
             if (_config.UiItem.MainGirdOrientation == EGirdOrientation.Horizontal)
             {

v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs

@@ -196,7 +196,7 @@ namespace v2rayN.Desktop.Views
 
         public async Task ShareServer(string url)
         {
-            if (Utils.IsNullOrEmpty(url))
+            if (url.IsNullOrEmpty())
             {
                 return;
             }
@@ -404,7 +404,7 @@ namespace v2rayN.Desktop.Views
                 lvColumnItem.Add(new()
                 {
                     Name = (string)item2.Tag,
-                    Width = item2.IsVisible == true ? Utils.ToInt(item2.ActualWidth) : -1,
+                    Width = (int)(item2.IsVisible == true ? item2.ActualWidth : -1),
                     Index = item2.DisplayIndex
                 });
             }

v2rayN/v2rayN.Desktop/Views/QrcodeView.axaml

@@ -17,10 +17,11 @@
             x:Name="txtContent"
             Grid.Row="1"
             Width="300"
+            MaxHeight="100"
             Margin="{StaticResource MarginTb8}"
             VerticalAlignment="Center"
             IsReadOnly="True"
-            MaxLines="1" />
+            TextWrapping="WrapWithOverflow" />
 
     </Grid>
 </UserControl>

v2rayN/v2rayN.Desktop/Views/QrcodeView.axaml.cs

@@ -1,5 +1,6 @@
 using Avalonia.Controls;
 using Avalonia.Media.Imaging;
+using Avalonia.Threading;
 
 namespace v2rayN.Desktop.Views
 {
@@ -17,7 +18,7 @@ namespace v2rayN.Desktop.Views
             txtContent.Text = url;
             imgQrcode.Source = GetQRCode(url);
 
-            //  btnCancel.Click += (s, e) => this.Close();
+            txtContent.GotFocus += (_, _) => Dispatcher.UIThread.Post(() => { txtContent.SelectAll(); });
         }
 
         private Bitmap? GetQRCode(string? url)
@@ -29,7 +30,9 @@ namespace v2rayN.Desktop.Views
         private Bitmap? ByteToBitmap(byte[]? bytes)
         {
             if (bytes is null)
+            {
                 return null;
+            }
 
             using var ms = new MemoryStream(bytes);
             return new Bitmap(ms);

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

@@ -44,9 +44,9 @@ namespace v2rayN.Desktop.Views
                 this.OneWayBind(ViewModel, vm => vm.RoutingItems, v => v.lstRoutings.ItemsSource).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.SelectedSource, v => v.lstRoutings.SelectedItem).DisposeWith(disposables);
 
-                this.Bind(ViewModel, vm => vm.domainStrategy, v => v.cmbdomainStrategy.SelectedValue).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.domainMatcher, v => v.cmbdomainMatcher.SelectedValue).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.domainStrategy4Singbox, v => v.cmbdomainStrategy4Singbox.SelectedValue).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.DomainStrategy, v => v.cmbdomainStrategy.SelectedValue).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.DomainMatcher, v => v.cmbdomainMatcher.SelectedValue).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.DomainStrategy4Singbox, v => v.cmbdomainStrategy4Singbox.SelectedValue).DisposeWith(disposables);
 
                 this.BindCommand(ViewModel, vm => vm.RoutingAdvancedAddCmd, v => v.menuRoutingAdvancedAdd).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.RoutingAdvancedAddCmd, v => v.menuRoutingAdvancedAdd2).DisposeWith(disposables);

v2rayN/v2rayN.Desktop/Views/SubSettingWindow.axaml.cs

@@ -69,7 +69,7 @@ namespace v2rayN.Desktop.Views
 
         private async Task ShareSub(string url)
         {
-            if (Utils.IsNullOrEmpty(url))
+            if (url.IsNullOrEmpty())
             {
                 return;
             }

v2rayN/v2rayN/Converters/MaterialDesignFonts.cs

@@ -11,7 +11,7 @@ namespace v2rayN.Converters
             try
             {
                 var fontFamily = AppHandler.Instance.Config.UiItem.CurrentFontFamily;
-                if (Utils.IsNotEmpty(fontFamily))
+                if (fontFamily.IsNotEmpty())
                 {
                     var fontPath = Utils.GetFontsPath();
                     MyFont = new FontFamily(new Uri(@$"file:///{fontPath}\"), $"./#{fontFamily}");

v2rayN/v2rayN/Handler/WindowsHandler.cs

@@ -56,7 +56,7 @@ namespace v2rayN.Handler
             try
             {
                 var item = await ConfigHandler.GetDefaultRouting(config);
-                if (item == null || Utils.IsNullOrEmpty(item.CustomIcon) || !File.Exists(item.CustomIcon))
+                if (item == null || item.CustomIcon.IsNullOrEmpty() || !File.Exists(item.CustomIcon))
                 {
                     return null;
                 }

v2rayN/v2rayN/ViewModels/ThemeSettingViewModel.cs

@@ -116,7 +116,7 @@ namespace v2rayN.ViewModels
              y => y != null && !y.IsNullOrEmpty())
                 .Subscribe(c =>
                 {
-                    if (Utils.IsNotEmpty(CurrentLanguage) && _config.UiItem.CurrentLanguage != CurrentLanguage)
+                    if (CurrentLanguage.IsNotEmpty() && _config.UiItem.CurrentLanguage != CurrentLanguage)
                     {
                         _config.UiItem.CurrentLanguage = CurrentLanguage;
                         Thread.CurrentThread.CurrentUICulture = new(CurrentLanguage);