up 6.15

解决全局热键不能录制Alt组合键的问题

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

@@ -9,7 +9,7 @@ namespace v2rayN.Base
         private static readonly Lazy<DownloaderHelper> _instance = new(() => new());
         public static DownloaderHelper Instance => _instance.Value;
 
-        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))
             {
@@ -45,7 +45,7 @@ namespace v2rayN.Base
             {
                 if (value.Error != null)
                 {
-                    throw new Exception(string.Format("{0}", value.Error.Message));
+                    throw value.Error;
                 }
             };
             using var stream = await downloader.DownloadFileTaskAsync(address: url, cancellationToken: cancellationToken.Token);
@@ -117,12 +117,12 @@ namespace v2rayN.Base
             };
             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))
             {

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,86 +9,46 @@ 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();
+            HttpClientHandler handler = new() { UseCookies = false };
+            HttpClientHelper helper = new(new HttpClient(handler));
+            return helper;
+        });
+        public static HttpClientHelper Instance => _instance.Value;
+        private readonly HttpClient httpClient;
+
+        private HttpClientHelper(HttpClient httpClient) => this.httpClient = httpClient;
 
-                HttpClientHandler handler = new() { UseCookies = false };
-                httpClientHelper.httpClient = new HttpClient(handler);
-                return httpClientHelper;
-            }
-        }
         public async Task<string?> GetAsync(string url)
         {
-            if (string.IsNullOrEmpty(url))
-            {
-                return null;
-            }
-            HttpResponseMessage response = await httpClient.GetAsync(url);
-
-            return await response.Content.ReadAsStringAsync();
+            if (string.IsNullOrEmpty(url)) return null;
+            return await httpClient.GetStringAsync(url);
         }
-        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(token);
+            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(nameof(url));
-            }
-            if (string.IsNullOrEmpty(fileName))
-            {
-                throw new ArgumentNullException(nameof(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 ?? -1L;
             var canReportProgress = total != -1 && progress != null;
@@ -96,48 +57,36 @@ namespace v2rayN.Base
             using var file = File.Create(fileName);
             var totalRead = 0L;
             var buffer = new byte[1024 * 1024];
-            var isMoreToRead = true;
             var progressPercentage = 0;
 
-            do
+            while (true)
             {
                 token.ThrowIfCancellationRequested();
 
                 var read = await stream.ReadAsync(buffer, token);
+                totalRead += read;
 
-                if (read == 0)
+                if (read == 0) break;
+                file.Write(buffer, 0, read);
+
+                if (canReportProgress)
                 {
-                    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 = (int)(100.0 * totalRead / total);
+                    //if (progressPercentage != percent && percent % 10 == 0)
                     {
-                        var percent = Convert.ToInt32((totalRead * 1d) / (total * 1d) * 100);
-                        if (progressPercentage != percent && percent % 10 == 0)
-                        {
-                            progressPercentage = percent;
-                            progress.Report(percent);
-                        }
+                        progressPercentage = percent;
+                        progress!.Report(percent);
                     }
                 }
-            } while (isMoreToRead);
+            }
             if (canReportProgress)
             {
-                progress.Report(101);
+                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))
             {
@@ -148,7 +97,7 @@ namespace v2rayN.Base
 
             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;

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

@@ -9,8 +9,9 @@ namespace v2rayN.Base
         private static readonly Lazy<SqliteHelper> _instance = new(() => new());
         public static SqliteHelper Instance => _instance.Value;
         private string _connstr;
-        public SQLiteConnection _db;
-        public SQLiteAsyncConnection _dbAsync;
+        private SQLiteConnection _db;
+        private SQLiteAsyncConnection _dbAsync;
+        private static readonly object objLock = new();
 
         public SqliteHelper()
         {
@@ -34,7 +35,10 @@ namespace v2rayN.Base
         }
         public int Replace(object model)
         {
-            return _db.InsertOrReplace(model);
+            lock (objLock)
+            {
+                return _db.InsertOrReplace(model);
+            }
         }
         public async Task<int> Replacesync(object model)
         {
@@ -43,7 +47,10 @@ namespace v2rayN.Base
 
         public int Update(object model)
         {
-            return _db.Update(model);
+            lock (objLock)
+            {
+                return _db.Update(model);
+            }
         }
         public async Task<int> UpdateAsync(object model)
         {
@@ -51,12 +58,18 @@ namespace v2rayN.Base
         }
         public int UpdateAll(IEnumerable models)
         {
-            return _db.UpdateAll(models);
+            lock (objLock)
+            {
+                return _db.UpdateAll(models);
+            }
         }
 
         public int Delete(object model)
         {
-            return _db.Delete(model);
+            lock (objLock)
+            {
+                return _db.Delete(model);
+            }
         }
         public async Task<int> DeleteAsync(object model)
         {

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);
         }
@@ -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/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";
@@ -123,7 +124,6 @@
 
         #region global variable
 
-        public static bool reloadCore { get; set; }
         public static int statePort { get; set; }
         public static Job processJob { get; set; }
         public static bool ShowInTaskbar { get; set; }

v2rayN/v2rayN/Handler/ConfigHandler.cs

@@ -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))
             {
@@ -195,16 +195,6 @@ namespace v2rayN.Handler
                 config.guiItem.statisticsFreshRate = 1;
             }
 
-            if (config == null)
-            {
-                Global.reloadCore = false;
-            }
-            else
-            {
-                Global.reloadCore = true;
-
-            }
-
             LazyConfig.Instance.SetConfig(config);
             return 0;
         }
@@ -215,7 +205,6 @@ namespace v2rayN.Handler
         /// <returns></returns>
         public static int SaveConfig(ref Config config, bool reload = true)
         {
-            Global.reloadCore = reload;
 
             ToJsonFile(config);
 
@@ -446,7 +435,6 @@ namespace v2rayN.Handler
             }
 
             config.indexId = indexId;
-            Global.reloadCore = true;
 
             ToJsonFile(config);
 
@@ -694,7 +682,7 @@ 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, "");
             if (lstModel.Count <= 0)
@@ -720,6 +708,8 @@ namespace v2rayN.Handler
                                   sort = t33 == null ? 0 : t33.sort
                               }).ToList();
 
+
+            Enum.TryParse(colName, true, out EServerColName name);
             var propertyName = string.Empty;
             switch (name)
             {
@@ -730,10 +720,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;
@@ -755,7 +749,7 @@ namespace v2rayN.Handler
             {
                 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)
@@ -766,7 +760,7 @@ namespace v2rayN.Handler
                     }
                 }
             }
-            if (name == EServerColName.speed)
+            if (name == EServerColName.speedVal)
             {
                 var maxSort = lstProfile.Max(t => t.sort) + 10;
                 foreach (var item in lstProfile)
@@ -850,7 +844,6 @@ namespace v2rayN.Handler
             }
             else if (profileItem.indexId == config.indexId)
             {
-                Global.reloadCore = true;
             }
 
             if (SqliteHelper.Instance.Replace(profileItem) > 0)
