up 6.19

Update: 默认关闭硬件加速

.gitignore

@@ -16,3 +16,4 @@
 /v2rayN/v2rayUpgrade/bin/Release
 /v2rayN/v2rayUpgrade/obj/
 *.user
+/.vs/v2rayN

v2rayN/v2rayN/App.xaml.cs

@@ -42,10 +42,11 @@ namespace v2rayN
             Global.processJob = new Job();
 
             Logging.Setup();
+            Init();
+            Logging.LoggingEnabled(_config.guiItem.enableLog);
             Utils.SaveLog($"v2rayN start up | {Utils.GetVersion()} | {Utils.GetExePath()}");
             Logging.ClearLogs();
 
-            Init();
 
             Thread.CurrentThread.CurrentUICulture = new(_config.uiItem.currentLanguage);
 

v2rayN/v2rayN/Base/DownloaderHelper.cs

@@ -115,7 +115,7 @@ namespace v2rayN.Base
                     }
                 }
             };
-            progress.Report("......");
+            //progress.Report("......");
 
             using var stream = await downloader.DownloadFileTaskAsync(address: url, cancellationToken: cancellationToken.Token);
 

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()
         {
@@ -24,17 +25,27 @@ namespace v2rayN.Base
             return _db.CreateTable<T>();
         }
 
-        public int Add(object model)
+        public int Insert(object model)
         {
             return _db.Insert(model);
         }
-        public async Task<int> AddAsync(object model)
+        public int InsertAll(IEnumerable models)
+        {
+            lock (objLock)
+            {
+                return _db.InsertAll(models);
+            }
+        }
+        public async Task<int> InsertAsync(object model)
         {
             return await _dbAsync.InsertAsync(model);
         }
         public int Replace(object model)
         {
-            return _db.InsertOrReplace(model);
+            lock (objLock)
+            {
+                return _db.InsertOrReplace(model);
+            }
         }
         public async Task<int> Replacesync(object model)
         {
@@ -43,7 +54,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 +65,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/Global.cs

@@ -43,7 +43,7 @@
         public const string directTag = "direct";
         public const string blockTag = "block";
         public const string StreamSecurity = "tls";
-        public const string StreamSecurityX = "xtls";
+        public const string StreamSecurityReality = "reality";
         public const string InboundSocks = "socks";
         public const string InboundHttp = "http";
         public const string InboundSocks2 = "socks2";
@@ -92,7 +92,7 @@
         public static readonly List<string> ssSecuritys = new() { "aes-256-gcm", "aes-128-gcm", "chacha20-poly1305", "chacha20-ietf-poly1305", "none", "plain" };
         public static readonly List<string> ssSecuritysInSagerNet = new() { "none", "2022-blake3-aes-128-gcm", "2022-blake3-aes-256-gcm", "2022-blake3-chacha20-poly1305", "aes-128-gcm", "aes-192-gcm", "aes-256-gcm", "chacha20-ietf-poly1305", "xchacha20-ietf-poly1305", "rc4", "rc4-md5", "aes-128-ctr", "aes-192-ctr", "aes-256-ctr", "aes-128-cfb", "aes-192-cfb", "aes-256-cfb", "aes-128-cfb8", "aes-192-cfb8", "aes-256-cfb8", "aes-128-ofb", "aes-192-ofb", "aes-256-ofb", "bf-cfb", "cast5-cfb", "des-cfb", "idea-cfb", "rc2-cfb", "seed-cfb", "camellia-128-cfb", "camellia-192-cfb", "camellia-256-cfb", "camellia-128-cfb8", "camellia-192-cfb8", "camellia-256-cfb8", "salsa20", "chacha20", "chacha20-ietf", "xchacha20" };
         public static readonly List<string> ssSecuritysInXray = new() { "aes-256-gcm", "aes-128-gcm", "chacha20-poly1305", "chacha20-ietf-poly1305", "xchacha20-poly1305", "xchacha20-ietf-poly1305", "none", "plain", "2022-blake3-aes-128-gcm", "2022-blake3-aes-256-gcm", "2022-blake3-chacha20-poly1305" };
-        public static readonly List<string> xtlsFlows = new() { "", "xtls-rprx-origin", "xtls-rprx-origin-udp443", "xtls-rprx-direct", "xtls-rprx-direct-udp443", "xtls-rprx-vision", "xtls-rprx-vision-udp443" };
+        public static readonly List<string> flows = new() { "", "xtls-rprx-vision", "xtls-rprx-vision-udp443" };
         public static readonly List<string> networks = new() { "tcp", "kcp", "ws", "h2", "quic", "grpc" };
         public static readonly List<string> kcpHeaderTypes = new() { "srtp", "utp", "wechat-video", "dtls", "wireguard" };
         public static readonly List<string> coreTypes = new() { "v2fly", "SagerNet", "Xray", "v2fly_v5" };
@@ -124,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

@@ -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);
 
@@ -363,7 +352,7 @@ namespace v2rayN.Handler
         /// <param name="config"></param>
         /// <param name="profileItem"></param>
         /// <returns></returns>
-        public static int AddServer(ref Config config, ProfileItem profileItem)
+        public static int AddServer(ref Config config, ProfileItem profileItem, bool toFile = true)
         {
             profileItem.configType = EConfigType.VMess;
 
@@ -381,7 +370,7 @@ namespace v2rayN.Handler
                 return -1;
             }
 
-            AddServerCommon(ref config, profileItem);
+            AddServerCommon(ref config, profileItem, toFile);
 
             return 0;
         }
@@ -394,11 +383,15 @@ namespace v2rayN.Handler
         /// <returns></returns>
         public static int RemoveServer(Config config, List<ProfileItem> indexs)
         {
+            var subid = "TempRemoveSubId";
             foreach (var item in indexs)
             {
-                RemoveProfileItem(config, item.indexId);
+                item.subid = subid;
             }
 
+            SqliteHelper.Instance.UpdateAll(indexs);
+            RemoveServerViaSubid(ref config, subid, false);
+
             return 0;
         }
 
@@ -410,8 +403,14 @@ namespace v2rayN.Handler
         /// <returns></returns>
         public static int CopyServer(ref Config config, List<ProfileItem> indexs)
         {
-            foreach (var item in indexs)
+            foreach (var it in indexs)
             {
+                var item = LazyConfig.Instance.GetProfileItem(it.indexId);
+                if (item is null)
+                {
+                    continue;
+                }
+
                 ProfileItem profileItem = Utils.DeepCopy(item);
                 profileItem.indexId = string.Empty;
                 profileItem.remarks = $"{item.remarks}-clone";
@@ -425,7 +424,7 @@ namespace v2rayN.Handler
                 }
                 else
                 {
-                    AddServerCommon(ref config, profileItem);
+                    AddServerCommon(ref config, profileItem, true);
                 }
             }
 
@@ -446,7 +445,6 @@ namespace v2rayN.Handler
             }
 
             config.indexId = indexId;
-            Global.reloadCore = true;
 
             ToJsonFile(config);
 
@@ -459,8 +457,7 @@ namespace v2rayN.Handler
             {
                 return 0;
             }
-            var allItems = LazyConfig.Instance.ProfileItemIndexs("");
-            if (allItems.Where(t => t == config.indexId).Any())
+            if (SqliteHelper.Instance.Table<ProfileItem>().Where(t => t.indexId == config.indexId).Any())
             {
                 return 0;
             }
@@ -468,11 +465,7 @@ namespace v2rayN.Handler
             {
                 return SetDefaultServerIndex(ref config, lstProfile[0].indexId);
             }
-            if (allItems.Count > 0)
-            {
-                return SetDefaultServerIndex(ref config, allItems.FirstOrDefault());
-            }
-            return -1;
+            return SetDefaultServerIndex(ref config, SqliteHelper.Instance.Table<ProfileItem>().Select(t => t.indexId).FirstOrDefault());
         }
         public static ProfileItem? GetDefaultServer(ref Config config)
         {
@@ -600,7 +593,7 @@ namespace v2rayN.Handler
             }
 
 
-            AddServerCommon(ref config, profileItem);
+            AddServerCommon(ref config, profileItem, true);
 
 
             return 0;
@@ -632,7 +625,7 @@ namespace v2rayN.Handler
         /// <param name="config"></param>
         /// <param name="profileItem"></param>
         /// <returns></returns>
-        public static int AddShadowsocksServer(ref Config config, ProfileItem profileItem)
+        public static int AddShadowsocksServer(ref Config config, ProfileItem profileItem, bool toFile = true)
         {
             profileItem.configType = EConfigType.Shadowsocks;
 
@@ -645,7 +638,7 @@ namespace v2rayN.Handler
                 return -1;
             }
 
-            AddServerCommon(ref config, profileItem);
+            AddServerCommon(ref config, profileItem, toFile);
 
             return 0;
         }
@@ -656,13 +649,13 @@ namespace v2rayN.Handler
         /// <param name="config"></param>
         /// <param name="profileItem"></param>
         /// <returns></returns>
-        public static int AddSocksServer(ref Config config, ProfileItem profileItem)
+        public static int AddSocksServer(ref Config config, ProfileItem profileItem, bool toFile = true)
         {
             profileItem.configType = EConfigType.Socks;
 
             profileItem.address = profileItem.address.TrimEx();
 
-            AddServerCommon(ref config, profileItem);
+            AddServerCommon(ref config, profileItem, toFile);
 
             return 0;
         }
@@ -673,7 +666,7 @@ namespace v2rayN.Handler
         /// <param name="config"></param>
         /// <param name="profileItem"></param>
         /// <returns></returns>
-        public static int AddTrojanServer(ref Config config, ProfileItem profileItem)
+        public static int AddTrojanServer(ref Config config, ProfileItem profileItem, bool toFile = true)
         {
             profileItem.configType = EConfigType.Trojan;
 
@@ -683,12 +676,8 @@ namespace v2rayN.Handler
             {
                 profileItem.streamSecurity = Global.StreamSecurity;
             }
-            if (Utils.IsNullOrEmpty(profileItem.allowInsecure))
-            {
-                profileItem.allowInsecure = config.coreBasicItem.defAllowInsecure.ToString().ToLower();
-            }
 
-            AddServerCommon(ref config, profileItem);
+            AddServerCommon(ref config, profileItem, toFile);
 
             return 0;
         }
@@ -793,7 +782,7 @@ namespace v2rayN.Handler
         /// <param name="config"></param>
         /// <param name="profileItem"></param>
         /// <returns></returns>
-        public static int AddVlessServer(ref Config config, ProfileItem profileItem)
+        public static int AddVlessServer(ref Config config, ProfileItem profileItem, bool toFile = true)
         {
             profileItem.configType = EConfigType.VLESS;
 
@@ -806,7 +795,7 @@ namespace v2rayN.Handler
             profileItem.path = profileItem.path.TrimEx();
             profileItem.streamSecurity = profileItem.streamSecurity.TrimEx();
 
-            AddServerCommon(ref config, profileItem);
+            AddServerCommon(ref config, profileItem, toFile);
 
             return 0;
         }
