Update 6.41

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

README.md

@@ -14,7 +14,8 @@ A GUI client for Windows, support [Xray core](https://github.com/XTLS/Xray-core)
 - Run v2rayN.exe
 
 ## Requirements  
-- [Microsoft .NET 6.0 Desktop Runtime ](https://download.visualstudio.microsoft.com/download/pr/513d13b7-b456-45af-828b-b7b7981ff462/edf44a743b78f8b54a2cec97ce888346/windowsdesktop-runtime-6.0.15-win-x64.exe)
+- (6.35 and above)[Microsoft .NET 8.0 Desktop Runtime ](https://dotnet.microsoft.com/en-us/download/dotnet/8.0)
+- (6.33 and below)[Microsoft .NET 6.0 Desktop Runtime ](https://dotnet.microsoft.com/en-us/download/dotnet/6.0)
 - [Supported cores](https://github.com/2dust/v2rayN/wiki/List-of-supported-cores)
 
 

v2rayN/ProtosLib/ProtosLib.csproj

@@ -9,9 +9,9 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Google.Protobuf" Version="3.25.2" />
+		<PackageReference Include="Google.Protobuf" Version="3.26.1" />
-		<PackageReference Include="Grpc.Net.Client" Version="2.60.0" />
+		<PackageReference Include="Grpc.Net.Client" Version="2.62.0" />
-		<PackageReference Include="Grpc.Tools" Version="2.61.0">
+		<PackageReference Include="Grpc.Tools" Version="2.62.0">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>

v2rayN/v2rayN/App.xaml.cs

@@ -1,7 +1,8 @@
-using System.Windows;
+using System.Diagnostics;
+using System.Windows;
 using System.Windows.Threading;
 using v2rayN.Handler;
-using v2rayN.Mode;
+using v2rayN.Models;
 
 namespace v2rayN
 {
@@ -34,7 +35,6 @@ namespace v2rayN
             if (!rebootas && !bCreatedNew)
             {
                 ProgramStarted.Set();
-                Current.Shutdown();
                 Environment.Exit(0);
                 return;
             }
@@ -54,8 +54,7 @@ namespace v2rayN
         {
             if (ConfigHandler.LoadConfig(ref _config) != 0)
             {
-                UI.ShowWarning($"Loading GUI configuration file is abnormal,please restart the application{Environment.NewLine}加载GUI配置文件异常,请重启应用");
+                UI.Show($"Loading GUI configuration file is abnormal,please restart the application{Environment.NewLine}加载GUI配置文件异常,请重启应用");
-                Application.Current.Shutdown();
                 Environment.Exit(0);
                 return;
             }
@@ -83,5 +82,12 @@ namespace v2rayN
         {
             Logging.SaveLog("TaskScheduler_UnobservedTaskException", e.Exception);
         }
+
+        protected override void OnExit(ExitEventArgs e)
+        {
+            Logging.SaveLog("OnExit");
+            base.OnExit(e);
+            Process.GetCurrentProcess().Kill();
+        }
     }
 }

v2rayN/v2rayN/Common/DownloaderHelper.cs

@@ -11,7 +11,7 @@ namespace v2rayN
 
         public async Task<string?> DownloadStringAsync(IWebProxy? webProxy, string url, string? userAgent, int timeout)
         {
-            if (string.IsNullOrEmpty(url))
+            if (Utils.IsNullOrEmpty(url))
             {
                 return null;
             }
@@ -57,7 +57,7 @@ namespace v2rayN
 
         public async Task DownloadDataAsync4Speed(IWebProxy webProxy, string url, IProgress<string> progress, int timeout)
         {
-            if (string.IsNullOrEmpty(url))
+            if (Utils.IsNullOrEmpty(url))
             {
                 throw new ArgumentNullException(nameof(url));
             }
@@ -120,11 +120,11 @@ namespace v2rayN
 
         public async Task DownloadFileAsync(IWebProxy? webProxy, string url, string fileName, IProgress<double> progress, int timeout)
         {
-            if (string.IsNullOrEmpty(url))
+            if (Utils.IsNullOrEmpty(url))
             {
                 throw new ArgumentNullException(nameof(url));
             }
-            if (string.IsNullOrEmpty(fileName))
+            if (Utils.IsNullOrEmpty(fileName))
             {
                 throw new ArgumentNullException(nameof(fileName));
             }

v2rayN/v2rayN/Common/FileManager.cs

@@ -20,7 +20,7 @@ namespace v2rayN
             return false;
         }
 
-        public static void UncompressFile(string fileName, byte[] content)
+        public static void UncompressedFile(string fileName, byte[] content)
         {
             try
             {

v2rayN/v2rayN/Common/HttpClientHelper.cs

@@ -23,13 +23,13 @@ namespace v2rayN
 
         public async Task<string?> GetAsync(string url)
         {
-            if (string.IsNullOrEmpty(url)) return null;
+            if (Utils.IsNullOrEmpty(url)) return null;
             return await httpClient.GetStringAsync(url);
         }
 
         public async Task<string?> GetAsync(HttpClient client, string url, CancellationToken token = default)
         {
-            if (string.IsNullOrWhiteSpace(url)) return null;
+            if (Utils.IsNullOrEmpty(url)) return null;
             return await client.GetStringAsync(url, token);
         }
 
@@ -76,19 +76,19 @@ namespace v2rayN
                     //if (progressPercentage != percent && percent % 10 == 0)
                     {
                         progressPercentage = percent;
-                        progress!.Report(percent);
+                        progress?.Report(percent);
                     }
                 }
             }
             if (canReportProgress)
             {
-                progress!.Report(101);
+                progress?.Report(101);
             }
         }
 
         public async Task DownloadDataAsync4Speed(HttpClient client, string url, IProgress<string> progress, CancellationToken token = default)
         {
-            if (string.IsNullOrEmpty(url))
+            if (Utils.IsNullOrEmpty(url))
             {
                 throw new ArgumentNullException(nameof(url));
             }

v2rayN/v2rayN/Common/JsonUtils.cs

@@ -28,7 +28,7 @@ namespace v2rayN
         {
             try
             {
-                if (string.IsNullOrEmpty(strJson))
+                if (string.IsNullOrWhiteSpace(strJson))
                 {
                     return default;
                 }
@@ -49,7 +49,7 @@ namespace v2rayN
         {
             try
             {
-                if (string.IsNullOrEmpty(strJson))
+                if (string.IsNullOrWhiteSpace(strJson))
                 {
                     return null;
                 }

v2rayN/v2rayN/Common/QueryableExtension.cs

@@ -29,22 +29,22 @@ namespace v2rayN
 
         public static IOrderedQueryable<T> OrderByInternal<T, TProp>(IQueryable<T> query, PropertyInfo memberProperty)
         {//public
-            return query.OrderBy(_GetLamba<T, TProp>(memberProperty));
+            return query.OrderBy(_GetLambda<T, TProp>(memberProperty));
         }
 
         public static IOrderedQueryable<T> OrderByDescendingInternal<T, TProp>(IQueryable<T> query, PropertyInfo memberProperty)
         {//public
-            return query.OrderByDescending(_GetLamba<T, TProp>(memberProperty));
+            return query.OrderByDescending(_GetLambda<T, TProp>(memberProperty));
         }
 
-        private static Expression<Func<T, TProp>> _GetLamba<T, TProp>(PropertyInfo memberProperty)
+        private static Expression<Func<T, TProp>> _GetLambda<T, TProp>(PropertyInfo memberProperty)
         {
             if (memberProperty.PropertyType != typeof(TProp)) throw new Exception();
 
             var thisArg = Expression.Parameter(typeof(T));
-            var lamba = Expression.Lambda<Func<T, TProp>>(Expression.Property(thisArg, memberProperty), thisArg);
+            var lambda = Expression.Lambda<Func<T, TProp>>(Expression.Property(thisArg, memberProperty), thisArg);
 
-            return lamba;
+            return lambda;
         }
     }
 }

v2rayN/v2rayN/Common/SqliteHelper.cs

@@ -3,17 +3,17 @@ using System.Collections;
 
 namespace v2rayN
 {
-    public sealed class SqliteHelper
+    public sealed class SQLiteHelper
     {
-        private static readonly Lazy<SqliteHelper> _instance = new(() => new());
+        private static readonly Lazy<SQLiteHelper> _instance = new(() => new());
-        public static SqliteHelper Instance => _instance.Value;
+        public static SQLiteHelper Instance => _instance.Value;
         private string _connstr;
         private SQLiteConnection _db;
         private SQLiteAsyncConnection _dbAsync;
         private static readonly object objLock = new();
         public readonly string _configDB = "guiNDB.db";
 
-        public SqliteHelper()
+        public SQLiteHelper()
         {
             _connstr = Utils.GetConfigPath(_configDB);
             _db = new SQLiteConnection(_connstr, false);
@@ -51,7 +51,7 @@ namespace v2rayN
             }
         }
 
-        public async Task<int> Replacesync(object model)
+        public async Task<int> ReplaceAsync(object model)
         {
             return await _dbAsync.InsertOrReplaceAsync(model);
         }

v2rayN/v2rayN/Common/UI.cs

@@ -12,11 +12,6 @@ namespace v2rayN
             MessageBox.Show(msg, caption, MessageBoxButton.OK, MessageBoxImage.Information, MessageBoxResult.OK);
         }
 
-        public static void ShowWarning(string msg)
-        {
-            MessageBox.Show(msg, caption, MessageBoxButton.OK, MessageBoxImage.Warning, MessageBoxResult.OK);
-        }
-
         public static MessageBoxResult ShowYesNo(string msg)
         {
             return MessageBox.Show(msg, caption, MessageBoxButton.YesNo, MessageBoxImage.Question);

v2rayN/v2rayN/Common/Utils.cs

@@ -325,8 +325,11 @@ namespace v2rayN
                 var key = Uri.UnescapeDataString(keyValue[0]);
                 var val = Uri.UnescapeDataString(keyValue[1]);
 
+                if (result[key] is null)
+                {
                     result.Add(key, val);
                 }
+            }
 
             return result;
         }
@@ -358,14 +361,14 @@ namespace v2rayN
         /// <returns></returns>
         public static string GetPunycode(string url)
         {
-            if (string.IsNullOrWhiteSpace(url))
+            if (Utils.IsNullOrEmpty(url))
             {
                 return url;
             }
             try
             {
                 Uri uri = new(url);
-                if (uri.Host == uri.IdnHost)
+                if (uri.Host == uri.IdnHost || uri.Host == $"[{uri.IdnHost}]")
                 {
                     return url;
                 }
@@ -388,7 +391,7 @@ namespace v2rayN
 
         public static string Convert2Comma(string text)
         {
-            if (string.IsNullOrWhiteSpace(text))
+            if (Utils.IsNullOrEmpty(text))
             {
                 return text;
             }
@@ -404,7 +407,7 @@ namespace v2rayN
         /// </summary>
         /// <param name="oText"></param>
         /// <returns></returns>
-        public static bool IsNumberic(string oText)
+        public static bool IsNumeric(string oText)
         {
             try
             {
@@ -425,7 +428,7 @@ namespace v2rayN
         /// <returns></returns>
         public static bool IsNullOrEmpty(string? text)
         {
-            if (string.IsNullOrEmpty(text))
+            if (string.IsNullOrWhiteSpace(text))
             {
                 return true;
             }
@@ -456,7 +459,7 @@ namespace v2rayN
                 string[] cidr = ip.Split('/');
                 if (cidr.Length == 2)
                 {
-                    if (!IsNumberic(cidr[0]))
+                    if (!IsNumeric(cidr[0]))
                     {
                         return false;
                     }
@@ -576,11 +579,10 @@ namespace v2rayN
             return inUse;
         }
 
-        public static int GetFreePort()
+        public static int GetFreePort(int defaultPort = 9090)
         {
             try
             {
-                int defaultPort = 9090;
                 if (!Utils.PortInUse(defaultPort))
                 {
                     return defaultPort;
@@ -595,7 +597,7 @@ namespace v2rayN
             catch
             {
             }
-            return 69090;
+            return 59090;
         }
 
         #endregion 测速
@@ -838,7 +840,7 @@ namespace v2rayN
             {
                 Directory.CreateDirectory(_tempPath);
             }
-            if (string.IsNullOrEmpty(filename))
+            if (Utils.IsNullOrEmpty(filename))
             {
                 return _tempPath;
             }
@@ -874,7 +876,7 @@ namespace v2rayN
             {
                 Directory.CreateDirectory(_tempPath);
             }
-            if (string.IsNullOrEmpty(filename))
+            if (Utils.IsNullOrEmpty(filename))
             {
                 return _tempPath;
             }
@@ -899,7 +901,7 @@ namespace v2rayN
                     Directory.CreateDirectory(_tempPath);
                 }
             }
-            if (string.IsNullOrEmpty(filename))
+            if (Utils.IsNullOrEmpty(filename))
             {
                 return _tempPath;
             }
@@ -916,7 +918,7 @@ namespace v2rayN
             {
                 Directory.CreateDirectory(_tempPath);
             }
-            if (string.IsNullOrEmpty(filename))
+            if (Utils.IsNullOrEmpty(filename))
             {
                 return _tempPath;
             }
@@ -933,7 +935,7 @@ namespace v2rayN
             {
                 Directory.CreateDirectory(_tempPath);
             }
-            if (string.IsNullOrEmpty(filename))
+            if (Utils.IsNullOrEmpty(filename))
             {
                 return _tempPath;
             }
@@ -1027,14 +1029,14 @@ namespace v2rayN
 
                 if (run)
                 {
-                    string exePath = $"\"{GetExePath()}\"";
+                    string exePath = GetExePath();
                     if (IsAdministrator())
                     {
                         AutoStart(autoRunName, exePath, "");
                     }
                     else
                     {
-                        RegWriteValue(AutoRunRegPath, autoRunName, exePath);
+                        RegWriteValue(AutoRunRegPath, autoRunName, exePath.AppendQuotes());
                     }
                 }
             }
@@ -1105,7 +1107,7 @@ namespace v2rayN
         /// <exception cref="ArgumentNullException"></exception>
         public static void AutoStart(string taskName, string fileName, string description)
         {
-            if (string.IsNullOrEmpty(taskName))
+            if (Utils.IsNullOrEmpty(taskName))
             {
                 return;
             }
@@ -1120,7 +1122,7 @@ namespace v2rayN
             {
                 taskService.RootFolder.DeleteTask(t.Name);
             }
-            if (string.IsNullOrEmpty(fileName))
+            if (Utils.IsNullOrEmpty(fileName))
             {
                 return;
             }
@@ -1134,7 +1136,7 @@ namespace v2rayN
             task.Settings.ExecutionTimeLimit = TimeSpan.Zero;
             task.Triggers.Add(new LogonTrigger { UserId = logonUser, Delay = TimeSpan.FromSeconds(10) });
             task.Principal.RunLevel = TaskRunLevel.Highest;
-            task.Actions.Add(new ExecAction(deamonFileName));
+            task.Actions.Add(new ExecAction(deamonFileName.AppendQuotes(), null, Path.GetDirectoryName(deamonFileName)));
 
             taskService.RootFolder.RegisterTaskDefinition(TaskName, task);
         }

v2rayN/v2rayN/Converters/MaterialDesignFonts.cs

@@ -12,7 +12,7 @@ namespace v2rayN.Converters
             try
             {
                 var fontFamily = LazyConfig.Instance.GetConfig().uiItem.currentFontFamily;
-                if (!string.IsNullOrEmpty(fontFamily))
+                if (!Utils.IsNullOrEmpty(fontFamily))
                 {
                     var fontPath = Utils.GetFontsPath();
                     MyFont = new FontFamily(new Uri(@$"file:///{fontPath}\"), $"./#{fontFamily}");

v2rayN/v2rayN/Global.cs

@@ -1,4 +1,4 @@
-using v2rayN.Mode;
+using v2rayN.Models;
 
 namespace v2rayN
 {
@@ -8,9 +8,6 @@ namespace v2rayN
 
         public const string GithubUrl = "https://github.com";
         public const string GithubApiUrl = "https://api.github.com/repos";
-        public const string V2rayWebsiteUrl = @"https://www.v2fly.org/";
-        public const string AboutUrl = @"https://github.com/2dust/v2rayN";
-        public const string UpdateUrl = AboutUrl + @"/releases";
         public const string V2flyCoreUrl = "https://github.com/v2fly/v2ray-core/releases";
         public const string XrayCoreUrl = "https://github.com/XTLS/Xray-core/releases";
         public const string SagerNetCoreUrl = "https://github.com/SagerNet/v2ray-core/releases";
@@ -23,7 +20,6 @@ namespace v2rayN
         public const string TuicCoreUrl = "https://github.com/EAimTY/tuic/releases";
         public const string SingboxCoreUrl = "https://github.com/SagerNet/sing-box/releases";
         public const string GeoUrl = "https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/{0}.dat";
-        public const string SingboxGeoUrl = "https://github.com/soffchen/sing-{0}/releases/latest/download/{0}.db";
         public const string SpeedPingTestUrl = @"https://www.google.com/generate_204";
         public const string JuicityCoreUrl = "https://github.com/juicity/juicity/releases";
         public const string CustomRoutingListUrl = @"https://raw.githubusercontent.com/2dust/v2rayCustomRoutingList/master/";
@@ -35,8 +31,8 @@ namespace v2rayN
         public const string CoreSpeedtestConfigFileName = "configSpeedtest.json";
         public const string V2raySampleClient = "v2rayN.Sample.SampleClientConfig";
         public const string SingboxSampleClient = "v2rayN.Sample.SingboxSampleClientConfig";
-        public const string V2raySampleHttprequestFileName = "v2rayN.Sample.SampleHttprequest";
+        public const string V2raySampleHttpRequestFileName = "v2rayN.Sample.SampleHttpRequest";
-        public const string V2raySampleHttpresponseFileName = "v2rayN.Sample.SampleHttpresponse";
+        public const string V2raySampleHttpResponseFileName = "v2rayN.Sample.SampleHttpResponse";
         public const string V2raySampleInbound = "v2rayN.Sample.SampleInbound";
         public const string V2raySampleOutbound = "v2rayN.Sample.SampleOutbound";
         public const string SingboxSampleOutbound = "v2rayN.Sample.SingboxSampleOutbound";
@@ -56,28 +52,23 @@ namespace v2rayN
         public const string BlockTag = "block";
         public const string StreamSecurity = "tls";
         public const string StreamSecurityReality = "reality";
-        public const string InboundSocks = "socks";
-        public const string InboundHttp = "http";
-        public const string InboundSocks2 = "socks2";
-        public const string InboundHttp2 = "http2";
         public const string Loopback = "127.0.0.1";
-        public const string InboundAPITagName = "api";
+        public const string InboundAPIProtocol = "dokodemo-door";
-        public const string InboundAPIProtocal = "dokodemo-door";
         public const string HttpProtocol = "http://";
         public const string HttpsProtocol = "https://";
 
         public const string UserEMail = "t@t.tt";
-        public const string MyRegPath = "Software\\v2rayNGUI";
         public const string AutoRunRegPath = @"Software\Microsoft\Windows\CurrentVersion\Run";
         public const string AutoRunName = "v2rayNAutoRun";
-        public const string MyRegKeyLanguage = "CurrentLanguage";
         public const string CustomIconName = "v2rayN.ico";
         public const string IEProxyExceptions = "localhost;127.*;10.*;172.16.*;172.17.*;172.18.*;172.19.*;172.20.*;172.21.*;172.22.*;172.23.*;172.24.*;172.25.*;172.26.*;172.27.*;172.28.*;172.29.*;172.30.*;172.31.*;192.168.*";
         public const string RoutingRuleComma = "<COMMA>";
-        public const string GrpcgunMode = "gun";
+        public const string GrpcGunMode = "gun";
-        public const string GrpcmultiMode = "multi";
+        public const string GrpcMultiMode = "multi";
         public const int MaxPort = 65536;
         public const string CommandClearMsg = "CommandClearMsg";
+        public const string CommandSendMsgView = "CommandSendMsgView";
+        public const string CommandStopSpeedTest = "CommandStopSpeedTest";
         public const string DelayUnit = "";
         public const string SpeedUnit = "";
         public const int MinFontSize = 10;
@@ -120,9 +111,11 @@ namespace v2rayN
 
         public static readonly List<string> SpeedPingTestUrls = new() {
             @"https://www.google.com/generate_204",
+            @"https://www.apple.com/library/test/success.html",
+            @"http://www.msftconnecttest.com/connecttest.txt",
         };
 
-        public static readonly Dictionary<string, string> UserAgentTxts = new()
+        public static readonly Dictionary<string, string> UserAgentTexts = new()
         {
             {"chrome","Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.131 Safari/537.36" },
             {"firefox","Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:90.0) Gecko/20100101 Firefox/90.0" },
@@ -157,23 +150,23 @@ namespace v2rayN
             {EConfigType.Wireguard,"wireguard"}
         };
 
-        public static readonly List<string> VmessSecuritys = new() { "aes-128-gcm", "chacha20-poly1305", "auto", "none", "zero" };
+        public static readonly List<string> VmessSecurities = new() { "aes-128-gcm", "chacha20-poly1305", "auto", "none", "zero" };
-        public static readonly List<string> SsSecuritys = new() { "aes-256-gcm", "aes-128-gcm", "chacha20-poly1305", "chacha20-ietf-poly1305", "none", "plain" };
+        public static readonly List<string> SsSecurities = 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> SsSecuritiesInSagerNet = 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> SsSecuritiesInXray = 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> SsSecuritysInSingbox = new() { "aes-256-gcm", "aes-192-gcm", "aes-128-gcm", "chacha20-ietf-poly1305", "xchacha20-ietf-poly1305", "none", "2022-blake3-aes-128-gcm", "2022-blake3-aes-256-gcm", "2022-blake3-chacha20-poly1305", "aes-128-ctr", "aes-192-ctr", "aes-256-ctr", "aes-128-cfb", "aes-192-cfb", "aes-256-cfb", "rc4-md5", "chacha20-ietf", "xchacha20" };
+        public static readonly List<string> SsSecuritiesInSingbox = new() { "aes-256-gcm", "aes-192-gcm", "aes-128-gcm", "chacha20-ietf-poly1305", "xchacha20-ietf-poly1305", "none", "2022-blake3-aes-128-gcm", "2022-blake3-aes-256-gcm", "2022-blake3-chacha20-poly1305", "aes-128-ctr", "aes-192-ctr", "aes-256-ctr", "aes-128-cfb", "aes-192-cfb", "aes-256-cfb", "rc4-md5", "chacha20-ietf", "xchacha20" };
         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> Networks = new() { "tcp", "kcp", "ws", "httpupgrade", "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", "sing_box" };
         public static readonly List<string> CoreTypes4VLESS = new() { "Xray", "sing_box" };
-        public static readonly List<string> DomainStrategys = new() { "AsIs", "IPIfNonMatch", "IPOnDemand" };
+        public static readonly List<string> DomainStrategies = new() { "AsIs", "IPIfNonMatch", "IPOnDemand" };
-        public static readonly List<string> DomainStrategys4Singbox = new() { "ipv4_only", "ipv6_only", "prefer_ipv4", "prefer_ipv6", "" };
+        public static readonly List<string> DomainStrategies4Singbox = new() { "ipv4_only", "ipv6_only", "prefer_ipv4", "prefer_ipv6", "" };
         public static readonly List<string> DomainMatchers = new() { "linear", "mph", "" };
         public static readonly List<string> Fingerprints = new() { "chrome", "firefox", "safari", "ios", "android", "edge", "360", "qq", "random", "randomized", "" };
         public static readonly List<string> UserAgent = new() { "chrome", "firefox", "safari", "edge", "none" };
 
-        public static readonly List<string> AllowInsecures = new() { "true", "false", "" };
+        public static readonly List<string> AllowInsecure = new() { "true", "false", "" };
         public static readonly List<string> DomainStrategy4Freedoms = new() { "AsIs", "UseIP", "UseIPv4", "UseIPv6", "" };
         public static readonly List<string> Languages = new() { "zh-Hans", "zh-Hant", "en", "fa-Ir", "ru" };
         public static readonly List<string> Alpns = new() { "h3", "h2", "http/1.1", "h3,h2,http/1.1", "h3,h2", "h2,http/1.1", "" };

v2rayN/v2rayN/Handler/ConfigHandler.cs

@@ -1,7 +1,7 @@
 using System.Data;
 using System.IO;
 using System.Text.RegularExpressions;
-using v2rayN.Mode;
+using v2rayN.Models;
 
 namespace v2rayN.Handler
 {
@@ -61,7 +61,7 @@ namespace v2rayN.Handler
                 config.inbound = new List<InItem>();
                 InItem inItem = new()
                 {
-                    protocol = Global.InboundSocks,
+                    protocol = EInboundProtocol.socks.ToString(),
                     localPort = 10808,
                     udpEnabled = true,
                     sniffingEnabled = true,
@@ -69,19 +69,12 @@ namespace v2rayN.Handler
                 };
 
                 config.inbound.Add(inItem);
-
-                //inItem = new InItem();
-                //inItem.protocol = "http";
-                //inItem.localPort = 1081;
-                //inItem.udpEnabled = true;
-
-                //config.inbound.Add(inItem);
             }
             else
             {
                 if (config.inbound.Count > 0)
                 {
-                    config.inbound[0].protocol = Global.InboundSocks;
+                    config.inbound[0].protocol = EInboundProtocol.socks.ToString();
                 }
             }
             if (config.routingBasicItem == null)
@@ -94,9 +87,9 @@ namespace v2rayN.Handler
             //路由规则
             if (Utils.IsNullOrEmpty(config.routingBasicItem.domainStrategy))
             {
-                config.routingBasicItem.domainStrategy = Global.DomainStrategys[0];//"IPIfNonMatch";
+                config.routingBasicItem.domainStrategy = Global.DomainStrategies[0];//"IPIfNonMatch";
             }
-            //if (Utils.IsNullOrEmpty(config.domainMatcher))
+            //if (Utile.IsNullOrEmpty(config.domainMatcher))
             //{
             //    config.domainMatcher = "linear";
             //}
@@ -187,10 +180,7 @@ namespace v2rayN.Handler
                 config.mux4SboxItem = new()
                 {
                     protocol = Global.SingboxMuxs[0],
-                    max_connections = 4,
+                    max_connections = 4
-                    min_streams = 4,
-                    max_streams = 0,
-                    padding = true
                 };
             }
 
@@ -272,7 +262,7 @@ namespace v2rayN.Handler
                 {
                     it.id = Utils.GetGUID(false);
                 }
-                SqliteHelper.Instance.Replace(it);
+                SQLiteHelper.Instance.Replace(it);
             }
 
             var profileItems = JsonUtils.Deserialize<List<ProfileItem>>(JsonUtils.Serialize(configOld.vmess));
@@ -282,7 +272,7 @@ namespace v2rayN.Handler
                 {
                     it.indexId = Utils.GetGUID(false);
                 }
-                SqliteHelper.Instance.Replace(it);
+                SQLiteHelper.Instance.Replace(it);
             }
 
             foreach (var it in configOld.routings)
@@ -303,7 +293,7 @@ namespace v2rayN.Handler
                 {
                     routing.id = Utils.GetGUID(false);
                 }
-                SqliteHelper.Instance.Replace(routing);
+                SQLiteHelper.Instance.Replace(routing);
             }
 
             config = JsonUtils.Deserialize<Config>(JsonUtils.Serialize(configOld));
@@ -372,7 +362,7 @@ namespace v2rayN.Handler
             profileItem.path = profileItem.path.TrimEx();
             profileItem.streamSecurity = profileItem.streamSecurity.TrimEx();
 
-            if (!Global.VmessSecuritys.Contains(profileItem.security))
+            if (!Global.VmessSecurities.Contains(profileItem.security))
             {
                 return -1;
             }
@@ -390,17 +380,17 @@ namespace v2rayN.Handler
         /// 移除服务器
         /// </summary>
         /// <param name="config"></param>
-        /// <param name="indexs"></param>
+        /// <param name="indexes"></param>
         /// <returns></returns>
-        public static int RemoveServer(Config config, List<ProfileItem> indexs)
+        public static int RemoveServer(Config config, List<ProfileItem> indexes)
         {
             var subid = "TempRemoveSubId";
-            foreach (var item in indexs)
+            foreach (var item in indexes)
             {
                 item.subid = subid;
             }
 
-            SqliteHelper.Instance.UpdateAll(indexs);
+            SQLiteHelper.Instance.UpdateAll(indexes);
             RemoveServerViaSubid(config, subid, false);
 
             return 0;
@@ -412,9 +402,9 @@ namespace v2rayN.Handler
         /// <param name="config"></param>
         /// <param name="index"></param>
         /// <returns></returns>
-        public static int CopyServer(Config config, List<ProfileItem> indexs)
+        public static int CopyServer(Config config, List<ProfileItem> indexes)
         {
-            foreach (var it in indexs)
+            foreach (var it in indexes)
             {
                 var item = LazyConfig.Instance.GetProfileItem(it.indexId);
                 if (item is null)
@@ -468,7 +458,7 @@ namespace v2rayN.Handler
             {
                 return 0;
             }
-            if (SqliteHelper.Instance.Table<ProfileItem>().Where(t => t.indexId == config.indexId).Any())
+            if (SQLiteHelper.Instance.Table<ProfileItem>().Where(t => t.indexId == config.indexId).Any())
             {
                 return 0;
             }
@@ -476,7 +466,7 @@ namespace v2rayN.Handler
             {
                 return SetDefaultServerIndex(config, lstProfile.Where(t => t.port > 0).FirstOrDefault()?.indexId);
             }
-            return SetDefaultServerIndex(config, SqliteHelper.Instance.Table<ProfileItem>().Where(t => t.port > 0).Select(t => t.indexId).FirstOrDefault());
+            return SetDefaultServerIndex(config, SQLiteHelper.Instance.Table<ProfileItem>().Where(t => t.port > 0).Select(t => t.indexId).FirstOrDefault());
         }
 
         public static ProfileItem? GetDefaultServer(Config config)
@@ -484,7 +474,7 @@ namespace v2rayN.Handler
             var item = LazyConfig.Instance.GetProfileItem(config.indexId);
             if (item is null)
             {
-                var item2 = SqliteHelper.Instance.Table<ProfileItem>().FirstOrDefault();
+                var item2 = SQLiteHelper.Instance.Table<ProfileItem>().FirstOrDefault();
                 SetDefaultServerIndex(config, item2?.indexId);
                 return item2;
             }
@@ -581,7 +571,7 @@ namespace v2rayN.Handler
             }
             var ext = Path.GetExtension(fileName);
             string newFileName = $"{Utils.GetGUID()}{ext}";
-            //newFileName = Path.Combine(Utils.GetTempPath(), newFileName);
+            //newFileName = Path.Combine(Utile.GetTempPath(), newFileName);
 
             try
             {
@@ -617,7 +607,7 @@ namespace v2rayN.Handler
         /// <returns></returns>
         public static int EditCustomServer(Config config, ProfileItem profileItem)
         {
-            if (SqliteHelper.Instance.Update(profileItem) > 0)
+            if (SQLiteHelper.Instance.Update(profileItem) > 0)
             {
                 return 0;
             }
@@ -643,7 +633,7 @@ namespace v2rayN.Handler
             profileItem.id = profileItem.id.TrimEx();
             profileItem.security = profileItem.security.TrimEx();
 
-            if (!LazyConfig.Instance.GetShadowsocksSecuritys(profileItem).Contains(profileItem.security))
+            if (!LazyConfig.Instance.GetShadowsocksSecurities(profileItem).Contains(profileItem.security))
             {
                 return -1;
             }
@@ -923,6 +913,10 @@ namespace v2rayN.Handler
             {
                 return -1;
             }
+            if (!Utils.IsNullOrEmpty(profileItem.security) && profileItem.security != Global.None)
+            {
+                profileItem.security = Global.None;
+            }
 
             AddServerCommon(config, profileItem, toFile);
 
@@ -958,6 +952,13 @@ namespace v2rayN.Handler
             profileItem.configVersion = 2;
 
             if (!Utils.IsNullOrEmpty(profileItem.streamSecurity))
+            {
+                if (profileItem.streamSecurity != Global.StreamSecurity
+                     && profileItem.streamSecurity != Global.StreamSecurityReality)
+                {
+                    profileItem.streamSecurity = string.Empty;
+                }
+                else
                 {
                     if (Utils.IsNullOrEmpty(profileItem.allowInsecure))
                     {
@@ -968,6 +969,7 @@ namespace v2rayN.Handler
                         profileItem.fingerprint = config.coreBasicItem.defFingerprint;
                     }
                 }
+            }
 
             if (!Utils.IsNullOrEmpty(profileItem.network) && !Global.Networks.Contains(profileItem.network))
             {
@@ -991,7 +993,7 @@ namespace v2rayN.Handler
 
             if (toFile)
             {
-                SqliteHelper.Instance.Replace(profileItem);
+                SQLiteHelper.Instance.Replace(profileItem);
             }
             return 0;
         }
@@ -1033,7 +1035,7 @@ namespace v2rayN.Handler
                     File.Delete(Utils.GetConfigPath(item.address));
                 }
 
-                SqliteHelper.Instance.Delete(item);
+                SQLiteHelper.Instance.Delete(item);
             }
             catch (Exception ex)
             {
@@ -1105,7 +1107,7 @@ namespace v2rayN.Handler
                         //Check for duplicate indexId
                         if (lstDbIndexId is null)
                         {
-                            lstDbIndexId = LazyConfig.Instance.ProfileItemIndexs("");
+                            lstDbIndexId = LazyConfig.Instance.ProfileItemIndexes("");
                         }
                         if (lstAdd.Any(t => t.indexId == existItem.indexId)
                             || lstDbIndexId.Any(t => t == existItem.indexId))
@@ -1151,7 +1153,7 @@ namespace v2rayN.Handler
 
             if (lstAdd.Count > 0)
             {
-                SqliteHelper.Instance.InsertAll(lstAdd);
+                SQLiteHelper.Instance.InsertAll(lstAdd);
             }
 
             ToJsonFile(config);
@@ -1166,7 +1168,7 @@ namespace v2rayN.Handler
             }
 
             //判断str是否包含s的任意一个字符串
-            static bool Containss(string str, params string[] s)
+            static bool Contains(string str, params string[] s)
             {
                 foreach (var item in s)
                 {
@@ -1175,9 +1177,49 @@ namespace v2rayN.Handler
                 return false;
             }
 
+            //Is v2ray array configuration
+            var configObjects = JsonUtils.Deserialize<Object[]>(clipboardData);
+            if (configObjects != null && configObjects.Length > 0)
+            {
+                if (isSub && !Utils.IsNullOrEmpty(subid))
+                {
+                    RemoveServerViaSubid(config, subid, isSub);
+                }
+
+                int count = 0;
+                foreach (var configObject in configObjects)
+                {
+                    var objectString = JsonUtils.Serialize(configObject);
+                    var v2rayCon = JsonUtils.Deserialize<V2rayConfig>(objectString);
+                    if (v2rayCon?.inbounds?.Count > 0 && v2rayCon.outbounds?.Count > 0)
+                    {
+                        var fileName = Utils.GetTempPath($"{Utils.GetGUID(false)}.json");
+                        File.WriteAllText(fileName, objectString);
+
+                        var profileIt = new ProfileItem
+                        {
+                            coreType = ECoreType.Xray,
+                            address = fileName,
+                            remarks = v2rayCon.remarks ?? "v2ray_custom",
+                            subid = subid,
+                            isSub = isSub
+                        };
+
+                        if (AddCustomServer(config, profileIt, true) == 0)
+                        {
+                            count++;
+                        }
+                    }
+                }
+                if (count > 0)
+                {
+                    return count;
+                }
+            }
+
             ProfileItem profileItem = new();
             //Is v2ray configuration
-            V2rayConfig? v2rayConfig = JsonUtils.Deserialize<V2rayConfig>(clipboardData);
+            var v2rayConfig = JsonUtils.Deserialize<V2rayConfig>(clipboardData);
             if (v2rayConfig?.inbounds?.Count > 0
                 && v2rayConfig.outbounds?.Count > 0)
             {
@@ -1186,10 +1228,10 @@ namespace v2rayN.Handler
 
                 profileItem.coreType = ECoreType.Xray;
                 profileItem.address = fileName;
-                profileItem.remarks = "v2ray_custom";
+                profileItem.remarks = v2rayConfig.remarks ?? "v2ray_custom";
             }
             //Is Clash configuration
-            else if (Containss(clipboardData, "port", "socks-port", "proxies"))
+            else if (Contains(clipboardData, "port", "socks-port", "proxies"))
             {
                 var fileName = Utils.GetTempPath($"{Utils.GetGUID(false)}.yaml");
                 File.WriteAllText(fileName, clipboardData);
@@ -1199,7 +1241,7 @@ namespace v2rayN.Handler
                 profileItem.remarks = "clash_custom";
             }
             //Is hysteria configuration
-            else if (Containss(clipboardData, "server", "up", "down", "listen", "<html>", "<body>"))
+            else if (Contains(clipboardData, "server", "up", "down", "listen", "<html>", "<body>"))
             {
                 var fileName = Utils.GetTempPath($"{Utils.GetGUID(false)}.json");
                 File.WriteAllText(fileName, clipboardData);
@@ -1209,7 +1251,7 @@ namespace v2rayN.Handler
                 profileItem.remarks = "hysteria_custom";
             }
             //Is naiveproxy configuration
-            else if (Containss(clipboardData, "listen", "proxy", "<html>", "<body>"))
+            else if (Contains(clipboardData, "listen", "proxy", "<html>", "<body>"))
             {
                 var fileName = Utils.GetTempPath($"{Utils.GetGUID(false)}.json");
                 File.WriteAllText(fileName, clipboardData);
@@ -1222,7 +1264,7 @@ namespace v2rayN.Handler
             else
             {
                 return -1;
-                //var fileName = Utils.GetTempPath($"{Utils.GetGUID(false)}.txt");
+                //var fileName = Utile.GetTempPath($"{Utile.GetGUID(false)}.txt");
                 //File.WriteAllText(fileName, clipboardData);
 
                 //profileItem.address = fileName;
@@ -1355,7 +1397,7 @@ namespace v2rayN.Handler
         public static int AddSubItem(Config config, string url)
         {
             //already exists
-            if (SqliteHelper.Instance.Table<SubItem>().Where(e => e.url == url).Count() > 0)
+            if (SQLiteHelper.Instance.Table<SubItem>().Where(e => e.url == url).Count() > 0)
             {
                 return 0;
             }
@@ -1379,14 +1421,14 @@ namespace v2rayN.Handler
                 if (subItem.sort <= 0)
                 {
                     var maxSort = 0;
-                    if (SqliteHelper.Instance.Table<SubItem>().Count() > 0)
+                    if (SQLiteHelper.Instance.Table<SubItem>().Count() > 0)
                     {
-                        maxSort = SqliteHelper.Instance.Table<SubItem>().Max(t => t == null ? 0 : t.sort);
+                        maxSort = SQLiteHelper.Instance.Table<SubItem>().Max(t => t == null ? 0 : t.sort);
                     }
                     subItem.sort = maxSort + 1;
                 }
             }
-            if (SqliteHelper.Instance.Replace(subItem) > 0)
+            if (SQLiteHelper.Instance.Replace(subItem) > 0)
             {
                 return 0;
             }
@@ -1408,14 +1450,14 @@ namespace v2rayN.Handler
             {
                 return -1;
             }
-            var customProfile = SqliteHelper.Instance.Table<ProfileItem>().Where(t => t.subid == subid && t.configType == EConfigType.Custom).ToList();
+            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}'");
+                SQLiteHelper.Instance.Execute($"delete from ProfileItem where isSub = 1 and subid = '{subid}'");
             }
             else
             {
-                SqliteHelper.Instance.Execute($"delete from ProfileItem where subid = '{subid}'");
+                SQLiteHelper.Instance.Execute($"delete from ProfileItem where subid = '{subid}'");
             }
             foreach (var item in customProfile)
             {
@@ -1432,7 +1474,7 @@ namespace v2rayN.Handler
             {
                 return 0;
             }
-            SqliteHelper.Instance.Delete(item);
+            SQLiteHelper.Instance.Delete(item);
             RemoveServerViaSubid(config, id, false);
 
             return 0;
@@ -1444,7 +1486,7 @@ namespace v2rayN.Handler
             {
                 item.subid = subid;
             }
-            SqliteHelper.Instance.UpdateAll(lstProfile);
+            SQLiteHelper.Instance.UpdateAll(lstProfile);
 
             return 0;
         }
@@ -1460,7 +1502,7 @@ namespace v2rayN.Handler
                 item.id = Utils.GetGUID(false);
             }
 
-            if (SqliteHelper.Instance.Replace(item) > 0)
+            if (SQLiteHelper.Instance.Replace(item) > 0)
             {
                 return 0;
             }
@@ -1501,7 +1543,7 @@ namespace v2rayN.Handler
                 routingItem.id = Utils.GetGUID(false);
             }
 
-            if (SqliteHelper.Instance.Replace(routingItem) > 0)
+            if (SQLiteHelper.Instance.Replace(routingItem) > 0)
             {
                 return 0;
             }
@@ -1590,7 +1632,7 @@ namespace v2rayN.Handler
 
         public static int SetDefaultRouting(Config config, RoutingItem routingItem)
         {
-            if (SqliteHelper.Instance.Table<RoutingItem>().Where(t => t.id == routingItem.id).Count() > 0)
+            if (SQLiteHelper.Instance.Table<RoutingItem>().Where(t => t.id == routingItem.id).Count() > 0)
             {
                 config.routingBasicItem.routingIndexId = routingItem.id;
             }
@@ -1605,7 +1647,7 @@ namespace v2rayN.Handler
             var item = LazyConfig.Instance.GetRoutingItem(config.routingBasicItem.routingIndexId);
             if (item is null)
             {
-                var item2 = SqliteHelper.Instance.Table<RoutingItem>().FirstOrDefault(t => t.locked == false);
+                var item2 = SQLiteHelper.Instance.Table<RoutingItem>().FirstOrDefault(t => t.locked == false);
                 SetDefaultRouting(config, item2);
                 return item2;
             }
@@ -1667,12 +1709,12 @@ namespace v2rayN.Handler
 
         public static RoutingItem GetLockedRoutingItem(Config config)
         {
-            return SqliteHelper.Instance.Table<RoutingItem>().FirstOrDefault(it => it.locked == true);
+            return SQLiteHelper.Instance.Table<RoutingItem>().FirstOrDefault(it => it.locked == true);
         }
 
         public static void RemoveRoutingItem(RoutingItem routingItem)
         {
-            SqliteHelper.Instance.Delete(routingItem);
+            SQLiteHelper.Instance.Delete(routingItem);
         }
 
         #endregion Routing
@@ -1709,7 +1751,7 @@ namespace v2rayN.Handler
                 item.id = Utils.GetGUID(false);
             }
 
-            if (SqliteHelper.Instance.Replace(item) > 0)
+            if (SQLiteHelper.Instance.Replace(item) > 0)
             {
                 return 0;
             }

v2rayN/v2rayN/Handler/CoreConfigHandler.cs

@@ -1,5 +1,5 @@
 using System.IO;
-using v2rayN.Mode;
+using v2rayN.Models;
 using v2rayN.Resx;
 
 namespace v2rayN.Handler
@@ -132,8 +132,8 @@ namespace v2rayN.Handler
                                 fileContent.RemoveAt(indexPort);
                             }
 
-                            fileContent.Add($"port: {LazyConfig.Instance.GetLocalPort(Global.InboundHttp)}");
+                            fileContent.Add($"port: {LazyConfig.Instance.GetLocalPort(EInboundProtocol.http)}");
-                            fileContent.Add($"socks-port: {LazyConfig.Instance.GetLocalPort(Global.InboundSocks)}");
+                            fileContent.Add($"socks-port: {LazyConfig.Instance.GetLocalPort(EInboundProtocol.socks)}");
                             break;
                     }
                     File.WriteAllLines(fileName, fileContent);

v2rayN/v2rayN/Handler/CoreConfigSingbox.cs

@@ -1,6 +1,6 @@
 using System.Net;
 using System.Net.NetworkInformation;
-using v2rayN.Mode;
+using v2rayN.Models;
 using v2rayN.Resx;
 
 namespace v2rayN.Handler
@@ -88,7 +88,7 @@ namespace v2rayN.Handler
                     default:
                         break;
                 }
-                if (_config.coreBasicItem.loglevel == "none")
+                if (_config.coreBasicItem.loglevel == Global.None)
                 {
                     singboxConfig.log.disabled = true;
                 }
@@ -115,13 +115,13 @@ namespace v2rayN.Handler
                 {
                     var inbound = new Inbound4Sbox()
                     {
-                        type = Global.InboundSocks,
+                        type = EInboundProtocol.socks.ToString(),
-                        tag = Global.InboundSocks,
+                        tag = EInboundProtocol.socks.ToString(),
                         listen = Global.Loopback,
                     };
                     singboxConfig.inbounds.Add(inbound);
 
-                    inbound.listen_port = LazyConfig.Instance.GetLocalPort(Global.InboundSocks);
+                    inbound.listen_port = LazyConfig.Instance.GetLocalPort(EInboundProtocol.socks);
                     inbound.sniff = _config.inbound[0].sniffingEnabled;
                     inbound.sniff_override_destination = _config.inbound[0].routeOnly ? false : _config.inbound[0].sniffingEnabled;
                     inbound.domain_strategy = Utils.IsNullOrEmpty(_config.routingBasicItem.domainStrategy4Singbox) ? null : _config.routingBasicItem.domainStrategy4Singbox;
@@ -136,18 +136,18 @@ namespace v2rayN.Handler
                     }
 
                     //http
-                    var inbound2 = GetInbound(inbound, Global.InboundHttp, 1, false);
+                    var inbound2 = GetInbound(inbound, EInboundProtocol.http, false);
                     singboxConfig.inbounds.Add(inbound2);
 
                     if (_config.inbound[0].allowLANConn)
                     {
                         if (_config.inbound[0].newPort4LAN)
                         {
-                            var inbound3 = GetInbound(inbound, Global.InboundSocks2, 2, true);
+                            var inbound3 = GetInbound(inbound, EInboundProtocol.socks2, true);
                             inbound3.listen = "::";
                             singboxConfig.inbounds.Add(inbound3);
 
-                            var inbound4 = GetInbound(inbound, Global.InboundHttp2, 3, false);
+                            var inbound4 = GetInbound(inbound, EInboundProtocol.http2, false);
                             inbound4.listen = "::";
                             singboxConfig.inbounds.Add(inbound4);
 
@@ -170,7 +170,7 @@ namespace v2rayN.Handler
                 {
                     if (_config.tunModeItem.mtu <= 0)
                     {
-                        _config.tunModeItem.mtu = Convert.ToInt32(Global.TunMtus[0]);
+                        _config.tunModeItem.mtu = Utils.ToInt(Global.TunMtus[0]);
                     }
                     if (Utils.IsNullOrEmpty(_config.tunModeItem.stack))
                     {
@@ -198,12 +198,12 @@ namespace v2rayN.Handler
             return 0;
         }
 
-        private Inbound4Sbox GetInbound(Inbound4Sbox inItem, string tag, int offset, bool bSocks)
+        private Inbound4Sbox GetInbound(Inbound4Sbox inItem, EInboundProtocol protocol, bool bSocks)
         {
             var inbound = JsonUtils.DeepCopy(inItem);
-            inbound.tag = tag;
+            inbound.tag = protocol.ToString();
-            inbound.listen_port = inItem.listen_port + offset;
+            inbound.listen_port = inItem.listen_port + (int)protocol;
-            inbound.type = bSocks ? Global.InboundSocks : Global.InboundHttp;
+            inbound.type = bSocks ? EInboundProtocol.socks.ToString() : EInboundProtocol.http.ToString();
             return inbound;
         }
 
@@ -220,7 +220,7 @@ namespace v2rayN.Handler
 
                     outbound.uuid = node.id;
                     outbound.alter_id = node.alterId;
-                    if (Global.VmessSecuritys.Contains(node.security))
+                    if (Global.VmessSecurities.Contains(node.security))
                     {
                         outbound.security = node.security;
                     }
@@ -235,7 +235,7 @@ namespace v2rayN.Handler
                 {
                     outbound.type = Global.ProtocolTypes[EConfigType.Shadowsocks];
 
-                    outbound.method = LazyConfig.Instance.GetShadowsocksSecuritys(node).Contains(node.security) ? node.security : "none";
+                    outbound.method = LazyConfig.Instance.GetShadowsocksSecurities(node).Contains(node.security) ? node.security : Global.None;
                     outbound.password = node.id;
 
                     GenOutboundMux(node, outbound);
@@ -294,8 +294,6 @@ namespace v2rayN.Handler
 
                     outbound.up_mbps = _config.hysteriaItem.up_mbps > 0 ? _config.hysteriaItem.up_mbps : null;
                     outbound.down_mbps = _config.hysteriaItem.down_mbps > 0 ? _config.hysteriaItem.down_mbps : null;
-
-                    GenOutboundMux(node, outbound);
                 }
                 else if (node.configType == EConfigType.Tuic)
                 {
@@ -304,8 +302,6 @@ namespace v2rayN.Handler
                     outbound.uuid = node.id;
                     outbound.password = node.security;
                     outbound.congestion_control = node.headerType;
-
-                    GenOutboundMux(node, outbound);
                 }
                 else if (node.configType == EConfigType.Wireguard)
                 {
@@ -316,7 +312,6 @@ namespace v2rayN.Handler
                     outbound.reserved = Utils.String2List(node.path).Select(int.Parse).ToArray();
                     outbound.local_address = [.. Utils.String2List(node.requestHost)];
                     outbound.mtu = Utils.ToInt(node.shortId.IsNullOrEmpty() ? Global.TunMtus.FirstOrDefault() : node.shortId);
-                    GenOutboundMux(node, outbound);
                 }
 
                 GenOutboundTls(node, outbound);
@@ -339,11 +334,8 @@ namespace v2rayN.Handler
                 //    var mux = new Multiplex4Sbox()
                 //    {
                 //        enabled = true,
-                //        protocol = _config.mux4Sbox.protocol,
+                //        protocol = _config.mux4SboxItem.protocol,
-                //        max_connections = _config.mux4Sbox.max_connections,
+                //        max_connections = _config.mux4SboxItem.max_connections,
-                //        min_streams = _config.mux4Sbox.min_streams,
-                //        max_streams = _config.mux4Sbox.max_streams,
-                //        padding = _config.mux4Sbox.padding
                 //    };
                 //    outbound.multiplex = mux;
                 //}
@@ -362,11 +354,11 @@ namespace v2rayN.Handler
                 if (node.streamSecurity == Global.StreamSecurityReality || node.streamSecurity == Global.StreamSecurity)
                 {
                     var server_name = string.Empty;
-                    if (!string.IsNullOrWhiteSpace(node.sni))
+                    if (!Utils.IsNullOrEmpty(node.sni))
                     {
                         server_name = node.sni;
                     }
-                    else if (!string.IsNullOrWhiteSpace(node.requestHost))
+                    else if (!Utils.IsNullOrEmpty(node.requestHost))
                     {
                         server_name = Utils.String2List(node.requestHost)[0];
                     }
@@ -413,14 +405,31 @@ namespace v2rayN.Handler
 
                 switch (node.GetNetwork())
                 {
-                    case "h2":
+                    case nameof(ETransport.h2):
-                        transport.type = "http";
+                        transport.type = nameof(ETransport.http);
                         transport.host = Utils.IsNullOrEmpty(node.requestHost) ? null : Utils.String2List(node.requestHost);
                         transport.path = Utils.IsNullOrEmpty(node.path) ? null : node.path;
                         break;
 
-                    case "ws":
+                    case nameof(ETransport.tcp):   //http
-                        transport.type = "ws";
+                        if (node.headerType == Global.TcpHeaderHttp)
+                        {
+                            if (node.configType == EConfigType.Shadowsocks)
+                            {
+                                outbound.plugin = "obfs-local";
+                                outbound.plugin_opts = $"obfs=http;obfs-host={node.requestHost};";
+                            }
+                            else
+                            {
+                                transport.type = nameof(ETransport.http);
+                                transport.host = Utils.IsNullOrEmpty(node.requestHost) ? null : Utils.String2List(node.requestHost);
+                                transport.path = Utils.IsNullOrEmpty(node.path) ? null : node.path;
+                            }
+                        }
+                        break;
+
+                    case nameof(ETransport.ws):
+                        transport.type = nameof(ETransport.ws);
                         transport.path = Utils.IsNullOrEmpty(node.path) ? null : node.path;
                         if (!Utils.IsNullOrEmpty(node.requestHost))
                         {
@@ -431,12 +440,19 @@ namespace v2rayN.Handler
                         }
                         break;
 
-                    case "quic":
+                    case nameof(ETransport.httpupgrade):
-                        transport.type = "quic";
+                        transport.type = nameof(ETransport.httpupgrade);
+                        transport.path = Utils.IsNullOrEmpty(node.path) ? null : node.path;
+                        transport.host = Utils.IsNullOrEmpty(node.requestHost) ? null : node.requestHost;
+
                         break;
 
-                    case "grpc":
+                    case nameof(ETransport.quic):
-                        transport.type = "grpc";
+                        transport.type = nameof(ETransport.quic);
+                        break;
+
+                    case nameof(ETransport.grpc):
+                        transport.type = nameof(ETransport.grpc);
                         transport.service_name = node.path;
                         transport.idle_timeout = _config.grpcItem.idle_timeout.ToString("##s");
                         transport.ping_timeout = _config.grpcItem.health_check_timeout.ToString("##s");
@@ -444,12 +460,13 @@ namespace v2rayN.Handler
                         break;
 
                     default:
-                        transport = null;
                         break;
                 }
-
+                if (transport.type != null)
+                {
                     outbound.transport = transport;
                 }
+            }
             catch (Exception ex)
             {
                 Logging.SaveLog(ex.Message, ex);
@@ -575,8 +592,8 @@ namespace v2rayN.Handler
         {
             lstDnsExe = new();
             lstDirectExe = new();
-            var coreInfos = LazyConfig.Instance.GetCoreInfos();
+            var coreInfo = LazyConfig.Instance.GetCoreInfo();
-            foreach (var it in coreInfos)
+            foreach (var it in coreInfo)
             {
                 if (it.coreType == ECoreType.v2rayN)
                 {
@@ -744,7 +761,7 @@ namespace v2rayN.Handler
                 {
                     var item = LazyConfig.Instance.GetDNSItem(ECoreType.sing_box);
                     var tunDNS = item?.tunDNS;
-                    if (string.IsNullOrWhiteSpace(tunDNS))
+                    if (Utils.IsNullOrEmpty(tunDNS))
                     {
                         tunDNS = Utils.GetEmbedText(Global.TunSingboxDNSFileName);
                     }
@@ -754,7 +771,7 @@ namespace v2rayN.Handler
                 {
                     var item = LazyConfig.Instance.GetDNSItem(ECoreType.sing_box);
                     var normalDNS = item?.normalDNS;
-                    if (string.IsNullOrWhiteSpace(normalDNS))
+                    if (Utils.IsNullOrEmpty(normalDNS))
                     {
                         normalDNS = "{\"servers\":[{\"address\":\"tcp://8.8.8.8\"}]}";
                     }
@@ -863,11 +880,11 @@ namespace v2rayN.Handler
                 }
 
                 GenLog(singboxConfig);
-                GenDns(new(), singboxConfig);
+                //GenDns(new(), singboxConfig);
                 singboxConfig.inbounds.Clear(); // Remove "proxy" service for speedtest, avoiding port conflicts.
                 singboxConfig.outbounds.RemoveAt(0);
 
-                int httpPort = LazyConfig.Instance.GetLocalPort("speedtest");
+                int httpPort = LazyConfig.Instance.GetLocalPort(EInboundProtocol.speedtest);
 
                 foreach (var it in selecteds)
                 {
@@ -888,7 +905,7 @@ namespace v2rayN.Handler
                         }
                     }
 
-                    //find unuse port
+                    //find unused port
                     var port = httpPort;
                     for (int k = httpPort; k < Global.MaxPort; k++)
                     {
@@ -919,9 +936,9 @@ namespace v2rayN.Handler
                     {
                         listen = Global.Loopback,
                         listen_port = port,
-                        type = Global.InboundHttp
+                        type = EInboundProtocol.http.ToString(),
                     };
-                    inbound.tag = Global.InboundHttp + inbound.listen_port.ToString();
+                    inbound.tag = inbound.type + inbound.listen_port.ToString();
                     singboxConfig.inbounds.Add(inbound);
 
                     //outbound
@@ -931,7 +948,7 @@ namespace v2rayN.Handler
                         continue;
                     }
                     if (item.configType == EConfigType.Shadowsocks
-                        && !Global.SsSecuritysInSingbox.Contains(item.security))
+                        && !Global.SsSecuritiesInSingbox.Contains(item.security))
                     {
                         continue;
                     }
@@ -955,6 +972,13 @@ namespace v2rayN.Handler
                     singboxConfig.route.rules.Add(rule);
                 }
 
+                GenDns(new(), singboxConfig);
+                var dnsServer = singboxConfig.dns?.servers.FirstOrDefault();
+                if (dnsServer != null)
+                {
+                    dnsServer.detour = singboxConfig.route.rules.LastOrDefault()?.outbound;
+                }
+
                 //msg = string.Format(ResUI.SuccessfulConfiguration"), node.getSummary());
                 return 0;
             }

v2rayN/v2rayN/Handler/CoreConfigV2ray.cs

@@ -1,6 +1,6 @@
 using System.Net;
 using System.Net.NetworkInformation;
-using v2rayN.Mode;
+using v2rayN.Models;
 using v2rayN.Resx;
 
 namespace v2rayN.Handler
@@ -100,22 +100,22 @@ namespace v2rayN.Handler
             {
                 v2rayConfig.inbounds = new List<Inbounds4Ray>();
 
-                Inbounds4Ray? inbound = GetInbound(_config.inbound[0], Global.InboundSocks, 0, true);
+                Inbounds4Ray? inbound = GetInbound(_config.inbound[0], EInboundProtocol.socks, true);
                 v2rayConfig.inbounds.Add(inbound);
 
                 //http
-                Inbounds4Ray? inbound2 = GetInbound(_config.inbound[0], Global.InboundHttp, 1, false);
+                Inbounds4Ray? inbound2 = GetInbound(_config.inbound[0], EInboundProtocol.http, false);
                 v2rayConfig.inbounds.Add(inbound2);
 
                 if (_config.inbound[0].allowLANConn)
                 {
                     if (_config.inbound[0].newPort4LAN)
                     {
-                        Inbounds4Ray inbound3 = GetInbound(_config.inbound[0], Global.InboundSocks2, 2, true);
+                        var inbound3 = GetInbound(_config.inbound[0], EInboundProtocol.socks2, true);
                         inbound3.listen = "0.0.0.0";
                         v2rayConfig.inbounds.Add(inbound3);
 
-                        Inbounds4Ray inbound4 = GetInbound(_config.inbound[0], Global.InboundHttp2, 3, false);
+                        var inbound4 = GetInbound(_config.inbound[0], EInboundProtocol.http2, false);
                         inbound4.listen = "0.0.0.0";
                         v2rayConfig.inbounds.Add(inbound4);
 
@@ -143,7 +143,7 @@ namespace v2rayN.Handler
             return 0;
         }
 
-        private Inbounds4Ray? GetInbound(InItem inItem, string tag, int offset, bool bSocks)
+        private Inbounds4Ray? GetInbound(InItem inItem, EInboundProtocol protocol, bool bSocks)
         {
             string result = Utils.GetEmbedText(Global.V2raySampleInbound);
             if (Utils.IsNullOrEmpty(result))
@@ -156,9 +156,9 @@ namespace v2rayN.Handler
             {
                 return null;
             }
-            inbound.tag = tag;
+            inbound.tag = protocol.ToString();
-            inbound.port = inItem.localPort + offset;
+            inbound.port = inItem.localPort + (int)protocol;
-            inbound.protocol = bSocks ? Global.InboundSocks : Global.InboundHttp;
+            inbound.protocol = bSocks ? EInboundProtocol.socks.ToString() : EInboundProtocol.http.ToString();
             inbound.settings.udp = inItem.udpEnabled;
             inbound.sniffing.enabled = inItem.sniffingEnabled;
             inbound.sniffing.routeOnly = inItem.routeOnly;
@@ -324,7 +324,7 @@ namespace v2rayN.Handler
                     usersItem.id = node.id;
                     usersItem.alterId = node.alterId;
                     usersItem.email = Global.UserEMail;
-                    if (Global.VmessSecuritys.Contains(node.security))
+                    if (Global.VmessSecurities.Contains(node.security))
                     {
                         usersItem.security = node.security;
                     }
@@ -353,7 +353,7 @@ namespace v2rayN.Handler
                     serversItem.address = node.address;
                     serversItem.port = node.port;
                     serversItem.password = node.id;
-                    serversItem.method = LazyConfig.Instance.GetShadowsocksSecuritys(node).Contains(node.security) ? node.security : "none";
+                    serversItem.method = LazyConfig.Instance.GetShadowsocksSecurities(node).Contains(node.security) ? node.security : "none";
 
                     serversItem.ota = false;
                     serversItem.level = 1;
@@ -514,7 +514,7 @@ namespace v2rayN.Handler
                 {
                     try
                     {
-                        useragent = Global.UserAgentTxts[_config.coreBasicItem.defUserAgent];
+                        useragent = Global.UserAgentTexts[_config.coreBasicItem.defUserAgent];
                     }
                     catch (KeyNotFoundException)
                     {
@@ -533,11 +533,11 @@ namespace v2rayN.Handler
                         alpn = node.GetAlpn(),
                         fingerprint = node.fingerprint.IsNullOrEmpty() ? _config.coreBasicItem.defFingerprint : node.fingerprint
                     };
-                    if (!string.IsNullOrWhiteSpace(sni))
+                    if (!Utils.IsNullOrEmpty(sni))
                     {
                         tlsSettings.serverName = sni;
                     }
-                    else if (!string.IsNullOrWhiteSpace(host))
+                    else if (!Utils.IsNullOrEmpty(host))
                     {
                         tlsSettings.serverName = Utils.String2List(host)[0];
                     }
@@ -564,7 +564,7 @@ namespace v2rayN.Handler
                 //streamSettings
                 switch (node.GetNetwork())
                 {
-                    case "kcp":
+                    case nameof(ETransport.kcp):
                         KcpSettings4Ray kcpSettings = new()
                         {
                             mtu = _config.kcpItem.mtu,
@@ -588,30 +588,45 @@ namespace v2rayN.Handler
                         streamSettings.kcpSettings = kcpSettings;
                         break;
                     //ws
-                    case "ws":
+                    case nameof(ETransport.ws):
                         WsSettings4Ray wsSettings = new();
                         wsSettings.headers = new Headers4Ray();
                         string path = node.path;
-                        if (!string.IsNullOrWhiteSpace(host))
+                        if (!Utils.IsNullOrEmpty(host))
                         {
                             wsSettings.headers.Host = host;
                         }
-                        if (!string.IsNullOrWhiteSpace(path))
+                        if (!Utils.IsNullOrEmpty(path))
                         {
                             wsSettings.path = path;
                         }
-                        if (!string.IsNullOrWhiteSpace(useragent))
+                        if (!Utils.IsNullOrEmpty(useragent))
                         {
                             wsSettings.headers.UserAgent = useragent;
                         }
                         streamSettings.wsSettings = wsSettings;
 
+                        break;
+                    //httpupgrade
+                    case nameof(ETransport.httpupgrade):
+                        HttpupgradeSettings4Ray httpupgradeSettings = new();
+
+                        if (!Utils.IsNullOrEmpty(node.path))
+                        {
+                            httpupgradeSettings.path = node.path;
+                        }
+                        if (!Utils.IsNullOrEmpty(host))
+                        {
+                            httpupgradeSettings.host = host;
+                        }
+                        streamSettings.httpupgradeSettings = httpupgradeSettings;
+
                         break;
                     //h2
-                    case "h2":
+                    case nameof(ETransport.h2):
                         HttpSettings4Ray httpSettings = new();
 
-                        if (!string.IsNullOrWhiteSpace(host))
+                        if (!Utils.IsNullOrEmpty(host))
                         {
                             httpSettings.host = Utils.String2List(host);
                         }
@@ -621,7 +636,7 @@ namespace v2rayN.Handler
 
                         break;
                     //quic
-                    case "quic":
+                    case nameof(ETransport.quic):
                         QuicSettings4Ray quicsettings = new()
                         {
                             security = host,
@@ -634,7 +649,7 @@ namespace v2rayN.Handler
                         streamSettings.quicSettings = quicsettings;
                         if (node.streamSecurity == Global.StreamSecurity)
                         {
-                            if (!string.IsNullOrWhiteSpace(sni))
+                            if (!Utils.IsNullOrEmpty(sni))
                             {
                                 streamSettings.tlsSettings.serverName = sni;
                             }
@@ -645,11 +660,12 @@ namespace v2rayN.Handler
                         }
                         break;
 
-                    case "grpc":
+                    case nameof(ETransport.grpc):
                         GrpcSettings4Ray grpcSettings = new()
                         {
+                            authority = Utils.IsNullOrEmpty(host) ? null : host,
                             serviceName = node.path,
-                            multiMode = (node.headerType == Global.GrpcmultiMode),
+                            multiMode = (node.headerType == Global.GrpcMultiMode),
                             idle_timeout = _config.grpcItem.idle_timeout,
                             health_check_timeout = _config.grpcItem.health_check_timeout,
                             permit_without_stream = _config.grpcItem.permit_without_stream,
@@ -671,7 +687,7 @@ namespace v2rayN.Handler
                             };
 
                             //request Host
-                            string request = Utils.GetEmbedText(Global.V2raySampleHttprequestFileName);
+                            string request = Utils.GetEmbedText(Global.V2raySampleHttpRequestFileName);
                             string[] arrHost = host.Split(',');
                             string host2 = string.Join("\",\"", arrHost);
                             request = request.Replace("$requestHost$", $"\"{host2}\"");
@@ -706,13 +722,13 @@ namespace v2rayN.Handler
                 var item = LazyConfig.Instance.GetDNSItem(ECoreType.Xray);
                 var normalDNS = item?.normalDNS;
                 var domainStrategy4Freedom = item?.domainStrategy4Freedom;
-                if (string.IsNullOrWhiteSpace(normalDNS))
+                if (Utils.IsNullOrEmpty(normalDNS))
                 {
                     normalDNS = "1.1.1.1,8.8.8.8";
                 }
 
                 //Outbound Freedom domainStrategy
-                if (!string.IsNullOrWhiteSpace(domainStrategy4Freedom))
+                if (!Utils.IsNullOrEmpty(domainStrategy4Freedom))
                 {
                     var outbound = v2rayConfig.outbounds[1];
                     outbound.settings.domainStrategy = domainStrategy4Freedom;
@@ -764,7 +780,7 @@ namespace v2rayN.Handler
         {
             if (_config.guiItem.enableStatistics)
             {
-                string tag = Global.InboundAPITagName;
+                string tag = EInboundProtocol.api.ToString();
                 API4Ray apiObj = new();
                 Policy4Ray policyObj = new();
                 SystemPolicy4Ray policySystemSetting = new();
@@ -789,7 +805,7 @@ namespace v2rayN.Handler
                     apiInbound.tag = tag;
                     apiInbound.listen = Global.Loopback;
                     apiInbound.port = LazyConfig.Instance.StatePort;
-                    apiInbound.protocol = Global.InboundAPIProtocal;
+                    apiInbound.protocol = Global.InboundAPIProtocol;
                     apiInboundSettings.address = Global.Loopback;
                     apiInbound.settings = apiInboundSettings;
                     v2rayConfig.inbounds.Add(apiInbound);
@@ -923,7 +939,7 @@ namespace v2rayN.Handler
                 v2rayConfig.inbounds.Clear(); // Remove "proxy" service for speedtest, avoiding port conflicts.
                 v2rayConfig.outbounds.RemoveAt(0);
 
-                int httpPort = LazyConfig.Instance.GetLocalPort("speedtest");
+                int httpPort = LazyConfig.Instance.GetLocalPort(EInboundProtocol.speedtest);
 
                 foreach (var it in selecteds)
                 {
@@ -944,7 +960,7 @@ namespace v2rayN.Handler
                         }
                     }
 
-                    //find unuse port
+                    //find unused port
                     var port = httpPort;
                     for (int k = httpPort; k < Global.MaxPort; k++)
                     {
@@ -975,9 +991,9 @@ namespace v2rayN.Handler
                     {
                         listen = Global.Loopback,
                         port = port,
-                        protocol = Global.InboundHttp
+                        protocol = EInboundProtocol.http.ToString(),
                     };
-                    inbound.tag = Global.InboundHttp + inbound.port.ToString();
+                    inbound.tag = inbound.protocol + inbound.port.ToString();
                     v2rayConfig.inbounds.Add(inbound);
 
                     //outbound
@@ -987,7 +1003,7 @@ namespace v2rayN.Handler
                         continue;
                     }
                     if (item.configType == EConfigType.Shadowsocks
-                        && !Global.SsSecuritysInXray.Contains(item.security))
+                        && !Global.SsSecuritiesInXray.Contains(item.security))
                     {
                         continue;
                     }

v2rayN/v2rayN/Handler/CoreHandler.cs

@@ -2,7 +2,7 @@
 using System.IO;
 using System.Reactive.Linq;
 using System.Text;
-using v2rayN.Mode;
+using v2rayN.Models;
 using v2rayN.Resx;
 
 namespace v2rayN.Handler
@@ -113,8 +113,8 @@ namespace v2rayN.Handler
 
                 if (!hasProc)
                 {
-                    var coreInfos = LazyConfig.Instance.GetCoreInfos();
+                    var coreInfo = LazyConfig.Instance.GetCoreInfo();
-                    foreach (var it in coreInfos)
+                    foreach (var it in coreInfo)
                     {
                         if (it.coreType == ECoreType.v2rayN)
                         {
@@ -156,7 +156,7 @@ namespace v2rayN.Handler
 
         #region Private
 
-        private string CoreFindexe(CoreInfo coreInfo)
+        private string CoreFindExe(CoreInfo coreInfo)
         {
             string fileName = string.Empty;
             foreach (string name in coreInfo.coreExes)
@@ -192,10 +192,11 @@ namespace v2rayN.Handler
             {
                 coreType = LazyConfig.Instance.GetCoreType(node, node.configType);
             }
+            _config.runningCoreType = coreType;
             var coreInfo = LazyConfig.Instance.GetCoreInfo(coreType);
 
             var displayLog = node.configType != EConfigType.Custom || node.displayLog;
-            var proc = RunProcess(node, coreInfo, "", displayLog, ShowMsg);
+            var proc = RunProcess(node, coreInfo, "", displayLog);
             if (proc is null)
             {
                 return;
@@ -214,11 +215,12 @@ namespace v2rayN.Handler
                         address = Global.Loopback,
                         port = node.preSocksPort
                     };
+                    _config.runningCoreType = ECoreType.sing_box;
                     string fileName2 = Utils.GetConfigPath(Global.CorePreConfigFileName);
                     if (CoreConfigHandler.GenerateClientConfig(itemSocks, fileName2, out string msg2, out string configStr) == 0)
                     {
                         var coreInfo2 = LazyConfig.Instance.GetCoreInfo(ECoreType.sing_box);
-                        var proc2 = RunProcess(node, coreInfo2, $" -c {Global.CorePreConfigFileName}", true, ShowMsg);
+                        var proc2 = RunProcess(node, coreInfo2, $" -c {Global.CorePreConfigFileName}", true);
                         if (proc2 is not null)
                         {
                             _processPre = proc2;
@@ -236,7 +238,7 @@ namespace v2rayN.Handler
             try
             {
                 var coreInfo = LazyConfig.Instance.GetCoreInfo(coreType);
-                var proc = RunProcess(new(), coreInfo, $" -c {Global.CoreSpeedtestConfigFileName}", true, ShowMsg);
+                var proc = RunProcess(new(), coreInfo, $" -c {Global.CoreSpeedtestConfigFileName}", true);
                 if (proc is null)
                 {
                     return -1;
@@ -253,20 +255,20 @@ namespace v2rayN.Handler
             }
         }
 
-        private void ShowMsg(bool updateToTrayTooltip, string msg)
+        private void ShowMsg(bool notify, string msg)
         {
-            _updateFunc(updateToTrayTooltip, msg);
+            _updateFunc(notify, msg);
         }
 
         #endregion Private
 
         #region Process
 
-        private Process? RunProcess(ProfileItem node, CoreInfo coreInfo, string configPath, bool displayLog, Action<bool, string> update)
+        private Process? RunProcess(ProfileItem node, CoreInfo coreInfo, string configPath, bool displayLog)
         {
             try
             {
-                string fileName = CoreFindexe(coreInfo);
+                string fileName = CoreFindExe(coreInfo);
                 if (Utils.IsNullOrEmpty(fileName))
                 {
                     return null;
@@ -286,22 +288,29 @@ namespace v2rayN.Handler
                         StandardErrorEncoding = displayLog ? Encoding.UTF8 : null,
                     }
                 };
+                var startUpErrorMessage = new StringBuilder();
+                var startUpSuccessful = false;
                 if (displayLog)
                 {
                     proc.OutputDataReceived += (sender, e) =>
                     {
-                        if (!string.IsNullOrEmpty(e.Data))
+                        if (!Utils.IsNullOrEmpty(e.Data))
                         {
                             string msg = e.Data + Environment.NewLine;
-                            update(false, msg);
+                            ShowMsg(false, msg);
                         }
                     };
                     proc.ErrorDataReceived += (sender, e) =>
                     {
-                        if (!string.IsNullOrEmpty(e.Data))
+                        if (!Utils.IsNullOrEmpty(e.Data))
                         {
                             string msg = e.Data + Environment.NewLine;
-                            update(false, msg);
+                            ShowMsg(false, msg);
+
+                            if (!startUpSuccessful)
+                            {
+                                startUpErrorMessage.Append(msg);
+                            }
                         }
                     };
                 }
@@ -314,7 +323,12 @@ namespace v2rayN.Handler
 
                 if (proc.WaitForExit(1000))
                 {
-                    throw new Exception(displayLog ? proc.StandardError.ReadToEnd() : "启动进程失败并退出 (Failed to start the process and exited)");
+                    proc.CancelErrorRead();
+                    throw new Exception(displayLog ? startUpErrorMessage.ToString() : "启动进程失败并退出 (Failed to start the process and exited)");
+                }
+                else
+                {
+                    startUpSuccessful = true;
                 }
 
                 LazyConfig.Instance.AddProcess(proc.Handle);
@@ -324,7 +338,7 @@ namespace v2rayN.Handler
             {
                 Logging.SaveLog(ex.Message, ex);
                 string msg = ex.Message;
-                update(true, msg);
+                ShowMsg(true, msg);
                 return null;
             }
         }
@@ -337,7 +351,7 @@ namespace v2rayN.Handler
             }
             try
             {
-                proc.CloseMainWindow();
+                proc.Kill();
                 proc.WaitForExit(100);
                 if (!proc.HasExited)
                 {

v2rayN/v2rayN/Handler/DownloadHandle.cs

@@ -4,6 +4,7 @@ using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Net.Sockets;
+using v2rayN.Models;
 using v2rayN.Resx;
 
 namespace v2rayN.Handler
@@ -300,7 +301,7 @@ namespace v2rayN.Handler
             }
             catch //(Exception ex)
             {
-                //Utils.SaveLog(ex.Message, ex);
+                //Utile.SaveLog(ex.Message, ex);
             }
             return responseTime;
         }
@@ -311,7 +312,7 @@ namespace v2rayN.Handler
             {
                 return null;
             }
-            var httpPort = LazyConfig.Instance.GetLocalPort(Global.InboundHttp);
+            var httpPort = LazyConfig.Instance.GetLocalPort(EInboundProtocol.http);
             if (!SocketCheck(Global.Loopback, httpPort))
             {
                 return null;

v2rayN/v2rayN/Handler/HotkeyHandler.cs

@@ -4,7 +4,7 @@ using System.Text;
 using System.Windows;
 using System.Windows.Input;
 using System.Windows.Interop;
-using v2rayN.Mode;
+using v2rayN.Models;
 using v2rayN.Resx;
 
 namespace v2rayN.Handler

v2rayN/v2rayN/Handler/LazyConfig.cs

@@ -1,5 +1,5 @@
 using System.Runtime.Intrinsics.X86;
-using v2rayN.Mode;
+using v2rayN.Models;
 
 namespace v2rayN.Handler
 {
@@ -7,24 +7,35 @@ namespace v2rayN.Handler
     {
         private static readonly Lazy<LazyConfig> _instance = new(() => new());
         private Config _config;
-        private List<CoreInfo> coreInfos;
+        private List<CoreInfo> coreInfo;
 
         public static LazyConfig Instance => _instance.Value;
 
-        private int _statePort;
+        private int? _statePort;
-        public int StatePort { get => _statePort; }
+
+        public int StatePort
+        {
+            get
+            {
+                if (_statePort is null)
+                {
+                    _statePort = Utils.GetFreePort(GetLocalPort(EInboundProtocol.api));
+                }
+
+                return _statePort.Value;
+            }
+        }
+
         private Job _processJob = new();
 
         public LazyConfig()
         {
-            _statePort = Utils.GetFreePort();
+            SQLiteHelper.Instance.CreateTable<SubItem>();
-
+            SQLiteHelper.Instance.CreateTable<ProfileItem>();
-            SqliteHelper.Instance.CreateTable<SubItem>();
+            SQLiteHelper.Instance.CreateTable<ServerStatItem>();
-            SqliteHelper.Instance.CreateTable<ProfileItem>();
+            SQLiteHelper.Instance.CreateTable<RoutingItem>();
-            SqliteHelper.Instance.CreateTable<ServerStatItem>();
+            SQLiteHelper.Instance.CreateTable<ProfileExItem>();
-            SqliteHelper.Instance.CreateTable<RoutingItem>();
+            SQLiteHelper.Instance.CreateTable<DNSItem>();
-            SqliteHelper.Instance.CreateTable<ProfileExItem>();
-            SqliteHelper.Instance.CreateTable<DNSItem>();
         }
 
         #region Config
@@ -39,34 +50,10 @@ namespace v2rayN.Handler
             return _config;
         }
 
-        public int GetLocalPort(string protocol)
+        public int GetLocalPort(EInboundProtocol protocol)
         {
-            int localPort = _config.inbound.FirstOrDefault(t => t.protocol == Global.InboundSocks).localPort;
+            var localPort = _config.inbound.FirstOrDefault(t => t.protocol == nameof(EInboundProtocol.socks))?.localPort ?? 10808;
-            if (protocol == Global.InboundSocks)
+            return localPort + (int)protocol;
-            {
-                return localPort;
-            }
-            else if (protocol == Global.InboundHttp)
-            {
-                return localPort + 1;
-            }
-            else if (protocol == Global.InboundSocks2)
-            {
-                return localPort + 2;
-            }
-            else if (protocol == Global.InboundHttp2)
-            {
-                return localPort + 3;
-            }
-            else if (protocol == ESysProxyType.Pac.ToString())
-            {
-                return localPort + 4;
-            }
-            else if (protocol == "speedtest")
-            {
-                return localPort + 103;
-            }
-            return localPort;
         }
 
         public void AddProcess(IntPtr processHandle)
@@ -80,35 +67,35 @@ namespace v2rayN.Handler
 
         public List<SubItem> SubItems()
         {
-            return SqliteHelper.Instance.Table<SubItem>().ToList();
+            return SQLiteHelper.Instance.Table<SubItem>().ToList();
         }
 
         public SubItem GetSubItem(string subid)
         {
-            return SqliteHelper.Instance.Table<SubItem>().FirstOrDefault(t => t.id == subid);
+            return SQLiteHelper.Instance.Table<SubItem>().FirstOrDefault(t => t.id == subid);
         }
 
         public List<ProfileItem> ProfileItems(string subid)
         {
             if (Utils.IsNullOrEmpty(subid))
             {
-                return SqliteHelper.Instance.Table<ProfileItem>().ToList();
+                return SQLiteHelper.Instance.Table<ProfileItem>().ToList();
             }
             else
             {
-                return SqliteHelper.Instance.Table<ProfileItem>().Where(t => t.subid == subid).ToList();
+                return SQLiteHelper.Instance.Table<ProfileItem>().Where(t => t.subid == subid).ToList();
             }
         }
 
-        public List<string> ProfileItemIndexs(string subid)
+        public List<string> ProfileItemIndexes(string subid)
         {
             if (Utils.IsNullOrEmpty(subid))
             {
-                return SqliteHelper.Instance.Table<ProfileItem>().Select(t => t.indexId).ToList();
+                return SQLiteHelper.Instance.Table<ProfileItem>().Select(t => t.indexId).ToList();
             }
             else
             {
-                return SqliteHelper.Instance.Table<ProfileItem>().Where(t => t.subid == subid).Select(t => t.indexId).ToList();
+                return SQLiteHelper.Instance.Table<ProfileItem>().Where(t => t.subid == subid).Select(t => t.indexId).ToList();
             }
         }
 
@@ -132,7 +119,7 @@ namespace v2rayN.Handler
                 sql += String.Format(" and (a.remarks like '%{0}%' or a.address like '%{0}%') ", filter);
             }
 
-            return SqliteHelper.Instance.Query<ProfileItemModel>(sql).ToList();
+            return SQLiteHelper.Instance.Query<ProfileItemModel>(sql).ToList();
         }
 
         public ProfileItem? GetProfileItem(string indexId)
@@ -141,7 +128,7 @@ namespace v2rayN.Handler
             {
                 return null;
             }
-            return SqliteHelper.Instance.Table<ProfileItem>().FirstOrDefault(it => it.indexId == indexId);
+            return SQLiteHelper.Instance.Table<ProfileItem>().FirstOrDefault(it => it.indexId == indexId);
         }
 
         public ProfileItem? GetProfileItemViaRemarks(string remarks)
@@ -150,48 +137,48 @@ namespace v2rayN.Handler
             {
                 return null;
             }
-            return SqliteHelper.Instance.Table<ProfileItem>().FirstOrDefault(it => it.remarks == remarks);
+            return SQLiteHelper.Instance.Table<ProfileItem>().FirstOrDefault(it => it.remarks == remarks);
         }
 
         public List<RoutingItem> RoutingItems()
         {
-            return SqliteHelper.Instance.Table<RoutingItem>().Where(it => it.locked == false).OrderBy(t => t.sort).ToList();
+            return SQLiteHelper.Instance.Table<RoutingItem>().Where(it => it.locked == false).OrderBy(t => t.sort).ToList();
         }
 
         public RoutingItem GetRoutingItem(string id)
         {
-            return SqliteHelper.Instance.Table<RoutingItem>().FirstOrDefault(it => it.locked == false && it.id == id);
+            return SQLiteHelper.Instance.Table<RoutingItem>().FirstOrDefault(it => it.locked == false && it.id == id);
         }
 
         public List<DNSItem> DNSItems()
         {
-            return SqliteHelper.Instance.Table<DNSItem>().ToList();
+            return SQLiteHelper.Instance.Table<DNSItem>().ToList();
         }
 
         public DNSItem GetDNSItem(ECoreType eCoreType)
         {
-            return SqliteHelper.Instance.Table<DNSItem>().FirstOrDefault(it => it.coreType == eCoreType);
+            return SQLiteHelper.Instance.Table<DNSItem>().FirstOrDefault(it => it.coreType == eCoreType);
         }
 
         #endregion SqliteHelper
 
         #region Core Type
 
-        public List<string> GetShadowsocksSecuritys(ProfileItem profileItem)
+        public List<string> GetShadowsocksSecurities(ProfileItem profileItem)
         {
             var coreType = GetCoreType(profileItem, EConfigType.Shadowsocks);
             switch (coreType)
             {
                 case ECoreType.v2fly:
-                    return Global.SsSecuritys;
+                    return Global.SsSecurities;
 
                 case ECoreType.Xray:
-                    return Global.SsSecuritysInXray;
+                    return Global.SsSecuritiesInXray;
 
                 case ECoreType.sing_box:
-                    return Global.SsSecuritysInSingbox;
+                    return Global.SsSecuritiesInSingbox;
             }
-            return Global.SsSecuritysInSagerNet;
+            return Global.SsSecuritiesInSagerNet;
         }
 
         public ECoreType GetCoreType(ProfileItem profileItem, EConfigType eConfigType)
@@ -215,27 +202,27 @@ namespace v2rayN.Handler
 
         public CoreInfo? GetCoreInfo(ECoreType coreType)
         {
-            if (coreInfos == null)
+            if (coreInfo == null)
             {
                 InitCoreInfo();
             }
-            return coreInfos!.FirstOrDefault(t => t.coreType == coreType);
+            return coreInfo?.FirstOrDefault(t => t.coreType == coreType);
         }
 
-        public List<CoreInfo> GetCoreInfos()
+        public List<CoreInfo> GetCoreInfo()
         {
-            if (coreInfos == null)
+            if (coreInfo == null)
             {
                 InitCoreInfo();
             }
-            return coreInfos!;
+            return coreInfo!;
         }
 
         private void InitCoreInfo()
         {
-            coreInfos = new(16);
+            coreInfo = new(16);
 
-            coreInfos.Add(new CoreInfo
+            coreInfo.Add(new CoreInfo
             {
                 coreType = ECoreType.v2rayN,
                 coreUrl = Global.NUrl,
@@ -245,7 +232,7 @@ namespace v2rayN.Handler
                 coreDownloadUrlArm64 = Global.NUrl + "/download/{0}/v2rayN-arm64.zip"
             });
 
-            coreInfos.Add(new CoreInfo
+            coreInfo.Add(new CoreInfo
             {
                 coreType = ECoreType.v2fly,
                 coreExes = new List<string> { "wv2ray", "v2ray" },
@@ -260,7 +247,7 @@ namespace v2rayN.Handler
                 redirectInfo = true,
             });
 
-            coreInfos.Add(new CoreInfo
+            coreInfo.Add(new CoreInfo
             {
                 coreType = ECoreType.SagerNet,
                 coreExes = new List<string> { "SagerNet", "v2ray" },
@@ -275,7 +262,7 @@ namespace v2rayN.Handler
                 redirectInfo = true,
             });
 
-            coreInfos.Add(new CoreInfo
+            coreInfo.Add(new CoreInfo
             {
                 coreType = ECoreType.v2fly_v5,
                 coreExes = new List<string> { "v2ray" },
@@ -290,7 +277,7 @@ namespace v2rayN.Handler
                 redirectInfo = true,
             });
 
-            coreInfos.Add(new CoreInfo
+            coreInfo.Add(new CoreInfo
             {
                 coreType = ECoreType.Xray,
                 coreExes = new List<string> { "xray", "wxray" },
@@ -305,7 +292,7 @@ namespace v2rayN.Handler
                 redirectInfo = true,
             });
 
-            coreInfos.Add(new CoreInfo
+            coreInfo.Add(new CoreInfo
             {
                 coreType = ECoreType.clash,
                 coreExes = new List<string> { "clash-windows-amd64-v3", "clash-windows-amd64", "clash-windows-386", "clash" },
@@ -320,7 +307,7 @@ namespace v2rayN.Handler
                 redirectInfo = true,
             });
 
-            coreInfos.Add(new CoreInfo
+            coreInfo.Add(new CoreInfo
             {
                 coreType = ECoreType.clash_meta,
                 coreExes = new List<string> { "Clash.Meta-windows-amd64-compatible", "Clash.Meta-windows-amd64", "Clash.Meta-windows-386", "Clash.Meta", "clash" },
@@ -335,18 +322,18 @@ namespace v2rayN.Handler
                 redirectInfo = true,
             });
 
-            coreInfos.Add(new CoreInfo
+            coreInfo.Add(new CoreInfo
             {
                 coreType = ECoreType.mihomo,
                 coreExes = new List<string> { $"mihomo-windows-amd64{(Avx2.X64.IsSupported ? "" : "-compatible")}", "mihomo-windows-amd64-compatible", "mihomo-windows-amd64", "mihomo-windows-386", "mihomo", "clash" },
-                arguments = "-f config.yaml",
+                arguments = "-f config.json",
                 coreUrl = Global.MihomoCoreUrl,
                 coreReleaseApiUrl = Global.MihomoCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
                 match = "Mihomo",
                 redirectInfo = true,
             });
 
-            coreInfos.Add(new CoreInfo
+            coreInfo.Add(new CoreInfo
             {
                 coreType = ECoreType.hysteria,
                 coreExes = new List<string> { "hysteria-windows-amd64", "hysteria-windows-386", "hysteria" },
@@ -359,7 +346,7 @@ namespace v2rayN.Handler
                 redirectInfo = true,
             });
 
-            coreInfos.Add(new CoreInfo
+            coreInfo.Add(new CoreInfo
             {
                 coreType = ECoreType.naiveproxy,
                 coreExes = new List<string> { "naiveproxy", "naive" },
@@ -368,7 +355,7 @@ namespace v2rayN.Handler
                 redirectInfo = false,
             });
 
-            coreInfos.Add(new CoreInfo
+            coreInfo.Add(new CoreInfo
             {
                 coreType = ECoreType.tuic,
                 coreExes = new List<string> { "tuic-client", "tuic" },
@@ -377,7 +364,7 @@ namespace v2rayN.Handler
                 redirectInfo = true,
             });
 
-            coreInfos.Add(new CoreInfo
+            coreInfo.Add(new CoreInfo
             {
                 coreType = ECoreType.sing_box,
                 coreExes = new List<string> { "sing-box-client", "sing-box" },
@@ -392,7 +379,7 @@ namespace v2rayN.Handler
                 versionArg = "version",
             });
 
-            coreInfos.Add(new CoreInfo
+            coreInfo.Add(new CoreInfo
             {
                 coreType = ECoreType.juicity,
                 coreExes = new List<string> { "juicity-client", "juicity" },
@@ -400,7 +387,7 @@ namespace v2rayN.Handler
                 coreUrl = Global.JuicityCoreUrl
             });
 
-            coreInfos.Add(new CoreInfo
+            coreInfo.Add(new CoreInfo
             {
                 coreType = ECoreType.hysteria2,
                 coreExes = new List<string> { "hysteria-windows-amd64", "hysteria-windows-386", "hysteria" },

v2rayN/v2rayN/Handler/MainFormHandler.cs

@@ -1,8 +1,9 @@
 using Microsoft.Win32;
+using Splat;
 using System.Drawing;
 using System.IO;
 using System.Windows.Media.Imaging;
-using v2rayN.Mode;
+using v2rayN.Models;
 using v2rayN.Resx;
 
 namespace v2rayN.Handler
@@ -50,18 +51,18 @@ namespace v2rayN.Handler
         public System.Windows.Media.ImageSource GetAppIcon(Config config)
         {
             int index = 1;
-            switch ((int)config.sysProxyType)
+            switch (config.sysProxyType)
             {
-                case 0:
+                case ESysProxyType.ForcedClear:
                     index = 1;
                     break;
 
-                case 1:
+                case ESysProxyType.ForcedChange:
-                case 3:
+                case ESysProxyType.Pac:
                     index = 2;
                     break;
 
-                case 2:
+                case ESysProxyType.Unchanged:
                     index = 3;
                     break;
             }
@@ -125,7 +126,7 @@ namespace v2rayN.Handler
             }
             if (item.configType == EConfigType.Custom)
             {
-                UI.Show(ResUI.NonVmessService);
+                Locator.Current.GetService<NoticeHandler>()?.Enqueue(ResUI.NonVmessService);
                 return;
             }
 
@@ -146,11 +147,12 @@ namespace v2rayN.Handler
             }
             if (CoreConfigHandler.GenerateClientConfig(item, fileName, out string msg, out string content) != 0)
             {
-                UI.Show(msg);
+                Locator.Current.GetService<NoticeHandler>()?.Enqueue(msg);
             }
             else
             {
-                UI.ShowWarning(string.Format(ResUI.SaveClientConfigurationIn, fileName));
+                msg = string.Format(ResUI.SaveClientConfigurationIn, fileName);
+                Locator.Current.GetService<NoticeHandler>()?.SendMessageAndEnqueue(msg);
             }
         }
 

v2rayN/v2rayN/Handler/NoticeHandler.cs

@@ -10,24 +10,32 @@ namespace v2rayN.Handler
         public NoticeHandler(ISnackbarMessageQueue snackbarMessageQueue)
         {
             _snackbarMessageQueue = snackbarMessageQueue ?? throw new ArgumentNullException(nameof(snackbarMessageQueue));
-
-            //_snackbarMessageQueue = snackbarMessageQueue;
         }
 
-        public void Enqueue(object content)
+        public void Enqueue(string content)
         {
+            if (content.IsNullOrEmpty())
+            {
+                return;
+            }
             _snackbarMessageQueue?.Enqueue(content);
         }
 
         public void SendMessage(string msg)
         {
-            MessageBus.Current.SendMessage(msg, "MsgView");
+            MessageBus.Current.SendMessage(msg, Global.CommandSendMsgView);
         }
 
         public void SendMessage(string msg, bool time)
         {
             msg = $"{DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss")} {msg}";
-            MessageBus.Current.SendMessage(msg, "MsgView");
+            SendMessage(msg);
+        }
+
+        public void SendMessageAndEnqueue(string msg)
+        {
+            Enqueue(msg);
+            SendMessage(msg);
         }
     }
 }

v2rayN/v2rayN/Handler/ProfileExHandler.cs

@@ -1,6 +1,6 @@
 using System.Collections.Concurrent;
 using System.Reactive.Linq;
-using v2rayN.Mode;
+using v2rayN.Models;
 
 namespace v2rayN.Handler
 {
@@ -19,9 +19,9 @@ namespace v2rayN.Handler
 
         private void Init()
         {
-            SqliteHelper.Instance.Execute($"delete from ProfileExItem where indexId not in ( select indexId from ProfileItem )");
+            SQLiteHelper.Instance.Execute($"delete from ProfileExItem where indexId not in ( select indexId from ProfileItem )");
 
-            _lstProfileEx = new(SqliteHelper.Instance.Table<ProfileExItem>());
+            _lstProfileEx = new(SQLiteHelper.Instance.Table<ProfileExItem>());
 
             Task.Run(async () =>
             {
@@ -34,7 +34,7 @@ namespace v2rayN.Handler
                         var item = _lstProfileEx.FirstOrDefault(t => t.indexId == id);
                         if (item is not null)
                         {
-                            SqliteHelper.Instance.Replace(item);
+                            SQLiteHelper.Instance.Replace(item);
                         }
                     }
                     await Task.Delay(1000 * 60);
@@ -65,7 +65,7 @@ namespace v2rayN.Handler
 
         public void ClearAll()
         {
-            SqliteHelper.Instance.Execute($"delete from ProfileExItem ");
+            SQLiteHelper.Instance.Execute($"delete from ProfileExItem ");
             _lstProfileEx = new();
         }
 
@@ -75,9 +75,9 @@ namespace v2rayN.Handler
             {
                 //foreach (var item in _lstProfileEx)
                 //{
-                //    SqliteHelper.Instance.Replace(item);
+                //    SQLiteHelper.Instance.Replace(item);
                 //}
-                SqliteHelper.Instance.UpdateAll(_lstProfileEx);
+                SQLiteHelper.Instance.UpdateAll(_lstProfileEx);
             }
             catch (Exception ex)
             {

v2rayN/v2rayN/Handler/ProxySetting.cs

@@ -26,7 +26,7 @@ namespace v2rayN.Handler
         ///     PROXY_TYPE_AUTO_DETECT      = 0x00000008  // use autoproxy detection
         /// </param>
         /// <exception cref="ApplicationException">Error message with win32 error code</exception>
-        /// <returns>true: one of connnection is successfully updated proxy settings</returns>
+        /// <returns>true: one of connection is successfully updated proxy settings</returns>
         public static bool SetProxy(string? strProxy, string? exceptions, int type)
         {
             // set proxy for LAN
@@ -67,7 +67,7 @@ namespace v2rayN.Handler
                 m_Option = PerConnOption.INTERNET_PER_CONN_AUTOCONFIG_URL;
             }
 
-            //int optionCount = Utils.IsNullOrEmpty(strProxy) ? 1 : (Utils.IsNullOrEmpty(exceptions) ? 2 : 3);
+            //int optionCount = Utile.IsNullOrEmpty(strProxy) ? 1 : (Utile.IsNullOrEmpty(exceptions) ? 2 : 3);
             InternetConnectionOption[] options = new InternetConnectionOption[optionCount];
             // USE a proxy server ...
             options[0].m_Option = PerConnOption.INTERNET_PER_CONN_FLAGS;

v2rayN/v2rayN/Handler/ShareHandler.cs

@@ -1,6 +1,6 @@
 using System.Collections.Specialized;
 using System.Text.RegularExpressions;
-using v2rayN.Mode;
+using v2rayN.Models;
 using v2rayN.Resx;
 
 namespace v2rayN.Handler
@@ -86,7 +86,7 @@ namespace v2rayN.Handler
             //    item.id,
             //    item.address,
             //    item.port);
-            //url = Utils.Base64Encode(url);
+            //url = Utile.Base64Encode(url);
             //new Sip002
             var pw = Utils.Base64Encode($"{item.security}:{item.id}");
             url = $"{pw}@{GetIpv6(item.address)}:{item.port}";
@@ -107,7 +107,7 @@ namespace v2rayN.Handler
             //    item.id,
             //    item.address,
             //    item.port);
-            //url = Utils.Base64Encode(url);
+            //url = Utile.Base64Encode(url);
             //new
             var pw = Utils.Base64Encode($"{item.security}:{item.id}");
             url = $"{pw}@{GetIpv6(item.address)}:{item.port}";
@@ -150,9 +150,9 @@ namespace v2rayN.Handler
             }
             else
             {
-                dicQuery.Add("encryption", "none");
+                dicQuery.Add("encryption", Global.None);
             }
-            GetStdTransport(item, "none", ref dicQuery);
+            GetStdTransport(item, Global.None, ref dicQuery);
             string query = "?" + string.Join("&", dicQuery.Select(x => x.Key + "=" + x.Value).ToArray());
 
             url = string.Format("{0}@{1}:{2}",
@@ -310,27 +310,28 @@ namespace v2rayN.Handler
                 dicQuery.Add("spx", Utils.UrlEncode(item.spiderX));
             }
 
-            dicQuery.Add("type", !Utils.IsNullOrEmpty(item.network) ? item.network : "tcp");
+            dicQuery.Add("type", !Utils.IsNullOrEmpty(item.network) ? item.network : nameof(ETransport.tcp));
 
             switch (item.network)
             {
-                case "tcp":
+                case nameof(ETransport.tcp):
-                    dicQuery.Add("headerType", !Utils.IsNullOrEmpty(item.headerType) ? item.headerType : "none");
+                    dicQuery.Add("headerType", !Utils.IsNullOrEmpty(item.headerType) ? item.headerType : Global.None);
                     if (!Utils.IsNullOrEmpty(item.requestHost))
                     {
                         dicQuery.Add("host", Utils.UrlEncode(item.requestHost));
                     }
                     break;
 
-                case "kcp":
+                case nameof(ETransport.kcp):
-                    dicQuery.Add("headerType", !Utils.IsNullOrEmpty(item.headerType) ? item.headerType : "none");
+                    dicQuery.Add("headerType", !Utils.IsNullOrEmpty(item.headerType) ? item.headerType : Global.None);
                     if (!Utils.IsNullOrEmpty(item.path))
                     {
                         dicQuery.Add("seed", Utils.UrlEncode(item.path));
                     }
                     break;
 
-                case "ws":
+                case nameof(ETransport.ws):
+                case nameof(ETransport.httpupgrade):
                     if (!Utils.IsNullOrEmpty(item.requestHost))
                     {
                         dicQuery.Add("host", Utils.UrlEncode(item.requestHost));
@@ -341,9 +342,9 @@ namespace v2rayN.Handler
                     }
                     break;
 
-                case "http":
+                case nameof(ETransport.http):
-                case "h2":
+                case nameof(ETransport.h2):
-                    dicQuery["type"] = "http";
+                    dicQuery["type"] = nameof(ETransport.http);
                     if (!Utils.IsNullOrEmpty(item.requestHost))
                     {
                         dicQuery.Add("host", Utils.UrlEncode(item.requestHost));
@@ -354,17 +355,18 @@ namespace v2rayN.Handler
                     }
                     break;
 
-                case "quic":
+                case nameof(ETransport.quic):
-                    dicQuery.Add("headerType", !Utils.IsNullOrEmpty(item.headerType) ? item.headerType : "none");
+                    dicQuery.Add("headerType", !Utils.IsNullOrEmpty(item.headerType) ? item.headerType : Global.None);
                     dicQuery.Add("quicSecurity", Utils.UrlEncode(item.requestHost));
                     dicQuery.Add("key", Utils.UrlEncode(item.path));
                     break;
 
-                case "grpc":
+                case nameof(ETransport.grpc):
                     if (!Utils.IsNullOrEmpty(item.path))
                     {
+                        dicQuery.Add("authority", Utils.UrlEncode(item.requestHost));
                         dicQuery.Add("serviceName", Utils.UrlEncode(item.path));
-                        if (item.headerType is Global.GrpcgunMode or Global.GrpcmultiMode)
+                        if (item.headerType is Global.GrpcGunMode or Global.GrpcMultiMode)
                         {
                             dicQuery.Add("mode", Utils.UrlEncode(item.headerType));
                         }
@@ -587,11 +589,11 @@ namespace v2rayN.Handler
             }
             switch (i.streamSecurity)
             {
-                case "tls":
+                case Global.StreamSecurity:
                     break;
 
                 default:
-                    if (!string.IsNullOrWhiteSpace(i.streamSecurity))
+                    if (!Utils.IsNullOrEmpty(i.streamSecurity))
                         return null;
                     break;
             }
@@ -599,35 +601,36 @@ namespace v2rayN.Handler
             i.network = m.Groups["network"].Value;
             switch (i.network)
             {
-                case "tcp":
+                case nameof(ETransport.tcp):
-                    string t1 = query["type"] ?? "none";
+                    string t1 = query["type"] ?? Global.None;
                     i.headerType = t1;
                     break;
 
-                case "kcp":
+                case nameof(ETransport.kcp):
-                    i.headerType = query["type"] ?? "none";
+                    i.headerType = query["type"] ?? Global.None;
                     break;
 
-                case "ws":
+                case nameof(ETransport.ws):
+                case nameof(ETransport.httpupgrade):
                     string p1 = query["path"] ?? "/";
                     string h1 = query["host"] ?? "";
                     i.requestHost = Utils.UrlDecode(h1);
                     i.path = p1;
                     break;
 
-                case "http":
+                case nameof(ETransport.http):
-                case "h2":
+                case nameof(ETransport.h2):
-                    i.network = "h2";
+                    i.network = nameof(ETransport.h2);
                     string p2 = query["path"] ?? "/";
                     string h2 = query["host"] ?? "";
                     i.requestHost = Utils.UrlDecode(h2);
                     i.path = p2;
                     break;
 
-                case "quic":
+                case nameof(ETransport.quic):
-                    string s = query["security"] ?? "none";
+                    string s = query["security"] ?? Global.None;
                     string k = query["key"] ?? "";
-                    string t3 = query["type"] ?? "none";
+                    string t3 = query["type"] ?? Global.None;
                     i.headerType = t3;
                     i.requestHost = Utils.UrlDecode(s);
                     i.path = k;
@@ -686,13 +689,13 @@ namespace v2rayN.Handler
             if (queryParameters["plugin"] != null)
             {
                 //obfs-host exists
-                var obfsHost = queryParameters["plugin"].Split(';').FirstOrDefault(t => t.Contains("obfs-host"));
+                var obfsHost = queryParameters["plugin"]?.Split(';').FirstOrDefault(t => t.Contains("obfs-host"));
                 if (queryParameters["plugin"].Contains("obfs=http") && !Utils.IsNullOrEmpty(obfsHost))
                 {
-                    obfsHost = obfsHost.Replace("obfs-host=", "");
+                    obfsHost = obfsHost?.Replace("obfs-host=", "");
                     server.network = Global.DefaultNetwork;
                     server.headerType = Global.TcpHeaderHttp;
-                    server.requestHost = obfsHost;
+                    server.requestHost = obfsHost ?? "";
                 }
                 else
                 {
@@ -844,7 +847,7 @@ namespace v2rayN.Handler
             ProfileItem item = new()
             {
                 configType = EConfigType.VLESS,
-                security = "none"
+                security = Global.None
             };
 
             Uri url = new(result);
@@ -855,7 +858,7 @@ namespace v2rayN.Handler
             item.id = Utils.UrlDecode(url.UserInfo);
 
             var query = Utils.ParseQueryString(url.Query);
-            item.security = query["encryption"] ?? "none";
+            item.security = query["encryption"] ?? Global.None;
             item.streamSecurity = query["security"] ?? "";
             ResolveStdTransport(query, ref item);
 
@@ -945,41 +948,43 @@ namespace v2rayN.Handler
             item.shortId = Utils.UrlDecode(query["sid"] ?? "");
             item.spiderX = Utils.UrlDecode(query["spx"] ?? "");
 
-            item.network = query["type"] ?? "tcp";
+            item.network = query["type"] ?? nameof(ETransport.tcp);
             switch (item.network)
             {
-                case "tcp":
+                case nameof(ETransport.tcp):
-                    item.headerType = query["headerType"] ?? "none";
+                    item.headerType = query["headerType"] ?? Global.None;
                     item.requestHost = Utils.UrlDecode(query["host"] ?? "");
 
                     break;
 
-                case "kcp":
+                case nameof(ETransport.kcp):
-                    item.headerType = query["headerType"] ?? "none";
+                    item.headerType = query["headerType"] ?? Global.None;
                     item.path = Utils.UrlDecode(query["seed"] ?? "");
                     break;
 
-                case "ws":
+                case nameof(ETransport.ws):
+                case nameof(ETransport.httpupgrade):
                     item.requestHost = Utils.UrlDecode(query["host"] ?? "");
                     item.path = Utils.UrlDecode(query["path"] ?? "/");
                     break;
 
-                case "http":
+                case nameof(ETransport.http):
-                case "h2":
+                case nameof(ETransport.h2):
-                    item.network = "h2";
+                    item.network = nameof(ETransport.h2);
                     item.requestHost = Utils.UrlDecode(query["host"] ?? "");
                     item.path = Utils.UrlDecode(query["path"] ?? "/");
                     break;
 
-                case "quic":
+                case nameof(ETransport.quic):
-                    item.headerType = query["headerType"] ?? "none";
+                    item.headerType = query["headerType"] ?? Global.None;
-                    item.requestHost = query["quicSecurity"] ?? "none";
+                    item.requestHost = query["quicSecurity"] ?? Global.None;
                     item.path = Utils.UrlDecode(query["key"] ?? "");
                     break;
 
-                case "grpc":
+                case nameof(ETransport.grpc):
+                    item.requestHost = Utils.UrlDecode(query["authority"] ?? ""); 
                     item.path = Utils.UrlDecode(query["serviceName"] ?? "");
-                    item.headerType = Utils.UrlDecode(query["mode"] ?? Global.GrpcgunMode);
+                    item.headerType = Utils.UrlDecode(query["mode"] ?? Global.GrpcGunMode);
                     break;
 
                 default:

v2rayN/v2rayN/Handler/SpeedtestHandler.cs

@@ -1,7 +1,8 @@
-using System.Diagnostics;
+using ReactiveUI;
+using System.Diagnostics;
 using System.Net;
 using System.Net.Sockets;
-using v2rayN.Mode;
+using v2rayN.Models;
 using v2rayN.Resx;
 
 namespace v2rayN.Handler
@@ -213,8 +214,24 @@ namespace v2rayN.Handler
 
             DownloadHandle downloadHandle = new();
 
+            var exitLoop = false;
+            MessageBus.Current.Listen<string>(Global.CommandStopSpeedTest)
+                .Subscribe(x =>
+                {
+                    if (!exitLoop)
+                    {
+                        UpdateFunc("", ResUI.SpeedtestingStop);
+                    }
+                    exitLoop = true;
+                });
+
             foreach (var it in _selecteds)
             {
+                if (exitLoop)
+                {
+                    UpdateFunc(it.indexId, "", ResUI.SpeedtestingSkip);
+                    continue;
+                }
                 if (!it.allowTest)
                 {
                     continue;
@@ -270,8 +287,25 @@ namespace v2rayN.Handler
 
             DownloadHandle downloadHandle = new();
 
+            var exitLoop = false;
+            MessageBus.Current.Listen<string>(Global.CommandStopSpeedTest)
+                .Subscribe(x =>
+                {
+                    if (!exitLoop)
+                    {
+                        UpdateFunc("", ResUI.SpeedtestingStop);
+                    }
+                    exitLoop = true;
+                });
+
             foreach (var it in _selecteds)
             {
+                if (exitLoop)
+                {
+                    UpdateFunc(it.indexId, "", ResUI.SpeedtestingSkip);
+                    continue;
+                }
+
                 if (!it.allowTest)
                 {
                     continue;
@@ -326,7 +360,7 @@ namespace v2rayN.Handler
         private async Task<string> GetRealPingTime(DownloadHandle downloadHandle, IWebProxy webProxy)
         {
             int responseTime = await downloadHandle.GetRealPingTime(_config.speedTestItem.speedPingTestUrl, webProxy, 10);
-            //string output = Utils.IsNullOrEmpty(status) ? FormatOut(responseTime, "ms") : status;
+            //string output = Utile.IsNullOrEmpty(status) ? FormatOut(responseTime, "ms") : status;
             return FormatOut(responseTime, Global.DelayUnit);
         }
 

v2rayN/v2rayN/Handler/StatisticsHandler.cs

@@ -1,6 +1,4 @@
-using System.Net;
+using v2rayN.Models;
-using System.Net.Sockets;
-using v2rayN.Mode;
 
 namespace v2rayN.Handler
 {
@@ -48,7 +46,7 @@ namespace v2rayN.Handler
 
         public void ClearAllServerStatistics()
         {
-            SqliteHelper.Instance.Execute($"delete from ServerStatItem ");
+            SQLiteHelper.Instance.Execute($"delete from ServerStatItem ");
             _serverStatItem = null;
             _lstServerStat = new();
         }
@@ -57,7 +55,7 @@ namespace v2rayN.Handler
         {
             try
             {
-                SqliteHelper.Instance.UpdateAll(_lstServerStat);
+                SQLiteHelper.Instance.UpdateAll(_lstServerStat);
             }
             catch (Exception ex)
             {
@@ -67,12 +65,12 @@ namespace v2rayN.Handler
 
         private void Init()
         {
-            SqliteHelper.Instance.Execute($"delete from ServerStatItem where indexId not in ( select indexId from ProfileItem )");
+            SQLiteHelper.Instance.Execute($"delete from ServerStatItem where indexId not in ( select indexId from ProfileItem )");
 
             long ticks = DateTime.Now.Date.Ticks;
-            SqliteHelper.Instance.Execute($"update ServerStatItem set todayUp = 0,todayDown=0,dateNow={ticks} where dateNow<>{ticks}");
+            SQLiteHelper.Instance.Execute($"update ServerStatItem set todayUp = 0,todayDown=0,dateNow={ticks} where dateNow<>{ticks}");
 
-            _lstServerStat = SqliteHelper.Instance.Table<ServerStatItem>().ToList();
+            _lstServerStat = SQLiteHelper.Instance.Table<ServerStatItem>().ToList();
         }
 
         private void UpdateServerStat(ServerSpeedItem server)
@@ -121,7 +119,7 @@ namespace v2rayN.Handler
                         todayDown = 0,
                         dateNow = ticks
                     };
-                    SqliteHelper.Instance.Replace(_serverStatItem);
+                    SQLiteHelper.Instance.Replace(_serverStatItem);
                     _lstServerStat.Add(_serverStatItem);
                 }
             }
@@ -133,27 +131,5 @@ namespace v2rayN.Handler
                 _serverStatItem.dateNow = ticks;
             }
         }
-
-        private int GetFreePort()
-        {
-            try
-            {
-                int defaultPort = 9090;
-                if (!Utils.PortInUse(defaultPort))
-                {
-                    return defaultPort;
-                }
-
-                TcpListener l = new(IPAddress.Loopback, 0);
-                l.Start();
-                int port = ((IPEndPoint)l.LocalEndpoint).Port;
-                l.Stop();
-                return port;
-            }
-            catch
-            {
-            }
-            return 69090;
-        }
     }
 }

v2rayN/v2rayN/Handler/StatisticsSingbox.cs

@@ -1,6 +1,6 @@
 using System.Net.WebSockets;
 using System.Text;
-using v2rayN.Mode;
+using v2rayN.Models;
 
 namespace v2rayN.Handler
 {
@@ -63,6 +63,10 @@ namespace v2rayN.Handler
             {
                 try
                 {
+                    if (!(_config.runningCoreType is ECoreType.sing_box or ECoreType.clash or ECoreType.clash_meta or ECoreType.mihomo))
+                    {
+                        continue;
+                    }
                     if (webSocket != null)
                     {
                         if (webSocket.State == WebSocketState.Aborted
@@ -84,7 +88,7 @@ namespace v2rayN.Handler
                         while (!res.CloseStatus.HasValue)
                         {
                             var result = Encoding.UTF8.GetString(buffer, 0, res.Count);
-                            if (!string.IsNullOrEmpty(result))
+                            if (!Utils.IsNullOrEmpty(result))
                             {
                                 ParseOutput(result, out ulong up, out ulong down);
 

v2rayN/v2rayN/Handler/StatisticsV2ray.cs

@@ -1,19 +1,19 @@
 using Grpc.Core;
 using Grpc.Net.Client;
 using ProtosLib.Statistics;
-using v2rayN.Mode;
+using v2rayN.Models;
 
 namespace v2rayN.Handler
 {
     internal class StatisticsV2ray
     {
-        private Mode.Config _config;
+        private Models.Config _config;
         private GrpcChannel? _channel;
         private StatsService.StatsServiceClient? _client;
         private bool _exitFlag;
         private Action<ServerSpeedItem> _updateFunc;
 
-        public StatisticsV2ray(Mode.Config config, Action<ServerSpeedItem> update)
+        public StatisticsV2ray(Models.Config config, Action<ServerSpeedItem> update)
         {
             _config = config;
             _updateFunc = update;
@@ -51,6 +51,10 @@ namespace v2rayN.Handler
             {
                 try
                 {
+                    if (!(_config.runningCoreType is ECoreType.Xray or ECoreType.v2fly or ECoreType.v2fly_v5 or ECoreType.SagerNet))
+                    {
+                        continue;
+                    }
                     if (_channel?.State == ConnectivityState.Ready)
                     {
                         QueryStatsResponse? res = null;
@@ -69,7 +73,7 @@ namespace v2rayN.Handler
                         }
                     }
                     await Task.Delay(1000);
-                    await _channel.ConnectAsync();
+                    if (_channel != null) await _channel.ConnectAsync();
                 }
                 catch
                 {

v2rayN/v2rayN/Handler/SysProxyHandle.cs

@@ -1,5 +1,5 @@
 using PacLib;
-using v2rayN.Mode;
+using v2rayN.Models;
 
 namespace v2rayN.Handler
 {
@@ -41,9 +41,9 @@ namespace v2rayN.Handler
 
             try
             {
-                int port = LazyConfig.Instance.GetLocalPort(Global.InboundHttp);
+                int port = LazyConfig.Instance.GetLocalPort(EInboundProtocol.http);
-                int portSocks = LazyConfig.Instance.GetLocalPort(Global.InboundSocks);
+                int portSocks = LazyConfig.Instance.GetLocalPort(EInboundProtocol.socks);
-                int portPac = LazyConfig.Instance.GetLocalPort(ESysProxyType.Pac.ToString());
+                int portPac = LazyConfig.Instance.GetLocalPort(EInboundProtocol.pac);
                 if (port <= 0)
                 {
                     return false;

v2rayN/v2rayN/Handler/UpdateHandle.cs

@@ -6,7 +6,7 @@ using System.Runtime.InteropServices;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Windows;
-using v2rayN.Mode;
+using v2rayN.Models;
 using v2rayN.Resx;
 
 namespace v2rayN.Handler
@@ -207,7 +207,7 @@ namespace v2rayN.Handler
                     //convert
                     if (!Utils.IsNullOrEmpty(item.convertTarget))
                     {
-                        var subConvertUrl = string.IsNullOrEmpty(config.constItem.subConvertUrl) ? Global.SubConvertUrls.FirstOrDefault() : config.constItem.subConvertUrl;
+                        var subConvertUrl = Utils.IsNullOrEmpty(config.constItem.subConvertUrl) ? Global.SubConvertUrls.FirstOrDefault() : config.constItem.subConvertUrl;
                         url = string.Format(subConvertUrl!, Utils.UrlEncode(url));
                         if (!url.Contains("target="))
                         {
@@ -270,7 +270,7 @@ namespace v2rayN.Handler
                     else
                     {
                         _updateFunc(false, $"{hashCode}{ResUI.MsgGetSubscriptionSuccessfully}");
-                        if (result!.Length < 99)
+                        if (result?.Length < 99)
                         {
                             _updateFunc(false, $"{hashCode}{result}");
                         }
@@ -392,6 +392,7 @@ namespace v2rayN.Handler
 
                     case ECoreType.clash:
                     case ECoreType.clash_meta:
+                    case ECoreType.mihomo:
                         version = Regex.Match(echo, $"v[0-9.]+").Groups[0].Value;
                         break;
 
@@ -414,9 +415,9 @@ namespace v2rayN.Handler
             try
             {
                 var gitHubReleases = JsonUtils.Deserialize<List<GitHubRelease>>(gitHubReleaseApi);
-                var gitHubRelease = preRelease ? gitHubReleases!.First() : gitHubReleases!.First(r => r.Prerelease == false);
+                var gitHubRelease = preRelease ? gitHubReleases?.First() : gitHubReleases?.First(r => r.Prerelease == false);
-                var version = new SemanticVersion(gitHubRelease!.TagName);
+                var version = new SemanticVersion(gitHubRelease?.TagName!);
-                var body = gitHubRelease!.Body;
+                var body = gitHubRelease?.Body;
 
                 var coreInfo = LazyConfig.Instance.GetCoreInfo(type);
 
@@ -453,6 +454,7 @@ namespace v2rayN.Handler
                         }
                     case ECoreType.clash:
                     case ECoreType.clash_meta:
+                    case ECoreType.mihomo:
                         {
                             curVersion = getCoreVersion(type);
                             message = string.Format(ResUI.IsLatestCore, type, curVersion);
@@ -573,7 +575,7 @@ namespace v2rayN.Handler
                         {
                             //Global.coreTypes.ForEach(it =>
                             //{
-                            //    string targetPath = Utils.GetBinPath($"{geoName}.dat", (ECoreType)Enum.Parse(typeof(ECoreType), it));
+                            //    string targetPath = Utile.GetBinPath($"{geoName}.dat", (ECoreType)Enum.Parse(typeof(ECoreType), it));
                             //    File.Copy(fileName, targetPath, true);
                             //});
                             string targetPath = Utils.GetBinPath($"{geoName}.dat");
@@ -600,54 +602,6 @@ namespace v2rayN.Handler
             await AskToDownload(downloadHandle, url, false);
         }
 
-        private async Task UpdateGeoFile4Singbox(string geoName, Config config, bool needStop, Action<bool, string> update)
-        {
-            _config = config;
-            _updateFunc = update;
-            var url = string.Format(Global.SingboxGeoUrl, geoName);
-
-            DownloadHandle downloadHandle = new();
-            downloadHandle.UpdateCompleted += async (sender2, args) =>
-            {
-                if (args.Success)
-                {
-                    _updateFunc(false, string.Format(ResUI.MsgDownloadGeoFileSuccessfully, geoName));
-                    var coreHandler = Locator.Current.GetService<CoreHandler>();
-
-                    try
-                    {
-                        if (needStop)
-                        {
-                            coreHandler?.CoreStop();
-                            await Task.Delay(3000);
-                        }
-                        string fileName = Utils.GetTempPath(Utils.GetDownloadFileName(url));
-                        if (File.Exists(fileName))
-                        {
-                            string targetPath = Utils.GetConfigPath($"{geoName}.db");
-                            File.Copy(fileName, targetPath, true);
-
-                            File.Delete(fileName);
-                        }
-                        if (needStop) coreHandler?.LoadCore();
-                    }
-                    catch (Exception ex)
-                    {
-                        _updateFunc(false, ex.Message);
-                    }
-                }
-                else
-                {
-                    _updateFunc(false, args.Msg);
-                }
-            };
-            downloadHandle.Error += (sender2, args) =>
-            {
-                _updateFunc(false, args.GetException().Message);
-            };
-            await AskToDownload(downloadHandle, url, false);
-        }
-
         #endregion private
     }
 }

v2rayN/v2rayN/Models/ComboItem.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Mode
+namespace v2rayN.Models
 {
     public class ComboItem
     {

v2rayN/v2rayN/Models/Config.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Mode
+namespace v2rayN.Models
 {
     /// <summary>
     /// 本软件配置文件实体类
@@ -14,6 +14,8 @@
         public string systemProxyExceptions { get; set; }
         public string systemProxyAdvancedProtocol { get; set; }
 
+        public ECoreType runningCoreType { get; set; }
+
         #endregion property
 
         #region other entities

v2rayN/v2rayN/Models/ConfigItems.cs

@@ -1,6 +1,6 @@
 using System.Windows.Input;
 
-namespace v2rayN.Mode
+namespace v2rayN.Models
 {
     [Serializable]
     public class CoreBasicItem
@@ -203,9 +203,6 @@ namespace v2rayN.Mode
     {
         public string protocol { get; set; }
         public int max_connections { get; set; }
-        public int min_streams { get; set; }
-        public int max_streams { get; set; }
-        public bool padding { get; set; }
     }
 
     [Serializable]

v2rayN/v2rayN/Models/ConfigOld.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Mode
+namespace v2rayN.Models
 {
     [Serializable]
     public class ConfigOld

v2rayN/v2rayN/Models/CoreInfo.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Mode
+namespace v2rayN.Models
 {
     [Serializable]
     public class CoreInfo

v2rayN/v2rayN/Models/DNSItem.cs

@@ -1,6 +1,6 @@
 using SQLite;
 
-namespace v2rayN.Mode
+namespace v2rayN.Models
 {
     [Serializable]
     public class DNSItem

v2rayN/v2rayN/Models/EConfigType.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Mode
+namespace v2rayN.Models
 {
     public enum EConfigType
     {

v2rayN/v2rayN/Models/ECoreType.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Mode
+namespace v2rayN.Models
 {
     public enum ECoreType
     {

v2rayN/v2rayN/Models/EGlobalHotkey.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Mode
+namespace v2rayN.Models
 {
     public enum EGlobalHotkey
     {

v2rayN/v2rayN/Models/EInboundProtocol.cs

@@ -0,0 +1,13 @@
+namespace v2rayN.Models
+{
+    public enum EInboundProtocol
+    {
+        socks = 0,
+        http,
+        socks2,
+        http2,
+        pac,
+        api,
+        speedtest = 21
+    }
+}

v2rayN/v2rayN/Models/EMove.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Mode
+namespace v2rayN.Models
 {
     public enum EMove
     {

v2rayN/v2rayN/Models/EServerColName.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Mode
+namespace v2rayN.Models
 {
     public enum EServerColName
     {

v2rayN/v2rayN/Models/ESpeedActionType.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Mode
+namespace v2rayN.Models
 {
     public enum ESpeedActionType
     {

v2rayN/v2rayN/Models/ESysProxyType.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Mode
+namespace v2rayN.Models
 {
     public enum ESysProxyType
     {

v2rayN/v2rayN/Models/ETransport.cs

@@ -0,0 +1,14 @@
+namespace v2rayN.Models
+{
+    public enum ETransport
+    {
+        tcp,
+        kcp,
+        ws,
+        httpupgrade,
+        h2,
+        http,
+        quic,
+        grpc
+    }
+}

v2rayN/v2rayN/Models/EViewAction.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Mode
+namespace v2rayN.Models
 {
     public enum EViewAction
     {

v2rayN/v2rayN/Models/GitHubRelease.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace v2rayN.Mode
+namespace v2rayN.Models
 {
     public class GitHubReleaseAsset
     {

v2rayN/v2rayN/Models/ProfileExItem.cs

@@ -1,6 +1,6 @@
 using SQLite;
 
-namespace v2rayN.Mode
+namespace v2rayN.Models
 {
     [Serializable]
     public class ProfileExItem

v2rayN/v2rayN/Models/ProfileItem.cs

@@ -1,6 +1,6 @@
 using SQLite;
 
-namespace v2rayN.Mode
+namespace v2rayN.Models
 {
     [Serializable]
     public class ProfileItem

v2rayN/v2rayN/Models/ProfileItemModel.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Mode
+namespace v2rayN.Models
 {
     [Serializable]
     public class ProfileItemModel : ProfileItem

v2rayN/v2rayN/Models/RoutingItem.cs

@@ -1,6 +1,6 @@
 using SQLite;
 
-namespace v2rayN.Mode
+namespace v2rayN.Models
 {
     [Serializable]
     public class RoutingItem

v2rayN/v2rayN/Models/RoutingItemModel.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Mode
+namespace v2rayN.Models
 {
     [Serializable]
     public class RoutingItemModel : RoutingItem

v2rayN/v2rayN/Models/RulesItem.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Mode
+namespace v2rayN.Models
 {
     [Serializable]
     public class RulesItem

v2rayN/v2rayN/Models/RulesItemModel.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Mode
+namespace v2rayN.Models
 {
     [Serializable]
     public class RulesItemModel : RulesItem

v2rayN/v2rayN/Models/ServerSpeedItem.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Mode
+namespace v2rayN.Models
 {
     [Serializable]
     internal class ServerSpeedItem : ServerStatItem

v2rayN/v2rayN/Models/ServerStatItem.cs

@@ -1,6 +1,6 @@
 using SQLite;
 
-namespace v2rayN.Mode
+namespace v2rayN.Models
 {
     [Serializable]
     public class ServerStatItem

v2rayN/v2rayN/Models/ServerTestItem.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Mode
+namespace v2rayN.Models
 {
     [Serializable]
     internal class ServerTestItem

v2rayN/v2rayN/Models/SingboxConfig.cs

@@ -1,9 +1,9 @@
-namespace v2rayN.Mode
+namespace v2rayN.Models
 {
     public class SingboxConfig
     {
         public Log4Sbox log { get; set; }
-        public object dns { get; set; }
+        public Dns4Sbox? dns { get; set; }
         public List<Inbound4Sbox> inbounds { get; set; }
         public List<Outbound4Sbox> outbounds { get; set; }
         public Route4Sbox route { get; set; }
@@ -15,7 +15,7 @@
         public bool? disabled { get; set; }
         public string level { get; set; }
         public string output { get; set; }
-        public bool timestamp { get; set; }
+        public bool? timestamp { get; set; }
     }
 
     public class Dns4Sbox
@@ -118,10 +118,12 @@
         public string? peer_public_key { get; set; }
         public int[]? reserved { get; set; }
         public int? mtu { get; set; }
-        public Tls4Sbox tls { get; set; }
+        public string? plugin { get; set; }
-        public Multiplex4Sbox multiplex { get; set; }
+        public string? plugin_opts { get; set; }
-        public Transport4Sbox transport { get; set; }
+        public Tls4Sbox? tls { get; set; }
-        public HyObfs4Sbox obfs { get; set; }
+        public Multiplex4Sbox? multiplex { get; set; }
+        public Transport4Sbox? transport { get; set; }
+        public HyObfs4Sbox? obfs { get; set; }
     }
 
     public class Tls4Sbox
@@ -139,9 +141,6 @@
         public bool enabled { get; set; }
         public string protocol { get; set; }
         public int max_connections { get; set; }
-        public int min_streams { get; set; }
-        public int max_streams { get; set; }
-        public bool padding { get; set; }
     }
 
     public class Utls4Sbox
@@ -159,14 +158,14 @@
 
     public class Transport4Sbox
     {
-        public string type { get; set; }
+        public string? type { get; set; }
-        public List<string>? host { get; set; }
+        public object? host { get; set; }
         public string? path { get; set; }
         public Headers4Sbox? headers { get; set; }
 
-        public string service_name { get; set; }
+        public string? service_name { get; set; }
-        public string idle_timeout { get; set; }
+        public string? idle_timeout { get; set; }
-        public string ping_timeout { get; set; }
+        public string? ping_timeout { get; set; }
         public bool? permit_without_stream { get; set; }
     }
 
@@ -187,7 +186,7 @@
         public string address { get; set; }
         public string address_resolver { get; set; }
         public string strategy { get; set; }
-        public string detour { get; set; }
+        public string? detour { get; set; }
     }
 
     public class Experimental4Sbox

v2rayN/v2rayN/Models/SsSIP008.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Mode
+namespace v2rayN.Models
 {
     public class SsSIP008
     {

v2rayN/v2rayN/Models/SubItem.cs

@@ -1,6 +1,6 @@
 using SQLite;
 
-namespace v2rayN.Mode
+namespace v2rayN.Models
 {
     [Serializable]
     public class SubItem

v2rayN/v2rayN/Models/SysProxyConfig.cs

@@ -1,6 +1,6 @@
-namespace v2rayN.Mode
+namespace v2rayN.Models
 {
-    internal class SysproxyConfig
+    internal class SysProxyConfig
     {
         public bool UserSettingsRecorded;
         public string Flags;
@@ -8,7 +8,7 @@
         public string BypassList;
         public string PacUrl;
 
-        public SysproxyConfig()
+        public SysProxyConfig()
         {
             UserSettingsRecorded = false;
             Flags = "1";

v2rayN/v2rayN/Models/V2rayConfig.cs

@@ -1,12 +1,17 @@
 using System.Text.Json.Serialization;
 
-namespace v2rayN.Mode
+namespace v2rayN.Models
 {
     /// <summary>
     /// v2ray配置文件实体类 例子SampleConfig.txt
     /// </summary>
     public class V2rayConfig
     {
+        /// <summary>
+        /// Properties that do not belong to Ray
+        /// </summary>
+        public string? remarks { get; set; }
+
         /// <summary>
         /// 日志配置
         /// </summary>
@@ -431,6 +436,11 @@ namespace v2rayN.Mode
         /// </summary>
         public WsSettings4Ray wsSettings { get; set; }
 
+        /// <summary>
+        ///
+        /// </summary>
+        public HttpupgradeSettings4Ray? httpupgradeSettings { get; set; }
+
         /// <summary>
         /// h2传输额外设置
         /// </summary>
@@ -583,6 +593,19 @@ namespace v2rayN.Mode
         public string UserAgent { get; set; }
     }
 
+    public class HttpupgradeSettings4Ray
+    {
+        /// <summary>
+        ///
+        /// </summary>
+        public string? path { get; set; }
+
+        /// <summary>
+        ///
+        /// </summary>
+        public string? host { get; set; }
+    }
+
     public class HttpSettings4Ray
     {
         /// <summary>
@@ -616,7 +639,8 @@ namespace v2rayN.Mode
 
     public class GrpcSettings4Ray
     {
-        public string serviceName { get; set; }
+        public string? authority { get; set; }
+        public string? serviceName { get; set; }
         public bool multiMode { get; set; }
         public int idle_timeout { get; set; }
         public int health_check_timeout { get; set; }

v2rayN/v2rayN/Models/V2rayTcpRequest.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Mode
+namespace v2rayN.Models
 {
     /// <summary>
     /// Tcp伪装http的Request，只要Host

v2rayN/v2rayN/Models/VmessQRCode.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace v2rayN.Mode
+namespace v2rayN.Models
 {
     /// <summary>
     /// https://github.com/2dust/v2rayN/wiki/

v2rayN/v2rayN/Resx/ResUI.Designer.cs

@@ -466,7 +466,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Previous proxy remakrs 的本地化字符串。
+        ///   查找类似 Previous proxy remarks 的本地化字符串。
         /// </summary>
         public static string LvPrevProfile {
             get {
@@ -592,7 +592,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Url(Optional) 的本地化字符串。
+        ///   查找类似 URL(Optional) 的本地化字符串。
         /// </summary>
         public static string LvUrl {
             get {
@@ -817,7 +817,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Import old config guiNConfig 的本地化字符串。
+        ///   查找类似 Import old config (guiNConfig) 的本地化字符串。
         /// </summary>
         public static string menuImportOldGuiConfig {
             get {
@@ -844,7 +844,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Import Rules From Sub Url 的本地化字符串。
+        ///   查找类似 Import Rules From Subscription URL 的本地化字符串。
         /// </summary>
         public static string menuImportRulesFromUrl {
             get {
@@ -916,7 +916,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Clear All 的本地化字符串。
+        ///   查找类似 Clear all 的本地化字符串。
         /// </summary>
         public static string menuMsgViewClear {
             get {
@@ -934,7 +934,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Copy All 的本地化字符串。
+        ///   查找类似 Copy all 的本地化字符串。
         /// </summary>
         public static string menuMsgViewCopyAll {
             get {
@@ -952,7 +952,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Select All (Ctrl+A) 的本地化字符串。
+        ///   查找类似 Select all (Ctrl+A) 的本地化字符串。
         /// </summary>
         public static string menuMsgViewSelectAll {
             get {
@@ -988,7 +988,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Reboot as administrator 的本地化字符串。
+        ///   查找类似 Restart as Administrator 的本地化字符串。
         /// </summary>
         public static string menuRebootAsAdmin {
             get {
@@ -1123,7 +1123,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Rule Add 的本地化字符串。
+        ///   查找类似 Add Rule 的本地化字符串。
         /// </summary>
         public static string menuRuleAdd {
             get {
@@ -1150,7 +1150,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Remove Rules (Delete) 的本地化字符串。
+        ///   查找类似 Remove Rule (Delete) 的本地化字符串。
         /// </summary>
         public static string menuRuleRemove {
             get {
@@ -1159,7 +1159,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Select All (Ctrl+A) 的本地化字符串。
+        ///   查找类似 Select all (Ctrl+A) 的本地化字符串。
         /// </summary>
         public static string menuSelectAll {
             get {
@@ -1276,7 +1276,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Subscription group Settings 的本地化字符串。
+        ///   查找类似 Subscription group settings 的本地化字符串。
         /// </summary>
         public static string menuSubSetting {
             get {
@@ -1339,7 +1339,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Pac Mode 的本地化字符串。
+        ///   查找类似 PAC mode 的本地化字符串。
         /// </summary>
         public static string menuSystemProxyPac {
             get {
@@ -1447,7 +1447,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Please fill in the Url 的本地化字符串。
+        ///   查找类似 Please fill in the URL 的本地化字符串。
         /// </summary>
         public static string MsgNeedUrl {
             get {
@@ -1591,7 +1591,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Not Run As Admin 的本地化字符串。
+        ///   查找类似 Not run as Admin 的本地化字符串。
         /// </summary>
         public static string NotRunAsAdmin {
             get {
@@ -1726,7 +1726,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Run As Admin 的本地化字符串。
+        ///   查找类似 Run as Admin 的本地化字符串。
         /// </summary>
         public static string RunAsAdmin {
             get {
@@ -1780,7 +1780,16 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Waiting for testing...... 的本地化字符串。
+        ///   查找类似 Test terminating... 的本地化字符串。
+        /// </summary>
+        public static string SpeedtestingStop {
+            get {
+                return ResourceManager.GetString("SpeedtestingStop", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Waiting for testing (press ESC to terminate)... 的本地化字符串。
         /// </summary>
         public static string SpeedtestingWait {
             get {
@@ -1871,7 +1880,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Alpn 的本地化字符串。
+        ///   查找类似 ALPN 的本地化字符串。
         /// </summary>
         public static string TbAlpn {
             get {
@@ -1880,7 +1889,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 AlterId 的本地化字符串。
+        ///   查找类似 AlterID 的本地化字符串。
         /// </summary>
         public static string TbAlterId {
             get {
@@ -2078,7 +2087,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Set directly by pressing the keyboard, Take effect after restart 的本地化字符串。
+        ///   查找类似 Set directly by pressing the keyboard, take effect after restart 的本地化字符串。
         /// </summary>
         public static string TbGlobalHotkeySettingTip {
             get {
@@ -2681,7 +2690,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Http Port 的本地化字符串。
+        ///   查找类似 HTTP Port 的本地化字符串。
         /// </summary>
         public static string TbSettingsHttpPort {
             get {
@@ -2834,7 +2843,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Socks Port 的本地化字符串。
+        ///   查找类似 SOCKS Port 的本地化字符串。
         /// </summary>
         public static string TbSettingsSocksPort {
             get {
@@ -2843,7 +2852,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 http port=socks port+1 的本地化字符串。
+        ///   查找类似 HTTP port=SOCKS port+1;Pac port=SOCKS port+4;API port=SOCKS port+5; 的本地化字符串。
         /// </summary>
         public static string TbSettingsSocksPortTip {
             get {
@@ -2852,7 +2861,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Speed Ping Test Url 的本地化字符串。
+        ///   查找类似 Speed Ping Test URL 的本地化字符串。
         /// </summary>
         public static string TbSettingsSpeedPingTestUrl {
             get {
@@ -2870,7 +2879,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 SpeedTest Url 的本地化字符串。
+        ///   查找类似 SpeedTest URL 的本地化字符串。
         /// </summary>
         public static string TbSettingsSpeedTestUrl {
             get {
@@ -2906,7 +2915,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Subscription conversion Url 的本地化字符串。
+        ///   查找类似 Subscription conversion URL 的本地化字符串。
         /// </summary>
         public static string TbSettingsSubConvert {
             get {
@@ -3086,7 +3095,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Pac Mode 的本地化字符串。
+        ///   查找类似 PAC mode 的本地化字符串。
         /// </summary>
         public static string TbSystemProxyPac {
             get {
@@ -3194,7 +3203,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 *ws path 的本地化字符串。
+        ///   查找类似 *ws/httpupgrade path 的本地化字符串。
         /// </summary>
         public static string TransportPathTip1 {
             get {
@@ -3212,7 +3221,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 *QUIC key/Kcp seed 的本地化字符串。
+        ///   查找类似 *QUIC key/KCP seed 的本地化字符串。
         /// </summary>
         public static string TransportPathTip3 {
             get {
@@ -3230,7 +3239,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 *Kcp seed 的本地化字符串。
+        ///   查找类似 *kcp seed 的本地化字符串。
         /// </summary>
         public static string TransportPathTip5 {
             get {
@@ -3248,7 +3257,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 *ws host 的本地化字符串。
+        ///   查找类似 *ws/httpupgrade host 的本地化字符串。
         /// </summary>
         public static string TransportRequestHostTip2 {
             get {
@@ -3274,6 +3283,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 *grpc Authority 的本地化字符串。
+        /// </summary>
+        public static string TransportRequestHostTip5 {
+            get {
+                return ResourceManager.GetString("TransportRequestHostTip5", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Ungrouped 的本地化字符串。
         /// </summary>

v2rayN/v2rayN/Resx/ResUI.resx

@@ -335,13 +335,13 @@
     <value>Remarks</value>
   </data>
   <data name="LvUrl" xml:space="preserve">
-    <value>Url(Optional)</value>
+    <value>URL(Optional)</value>
   </data>
   <data name="LvCount" xml:space="preserve">
     <value>Count</value>
   </data>
   <data name="MsgNeedUrl" xml:space="preserve">
-    <value>Please fill in the 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>
@@ -359,13 +359,13 @@
     <value>Please fill in the correct custom DNS</value>
   </data>
   <data name="TransportPathTip1" xml:space="preserve">
-    <value>*ws path</value>
+    <value>*ws/httpupgrade path</value>
   </data>
   <data name="TransportPathTip2" xml:space="preserve">
     <value>*h2 path</value>
   </data>
   <data name="TransportPathTip3" xml:space="preserve">
-    <value>*QUIC key/Kcp seed</value>
+    <value>*QUIC key/KCP seed</value>
   </data>
   <data name="TransportPathTip4" xml:space="preserve">
     <value>*grpc serviceName</value>
@@ -374,7 +374,7 @@
     <value>*http host Separated by commas (,)</value>
   </data>
   <data name="TransportRequestHostTip2" xml:space="preserve">
-    <value>*ws host</value>
+    <value>*ws/httpupgrade host</value>
   </data>
   <data name="TransportRequestHostTip3" xml:space="preserve">
     <value>*h2 host Separated by commas (,)</value>
@@ -398,7 +398,7 @@
     <value>TLS</value>
   </data>
   <data name="TransportPathTip5" xml:space="preserve">
-    <value>*Kcp seed</value>
+    <value>*kcp seed</value>
   </data>
   <data name="RegisterGlobalHotkeyFailed" xml:space="preserve">
     <value>Global hotkey {0} registered failed, reason {1}</value>
@@ -476,7 +476,7 @@
     <value>Subscription group</value>
   </data>
   <data name="menuSubSetting" xml:space="preserve">
-    <value>Subscription group Settings</value>
+    <value>Subscription group settings</value>
   </data>
   <data name="menuSubUpdate" xml:space="preserve">
     <value>Update subscription without proxy</value>
@@ -494,7 +494,7 @@
     <value>Do not change system proxy</value>
   </data>
   <data name="menuSystemProxyPac" xml:space="preserve">
-    <value>Pac Mode</value>
+    <value>PAC mode</value>
   </data>
   <data name="menuSystemProxySet" xml:space="preserve">
     <value>Set system proxy</value>
@@ -575,22 +575,22 @@
     <value>Add [VMess] server</value>
   </data>
   <data name="menuSelectAll" xml:space="preserve">
-    <value>Select All (Ctrl+A)</value>
+    <value>Select all (Ctrl+A)</value>
   </data>
   <data name="menuMsgViewClear" xml:space="preserve">
-    <value>Clear All</value>
+    <value>Clear all</value>
   </data>
   <data name="menuMsgViewCopy" xml:space="preserve">
     <value>Copy (Ctrl+C)</value>
   </data>
   <data name="menuMsgViewCopyAll" xml:space="preserve">
-    <value>Copy All</value>
+    <value>Copy all</value>
   </data>
   <data name="menuMsgViewFilter" xml:space="preserve">
     <value>Set message filters</value>
   </data>
   <data name="menuMsgViewSelectAll" xml:space="preserve">
-    <value>Select All (Ctrl+A)</value>
+    <value>Select all (Ctrl+A)</value>
   </data>
   <data name="menuSubAdd" xml:space="preserve">
     <value>Add</value>
@@ -629,10 +629,10 @@
     <value>AllowInsecure</value>
   </data>
   <data name="TbAlpn" xml:space="preserve">
-    <value>Alpn</value>
+    <value>ALPN</value>
   </data>
   <data name="TbAlterId" xml:space="preserve">
-    <value>AlterId</value>
+    <value>AlterID</value>
   </data>
   <data name="TbFingerprint" xml:space="preserve">
     <value>Fingerprint</value>
@@ -752,7 +752,7 @@
     <value>Exception. Do not use proxy server for addresses beginning with,Use semicolon (;)</value>
   </data>
   <data name="TbSettingsHttpPort" xml:space="preserve">
-    <value>Http Port</value>
+    <value>HTTP Port</value>
   </data>
   <data name="TbSettingsIgnoreGeoUpdateCore" xml:space="preserve">
     <value>Ignore Geo files when updating core</value>
@@ -785,7 +785,7 @@
     <value>Turn on Sniffing</value>
   </data>
   <data name="TbSettingsSocksPort" xml:space="preserve">
-    <value>Socks Port</value>
+    <value>SOCKS Port</value>
   </data>
   <data name="TbSettingsStartBoot" xml:space="preserve">
     <value>Start on boot</value>
@@ -794,7 +794,7 @@
     <value>Enable Statistics (Require restart)</value>
   </data>
   <data name="TbSettingsSubConvert" xml:space="preserve">
-    <value>Subscription conversion Url</value>
+    <value>Subscription conversion URL</value>
   </data>
   <data name="TbSettingsSystemproxy" xml:space="preserve">
     <value>System proxy settings</value>
@@ -821,7 +821,7 @@
     <value>Global Hotkey Settings</value>
   </data>
   <data name="TbGlobalHotkeySettingTip" xml:space="preserve">
-    <value>Set directly by pressing the keyboard, Take effect after restart</value>
+    <value>Set directly by pressing the keyboard, take effect after restart</value>
   </data>
   <data name="TbNotChangeSystemProxy" xml:space="preserve">
     <value>Do not change system proxy</value>
@@ -833,7 +833,7 @@
     <value>Set system proxy</value>
   </data>
   <data name="TbSystemProxyPac" xml:space="preserve">
-    <value>Pac Mode</value>
+    <value>PAC mode</value>
   </data>
   <data name="menuShareServer" xml:space="preserve">
     <value>Share Server (Ctrl+F)</value>
@@ -842,10 +842,10 @@
     <value>Routing</value>
   </data>
   <data name="NotRunAsAdmin" xml:space="preserve">
-    <value>Not Run As Admin</value>
+    <value>Not run as Admin</value>
   </data>
   <data name="RunAsAdmin" xml:space="preserve">
-    <value>Run As Admin</value>
+    <value>Run as Admin</value>
   </data>
   <data name="menuMoveBottom" xml:space="preserve">
     <value>Move to bottom (B)</value>
@@ -917,13 +917,13 @@
     <value>Import Rules From File</value>
   </data>
   <data name="menuImportRulesFromUrl" xml:space="preserve">
-    <value>Import Rules From Sub Url</value>
+    <value>Import Rules From Subscription URL</value>
   </data>
   <data name="menuRoutingRuleSetting" xml:space="preserve">
     <value>Rule Settings</value>
   </data>
   <data name="menuRuleAdd" xml:space="preserve">
-    <value>Rule Add</value>
+    <value>Add Rule</value>
   </data>
   <data name="menuRuleExportSelected" xml:space="preserve">
     <value>Export Selected Rules</value>
@@ -932,7 +932,7 @@
     <value>Rule List</value>
   </data>
   <data name="menuRuleRemove" xml:space="preserve">
-    <value>Remove Rules (Delete)</value>
+    <value>Remove Rule (Delete)</value>
   </data>
   <data name="menuRoutingRuleDetailsSetting" xml:space="preserve">
     <value>RoutingRuleDetailsSetting</value>
@@ -977,7 +977,7 @@
     <value>Display Log</value>
   </data>
   <data name="menuImportOldGuiConfig" xml:space="preserve">
-    <value>Import old config guiNConfig</value>
+    <value>Import old config (guiNConfig)</value>
   </data>
   <data name="TbEnableTunAs" xml:space="preserve">
     <value>Enable Tun</value>
@@ -1037,7 +1037,7 @@
     <value>Copy the font TTF/TTC file to the directory guiFonts, restart the settings</value>
   </data>
   <data name="TbSettingsSocksPortTip" xml:space="preserve">
-    <value>http port=socks port+1</value>
+    <value>HTTP port=SOCKS port+1;Pac port=SOCKS port+4;API port=SOCKS port+5;</value>
   </data>
   <data name="TbSettingsStartBootTip" xml:space="preserve">
     <value>Set this with admin privileges, get admin privileges after startup</value>
@@ -1058,7 +1058,7 @@
     <value>SpeedTest Single Timeout Value</value>
   </data>
   <data name="TbSettingsSpeedTestUrl" xml:space="preserve">
-    <value>SpeedTest Url</value>
+    <value>SpeedTest URL</value>
   </data>
   <data name="TbSettingsTunModeDNS" xml:space="preserve">
     <value>DNS object, e.g. {"servers":[]}</value>
@@ -1079,7 +1079,7 @@
     <value>Enable hardware acceleration(Require restart)</value>
   </data>
   <data name="SpeedtestingWait" xml:space="preserve">
-    <value>Waiting for testing......</value>
+    <value>Waiting for testing (press ESC to terminate)...</value>
   </data>
   <data name="TipDisplayLog" xml:space="preserve">
     <value>Please turn off when there is an abnormal disconnection</value>
@@ -1088,7 +1088,7 @@
     <value>Updates are not enabled, skip this subscription</value>
   </data>
   <data name="menuRebootAsAdmin" xml:space="preserve">
-    <value>Reboot as administrator</value>
+    <value>Restart as Administrator</value>
   </data>
   <data name="LvMoreUrl" xml:space="preserve">
     <value>More urls, separated by commas;Subscription conversion will be invalid</value>
@@ -1151,7 +1151,7 @@
     <value>Congestion control</value>
   </data>
   <data name="LvPrevProfile" xml:space="preserve">
-    <value>Previous proxy remakrs</value>
+    <value>Previous proxy remarks</value>
   </data>
   <data name="LvNextProfile" xml:space="preserve">
     <value>Next proxy remarks</value>
@@ -1187,9 +1187,15 @@
     <value>Auto ScrollToEnd</value>
   </data>
   <data name="TbSettingsSpeedPingTestUrl" xml:space="preserve">
-    <value>Speed Ping Test Url</value>
+    <value>Speed Ping Test URL</value>
   </data>
   <data name="TbSettingsEnableUpdateSubOnlyRemarksExist" xml:space="preserve">
     <value>Updating subscription, only determine remarks exists</value>
   </data>
+  <data name="SpeedtestingStop" xml:space="preserve">
+    <value>Test terminating...</value>
+  </data>
+  <data name="TransportRequestHostTip5" xml:space="preserve">
+    <value>*grpc Authority</value>
+  </data>
 </root>

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

@@ -359,7 +359,7 @@
     <value>请填写正确的自定义DNS</value>
   </data>
   <data name="TransportPathTip1" xml:space="preserve">
-    <value>*ws path</value>
+    <value>*ws/httpupgrade path</value>
   </data>
   <data name="TransportPathTip2" xml:space="preserve">
     <value>*h2 path</value>
@@ -374,7 +374,7 @@
     <value>*http host中间逗号(,)分隔</value>
   </data>
   <data name="TransportRequestHostTip2" xml:space="preserve">
-    <value>*ws host</value>
+    <value>*ws/httpupgrade host</value>
   </data>
   <data name="TransportRequestHostTip3" xml:space="preserve">
     <value>*h2 host中间逗号(,)分隔</value>
@@ -1037,7 +1037,7 @@
     <value>拷贝字体TTF/TTC文件到目录guiFonts，重启设置</value>
   </data>
   <data name="TbSettingsSocksPortTip" xml:space="preserve">
-    <value>http端口=socks端口+1</value>
+    <value>http端口=socks端口+1；Pac端口=socks端口+4；API端口=socks端口+5；</value>
   </data>
   <data name="TbSettingsStartBootTip" xml:space="preserve">
     <value>以管理员权限设置此项，在启动后获得管理员权限</value>
@@ -1079,7 +1079,7 @@
     <value>启用硬件加速(需重启)</value>
   </data>
   <data name="SpeedtestingWait" xml:space="preserve">
-    <value>等待测试中......</value>
+    <value>等待测试中（按ESC终止）...</value>
   </data>
   <data name="TipDisplayLog" xml:space="preserve">
     <value>当有异常断流时请关闭</value>
@@ -1189,4 +1189,10 @@
   <data name="TbSettingsEnableUpdateSubOnlyRemarksExist" xml:space="preserve">
     <value>更新订阅时只判断别名已存在否</value>
   </data>
+  <data name="SpeedtestingStop" xml:space="preserve">
+    <value>测试终止中...</value>
+  </data>
+  <data name="TransportRequestHostTip5" xml:space="preserve">
+    <value>*grpc Authority</value>
+  </data>
 </root>

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

@@ -130,7 +130,7 @@
     <value>配置格式不正確</value>
   </data>
   <data name="CustomServerTips" xml:space="preserve">
-    <value>注意,自訂配置完全依賴您自己的配置，不能使用所有設定功能。如需使用系統代理請手動修改監聽埠。</value>
+    <value>注意，自訂配置完全依賴您自己的配置，不能使用所有設定功能。如需使用系統代理請手動修改監聽埠。</value>
   </data>
   <data name="Downloading" xml:space="preserve">
     <value>下載開始...</value>
@@ -214,10 +214,10 @@
     <value>今日上傳</value>
   </data>
   <data name="LvTotalDownloadDataAmount" xml:space="preserve">
-    <value>縂下載</value>
+    <value>總下載</value>
   </data>
   <data name="LvTotalUploadDataAmount" xml:space="preserve">
-    <value>縂上傳</value>
+    <value>總上傳</value>
   </data>
   <data name="LvTransportProtocol" xml:space="preserve">
     <value>傳輸協定</value>
@@ -265,7 +265,7 @@
     <value>更新Core成功！正在重啟服務...</value>
   </data>
   <data name="NonvmessOrssProtocol" xml:space="preserve">
-    <value>非VMess或ss協定</value>
+    <value>非VMess或SS協定</value>
   </data>
   <data name="NonVmessService" xml:space="preserve">
     <value>非標準服務，此功能無效</value>
@@ -334,13 +334,13 @@
     <value>別名</value>
   </data>
   <data name="LvUrl" xml:space="preserve">
-    <value>可選位址(Url)</value>
+    <value>可選位址(URL)</value>
   </data>
   <data name="LvCount" xml:space="preserve">
     <value>數量</value>
   </data>
   <data name="MsgNeedUrl" xml:space="preserve">
-    <value>請填寫Url</value>
+    <value>請填寫URL</value>
   </data>
   <data name="AddBatchRoutingRulesYesNo" xml:space="preserve">
     <value>是否追加規則?選擇是則追加,選擇否則取代</value>
@@ -358,7 +358,7 @@
     <value>請填寫正確的自訂DNS</value>
   </data>
   <data name="TransportPathTip1" xml:space="preserve">
-    <value>*ws path</value>
+    <value>*ws/httpupgrade path</value>
   </data>
   <data name="TransportPathTip2" xml:space="preserve">
     <value>*h2 path</value>
@@ -373,7 +373,7 @@
     <value>*http host中間逗號(,)分隔</value>
   </data>
   <data name="TransportRequestHostTip2" xml:space="preserve">
-    <value>*ws host</value>
+    <value>*ws/httpupgrade host</value>
   </data>
   <data name="TransportRequestHostTip3" xml:space="preserve">
     <value>*h2 host中間逗號(,)分隔</value>
@@ -382,22 +382,22 @@
     <value>*QUIC 加密方式</value>
   </data>
   <data name="TransportHeaderTypeTip1" xml:space="preserve">
-    <value>*tcp偽裝類型</value>
+    <value>*TCP偽裝類型</value>
   </data>
   <data name="TransportHeaderTypeTip2" xml:space="preserve">
-    <value>*kcp偽裝類型</value>
+    <value>*KCP偽裝類型</value>
   </data>
   <data name="TransportHeaderTypeTip3" xml:space="preserve">
     <value>*QUIC偽裝類型</value>
   </data>
   <data name="TransportHeaderTypeTip4" xml:space="preserve">
-    <value>*grpc 模式</value>
+    <value>*GRPC 模式</value>
   </data>
   <data name="LvTLS" xml:space="preserve">
     <value>TLS</value>
   </data>
   <data name="TransportPathTip5" xml:space="preserve">
-    <value>*Kcp seed</value>
+    <value>*KCP seed</value>
   </data>
   <data name="RegisterGlobalHotkeyFailed" xml:space="preserve">
     <value>註冊全域快速鍵 {0} 失敗,原因 {1}</value>
@@ -445,7 +445,7 @@
     <value>全域快速鍵設定</value>
   </data>
   <data name="menuHelp" xml:space="preserve">
-    <value>幫助</value>
+    <value>說明</value>
   </data>
   <data name="menuOptionSetting" xml:space="preserve">
     <value>參數設定</value>
@@ -493,7 +493,7 @@
     <value>不改變系統代理</value>
   </data>
   <data name="menuSystemProxyPac" xml:space="preserve">
-    <value>Pac模式</value>
+    <value>PAC模式</value>
   </data>
   <data name="menuSystemProxySet" xml:space="preserve">
     <value>自動配置系統代理</value>
@@ -625,13 +625,13 @@
     <value>位址(address)</value>
   </data>
   <data name="TbAllowInsecure" xml:space="preserve">
-    <value>跳過證書驗證(allowInsecure)</value>
+    <value>跳過憑證驗證(allowinsecure)</value>
   </data>
   <data name="TbAlpn" xml:space="preserve">
-    <value>Alpn</value>
+    <value>ALPN</value>
   </data>
   <data name="TbAlterId" xml:space="preserve">
-    <value>額外ID(alterId)</value>
+    <value>額外ID(alterid)</value>
   </data>
   <data name="TbFingerprint" xml:space="preserve">
     <value>Fingerprint</value>
@@ -667,7 +667,7 @@
     <value>傳輸層安全(TLS)</value>
   </data>
   <data name="TipNetwork" xml:space="preserve">
-    <value>*預設tcp,選錯會無法連接</value>
+    <value>*預設TCP,選錯會無法連接</value>
   </data>
   <data name="TbCoreType" xml:space="preserve">
     <value>Core類型</value>
@@ -697,7 +697,7 @@
     <value>加密方式(encryption)</value>
   </data>
   <data name="TbPreSocksPort" xml:space="preserve">
-    <value>Socks埠</value>
+    <value>SOCKS埠</value>
   </data>
   <data name="TipPreSocksPort" xml:space="preserve">
     <value>* 自訂配置的Socks埠值，可不設定；當設定此值後，將使用sing-box額外啟動一個前置Socks服務，提供分流和速度顯示等功能</value>
@@ -734,13 +734,13 @@
     <value>Core類型設定</value>
   </data>
   <data name="TbSettingsDefAllowInsecure" xml:space="preserve">
-    <value>預設跳過證書驗證(allowInsecure)</value>
+    <value>預設跳過憑證驗證(allowinsecure)</value>
   </data>
   <data name="TbSettingsDomainStrategy4Freedom" xml:space="preserve">
     <value>Outbound Freedom domainStrategy</value>
   </data>
   <data name="TbSettingsEnableAutoAdjustMainLvColWidth" xml:space="preserve">
-    <value>自動調整伺服器列寬在更新訂閱後</value>
+    <value>在更新訂閱後自動調整伺服器列寬</value>
   </data>
   <data name="TbSettingsEnableCheckPreReleaseUpdate" xml:space="preserve">
     <value>檢查Pre-Release更新(請謹慎啟用)</value>
@@ -752,10 +752,10 @@
     <value>例外. 對於下列字元開頭的位址不使用代理配置檔案:使用分號(;)分隔</value>
   </data>
   <data name="TbSettingsHttpPort" xml:space="preserve">
-    <value>本機http監聽埠</value>
+    <value>本機HTTP監聽埠</value>
   </data>
   <data name="TbSettingsIgnoreGeoUpdateCore" xml:space="preserve">
-    <value>更新Core時忽略Geo文件</value>
+    <value>更新Core時忽略Geo檔案</value>
   </data>
   <data name="TbSettingsKeepOlderDedupl" xml:space="preserve">
     <value>去重時保留序號較小的項</value>
@@ -785,7 +785,7 @@
     <value>開啟流量探測</value>
   </data>
   <data name="TbSettingsSocksPort" xml:space="preserve">
-    <value>本機socks監聽埠</value>
+    <value>本機SOCKS監聽埠</value>
   </data>
   <data name="TbSettingsStartBoot" xml:space="preserve">
     <value>開機啟動(可能會不成功)</value>
@@ -833,7 +833,7 @@
     <value>自動配置系統代理</value>
   </data>
   <data name="TbSystemProxyPac" xml:space="preserve">
-    <value>Pac模式</value>
+    <value>PAC模式</value>
   </data>
   <data name="menuShareServer" xml:space="preserve">
     <value>分享伺服器 (Ctrl+F)</value>
@@ -848,13 +848,13 @@
     <value>以管理員身份執行</value>
   </data>
   <data name="menuMoveBottom" xml:space="preserve">
-    <value>下移至底 (B)</value>
+    <value>下移至底部 (B)</value>
   </data>
   <data name="menuMoveDown" xml:space="preserve">
     <value>下移 (D)</value>
   </data>
   <data name="menuMoveTop" xml:space="preserve">
-    <value>上移至頂 (T)</value>
+    <value>上移至頂部 (T)</value>
   </data>
   <data name="menuMoveUp" xml:space="preserve">
     <value>上移 (U)</value>
@@ -917,7 +917,7 @@
     <value>從文件中匯入規則</value>
   </data>
   <data name="menuImportRulesFromUrl" xml:space="preserve">
-    <value>從訂閱Url中匯入規則</value>
+    <value>從訂閱URL中匯入規則</value>
   </data>
   <data name="menuRoutingRuleSetting" xml:space="preserve">
     <value>規則集設定</value>
@@ -950,10 +950,10 @@
     <value>普通分組此處請留空</value>
   </data>
   <data name="TipChangeRouting" xml:space="preserve">
-    <value>路由設定改變</value>
+    <value>路由設定已改變</value>
   </data>
   <data name="TipChangeSystemProxy" xml:space="preserve">
-    <value>系統代理設定改變</value>
+    <value>系統代理設定已改變</value>
   </data>
   <data name="TbSettingsRouteOnly" xml:space="preserve">
     <value>RouteOnly</value>
@@ -980,13 +980,13 @@
     <value>匯入舊的配置檔案guiNConfig</value>
   </data>
   <data name="TbEnableTunAs" xml:space="preserve">
-    <value>啟用Tun模式</value>
+    <value>啟用TUN模式</value>
   </data>
   <data name="TbSettingsNewPort4LAN" xml:space="preserve">
     <value>為區域網路開啟新的埠</value>
   </data>
   <data name="TbSettingsTunMode" xml:space="preserve">
-    <value>Tun模式設定</value>
+    <value>TUN模式設定</value>
   </data>
   <data name="TbSettingsTunModeDirectIP" xml:space="preserve">
     <value>直連的IP CIDR，用逗號(,)分隔</value>
@@ -1028,7 +1028,7 @@
     <value>使用者代理(User-Agent)</value>
   </data>
   <data name="TbSettingsDefUserAgentTips" xml:space="preserve">
-    <value>僅對tcp/http、ws協定生效</value>
+    <value>僅對TCP/HTTP、WS協定生效</value>
   </data>
   <data name="TbSettingsCurrentFontFamily" xml:space="preserve">
     <value>目前字型(需重啟)</value>
@@ -1037,7 +1037,7 @@
     <value>複製字型TTF/TTC文件到目錄guiFonts，重啟設定</value>
   </data>
   <data name="TbSettingsSocksPortTip" xml:space="preserve">
-    <value>http埠=socks埠+1</value>
+    <value>HTTP埠=SOCKS埠+1</value>
   </data>
   <data name="TbSettingsStartBootTip" xml:space="preserve">
     <value>以管理員權限設定此項，在啟動後獲得管理員權限</value>
@@ -1058,7 +1058,7 @@
     <value>測速單個超時值</value>
   </data>
   <data name="TbSettingsSpeedTestUrl" xml:space="preserve">
-    <value>測速文件位址</value>
+    <value>測速檔案位址</value>
   </data>
   <data name="TbSettingsTunModeDNS" xml:space="preserve">
     <value>DNS物件，例如 {"servers":[]}</value>
@@ -1079,7 +1079,7 @@
     <value>啟用硬體加速(需重啟)</value>
   </data>
   <data name="SpeedtestingWait" xml:space="preserve">
-    <value>等待測試中......</value>
+    <value>等待测试中（按ESC终止）...</value>
   </data>
   <data name="TipDisplayLog" xml:space="preserve">
     <value>當有異常斷流時請關閉</value>
@@ -1124,7 +1124,7 @@
     <value>sing-box Mux 多路復用協定</value>
   </data>
   <data name="TbRoutingRuleProcess" xml:space="preserve">
-    <value>行程名全稱 (Tun模式)</value>
+    <value>行程名全稱 (TUN模式)</value>
   </data>
   <data name="TbRoutingRuleDomain" xml:space="preserve">
     <value>Domain</value>
@@ -1151,7 +1151,7 @@
     <value>啟用IPv6</value>
   </data>
   <data name="TbRuleMatchingTips" xml:space="preserve">
-    <value>(Domain 或 IP 或 进程名) 与 Port 与 Protocol 与 InboundTag =&gt; OutboundTag</value>
+    <value>(Domain 或 IP 或 行程名) 与 Port 与 Protocol 与 InboundTag =&gt; OutboundTag</value>
   </data>
   <data name="TbAutoScrollToEnd" xml:space="preserve">
     <value>自动滚动到末尾</value>
@@ -1160,6 +1160,12 @@
     <value>真連接測試地址</value>
   </data>
   <data name="TbSettingsEnableUpdateSubOnlyRemarksExist" xml:space="preserve">
-    <value>更新订阅时只判断别名已存在否</value>
+    <value>更新訂閱時只判斷別名是否存在</value>
+  </data>
+  <data name="SpeedtestingStop" xml:space="preserve">
+    <value>測試終止中...</value>
+  </data>
+  <data name="TransportRequestHostTip5" xml:space="preserve">
+    <value>*grpc Authority</value>
   </data>
 </root>

v2rayN/v2rayN/ViewModels/AddServer2ViewModel.cs

@@ -6,7 +6,7 @@ using System.IO;
 using System.Reactive;
 using System.Windows;
 using v2rayN.Handler;
-using v2rayN.Mode;
+using v2rayN.Models;
 using v2rayN.Resx;
 
 namespace v2rayN.ViewModels
@@ -64,13 +64,13 @@ namespace v2rayN.ViewModels
             string remarks = SelectedSource.remarks;
             if (Utils.IsNullOrEmpty(remarks))
             {
-                UI.Show(ResUI.PleaseFillRemarks);
+                _noticeHandler?.Enqueue(ResUI.PleaseFillRemarks);
                 return;
             }
 
             if (Utils.IsNullOrEmpty(SelectedSource.address))
             {
-                UI.Show(ResUI.FillServerAddressCustom);
+                _noticeHandler?.Enqueue(ResUI.FillServerAddressCustom);
                 return;
             }
 
@@ -95,13 +95,13 @@ namespace v2rayN.ViewModels
             }
             else
             {
-                UI.Show(ResUI.OperationFailed);
+                _noticeHandler?.Enqueue(ResUI.OperationFailed);
             }
         }
 
         private void BrowseServer()
         {
-            //UI.Show(ResUI.CustomServerTips);
+            //_noticeHandler?.Enqueue(ResUI.CustomServerTips);
 
             if (UI.OpenFileDialog(out string fileName,
                 "Config|*.json|YAML|*.yaml;*.yml|All|*.*") != true)
@@ -127,7 +127,7 @@ namespace v2rayN.ViewModels
             }
             else
             {
-                UI.ShowWarning(ResUI.FailedImportedCustomServer);
+                _noticeHandler?.Enqueue(ResUI.FailedImportedCustomServer);
             }
         }
 
@@ -136,7 +136,7 @@ namespace v2rayN.ViewModels
             var address = SelectedSource.address;
             if (Utils.IsNullOrEmpty(address))
             {
-                UI.Show(ResUI.FillServerAddressCustom);
+                _noticeHandler?.Enqueue(ResUI.FillServerAddressCustom);
                 return;
             }
 

v2rayN/v2rayN/ViewModels/AddServerViewModel.cs

@@ -4,7 +4,7 @@ using Splat;
 using System.Reactive;
 using System.Windows;
 using v2rayN.Handler;
-using v2rayN.Mode;
+using v2rayN.Models;
 using v2rayN.Resx;
 
 namespace v2rayN.ViewModels
@@ -51,32 +51,32 @@ namespace v2rayN.ViewModels
         {
             if (Utils.IsNullOrEmpty(SelectedSource.remarks))
             {
-                UI.Show(ResUI.PleaseFillRemarks);
+                _noticeHandler?.Enqueue(ResUI.PleaseFillRemarks);
                 return;
             }
 
             if (Utils.IsNullOrEmpty(SelectedSource.address))
             {
-                UI.Show(ResUI.FillServerAddress);
+                _noticeHandler?.Enqueue(ResUI.FillServerAddress);
                 return;
             }
             var port = SelectedSource.port.ToString();
-            if (Utils.IsNullOrEmpty(port) || !Utils.IsNumberic(port)
+            if (Utils.IsNullOrEmpty(port) || !Utils.IsNumeric(port)
                 || SelectedSource.port <= 0 || SelectedSource.port >= Global.MaxPort)
             {
-                UI.Show(ResUI.FillCorrectServerPort);
+                _noticeHandler?.Enqueue(ResUI.FillCorrectServerPort);
                 return;
             }
             if (SelectedSource.configType == EConfigType.Shadowsocks)
             {
                 if (Utils.IsNullOrEmpty(SelectedSource.id))
                 {
-                    UI.Show(ResUI.FillPassword);
+                    _noticeHandler?.Enqueue(ResUI.FillPassword);
                     return;
                 }
                 if (Utils.IsNullOrEmpty(SelectedSource.security))
                 {
-                    UI.Show(ResUI.PleaseSelectEncryption);
+                    _noticeHandler?.Enqueue(ResUI.PleaseSelectEncryption);
                     return;
                 }
             }
@@ -84,7 +84,7 @@ namespace v2rayN.ViewModels
             {
                 if (Utils.IsNullOrEmpty(SelectedSource.id))
                 {
-                    UI.Show(ResUI.FillUUID);
+                    _noticeHandler?.Enqueue(ResUI.FillUUID);
                     return;
                 }
             }
@@ -143,7 +143,7 @@ namespace v2rayN.ViewModels
             }
             else
             {
-                UI.Show(ResUI.OperationFailed);
+                _noticeHandler?.Enqueue(ResUI.OperationFailed);
             }
         }
     }

v2rayN/v2rayN/ViewModels/DNSSettingViewModel.cs

@@ -4,7 +4,7 @@ using Splat;
 using System.Reactive;
 using System.Windows;
 using v2rayN.Handler;
-using v2rayN.Mode;
+using v2rayN.Models;
 using v2rayN.Resx;
 
 namespace v2rayN.ViewModels
@@ -71,7 +71,7 @@ namespace v2rayN.ViewModels
                 {
                     if (normalDNS.Contains("{") || normalDNS.Contains("}"))
                     {
-                        UI.Show(ResUI.FillCorrectDNSText);
+                        _noticeHandler?.Enqueue(ResUI.FillCorrectDNSText);
                         return;
                     }
                 }
@@ -81,7 +81,7 @@ namespace v2rayN.ViewModels
                 var obj2 = JsonUtils.Deserialize<Dns4Sbox>(normalDNS2);
                 if (obj2 == null)
                 {
-                    UI.Show(ResUI.FillCorrectDNSText);
+                    _noticeHandler?.Enqueue(ResUI.FillCorrectDNSText);
                     return;
                 }
             }
@@ -90,7 +90,7 @@ namespace v2rayN.ViewModels
                 var obj2 = JsonUtils.Deserialize<Dns4Sbox>(tunDNS2);
                 if (obj2 == null)
                 {
-                    UI.Show(ResUI.FillCorrectDNSText);
+                    _noticeHandler?.Enqueue(ResUI.FillCorrectDNSText);
                     return;
                 }
             }

v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs

@@ -15,7 +15,7 @@ using System.Text;
 using System.Windows;
 using System.Windows.Media;
 using v2rayN.Handler;
-using v2rayN.Mode;
+using v2rayN.Models;
 using v2rayN.Resx;
 using v2rayN.Views;
 
@@ -597,7 +597,7 @@ namespace v2rayN.ViewModels
 
         private void OnProgramStarted(object state, bool timeout)
         {
-            Application.Current.Dispatcher.Invoke((Action)(() =>
+            Application.Current?.Dispatcher.Invoke((Action)(() =>
             {
                 ShowHideWindow(true);
             }));
@@ -610,6 +610,10 @@ namespace v2rayN.ViewModels
         private void UpdateHandler(bool notify, string msg)
         {
             _noticeHandler?.SendMessage(msg);
+            if (notify)
+            {
+                _noticeHandler?.Enqueue(msg);
+            }
         }
 
         private void UpdateTaskHandler(bool success, string msg)
@@ -634,7 +638,7 @@ namespace v2rayN.ViewModels
         {
             try
             {
-                Application.Current.Dispatcher.Invoke((Action)(() =>
+                Application.Current?.Dispatcher.Invoke((Action)(() =>
                 {
                     if (!_showInTaskbar)
                     {
@@ -680,7 +684,7 @@ namespace v2rayN.ViewModels
 
         private void UpdateSpeedtestHandler(string indexId, string delay, string speed)
         {
-            Application.Current.Dispatcher.Invoke((Action)(() =>
+            Application.Current?.Dispatcher.Invoke((Action)(() =>
             {
                 SetTestResult(indexId, delay, speed);
             }));
@@ -743,7 +747,6 @@ namespace v2rayN.ViewModels
             {
                 Logging.SaveLog("MyAppExit Begin");
 
-                StorageUI();
                 ConfigHandler.SaveConfig(_config);
 
                 //HttpProxyHandle.CloseHttpAgent(config);
@@ -768,7 +771,6 @@ namespace v2rayN.ViewModels
             finally
             {
                 Application.Current.Shutdown();
-                Environment.Exit(0);
             }
         }
 
@@ -844,7 +846,7 @@ namespace v2rayN.ViewModels
                         }).OrderBy(t => t.sort).ToList();
             _lstProfile = JsonUtils.Deserialize<List<ProfileItem>>(JsonUtils.Serialize(lstModel));
 
-            Application.Current.Dispatcher.Invoke((Action)(() =>
+            Application.Current?.Dispatcher.Invoke((Action)(() =>
             {
                 _profileItems.Clear();
                 _profileItems.AddRange(lstModel);
@@ -1182,7 +1184,7 @@ namespace v2rayN.ViewModels
             (new UpdateHandle()).RunAvailabilityCheck((bool success, string msg) =>
             {
                 _noticeHandler?.SendMessage(msg, true);
-                Application.Current.Dispatcher.Invoke((Action)(() =>
+                Application.Current?.Dispatcher.Invoke((Action)(() =>
                 {
                     if (!_showInTaskbar)
                     {
@@ -1434,11 +1436,11 @@ namespace v2rayN.ViewModels
                 InitSubscriptionView();
                 RefreshServers();
                 Reload();
-                UI.Show(ResUI.OperationSuccess);
+                _noticeHandler?.Enqueue(ResUI.OperationSuccess);
             }
             else
             {
-                _noticeHandler.Enqueue(ResUI.OperationFailed);
+                _noticeHandler?.Enqueue(ResUI.OperationFailed);
             }
         }
 
@@ -1466,7 +1468,7 @@ namespace v2rayN.ViewModels
                 _noticeHandler?.SendMessage(msg);
                 if (success)
                 {
-                    CloseV2ray();
+                    CloseCore();
 
                     string fileName = Utils.GetTempPath(Utils.GetDownloadFileName(msg));
                     string toPath = Utils.GetBinPath("", type.ToString());
@@ -1495,24 +1497,24 @@ namespace v2rayN.ViewModels
 
         #endregion CheckUpdate
 
-        #region v2ray job
+        #region core job
 
         public void Reload()
         {
             BlReloadEnabled = false;
 
-            LoadV2ray().ContinueWith(task =>
+            LoadCore().ContinueWith(task =>
             {
                 TestServerAvailability();
 
-                Application.Current.Dispatcher.Invoke((Action)(() =>
+                Application.Current?.Dispatcher.Invoke((Action)(() =>
                 {
                     BlReloadEnabled = true;
                 }));
             });
         }
 
-        private async Task LoadV2ray()
+        private async Task LoadCore()
         {
             await Task.Run(() =>
             {
@@ -1524,7 +1526,7 @@ namespace v2rayN.ViewModels
             });
         }
 
-        private void CloseV2ray()
+        private void CloseCore()
         {
             ConfigHandler.SaveConfig(_config, false);
 
@@ -1533,7 +1535,7 @@ namespace v2rayN.ViewModels
             _coreHandler.CoreStop();
         }
 
-        #endregion v2ray job
+        #endregion core job
 
         #region System proxy and Routings
 
@@ -1555,7 +1557,7 @@ namespace v2rayN.ViewModels
             SysProxyHandle.UpdateSysProxy(_config, _config.tunModeItem.enableTun ? true : false);
             _noticeHandler?.SendMessage(ResUI.TipChangeSystemProxy + _config.sysProxyType.ToString(), true);
 
-            Application.Current.Dispatcher.Invoke((Action)(() =>
+            Application.Current?.Dispatcher.Invoke((Action)(() =>
             {
                 BlSystemProxyClear = (type == ESysProxyType.ForcedClear);
                 BlSystemProxySet = (type == ESysProxyType.ForcedChange);
@@ -1676,7 +1678,7 @@ namespace v2rayN.ViewModels
                 Application.Current.MainWindow.Hide();
                 //Application.Current.MainWindow.ShowInTaskbar = false;
                 //IntPtr windowHandle = new WindowInteropHelper(Application.Current.MainWindow).Handle;
-                //Utils.RegWriteValue(Global.MyRegPath, Utils.WindowHwndKey, Convert.ToString((long)windowHandle));
+                //Utile.RegWriteValue(Global.MyRegPath, Utile.WindowHwndKey, Convert.ToString((long)windowHandle));
             }
             _showInTaskbar = bl;
         }
@@ -1704,10 +1706,6 @@ namespace v2rayN.ViewModels
             }
         }
 
-        private void StorageUI()
-        {
-        }
-
         private void BindingUI()
         {
             ColorModeDark = _config.uiItem.colorModeDark;
@@ -1807,7 +1805,7 @@ namespace v2rayN.ViewModels
         public void InboundDisplayStaus()
         {
             StringBuilder sb = new();
-            sb.Append($"[{Global.InboundSocks}:{LazyConfig.Instance.GetLocalPort(Global.InboundSocks)}]");
+            sb.Append($"[{EInboundProtocol.socks}:{LazyConfig.Instance.GetLocalPort(EInboundProtocol.socks)}]");
             sb.Append(" | ");
             //if (_config.sysProxyType == ESysProxyType.ForcedChange)
             //{
@@ -1815,7 +1813,7 @@ namespace v2rayN.ViewModels
             //}
             //else
             //{
-            sb.Append($"[{Global.InboundHttp}:{LazyConfig.Instance.GetLocalPort(Global.InboundHttp)}]");
+            sb.Append($"[{EInboundProtocol.http}:{LazyConfig.Instance.GetLocalPort(EInboundProtocol.http)}]");
             //}
             InboundDisplay = $"{ResUI.LabLocal}:{sb}";
 
@@ -1824,9 +1822,9 @@ namespace v2rayN.ViewModels
                 if (_config.inbound[0].newPort4LAN)
                 {
                     StringBuilder sb2 = new();
-                    sb2.Append($"[{Global.InboundSocks}:{LazyConfig.Instance.GetLocalPort(Global.InboundSocks2)}]");
+                    sb2.Append($"[{EInboundProtocol.socks}:{LazyConfig.Instance.GetLocalPort(EInboundProtocol.socks2)}]");
                     sb2.Append(" | ");
-                    sb2.Append($"[{Global.InboundHttp}:{LazyConfig.Instance.GetLocalPort(Global.InboundHttp2)}]");
+                    sb2.Append($"[{EInboundProtocol.http}:{LazyConfig.Instance.GetLocalPort(EInboundProtocol.http2)}]");
                     InboundLanDisplay = $"{ResUI.LabLAN}:{sb2}";
                 }
                 else
@@ -1869,7 +1867,7 @@ namespace v2rayN.ViewModels
                  .Delay(TimeSpan.FromSeconds(1))
                  .Subscribe(x =>
                  {
-                     Application.Current.Dispatcher.Invoke(() =>
+                     Application.Current?.Dispatcher.Invoke(() =>
                      {
                          ShowHideWindow(false);
                      });

v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs

@@ -4,7 +4,7 @@ using Splat;
 using System.Reactive;
 using System.Windows;
 using v2rayN.Handler;
-using v2rayN.Mode;
+using v2rayN.Models;
 using v2rayN.Resx;
 
 namespace v2rayN.ViewModels
@@ -249,21 +249,21 @@ namespace v2rayN.ViewModels
 
         private void SaveSetting()
         {
-            if (Utils.IsNullOrEmpty(localPort.ToString()) || !Utils.IsNumberic(localPort.ToString())
+            if (Utils.IsNullOrEmpty(localPort.ToString()) || !Utils.IsNumeric(localPort.ToString())
                || localPort <= 0 || localPort >= Global.MaxPort)
             {
-                UI.Show(ResUI.FillLocalListeningPort);
+                _noticeHandler?.Enqueue(ResUI.FillLocalListeningPort);
                 return;
             }
 
-            //if (Utils.IsNullOrEmpty(Kcpmtu.ToString()) || !Utils.IsNumberic(Kcpmtu.ToString())
+            //if (Utile.IsNullOrEmpty(Kcpmtu.ToString()) || !Utile.IsNumeric(Kcpmtu.ToString())
-            //       || Utils.IsNullOrEmpty(Kcptti.ToString()) || !Utils.IsNumberic(Kcptti.ToString())
+            //       || Utile.IsNullOrEmpty(Kcptti.ToString()) || !Utile.IsNumeric(Kcptti.ToString())
-            //       || Utils.IsNullOrEmpty(KcpuplinkCapacity.ToString()) || !Utils.IsNumberic(KcpuplinkCapacity.ToString())
+            //       || Utile.IsNullOrEmpty(KcpuplinkCapacity.ToString()) || !Utile.IsNumeric(KcpuplinkCapacity.ToString())
-            //       || Utils.IsNullOrEmpty(KcpdownlinkCapacity.ToString()) || !Utils.IsNumberic(KcpdownlinkCapacity.ToString())
+            //       || Utile.IsNullOrEmpty(KcpdownlinkCapacity.ToString()) || !Utile.IsNumeric(KcpdownlinkCapacity.ToString())
-            //       || Utils.IsNullOrEmpty(KcpreadBufferSize.ToString()) || !Utils.IsNumberic(KcpreadBufferSize.ToString())
+            //       || Utile.IsNullOrEmpty(KcpreadBufferSize.ToString()) || !Utile.IsNumeric(KcpreadBufferSize.ToString())
-            //       || Utils.IsNullOrEmpty(KcpwriteBufferSize.ToString()) || !Utils.IsNumberic(KcpwriteBufferSize.ToString()))
+            //       || Utile.IsNullOrEmpty(KcpwriteBufferSize.ToString()) || !Utile.IsNumeric(KcpwriteBufferSize.ToString()))
             //{
-            //    UI.Show(ResUI.FillKcpParameters);
+            //    _noticeHandler?.Enqueue(ResUI.FillKcpParameters);
             //    return;
             //}
 
@@ -342,7 +342,7 @@ namespace v2rayN.ViewModels
             }
             else
             {
-                UI.ShowWarning(ResUI.OperationFailed);
+                _noticeHandler?.Enqueue(ResUI.OperationFailed);
             }
         }
 

v2rayN/v2rayN/ViewModels/RoutingRuleDetailsViewModel.cs

@@ -4,7 +4,7 @@ using Splat;
 using System.Reactive;
 using System.Windows;
 using v2rayN.Handler;
-using v2rayN.Mode;
+using v2rayN.Models;
 using v2rayN.Resx;
 
 namespace v2rayN.ViewModels
@@ -94,7 +94,7 @@ namespace v2rayN.ViewModels
 
             if (!hasRule)
             {
-                UI.ShowWarning(string.Format(ResUI.RoutingRuleDetailRequiredTips, "Port/Protocol/Domain/IP/Process"));
+                _noticeHandler?.Enqueue(string.Format(ResUI.RoutingRuleDetailRequiredTips, "Port/Protocol/Domain/IP/Process"));
                 return;
             }
             //_noticeHandler?.Enqueue(ResUI.OperationSuccess);

v2rayN/v2rayN/ViewModels/RoutingRuleSettingViewModel.cs

@@ -5,7 +5,7 @@ using Splat;
 using System.Reactive;
 using System.Windows;
 using v2rayN.Handler;
-using v2rayN.Mode;
+using v2rayN.Models;
 using v2rayN.Resx;
 using v2rayN.Views;
 using Application = System.Windows.Application;
@@ -169,7 +169,7 @@ namespace v2rayN.ViewModels
         {
             if (SelectedSource is null || SelectedSource.outboundTag.IsNullOrEmpty())
             {
-                UI.Show(ResUI.PleaseSelectRules);
+                _noticeHandler?.Enqueue(ResUI.PleaseSelectRules);
                 return;
             }
             if (UI.ShowYesNo(ResUI.RemoveRules) == MessageBoxResult.No)
@@ -192,7 +192,7 @@ namespace v2rayN.ViewModels
         {
             if (SelectedSource is null || SelectedSource.outboundTag.IsNullOrEmpty())
             {
-                UI.Show(ResUI.PleaseSelectRules);
+                _noticeHandler?.Enqueue(ResUI.PleaseSelectRules);
                 return;
             }
 
@@ -208,7 +208,7 @@ namespace v2rayN.ViewModels
             if (lst.Count > 0)
             {
                 Utils.SetClipboardData(JsonUtils.Serialize(lst));
-                //UI.Show(ResUI.OperationSuccess"));
+                //_noticeHandler?.Enqueue(ResUI.OperationSuccess"));
             }
         }
 
@@ -216,7 +216,7 @@ namespace v2rayN.ViewModels
         {
             if (SelectedSource is null || SelectedSource.outboundTag.IsNullOrEmpty())
             {
-                UI.Show(ResUI.PleaseSelectRules);
+                _noticeHandler?.Enqueue(ResUI.PleaseSelectRules);
                 return;
             }
 
@@ -237,7 +237,7 @@ namespace v2rayN.ViewModels
             string remarks = SelectedRouting.remarks;
             if (Utils.IsNullOrEmpty(remarks))
             {
-                UI.Show(ResUI.PleaseFillRemarks);
+                _noticeHandler?.Enqueue(ResUI.PleaseFillRemarks);
                 return;
             }
             var item = SelectedRouting;
@@ -255,7 +255,7 @@ namespace v2rayN.ViewModels
             }
             else
             {
-                UI.ShowWarning(ResUI.OperationFailed);
+                _noticeHandler?.Enqueue(ResUI.OperationFailed);
             }
         }
 
@@ -282,7 +282,7 @@ namespace v2rayN.ViewModels
             if (AddBatchRoutingRules(SelectedRouting, result) == 0)
             {
                 RefreshRulesItems();
-                UI.Show(ResUI.OperationSuccess);
+                _noticeHandler?.Enqueue(ResUI.OperationSuccess);
             }
         }
 
@@ -292,7 +292,7 @@ namespace v2rayN.ViewModels
             if (AddBatchRoutingRules(SelectedRouting, clipboardData) == 0)
             {
                 RefreshRulesItems();
-                UI.Show(ResUI.OperationSuccess);
+                _noticeHandler?.Enqueue(ResUI.OperationSuccess);
             }
         }
 
@@ -301,7 +301,7 @@ namespace v2rayN.ViewModels
             var url = SelectedRouting.url;
             if (Utils.IsNullOrEmpty(url))
             {
-                UI.Show(ResUI.MsgNeedUrl);
+                _noticeHandler?.Enqueue(ResUI.MsgNeedUrl);
                 return;
             }
 
@@ -313,7 +313,7 @@ namespace v2rayN.ViewModels
                 {
                     RefreshRulesItems();
                 }));
-                UI.Show(ResUI.OperationSuccess);
+                _noticeHandler?.Enqueue(ResUI.OperationSuccess);
             }
         }
 

v2rayN/v2rayN/ViewModels/RoutingSettingViewModel.cs

@@ -5,7 +5,7 @@ using Splat;
 using System.Reactive;
 using System.Windows;
 using v2rayN.Handler;
-using v2rayN.Mode;
+using v2rayN.Models;
 using v2rayN.Resx;
 using v2rayN.Views;
 
@@ -214,7 +214,7 @@ namespace v2rayN.ViewModels
             }
             else
             {
-                UI.ShowWarning(ResUI.OperationFailed);
+                _noticeHandler?.Enqueue(ResUI.OperationFailed);
             }
         }
 
@@ -229,7 +229,7 @@ namespace v2rayN.ViewModels
             BlockDomain = "geosite:category-ads-all";
 
             //_noticeHandler?.Enqueue(ResUI.OperationSuccess);
-            UI.Show(ResUI.OperationSuccess);
+            _noticeHandler?.Enqueue(ResUI.OperationSuccess);
         }
 
         public void RoutingAdvancedEdit(bool blNew)
@@ -259,7 +259,7 @@ namespace v2rayN.ViewModels
         {
             if (SelectedSource is null || SelectedSource.remarks.IsNullOrEmpty())
             {
-                UI.Show(ResUI.PleaseSelectRules);
+                _noticeHandler?.Enqueue(ResUI.PleaseSelectRules);
                 return;
             }
             if (UI.ShowYesNo(ResUI.RemoveRules) == MessageBoxResult.No)
@@ -284,7 +284,7 @@ namespace v2rayN.ViewModels
             var item = LazyConfig.Instance.GetRoutingItem(SelectedSource?.id);
             if (item is null)
             {
-                UI.Show(ResUI.PleaseSelectRules);
+                _noticeHandler?.Enqueue(ResUI.PleaseSelectRules);
                 return;
             }
 

v2rayN/v2rayN/ViewModels/SubEditViewModel.cs

@@ -4,7 +4,7 @@ using Splat;
 using System.Reactive;
 using System.Windows;
 using v2rayN.Handler;
-using v2rayN.Mode;
+using v2rayN.Models;
 using v2rayN.Resx;
 
 namespace v2rayN.ViewModels
@@ -46,9 +46,9 @@ namespace v2rayN.ViewModels
         private void SaveSub()
         {
             string remarks = SelectedSource.remarks;
-            if (string.IsNullOrEmpty(remarks))
+            if (Utils.IsNullOrEmpty(remarks))
             {
-                UI.Show(ResUI.PleaseFillRemarks);
+                _noticeHandler?.Enqueue(ResUI.PleaseFillRemarks);
                 return;
             }
 

v2rayN/v2rayN/ViewModels/SubSettingViewModel.cs

@@ -7,7 +7,7 @@ using Splat;
 using System.Reactive;
 using System.Windows;
 using v2rayN.Handler;
-using v2rayN.Mode;
+using v2rayN.Models;
 using v2rayN.Resx;
 using v2rayN.Views;
 

v2rayN/v2rayN/Views/AddServer2Window.xaml

@@ -1,12 +1,12 @@
 <reactiveui:ReactiveWindow
     x:Class="v2rayN.Views.AddServer2Window"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:conv="clr-namespace:v2rayN.Converters"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:reactiveui="http://reactiveui.net"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:conv="clr-namespace:v2rayN.Converters"
     xmlns:resx="clr-namespace:v2rayN.Resx"
     xmlns:vms="clr-namespace:v2rayN.ViewModels"
     Title="v2rayN"

v2rayN/v2rayN/Views/AddServer2Window.xaml.cs

@@ -1,7 +1,7 @@
 using ReactiveUI;
 using System.Reactive.Disposables;
 using System.Windows;
-using v2rayN.Mode;
+using v2rayN.Models;
 using v2rayN.ViewModels;
 
 namespace v2rayN.Views

v2rayN/v2rayN/Views/AddServerWindow.xaml

@@ -1,12 +1,12 @@
 <reactiveui:ReactiveWindow
     x:Class="v2rayN.Views.AddServerWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:conv="clr-namespace:v2rayN.Converters"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:reactiveui="http://reactiveui.net"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:conv="clr-namespace:v2rayN.Converters"
     xmlns:resx="clr-namespace:v2rayN.Resx"
     xmlns:vms="clr-namespace:v2rayN.ViewModels"
     Title="{x:Static resx:ResUI.menuServers}"

v2rayN/v2rayN/Views/AddServerWindow.xaml.cs

@@ -3,7 +3,7 @@ using System.Reactive.Disposables;
 using System.Windows;
 using System.Windows.Controls;
 using v2rayN.Handler;
-using v2rayN.Mode;
+using v2rayN.Models;
 using v2rayN.Resx;
 using v2rayN.ViewModels;
 
@@ -60,7 +60,7 @@ namespace v2rayN.Views
                 cmbFingerprint.Items.Add(it);
                 cmbFingerprint2.Items.Add(it);
             });
-            Global.AllowInsecures.ForEach(it =>
+            Global.AllowInsecure.ForEach(it =>
             {
                 cmbAllowInsecure.Items.Add(it);
             });
@@ -73,7 +73,7 @@ namespace v2rayN.Views
             {
                 case EConfigType.VMess:
                     gridVMess.Visibility = Visibility.Visible;
-                    Global.VmessSecuritys.ForEach(it =>
+                    Global.VmessSecurities.ForEach(it =>
                     {
                         cmbSecurity.Items.Add(it);
                     });
@@ -85,7 +85,7 @@ namespace v2rayN.Views
 
                 case EConfigType.Shadowsocks:
                     gridSs.Visibility = Visibility.Visible;
-                    LazyConfig.Instance.GetShadowsocksSecuritys(profileItem).ForEach(it =>
+                    LazyConfig.Instance.GetShadowsocksSecurities(profileItem).ForEach(it =>
                     {
                         cmbSecurity3.Items.Add(it);
                     });
@@ -279,12 +279,12 @@ namespace v2rayN.Views
                 return;
             }
 
-            if (network == Global.DefaultNetwork)
+            if (network == nameof(ETransport.tcp))
             {
                 cmbHeaderType.Items.Add(Global.None);
                 cmbHeaderType.Items.Add(Global.TcpHeaderHttp);
             }
-            else if (network is "kcp" or "quic")
+            else if (network is nameof(ETransport.kcp) or nameof(ETransport.quic))
             {
                 cmbHeaderType.Items.Add(Global.None);
                 Global.KcpHeaderTypes.ForEach(it =>
@@ -292,10 +292,10 @@ namespace v2rayN.Views
                     cmbHeaderType.Items.Add(it);
                 });
             }
-            else if (network == "grpc")
+            else if (network == nameof(ETransport.grpc))
             {
-                cmbHeaderType.Items.Add(Global.GrpcgunMode);
+                cmbHeaderType.Items.Add(Global.GrpcGunMode);
-                cmbHeaderType.Items.Add(Global.GrpcmultiMode);
+                cmbHeaderType.Items.Add(Global.GrpcMultiMode);
             }
             else
             {
@@ -318,33 +318,35 @@ namespace v2rayN.Views
 
             switch (network)
             {
-                case Global.DefaultNetwork:
+                case nameof(ETransport.tcp):
                     tipRequestHost.Text = ResUI.TransportRequestHostTip1;
                     tipHeaderType.Text = ResUI.TransportHeaderTypeTip1;
                     break;
 
-                case "kcp":
+                case nameof(ETransport.kcp):
                     tipHeaderType.Text = ResUI.TransportHeaderTypeTip2;
                     tipPath.Text = ResUI.TransportPathTip5;
                     break;
 
-                case "ws":
+                case nameof(ETransport.ws):
+                case nameof(ETransport.httpupgrade):
                     tipRequestHost.Text = ResUI.TransportRequestHostTip2;
                     tipPath.Text = ResUI.TransportPathTip1;
                     break;
 
-                case "h2":
+                case nameof(ETransport.h2):
                     tipRequestHost.Text = ResUI.TransportRequestHostTip3;
                     tipPath.Text = ResUI.TransportPathTip2;
                     break;
 
-                case "quic":
+                case nameof(ETransport.quic):
                     tipRequestHost.Text = ResUI.TransportRequestHostTip4;
                     tipPath.Text = ResUI.TransportPathTip3;
                     tipHeaderType.Text = ResUI.TransportHeaderTypeTip3;
                     break;
 
-                case "grpc":
+                case nameof(ETransport.grpc):
+                    tipRequestHost.Text = ResUI.TransportRequestHostTip5;
                     tipPath.Text = ResUI.TransportPathTip4;
                     tipHeaderType.Text = ResUI.TransportHeaderTypeTip4;
                     labHeaderType.Visibility = Visibility.Hidden;

v2rayN/v2rayN/Views/DNSSettingWindow.xaml.cs

@@ -2,7 +2,7 @@
 using System.Reactive.Disposables;
 using System.Windows;
 using v2rayN.Handler;
-using v2rayN.Mode;
+using v2rayN.Models;
 using v2rayN.ViewModels;
 
 namespace v2rayN.Views

v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml

@@ -40,6 +40,7 @@
             <Button
                 x:Name="btnSave"
                 Width="100"
+                Click="btnSave_Click"
                 Content="{x:Static resx:ResUI.TbConfirm}"
                 Cursor="Hand"
                 Style="{StaticResource DefButton}" />

v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml.cs

@@ -3,7 +3,7 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 using v2rayN.Handler;
-using v2rayN.Mode;
+using v2rayN.Models;
 using v2rayN.Resx;
 
 namespace v2rayN.Views
@@ -68,9 +68,9 @@ namespace v2rayN.Views
             (sender as TextBox)!.Text = KeyEventItemToString(_TextBoxKeyEventItem[sender]);
         }
 
-        private KeyEventItem GetKeyEventItemByEGlobalHotkey(List<KeyEventItem> KELsit, EGlobalHotkey eg)
+        private KeyEventItem GetKeyEventItemByEGlobalHotkey(List<KeyEventItem> KEList, EGlobalHotkey eg)
         {
-            return JsonUtils.DeepCopy(KELsit.Find((it) => it.eGlobalHotkey == eg) ?? new()
+            return JsonUtils.DeepCopy(KEList.Find((it) => it.eGlobalHotkey == eg) ?? new()
             {
                 eGlobalHotkey = eg,
                 Control = false,
@@ -119,7 +119,7 @@ namespace v2rayN.Views
             }
             else
             {
-                UI.ShowWarning(ResUI.OperationFailed);
+                UI.Show(ResUI.OperationFailed);
             }
         }
 

v2rayN/v2rayN/Views/MainWindow.xaml

@@ -1,17 +1,17 @@
 <reactiveui:ReactiveWindow
     x:Class="v2rayN.Views.MainWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:reactiveui="http://reactiveui.net"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:tb="clr-namespace:H.NotifyIcon;assembly=H.NotifyIcon.Wpf"
     xmlns:base="clr-namespace:v2rayN.Base"
     xmlns:conv="clr-namespace:v2rayN.Converters"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="clr-namespace:v2rayN.Views"
-    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:reactiveui="http://reactiveui.net"
     xmlns:resx="clr-namespace:v2rayN.Resx"
-    xmlns:tb="clr-namespace:H.NotifyIcon;assembly=H.NotifyIcon.Wpf"
     xmlns:vms="clr-namespace:v2rayN.ViewModels"
+    xmlns:local="clr-namespace:v2rayN.Views"
     Title="v2rayN"
     Width="900"
     Height="700"

v2rayN/v2rayN/Views/MainWindow.xaml.cs

@@ -11,7 +11,7 @@ using System.Windows.Interop;
 using System.Windows.Media;
 using v2rayN.Base;
 using v2rayN.Handler;
-using v2rayN.Mode;
+using v2rayN.Models;
 using v2rayN.Resx;
 using v2rayN.ViewModels;
 using Point = System.Windows.Point;
@@ -356,6 +356,10 @@ namespace v2rayN.Views
                 {
                     ViewModel?.Reload();
                 }
+                else if (e.Key == Key.Escape)
+                {
+                    MessageBus.Current.SendMessage("true", Global.CommandStopSpeedTest);
+                }
             }
         }
 
@@ -512,8 +516,8 @@ namespace v2rayN.Views
 
         private void StorageUI()
         {
-            _config.uiItem.mainWidth = this.Width;
+            _config.uiItem.mainWidth = Utils.ToInt(this.Width);
-            _config.uiItem.mainHeight = this.Height;
+            _config.uiItem.mainHeight = Utils.ToInt(this.Height);
 
             List<ColumnItem> lvColumnItem = new();
             for (int k = 0; k < lstProfiles.Columns.Count; k++)
@@ -522,7 +526,7 @@ namespace v2rayN.Views
                 lvColumnItem.Add(new()
                 {
                     Name = item2.ExName,
-                    Width = item2.Visibility == Visibility.Visible ? Convert.ToInt32(item2.ActualWidth) : -1,
+                    Width = item2.Visibility == Visibility.Visible ? Utils.ToInt(item2.ActualWidth) : -1,
                     Index = item2.DisplayIndex
                 });
             }
@@ -534,8 +538,8 @@ namespace v2rayN.Views
 
         private void AddHelpMenuItem()
         {
-            var coreInfos = LazyConfig.Instance.GetCoreInfos();
+            var coreInfo = LazyConfig.Instance.GetCoreInfo();
-            foreach (var it in coreInfos
+            foreach (var it in coreInfo
                 .Where(t => t.coreType != ECoreType.v2fly
                             && t.coreType != ECoreType.clash
                             && t.coreType != ECoreType.clash_meta
@@ -573,7 +577,7 @@ namespace v2rayN.Views
         /// <typeparam name="T"></typeparam>
         /// <param name="current"></param>
         /// <returns></returns>
-        private static T? FindAnchestor<T>(DependencyObject current) where T : DependencyObject
+        private static T? FindAncestor<T>(DependencyObject current) where T : DependencyObject
         {
             do
             {
@@ -605,7 +609,7 @@ namespace v2rayN.Views
             {
                 // Get the dragged Item
                 if (sender is not DataGrid listView) return;
-                var listViewItem = FindAnchestor<DataGridRow>((DependencyObject)e.OriginalSource);
+                var listViewItem = FindAncestor<DataGridRow>((DependencyObject)e.OriginalSource);
                 if (listViewItem == null) return;           // Abort
                                                             // Find the data behind the ListViewItem
                 ProfileItemModel item = (ProfileItemModel)listView.ItemContainerGenerator.ItemFromContainer(listViewItem);
@@ -631,7 +635,7 @@ namespace v2rayN.Views
             {
                 // Get the drop Item destination
                 if (sender is not DataGrid listView) return;
-                var listViewItem = FindAnchestor<DataGridRow>((DependencyObject)e.OriginalSource);
+                var listViewItem = FindAncestor<DataGridRow>((DependencyObject)e.OriginalSource);
                 if (listViewItem == null)
                 {
                     // Abort

v2rayN/v2rayN/Views/MsgView.xaml.cs

@@ -3,7 +3,7 @@ using System.Reactive.Linq;
 using System.Text.RegularExpressions;
 using System.Windows.Threading;
 using v2rayN.Handler;
-using v2rayN.Mode;
+using v2rayN.Models;
 
 namespace v2rayN.Views
 {
@@ -18,7 +18,7 @@ namespace v2rayN.Views
         {
             InitializeComponent();
             _config = LazyConfig.Instance.GetConfig();
-            MessageBus.Current.Listen<string>("MsgView").Subscribe(x => DelegateAppendText(x));
+            MessageBus.Current.Listen<string>(Global.CommandSendMsgView).Subscribe(x => DelegateAppendText(x));
             Global.PresetMsgFilters.ForEach(it =>
             {
                 cmbMsgFilter.Items.Add(it);
@@ -48,7 +48,7 @@ namespace v2rayN.Views
 
             var MsgFilter = cmbMsgFilter.Text.TrimEx();
             if (MsgFilter != lastMsgFilter) lastMsgFilterNotAvailable = false;
-            if (!string.IsNullOrEmpty(MsgFilter) && !lastMsgFilterNotAvailable)
+            if (!Utils.IsNullOrEmpty(MsgFilter) && !lastMsgFilterNotAvailable)
             {
                 try
                 {

v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs

@@ -5,7 +5,7 @@ using System.Reactive.Disposables;
 using System.Windows;
 using System.Windows.Media;
 using v2rayN.Handler;
-using v2rayN.Mode;
+using v2rayN.Models;
 using v2rayN.ViewModels;
 
 namespace v2rayN.Views

v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml.cs

@@ -1,7 +1,7 @@
 using ReactiveUI;
 using System.Reactive.Disposables;
 using System.Windows;
-using v2rayN.Mode;
+using v2rayN.Models;
 using v2rayN.ViewModels;
 
 namespace v2rayN.Views

v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml.cs

@@ -2,7 +2,7 @@
 using System.Reactive.Disposables;
 using System.Windows;
 using System.Windows.Input;
-using v2rayN.Mode;
+using v2rayN.Models;
 using v2rayN.ViewModels;
 
 namespace v2rayN.Views
@@ -30,12 +30,12 @@ namespace v2rayN.Views
             lstRules.MouseDoubleClick += LstRules_MouseDoubleClick;
 
             ViewModel = new RoutingRuleSettingViewModel(routingItem, this);
-            Global.DomainStrategys.ForEach(it =>
+            Global.DomainStrategies.ForEach(it =>
             {
                 cmbdomainStrategy.Items.Add(it);
             });
             cmbdomainStrategy.Items.Add(string.Empty);
-            Global.DomainStrategys4Singbox.ForEach(it =>
+            Global.DomainStrategies4Singbox.ForEach(it =>
             {
                 cmbdomainStrategy4Singbox.Items.Add(it);
             });

v2rayN/v2rayN/Views/RoutingSettingWindow.xaml.cs

@@ -2,7 +2,7 @@
 using System.Reactive.Disposables;
 using System.Windows;
 using System.Windows.Input;
-using v2rayN.Mode;
+using v2rayN.Models;
 using v2rayN.ViewModels;
 
 namespace v2rayN.Views
@@ -31,7 +31,7 @@ namespace v2rayN.Views
 
             ViewModel = new RoutingSettingViewModel(this);
 
-            Global.DomainStrategys.ForEach(it =>
+            Global.DomainStrategies.ForEach(it =>
             {
                 cmbdomainStrategy.Items.Add(it);
             });
@@ -39,7 +39,7 @@ namespace v2rayN.Views
             {
                 cmbdomainMatcher.Items.Add(it);
             });
-            Global.DomainStrategys4Singbox.ForEach(it =>
+            Global.DomainStrategies4Singbox.ForEach(it =>
             {
                 cmbdomainStrategy4Singbox.Items.Add(it);
             });

v2rayN/v2rayN/Views/SubEditWindow.xaml

@@ -1,12 +1,12 @@
 <reactiveui:ReactiveWindow
     x:Class="v2rayN.Views.SubEditWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:conv="clr-namespace:v2rayN.Converters"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:reactiveui="http://reactiveui.net"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:conv="clr-namespace:v2rayN.Converters"
     xmlns:resx="clr-namespace:v2rayN.Resx"
     xmlns:vms="clr-namespace:v2rayN.ViewModels"
     Title="{x:Static resx:ResUI.menuSubSetting}"

v2rayN/v2rayN/Views/SubEditWindow.xaml.cs

@@ -1,7 +1,7 @@
 using ReactiveUI;
 using System.Reactive.Disposables;
 using System.Windows;
-using v2rayN.Mode;
+using v2rayN.Models;
 using v2rayN.ViewModels;
 
 namespace v2rayN.Views

v2rayN/v2rayN/Views/SubSettingWindow.xaml.cs

@@ -3,7 +3,7 @@ using System.ComponentModel;
 using System.Reactive.Disposables;
 using System.Windows;
 using System.Windows.Input;
-using v2rayN.Mode;
+using v2rayN.Models;
 using v2rayN.ViewModels;
 
 namespace v2rayN.Views

v2rayN/v2rayN/v2rayN.csproj

@@ -10,7 +10,7 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<ApplicationIcon>v2rayN.ico</ApplicationIcon>
 		<Copyright>Copyright © 2017-2024 (GPLv3)</Copyright>
-		<FileVersion>6.35</FileVersion>
+		<FileVersion>6.41</FileVersion>
 		<SupportedOSPlatformVersion>7.0</SupportedOSPlatformVersion>
 	</PropertyGroup>
 	
@@ -19,12 +19,12 @@
 		<PackageReference Include="MaterialDesignThemes" Version="4.9.0" />
 		<PackageReference Include="H.NotifyIcon.Wpf" Version="2.0.124" />
 		<PackageReference Include="QRCoder.Xaml" Version="1.4.3" />
-		<PackageReference Include="sqlite-net-pcl" Version="1.8.116" />
+		<PackageReference Include="sqlite-net-pcl" Version="1.9.172" />
 		<PackageReference Include="TaskScheduler" Version="2.10.1" /> 
 		<PackageReference Include="ZXing.Net.Bindings.Windows.Compatibility" Version="0.16.12" />
 		<PackageReference Include="ReactiveUI.Fody" Version="19.5.41" />
 		<PackageReference Include="ReactiveUI.Validation" Version="3.1.7" />
-		<PackageReference Include="ReactiveUI.WPF" Version="19.5.41" />
+		<PackageReference Include="ReactiveUI.WPF" Version="19.6.1" />
 		<PackageReference Include="Splat.NLog" Version="14.8.12" />
 	</ItemGroup>
 	
@@ -55,10 +55,10 @@
         <EmbeddedResource Include="Sample\SampleClientConfig">
           <CopyToOutputDirectory>Never</CopyToOutputDirectory>
         </EmbeddedResource>  
-        <EmbeddedResource Include="Sample\SampleHttprequest">
+        <EmbeddedResource Include="Sample\SampleHttpRequest">
           <CopyToOutputDirectory>Never</CopyToOutputDirectory>
         </EmbeddedResource>  
-        <EmbeddedResource Include="Sample\SampleHttpresponse">
+        <EmbeddedResource Include="Sample\SampleHttpResponse">
           <CopyToOutputDirectory>Never</CopyToOutputDirectory>
         </EmbeddedResource>  
         <EmbeddedResource Include="Sample\SampleInbound">