@@ -966,7 +959,7 @@ namespace v2rayN.Handler
                     var existItem = lstOriSub?.FirstOrDefault(t => CompareProfileItem(t, profileItem, true));
                     if (existItem != null)
                     {
-                        profileItem = existItem;
+                        profileItem.indexId = existItem.indexId;
                     }
                     //filter
                     if (!Utils.IsNullOrEmpty(subFilter))
@@ -1042,11 +1035,8 @@ namespace v2rayN.Handler
             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)
+            if (v2rayConfig?.inbounds?.Count > 0
+                && v2rayConfig.outbounds?.Count > 0)
             {
                 var fileName = Utils.GetTempPath($"{Utils.GetGUID(false)}.json");
                 File.WriteAllText(fileName, clipboardData);
@@ -1100,7 +1090,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;
             }
@@ -1137,16 +1127,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)
@@ -1313,44 +1303,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)
@@ -1496,8 +1448,6 @@ namespace v2rayN.Handler
                 config.routingBasicItem.routingIndexId = routingItem.id;
             }
 
-            Global.reloadCore = true;
-
             ToJsonFile(config);
 
             return 0;

v2rayN/v2rayN/Handler/CoreConfigHandler.cs

@@ -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);
@@ -613,12 +612,12 @@ namespace v2rayN.Handler
                             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;
@@ -724,7 +723,7 @@ namespace v2rayN.Handler
                         break;
                     default:
                         //tcp
-                        if (node.headerType.Equals(Global.TcpHeaderHttp))
+                        if (node.headerType == Global.TcpHeaderHttp)
                         {
                             TcpSettings tcpSettings = new()
                             {
@@ -734,7 +733,7 @@ namespace v2rayN.Handler
                                 }
                             };
 
-                            if (iobound.Equals("out"))
+                            if (iobound == "out")
                             {
                                 //request Host
                                 string request = Utils.GetEmbedText(Global.v2raySampleHttprequestFileName);
@@ -753,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);
@@ -789,7 +788,7 @@ namespace v2rayN.Handler
                 }
 
                 var obj = Utils.ParseJson(config.remoteDNS);
-                if (obj != null && obj.ContainsKey("servers"))
+                if (obj?.ContainsKey("servers") == true)
                 {
                     v2rayConfig.dns = obj;
                 }
@@ -1171,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];
                             }
@@ -1202,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))
                     {
@@ -1226,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;
                 }
@@ -1265,7 +1251,7 @@ namespace v2rayN.Handler
 
             try
             {
-                string result = Utils.LoadResource(fileName);
+                string? result = Utils.LoadResource(fileName);
                 if (Utils.IsNullOrEmpty(result))
                 {
                     msg = ResUI.FailedReadConfiguration;
@@ -1309,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];
                             }
@@ -1349,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))
                     {
@@ -1364,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;
                 }
@@ -1486,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;
                         }
@@ -1501,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;
                     }

v2rayN/v2rayN/Handler/CoreHandler.cs

@@ -27,46 +27,43 @@ namespace v2rayN.Handler
 
         public void LoadCore(Config config)
         {
-            if (Global.reloadCore)
+            var node = ConfigHandler.GetDefaultServer(ref config);
+            if (node == null)
             {
-                var node = ConfigHandler.GetDefaultServer(ref config);
-                if (node == null)
-                {
-                    ShowMsg(false, ResUI.CheckServerSettings);
-                    return;
-                }
+                ShowMsg(false, ResUI.CheckServerSettings);
+                return;
+            }
 
-                if (SetCore(config, node) != 0)
-                {
-                    ShowMsg(false, ResUI.CheckServerSettings);
-                    return;
-                }
-                string fileName = Utils.GetConfigPath(_coreCConfigRes);
-                if (CoreConfigHandler.GenerateClientConfig(node, fileName, out string msg, out string content) != 0)
-                {
-                    ShowMsg(false, msg);
-                }
-                else
-                {
-                    ShowMsg(false, msg);
-                    ShowMsg(true, $"{node.GetSummary()}");
-                    CoreStop();
-                    CoreStart(node);
-                }
+            if (SetCore(config, node) != 0)
+            {
+                ShowMsg(false, ResUI.CheckServerSettings);
+                return;
+            }
+            string fileName = Utils.GetConfigPath(_coreCConfigRes);
+            if (CoreConfigHandler.GenerateClientConfig(node, fileName, out string msg, out string content) != 0)
+            {
+                ShowMsg(false, msg);
+            }
+            else
+            {
+                ShowMsg(false, msg);
+                ShowMsg(true, $"{node.GetSummary()}");
+                CoreStop();
+                CoreStart(node);
+            }
 
-                //start a socks service
-                if (_process != null && !_process.HasExited && node.configType == EConfigType.Custom && node.preSocksPort > 0)
+            //start a socks service
+            if (_process != null && !_process.HasExited && node.configType == EConfigType.Custom && node.preSocksPort > 0)
+            {
+                var itemSocks = new ProfileItem()
                 {
-                    var itemSocks = new ProfileItem()
-                    {
-                        configType = EConfigType.Socks,
-                        address = Global.Loopback,
-                        port = node.preSocksPort
-                    };
-                    if (CoreConfigHandler.GenerateClientConfig(itemSocks, null, out string msg2, out string configStr) == 0)
-                    {
-                        _processId = CoreStartViaString(configStr);
-                    }
+                    configType = EConfigType.Socks,
+                    address = Global.Loopback,
+                    port = node.preSocksPort
+                };
+                if (CoreConfigHandler.GenerateClientConfig(itemSocks, null, out string msg2, out string configStr) == 0)
+                {
+                    _processId = CoreStartViaString(configStr);
                 }
             }
         }

v2rayN/v2rayN/Handler/DownloadHandle.cs

@@ -14,7 +14,7 @@ namespace v2rayN.Handler
     /// </summary>
     class DownloadHandle
     {
-        public event EventHandler<ResultEventArgs> UpdateCompleted;
+        public event EventHandler<ResultEventArgs>? UpdateCompleted;
 
         public event ErrorEventHandler? Error;
 
@@ -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, msg));
-                    }
+                    UpdateCompleted?.Invoke(this, new ResultEventArgs(value > 100, $"...{value}%"));
                 };
 
                 var webProxy = GetWebProxy(blProxy);
@@ -110,9 +106,9 @@ namespace v2rayN.Handler
             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();
+                return response.Headers.Location.ToString();
             }
             else
             {
@@ -192,14 +188,16 @@ namespace v2rayN.Handler
             try
             {
                 Utils.SetSecurityProtocol(LazyConfig.Instance.GetConfig().guiItem.enableSecurityProtocolTls13);
+                var webProxy = GetWebProxy(blProxy);
                 var client = new HttpClient(new SocketsHttpHandler()
                 {
-                    Proxy = GetWebProxy(blProxy)
+                    Proxy = webProxy,
+                    UseProxy = webProxy != null
                 });
 
                 if (Utils.IsNullOrEmpty(userAgent))
                 {
-                    userAgent = $"{Utils.GetVersion(false)}";
+                    userAgent = Utils.GetVersion(false);
                 }
                 client.DefaultRequestHeaders.UserAgent.TryParseAdd(userAgent);
 
@@ -213,7 +211,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)
@@ -242,7 +240,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;
@@ -260,7 +258,7 @@ namespace v2rayN.Handler
         }
 
 