@@ -816,33 +805,42 @@ namespace v2rayN.Handler
             List<ProfileItem> source = lstProfile;
             bool keepOlder = config.guiItem.keepOlderDedupl;
 
-            List<ProfileItem> list = new();
+            List<ProfileItem> lstKeep = new();
+            List<ProfileItem> lstRemove = new();
             if (!keepOlder) source.Reverse(); // Remove the early items first
 
             foreach (ProfileItem item in source)
             {
-                if (!list.Exists(i => CompareProfileItem(i, item, false)))
+                if (!lstKeep.Exists(i => CompareProfileItem(i, item, false)))
                 {
-                    list.Add(item);
+                    lstKeep.Add(item);
                 }
                 else
                 {
-                    RemoveProfileItem(config, item.indexId);
+                    lstRemove.Add(item);
                 }
             }
-            //if (!keepOlder) list.Reverse();
-            //config.vmess = list;
+            RemoveServer(config, lstRemove);
 
-            return list.Count;
+            return lstKeep.Count;
         }
 
-        public static int AddServerCommon(ref Config config, ProfileItem profileItem)
+        public static int AddServerCommon(ref Config config, ProfileItem profileItem, bool toFile = true)
         {
             profileItem.configVersion = 2;
-            if (Utils.IsNullOrEmpty(profileItem.allowInsecure))
+
+            if (!Utils.IsNullOrEmpty(profileItem.streamSecurity))
             {
-                profileItem.allowInsecure = config.coreBasicItem.defAllowInsecure.ToString().ToLower();
+                if (Utils.IsNullOrEmpty(profileItem.allowInsecure))
+                {
+                    profileItem.allowInsecure = config.coreBasicItem.defAllowInsecure.ToString().ToLower();
+                }
+                if (Utils.IsNullOrEmpty(profileItem.fingerprint))
+                {
+                    profileItem.fingerprint = config.coreBasicItem.defFingerprint;
+                }
             }
+
             if (!Utils.IsNullOrEmpty(profileItem.network) && !Global.networks.Contains(profileItem.network))
             {
                 profileItem.network = Global.DefaultNetwork;
@@ -854,19 +852,12 @@ namespace v2rayN.Handler
                 var maxSort = ProfileExHandler.Instance.GetMaxSort();
                 ProfileExHandler.Instance.SetSort(profileItem.indexId, maxSort + 1);
             }
-            else if (profileItem.indexId == config.indexId)
-            {
-                Global.reloadCore = true;
-            }
 
-            if (SqliteHelper.Instance.Replace(profileItem) > 0)
+            if (toFile)
             {
-                return 0;
-            }
-            else
-            {
-                return -1;
+                SqliteHelper.Instance.Replace(profileItem);
             }
+            return 0;
         }
 
         private static bool CompareProfileItem(ProfileItem o, ProfileItem n, bool remarks)
@@ -943,11 +934,7 @@ namespace v2rayN.Handler
             }
 
             int countServers = 0;
-            //var maxSort = 0;
-            //if (SqliteHelper.Instance.Table<ProfileItem>().Count() > 0)
-            //{
-            //    maxSort = SqliteHelper.Instance.Table<ProfileItem>().Max(t => t.sort);
-            //}
+            List<ProfileItem> lstAdd = new();
             string[] arrData = clipboardData.Split(Environment.NewLine.ToCharArray());
             foreach (string str in arrData)
             {
@@ -969,10 +956,10 @@ namespace v2rayN.Handler
                 //exist sub items
                 if (isSub && !Utils.IsNullOrEmpty(subid))
                 {
-                    var existItem = lstOriSub?.FirstOrDefault(t => CompareProfileItem(t, profileItem, true));
+                    var existItem = lstOriSub?.FirstOrDefault(t => t.isSub == isSub && CompareProfileItem(t, profileItem, true));
                     if (existItem != null)
                     {
-                        profileItem = existItem;
+                        profileItem.indexId = existItem.indexId;
                     }
                     //filter
                     if (!Utils.IsNullOrEmpty(subFilter))
@@ -985,43 +972,39 @@ namespace v2rayN.Handler
                 }
                 profileItem.subid = subid;
                 profileItem.isSub = isSub;
-                //profileItem.sort = maxSort + countServers + 1;
+                var addStatus = -1;
 
                 if (profileItem.configType == EConfigType.VMess)
                 {
-                    if (AddServer(ref config, profileItem) == 0)
-                    {
-                        countServers++;
-                    }
+                    addStatus = AddServer(ref config, profileItem, false);
                 }
                 else if (profileItem.configType == EConfigType.Shadowsocks)
                 {
-                    if (AddShadowsocksServer(ref config, profileItem) == 0)
-                    {
-                        countServers++;
-                    }
+                    addStatus = AddShadowsocksServer(ref config, profileItem, false);
                 }
                 else if (profileItem.configType == EConfigType.Socks)
                 {
-                    if (AddSocksServer(ref config, profileItem) == 0)
-                    {
-                        countServers++;
-                    }
+                    addStatus = AddSocksServer(ref config, profileItem, false);
                 }
                 else if (profileItem.configType == EConfigType.Trojan)
                 {
-                    if (AddTrojanServer(ref config, profileItem) == 0)
-                    {
-                        countServers++;
-                    }
+                    addStatus = AddTrojanServer(ref config, profileItem, false);
                 }
                 else if (profileItem.configType == EConfigType.VLESS)
                 {
-                    if (AddVlessServer(ref config, profileItem) == 0)
-                    {
-                        countServers++;
-                    }
+                    addStatus = AddVlessServer(ref config, profileItem, false);
                 }
+
+                if (addStatus == 0)
+                {
+                    countServers++;
+                    lstAdd.Add(profileItem);
+                }
+            }
+
+            if (lstAdd.Count > 0)
+            {
+                SqliteHelper.Instance.InsertAll(lstAdd);
             }
 
             ToJsonFile(config);
@@ -1273,6 +1256,7 @@ namespace v2rayN.Handler
             {
                 return -1;
             }
+            var customProfile = SqliteHelper.Instance.Table<ProfileItem>().Where(t => t.subid == subid && t.configType == EConfigType.Custom).ToList();
             if (isSub)
             {
                 SqliteHelper.Instance.Execute($"delete from ProfileItem where isSub = 1 and subid = '{subid}'");
@@ -1281,6 +1265,10 @@ namespace v2rayN.Handler
             {
                 SqliteHelper.Instance.Execute($"delete from ProfileItem where subid = '{subid}'");
             }
+            foreach (var item in customProfile)
+            {
+                File.Delete(Utils.GetConfigPath(item.address));
+            }
 
             return 0;
         }
@@ -1461,8 +1449,6 @@ namespace v2rayN.Handler
                 config.routingBasicItem.routingIndexId = routingItem.id;
             }
 
-            Global.reloadCore = true;
-
             ToJsonFile(config);
 
             return 0;

v2rayN/v2rayN/Handler/CoreConfigHandler.cs

@@ -456,17 +456,9 @@ namespace v2rayN.Handler
 
                     boundStreamSettings(node, "out", outbound.streamSettings);
 
-                    //if xtls
-                    if (node.streamSecurity == Global.StreamSecurityX)
+                    if (node.streamSecurity == Global.StreamSecurityReality)
                     {
-                        if (Utils.IsNullOrEmpty(node.flow))
-                        {
-                            usersItem.flow = Global.xtlsFlows[1];
-                        }
-                        else
-                        {
-                            usersItem.flow = node.flow.Replace("splice", "direct");
-                        }
+                        usersItem.flow = node.flow;
 
                         outbound.mux.enabled = false;
                         outbound.mux.concurrency = -1;
@@ -505,22 +497,6 @@ namespace v2rayN.Handler
                     serversItem.ota = false;
                     serversItem.level = 1;
 
-                    //if xtls
-                    if (node.streamSecurity == Global.StreamSecurityX)
-                    {
-                        if (Utils.IsNullOrEmpty(node.flow))
-                        {
-                            serversItem.flow = Global.xtlsFlows[1];
-                        }
-                        else
-                        {
-                            serversItem.flow = node.flow.Replace("splice", "direct");
-                        }
-
-                        outbound.mux.enabled = false;
-                        outbound.mux.concurrency = -1;
-                    }
-
                     outbound.mux.enabled = false;
                     outbound.mux.concurrency = -1;
 
@@ -581,26 +557,21 @@ namespace v2rayN.Handler
                     streamSettings.tlsSettings = tlsSettings;
                 }
 
-                //if xtls
-                if (node.streamSecurity == Global.StreamSecurityX)
+                //if Reality
+                if (node.streamSecurity == Global.StreamSecurityReality)
                 {
                     streamSettings.security = node.streamSecurity;
 
-                    TlsSettings xtlsSettings = new()
+                    TlsSettings realitySettings = new()
                     {
-                        allowInsecure = Utils.ToBool(node.allowInsecure.IsNullOrEmpty() ? config.coreBasicItem.defAllowInsecure.ToString().ToLower() : node.allowInsecure),
-                        alpn = node.GetAlpn(),
-                        fingerprint = node.fingerprint.IsNullOrEmpty() ? config.coreBasicItem.defFingerprint : node.fingerprint
+                        fingerprint = node.fingerprint.IsNullOrEmpty() ? config.coreBasicItem.defFingerprint : node.fingerprint,
+                        serverName = sni,
+                        publicKey = node.publicKey,
+                        shortId = node.shortId,
+                        spiderX = node.spiderX,
                     };
-                    if (!string.IsNullOrWhiteSpace(sni))
-                    {
-                        xtlsSettings.serverName = sni;
-                    }
-                    else if (!string.IsNullOrWhiteSpace(host))
-                    {
-                        xtlsSettings.serverName = Utils.String2List(host)[0];
-                    }
-                    streamSettings.xtlsSettings = xtlsSettings;
+
+                    streamSettings.realitySettings = realitySettings;
                 }
 
                 //streamSettings
@@ -660,13 +631,6 @@ namespace v2rayN.Handler
                         }
                         streamSettings.wsSettings = wsSettings;
 
-                        //TlsSettings tlsSettings = new TlsSettings();
-                        //tlsSettings.allowInsecure = config.allowInsecure();
-                        //if (!string.IsNullOrWhiteSpace(host))
-                        //{
-                        //    tlsSettings.serverName = host;
-                        //}
-                        //streamSettings.tlsSettings = tlsSettings;
                         break;
                     //h2
                     case "h2":
@@ -680,9 +644,6 @@ namespace v2rayN.Handler
 
                         streamSettings.httpSettings = httpSettings;
 
-                        //TlsSettings tlsSettings2 = new TlsSettings();
-                        //tlsSettings2.allowInsecure = config.allowInsecure();
-                        //streamSettings.tlsSettings = tlsSettings2;
                         break;
                     //quic
                     case "quic":
