up 6.14

commit

v2rayN/PacLib/PacHandler.cs

@@ -20,14 +20,8 @@ public class PacHandler
 
     public static void Start(string configPath, int httpPort, int pacPort)
     {
-        if (configPath.Equals(_configPath)
-            && httpPort.Equals(_httpPort)
-            && pacPort.Equals(_pacPort)
-            && _isRunning)
-        {
-            _needRestart = false;
-        }
-
+        _needRestart = (configPath != _configPath || httpPort != _httpPort || pacPort != _pacPort || !_isRunning);
+      
         _configPath = configPath;
         _httpPort = httpPort;
         _pacPort = pacPort;

v2rayN/v2rayN/Base/DownloaderHelper.cs

@@ -6,14 +6,10 @@ namespace v2rayN.Base
 {
     internal class DownloaderHelper
     {
-        private static readonly Lazy<DownloaderHelper> _instance = new Lazy<DownloaderHelper>(() => new());
+        private static readonly Lazy<DownloaderHelper> _instance = new(() => new());
         public static DownloaderHelper Instance => _instance.Value;
 
-        public DownloaderHelper()
-        {
-        }
-
-        public async Task<string> DownloadStringAsync(IWebProxy webProxy, string url, string? userAgent, int timeout)
+        public async Task<string?> DownloadStringAsync(IWebProxy? webProxy, string url, string? userAgent, int timeout)
         {
             if (string.IsNullOrEmpty(url))
             {
@@ -23,7 +19,7 @@ namespace v2rayN.Base
             var cancellationToken = new CancellationTokenSource();
             cancellationToken.CancelAfter(timeout * 1000);
 
-            Uri uri = new Uri(url);
+            Uri uri = new(url);
             //Authorization Header
             var headers = new WebHeaderCollection();
             if (!Utils.IsNullOrEmpty(uri.UserInfo))
@@ -44,28 +40,20 @@ namespace v2rayN.Base
                 }
             };
 
-            string text = string.Empty;
-            using (var downloader = new DownloadService(downloadOpt))
+            using var downloader = new DownloadService(downloadOpt);
+            downloader.DownloadFileCompleted += (sender, value) =>
             {
-                downloader.DownloadFileCompleted += (sender, value) =>
+                if (value.Error != null)
                 {
-                    if (value.Error != null)
-                    {
-                        throw new Exception(string.Format("{0}", value.Error.Message));
-                    }
-                };
-                using (var stream = await downloader.DownloadFileTaskAsync(address: url, cancellationToken: cancellationToken.Token))
-                {
-                    using (StreamReader reader = new StreamReader(stream))
-                    {
-                        text = reader.ReadToEnd();
-                    }
+                    throw value.Error;
                 }
-            }
+            };
+            using var stream = await downloader.DownloadFileTaskAsync(address: url, cancellationToken: cancellationToken.Token);
+            using StreamReader reader = new(stream);
 
             downloadOpt = null;
 
-            return text;
+            return reader.ReadToEnd();
         }
 
 
@@ -73,7 +61,7 @@ namespace v2rayN.Base
         {
             if (string.IsNullOrEmpty(url))
             {
-                throw new ArgumentNullException("url");
+                throw new ArgumentNullException(nameof(url));
             }
 
             var cancellationToken = new CancellationTokenSource();
@@ -94,57 +82,55 @@ namespace v2rayN.Base
             int totalSecond = 0;
             var hasValue = false;
             double maxSpeed = 0;
-            using (var downloader = new DownloadService(downloadOpt))
+            using var downloader = new DownloadService(downloadOpt);
+            //downloader.DownloadStarted += (sender, value) =>
+            //{
+            //    if (progress != null)
+            //    {
+            //        progress.Report("Start download data...");
+            //    }
+            //};
+            downloader.DownloadProgressChanged += (sender, value) =>
             {
-                //downloader.DownloadStarted += (sender, value) =>
-                //{
-                //    if (progress != null)
-                //    {
-                //        progress.Report("Start download data...");
-                //    }
-                //};
-                downloader.DownloadProgressChanged += (sender, value) =>
+                TimeSpan ts = (DateTime.Now - totalDatetime);
+                if (progress != null && ts.Seconds > totalSecond)
                 {
-                    TimeSpan ts = (DateTime.Now - totalDatetime);
-                    if (progress != null && ts.Seconds > totalSecond)
+                    hasValue = true;
+                    totalSecond = ts.Seconds;
+                    if (value.BytesPerSecondSpeed > maxSpeed)
                     {
-                        hasValue = true;
-                        totalSecond = ts.Seconds;
-                        if (value.BytesPerSecondSpeed > maxSpeed)
-                        {
-                            maxSpeed = value.BytesPerSecondSpeed;
-                            var speed = (maxSpeed / 1000 / 1000).ToString("#0.0");
-                            progress.Report(speed);
-                        }
+                        maxSpeed = value.BytesPerSecondSpeed;
+                        var speed = (maxSpeed / 1000 / 1000).ToString("#0.0");
+                        progress.Report(speed);
                     }
-                };
-                downloader.DownloadFileCompleted += (sender, value) =>
+                }
+            };
+            downloader.DownloadFileCompleted += (sender, value) =>
+            {
+                if (progress != null)
                 {
-                    if (progress != null)
+                    if (!hasValue && value.Error != null)
                     {
-                        if (!hasValue && value.Error != null)
-                        {
-                            progress.Report(value.Error?.Message);
-                        }
+                        progress.Report(value.Error?.Message);
                     }
-                };
-                progress.Report("......");
+                }
+            };
+            progress.Report("......");
 
-                await downloader.DownloadFileTaskAsync(address: url, cancellationToken: cancellationToken.Token);
-            }
+            using var stream = await downloader.DownloadFileTaskAsync(address: url, cancellationToken: cancellationToken.Token);
 
             downloadOpt = null;
         }
 
-        public async Task DownloadFileAsync(IWebProxy webProxy, string url, string fileName, IProgress<double> progress, int timeout)
+        public async Task DownloadFileAsync(IWebProxy? webProxy, string url, string fileName, IProgress<double> progress, int timeout)
         {
             if (string.IsNullOrEmpty(url))
             {
-                throw new ArgumentNullException("url");
+                throw new ArgumentNullException(nameof(url));
             }
             if (string.IsNullOrEmpty(fileName))
             {
-                throw new ArgumentNullException("fileName");
+                throw new ArgumentNullException(nameof(fileName));
             }
             if (File.Exists(fileName))
             {
@@ -167,38 +153,33 @@ namespace v2rayN.Base
 
             var progressPercentage = 0;
             var hasValue = false;
-            using (var downloader = new DownloadService(downloadOpt))
+            using var downloader = new DownloadService(downloadOpt);
+            downloader.DownloadStarted += (sender, value) =>
             {
-                downloader.DownloadStarted += (sender, value) =>
+                progress?.Report(0);
+            };
+            downloader.DownloadProgressChanged += (sender, value) =>
+            {
+                hasValue = true;
+                var percent = (int)value.ProgressPercentage;//   Convert.ToInt32((totalRead * 1d) / (total * 1d) * 100);
+                if (progressPercentage != percent && percent % 10 == 0)
                 {
-                    if (progress != null)
-                    {
-                        progress.Report(0);
-                    }
-                };
-                downloader.DownloadProgressChanged += (sender, value) =>
+                    progressPercentage = percent;
+                    progress.Report(percent);
+                }
+            };
+            downloader.DownloadFileCompleted += (sender, value) =>
+            {
+                if (progress != null)
                 {
-                    hasValue = true;
-                    var percent = (int)value.ProgressPercentage;//   Convert.ToInt32((totalRead * 1d) / (total * 1d) * 100);
-                    if (progressPercentage != percent && percent % 10 == 0)
+                    if (hasValue && value.Error == null)
                     {
-                        progressPercentage = percent;
-                        progress.Report(percent);
+                        progress.Report(101);
                     }
-                };
-                downloader.DownloadFileCompleted += (sender, value) =>
-                {
-                    if (progress != null)
-                    {
-                        if (hasValue && value.Error == null)
-                        {
-                            progress.Report(101);
-                        }
-                    }
-                };
+                }
+            };
 
-                await downloader.DownloadFileTaskAsync(url, fileName, cancellationToken: cancellationToken.Token);
-            }
+            await downloader.DownloadFileTaskAsync(url, fileName, cancellationToken: cancellationToken.Token);
 
             downloadOpt = null;
         }

v2rayN/v2rayN/Base/HttpClientHelper.cs

@@ -1,6 +1,7 @@
 using System.IO;
 using System.Net.Http;
-using System.Net.Http.Headers;
+using System.Net.Mime;
+using System.Text;
 
 namespace v2rayN.Base
 {
@@ -8,208 +9,149 @@ namespace v2rayN.Base
     /// </summary>
     public class HttpClientHelper
     {
-        private static HttpClientHelper httpClientHelper = null;
-        private HttpClient httpClient;
-
-        /// <summary>
-        /// </summary>
-        private HttpClientHelper() { }
-
-        /// <summary>
-        /// </summary>
-        /// <returns></returns>
-        public static HttpClientHelper GetInstance()
+        private readonly static Lazy<HttpClientHelper> _instance = new(() =>
         {
-            if (httpClientHelper != null)
-            {
-                return httpClientHelper;
-            }
-            else
-            {
-                HttpClientHelper httpClientHelper = new HttpClientHelper();
+            HttpClientHandler handler = new() { UseCookies = false };
+            HttpClientHelper helper = new(new HttpClient(handler));
+            return helper;
+        });
+        public static HttpClientHelper Instance => _instance.Value;
+        private readonly HttpClient httpClient;
 
-                HttpClientHandler handler = new HttpClientHandler() { UseCookies = false };
-                httpClientHelper.httpClient = new HttpClient(handler);
-                return httpClientHelper;
-            }
+        private HttpClientHelper(HttpClient httpClient) => this.httpClient = httpClient;
+
+        public async Task<string?> GetAsync(string url)
+        {
+            if (string.IsNullOrEmpty(url)) return null;
+            return await httpClient.GetStringAsync(url);
         }
-        public async Task<string> GetAsync(string url)
-        {
-            if (string.IsNullOrEmpty(url))
-            {
-                return null;
-            }
-            HttpResponseMessage response = await httpClient.GetAsync(url);
 
-            return await response.Content.ReadAsStringAsync();
-        }
-        public async Task<string> GetAsync(HttpClient client, string url, CancellationToken token)
+        public async Task<string?> GetAsync(HttpClient client, string url, CancellationToken token = default)
         {
-            if (string.IsNullOrEmpty(url))
-            {
-                return null;
-            }
-            HttpResponseMessage response = await client.GetAsync(url, token);
-            if (!response.IsSuccessStatusCode)
-            {
-                throw new Exception(string.Format("{0}", response.StatusCode));
-            }
-            return await response.Content.ReadAsStringAsync();
+            if (string.IsNullOrWhiteSpace(url)) return null;
+            return await client.GetStringAsync(url, token);
         }
 
         public async Task PutAsync(string url, Dictionary<string, string> headers)
         {
-            var myContent = Utils.ToJson(headers);
-            var buffer = System.Text.Encoding.UTF8.GetBytes(myContent);
-            var byteContent = new ByteArrayContent(buffer);
-            byteContent.Headers.ContentType = new MediaTypeHeaderValue("application/json");
+            var jsonContent = Utils.ToJson(headers);
+            var content = new StringContent(jsonContent, Encoding.UTF8, MediaTypeNames.Application.Json);
 
-            var result = await httpClient.PutAsync(url, byteContent);
+            var result = await httpClient.PutAsync(url, content);
         }
 
-        public async Task DownloadFileAsync(HttpClient client, string url, string fileName, IProgress<double> progress, CancellationToken token)
+        public static async Task DownloadFileAsync(HttpClient client, string url, string fileName, IProgress<double>? progress, CancellationToken token = default)
         {
-            if (string.IsNullOrEmpty(url))
-            {
-                throw new ArgumentNullException("url");
-            }
-            if (string.IsNullOrEmpty(fileName))
-            {
-                throw new ArgumentNullException("fileName");
-            }
-            if (File.Exists(fileName))
-            {
-                File.Delete(fileName);
-            }
+            ArgumentNullException.ThrowIfNull(url);
+            ArgumentNullException.ThrowIfNull(fileName);
+            if (File.Exists(fileName)) File.Delete(fileName);
 
-            var response = await client.GetAsync(url, HttpCompletionOption.ResponseHeadersRead, token);
+            using var response = await client.GetAsync(url, HttpCompletionOption.ResponseHeadersRead, token);
 
-            if (!response.IsSuccessStatusCode)
-            {
-                throw new Exception(string.Format("{0}", response.StatusCode));
-            }
+            if (!response.IsSuccessStatusCode) throw new Exception(response.StatusCode.ToString());
 
-            var total = response.Content.Headers.ContentLength.HasValue ? response.Content.Headers.ContentLength.Value : -1L;
+            var total = response.Content.Headers.ContentLength ?? -1L;
             var canReportProgress = total != -1 && progress != null;
 
-            using (var stream = await response.Content.ReadAsStreamAsync())
+            using var stream = await response.Content.ReadAsStreamAsync(token);
+            using var file = File.Create(fileName);
+            var totalRead = 0L;
+            var buffer = new byte[1024 * 1024];
+            var progressPercentage = 0;
+
+            while (true)
             {
-                using (var file = File.Create(fileName))
+                token.ThrowIfCancellationRequested();
+
+                var read = await stream.ReadAsync(buffer, token);
+                totalRead += read;
+
+                if (read == 0) break;
+                file.Write(buffer, 0, read);
+
+                if (canReportProgress)
                 {
-                    var totalRead = 0L;
-                    var buffer = new byte[1024 * 1024];
-                    var isMoreToRead = true;
-                    var progressPercentage = 0;
-
-                    do
+                    var percent = (int)(100.0 * totalRead / total);
+                    //if (progressPercentage != percent && percent % 10 == 0)
                     {
-                        token.ThrowIfCancellationRequested();
-
-                        var read = await stream.ReadAsync(buffer, 0, buffer.Length, token);
-
-                        if (read == 0)
-                        {
-                            isMoreToRead = false;
-                        }
-                        else
-                        {
-                            var data = new byte[read];
-                            buffer.ToList().CopyTo(0, data, 0, read);
-
-                            // TODO: put here the code to write the file to disk
-                            file.Write(data, 0, read);
-
-                            totalRead += read;
-
-                            if (canReportProgress)
-                            {
-                                var percent = Convert.ToInt32((totalRead * 1d) / (total * 1d) * 100);
-                                if (progressPercentage != percent && percent % 10 == 0)
-                                {
-                                    progressPercentage = percent;
-                                    progress.Report(percent);
-                                }
-                            }
-                        }
-                    } while (isMoreToRead);
-                    file.Close();
-                    if (canReportProgress)
-                    {
-                        progress.Report(101);
-
+                        progressPercentage = percent;
+                        progress!.Report(percent);
                     }
                 }
             }
+            if (canReportProgress)
+            {
+                progress!.Report(101);
+
+            }
         }
 
-        public async Task DownloadDataAsync4Speed(HttpClient client, string url, IProgress<string> progress, CancellationToken token)
+        public async Task DownloadDataAsync4Speed(HttpClient client, string url, IProgress<string> progress, CancellationToken token = default)
         {
             if (string.IsNullOrEmpty(url))
             {
-                throw new ArgumentNullException("url");
+                throw new ArgumentNullException(nameof(url));
             }
 
             var response = await client.GetAsync(url, HttpCompletionOption.ResponseHeadersRead, token);
 
             if (!response.IsSuccessStatusCode)
             {
-                throw new Exception(string.Format("{0}", response.StatusCode));
+                throw new Exception(response.StatusCode.ToString());
             }
 
             //var total = response.Content.Headers.ContentLength.HasValue ? response.Content.Headers.ContentLength.Value : -1L;
             //var canReportProgress = total != -1 && progress != null;
 
-            using (var stream = await response.Content.ReadAsStreamAsync())
+            using var stream = await response.Content.ReadAsStreamAsync(token);
+            var totalRead = 0L;
+            var buffer = new byte[1024 * 64];
+            var isMoreToRead = true;
+            string progressSpeed = string.Empty;
+            DateTime totalDatetime = DateTime.Now;
+            int totalSecond = 0;
+
+            do
             {
-                var totalRead = 0L;
-                var buffer = new byte[1024 * 64];
-                var isMoreToRead = true;
-                string progressSpeed = string.Empty;
-                DateTime totalDatetime = DateTime.Now;
-                int totalSecond = 0;
-
-                do
+                if (token.IsCancellationRequested)
                 {
-                    if (token.IsCancellationRequested)
+                    if (totalRead > 0)
                     {
-                        if (totalRead > 0)
-                        {
-                            return;
-                        }
-                        else
-                        {
-                            token.ThrowIfCancellationRequested();
-                        }
-                    }
-
-                    var read = await stream.ReadAsync(buffer, 0, buffer.Length, token);
-
-                    if (read == 0)
-                    {
-                        isMoreToRead = false;
+                        return;
                     }
                     else
                     {
-                        var data = new byte[read];
-                        buffer.ToList().CopyTo(0, data, 0, read);
+                        token.ThrowIfCancellationRequested();
+                    }
+                }
 
-                        // TODO:   
-                        totalRead += read;
+                var read = await stream.ReadAsync(buffer, token);
 
-                        TimeSpan ts = (DateTime.Now - totalDatetime);
-                        if (progress != null && ts.Seconds > totalSecond)
+                if (read == 0)
+                {
+                    isMoreToRead = false;
+                }
+                else
+                {
+                    var data = new byte[read];
+                    buffer.ToList().CopyTo(0, data, 0, read);
+
+                    // TODO:   
+                    totalRead += read;
+
+                    TimeSpan ts = (DateTime.Now - totalDatetime);
+                    if (progress != null && ts.Seconds > totalSecond)
+                    {
+                        totalSecond = ts.Seconds;
+                        var speed = (totalRead * 1d / ts.TotalMilliseconds / 1000).ToString("#0.0");
+                        if (progressSpeed != speed)
                         {
-                            totalSecond = ts.Seconds;
-                            var speed = (totalRead * 1d / ts.TotalMilliseconds / 1000).ToString("#0.0");
-                            if (progressSpeed != speed)
-                            {
-                                progressSpeed = speed;
-                                progress.Report(speed);
-                            }
+                            progressSpeed = speed;
+                            progress.Report(speed);
                         }
                     }
-                } while (isMoreToRead);
-            }
+                }
+            } while (isMoreToRead);
         }
 
     }

v2rayN/v2rayN/Base/MyDGTextColumn.cs

@@ -0,0 +1,10 @@
+using System.Windows.Controls;
+
+namespace v2rayN.Base
+{
+    internal class MyDGTextColumn : DataGridTextColumn
+    {
+        public string ExName { get; set; }
+
+    }
+}

v2rayN/v2rayN/Base/SqliteHelper.cs

@@ -6,7 +6,7 @@ namespace v2rayN.Base
 {
     public sealed class SqliteHelper
     {
-        private static readonly Lazy<SqliteHelper> _instance = new Lazy<SqliteHelper>(() => new());
+        private static readonly Lazy<SqliteHelper> _instance = new(() => new());
         public static SqliteHelper Instance => _instance.Value;
         private string _connstr;
         public SQLiteConnection _db;

v2rayN/v2rayN/Base/StringEx.cs

@@ -1,15 +1,16 @@
-using System.IO;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
 
 namespace v2rayN.Base
 {
     static class StringEx
     {
-        public static bool IsNullOrEmpty(this string value)
+        public static bool IsNullOrEmpty([NotNullWhen(false)] this string? value)
         {
             return string.IsNullOrEmpty(value);
         }
 
-        public static bool IsNullOrWhiteSpace(this string value)
+        public static bool IsNullOrWhiteSpace([NotNullWhen(false)] this string? value)
         {
             return string.IsNullOrWhiteSpace(value);
         }
@@ -34,7 +35,7 @@ namespace v2rayN.Base
 
         public static IEnumerable<string> NonWhiteSpaceLines(this TextReader reader)
         {
-            string line;
+            string? line;
             while ((line = reader.ReadLine()) != null)
             {
                 if (line.IsWhiteSpace()) continue;
@@ -42,7 +43,7 @@ namespace v2rayN.Base
             }
         }
 
-        public static string TrimEx(this string value)
+        public static string TrimEx(this string? value)
         {
             return value == null ? string.Empty : value.Trim();
         }

v2rayN/v2rayN/Converters/DelayColorConverter.cs

@@ -17,7 +17,7 @@ namespace v2rayN.Converters
                 return new SolidColorBrush(Colors.IndianRed);
         }
 
-        public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+        public object? ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
         {
             return null;
         }

v2rayN/v2rayN/Converters/MaterialDesignFonts.cs

@@ -21,10 +21,7 @@ namespace v2rayN.Converters
             catch
             {
             }
-            if (MyFont is null)
-            {
-                MyFont = new FontFamily("Microsoft YaHei");
-            }
+            MyFont ??= new FontFamily("Microsoft YaHei");
         }
     }
 }

v2rayN/v2rayN/Global.cs

@@ -33,6 +33,7 @@
         public const string CustomRoutingFileName = "v2rayN.Sample.custom_routing_";
         public const string v2raySampleInbound = "v2rayN.Sample.SampleInbound";
         public const string TunSingboxFileName = "v2rayN.Sample.tun_singbox";
+        public const string TunSingboxDNSFileName = "v2rayN.Sample.tun_singbox_dns";
 
         public const string DefaultSecurity = "auto";
         public const string DefaultNetwork = "tcp";
@@ -80,26 +81,26 @@
         public const string SpeedUnit = "";
         public const int MinFontSize = 10;
 
-        public static readonly List<string> IEProxyProtocols = new List<string> {
+        public static readonly List<string> IEProxyProtocols = new() {
                         "{ip}:{http_port}",
                         "socks={ip}:{socks_port}",
                         "http={ip}:{http_port};https={ip}:{http_port};ftp={ip}:{http_port};socks={ip}:{socks_port}",
                         "http=http://{ip}:{http_port};https=http://{ip}:{http_port}",
                         ""
                     };
-        public static readonly List<string> vmessSecuritys = new List<string> { "aes-128-gcm", "chacha20-poly1305", "auto", "none", "zero" };
-        public static readonly List<string> ssSecuritys = new List<string> { "aes-256-gcm", "aes-128-gcm", "chacha20-poly1305", "chacha20-ietf-poly1305", "none", "plain" };
-        public static readonly List<string> ssSecuritysInSagerNet = new List<string> { "none", "2022-blake3-aes-128-gcm", "2022-blake3-aes-256-gcm", "2022-blake3-chacha20-poly1305", "aes-128-gcm", "aes-192-gcm", "aes-256-gcm", "chacha20-ietf-poly1305", "xchacha20-ietf-poly1305", "rc4", "rc4-md5", "aes-128-ctr", "aes-192-ctr", "aes-256-ctr", "aes-128-cfb", "aes-192-cfb", "aes-256-cfb", "aes-128-cfb8", "aes-192-cfb8", "aes-256-cfb8", "aes-128-ofb", "aes-192-ofb", "aes-256-ofb", "bf-cfb", "cast5-cfb", "des-cfb", "idea-cfb", "rc2-cfb", "seed-cfb", "camellia-128-cfb", "camellia-192-cfb", "camellia-256-cfb", "camellia-128-cfb8", "camellia-192-cfb8", "camellia-256-cfb8", "salsa20", "chacha20", "chacha20-ietf", "xchacha20" };
-        public static readonly List<string> ssSecuritysInXray = new List<string> { "aes-256-gcm", "aes-128-gcm", "chacha20-poly1305", "chacha20-ietf-poly1305", "xchacha20-poly1305", "xchacha20-ietf-poly1305", "none", "plain", "2022-blake3-aes-128-gcm", "2022-blake3-aes-256-gcm", "2022-blake3-chacha20-poly1305" };
-        public static readonly List<string> xtlsFlows = new List<string> { "", "xtls-rprx-origin", "xtls-rprx-origin-udp443", "xtls-rprx-direct", "xtls-rprx-direct-udp443", "xtls-rprx-vision", "xtls-rprx-vision-udp443" };
-        public static readonly List<string> networks = new List<string> { "tcp", "kcp", "ws", "h2", "quic", "grpc" };
-        public static readonly List<string> kcpHeaderTypes = new List<string> { "srtp", "utp", "wechat-video", "dtls", "wireguard" };
-        public static readonly List<string> coreTypes = new List<string> { "v2fly", "SagerNet", "Xray", "v2fly_v5" };
-        public static readonly List<string> domainStrategys = new List<string> { "AsIs", "IPIfNonMatch", "IPOnDemand" };
-        public static readonly List<string> domainMatchers = new List<string> { "linear", "mph", "" };
-        public static readonly List<string> fingerprints = new List<string> { "chrome", "firefox", "safari", "ios", "android", "edge", "360", "qq", "random", "randomized", "" };
-        public static readonly List<string> userAgent = new List<string> { "chrome", "firefox", "safari", "edge", "none" };
-        public static readonly Dictionary<string, string> userAgentTxt = new Dictionary<string, string>
+        public static readonly List<string> vmessSecuritys = new() { "aes-128-gcm", "chacha20-poly1305", "auto", "none", "zero" };
+        public static readonly List<string> ssSecuritys = new() { "aes-256-gcm", "aes-128-gcm", "chacha20-poly1305", "chacha20-ietf-poly1305", "none", "plain" };
+        public static readonly List<string> ssSecuritysInSagerNet = new() { "none", "2022-blake3-aes-128-gcm", "2022-blake3-aes-256-gcm", "2022-blake3-chacha20-poly1305", "aes-128-gcm", "aes-192-gcm", "aes-256-gcm", "chacha20-ietf-poly1305", "xchacha20-ietf-poly1305", "rc4", "rc4-md5", "aes-128-ctr", "aes-192-ctr", "aes-256-ctr", "aes-128-cfb", "aes-192-cfb", "aes-256-cfb", "aes-128-cfb8", "aes-192-cfb8", "aes-256-cfb8", "aes-128-ofb", "aes-192-ofb", "aes-256-ofb", "bf-cfb", "cast5-cfb", "des-cfb", "idea-cfb", "rc2-cfb", "seed-cfb", "camellia-128-cfb", "camellia-192-cfb", "camellia-256-cfb", "camellia-128-cfb8", "camellia-192-cfb8", "camellia-256-cfb8", "salsa20", "chacha20", "chacha20-ietf", "xchacha20" };
+        public static readonly List<string> ssSecuritysInXray = new() { "aes-256-gcm", "aes-128-gcm", "chacha20-poly1305", "chacha20-ietf-poly1305", "xchacha20-poly1305", "xchacha20-ietf-poly1305", "none", "plain", "2022-blake3-aes-128-gcm", "2022-blake3-aes-256-gcm", "2022-blake3-chacha20-poly1305" };
+        public static readonly List<string> xtlsFlows = new() { "", "xtls-rprx-origin", "xtls-rprx-origin-udp443", "xtls-rprx-direct", "xtls-rprx-direct-udp443", "xtls-rprx-vision", "xtls-rprx-vision-udp443" };
+        public static readonly List<string> networks = new() { "tcp", "kcp", "ws", "h2", "quic", "grpc" };
+        public static readonly List<string> kcpHeaderTypes = new() { "srtp", "utp", "wechat-video", "dtls", "wireguard" };
+        public static readonly List<string> coreTypes = new() { "v2fly", "SagerNet", "Xray", "v2fly_v5" };
+        public static readonly List<string> domainStrategys = new() { "AsIs", "IPIfNonMatch", "IPOnDemand" };
+        public static readonly List<string> domainMatchers = new() { "linear", "mph", "" };
+        public static readonly List<string> fingerprints = new() { "chrome", "firefox", "safari", "ios", "android", "edge", "360", "qq", "random", "randomized", "" };
+        public static readonly List<string> userAgent = new() { "chrome", "firefox", "safari", "edge", "none" };
+        public static readonly Dictionary<string, string> userAgentTxt = new()
         {
             {"chrome","Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.131 Safari/537.36" },
             {"firefox","Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:90.0) Gecko/20100101 Firefox/90.0" },
@@ -107,17 +108,17 @@
             {"edge","Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36 Edg/91.0.864.70" },
             {"none",""}
         };
-        public static readonly List<string> allowInsecures = new List<string> { "true", "false", "" };
-        public static readonly List<string> domainStrategy4Freedoms = new List<string> { "AsIs", "UseIP", "UseIPv4", "UseIPv6", "" };
-        public static readonly List<string> Languages = new List<string> { "zh-Hans", "en", "fa-Ir", "ru" };
-        public static readonly List<string> alpns = new List<string> { "h2", "http/1.1", "h2,http/1.1", "" };
-        public static readonly List<string> LogLevel = new List<string> { "debug", "info", "warning", "error", "none" };
-        public static readonly List<string> InboundTags = new List<string> { "socks", "http", "socks2", "http2" };
-        public static readonly List<string> Protocols = new List<string> { "http", "tls", "bittorrent" };
-        public static readonly List<string> TunMtus = new List<string> { "9000", "1500" };
-        public static readonly List<string> TunStacks = new List<string> { "gvisor", "system" };
-        public static readonly List<string> PresetMsgFilters = new List<string> { "proxy", "direct", "block", "" };
-        public static readonly List<string> SpeedTestUrls = new List<string> { @"http://cachefly.cachefly.net/100mb.test", @"http://cachefly.cachefly.net/10mb.test" };
+        public static readonly List<string> allowInsecures = new() { "true", "false", "" };
+        public static readonly List<string> domainStrategy4Freedoms = new() { "AsIs", "UseIP", "UseIPv4", "UseIPv6", "" };
+        public static readonly List<string> Languages = new() { "zh-Hans", "en", "fa-Ir", "ru" };
+        public static readonly List<string> alpns = new() { "h2", "http/1.1", "h2,http/1.1", "" };
+        public static readonly List<string> LogLevel = new() { "debug", "info", "warning", "error", "none" };
+        public static readonly List<string> InboundTags = new() { "socks", "http", "socks2", "http2" };
+        public static readonly List<string> Protocols = new() { "http", "tls", "bittorrent" };
+        public static readonly List<string> TunMtus = new() { "9000", "1500" };
+        public static readonly List<string> TunStacks = new() { "gvisor", "system" };
+        public static readonly List<string> PresetMsgFilters = new() { "proxy", "direct", "block", "" };
+        public static readonly List<string> SpeedTestUrls = new() { @"http://cachefly.cachefly.net/100mb.test", @"http://cachefly.cachefly.net/10mb.test" };
 
         #endregion
 

v2rayN/v2rayN/Handler/ConfigHandler.cs

@@ -13,7 +13,7 @@ namespace v2rayN.Handler
     class ConfigHandler
     {
         private static string configRes = Global.ConfigFileName;
-        private static readonly object objLock = new object();
+        private static readonly object objLock = new();
 
         #region ConfigHandler
 
@@ -61,7 +61,7 @@ namespace v2rayN.Handler
             if (config.inbound == null)
             {
                 config.inbound = new List<InItem>();
-                InItem inItem = new InItem
+                InItem inItem = new()
                 {
                     protocol = Global.InboundSocks,
                     localPort = 10808,
@@ -151,9 +151,9 @@ namespace v2rayN.Handler
                     enableAutoAdjustMainLvColWidth = true
                 };
             }
-            if (config.uiItem.mainLvColWidth == null)
+            if (config.uiItem.mainColumnItem == null)
             {
-                config.uiItem.mainLvColWidth = new Dictionary<string, int>();
+                config.uiItem.mainColumnItem = new();
             }
             if (Utils.IsNullOrEmpty(config.uiItem.currentLanguage))
             {
@@ -190,7 +190,7 @@ namespace v2rayN.Handler
                 config.speedTestItem.speedPingTestUrl = Global.SpeedPingTestUrl;
             }
 
-            if (config.guiItem.statisticsFreshRate > 100 || config.guiItem.statisticsFreshRate < 1)
+            if (config.guiItem.statisticsFreshRate is > 100 or < 1)
             {
                 config.guiItem.statisticsFreshRate = 1;
             }
@@ -205,7 +205,7 @@ namespace v2rayN.Handler
 
             }
 
-            LazyConfig.Instance.SetConfig(ref config);
+            LazyConfig.Instance.SetConfig(config);
             return 0;
         }
         /// <summary>