-        public int RunAvailabilityCheck(WebProxy? webProxy)
+        public int RunAvailabilityCheck(IWebProxy? webProxy)
         {
             try
             {
@@ -290,7 +288,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;
@@ -300,18 +298,14 @@ namespace v2rayN.Handler
                 myHttpWebRequest.Timeout = downloadTimeout * 1000;
                 myHttpWebRequest.Proxy = webProxy;
 
-                Stopwatch timer = new();
-                timer.Start();
+                Stopwatch timer = Stopwatch.StartNew();
 
-                HttpWebResponse myHttpWebResponse = (HttpWebResponse)myHttpWebRequest.GetResponse();
+                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)
             {
@@ -338,25 +332,17 @@ namespace v2rayN.Handler
 
         private bool SocketCheck(string ip, int port)
         {
-            Socket? sock = null;
             try
             {
-                IPAddress ipa = IPAddress.Parse(ip);
-                IPEndPoint point = new(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

@@ -108,7 +108,7 @@ namespace v2rayN.Handler
             }
             if (!Utils.IsNullOrEmpty(filter))
             {
-                if (filter.Contains("'"))
+                if (filter.Contains('\''))
                 {
                     filter = filter.Replace("'", "");
                 }
@@ -156,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;
             }
@@ -179,7 +179,7 @@ namespace v2rayN.Handler
             {
                 InitCoreInfo();
             }
-            return coreInfos.Where(t => t.coreType == coreType).FirstOrDefault();
+            return coreInfos!.FirstOrDefault(t => t.coreType == coreType);
         }
 
         public List<CoreInfo>? GetCoreInfos()

v2rayN/v2rayN/Handler/ProfileExHandler.cs

@@ -1,4 +1,6 @@
-using v2rayN.Base;
+using System.Collections.Concurrent;
+using System.Reactive.Linq;
+using v2rayN.Base;
 using v2rayN.Mode;
 
 namespace v2rayN.Handler
@@ -6,8 +8,9 @@ namespace v2rayN.Handler
     class ProfileExHandler
     {
         private static readonly Lazy<ProfileExHandler> _instance = new(() => new());
-        private List<ProfileExItem> _lstProfileEx;
-        public List<ProfileExItem> ProfileExs => _lstProfileEx;
+        private ConcurrentBag<ProfileExItem> _lstProfileEx;
+        private Queue<string> _queIndexIds = new();
+        public ConcurrentBag<ProfileExItem> ProfileExs => _lstProfileEx;
         public static ProfileExHandler Instance => _instance.Value;
 
         public ProfileExHandler()
@@ -19,7 +22,33 @@ namespace v2rayN.Handler
         {
             SqliteHelper.Instance.Execute($"delete from ProfileExItem where indexId not in ( select indexId from ProfileItem )");
 
-            _lstProfileEx = SqliteHelper.Instance.Table<ProfileExItem>().ToList();
+            _lstProfileEx = new(SqliteHelper.Instance.Table<ProfileExItem>());
+
+            Task.Run(() =>
+            {
+                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)
+                        {
+                            SqliteHelper.Instance.Replace(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)
@@ -32,7 +61,7 @@ namespace v2rayN.Handler
                 sort = 0
             };
             _lstProfileEx.Add(profileEx);
-            //SqliteHelper.Instance.Replace(profileEx);
+            IndexIdEnqueue(indexId);
         }
 
         public void ClearAll()
@@ -45,11 +74,11 @@ namespace v2rayN.Handler
         {
             try
             {
-                foreach (var item in _lstProfileEx)
-                {
-                    SqliteHelper.Instance.Replace(item);
-                }
-                //SqliteHelper.Instance.UpdateAll(_lstProfileEx);
+                //foreach (var item in _lstProfileEx)
+                //{
+                //    SqliteHelper.Instance.Replace(item);
+                //}
+                SqliteHelper.Instance.UpdateAll(_lstProfileEx);
             }
             catch (Exception ex)
             {
@@ -57,7 +86,7 @@ namespace v2rayN.Handler
             }
         }
 
-        public Task SetTestDelay(string indexId, string delayVal)
+        public void SetTestDelay(string indexId, string delayVal)
         {
             var profileEx = _lstProfileEx.FirstOrDefault(t => t.indexId == indexId);
             if (profileEx == null)
@@ -67,10 +96,10 @@ namespace v2rayN.Handler
 
             int.TryParse(delayVal, out int delay);
             profileEx.delay = delay;
-            return Task.CompletedTask;
+            IndexIdEnqueue(indexId);
         }
 
-        public Task SetTestSpeed(string indexId, string speedVal)
+        public void SetTestSpeed(string indexId, string speedVal)
         {
             var profileEx = _lstProfileEx.FirstOrDefault(t => t.indexId == indexId);
             if (profileEx == null)
@@ -80,7 +109,7 @@ namespace v2rayN.Handler
 
             decimal.TryParse(speedVal, out decimal speed);
             profileEx.speed = speed;
-            return Task.CompletedTask;
+            IndexIdEnqueue(indexId);
         }
 
         public void SetSort(string indexId, int sort)
@@ -91,6 +120,7 @@ namespace v2rayN.Handler
                 AddProfileEx(indexId, ref profileEx);
             }
             profileEx.sort = sort;
+            IndexIdEnqueue(indexId);
         }
 
         public int GetSort(string indexId)

v2rayN/v2rayN/Handler/ShareHandler.cs

@@ -274,7 +274,7 @@ namespace v2rayN.Handler
         {
             msg = string.Empty;
 
-            ProfileItem profileItem = new();  
+            ProfileItem profileItem = new();
 
             try
             {

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;
                 }
             }
@@ -112,24 +116,24 @@ namespace v2rayN.Handler
 
         private void RunPing()
         {
-            RunPingSub(async (ServerTestItem it) =>
+            RunPingSub((ServerTestItem it) =>
             {
                 long time = Ping(it.address);
                 var output = FormatOut(time, Global.DelayUnit);
 
-                await ProfileExHandler.Instance.SetTestDelay(it.indexId, output);
+                ProfileExHandler.Instance.SetTestDelay(it.indexId, output);
                 UpdateFunc(it.indexId, output);
             });
         }
 
         private void RunTcping()
         {
-            RunPingSub(async (ServerTestItem it) =>
+            RunPingSub((ServerTestItem it) =>
             {
                 int time = GetTcpingTime(it.address, it.port);
                 var output = FormatOut(time, Global.DelayUnit);
 
-                await ProfileExHandler.Instance.SetTestDelay(it.indexId, output);
+                ProfileExHandler.Instance.SetTestDelay(it.indexId, output);
                 UpdateFunc(it.indexId, output);
             });
         }
@@ -161,7 +165,7 @@ namespace v2rayN.Handler
                     {
                         continue;
                     }
-                    tasks.Add(Task.Run(async () =>
+                    tasks.Add(Task.Run(() =>
                     {
                         try
                         {
@@ -169,7 +173,7 @@ namespace v2rayN.Handler
                             WebProxy webProxy = new(Global.Loopback, it.port);
                             string output = GetRealPingTime(downloadHandle, webProxy);
 
-                            await ProfileExHandler.Instance.SetTestDelay(it.indexId, output);
+                            ProfileExHandler.Instance.SetTestDelay(it.indexId, output);
                             UpdateFunc(it.indexId, output);
                             int.TryParse(output, out int delay);
                             it.delay = delay;
@@ -231,7 +235,7 @@ namespace v2rayN.Handler
                 //    UpdateFunc(it.indexId, "", ResUI.SpeedtestingSkip);
                 //    continue;
                 //}
-                await ProfileExHandler.Instance.SetTestSpeed(it.indexId, "-1");
+                ProfileExHandler.Instance.SetTestSpeed(it.indexId, "-1");
 
                 var item = LazyConfig.Instance.GetProfileItem(it.indexId);
                 if (item is null) continue;
@@ -243,7 +247,7 @@ namespace v2rayN.Handler
                     decimal.TryParse(msg, out decimal dec);
                     if (dec > 0)
                     {
-                        await ProfileExHandler.Instance.SetTestSpeed(it.indexId, msg);
+                        ProfileExHandler.Instance.SetTestSpeed(it.indexId, msg);
                     }
                     UpdateFunc(it.indexId, "", msg);
                 });
@@ -282,7 +286,7 @@ namespace v2rayN.Handler
                 {
                     continue;
                 }
-                await ProfileExHandler.Instance.SetTestSpeed(it.indexId, "-1");
+                ProfileExHandler.Instance.SetTestSpeed(it.indexId, "-1");
 
                 var item = LazyConfig.Instance.GetProfileItem(it.indexId);
                 if (item is null) continue;
@@ -293,7 +297,7 @@ namespace v2rayN.Handler
                     decimal.TryParse(msg, out decimal dec);
                     if (dec > 0)
                     {
-                        await ProfileExHandler.Instance.SetTestSpeed(it.indexId, msg);
+                        ProfileExHandler.Instance.SetTestSpeed(it.indexId, msg);
                     }
                     UpdateFunc(it.indexId, "", msg);
                 });
@@ -319,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;

v2rayN/v2rayN/Handler/StatisticsHandler.cs

@@ -162,7 +162,7 @@ namespace v2rayN.Handler
                         todayDown = 0,
                         dateNow = ticks
                     };
-                    _ = SqliteHelper.Instance.Replacesync(_serverStatItem);
+                    SqliteHelper.Instance.Replace(_serverStatItem);
                     _lstServerStat.Add(_serverStatItem);
                 }
             }

v2rayN/v2rayN/Handler/SysProxyHandle.cs

@@ -50,7 +50,7 @@ namespace v2rayN.Handler
         {
             var type = config.sysProxyType;
 
-            if (forceDisable && type == ESysProxyType.ForcedChange)
+            if (forceDisable && type != ESysProxyType.Unchanged)
             {
                 type = ESysProxyType.ForcedClear;
             }

v2rayN/v2rayN/Handler/TunHandler.cs

@@ -45,7 +45,7 @@ namespace v2rayN.Base
         {
             var socksPort = LazyConfig.Instance.GetLocalPort(Global.InboundSocks);
 
-            if (socksPort.Equals(_socksPort)
+            if (socksPort == _socksPort
                 && _process != null
                 && !_process.HasExited)
             {
@@ -103,7 +103,7 @@ namespace v2rayN.Base
             configStr = configStr.Replace("$stack$", $"{_config.tunModeItem.stack}");
 
             //logs
-            configStr = configStr.Replace("$log_disabled$", $"aaa{(!_config.tunModeItem.enabledLog).ToString().ToLower()}");
+            configStr = configStr.Replace("$log_disabled$", $"{(!_config.tunModeItem.enabledLog).ToString().ToLower()}");
             if (_config.tunModeItem.showWindow)
             {
                 configStr = configStr.Replace("$log_output$", $"");
@@ -118,6 +118,22 @@ namespace v2rayN.Base
             //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> lstDirectExe = new();

v2rayN/v2rayN/Handler/UpdateHandle.cs

@@ -164,14 +164,14 @@ namespace v2rayN.Handler
             Task.Run(async () =>
             {
                 //Turn off system proxy
-                bool bSysProxyType = false;
-                if (!blProxy && config.sysProxyType == ESysProxyType.ForcedChange)
-                {
-                    bSysProxyType = true;
-                    config.sysProxyType = ESysProxyType.ForcedClear;
-                    SysProxyHandle.UpdateSysProxy(config, false);
-                    Thread.Sleep(3000);
-                }
+                //bool bSysProxyType = false;
+                //if (!blProxy && config.sysProxyType == ESysProxyType.ForcedChange)
+                //{
+                //    bSysProxyType = true;
+                //    config.sysProxyType = ESysProxyType.ForcedClear;
+                //    SysProxyHandle.UpdateSysProxy(config, false);
+                //    Thread.Sleep(3000);
+                //}
 
                 foreach (var item in subItem)
                 {
@@ -235,12 +235,12 @@ namespace v2rayN.Handler
                     }
                     _updateFunc(false, "-------------------------------------------------------");
                 }
-                //restore system proxy
-                if (bSysProxyType)
-                {
-                    config.sysProxyType = ESysProxyType.ForcedChange;
-                    SysProxyHandle.UpdateSysProxy(config, false);
-                }
+                ////restore system proxy
+                //if (bSysProxyType)
+                //{
+                //    config.sysProxyType = ESysProxyType.ForcedChange;
+                //    SysProxyHandle.UpdateSysProxy(config, false);
+                //}
                 _updateFunc(true, $"{ResUI.MsgUpdateSubscriptionEnd}");
 
             });

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]
@@ -168,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; }
 
     }
 
@@ -193,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/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>
@@ -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>

v2rayN/v2rayN/Resx/ResUI.resx

@@ -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

@@ -1126,4 +1126,10 @@
   <data name="TbSettingsSpeedTestUrl" xml:space="preserve">
     <value>测速文件地址</value>
   </data>
-</root>
+  <data name="TbSettingsTunModeDNS" xml:space="preserve">
+    <value>DNS对象，例如 {"servers":[]}</value>
+  </data>
+  <data name="menuMoveTo" xml:space="preserve">
+    <value>移至上下</value>
+  </data>
+</root>

v2rayN/v2rayN/Sample/custom_routing_black

@@ -14,7 +14,14 @@
   {
     "outboundTag": "proxy",
     "ip": [
-      "geoip:telegram"
+      "geoip:cloudflare",
+      "geoip:cloudfront",
+      "geoip:facebook",
+      "geoip:fastly",
+      "geoip:google",
+      "geoip:netflix",
+      "geoip:telegram",
+      "geoip:twitter"
     ],
     "domain": [
       "geosite:gfw",

v2rayN/v2rayN/Sample/tun_singbox

@@ -5,27 +5,7 @@
     $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,31 @@
+  {
+    "servers": [
+      {
+        "tag": "out_dns",
+        "address": "8.8.8.8",
+        "detour": "proxy"
+      },
+      {
+        "tag": "local",
+        "address": "223.5.5.5",
+        "detour": "direct"
+      },
+      {
+        "tag": "block",
+        "address": "rcode://success"
+      }
+    ],
+    "rules": [
+      {
+        "geosite": "cn",
+        "server": "local",
+        "disable_cache": true
+      },
+      {
+        "geosite": "category-ads-all",
+        "server": "block",
+        "disable_cache": true
+      }
+    ],
+    "strategy": "ipv4_only"
+  }

v2rayN/v2rayN/Tool/Utils.cs

@@ -65,24 +65,18 @@ namespace v2rayN
         /// 取得存储资源
         /// </summary>
         /// <returns></returns>
-        public static string LoadResource(string res)
+        public static string? LoadResource(string res)
         {
-            string result = string.Empty;
-
             try
             {
-                if (!File.Exists(res))
-                {
-                    return result;
-                }
-                using StreamReader reader = new(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>
@@ -91,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
             {
@@ -117,6 +111,10 @@ namespace v2rayN
             string result = string.Empty;
             try
             {
+                if (obj == null)
+                {
+                    return result;
+                }
                 if (indented)
                 {
                     result = JsonConvert.SerializeObject(obj,
@@ -172,8 +170,7 @@ namespace v2rayN
         {
             try
             {
-                JObject obj = JObject.Parse(strJson);
-                return obj;
+                return JObject.Parse(strJson);
             }
             catch (Exception ex)
             {
@@ -204,7 +201,7 @@ namespace v2rayN
                 }
                 else
                 {
-                    return string.Join(",", lst.ToArray());
+                    return string.Join(",", lst);
                 }
             }
             catch (Exception ex)
@@ -489,7 +486,7 @@ namespace v2rayN
             {
                 return true;
             }
-            if (text.Equals("null"))
+            if (text == "null")
             {
                 return true;
             }
@@ -636,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;
                 }
@@ -738,9 +735,9 @@ namespace v2rayN
         {
             const string subkey = @"SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full\";
             using RegistryKey? ndpKey = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry32).OpenSubKey(subkey);
-            if (ndpKey != null && ndpKey.GetValue("Release") != null)
+            if (ndpKey?.GetValue("Release") != null)
             {
-                return (int)ndpKey.GetValue("Release") >= release ? true : false;
+                return (int)ndpKey.GetValue("Release") >= release;
             }
             return false;
         }
@@ -1161,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);
             }
@@ -1193,8 +1190,8 @@ namespace v2rayN
                     {
                         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);
+                        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))
@@ -1204,9 +1201,9 @@ namespace v2rayN
                                             GraphicsUnit.Pixel);
                         }
 
-                        BitmapLuminanceSource source = new BitmapLuminanceSource(target);
-                        BinaryBitmap bitmap = new BinaryBitmap(new HybridBinarizer(source));
-                        QRCodeReader reader = new QRCodeReader();
+                        BitmapLuminanceSource source = new(target);
+                        BinaryBitmap bitmap = new(new HybridBinarizer(source));
+                        QRCodeReader reader = new();
                         Result result = reader.decode(bitmap);
                         if (result != null)
                         {

v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs

@@ -38,7 +38,7 @@ namespace v2rayN.ViewModels
         private static Config _config;
         private NoticeHandler? _noticeHandler;
         private readonly PaletteHelper _paletteHelper = new();
-        private Dictionary<int, bool> _dicHeaderSort = new();
+        private Dictionary<string, bool> _dicHeaderSort = new();
         private Action<string> _updateView;
 
         #endregion
@@ -175,6 +175,8 @@ namespace v2rayN.ViewModels
         [Reactive]
         public string RunningServerDisplay { get; set; }
         [Reactive]
+        public string RunningServerToolTipText { get; set; }
+        [Reactive]
         public string RunningInfoDisplay { get; set; }
         [Reactive]
         public string SpeedProxyDisplay { get; set; }
@@ -218,10 +220,11 @@ namespace v2rayN.ViewModels
             {
                 EnableTun = true;
             }
+            _subId = _config.subIndexId;
 
-            //RefreshServers();
             InitSubscriptionView();
             RefreshRoutingsMenu();
+            RefreshServers();
 
             var canEditRemove = this.WhenAnyValue(
                x => x.SelectedProfile,
@@ -365,7 +368,7 @@ namespace v2rayN.ViewModels
             }, canEditRemove);
             SortServerResultCmd = ReactiveCommand.Create(() =>
             {
-                SortServer((int)EServerColName.delay);
+                SortServer(EServerColName.delayVal.ToString());
             });
             //servers export
             Export2ClientConfigCmd = ReactiveCommand.Create(() =>
@@ -537,8 +540,12 @@ namespace v2rayN.ViewModels
             _noticeHandler?.SendMessage(msg);
             if (success)
             {
+                var indexIdOld = _config.indexId;
                 RefreshServers();
-                Reload();
+                if (indexIdOld != _config.indexId)
+                {
+                    Reload();
+                }
                 if (_config.uiItem.enableAutoAdjustMainLvColWidth)
                 {
                     _updateView("AdjustMainLvColWidth");
@@ -691,6 +698,7 @@ namespace v2rayN.ViewModels
                 return;
             }
             _subId = SelectedSub?.id;
+            _config.subIndexId = _subId;
 
             RefreshServers();
 
@@ -736,6 +744,7 @@ namespace v2rayN.ViewModels
                             subRemarks = t.subRemarks,
                             isActive = t.indexId == _config.indexId,
                             sort = t33 == null ? 0 : t33.sort,
+                            delay = t33 == null ? 0 : t33.delay,
                             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),
@@ -768,7 +777,9 @@ namespace v2rayN.ViewModels
                 var running = ConfigHandler.GetDefaultServer(ref _config);
                 if (running != null)
                 {
-                    RunningServerDisplay = string.Format("{0}:{1}", ResUI.menuServers, running.GetSummary());
+                    var runningSummary = running.GetSummary();
+                    RunningServerDisplay = $"{ResUI.menuServers}:{runningSummary}";
+                    RunningServerToolTipText = runningSummary;
                 }
             }));
         }
@@ -788,7 +799,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;
                 }
@@ -1032,23 +1043,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();
         }
 
@@ -1360,7 +1371,6 @@ namespace v2rayN.ViewModels
 
         public void Reload()
         {
-            Global.reloadCore = true;
             _ = LoadV2ray();
         }
 
@@ -1380,7 +1390,6 @@ namespace v2rayN.ViewModels
             {
                 _coreHandler.LoadCore(_config);
 
-                Global.reloadCore = false;
                 //ConfigHandler.SaveConfig(ref _config, false);
 
                 ChangeSystemProxyStatus(_config.sysProxyType, false);
@@ -1456,7 +1465,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;
                 }

v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs

@@ -84,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
@@ -177,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);
@@ -253,7 +257,7 @@ namespace v2rayN.ViewModels
             }
 
             var obj = Utils.ParseJson(remoteDNS);