@@ -718,7 +679,6 @@ namespace v2rayN.Handler
                             permit_without_stream = config.grpcItem.permit_without_stream,
                             initial_windows_size = config.grpcItem.initial_windows_size,
                         };
-
                         streamSettings.grpcSettings = grpcSettings;
                         break;
                     default:

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);
                 }
             }
         }
@@ -159,6 +156,7 @@ namespace v2rayN.Handler
             if (Utils.IsNullOrEmpty(fileName))
             {
                 string msg = string.Format(ResUI.NotFoundCore, Utils.GetBinPath("", coreInfo.coreType), string.Join(", ", coreInfo.coreExes.ToArray()), coreInfo.coreUrl);
+                Utils.SaveLog(msg);
                 ShowMsg(false, msg);
             }
             return fileName;
@@ -216,6 +214,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
+                Utils.SaveLog(Utils.ToJson(node));
                 Utils.SaveLog(ex.Message, ex);
                 string msg = ex.Message;
                 ShowMsg(true, msg);

v2rayN/v2rayN/Handler/DownloadHandle.cs

@@ -188,9 +188,11 @@ 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))

v2rayN/v2rayN/Handler/HotkeyHandler.cs

@@ -0,0 +1,172 @@
+using System.ComponentModel;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Windows;
+using System.Windows.Input;
+using System.Windows.Interop;
+using v2rayN.Mode;
+using v2rayN.Resx;
+
+namespace v2rayN.Handler
+{
+    public sealed class HotkeyHandler
+    {
+        private static readonly Lazy<HotkeyHandler> _instance = new(() => new());
+        public static HotkeyHandler Instance = _instance.Value;
+
+        private const int WmHotkey = 0x0312;
+        private Config _config
+        {
+            get => LazyConfig.Instance.GetConfig();
+        }
+        private Dictionary<int, List<EGlobalHotkey>> _hotkeyTriggerDic;
+
+        public bool IsPause { get; set; } = false;
+        public event Action<bool, string>? UpdateViewEvent;
+        public event Action<EGlobalHotkey>? HotkeyTriggerEvent;
+        public HotkeyHandler()
+        {
+            _hotkeyTriggerDic = new();
+            ComponentDispatcher.ThreadPreprocessMessage += OnThreadPreProcessMessage;
+            Init();
+        }
+
+        private void Init()
+        {
+            _hotkeyTriggerDic.Clear();
+            if (_config.globalHotkeys == null) return;
+            foreach (var item in _config.globalHotkeys)
+            {
+                if (item.KeyCode != null && item.KeyCode != Key.None)
+                {
+                    int key = KeyInterop.VirtualKeyFromKey((Key)item.KeyCode);
+                    KeyModifiers modifiers = KeyModifiers.None;
+                    if (item.Control) modifiers |= KeyModifiers.Ctrl;
+                    if (item.Shift) modifiers |= KeyModifiers.Shift;
+                    if (item.Alt) modifiers |= KeyModifiers.Alt;
+                    key = (key << 16) | (int)modifiers;
+                    if (!_hotkeyTriggerDic.ContainsKey(key))
+                    {
+                        _hotkeyTriggerDic.Add(key, new() { item.eGlobalHotkey });
+                    }
+                    else
+                    {
+                        if (!_hotkeyTriggerDic[key].Contains(item.eGlobalHotkey))
+                            _hotkeyTriggerDic[key].Add(item.eGlobalHotkey);
+                    }
+                }
+            }
+        }
+        public void Load()
+        {
+            foreach (var _hotkeyCode in _hotkeyTriggerDic.Keys)
+            {
+                var hotkeyInfo = GetHotkeyInfo(_hotkeyCode);
+                bool isSuccess = false;
+                string msg;
+
+                Application.Current.Dispatcher.Invoke(() =>
+                {
+                    isSuccess = RegisterHotKey(IntPtr.Zero, _hotkeyCode, hotkeyInfo.fsModifiers, hotkeyInfo.vKey);
+                });
+                foreach (var name in hotkeyInfo.Names)
+                {
+                    if (isSuccess)
+                    {
+                        msg = string.Format(ResUI.RegisterGlobalHotkeySuccessfully, $"{name}({hotkeyInfo.hotkeyStr})");
+                    }
+                    else
+                    {
+                        var errInfo = new Win32Exception(Marshal.GetLastWin32Error()).Message;
+                        msg = string.Format(ResUI.RegisterGlobalHotkeyFailed, $"{name}({hotkeyInfo.hotkeyStr})", errInfo);
+                    }
+                    UpdateViewEvent?.Invoke(false, msg);
+                }
+
+            }
+        }
+
+        public void ReLoad()
+        {
+            foreach (var hotkey in _hotkeyTriggerDic.Keys)
+            {
+                Application.Current.Dispatcher.Invoke(() =>
+                {
+                    UnregisterHotKey(IntPtr.Zero, hotkey);
+                });
+            }
+            Init();
+            Load();
+        }
+        private (int fsModifiers, int vKey, string hotkeyStr, List<string> Names) GetHotkeyInfo(int hotkeycode)
+        {
+            var _fsModifiers = hotkeycode & 0xffff;
+            var _vkey = (hotkeycode >> 16) & 0xffff;
+            var _hotkeyStr = new StringBuilder();
+            var _names = new List<string>();
+
+            var mdif = (KeyModifiers)_fsModifiers;
+            var key = KeyInterop.KeyFromVirtualKey(_vkey);
+            if ((mdif | KeyModifiers.Ctrl) == KeyModifiers.Ctrl) _hotkeyStr.Append($"{KeyModifiers.Ctrl}+");
+            if ((mdif | KeyModifiers.Alt) == KeyModifiers.Alt) _hotkeyStr.Append($"{KeyModifiers.Alt}+");
+            if ((mdif | KeyModifiers.Shift) == KeyModifiers.Shift) _hotkeyStr.Append($"{KeyModifiers.Shift}+");
+            _hotkeyStr.Append(key.ToString());
+
+            foreach (var name in _hotkeyTriggerDic[hotkeycode])
+            {
+                _names.Add(name.ToString());
+            }
+
+
+            return (_fsModifiers, _vkey, _hotkeyStr.ToString(), _names);
+        }
+        private void OnThreadPreProcessMessage(ref MSG msg, ref bool handled)
+        {
+            if (msg.message != WmHotkey || !_hotkeyTriggerDic.ContainsKey((int)msg.lParam))
+            {
+                return;
+            }
+            handled = true;
+            var _hotKeyCode = (int)msg.lParam;
+            if (IsPause)
+            {
+                Application.Current.Dispatcher.Invoke(() =>
+                {
+                    UIElement? element = Keyboard.FocusedElement as UIElement;
+                    if (element != null)
+                    {
+                        var _keyEventArgs = new KeyEventArgs(Keyboard.PrimaryDevice,
+                            PresentationSource.FromVisual(element), 0,
+                            KeyInterop.KeyFromVirtualKey(GetHotkeyInfo(_hotKeyCode).vKey))
+                        {
+                            RoutedEvent = UIElement.KeyDownEvent
+                        };
+                        element.RaiseEvent(_keyEventArgs);
+                    }
+                });
+            }
+            else
+            {
+                foreach (var keyEvent in _hotkeyTriggerDic[(int)msg.lParam])
+                {
+                    HotkeyTriggerEvent?.Invoke(keyEvent);
+                }
+            }
+        }
+        [DllImport("user32.dll", SetLastError = true)]
+        private static extern bool RegisterHotKey(IntPtr hWnd, int id, int fsModifiers, int vlc);
+
+        [DllImport("user32.dll", SetLastError = true)]
+        private static extern bool UnregisterHotKey(IntPtr hWnd, int id);
+        [Flags]
+        private enum KeyModifiers
+        {
+            None = 0x0000,
+            Alt = 0x0001,
+            Ctrl = 0x0002,
+            Shift = 0x0004,
+            Win = 0x0008,
+            NoRepeat = 0x4000
+        }
+    }
+}

v2rayN/v2rayN/Handler/LazyConfig.cs

@@ -112,7 +112,7 @@ namespace v2rayN.Handler
                 {
                     filter = filter.Replace("'", "");
                 }
-                sql += $" and a.remarks like '%{filter}%'";
+                sql += String.Format(" and (a.remarks like '%{0}%' or a.address like '%{0}%') ", filter);
             }
 
             return SqliteHelper.Instance.Query<ProfileItemModel>(sql).ToList();

v2rayN/v2rayN/Handler/MainFormHandler.cs

@@ -1,9 +1,7 @@
-using NHotkey;
-using NHotkey.Wpf;
+
 using System.Drawing;
 using System.IO;
 using System.Windows.Forms;
-using System.Windows.Input;
 using System.Windows.Media.Imaging;
 using v2rayN.Mode;
 using v2rayN.Resx;
@@ -343,48 +341,11 @@ namespace v2rayN.Handler
             }
         }
 
-        public void RegisterGlobalHotkey(Config config, EventHandler<HotkeyEventArgs> handler, Action<bool, string> update)
+        public void RegisterGlobalHotkey(Config config, Action<EGlobalHotkey> handler, Action<bool, string> update)
         {
-            if (config.globalHotkeys == null)
-            {
-                return;
-            }
-
-            foreach (var item in config.globalHotkeys)
-            {
-                if (item.KeyCode == null)
-                {
-                    continue;
-                }
-
-                var modifiers = ModifierKeys.None;
-                if (item.Control)
-                {
-                    modifiers |= ModifierKeys.Control;
-                }
-                if (item.Alt)
-                {
-                    modifiers |= ModifierKeys.Alt;
-                }
-                if (item.Shift)
-                {
-                    modifiers |= ModifierKeys.Shift;
-                }
-
-                var gesture = new KeyGesture(KeyInterop.KeyFromVirtualKey((int)item.KeyCode), modifiers);
-                try
-                {
-                    HotkeyManager.Current.AddOrReplace(((int)item.eGlobalHotkey).ToString(), gesture, handler);
-                    var msg = string.Format(ResUI.RegisterGlobalHotkeySuccessfully, $"{item.eGlobalHotkey}");
-                    update(false, msg);
-                }
-                catch (Exception ex)
-                {
-                    var msg = string.Format(ResUI.RegisterGlobalHotkeyFailed, $"{item.eGlobalHotkey}", ex.Message);
-                    update(false, msg);
-                    Utils.SaveLog(msg);
-                }
-            }
+            HotkeyHandler.Instance.UpdateViewEvent += update;
+            HotkeyHandler.Instance.HotkeyTriggerEvent += handler;
+            HotkeyHandler.Instance.Load();
         }
 
     }

v2rayN/v2rayN/Handler/ProfileExHandler.cs