@@ -438,14 +438,14 @@ namespace v2rayN.Handler
         /// <param name="config"></param>
         /// <param name="item"></param>
         /// <returns></returns>
-        public static int SetDefaultServer(ref Config config, ProfileItem item)
+        public static int SetDefaultServerIndex(ref Config config, string? indexId)
         {
-            if (item == null)
+            if (Utils.IsNullOrEmpty(indexId))
             {
                 return -1;
             }
 
-            config.indexId = item.indexId;
+            config.indexId = indexId;
             Global.reloadCore = true;
 
             ToJsonFile(config);
@@ -453,34 +453,34 @@ namespace v2rayN.Handler
             return 0;
         }
 
-        public static int SetDefaultServer(Config config, List<ProfileItem> lstProfile)
+        public static int SetDefaultServer(Config config, List<ProfileItemModel> lstProfile)
         {
             if (lstProfile.Exists(t => t.indexId == config.indexId))
             {
                 return 0;
             }
-
-            if (SqliteHelper.Instance.Table<ProfileItem>().Where(t => t.indexId == config.indexId).Count() > 0)
+            var allItems = LazyConfig.Instance.ProfileItemIndexs("");
+            if (allItems.Where(t => t == config.indexId).Any())
             {
                 return 0;
             }
             if (lstProfile.Count > 0)
             {
-                return SetDefaultServer(ref config, lstProfile[0]);
+                return SetDefaultServerIndex(ref config, lstProfile[0].indexId);
             }
-            if (SqliteHelper.Instance.Table<ProfileItem>().Count() > 0)
+            if (allItems.Count > 0)
             {
-                return SetDefaultServer(ref config, SqliteHelper.Instance.Table<ProfileItem>().FirstOrDefault());
+                return SetDefaultServerIndex(ref config, allItems.FirstOrDefault());
             }
             return -1;
         }
-        public static ProfileItem GetDefaultServer(ref Config config)
+        public static ProfileItem? GetDefaultServer(ref Config config)
         {
             var item = LazyConfig.Instance.GetProfileItem(config.indexId);
             if (item is null)
             {
                 var item2 = SqliteHelper.Instance.Table<ProfileItem>().FirstOrDefault();
-                SetDefaultServer(ref config, item2);
+                SetDefaultServerIndex(ref config, item2?.indexId);
                 return item2;
             }
 
@@ -505,9 +505,10 @@ namespace v2rayN.Handler
 
             for (int i = 0; i < lstProfile.Count; i++)
             {
-                lstProfile[i].sort = (i + 1) * 10;
+                ProfileExHandler.Instance.SetSort(lstProfile[i].indexId, (i + 1) * 10);
             }
 
+            var sort = 0;
             switch (eMove)
             {
                 case EMove.Top:
@@ -516,7 +517,7 @@ namespace v2rayN.Handler
                         {
                             return 0;
                         }
-                        lstProfile[index].sort = lstProfile[0].sort - 1;
+                        sort = ProfileExHandler.Instance.GetSort(lstProfile[0].indexId) - 1;
 
                         break;
                     }
@@ -526,7 +527,7 @@ namespace v2rayN.Handler
                         {
                             return 0;
                         }
-                        lstProfile[index].sort = lstProfile[index - 1].sort - 1;
+                        sort = ProfileExHandler.Instance.GetSort(lstProfile[index - 1].indexId) - 1;
 
                         break;
                     }
@@ -537,7 +538,7 @@ namespace v2rayN.Handler
                         {
                             return 0;
                         }
-                        lstProfile[index].sort = lstProfile[index + 1].sort + 1;
+                        sort = ProfileExHandler.Instance.GetSort(lstProfile[index + 1].indexId) + 1;
 
                         break;
                     }
@@ -547,18 +548,16 @@ namespace v2rayN.Handler
                         {
                             return 0;
                         }
-                        lstProfile[index].sort = lstProfile[lstProfile.Count - 1].sort + 1;
+                        sort = ProfileExHandler.Instance.GetSort(lstProfile[^1].indexId) + 1;
 
                         break;
                     }
                 case EMove.Position:
-                    lstProfile[index].sort = pos * 10 + 1;
+                    sort = pos * 10 + 1;
                     break;
             }
 
-            SqliteHelper.Instance.UpdateAll(lstProfile);
-
-
+            ProfileExHandler.Instance.SetSort(lstProfile[index].indexId, sort);
             return 0;
         }
 
@@ -695,14 +694,34 @@ namespace v2rayN.Handler
         }
 
 
-        public static int SortServers(ref Config config, string subId, EServerColName name, bool asc)
+        public static int SortServers(ref Config config, string subId, string colName, bool asc)
         {
             var lstModel = LazyConfig.Instance.ProfileItems(subId, "");
-            var lstProfile = Utils.FromJson<List<ProfileItem>>(Utils.ToJson(lstModel));
-            if (lstProfile.Count <= 0)
+            if (lstModel.Count <= 0)
             {
                 return -1;
             }
+            var lstProfileExs = ProfileExHandler.Instance.ProfileExs;
+            var lstProfile = (from t in lstModel
+                              join t3 in lstProfileExs on t.indexId equals t3.indexId into t3b
+                              from t33 in t3b.DefaultIfEmpty()
+                              select new ProfileItemModel
+                              {
+                                  indexId = t.indexId,
+                                  configType = t.configType,
+                                  remarks = t.remarks,
+                                  address = t.address,
+                                  port = t.port,
+                                  security = t.security,
+                                  network = t.network,
+                                  streamSecurity = t.streamSecurity,
+                                  delay = t33 == null ? 0 : t33.delay,
+                                  speed = t33 == null ? 0 : t33.speed,
+                                  sort = t33 == null ? 0 : t33.sort
+                              }).ToList();
+
+
+            Enum.TryParse(colName, true, out EServerColName name);
             var propertyName = string.Empty;
             switch (name)
             {
@@ -713,10 +732,14 @@ namespace v2rayN.Handler
                 case EServerColName.security:
                 case EServerColName.network:
                 case EServerColName.streamSecurity:
-                case EServerColName.delay:
-                case EServerColName.speed:
                     propertyName = name.ToString();
                     break;
+                case EServerColName.delayVal:
+                    propertyName = "delay";
+                    break;
+                case EServerColName.speedVal:
+                    propertyName = "speed";
+                    break;
                 case EServerColName.subRemarks:
                     propertyName = "subid";
                     break;
@@ -736,33 +759,31 @@ namespace v2rayN.Handler
             }
             for (int i = 0; i < lstProfile.Count; i++)
             {
-                lstProfile[i].sort = (i + 1) * 10;
+                ProfileExHandler.Instance.SetSort(lstProfile[i].indexId, (i + 1) * 10);
             }
-            if (name == EServerColName.delay)
+            if (name == EServerColName.delayVal)
             {
                 var maxSort = lstProfile.Max(t => t.sort) + 10;
                 foreach (var item in lstProfile)
                 {
                     if (item.delay <= 0)
                     {
-                        item.sort = maxSort;
+                        ProfileExHandler.Instance.SetSort(item.indexId, maxSort);
                     }
                 }
             }
-            if (name == EServerColName.speed)
+            if (name == EServerColName.speedVal)
             {
                 var maxSort = lstProfile.Max(t => t.sort) + 10;
                 foreach (var item in lstProfile)
                 {
                     if (item.speed <= 0)
                     {
-                        item.sort = maxSort;
+                        ProfileExHandler.Instance.SetSort(item.indexId, maxSort);
                     }
                 }
             }
 
-            SqliteHelper.Instance.UpdateAll(lstProfile);
-
             return 0;
         }
 
@@ -795,7 +816,7 @@ namespace v2rayN.Handler
             List<ProfileItem> source = lstProfile;
             bool keepOlder = config.guiItem.keepOlderDedupl;
 
-            List<ProfileItem> list = new List<ProfileItem>();
+            List<ProfileItem> list = new();
             if (!keepOlder) source.Reverse(); // Remove the early items first
 
             foreach (ProfileItem item in source)
@@ -830,15 +851,8 @@ namespace v2rayN.Handler
             if (Utils.IsNullOrEmpty(profileItem.indexId))
             {
                 profileItem.indexId = Utils.GetGUID(false);
-                if (profileItem.sort <= 0)
-                {
-                    var maxSort = 0;
-                    if (SqliteHelper.Instance.Table<ProfileItem>().Count() > 0)
-                    {
-                        maxSort = SqliteHelper.Instance.Table<ProfileItem>().Max(t => t == null ? 0 : t.sort);
-                    }
-                    profileItem.sort = maxSort + 1;
-                }
+                var maxSort = ProfileExHandler.Instance.GetMaxSort();
+                ProfileExHandler.Instance.SetSort(profileItem.indexId, maxSort + 1);
             }
             else if (profileItem.indexId == config.indexId)
             {
@@ -929,11 +943,11 @@ namespace v2rayN.Handler
             }
 
             int countServers = 0;
-            var maxSort = 0;
-            if (SqliteHelper.Instance.Table<ProfileItem>().Count() > 0)
-            {
-                maxSort = SqliteHelper.Instance.Table<ProfileItem>().Max(t => t.sort);
-            }
+            //var maxSort = 0;
+            //if (SqliteHelper.Instance.Table<ProfileItem>().Count() > 0)
+            //{
+            //    maxSort = SqliteHelper.Instance.Table<ProfileItem>().Max(t => t.sort);
+            //}
             string[] arrData = clipboardData.Split(Environment.NewLine.ToCharArray());
             foreach (string str in arrData)
             {
@@ -971,7 +985,7 @@ namespace v2rayN.Handler
                 }
                 profileItem.subid = subid;
                 profileItem.isSub = isSub;
-                profileItem.sort = maxSort + countServers + 1;
+                //profileItem.sort = maxSort + countServers + 1;
 
                 if (profileItem.configType == EConfigType.VMess)
                 {
@@ -1021,14 +1035,21 @@ namespace v2rayN.Handler
                 return -1;
             }
 
-            ProfileItem profileItem = new ProfileItem();
+            //判断str是否包含s的任意一个字符串
+            static bool Containss(string str, params string[] s)
+            {
+                foreach (var item in s)
+                {
+                    if (str.Contains(item, StringComparison.OrdinalIgnoreCase)) return true;
+                }
+                return false;
+            }
+
+            ProfileItem profileItem = new();
             //Is v2ray configuration
-            V2rayConfig v2rayConfig = Utils.FromJson<V2rayConfig>(clipboardData);
-            if (v2rayConfig != null
-                && v2rayConfig.inbounds != null
-                && v2rayConfig.inbounds.Count > 0
-                && v2rayConfig.outbounds != null
-                && v2rayConfig.outbounds.Count > 0)
+            V2rayConfig? v2rayConfig = Utils.FromJson<V2rayConfig>(clipboardData);
+            if (v2rayConfig?.inbounds?.Count > 0
+                && v2rayConfig.outbounds?.Count > 0)
             {
                 var fileName = Utils.GetTempPath($"{Utils.GetGUID(false)}.json");
                 File.WriteAllText(fileName, clipboardData);
@@ -1038,9 +1059,7 @@ namespace v2rayN.Handler
                 profileItem.remarks = "v2ray_custom";
             }
             //Is Clash configuration
-            else if (clipboardData.IndexOf("port") >= 0
-                && clipboardData.IndexOf("socks-port") >= 0
-                && clipboardData.IndexOf("proxies") >= 0)
+            else if (Containss(clipboardData, "port", "socks-port", "proxies"))
             {
                 var fileName = Utils.GetTempPath($"{Utils.GetGUID(false)}.yaml");
                 File.WriteAllText(fileName, clipboardData);
@@ -1050,12 +1069,7 @@ namespace v2rayN.Handler
                 profileItem.remarks = "clash_custom";
             }
             //Is hysteria configuration
-            else if (clipboardData.IndexOf("server") >= 0
-                && clipboardData.IndexOf("up") >= 0
-                && clipboardData.IndexOf("down") >= 0
-                && clipboardData.IndexOf("listen") >= 0
-                && clipboardData.IndexOf("<html>") < 0
-                && clipboardData.IndexOf("<body>") < 0)
+            else if (Containss(clipboardData, "server", "up", "down", "listen", "<html>", "<body>"))
             {
                 var fileName = Utils.GetTempPath($"{Utils.GetGUID(false)}.json");
                 File.WriteAllText(fileName, clipboardData);
@@ -1065,10 +1079,7 @@ namespace v2rayN.Handler
                 profileItem.remarks = "hysteria_custom";
             }
             //Is naiveproxy configuration