-            if (obj != null && obj.ContainsKey("servers"))
+            if (obj?.ContainsKey("servers") == true)
             {
             }
             else
@@ -277,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;
@@ -350,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/RoutingRuleSettingViewModel.cs

@@ -299,7 +299,7 @@ namespace v2rayN.ViewModels
                 UI.Show(ResUI.OperationSuccess);
             }
         }
-        private void ImportRulesFromUrl()
+        private async Task ImportRulesFromUrl()
         {
             var url = SelectedRouting.url;
             if (Utils.IsNullOrEmpty(url))
@@ -308,19 +308,16 @@ namespace v2rayN.ViewModels
                 return;
             }
 
-            Task.Run(async () =>
+            DownloadHandle downloadHandle = new DownloadHandle();
+            string result = await downloadHandle.TryDownloadString(url, true, "");
+            if (AddBatchRoutingRules(SelectedRouting, result) == 0)
             {
-                DownloadHandle downloadHandle = new DownloadHandle();
-                string result = await downloadHandle.DownloadStringAsync(url, false, "");
-                if (AddBatchRoutingRules(SelectedRouting, result) == 0)
+                Application.Current.Dispatcher.Invoke((Action)(() =>
                 {
-                    Application.Current.Dispatcher.Invoke((Action)(() =>
-                    {
-                        RefreshRulesItems();
-                    }));
-                    UI.Show(ResUI.OperationSuccess);
-                }
-            });
+                    RefreshRulesItems();
+                }));
+                UI.Show(ResUI.OperationSuccess);
+            }
         }
         private int AddBatchRoutingRules(RoutingItem routingItem, string clipboardData)
         {

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/AddServerWindow.xaml.cs

@@ -185,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 =>
@@ -198,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);
@@ -222,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.cs