@@ -24,7 +24,7 @@ namespace v2rayN.Handler
 
             _lstProfileEx = new(SqliteHelper.Instance.Table<ProfileExItem>());
 
-            Task.Run(async () =>
+            Task.Run(() =>
             {
                 while (true)
                 {
@@ -35,7 +35,7 @@ namespace v2rayN.Handler
                         var item = _lstProfileEx.FirstOrDefault(t => t.indexId == id);
                         if (item is not null)
                         {
-                            await SqliteHelper.Instance.Replacesync(item);
+                            SqliteHelper.Instance.Replace(item);
                         }
                     }
                     Thread.Sleep(1000 * 60);

v2rayN/v2rayN/Handler/ShareHandler.cs

@@ -197,6 +197,18 @@ namespace v2rayN.Handler
             {
                 dicQuery.Add("fp", Utils.UrlEncode(item.fingerprint));
             }
+            if (!Utils.IsNullOrEmpty(item.publicKey))
+            {
+                dicQuery.Add("pbk", Utils.UrlEncode(item.publicKey));
+            }
+            if (!Utils.IsNullOrEmpty(item.shortId))
+            {
+                dicQuery.Add("sid", Utils.UrlEncode(item.shortId));
+            }
+            if (!Utils.IsNullOrEmpty(item.spiderX))
+            {
+                dicQuery.Add("spx", Utils.UrlEncode(item.spiderX));
+            }
 
             dicQuery.Add("type", !Utils.IsNullOrEmpty(item.network) ? item.network : "tcp");
 
@@ -756,6 +768,10 @@ namespace v2rayN.Handler
             item.sni = query["sni"] ?? "";
             item.alpn = Utils.UrlDecode(query["alpn"] ?? "");
             item.fingerprint = Utils.UrlDecode(query["fp"] ?? "");
+            item.publicKey = Utils.UrlDecode(query["pbk"] ?? "");
+            item.shortId = Utils.UrlDecode(query["sid"] ?? "");
+            item.spiderX = Utils.UrlDecode(query["spx"] ?? "");
+
             item.network = query["type"] ?? "tcp";
             switch (item.network)
             {

v2rayN/v2rayN/Handler/SpeedtestHandler.cs

@@ -58,11 +58,11 @@ namespace v2rayN.Handler
                         ProfileExHandler.Instance.SetTestDelay(it.indexId, "0");
                         break;
                     case ESpeedActionType.Speedtest:
-                        UpdateFunc(it.indexId, "", ResUI.Speedtesting);
+                        UpdateFunc(it.indexId, "", ResUI.SpeedtestingWait);
                         ProfileExHandler.Instance.SetTestSpeed(it.indexId, "0");
                         break;
                     case ESpeedActionType.Mixedtest:
-                        UpdateFunc(it.indexId, ResUI.Speedtesting, ResUI.Speedtesting);
+                        UpdateFunc(it.indexId, ResUI.Speedtesting, ResUI.SpeedtestingWait);
                         ProfileExHandler.Instance.SetTestDelay(it.indexId, "0");
                         ProfileExHandler.Instance.SetTestSpeed(it.indexId, "0");
                         break;
@@ -236,6 +236,7 @@ namespace v2rayN.Handler
                 //    continue;
                 //}
                 ProfileExHandler.Instance.SetTestSpeed(it.indexId, "-1");
+                UpdateFunc(it.indexId, "", ResUI.Speedtesting);
 
                 var item = LazyConfig.Instance.GetProfileItem(it.indexId);
                 if (item is null) continue;
@@ -287,6 +288,7 @@ namespace v2rayN.Handler
                     continue;
                 }
                 ProfileExHandler.Instance.SetTestSpeed(it.indexId, "-1");
+                UpdateFunc(it.indexId, "", ResUI.Speedtesting);
 
                 var item = LazyConfig.Instance.GetProfileItem(it.indexId);
                 if (item is null) continue;

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/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/ConfigItems.cs

@@ -1,5 +1,4 @@
-using System.Windows.Forms;
-
+using System.Windows.Input;
 namespace v2rayN.Mode
 {
     [Serializable]
@@ -104,6 +103,10 @@ namespace v2rayN.Mode
         public bool enableSecurityProtocolTls13 { get; set; }
 
         public int trayMenuServersLimit { get; set; } = 20;
+
+        public bool enableHWA { get; set; } = false;
+
+        public bool enableLog { get; set; } = true;
     }
 
     [Serializable]
@@ -144,7 +147,7 @@ namespace v2rayN.Mode
 
         public bool Shift { get; set; }
 
-        public Keys? KeyCode { get; set; }
+        public Key? KeyCode { get; set; }
 
     }
 

v2rayN/v2rayN/Mode/ProfileItem.cs

@@ -85,158 +85,100 @@ namespace v2rayN.Mode
         #endregion
 
         [PrimaryKey]
-        public string indexId
-        {
-            get; set;
-        }
+        public string indexId { get; set; }
 
         /// <summary>
         /// config type(1=normal,2=custom)
         /// </summary>
-        public EConfigType configType
-        {
-            get; set;
-        }
-
+        public EConfigType configType { get; set; }
         /// <summary>
         /// 版本(现在=2)
         /// </summary>
-        public int configVersion
-        {
-            get; set;
-        }
+        public int configVersion { get; set; }
 
         /// <summary>
         /// 远程服务器地址
         /// </summary>
-        public string address
-        {
-            get; set;
-        }
+        public string address { get; set; }
         /// <summary>
         /// 远程服务器端口
         /// </summary>
-        public int port
-        {
-            get; set;
-        }
+        public int port { get; set; }
         /// <summary>
         /// 远程服务器ID
         /// </summary>
-        public string id
-        {
-            get; set;
-        }
+        public string id { get; set; }
         /// <summary>
         /// 远程服务器额外ID
         /// </summary>
-        public int alterId
-        {
-            get; set;
-        }
+        public int alterId { get; set; }
         /// <summary>
         /// 本地安全策略
         /// </summary>
-        public string security
-        {
-            get; set;
-        }
+        public string security { get; set; }
         /// <summary>
         /// tcp,kcp,ws,h2,quic
         /// </summary>
-        public string network
-        {
-            get; set;
-        }
+        public string network { get; set; }
         /// <summary>
         /// 备注或别名
         /// </summary>
-        public string remarks
-        {
-            get; set;
-        }
+        public string remarks { get; set; }
 
         /// <summary>
         /// 伪装类型
         /// </summary>
-        public string headerType
-        {
-            get; set;
-        }
+        public string headerType { get; set; }
 
         /// <summary>
         /// 伪装的域名
         /// </summary>
-        public string requestHost
-        {
-            get; set;
-        }
+        public string requestHost { get; set; }
 
         /// <summary>
         /// ws h2 path
         /// </summary>
-        public string path
-        {
-            get; set;
-        }
+        public string path { get; set; }
 
         /// <summary>
         /// 传输层安全
         /// </summary>
-        public string streamSecurity
-        {
-            get; set;
-        }
+        public string streamSecurity { get; set; }
 
         /// <summary>
         /// 是否允许不安全连接（用于客户端）
         /// </summary>
-        public string allowInsecure
-        {
-            get; set;
-        }
+        public string allowInsecure { get; set; }
 
         /// <summary>
         /// SubItem id
         /// </summary>
-        public string subid
-        {
-            get; set;
-        }
+        public string subid { get; set; }
         public bool isSub { get; set; } = true;
 
         /// <summary>
         /// VLESS flow
         /// </summary>
-        public string flow
-        {
-            get; set;
-        }
+        public string flow { get; set; }
         /// <summary>
         /// tls sni
         /// </summary>
-        public string sni
-        {
-            get; set;
-        }
+        public string sni { get; set; }
         /// <summary>
         /// tls alpn
         /// </summary>
         public string alpn { get; set; } = string.Empty;
 
 
-        public ECoreType? coreType
-        {
-            get; set;
-        }
+        public ECoreType? coreType { get; set; }
 
-        public int preSocksPort
-        {
-            get; set;
-        }
+        public int preSocksPort { get; set; }
 
         public string fingerprint { get; set; }
 
         public bool displayLog { get; set; } = true;
+        public string publicKey { get; set; }
+        public string shortId { get; set; }
+        public string spiderX { get; set; }
     }
 }

v2rayN/v2rayN/Mode/V2rayConfig.cs

@@ -389,9 +389,9 @@ namespace v2rayN.Mode
         public QuicSettings quicSettings { get; set; }
 
         /// <summary>
-        /// VLESS xtls
+        /// VLESS only
         /// </summary>
-        public TlsSettings xtlsSettings { get; set; }
+        public TlsSettings realitySettings { get; set; }
         /// <summary>
         /// grpc
         /// </summary>
@@ -404,24 +404,23 @@ namespace v2rayN.Mode
         /// <summary>
         /// 是否允许不安全连接（用于客户端）
         /// </summary>
-        public bool allowInsecure { get; set; }
+        public bool? allowInsecure { get; set; }
 
         /// <summary>
         /// 
         /// </summary>
-        public string serverName { get; set; }
+        public string? serverName { get; set; }
         /// <summary>
         /// 
         /// </summary>
-        public List<string> alpn
-        {
-            get; set;
-        }
+        public List<string>? alpn { get; set; }
 
-        /// <summary>
-        /// "chrome" | "firefox" | "safari" | "randomized"
-        /// </summary>
-        public string fingerprint { get; set; }
+        public string? fingerprint { get; set; }
+
+        public bool? show { get; set; } = false;
+        public string? publicKey { get; set; }
+        public string? shortId { get; set; }
+        public string? spiderX { get; set; }
 
     }
 

v2rayN/v2rayN/Resx/ResUI.Designer.cs