-            else if (clipboardData.IndexOf("listen") >= 0
-                && clipboardData.IndexOf("proxy") >= 0
-                && clipboardData.IndexOf("<html>") < 0
-                && clipboardData.IndexOf("<body>") < 0)
+            else if (Containss(clipboardData, "listen", "proxy", "<html>", "<body>"))
             {
                 var fileName = Utils.GetTempPath($"{Utils.GetGUID(false)}.json");
                 File.WriteAllText(fileName, clipboardData);
@@ -1092,7 +1103,7 @@ namespace v2rayN.Handler
             {
                 RemoveServerViaSubid(ref config, subid, isSub);
             }
-            if (isSub && lstOriSub != null && lstOriSub.Count == 1)
+            if (isSub && lstOriSub?.Count == 1)
             {
                 profileItem.indexId = lstOriSub[0].indexId;
             }
@@ -1129,16 +1140,16 @@ namespace v2rayN.Handler
 
             //SsSIP008
             var lstSsServer = Utils.FromJson<List<SsServer>>(clipboardData);
-            if (lstSsServer == null || lstSsServer.Count <= 0)
+            if (lstSsServer?.Count <= 0)
             {
                 var ssSIP008 = Utils.FromJson<SsSIP008>(clipboardData);
-                if (ssSIP008?.servers != null && ssSIP008.servers.Count > 0)
+                if (ssSIP008?.servers?.Count > 0)
                 {
                     lstSsServer = ssSIP008.servers;
                 }
             }
 
-            if (lstSsServer != null && lstSsServer.Count > 0)
+            if (lstSsServer?.Count > 0)
             {
                 int counter = 0;
                 foreach (var it in lstSsServer)
@@ -1168,7 +1179,7 @@ namespace v2rayN.Handler
 
         public static int AddBatchServers(ref Config config, string clipboardData, string subid, bool isSub)
         {
-            List<ProfileItem> lstOriSub = null;
+            List<ProfileItem>? lstOriSub = null;
             if (isSub && !Utils.IsNullOrEmpty(subid))
             {
                 lstOriSub = LazyConfig.Instance.ProfileItems(subid);
@@ -1213,7 +1224,7 @@ namespace v2rayN.Handler
                 return 0;
             }
 
-            SubItem subItem = new SubItem
+            SubItem subItem = new()
             {
                 id = string.Empty,
                 remarks = "import_sub",
@@ -1305,44 +1316,6 @@ namespace v2rayN.Handler
         }
         #endregion
 
-        #region UI
-
-        public static int AddformMainLvColWidth(ref Config config, string name, int width)
-        {
-            if (config.uiItem.mainLvColWidth == null)
-            {
-                config.uiItem.mainLvColWidth = new Dictionary<string, int>();
-            }
-            if (config.uiItem.mainLvColWidth.ContainsKey(name))
-            {
-                config.uiItem.mainLvColWidth[name] = width;
-            }
-            else
-            {
-                config.uiItem.mainLvColWidth.Add(name, width);
-            }
-
-            ToJsonFile(config);
-            return 0;
-        }
-        public static int GetformMainLvColWidth(ref Config config, string name, int width)
-        {
-            if (config.uiItem.mainLvColWidth == null)
-            {
-                config.uiItem.mainLvColWidth = new Dictionary<string, int>();
-            }
-            if (config.uiItem.mainLvColWidth.ContainsKey(name))
-            {
-                return config.uiItem.mainLvColWidth[name];
-            }
-            else
-            {
-                return width;
-            }
-        }
-
-        #endregion
-
         #region Routing        
 
         public static int SaveRoutingItem(ref Config config, RoutingItem item)

v2rayN/v2rayN/Handler/CoreConfigHandler.cs

@@ -25,7 +25,7 @@ namespace v2rayN.Handler
         /// <param name="msg"></param>
         /// <param name="content"></param>
         /// <returns></returns>
-        public static int GenerateClientConfig(ProfileItem node, string fileName, out string msg, out string content)
+        public static int GenerateClientConfig(ProfileItem node, string? fileName, out string msg, out string content)
         {
             content = string.Empty;
             try
@@ -43,7 +43,7 @@ namespace v2rayN.Handler
                 }
                 else
                 {
-                    V2rayConfig v2rayConfig = null;
+                    V2rayConfig? v2rayConfig = null;
                     if (GenerateClientConfigContent(node, false, ref v2rayConfig, out msg) != 0)
                     {
                         return -1;
@@ -90,8 +90,8 @@ namespace v2rayN.Handler
                     {
                         var dtNow = DateTime.Now;
                         v2rayConfig.log.loglevel = config.coreBasicItem.loglevel;
-                        v2rayConfig.log.access = Utils.GetLogPath($"Vaccess_{dtNow.ToString("yyyy-MM-dd")}.txt");
-                        v2rayConfig.log.error = Utils.GetLogPath($"Verror_{dtNow.ToString("yyyy-MM-dd")}.txt");
+                        v2rayConfig.log.access = Utils.GetLogPath($"Vaccess_{dtNow:yyyy-MM-dd}.txt");
+                        v2rayConfig.log.error = Utils.GetLogPath($"Verror_{dtNow:yyyy-MM-dd}.txt");
                     }
                     else
                     {
@@ -114,11 +114,11 @@ namespace v2rayN.Handler
             {
                 v2rayConfig.inbounds = new List<Inbounds>();
 
-                Inbounds inbound = GetInbound(config.inbound[0], Global.InboundSocks, 0, true);
+                Inbounds? inbound = GetInbound(config.inbound[0], Global.InboundSocks, 0, true);
                 v2rayConfig.inbounds.Add(inbound);
 
                 //http
-                Inbounds inbound2 = GetInbound(config.inbound[0], Global.InboundHttp, 1, false);
+                Inbounds? inbound2 = GetInbound(config.inbound[0], Global.InboundHttp, 1, false);
                 v2rayConfig.inbounds.Add(inbound2);
 
                 if (config.inbound[0].allowLANConn)
@@ -157,7 +157,7 @@ namespace v2rayN.Handler
             return 0;
         }
 
-        private static Inbounds GetInbound(InItem inItem, string tag, int offset, bool bSocks)
+        private static Inbounds? GetInbound(InItem inItem, string tag, int offset, bool bSocks)
         {
             string result = Utils.GetEmbedText(Global.v2raySampleInbound);
             if (Utils.IsNullOrEmpty(result))
@@ -184,8 +184,7 @@ namespace v2rayN.Handler
         {
             try
             {
-                if (v2rayConfig.routing != null
-                  && v2rayConfig.routing.rules != null)
+                if (v2rayConfig.routing?.rules != null)
                 {
                     v2rayConfig.routing.domainStrategy = config.routingBasicItem.domainStrategy;
                     v2rayConfig.routing.domainMatcher = Utils.IsNullOrEmpty(config.routingBasicItem.domainMatcher) ? null : config.routingBasicItem.domainMatcher;
@@ -241,25 +240,25 @@ namespace v2rayN.Handler
                 {
                     rules.port = null;
                 }
-                if (rules.domain != null && rules.domain.Count == 0)
+                if (rules.domain?.Count == 0)
                 {
                     rules.domain = null;
                 }
-                if (rules.ip != null && rules.ip.Count == 0)
+                if (rules.ip?.Count == 0)
                 {
                     rules.ip = null;
                 }
-                if (rules.protocol != null && rules.protocol.Count == 0)
+                if (rules.protocol?.Count == 0)
                 {
                     rules.protocol = null;
                 }
-                if (rules.inboundTag != null && rules.inboundTag.Count == 0)
+                if (rules.inboundTag?.Count == 0)
                 {
                     rules.inboundTag = null;
                 }
 
                 var hasDomainIp = false;
-                if (rules.domain != null && rules.domain.Count > 0)
+                if (rules.domain?.Count > 0)
                 {
                     var it = Utils.DeepCopy(rules);
                     it.ip = null;
@@ -275,7 +274,7 @@ namespace v2rayN.Handler
                     v2rayConfig.routing.rules.Add(it);
                     hasDomainIp = true;
                 }
-                if (rules.ip != null && rules.ip.Count > 0)
+                if (rules.ip?.Count > 0)
                 {
                     var it = Utils.DeepCopy(rules);
                     it.domain = null;
@@ -286,8 +285,8 @@ namespace v2rayN.Handler
                 if (!hasDomainIp)
                 {
                     if (!Utils.IsNullOrEmpty(rules.port)
-                        || (rules.protocol != null && rules.protocol.Count > 0)
-                        || (rules.inboundTag != null && rules.inboundTag.Count > 0)
+                        || (rules.protocol?.Count > 0)
+                        || (rules.inboundTag?.Count > 0)
                         )
                     {
                         var it = Utils.DeepCopy(rules);
@@ -405,7 +404,7 @@ namespace v2rayN.Handler
                     if (!Utils.IsNullOrEmpty(node.security)
                         && !Utils.IsNullOrEmpty(node.id))
                     {
-                        SocksUsersItem socksUsersItem = new SocksUsersItem
+                        SocksUsersItem socksUsersItem = new()
                         {
                             user = node.security,
                             pass = node.id,
@@ -565,7 +564,7 @@ namespace v2rayN.Handler
                 {
                     streamSettings.security = node.streamSecurity;
 
-                    TlsSettings tlsSettings = new TlsSettings
+                    TlsSettings tlsSettings = new()
                     {
                         allowInsecure = Utils.ToBool(node.allowInsecure.IsNullOrEmpty() ? config.coreBasicItem.defAllowInsecure.ToString().ToLower() : node.allowInsecure),
                         alpn = node.GetAlpn(),
@@ -587,7 +586,7 @@ namespace v2rayN.Handler
                 {
                     streamSettings.security = node.streamSecurity;
 
-                    TlsSettings xtlsSettings = new TlsSettings
+                    TlsSettings xtlsSettings = new()
                     {
                         allowInsecure = Utils.ToBool(node.allowInsecure.IsNullOrEmpty() ? config.coreBasicItem.defAllowInsecure.ToString().ToLower() : node.allowInsecure),
                         alpn = node.GetAlpn(),
@@ -608,17 +607,17 @@ namespace v2rayN.Handler
                 switch (node.GetNetwork())
                 {
                     case "kcp":
-                        KcpSettings kcpSettings = new KcpSettings
+                        KcpSettings kcpSettings = new()
                         {
                             mtu = config.kcpItem.mtu,
                             tti = config.kcpItem.tti
                         };
-                        if (iobound.Equals("out"))
+                        if (iobound == "out")
                         {
                             kcpSettings.uplinkCapacity = config.kcpItem.uplinkCapacity;
                             kcpSettings.downlinkCapacity = config.kcpItem.downlinkCapacity;
                         }
-                        else if (iobound.Equals("in"))
+                        else if (iobound == "in")
                         {
                             kcpSettings.uplinkCapacity = config.kcpItem.downlinkCapacity; ;
                             kcpSettings.downlinkCapacity = config.kcpItem.downlinkCapacity;
@@ -644,12 +643,8 @@ namespace v2rayN.Handler
                         break;
                     //ws
                     case "ws":
-                        WsSettings wsSettings = new WsSettings
-                        {
-                        };
-                        wsSettings.headers = new Headers
-                        {
-                        };
+                        WsSettings wsSettings = new();
+                        wsSettings.headers = new Headers();
                         string path = node.path;
                         if (!string.IsNullOrWhiteSpace(host))
                         {
@@ -675,7 +670,7 @@ namespace v2rayN.Handler
                         break;
                     //h2
                     case "h2":
-                        HttpSettings httpSettings = new HttpSettings();
+                        HttpSettings httpSettings = new();
 
                         if (!string.IsNullOrWhiteSpace(host))
                         {
@@ -691,7 +686,7 @@ namespace v2rayN.Handler
                         break;
                     //quic
                     case "quic":
-                        QuicSettings quicsettings = new QuicSettings
+                        QuicSettings quicsettings = new()
                         {
                             security = host,
                             key = node.path,
@@ -714,7 +709,7 @@ namespace v2rayN.Handler
                         }
                         break;
                     case "grpc":
-                        var grpcSettings = new GrpcSettings
+                        GrpcSettings grpcSettings = new()
                         {
                             serviceName = node.path,
                             multiMode = (node.headerType == Global.GrpcmultiMode),
@@ -728,9 +723,9 @@ namespace v2rayN.Handler
                         break;
                     default:
                         //tcp
-                        if (node.headerType.Equals(Global.TcpHeaderHttp))
+                        if (node.headerType == Global.TcpHeaderHttp)
                         {
-                            TcpSettings tcpSettings = new TcpSettings
+                            TcpSettings tcpSettings = new()
                             {
                                 header = new Header
                                 {
@@ -738,7 +733,7 @@ namespace v2rayN.Handler
                                 }
                             };
 
-                            if (iobound.Equals("out"))
+                            if (iobound == "out")
                             {
                                 //request Host
                                 string request = Utils.GetEmbedText(Global.v2raySampleHttprequestFileName);
@@ -757,7 +752,7 @@ namespace v2rayN.Handler
                                 request = request.Replace("$requestPath$", $"\"{pathHttp}\"");
                                 tcpSettings.header.request = Utils.FromJson<object>(request);
                             }
-                            else if (iobound.Equals("in"))
+                            else if (iobound == "in")
                             {
                                 //string response = Utils.GetEmbedText(Global.v2raySampleHttpresponseFileName);
                                 //tcpSettings.header.response = Utils.FromJson<object>(response);
@@ -793,13 +788,13 @@ namespace v2rayN.Handler
                 }
 
                 var obj = Utils.ParseJson(config.remoteDNS);
-                if (obj != null && obj.ContainsKey("servers"))
+                if (obj?.ContainsKey("servers") == true)
                 {
                     v2rayConfig.dns = obj;
                 }
                 else
                 {
-                    List<string> servers = new List<string>();
+                    List<string> servers = new();
 
                     string[] arrDNS = config.remoteDNS.Split(',');
                     foreach (string str in arrDNS)
@@ -828,9 +823,9 @@ namespace v2rayN.Handler
             if (config.guiItem.enableStatistics)
             {
                 string tag = Global.InboundAPITagName;
-                API apiObj = new API();
-                Policy policyObj = new Policy();
-                SystemPolicy policySystemSetting = new SystemPolicy();
+                API apiObj = new();
+                Policy policyObj = new();
+                SystemPolicy policySystemSetting = new();
 
                 string[] services = { "StatsService" };
 
@@ -847,8 +842,8 @@ namespace v2rayN.Handler
 
                 if (!v2rayConfig.inbounds.Exists(item => item.tag == tag))
                 {
-                    Inbounds apiInbound = new Inbounds();
-                    Inboundsettings apiInboundSettings = new Inboundsettings();
+                    Inbounds apiInbound = new();
+                    Inboundsettings apiInboundSettings = new();
                     apiInbound.tag = tag;
                     apiInbound.listen = Global.Loopback;
                     apiInbound.port = Global.statePort;
@@ -860,7 +855,7 @@ namespace v2rayN.Handler
 
                 if (!v2rayConfig.routing.rules.Exists(item => item.outboundTag == tag))
                 {
-                    RulesItem apiRoutingRule = new RulesItem
+                    RulesItem apiRoutingRule = new()
                     {
                         inboundTag = new List<string> { tag },
                         outboundTag = tag,
@@ -957,7 +952,7 @@ namespace v2rayN.Handler
             return 0;
         }
 
-        public static int GenerateClientConfigContent(ProfileItem node, bool blExport, ref V2rayConfig v2rayConfig, out string msg)
+        public static int GenerateClientConfigContent(ProfileItem node, bool blExport, ref V2rayConfig? v2rayConfig, out string msg)
         {
             try
             {
@@ -1034,7 +1029,7 @@ namespace v2rayN.Handler
                     return -1;
                 }
 
-                V2rayConfig v2rayConfig = Utils.FromJson<V2rayConfig>(result);
+                V2rayConfig? v2rayConfig = Utils.FromJson<V2rayConfig>(result);
                 if (v2rayConfig == null)
                 {
                     msg = ResUI.FailedGenDefaultConfiguration;
@@ -1123,10 +1118,10 @@ namespace v2rayN.Handler
 
         #region Import (export) client/server configuration
 
-        public static ProfileItem ImportFromClientConfig(string fileName, out string msg)
+        public static ProfileItem? ImportFromClientConfig(string fileName, out string msg)
         {
             msg = string.Empty;
-            ProfileItem profileItem = new ProfileItem();
+            ProfileItem profileItem = new();
 
             try
             {
@@ -1137,7 +1132,7 @@ namespace v2rayN.Handler
                     return null;
                 }
 
-                V2rayConfig v2rayConfig = Utils.FromJson<V2rayConfig>(result);
+                V2rayConfig? v2rayConfig = Utils.FromJson<V2rayConfig>(result);
                 if (v2rayConfig == null)
                 {
                     msg = ResUI.FailedConversionConfiguration;
@@ -1175,30 +1170,24 @@ namespace v2rayN.Handler
                 profileItem.remarks = $"import@{DateTime.Now.ToShortDateString()}";
 
                 //tcp or kcp
-                if (outbound.streamSettings != null
-                    && outbound.streamSettings.network != null
+                if (outbound.streamSettings?.network != null
                     && !Utils.IsNullOrEmpty(outbound.streamSettings.network))
                 {
                     profileItem.network = outbound.streamSettings.network;
                 }
 
                 //tcp http
-                if (outbound.streamSettings != null
-                    && outbound.streamSettings.tcpSettings != null
-                    && outbound.streamSettings.tcpSettings.header != null
+                if (outbound.streamSettings?.tcpSettings?.header != null
                     && !Utils.IsNullOrEmpty(outbound.streamSettings.tcpSettings.header.type))
                 {
-                    if (outbound.streamSettings.tcpSettings.header.type.Equals(Global.TcpHeaderHttp))
+                    if (outbound.streamSettings.tcpSettings.header.type == Global.TcpHeaderHttp)
                     {
                         profileItem.headerType = outbound.streamSettings.tcpSettings.header.type;
-                        string request = Convert.ToString(outbound.streamSettings.tcpSettings.header.request);
+                        string? request = Convert.ToString(outbound.streamSettings.tcpSettings.header.request);
                         if (!Utils.IsNullOrEmpty(request))
                         {
-                            V2rayTcpRequest v2rayTcpRequest = Utils.FromJson<V2rayTcpRequest>(request);
-                            if (v2rayTcpRequest != null
-                                && v2rayTcpRequest.headers != null
-                                && v2rayTcpRequest.headers.Host != null
-                                && v2rayTcpRequest.headers.Host.Count > 0)
+                            V2rayTcpRequest? v2rayTcpRequest = Utils.FromJson<V2rayTcpRequest>(request);
+                            if (v2rayTcpRequest?.headers?.Host?.Count > 0)
                             {
                                 profileItem.requestHost = v2rayTcpRequest.headers.Host[0];
                             }
@@ -1206,17 +1195,14 @@ namespace v2rayN.Handler
                     }
                 }
                 //kcp
-                if (outbound.streamSettings != null
-                    && outbound.streamSettings.kcpSettings != null
-                    && outbound.streamSettings.kcpSettings.header != null
+                if (outbound?.streamSettings?.kcpSettings?.header != null
                     && !Utils.IsNullOrEmpty(outbound.streamSettings.kcpSettings.header.type))
                 {
                     profileItem.headerType = outbound.streamSettings.kcpSettings.header.type;
                 }
 
                 //ws
-                if (outbound.streamSettings != null
-                    && outbound.streamSettings.wsSettings != null)
+                if (outbound?.streamSettings?.wsSettings != null)
                 {
                     if (!Utils.IsNullOrEmpty(outbound.streamSettings.wsSettings.path))
                     {
@@ -1230,24 +1216,20 @@ namespace v2rayN.Handler
                 }
 
                 //h2
-                if (outbound.streamSettings != null
-                    && outbound.streamSettings.httpSettings != null)
+                if (outbound?.streamSettings?.httpSettings != null)
                 {
                     if (!Utils.IsNullOrEmpty(outbound.streamSettings.httpSettings.path))
                     {
                         profileItem.path = outbound.streamSettings.httpSettings.path;
                     }
-                    if (outbound.streamSettings.httpSettings.host != null
-                        && outbound.streamSettings.httpSettings.host.Count > 0)
+                    if (outbound.streamSettings.httpSettings.host?.Count > 0)
                     {
                         profileItem.requestHost = Utils.List2String(outbound.streamSettings.httpSettings.host);
                     }
                 }
 
                 //tls
-                if (outbound.streamSettings != null
-                    && outbound.streamSettings.security != null
-                    && outbound.streamSettings.security == Global.StreamSecurity)
+                if (outbound?.streamSettings?.security == Global.StreamSecurity)
                 {
                     profileItem.streamSecurity = Global.StreamSecurity;
                 }
@@ -1262,21 +1244,21 @@ namespace v2rayN.Handler
             return profileItem;
         }
 
-        public static ProfileItem ImportFromServerConfig(string fileName, out string msg)
+        public static ProfileItem? ImportFromServerConfig(string fileName, out string msg)
         {
             msg = string.Empty;
-            ProfileItem profileItem = new ProfileItem();
+            ProfileItem profileItem = new();
 
             try
             {
-                string result = Utils.LoadResource(fileName);
+                string? result = Utils.LoadResource(fileName);
                 if (Utils.IsNullOrEmpty(result))
                 {
                     msg = ResUI.FailedReadConfiguration;
                     return null;
                 }
 
-                V2rayConfig v2rayConfig = Utils.FromJson<V2rayConfig>(result);
+                V2rayConfig? v2rayConfig = Utils.FromJson<V2rayConfig>(result);
                 if (v2rayConfig == null)
                 {
                     msg = ResUI.FailedConversionConfiguration;
@@ -1313,30 +1295,24 @@ namespace v2rayN.Handler
                 profileItem.remarks = $"import@{DateTime.Now.ToShortDateString()}";
 
                 //tcp or kcp
-                if (inbound.streamSettings != null
-                    && inbound.streamSettings.network != null
+                if (inbound.streamSettings?.network != null
                     && !Utils.IsNullOrEmpty(inbound.streamSettings.network))
                 {
                     profileItem.network = inbound.streamSettings.network;
                 }
 
                 //tcp http
-                if (inbound.streamSettings != null
-                    && inbound.streamSettings.tcpSettings != null
-                    && inbound.streamSettings.tcpSettings.header != null
+                if (inbound.streamSettings?.tcpSettings?.header != null
                     && !Utils.IsNullOrEmpty(inbound.streamSettings.tcpSettings.header.type))
                 {
-                    if (inbound.streamSettings.tcpSettings.header.type.Equals(Global.TcpHeaderHttp))
+                    if (inbound.streamSettings.tcpSettings.header.type == Global.TcpHeaderHttp)
                     {
                         profileItem.headerType = inbound.streamSettings.tcpSettings.header.type;
-                        string request = Convert.ToString(inbound.streamSettings.tcpSettings.header.request);
+                        string? request = Convert.ToString(inbound.streamSettings.tcpSettings.header.request);
                         if (!Utils.IsNullOrEmpty(request))
                         {
-                            V2rayTcpRequest v2rayTcpRequest = Utils.FromJson<V2rayTcpRequest>(request);
-                            if (v2rayTcpRequest != null
-                                && v2rayTcpRequest.headers != null
-                                && v2rayTcpRequest.headers.Host != null
-                                && v2rayTcpRequest.headers.Host.Count > 0)
+                            V2rayTcpRequest? v2rayTcpRequest = Utils.FromJson<V2rayTcpRequest>(request);
+                            if (v2rayTcpRequest?.headers?.Host?.Count > 0)
                             {
                                 profileItem.requestHost = v2rayTcpRequest.headers.Host[0];
                             }
@@ -1353,8 +1329,7 @@ namespace v2rayN.Handler
                 //}
 
                 //ws
-                if (inbound.streamSettings != null
-                    && inbound.streamSettings.wsSettings != null)
+                if (inbound.streamSettings?.wsSettings != null)
                 {
                     if (!Utils.IsNullOrEmpty(inbound.streamSettings.wsSettings.path))
                     {
@@ -1368,24 +1343,20 @@ namespace v2rayN.Handler
                 }
 
                 //h2
-                if (inbound.streamSettings != null
-                    && inbound.streamSettings.httpSettings != null)
+                if (inbound.streamSettings?.httpSettings != null)
                 {
                     if (!Utils.IsNullOrEmpty(inbound.streamSettings.httpSettings.path))
                     {
                         profileItem.path = inbound.streamSettings.httpSettings.path;
                     }
-                    if (inbound.streamSettings.httpSettings.host != null
-                        && inbound.streamSettings.httpSettings.host.Count > 0)
+                    if (inbound.streamSettings.httpSettings.host?.Count > 0)
                     {
                         profileItem.requestHost = Utils.List2String(inbound.streamSettings.httpSettings.host);
                     }
                 }
 
                 //tls
-                if (inbound.streamSettings != null
-                    && inbound.streamSettings.security != null
-                    && inbound.streamSettings.security == Global.StreamSecurity)
+                if (inbound.streamSettings?.security == Global.StreamSecurity)
                 {
                     profileItem.streamSecurity = Global.StreamSecurity;
                 }
@@ -1401,7 +1372,7 @@ namespace v2rayN.Handler
 
         public static int Export2ClientConfig(ProfileItem node, string fileName, out string msg)
         {
-            V2rayConfig v2rayConfig = null;
+            V2rayConfig? v2rayConfig = null;
             if (GenerateClientConfigContent(node, true, ref v2rayConfig, out msg) != 0)
             {
                 return -1;
@@ -1440,14 +1411,14 @@ namespace v2rayN.Handler
                     return "";
                 }
 
-                V2rayConfig v2rayConfig = Utils.FromJson<V2rayConfig>(result);
+                V2rayConfig? v2rayConfig = Utils.FromJson<V2rayConfig>(result);
                 if (v2rayConfig == null)
                 {
                     msg = ResUI.FailedGenDefaultConfiguration;
                     return "";
                 }
-                List<IPEndPoint> lstIpEndPoints = new List<IPEndPoint>();
-                List<TcpConnectionInformation> lstTcpConns = new List<TcpConnectionInformation>();
+                List<IPEndPoint> lstIpEndPoints = new();
+                List<TcpConnectionInformation> lstTcpConns = new();
                 try
                 {
                     lstIpEndPoints.AddRange(IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpListeners());
@@ -1477,7 +1448,7 @@ namespace v2rayN.Handler
                     {
                         continue;
                     }
-                    if (it.configType == EConfigType.VMess || it.configType == EConfigType.VLESS)
+                    if (it.configType is EConfigType.VMess or EConfigType.VLESS)
                     {
                         var item2 = LazyConfig.Instance.GetProfileItem(it.indexId);
                         if (item2 is null || Utils.IsNullOrEmpty(item2.id) || !Utils.IsGuidByParse(item2.id))
@@ -1490,11 +1461,11 @@ namespace v2rayN.Handler
                     var port = httpPort;
                     for (int k = httpPort; k < Global.MaxPort; k++)
                     {
-                        if (lstIpEndPoints != null && lstIpEndPoints.FindIndex(_it => _it.Port == k) >= 0)
+                        if (lstIpEndPoints?.FindIndex(_it => _it.Port == k) >= 0)
                         {
                             continue;
                         }
-                        if (lstTcpConns != null && lstTcpConns.FindIndex(_it => _it.LocalEndPoint.Port == k) >= 0)
+                        if (lstTcpConns?.FindIndex(_it => _it.LocalEndPoint.Port == k) >= 0)
                         {
                             continue;
                         }
@@ -1505,7 +1476,7 @@ namespace v2rayN.Handler
                     }
 
                     //Port In Used
-                    if (lstIpEndPoints != null && lstIpEndPoints.FindIndex(_it => _it.Port == port) >= 0)
+                    if (lstIpEndPoints?.FindIndex(_it => _it.Port == port) >= 0)
                     {
                         continue;
                     }
@@ -1513,7 +1484,7 @@ namespace v2rayN.Handler
                     it.allowTest = true;
 
                     //inbound
-                    Inbounds inbound = new Inbounds
+                    Inbounds inbound = new()
                     {
                         listen = Global.Loopback,
                         port = port,
@@ -1523,7 +1494,7 @@ namespace v2rayN.Handler
                     v2rayConfig.inbounds.Add(inbound);
 
                     //outbound
-                    V2rayConfig v2rayConfigCopy = Utils.FromJson<V2rayConfig>(result);
+                    V2rayConfig? v2rayConfigCopy = Utils.FromJson<V2rayConfig>(result);
                     var item = LazyConfig.Instance.GetProfileItem(it.indexId);
                     if (item is null)
                     {
@@ -1540,7 +1511,7 @@ namespace v2rayN.Handler
                     v2rayConfig.outbounds.Add(v2rayConfigCopy.outbounds[0]);
 
                     //rule
-                    RulesItem rule = new RulesItem
+                    RulesItem rule = new()
                     {
                         inboundTag = new List<string> { inbound.tag },
                         outboundTag = v2rayConfigCopy.outbounds[0].tag,

v2rayN/v2rayN/Handler/CoreHandler.cs

@@ -12,9 +12,9 @@ namespace v2rayN.Handler
     class CoreHandler
     {
         private static string _coreCConfigRes = Global.coreConfigFileName;
-        private CoreInfo _coreInfo;
+        private CoreInfo? _coreInfo;
         private int _processId = 0;
-        private Process _process;
+        private Process? _process;
         Action<bool, string> _updateFunc;
 
         public CoreHandler(Action<bool, string> update)
@@ -108,7 +108,7 @@ namespace v2rayN.Handler
                         Process[] existing = Process.GetProcessesByName(vName);
                         foreach (Process p in existing)
                         {
-                            string path = p.MainModule.FileName;
+                            string? path = p.MainModule?.FileName;
                             if (path == $"{Utils.GetBinPath(vName, _coreInfo.coreType)}.exe")
                             {
                                 KillProcess(p);
@@ -173,7 +173,8 @@ namespace v2rayN.Handler
                 string fileName = CoreFindexe(_coreInfo);
                 if (fileName == "") return;
 
-                Process p = new Process
+                var displayLog = node.configType != EConfigType.Custom || node.displayLog;
+                Process p = new()
                 {
                     StartInfo = new ProcessStartInfo
                     {
@@ -181,18 +182,18 @@ namespace v2rayN.Handler
                         Arguments = _coreInfo.arguments,
                         WorkingDirectory = Utils.GetConfigPath(),
                         UseShellExecute = false,
-                        RedirectStandardOutput = node.displayLog,
-                        RedirectStandardError = node.displayLog,
+                        RedirectStandardOutput = displayLog,
+                        RedirectStandardError = displayLog,
                         CreateNoWindow = true,
-                        StandardOutputEncoding = node.displayLog ? Encoding.UTF8 : null,
-                        StandardErrorEncoding = node.displayLog ? Encoding.UTF8 : null,
+                        StandardOutputEncoding = displayLog ? Encoding.UTF8 : null,
+                        StandardErrorEncoding = displayLog ? Encoding.UTF8 : null,
                     }
                 };
-                if (node.displayLog)
+                if (displayLog)
                 {
                     p.OutputDataReceived += (sender, e) =>
                     {
-                        if (!String.IsNullOrEmpty(e.Data))
+                        if (!string.IsNullOrEmpty(e.Data))
                         {
                             string msg = e.Data + Environment.NewLine;
                             ShowMsg(false, msg);
@@ -200,7 +201,7 @@ namespace v2rayN.Handler
                     };
                 }
                 p.Start();
-                if (node.displayLog)
+                if (displayLog)
                 {
                     p.BeginOutputReadLine();
                 }
@@ -208,7 +209,7 @@ namespace v2rayN.Handler
 
                 if (p.WaitForExit(1000))
                 {
-                    throw new Exception(node.displayLog ? p.StandardError.ReadToEnd() : "启动进程失败并退出 (Failed to start the process and exited)");
+                    throw new Exception(displayLog ? p.StandardError.ReadToEnd() : "启动进程失败并退出 (Failed to start the process and exited)");
                 }
 
                 Global.processJob.AddProcess(p.Handle);
@@ -231,7 +232,7 @@ namespace v2rayN.Handler
                 string fileName = CoreFindexe(coreInfo);
                 if (fileName == "") return -1;
 
-                Process p = new Process
+                Process p = new()
                 {
                     StartInfo = new ProcessStartInfo
                     {

v2rayN/v2rayN/Handler/DownloadHandle.cs

@@ -14,9 +14,9 @@ namespace v2rayN.Handler
     /// </summary>
     class DownloadHandle
     {
-        public event EventHandler<ResultEventArgs> UpdateCompleted;
+        public event EventHandler<ResultEventArgs>? UpdateCompleted;
 
-        public event ErrorEventHandler Error;
+        public event ErrorEventHandler? Error;
 
 
         public class ResultEventArgs : EventArgs
@@ -73,11 +73,7 @@ namespace v2rayN.Handler
                 var progress = new Progress<double>();
                 progress.ProgressChanged += (sender, value) =>
                 {
-                    if (UpdateCompleted != null)
-                    {
-                        string msg = $"...{value}%";
-                        UpdateCompleted(this, new ResultEventArgs(value > 100 ? true : false, msg));
-                    }
+                    UpdateCompleted?.Invoke(this, new ResultEventArgs(value > 100, $"...{value}%"));
                 };
 
                 var webProxy = GetWebProxy(blProxy);
@@ -99,7 +95,7 @@ namespace v2rayN.Handler
             }
         }
 
-        public async Task<string> UrlRedirectAsync(string url, bool blProxy)
+        public async Task<string?> UrlRedirectAsync(string url, bool blProxy)
         {
             Utils.SetSecurityProtocol(LazyConfig.Instance.GetConfig().guiItem.enableSecurityProtocolTls13);
             var webRequestHandler = new SocketsHttpHandler
@@ -107,10 +103,10 @@ namespace v2rayN.Handler
                 AllowAutoRedirect = false,
                 Proxy = GetWebProxy(blProxy)
             };
-            HttpClient client = new HttpClient(webRequestHandler);
+            HttpClient client = new(webRequestHandler);
 
             HttpResponseMessage response = await client.GetAsync(url);
-            if (response.StatusCode.ToString() == "Redirect")
+            if (response.StatusCode == HttpStatusCode.Redirect && response.Headers.Location is not null)
             {
                 return response.Headers.Location.ToString();
             }
@@ -121,7 +117,7 @@ namespace v2rayN.Handler
             }
         }
 
-        public async Task<string> TryDownloadString(string url, bool blProxy, string userAgent)
+        public async Task<string?> TryDownloadString(string url, bool blProxy, string userAgent)
         {
             try
             {
@@ -161,14 +157,12 @@ namespace v2rayN.Handler
 
             try
             {
-                using (var wc = new WebClient())
+                using var wc = new WebClient();
+                wc.Proxy = GetWebProxy(blProxy);
+                var result3 = await wc.DownloadStringTaskAsync(url);
+                if (!Utils.IsNullOrEmpty(result3))
                 {
-                    wc.Proxy = GetWebProxy(blProxy);
-                    var result3 = await wc.DownloadStringTaskAsync(url);
-                    if (!Utils.IsNullOrEmpty(result3))
-                    {
-                        return result3;
-                    }
+                    return result3;
                 }
             }
             catch (Exception ex)
@@ -181,7 +175,7 @@ namespace v2rayN.Handler
                 }
             }
 
-       
+
             return null;
         }
 
@@ -189,7 +183,7 @@ namespace v2rayN.Handler
         /// DownloadString
         /// </summary> 
         /// <param name="url"></param>
-        public async Task<string> DownloadStringAsync(string url, bool blProxy, string userAgent)
+        public async Task<string?> DownloadStringAsync(string url, bool blProxy, string userAgent)
         {
             try
             {
@@ -201,11 +195,11 @@ namespace v2rayN.Handler
 
                 if (Utils.IsNullOrEmpty(userAgent))
                 {
-                    userAgent = $"{Utils.GetVersion(false)}";
+                    userAgent = Utils.GetVersion(false);
                 }
                 client.DefaultRequestHeaders.UserAgent.TryParseAdd(userAgent);
 
-                Uri uri = new Uri(url);
+                Uri uri = new(url);
                 //Authorization Header
                 if (!Utils.IsNullOrEmpty(uri.UserInfo))
                 {
@@ -215,7 +209,7 @@ namespace v2rayN.Handler
                 var cts = new CancellationTokenSource();
                 cts.CancelAfter(1000 * 30);
 
-                var result = await HttpClientHelper.GetInstance().GetAsync(client, url, cts.Token);
+                var result = await HttpClientHelper.Instance.GetAsync(client, url, cts.Token);
                 return result;
             }
             catch (Exception ex)
@@ -234,7 +228,7 @@ namespace v2rayN.Handler
         /// DownloadString
         /// </summary> 
         /// <param name="url"></param>
-        public async Task<string> DownloadStringViaDownloader(string url, bool blProxy, string userAgent)
+        public async Task<string?> DownloadStringViaDownloader(string url, bool blProxy, string userAgent)
         {
             try
             {
@@ -244,7 +238,7 @@ namespace v2rayN.Handler
 
                 if (Utils.IsNullOrEmpty(userAgent))
                 {
-                    userAgent = $"{Utils.GetVersion(false)}";
+                    userAgent = Utils.GetVersion(false);
                 }
                 var result = await DownloaderHelper.Instance.DownloadStringAsync(webProxy, url, userAgent, 30);
                 return result;
@@ -262,7 +256,7 @@ namespace v2rayN.Handler
         }
 
 
-        public int RunAvailabilityCheck(WebProxy webProxy)
+        public int RunAvailabilityCheck(IWebProxy? webProxy)
         {
             try
             {
@@ -292,7 +286,7 @@ namespace v2rayN.Handler
             }
         }
 
-        public string GetRealPingTime(string url, WebProxy webProxy, int downloadTimeout, out int responseTime)
+        public string GetRealPingTime(string url, IWebProxy? webProxy, int downloadTimeout, out int responseTime)
         {
             string msg = string.Empty;
             responseTime = -1;
@@ -302,19 +296,14 @@ namespace v2rayN.Handler
                 myHttpWebRequest.Timeout = downloadTimeout * 1000;
                 myHttpWebRequest.Proxy = webProxy;
 
-                Stopwatch timer = new Stopwatch();
-                timer.Start();
+                Stopwatch timer = Stopwatch.StartNew();
 
-                HttpWebResponse myHttpWebResponse = (HttpWebResponse)myHttpWebRequest.GetResponse();
-                if (myHttpWebResponse.StatusCode != HttpStatusCode.OK
-                    && myHttpWebResponse.StatusCode != HttpStatusCode.NoContent)
+                using HttpWebResponse myHttpWebResponse = (HttpWebResponse)myHttpWebRequest.GetResponse();
+                if (myHttpWebResponse.StatusCode is not HttpStatusCode.OK and not HttpStatusCode.NoContent)
                 {
                     msg = myHttpWebResponse.StatusDescription;
                 }
-                timer.Stop();
                 responseTime = timer.Elapsed.Milliseconds;
-
-                myHttpWebResponse.Close();
             }
             catch (Exception ex)
             {
@@ -324,7 +313,7 @@ namespace v2rayN.Handler
             return msg;
         }
 
-        private WebProxy GetWebProxy(bool blProxy)
+        private WebProxy? GetWebProxy(bool blProxy)
         {
             if (!blProxy)
             {
@@ -341,25 +330,17 @@ namespace v2rayN.Handler
 
         private bool SocketCheck(string ip, int port)
         {
-            Socket sock = null;
             try
             {
-                IPAddress ipa = IPAddress.Parse(ip);
-                IPEndPoint point = new IPEndPoint(ipa, port);
-                sock = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+                IPEndPoint point = new(IPAddress.Parse(ip), port);
+                using Socket? sock = new(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
                 sock.Connect(point);
                 return true;
             }
-            catch { }
-            finally
+            catch (Exception)
             {
-                if (sock != null)
-                {
-                    sock.Close();
-                    sock.Dispose();
-                }
+                return false;
             }
-            return false;
         }
     }
 }

v2rayN/v2rayN/Handler/LazyConfig.cs

@@ -5,7 +5,7 @@ namespace v2rayN.Handler
 {
     public sealed class LazyConfig
     {
-        private static readonly Lazy<LazyConfig> _instance = new Lazy<LazyConfig>(() => new());
+        private static readonly Lazy<LazyConfig> _instance = new(() => new());
         private Config _config;
         private List<CoreInfo> coreInfos;
 
@@ -17,11 +17,12 @@ namespace v2rayN.Handler
             SqliteHelper.Instance.CreateTable<ProfileItem>();
             SqliteHelper.Instance.CreateTable<ServerStatItem>();
             SqliteHelper.Instance.CreateTable<RoutingItem>();
+            SqliteHelper.Instance.CreateTable<ProfileExItem>();
         }
 
         #region Config
 
-        public void SetConfig(ref Config config)
+        public void SetConfig(Config config)
         {
             _config = config;
         }
@@ -81,6 +82,18 @@ namespace v2rayN.Handler
                 return SqliteHelper.Instance.Table<ProfileItem>().Where(t => t.subid == subid).ToList();
             }
         }
+        public List<string> ProfileItemIndexs(string subid)
+        {
+            if (Utils.IsNullOrEmpty(subid))
+            {
+                return SqliteHelper.Instance.Table<ProfileItem>().Select(t => t.indexId).ToList();
+
+            }
+            else
+            {
+                return SqliteHelper.Instance.Table<ProfileItem>().Where(t => t.subid == subid).Select(t => t.indexId).ToList();
+            }
+        }
 
         public List<ProfileItemModel> ProfileItems(string subid, string filter)
         {
@@ -95,18 +108,17 @@ namespace v2rayN.Handler
             }
             if (!Utils.IsNullOrEmpty(filter))
             {
-                if (filter.Contains("'"))
+                if (filter.Contains('\''))
                 {
                     filter = filter.Replace("'", "");
                 }
                 sql += $" and a.remarks like '%{filter}%'";
             }
-            sql += " order by a.sort";
 
             return SqliteHelper.Instance.Query<ProfileItemModel>(sql).ToList();
         }
 
-        public ProfileItem GetProfileItem(string indexId)
+        public ProfileItem? GetProfileItem(string indexId)
         {
             if (Utils.IsNullOrEmpty(indexId))
             {
@@ -115,28 +127,6 @@ namespace v2rayN.Handler
             return SqliteHelper.Instance.Table<ProfileItem>().FirstOrDefault(it => it.indexId == indexId);
         }
 
-        public Task SetTestResult(string indexId, string delayVal, string speedVal)
-        {
-            string sql = string.Empty;
-            if (!Utils.IsNullOrEmpty(delayVal) && !Utils.IsNullOrEmpty(speedVal))
-            {
-                int.TryParse(delayVal, out int delay);
-                decimal.TryParse(speedVal, out decimal speed);
-                sql = $"update ProfileItem set delay={delay},speed={speed} where indexId = '{indexId}'";
-            }
-            else if (!Utils.IsNullOrEmpty(delayVal))
-            {
-                int.TryParse(delayVal, out int delay);
-                sql = $"update ProfileItem set delay={delay} where indexId = '{indexId}'";
-            }
-            else if (!Utils.IsNullOrEmpty(speedVal))
-            {
-                decimal.TryParse(speedVal, out decimal speed);
-                sql = $"update ProfileItem set speed={speed} where indexId = '{indexId}'";
-            }
-            return SqliteHelper.Instance.ExecuteAsync(sql);
-        }
-
         public List<RoutingItem> RoutingItems()
         {
             return SqliteHelper.Instance.Table<RoutingItem>().Where(it => it.locked == false).OrderBy(t => t.sort).ToList();
@@ -166,7 +156,7 @@ namespace v2rayN.Handler
 
         public ECoreType GetCoreType(ProfileItem profileItem, EConfigType eConfigType)
         {
-            if (profileItem != null && profileItem.coreType != null)
+            if (profileItem?.coreType != null)
             {
                 return (ECoreType)profileItem.coreType;
             }
@@ -183,16 +173,16 @@ namespace v2rayN.Handler
             return item.coreType;
         }
 
-        public CoreInfo GetCoreInfo(ECoreType coreType)
+        public CoreInfo? GetCoreInfo(ECoreType coreType)
         {
             if (coreInfos == null)
             {
                 InitCoreInfo();
             }
-            return coreInfos.Where(t => t.coreType == coreType).FirstOrDefault();
+            return coreInfos!.FirstOrDefault(t => t.coreType == coreType);
         }
 
-        public List<CoreInfo> GetCoreInfos()
+        public List<CoreInfo>? GetCoreInfos()
         {
             if (coreInfos == null)
             {
@@ -203,7 +193,7 @@ namespace v2rayN.Handler
 
         private void InitCoreInfo()
         {
-            coreInfos = new List<CoreInfo>();
+            coreInfos = new(16);
 
             coreInfos.Add(new CoreInfo
             {

v2rayN/v2rayN/Handler/MainFormHandler.cs

@@ -12,7 +12,7 @@ namespace v2rayN.Handler
 {
     public sealed class MainFormHandler
     {
-        private static readonly Lazy<MainFormHandler> instance = new Lazy<MainFormHandler>(() => new MainFormHandler());
+        private static readonly Lazy<MainFormHandler> instance = new(() => new());
         //Action<bool, string> _updateUI;
 
         //private DownloadHandle downloadHandle2;
@@ -42,19 +42,14 @@ namespace v2rayN.Handler
                 {
                     return new Icon(fileName);
                 }
-                switch (index)
+                return index switch
                 {
-                    case 0:
-                        return Properties.Resources.NotifyIcon1;
-                    case 1:
-                        return Properties.Resources.NotifyIcon2;
-                    case 2:
-                        return Properties.Resources.NotifyIcon3;
-                    case 3:
-                        return Properties.Resources.NotifyIcon2;
-                }
-
-                return Properties.Resources.NotifyIcon1;
+                    0 => Properties.Resources.NotifyIcon1,
+                    1 => Properties.Resources.NotifyIcon2,
+                    2 => Properties.Resources.NotifyIcon3,
+                    3 => Properties.Resources.NotifyIcon2,
+                    _ => Properties.Resources.NotifyIcon1, // default
+                };
             }
             catch (Exception ex)
             {
@@ -82,7 +77,7 @@ namespace v2rayN.Handler
             return BitmapFrame.Create(new Uri($"pack://application:,,,/Resources/NotifyIcon{index}.ico", UriKind.RelativeOrAbsolute));
         }
 
-        private Icon GetNotifyIcon4Routing(Config config)
+        private Icon? GetNotifyIcon4Routing(Config config)
         {
             try
             {
@@ -107,9 +102,9 @@ namespace v2rayN.Handler
                 int width = 128;
                 int height = 128;
 
-                Bitmap bitmap = new Bitmap(width, height);
+                Bitmap bitmap = new(width, height);
                 Graphics graphics = Graphics.FromImage(bitmap);
-                SolidBrush drawBrush = new SolidBrush(color);
+                SolidBrush drawBrush = new(color);
 
                 graphics.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
                 //graphics.FillRectangle(drawBrush, new Rectangle(0, 0, width, height));                
@@ -143,7 +138,7 @@ namespace v2rayN.Handler
                 return;
             }
 
-            SaveFileDialog fileDialog = new SaveFileDialog
+            SaveFileDialog fileDialog = new()
             {
                 Filter = "Config|*.json",
                 FilterIndex = 2,
@@ -176,14 +171,13 @@ namespace v2rayN.Handler
             {
                 return;
             }
-            if (item.configType != EConfigType.VMess
-                && item.configType != EConfigType.VLESS)
+            if (item.configType is not EConfigType.VMess and not EConfigType.VLESS)
             {
                 UI.Show(ResUI.NonVmessService);
                 return;
             }
 
-            SaveFileDialog fileDialog = new SaveFileDialog
+            SaveFileDialog fileDialog = new()
             {
                 Filter = "Config|*.json",
                 FilterIndex = 2,
@@ -212,14 +206,14 @@ namespace v2rayN.Handler
 
         public void BackupGuiNConfig(Config config, bool auto = false)
         {
-            string fileName = $"guiNConfig_{DateTime.Now.ToString("yyyy_MM_dd_HH_mm_ss_fff")}.json";
+            string fileName = $"guiNConfig_{DateTime.Now:yyyy_MM_dd_HH_mm_ss_fff}.json";
             if (auto)
             {
                 fileName = Utils.GetBackupPath(fileName);
             }
             else
             {
-                SaveFileDialog fileDialog = new SaveFileDialog
+                SaveFileDialog fileDialog = new()
                 {
                     FileName = fileName,
                     Filter = "guiNConfig|*.json",
@@ -254,7 +248,7 @@ namespace v2rayN.Handler
         public bool RestoreGuiNConfig(ref Config config)
         {
             var fileContent = string.Empty;
-            using (OpenFileDialog fileDialog = new OpenFileDialog())
+            using (OpenFileDialog fileDialog = new())
             {
                 fileDialog.InitialDirectory = Utils.GetBackupPath("");
                 fileDialog.Filter = "guiNConfig|*.json|All|*.*";
@@ -286,7 +280,7 @@ namespace v2rayN.Handler
             BackupGuiNConfig(config, true);
 
             config = resConfig;
-            LazyConfig.Instance.SetConfig(ref config);
+            LazyConfig.Instance.SetConfig(config);
 
             return true;
         }
@@ -381,12 +375,12 @@ namespace v2rayN.Handler
                 try
                 {
                     HotkeyManager.Current.AddOrReplace(((int)item.eGlobalHotkey).ToString(), gesture, handler);
-                    var msg = string.Format(ResUI.RegisterGlobalHotkeySuccessfully, $"{item.eGlobalHotkey.ToString()}");
+                    var msg = string.Format(ResUI.RegisterGlobalHotkeySuccessfully, $"{item.eGlobalHotkey}");
                     update(false, msg);
                 }
                 catch (Exception ex)
                 {
-                    var msg = string.Format(ResUI.RegisterGlobalHotkeyFailed, $"{item.eGlobalHotkey.ToString()}", ex.Message);
+                    var msg = string.Format(ResUI.RegisterGlobalHotkeyFailed, $"{item.eGlobalHotkey}", ex.Message);
                     update(false, msg);
                     Utils.SaveLog(msg);
                 }

v2rayN/v2rayN/Handler/ProfileExHandler.cs

@@ -0,0 +1,144 @@
+using System.Collections.Concurrent;
+using System.Reactive.Linq;
+using v2rayN.Base;
+using v2rayN.Mode;
+
+namespace v2rayN.Handler
+{
+    class ProfileExHandler
+    {
+        private static readonly Lazy<ProfileExHandler> _instance = new(() => new());
+        private ConcurrentBag<ProfileExItem> _lstProfileEx;
+        private Queue<string> _queIndexIds = new();
+        public ConcurrentBag<ProfileExItem> ProfileExs => _lstProfileEx;
+        public static ProfileExHandler Instance => _instance.Value;
+
+        public ProfileExHandler()
+        {
+            Init();
+        }
+
+        private void Init()
+        {
+            SqliteHelper.Instance.Execute($"delete from ProfileExItem where indexId not in ( select indexId from ProfileItem )");
+
+            _lstProfileEx = new(SqliteHelper.Instance.Table<ProfileExItem>());
+
+            Task.Run(async () =>
+            {
+                while (true)
+                {
+                    var cnt = _queIndexIds.Count;
+                    for (int i = 0; i < cnt; i++)
+                    {
+                        var id = _queIndexIds.Dequeue();
+                        var item = _lstProfileEx.FirstOrDefault(t => t.indexId == id);
+                        if (item is not null)
+                        {
+                            await SqliteHelper.Instance.Replacesync(item);
+                        }
+                    }
+                    Thread.Sleep(1000 * 60);
+                }
+            });
+        }
+
+        private void IndexIdEnqueue(string indexId)
+        {
+            if (!Utils.IsNullOrEmpty(indexId) && !_queIndexIds.Contains(indexId))
+            {
+                _queIndexIds.Enqueue(indexId);
+            }
+        }
+
+        private void AddProfileEx(string indexId, ref ProfileExItem profileEx)
+        {
+            profileEx = new()
+            {
+                indexId = indexId,
+                delay = 0,
+                speed = 0,
+                sort = 0
+            };
+            _lstProfileEx.Add(profileEx);
+            IndexIdEnqueue(indexId);
+        }
+
+        public void ClearAll()
+        {
+            SqliteHelper.Instance.Execute($"delete from ProfileExItem ");
+            _lstProfileEx = new();
+        }
+
+        public void SaveTo()
+        {
+            try
+            {
+                //foreach (var item in _lstProfileEx)
+                //{
+                //    SqliteHelper.Instance.Replace(item);
+                //}
+                SqliteHelper.Instance.UpdateAll(_lstProfileEx);
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+            }
+        }
+
+        public void SetTestDelay(string indexId, string delayVal)
+        {
+            var profileEx = _lstProfileEx.FirstOrDefault(t => t.indexId == indexId);
+            if (profileEx == null)
+            {
+                AddProfileEx(indexId, ref profileEx);
+            }
+
+            int.TryParse(delayVal, out int delay);
+            profileEx.delay = delay;
+            IndexIdEnqueue(indexId);
+        }
+
+        public void SetTestSpeed(string indexId, string speedVal)
+        {
+            var profileEx = _lstProfileEx.FirstOrDefault(t => t.indexId == indexId);
+            if (profileEx == null)
+            {
+                AddProfileEx(indexId, ref profileEx);
+            }
+
+            decimal.TryParse(speedVal, out decimal speed);
+            profileEx.speed = speed;
+            IndexIdEnqueue(indexId);
+        }
+
+        public void SetSort(string indexId, int sort)
+        {
+            var profileEx = _lstProfileEx.FirstOrDefault(t => t.indexId == indexId);
+            if (profileEx == null)
+            {
+                AddProfileEx(indexId, ref profileEx);
+            }
+            profileEx.sort = sort;
+            IndexIdEnqueue(indexId);
+        }
+
+        public int GetSort(string indexId)
+        {
+            var profileEx = _lstProfileEx.FirstOrDefault(t => t.indexId == indexId);
+            if (profileEx == null)
+            {
+                return 0;
+            }
+            return profileEx.sort;
+        }
+        public int GetMaxSort()
+        {
+            if (_lstProfileEx.Count <= 0)
+            {
+                return 0;
+            }
+            return _lstProfileEx.Max(t => t == null ? 0 : t.sort);
+        }
+    }
+}

v2rayN/v2rayN/Handler/ProxySetting.cs

@@ -10,16 +10,16 @@ namespace v2rayN.Handler
             return SetProxy(null, null, 1);
         }
 
-        public static bool SetProxy(string strProxy, string exceptions, int type)
+        public static bool SetProxy(string? strProxy, string? exceptions, int type)
         {
-            InternetPerConnOptionList list = new InternetPerConnOptionList();
+            InternetPerConnOptionList list = new();
 
             int optionCount = 1;
             if (type == 1)
             {
                 optionCount = 1;
             }
-            else if (type == 2 || type == 4)
+            else if (type is 2 or 4)
             {
                 optionCount = Utils.IsNullOrEmpty(exceptions) ? 2 : 3;
             }
@@ -71,12 +71,12 @@ namespace v2rayN.Handler
             {
                 if (Environment.Is64BitOperatingSystem)
                 {
-                    IntPtr opt = new IntPtr(optionsPtr.ToInt64() + (i * optSize));
+                    IntPtr opt = new(optionsPtr.ToInt64() + (i * optSize));
                     Marshal.StructureToPtr(options[i], opt, false);
                 }
                 else
                 {
-                    IntPtr opt = new IntPtr(optionsPtr.ToInt32() + (i * optSize));
+                    IntPtr opt = new(optionsPtr.ToInt32() + (i * optSize));
                     Marshal.StructureToPtr(options[i], opt, false);
                 }
             }
@@ -84,7 +84,7 @@ namespace v2rayN.Handler
             list.options = optionsPtr;
 
             // and then make a pointer out of the whole list
-            IntPtr ipcoListPtr = Marshal.AllocCoTaskMem((int)list.dwSize);
+            IntPtr ipcoListPtr = Marshal.AllocCoTaskMem(list.dwSize);
             Marshal.StructureToPtr(list, ipcoListPtr, false);
 
             // and finally, call the API method!
@@ -189,24 +189,21 @@ namespace v2rayN.Handler
         //判断是否使用代理
         public static bool UsedProxy()
         {
-            RegistryKey rk = Registry.CurrentUser.OpenSubKey(@"Software\Microsoft\Windows\CurrentVersion\Internet Settings", true);
-            if (rk.GetValue("ProxyEnable").ToString() == "1")
+            using RegistryKey? rk = Registry.CurrentUser.OpenSubKey(@"Software\Microsoft\Windows\CurrentVersion\Internet Settings", true);
+            if (rk?.GetValue("ProxyEnable")?.ToString() == "1")
             {
-                rk.Close();
                 return true;
             }
             else
             {
-                rk.Close();
                 return false;
             }
         }
         //获得代理的IP和端口
-        public static string GetProxyProxyServer()
+        public static string? GetProxyProxyServer()
         {
-            RegistryKey rk = Registry.CurrentUser.OpenSubKey(@"Software\Microsoft\Windows\CurrentVersion\Internet Settings", true);
+            using RegistryKey? rk = Registry.CurrentUser.OpenSubKey(@"Software\Microsoft\Windows\CurrentVersion\Internet Settings", true);
             string ProxyServer = rk.GetValue("ProxyServer").ToString();
-            rk.Close();
             return ProxyServer;
 
         }

v2rayN/v2rayN/Handler/QRCodeHelper.cs

@@ -9,13 +9,13 @@ namespace v2rayN.Handler
     /// </summary>
     public class QRCodeHelper
     {
-        public static DrawingImage GetQRCode(string strContent)
+        public static DrawingImage? GetQRCode(string strContent)
         {
             try
             {
-                QRCodeGenerator qrGenerator = new QRCodeGenerator();
+                QRCodeGenerator qrGenerator = new();
                 QRCodeData qrCodeData = qrGenerator.CreateQrCode(strContent, QRCodeGenerator.ECCLevel.H);
-                XamlQRCode qrCode = new XamlQRCode(qrCodeData);
+                XamlQRCode qrCode = new(qrCodeData);
                 DrawingImage qrCodeAsXaml = qrCode.GetGraphic(40);
                 return qrCodeAsXaml;
             }

v2rayN/v2rayN/Handler/ShareHandler.cs

@@ -17,32 +17,22 @@ namespace v2rayN.Handler
         /// </summary>
         /// <param name="item"></param>
         /// <returns></returns>
-        public static string GetShareUrl(ProfileItem item)
+        public static string? GetShareUrl(ProfileItem item)
         {
             try
             {
-                string url = string.Empty;
+                string? url = string.Empty;
 
-                switch (item.configType)
+                url = item.configType switch
                 {
-                    case EConfigType.VMess:
-                        url = ShareVmess(item);
-                        break;
-                    case EConfigType.Shadowsocks:
-                        url = ShareShadowsocks(item);
-                        break;
-                    case EConfigType.Socks:
-                        url = ShareSocks(item);
-                        break;
-                    case EConfigType.Trojan:
-                        url = ShareTrojan(item);
-                        break;
-                    case EConfigType.VLESS:
-                        url = ShareVLESS(item);
-                        break;
-                    default:
-                        break;
-                }
+                    EConfigType.VMess => ShareVmess(item),
+                    EConfigType.Shadowsocks => ShareShadowsocks(item),
+                    EConfigType.Socks => ShareSocks(item),
+                    EConfigType.Trojan => ShareTrojan(item),
+                    EConfigType.VLESS => ShareVLESS(item),
+                    _ => null,
+                };
+
                 return url;
             }
             catch (Exception ex)
@@ -56,7 +46,7 @@ namespace v2rayN.Handler
         {
             string url = string.Empty;
 
-            VmessQRCode vmessQRCode = new VmessQRCode
+            VmessQRCode vmessQRCode = new()
             {
                 v = item.configVersion.ToString(),
                 ps = item.remarks.TrimEx(), //备注也许很长 ;
@@ -177,7 +167,7 @@ namespace v2rayN.Handler
             return Utils.IsIpv6(address) ? $"[{address}]" : address;
         }
 
-        private static int GetStdTransport(ProfileItem item, string securityDef, ref Dictionary<string, string> dicQuery)
+        private static int GetStdTransport(ProfileItem item, string? securityDef, ref Dictionary<string, string> dicQuery)
         {
             if (!Utils.IsNullOrEmpty(item.flow))
             {
@@ -260,7 +250,7 @@ namespace v2rayN.Handler
                     if (!Utils.IsNullOrEmpty(item.path))
                     {
                         dicQuery.Add("serviceName", Utils.UrlEncode(item.path));
-                        if (item.headerType == Global.GrpcgunMode || item.headerType == Global.GrpcmultiMode)
+                        if (item.headerType is Global.GrpcgunMode or Global.GrpcmultiMode)
                         {
                             dicQuery.Add("mode", Utils.UrlEncode(item.headerType));
                         }
@@ -278,13 +268,13 @@ namespace v2rayN.Handler
         /// <summary>
         /// 从剪贴板导入URL
         /// </summary>
-        /// <param name="fileName"></param>
         /// <param name="msg"></param>
         /// <returns></returns>
-        public static ProfileItem ImportFromClipboardConfig(string clipboardData, out string msg)
+        public static ProfileItem? ImportFromClipboardConfig(string clipboardData, out string msg)
         {
             msg = string.Empty;
-            ProfileItem profileItem = new ProfileItem();
+
+            ProfileItem profileItem = new();
 
             try
             {
@@ -368,7 +358,7 @@ namespace v2rayN.Handler
             return profileItem;
         }
 
-        private static ProfileItem ResolveVmess(string result, out string msg)
+        private static ProfileItem? ResolveVmess(string result, out string msg)
         {
             msg = string.Empty;
             var profileItem = new ProfileItem
@@ -376,11 +366,11 @@ namespace v2rayN.Handler
                 configType = EConfigType.VMess
             };
 
-            result = result.Substring(Global.vmessProtocol.Length);
+            result = result[Global.vmessProtocol.Length..];
             result = Utils.Base64Decode(result);
 
             //转成Json
-            VmessQRCode vmessQRCode = Utils.FromJson<VmessQRCode>(result);
+            VmessQRCode? vmessQRCode = Utils.FromJson<VmessQRCode>(result);
             if (vmessQRCode == null)
             {
                 msg = ResUI.FailedConversionConfiguration;
@@ -418,17 +408,17 @@ namespace v2rayN.Handler
             return profileItem;
         }
 
-        private static ProfileItem ResolveVmess4Kitsunebi(string result)
+        private static ProfileItem? ResolveVmess4Kitsunebi(string result)
         {
-            ProfileItem profileItem = new ProfileItem
+            ProfileItem profileItem = new()
             {
                 configType = EConfigType.VMess
             };
-            result = result.Substring(Global.vmessProtocol.Length);
+            result = result[Global.vmessProtocol.Length..];
             int indexSplit = result.IndexOf("?");
             if (indexSplit > 0)
             {
-                result = result.Substring(0, indexSplit);
+                result = result[..indexSplit];
             }
             result = Utils.Base64Decode(result);
 
@@ -439,7 +429,7 @@ namespace v2rayN.Handler
             }
             string[] arr21 = arr1[0].Split(':');
             string[] arr22 = arr1[1].Split(':');
-            if (arr21.Length != 2 || arr21.Length != 2)
+            if (arr21.Length != 2 || arr22.Length != 2)
             {
                 return null;
             }
@@ -456,15 +446,15 @@ namespace v2rayN.Handler
             return profileItem;
         }
 
-        private static ProfileItem ResolveStdVmess(string result)
+        private static ProfileItem? ResolveStdVmess(string result)
         {
-            ProfileItem i = new ProfileItem
+            ProfileItem i = new()
             {
                 configType = EConfigType.VMess,
                 security = "auto"
             };
 
-            Uri u = new Uri(result);
+            Uri u = new(result);
 
             i.address = u.IdnHost;
             i.port = u.Port;
@@ -537,7 +527,7 @@ namespace v2rayN.Handler
             return i;
         }
 
-        private static ProfileItem ResolveSip002(string result)
+        private static ProfileItem? ResolveSip002(string result)
         {
             Uri parsedUrl;
             try
@@ -548,7 +538,7 @@ namespace v2rayN.Handler
             {
                 return null;
             }
-            ProfileItem server = new ProfileItem
+            ProfileItem server = new()
             {
                 remarks = parsedUrl.GetComponents(UriComponents.Fragment, UriFormat.Unescaped),
                 address = parsedUrl.IdnHost,
@@ -556,7 +546,7 @@ namespace v2rayN.Handler
             };
             string rawUserInfo = parsedUrl.GetComponents(UriComponents.UserInfo, UriFormat.UriEscaped);
             //2022-blake3
-            if (rawUserInfo.Contains(":"))
+            if (rawUserInfo.Contains(':'))
             {
                 string[] userInfoParts = rawUserInfo.Split(new[] { ':' }, 2);
                 if (userInfoParts.Length != 2)
@@ -600,16 +590,16 @@ namespace v2rayN.Handler
             return server;
         }
 
-        private static readonly Regex UrlFinder = new Regex(@"ss://(?<base64>[A-Za-z0-9+-/=_]+)(?:#(?<tag>\S+))?", RegexOptions.IgnoreCase);
-        private static readonly Regex DetailsParser = new Regex(@"^((?<method>.+?):(?<password>.*)@(?<hostname>.+?):(?<port>\d+?))$", RegexOptions.IgnoreCase);
+        private static readonly Regex UrlFinder = new(@"ss://(?<base64>[A-Za-z0-9+-/=_]+)(?:#(?<tag>\S+))?", RegexOptions.IgnoreCase | RegexOptions.Compiled);
+        private static readonly Regex DetailsParser = new(@"^((?<method>.+?):(?<password>.*)@(?<hostname>.+?):(?<port>\d+?))$", RegexOptions.IgnoreCase | RegexOptions.Compiled);
 
-        private static ProfileItem ResolveSSLegacy(string result)
+        private static ProfileItem? ResolveSSLegacy(string result)
         {
             var match = UrlFinder.Match(result);
             if (!match.Success)
                 return null;
 
-            ProfileItem server = new ProfileItem();
+            ProfileItem server = new();
             var base64 = match.Groups["base64"].Value.TrimEnd('/');
             var tag = match.Groups["tag"].Value;
             if (!Utils.IsNullOrEmpty(tag))
@@ -635,16 +625,16 @@ namespace v2rayN.Handler
         }
 
 
-        private static readonly Regex StdVmessUserInfo = new Regex(
-            @"^(?<network>[a-z]+)(\+(?<streamSecurity>[a-z]+))?:(?<id>[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})$");
+        private static readonly Regex StdVmessUserInfo = new(
+            @"^(?<network>[a-z]+)(\+(?<streamSecurity>[a-z]+))?:(?<id>[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})$", RegexOptions.Compiled);
 
-        private static ProfileItem ResolveSocks(string result)
+        private static ProfileItem? ResolveSocks(string result)
         {
-            ProfileItem profileItem = new ProfileItem
+            ProfileItem profileItem = new()
             {
                 configType = EConfigType.Socks
             };
-            result = result.Substring(Global.socksProtocol.Length);
+            result = result[Global.socksProtocol.Length..];
             //remark
             int indexRemark = result.IndexOf("#");
             if (indexRemark > 0)
@@ -654,7 +644,7 @@ namespace v2rayN.Handler
                     profileItem.remarks = Utils.UrlDecode(result.Substring(indexRemark + 1, result.Length - indexRemark - 1));
                 }
                 catch { }
-                result = result.Substring(0, indexRemark);
+                result = result[..indexRemark];
             }
             //part decode
             int indexS = result.IndexOf("@");
@@ -678,15 +668,15 @@ namespace v2rayN.Handler
             {
                 return null;
             }
-            profileItem.address = arr1[1].Substring(0, indexPort);
-            profileItem.port = Utils.ToInt(arr1[1].Substring(indexPort + 1, arr1[1].Length - (indexPort + 1)));
+            profileItem.address = arr1[1][..indexPort];
+            profileItem.port = Utils.ToInt(arr1[1][(indexPort + 1)..]);
             profileItem.security = arr21[0];
             profileItem.id = arr21[1];
 
             return profileItem;
         }
 
-        private static ProfileItem ResolveSocksNew(string result)
+        private static ProfileItem? ResolveSocksNew(string result)
         {
             Uri parsedUrl;
             try
@@ -697,7 +687,7 @@ namespace v2rayN.Handler
             {
                 return null;
             }
-            ProfileItem server = new ProfileItem
+            ProfileItem server = new()
             {
                 remarks = parsedUrl.GetComponents(UriComponents.Fragment, UriFormat.Unescaped),
                 address = parsedUrl.IdnHost,
@@ -719,12 +709,12 @@ namespace v2rayN.Handler
 
         private static ProfileItem ResolveTrojan(string result)
         {
-            ProfileItem item = new ProfileItem
+            ProfileItem item = new()
             {
                 configType = EConfigType.Trojan
             };
 
-            Uri url = new Uri(result);
+            Uri url = new(result);
 
             item.address = url.IdnHost;
             item.port = url.Port;
@@ -738,13 +728,13 @@ namespace v2rayN.Handler
         }
         private static ProfileItem ResolveStdVLESS(string result)
         {
-            ProfileItem item = new ProfileItem
+            ProfileItem item = new()
             {
                 configType = EConfigType.VLESS,
                 security = "none"
             };
 
-            Uri url = new Uri(result);
+            Uri url = new(result);
 
             item.address = url.IdnHost;
             item.port = url.Port;

v2rayN/v2rayN/Handler/SpeedtestHandler.cs

@@ -55,12 +55,16 @@ namespace v2rayN.Handler
                     case ESpeedActionType.Tcping:
                     case ESpeedActionType.Realping:
                         UpdateFunc(it.indexId, ResUI.Speedtesting, "");
+                        ProfileExHandler.Instance.SetTestDelay(it.indexId, "0");
                         break;
                     case ESpeedActionType.Speedtest:
                         UpdateFunc(it.indexId, "", ResUI.Speedtesting);
+                        ProfileExHandler.Instance.SetTestSpeed(it.indexId, "0");
                         break;
                     case ESpeedActionType.Mixedtest:
                         UpdateFunc(it.indexId, ResUI.Speedtesting, ResUI.Speedtesting);
+                        ProfileExHandler.Instance.SetTestDelay(it.indexId, "0");
+                        ProfileExHandler.Instance.SetTestSpeed(it.indexId, "0");
                         break;
                 }
             }
@@ -117,7 +121,7 @@ namespace v2rayN.Handler
                 long time = Ping(it.address);
                 var output = FormatOut(time, Global.DelayUnit);
 
-                LazyConfig.Instance.SetTestResult(it.indexId, output, "");
+                ProfileExHandler.Instance.SetTestDelay(it.indexId, output);
                 UpdateFunc(it.indexId, output);
             });
         }
@@ -129,7 +133,7 @@ namespace v2rayN.Handler
                 int time = GetTcpingTime(it.address, it.port);
                 var output = FormatOut(time, Global.DelayUnit);
 
-                LazyConfig.Instance.SetTestResult(it.indexId, output, "");
+                ProfileExHandler.Instance.SetTestDelay(it.indexId, output);
                 UpdateFunc(it.indexId, output);
             });
         }
@@ -150,7 +154,7 @@ namespace v2rayN.Handler
 
                 DownloadHandle downloadHandle = new DownloadHandle();
                 //Thread.Sleep(5000);
-                List<Task> tasks = new List<Task>();
+                List<Task> tasks = new();
                 foreach (var it in _selecteds)
                 {
                     if (!it.allowTest)
@@ -165,12 +169,11 @@ namespace v2rayN.Handler
                     {
                         try
                         {
-                            LazyConfig.Instance.SetTestResult(it.indexId, "-1", "");
 
-                            WebProxy webProxy = new WebProxy(Global.Loopback, it.port);
+                            WebProxy webProxy = new(Global.Loopback, it.port);
                             string output = GetRealPingTime(downloadHandle, webProxy);
 
-                            LazyConfig.Instance.SetTestResult(it.indexId, output, "");
+                            ProfileExHandler.Instance.SetTestDelay(it.indexId, output);
                             UpdateFunc(it.indexId, output);
                             int.TryParse(output, out int delay);
                             it.delay = delay;
@@ -191,6 +194,7 @@ namespace v2rayN.Handler
             finally
             {
                 if (pid > 0) _coreHandler.CoreStopPid(pid);
+                ProfileExHandler.Instance.SaveTo();
             }
 
             return Task.CompletedTask;
@@ -214,7 +218,7 @@ namespace v2rayN.Handler
             string url = _config.speedTestItem.speedTestUrl;
             var timeout = _config.speedTestItem.speedTestTimeout;
 
-            DownloadHandle downloadHandle = new DownloadHandle();
+            DownloadHandle downloadHandle = new();
 
             foreach (var it in _selecteds)
             {
@@ -231,19 +235,19 @@ namespace v2rayN.Handler
                 //    UpdateFunc(it.indexId, "", ResUI.SpeedtestingSkip);
                 //    continue;
                 //}
-                _ = LazyConfig.Instance.SetTestResult(it.indexId, "", "-1");
+                ProfileExHandler.Instance.SetTestSpeed(it.indexId, "-1");
 
                 var item = LazyConfig.Instance.GetProfileItem(it.indexId);
                 if (item is null) continue;
 
-                WebProxy webProxy = new WebProxy(Global.Loopback, it.port);
+                WebProxy webProxy = new(Global.Loopback, it.port);
 
-                await downloadHandle.DownloadDataAsync(url, webProxy, timeout, (bool success, string msg) =>
+                await downloadHandle.DownloadDataAsync(url, webProxy, timeout, async (bool success, string msg) =>
                 {
                     decimal.TryParse(msg, out decimal dec);
                     if (dec > 0)
                     {
-                        _ = LazyConfig.Instance.SetTestResult(it.indexId, "", msg);
+                        ProfileExHandler.Instance.SetTestSpeed(it.indexId, msg);
                     }
                     UpdateFunc(it.indexId, "", msg);
                 });
@@ -254,6 +258,7 @@ namespace v2rayN.Handler
                 _coreHandler.CoreStopPid(pid);
             }
             UpdateFunc("", ResUI.SpeedtestingCompleted);
+            ProfileExHandler.Instance.SaveTo();
         }
 
         private async Task RunSpeedTestMulti()
@@ -269,7 +274,7 @@ namespace v2rayN.Handler
             string url = _config.speedTestItem.speedTestUrl;
             var timeout = _config.speedTestItem.speedTestTimeout;
 
-            DownloadHandle downloadHandle = new DownloadHandle();
+            DownloadHandle downloadHandle = new();
 
             foreach (var it in _selecteds)
             {
@@ -281,18 +286,18 @@ namespace v2rayN.Handler
                 {
                     continue;
                 }
-                _ = LazyConfig.Instance.SetTestResult(it.indexId, "", "-1");
+                ProfileExHandler.Instance.SetTestSpeed(it.indexId, "-1");
 
                 var item = LazyConfig.Instance.GetProfileItem(it.indexId);
                 if (item is null) continue;
 
-                WebProxy webProxy = new WebProxy(Global.Loopback, it.port);
-                _ = downloadHandle.DownloadDataAsync(url, webProxy, timeout, (bool success, string msg) =>
+                WebProxy webProxy = new(Global.Loopback, it.port);
+                _ = downloadHandle.DownloadDataAsync(url, webProxy, timeout, async (bool success, string msg) =>
                 {
                     decimal.TryParse(msg, out decimal dec);
                     if (dec > 0)
                     {
-                        _ = LazyConfig.Instance.SetTestResult(it.indexId, "", msg);
+                        ProfileExHandler.Instance.SetTestSpeed(it.indexId, msg);
                     }
                     UpdateFunc(it.indexId, "", msg);
                 });
@@ -306,6 +311,7 @@ namespace v2rayN.Handler
                 _coreHandler.CoreStopPid(pid);
             }
             UpdateFunc("", ResUI.SpeedtestingCompleted);
+            ProfileExHandler.Instance.SaveTo();
         }
 
         private async Task RunMixedtestAsync()
@@ -317,7 +323,7 @@ namespace v2rayN.Handler
             await RunSpeedTestMulti();
         }
 
-        public string GetRealPingTime(DownloadHandle downloadHandle, WebProxy webProxy)
+        public string GetRealPingTime(DownloadHandle downloadHandle, IWebProxy webProxy)
         {
             string status = downloadHandle.GetRealPingTime(_config.speedTestItem.speedPingTestUrl, webProxy, 10, out int responseTime);
             //string output = Utils.IsNullOrEmpty(status) ? FormatOut(responseTime, "ms") : status;
@@ -336,11 +342,11 @@ namespace v2rayN.Handler
                     ipAddress = ipHostInfo.AddressList[0];
                 }
 
-                Stopwatch timer = new Stopwatch();
+                Stopwatch timer = new();
                 timer.Start();
 
-                IPEndPoint endPoint = new IPEndPoint(ipAddress, port);
-                Socket clientSocket = new Socket(endPoint.AddressFamily, SocketType.Stream, ProtocolType.Tcp);
+                IPEndPoint endPoint = new(ipAddress, port);
+                using Socket clientSocket = new(endPoint.AddressFamily, SocketType.Stream, ProtocolType.Tcp);
 
                 IAsyncResult result = clientSocket.BeginConnect(endPoint, null, null);
                 if (!result.AsyncWaitHandle.WaitOne(TimeSpan.FromSeconds(5)))
@@ -349,7 +355,6 @@ namespace v2rayN.Handler
 
                 timer.Stop();
                 responseTime = timer.Elapsed.Milliseconds;
-                clientSocket.Close();
             }
             catch (Exception ex)
             {
@@ -371,7 +376,7 @@ namespace v2rayN.Handler
             {
                 int timeout = 30;
                 int echoNum = 2;
-                Ping pingSender = new Ping();
+                using Ping pingSender = new();
                 for (int i = 0; i < echoNum; i++)
                 {
                     PingReply reply = pingSender.Send(host, timeout);

v2rayN/v2rayN/Handler/StatisticsHandler.cs

@@ -13,7 +13,7 @@ namespace v2rayN.Handler
         private Channel channel_;
         private StatsService.StatsServiceClient client_;
         private bool exitFlag_;
-        private ServerStatItem _serverStatItem;
+        private ServerStatItem? _serverStatItem;
         private List<ServerStatItem> _lstServerStat;
         public List<ServerStatItem> ServerStat => _lstServerStat;
 
@@ -70,7 +70,7 @@ namespace v2rayN.Handler
                 {
                     if (Enable && channel_.State == ChannelState.Ready)
                     {
-                        QueryStatsResponse res = null;
+                        QueryStatsResponse? res = null;
                         try
                         {
                             res = client_.QueryStats(new QueryStatsRequest() { Pattern = "", Reset = true });
@@ -229,7 +229,7 @@ namespace v2rayN.Handler
             try
             {
                 // TCP stack please do me a favor
-                TcpListener l = new TcpListener(IPAddress.Loopback, 0);
+                TcpListener l = new(IPAddress.Loopback, 0);
                 l.Start();
                 int port = ((IPEndPoint)l.LocalEndpoint).Port;
                 l.Stop();

v2rayN/v2rayN/Handler/SysProxyHandle.cs

@@ -20,7 +20,7 @@ namespace v2rayN.Handler
         //  <proxy-server><CR-LF>
         //  <bypass-list><CR-LF>
         //  <pac-url>
-        private static SysproxyConfig _userSettings = null;
+        private static SysproxyConfig? _userSettings = null;
 
         enum RET_ERRORS : int
         {
@@ -50,7 +50,7 @@ namespace v2rayN.Handler
         {
             var type = config.sysProxyType;
 
-            if (forceDisable && type == ESysProxyType.ForcedChange)
+            if (forceDisable && type != ESysProxyType.Unchanged)
             {
                 type = ESysProxyType.ForcedClear;
             }
@@ -154,85 +154,82 @@ namespace v2rayN.Handler
             // using event to avoid hanging when redirect standard output/error
             // ref: https://stackoverflow.com/questions/139593/processstartinfo-hanging-on-waitforexit-why
             // and http://blog.csdn.net/zhangweixing0/article/details/7356841
-            using (AutoResetEvent outputWaitHandle = new AutoResetEvent(false))
-            using (AutoResetEvent errorWaitHandle = new AutoResetEvent(false))
+            using AutoResetEvent outputWaitHandle = new(false);
+            using AutoResetEvent errorWaitHandle = new(false);
+            using Process process = new();
+
+            // Configure the process using the StartInfo properties.
+            process.StartInfo.FileName = Utils.GetTempPath("sysproxy.exe");
+            process.StartInfo.Arguments = arguments;
+            process.StartInfo.WorkingDirectory = Utils.GetTempPath();
+            process.StartInfo.WindowStyle = ProcessWindowStyle.Hidden;
+            process.StartInfo.UseShellExecute = false;
+            process.StartInfo.RedirectStandardError = true;
+            process.StartInfo.RedirectStandardOutput = true;
+
+            // Need to provide encoding info, or output/error strings we got will be wrong.
+            process.StartInfo.StandardOutputEncoding = Encoding.Unicode;
+            process.StartInfo.StandardErrorEncoding = Encoding.Unicode;
+
+            process.StartInfo.CreateNoWindow = true;
+
+            StringBuilder output = new(1024);
+            StringBuilder error = new(1024);
+
+            process.OutputDataReceived += (sender, e) =>
             {
-                using (Process process = new Process())
+                if (e.Data == null)
                 {
-                    // Configure the process using the StartInfo properties.
-                    process.StartInfo.FileName = Utils.GetTempPath("sysproxy.exe");
-                    process.StartInfo.Arguments = arguments;
-                    process.StartInfo.WorkingDirectory = Utils.GetTempPath();
-                    process.StartInfo.WindowStyle = ProcessWindowStyle.Hidden;
-                    process.StartInfo.UseShellExecute = false;
-                    process.StartInfo.RedirectStandardError = true;
-                    process.StartInfo.RedirectStandardOutput = true;
-
-                    // Need to provide encoding info, or output/error strings we got will be wrong.
-                    process.StartInfo.StandardOutputEncoding = Encoding.Unicode;
-                    process.StartInfo.StandardErrorEncoding = Encoding.Unicode;
-
-                    process.StartInfo.CreateNoWindow = true;
-
-                    StringBuilder output = new StringBuilder();
-                    StringBuilder error = new StringBuilder();
-
-                    process.OutputDataReceived += (sender, e) =>
-                    {
-                        if (e.Data == null)
-                        {
-                            outputWaitHandle.Set();
-                        }
-                        else
-                        {
-                            output.AppendLine(e.Data);
-                        }
-                    };
-                    process.ErrorDataReceived += (sender, e) =>
-                    {
-                        if (e.Data == null)
-                        {
-                            errorWaitHandle.Set();
-                        }
-                        else
-                        {
-                            error.AppendLine(e.Data);
-                        }
-                    };
-                    try
-                    {
-                        process.Start();
-
-                        process.BeginErrorReadLine();
-                        process.BeginOutputReadLine();
-
-                        process.WaitForExit();
-                    }
-                    catch (System.ComponentModel.Win32Exception e)
-                    {
-
-                        // log the arguments
-                        throw new Exception(process.StartInfo.Arguments);
-                    }
-                    string stderr = error.ToString();
-                    string stdout = output.ToString();
-
-                    int exitCode = process.ExitCode;
-                    if (exitCode != (int)RET_ERRORS.RET_NO_ERROR)
-                    {
-                        throw new Exception(stderr);
-                    }
-
-                    //if (arguments == "query")
-                    //{
-                    //    if (stdout.IsNullOrWhiteSpace() || stdout.IsNullOrEmpty())
-                    //    {
-                    //        throw new Exception("failed to query wininet settings");
-                    //    }
-                    //    _queryStr = stdout;
-                    //}
+                    outputWaitHandle.Set();
                 }
+                else
+                {
+                    output.AppendLine(e.Data);
+                }
+            };
+            process.ErrorDataReceived += (sender, e) =>
+            {
+                if (e.Data == null)
+                {
+                    errorWaitHandle.Set();
+                }
+                else
+                {
+                    error.AppendLine(e.Data);
+                }
+            };
+            try
+            {
+                process.Start();
+
+                process.BeginErrorReadLine();
+                process.BeginOutputReadLine();
+
+                process.WaitForExit();
             }
+            catch (System.ComponentModel.Win32Exception e)
+            {
+
+                // log the arguments
+                throw new Exception(process.StartInfo.Arguments);
+            }
+            string stderr = error.ToString();
+            string stdout = output.ToString();
+
+            int exitCode = process.ExitCode;
+            if (exitCode != (int)RET_ERRORS.RET_NO_ERROR)
+            {
+                throw new Exception(stderr);
+            }
+
+            //if (arguments == "query")
+            //{
+            //    if (stdout.IsNullOrWhiteSpace() || stdout.IsNullOrEmpty())
+            //    {
+            //        throw new Exception("failed to query wininet settings");
+            //    }
+            //    _queryStr = stdout;
+            //}
         }
 
 

v2rayN/v2rayN/Handler/TunHandler.cs

@@ -3,17 +3,18 @@ using System.IO;
 using System.Reactive.Linq;
 using v2rayN.Handler;
 using v2rayN.Mode;
+using v2rayN.Resx;
 
 namespace v2rayN.Base
 {
     public sealed class TunHandler
     {
-        private static readonly Lazy<TunHandler> _instance = new Lazy<TunHandler>(() => new());
+        private static readonly Lazy<TunHandler> _instance = new(() => new());
         public static TunHandler Instance => _instance.Value;
         private string _tunConfigName = "tunConfig.json";
         private static Config _config;
         private CoreInfo coreInfo;
-        private Process _process;
+        private Process? _process;
         private static int _socksPort;
         private static bool _needRestart = true;
         private static bool _isRunning = false;
@@ -44,7 +45,7 @@ namespace v2rayN.Base
         {
             var socksPort = LazyConfig.Instance.GetLocalPort(Global.InboundSocks);
 
-            if (socksPort.Equals(_socksPort)
+            if (socksPort == _socksPort
                 && _process != null
                 && !_process.HasExited)
             {
@@ -60,6 +61,7 @@ namespace v2rayN.Base
                 {
                     return;
                 }
+                CoreStartTest();
                 CoreStart();
             }
         }
@@ -101,6 +103,7 @@ namespace v2rayN.Base
             configStr = configStr.Replace("$stack$", $"{_config.tunModeItem.stack}");
 
             //logs
+            configStr = configStr.Replace("$log_disabled$", $"{(!_config.tunModeItem.enabledLog).ToString().ToLower()}");
             if (_config.tunModeItem.showWindow)
             {
                 configStr = configStr.Replace("$log_output$", $"");
@@ -108,16 +111,32 @@ namespace v2rayN.Base
             else
             {
                 var dtNow = DateTime.Now;
-                var log_output = $"\"output\": \"{Utils.GetLogPath($"singbox_{dtNow.ToString("yyyy-MM-dd")}.txt")}\", ";
+                var log_output = $"\"output\": \"{Utils.GetLogPath($"singbox_{dtNow:yyyy-MM-dd}.txt")}\", ";
                 configStr = configStr.Replace("$log_output$", $"{log_output.Replace(@"\", @"\\")}");
             }
 
             //port
             configStr = configStr.Replace("$socksPort$", $"{_socksPort}");
 
+            //dns
+            string dnsObject = String.Empty;
+            if (_config.tunModeItem.bypassMode)
+            {
+                dnsObject = _config.tunModeItem.directDNS;
+            }
+            else
+            {
+                dnsObject = _config.tunModeItem.proxyDNS;
+            }
+            if (dnsObject.IsNullOrEmpty() || Utils.ParseJson(dnsObject)?.ContainsKey("servers") == false)
+            {
+                dnsObject = Utils.GetEmbedText(Global.TunSingboxDNSFileName);
+            }
+            configStr = configStr.Replace("$dns_object$", dnsObject);
+
             //exe
-            List<string> lstDnsExe = new List<string>();
-            List<string> lstDirectExe = new List<string>();
+            List<string> lstDnsExe = new();
+            List<string> lstDirectExe = new();
             var coreInfos = LazyConfig.Instance.GetCoreInfos();
             foreach (var it in coreInfos)
             {
@@ -225,7 +244,8 @@ namespace v2rayN.Base
             }
             if (Utils.IsNullOrEmpty(fileName))
             {
-
+                string msg = string.Format(ResUI.NotFoundCore, Utils.GetBinPath("", coreInfo.coreType), string.Join(", ", coreInfo.coreExes.ToArray()), coreInfo.coreUrl);
+                Utils.SaveLog(msg);
             }
             return fileName;
         }
@@ -235,12 +255,12 @@ namespace v2rayN.Base
             try
             {
                 string fileName = CoreFindexe();
-                if (fileName == "")
+                if (Utils.IsNullOrEmpty(fileName))
                 {
                     return;
                 }
                 var showWindow = _config.tunModeItem.showWindow;
-                Process p = new Process
+                Process p = new()
                 {
                     StartInfo = new ProcessStartInfo
                     {
@@ -293,5 +313,47 @@ namespace v2rayN.Base
                 Utils.SaveLog(ex.Message, ex);
             }
         }
+
+        private int CoreStartTest()
+        {
+            Utils.SaveLog("Tun mode configuration file test start");
+            try
+            {
+                string fileName = CoreFindexe();
+                if (fileName == "")
+                {
+                    return -1;
+                }
+                Process p = new Process
+                {
+                    StartInfo = new ProcessStartInfo
+                    {
+                        FileName = fileName,
+                        Arguments = $"run -c \"{Utils.GetConfigPath(_tunConfigName)}\"",
+                        WorkingDirectory = Utils.GetConfigPath(),
+                        UseShellExecute = false,
+                        CreateNoWindow = true,
+                        RedirectStandardError = true,
+                        Verb = "runas",
+                    }
+                };
+                p.Start();
+                if (p.WaitForExit(2000))
+                {
+                    throw new Exception(p.StandardError.ReadToEnd());
+                }
+                KillProcess(p);
+                return 0;
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+                return -1;
+            }
+            finally
+            {
+                Utils.SaveLog("Tun mode configuration file test end");
+            }
+        }
     }
 }

v2rayN/v2rayN/Handler/UpdateHandle.cs

@@ -35,51 +35,46 @@ namespace v2rayN.Handler
             _updateFunc = update;
             var url = string.Empty;
 
-            DownloadHandle downloadHandle = null;
-            if (downloadHandle == null)
+            DownloadHandle downloadHandle = new();
+            downloadHandle.UpdateCompleted += (sender2, args) =>
             {
-                downloadHandle = new DownloadHandle();
-
-                downloadHandle.UpdateCompleted += (sender2, args) =>
+                if (args.Success)
                 {
-                    if (args.Success)
-                    {
-                        _updateFunc(false, ResUI.MsgDownloadV2rayCoreSuccessfully);
+                    _updateFunc(false, ResUI.MsgDownloadV2rayCoreSuccessfully);
 
-                        try
+                    try
+                    {
+                        string fileName = Utils.GetTempPath(Utils.GetDownloadFileName(url));
+                        fileName = Utils.UrlEncode(fileName);
+                        Process process = new()
                         {
-                            string fileName = Utils.GetTempPath(Utils.GetDownloadFileName(url));
-                            fileName = Utils.UrlEncode(fileName);
-                            Process process = new Process
+                            StartInfo = new ProcessStartInfo
                             {
-                                StartInfo = new ProcessStartInfo
-                                {
-                                    FileName = "v2rayUpgrade.exe",
-                                    Arguments = $"\"{fileName}\"",
-                                    WorkingDirectory = Utils.StartupPath()
-                                }
-                            };
-                            process.Start();
-                            if (process.Id > 0)
-                            {
-                                _updateFunc(true, "");
+                                FileName = "v2rayUpgrade.exe",
+                                Arguments = $"\"{fileName}\"",
+                                WorkingDirectory = Utils.StartupPath()
                             }
-                        }
-                        catch (Exception ex)
+                        };
+                        process.Start();
+                        if (process.Id > 0)
                         {
-                            _updateFunc(false, ex.Message);
+                            _updateFunc(true, "");
                         }
                     }
-                    else
+                    catch (Exception ex)
                     {
-                        _updateFunc(false, args.Msg);
+                        _updateFunc(false, ex.Message);
                     }
-                };
-                downloadHandle.Error += (sender2, args) =>
+                }
+                else
                 {
-                    _updateFunc(false, args.GetException().Message);
-                };
-            }
+                    _updateFunc(false, args.Msg);
+                }
+            };
+            downloadHandle.Error += (sender2, args) =>
+            {
+                _updateFunc(false, args.GetException().Message);
+            };
             AbsoluteCompleted += (sender2, args) =>
             {
                 if (args.Success)
@@ -106,36 +101,32 @@ namespace v2rayN.Handler
             _updateFunc = update;
             var url = string.Empty;
 
-            DownloadHandle downloadHandle = null;
-            if (downloadHandle == null)
+            DownloadHandle downloadHandle = new();
+            downloadHandle.UpdateCompleted += (sender2, args) =>
             {
-                downloadHandle = new DownloadHandle();
-                downloadHandle.UpdateCompleted += (sender2, args) =>
+                if (args.Success)
                 {
-                    if (args.Success)
-                    {
-                        _updateFunc(false, ResUI.MsgDownloadV2rayCoreSuccessfully);
-                        _updateFunc(false, ResUI.MsgUnpacking);
+                    _updateFunc(false, ResUI.MsgDownloadV2rayCoreSuccessfully);
+                    _updateFunc(false, ResUI.MsgUnpacking);
 
-                        try
-                        {
-                            _updateFunc(true, url);
-                        }
-                        catch (Exception ex)
-                        {
-                            _updateFunc(false, ex.Message);
-                        }
-                    }
-                    else
+                    try
                     {
-                        _updateFunc(false, args.Msg);
+                        _updateFunc(true, url);
                     }
-                };
-                downloadHandle.Error += (sender2, args) =>
+                    catch (Exception ex)
+                    {
+                        _updateFunc(false, ex.Message);
+                    }
+                }
+                else
                 {
-                    _updateFunc(true, args.GetException().Message);
-                };
-            }
+                    _updateFunc(false, args.Msg);
+                }
+            };
+            downloadHandle.Error += (sender2, args) =>
+            {
+                _updateFunc(true, args.GetException().Message);
+            };
 
             AbsoluteCompleted += (sender2, args) =>
             {
@@ -226,7 +217,7 @@ namespace v2rayN.Handler
                     else
                     {
                         _updateFunc(false, $"{hashCode}{ResUI.MsgGetSubscriptionSuccessfully}");
-                        if (result.Length < 99)
+                        if (result!.Length < 99)
                         {
                             _updateFunc(false, $"{hashCode}{result}");
                         }
@@ -262,49 +253,44 @@ namespace v2rayN.Handler
             _updateFunc = update;
             var url = string.Format(Global.geoUrl, geoName);
 
-            DownloadHandle downloadHandle = null;
-            if (downloadHandle == null)
+            DownloadHandle downloadHandle = new();
+            downloadHandle.UpdateCompleted += (sender2, args) =>
             {
-                downloadHandle = new DownloadHandle();
-
-                downloadHandle.UpdateCompleted += (sender2, args) =>
+                if (args.Success)
                 {
-                    if (args.Success)
+                    _updateFunc(false, string.Format(ResUI.MsgDownloadGeoFileSuccessfully, geoName));
+
+                    try
                     {
-                        _updateFunc(false, string.Format(ResUI.MsgDownloadGeoFileSuccessfully, geoName));
-
-                        try
+                        string fileName = Utils.GetTempPath(Utils.GetDownloadFileName(url));
+                        if (File.Exists(fileName))
                         {
-                            string fileName = Utils.GetTempPath(Utils.GetDownloadFileName(url));
-                            if (File.Exists(fileName))
-                            {
-                                //Global.coreTypes.ForEach(it =>
-                                //{
-                                //    string targetPath = Utils.GetBinPath($"{geoName}.dat", (ECoreType)Enum.Parse(typeof(ECoreType), it));
-                                //    File.Copy(fileName, targetPath, true);
-                                //});
-                                string targetPath = Utils.GetBinPath($"{geoName}.dat");
-                                File.Copy(fileName, targetPath, true);
+                            //Global.coreTypes.ForEach(it =>
+                            //{
+                            //    string targetPath = Utils.GetBinPath($"{geoName}.dat", (ECoreType)Enum.Parse(typeof(ECoreType), it));
+                            //    File.Copy(fileName, targetPath, true);
+                            //});
+                            string targetPath = Utils.GetBinPath($"{geoName}.dat");
+                            File.Copy(fileName, targetPath, true);
 
-                                File.Delete(fileName);
-                                //_updateFunc(true, "");
-                            }
-                        }
-                        catch (Exception ex)
-                        {
-                            _updateFunc(false, ex.Message);
+                            File.Delete(fileName);
+                            //_updateFunc(true, "");
                         }
                     }
-                    else
+                    catch (Exception ex)
                     {
-                        _updateFunc(false, args.Msg);
+                        _updateFunc(false, ex.Message);
                     }
-                };
-                downloadHandle.Error += (sender2, args) =>
+                }
+                else
                 {
-                    _updateFunc(false, args.GetException().Message);
-                };
-            }
+                    _updateFunc(false, args.Msg);
+                }
+            };
+            downloadHandle.Error += (sender2, args) =>
+            {
+                _updateFunc(false, args.GetException().Message);
+            };
             askToDownload(downloadHandle, url, false);
 
         }
@@ -374,7 +360,7 @@ namespace v2rayN.Handler
                     return "";
                 }
 
-                Process p = new Process();
+                using Process p = new();
                 p.StartInfo.FileName = filePath;
                 p.StartInfo.Arguments = coreInfo.versionArg;
                 p.StartInfo.WorkingDirectory = Utils.StartupPath();

v2rayN/v2rayN/Mode/Config.cs

@@ -9,6 +9,7 @@
         #region property
 
         public string indexId { get; set; }
+        public string subIndexId { get; set; }
 
         public string remoteDNS { get; set; }
         /// <summary>

v2rayN/v2rayN/Mode/ConfigItems.cs

@@ -123,7 +123,8 @@ namespace v2rayN.Mode
         public bool doubleClick2Activate { get; set; }
         public bool autoHideStartup { get; set; } = true;
         public string mainMsgFilter { get; set; }
-        public Dictionary<string, int> mainLvColWidth { get; set; }
+        public List<ColumnItem> mainColumnItem { get; set; }
+
     }
 
     [Serializable]
@@ -160,6 +161,7 @@ namespace v2rayN.Mode
     {
         public bool enableTun { get; set; }
         public bool showWindow { get; set; }
+        public bool enabledLog { get; set; }
         public bool strictRoute { get; set; }
         public string stack { get; set; }
         public int mtu { get; set; }
@@ -167,8 +169,10 @@ namespace v2rayN.Mode
         public bool bypassMode { get; set; } = true;
         public List<string> directIP { get; set; }
         public List<string> directProcess { get; set; }
+        public string directDNS { get; set; }
         public List<string> proxyIP { get; set; }
         public List<string> proxyProcess { get; set; }
+        public string proxyDNS { get; set; }
 
     }
 
@@ -192,4 +196,12 @@ namespace v2rayN.Mode
         public string routingIndexId { get; set; }
         public bool enableRoutingAdvanced { get; set; }
     }
+
+    [Serializable]
+    public class ColumnItem
+    {
+        public string Name { get; set; }
+        public int Width { get; set; }
+        public int Index { get; set; }
+    }
 }

v2rayN/v2rayN/Mode/EServerColName.cs

@@ -12,8 +12,8 @@ namespace v2rayN.Mode
         network,
         streamSecurity,
         subRemarks,
-        delay,
-        speed,
+        delayVal,
+        speedVal,
 
         todayDown,
         todayUp,

v2rayN/v2rayN/Mode/ProfileExItem.cs

@@ -0,0 +1,14 @@
+using SQLite;
+
+namespace v2rayN.Mode
+{
+    [Serializable]
+    public class ProfileExItem
+    {
+        [PrimaryKey]
+        public string indexId { get; set; }
+        public int delay { get; set; }
+        public decimal speed { get; set; }
+        public int sort { get; set; }
+    }
+}

v2rayN/v2rayN/Mode/ProfileItem.cs

@@ -11,7 +11,6 @@ namespace v2rayN.Mode
             indexId = string.Empty;
             configType = EConfigType.VMess;
             configVersion = 2;
-            sort = 0;
             address = string.Empty;
             port = 0;
             id = string.Empty;
@@ -107,11 +106,6 @@ namespace v2rayN.Mode
             get; set;
         }
 
-        public int sort
-        {
-            get; set;
-        }
-
         /// <summary>
         /// 远程服务器地址
         /// </summary>
@@ -202,9 +196,6 @@ namespace v2rayN.Mode
             get; set;
         }
 
-        public int delay { get; set; }
-        public decimal speed { get; set; }
-
         /// <summary>
         /// SubItem id
         /// </summary>

v2rayN/v2rayN/Mode/ProfileItemModel.cs

@@ -5,6 +5,9 @@
     {
         public bool isActive { get; set; }
         public string subRemarks { get; set; }
+        public int delay { get; set; }
+        public decimal speed { get; set; }
+        public int sort { get; set; }
         public string delayVal { get; set; }
         public string speedVal { get; set; }
         public string todayUp { get; set; }

v2rayN/v2rayN/Resx/ResUI.Designer.cs

@@ -816,6 +816,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Move up and down 的本地化字符串。
+        /// </summary>
+        public static string menuMoveTo {
+            get {
+                return ResourceManager.GetString("menuMoveTo", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Move to group 的本地化字符串。
         /// </summary>
@@ -2564,7 +2573,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Record local logs 的本地化字符串。
+        ///   查找类似 Enable Log 的本地化字符串。
         /// </summary>
         public static string TbSettingsLogEnabled {
             get {
@@ -2833,6 +2842,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 DNS object, e.g. {&quot;servers&quot;:[]} 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsTunModeDNS {
+            get {
+                return ResourceManager.GetString("TbSettingsTunModeDNS", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Proxy IP CIDR, separated by commas (,) 的本地化字符串。
         /// </summary>
@@ -3068,7 +3086,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 *QUIC securty 的本地化字符串。
+        ///   查找类似 *QUIC security 的本地化字符串。
         /// </summary>
         public static string TransportRequestHostTip4 {
             get {

v2rayN/v2rayN/Resx/ResUI.resx

@@ -419,7 +419,7 @@
     <value>*h2 host Separated by commas (,)</value>
   </data>
   <data name="TransportRequestHostTip4" xml:space="preserve">
-    <value>*QUIC securty</value>
+    <value>*QUIC security</value>
   </data>
   <data name="TransportHeaderTypeTip1" xml:space="preserve">
     <value>*tcp camouflage type</value>
@@ -815,7 +815,7 @@
     <value>Keep older when deduplication</value>
   </data>
   <data name="TbSettingsLogEnabled" xml:space="preserve">
-    <value>Record local logs</value>
+    <value>Enable Log</value>
   </data>
   <data name="TbSettingsLogLevel" xml:space="preserve">
     <value>Log Level</value>
@@ -1126,4 +1126,10 @@
   <data name="TbSettingsSpeedTestUrl" xml:space="preserve">
     <value>SpeedTest Url</value>
   </data>
+  <data name="TbSettingsTunModeDNS" xml:space="preserve">
+    <value>DNS object, e.g. {"servers":[]}</value>
+  </data>
+  <data name="menuMoveTo" xml:space="preserve">
+    <value>Move up and down</value>
+  </data>
 </root>

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

@@ -130,7 +130,7 @@
     <value>配置格式不正确</value>
   </data>
   <data name="CustomServerTips" xml:space="preserve">
-    <value>注意,自定义配置完全依赖您自己的配置，不能使用所有设置功能。如需使用系统代理请手工修改监听端口。</value>
+    <value>注意,自定义配置完全依赖您自己的配置，不能使用所有设置功能。如需使用系统代理请手动修改监听端口。</value>
   </data>
   <data name="Downloading" xml:space="preserve">
     <value>下载开始...</value>
@@ -148,7 +148,7 @@
     <value>生成默认配置文件失败</value>
   </data>
   <data name="FailedGetDefaultConfiguration" xml:space="preserve">
-    <value>取得默认配置失败</value>
+    <value>获取默认配置失败</value>
   </data>
   <data name="FailedImportedCustomServer" xml:space="preserve">
     <value>导入自定义配置服务器失败</value>
@@ -815,7 +815,7 @@
     <value>去重时保留序号较小的项</value>
   </data>
   <data name="TbSettingsLogEnabled" xml:space="preserve">
-    <value>记录本地日志(默认关闭)</value>
+    <value>启用日志(默认关闭)</value>
   </data>
   <data name="TbSettingsLogLevel" xml:space="preserve">
     <value>日志等级</value>
@@ -905,7 +905,7 @@
     <value>路由</value>
   </data>
   <data name="NotRunAsAdmin" xml:space="preserve">
-    <value>非以管理员身份运行</value>
+    <value>以非管理员身份运行</value>
   </data>
   <data name="RunAsAdmin" xml:space="preserve">
     <value>以管理员身份运行</value>
@@ -1126,4 +1126,10 @@
   <data name="TbSettingsSpeedTestUrl" xml:space="preserve">
     <value>测速文件地址</value>
   </data>
+  <data name="TbSettingsTunModeDNS" xml:space="preserve">
+    <value>DNS对象，例如 {"servers":[]}</value>
+  </data>
+  <data name="menuMoveTo" xml:space="preserve">
+    <value>移至上下</value>
+  </data>
 </root>

v2rayN/v2rayN/Sample/tun_singbox

@@ -1,31 +1,11 @@
 {
   "log": {
-    "disabled": false,
+    "disabled": $log_disabled$,
     "level": "debug",
     $log_output$
     "timestamp": true
   },
-  "dns": {
-    "servers": [    
-      {
-        "tag": "local",
-        "address": "223.5.5.5",
-        "detour": "direct"
-      },
-      {
-        "tag": "block",
-        "address": "rcode://success"
-      }
-    ],
-    "rules": [
-      {
-        "geosite": "category-ads-all",
-        "server": "block",
-        "disable_cache": true
-      }
-    ],
-    "strategy": "ipv4_only"
-  },
+  "dns": $dns_object$ ,
   "inbounds": [
     {
       "type": "tun",

v2rayN/v2rayN/Sample/tun_singbox_dns

@@ -0,0 +1,21 @@
+  {
+    "servers": [
+      {
+        "tag": "local",
+        "address": "223.5.5.5",
+        "detour": "direct"
+      },
+      {
+        "tag": "block",
+        "address": "rcode://success"
+      }
+    ],
+    "rules": [
+      {
+        "geosite": "category-ads-all",
+        "server": "block",
+        "disable_cache": true
+      }
+    ],
+    "strategy": "ipv4_only"
+  }

v2rayN/v2rayN/Tool/FileManager.cs

@@ -10,8 +10,7 @@ namespace v2rayN.Tool
         {
             try
             {
-                using (FileStream fs = new FileStream(fileName, FileMode.Create, FileAccess.Write))
-                    fs.Write(content, 0, content.Length);
+                File.WriteAllBytes(fileName, content);
                 return true;
             }
             catch (Exception ex)
@@ -25,20 +24,9 @@ namespace v2rayN.Tool
         {
             try
             {
-                // Because the uncompressed size of the file is unknown,
-                // we are using an arbitrary buffer size.
-                byte[] buffer = new byte[4096];
-                int n;
-
-                using (FileStream fs = File.Create(fileName))
-                using (GZipStream input = new GZipStream(new MemoryStream(content),
-                        CompressionMode.Decompress, false))
-                {
-                    while ((n = input.Read(buffer, 0, buffer.Length)) > 0)
-                    {
-                        fs.Write(buffer, 0, n);
-                    }
-                }
+                using FileStream fs = File.Create(fileName);
+                using GZipStream input = new(new MemoryStream(content), CompressionMode.Decompress, false);
+                input.CopyTo(fs);
             }
             catch (Exception ex)
             {
@@ -55,42 +43,38 @@ namespace v2rayN.Tool
         {
             try
             {
-                using (FileStream fs = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
-                using (StreamReader sr = new StreamReader(fs, encoding))
-                {
-                    return sr.ReadToEnd();
-                }
+                using FileStream fs = new(path, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
+                using StreamReader sr = new(fs, encoding);
+                return sr.ReadToEnd();
             }
             catch (Exception ex)
             {
                 Utils.SaveLog(ex.Message, ex);
-                throw ex;
+                throw;
             }
         }
         public static bool ZipExtractToFile(string fileName, string toPath, string ignoredName)
         {
             try
             {
-                using (ZipArchive archive = ZipFile.OpenRead(fileName))
+                using ZipArchive archive = ZipFile.OpenRead(fileName);
+                foreach (ZipArchiveEntry entry in archive.Entries)
                 {
-                    foreach (ZipArchiveEntry entry in archive.Entries)
+                    if (entry.Length == 0)
                     {
-                        if (entry.Length == 0)
+                        continue;
+                    }
+                    try
+                    {
+                        if (!Utils.IsNullOrEmpty(ignoredName) && entry.Name.Contains(ignoredName))
                         {
                             continue;
                         }
-                        try
-                        {
-                            if (!Utils.IsNullOrEmpty(ignoredName) && entry.Name.Contains(ignoredName))
-                            {
-                                continue;
-                            }
-                            entry.ExtractToFile(Path.Combine(toPath, entry.Name), true);
-                        }
-                        catch (IOException ex)
-                        {
-                            Utils.SaveLog(ex.Message, ex);
-                        }
+                        entry.ExtractToFile(Path.Combine(toPath, entry.Name), true);
+                    }
+                    catch (IOException ex)
+                    {
+                        Utils.SaveLog(ex.Message, ex);
                     }
                 }
             }

v2rayN/v2rayN/Tool/Job.cs

@@ -16,12 +16,12 @@ namespace v2rayN
         {
             handle = CreateJobObject(IntPtr.Zero, null);
             IntPtr extendedInfoPtr = IntPtr.Zero;
-            JOBOBJECT_BASIC_LIMIT_INFORMATION info = new JOBOBJECT_BASIC_LIMIT_INFORMATION
+            JOBOBJECT_BASIC_LIMIT_INFORMATION info = new()
             {
                 LimitFlags = 0x2000
             };
 
-            JOBOBJECT_EXTENDED_LIMIT_INFORMATION extendedInfo = new JOBOBJECT_EXTENDED_LIMIT_INFORMATION
+            JOBOBJECT_EXTENDED_LIMIT_INFORMATION extendedInfo = new()
             {
                 BasicLimitInformation = info
             };
@@ -100,7 +100,7 @@ namespace v2rayN
         #region Interop
 
         [DllImport("kernel32.dll", CharSet = CharSet.Unicode)]
-        private static extern IntPtr CreateJobObject(IntPtr a, string lpName);
+        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);

v2rayN/v2rayN/Tool/Logging.cs

@@ -9,8 +9,8 @@ namespace v2rayN.Tool
     {
         public static void Setup()
         {
-            LoggingConfiguration config = new LoggingConfiguration();
-            FileTarget fileTarget = new FileTarget();
+            LoggingConfiguration config = new();
+            FileTarget fileTarget = new();
             config.AddTarget("file", fileTarget);
             fileTarget.Layout = "${longdate}-${level:uppercase=true} ${message}";
             fileTarget.FileName = Utils.GetLogPath("${shortdate}.txt");

v2rayN/v2rayN/Tool/Utils.cs

@@ -48,11 +48,10 @@ namespace v2rayN
             try
             {
                 Assembly assembly = Assembly.GetExecutingAssembly();
-                using (Stream stream = assembly.GetManifestResourceStream(res))
-                using (StreamReader reader = new StreamReader(stream))
-                {
-                    result = reader.ReadToEnd();
-                }
+                using Stream? stream = assembly.GetManifestResourceStream(res);
+                ArgumentNullException.ThrowIfNull(stream);
+                using StreamReader reader = new(stream);
+                result = reader.ReadToEnd();
             }
             catch (Exception ex)
             {
@@ -66,22 +65,18 @@ namespace v2rayN
         /// 取得存储资源
         /// </summary>
         /// <returns></returns>
-        public static string LoadResource(string res)
+        public static string? LoadResource(string res)
         {
-            string result = string.Empty;
-
             try
             {
-                using (StreamReader reader = new StreamReader(res))
-                {
-                    result = reader.ReadToEnd();
-                }
+                if (!File.Exists(res)) return null;
+                return File.ReadAllText(res);
             }
             catch (Exception ex)
             {
                 SaveLog(ex.Message, ex);
             }
-            return result;
+            return null;
         }
 
         /// <summary>
@@ -90,7 +85,7 @@ namespace v2rayN
         /// <typeparam name="T"></typeparam>
         /// <param name="strJson"></param>
         /// <returns></returns>
-        public static T FromJson<T>(string strJson)
+        public static T? FromJson<T>(string? strJson)
         {
             try
             {
@@ -98,8 +93,7 @@ namespace v2rayN
                 {
                     return default;
                 }
-                T obj = JsonConvert.DeserializeObject<T>(strJson);
-                return obj;
+                return JsonConvert.DeserializeObject<T>(strJson);
             }
             catch
             {
@@ -112,11 +106,15 @@ namespace v2rayN
         /// </summary>
         /// <param name="obj"></param>
         /// <returns></returns>
-        public static string ToJson(Object obj, bool indented = true)
+        public static string ToJson(object? obj, bool indented = true)
         {
             string result = string.Empty;
             try
             {
+                if (obj == null)
+                {
+                    return result;
+                }
                 if (indented)
                 {
                     result = JsonConvert.SerializeObject(obj,
@@ -141,25 +139,23 @@ namespace v2rayN
         /// <param name="obj"></param>
         /// <param name="filePath"></param>
         /// <returns></returns>
-        public static int ToJsonFile(Object obj, string filePath, bool nullValue = true)
+        public static int ToJsonFile(object? obj, string filePath, bool nullValue = true)
         {
             int result;
             try
             {
-                using (StreamWriter file = File.CreateText(filePath))
+                using StreamWriter file = File.CreateText(filePath);
+                JsonSerializer serializer;
+                if (nullValue)
                 {
-                    JsonSerializer serializer;
-                    if (nullValue)
-                    {
-                        serializer = new JsonSerializer() { Formatting = Formatting.Indented };
-                    }
-                    else
-                    {
-                        serializer = new JsonSerializer() { Formatting = Formatting.Indented, NullValueHandling = NullValueHandling.Ignore };
-                    }
-
-                    serializer.Serialize(file, obj);
+                    serializer = new JsonSerializer() { Formatting = Formatting.Indented };
                 }
+                else
+                {
+                    serializer = new JsonSerializer() { Formatting = Formatting.Indented, NullValueHandling = NullValueHandling.Ignore };
+                }
+
+                serializer.Serialize(file, obj);
                 result = 0;
             }
             catch (Exception ex)
@@ -170,12 +166,11 @@ namespace v2rayN
             return result;
         }
 
-        public static JObject ParseJson(string strJson)
+        public static JObject? ParseJson(string strJson)
         {
             try
             {
-                JObject obj = JObject.Parse(strJson);
-                return obj;
+                return JObject.Parse(strJson);
             }
             catch (Exception ex)
             {
@@ -202,11 +197,11 @@ namespace v2rayN
                 }
                 if (wrap)
                 {
-                    return string.Join("," + Environment.NewLine, lst.ToArray());
+                    return string.Join("," + Environment.NewLine, lst);
                 }
                 else
                 {
-                    return string.Join(",", lst.ToArray());
+                    return string.Join(",", lst);
                 }
             }
             catch (Exception ex)
@@ -225,7 +220,7 @@ namespace v2rayN
             try
             {
                 str = str.Replace(Environment.NewLine, "");
-                return new List<string>(str.Split(new string[] { "," }, StringSplitOptions.RemoveEmptyEntries));
+                return new List<string>(str.Split(',', StringSplitOptions.RemoveEmptyEntries));
             }
             catch (Exception ex)
             {
@@ -244,8 +239,9 @@ namespace v2rayN
             try
             {
                 str = str.Replace(Environment.NewLine, "");
-                List<string> list = new List<string>(str.Split(new string[] { "," }, StringSplitOptions.RemoveEmptyEntries));
-                return list.OrderBy(x => x).ToList();
+                List<string> list = new(str.Split(',', StringSplitOptions.RemoveEmptyEntries));
+                list.Sort();
+                return list;
             }
             catch (Exception ex)
             {
@@ -337,7 +333,7 @@ namespace v2rayN
         {
             try
             {
-                return (obj == null ? string.Empty : obj.ToString());
+                return obj?.ToString() ?? string.Empty;
             }
             catch (Exception ex)
             {
@@ -414,10 +410,9 @@ namespace v2rayN
 
         public static string GetMD5(string str)
         {
-            var md5 = MD5.Create();
             byte[] byteOld = Encoding.UTF8.GetBytes(str);
-            byte[] byteNew = md5.ComputeHash(byteOld);
-            StringBuilder sb = new StringBuilder();
+            byte[] byteNew = MD5.HashData(byteOld);
+            StringBuilder sb = new(32);
             foreach (byte b in byteNew)
             {
                 sb.Append(b.ToString("x2"));
@@ -440,7 +435,7 @@ namespace v2rayN
             }
             try
             {
-                Uri uri = new Uri(url);
+                Uri uri = new(url);
                 if (uri.Host == uri.IdnHost)
                 {
                     return url;
@@ -491,7 +486,7 @@ namespace v2rayN
             {
                 return true;
             }
-            if (text.Equals("null"))
+            if (text == "null")
             {
                 return true;
             }
@@ -568,18 +563,14 @@ namespace v2rayN
 
         public static bool IsIpv6(string ip)
         {
-            IPAddress address;
-            if (IPAddress.TryParse(ip, out address))
+            if (IPAddress.TryParse(ip, out IPAddress? address))
             {
-                switch (address.AddressFamily)
+                return address.AddressFamily switch
                 {
-                    case AddressFamily.InterNetwork:
-                        return false;
-                    case AddressFamily.InterNetworkV6:
-                        return true;
-                    default:
-                        return false;
-                }
+                    AddressFamily.InterNetwork => false,
+                    AddressFamily.InterNetworkV6 => true,
+                    _ => false,
+                };
             }
             return false;
         }
@@ -642,7 +633,7 @@ namespace v2rayN
 
                 string value = RegReadValue(Global.AutoRunRegPath, Global.AutoRunName, "");
                 string exePath = GetExePath();
-                if (value?.Equals(exePath) == true || value?.Equals($"\"{exePath}\"") == true)
+                if (value == exePath || value == $"\"{exePath}\"")
                 {
                     return true;
                 }
@@ -682,13 +673,13 @@ namespace v2rayN
             return Application.StartupPath;
         }
 
-        public static string RegReadValue(string path, string name, string def)
+        public static string? RegReadValue(string path, string name, string def)
         {
-            RegistryKey regKey = null;
+            RegistryKey? regKey = null;
             try
             {
                 regKey = Registry.CurrentUser.OpenSubKey(path, false);
-                string value = regKey?.GetValue(name) as string;
+                string? value = regKey?.GetValue(name) as string;
                 if (IsNullOrEmpty(value))
                 {
                     return def;
@@ -711,7 +702,7 @@ namespace v2rayN
 
         public static void RegWriteValue(string path, string name, object value)
         {
-            RegistryKey regKey = null;
+            RegistryKey? regKey = null;
             try
             {
                 regKey = Registry.CurrentUser.CreateSubKey(path);
@@ -743,14 +734,12 @@ namespace v2rayN
         public static bool CheckForDotNetVersion(int release = 528040)
         {
             const string subkey = @"SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full\";
-            using (RegistryKey ndpKey = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry32).OpenSubKey(subkey))
+            using RegistryKey? ndpKey = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry32).OpenSubKey(subkey);
+            if (ndpKey?.GetValue("Release") != null)
             {
-                if (ndpKey != null && ndpKey.GetValue("Release") != null)
-                {
-                    return (int)ndpKey.GetValue("Release") >= release ? true : false;
-                }
-                return false;
+                return (int)ndpKey.GetValue("Release") >= release;
             }
+            return false;
         }
 
         /// <summary>
@@ -771,31 +760,29 @@ namespace v2rayN
             string taskDescription = description;
             string deamonFileName = fileName;
 
-            using (var taskService = new TaskService())
+            using var taskService = new TaskService();
+            var tasks = taskService.RootFolder.GetTasks(new Regex(TaskName));
+            foreach (var t in tasks)
             {
-                var tasks = taskService.RootFolder.GetTasks(new Regex(TaskName));
-                foreach (var t in tasks)
-                {
-                    taskService.RootFolder.DeleteTask(t.Name);
-                }
-                if (string.IsNullOrEmpty(fileName))
-                {
-                    return;
-                }
-
-                var task = taskService.NewTask();
-                task.RegistrationInfo.Description = taskDescription;
-                task.Settings.DisallowStartIfOnBatteries = false;
-                task.Settings.StopIfGoingOnBatteries = false;
-                task.Settings.RunOnlyIfIdle = false;
-                task.Settings.IdleSettings.StopOnIdleEnd = false;
-                task.Settings.ExecutionTimeLimit = TimeSpan.Zero;
-                task.Triggers.Add(new LogonTrigger { UserId = logonUser, Delay = TimeSpan.FromMinutes(1) });
-                task.Principal.RunLevel = TaskRunLevel.Highest;
-                task.Actions.Add(new ExecAction(deamonFileName));
-
-                taskService.RootFolder.RegisterTaskDefinition(TaskName, task);
+                taskService.RootFolder.DeleteTask(t.Name);
             }
+            if (string.IsNullOrEmpty(fileName))
+            {
+                return;
+            }
+
+            var task = taskService.NewTask();
+            task.RegistrationInfo.Description = taskDescription;
+            task.Settings.DisallowStartIfOnBatteries = false;
+            task.Settings.StopIfGoingOnBatteries = false;
+            task.Settings.RunOnlyIfIdle = false;
+            task.Settings.IdleSettings.StopOnIdleEnd = false;
+            task.Settings.ExecutionTimeLimit = TimeSpan.Zero;
+            task.Triggers.Add(new LogonTrigger { UserId = logonUser, Delay = TimeSpan.FromMinutes(1) });
+            task.Principal.RunLevel = TaskRunLevel.Highest;
+            task.Actions.Add(new ExecAction(deamonFileName));
+
+            taskService.RootFolder.RegisterTaskDefinition(TaskName, task);
         }
 
         #endregion
@@ -904,16 +891,13 @@ namespace v2rayN
         public static T DeepCopy<T>(T obj)
         {
             object retval;
-            using (MemoryStream ms = new MemoryStream())
-            {
-                BinaryFormatter bf = new BinaryFormatter();
-                //序列化成流
-                bf.Serialize(ms, obj);
-                ms.Seek(0, SeekOrigin.Begin);
-                //反序列化成对象
-                retval = bf.Deserialize(ms);
-                ms.Close();
-            }
+            MemoryStream ms = new MemoryStream();
+            BinaryFormatter bf = new BinaryFormatter();
+            //序列化成流
+            bf.Serialize(ms, obj);
+            ms.Seek(0, SeekOrigin.Begin);
+            //反序列化成对象
+            retval = bf.Deserialize(ms);
             return (T)retval;
         }
 
@@ -921,7 +905,7 @@ namespace v2rayN
         /// 获取剪贴板数
         /// </summary>
         /// <returns></returns>
-        public static string GetClipboardData()
+        public static string? GetClipboardData()
         {
             string strData = string.Empty;
             try
@@ -1008,7 +992,7 @@ namespace v2rayN
             return fileName;
         }
 
-        public static IPAddress GetDefaultGateway()
+        public static IPAddress? GetDefaultGateway()
         {
             return NetworkInterface
                 .GetAllNetworkInterfaces()
@@ -1071,14 +1055,11 @@ namespace v2rayN
 
         public static string UnGzip(byte[] buf)
         {
-            MemoryStream sb = new MemoryStream();
-            using (GZipStream input = new GZipStream(new MemoryStream(buf),
-            CompressionMode.Decompress,
-            false))
-            {
-                input.CopyTo(sb);
-            }
-            return Encoding.UTF8.GetString(sb.ToArray());
+            using MemoryStream sb = new();
+            using GZipStream input = new(new MemoryStream(buf), CompressionMode.Decompress, false);
+            input.CopyTo(sb);
+            sb.Position = 0;
+            return new StreamReader(sb, Encoding.UTF8).ReadToEnd();
         }
 
         public static string GetBackupPath(string filename)
@@ -1177,7 +1158,7 @@ namespace v2rayN
             var logger = LogManager.GetLogger("Log2");
             logger.Debug($"{strTitle},{ex.Message}");
             logger.Debug(ex.StackTrace);
-            if (ex != null && ex.InnerException != null)
+            if (ex?.InnerException != null)
             {
                 logger.Error(ex.InnerException);
             }
@@ -1194,42 +1175,40 @@ namespace v2rayN
             {
                 foreach (Screen screen in Screen.AllScreens)
                 {
-                    using (Bitmap fullImage = new Bitmap(screen.Bounds.Width,
-                                                    screen.Bounds.Height))
+                    using Bitmap fullImage = new Bitmap(screen.Bounds.Width,
+                                                    screen.Bounds.Height);
+                    using (Graphics g = Graphics.FromImage(fullImage))
                     {
-                        using (Graphics g = Graphics.FromImage(fullImage))
+                        g.CopyFromScreen(screen.Bounds.X,
+                                         screen.Bounds.Y,
+                                         0, 0,
+                                         fullImage.Size,
+                                         CopyPixelOperation.SourceCopy);
+                    }
+                    int maxTry = 10;
+                    for (int i = 0; i < maxTry; i++)
+                    {
+                        int marginLeft = (int)((double)fullImage.Width * i / 2.5 / maxTry);
+                        int marginTop = (int)((double)fullImage.Height * i / 2.5 / maxTry);
+                        Rectangle cropRect = new(marginLeft, marginTop, fullImage.Width - marginLeft * 2, fullImage.Height - marginTop * 2);
+                        Bitmap target = new(screen.Bounds.Width, screen.Bounds.Height);
+
+                        double imageScale = (double)screen.Bounds.Width / (double)cropRect.Width;
+                        using (Graphics g = Graphics.FromImage(target))
                         {
-                            g.CopyFromScreen(screen.Bounds.X,
-                                             screen.Bounds.Y,
-                                             0, 0,
-                                             fullImage.Size,
-                                             CopyPixelOperation.SourceCopy);
+                            g.DrawImage(fullImage, new Rectangle(0, 0, target.Width, target.Height),
+                                            cropRect,
+                                            GraphicsUnit.Pixel);
                         }
-                        int maxTry = 10;
-                        for (int i = 0; i < maxTry; i++)
+
+                        BitmapLuminanceSource source = new(target);
+                        BinaryBitmap bitmap = new(new HybridBinarizer(source));
+                        QRCodeReader reader = new();
+                        Result result = reader.decode(bitmap);
+                        if (result != null)
                         {
-                            int marginLeft = (int)((double)fullImage.Width * i / 2.5 / maxTry);
-                            int marginTop = (int)((double)fullImage.Height * i / 2.5 / maxTry);
-                            Rectangle cropRect = new Rectangle(marginLeft, marginTop, fullImage.Width - marginLeft * 2, fullImage.Height - marginTop * 2);
-                            Bitmap target = new Bitmap(screen.Bounds.Width, screen.Bounds.Height);
-
-                            double imageScale = (double)screen.Bounds.Width / (double)cropRect.Width;
-                            using (Graphics g = Graphics.FromImage(target))
-                            {
-                                g.DrawImage(fullImage, new Rectangle(0, 0, target.Width, target.Height),
-                                                cropRect,
-                                                GraphicsUnit.Pixel);
-                            }
-
-                            BitmapLuminanceSource source = new BitmapLuminanceSource(target);
-                            BinaryBitmap bitmap = new BinaryBitmap(new HybridBinarizer(source));
-                            QRCodeReader reader = new QRCodeReader();
-                            Result result = reader.decode(bitmap);
-                            if (result != null)
-                            {
-                                string ret = result.Text;
-                                return ret;
-                            }
+                            string ret = result.Text;
+                            return ret;
                         }
                     }
                 }

v2rayN/v2rayN/ViewModels/AddServer2ViewModel.cs

@@ -106,7 +106,7 @@ namespace v2rayN.ViewModels
         {
             UI.Show(ResUI.CustomServerTips);
 
-            OpenFileDialog fileDialog = new OpenFileDialog
+            OpenFileDialog fileDialog = new()
             {
                 Multiselect = false,
                 Filter = "Config|*.json|YAML|*.yaml;*.yml|All|*.*"
@@ -121,10 +121,7 @@ namespace v2rayN.ViewModels
                 return;
             }
             var item = LazyConfig.Instance.GetProfileItem(SelectedSource.indexId);
-            if (item is null)
-            {
-                item = SelectedSource;
-            }
+            item ??= SelectedSource;
             item.address = fileName;
             if (ConfigHandler.AddCustomServer(ref _config, item, false) == 0)
             {

v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs

@@ -37,8 +37,8 @@ namespace v2rayN.ViewModels
         private string _serverFilter = string.Empty;
         private static Config _config;
         private NoticeHandler? _noticeHandler;
-        private readonly PaletteHelper _paletteHelper = new PaletteHelper();
-        private Dictionary<int, bool> _dicHeaderSort = new();
+        private readonly PaletteHelper _paletteHelper = new();
+        private Dictionary<string, bool> _dicHeaderSort = new();
         private Action<string> _updateView;
 
         #endregion
@@ -218,10 +218,11 @@ namespace v2rayN.ViewModels
             {
                 EnableTun = true;
             }
+            _subId = _config.subIndexId;
 
-            //RefreshServers();
             InitSubscriptionView();
             RefreshRoutingsMenu();
+            RefreshServers();
 
             var canEditRemove = this.WhenAnyValue(
                x => x.SelectedProfile,
@@ -254,7 +255,7 @@ namespace v2rayN.ViewModels
             SystemProxySelected = (int)_config.sysProxyType;
             this.WhenAnyValue(
               x => x.SystemProxySelected,
-              y => y != null && y >= 0)
+              y => y >= 0)
                   .Subscribe(c => DoSystemProxySelected(c));
 
             this.WhenAnyValue(
@@ -365,7 +366,7 @@ namespace v2rayN.ViewModels
             }, canEditRemove);
             SortServerResultCmd = ReactiveCommand.Create(() =>
             {
-                SortServer((int)EServerColName.delay);
+                SortServer(EServerColName.delayVal.ToString());
             });
             //servers export
             Export2ClientConfigCmd = ReactiveCommand.Create(() =>
@@ -532,7 +533,7 @@ namespace v2rayN.ViewModels
         {
             _noticeHandler?.SendMessage(msg);
         }
-        private async void UpdateTaskHandler(bool success, string msg)
+        private void UpdateTaskHandler(bool success, string msg)
         {
             _noticeHandler?.SendMessage(msg);
             if (success)
@@ -664,6 +665,8 @@ namespace v2rayN.ViewModels
                     SysProxyHandle.UpdateSysProxy(_config, true);
                 }
 
+                ProfileExHandler.Instance.SaveTo();
+
                 _statistics?.SaveTo();
                 _statistics?.Close();
 
@@ -689,6 +692,7 @@ namespace v2rayN.ViewModels
                 return;
             }
             _subId = SelectedSub?.id;
+            _config.subIndexId = _subId;
 
             RefreshServers();
 
@@ -708,19 +712,19 @@ namespace v2rayN.ViewModels
         private void RefreshServers()
         {
             List<ProfileItemModel> lstModel = LazyConfig.Instance.ProfileItems(_subId, _serverFilter);
-            _lstProfile = Utils.FromJson<List<ProfileItem>>(Utils.ToJson(lstModel));
-
-            ConfigHandler.SetDefaultServer(_config, _lstProfile);
+            ConfigHandler.SetDefaultServer(_config, lstModel);
 
             List<ServerStatItem> lstServerStat = new();
             if (_statistics != null && _statistics.Enable)
             {
                 lstServerStat = _statistics.ServerStat;
             }
+            var lstProfileExs = ProfileExHandler.Instance.ProfileExs;
             lstModel = (from t in lstModel
-                        join t2 in lstServerStat
-                        on t.indexId equals t2.indexId into t2b
+                        join t2 in lstServerStat on t.indexId equals t2.indexId into t2b
                         from t22 in t2b.DefaultIfEmpty()
+                        join t3 in lstProfileExs on t.indexId equals t3.indexId into t3b
+                        from t33 in t3b.DefaultIfEmpty()
                         select new ProfileItemModel
                         {
                             indexId = t.indexId,
@@ -733,14 +737,15 @@ namespace v2rayN.ViewModels
                             streamSecurity = t.streamSecurity,
                             subRemarks = t.subRemarks,
                             isActive = t.indexId == _config.indexId,
-                            delay = t.delay,
-                            delayVal = t.delay != 0 ? $"{t.delay} {Global.DelayUnit}" : string.Empty,
-                            speedVal = t.speed != 0 ? $"{t.speed} {Global.SpeedUnit}" : string.Empty,
+                            sort = t33 == null ? 0 : t33.sort,
+                            delayVal = t33?.delay != 0 ? $"{t33?.delay} {Global.DelayUnit}" : string.Empty,
+                            speedVal = t33?.speed != 0 ? $"{t33?.speed} {Global.SpeedUnit}" : string.Empty,
                             todayDown = t22 == null ? "" : Utils.HumanFy(t22.todayDown),
                             todayUp = t22 == null ? "" : Utils.HumanFy(t22.todayUp),
                             totalDown = t22 == null ? "" : Utils.HumanFy(t22.totalDown),
                             totalUp = t22 == null ? "" : Utils.HumanFy(t22.totalUp)
-                        }).ToList();
+                        }).OrderBy(t => t.sort).ToList();
+            _lstProfile = Utils.FromJson<List<ProfileItem>>(Utils.ToJson(lstModel));
 
             Application.Current.Dispatcher.Invoke((Action)(() =>
             {
@@ -785,7 +790,7 @@ namespace v2rayN.ViewModels
 
                 var item = new ComboItem() { ID = it.indexId, Text = name };
                 _servers.Add(item);
-                if (_config.indexId.Equals(it.indexId))
+                if (_config.indexId == it.indexId)
                 {
                     SelectedServer = item;
                 }
@@ -801,7 +806,14 @@ namespace v2rayN.ViewModels
             {
                 _subItems.Add(item);
             }
-            SelectedSub = _subItems[0];
+            if (_subId != null && _subItems.FirstOrDefault(t => t.id == _subId) != null)
+            {
+                SelectedSub = _subItems.FirstOrDefault(t => t.id == _subId);
+            }
+            else
+            {
+                SelectedSub = _subItems[0];
+            }
         }
 
         #endregion
@@ -810,7 +822,7 @@ namespace v2rayN.ViewModels
         private int GetProfileItems(out List<ProfileItem> lstSelecteds)
         {
             lstSelecteds = new List<ProfileItem>();
-            if (SelectedProfiles == null || SelectedProfiles.Count() <= 0)
+            if (SelectedProfiles == null || SelectedProfiles.Count <= 0)
             {
                 return -1;
             }
@@ -834,7 +846,6 @@ namespace v2rayN.ViewModels
                 {
                     subid = _subId,
                     configType = eConfigType,
-                    displayLog = false
                 };
             }
             else
@@ -876,6 +887,7 @@ namespace v2rayN.ViewModels
             int ret = ConfigHandler.AddBatchServers(ref _config, clipboardData, _subId, false);
             if (ret > 0)
             {
+                InitSubscriptionView();
                 RefreshServers();
                 _noticeHandler?.Enqueue(string.Format(ResUI.SuccessfullyImportedServerViaClipboard, ret));
             }
@@ -900,6 +912,7 @@ namespace v2rayN.ViewModels
                 int ret = ConfigHandler.AddBatchServers(ref _config, result, _subId, false);
                 if (ret > 0)
                 {
+                    InitSubscriptionView();
                     RefreshServers();
                     _noticeHandler?.Enqueue(ResUI.SuccessfullyImportedServerViaScan);
                 }
@@ -974,7 +987,7 @@ namespace v2rayN.ViewModels
                 return;
             }
 
-            if (ConfigHandler.SetDefaultServer(ref _config, item) == 0)
+            if (ConfigHandler.SetDefaultServerIndex(ref _config, indexId) == 0)
             {
                 RefreshServers();
                 Reload();
@@ -1021,23 +1034,23 @@ namespace v2rayN.ViewModels
             await DialogHost.Show(dialog, "RootDialog");
         }
 
-        public void SortServer(int colIndex)
+        public void SortServer(string colName)
         {
-            if (colIndex < 0)
+            if (Utils.IsNullOrEmpty(colName))
             {
                 return;
             }
 
-            if (!_dicHeaderSort.ContainsKey(colIndex))
+            if (!_dicHeaderSort.ContainsKey(colName))
             {
-                _dicHeaderSort.Add(colIndex, true);
+                _dicHeaderSort.Add(colName, true);
             }
-            _dicHeaderSort.TryGetValue(colIndex, out bool asc);
-            if (ConfigHandler.SortServers(ref _config, _subId, (EServerColName)colIndex, asc) != 0)
+            _dicHeaderSort.TryGetValue(colName, out bool asc);
+            if (ConfigHandler.SortServers(ref _config, _subId, colName, asc) != 0)
             {
                 return;
             }
-            _dicHeaderSort[colIndex] = !asc;
+            _dicHeaderSort[colName] = !asc;
             RefreshServers();
         }
 
@@ -1158,7 +1171,7 @@ namespace v2rayN.ViewModels
                 return;
             }
 
-            StringBuilder sb = new StringBuilder();
+            StringBuilder sb = new();
             foreach (var it in lstSelecteds)
             {
                 string url = ShareHandler.GetShareUrl(it);
@@ -1183,10 +1196,10 @@ namespace v2rayN.ViewModels
                 return;
             }
 
-            StringBuilder sb = new StringBuilder();
+            StringBuilder sb = new();
             foreach (var it in lstSelecteds)
             {
-                string url = ShareHandler.GetShareUrl(it);
+                string? url = ShareHandler.GetShareUrl(it);
                 if (Utils.IsNullOrEmpty(url))
                 {
                     continue;
@@ -1257,7 +1270,7 @@ namespace v2rayN.ViewModels
 
         private void ImportOldGuiConfig()
         {
-            OpenFileDialog fileDialog = new OpenFileDialog
+            OpenFileDialog fileDialog = new()
             {
                 Multiselect = false,
                 Filter = "guiNConfig|*.json|All|*.*"
@@ -1445,7 +1458,7 @@ namespace v2rayN.ViewModels
             foreach (var item in routings)
             {
                 _routingItems.Add(item);
-                if (item.id.Equals(_config.routingBasicItem.routingIndexId))
+                if (item.id == _config.routingBasicItem.routingIndexId)
                 {
                     SelectedRouting = item;
                 }
@@ -1521,7 +1534,7 @@ namespace v2rayN.ViewModels
 
         public void ShowHideWindow(bool? blShow)
         {
-            var bl = blShow.HasValue ? blShow.Value : !Global.ShowInTaskbar;
+            var bl = blShow ?? !Global.ShowInTaskbar;
             if (bl)
             {
                 //Application.Current.MainWindow.ShowInTaskbar = true;
@@ -1640,7 +1653,7 @@ namespace v2rayN.ViewModels
 
         public void InboundDisplayStaus()
         {
-            StringBuilder sb = new StringBuilder();
+            StringBuilder sb = new();
             sb.Append($"[{Global.InboundSocks}:{LazyConfig.Instance.GetLocalPort(Global.InboundSocks)}]");
             sb.Append(" | ");
             //if (_config.sysProxyType == ESysProxyType.ForcedChange)
@@ -1651,21 +1664,21 @@ namespace v2rayN.ViewModels
             //{
             sb.Append($"[{Global.InboundHttp}:{LazyConfig.Instance.GetLocalPort(Global.InboundHttp)}]");
             //}
-            InboundDisplay = $"{ResUI.LabLocal}:{sb.ToString()}";
+            InboundDisplay = $"{ResUI.LabLocal}:{sb}";
 
             if (_config.inbound[0].allowLANConn)
             {
                 if (_config.inbound[0].newPort4LAN)
                 {
-                    StringBuilder sb2 = new StringBuilder();
+                    StringBuilder sb2 = new();
                     sb2.Append($"[{Global.InboundSocks}:{LazyConfig.Instance.GetLocalPort(Global.InboundSocks2)}]");
                     sb2.Append(" | ");
                     sb2.Append($"[{Global.InboundHttp}:{LazyConfig.Instance.GetLocalPort(Global.InboundHttp2)}]");
-                    InboundLanDisplay = $"{ResUI.LabLAN}:{sb2.ToString()}";
+                    InboundLanDisplay = $"{ResUI.LabLAN}:{sb2}";
                 }
                 else
                 {
-                    InboundLanDisplay = $"{ResUI.LabLAN}:{sb.ToString()}";
+                    InboundLanDisplay = $"{ResUI.LabLAN}:{sb}";
                 }
             }
             else
@@ -1702,10 +1715,10 @@ namespace v2rayN.ViewModels
                  .Delay(TimeSpan.FromSeconds(1))
                  .Subscribe(x =>
                  {
-                     Application.Current.Dispatcher.Invoke((Action)(() =>
+                     Application.Current.Dispatcher.Invoke(() =>
                      {
                          ShowHideWindow(false);
-                     }));
+                     });
                  });
             }
         }

v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs

@@ -75,6 +75,7 @@ namespace v2rayN.ViewModels
 
         #region Tun mode
         [Reactive] public bool TunShowWindow { get; set; }
+        [Reactive] public bool TunEnabledLog { get; set; }
         [Reactive] public bool TunStrictRoute { get; set; }
         [Reactive] public string TunStack { get; set; }
         [Reactive] public int TunMtu { get; set; }
@@ -83,8 +84,10 @@ namespace v2rayN.ViewModels
         [Reactive] public bool TunBypassMode2 { get; set; }
         [Reactive] public string TunDirectIP { get; set; }
         [Reactive] public string TunDirectProcess { get; set; }
+        [Reactive] public string TunDirectDNS { get; set; }
         [Reactive] public string TunProxyIP { get; set; }
         [Reactive] public string TunProxyProcess { get; set; }
+        [Reactive] public string TunProxyDNS { get; set; }
         #endregion
 
         #region CoreType
@@ -168,6 +171,7 @@ namespace v2rayN.ViewModels
             #region Tun mode
 
             TunShowWindow = _config.tunModeItem.showWindow;
+            TunEnabledLog = _config.tunModeItem.enabledLog;
             TunStrictRoute = _config.tunModeItem.strictRoute;
             TunStack = _config.tunModeItem.stack;
             TunMtu = _config.tunModeItem.mtu;
@@ -175,8 +179,10 @@ namespace v2rayN.ViewModels
             TunBypassMode = _config.tunModeItem.bypassMode;
             TunDirectIP = Utils.List2String(_config.tunModeItem.directIP, true);
             TunDirectProcess = Utils.List2String(_config.tunModeItem.directProcess, true);
+            TunDirectDNS = _config.tunModeItem.directDNS;
             TunProxyIP = Utils.List2String(_config.tunModeItem.proxyIP, true);
             TunProxyProcess = Utils.List2String(_config.tunModeItem.proxyProcess, true);
+            TunProxyDNS = _config.tunModeItem.proxyDNS;
             this.WhenAnyValue(
               x => x.TunBypassMode)
               .Subscribe(c => TunBypassMode2 = !TunBypassMode);
@@ -251,7 +257,7 @@ namespace v2rayN.ViewModels
             }
 
             var obj = Utils.ParseJson(remoteDNS);
-            if (obj != null && obj.ContainsKey("servers"))
+            if (obj?.ContainsKey("servers") == true)
             {
             }
             else
@@ -275,7 +281,7 @@ namespace v2rayN.ViewModels
             //}
 
             //Core
-            _config.inbound[0].localPort = Utils.ToInt(localPort);
+            _config.inbound[0].localPort = localPort;
             _config.inbound[0].udpEnabled = udpEnabled;
             _config.inbound[0].sniffingEnabled = sniffingEnabled;
             _config.inbound[0].routeOnly = routeOnly;
@@ -340,6 +346,7 @@ namespace v2rayN.ViewModels
 
             //tun mode
             _config.tunModeItem.showWindow = TunShowWindow;
+            _config.tunModeItem.enabledLog = TunEnabledLog;
             _config.tunModeItem.strictRoute = TunStrictRoute;
             _config.tunModeItem.stack = TunStack;
             _config.tunModeItem.mtu = TunMtu;
@@ -347,8 +354,10 @@ namespace v2rayN.ViewModels
             _config.tunModeItem.bypassMode = TunBypassMode;
             _config.tunModeItem.directIP = Utils.String2List(TunDirectIP);
             _config.tunModeItem.directProcess = Utils.String2List(TunDirectProcess);
+            _config.tunModeItem.directDNS = Utils.ToJson(Utils.ParseJson(TunDirectDNS));
             _config.tunModeItem.proxyIP = Utils.String2List(TunProxyIP);
             _config.tunModeItem.proxyProcess = Utils.String2List(TunProxyProcess);
+            _config.tunModeItem.proxyDNS = Utils.ToJson(Utils.ParseJson(TunProxyDNS));
 
             //coreType 
             SaveCoreType();

v2rayN/v2rayN/ViewModels/RoutingSettingViewModel.cs

@@ -163,7 +163,7 @@ namespace v2rayN.ViewModels
             foreach (var item in routings)
             {
                 bool def = false;
-                if (item.id.Equals(_config.routingBasicItem.routingIndexId))
+                if (item.id == _config.routingBasicItem.routingIndexId)
                 {
                     def = true;
                 }

v2rayN/v2rayN/Views/AddServer2Window.xaml

@@ -18,6 +18,7 @@
     Background="{DynamicResource MaterialDesignPaper}"
     FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
     ResizeMode="NoResize"
+    ShowInTaskbar="False"
     TextElement.FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
     TextElement.Foreground="{DynamicResource MaterialDesignBody}"
     TextOptions.TextFormattingMode="Display"

v2rayN/v2rayN/Views/AddServer2Window.xaml.cs

@@ -11,6 +11,7 @@ namespace v2rayN.Views
         public AddServer2Window(ProfileItem profileItem)
         {
             InitializeComponent();
+            this.Owner = Application.Current.MainWindow;
             this.Loaded += Window_Loaded;
             ViewModel = new AddServer2ViewModel(profileItem, this);
 

v2rayN/v2rayN/Views/AddServerWindow.xaml

@@ -16,6 +16,7 @@
     Background="{DynamicResource MaterialDesignPaper}"
     FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
     ResizeMode="NoResize"
+    ShowInTaskbar="False"
     TextElement.FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
     TextElement.Foreground="{DynamicResource MaterialDesignBody}"
     TextOptions.TextFormattingMode="Display"

v2rayN/v2rayN/Views/AddServerWindow.xaml.cs

@@ -16,6 +16,7 @@ namespace v2rayN.Views
         public AddServerWindow(ProfileItem profileItem)
         {
             InitializeComponent();
+            this.Owner = Application.Current.MainWindow;
             this.Loaded += Window_Loaded;
             cmbNetwork.SelectionChanged += CmbNetwork_SelectionChanged;
             cmbStreamSecurity.SelectionChanged += CmbStreamSecurity_SelectionChanged;
@@ -184,12 +185,12 @@ namespace v2rayN.Views
                 return;
             }
 
-            if (network.Equals(Global.DefaultNetwork))
+            if (network == Global.DefaultNetwork)
             {
                 cmbHeaderType.Items.Add(Global.None);
                 cmbHeaderType.Items.Add(Global.TcpHeaderHttp);
             }
-            else if (network.Equals("kcp") || network.Equals("quic"))
+            else if (network is "kcp" or "quic")
             {
                 cmbHeaderType.Items.Add(Global.None);
                 Global.kcpHeaderTypes.ForEach(it =>
@@ -197,7 +198,7 @@ namespace v2rayN.Views
                     cmbHeaderType.Items.Add(it);
                 });
             }
-            else if (network.Equals("grpc"))
+            else if (network == "grpc")
             {
                 cmbHeaderType.Items.Add(Global.GrpcgunMode);
                 cmbHeaderType.Items.Add(Global.GrpcmultiMode);
@@ -221,37 +222,34 @@ namespace v2rayN.Views
             tipPath.Text =
             tipHeaderType.Text = string.Empty;
 
-            if (network.Equals(Global.DefaultNetwork))
+            switch (network)
             {
-                tipRequestHost.Text = ResUI.TransportRequestHostTip1;
-                tipHeaderType.Text = ResUI.TransportHeaderTypeTip1;
-            }
-            else if (network.Equals("kcp"))
-            {
-                tipHeaderType.Text = ResUI.TransportHeaderTypeTip2;
-                tipPath.Text = ResUI.TransportPathTip5;
-            }
-            else if (network.Equals("ws"))
-            {
-                tipRequestHost.Text = ResUI.TransportRequestHostTip2;
-                tipPath.Text = ResUI.TransportPathTip1;
-            }
-            else if (network.Equals("h2"))
-            {
-                tipRequestHost.Text = ResUI.TransportRequestHostTip3;
-                tipPath.Text = ResUI.TransportPathTip2;
-            }
-            else if (network.Equals("quic"))
-            {
-                tipRequestHost.Text = ResUI.TransportRequestHostTip4;
-                tipPath.Text = ResUI.TransportPathTip3;
-                tipHeaderType.Text = ResUI.TransportHeaderTypeTip3;
-            }
-            else if (network.Equals("grpc"))
-            {
-                tipPath.Text = ResUI.TransportPathTip4;
-                tipHeaderType.Text = ResUI.TransportHeaderTypeTip4;
-                labHeaderType.Visibility = Visibility.Hidden;
+                case Global.DefaultNetwork:
+                    tipRequestHost.Text = ResUI.TransportRequestHostTip1;
+                    tipHeaderType.Text = ResUI.TransportHeaderTypeTip1;
+                    break;
+                case "kcp":
+                    tipHeaderType.Text = ResUI.TransportHeaderTypeTip2;
+                    tipPath.Text = ResUI.TransportPathTip5;
+                    break;
+                case "ws":
+                    tipRequestHost.Text = ResUI.TransportRequestHostTip2;
+                    tipPath.Text = ResUI.TransportPathTip1;
+                    break;
+                case "h2":
+                    tipRequestHost.Text = ResUI.TransportRequestHostTip3;
+                    tipPath.Text = ResUI.TransportPathTip2;
+                    break;
+                case "quic":
+                    tipRequestHost.Text = ResUI.TransportRequestHostTip4;
+                    tipPath.Text = ResUI.TransportPathTip3;
+                    tipHeaderType.Text = ResUI.TransportHeaderTypeTip3;
+                    break;
+                case "grpc":
+                    tipPath.Text = ResUI.TransportPathTip4;
+                    tipHeaderType.Text = ResUI.TransportHeaderTypeTip4;
+                    labHeaderType.Visibility = Visibility.Hidden;
+                    break;
             }
         }
 

v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml

@@ -18,6 +18,7 @@
     FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
     KeyDown="GlobalHotkeySettingWindow_KeyDown"
     ResizeMode="NoResize"
+    ShowInTaskbar="False"
     TextElement.FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
     TextElement.Foreground="{DynamicResource MaterialDesignBody}"
     TextOptions.TextFormattingMode="Display"

v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml.cs

@@ -16,6 +16,7 @@ namespace v2rayN.Views
         public GlobalHotkeySettingWindow()
         {
             InitializeComponent();
+            this.Owner = Application.Current.MainWindow;
             _config = LazyConfig.Instance.GetConfig();
 
             if (_config.globalHotkeys == null)
@@ -84,19 +85,19 @@ namespace v2rayN.Views
 
                 if (item.Control)
                 {
-                    keys += $"{Forms.Keys.Control.ToString()} + ";
+                    keys += $"{Forms.Keys.Control} + ";
                 }
                 if (item.Alt)
                 {
-                    keys += $"{Forms.Keys.Alt.ToString()} + ";
+                    keys += $"{Forms.Keys.Alt} + ";
                 }
                 if (item.Shift)
                 {
-                    keys += $"{Forms.Keys.Shift.ToString()} + ";
+                    keys += $"{Forms.Keys.Shift} + ";
                 }
                 if (item.KeyCode != null)
                 {
-                    keys += $"{item.KeyCode.ToString()}";
+                    keys += $"{item.KeyCode}";
                 }
 
                 SetText($"txtGlobalHotkey{k}", keys);
@@ -147,11 +148,11 @@ namespace v2rayN.Views
         {
             foreach (UIElement element in gridText.Children)
             {
-                if (element is TextBox)
+                if (element is TextBox box)
                 {
-                    if (((TextBox)element).Name == name)
+                    if (box.Name == name)
                     {
-                        ((TextBox)element).Text = txt;
+                        box.Text = txt;
                     }
                 }
             }

v2rayN/v2rayN/Views/MainWindow.xaml

@@ -333,41 +333,35 @@
                         </materialDesign:PopupBox>
                     </ToolBar>
                 </ToolBarTray>
-                <ToolBarTray DockPanel.Dock="Top">
-                    <ToolBar
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Center"
-                        ClipToBounds="True"
-                        Style="{StaticResource MaterialDesignToolBar}">
-                        <ListBox
-                            x:Name="lstGroup"
-                            FontSize="{DynamicResource StdFontSize}"
-                            ItemContainerStyle="{StaticResource MyChipListBoxItem}"
-                            Style="{StaticResource MaterialDesignChoiceChipPrimaryOutlineListBox}">
-                            <ListBox.ItemTemplate>
-                                <DataTemplate>
-                                    <TextBlock Text="{Binding remarks}" />
-                                </DataTemplate>
-                            </ListBox.ItemTemplate>
-                        </ListBox>
-                        <Button
-                            x:Name="btnAddSub"
-                            Width="30"
-                            Height="30"
-                            Margin="4,0"
-                            Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}">
-                            <materialDesign:PackIcon Kind="Plus" />
-                        </Button>
-                        <Separator />
-                        <TextBox
-                            x:Name="txtServerFilter"
-                            Width="100"
-                            Margin="4,0"
-                            materialDesign:HintAssist.Hint="{x:Static resx:ResUI.MsgServerTitle}"
-                            materialDesign:TextFieldAssist.HasClearButton="True"
-                            Style="{StaticResource DefTextBox}" />
-                    </ToolBar>
-                </ToolBarTray>
+                <WrapPanel Margin="2" DockPanel.Dock="Top">
+                    <ListBox
+                        x:Name="lstGroup"
+                        FontSize="{DynamicResource StdFontSize}"
+                        ItemContainerStyle="{StaticResource MyChipListBoxItem}"
+                        Style="{StaticResource MaterialDesignChoiceChipPrimaryOutlineListBox}">
+                        <ListBox.ItemTemplate>
+                            <DataTemplate>
+                                <TextBlock Text="{Binding remarks}" />
+                            </DataTemplate>
+                        </ListBox.ItemTemplate>
+                    </ListBox>
+                    <Button
+                        x:Name="btnAddSub"
+                        Width="30"
+                        Height="30"
+                        Margin="4,0"
+                        Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}">
+                        <materialDesign:PackIcon Kind="Plus" />
+                    </Button>
+                    <TextBox
+                        x:Name="txtServerFilter"
+                        Width="200"
+                        Margin="4,0"
+                        VerticalContentAlignment="Center"
+                        materialDesign:HintAssist.Hint="{x:Static resx:ResUI.MsgServerTitle}"
+                        materialDesign:TextFieldAssist.HasClearButton="True"
+                        Style="{StaticResource DefTextBox}" />
+                </WrapPanel>
 
                 <materialDesign:ColorZone
                     Height="50"
@@ -465,6 +459,7 @@
                         CanUserSortColumns="False"
                         EnableRowVirtualization="True"
                         Focusable="True"
+                        FrozenColumnCount="1"
                         GridLinesVisibility="All"
                         HeadersVisibility="All"
                         IsReadOnly="True"
@@ -545,22 +540,24 @@
                                         </MenuItem.Header>
                                     </MenuItem>
                                 </MenuItem>
-                                <MenuItem
-                                    x:Name="menuMoveTop"
-                                    Height="{StaticResource MenuItemHeight}"
-                                    Header="{x:Static resx:ResUI.menuMoveTop}" />
-                                <MenuItem
-                                    x:Name="menuMoveUp"
-                                    Height="{StaticResource MenuItemHeight}"
-                                    Header="{x:Static resx:ResUI.menuMoveUp}" />
-                                <MenuItem
-                                    x:Name="menuMoveDown"
-                                    Height="{StaticResource MenuItemHeight}"
-                                    Header="{x:Static resx:ResUI.menuMoveDown}" />
-                                <MenuItem
-                                    x:Name="menuMoveBottom"
-                                    Height="{StaticResource MenuItemHeight}"
-                                    Header="{x:Static resx:ResUI.menuMoveBottom}" />
+                                <MenuItem Header="{x:Static resx:ResUI.menuMoveTo}">
+                                    <MenuItem
+                                        x:Name="menuMoveTop"
+                                        Height="{StaticResource MenuItemHeight}"
+                                        Header="{x:Static resx:ResUI.menuMoveTop}" />
+                                    <MenuItem
+                                        x:Name="menuMoveUp"
+                                        Height="{StaticResource MenuItemHeight}"
+                                        Header="{x:Static resx:ResUI.menuMoveUp}" />
+                                    <MenuItem
+                                        x:Name="menuMoveDown"
+                                        Height="{StaticResource MenuItemHeight}"
+                                        Header="{x:Static resx:ResUI.menuMoveDown}" />
+                                    <MenuItem
+                                        x:Name="menuMoveBottom"
+                                        Height="{StaticResource MenuItemHeight}"
+                                        Header="{x:Static resx:ResUI.menuMoveBottom}" />
+                                </MenuItem>
                                 <MenuItem
                                     x:Name="menuSelectAll"
                                     Height="{StaticResource MenuItemHeight}"
@@ -607,41 +604,50 @@
                                 </DataGridTemplateColumn.CellTemplate>
                             </DataGridTemplateColumn>
 
-                            <materialDesign:DataGridTextColumn
+                            <base:MyDGTextColumn
                                 Width="80"
                                 Binding="{Binding configType}"
+                                ExName="configType"
                                 Header="{x:Static resx:ResUI.LvServiceType}" />
-                            <DataGridTextColumn
+                            <base:MyDGTextColumn
                                 Width="150"
                                 Binding="{Binding remarks}"
+                                ExName="remarks"
                                 Header="{x:Static resx:ResUI.LvAlias}" />
-                            <DataGridTextColumn
+                            <base:MyDGTextColumn
                                 Width="120"
                                 Binding="{Binding address}"
+                                ExName="address"
                                 Header="{x:Static resx:ResUI.LvAddress}" />
-                            <DataGridTextColumn
+                            <base:MyDGTextColumn
                                 Width="60"
                                 Binding="{Binding port}"
+                                ExName="port"
                                 Header="{x:Static resx:ResUI.LvPort}" />
-                            <DataGridTextColumn
+                            <base:MyDGTextColumn
                                 Width="100"
                                 Binding="{Binding security}"
+                                ExName="security"
                                 Header="{x:Static resx:ResUI.LvEncryptionMethod}" />
-                            <DataGridTextColumn
+                            <base:MyDGTextColumn
                                 Width="100"
                                 Binding="{Binding network}"
+                                ExName="network"
                                 Header="{x:Static resx:ResUI.LvTransportProtocol}" />
-                            <DataGridTextColumn
+                            <base:MyDGTextColumn
                                 Width="100"
                                 Binding="{Binding streamSecurity}"
+                                ExName="streamSecurity"
                                 Header="{x:Static resx:ResUI.LvTLS}" />
-                            <DataGridTextColumn
+                            <base:MyDGTextColumn
                                 Width="100"
                                 Binding="{Binding subRemarks}"
+                                ExName="subRemarks"
                                 Header="{x:Static resx:ResUI.LvSubscription}" />
-                            <DataGridTextColumn
+                            <base:MyDGTextColumn
                                 Width="100"
                                 Binding="{Binding delayVal}"
+                                ExName="delayVal"
                                 Header="{x:Static resx:ResUI.LvTestDelay}">
                                 <DataGridTextColumn.ElementStyle>
                                     <Style TargetType="{x:Type TextBlock}">
@@ -649,37 +655,42 @@
                                         <Setter Property="Foreground" Value="{Binding delay, Converter={StaticResource DelayColorConverter}}" />
                                     </Style>
                                 </DataGridTextColumn.ElementStyle>
-                            </DataGridTextColumn>
-                            <DataGridTextColumn
+                            </base:MyDGTextColumn>
+                            <base:MyDGTextColumn
                                 Width="100"
                                 Binding="{Binding speedVal}"
+                                ExName="speedVal"
                                 Header="{x:Static resx:ResUI.LvTestSpeed}">
                                 <DataGridTextColumn.ElementStyle>
                                     <Style TargetType="{x:Type TextBlock}">
                                         <Setter Property="HorizontalAlignment" Value="Right" />
                                     </Style>
                                 </DataGridTextColumn.ElementStyle>
-                            </DataGridTextColumn>
+                            </base:MyDGTextColumn>
 
-                            <DataGridTextColumn
+                            <base:MyDGTextColumn
                                 x:Name="colTodayUp"
                                 Width="100"
                                 Binding="{Binding todayUp}"
+                                ExName="todayUp"
                                 Header="{x:Static resx:ResUI.LvTodayUploadDataAmount}" />
-                            <DataGridTextColumn
+                            <base:MyDGTextColumn
                                 x:Name="colTodayDown"
                                 Width="100"
                                 Binding="{Binding todayDown}"
+                                ExName="todayDown"
                                 Header="{x:Static resx:ResUI.LvTodayDownloadDataAmount}" />
-                            <DataGridTextColumn
+                            <base:MyDGTextColumn
                                 x:Name="colTotalUp"
                                 Width="100"
                                 Binding="{Binding totalUp}"
+                                ExName="totalUp"
                                 Header="{x:Static resx:ResUI.LvTotalUploadDataAmount}" />
-                            <DataGridTextColumn
+                            <base:MyDGTextColumn
                                 x:Name="colTotalDown"
                                 Width="100"
                                 Binding="{Binding totalDown}"
+                                ExName="totalDown"
                                 Header="{x:Static resx:ResUI.LvTotalDownloadDataAmount}" />
 
                         </DataGrid.Columns>

v2rayN/v2rayN/Views/MainWindow.xaml.cs

@@ -9,6 +9,7 @@ using System.Windows.Controls.Primitives;
 using System.Windows.Input;
 using System.Windows.Interop;
 using System.Windows.Media;
+using v2rayN.Base;
 using v2rayN.Handler;
 using v2rayN.Mode;
 using v2rayN.Resx;
@@ -197,13 +198,13 @@ namespace v2rayN.Views
         {
             if (action == "AdjustMainLvColWidth")
             {
-                Application.Current.Dispatcher.Invoke((Action)(() =>
+                Application.Current.Dispatcher.Invoke(() =>
                 {
                     foreach (var it in lstProfiles.Columns)
                     {
                         it.Width = new DataGridLength(1, DataGridLengthUnitType.Auto);
                     }
-                }));
+                });
             }
             else if (action == "ProfilesFocus")
             {
@@ -265,14 +266,7 @@ namespace v2rayN.Views
                 return;
             }
 
-            //find index
-            var index = lstProfiles.Columns.IndexOf(colHeader.Column);
-            if (index < 0)
-            {
-                index = colHeader.TabIndex;
-            }
-
-            if (index == 0)
+            if (colHeader.Column.GetType().Name != typeof(MyDGTextColumn).Name)
             {
                 foreach (var it in lstProfiles.Columns)
                 {
@@ -282,7 +276,8 @@ namespace v2rayN.Views
                 return;
             }
 
-            ViewModel?.SortServer(index);
+            var colName = ((MyDGTextColumn)colHeader.Column).ExName;
+            ViewModel?.SortServer(colName);
         }
 
         private void menuSelectAll_Click(object sender, RoutedEventArgs e)
@@ -355,7 +350,7 @@ namespace v2rayN.Views
             }
             else
             {
-                if (e.Key == Key.Enter || e.Key == Key.Return)
+                if (e.Key is Key.Enter or Key.Return)
                 {
                     ViewModel?.SetDefaultServer();
                 }
@@ -403,7 +398,7 @@ namespace v2rayN.Views
         }
         #endregion
 
-        #region UI
+        #region UI          
 
         private void RestoreUI()
         {
@@ -429,11 +424,21 @@ namespace v2rayN.Views
                 gridMain.RowDefinitions[2].Height = new GridLength(_config.uiItem.mainGirdHeight2, GridUnitType.Star);
             }
 
-            for (int k = 0; k < lstProfiles.Columns.Count; k++)
+            var lvColumnItem = _config.uiItem.mainColumnItem.OrderBy(t => t.Index).ToList();
+            for (int i = 0; i < lvColumnItem.Count; i++)
             {
-                var width = ConfigHandler.GetformMainLvColWidth(ref _config, ((EServerColName)k).ToString(), Convert.ToInt32(lstProfiles.Columns[k].Width.Value));
-                lstProfiles.Columns[k].Width = width;
+                var item = lvColumnItem[i];
+                for (int k = 1; k < lstProfiles.Columns.Count; k++)
+                {
+                    var item2 = (MyDGTextColumn)lstProfiles.Columns[k];
+                    if (item2.ExName == item.Name)
+                    {
+                        item2.Width = item.Width;
+                        item2.DisplayIndex = i + 1;
+                    }
+                }
             }
+
             if (!_config.guiItem.enableStatistics)
             {
                 colTodayUp.Visibility = Visibility.Hidden;
@@ -447,10 +452,19 @@ namespace v2rayN.Views
             _config.uiItem.mainWidth = this.Width;
             _config.uiItem.mainHeight = this.Height;
 
-            for (int k = 0; k < lstProfiles.Columns.Count; k++)
+            List<ColumnItem> lvColumnItem = new();
+            for (int k = 1; k < lstProfiles.Columns.Count; k++)
             {
-                ConfigHandler.AddformMainLvColWidth(ref _config, ((EServerColName)k).ToString(), Convert.ToInt32(lstProfiles.Columns[k].ActualWidth));
+                var item2 = (MyDGTextColumn)lstProfiles.Columns[k];
+                lvColumnItem.Add(new()
+                {
+                    Name = item2.ExName,
+                    Width = Convert.ToInt32(item2.ActualWidth),
+                    Index = item2.DisplayIndex
+                });
             }
+            _config.uiItem.mainColumnItem = lvColumnItem;
+
             _config.uiItem.mainGirdHeight1 = Math.Ceiling(gridMain.RowDefinitions[0].ActualHeight + 0.1);
             _config.uiItem.mainGirdHeight2 = Math.Ceiling(gridMain.RowDefinitions[2].ActualHeight + 0.1);
         }
@@ -471,9 +485,8 @@ namespace v2rayN.Views
         }
         private void MenuItem_Click(object sender, RoutedEventArgs e)
         {
-            if (sender is MenuItem)
+            if (sender is MenuItem item)
             {
-                MenuItem item = (MenuItem)sender;
                 Utils.ProcessStart(item.Tag.ToString());
             }
         }
@@ -482,7 +495,7 @@ namespace v2rayN.Views
         #endregion
         #region Drag and Drop
 
-        private Point startPoint = new Point();
+        private Point startPoint = new();
         private int startIndex = -1;
         private string formatData = "ProfileItemModel";
 
@@ -523,8 +536,7 @@ namespace v2rayN.Views
                        Math.Abs(diff.Y) > SystemParameters.MinimumVerticalDragDistance))
             {
                 // Get the dragged Item
-                var listView = sender as DataGrid;
-                if (listView == null) return;
+                if (sender is not DataGrid listView) return;
                 var listViewItem = FindAnchestor<DataGridRow>((DependencyObject)e.OriginalSource);
                 if (listViewItem == null) return;           // Abort
                                                             // Find the data behind the ListViewItem
@@ -532,7 +544,7 @@ namespace v2rayN.Views
                 if (item == null) return;                   // Abort
                                                             // Initialize the drag & drop operation
                 startIndex = lstProfiles.SelectedIndex;
-                DataObject dragData = new DataObject(formatData, item);
+                DataObject dragData = new(formatData, item);
                 DragDrop.DoDragDrop(listViewItem, dragData, DragDropEffects.Copy | DragDropEffects.Move);
             }
         }
@@ -550,8 +562,7 @@ namespace v2rayN.Views
             if (e.Data.GetDataPresent(formatData) && sender == e.Source)
             {
                 // Get the drop Item destination
-                var listView = sender as DataGrid;
-                if (listView == null) return;
+                if (sender is not DataGrid listView) return;
                 var listViewItem = FindAnchestor<DataGridRow>((DependencyObject)e.OriginalSource);
                 if (listViewItem == null)
                 {
@@ -576,4 +587,4 @@ namespace v2rayN.Views
 
 
     }
-}
+}

v2rayN/v2rayN/Views/MsgView.xaml.cs

@@ -11,6 +11,10 @@ namespace v2rayN.Views
     public partial class MsgView
     {
         private static Config _config;
+
+        private string lastMsgFilter;
+        private bool lastMsgFilterNotAvailable;
+
         public MsgView()
         {
             InitializeComponent();
@@ -28,28 +32,38 @@ namespace v2rayN.Views
 
         void DelegateAppendText(string msg)
         {
-            Dispatcher.BeginInvoke(new Action<string>(AppendText), DispatcherPriority.Send, msg);
+            Dispatcher.BeginInvoke(AppendText, DispatcherPriority.Send, msg);
         }
 
         public void AppendText(string msg)
         {
-            if (msg.Equals(Global.CommandClearMsg))
+            if (msg == Global.CommandClearMsg)
             {
                 ClearMsg();
                 return;
             }
-            if (!togAutoRefresh.IsChecked.Value)
+            if (togAutoRefresh.IsChecked == false)
             {
                 return;
             }
+
             var MsgFilter = cmbMsgFilter.Text.TrimEx();
-            if (!Utils.IsNullOrEmpty(MsgFilter))
+            if (MsgFilter != lastMsgFilter) lastMsgFilterNotAvailable = false;
+            if (!string.IsNullOrEmpty(MsgFilter) && !lastMsgFilterNotAvailable)
             {
-                if (!Regex.IsMatch(msg, MsgFilter))
+                try
                 {
-                    return;
+                    if (!Regex.IsMatch(msg, MsgFilter)) // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʽ<EFBFBD><CABD><EFBFBD>쳣
+                    {
+                        return;
+                    }
+                }
+                catch (Exception)
+                {
+                    lastMsgFilterNotAvailable = true;
                 }
             }
+            lastMsgFilter = MsgFilter;
 
             ShowMsg(msg);
         }

v2rayN/v2rayN/Views/OptionSettingWindow.xaml

@@ -16,6 +16,7 @@
     Background="{DynamicResource MaterialDesignPaper}"
     FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
     ResizeMode="NoResize"
+    ShowInTaskbar="False"
     TextElement.FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
     TextElement.Foreground="{DynamicResource MaterialDesignBody}"
     TextOptions.TextFormattingMode="Display"
@@ -815,7 +816,7 @@
                         </Grid.ColumnDefinitions>
 
                         <TextBlock
-                            Grid.Row="1"
+                            Grid.Row="0"
                             Grid.Column="0"
                             Margin="{StaticResource SettingItemMargin}"
                             VerticalAlignment="Center"
@@ -823,6 +824,20 @@
                             Text="{x:Static resx:ResUI.TbSettingsTunModeShowWindow}" />
                         <ToggleButton
                             x:Name="togShowWindow"
+                            Grid.Row="0"
+                            Grid.Column="1"
+                            Margin="{StaticResource SettingItemMargin}"
+                            HorizontalAlignment="Left" />
+
+                        <TextBlock
+                            Grid.Row="1"
+                            Grid.Column="0"
+                            Margin="{StaticResource SettingItemMargin}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbSettingsLogEnabled}" />
+                        <ToggleButton
+                            x:Name="togEnabledLog"
                             Grid.Row="1"
                             Grid.Column="1"
                             Margin="{StaticResource SettingItemMargin}"
@@ -926,13 +941,15 @@
 
                     <Grid
                         x:Name="gridTunModeDirect"
-                        Width="600"
+                        Width="800"
                         Margin="{StaticResource SettingItemMargin}"
                         HorizontalAlignment="Left">
                         <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="1*" />
-                            <ColumnDefinition Width="10" />
-                            <ColumnDefinition Width="1*" />
+                            <ColumnDefinition Width="2*" />
+                            <ColumnDefinition Width="5" />
+                            <ColumnDefinition Width="2*" />
+                            <ColumnDefinition Width="5" />
+                            <ColumnDefinition Width="3*" />
                         </Grid.ColumnDefinitions>
                         <GroupBox
                             Grid.Column="0"
@@ -957,17 +974,31 @@
                                 TextWrapping="Wrap"
                                 VerticalScrollBarVisibility="Auto" />
                         </GroupBox>
+                        <GridSplitter Grid.Column="3" HorizontalAlignment="Stretch" />
+                        <GroupBox
+                            Grid.Column="4"
+                            Header="{x:Static resx:ResUI.TbSettingsTunModeDNS}"
+                            Style="{StaticResource MyGroupBox}">
+                            <TextBox
+                                Name="txtDirectDNS"
+                                AcceptsReturn="True"
+                                Style="{StaticResource DefTextBox}"
+                                TextWrapping="Wrap"
+                                VerticalScrollBarVisibility="Auto" />
+                        </GroupBox>
                     </Grid>
 
                     <Grid
                         x:Name="gridTunModeProxy"
-                        Width="600"
+                        Width="800"
                         Margin="{StaticResource SettingItemMargin}"
                         HorizontalAlignment="Left">
                         <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="1*" />
-                            <ColumnDefinition Width="10" />
-                            <ColumnDefinition Width="1*" />
+                            <ColumnDefinition Width="2*" />
+                            <ColumnDefinition Width="5" />
+                            <ColumnDefinition Width="2*" />
+                            <ColumnDefinition Width="5" />
+                            <ColumnDefinition Width="3*" />
                         </Grid.ColumnDefinitions>
                         <GroupBox
                             Grid.Column="0"
@@ -992,6 +1023,18 @@
                                 TextWrapping="Wrap"
                                 VerticalScrollBarVisibility="Auto" />
                         </GroupBox>
+                        <GridSplitter Grid.Column="3" HorizontalAlignment="Stretch" />
+                        <GroupBox
+                            Grid.Column="4"
+                            Header="{x:Static resx:ResUI.TbSettingsTunModeDNS}"
+                            Style="{StaticResource MyGroupBox}">
+                            <TextBox
+                                Name="txtProxyDNS"
+                                AcceptsReturn="True"
+                                Style="{StaticResource DefTextBox}"
+                                TextWrapping="Wrap"
+                                VerticalScrollBarVisibility="Auto" />
+                        </GroupBox>
                     </Grid>
 
                 </DockPanel>

v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs

@@ -17,6 +17,7 @@ namespace v2rayN.Views
         public OptionSettingWindow()
         {
             InitializeComponent();
+            this.Owner = Application.Current.MainWindow;
             _config = LazyConfig.Instance.GetConfig();
 
             ViewModel = new OptionSettingViewModel(this);
@@ -75,13 +76,12 @@ namespace v2rayN.Views
             //fill fonts
             try
             {
-                var dir = new DirectoryInfo(Utils.GetFontsPath());
-                var files = dir.GetFiles("*.ttf");
-                var culture = _config.uiItem.currentLanguage.Equals(Global.Languages[0]) ? "zh-cn" : "en-us";
+                var files = Directory.GetFiles(Utils.GetFontsPath(), "*.ttf");
+                var culture = _config.uiItem.currentLanguage == Global.Languages[0] ? "zh-cn" : "en-us";
                 var culture2 = "en-us";
-                foreach (var it in files)
+                foreach (var ttf in files)
                 {
-                    var families = Fonts.GetFontFamilies(Utils.GetFontsPath(it.Name));
+                    var families = Fonts.GetFontFamilies(Utils.GetFontsPath(ttf));
                     foreach (FontFamily family in families)
                     {
                         var typefaces = family.GetTypefaces();
@@ -171,6 +171,7 @@ namespace v2rayN.Views
 
 
                 this.Bind(ViewModel, vm => vm.TunShowWindow, v => v.togShowWindow.IsChecked).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.TunEnabledLog, v => v.togEnabledLog.IsChecked).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.TunStrictRoute, v => v.togStrictRoute.IsChecked).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.TunStack, v => v.cmbStack.Text).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.TunMtu, v => v.cmbMtu.Text).DisposeWith(disposables);
@@ -180,8 +181,10 @@ namespace v2rayN.Views
                 this.OneWayBind(ViewModel, vm => vm.TunBypassMode2, v => v.gridTunModeProxy.Visibility, vmToViewConverterOverride: new BooleanToVisibilityTypeConverter()).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.TunDirectIP, v => v.txtDirectIP.Text).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.TunDirectProcess, v => v.txtDirectProcess.Text).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.TunDirectDNS, v => v.txtDirectDNS.Text).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.TunProxyIP, v => v.txtProxyIP.Text).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.TunProxyProcess, v => v.txtProxyProcess.Text).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.TunProxyDNS, v => v.txtProxyDNS.Text).DisposeWith(disposables);
 
 
                 this.Bind(ViewModel, vm => vm.CoreType1, v => v.cmbCoreType1.Text).DisposeWith(disposables);

v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml

@@ -16,6 +16,7 @@
     Background="{DynamicResource MaterialDesignPaper}"
     FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
     ResizeMode="NoResize"
+    ShowInTaskbar="False"
     TextElement.FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
     TextElement.Foreground="{DynamicResource MaterialDesignBody}"
     TextOptions.TextFormattingMode="Display"

v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml.cs

@@ -12,6 +12,7 @@ namespace v2rayN.Views
         public RoutingRuleDetailsWindow(RulesItem rulesItem)
         {
             InitializeComponent();
+            this.Owner = Application.Current.MainWindow;
             this.Loaded += Window_Loaded;
             clbProtocol.SelectionChanged += ClbProtocol_SelectionChanged;
             clbInboundTag.SelectionChanged += ClbInboundTag_SelectionChanged;

v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml

@@ -16,6 +16,7 @@
     Background="{DynamicResource MaterialDesignPaper}"
     FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
     ResizeMode="NoResize"
+    ShowInTaskbar="False"
     TextElement.FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
     TextElement.Foreground="{DynamicResource MaterialDesignBody}"
     TextOptions.TextFormattingMode="Display"

v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml.cs

@@ -12,6 +12,7 @@ namespace v2rayN.Views
         public RoutingRuleSettingWindow(RoutingItem routingItem)
         {
             InitializeComponent();
+            this.Owner = Application.Current.MainWindow;
             this.Loaded += Window_Loaded;
             this.PreviewKeyDown += RoutingRuleSettingWindow_PreviewKeyDown;
             lstRules.SelectionChanged += lstRules_SelectionChanged;

v2rayN/v2rayN/Views/RoutingSettingWindow.xaml

@@ -16,6 +16,7 @@
     Background="{DynamicResource MaterialDesignPaper}"
     FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
     ResizeMode="NoResize"
+    ShowInTaskbar="False"
     TextElement.FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
     TextElement.Foreground="{DynamicResource MaterialDesignBody}"
     TextOptions.TextFormattingMode="Display"

v2rayN/v2rayN/Views/RoutingSettingWindow.xaml.cs

@@ -1,5 +1,6 @@
 using ReactiveUI;
 using System.Reactive.Disposables;
+using System.Windows;
 using System.Windows.Input;
 using v2rayN.Mode;
 using v2rayN.ViewModels;
@@ -11,6 +12,7 @@ namespace v2rayN.Views
         public RoutingSettingWindow()
         {
             InitializeComponent();
+            this.Owner = Application.Current.MainWindow;
             this.Closing += RoutingSettingWindow_Closing;
             this.PreviewKeyDown += RoutingSettingWindow_PreviewKeyDown;
             lstRoutings.SelectionChanged += lstRoutings_SelectionChanged;

v2rayN/v2rayN/Views/SubEditWindow.xaml

@@ -16,6 +16,7 @@
     Background="{DynamicResource MaterialDesignPaper}"
     FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
     ResizeMode="NoResize"
+    ShowInTaskbar="False"
     TextElement.FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
     TextElement.Foreground="{DynamicResource MaterialDesignBody}"
     TextOptions.TextFormattingMode="Display"

v2rayN/v2rayN/Views/SubEditWindow.xaml.cs

@@ -11,6 +11,7 @@ namespace v2rayN.Views
         public SubEditWindow(SubItem subItem)
         {
             InitializeComponent();
+            this.Owner = Application.Current.MainWindow;
             this.Loaded += Window_Loaded;
 
             ViewModel = new SubEditViewModel(subItem, this);

v2rayN/v2rayN/Views/SubSettingWindow.xaml

@@ -16,6 +16,7 @@
     Background="{DynamicResource MaterialDesignPaper}"
     FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
     ResizeMode="NoResize"
+    ShowInTaskbar="False"
     TextElement.FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
     TextElement.Foreground="{DynamicResource MaterialDesignBody}"
     TextOptions.TextFormattingMode="Display"

v2rayN/v2rayN/Views/SubSettingWindow.xaml.cs

@@ -1,6 +1,7 @@
 using ReactiveUI;
 using System.ComponentModel;
 using System.Reactive.Disposables;
+using System.Windows;
 using System.Windows.Input;
 using v2rayN.ViewModels;
 
@@ -11,6 +12,7 @@ namespace v2rayN.Views
         public SubSettingWindow()
         {
             InitializeComponent();
+            this.Owner = Application.Current.MainWindow;
 
             ViewModel = new SubSettingViewModel(this);
             this.Closing += SubSettingWindow_Closing;

v2rayN/v2rayN/v2rayN.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
+		<GenerateSatelliteAssembliesForCore>true</GenerateSatelliteAssembliesForCore>
 		<OutputType>WinExe</OutputType>
 		<TargetFramework>net6.0-windows</TargetFramework>
 		<Nullable>enable</Nullable>
@@ -9,10 +10,10 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<ApplicationIcon>v2rayN.ico</ApplicationIcon>
 		<Copyright>Copyright © 2017-2023 (GPLv3)</Copyright>
-		<FileVersion>6.12</FileVersion>
+		<FileVersion>6.14</FileVersion>
 	</PropertyGroup>
 
-	<ItemGroup>		
+	<ItemGroup>
 		<PackageReference Include="Downloader" Version="3.0.3" />		
 		<PackageReference Include="MaterialDesignThemes" Version="4.7.1" />
 		<PackageReference Include="Hardcodet.NotifyIcon.Wpf" Version="1.1.0" />		 
@@ -35,6 +36,9 @@
         <EmbeddedResource Include="Sample\tun_singbox">
 			<CopyToOutputDirectory>Never</CopyToOutputDirectory>
 		</EmbeddedResource>
+		<EmbeddedResource Include="Sample\tun_singbox_dns">
+			<CopyToOutputDirectory>Never</CopyToOutputDirectory>
+		</EmbeddedResource>
 		<EmbeddedResource Include="Sample\custom_routing_black">
           <CopyToOutputDirectory>Never</CopyToOutputDirectory>
         </EmbeddedResource>  
@@ -64,7 +68,7 @@
         </EmbeddedResource>  
         <EmbeddedResource Include="Sample\SampleServerConfig">
           <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-        </EmbeddedResource>
+        </EmbeddedResource>  
         <EmbeddedResource Include="v2rayN.ico">
           <CopyToOutputDirectory>Never</CopyToOutputDirectory>
         </EmbeddedResource>

v2rayN/v2rayUpgrade/MainForm.cs

@@ -11,18 +11,22 @@ namespace v2rayUpgrade
     public partial class MainForm : Form
     {
         private readonly string defaultFilename = "v2ray-windows.zip";
-        private string fileName;
+        private string? fileName;
 
         public MainForm(string[] args)
         {
             InitializeComponent();
             if (args.Length > 0)
             {
-                fileName = string.Join(" ", args);
-                fileName = HttpUtility.UrlDecode(fileName);
+                fileName = HttpUtility.UrlDecode(string.Join(" ", args));
+            }
+            else
+            {
+                fileName = defaultFilename;
             }
         }
-        private void showWarn(string message)
+
+        private void ShowWarn(string message)
         {
             MessageBox.Show(message, "", MessageBoxButtons.OK, MessageBoxIcon.Warning);
         }
@@ -34,7 +38,7 @@ namespace v2rayUpgrade
                 Process[] existing = Process.GetProcessesByName("v2rayN");
                 foreach (Process p in existing)
                 {
-                    string path = p.MainModule.FileName;
+                    string? path = p.MainModule?.FileName;
                     if (path == GetPath("v2rayN.exe"))
                     {
                         p.Kill();
@@ -45,72 +49,67 @@ namespace v2rayUpgrade
             catch (Exception ex)
             {
                 // Access may be denied without admin right. The user may not be an administrator.
-                showWarn("Failed to close v2rayN(关闭v2rayN失败).\n" +
+                ShowWarn("Failed to close v2rayN(关闭v2rayN失败).\n" +
                     "Close it manually, or the upgrade may fail.(请手动关闭正在运行的v2rayN，否则可能升级失败。\n\n" + ex.StackTrace);
             }
 
-            StringBuilder sb = new StringBuilder();
+            if (!File.Exists(fileName))
+            {
+                if (File.Exists(defaultFilename))
+                {
+                    fileName = defaultFilename;
+                }
+                else
+                {
+                    ShowWarn("Upgrade Failed, File Not Exist(升级失败,文件不存在).");
+                    return;
+                }
+            }
+
+            StringBuilder sb = new();
             try
             {
-                if (!File.Exists(fileName))
-                {
-                    if (File.Exists(defaultFilename))
-                    {
-                        fileName = defaultFilename;
-                    }
-                    else
-                    {
-                        showWarn("Upgrade Failed, File Not Exist(升级失败,文件不存在).");
-                        return;
-                    }
-                }
-
-                string thisAppOldFile = Application.ExecutablePath + ".tmp";
+                string thisAppOldFile = $"{Application.ExecutablePath}.tmp";
                 File.Delete(thisAppOldFile);
                 string startKey = "v2rayN/";
 
-
-                using (ZipArchive archive = ZipFile.OpenRead(fileName))
+                using ZipArchive archive = ZipFile.OpenRead(fileName);
+                foreach (ZipArchiveEntry entry in archive.Entries)
                 {
-                    foreach (ZipArchiveEntry entry in archive.Entries)
+                    try
                     {
-                        try
+                        if (entry.Length == 0)
                         {
-                            if (entry.Length == 0)
-                            {
-                                continue;
-                            }
-                            string fullName = entry.FullName;
-                            if (fullName.StartsWith(startKey))
-                            {
-                                fullName = fullName.Substring(startKey.Length, fullName.Length - startKey.Length);
-                            }
-                            if (Application.ExecutablePath.ToLower() == GetPath(fullName).ToLower())
-                            {
-                                File.Move(Application.ExecutablePath, thisAppOldFile);
-                            }
-
-                            string entryOuputPath = GetPath(fullName);
-
-                            FileInfo fileInfo = new FileInfo(entryOuputPath);
-                            fileInfo.Directory.Create();
-                            entry.ExtractToFile(entryOuputPath, true);
+                            continue;
                         }
-                        catch (Exception ex)
+                        string fullName = entry.FullName;
+                        if (fullName.StartsWith(startKey))
                         {
-                            sb.Append(ex.StackTrace);
+                            fullName = fullName[startKey.Length..];
                         }
+                        if (string.Equals(Application.ExecutablePath, GetPath(fullName), StringComparison.OrdinalIgnoreCase))
+                        {
+                            File.Move(Application.ExecutablePath, thisAppOldFile);
+                        }
+
+                        string entryOuputPath = GetPath(fullName);
+                        Directory.CreateDirectory(Path.GetDirectoryName(entryOuputPath)!);
+                        entry.ExtractToFile(entryOuputPath, true);
+                    }
+                    catch (Exception ex)
+                    {
+                        sb.Append(ex.StackTrace);
                     }
                 }
             }
             catch (Exception ex)
             {
-                showWarn("Upgrade Failed(升级失败)." + ex.StackTrace);
+                ShowWarn("Upgrade Failed(升级失败)." + ex.StackTrace);
                 return;
             }
             if (sb.Length > 0)
             {
-                showWarn("Upgrade Failed,Hold ctrl + c to copy to clipboard.\n" +
+                ShowWarn("Upgrade Failed,Hold ctrl + c to copy to clipboard.\n" +
                     "(升级失败,按住ctrl+c可以复制到剪贴板)." + sb.ToString());
                 return;
             }

v2rayN/v2rayUpgrade/v2rayUpgrade.csproj

@@ -6,5 +6,6 @@
 	<Copyright>Copyright © 2019-2023 (GPLv3)</Copyright>
 	<FileVersion>1.1.0.0</FileVersion>
 	<ApplicationManifest>app.manifest</ApplicationManifest>
+	<Nullable>enable</Nullable>
   </PropertyGroup>
 </Project>