@@ -57,19 +57,21 @@ namespace v2rayN.Views
 
         private void TxtGlobalHotkey_KeyDown(object sender, KeyEventArgs e)
         {
-            var txt = ((TextBox)sender);
-            var index = Utils.ToInt(txt.Name.Substring(txt.Name.Length - 1, 1));
+            e.Handled = true;
+            var _ModifierKeys = new Key[] { Key.LeftCtrl, Key.RightCtrl, Key.LeftShift, Key.RightShift, Key.LeftAlt, Key.RightAlt };
+            if (!_ModifierKeys.Contains(e.Key) && !_ModifierKeys.Contains(e.SystemKey))
+            {
+                var txt = ((TextBox)sender);
+                var index = Utils.ToInt(txt.Name.Substring(txt.Name.Length - 1, 1));
+                var formsKey = (Forms.Keys)KeyInterop.VirtualKeyFromKey(e.Key == Key.System ? e.SystemKey : e.Key);
 
-            if (e.Key == Key.System)
-                return;
-            var formsKey = (Forms.Keys)KeyInterop.VirtualKeyFromKey(e.Key);
+                lstKey[index].KeyCode = formsKey;
+                lstKey[index].Alt = (Keyboard.Modifiers & ModifierKeys.Alt) == ModifierKeys.Alt;
+                lstKey[index].Control = (Keyboard.Modifiers & ModifierKeys.Control) == ModifierKeys.Control;
+                lstKey[index].Shift = (Keyboard.Modifiers & ModifierKeys.Shift) == ModifierKeys.Shift;
 
-            lstKey[index].KeyCode = formsKey;
-            lstKey[index].Alt = Keyboard.IsKeyDown(Key.LeftAlt) || Keyboard.IsKeyDown(Key.RightAlt);
-            lstKey[index].Control = Keyboard.IsKeyDown(Key.LeftCtrl) || Keyboard.IsKeyDown(Key.RightCtrl);
-            lstKey[index].Shift = Keyboard.IsKeyDown(Key.LeftShift) || Keyboard.IsKeyDown(Key.RightShift);
-
-            BindingData(index);
+                BindingData(index);
+            }
         }
 
         private void BindingData(int index)