@@ -1384,7 +1384,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Please fill in the address (Url) 的本地化字符串。
+        ///   查找类似 Please fill in the Url 的本地化字符串。
         /// </summary>
         public static string MsgNeedUrl {
             get {
@@ -1788,6 +1788,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Waiting for testing 的本地化字符串。
+        /// </summary>
+        public static string SpeedtestingWait {
+            get {
+                return ResourceManager.GetString("SpeedtestingWait", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 PAC failed to start. Please run this program as Administrator. 的本地化字符串。
         /// </summary>
@@ -2167,6 +2176,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 PublicKey 的本地化字符串。
+        /// </summary>
+        public static string TbPublicKey {
+            get {
+                return ResourceManager.GetString("TbPublicKey", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Alias (remarks) 的本地化字符串。
         /// </summary>
@@ -2500,6 +2518,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Enable hardware acceleration(Require restart) 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsEnableHWA {
+            get {
+                return ResourceManager.GetString("TbSettingsEnableHWA", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Exception 的本地化字符串。
         /// </summary>
@@ -2896,6 +2923,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 ShortId 的本地化字符串。
+        /// </summary>
+        public static string TbShortId {
+            get {
+                return ResourceManager.GetString("TbShortId", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 SNI 的本地化字符串。
         /// </summary>
@@ -2905,6 +2941,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 SpiderX 的本地化字符串。
+        /// </summary>
+        public static string TbSpiderX {
+            get {
+                return ResourceManager.GetString("TbSpiderX", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 TLS 的本地化字符串。
         /// </summary>

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

@@ -1066,4 +1066,7 @@
   <data name="TbSettingsDefUserAgentTips" xml:space="preserve">
     <value>This parameter is valid only for tcp/http and ws</value>
   </data>
+  <data name="TbSettingsEnableHWA" xml:space="preserve">
+    <value>فعال‌سازی شتاب‌دهنده سخت‌افزاری (نیاز به راه‌اندازی مجدد)</value>
+  </data>
 </root>

v2rayN/v2rayN/Resx/ResUI.resx

@@ -380,7 +380,7 @@
     <value>Count</value>
   </data>
   <data name="MsgNeedUrl" xml:space="preserve">
-    <value>Please fill in the address (Url)</value>
+    <value>Please fill in the Url</value>
   </data>
   <data name="AddBatchRoutingRulesYesNo" xml:space="preserve">
     <value>Do you want to append rules? Choose yes to append, choose otherwise to replace</value>
@@ -1132,4 +1132,19 @@
   <data name="menuMoveTo" xml:space="preserve">
     <value>Move up and down</value>
   </data>
+  <data name="TbPublicKey" xml:space="preserve">
+    <value>PublicKey</value>
+  </data>
+  <data name="TbShortId" xml:space="preserve">
+    <value>ShortId</value>
+  </data>
+  <data name="TbSpiderX" xml:space="preserve">
+    <value>SpiderX</value>
+  </data>
+  <data name="TbSettingsEnableHWA" xml:space="preserve">
+    <value>Enable hardware acceleration(Require restart)</value>
+  </data>
+  <data name="SpeedtestingWait" xml:space="preserve">
+    <value>Waiting for testing</value>
+  </data>
 </root>

v2rayN/v2rayN/Resx/ResUI.ru.resx

@@ -1108,4 +1108,7 @@
   <data name="TbSettingsFontSize" xml:space="preserve">
     <value>Размер шрифта</value>
   </data>
+  <data name="TbSettingsEnableHWA" xml:space="preserve">
+    <value>Включить аппаратное ускорение (требуется перезагрузка)</value>
+  </data>
 </root>

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

@@ -304,7 +304,7 @@
     <value>操作失败，请检查重试</value>
   </data>
   <data name="PleaseFillRemarks" xml:space="preserve">
-    <value>请填写备注</value>
+    <value>请填写别名</value>
   </data>
   <data name="PleaseSelectEncryption" xml:space="preserve">
     <value>请选择加密方式</value>
@@ -380,7 +380,7 @@
     <value>数量</value>
   </data>
   <data name="MsgNeedUrl" xml:space="preserve">
-    <value>请填写地址(Url)</value>
+    <value>请填写Url</value>
   </data>
   <data name="AddBatchRoutingRulesYesNo" xml:space="preserve">
     <value>是否追加规则?选择是则追加,选择否则替换</value>
@@ -710,7 +710,7 @@
     <value>SNI</value>
   </data>
   <data name="TbStreamSecurity" xml:space="preserve">
-    <value>TLS</value>
+    <value>传输层安全(TLS)</value>
   </data>
   <data name="TipNetwork" xml:space="preserve">
     <value>*默认tcp,选错会无法连接</value>
@@ -1132,4 +1132,19 @@
   <data name="menuMoveTo" xml:space="preserve">
     <value>移至上下</value>
   </data>
+  <data name="TbPublicKey" xml:space="preserve">
+    <value>PublicKey</value>
+  </data>
+  <data name="TbShortId" xml:space="preserve">
+    <value>ShortId</value>
+  </data>
+  <data name="TbSpiderX" xml:space="preserve">
+    <value>SpiderX</value>
+  </data>
+  <data name="TbSettingsEnableHWA" xml:space="preserve">
+    <value>启用硬件加速(需重启)</value>
+  </data>
+  <data name="SpeedtestingWait" 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_dns

@@ -1,5 +1,10 @@
   {
     "servers": [
+      {
+        "tag": "out_dns",
+        "address": "8.8.8.8",
+        "detour": "proxy"
+      },
       {
         "tag": "local",
         "address": "223.5.5.5",
@@ -11,6 +16,11 @@
       }
     ],
     "rules": [
+      {
+        "geosite": "cn",
+        "server": "local",
+        "disable_cache": true
+      },
       {
         "geosite": "category-ads-all",
         "server": "block",
@@ -18,4 +28,4 @@
       }
     ],
     "strategy": "ipv4_only"
-  }
+  }

v2rayN/v2rayN/Tool/Logging.cs

@@ -17,6 +17,13 @@ namespace v2rayN.Tool
             config.LoggingRules.Add(new LoggingRule("*", LogLevel.Debug, fileTarget));
             LogManager.Configuration = config;
         }
+        public static void LoggingEnabled(bool enable)
+        {
+            if (!enable)
+            {
+                LogManager.SuspendLogging();
+            }
+        }
 
         public static void ClearLogs()
         {

v2rayN/v2rayN/Tool/Utils.cs

@@ -282,6 +282,8 @@ namespace v2rayN
                   .Replace(Environment.NewLine, "")
                   .Replace("\n", "")
                   .Replace("\r", "")
+                  .Replace('_', '/')
+                  .Replace('-', '+')
                   .Replace(" ", "");
 
                 if (plainText.Length % 4 > 0)
@@ -312,7 +314,7 @@ namespace v2rayN
             }
             catch (Exception ex)
             {
-                SaveLog(ex.Message, ex);
+                //SaveLog(ex.Message, ex);
                 return 0;
             }
         }
@@ -324,7 +326,7 @@ namespace v2rayN
             }
             catch (Exception ex)
             {
-                SaveLog(ex.Message, ex);
+                //SaveLog(ex.Message, ex);
                 return false;
             }
         }
@@ -337,7 +339,7 @@ namespace v2rayN
             }
             catch (Exception ex)
             {
-                SaveLog(ex.Message, ex);
+                //SaveLog(ex.Message, ex);
                 return string.Empty;
             }
         }
@@ -778,7 +780,7 @@ namespace v2rayN
             task.Settings.RunOnlyIfIdle = false;
             task.Settings.IdleSettings.StopOnIdleEnd = false;
             task.Settings.ExecutionTimeLimit = TimeSpan.Zero;
-            task.Triggers.Add(new LogonTrigger { UserId = logonUser, Delay = TimeSpan.FromMinutes(1) });
+            task.Triggers.Add(new LogonTrigger { UserId = logonUser, Delay = TimeSpan.FromSeconds(10) });
             task.Principal.RunLevel = TaskRunLevel.Highest;
             task.Actions.Add(new ExecAction(deamonFileName));
 
@@ -865,7 +867,7 @@ namespace v2rayN
                 string location = GetExePath();
                 if (blFull)
                 {
-                    return string.Format("v2rayN - V{0} - {1}",
+                    return string.Format("v2rayN - V{0} - {1}-Test",
                             FileVersionInfo.GetVersionInfo(location).FileVersion.ToString(),
                             File.GetLastWriteTime(location).ToString("yyyy/MM/dd"));
                 }
@@ -907,13 +909,13 @@ namespace v2rayN
         /// <returns></returns>
         public static string? GetClipboardData()
         {
-            string strData = string.Empty;
+            string? strData = string.Empty;
             try
             {
                 IDataObject data = Clipboard.GetDataObject();
                 if (data.GetDataPresent(DataFormats.UnicodeText))
                 {
-                    strData = data.GetData(DataFormats.UnicodeText).ToString();
+                    strData = data.GetData(DataFormats.UnicodeText)?.ToString();
                 }
                 return strData;
             }
@@ -1150,17 +1152,23 @@ namespace v2rayN
 
         public static void SaveLog(string strContent)
         {
-            var logger = LogManager.GetLogger("Log1");
-            logger.Info(strContent);
+            if (LogManager.IsLoggingEnabled())
+            {
+                var logger = LogManager.GetLogger("Log1");
+                logger.Info(strContent);
+            }
         }
         public static void SaveLog(string strTitle, Exception ex)
         {
-            var logger = LogManager.GetLogger("Log2");
-            logger.Debug($"{strTitle},{ex.Message}");
-            logger.Debug(ex.StackTrace);
-            if (ex?.InnerException != null)
+            if (LogManager.IsLoggingEnabled())
             {
-                logger.Error(ex.InnerException);
+                var logger = LogManager.GetLogger("Log2");
+                logger.Debug($"{strTitle},{ex.Message}");
+                logger.Debug(ex.StackTrace);
+                if (ex?.InnerException != null)
+                {
+                    logger.Error(ex.InnerException);
+                }
             }
         }
 

v2rayN/v2rayN/ViewModels/AddServerViewModel.cs

@@ -118,6 +118,10 @@ namespace v2rayN.ViewModels
                 item.allowInsecure = SelectedSource.allowInsecure;
                 item.fingerprint = SelectedSource.fingerprint;
                 item.alpn = SelectedSource.alpn;
+
+                item.publicKey = SelectedSource.publicKey;
+                item.shortId = SelectedSource.shortId;
+                item.spiderX = SelectedSource.spiderX;
             }
 
             int ret = -1;

v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs

@@ -3,7 +3,6 @@ using DynamicData.Binding;
 using MaterialDesignColors;
 using MaterialDesignColors.ColorManipulation;
 using MaterialDesignThemes.Wpf;
-using NHotkey;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
 using Splat;
@@ -70,6 +69,8 @@ namespace v2rayN.ViewModels
         public ComboItem SelectedServer { get; set; }
         [Reactive]
         public string ServerFilter { get; set; }
+        [Reactive]
+        public bool BlServers { get; set; }
         #endregion
 
         #region Menu
@@ -175,6 +176,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; }
@@ -538,8 +541,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");
@@ -624,27 +631,26 @@ namespace v2rayN.ViewModels
             }
         }
 
-        private void OnHotkeyHandler(object sender, HotkeyEventArgs e)
+        private void OnHotkeyHandler(EGlobalHotkey e)
         {
-            switch (Utils.ToInt(e.Name))
+            switch (e)
             {
-                case (int)EGlobalHotkey.ShowForm:
+                case EGlobalHotkey.ShowForm:
                     ShowHideWindow(null);
                     break;
-                case (int)EGlobalHotkey.SystemProxyClear:
+                case EGlobalHotkey.SystemProxyClear:
                     SetListenerType(ESysProxyType.ForcedClear);
                     break;
-                case (int)EGlobalHotkey.SystemProxySet:
+                case EGlobalHotkey.SystemProxySet:
                     SetListenerType(ESysProxyType.ForcedChange);
                     break;
-                case (int)EGlobalHotkey.SystemProxyUnchanged:
+                case EGlobalHotkey.SystemProxyUnchanged:
                     SetListenerType(ESysProxyType.Unchanged);
                     break;
-                case (int)EGlobalHotkey.SystemProxyPac:
+                case EGlobalHotkey.SystemProxyPac:
                     SetListenerType(ESysProxyType.Pac);
                     break;
             }
-            e.Handled = true;
         }
         public void MyAppExit(bool blWindowsShutDown)
         {
@@ -712,6 +718,7 @@ namespace v2rayN.ViewModels
         private void RefreshServers()
         {
             List<ProfileItemModel> lstModel = LazyConfig.Instance.ProfileItems(_subId, _serverFilter);
+
             ConfigHandler.SetDefaultServer(_config, lstModel);
 
             List<ServerStatItem> lstServerStat = new();
@@ -735,9 +742,11 @@ namespace v2rayN.ViewModels
                             security = t.security,
                             network = t.network,
                             streamSecurity = t.streamSecurity,
+                            subid = t.subid,
                             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),
@@ -770,7 +779,14 @@ 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;
+                }
+                else
+                {
+                    RunningServerDisplay =
+                    RunningServerToolTipText = ResUI.CheckServerSettings;
                 }
             }));
         }
@@ -780,9 +796,11 @@ namespace v2rayN.ViewModels
             _servers.Clear();
             if (_lstProfile.Count > _config.guiItem.trayMenuServersLimit)
             {
+                BlServers = false;
                 return;
             }
 
+            BlServers = true;
             for (int k = 0; k < _lstProfile.Count; k++)
             {
                 ProfileItem it = _lstProfile[k];
@@ -819,21 +837,31 @@ namespace v2rayN.ViewModels
         #endregion
 
         #region Add Servers
-        private int GetProfileItems(out List<ProfileItem> lstSelecteds)
+        private int GetProfileItems(out List<ProfileItem> lstSelecteds, bool latest)
         {
             lstSelecteds = new List<ProfileItem>();
             if (SelectedProfiles == null || SelectedProfiles.Count <= 0)
             {
                 return -1;
             }
-            foreach (var profile in SelectedProfiles)
+
+            var orderProfiles = SelectedProfiles?.OrderBy(t => t.sort);
+            if (latest)
             {
-                var item = LazyConfig.Instance.GetProfileItem(profile.indexId);
-                if (item is not null)
+                foreach (var profile in orderProfiles)
                 {
-                    lstSelecteds.Add(item);
+                    var item = LazyConfig.Instance.GetProfileItem(profile.indexId);
+                    if (item is not null)
+                    {
+                        lstSelecteds.Add(item);
+                    }
                 }
             }
+            else
+            {
+                lstSelecteds = Utils.FromJson<List<ProfileItem>>(Utils.ToJson(orderProfiles));
+            }
+
             return 0;
         }
 
@@ -920,7 +948,7 @@ namespace v2rayN.ViewModels
         }
         public void RemoveServer()
         {
-            if (GetProfileItems(out List<ProfileItem> lstSelecteds) < 0)
+            if (GetProfileItems(out List<ProfileItem> lstSelecteds, false) < 0)
             {
                 return;
             }
@@ -951,7 +979,7 @@ namespace v2rayN.ViewModels
         }
         private void CopyServer()
         {
-            if (GetProfileItems(out List<ProfileItem> lstSelecteds) < 0)
+            if (GetProfileItems(out List<ProfileItem> lstSelecteds, false) < 0)
             {
                 return;
             }
@@ -1083,7 +1111,7 @@ namespace v2rayN.ViewModels
                 return;
             }
 
-            if (GetProfileItems(out List<ProfileItem> lstSelecteds) < 0)
+            if (GetProfileItems(out List<ProfileItem> lstSelecteds, false) < 0)
             {
                 return;
             }
@@ -1134,7 +1162,7 @@ namespace v2rayN.ViewModels
             {
                 SelectedProfiles = _profileItems;
             }
-            if (GetProfileItems(out List<ProfileItem> lstSelecteds) < 0)
+            if (GetProfileItems(out List<ProfileItem> lstSelecteds, false) < 0)
             {
                 return;
             }
@@ -1166,7 +1194,7 @@ namespace v2rayN.ViewModels
 
         public void Export2ShareUrl()
         {
-            if (GetProfileItems(out List<ProfileItem> lstSelecteds) < 0)
+            if (GetProfileItems(out List<ProfileItem> lstSelecteds, true) < 0)
             {
                 return;
             }
@@ -1191,7 +1219,7 @@ namespace v2rayN.ViewModels
 
         private void Export2SubContent()
         {
-            if (GetProfileItems(out List<ProfileItem> lstSelecteds) < 0)
+            if (GetProfileItems(out List<ProfileItem> lstSelecteds, true) < 0)
             {
                 return;
             }
@@ -1362,7 +1390,6 @@ namespace v2rayN.ViewModels
 
         public void Reload()
         {
-            Global.reloadCore = true;
             _ = LoadV2ray();
         }
 
@@ -1382,7 +1409,6 @@ namespace v2rayN.ViewModels
             {
                 _coreHandler.LoadCore(_config);
 
-                Global.reloadCore = false;
                 //ConfigHandler.SaveConfig(ref _config, false);
 
                 ChangeSystemProxyStatus(_config.sysProxyType, false);

v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs

@@ -65,6 +65,7 @@ namespace v2rayN.ViewModels
         [Reactive] public string currentFontFamily { get; set; }
         [Reactive] public int SpeedTestTimeout { get; set; }
         [Reactive] public string SpeedTestUrl { get; set; }
+        [Reactive] public bool EnableHWA { get; set; }
 
         #endregion
 
@@ -160,6 +161,7 @@ namespace v2rayN.ViewModels
             currentFontFamily = _config.uiItem.currentFontFamily;
             SpeedTestTimeout = _config.speedTestItem.speedTestTimeout;
             SpeedTestUrl = _config.speedTestItem.speedTestUrl;
+            EnableHWA = _config.guiItem.enableHWA;
 
             #endregion
 
@@ -339,6 +341,7 @@ namespace v2rayN.ViewModels
             _config.uiItem.currentFontFamily = currentFontFamily;
             _config.speedTestItem.speedTestTimeout = SpeedTestTimeout;
             _config.speedTestItem.speedTestUrl = SpeedTestUrl;
+            _config.guiItem.enableHWA = EnableHWA;
 
             //systemProxy
             _config.systemProxyExceptions = systemProxyExceptions;

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

@@ -11,7 +11,7 @@
     xmlns:vms="clr-namespace:v2rayN.ViewModels"
     Title="{x:Static resx:ResUI.menuServers}"
     Width="800"
-    Height="800"
+    Height="830"
     x:TypeArguments="vms:AddServerViewModel"
     Background="{DynamicResource MaterialDesignPaper}"
     FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
@@ -559,8 +559,10 @@
                     Margin="{StaticResource ServerItemMargin}"
                     Style="{StaticResource DefComboBox}" />
             </Grid>
-
-            <Grid x:Name="gridTlsMore" Grid.Row="7">
+            <Grid
+                x:Name="gridTlsMore"
+                Grid.Row="7"
+                Visibility="Hidden">
                 <Grid.RowDefinitions>
                     <RowDefinition Height="Auto" />
                     <RowDefinition Height="Auto" />
@@ -595,25 +597,10 @@
                     Margin="{StaticResource ServerItemMargin}"
                     VerticalAlignment="Center"
                     Style="{StaticResource ToolbarTextBlock}"
-                    Text="{x:Static resx:ResUI.TbAllowInsecure}" />
-                <ComboBox
-                    x:Name="cmbAllowInsecure"
-                    Grid.Row="2"
-                    Grid.Column="1"
-                    Width="100"
-                    Margin="{StaticResource ServerItemMargin}"
-                    Style="{StaticResource DefComboBox}" />
-
-                <TextBlock
-                    Grid.Row="3"
-                    Grid.Column="0"
-                    Margin="{StaticResource ServerItemMargin}"
-                    VerticalAlignment="Center"
-                    Style="{StaticResource ToolbarTextBlock}"
                     Text="{x:Static resx:ResUI.TbFingerprint}" />
                 <ComboBox
                     x:Name="cmbFingerprint"
-                    Grid.Row="3"
+                    Grid.Row="2"
                     Grid.Column="1"
                     Width="200"
                     Margin="{StaticResource ServerItemMargin}"
@@ -621,7 +608,7 @@
                     Style="{StaticResource DefComboBox}" />
 
                 <TextBlock
-                    Grid.Row="4"
+                    Grid.Row="3"
                     Grid.Column="0"
                     Margin="{StaticResource ServerItemMargin}"
                     VerticalAlignment="Center"
@@ -629,13 +616,125 @@
                     Text="{x:Static resx:ResUI.TbAlpn}" />
                 <ComboBox
                     x:Name="cmbAlpn"
-                    Grid.Row="4"
+                    Grid.Row="3"
                     Grid.Column="1"
                     Width="200"
                     Margin="{StaticResource ServerItemMargin}"
                     Style="{StaticResource DefComboBox}" />
-            </Grid>
 
+                <TextBlock
+                    Grid.Row="4"
+                    Grid.Column="0"
+                    Margin="{StaticResource ServerItemMargin}"
+                    VerticalAlignment="Center"
+                    Style="{StaticResource ToolbarTextBlock}"
+                    Text="{x:Static resx:ResUI.TbAllowInsecure}" />
+                <ComboBox
+                    x:Name="cmbAllowInsecure"
+                    Grid.Row="4"
+                    Grid.Column="1"
+                    Width="100"
+                    Margin="{StaticResource ServerItemMargin}"
+                    Style="{StaticResource DefComboBox}" />
+            </Grid>
+            <Grid
+                x:Name="gridRealityMore"
+                Grid.Row="7"
+                Visibility="Hidden">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="180" />
+                    <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+
+                <TextBlock
+                    Grid.Row="0"
+                    Grid.Column="0"
+                    Margin="{StaticResource ServerItemMargin}"
+                    VerticalAlignment="Center"
+                    Style="{StaticResource ToolbarTextBlock}"
+                    Text="{x:Static resx:ResUI.TbSNI}" />
+                <TextBox
+                    x:Name="txtSNI2"
+                    Grid.Row="0"
+                    Grid.Column="1"
+                    Width="400"
+                    Margin="{StaticResource ServerItemMargin}"
+                    HorizontalAlignment="Left"
+                    Style="{StaticResource DefTextBox}" />
+
+                <TextBlock
+                    Grid.Row="1"
+                    Grid.Column="0"
+                    Margin="{StaticResource ServerItemMargin}"
+                    VerticalAlignment="Center"
+                    Style="{StaticResource ToolbarTextBlock}"
+                    Text="{x:Static resx:ResUI.TbFingerprint}" />
+                <ComboBox
+                    x:Name="cmbFingerprint2"
+                    Grid.Row="1"
+                    Grid.Column="1"
+                    Width="200"
+                    Margin="{StaticResource ServerItemMargin}"
+                    IsEditable="True"
+                    Style="{StaticResource DefComboBox}" />
+
+                <TextBlock
+                    Grid.Row="2"
+                    Grid.Column="0"
+                    Margin="{StaticResource ServerItemMargin}"
+                    VerticalAlignment="Center"
+                    Style="{StaticResource ToolbarTextBlock}"
+                    Text="{x:Static resx:ResUI.TbPublicKey}" />
+                <TextBox
+                    x:Name="txtPublicKey"
+                    Grid.Row="2"
+                    Grid.Column="1"
+                    Width="400"
+                    Margin="{StaticResource ServerItemMargin}"
+                    HorizontalAlignment="Left"
+                    Style="{StaticResource DefTextBox}" />
+
+                <TextBlock
+                    Grid.Row="3"
+                    Grid.Column="0"
+                    Margin="{StaticResource ServerItemMargin}"
+                    VerticalAlignment="Center"
+                    Style="{StaticResource ToolbarTextBlock}"
+                    Text="{x:Static resx:ResUI.TbShortId}" />
+                <TextBox
+                    x:Name="txtShortId"
+                    Grid.Row="3"
+                    Grid.Column="1"
+                    Width="200"
+                    Margin="{StaticResource ServerItemMargin}"
+                    HorizontalAlignment="Left"
+                    Style="{StaticResource DefTextBox}" />
+
+                <TextBlock
+                    Grid.Row="4"
+                    Grid.Column="0"
+                    Margin="{StaticResource ServerItemMargin}"
+                    VerticalAlignment="Center"
+                    Style="{StaticResource ToolbarTextBlock}"
+                    Text="{x:Static resx:ResUI.TbSpiderX}" />
+                <TextBox
+                    x:Name="txtSpiderX"
+                    Grid.Row="4"
+                    Grid.Column="1"
+                    Width="400"
+                    Margin="{StaticResource ServerItemMargin}"
+                    HorizontalAlignment="Left"
+                    Style="{StaticResource DefTextBox}" />
+
+
+            </Grid>
             <Separator
                 Grid.Row="8"
                 Margin="0,2"

v2rayN/v2rayN/Views/AddServerWindow.xaml.cs

@@ -39,6 +39,7 @@ namespace v2rayN.Views
             Global.fingerprints.ForEach(it =>
             {
                 cmbFingerprint.Items.Add(it);
+                cmbFingerprint2.Items.Add(it);
             });
             Global.allowInsecures.ForEach(it =>
             {
@@ -74,8 +75,8 @@ namespace v2rayN.Views
                     break;
                 case EConfigType.VLESS:
                     gridVLESS.Visibility = Visibility.Visible;
-                    cmbStreamSecurity.Items.Add(Global.StreamSecurityX);
-                    Global.xtlsFlows.ForEach(it =>
+                    cmbStreamSecurity.Items.Add(Global.StreamSecurityReality);
+                    Global.flows.ForEach(it =>
                     {
                         cmbFlow5.Items.Add(it);
                     });
@@ -86,8 +87,7 @@ namespace v2rayN.Views
                     break;
                 case EConfigType.Trojan:
                     gridTrojan.Visibility = Visibility.Visible;
-                    cmbStreamSecurity.Items.Add(Global.StreamSecurityX);
-                    Global.xtlsFlows.ForEach(it =>
+                    Global.flows.ForEach(it =>
                     {
                         cmbFlow6.Items.Add(it);
                     });
@@ -138,6 +138,13 @@ namespace v2rayN.Views
                 this.Bind(ViewModel, vm => vm.SelectedSource.allowInsecure, v => v.cmbAllowInsecure.Text).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.SelectedSource.fingerprint, v => v.cmbFingerprint.Text).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.SelectedSource.alpn, v => v.cmbAlpn.Text).DisposeWith(disposables);
+                //reality
+                this.Bind(ViewModel, vm => vm.SelectedSource.sni, v => v.txtSNI2.Text).DisposeWith(disposables); 
+                this.Bind(ViewModel, vm => vm.SelectedSource.fingerprint, v => v.cmbFingerprint2.Text).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.SelectedSource.publicKey, v => v.txtPublicKey.Text).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.SelectedSource.shortId, v => v.txtShortId.Text).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.SelectedSource.spiderX, v => v.txtSpiderX.Text).DisposeWith(disposables);
+
 
                 this.BindCommand(ViewModel, vm => vm.SaveCmd, v => v.btnSave).DisposeWith(disposables);
 
@@ -159,13 +166,20 @@ namespace v2rayN.Views
         private void CmbStreamSecurity_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
             var security = cmbStreamSecurity.SelectedItem.ToString();
-            if (Utils.IsNullOrEmpty(security))
+            if (security == Global.StreamSecurityReality)
             {
+                gridRealityMore.Visibility = Visibility.Visible;
                 gridTlsMore.Visibility = Visibility.Hidden;
             }
+            else if (security == Global.StreamSecurity)
+            {
+                gridRealityMore.Visibility = Visibility.Hidden;
+                gridTlsMore.Visibility = Visibility.Visible;
+            }
             else
             {
-                gridTlsMore.Visibility = Visibility.Visible;
+                gridRealityMore.Visibility = Visibility.Hidden;
+                gridTlsMore.Visibility = Visibility.Hidden;
             }
         }
         private void btnGUID_Click(object sender, RoutedEventArgs e)

v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml.cs

@@ -1,47 +1,24 @@
-using System.Windows;
+using System.Text;
+using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 using v2rayN.Handler;
 using v2rayN.Mode;
 using v2rayN.Resx;
-using Forms = System.Windows.Forms;
 
 namespace v2rayN.Views
 {
     public partial class GlobalHotkeySettingWindow
     {
-        private static Config _config;
-        List<KeyEventItem> lstKey;
+        private static Config _config = default!;
+        private Dictionary<object, KeyEventItem> _TextBoxKeyEventItem = default!;
 
         public GlobalHotkeySettingWindow()
         {
             InitializeComponent();
             this.Owner = Application.Current.MainWindow;
             _config = LazyConfig.Instance.GetConfig();
-
-            if (_config.globalHotkeys == null)
-            {
-                _config.globalHotkeys = new List<KeyEventItem>();
-            }
-
-            foreach (EGlobalHotkey it in Enum.GetValues(typeof(EGlobalHotkey)))
-            {
-                if (_config.globalHotkeys.FindIndex(t => t.eGlobalHotkey == it) >= 0)
-                {
-                    continue;
-                }
-
-                _config.globalHotkeys.Add(new KeyEventItem()
-                {
-                    eGlobalHotkey = it,
-                    Alt = false,
-                    Control = false,
-                    Shift = false,
-                    KeyCode = null
-                });
-            }
-
-            lstKey = Utils.DeepCopy(_config.globalHotkeys);
+            _config.globalHotkeys ??= new List<KeyEventItem>();
 
             txtGlobalHotkey0.KeyDown += TxtGlobalHotkey_KeyDown;
             txtGlobalHotkey1.KeyDown += TxtGlobalHotkey_KeyDown;
@@ -49,67 +26,84 @@ namespace v2rayN.Views
             txtGlobalHotkey3.KeyDown += TxtGlobalHotkey_KeyDown;
             txtGlobalHotkey4.KeyDown += TxtGlobalHotkey_KeyDown;
 
-            BindingData(-1);
-
+            HotkeyHandler.Instance.IsPause = true;
+            this.Closing += (s, e) => HotkeyHandler.Instance.IsPause = false;
             Utils.SetDarkBorder(this, _config.uiItem.colorModeDark);
+            InitData();
+        }
+
+        private void InitData()
+        {
+            _TextBoxKeyEventItem = new()
+            {
+                { txtGlobalHotkey0,GetKeyEventItemByEGlobalHotkey(_config.globalHotkeys,EGlobalHotkey.ShowForm) },
+                { txtGlobalHotkey1,GetKeyEventItemByEGlobalHotkey(_config.globalHotkeys,EGlobalHotkey.SystemProxyClear) },
+                { txtGlobalHotkey2,GetKeyEventItemByEGlobalHotkey(_config.globalHotkeys,EGlobalHotkey.SystemProxySet) },
+                { txtGlobalHotkey3,GetKeyEventItemByEGlobalHotkey(_config.globalHotkeys,EGlobalHotkey.SystemProxyUnchanged)},
+                { txtGlobalHotkey4,GetKeyEventItemByEGlobalHotkey(_config.globalHotkeys,EGlobalHotkey.SystemProxyPac)}
+            };
+            BindingData();
         }
 
 
         private void TxtGlobalHotkey_KeyDown(object sender, KeyEventArgs e)
         {
-            var txt = ((TextBox)sender);
-            var index = Utils.ToInt(txt.Name.Substring(txt.Name.Length - 1, 1));
-
-            if (e.Key == Key.System)
-                return;
-            var formsKey = (Forms.Keys)KeyInterop.VirtualKeyFromKey(e.Key);
-
-            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);
+            e.Handled = true;
+            var _ModifierKeys = new Key[] { Key.LeftCtrl, Key.RightCtrl, Key.LeftShift,
+                Key.RightShift, Key.LeftAlt, Key.RightAlt, Key.LWin, Key.RWin};
+            _TextBoxKeyEventItem[sender].KeyCode = e.Key == Key.System ? (_ModifierKeys.Contains(e.SystemKey) ? Key.None : e.SystemKey) : (_ModifierKeys.Contains(e.Key) ? Key.None : e.Key);
+            _TextBoxKeyEventItem[sender].Alt = (Keyboard.Modifiers & ModifierKeys.Alt) == ModifierKeys.Alt;
+            _TextBoxKeyEventItem[sender].Control = (Keyboard.Modifiers & ModifierKeys.Control) == ModifierKeys.Control;
+            _TextBoxKeyEventItem[sender].Shift = (Keyboard.Modifiers & ModifierKeys.Shift) == ModifierKeys.Shift;
+            (sender as TextBox)!.Text = KeyEventItemToString(_TextBoxKeyEventItem[sender]);
         }
 
-        private void BindingData(int index)
+        private KeyEventItem GetKeyEventItemByEGlobalHotkey(List<KeyEventItem> KELsit, EGlobalHotkey eg)
         {
-            for (int k = 0; k < lstKey.Count; k++)
+            return Utils.DeepCopy(KELsit.Find((it) => it.eGlobalHotkey == eg) ?? new()
             {
-                if (index >= 0 && index != k)
-                {
-                    continue;
-                }
-                var item = lstKey[k];
-                var keys = string.Empty;
+                eGlobalHotkey = eg,
+                Control = false,
+                Alt = false,
+                Shift = false,
+                KeyCode = null
+            });
 
-                if (item.Control)
-                {
-                    keys += $"{Forms.Keys.Control} + ";
-                }
-                if (item.Alt)
-                {
-                    keys += $"{Forms.Keys.Alt} + ";
-                }
-                if (item.Shift)
-                {
-                    keys += $"{Forms.Keys.Shift} + ";
-                }
-                if (item.KeyCode != null)
-                {
-                    keys += $"{item.KeyCode}";
-                }
+        }
+        private string KeyEventItemToString(KeyEventItem item)
+        {
+            var res = new StringBuilder();
 
-                SetText($"txtGlobalHotkey{k}", keys);
+            if (item.Control) res.Append($"{ModifierKeys.Control}+");
+            if (item.Shift) res.Append($"{ModifierKeys.Shift}+");
+            if (item.Alt) res.Append($"{ModifierKeys.Alt}+");
+            if (item.KeyCode != null && item.KeyCode != Key.None)
+                res.Append($"{item.KeyCode}");
+
+            return res.ToString();
+        }
+        private void BindingData()
+        {
+            foreach (var item in _TextBoxKeyEventItem)
+            {
+                if (item.Value.KeyCode != null && item.Value.KeyCode != Key.None)
+                {
+                    (item.Key as TextBox)!.Text = KeyEventItemToString(item.Value);
+                }
+                else
+                {
+                    (item.Key as TextBox)!.Text = string.Empty;
+                }
             }
         }
 
         private void btnSave_Click(object sender, RoutedEventArgs e)
         {
-            _config.globalHotkeys = lstKey;
+            _config.globalHotkeys = _TextBoxKeyEventItem.Values.ToList();
 
             if (ConfigHandler.SaveConfig(ref _config, false) == 0)
             {
+                HotkeyHandler.Instance.ReLoad();
                 this.DialogResult = true;
             }
             else
@@ -125,37 +119,14 @@ namespace v2rayN.Views
 
         private void btnReset_Click(object sender, RoutedEventArgs e)
         {
-            lstKey.Clear();
-            foreach (EGlobalHotkey it in Enum.GetValues(typeof(EGlobalHotkey)))
+            foreach (var k in _TextBoxKeyEventItem.Keys)
             {
-                if (lstKey.FindIndex(t => t.eGlobalHotkey == it) >= 0)
-                {
-                    continue;
-                }
-
-                lstKey.Add(new KeyEventItem()
-                {
-                    eGlobalHotkey = it,
-                    Alt = false,
-                    Control = false,
-                    Shift = false,
-                    KeyCode = null
-                });
-            }
-            BindingData(-1);
-        }
-        private void SetText(string name, string txt)
-        {
-            foreach (UIElement element in gridText.Children)
-            {
-                if (element is TextBox box)
-                {
-                    if (box.Name == name)
-                    {
-                        box.Text = txt;
-                    }
-                }
+                _TextBoxKeyEventItem[k].Alt = false;
+                _TextBoxKeyEventItem[k].Control = false;
+                _TextBoxKeyEventItem[k].Shift = false;
+                _TextBoxKeyEventItem[k].KeyCode = Key.None;
             }
+            BindingData();
         }
 
         private void GlobalHotkeySettingWindow_KeyDown(object sender, KeyEventArgs e)

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,7 +376,7 @@
                         Height="30"
                         Margin="4,0"
                         Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}">
-                        <materialDesign:PackIcon Kind="Plus" />
+                        <materialDesign:PackIcon VerticalAlignment="Center" Kind="Plus" />
                     </Button>
                     <TextBox
                         x:Name="txtServerFilter"
@@ -592,7 +617,7 @@
                             </Style>
                         </DataGrid.Resources>
                         <DataGrid.Columns>
-                            <DataGridTemplateColumn Width="50">
+                            <DataGridTemplateColumn Width="40">
                                 <DataGridTemplateColumn.CellTemplate>
                                     <DataTemplate>
                                         <Border
@@ -712,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>
@@ -723,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>
@@ -734,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>
@@ -745,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>
@@ -802,6 +831,21 @@
                             Header="{x:Static resx:ResUI.menuExit}" />
                     </ContextMenu>
                 </tb:TaskbarIcon.ContextMenu>
+                <tb:TaskbarIcon.TrayToolTip>
+                    <Border
+                        Width="Auto"
+                        Height="Auto"
+                        Background="{DynamicResource MaterialDesignLightBackground}"
+                        BorderBrush="{DynamicResource MaterialDesignDarkBackground}"
+                        BorderThickness="1">
+                        <TextBlock
+                            Margin="2"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            Foreground="{DynamicResource MaterialDesignDarkBackground}"
+                            Text="{Binding Mode=OneWay, Path=ToolTipText}" />
+                    </Border>
+                </tb:TaskbarIcon.TrayToolTip>
             </tb:TaskbarIcon>
             <materialDesign:Snackbar x:Name="MainSnackbar" MessageQueue="{materialDesign:MessageQueue}" />
         </Grid>

v2rayN/v2rayN/Views/MainWindow.xaml.cs

@@ -150,6 +150,7 @@ namespace v2rayN.Views
 
                 this.OneWayBind(ViewModel, vm => vm.Servers, v => v.cmbServers.ItemsSource).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.SelectedServer, v => v.cmbServers.SelectedItem).DisposeWith(disposables);
+                this.OneWayBind(ViewModel, vm => vm.BlServers, v => v.cmbServers.Visibility).DisposeWith(disposables);
 
                 //tray menu
                 this.BindCommand(ViewModel, vm => vm.AddServerViaClipboardCmd, v => v.menuAddServerViaClipboard2).DisposeWith(disposables);
@@ -158,6 +159,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);
 
@@ -190,6 +192,16 @@ 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;
+            }
+
+            if (!_config.guiItem.enableHWA)
+            {
+                RenderOptions.ProcessRenderMode = RenderMode.SoftwareOnly;
+            }
         }
 
         #region Event 
@@ -433,8 +445,15 @@ namespace v2rayN.Views
                     var item2 = (MyDGTextColumn)lstProfiles.Columns[k];
                     if (item2.ExName == item.Name)
                     {
-                        item2.Width = item.Width;
-                        item2.DisplayIndex = i + 1;
+                        if (item.Width <= 0)
+                        {
+                            item2.Visibility = Visibility.Hidden;
+                        }
+                        else
+                        {
+                            item2.Width = item.Width;
+                            item2.DisplayIndex = i + 1;
+                        }
                     }
                 }
             }
@@ -459,7 +478,7 @@ namespace v2rayN.Views
                 lvColumnItem.Add(new()
                 {
                     Name = item2.ExName,
-                    Width = Convert.ToInt32(item2.ActualWidth),
+                    Width = item2.Visibility == Visibility.Visible ? Convert.ToInt32(item2.ActualWidth) : 0,
                     Index = item2.DisplayIndex
                 });
             }

v2rayN/v2rayN/Views/MsgView.xaml

@@ -48,6 +48,7 @@
             FontSize="{DynamicResource StdFontSizeMsg}"
             HorizontalScrollBarVisibility="Auto"
             IsReadOnly="True"
+            IsReadOnlyCaretVisible="True"
             TextAlignment="Left"
             TextWrapping="Wrap"
             VerticalScrollBarVisibility="Visible">

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}">
@@ -481,11 +481,12 @@
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
                         </Grid.RowDefinitions>
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="Auto" />
                             <ColumnDefinition Width="Auto" />
-                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" />
                         </Grid.ColumnDefinitions>
 
                         <TextBlock
@@ -507,7 +508,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 +721,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"
@@ -750,6 +753,20 @@
                             Width="300"
                             Margin="{StaticResource SettingItemMargin}"
                             Style="{StaticResource DefComboBox}" />