@@ -85,19 +87,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);
@@ -148,11 +150,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

@@ -53,7 +53,10 @@
                             <MenuItem Padding="8,0">
                                 <MenuItem.Header>
                                     <StackPanel Orientation="Horizontal">
-                                        <materialDesign:PackIcon Margin="0,0,8,0" Kind="Server" />
+                                        <materialDesign:PackIcon
+                                            Margin="0,0,8,0"
+                                            VerticalAlignment="Center"
+                                            Kind="Server" />
                                         <TextBlock Text="{x:Static resx:ResUI.menuServers}" />
                                     </StackPanel>
                                 </MenuItem.Header>
@@ -99,7 +102,10 @@
                             <MenuItem Padding="8,0">
                                 <MenuItem.Header>
                                     <StackPanel Orientation="Horizontal">
-                                        <materialDesign:PackIcon Margin="0,0,8,0" Kind="BookClockOutline" />
+                                        <materialDesign:PackIcon
+                                            Margin="0,0,8,0"
+                                            VerticalAlignment="Center"
+                                            Kind="BookClockOutline" />
                                         <TextBlock Text="{x:Static resx:ResUI.menuSubscription}" />
                                     </StackPanel>
                                 </MenuItem.Header>
@@ -131,7 +137,10 @@
                             <MenuItem Padding="8,0">
                                 <MenuItem.Header>
                                     <StackPanel Orientation="Horizontal">
-                                        <materialDesign:PackIcon Margin="0,0,8,0" Kind="SettingsOutline" />
+                                        <materialDesign:PackIcon
+                                            Margin="0,0,8,0"
+                                            VerticalAlignment="Center"
+                                            Kind="SettingsOutline" />
                                         <TextBlock Text="{x:Static resx:ResUI.menuSetting}" />
                                     </StackPanel>
                                 </MenuItem.Header>
@@ -169,7 +178,10 @@
                             <MenuItem x:Name="menuReload" Padding="8,0">
                                 <MenuItem.Header>
                                     <StackPanel Orientation="Horizontal">
-                                        <materialDesign:PackIcon Margin="0,0,8,0" Kind="Reload" />
+                                        <materialDesign:PackIcon
+                                            Margin="0,0,8,0"
+                                            VerticalAlignment="Center"
+                                            Kind="Reload" />
                                         <TextBlock Text="{x:Static resx:ResUI.menuReload}" />
                                     </StackPanel>
                                 </MenuItem.Header>
@@ -180,7 +192,10 @@
                             <MenuItem Padding="8,0">
                                 <MenuItem.Header>
                                     <StackPanel Orientation="Horizontal">
-                                        <materialDesign:PackIcon Margin="0,0,8,0" Kind="Update" />
+                                        <materialDesign:PackIcon
+                                            Margin="0,0,8,0"
+                                            VerticalAlignment="Center"
+                                            Kind="Update" />
                                         <TextBlock Text="{x:Static resx:ResUI.menuCheckUpdate}" />
                                     </StackPanel>
                                 </MenuItem.Header>
@@ -221,7 +236,10 @@
                             <MenuItem x:Name="menuHelp" Padding="8,0">
                                 <MenuItem.Header>
                                     <StackPanel Orientation="Horizontal">
-                                        <materialDesign:PackIcon Margin="0,0,8,0" Kind="HelpCircleOutline" />
+                                        <materialDesign:PackIcon
+                                            Margin="0,0,8,0"
+                                            VerticalAlignment="Center"
+                                            Kind="HelpCircleOutline" />
                                         <TextBlock Text="{x:Static resx:ResUI.menuHelp}" />
                                     </StackPanel>
                                 </MenuItem.Header>
@@ -235,7 +253,10 @@
                                 Click="menuPromotion_Click">
                                 <MenuItem.Header>
                                     <StackPanel Orientation="Horizontal">
-                                        <materialDesign:PackIcon Margin="0,0,8,0" Kind="VolumeHigh" />
+                                        <materialDesign:PackIcon
+                                            Margin="0,0,8,0"
+                                            VerticalAlignment="Center"
+                                            Kind="VolumeHigh" />
                                         <TextBlock Text="{x:Static resx:ResUI.menuPromotion}" />
                                     </StackPanel>
                                 </MenuItem.Header>
@@ -249,7 +270,10 @@
                                 Click="menuClose_Click">
                                 <MenuItem.Header>
                                     <StackPanel Orientation="Horizontal">
-                                        <materialDesign:PackIcon Margin="0,0,8,0" Kind="Minimize" />
+                                        <materialDesign:PackIcon
+                                            Margin="0,0,8,0"
+                                            VerticalAlignment="Center"
+                                            Kind="Minimize" />
                                         <TextBlock Text="{x:Static resx:ResUI.menuClose}" />
                                     </StackPanel>
                                 </MenuItem.Header>
@@ -259,6 +283,7 @@
                         <materialDesign:PopupBox
                             Padding="8,0"
                             HorizontalAlignment="Right"
+                            StaysOpen="True"
                             Style="{StaticResource MaterialDesignToolForegroundPopupBox}">
                             <StackPanel Margin="8">
                                 <Grid>
@@ -351,12 +376,13 @@
                         Height="30"
                         Margin="4,0"
                         Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}">
-                        <materialDesign:PackIcon Kind="Plus" />
+                        <materialDesign:PackIcon VerticalAlignment="Center" 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}" />
@@ -458,6 +484,7 @@
                         CanUserSortColumns="False"
                         EnableRowVirtualization="True"
                         Focusable="True"
+                        FrozenColumnCount="1"
                         GridLinesVisibility="All"
                         HeadersVisibility="All"
                         IsReadOnly="True"
@@ -538,22 +565,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}"
@@ -600,41 +629,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}">
@@ -642,37 +680,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>
@@ -694,6 +737,7 @@
                                     <materialDesign:PackIcon
                                         x:Name="menuSystemProxyClear2"
                                         Margin="0,0,8,0"
+                                        VerticalAlignment="Center"
                                         Kind="Check" />
                                     <TextBlock Text="{x:Static resx:ResUI.menuSystemProxyClear}" />
                                 </StackPanel>
@@ -705,6 +749,7 @@
                                     <materialDesign:PackIcon
                                         x:Name="menuSystemProxySet2"
                                         Margin="0,0,8,0"
+                                        VerticalAlignment="Center"
                                         Kind="Check" />
                                     <TextBlock Text="{x:Static resx:ResUI.menuSystemProxySet}" />
                                 </StackPanel>
@@ -716,6 +761,7 @@
                                     <materialDesign:PackIcon
                                         x:Name="menuSystemProxyNothing2"
                                         Margin="0,0,8,0"
+                                        VerticalAlignment="Center"
                                         Kind="Check" />
                                     <TextBlock Text="{x:Static resx:ResUI.menuSystemProxyNothing}" />
                                 </StackPanel>
@@ -727,6 +773,7 @@
                                     <materialDesign:PackIcon
                                         x:Name="menuSystemProxyPac2"
                                         Margin="0,0,8,0"
+                                        VerticalAlignment="Center"
                                         Kind="Check" />
                                     <TextBlock Text="{x:Static resx:ResUI.menuSystemProxyPac}" />
                                 </StackPanel>

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;
@@ -157,6 +158,7 @@ namespace v2rayN.Views
                 this.BindCommand(ViewModel, vm => vm.SubUpdateViaProxyCmd, v => v.menuSubUpdateViaProxy2).DisposeWith(disposables);
 
                 this.OneWayBind(ViewModel, vm => vm.NotifyIcon, v => v.tbNotify.Icon).DisposeWith(disposables);
+                this.OneWayBind(ViewModel, vm => vm.RunningServerToolTipText, v => v.tbNotify.ToolTipText).DisposeWith(disposables);
                 this.OneWayBind(ViewModel, vm => vm.NotifyLeftClickCmd, v => v.tbNotify.LeftClickCommand).DisposeWith(disposables);
                 this.OneWayBind(ViewModel, vm => vm.AppIcon, v => v.Icon).DisposeWith(disposables);
 
@@ -189,6 +191,11 @@ namespace v2rayN.Views
             this.Title = $"{Utils.GetVersion()} - {(IsAdministrator ? ResUI.RunAsAdmin : ResUI.NotRunAsAdmin)}";
 
             spEnableTun.Visibility = IsAdministrator ? Visibility.Visible : Visibility.Collapsed;
+         
+            if (_config.uiItem.autoHideStartup)
+            {
+                WindowState = WindowState.Minimized;
+            }
         }
 
         #region Event 
@@ -197,13 +204,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 +272,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 +282,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 +356,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 +404,7 @@ namespace v2rayN.Views
         }
         #endregion
 