+                        
+                        <TextBlock
+                            Grid.Row="18"
+                            Grid.Column="0"
+                            Margin="{StaticResource SettingItemMargin}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbSettingsEnableHWA}"/>
+                        <ToggleButton
+                            x:Name="togEnableHWA"
+                            Grid.Row="18"
+                            Grid.Column="1"
+                            Margin="{StaticResource SettingItemMargin}"
+                            HorizontalAlignment="Left" />
                     </Grid>
                 </ScrollViewer>
             </TabItem>

v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs

@@ -164,6 +164,7 @@ namespace v2rayN.Views
                 this.Bind(ViewModel, vm => vm.currentFontFamily, v => v.cmbcurrentFontFamily.Text).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.SpeedTestTimeout, v => v.cmbSpeedTestTimeout.Text).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.SpeedTestUrl, v => v.cmbSpeedTestUrl.Text).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.EnableHWA, v => v.togEnableHWA.IsChecked).DisposeWith(disposables);
 
 
                 this.Bind(ViewModel, vm => vm.systemProxyAdvancedProtocol, v => v.cmbsystemProxyAdvancedProtocol.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/app.manifest

@@ -6,4 +6,18 @@
       <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
     </asmv3:windowsSettings>
   </asmv3:application>
+	
+	<!-- Enable themes for Windows common controls and dialogs (Windows XP and later) -->
+	<dependency>
+		<dependentAssembly>
+			<assemblyIdentity
+				type="win32"
+				name="Microsoft.Windows.Common-Controls"
+				version="6.0.0.0"
+				processorArchitecture="*"
+				publicKeyToken="6595b64144ccf1df"
+				language="*"
+        />
+		</dependentAssembly>
+	</dependency>
 </assembly>

v2rayN/v2rayN/v2rayN.csproj

@@ -10,20 +10,18 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<ApplicationIcon>v2rayN.ico</ApplicationIcon>
 		<Copyright>Copyright © 2017-2023 (GPLv3)</Copyright>
-		<FileVersion>6.14</FileVersion>
+		<FileVersion>6.19</FileVersion>
 	</PropertyGroup>
 
 	<ItemGroup>
 		<PackageReference Include="Downloader" Version="3.0.3" />		
 		<PackageReference Include="MaterialDesignThemes" Version="4.7.1" />
 		<PackageReference Include="Hardcodet.NotifyIcon.Wpf" Version="1.1.0" />		 
-		<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
-		<PackageReference Include="NHotkey" Version="2.1.0" />
-		<PackageReference Include="NHotkey.Wpf" Version="2.1.0" />
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 		<PackageReference Include="QRCoder.Xaml" Version="1.4.3" />
 		<PackageReference Include="sqlite-net-pcl" Version="1.8.116" />
 		<PackageReference Include="TaskScheduler" Version="2.10.1" /> 
-		<PackageReference Include="ZXing.Net.Bindings.Windows.Compatibility" Version="0.16.10" />
+		<PackageReference Include="ZXing.Net.Bindings.Windows.Compatibility" Version="0.16.12" />
 		<PackageReference Include="ReactiveUI.Fody" Version="18.4.1" />
 		<PackageReference Include="ReactiveUI.Validation" Version="3.0.22" />
 		<PackageReference Include="ReactiveUI.WPF" Version="18.4.1" />