-        #region UI
+        #region UI          
 
         private void RestoreUI()
         {
@@ -429,11 +430,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 +458,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 +491,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 +501,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 +542,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 +550,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 +568,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 +593,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

@@ -10,7 +10,7 @@
     xmlns:resx="clr-namespace:v2rayN.Resx"
     xmlns:vms="clr-namespace:v2rayN.ViewModels"
     Title="{x:Static resx:ResUI.menuSetting}"
-    Width="900"
+    Width="1000"
     Height="700"
     x:TypeArguments="vms:OptionSettingViewModel"
     Background="{DynamicResource MaterialDesignPaper}"
@@ -47,7 +47,7 @@
                 Style="{StaticResource DefButton}" />
         </Grid>
 
-        <TabControl>
+        <TabControl HorizontalContentAlignment="Left">
             <TabItem Header="{x:Static resx:ResUI.TbSettingsCore}">
                 <ScrollViewer VerticalScrollBarVisibility="Visible">
                     <Grid Margin="{StaticResource SettingItemMargin}">
@@ -485,7 +485,7 @@
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="Auto" />
                             <ColumnDefinition Width="Auto" />
-                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" />
                         </Grid.ColumnDefinitions>
 
                         <TextBlock
@@ -507,7 +507,8 @@
                             Margin="{StaticResource ServerItemMargin}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
-                            Text="{x:Static resx:ResUI.TbSettingsStartBootTip}" />
+                            Text="{x:Static resx:ResUI.TbSettingsStartBootTip}"
+                            TextWrapping="Wrap" />
 
                         <TextBlock
                             Grid.Row="2"
@@ -719,7 +720,8 @@
                             Margin="{StaticResource ServerItemMargin}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
-                            Text="{x:Static resx:ResUI.TbSettingsCurrentFontFamilyTip}" />
+                            Text="{x:Static resx:ResUI.TbSettingsCurrentFontFamilyTip}"
+                            TextWrapping="Wrap" />
 
                         <TextBlock
                             Grid.Row="16"
@@ -941,13 +943,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"
@@ -972,17 +976,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"
@@ -1007,6 +1025,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

@@ -76,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();
@@ -182,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/RoutingRuleSettingWindow.xaml

@@ -32,28 +32,40 @@
                 Style="{StaticResource MaterialDesignToolBar}">
                 <Button x:Name="menuRuleAdd">
                     <StackPanel Orientation="Horizontal">
-                        <materialDesign:PackIcon Margin="0,0,8,0" Kind="Plus" />
+                        <materialDesign:PackIcon
+                            Margin="0,0,8,0"
+                            VerticalAlignment="Center"
+                            Kind="Plus" />
                         <TextBlock Style="{StaticResource ToolbarTextBlock}" Text="{x:Static resx:ResUI.menuRuleAdd}" />
                     </StackPanel>
                 </Button>
                 <Separator />
                 <Button x:Name="menuImportRulesFromFile">
                     <StackPanel Orientation="Horizontal">
-                        <materialDesign:PackIcon Margin="0,0,8,0" Kind="Import" />
+                        <materialDesign:PackIcon
+                            Margin="0,0,8,0"
+                            VerticalAlignment="Center"
+                            Kind="Import" />
                         <TextBlock Style="{StaticResource ToolbarTextBlock}" Text="{x:Static resx:ResUI.menuImportRulesFromFile}" />
                     </StackPanel>
                 </Button>
                 <Separator />
                 <Button x:Name="menuImportRulesFromClipboard">
                     <StackPanel Orientation="Horizontal">
-                        <materialDesign:PackIcon Margin="0,0,8,0" Kind="Import" />
+                        <materialDesign:PackIcon
+                            Margin="0,0,8,0"
+                            VerticalAlignment="Center"
+                            Kind="Import" />
                         <TextBlock Style="{StaticResource ToolbarTextBlock}" Text="{x:Static resx:ResUI.menuImportRulesFromClipboard}" />
                     </StackPanel>
                 </Button>
                 <Separator />
                 <Button x:Name="menuImportRulesFromUrl">
                     <StackPanel Orientation="Horizontal">
-                        <materialDesign:PackIcon Margin="0,0,8,0" Kind="Import" />
+                        <materialDesign:PackIcon
+                            Margin="0,0,8,0"
+                            VerticalAlignment="Center"
+                            Kind="Import" />
                         <TextBlock Style="{StaticResource ToolbarTextBlock}" Text="{x:Static resx:ResUI.menuImportRulesFromUrl}" />
                     </StackPanel>
                 </Button>

v2rayN/v2rayN/Views/RoutingSettingWindow.xaml

@@ -39,7 +39,10 @@
                     <MenuItem x:Name="menuRoutingBasic" Padding="8,0">
                         <MenuItem.Header>
                             <StackPanel Orientation="Horizontal">
-                                <materialDesign:PackIcon Margin="0,0,8,0" Kind="Server" />
+                                <materialDesign:PackIcon
+                                    Margin="0,0,8,0"
+                                    VerticalAlignment="Center"
+                                    Kind="Server" />
                                 <TextBlock Text="{x:Static resx:ResUI.menuRoutingBasic}" />
                             </StackPanel>
                         </MenuItem.Header>
@@ -54,7 +57,10 @@
                     <MenuItem x:Name="menuRoutingAdvanced" Padding="8,0">
                         <MenuItem.Header>
                             <StackPanel Orientation="Horizontal">
-                                <materialDesign:PackIcon Margin="0,0,8,0" Kind="Routes" />
+                                <materialDesign:PackIcon
+                                    Margin="0,0,8,0"
+                                    VerticalAlignment="Center"
+                                    Kind="Routes" />
                                 <TextBlock Text="{x:Static resx:ResUI.menuRoutingAdvanced}" />
                             </StackPanel>
                         </MenuItem.Header>

v2rayN/v2rayN/Views/SubSettingWindow.xaml

@@ -33,28 +33,40 @@
                     Style="{StaticResource MaterialDesignToolBar}">
                     <Button x:Name="menuSubAdd">
                         <StackPanel Orientation="Horizontal">
-                            <materialDesign:PackIcon Margin="0,0,8,0" Kind="Plus" />
+                            <materialDesign:PackIcon
+                                Margin="0,0,8,0"
+                                VerticalAlignment="Center"
+                                Kind="Plus" />
                             <TextBlock Style="{StaticResource ToolbarTextBlock}" Text="{x:Static resx:ResUI.menuSubAdd}" />
                         </StackPanel>
                     </Button>
                     <Separator />
                     <Button x:Name="menuSubDelete">
                         <StackPanel Orientation="Horizontal">
-                            <materialDesign:PackIcon Margin="0,0,8,0" Kind="Delete" />
+                            <materialDesign:PackIcon
+                                Margin="0,0,8,0"
+                                VerticalAlignment="Center"
+                                Kind="Delete" />
                             <TextBlock Style="{StaticResource ToolbarTextBlock}" Text="{x:Static resx:ResUI.menuSubDelete}" />
                         </StackPanel>
                     </Button>
                     <Separator />
                     <Button x:Name="menuSubEdit">
                         <StackPanel Orientation="Horizontal">
-                            <materialDesign:PackIcon Margin="0,0,8,0" Kind="Edit" />
+                            <materialDesign:PackIcon
+                                Margin="0,0,8,0"
+                                VerticalAlignment="Center"
+                                Kind="Edit" />
                             <TextBlock Style="{StaticResource ToolbarTextBlock}" Text="{x:Static resx:ResUI.menuSubEdit}" />
                         </StackPanel>
                     </Button>
                     <Separator />
                     <Button x:Name="menuSubShare">
                         <StackPanel Orientation="Horizontal">
-                            <materialDesign:PackIcon Margin="0,0,8,0" Kind="QrcodePlus" />
+                            <materialDesign:PackIcon
+                                Margin="0,0,8,0"
+                                VerticalAlignment="Center"
+                                Kind="QrcodePlus" />
                             <TextBlock Style="{StaticResource ToolbarTextBlock}" Text="{x:Static resx:ResUI.menuSubShare}" />
                         </StackPanel>
                     </Button>
@@ -63,7 +75,10 @@
                         Click="menuClose_Click"
                         IsCancel="True">
                         <StackPanel Orientation="Horizontal">
-                            <materialDesign:PackIcon Margin="0,0,8,0" Kind="Close" />
+                            <materialDesign:PackIcon
+                                Margin="0,0,8,0"
+                                VerticalAlignment="Center"
+                                Kind="Close" />
                             <TextBlock Style="{StaticResource ToolbarTextBlock}" Text="{x:Static resx:ResUI.menuClose}" />
                         </StackPanel>
                     </Button>

v2rayN/v2rayN/v2rayN.csproj

@@ -10,10 +10,10 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<ApplicationIcon>v2rayN.ico</ApplicationIcon>
 		<Copyright>Copyright © 2017-2023 (GPLv3)</Copyright>
-		<FileVersion>6.13</FileVersion>
+		<FileVersion>6.15</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" />		 
@@ -36,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>  
@@ -65,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>