up 6.45

Optimize code for better performance

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="Grpc.Net.Client" Version="2.60.0" />
-		<PackageReference Include="Grpc.Tools" Version="2.61.0">
+		<PackageReference Include="Google.Protobuf" Version="3.26.1" />
+		<PackageReference Include="Grpc.Net.Client" Version="2.62.0" />
+		<PackageReference Include="Grpc.Tools" Version="2.63.0">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>

v2rayN/v2rayN/App.xaml

@@ -13,7 +13,7 @@
                     BaseTheme="Light"
                     PrimaryColor="Blue"
                     SecondaryColor="Lime" />
-                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesign2.Defaults.xaml" />
             </ResourceDictionary.MergedDictionaries>
             <system:Double x:Key="MenuItemHeight">26</system:Double>
             <system:Double x:Key="StdFontSize">12</system:Double>
@@ -72,10 +72,10 @@
                 <Setter Property="FontSize" Value="{DynamicResource StdFontSize}" />
                 <Style.Triggers>
                     <Trigger Property="IsSelected" Value="true">
-                        <Setter Property="Background" Value="{DynamicResource PrimaryHueLightBrush}" />
+                        <Setter Property="Background" Value="{DynamicResource MaterialDesign.Brush.Primary.Light}" />
                     </Trigger>
                     <Trigger Property="IsMouseOver" Value="true">
-                        <Setter Property="Background" Value="{DynamicResource PrimaryHueMidBrush}" />
+                        <Setter Property="Background" Value="{DynamicResource MaterialDesign.Brush.Primary}" />
                     </Trigger>
                 </Style.Triggers>
             </Style>

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.Model;
+using v2rayN.Models;
 
 namespace v2rayN
 {
@@ -27,14 +28,13 @@ namespace v2rayN
         /// <param name="e"></param>
         protected override void OnStartup(StartupEventArgs e)
         {
-            var exePathKey = Utile.GetMD5(Utile.GetExePath());
+            var exePathKey = Utils.GetMD5(Utils.GetExePath());
 
             var rebootas = (e.Args ?? new string[] { }).Any(t => t == Global.RebootAs);
             ProgramStarted = new EventWaitHandle(false, EventResetMode.AutoReset, exePathKey, out bool bCreatedNew);
             if (!rebootas && !bCreatedNew)
             {
                 ProgramStarted.Set();
-                Current.Shutdown();
                 Environment.Exit(0);
                 return;
             }
@@ -42,7 +42,7 @@ namespace v2rayN
             Logging.Setup();
             Init();
             Logging.LoggingEnabled(_config.guiItem.enableLog);
-            Logging.SaveLog($"v2rayN start up | {Utile.GetVersion()} | {Utile.GetExePath()}");
+            Logging.SaveLog($"v2rayN start up | {Utils.GetVersion()} | {Utils.GetExePath()}");
             Logging.ClearLogs();
 
             Thread.CurrentThread.CurrentUICulture = new(_config.uiItem.currentLanguage);
@@ -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配置文件异常,请重启应用");
-                Application.Current.Shutdown();
+                UI.Show($"Loading GUI configuration file is abnormal,please restart the application{Environment.NewLine}加载GUI配置文件异常,请重启应用");
                 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;
             }
@@ -19,9 +19,9 @@ namespace v2rayN
             Uri uri = new(url);
             //Authorization Header
             var headers = new WebHeaderCollection();
-            if (!Utile.IsNullOrEmpty(uri.UserInfo))
+            if (!Utils.IsNullOrEmpty(uri.UserInfo))
             {
-                headers.Add(HttpRequestHeader.Authorization, "Basic " + Utile.Base64Encode(uri.UserInfo));
+                headers.Add(HttpRequestHeader.Authorization, "Basic " + Utils.Base64Encode(uri.UserInfo));
             }
 
             var downloadOpt = new DownloadConfiguration()
@@ -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

@@ -67,7 +67,7 @@ namespace v2rayN
                     }
                     try
                     {
-                        if (!Utile.IsNullOrEmpty(ignoredName) && entry.Name.Contains(ignoredName))
+                        if (!Utils.IsNullOrEmpty(ignoredName) && entry.Name.Contains(ignoredName))
                         {
                             continue;
                         }

v2rayN/v2rayN/Common/HttpClientHelper.cs

@@ -23,19 +23,19 @@ 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);
         }
 
         public async Task PutAsync(string url, Dictionary<string, string> headers)
         {
-            var jsonContent = JsonUtile.Serialize(headers);
+            var jsonContent = JsonUtils.Serialize(headers);
             var content = new StringContent(jsonContent, Encoding.UTF8, MediaTypeNames.Application.Json);
 
             var result = await httpClient.PutAsync(url, content);
@@ -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

@@ -5,7 +5,7 @@ using System.Text.Json.Serialization;
 
 namespace v2rayN
 {
-    internal class JsonUtile
+    internal class JsonUtils
     {
         /// <summary>
         /// DeepCopy
@@ -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/Logging.cs

@@ -13,7 +13,7 @@ namespace v2rayN
             FileTarget fileTarget = new();
             config.AddTarget("file", fileTarget);
             fileTarget.Layout = "${longdate}-${level:uppercase=true} ${message}";
-            fileTarget.FileName = Utile.GetLogPath("${shortdate}.txt");
+            fileTarget.FileName = Utils.GetLogPath("${shortdate}.txt");
             config.LoggingRules.Add(new LoggingRule("*", LogLevel.Debug, fileTarget));
             LogManager.Configuration = config;
         }
@@ -33,7 +33,7 @@ namespace v2rayN
                 try
                 {
                     var now = DateTime.Now.AddMonths(-1);
-                    var dir = Utile.GetLogPath();
+                    var dir = Utils.GetLogPath();
                     var files = Directory.GetFiles(dir, "*.txt");
                     foreach (var filePath in files)
                     {

v2rayN/v2rayN/Common/QRCodeHelper.cs

@@ -1,6 +1,13 @@
 using QRCoder;
 using QRCoder.Xaml;
+using System.Drawing;
+using System.Windows.Interop;
+using System.Windows;
 using System.Windows.Media;
+using ZXing.Common;
+using ZXing.QrCode;
+using ZXing.Windows.Compatibility;
+using ZXing;
 
 namespace v2rayN
 {
@@ -28,5 +35,70 @@ namespace v2rayN
                 return null;
             }
         }
+
+        public static string ScanScreen(float dpiX, float dpiY)
+        {
+            try
+            {
+                var left = (int)(SystemParameters.WorkArea.Left);
+                var top = (int)(SystemParameters.WorkArea.Top);
+                var width = (int)(SystemParameters.WorkArea.Width / dpiX);
+                var height = (int)(SystemParameters.WorkArea.Height / dpiY);
+
+                using Bitmap fullImage = new Bitmap(width, height);
+                using (Graphics g = Graphics.FromImage(fullImage))
+                {
+                    g.CopyFromScreen(left, top, 0, 0, fullImage.Size, CopyPixelOperation.SourceCopy);
+                }
+                int maxTry = 10;
+                for (int i = 0; i < maxTry; i++)
+                {
+                    int marginLeft = (int)((double)fullImage.Width * i / 2.5 / maxTry);
+                    int marginTop = (int)((double)fullImage.Height * i / 2.5 / maxTry);
+                    Rectangle cropRect = new(marginLeft, marginTop, fullImage.Width - marginLeft * 2, fullImage.Height - marginTop * 2);
+                    Bitmap target = new(width, height);
+
+                    double imageScale = (double)width / (double)cropRect.Width;
+                    using (Graphics g = Graphics.FromImage(target))
+                    {
+                        g.DrawImage(fullImage, new Rectangle(0, 0, target.Width, target.Height),
+                                        cropRect,
+                                        GraphicsUnit.Pixel);
+                    }
+
+                    BitmapLuminanceSource source = new(target);
+                    QRCodeReader reader = new();
+
+                    BinaryBitmap bitmap = new(new HybridBinarizer(source));
+                    var result = reader.decode(bitmap);
+                    if (result != null)
+                    {
+                        return result.Text;
+                    }
+                    else
+                    {
+                        BinaryBitmap bitmap2 = new(new HybridBinarizer(source.invert()));
+                        var result2 = reader.decode(bitmap2);
+                        if (result2 != null)
+                        {
+                            return result2.Text;
+                        }
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+            }
+            return string.Empty;
+        }
+
+        public static Tuple<float, float> GetDpiXY(Window window)
+        {
+            IntPtr hWnd = new WindowInteropHelper(window).EnsureHandle();
+            Graphics g = Graphics.FromHwnd(hWnd);
+
+            return new(96 / g.DpiX, 96 / g.DpiY);
+        }
     }
 }

v2rayN/v2rayN/Common/SqliteHelper.cs

@@ -15,7 +15,7 @@ namespace v2rayN
 
         public SQLiteHelper()
         {
-            _connstr = Utile.GetConfigPath(_configDB);
+            _connstr = Utils.GetConfigPath(_configDB);
             _db = new SQLiteConnection(_connstr, false);
             _dbAsync = new SQLiteAsyncConnection(_connstr, false);
         }

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

@@ -18,14 +18,10 @@ using System.Windows;
 using System.Windows.Interop;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
-using ZXing;
-using ZXing.Common;
-using ZXing.QrCode;
-using ZXing.Windows.Compatibility;
 
 namespace v2rayN
 {
-    internal class Utile
+    internal class Utils
     {
         #region 资源Json操作
 
@@ -57,11 +53,14 @@ namespace v2rayN
         /// 取得存储资源
         /// </summary>
         /// <returns></returns>
-        public static string? LoadResource(string res)
+        public static string? LoadResource(string? res)
         {
             try
             {
-                if (!File.Exists(res)) return null;
+                if (!File.Exists(res))
+                {
+                    return null;
+                }
                 return File.ReadAllText(res);
             }
             catch (Exception ex)
@@ -361,14 +360,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;
                 }
@@ -391,7 +390,7 @@ namespace v2rayN
 
         public static string Convert2Comma(string text)
         {
-            if (string.IsNullOrWhiteSpace(text))
+            if (Utils.IsNullOrEmpty(text))
             {
                 return text;
             }
@@ -428,7 +427,7 @@ namespace v2rayN
         /// <returns></returns>
         public static bool IsNullOrEmpty(string? text)
         {
-            if (string.IsNullOrEmpty(text))
+            if (string.IsNullOrWhiteSpace(text))
             {
                 return true;
             }
@@ -478,7 +477,7 @@ namespace v2rayN
         /// 验证Domain地址是否合法
         /// </summary>
         /// <param name="domain"></param>
-        public static bool IsDomain(string domain)
+        public static bool IsDomain(string? domain)
         {
             //如果为空
             if (IsNullOrEmpty(domain))
@@ -579,12 +578,11 @@ namespace v2rayN
             return inUse;
         }
 
-        public static int GetFreePort()
+        public static int GetFreePort(int defaultPort = 9090)
         {
             try
             {
-                int defaultPort = 9090;
-                if (!Utile.PortInUse(defaultPort))
+                if (!Utils.PortInUse(defaultPort))
                 {
                     return defaultPort;
                 }
@@ -598,7 +596,7 @@ namespace v2rayN
             catch
             {
             }
-            return 69090;
+            return 59090;
         }
 
         #endregion 测速
@@ -742,11 +740,11 @@ namespace v2rayN
             return Guid.TryParse(strSrc, out Guid g);
         }
 
-        public static void ProcessStart(string fileName)
+        public static void ProcessStart(string fileName, string arguments = "")
         {
             try
             {
-                Process.Start(new ProcessStartInfo(fileName) { UseShellExecute = true });
+                Process.Start(new ProcessStartInfo(fileName, arguments) { UseShellExecute = true });
             }
             catch (Exception ex)
             {
@@ -841,7 +839,7 @@ namespace v2rayN
             {
                 Directory.CreateDirectory(_tempPath);
             }
-            if (string.IsNullOrEmpty(filename))
+            if (Utils.IsNullOrEmpty(filename))
             {
                 return _tempPath;
             }
@@ -877,7 +875,7 @@ namespace v2rayN
             {
                 Directory.CreateDirectory(_tempPath);
             }
-            if (string.IsNullOrEmpty(filename))
+            if (Utils.IsNullOrEmpty(filename))
             {
                 return _tempPath;
             }
@@ -902,7 +900,7 @@ namespace v2rayN
                     Directory.CreateDirectory(_tempPath);
                 }
             }
-            if (string.IsNullOrEmpty(filename))
+            if (Utils.IsNullOrEmpty(filename))
             {
                 return _tempPath;
             }
@@ -919,7 +917,7 @@ namespace v2rayN
             {
                 Directory.CreateDirectory(_tempPath);
             }
-            if (string.IsNullOrEmpty(filename))
+            if (Utils.IsNullOrEmpty(filename))
             {
                 return _tempPath;
             }
@@ -936,7 +934,7 @@ namespace v2rayN
             {
                 Directory.CreateDirectory(_tempPath);
             }
-            if (string.IsNullOrEmpty(filename))
+            if (Utils.IsNullOrEmpty(filename))
             {
                 return _tempPath;
             }
@@ -948,66 +946,6 @@ namespace v2rayN
 
         #endregion TempPath
 
-        #region scan screen
-
-        public static string ScanScreen(float dpiX, float dpiY)
-        {
-            try
-            {
-                var left = (int)(SystemParameters.WorkArea.Left);
-                var top = (int)(SystemParameters.WorkArea.Top);
-                var width = (int)(SystemParameters.WorkArea.Width / dpiX);
-                var height = (int)(SystemParameters.WorkArea.Height / dpiY);
-
-                using Bitmap fullImage = new Bitmap(width, height);
-                using (Graphics g = Graphics.FromImage(fullImage))
-                {
-                    g.CopyFromScreen(left, top, 0, 0, fullImage.Size, CopyPixelOperation.SourceCopy);
-                }
-                int maxTry = 10;
-                for (int i = 0; i < maxTry; i++)
-                {
-                    int marginLeft = (int)((double)fullImage.Width * i / 2.5 / maxTry);
-                    int marginTop = (int)((double)fullImage.Height * i / 2.5 / maxTry);
-                    Rectangle cropRect = new(marginLeft, marginTop, fullImage.Width - marginLeft * 2, fullImage.Height - marginTop * 2);
-                    Bitmap target = new(width, height);
-
-                    double imageScale = (double)width / (double)cropRect.Width;
-                    using (Graphics g = Graphics.FromImage(target))
-                    {
-                        g.DrawImage(fullImage, new Rectangle(0, 0, target.Width, target.Height),
-                                        cropRect,
-                                        GraphicsUnit.Pixel);
-                    }
-
-                    BitmapLuminanceSource source = new(target);
-                    BinaryBitmap bitmap = new(new HybridBinarizer(source));
-                    QRCodeReader reader = new();
-                    Result result = reader.decode(bitmap);
-                    if (result != null)
-                    {
-                        string ret = result.Text;
-                        return ret;
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(ex.Message, ex);
-            }
-            return string.Empty;
-        }
-
-        public static Tuple<float, float> GetDpiXY(Window window)
-        {
-            IntPtr hWnd = new WindowInteropHelper(window).EnsureHandle();
-            Graphics g = Graphics.FromHwnd(hWnd);
-
-            return new(96 / g.DpiX, 96 / g.DpiY);
-        }
-
-        #endregion scan screen
-
         #region 开机自动启动等
 
         /// <summary>
@@ -1030,14 +968,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());
                     }
                 }
             }
@@ -1108,7 +1046,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;
             }
@@ -1123,7 +1061,7 @@ namespace v2rayN
             {
                 taskService.RootFolder.DeleteTask(t.Name);
             }
-            if (string.IsNullOrEmpty(fileName))
+            if (Utils.IsNullOrEmpty(fileName))
             {
                 return;
             }
@@ -1137,7 +1075,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,9 +12,9 @@ namespace v2rayN.Converters
             try
             {
                 var fontFamily = LazyConfig.Instance.GetConfig().uiItem.currentFontFamily;
-                if (!string.IsNullOrEmpty(fontFamily))
+                if (!Utils.IsNullOrEmpty(fontFamily))
                 {
-                    var fontPath = Utile.GetFontsPath();
+                    var fontPath = Utils.GetFontsPath();
                     MyFont = new FontFamily(new Uri(@$"file:///{fontPath}\"), $"./#{fontFamily}");
                 }
             }

v2rayN/v2rayN/Global.cs

@@ -1,4 +1,4 @@
-using v2rayN.Model;
+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,10 +20,10 @@ 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/";
+        public const string SingboxRulesetUrl = @"https://raw.githubusercontent.com/SagerNet/sing-{0}/rule-set/{1}.srs";
 
         public const string PromotionUrl = @"aHR0cHM6Ly85LjIzNDQ1Ni54eXovYWJjLmh0bWw=";
         public const string ConfigFileName = "guiNConfig.json";
@@ -56,21 +53,14 @@ 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 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>";
@@ -122,6 +112,8 @@ 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> UserAgentTexts = new()
@@ -152,6 +144,7 @@ namespace v2rayN
             {EConfigType.VMess,"vmess"},
             {EConfigType.Shadowsocks,"shadowsocks"},
             {EConfigType.Socks,"socks"},
+            {EConfigType.Http,"http"},
             {EConfigType.VLESS,"vless"},
             {EConfigType.Trojan,"trojan"},
             {EConfigType.Hysteria2,"hysteria2"},
@@ -165,7 +158,7 @@ namespace v2rayN
         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> 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" };
@@ -182,6 +175,7 @@ namespace v2rayN
         public static readonly List<string> LogLevels = new() { "debug", "info", "warning", "error", "none" };
         public static readonly List<string> InboundTags = new() { "socks", "http", "socks2", "http2" };
         public static readonly List<string> RuleProtocols = new() { "http", "tls", "bittorrent" };
+        public static readonly List<string> destOverrideProtocols = ["http", "tls", "quic", "fakedns", "fakedns+others"];
         public static readonly List<string> TunMtus = new() { "1280", "1408", "1500", "9000" };
         public static readonly List<string> TunStacks = new() { "gvisor", "system" };
         public static readonly List<string> PresetMsgFilters = new() { "proxy", "direct", "block", "" };

v2rayN/v2rayN/Handler/ConfigHandler.cs

@@ -1,7 +1,7 @@
 using System.Data;
 using System.IO;
 using System.Text.RegularExpressions;
-using v2rayN.Model;
+using v2rayN.Models;
 
 namespace v2rayN.Handler
 {
@@ -23,15 +23,15 @@ namespace v2rayN.Handler
         public static int LoadConfig(ref Config? config)
         {
             //载入配置文件
-            var result = Utile.LoadResource(Utile.GetConfigPath(configRes));
-            if (!Utile.IsNullOrEmpty(result))
+            var result = Utils.LoadResource(Utils.GetConfigPath(configRes));
+            if (!Utils.IsNullOrEmpty(result))
             {
                 //转成Json
-                config = JsonUtile.Deserialize<Config>(result);
+                config = JsonUtils.Deserialize<Config>(result);
             }
             else
             {
-                if (File.Exists(Utile.GetConfigPath(configRes)))
+                if (File.Exists(Utils.GetConfigPath(configRes)))
                 {
                     Logging.SaveLog("LoadConfig Exception");
                     return -1;
@@ -50,7 +50,6 @@ namespace v2rayN.Handler
                 {
                     logEnabled = false,
                     loglevel = "warning",
-
                     muxEnabled = false,
                 };
             }
@@ -61,7 +60,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 +68,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)
@@ -92,7 +84,7 @@ namespace v2rayN.Handler
                 };
             }
             //路由规则
-            if (Utile.IsNullOrEmpty(config.routingBasicItem.domainStrategy))
+            if (Utils.IsNullOrEmpty(config.routingBasicItem.domainStrategy))
             {
                 config.routingBasicItem.domainStrategy = Global.DomainStrategies[0];//"IPIfNonMatch";
             }
@@ -151,7 +143,7 @@ namespace v2rayN.Handler
             {
                 config.uiItem.mainColumnItem = new();
             }
-            if (Utile.IsNullOrEmpty(config.uiItem.currentLanguage))
+            if (Utils.IsNullOrEmpty(config.uiItem.currentLanguage))
             {
                 config.uiItem.currentLanguage = Global.Languages[0];
             }
@@ -160,7 +152,7 @@ namespace v2rayN.Handler
             {
                 config.constItem = new ConstItem();
             }
-            if (Utile.IsNullOrEmpty(config.constItem.defIEProxyExceptions))
+            if (Utils.IsNullOrEmpty(config.constItem.defIEProxyExceptions))
             {
                 config.constItem.defIEProxyExceptions = Global.IEProxyExceptions;
             }
@@ -173,11 +165,11 @@ namespace v2rayN.Handler
             {
                 config.speedTestItem.speedTestTimeout = 10;
             }
-            if (Utile.IsNullOrEmpty(config.speedTestItem.speedTestUrl))
+            if (Utils.IsNullOrEmpty(config.speedTestItem.speedTestUrl))
             {
                 config.speedTestItem.speedTestUrl = Global.SpeedTestUrls[0];
             }
-            if (Utile.IsNullOrEmpty(config.speedTestItem.speedPingTestUrl))
+            if (Utils.IsNullOrEmpty(config.speedTestItem.speedPingTestUrl))
             {
                 config.speedTestItem.speedPingTestUrl = Global.SpeedPingTestUrl;
             }
@@ -187,7 +179,7 @@ namespace v2rayN.Handler
                 config.mux4SboxItem = new()
                 {
                     protocol = Global.SingboxMuxs[0],
-                    max_connections = 4
+                    max_connections = 8
                 };
             }
 
@@ -227,9 +219,9 @@ namespace v2rayN.Handler
                 try
                 {
                     //save temp file
-                    var resPath = Utile.GetConfigPath(configRes);
+                    var resPath = Utils.GetConfigPath(configRes);
                     var tempPath = $"{resPath}_temp";
-                    if (JsonUtile.ToFile(config, tempPath) != 0)
+                    if (JsonUtils.ToFile(config, tempPath) != 0)
                     {
                         return;
                     }
@@ -248,103 +240,103 @@ namespace v2rayN.Handler
             }
         }
 
-        public static int ImportOldGuiConfig(Config config, string fileName)
-        {
-            var result = Utile.LoadResource(fileName);
-            if (Utile.IsNullOrEmpty(result))
-            {
-                return -1;
-            }
+        //public static int ImportOldGuiConfig(Config config, string fileName)
+        //{
+        //    var result = Utils.LoadResource(fileName);
+        //    if (Utils.IsNullOrEmpty(result))
+        //    {
+        //        return -1;
+        //    }
 
-            var configOld = JsonUtile.Deserialize<ConfigOld>(result);
-            if (configOld == null)
-            {
-                return -1;
-            }
+        //    var configOld = JsonUtils.Deserialize<ConfigOld>(result);
+        //    if (configOld == null)
+        //    {
+        //        return -1;
+        //    }
 
-            var subItem = JsonUtile.Deserialize<List<SubItem>>(JsonUtile.Serialize(configOld.subItem));
-            foreach (var it in subItem)
-            {
-                if (Utile.IsNullOrEmpty(it.id))
-                {
-                    it.id = Utile.GetGUID(false);
-                }
-                SQLiteHelper.Instance.Replace(it);
-            }
+        //    var subItem = JsonUtils.Deserialize<List<SubItem>>(JsonUtils.Serialize(configOld.subItem));
+        //    foreach (var it in subItem)
+        //    {
+        //        if (Utils.IsNullOrEmpty(it.id))
+        //        {
+        //            it.id = Utils.GetGUID(false);
+        //        }
+        //        SQLiteHelper.Instance.Replace(it);
+        //    }
 
-            var profileItems = JsonUtile.Deserialize<List<ProfileItem>>(JsonUtile.Serialize(configOld.vmess));
-            foreach (var it in profileItems)
-            {
-                if (Utile.IsNullOrEmpty(it.indexId))
-                {
-                    it.indexId = Utile.GetGUID(false);
-                }
-                SQLiteHelper.Instance.Replace(it);
-            }
+        //    var profileItems = JsonUtils.Deserialize<List<ProfileItem>>(JsonUtils.Serialize(configOld.vmess));
+        //    foreach (var it in profileItems)
+        //    {
+        //        if (Utils.IsNullOrEmpty(it.indexId))
+        //        {
+        //            it.indexId = Utils.GetGUID(false);
+        //        }
+        //        SQLiteHelper.Instance.Replace(it);
+        //    }
 
-            foreach (var it in configOld.routings)
-            {
-                if (it.locked)
-                {
-                    continue;
-                }
-                var routing = JsonUtile.Deserialize<RoutingItem>(JsonUtile.Serialize(it));
-                foreach (var it2 in it.rules)
-                {
-                    it2.id = Utile.GetGUID(false);
-                }
-                routing.ruleNum = it.rules.Count;
-                routing.ruleSet = JsonUtile.Serialize(it.rules, false);
+        //    foreach (var it in configOld.routings)
+        //    {
+        //        if (it.locked)
+        //        {
+        //            continue;
+        //        }
+        //        var routing = JsonUtils.Deserialize<RoutingItem>(JsonUtils.Serialize(it));
+        //        foreach (var it2 in it.rules)
+        //        {
+        //            it2.id = Utils.GetGUID(false);
+        //        }
+        //        routing.ruleNum = it.rules.Count;
+        //        routing.ruleSet = JsonUtils.Serialize(it.rules, false);
 
-                if (Utile.IsNullOrEmpty(routing.id))
-                {
-                    routing.id = Utile.GetGUID(false);
-                }
-                SQLiteHelper.Instance.Replace(routing);
-            }
+        //        if (Utils.IsNullOrEmpty(routing.id))
+        //        {
+        //            routing.id = Utils.GetGUID(false);
+        //        }
+        //        SQLiteHelper.Instance.Replace(routing);
+        //    }
 
-            config = JsonUtile.Deserialize<Config>(JsonUtile.Serialize(configOld));
+        //    config = JsonUtils.Deserialize<Config>(JsonUtils.Serialize(configOld));
 
-            if (config.coreBasicItem == null)
-            {
-                config.coreBasicItem = new()
-                {
-                    logEnabled = configOld.logEnabled,
-                    loglevel = configOld.loglevel,
-                    muxEnabled = configOld.muxEnabled,
-                };
-            }
+        //    if (config.coreBasicItem == null)
+        //    {
+        //        config.coreBasicItem = new()
+        //        {
+        //            logEnabled = configOld.logEnabled,
+        //            loglevel = configOld.loglevel,
+        //            muxEnabled = configOld.muxEnabled,
+        //        };
+        //    }
 
-            if (config.routingBasicItem == null)
-            {
-                config.routingBasicItem = new()
-                {
-                    enableRoutingAdvanced = configOld.enableRoutingAdvanced,
-                    domainStrategy = configOld.domainStrategy
-                };
-            }
+        //    if (config.routingBasicItem == null)
+        //    {
+        //        config.routingBasicItem = new()
+        //        {
+        //            enableRoutingAdvanced = configOld.enableRoutingAdvanced,
+        //            domainStrategy = configOld.domainStrategy
+        //        };
+        //    }
 
-            if (config.guiItem == null)
-            {
-                config.guiItem = new()
-                {
-                    enableStatistics = configOld.enableStatistics,
-                    keepOlderDedupl = configOld.keepOlderDedupl,
-                    ignoreGeoUpdateCore = configOld.ignoreGeoUpdateCore,
-                    autoUpdateInterval = configOld.autoUpdateInterval,
-                    checkPreReleaseUpdate = configOld.checkPreReleaseUpdate,
-                    enableSecurityProtocolTls13 = configOld.enableSecurityProtocolTls13,
-                    trayMenuServersLimit = configOld.trayMenuServersLimit,
-                };
-            }
+        //    if (config.guiItem == null)
+        //    {
+        //        config.guiItem = new()
+        //        {
+        //            enableStatistics = configOld.enableStatistics,
+        //            keepOlderDedupl = configOld.keepOlderDedupl,
+        //            ignoreGeoUpdateCore = configOld.ignoreGeoUpdateCore,
+        //            autoUpdateInterval = configOld.autoUpdateInterval,
+        //            checkPreReleaseUpdate = configOld.checkPreReleaseUpdate,
+        //            enableSecurityProtocolTls13 = configOld.enableSecurityProtocolTls13,
+        //            trayMenuServersLimit = configOld.trayMenuServersLimit,
+        //        };
+        //    }
 
-            GetDefaultServer(config);
-            GetDefaultRouting(config);
-            SaveConfig(config);
-            LoadConfig(ref config);
+        //    GetDefaultServer(config);
+        //    GetDefaultRouting(config);
+        //    SaveConfig(config);
+        //    LoadConfig(ref config);
 
-            return 0;
-        }
+        //    return 0;
+        //}
 
         #endregion ConfigHandler
 
@@ -419,13 +411,13 @@ namespace v2rayN.Handler
                     continue;
                 }
 
-                ProfileItem profileItem = JsonUtile.DeepCopy(item);
+                ProfileItem profileItem = JsonUtils.DeepCopy(item);
                 profileItem.indexId = string.Empty;
                 profileItem.remarks = $"{item.remarks}-clone";
 
                 if (profileItem.configType == EConfigType.Custom)
                 {
-                    profileItem.address = Utile.GetConfigPath(profileItem.address);
+                    profileItem.address = Utils.GetConfigPath(profileItem.address);
                     if (AddCustomServer(config, profileItem, false) == 0)
                     {
                     }
@@ -447,7 +439,7 @@ namespace v2rayN.Handler
         /// <returns></returns>
         public static int SetDefaultServerIndex(Config config, string? indexId)
         {
-            if (Utile.IsNullOrEmpty(indexId))
+            if (Utils.IsNullOrEmpty(indexId))
             {
                 return -1;
             }
@@ -577,12 +569,12 @@ namespace v2rayN.Handler
                 return -1;
             }
             var ext = Path.GetExtension(fileName);
-            string newFileName = $"{Utile.GetGUID()}{ext}";
+            string newFileName = $"{Utils.GetGUID()}{ext}";
             //newFileName = Path.Combine(Utile.GetTempPath(), newFileName);
 
             try
             {
-                File.Copy(fileName, Utile.GetConfigPath(newFileName));
+                File.Copy(fileName, Utils.GetConfigPath(newFileName));
                 if (blDelete)
                 {
                     File.Delete(fileName);
@@ -596,7 +588,7 @@ namespace v2rayN.Handler
 
             profileItem.address = newFileName;
             profileItem.configType = EConfigType.Custom;
-            if (Utile.IsNullOrEmpty(profileItem.remarks))
+            if (Utils.IsNullOrEmpty(profileItem.remarks))
             {
                 profileItem.remarks = $"import custom@{DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss")}";
             }
@@ -671,6 +663,23 @@ namespace v2rayN.Handler
             return 0;
         }
 
+        /// <summary>
+        /// Add or edit server
+        /// </summary>
+        /// <param name="config"></param>
+        /// <param name="profileItem"></param>
+        /// <returns></returns>
+        public static int AddHttpServer(Config config, ProfileItem profileItem, bool toFile = true)
+        {
+            profileItem.configType = EConfigType.Http;
+
+            profileItem.address = profileItem.address.TrimEx();
+
+            AddServerCommon(config, profileItem, toFile);
+
+            return 0;
+        }
+
         /// <summary>
         /// Add or edit server
         /// </summary>
@@ -683,7 +692,7 @@ namespace v2rayN.Handler
 
             profileItem.address = profileItem.address.TrimEx();
             profileItem.id = profileItem.id.TrimEx();
-            if (Utile.IsNullOrEmpty(profileItem.streamSecurity))
+            if (Utils.IsNullOrEmpty(profileItem.streamSecurity))
             {
                 profileItem.streamSecurity = Global.StreamSecurity;
             }
@@ -713,7 +722,7 @@ namespace v2rayN.Handler
             profileItem.path = profileItem.path.TrimEx();
             profileItem.network = string.Empty;
 
-            if (Utile.IsNullOrEmpty(profileItem.streamSecurity))
+            if (Utils.IsNullOrEmpty(profileItem.streamSecurity))
             {
                 profileItem.streamSecurity = Global.StreamSecurity;
             }
@@ -748,11 +757,11 @@ namespace v2rayN.Handler
                 profileItem.headerType = Global.TuicCongestionControls.FirstOrDefault()!;
             }
 
-            if (Utile.IsNullOrEmpty(profileItem.streamSecurity))
+            if (Utils.IsNullOrEmpty(profileItem.streamSecurity))
             {
                 profileItem.streamSecurity = Global.StreamSecurity;
             }
-            if (Utile.IsNullOrEmpty(profileItem.alpn))
+            if (Utils.IsNullOrEmpty(profileItem.alpn))
             {
                 profileItem.alpn = "h3";
             }
@@ -920,7 +929,7 @@ namespace v2rayN.Handler
             {
                 return -1;
             }
-            if (!Utile.IsNullOrEmpty(profileItem.security) && profileItem.security != Global.None)
+            if (!Utils.IsNullOrEmpty(profileItem.security) && profileItem.security != Global.None)
             {
                 profileItem.security = Global.None;
             }
@@ -958,7 +967,7 @@ namespace v2rayN.Handler
         {
             profileItem.configVersion = 2;
 
-            if (!Utile.IsNullOrEmpty(profileItem.streamSecurity))
+            if (!Utils.IsNullOrEmpty(profileItem.streamSecurity))
             {
                 if (profileItem.streamSecurity != Global.StreamSecurity
                      && profileItem.streamSecurity != Global.StreamSecurityReality)
@@ -967,26 +976,26 @@ namespace v2rayN.Handler
                 }
                 else
                 {
-                    if (Utile.IsNullOrEmpty(profileItem.allowInsecure))
+                    if (Utils.IsNullOrEmpty(profileItem.allowInsecure))
                     {
                         profileItem.allowInsecure = config.coreBasicItem.defAllowInsecure.ToString().ToLower();
                     }
-                    if (Utile.IsNullOrEmpty(profileItem.fingerprint) && profileItem.streamSecurity == Global.StreamSecurityReality)
+                    if (Utils.IsNullOrEmpty(profileItem.fingerprint) && profileItem.streamSecurity == Global.StreamSecurityReality)
                     {
                         profileItem.fingerprint = config.coreBasicItem.defFingerprint;
                     }
                 }
             }
 
-            if (!Utile.IsNullOrEmpty(profileItem.network) && !Global.Networks.Contains(profileItem.network))
+            if (!Utils.IsNullOrEmpty(profileItem.network) && !Global.Networks.Contains(profileItem.network))
             {
                 profileItem.network = Global.DefaultNetwork;
             }
 
             var maxSort = -1;
-            if (Utile.IsNullOrEmpty(profileItem.indexId))
+            if (Utils.IsNullOrEmpty(profileItem.indexId))
             {
-                profileItem.indexId = Utile.GetGUID(false);
+                profileItem.indexId = Utils.GetGUID(false);
                 maxSort = ProfileExHandler.Instance.GetMaxSort();
             }
             if (!toFile && maxSort < 0)
@@ -1039,7 +1048,7 @@ namespace v2rayN.Handler
                 }
                 if (item.configType == EConfigType.Custom)
                 {
-                    File.Delete(Utile.GetConfigPath(item.address));
+                    File.Delete(Utils.GetConfigPath(item.address));
                 }
 
                 SQLiteHelper.Instance.Delete(item);
@@ -1065,14 +1074,14 @@ namespace v2rayN.Handler
         /// <returns>成功导入的数量</returns>
         private static int AddBatchServers(Config config, string clipboardData, string subid, bool isSub, List<ProfileItem> lstOriSub)
         {
-            if (Utile.IsNullOrEmpty(clipboardData))
+            if (Utils.IsNullOrEmpty(clipboardData))
             {
                 return -1;
             }
 
             string subFilter = string.Empty;
             //remove sub items
-            if (isSub && !Utile.IsNullOrEmpty(subid))
+            if (isSub && !Utils.IsNullOrEmpty(subid))
             {
                 RemoveServerViaSubid(config, subid, isSub);
                 subFilter = LazyConfig.Instance.GetSubItem(subid)?.filter ?? "";
@@ -1105,7 +1114,7 @@ namespace v2rayN.Handler
                 }
 
                 //exist sub items
-                if (isSub && !Utile.IsNullOrEmpty(subid))
+                if (isSub && !Utils.IsNullOrEmpty(subid))
                 {
                     var existItem = lstOriSub?.FirstOrDefault(t => t.isSub == isSub
                                                 && config.uiItem.enableUpdateSubOnlyRemarksExist ? t.remarks == profileItem.remarks : CompareProfileItem(t, profileItem, true));
@@ -1127,7 +1136,7 @@ namespace v2rayN.Handler
                         }
                     }
                     //filter
-                    if (!Utile.IsNullOrEmpty(subFilter))
+                    if (!Utils.IsNullOrEmpty(subFilter))
                     {
                         if (!Regex.IsMatch(profileItem.remarks, subFilter))
                         {
@@ -1169,7 +1178,7 @@ namespace v2rayN.Handler
 
         private static int AddBatchServers4Custom(Config config, string clipboardData, string subid, bool isSub, List<ProfileItem> lstOriSub)
         {
-            if (Utile.IsNullOrEmpty(clipboardData))
+            if (Utils.IsNullOrEmpty(clipboardData))
             {
                 return -1;
             }
@@ -1184,23 +1193,63 @@ 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 = JsonUtile.Deserialize<V2rayConfig>(clipboardData);
+            var v2rayConfig = JsonUtils.Deserialize<V2rayConfig>(clipboardData);
             if (v2rayConfig?.inbounds?.Count > 0
                 && v2rayConfig.outbounds?.Count > 0)
             {
-                var fileName = Utile.GetTempPath($"{Utile.GetGUID(false)}.json");
+                var fileName = Utils.GetTempPath($"{Utils.GetGUID(false)}.json");
                 File.WriteAllText(fileName, clipboardData);
 
                 profileItem.coreType = ECoreType.Xray;
                 profileItem.address = fileName;
-                profileItem.remarks = "v2ray_custom";
+                profileItem.remarks = v2rayConfig.remarks ?? "v2ray_custom";
             }
             //Is Clash configuration
             else if (Contains(clipboardData, "port", "socks-port", "proxies"))
             {
-                var fileName = Utile.GetTempPath($"{Utile.GetGUID(false)}.yaml");
+                var fileName = Utils.GetTempPath($"{Utils.GetGUID(false)}.yaml");
                 File.WriteAllText(fileName, clipboardData);
 
                 profileItem.coreType = ECoreType.mihomo;
@@ -1210,7 +1259,7 @@ namespace v2rayN.Handler
             //Is hysteria configuration
             else if (Contains(clipboardData, "server", "up", "down", "listen", "<html>", "<body>"))
             {
-                var fileName = Utile.GetTempPath($"{Utile.GetGUID(false)}.json");
+                var fileName = Utils.GetTempPath($"{Utils.GetGUID(false)}.json");
                 File.WriteAllText(fileName, clipboardData);
 
                 profileItem.coreType = ECoreType.hysteria;
@@ -1220,7 +1269,7 @@ namespace v2rayN.Handler
             //Is naiveproxy configuration
             else if (Contains(clipboardData, "listen", "proxy", "<html>", "<body>"))
             {
-                var fileName = Utile.GetTempPath($"{Utile.GetGUID(false)}.json");
+                var fileName = Utils.GetTempPath($"{Utils.GetGUID(false)}.json");
                 File.WriteAllText(fileName, clipboardData);
 
                 profileItem.coreType = ECoreType.naiveproxy;
@@ -1238,7 +1287,7 @@ namespace v2rayN.Handler
                 //profileItem.remarks = "other_custom";
             }
 
-            if (isSub && !Utile.IsNullOrEmpty(subid))
+            if (isSub && !Utils.IsNullOrEmpty(subid))
             {
                 RemoveServerViaSubid(config, subid, isSub);
             }
@@ -1249,7 +1298,7 @@ namespace v2rayN.Handler
             profileItem.subid = subid;
             profileItem.isSub = isSub;
 
-            if (Utile.IsNullOrEmpty(profileItem.address))
+            if (Utils.IsNullOrEmpty(profileItem.address))
             {
                 return -1;
             }
@@ -1266,21 +1315,21 @@ namespace v2rayN.Handler
 
         private static int AddBatchServers4SsSIP008(Config config, string clipboardData, string subid, bool isSub, List<ProfileItem> lstOriSub)
         {
-            if (Utile.IsNullOrEmpty(clipboardData))
+            if (Utils.IsNullOrEmpty(clipboardData))
             {
                 return -1;
             }
 
-            if (isSub && !Utile.IsNullOrEmpty(subid))
+            if (isSub && !Utils.IsNullOrEmpty(subid))
             {
                 RemoveServerViaSubid(config, subid, isSub);
             }
 
             //SsSIP008
-            var lstSsServer = JsonUtile.Deserialize<List<SsServer>>(clipboardData);
+            var lstSsServer = JsonUtils.Deserialize<List<SsServer>>(clipboardData);
             if (lstSsServer?.Count <= 0)
             {
-                var ssSIP008 = JsonUtile.Deserialize<SsSIP008>(clipboardData);
+                var ssSIP008 = JsonUtils.Deserialize<SsSIP008>(clipboardData);
                 if (ssSIP008?.servers?.Count > 0)
                 {
                     lstSsServer = ssSIP008.servers;
@@ -1299,7 +1348,7 @@ namespace v2rayN.Handler
                         security = it.method,
                         id = it.password,
                         address = it.server,
-                        port = Utile.ToInt(it.server_port)
+                        port = Utils.ToInt(it.server_port)
                     };
                     ssItem.subid = subid;
                     ssItem.isSub = isSub;
@@ -1318,15 +1367,15 @@ namespace v2rayN.Handler
         public static int AddBatchServers(Config config, string clipboardData, string subid, bool isSub)
         {
             List<ProfileItem>? lstOriSub = null;
-            if (isSub && !Utile.IsNullOrEmpty(subid))
+            if (isSub && !Utils.IsNullOrEmpty(subid))
             {
                 lstOriSub = LazyConfig.Instance.ProfileItems(subid);
             }
 
             var counter = 0;
-            if (Utile.IsBase64String(clipboardData))
+            if (Utils.IsBase64String(clipboardData))
             {
-                counter = AddBatchServers(config, Utile.Base64Decode(clipboardData), subid, isSub, lstOriSub);
+                counter = AddBatchServers(config, Utils.Base64Decode(clipboardData), subid, isSub, lstOriSub);
             }
             if (counter < 1)
             {
@@ -1334,7 +1383,7 @@ namespace v2rayN.Handler
             }
             if (counter < 1)
             {
-                counter = AddBatchServers(config, Utile.Base64Decode(clipboardData), subid, isSub, lstOriSub);
+                counter = AddBatchServers(config, Utils.Base64Decode(clipboardData), subid, isSub, lstOriSub);
             }
 
             if (counter < 1)
@@ -1381,9 +1430,9 @@ namespace v2rayN.Handler
 
         public static int AddSubItem(Config config, SubItem subItem)
         {
-            if (Utile.IsNullOrEmpty(subItem.id))
+            if (Utils.IsNullOrEmpty(subItem.id))
             {
-                subItem.id = Utile.GetGUID(false);
+                subItem.id = Utils.GetGUID(false);
 
                 if (subItem.sort <= 0)
                 {
@@ -1413,7 +1462,7 @@ namespace v2rayN.Handler
         /// <returns></returns>
         public static int RemoveServerViaSubid(Config config, string subid, bool isSub)
         {
-            if (Utile.IsNullOrEmpty(subid))
+            if (Utils.IsNullOrEmpty(subid))
             {
                 return -1;
             }
@@ -1428,7 +1477,7 @@ namespace v2rayN.Handler
             }
             foreach (var item in customProfile)
             {
-                File.Delete(Utile.GetConfigPath(item.address));
+                File.Delete(Utils.GetConfigPath(item.address));
             }
 
             return 0;
@@ -1464,9 +1513,9 @@ namespace v2rayN.Handler
 
         public static int SaveRoutingItem(Config config, RoutingItem item)
         {
-            if (Utile.IsNullOrEmpty(item.id))
+            if (Utils.IsNullOrEmpty(item.id))
             {
-                item.id = Utile.GetGUID(false);
+                item.id = Utils.GetGUID(false);
             }
 
             if (SQLiteHelper.Instance.Replace(item) > 0)
@@ -1487,12 +1536,12 @@ namespace v2rayN.Handler
         /// <returns></returns>
         public static int AddBatchRoutingRules(ref RoutingItem routingItem, string clipboardData)
         {
-            if (Utile.IsNullOrEmpty(clipboardData))
+            if (Utils.IsNullOrEmpty(clipboardData))
             {
                 return -1;
             }
 
-            var lstRules = JsonUtile.Deserialize<List<RulesItem>>(clipboardData);
+            var lstRules = JsonUtils.Deserialize<List<RulesItem>>(clipboardData);
             if (lstRules == null)
             {
                 return -1;
@@ -1500,14 +1549,14 @@ namespace v2rayN.Handler
 
             foreach (var item in lstRules)
             {
-                item.id = Utile.GetGUID(false);
+                item.id = Utils.GetGUID(false);
             }
             routingItem.ruleNum = lstRules.Count;
-            routingItem.ruleSet = JsonUtile.Serialize(lstRules, false);
+            routingItem.ruleSet = JsonUtils.Serialize(lstRules, false);
 
-            if (Utile.IsNullOrEmpty(routingItem.id))
+            if (Utils.IsNullOrEmpty(routingItem.id))
             {
-                routingItem.id = Utile.GetGUID(false);
+                routingItem.id = Utils.GetGUID(false);
             }
 
             if (SQLiteHelper.Instance.Replace(routingItem) > 0)
@@ -1542,7 +1591,7 @@ namespace v2rayN.Handler
                         {
                             return 0;
                         }
-                        var item = JsonUtile.DeepCopy(rules[index]);
+                        var item = JsonUtils.DeepCopy(rules[index]);
                         rules.RemoveAt(index);
                         rules.Insert(0, item);
 
@@ -1554,7 +1603,7 @@ namespace v2rayN.Handler
                         {
                             return 0;
                         }
-                        var item = JsonUtile.DeepCopy(rules[index]);
+                        var item = JsonUtils.DeepCopy(rules[index]);
                         rules.RemoveAt(index);
                         rules.Insert(index - 1, item);
 
@@ -1567,7 +1616,7 @@ namespace v2rayN.Handler
                         {
                             return 0;
                         }
-                        var item = JsonUtile.DeepCopy(rules[index]);
+                        var item = JsonUtils.DeepCopy(rules[index]);
                         rules.RemoveAt(index);
                         rules.Insert(index + 1, item);
 
@@ -1579,7 +1628,7 @@ namespace v2rayN.Handler
                         {
                             return 0;
                         }
-                        var item = JsonUtile.DeepCopy(rules[index]);
+                        var item = JsonUtils.DeepCopy(rules[index]);
                         rules.RemoveAt(index);
                         rules.Add(item);
 
@@ -1588,7 +1637,7 @@ namespace v2rayN.Handler
                 case EMove.Position:
                     {
                         var removeItem = rules[index];
-                        var item = JsonUtile.DeepCopy(rules[index]);
+                        var item = JsonUtils.DeepCopy(rules[index]);
                         rules.Insert(pos, item);
                         rules.Remove(removeItem);
                         break;
@@ -1624,36 +1673,37 @@ namespace v2rayN.Handler
 
         public static int InitBuiltinRouting(Config config, bool blImportAdvancedRules = false)
         {
+            var ver = "V2-";
             var items = LazyConfig.Instance.RoutingItems();
-            if (blImportAdvancedRules || items.Count <= 0)
+            if (blImportAdvancedRules || items.Where(t => t.remarks.StartsWith(ver)).ToList().Count <= 0)
             {
                 var maxSort = items.Count;
                 //Bypass the mainland
                 var item2 = new RoutingItem()
                 {
-                    remarks = "绕过大陆(Whitelist)",
+                    remarks = $"{ver}绕过大陆(Whitelist)",
                     url = string.Empty,
                     sort = maxSort + 1,
                 };
-                AddBatchRoutingRules(ref item2, Utile.GetEmbedText(Global.CustomRoutingFileName + "white"));
+                AddBatchRoutingRules(ref item2, Utils.GetEmbedText(Global.CustomRoutingFileName + "white"));
 
                 //Blacklist
                 var item3 = new RoutingItem()
                 {
-                    remarks = "黑名单(Blacklist)",
+                    remarks = $"{ver}黑名单(Blacklist)",
                     url = string.Empty,
                     sort = maxSort + 2,
                 };
-                AddBatchRoutingRules(ref item3, Utile.GetEmbedText(Global.CustomRoutingFileName + "black"));
+                AddBatchRoutingRules(ref item3, Utils.GetEmbedText(Global.CustomRoutingFileName + "black"));
 
                 //Global
                 var item1 = new RoutingItem()
                 {
-                    remarks = "全局(Global)",
+                    remarks = $"{ver}全局(Global)",
                     url = string.Empty,
                     sort = maxSort + 3,
                 };
-                AddBatchRoutingRules(ref item1, Utile.GetEmbedText(Global.CustomRoutingFileName + "global"));
+                AddBatchRoutingRules(ref item1, Utils.GetEmbedText(Global.CustomRoutingFileName + "global"));
 
                 if (!blImportAdvancedRules)
                 {
@@ -1669,7 +1719,7 @@ namespace v2rayN.Handler
                     url = string.Empty,
                     locked = true,
                 };
-                AddBatchRoutingRules(ref item1, Utile.GetEmbedText(Global.CustomRoutingFileName + "locked"));
+                AddBatchRoutingRules(ref item1, Utils.GetEmbedText(Global.CustomRoutingFileName + "locked"));
             }
             return 0;
         }
@@ -1713,9 +1763,9 @@ namespace v2rayN.Handler
 
         public static int SaveDNSItems(Config config, DNSItem item)
         {
-            if (Utile.IsNullOrEmpty(item.id))
+            if (Utils.IsNullOrEmpty(item.id))
             {
-                item.id = Utile.GetGUID(false);
+                item.id = Utils.GetGUID(false);
             }
 
             if (SQLiteHelper.Instance.Replace(item) > 0)

v2rayN/v2rayN/Handler/CoreConfigHandler.cs

@@ -1,5 +1,5 @@
 using System.IO;
-using v2rayN.Model;
+using v2rayN.Models;
 using v2rayN.Resx;
 
 namespace v2rayN.Handler
@@ -33,13 +33,13 @@ namespace v2rayN.Handler
                     {
                         return -1;
                     }
-                    if (Utile.IsNullOrEmpty(fileName))
+                    if (Utils.IsNullOrEmpty(fileName))
                     {
-                        content = JsonUtile.Serialize(singboxConfig);
+                        content = JsonUtils.Serialize(singboxConfig);
                     }
                     else
                     {
-                        JsonUtile.ToFile(singboxConfig, fileName, false);
+                        JsonUtils.ToFile(singboxConfig, fileName, false);
                     }
                 }
                 else
@@ -49,13 +49,13 @@ namespace v2rayN.Handler
                     {
                         return -1;
                     }
-                    if (Utile.IsNullOrEmpty(fileName))
+                    if (Utils.IsNullOrEmpty(fileName))
                     {
-                        content = JsonUtile.Serialize(v2rayConfig);
+                        content = JsonUtils.Serialize(v2rayConfig);
                     }
                     else
                     {
-                        JsonUtile.ToFile(v2rayConfig, fileName, false);
+                        JsonUtils.ToFile(v2rayConfig, fileName, false);
                     }
                 }
             }
@@ -87,7 +87,7 @@ namespace v2rayN.Handler
                 string addressFileName = node.address;
                 if (!File.Exists(addressFileName))
                 {
-                    addressFileName = Utile.GetConfigPath(addressFileName);
+                    addressFileName = Utils.GetConfigPath(addressFileName);
                 }
                 if (!File.Exists(addressFileName))
                 {
@@ -132,8 +132,8 @@ namespace v2rayN.Handler
                                 fileContent.RemoveAt(indexPort);
                             }
 
-                            fileContent.Add($"port: {LazyConfig.Instance.GetLocalPort(Global.InboundHttp)}");
-                            fileContent.Add($"socks-port: {LazyConfig.Instance.GetLocalPort(Global.InboundSocks)}");
+                            fileContent.Add($"port: {LazyConfig.Instance.GetLocalPort(EInboundProtocol.http)}");
+                            fileContent.Add($"socks-port: {LazyConfig.Instance.GetLocalPort(EInboundProtocol.socks)}");
                             break;
                     }
                     File.WriteAllLines(fileName, fileContent);
@@ -158,7 +158,7 @@ namespace v2rayN.Handler
                 {
                     return -1;
                 }
-                JsonUtile.ToFile(singboxConfig, fileName, false);
+                JsonUtils.ToFile(singboxConfig, fileName, false);
             }
             else
             {
@@ -166,7 +166,7 @@ namespace v2rayN.Handler
                 {
                     return -1;
                 }
-                JsonUtile.ToFile(v2rayConfig, fileName, false);
+                JsonUtils.ToFile(v2rayConfig, fileName, false);
             }
             return 0;
         }

v2rayN/v2rayN/Handler/CoreConfigSingbox.cs

@@ -1,6 +1,6 @@
 using System.Net;
 using System.Net.NetworkInformation;
-using v2rayN.Model;
+using v2rayN.Models;
 using v2rayN.Resx;
 
 namespace v2rayN.Handler
@@ -28,14 +28,14 @@ namespace v2rayN.Handler
 
                 msg = ResUI.InitialConfiguration;
 
-                string result = Utile.GetEmbedText(Global.SingboxSampleClient);
-                if (Utile.IsNullOrEmpty(result))
+                string result = Utils.GetEmbedText(Global.SingboxSampleClient);
+                if (Utils.IsNullOrEmpty(result))
                 {
                     msg = ResUI.FailedGetDefaultConfiguration;
                     return -1;
                 }
 
-                singboxConfig = JsonUtile.Deserialize<SingboxConfig>(result);
+                singboxConfig = JsonUtils.Deserialize<SingboxConfig>(result);
                 if (singboxConfig == null)
                 {
                     msg = ResUI.FailedGenDefaultConfiguration;
@@ -54,7 +54,9 @@ namespace v2rayN.Handler
 
                 GenDns(node, singboxConfig);
 
-                GenStatistic(singboxConfig);
+                GenExperimental(singboxConfig);
+
+                ConvertGeo2Ruleset(singboxConfig);
 
                 msg = string.Format(ResUI.SuccessfulConfiguration, "");
             }
@@ -95,7 +97,7 @@ namespace v2rayN.Handler
                 if (_config.coreBasicItem.logEnabled)
                 {
                     var dtNow = DateTime.Now;
-                    singboxConfig.log.output = Utile.GetLogPath($"sbox_{dtNow:yyyy-MM-dd}.txt");
+                    singboxConfig.log.output = Utils.GetLogPath($"sbox_{dtNow:yyyy-MM-dd}.txt");
                 }
             }
             catch (Exception ex)
@@ -109,50 +111,51 @@ namespace v2rayN.Handler
         {
             try
             {
-                singboxConfig.inbounds.Clear();
+                var listen = "::";
+                singboxConfig.inbounds = [];
 
                 if (!_config.tunModeItem.enableTun || (_config.tunModeItem.enableTun && _config.tunModeItem.enableExInbound))
                 {
                     var inbound = new Inbound4Sbox()
                     {
-                        type = Global.InboundSocks,
-                        tag = Global.InboundSocks,
+                        type = EInboundProtocol.socks.ToString(),
+                        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 = Utile.IsNullOrEmpty(_config.routingBasicItem.domainStrategy4Singbox) ? null : _config.routingBasicItem.domainStrategy4Singbox;
+                    inbound.domain_strategy = Utils.IsNullOrEmpty(_config.routingBasicItem.domainStrategy4Singbox) ? null : _config.routingBasicItem.domainStrategy4Singbox;
 
                     if (_config.routingBasicItem.enableRoutingAdvanced)
                     {
                         var routing = ConfigHandler.GetDefaultRouting(_config);
-                        if (!Utile.IsNullOrEmpty(routing.domainStrategy4Singbox))
+                        if (!Utils.IsNullOrEmpty(routing.domainStrategy4Singbox))
                         {
                             inbound.domain_strategy = routing.domainStrategy4Singbox;
                         }
                     }
 
                     //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);
-                            inbound3.listen = "::";
+                            var inbound3 = GetInbound(inbound, EInboundProtocol.socks2, true);
+                            inbound3.listen = listen;
                             singboxConfig.inbounds.Add(inbound3);
 
-                            var inbound4 = GetInbound(inbound, Global.InboundHttp2, 3, false);
-                            inbound4.listen = "::";
+                            var inbound4 = GetInbound(inbound, EInboundProtocol.http2, false);
+                            inbound4.listen = listen;
                             singboxConfig.inbounds.Add(inbound4);
 
                             //auth
-                            if (!Utile.IsNullOrEmpty(_config.inbound[0].user) && !Utile.IsNullOrEmpty(_config.inbound[0].pass))
+                            if (!Utils.IsNullOrEmpty(_config.inbound[0].user) && !Utils.IsNullOrEmpty(_config.inbound[0].pass))
                             {
                                 inbound3.users = new() { new() { username = _config.inbound[0].user, password = _config.inbound[0].pass } };
                                 inbound4.users = new() { new() { username = _config.inbound[0].user, password = _config.inbound[0].pass } };
@@ -160,8 +163,8 @@ namespace v2rayN.Handler
                         }
                         else
                         {
-                            inbound.listen = "::";
-                            inbound2.listen = "::";
+                            inbound.listen = listen;
+                            inbound2.listen = listen;
                         }
                     }
                 }
@@ -170,14 +173,14 @@ namespace v2rayN.Handler
                 {
                     if (_config.tunModeItem.mtu <= 0)
                     {
-                        _config.tunModeItem.mtu = Utile.ToInt(Global.TunMtus[0]);
+                        _config.tunModeItem.mtu = Utils.ToInt(Global.TunMtus[0]);
                     }
-                    if (Utile.IsNullOrEmpty(_config.tunModeItem.stack))
+                    if (Utils.IsNullOrEmpty(_config.tunModeItem.stack))
                     {
                         _config.tunModeItem.stack = Global.TunStacks[0];
                     }
 
-                    var tunInbound = JsonUtile.Deserialize<Inbound4Sbox>(Utile.GetEmbedText(Global.TunSingboxInboundFileName)) ?? new Inbound4Sbox { };
+                    var tunInbound = JsonUtils.Deserialize<Inbound4Sbox>(Utils.GetEmbedText(Global.TunSingboxInboundFileName)) ?? new Inbound4Sbox { };
                     tunInbound.mtu = _config.tunModeItem.mtu;
                     tunInbound.strict_route = _config.tunModeItem.strictRoute;
                     tunInbound.stack = _config.tunModeItem.stack;
@@ -198,12 +201,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 = JsonUtile.DeepCopy(inItem);
-            inbound.tag = tag;
-            inbound.listen_port = inItem.listen_port + offset;
-            inbound.type = bSocks ? Global.InboundSocks : Global.InboundHttp;
+            var inbound = JsonUtils.DeepCopy(inItem);
+            inbound.tag = protocol.ToString();
+            inbound.listen_port = inItem.listen_port + (int)protocol;
+            inbound.type = bSocks ? EInboundProtocol.socks.ToString() : EInboundProtocol.http.ToString();
             return inbound;
         }
 
@@ -213,113 +216,111 @@ namespace v2rayN.Handler
             {
                 outbound.server = node.address;
                 outbound.server_port = node.port;
+                outbound.type = Global.ProtocolTypes[node.configType];
 
-                if (node.configType == EConfigType.VMess)
+                switch (node.configType)
                 {
-                    outbound.type = Global.ProtocolTypes[EConfigType.VMess];
-
-                    outbound.uuid = node.id;
-                    outbound.alter_id = node.alterId;
-                    if (Global.VmessSecurities.Contains(node.security))
-                    {
-                        outbound.security = node.security;
-                    }
-                    else
-                    {
-                        outbound.security = Global.DefaultSecurity;
-                    }
-
-                    GenOutboundMux(node, outbound);
-                }
-                else if (node.configType == EConfigType.Shadowsocks)
-                {
-                    outbound.type = Global.ProtocolTypes[EConfigType.Shadowsocks];
-
-                    outbound.method = LazyConfig.Instance.GetShadowsocksSecurities(node).Contains(node.security) ? node.security : Global.None;
-                    outbound.password = node.id;
-
-                    if (node.network == Global.DefaultNetwork
-                        && node.headerType == Global.TcpHeaderHttp
-                        && node.requestHost.IsNullOrEmpty() == false)
-                    {
-                        outbound.plugin = "obfs-local";
-                        outbound.plugin_opts = $"obfs=http;obfs-host={node.requestHost};";
-                    }
-
-                    GenOutboundMux(node, outbound);
-                }
-                else if (node.configType == EConfigType.Socks)
-                {
-                    outbound.type = Global.ProtocolTypes[EConfigType.Socks];
-
-                    outbound.version = "5";
-                    if (!Utile.IsNullOrEmpty(node.security)
-                      && !Utile.IsNullOrEmpty(node.id))
-                    {
-                        outbound.username = node.security;
-                        outbound.password = node.id;
-                    }
-                }
-                else if (node.configType == EConfigType.VLESS)
-                {
-                    outbound.type = Global.ProtocolTypes[EConfigType.VLESS];
-
-                    outbound.uuid = node.id;
-
-                    outbound.packet_encoding = "xudp";
-
-                    if (Utile.IsNullOrEmpty(node.flow))
-                    {
-                        GenOutboundMux(node, outbound);
-                    }
-                    else
-                    {
-                        outbound.flow = node.flow;
-                    }
-                }
-                else if (node.configType == EConfigType.Trojan)
-                {
-                    outbound.type = Global.ProtocolTypes[EConfigType.Trojan];
-
-                    outbound.password = node.id;
-
-                    GenOutboundMux(node, outbound);
-                }
-                else if (node.configType == EConfigType.Hysteria2)
-                {
-                    outbound.type = Global.ProtocolTypes[EConfigType.Hysteria2];
-
-                    outbound.password = node.id;
-
-                    if (!Utile.IsNullOrEmpty(node.path))
-                    {
-                        outbound.obfs = new()
+                    case EConfigType.VMess:
                         {
-                            type = "salamander",
-                            password = node.path.TrimEx(),
-                        };
-                    }
+                            outbound.uuid = node.id;
+                            outbound.alter_id = node.alterId;
+                            if (Global.VmessSecurities.Contains(node.security))
+                            {
+                                outbound.security = node.security;
+                            }
+                            else
+                            {
+                                outbound.security = Global.DefaultSecurity;
+                            }
 
-                    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;
-                }
-                else if (node.configType == EConfigType.Tuic)
-                {
-                    outbound.type = Global.ProtocolTypes[EConfigType.Tuic];
+                            GenOutboundMux(node, outbound);
+                            break;
+                        }
+                    case EConfigType.Shadowsocks:
+                        {
+                            outbound.method = LazyConfig.Instance.GetShadowsocksSecurities(node).Contains(node.security) ? node.security : Global.None;
+                            outbound.password = node.id;
 
-                    outbound.uuid = node.id;
-                    outbound.password = node.security;
-                    outbound.congestion_control = node.headerType;
-                }
-                else if (node.configType == EConfigType.Wireguard)
-                {
-                    outbound.type = Global.ProtocolTypes[EConfigType.Wireguard];
+                            GenOutboundMux(node, outbound);
+                            break;
+                        }
+                    case EConfigType.Socks:
+                        {
+                            outbound.version = "5";
+                            if (!Utils.IsNullOrEmpty(node.security)
+                              && !Utils.IsNullOrEmpty(node.id))
+                            {
+                                outbound.username = node.security;
+                                outbound.password = node.id;
+                            }
+                            break;
+                        }
+                    case EConfigType.Http:
+                        {
+                            if (!Utils.IsNullOrEmpty(node.security)
+                              && !Utils.IsNullOrEmpty(node.id))
+                            {
+                                outbound.username = node.security;
+                                outbound.password = node.id;
+                            }
+                            break;
+                        }
+                    case EConfigType.VLESS:
+                        {
+                            outbound.uuid = node.id;
 
-                    outbound.private_key = node.id;
-                    outbound.peer_public_key = node.publicKey;
-                    outbound.reserved = Utile.String2List(node.path).Select(int.Parse).ToArray();
-                    outbound.local_address = [.. Utile.String2List(node.requestHost)];
-                    outbound.mtu = Utile.ToInt(node.shortId.IsNullOrEmpty() ? Global.TunMtus.FirstOrDefault() : node.shortId);
+                            outbound.packet_encoding = "xudp";
+
+                            if (Utils.IsNullOrEmpty(node.flow))
+                            {
+                                GenOutboundMux(node, outbound);
+                            }
+                            else
+                            {
+                                outbound.flow = node.flow;
+                            }
+                            break;
+                        }
+                    case EConfigType.Trojan:
+                        {
+                            outbound.password = node.id;
+
+                            GenOutboundMux(node, outbound);
+                            break;
+                        }
+                    case EConfigType.Hysteria2:
+                        {
+                            outbound.password = node.id;
+
+                            if (!Utils.IsNullOrEmpty(node.path))
+                            {
+                                outbound.obfs = new()
+                                {
+                                    type = "salamander",
+                                    password = node.path.TrimEx(),
+                                };
+                            }
+
+                            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;
+                            break;
+                        }
+                    case EConfigType.Tuic:
+                        {
+                            outbound.uuid = node.id;
+                            outbound.password = node.security;
+                            outbound.congestion_control = node.headerType;
+                            break;
+                        }
+                    case EConfigType.Wireguard:
+                        {
+                            outbound.private_key = node.id;
+                            outbound.peer_public_key = node.publicKey;
+                            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);
+                            break;
+                        }
                 }
 
                 GenOutboundTls(node, outbound);
@@ -337,16 +338,16 @@ namespace v2rayN.Handler
         {
             try
             {
-                //if (_config.coreBasicItem.muxEnabled)
-                //{
-                //    var mux = new Multiplex4Sbox()
-                //    {
-                //        enabled = true,
-                //        protocol = _config.mux4SboxItem.protocol,
-                //        max_connections = _config.mux4SboxItem.max_connections,
-                //    };
-                //    outbound.multiplex = mux;
-                //}
+                if (_config.coreBasicItem.muxEnabled && !Utils.IsNullOrEmpty(_config.mux4SboxItem.protocol))
+                {
+                    var mux = new Multiplex4Sbox()
+                    {
+                        enabled = true,
+                        protocol = _config.mux4SboxItem.protocol,
+                        max_connections = _config.mux4SboxItem.max_connections,
+                    };
+                    outbound.multiplex = mux;
+                }
             }
             catch (Exception ex)
             {
@@ -362,22 +363,22 @@ 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 = Utile.String2List(node.requestHost)[0];
+                        server_name = Utils.String2List(node.requestHost)[0];
                     }
                     var tls = new Tls4Sbox()
                     {
                         enabled = true,
                         server_name = server_name,
-                        insecure = Utile.ToBool(node.allowInsecure.IsNullOrEmpty() ? _config.coreBasicItem.defAllowInsecure.ToString().ToLower() : node.allowInsecure),
+                        insecure = Utils.ToBool(node.allowInsecure.IsNullOrEmpty() ? _config.coreBasicItem.defAllowInsecure.ToString().ToLower() : node.allowInsecure),
                         alpn = node.GetAlpn(),
                     };
-                    if (!Utile.IsNullOrEmpty(node.fingerprint))
+                    if (!Utils.IsNullOrEmpty(node.fingerprint))
                     {
                         tls.utls = new Utls4Sbox()
                         {
@@ -413,16 +414,33 @@ namespace v2rayN.Handler
 
                 switch (node.GetNetwork())
                 {
-                    case "h2":
-                        transport.type = "http";
-                        transport.host = Utile.IsNullOrEmpty(node.requestHost) ? null : Utile.String2List(node.requestHost);
-                        transport.path = Utile.IsNullOrEmpty(node.path) ? null : node.path;
+                    case nameof(ETransport.h2):
+                        transport.type = nameof(ETransport.http);
+                        transport.host = Utils.IsNullOrEmpty(node.requestHost) ? null : Utils.String2List(node.requestHost);
+                        transport.path = Utils.IsNullOrEmpty(node.path) ? null : node.path;
                         break;
 
-                    case "ws":
-                        transport.type = "ws";
-                        transport.path = Utile.IsNullOrEmpty(node.path) ? null : node.path;
-                        if (!Utile.IsNullOrEmpty(node.requestHost))
+                    case nameof(ETransport.tcp):   //http
+                        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))
                         {
                             transport.headers = new()
                             {
@@ -431,12 +449,19 @@ namespace v2rayN.Handler
                         }
                         break;
 
-                    case "quic":
-                        transport.type = "quic";
+                    case nameof(ETransport.httpupgrade):
+                        transport.type = nameof(ETransport.httpupgrade);
+                        transport.path = Utils.IsNullOrEmpty(node.path) ? null : node.path;
+                        transport.host = Utils.IsNullOrEmpty(node.requestHost) ? null : node.requestHost;
+
                         break;
 
-                    case "grpc":
-                        transport.type = "grpc";
+                    case nameof(ETransport.quic):
+                        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,11 +469,12 @@ namespace v2rayN.Handler
                         break;
 
                     default:
-                        transport = null;
                         break;
                 }
-
-                outbound.transport = transport;
+                if (transport.type != null)
+                {
+                    outbound.transport = transport;
+                }
             }
             catch (Exception ex)
             {
@@ -473,14 +499,14 @@ namespace v2rayN.Handler
 
                 //current proxy
                 var outbound = singboxConfig.outbounds[0];
-                var txtOutbound = Utile.GetEmbedText(Global.SingboxSampleOutbound);
+                var txtOutbound = Utils.GetEmbedText(Global.SingboxSampleOutbound);
 
                 //Previous proxy
                 var prevNode = LazyConfig.Instance.GetProfileItemViaRemarks(subItem.prevProfile!);
                 if (prevNode is not null
                     && prevNode.configType != EConfigType.Custom)
                 {
-                    var prevOutbound = JsonUtile.Deserialize<Outbound4Sbox>(txtOutbound);
+                    var prevOutbound = JsonUtils.Deserialize<Outbound4Sbox>(txtOutbound);
                     GenOutbound(prevNode, prevOutbound);
                     prevOutbound.tag = $"{Global.ProxyTag}2";
                     singboxConfig.outbounds.Add(prevOutbound);
@@ -493,7 +519,7 @@ namespace v2rayN.Handler
                 if (nextNode is not null
                     && nextNode.configType != EConfigType.Custom)
                 {
-                    var nextOutbound = JsonUtile.Deserialize<Outbound4Sbox>(txtOutbound);
+                    var nextOutbound = JsonUtils.Deserialize<Outbound4Sbox>(txtOutbound);
                     GenOutbound(nextNode, nextOutbound);
                     nextOutbound.tag = Global.ProxyTag;
                     singboxConfig.outbounds.Insert(0, nextOutbound);
@@ -514,24 +540,38 @@ namespace v2rayN.Handler
         {
             try
             {
+                var dnsOutbound = "dns_out";
+                if (!_config.inbound[0].sniffingEnabled)
+                {
+                    singboxConfig.route.rules.Add(new()
+                    {
+                        port = [53],
+                        network = "udp",
+                        outbound = dnsOutbound
+                    });
+                }
+
                 if (_config.tunModeItem.enableTun)
                 {
                     singboxConfig.route.auto_detect_interface = true;
 
-                    var tunRules = JsonUtile.Deserialize<List<Rule4Sbox>>(Utile.GetEmbedText(Global.TunSingboxRulesFileName));
-                    singboxConfig.route.rules.AddRange(tunRules);
+                    var tunRules = JsonUtils.Deserialize<List<Rule4Sbox>>(Utils.GetEmbedText(Global.TunSingboxRulesFileName));
+                    if (tunRules != null)
+                    {
+                        singboxConfig.route.rules.AddRange(tunRules);
+                    }
 
                     GenRoutingDirectExe(out List<string> lstDnsExe, out List<string> lstDirectExe);
                     singboxConfig.route.rules.Add(new()
                     {
                         port = new() { 53 },
-                        outbound = "dns_out",
+                        outbound = dnsOutbound,
                         process_name = lstDnsExe
                     });
 
                     singboxConfig.route.rules.Add(new()
                     {
-                        outbound = "direct",
+                        outbound = Global.DirectTag,
                         process_name = lstDirectExe
                     });
                 }
@@ -541,7 +581,7 @@ namespace v2rayN.Handler
                     var routing = ConfigHandler.GetDefaultRouting(_config);
                     if (routing != null)
                     {
-                        var rules = JsonUtile.Deserialize<List<RulesItem>>(routing.ruleSet);
+                        var rules = JsonUtils.Deserialize<List<RulesItem>>(routing.ruleSet);
                         foreach (var item in rules!)
                         {
                             if (item.enabled)
@@ -556,7 +596,7 @@ namespace v2rayN.Handler
                     var lockedItem = ConfigHandler.GetLockedRoutingItem(_config);
                     if (lockedItem != null)
                     {
-                        var rules = JsonUtile.Deserialize<List<RulesItem>>(lockedItem.ruleSet);
+                        var rules = JsonUtils.Deserialize<List<RulesItem>>(lockedItem.ruleSet);
                         foreach (var item in rules!)
                         {
                             GenRoutingUserRule(item, singboxConfig.route.rules);
@@ -611,7 +651,7 @@ namespace v2rayN.Handler
                     outbound = item.outboundTag,
                 };
 
-                if (!Utile.IsNullOrEmpty(item.port))
+                if (!Utils.IsNullOrEmpty(item.port))
                 {
                     if (item.port.Contains("-"))
                     {
@@ -619,7 +659,7 @@ namespace v2rayN.Handler
                     }
                     else
                     {
-                        rule.port = new List<int> { Utile.ToInt(item.port) };
+                        rule.port = new List<int> { Utils.ToInt(item.port) };
                     }
                 }
                 if (item.protocol?.Count > 0)
@@ -630,28 +670,37 @@ namespace v2rayN.Handler
                 {
                     rule.inbound = item.inboundTag;
                 }
-                var rule2 = JsonUtile.DeepCopy(rule);
-                var rule3 = JsonUtile.DeepCopy(rule);
+                var rule1 = JsonUtils.DeepCopy(rule);
+                var rule2 = JsonUtils.DeepCopy(rule);
+                var rule3 = JsonUtils.DeepCopy(rule);
 
                 var hasDomainIp = false;
                 if (item.domain?.Count > 0)
                 {
+                    var countDomain = 0;
                     foreach (var it in item.domain)
                     {
-                        ParseV2Domain(it, rule);
+                        if (ParseV2Domain(it, rule1)) countDomain++;
+                    }
+                    if (countDomain > 0)
+                    {
+                        rules.Add(rule1);
+                        hasDomainIp = true;
                     }
-                    rules.Add(rule);
-                    hasDomainIp = true;
                 }
 
                 if (item.ip?.Count > 0)
                 {
+                    var countIp = 0;
                     foreach (var it in item.ip)
                     {
-                        ParseV2Address(it, rule2);
+                        if (ParseV2Address(it, rule2)) countIp++;
+                    }
+                    if (countIp > 0)
+                    {
+                        rules.Add(rule2);
+                        hasDomainIp = true;
                     }
-                    rules.Add(rule2);
-                    hasDomainIp = true;
                 }
 
                 if (_config.tunModeItem.enableTun && item.process?.Count > 0)
@@ -661,7 +710,8 @@ namespace v2rayN.Handler
                     hasDomainIp = true;
                 }
 
-                if (!hasDomainIp)
+                if (!hasDomainIp
+                    && (rule.port != null || rule.port_range != null || rule.protocol != null || rule.inbound != null))
                 {
                     rules.Add(rule);
                 }
@@ -673,11 +723,11 @@ namespace v2rayN.Handler
             return 0;
         }
 
-        private void ParseV2Domain(string domain, Rule4Sbox rule)
+        private bool ParseV2Domain(string domain, Rule4Sbox rule)
         {
             if (domain.StartsWith("#") || domain.StartsWith("ext:") || domain.StartsWith("ext-domain:"))
             {
-                return;
+                return false;
             }
             else if (domain.StartsWith("geosite:"))
             {
@@ -711,17 +761,22 @@ namespace v2rayN.Handler
                 rule.domain_keyword ??= [];
                 rule.domain_keyword?.Add(domain);
             }
+            return true;
         }
 
-        private void ParseV2Address(string address, Rule4Sbox rule)
+        private bool ParseV2Address(string address, Rule4Sbox rule)
         {
             if (address.StartsWith("ext:") || address.StartsWith("ext-ip:"))
             {
-                return;
+                return false;
             }
             else if (address.StartsWith("geoip:!"))
             {
-                return;
+                return false;
+            }
+            else if (address.Equals("geoip:private"))
+            {
+                rule.ip_is_private = true;
             }
             else if (address.StartsWith("geoip:"))
             {
@@ -733,56 +788,32 @@ namespace v2rayN.Handler
                 if (rule.ip_cidr is null) { rule.ip_cidr = new(); }
                 rule.ip_cidr?.Add(address);
             }
+            return true;
         }
 
         private int GenDns(ProfileItem node, SingboxConfig singboxConfig)
         {
             try
             {
-                Dns4Sbox? dns4Sbox;
+                var item = LazyConfig.Instance.GetDNSItem(ECoreType.sing_box);
+                var strDNS = string.Empty;
                 if (_config.tunModeItem.enableTun)
                 {
-                    var item = LazyConfig.Instance.GetDNSItem(ECoreType.sing_box);
-                    var tunDNS = item?.tunDNS;
-                    if (string.IsNullOrWhiteSpace(tunDNS))
-                    {
-                        tunDNS = Utile.GetEmbedText(Global.TunSingboxDNSFileName);
-                    }
-                    dns4Sbox = JsonUtile.Deserialize<Dns4Sbox>(tunDNS);
+                    strDNS = Utils.IsNullOrEmpty(item?.tunDNS) ? Utils.GetEmbedText(Global.TunSingboxDNSFileName) : item?.tunDNS;
                 }
                 else
                 {
-                    var item = LazyConfig.Instance.GetDNSItem(ECoreType.sing_box);
-                    var normalDNS = item?.normalDNS;
-                    if (string.IsNullOrWhiteSpace(normalDNS))
-                    {
-                        normalDNS = "{\"servers\":[{\"address\":\"tcp://8.8.8.8\"}]}";
-                    }
-
-                    dns4Sbox = JsonUtile.Deserialize<Dns4Sbox>(normalDNS);
+                    strDNS = Utils.IsNullOrEmpty(item?.normalDNS) ? Utils.GetEmbedText(Global.DNSSingboxNormalFileName) : item?.normalDNS;
                 }
+
+                var dns4Sbox = JsonUtils.Deserialize<Dns4Sbox>(strDNS);
                 if (dns4Sbox is null)
                 {
                     return 0;
                 }
-                //Add the dns of the remote server domain
-                if (dns4Sbox.rules is null)
-                {
-                    dns4Sbox.rules = new();
-                }
-                dns4Sbox.servers.Add(new()
-                {
-                    tag = "local_local",
-                    address = "223.5.5.5",
-                    detour = "direct"
-                });
-                dns4Sbox.rules.Add(new()
-                {
-                    server = "local_local",
-                    outbound = "any"
-                });
-
                 singboxConfig.dns = dns4Sbox;
+
+                GenDnsDomains(singboxConfig);
             }
             catch (Exception ex)
             {
@@ -791,30 +822,135 @@ namespace v2rayN.Handler
             return 0;
         }
 
-        private int GenStatistic(SingboxConfig singboxConfig)
+        private int GenDnsDomains(SingboxConfig singboxConfig)
+        {
+            var dns4Sbox = singboxConfig.dns ?? new();
+            dns4Sbox.servers ??= [];
+            dns4Sbox.rules ??= [];
+
+            var lstDomain = singboxConfig.outbounds
+                           .Where(t => !Utils.IsNullOrEmpty(t.server) && Utils.IsDomain(t.server))
+                           .Select(t => t.server)
+                           .ToList();
+            if (lstDomain != null && lstDomain.Count > 0)
+            {
+                var tag = "local_local";
+                dns4Sbox.servers.Insert(0, new()
+                {
+                    tag = tag,
+                    address = "223.5.5.5",
+                    detour = Global.DirectTag,
+                });
+                dns4Sbox.rules.Insert(0, new()
+                {
+                    server = tag,
+                    domain = lstDomain
+                });
+            }
+            singboxConfig.dns = dns4Sbox;
+            return 0;
+        }
+
+        private int GenExperimental(SingboxConfig singboxConfig)
         {
             if (_config.guiItem.enableStatistics)
             {
-                singboxConfig.experimental = new Experimental4Sbox()
+                singboxConfig.experimental ??= new Experimental4Sbox();
+                singboxConfig.experimental.clash_api = new Clash_Api4Sbox()
                 {
-                    //cache_file = new CacheFile4Sbox()
-                    //{
-                    //    enabled = true
-                    //},
-                    //v2ray_api = new V2ray_Api4Sbox()
-                    //{
-                    //    listen = $"{Global.Loopback}:{Global.StatePort}",
-                    //    stats = new Stats4Sbox()
-                    //    {
-                    //        enabled = true,
-                    //    }
-                    //},
-                    clash_api = new Clash_Api4Sbox()
-                    {
-                        external_controller = $"{Global.Loopback}:{LazyConfig.Instance.StatePort}",
-                    }
+                    external_controller = $"{Global.Loopback}:{LazyConfig.Instance.StatePort}",
                 };
             }
+
+            if (_config.coreBasicItem.enableCacheFile4Sbox)
+            {
+                singboxConfig.experimental ??= new Experimental4Sbox();
+                singboxConfig.experimental.cache_file = new CacheFile4Sbox()
+                {
+                    enabled = true
+                };
+            }
+
+            return 0;
+        }
+
+        private int ConvertGeo2Ruleset(SingboxConfig singboxConfig)
+        {
+            var geosite = "geosite";
+            var geoip = "geoip";
+            var ruleSets = new List<string>();
+
+            //convert route geosite & geoip to ruleset
+            foreach (var rule in singboxConfig.route.rules.Where(t => t.geosite?.Count > 0).ToList() ?? [])
+            {
+                rule.rule_set = rule?.geosite?.Select(t => $"{geosite}-{t}").ToList();
+                rule.geosite = null;
+                ruleSets.AddRange(rule.rule_set);
+            }
+            foreach (var rule in singboxConfig.route.rules.Where(t => t.geoip?.Count > 0).ToList() ?? [])
+            {
+                rule.rule_set = rule?.geoip?.Select(t => $"{geoip}-{t}").ToList();
+                rule.geoip = null;
+                ruleSets.AddRange(rule.rule_set);
+            }
+
+            //convert dns geosite & geoip to ruleset
+            foreach (var rule in singboxConfig.dns?.rules.Where(t => t.geosite?.Count > 0).ToList() ?? [])
+            {
+                rule.rule_set = rule?.geosite?.Select(t => $"{geosite}-{t}").ToList();
+                rule.geosite = null;
+            }
+            foreach (var rule in singboxConfig.dns?.rules.Where(t => t.geoip?.Count > 0).ToList() ?? [])
+            {
+                rule.rule_set = rule?.geoip?.Select(t => $"{geoip}-{t}").ToList();
+                rule.geoip = null;
+            }
+            foreach (var dnsRule in singboxConfig.dns?.rules.Where(t => t.rule_set?.Count > 0).ToList() ?? [])
+            {
+                ruleSets.AddRange(dnsRule.rule_set);
+            }
+
+            //load custom ruleset file
+            List<Ruleset4Sbox> customRulesets = [];
+            if (_config.routingBasicItem.enableRoutingAdvanced)
+            {
+                var routing = ConfigHandler.GetDefaultRouting(_config);
+                if (!Utils.IsNullOrEmpty(routing.customRulesetPath4Singbox))
+                {
+                    var result = Utils.LoadResource(routing.customRulesetPath4Singbox);
+                    if (!Utils.IsNullOrEmpty(result))
+                    {
+                        customRulesets = (JsonUtils.Deserialize<List<Ruleset4Sbox>>(result) ?? [])
+                            .Where(t => t.tag != null)
+                            .Where(t => t.type != null)
+                            .Where(t => t.format != null)
+                            .ToList();
+                    }
+                }
+            }
+
+            //Add ruleset srs
+            singboxConfig.route.rule_set = [];
+            foreach (var item in new HashSet<string>(ruleSets))
+            {
+                var customRuleset = customRulesets.FirstOrDefault(t => t.tag != null && t.tag.Equals(item));
+                if (customRuleset != null)
+                {
+                    singboxConfig.route.rule_set.Add(customRuleset);
+                }
+                else
+                {
+                    singboxConfig.route.rule_set.Add(new()
+                    {
+                        type = "remote",
+                        format = "binary",
+                        tag = item,
+                        url = string.Format(Global.SingboxRulesetUrl, item.StartsWith(geosite) ? geosite : geoip, item),
+                        download_detour = Global.ProxyTag
+                    });
+                }
+            }
+
             return 0;
         }
 
@@ -835,15 +971,15 @@ namespace v2rayN.Handler
 
                 msg = ResUI.InitialConfiguration;
 
-                string result = Utile.GetEmbedText(Global.SingboxSampleClient);
-                string txtOutbound = Utile.GetEmbedText(Global.SingboxSampleOutbound);
-                if (Utile.IsNullOrEmpty(result) || txtOutbound.IsNullOrEmpty())
+                string result = Utils.GetEmbedText(Global.SingboxSampleClient);
+                string txtOutbound = Utils.GetEmbedText(Global.SingboxSampleOutbound);
+                if (Utils.IsNullOrEmpty(result) || txtOutbound.IsNullOrEmpty())
                 {
                     msg = ResUI.FailedGetDefaultConfiguration;
                     return -1;
                 }
 
-                singboxConfig = JsonUtile.Deserialize<SingboxConfig>(result);
+                singboxConfig = JsonUtils.Deserialize<SingboxConfig>(result);
                 if (singboxConfig == null)
                 {
                     msg = ResUI.FailedGenDefaultConfiguration;
@@ -863,11 +999,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)
                 {
@@ -882,7 +1018,7 @@ namespace v2rayN.Handler
                     if (it.configType is EConfigType.VMess or EConfigType.VLESS)
                     {
                         var item2 = LazyConfig.Instance.GetProfileItem(it.indexId);
-                        if (item2 is null || Utile.IsNullOrEmpty(item2.id) || !Utile.IsGuidByParse(item2.id))
+                        if (item2 is null || Utils.IsNullOrEmpty(item2.id) || !Utils.IsGuidByParse(item2.id))
                         {
                             continue;
                         }
@@ -919,9 +1055,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
@@ -941,7 +1077,7 @@ namespace v2rayN.Handler
                         continue;
                     }
 
-                    var outbound = JsonUtile.Deserialize<Outbound4Sbox>(txtOutbound);
+                    var outbound = JsonUtils.Deserialize<Outbound4Sbox>(txtOutbound);
                     GenOutbound(item, outbound);
                     outbound.tag = Global.ProxyTag + inbound.listen_port.ToString();
                     singboxConfig.outbounds.Add(outbound);
@@ -955,6 +1091,19 @@ namespace v2rayN.Handler
                     singboxConfig.route.rules.Add(rule);
                 }
 
+                GenDnsDomains(singboxConfig);
+                //var dnsServer = singboxConfig.dns?.servers.FirstOrDefault();
+                //if (dnsServer != null)
+                //{
+                //    dnsServer.detour = singboxConfig.route.rules.LastOrDefault()?.outbound;
+                //}
+                //var dnsRule = singboxConfig.dns?.rules.Where(t => t.outbound != null).FirstOrDefault();
+                //if (dnsRule != null)
+                //{
+                //    singboxConfig.dns.rules = [];
+                //    singboxConfig.dns.rules.Add(dnsRule);
+                //}
+
                 //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.Model;
+using v2rayN.Models;
 using v2rayN.Resx;
 
 namespace v2rayN.Handler
@@ -28,14 +28,14 @@ namespace v2rayN.Handler
 
                 msg = ResUI.InitialConfiguration;
 
-                string result = Utile.GetEmbedText(Global.V2raySampleClient);
-                if (Utile.IsNullOrEmpty(result))
+                string result = Utils.GetEmbedText(Global.V2raySampleClient);
+                if (Utils.IsNullOrEmpty(result))
                 {
                     msg = ResUI.FailedGetDefaultConfiguration;
                     return -1;
                 }
 
-                v2rayConfig = JsonUtile.Deserialize<V2rayConfig>(result);
+                v2rayConfig = JsonUtils.Deserialize<V2rayConfig>(result);
                 if (v2rayConfig == null)
                 {
                     msg = ResUI.FailedGenDefaultConfiguration;
@@ -77,8 +77,8 @@ namespace v2rayN.Handler
                 {
                     var dtNow = DateTime.Now;
                     v2rayConfig.log.loglevel = _config.coreBasicItem.loglevel;
-                    v2rayConfig.log.access = Utile.GetLogPath($"Vaccess_{dtNow:yyyy-MM-dd}.txt");
-                    v2rayConfig.log.error = Utile.GetLogPath($"Verror_{dtNow:yyyy-MM-dd}.txt");
+                    v2rayConfig.log.access = Utils.GetLogPath($"Vaccess_{dtNow:yyyy-MM-dd}.txt");
+                    v2rayConfig.log.error = Utils.GetLogPath($"Verror_{dtNow:yyyy-MM-dd}.txt");
                 }
                 else
                 {
@@ -98,29 +98,30 @@ namespace v2rayN.Handler
         {
             try
             {
-                v2rayConfig.inbounds = new List<Inbounds4Ray>();
+                var listen = "0.0.0.0";
+                v2rayConfig.inbounds = [];
 
-                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);
-                        inbound3.listen = "0.0.0.0";
+                        var inbound3 = GetInbound(_config.inbound[0], EInboundProtocol.socks2, true);
+                        inbound3.listen = listen;
                         v2rayConfig.inbounds.Add(inbound3);
 
-                        Inbounds4Ray inbound4 = GetInbound(_config.inbound[0], Global.InboundHttp2, 3, false);
-                        inbound4.listen = "0.0.0.0";
+                        var inbound4 = GetInbound(_config.inbound[0], EInboundProtocol.http2, false);
+                        inbound4.listen = listen;
                         v2rayConfig.inbounds.Add(inbound4);
 
                         //auth
-                        if (!Utile.IsNullOrEmpty(_config.inbound[0].user) && !Utile.IsNullOrEmpty(_config.inbound[0].pass))
+                        if (!Utils.IsNullOrEmpty(_config.inbound[0].user) && !Utils.IsNullOrEmpty(_config.inbound[0].pass))
                         {
                             inbound3.settings.auth = "password";
                             inbound3.settings.accounts = new List<AccountsItem4Ray> { new AccountsItem4Ray() { user = _config.inbound[0].user, pass = _config.inbound[0].pass } };
@@ -131,8 +132,8 @@ namespace v2rayN.Handler
                     }
                     else
                     {
-                        inbound.listen = "0.0.0.0";
-                        inbound2.listen = "0.0.0.0";
+                        inbound.listen = listen;
+                        inbound2.listen = listen;
                     }
                 }
             }
@@ -143,24 +144,25 @@ 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 = Utile.GetEmbedText(Global.V2raySampleInbound);
-            if (Utile.IsNullOrEmpty(result))
+            string result = Utils.GetEmbedText(Global.V2raySampleInbound);
+            if (Utils.IsNullOrEmpty(result))
             {
-                return null;
+                return new();
             }
 
-            var inbound = JsonUtile.Deserialize<Inbounds4Ray>(result);
+            var inbound = JsonUtils.Deserialize<Inbounds4Ray>(result);
             if (inbound == null)
             {
-                return null;
+                return new();
             }
-            inbound.tag = tag;
-            inbound.port = inItem.localPort + offset;
-            inbound.protocol = bSocks ? Global.InboundSocks : Global.InboundHttp;
+            inbound.tag = protocol.ToString();
+            inbound.port = inItem.localPort + (int)protocol;
+            inbound.protocol = bSocks ? EInboundProtocol.socks.ToString() : EInboundProtocol.http.ToString();
             inbound.settings.udp = inItem.udpEnabled;
             inbound.sniffing.enabled = inItem.sniffingEnabled;
+            inbound.sniffing.destOverride = inItem.destOverride;
             inbound.sniffing.routeOnly = inItem.routeOnly;
 
             return inbound;
@@ -173,23 +175,23 @@ namespace v2rayN.Handler
                 if (v2rayConfig.routing?.rules != null)
                 {
                     v2rayConfig.routing.domainStrategy = _config.routingBasicItem.domainStrategy;
-                    v2rayConfig.routing.domainMatcher = Utile.IsNullOrEmpty(_config.routingBasicItem.domainMatcher) ? null : _config.routingBasicItem.domainMatcher;
+                    v2rayConfig.routing.domainMatcher = Utils.IsNullOrEmpty(_config.routingBasicItem.domainMatcher) ? null : _config.routingBasicItem.domainMatcher;
 
                     if (_config.routingBasicItem.enableRoutingAdvanced)
                     {
                         var routing = ConfigHandler.GetDefaultRouting(_config);
                         if (routing != null)
                         {
-                            if (!Utile.IsNullOrEmpty(routing.domainStrategy))
+                            if (!Utils.IsNullOrEmpty(routing.domainStrategy))
                             {
                                 v2rayConfig.routing.domainStrategy = routing.domainStrategy;
                             }
-                            var rules = JsonUtile.Deserialize<List<RulesItem>>(routing.ruleSet);
+                            var rules = JsonUtils.Deserialize<List<RulesItem>>(routing.ruleSet);
                             foreach (var item in rules)
                             {
                                 if (item.enabled)
                                 {
-                                    var item2 = JsonUtile.Deserialize<RulesItem4Ray>(JsonUtile.Serialize(item));
+                                    var item2 = JsonUtils.Deserialize<RulesItem4Ray>(JsonUtils.Serialize(item));
                                     GenRoutingUserRule(item2, v2rayConfig);
                                 }
                             }
@@ -200,10 +202,10 @@ namespace v2rayN.Handler
                         var lockedItem = ConfigHandler.GetLockedRoutingItem(_config);
                         if (lockedItem != null)
                         {
-                            var rules = JsonUtile.Deserialize<List<RulesItem>>(lockedItem.ruleSet);
+                            var rules = JsonUtils.Deserialize<List<RulesItem>>(lockedItem.ruleSet);
                             foreach (var item in rules)
                             {
-                                var item2 = JsonUtile.Deserialize<RulesItem4Ray>(JsonUtile.Serialize(item));
+                                var item2 = JsonUtils.Deserialize<RulesItem4Ray>(JsonUtils.Serialize(item));
                                 GenRoutingUserRule(item2, v2rayConfig);
                             }
                         }
@@ -225,7 +227,7 @@ namespace v2rayN.Handler
                 {
                     return 0;
                 }
-                if (Utile.IsNullOrEmpty(rules.port))
+                if (Utils.IsNullOrEmpty(rules.port))
                 {
                     rules.port = null;
                 }
@@ -249,7 +251,7 @@ namespace v2rayN.Handler
                 var hasDomainIp = false;
                 if (rules.domain?.Count > 0)
                 {
-                    var it = JsonUtile.DeepCopy(rules);
+                    var it = JsonUtils.DeepCopy(rules);
                     it.ip = null;
                     it.type = "field";
                     for (int k = it.domain.Count - 1; k >= 0; k--)
@@ -265,7 +267,7 @@ namespace v2rayN.Handler
                 }
                 if (rules.ip?.Count > 0)
                 {
-                    var it = JsonUtile.DeepCopy(rules);
+                    var it = JsonUtils.DeepCopy(rules);
                     it.domain = null;
                     it.type = "field";
                     v2rayConfig.routing.rules.Add(it);
@@ -273,12 +275,12 @@ namespace v2rayN.Handler
                 }
                 if (!hasDomainIp)
                 {
-                    if (!Utile.IsNullOrEmpty(rules.port)
+                    if (!Utils.IsNullOrEmpty(rules.port)
                         || (rules.protocol?.Count > 0)
                         || (rules.inboundTag?.Count > 0)
                         )
                     {
-                        var it = JsonUtile.DeepCopy(rules);
+                        var it = JsonUtils.DeepCopy(rules);
                         it.type = "field";
                         v2rayConfig.routing.rules.Add(it);
                     }
@@ -295,182 +297,188 @@ namespace v2rayN.Handler
         {
             try
             {
-                if (node.configType == EConfigType.VMess)
+                switch (node.configType)
                 {
-                    VnextItem4Ray vnextItem;
-                    if (outbound.settings.vnext.Count <= 0)
-                    {
-                        vnextItem = new VnextItem4Ray();
-                        outbound.settings.vnext.Add(vnextItem);
-                    }
-                    else
-                    {
-                        vnextItem = outbound.settings.vnext[0];
-                    }
-                    vnextItem.address = node.address;
-                    vnextItem.port = node.port;
-
-                    UsersItem4Ray usersItem;
-                    if (vnextItem.users.Count <= 0)
-                    {
-                        usersItem = new UsersItem4Ray();
-                        vnextItem.users.Add(usersItem);
-                    }
-                    else
-                    {
-                        usersItem = vnextItem.users[0];
-                    }
-                    //远程服务器用户ID
-                    usersItem.id = node.id;
-                    usersItem.alterId = node.alterId;
-                    usersItem.email = Global.UserEMail;
-                    if (Global.VmessSecurities.Contains(node.security))
-                    {
-                        usersItem.security = node.security;
-                    }
-                    else
-                    {
-                        usersItem.security = Global.DefaultSecurity;
-                    }
-
-                    GenOutboundMux(node, outbound, _config.coreBasicItem.muxEnabled);
-
-                    outbound.protocol = Global.ProtocolTypes[EConfigType.VMess];
-                    outbound.settings.servers = null;
-                }
-                else if (node.configType == EConfigType.Shadowsocks)
-                {
-                    ServersItem4Ray serversItem;
-                    if (outbound.settings.servers.Count <= 0)
-                    {
-                        serversItem = new ServersItem4Ray();
-                        outbound.settings.servers.Add(serversItem);
-                    }
-                    else
-                    {
-                        serversItem = outbound.settings.servers[0];
-                    }
-                    serversItem.address = node.address;
-                    serversItem.port = node.port;
-                    serversItem.password = node.id;
-                    serversItem.method = LazyConfig.Instance.GetShadowsocksSecurities(node).Contains(node.security) ? node.security : "none";
-
-                    serversItem.ota = false;
-                    serversItem.level = 1;
-
-                    GenOutboundMux(node, outbound, false);
-
-                    outbound.protocol = Global.ProtocolTypes[EConfigType.Shadowsocks];
-                    outbound.settings.vnext = null;
-                }
-                else if (node.configType == EConfigType.Socks)
-                {
-                    ServersItem4Ray serversItem;
-                    if (outbound.settings.servers.Count <= 0)
-                    {
-                        serversItem = new ServersItem4Ray();
-                        outbound.settings.servers.Add(serversItem);
-                    }
-                    else
-                    {
-                        serversItem = outbound.settings.servers[0];
-                    }
-                    serversItem.address = node.address;
-                    serversItem.port = node.port;
-                    serversItem.method = null;
-                    serversItem.password = null;
-
-                    if (!Utile.IsNullOrEmpty(node.security)
-                        && !Utile.IsNullOrEmpty(node.id))
-                    {
-                        SocksUsersItem4Ray socksUsersItem = new()
+                    case EConfigType.VMess:
                         {
-                            user = node.security,
-                            pass = node.id,
-                            level = 1
-                        };
+                            VnextItem4Ray vnextItem;
+                            if (outbound.settings.vnext.Count <= 0)
+                            {
+                                vnextItem = new VnextItem4Ray();
+                                outbound.settings.vnext.Add(vnextItem);
+                            }
+                            else
+                            {
+                                vnextItem = outbound.settings.vnext[0];
+                            }
+                            vnextItem.address = node.address;
+                            vnextItem.port = node.port;
 
-                        serversItem.users = new List<SocksUsersItem4Ray>() { socksUsersItem };
-                    }
+                            UsersItem4Ray usersItem;
+                            if (vnextItem.users.Count <= 0)
+                            {
+                                usersItem = new UsersItem4Ray();
+                                vnextItem.users.Add(usersItem);
+                            }
+                            else
+                            {
+                                usersItem = vnextItem.users[0];
+                            }
+                            //远程服务器用户ID
+                            usersItem.id = node.id;
+                            usersItem.alterId = node.alterId;
+                            usersItem.email = Global.UserEMail;
+                            if (Global.VmessSecurities.Contains(node.security))
+                            {
+                                usersItem.security = node.security;
+                            }
+                            else
+                            {
+                                usersItem.security = Global.DefaultSecurity;
+                            }
 
-                    GenOutboundMux(node, outbound, false);
+                            GenOutboundMux(node, outbound, _config.coreBasicItem.muxEnabled);
 
-                    outbound.protocol = Global.ProtocolTypes[EConfigType.Socks];
-                    outbound.settings.vnext = null;
-                }
-                else if (node.configType == EConfigType.VLESS)
-                {
-                    VnextItem4Ray vnextItem;
-                    if (outbound.settings.vnext.Count <= 0)
-                    {
-                        vnextItem = new VnextItem4Ray();
-                        outbound.settings.vnext.Add(vnextItem);
-                    }
-                    else
-                    {
-                        vnextItem = outbound.settings.vnext[0];
-                    }
-                    vnextItem.address = node.address;
-                    vnextItem.port = node.port;
-
-                    UsersItem4Ray usersItem;
-                    if (vnextItem.users.Count <= 0)
-                    {
-                        usersItem = new UsersItem4Ray();
-                        vnextItem.users.Add(usersItem);
-                    }
-                    else
-                    {
-                        usersItem = vnextItem.users[0];
-                    }
-                    usersItem.id = node.id;
-                    usersItem.email = Global.UserEMail;
-                    usersItem.encryption = node.security;
-
-                    GenOutboundMux(node, outbound, _config.coreBasicItem.muxEnabled);
-
-                    if (node.streamSecurity == Global.StreamSecurityReality
-                        || node.streamSecurity == Global.StreamSecurity)
-                    {
-                        if (!Utile.IsNullOrEmpty(node.flow))
+                            outbound.settings.servers = null;
+                            break;
+                        }
+                    case EConfigType.Shadowsocks:
                         {
-                            usersItem.flow = node.flow;
+                            ServersItem4Ray serversItem;
+                            if (outbound.settings.servers.Count <= 0)
+                            {
+                                serversItem = new ServersItem4Ray();
+                                outbound.settings.servers.Add(serversItem);
+                            }
+                            else
+                            {
+                                serversItem = outbound.settings.servers[0];
+                            }
+                            serversItem.address = node.address;
+                            serversItem.port = node.port;
+                            serversItem.password = node.id;
+                            serversItem.method = LazyConfig.Instance.GetShadowsocksSecurities(node).Contains(node.security) ? node.security : "none";
+
+                            serversItem.ota = false;
+                            serversItem.level = 1;
 
                             GenOutboundMux(node, outbound, false);
+
+                            outbound.settings.vnext = null;
+                            break;
                         }
-                    }
-                    if (node.streamSecurity == Global.StreamSecurityReality && Utile.IsNullOrEmpty(node.flow))
-                    {
-                        GenOutboundMux(node, outbound, _config.coreBasicItem.muxEnabled);
-                    }
+                    case EConfigType.Socks:
+                    case EConfigType.Http:
+                        {
+                            ServersItem4Ray serversItem;
+                            if (outbound.settings.servers.Count <= 0)
+                            {
+                                serversItem = new ServersItem4Ray();
+                                outbound.settings.servers.Add(serversItem);
+                            }
+                            else
+                            {
+                                serversItem = outbound.settings.servers[0];
+                            }
+                            serversItem.address = node.address;
+                            serversItem.port = node.port;
+                            serversItem.method = null;
+                            serversItem.password = null;
 
-                    outbound.protocol = Global.ProtocolTypes[EConfigType.VLESS];
-                    outbound.settings.servers = null;
+                            if (!Utils.IsNullOrEmpty(node.security)
+                                && !Utils.IsNullOrEmpty(node.id))
+                            {
+                                SocksUsersItem4Ray socksUsersItem = new()
+                                {
+                                    user = node.security,
+                                    pass = node.id,
+                                    level = 1
+                                };
+
+                                serversItem.users = new List<SocksUsersItem4Ray>() { socksUsersItem };
+                            }
+
+                            GenOutboundMux(node, outbound, false);
+
+                            outbound.settings.vnext = null;
+                            break;
+                        }
+                    case EConfigType.VLESS:
+                        {
+                            VnextItem4Ray vnextItem;
+                            if (outbound.settings.vnext?.Count <= 0)
+                            {
+                                vnextItem = new VnextItem4Ray();
+                                outbound.settings.vnext.Add(vnextItem);
+                            }
+                            else
+                            {
+                                vnextItem = outbound.settings.vnext[0];
+                            }
+                            vnextItem.address = node.address;
+                            vnextItem.port = node.port;
+
+                            UsersItem4Ray usersItem;
+                            if (vnextItem.users.Count <= 0)
+                            {
+                                usersItem = new UsersItem4Ray();
+                                vnextItem.users.Add(usersItem);
+                            }
+                            else
+                            {
+                                usersItem = vnextItem.users[0];
+                            }
+                            usersItem.id = node.id;
+                            usersItem.email = Global.UserEMail;
+                            usersItem.encryption = node.security;
+
+                            GenOutboundMux(node, outbound, _config.coreBasicItem.muxEnabled);
+
+                            if (node.streamSecurity == Global.StreamSecurityReality
+                                || node.streamSecurity == Global.StreamSecurity)
+                            {
+                                if (!Utils.IsNullOrEmpty(node.flow))
+                                {
+                                    usersItem.flow = node.flow;
+
+                                    GenOutboundMux(node, outbound, false);
+                                }
+                            }
+                            if (node.streamSecurity == Global.StreamSecurityReality && Utils.IsNullOrEmpty(node.flow))
+                            {
+                                GenOutboundMux(node, outbound, _config.coreBasicItem.muxEnabled);
+                            }
+
+                            outbound.settings.servers = null;
+                            break;
+                        }
+                    case EConfigType.Trojan:
+                        {
+                            ServersItem4Ray serversItem;
+                            if (outbound.settings.servers.Count <= 0)
+                            {
+                                serversItem = new ServersItem4Ray();
+                                outbound.settings.servers.Add(serversItem);
+                            }
+                            else
+                            {
+                                serversItem = outbound.settings.servers[0];
+                            }
+                            serversItem.address = node.address;
+                            serversItem.port = node.port;
+                            serversItem.password = node.id;
+
+                            serversItem.ota = false;
+                            serversItem.level = 1;
+
+                            GenOutboundMux(node, outbound, false);
+
+                            outbound.settings.vnext = null;
+                            break;
+                        }
                 }
-                else if (node.configType == EConfigType.Trojan)
-                {
-                    ServersItem4Ray serversItem;
-                    if (outbound.settings.servers.Count <= 0)
-                    {
-                        serversItem = new ServersItem4Ray();
-                        outbound.settings.servers.Add(serversItem);
-                    }
-                    else
-                    {
-                        serversItem = outbound.settings.servers[0];
-                    }
-                    serversItem.address = node.address;
-                    serversItem.port = node.port;
-                    serversItem.password = node.id;
 
-                    serversItem.ota = false;
-                    serversItem.level = 1;
-
-                    GenOutboundMux(node, outbound, false);
-
-                    outbound.protocol = Global.ProtocolTypes[EConfigType.Trojan];
-                    outbound.settings.vnext = null;
-                }
+                outbound.protocol = Global.ProtocolTypes[node.configType];
                 GenBoundStreamSettings(node, outbound.streamSettings);
             }
             catch (Exception ex)
@@ -529,17 +537,17 @@ namespace v2rayN.Handler
 
                     TlsSettings4Ray tlsSettings = new()
                     {
-                        allowInsecure = Utile.ToBool(node.allowInsecure.IsNullOrEmpty() ? _config.coreBasicItem.defAllowInsecure.ToString().ToLower() : node.allowInsecure),
+                        allowInsecure = Utils.ToBool(node.allowInsecure.IsNullOrEmpty() ? _config.coreBasicItem.defAllowInsecure.ToString().ToLower() : node.allowInsecure),
                         alpn = node.GetAlpn(),
                         fingerprint = node.fingerprint.IsNullOrEmpty() ? _config.coreBasicItem.defFingerprint : node.fingerprint
                     };
-                    if (!string.IsNullOrWhiteSpace(sni))
+                    if (!Utils.IsNullOrEmpty(sni))
                     {
                         tlsSettings.serverName = sni;
                     }
-                    else if (!string.IsNullOrWhiteSpace(host))
+                    else if (!Utils.IsNullOrEmpty(host))
                     {
-                        tlsSettings.serverName = Utile.String2List(host)[0];
+                        tlsSettings.serverName = Utils.String2List(host)[0];
                     }
                     streamSettings.tlsSettings = tlsSettings;
                 }
@@ -564,7 +572,7 @@ namespace v2rayN.Handler
                 //streamSettings
                 switch (node.GetNetwork())
                 {
-                    case "kcp":
+                    case nameof(ETransport.kcp):
                         KcpSettings4Ray kcpSettings = new()
                         {
                             mtu = _config.kcpItem.mtu,
@@ -581,39 +589,54 @@ namespace v2rayN.Handler
                         {
                             type = node.headerType
                         };
-                        if (!Utile.IsNullOrEmpty(node.path))
+                        if (!Utils.IsNullOrEmpty(node.path))
                         {
                             kcpSettings.seed = node.path;
                         }
                         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 = Utile.String2List(host);
+                            httpSettings.host = Utils.String2List(host);
                         }
                         httpSettings.path = node.path;
 
@@ -621,7 +644,7 @@ namespace v2rayN.Handler
 
                         break;
                     //quic
-                    case "quic":
+                    case nameof(ETransport.quic):
                         QuicSettings4Ray quicsettings = new()
                         {
                             security = host,
@@ -634,7 +657,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,9 +668,10 @@ 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),
                             idle_timeout = _config.grpcItem.idle_timeout,
@@ -671,7 +695,7 @@ namespace v2rayN.Handler
                             };
 
                             //request Host
-                            string request = Utile.GetEmbedText(Global.V2raySampleHttpRequestFileName);
+                            string request = Utils.GetEmbedText(Global.V2raySampleHttpRequestFileName);
                             string[] arrHost = host.Split(',');
                             string host2 = string.Join("\",\"", arrHost);
                             request = request.Replace("$requestHost$", $"\"{host2}\"");
@@ -679,13 +703,13 @@ namespace v2rayN.Handler
                             request = request.Replace("$requestUserAgent$", $"\"{useragent}\"");
                             //Path
                             string pathHttp = @"/";
-                            if (!Utile.IsNullOrEmpty(node.path))
+                            if (!Utils.IsNullOrEmpty(node.path))
                             {
                                 string[] arrPath = node.path.Split(',');
                                 pathHttp = string.Join("\",\"", arrPath);
                             }
                             request = request.Replace("$requestPath$", $"\"{pathHttp}\"");
-                            tcpSettings.header.request = JsonUtile.Deserialize<object>(request);
+                            tcpSettings.header.request = JsonUtils.Deserialize<object>(request);
 
                             streamSettings.tcpSettings = tcpSettings;
                         }
@@ -706,20 +730,20 @@ 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";
+                    normalDNS = Utils.GetEmbedText(Global.DNSV2rayNormalFileName);
                 }
 
                 //Outbound Freedom domainStrategy
-                if (!string.IsNullOrWhiteSpace(domainStrategy4Freedom))
+                if (!Utils.IsNullOrEmpty(domainStrategy4Freedom))
                 {
                     var outbound = v2rayConfig.outbounds[1];
                     outbound.settings.domainStrategy = domainStrategy4Freedom;
                     outbound.settings.userLevel = 0;
                 }
 
-                var obj = JsonUtile.ParseJson(normalDNS);
+                var obj = JsonUtils.ParseJson(normalDNS);
                 if (obj is null)
                 {
                     List<string> servers = [];
@@ -728,14 +752,14 @@ namespace v2rayN.Handler
                     {
                         servers.Add(str);
                     }
-                    obj = JsonUtile.ParseJson("{}");
-                    obj["servers"] = JsonUtile.SerializeToNode(servers);
+                    obj = JsonUtils.ParseJson("{}");
+                    obj["servers"] = JsonUtils.SerializeToNode(servers);
                 }
 
                 // 追加至 dns 设置
                 if (item.useSystemHosts)
                 {
-                    var systemHosts = Utile.GetSystemHosts();
+                    var systemHosts = Utils.GetSystemHosts();
                     if (systemHosts.Count > 0)
                     {
                         var normalHost = obj["hosts"];
@@ -764,7 +788,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();
@@ -812,6 +836,33 @@ namespace v2rayN.Handler
 
         private int GenMoreOutbounds(ProfileItem node, V2rayConfig v2rayConfig)
         {
+            //fragment proxy
+            if (_config.coreBasicItem.enableFragment
+                && !Utils.IsNullOrEmpty(v2rayConfig.outbounds[0].streamSettings?.security))
+            {
+                var fragmentOutbound = new Outbounds4Ray
+                {
+                    protocol = "freedom",
+                    tag = $"{Global.ProxyTag}3",
+                    settings = new()
+                    {
+                        fragment = new()
+                        {
+                            packets = "tlshello",
+                            length = "100-200",
+                            interval = "10-20"
+                        }
+                    }
+                };
+
+                v2rayConfig.outbounds.Add(fragmentOutbound);
+                v2rayConfig.outbounds[0].streamSettings.sockopt = new()
+                {
+                    dialerProxy = fragmentOutbound.tag
+                };
+                return 0;
+            }
+
             if (node.subid.IsNullOrEmpty())
             {
                 return 0;
@@ -826,7 +877,7 @@ namespace v2rayN.Handler
 
                 //current proxy
                 var outbound = v2rayConfig.outbounds[0];
-                var txtOutbound = Utile.GetEmbedText(Global.V2raySampleOutbound);
+                var txtOutbound = Utils.GetEmbedText(Global.V2raySampleOutbound);
 
                 //Previous proxy
                 var prevNode = LazyConfig.Instance.GetProfileItemViaRemarks(subItem.prevProfile!);
@@ -836,7 +887,7 @@ namespace v2rayN.Handler
                     && prevNode.configType != EConfigType.Tuic
                     && prevNode.configType != EConfigType.Wireguard)
                 {
-                    var prevOutbound = JsonUtile.Deserialize<Outbounds4Ray>(txtOutbound);
+                    var prevOutbound = JsonUtils.Deserialize<Outbounds4Ray>(txtOutbound);
                     GenOutbound(prevNode, prevOutbound);
                     prevOutbound.tag = $"{Global.ProxyTag}2";
                     v2rayConfig.outbounds.Add(prevOutbound);
@@ -855,7 +906,7 @@ namespace v2rayN.Handler
                     && nextNode.configType != EConfigType.Tuic
                     && nextNode.configType != EConfigType.Wireguard)
                 {
-                    var nextOutbound = JsonUtile.Deserialize<Outbounds4Ray>(txtOutbound);
+                    var nextOutbound = JsonUtils.Deserialize<Outbounds4Ray>(txtOutbound);
                     GenOutbound(nextNode, nextOutbound);
                     nextOutbound.tag = Global.ProxyTag;
                     v2rayConfig.outbounds.Insert(0, nextOutbound);
@@ -892,15 +943,15 @@ namespace v2rayN.Handler
 
                 msg = ResUI.InitialConfiguration;
 
-                string result = Utile.GetEmbedText(Global.V2raySampleClient);
-                string txtOutbound = Utile.GetEmbedText(Global.V2raySampleOutbound);
-                if (Utile.IsNullOrEmpty(result) || txtOutbound.IsNullOrEmpty())
+                string result = Utils.GetEmbedText(Global.V2raySampleClient);
+                string txtOutbound = Utils.GetEmbedText(Global.V2raySampleOutbound);
+                if (Utils.IsNullOrEmpty(result) || txtOutbound.IsNullOrEmpty())
                 {
                     msg = ResUI.FailedGetDefaultConfiguration;
                     return -1;
                 }
 
-                v2rayConfig = JsonUtile.Deserialize<V2rayConfig>(result);
+                v2rayConfig = JsonUtils.Deserialize<V2rayConfig>(result);
                 if (v2rayConfig == null)
                 {
                     msg = ResUI.FailedGenDefaultConfiguration;
@@ -923,7 +974,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)
                 {
@@ -938,7 +989,7 @@ namespace v2rayN.Handler
                     if (it.configType is EConfigType.VMess or EConfigType.VLESS)
                     {
                         var item2 = LazyConfig.Instance.GetProfileItem(it.indexId);
-                        if (item2 is null || Utile.IsNullOrEmpty(item2.id) || !Utile.IsGuidByParse(item2.id))
+                        if (item2 is null || Utils.IsNullOrEmpty(item2.id) || !Utils.IsGuidByParse(item2.id))
                         {
                             continue;
                         }
@@ -975,9 +1026,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
@@ -997,7 +1048,7 @@ namespace v2rayN.Handler
                         continue;
                     }
 
-                    var outbound = JsonUtile.Deserialize<Outbounds4Ray>(txtOutbound);
+                    var outbound = JsonUtils.Deserialize<Outbounds4Ray>(txtOutbound);
                     GenOutbound(item, outbound);
                     outbound.tag = Global.ProxyTag + inbound.port.ToString();
                     v2rayConfig.outbounds.Add(outbound);

v2rayN/v2rayN/Handler/CoreHandler.cs

@@ -2,7 +2,7 @@
 using System.IO;
 using System.Reactive.Linq;
 using System.Text;
-using v2rayN.Model;
+using v2rayN.Models;
 using v2rayN.Resx;
 
 namespace v2rayN.Handler
@@ -22,8 +22,8 @@ namespace v2rayN.Handler
             _config = config;
             _updateFunc = update;
 
-            Environment.SetEnvironmentVariable("v2ray.location.asset", Utile.GetBinPath(""), EnvironmentVariableTarget.Process);
-            Environment.SetEnvironmentVariable("xray.location.asset", Utile.GetBinPath(""), EnvironmentVariableTarget.Process);
+            Environment.SetEnvironmentVariable("v2ray.location.asset", Utils.GetBinPath(""), EnvironmentVariableTarget.Process);
+            Environment.SetEnvironmentVariable("xray.location.asset", Utils.GetBinPath(""), EnvironmentVariableTarget.Process);
         }
 
         public void LoadCore()
@@ -35,7 +35,7 @@ namespace v2rayN.Handler
                 return;
             }
 
-            string fileName = Utile.GetConfigPath(Global.CoreConfigFileName);
+            string fileName = Utils.GetConfigPath(Global.CoreConfigFileName);
             if (CoreConfigHandler.GenerateClientConfig(node, fileName, out string msg, out string content) != 0)
             {
                 ShowMsg(false, msg);
@@ -48,7 +48,7 @@ namespace v2rayN.Handler
                 if (_config.tunModeItem.enableTun)
                 {
                     Thread.Sleep(1000);
-                    Utile.RemoveTunDevice();
+                    Utils.RemoveTunDevice();
                 }
 
                 CoreStart(node);
@@ -77,7 +77,7 @@ namespace v2rayN.Handler
         {
             int pid = -1;
             var coreType = selecteds.Exists(t => t.configType == EConfigType.Hysteria2 || t.configType == EConfigType.Tuic || t.configType == EConfigType.Wireguard) ? ECoreType.sing_box : ECoreType.Xray;
-            string configPath = Utile.GetConfigPath(Global.CoreSpeedtestConfigFileName);
+            string configPath = Utils.GetConfigPath(Global.CoreSpeedtestConfigFileName);
             if (CoreConfigHandler.GenerateClientSpeedtestConfig(_config, configPath, selecteds, coreType, out string msg) != 0)
             {
                 ShowMsg(false, msg);
@@ -126,7 +126,7 @@ namespace v2rayN.Handler
                             foreach (Process p in existing)
                             {
                                 string? path = p.MainModule?.FileName;
-                                if (path == $"{Utile.GetBinPath(vName, it.coreType.ToString())}.exe")
+                                if (path == $"{Utils.GetBinPath(vName, it.coreType.ToString())}.exe")
                                 {
                                     KillProcess(p);
                                 }
@@ -162,16 +162,16 @@ namespace v2rayN.Handler
             foreach (string name in coreInfo.coreExes)
             {
                 string vName = $"{name}.exe";
-                vName = Utile.GetBinPath(vName, coreInfo.coreType.ToString());
+                vName = Utils.GetBinPath(vName, coreInfo.coreType.ToString());
                 if (File.Exists(vName))
                 {
                     fileName = vName;
                     break;
                 }
             }
-            if (Utile.IsNullOrEmpty(fileName))
+            if (Utils.IsNullOrEmpty(fileName))
             {
-                string msg = string.Format(ResUI.NotFoundCore, Utile.GetBinPath("", coreInfo.coreType.ToString()), string.Join(", ", coreInfo.coreExes.ToArray()), coreInfo.coreUrl);
+                string msg = string.Format(ResUI.NotFoundCore, Utils.GetBinPath("", coreInfo.coreType.ToString()), string.Join(", ", coreInfo.coreExes.ToArray()), coreInfo.coreUrl);
                 Logging.SaveLog(msg);
                 ShowMsg(false, msg);
             }
@@ -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;
@@ -207,18 +208,20 @@ namespace v2rayN.Handler
             {
                 if ((node.configType == EConfigType.Custom && node.preSocksPort > 0))
                 {
+                    var preCoreType = _config.tunModeItem.enableTun ? ECoreType.sing_box : ECoreType.Xray;
                     var itemSocks = new ProfileItem()
                     {
-                        coreType = ECoreType.sing_box,
+                        coreType = preCoreType,
                         configType = EConfigType.Socks,
                         address = Global.Loopback,
                         port = node.preSocksPort
                     };
-                    string fileName2 = Utile.GetConfigPath(Global.CorePreConfigFileName);
+                    _config.runningCoreType = preCoreType;
+                    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 coreInfo2 = LazyConfig.Instance.GetCoreInfo(preCoreType);
+                        var proc2 = RunProcess(node, coreInfo2, $" -c {Global.CorePreConfigFileName}", true);
                         if (proc2 is not null)
                         {
                             _processPre = proc2;
@@ -236,7 +239,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,21 +256,21 @@ 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);
-                if (Utile.IsNullOrEmpty(fileName))
+                if (Utils.IsNullOrEmpty(fileName))
                 {
                     return null;
                 }
@@ -277,7 +280,7 @@ namespace v2rayN.Handler
                     {
                         FileName = fileName,
                         Arguments = string.Format(coreInfo.arguments, configPath),
-                        WorkingDirectory = Utile.GetConfigPath(),
+                        WorkingDirectory = Utils.GetConfigPath(),
                         UseShellExecute = false,
                         RedirectStandardOutput = displayLog,
                         RedirectStandardError = displayLog,
@@ -292,18 +295,18 @@ namespace v2rayN.Handler
                 {
                     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)
                             {
@@ -336,7 +339,7 @@ namespace v2rayN.Handler
             {
                 Logging.SaveLog(ex.Message, ex);
                 string msg = ex.Message;
-                update(true, msg);
+                ShowMsg(true, msg);
                 return null;
             }
         }
@@ -349,7 +352,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
@@ -33,7 +34,7 @@ namespace v2rayN.Handler
         {
             try
             {
-                Utile.SetSecurityProtocol(LazyConfig.Instance.GetConfig().guiItem.enableSecurityProtocolTls13);
+                Utils.SetSecurityProtocol(LazyConfig.Instance.GetConfig().guiItem.enableSecurityProtocolTls13);
 
                 var progress = new Progress<string>();
                 progress.ProgressChanged += (sender, value) =>
@@ -65,7 +66,7 @@ namespace v2rayN.Handler
         {
             try
             {
-                Utile.SetSecurityProtocol(LazyConfig.Instance.GetConfig().guiItem.enableSecurityProtocolTls13);
+                Utils.SetSecurityProtocol(LazyConfig.Instance.GetConfig().guiItem.enableSecurityProtocolTls13);
                 UpdateCompleted?.Invoke(this, new ResultEventArgs(false, $"{ResUI.Downloading}   {url}"));
 
                 var progress = new Progress<double>();
@@ -77,7 +78,7 @@ namespace v2rayN.Handler
                 var webProxy = GetWebProxy(blProxy);
                 await DownloaderHelper.Instance.DownloadFileAsync(webProxy,
                     url,
-                    Utile.GetTempPath(Utile.GetDownloadFileName(url)),
+                    Utils.GetTempPath(Utils.GetDownloadFileName(url)),
                     progress,
                     downloadTimeout);
             }
@@ -95,7 +96,7 @@ namespace v2rayN.Handler
 
         public async Task<string?> UrlRedirectAsync(string url, bool blProxy)
         {
-            Utile.SetSecurityProtocol(LazyConfig.Instance.GetConfig().guiItem.enableSecurityProtocolTls13);
+            Utils.SetSecurityProtocol(LazyConfig.Instance.GetConfig().guiItem.enableSecurityProtocolTls13);
             var webRequestHandler = new SocketsHttpHandler
             {
                 AllowAutoRedirect = false,
@@ -120,7 +121,7 @@ namespace v2rayN.Handler
             try
             {
                 var result1 = await DownloadStringAsync(url, blProxy, userAgent);
-                if (!Utile.IsNullOrEmpty(result1))
+                if (!Utils.IsNullOrEmpty(result1))
                 {
                     return result1;
                 }
@@ -138,7 +139,7 @@ namespace v2rayN.Handler
             try
             {
                 var result2 = await DownloadStringViaDownloader(url, blProxy, userAgent);
-                if (!Utile.IsNullOrEmpty(result2))
+                if (!Utils.IsNullOrEmpty(result2))
                 {
                     return result2;
                 }
@@ -158,7 +159,7 @@ namespace v2rayN.Handler
                 using var wc = new WebClient();
                 wc.Proxy = GetWebProxy(blProxy);
                 var result3 = await wc.DownloadStringTaskAsync(url);
-                if (!Utile.IsNullOrEmpty(result3))
+                if (!Utils.IsNullOrEmpty(result3))
                 {
                     return result3;
                 }
@@ -184,7 +185,7 @@ namespace v2rayN.Handler
         {
             try
             {
-                Utile.SetSecurityProtocol(LazyConfig.Instance.GetConfig().guiItem.enableSecurityProtocolTls13);
+                Utils.SetSecurityProtocol(LazyConfig.Instance.GetConfig().guiItem.enableSecurityProtocolTls13);
                 var webProxy = GetWebProxy(blProxy);
                 var client = new HttpClient(new SocketsHttpHandler()
                 {
@@ -192,17 +193,17 @@ namespace v2rayN.Handler
                     UseProxy = webProxy != null
                 });
 
-                if (Utile.IsNullOrEmpty(userAgent))
+                if (Utils.IsNullOrEmpty(userAgent))
                 {
-                    userAgent = Utile.GetVersion(false);
+                    userAgent = Utils.GetVersion(false);
                 }
                 client.DefaultRequestHeaders.UserAgent.TryParseAdd(userAgent);
 
                 Uri uri = new(url);
                 //Authorization Header
-                if (!Utile.IsNullOrEmpty(uri.UserInfo))
+                if (!Utils.IsNullOrEmpty(uri.UserInfo))
                 {
-                    client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic", Utile.Base64Encode(uri.UserInfo));
+                    client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic", Utils.Base64Encode(uri.UserInfo));
                 }
 
                 using var cts = new CancellationTokenSource();
@@ -229,13 +230,13 @@ namespace v2rayN.Handler
         {
             try
             {
-                Utile.SetSecurityProtocol(LazyConfig.Instance.GetConfig().guiItem.enableSecurityProtocolTls13);
+                Utils.SetSecurityProtocol(LazyConfig.Instance.GetConfig().guiItem.enableSecurityProtocolTls13);
 
                 var webProxy = GetWebProxy(blProxy);
 
-                if (Utile.IsNullOrEmpty(userAgent))
+                if (Utils.IsNullOrEmpty(userAgent))
                 {
-                    userAgent = Utile.GetVersion(false);
+                    userAgent = Utils.GetVersion(false);
                 }
                 var result = await DownloaderHelper.Instance.DownloadStringAsync(webProxy, url, userAgent, 30);
                 return result;
@@ -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.Model;
+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.Model;
+using v2rayN.Models;
 
 namespace v2rayN.Handler
 {
@@ -19,7 +19,7 @@ namespace v2rayN.Handler
             {
                 if (_statePort is null)
                 {
-                    _statePort = Utile.GetFreePort();
+                    _statePort = Utils.GetFreePort(GetLocalPort(EInboundProtocol.api));
                 }
 
                 return _statePort.Value;
@@ -50,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;
-            if (protocol == Global.InboundSocks)
-            {
-                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;
+            var localPort = _config.inbound.FirstOrDefault(t => t.protocol == nameof(EInboundProtocol.socks))?.localPort ?? 10808;
+            return localPort + (int)protocol;
         }
 
         public void AddProcess(IntPtr processHandle)
@@ -101,7 +77,7 @@ namespace v2rayN.Handler
 
         public List<ProfileItem> ProfileItems(string subid)
         {
-            if (Utile.IsNullOrEmpty(subid))
+            if (Utils.IsNullOrEmpty(subid))
             {
                 return SQLiteHelper.Instance.Table<ProfileItem>().ToList();
             }
@@ -113,7 +89,7 @@ namespace v2rayN.Handler
 
         public List<string> ProfileItemIndexes(string subid)
         {
-            if (Utile.IsNullOrEmpty(subid))
+            if (Utils.IsNullOrEmpty(subid))
             {
                 return SQLiteHelper.Instance.Table<ProfileItem>().Select(t => t.indexId).ToList();
             }
@@ -130,11 +106,11 @@ namespace v2rayN.Handler
                         from ProfileItem a
                         left join SubItem b on a.subid = b.id
                         where 1=1 ";
-            if (!Utile.IsNullOrEmpty(subid))
+            if (!Utils.IsNullOrEmpty(subid))
             {
                 sql += $" and a.subid = '{subid}'";
             }
-            if (!Utile.IsNullOrEmpty(filter))
+            if (!Utils.IsNullOrEmpty(filter))
             {
                 if (filter.Contains('\''))
                 {
@@ -148,7 +124,7 @@ namespace v2rayN.Handler
 
         public ProfileItem? GetProfileItem(string indexId)
         {
-            if (Utile.IsNullOrEmpty(indexId))
+            if (Utils.IsNullOrEmpty(indexId))
             {
                 return null;
             }
@@ -157,7 +133,7 @@ namespace v2rayN.Handler
 
         public ProfileItem? GetProfileItemViaRemarks(string remarks)
         {
-            if (Utile.IsNullOrEmpty(remarks))
+            if (Utils.IsNullOrEmpty(remarks))
             {
                 return null;
             }
@@ -230,7 +206,7 @@ namespace v2rayN.Handler
             {
                 InitCoreInfo();
             }
-            return coreInfo!.FirstOrDefault(t => t.coreType == coreType);
+            return coreInfo?.FirstOrDefault(t => t.coreType == coreType);
         }
 
         public List<CoreInfo> GetCoreInfo()

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.Model;
+using v2rayN.Models;
 using v2rayN.Resx;
 
 namespace v2rayN.Handler
@@ -26,7 +27,7 @@ namespace v2rayN.Handler
                 }
 
                 //Load from local file
-                var fileName = Utile.GetPath($"NotifyIcon{index + 1}.ico");
+                var fileName = Utils.GetPath($"NotifyIcon{index + 1}.ico");
                 if (File.Exists(fileName))
                 {
                     return new Icon(fileName);
@@ -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 3:
+                case ESysProxyType.ForcedChange:
+                case ESysProxyType.Pac:
                     index = 2;
                     break;
 
-                case 2:
+                case ESysProxyType.Unchanged:
                     index = 3;
                     break;
             }
@@ -78,7 +79,7 @@ namespace v2rayN.Handler
                 }
 
                 var item = ConfigHandler.GetDefaultRouting(config);
-                if (item == null || Utile.IsNullOrEmpty(item.customIcon) || !File.Exists(item.customIcon))
+                if (item == null || Utils.IsNullOrEmpty(item.customIcon) || !File.Exists(item.customIcon))
                 {
                     return null;
                 }
@@ -125,7 +126,7 @@ namespace v2rayN.Handler
             }
             if (item.configType == EConfigType.Custom)
             {
-                UI.Show(ResUI.NonVmessService);
+                Locator.Current.GetService<NoticeHandler>()?.Enqueue(ResUI.NonVmessService);
                 return;
             }
 
@@ -140,17 +141,18 @@ namespace v2rayN.Handler
                 return;
             }
             string fileName = fileDialog.FileName;
-            if (Utile.IsNullOrEmpty(fileName))
+            if (Utils.IsNullOrEmpty(fileName))
             {
                 return;
             }
             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,12 +10,14 @@ 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);
         }
 
@@ -27,7 +29,13 @@ namespace v2rayN.Handler
         public void SendMessage(string msg, bool time)
         {
             msg = $"{DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss")} {msg}";
-            MessageBus.Current.SendMessage(msg, Global.CommandSendMsgView);
+            SendMessage(msg);
+        }
+
+        public void SendMessageAndEnqueue(string msg)
+        {
+            Enqueue(msg);
+            SendMessage(msg);
         }
     }
 }

v2rayN/v2rayN/Handler/ProfileExHandler.cs

@@ -1,13 +1,13 @@
 using System.Collections.Concurrent;
 using System.Reactive.Linq;
-using v2rayN.Model;
+using v2rayN.Models;
 
 namespace v2rayN.Handler
 {
     internal class ProfileExHandler
     {
         private static readonly Lazy<ProfileExHandler> _instance = new(() => new());
-        private ConcurrentBag<ProfileExItem> _lstProfileEx;
+        private ConcurrentBag<ProfileExItem> _lstProfileEx = [];
         private Queue<string> _queIndexIds = new();
         public ConcurrentBag<ProfileExItem> ProfileExs => _lstProfileEx;
         public static ProfileExHandler Instance => _instance.Value;
@@ -15,6 +15,15 @@ namespace v2rayN.Handler
         public ProfileExHandler()
         {
             Init();
+
+            Task.Run(async () =>
+            {
+                while (true)
+                {
+                    SaveQueueIndexIds();
+                    await Task.Delay(1000 * 600);
+                }
+            });
         }
 
         private void Init()
@@ -22,34 +31,59 @@ namespace v2rayN.Handler
             SQLiteHelper.Instance.Execute($"delete from ProfileExItem where indexId not in ( select indexId from ProfileItem )");
 
             _lstProfileEx = new(SQLiteHelper.Instance.Table<ProfileExItem>());
-
-            Task.Run(async () =>
-            {
-                while (true)
-                {
-                    var cnt = _queIndexIds.Count;
-                    for (int i = 0; i < cnt; i++)
-                    {
-                        var id = _queIndexIds.Dequeue();
-                        var item = _lstProfileEx.FirstOrDefault(t => t.indexId == id);
-                        if (item is not null)
-                        {
-                            SQLiteHelper.Instance.Replace(item);
-                        }
-                    }
-                    await Task.Delay(1000 * 60);
-                }
-            });
         }
 
         private void IndexIdEnqueue(string indexId)
         {
-            if (!Utile.IsNullOrEmpty(indexId) && !_queIndexIds.Contains(indexId))
+            if (!Utils.IsNullOrEmpty(indexId) && !_queIndexIds.Contains(indexId))
             {
                 _queIndexIds.Enqueue(indexId);
             }
         }
 
+        private void SaveQueueIndexIds()
+        {
+            var cnt = _queIndexIds.Count;
+            if (cnt > 0)
+            {
+                var lstExists = SQLiteHelper.Instance.Table<ProfileExItem>();
+                List<ProfileExItem> lstInserts = [];
+                List<ProfileExItem> lstUpdates = [];
+
+                for (int i = 0; i < cnt; i++)
+                {
+                    var id = _queIndexIds.Dequeue();
+                    var item = lstExists.FirstOrDefault(t => t.indexId == id);
+                    var itemNew = _lstProfileEx?.FirstOrDefault(t => t.indexId == id);
+                    if (itemNew is null)
+                    {
+                        continue;
+                    }
+
+                    if (item is not null)
+                    {
+                        lstUpdates.Add(itemNew);
+                    }
+                    else
+                    {
+                        lstInserts.Add(itemNew);
+                    }
+                }
+                try
+                {
+                    if (lstInserts.Count() > 0)
+                        SQLiteHelper.Instance.InsertAll(lstInserts);
+
+                    if (lstUpdates.Count() > 0)
+                        SQLiteHelper.Instance.UpdateAll(lstUpdates);
+                }
+                catch (Exception ex)
+                {
+                    Logging.SaveLog("ProfileExHandler", ex);
+                }
+            }
+        }
+
         private void AddProfileEx(string indexId, ref ProfileExItem? profileEx)
         {
             profileEx = new()
@@ -73,11 +107,7 @@ namespace v2rayN.Handler
         {
             try
             {
-                //foreach (var item in _lstProfileEx)
-                //{
-                //    SQLiteHelper.Instance.Replace(item);
-                //}
-                SQLiteHelper.Instance.UpdateAll(_lstProfileEx);
+                SaveQueueIndexIds();
             }
             catch (Exception ex)
             {

v2rayN/v2rayN/Handler/ProxySetting.cs

@@ -51,7 +51,7 @@ namespace v2rayN.Handler
             }
             else if (type is 2 or 4) // named proxy or autoproxy script URL
             {
-                optionCount = Utile.IsNullOrEmpty(exceptions) ? 2 : 3;
+                optionCount = Utils.IsNullOrEmpty(exceptions) ? 2 : 3;
             }
 
             int m_Int = (int)PerConnFlags.PROXY_TYPE_DIRECT;

v2rayN/v2rayN/Handler/ShareHandler.cs

@@ -1,6 +1,6 @@
 using System.Collections.Specialized;
 using System.Text.RegularExpressions;
-using v2rayN.Model;
+using v2rayN.Models;
 using v2rayN.Resx;
 
 namespace v2rayN.Handler
@@ -65,8 +65,8 @@ namespace v2rayN.Handler
                 fp = item.fingerprint
             };
 
-            url = JsonUtile.Serialize(vmessQRCode);
-            url = Utile.Base64Encode(url);
+            url = JsonUtils.Serialize(vmessQRCode);
+            url = Utils.Base64Encode(url);
             url = $"{Global.ProtocolShares[EConfigType.VMess]}{url}";
 
             return url;
@@ -77,9 +77,9 @@ namespace v2rayN.Handler
             string url = string.Empty;
 
             string remark = string.Empty;
-            if (!Utile.IsNullOrEmpty(item.remarks))
+            if (!Utils.IsNullOrEmpty(item.remarks))
             {
-                remark = "#" + Utile.UrlEncode(item.remarks);
+                remark = "#" + Utils.UrlEncode(item.remarks);
             }
             //url = string.Format("{0}:{1}@{2}:{3}",
             //    item.security,
@@ -88,7 +88,7 @@ namespace v2rayN.Handler
             //    item.port);
             //url = Utile.Base64Encode(url);
             //new Sip002
-            var pw = Utile.Base64Encode($"{item.security}:{item.id}");
+            var pw = Utils.Base64Encode($"{item.security}:{item.id}");
             url = $"{pw}@{GetIpv6(item.address)}:{item.port}";
             url = $"{Global.ProtocolShares[EConfigType.Shadowsocks]}{url}{remark}";
             return url;
@@ -98,9 +98,9 @@ namespace v2rayN.Handler
         {
             string url = string.Empty;
             string remark = string.Empty;
-            if (!Utile.IsNullOrEmpty(item.remarks))
+            if (!Utils.IsNullOrEmpty(item.remarks))
             {
-                remark = "#" + Utile.UrlEncode(item.remarks);
+                remark = "#" + Utils.UrlEncode(item.remarks);
             }
             //url = string.Format("{0}:{1}@{2}:{3}",
             //    item.security,
@@ -109,7 +109,7 @@ namespace v2rayN.Handler
             //    item.port);
             //url = Utile.Base64Encode(url);
             //new
-            var pw = Utile.Base64Encode($"{item.security}:{item.id}");
+            var pw = Utils.Base64Encode($"{item.security}:{item.id}");
             url = $"{pw}@{GetIpv6(item.address)}:{item.port}";
             url = $"{Global.ProtocolShares[EConfigType.Socks]}{url}{remark}";
             return url;
@@ -119,9 +119,9 @@ namespace v2rayN.Handler
         {
             string url = string.Empty;
             string remark = string.Empty;
-            if (!Utile.IsNullOrEmpty(item.remarks))
+            if (!Utils.IsNullOrEmpty(item.remarks))
             {
-                remark = "#" + Utile.UrlEncode(item.remarks);
+                remark = "#" + Utils.UrlEncode(item.remarks);
             }
             var dicQuery = new Dictionary<string, string>();
             GetStdTransport(item, null, ref dicQuery);
@@ -139,12 +139,12 @@ namespace v2rayN.Handler
         {
             string url = string.Empty;
             string remark = string.Empty;
-            if (!Utile.IsNullOrEmpty(item.remarks))
+            if (!Utils.IsNullOrEmpty(item.remarks))
             {
-                remark = "#" + Utile.UrlEncode(item.remarks);
+                remark = "#" + Utils.UrlEncode(item.remarks);
             }
             var dicQuery = new Dictionary<string, string>();
-            if (!Utile.IsNullOrEmpty(item.security))
+            if (!Utils.IsNullOrEmpty(item.security))
             {
                 dicQuery.Add("encryption", item.security);
             }
@@ -167,23 +167,23 @@ namespace v2rayN.Handler
         {
             string url = string.Empty;
             string remark = string.Empty;
-            if (!Utile.IsNullOrEmpty(item.remarks))
+            if (!Utils.IsNullOrEmpty(item.remarks))
             {
-                remark = "#" + Utile.UrlEncode(item.remarks);
+                remark = "#" + Utils.UrlEncode(item.remarks);
             }
             var dicQuery = new Dictionary<string, string>();
-            if (!Utile.IsNullOrEmpty(item.sni))
+            if (!Utils.IsNullOrEmpty(item.sni))
             {
                 dicQuery.Add("sni", item.sni);
             }
-            if (!Utile.IsNullOrEmpty(item.alpn))
+            if (!Utils.IsNullOrEmpty(item.alpn))
             {
-                dicQuery.Add("alpn", Utile.UrlEncode(item.alpn));
+                dicQuery.Add("alpn", Utils.UrlEncode(item.alpn));
             }
-            if (!Utile.IsNullOrEmpty(item.path))
+            if (!Utils.IsNullOrEmpty(item.path))
             {
                 dicQuery.Add("obfs", "salamander");
-                dicQuery.Add("obfs-password", Utile.UrlEncode(item.path));
+                dicQuery.Add("obfs-password", Utils.UrlEncode(item.path));
             }
             dicQuery.Add("insecure", item.allowInsecure.ToLower() == "true" ? "1" : "0");
 
@@ -201,18 +201,18 @@ namespace v2rayN.Handler
         {
             string url = string.Empty;
             string remark = string.Empty;
-            if (!Utile.IsNullOrEmpty(item.remarks))
+            if (!Utils.IsNullOrEmpty(item.remarks))
             {
-                remark = "#" + Utile.UrlEncode(item.remarks);
+                remark = "#" + Utils.UrlEncode(item.remarks);
             }
             var dicQuery = new Dictionary<string, string>();
-            if (!Utile.IsNullOrEmpty(item.sni))
+            if (!Utils.IsNullOrEmpty(item.sni))
             {
                 dicQuery.Add("sni", item.sni);
             }
-            if (!Utile.IsNullOrEmpty(item.alpn))
+            if (!Utils.IsNullOrEmpty(item.alpn))
             {
-                dicQuery.Add("alpn", Utile.UrlEncode(item.alpn));
+                dicQuery.Add("alpn", Utils.UrlEncode(item.alpn));
             }
             dicQuery.Add("congestion_control", item.headerType);
 
@@ -230,32 +230,32 @@ namespace v2rayN.Handler
         {
             string url = string.Empty;
             string remark = string.Empty;
-            if (!Utile.IsNullOrEmpty(item.remarks))
+            if (!Utils.IsNullOrEmpty(item.remarks))
             {
-                remark = "#" + Utile.UrlEncode(item.remarks);
+                remark = "#" + Utils.UrlEncode(item.remarks);
             }
 
             var dicQuery = new Dictionary<string, string>();
-            if (!Utile.IsNullOrEmpty(item.publicKey))
+            if (!Utils.IsNullOrEmpty(item.publicKey))
             {
-                dicQuery.Add("publickey", Utile.UrlEncode(item.publicKey));
+                dicQuery.Add("publickey", Utils.UrlEncode(item.publicKey));
             }
-            if (!Utile.IsNullOrEmpty(item.path))
+            if (!Utils.IsNullOrEmpty(item.path))
             {
-                dicQuery.Add("reserved", Utile.UrlEncode(item.path));
+                dicQuery.Add("reserved", Utils.UrlEncode(item.path));
             }
-            if (!Utile.IsNullOrEmpty(item.requestHost))
+            if (!Utils.IsNullOrEmpty(item.requestHost))
             {
-                dicQuery.Add("address", Utile.UrlEncode(item.requestHost));
+                dicQuery.Add("address", Utils.UrlEncode(item.requestHost));
             }
-            if (!Utile.IsNullOrEmpty(item.shortId))
+            if (!Utils.IsNullOrEmpty(item.shortId))
             {
-                dicQuery.Add("mtu", Utile.UrlEncode(item.shortId));
+                dicQuery.Add("mtu", Utils.UrlEncode(item.shortId));
             }
             string query = "?" + string.Join("&", dicQuery.Select(x => x.Key + "=" + x.Value).ToArray());
 
             url = string.Format("{0}@{1}:{2}",
-            Utile.UrlEncode(item.id),
+            Utils.UrlEncode(item.id),
             GetIpv6(item.address),
             item.port);
             url = $"{Global.ProtocolShares[EConfigType.Wireguard]}{url}/{query}{remark}";
@@ -264,17 +264,22 @@ namespace v2rayN.Handler
 
         private static string GetIpv6(string address)
         {
-            return Utile.IsIpv6(address) ? $"[{address}]" : address;
+            if (Utils.IsIpv6(address))
+            {
+                // 检查地址是否已经被方括号包围，如果没有，则添加方括号
+                return address.StartsWith('[') && address.EndsWith(']') ? address : $"[{address}]";
+            }
+            return address;  // 如果不是IPv6地址，直接返回原地址
         }
 
         private static int GetStdTransport(ProfileItem item, string? securityDef, ref Dictionary<string, string> dicQuery)
         {
-            if (!Utile.IsNullOrEmpty(item.flow))
+            if (!Utils.IsNullOrEmpty(item.flow))
             {
                 dicQuery.Add("flow", item.flow);
             }
 
-            if (!Utile.IsNullOrEmpty(item.streamSecurity))
+            if (!Utils.IsNullOrEmpty(item.streamSecurity))
             {
                 dicQuery.Add("security", item.streamSecurity);
             }
@@ -285,88 +290,90 @@ namespace v2rayN.Handler
                     dicQuery.Add("security", securityDef);
                 }
             }
-            if (!Utile.IsNullOrEmpty(item.sni))
+            if (!Utils.IsNullOrEmpty(item.sni))
             {
                 dicQuery.Add("sni", item.sni);
             }
-            if (!Utile.IsNullOrEmpty(item.alpn))
+            if (!Utils.IsNullOrEmpty(item.alpn))
             {
-                dicQuery.Add("alpn", Utile.UrlEncode(item.alpn));
+                dicQuery.Add("alpn", Utils.UrlEncode(item.alpn));
             }
-            if (!Utile.IsNullOrEmpty(item.fingerprint))
+            if (!Utils.IsNullOrEmpty(item.fingerprint))
             {
-                dicQuery.Add("fp", Utile.UrlEncode(item.fingerprint));
+                dicQuery.Add("fp", Utils.UrlEncode(item.fingerprint));
             }
-            if (!Utile.IsNullOrEmpty(item.publicKey))
+            if (!Utils.IsNullOrEmpty(item.publicKey))
             {
-                dicQuery.Add("pbk", Utile.UrlEncode(item.publicKey));
+                dicQuery.Add("pbk", Utils.UrlEncode(item.publicKey));
             }
-            if (!Utile.IsNullOrEmpty(item.shortId))
+            if (!Utils.IsNullOrEmpty(item.shortId))
             {
-                dicQuery.Add("sid", Utile.UrlEncode(item.shortId));
+                dicQuery.Add("sid", Utils.UrlEncode(item.shortId));
             }
-            if (!Utile.IsNullOrEmpty(item.spiderX))
+            if (!Utils.IsNullOrEmpty(item.spiderX))
             {
-                dicQuery.Add("spx", Utile.UrlEncode(item.spiderX));
+                dicQuery.Add("spx", Utils.UrlEncode(item.spiderX));
             }
 
-            dicQuery.Add("type", !Utile.IsNullOrEmpty(item.network) ? item.network : "tcp");
+            dicQuery.Add("type", !Utils.IsNullOrEmpty(item.network) ? item.network : nameof(ETransport.tcp));
 
             switch (item.network)
             {
-                case "tcp":
-                    dicQuery.Add("headerType", !Utile.IsNullOrEmpty(item.headerType) ? item.headerType : Global.None);
-                    if (!Utile.IsNullOrEmpty(item.requestHost))
+                case nameof(ETransport.tcp):
+                    dicQuery.Add("headerType", !Utils.IsNullOrEmpty(item.headerType) ? item.headerType : Global.None);
+                    if (!Utils.IsNullOrEmpty(item.requestHost))
                     {
-                        dicQuery.Add("host", Utile.UrlEncode(item.requestHost));
+                        dicQuery.Add("host", Utils.UrlEncode(item.requestHost));
                     }
                     break;
 
-                case "kcp":
-                    dicQuery.Add("headerType", !Utile.IsNullOrEmpty(item.headerType) ? item.headerType : Global.None);
-                    if (!Utile.IsNullOrEmpty(item.path))
+                case nameof(ETransport.kcp):
+                    dicQuery.Add("headerType", !Utils.IsNullOrEmpty(item.headerType) ? item.headerType : Global.None);
+                    if (!Utils.IsNullOrEmpty(item.path))
                     {
-                        dicQuery.Add("seed", Utile.UrlEncode(item.path));
+                        dicQuery.Add("seed", Utils.UrlEncode(item.path));
                     }
                     break;
 
-                case "ws":
-                    if (!Utile.IsNullOrEmpty(item.requestHost))
+                case nameof(ETransport.ws):
+                case nameof(ETransport.httpupgrade):
+                    if (!Utils.IsNullOrEmpty(item.requestHost))
                     {
-                        dicQuery.Add("host", Utile.UrlEncode(item.requestHost));
+                        dicQuery.Add("host", Utils.UrlEncode(item.requestHost));
                     }
-                    if (!Utile.IsNullOrEmpty(item.path))
+                    if (!Utils.IsNullOrEmpty(item.path))
                     {
-                        dicQuery.Add("path", Utile.UrlEncode(item.path));
+                        dicQuery.Add("path", Utils.UrlEncode(item.path));
                     }
                     break;
 
-                case "http":
-                case "h2":
-                    dicQuery["type"] = "http";
-                    if (!Utile.IsNullOrEmpty(item.requestHost))
+                case nameof(ETransport.http):
+                case nameof(ETransport.h2):
+                    dicQuery["type"] = nameof(ETransport.http);
+                    if (!Utils.IsNullOrEmpty(item.requestHost))
                     {
-                        dicQuery.Add("host", Utile.UrlEncode(item.requestHost));
+                        dicQuery.Add("host", Utils.UrlEncode(item.requestHost));
                     }
-                    if (!Utile.IsNullOrEmpty(item.path))
+                    if (!Utils.IsNullOrEmpty(item.path))
                     {
-                        dicQuery.Add("path", Utile.UrlEncode(item.path));
+                        dicQuery.Add("path", Utils.UrlEncode(item.path));
                     }
                     break;
 
-                case "quic":
-                    dicQuery.Add("headerType", !Utile.IsNullOrEmpty(item.headerType) ? item.headerType : Global.None);
-                    dicQuery.Add("quicSecurity", Utile.UrlEncode(item.requestHost));
-                    dicQuery.Add("key", Utile.UrlEncode(item.path));
+                case nameof(ETransport.quic):
+                    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":
-                    if (!Utile.IsNullOrEmpty(item.path))
+                case nameof(ETransport.grpc):
+                    if (!Utils.IsNullOrEmpty(item.path))
                     {
-                        dicQuery.Add("serviceName", Utile.UrlEncode(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)
                         {
-                            dicQuery.Add("mode", Utile.UrlEncode(item.headerType));
+                            dicQuery.Add("mode", Utils.UrlEncode(item.headerType));
                         }
                     }
                     break;
@@ -391,7 +398,7 @@ namespace v2rayN.Handler
             try
             {
                 string result = clipboardData.TrimEx();
-                if (Utile.IsNullOrEmpty(result))
+                if (Utils.IsNullOrEmpty(result))
                 {
                     msg = ResUI.FailedReadConfiguration;
                     return null;
@@ -482,10 +489,10 @@ namespace v2rayN.Handler
             };
 
             result = result[Global.ProtocolShares[EConfigType.VMess].Length..];
-            result = Utile.Base64Decode(result);
+            result = Utils.Base64Decode(result);
 
             //转成Json
-            VmessQRCode? vmessQRCode = JsonUtile.Deserialize<VmessQRCode>(result);
+            VmessQRCode? vmessQRCode = JsonUtils.Deserialize<VmessQRCode>(result);
             if (vmessQRCode == null)
             {
                 msg = ResUI.FailedConversionConfiguration;
@@ -495,30 +502,30 @@ namespace v2rayN.Handler
             profileItem.network = Global.DefaultNetwork;
             profileItem.headerType = Global.None;
 
-            profileItem.configVersion = Utile.ToInt(vmessQRCode.v);
-            profileItem.remarks = Utile.ToString(vmessQRCode.ps);
-            profileItem.address = Utile.ToString(vmessQRCode.add);
-            profileItem.port = Utile.ToInt(vmessQRCode.port);
-            profileItem.id = Utile.ToString(vmessQRCode.id);
-            profileItem.alterId = Utile.ToInt(vmessQRCode.aid);
-            profileItem.security = Utile.ToString(vmessQRCode.scy);
+            profileItem.configVersion = Utils.ToInt(vmessQRCode.v);
+            profileItem.remarks = Utils.ToString(vmessQRCode.ps);
+            profileItem.address = Utils.ToString(vmessQRCode.add);
+            profileItem.port = Utils.ToInt(vmessQRCode.port);
+            profileItem.id = Utils.ToString(vmessQRCode.id);
+            profileItem.alterId = Utils.ToInt(vmessQRCode.aid);
+            profileItem.security = Utils.ToString(vmessQRCode.scy);
 
-            profileItem.security = !Utile.IsNullOrEmpty(vmessQRCode.scy) ? vmessQRCode.scy : Global.DefaultSecurity;
-            if (!Utile.IsNullOrEmpty(vmessQRCode.net))
+            profileItem.security = !Utils.IsNullOrEmpty(vmessQRCode.scy) ? vmessQRCode.scy : Global.DefaultSecurity;
+            if (!Utils.IsNullOrEmpty(vmessQRCode.net))
             {
                 profileItem.network = vmessQRCode.net;
             }
-            if (!Utile.IsNullOrEmpty(vmessQRCode.type))
+            if (!Utils.IsNullOrEmpty(vmessQRCode.type))
             {
                 profileItem.headerType = vmessQRCode.type;
             }
 
-            profileItem.requestHost = Utile.ToString(vmessQRCode.host);
-            profileItem.path = Utile.ToString(vmessQRCode.path);
-            profileItem.streamSecurity = Utile.ToString(vmessQRCode.tls);
-            profileItem.sni = Utile.ToString(vmessQRCode.sni);
-            profileItem.alpn = Utile.ToString(vmessQRCode.alpn);
-            profileItem.fingerprint = Utile.ToString(vmessQRCode.fp);
+            profileItem.requestHost = Utils.ToString(vmessQRCode.host);
+            profileItem.path = Utils.ToString(vmessQRCode.path);
+            profileItem.streamSecurity = Utils.ToString(vmessQRCode.tls);
+            profileItem.sni = Utils.ToString(vmessQRCode.sni);
+            profileItem.alpn = Utils.ToString(vmessQRCode.alpn);
+            profileItem.fingerprint = Utils.ToString(vmessQRCode.fp);
 
             return profileItem;
         }
@@ -535,7 +542,7 @@ namespace v2rayN.Handler
             {
                 result = result[..indexSplit];
             }
-            result = Utile.Base64Decode(result);
+            result = Utils.Base64Decode(result);
 
             string[] arr1 = result.Split('@');
             if (arr1.Length != 2)
@@ -550,7 +557,7 @@ namespace v2rayN.Handler
             }
 
             profileItem.address = arr22[0];
-            profileItem.port = Utile.ToInt(arr22[1]);
+            profileItem.port = Utils.ToInt(arr22[1]);
             profileItem.security = arr21[0];
             profileItem.id = arr21[1];
 
@@ -574,7 +581,7 @@ namespace v2rayN.Handler
             i.address = u.IdnHost;
             i.port = u.Port;
             i.remarks = u.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
-            var query = Utile.ParseQueryString(u.Query);
+            var query = Utils.ParseQueryString(u.Query);
 
             var m = StdVmessUserInfo.Match(u.UserInfo);
             if (!m.Success) return null;
@@ -587,11 +594,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,37 +606,38 @@ namespace v2rayN.Handler
             i.network = m.Groups["network"].Value;
             switch (i.network)
             {
-                case "tcp":
+                case nameof(ETransport.tcp):
                     string t1 = query["type"] ?? Global.None;
                     i.headerType = t1;
                     break;
 
-                case "kcp":
+                case nameof(ETransport.kcp):
                     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 = Utile.UrlDecode(h1);
+                    i.requestHost = Utils.UrlDecode(h1);
                     i.path = p1;
                     break;
 
-                case "http":
-                case "h2":
-                    i.network = "h2";
+                case nameof(ETransport.http):
+                case nameof(ETransport.h2):
+                    i.network = nameof(ETransport.h2);
                     string p2 = query["path"] ?? "/";
                     string h2 = query["host"] ?? "";
-                    i.requestHost = Utile.UrlDecode(h2);
+                    i.requestHost = Utils.UrlDecode(h2);
                     i.path = p2;
                     break;
 
-                case "quic":
+                case nameof(ETransport.quic):
                     string s = query["security"] ?? Global.None;
                     string k = query["key"] ?? "";
                     string t3 = query["type"] ?? Global.None;
                     i.headerType = t3;
-                    i.requestHost = Utile.UrlDecode(s);
+                    i.requestHost = Utils.UrlDecode(s);
                     i.path = k;
                     break;
 
@@ -667,12 +675,12 @@ namespace v2rayN.Handler
                     return null;
                 }
                 server.security = userInfoParts[0];
-                server.id = Utile.UrlDecode(userInfoParts[1]);
+                server.id = Utils.UrlDecode(userInfoParts[1]);
             }
             else
             {
                 // parse base64 UserInfo
-                string userInfo = Utile.Base64Decode(rawUserInfo);
+                string userInfo = Utils.Base64Decode(rawUserInfo);
                 string[] userInfoParts = userInfo.Split(new[] { ':' }, 2);
                 if (userInfoParts.Length != 2)
                 {
@@ -682,12 +690,12 @@ namespace v2rayN.Handler
                 server.id = userInfoParts[1];
             }
 
-            var queryParameters = Utile.ParseQueryString(parsedUrl.Query);
+            var queryParameters = Utils.ParseQueryString(parsedUrl.Query);
             if (queryParameters["plugin"] != null)
             {
                 //obfs-host exists
                 var obfsHost = queryParameters["plugin"]?.Split(';').FirstOrDefault(t => t.Contains("obfs-host"));
-                if (queryParameters["plugin"].Contains("obfs=http") && !Utile.IsNullOrEmpty(obfsHost))
+                if (queryParameters["plugin"].Contains("obfs=http") && !Utils.IsNullOrEmpty(obfsHost))
                 {
                     obfsHost = obfsHost?.Replace("obfs-host=", "");
                     server.network = Global.DefaultNetwork;
@@ -715,14 +723,14 @@ namespace v2rayN.Handler
             ProfileItem server = new();
             var base64 = match.Groups["base64"].Value.TrimEnd('/');
             var tag = match.Groups["tag"].Value;
-            if (!Utile.IsNullOrEmpty(tag))
+            if (!Utils.IsNullOrEmpty(tag))
             {
-                server.remarks = Utile.UrlDecode(tag);
+                server.remarks = Utils.UrlDecode(tag);
             }
             Match details;
             try
             {
-                details = DetailsParser.Match(Utile.Base64Decode(base64));
+                details = DetailsParser.Match(Utils.Base64Decode(base64));
             }
             catch (FormatException)
             {
@@ -733,7 +741,7 @@ namespace v2rayN.Handler
             server.security = details.Groups["method"].Value;
             server.id = details.Groups["password"].Value;
             server.address = details.Groups["hostname"].Value;
-            server.port = Utile.ToInt(details.Groups["port"].Value);
+            server.port = Utils.ToInt(details.Groups["port"].Value);
             return server;
         }
 
@@ -753,7 +761,7 @@ namespace v2rayN.Handler
             {
                 try
                 {
-                    profileItem.remarks = Utile.UrlDecode(result.Substring(indexRemark + 1, result.Length - indexRemark - 1));
+                    profileItem.remarks = Utils.UrlDecode(result.Substring(indexRemark + 1, result.Length - indexRemark - 1));
                 }
                 catch { }
                 result = result[..indexRemark];
@@ -765,7 +773,7 @@ namespace v2rayN.Handler
             }
             else
             {
-                result = Utile.Base64Decode(result);
+                result = Utils.Base64Decode(result);
             }
 
             string[] arr1 = result.Split('@');
@@ -781,7 +789,7 @@ namespace v2rayN.Handler
                 return null;
             }
             profileItem.address = arr1[1][..indexPort];
-            profileItem.port = Utile.ToInt(arr1[1][(indexPort + 1)..]);
+            profileItem.port = Utils.ToInt(arr1[1][(indexPort + 1)..]);
             profileItem.security = arr21[0];
             profileItem.id = arr21[1];
 
@@ -808,7 +816,7 @@ namespace v2rayN.Handler
 
             // parse base64 UserInfo
             string rawUserInfo = parsedUrl.GetComponents(UriComponents.UserInfo, UriFormat.Unescaped);
-            string userInfo = Utile.Base64Decode(rawUserInfo);
+            string userInfo = Utils.Base64Decode(rawUserInfo);
             string[] userInfoParts = userInfo.Split(new[] { ':' }, 2);
             if (userInfoParts.Length == 2)
             {
@@ -831,9 +839,9 @@ namespace v2rayN.Handler
             item.address = url.IdnHost;
             item.port = url.Port;
             item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
-            item.id = Utile.UrlDecode(url.UserInfo);
+            item.id = Utils.UrlDecode(url.UserInfo);
 
-            var query = Utile.ParseQueryString(url.Query);
+            var query = Utils.ParseQueryString(url.Query);
             ResolveStdTransport(query, ref item);
 
             return item;
@@ -852,9 +860,9 @@ namespace v2rayN.Handler
             item.address = url.IdnHost;
             item.port = url.Port;
             item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
-            item.id = Utile.UrlDecode(url.UserInfo);
+            item.id = Utils.UrlDecode(url.UserInfo);
 
-            var query = Utile.ParseQueryString(url.Query);
+            var query = Utils.ParseQueryString(url.Query);
             item.security = query["encryption"] ?? Global.None;
             item.streamSecurity = query["security"] ?? "";
             ResolveStdTransport(query, ref item);
@@ -874,11 +882,11 @@ namespace v2rayN.Handler
             item.address = url.IdnHost;
             item.port = url.Port;
             item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
-            item.id = Utile.UrlDecode(url.UserInfo);
+            item.id = Utils.UrlDecode(url.UserInfo);
 
-            var query = Utile.ParseQueryString(url.Query);
+            var query = Utils.ParseQueryString(url.Query);
             ResolveStdTransport(query, ref item);
-            item.path = Utile.UrlDecode(query["obfs-password"] ?? "");
+            item.path = Utils.UrlDecode(query["obfs-password"] ?? "");
             item.allowInsecure = (query["insecure"] ?? "") == "1" ? "true" : "false";
 
             return item;
@@ -903,7 +911,7 @@ namespace v2rayN.Handler
                 item.security = userInfoParts[1];
             }
 
-            var query = Utile.ParseQueryString(url.Query);
+            var query = Utils.ParseQueryString(url.Query);
             ResolveStdTransport(query, ref item);
             item.headerType = query["congestion_control"] ?? "";
 
@@ -922,14 +930,14 @@ namespace v2rayN.Handler
             item.address = url.IdnHost;
             item.port = url.Port;
             item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
-            item.id = Utile.UrlDecode(url.UserInfo);
+            item.id = Utils.UrlDecode(url.UserInfo);
 
-            var query = Utile.ParseQueryString(url.Query);
+            var query = Utils.ParseQueryString(url.Query);
 
-            item.publicKey = Utile.UrlDecode(query["publickey"] ?? "");
-            item.path = Utile.UrlDecode(query["reserved"] ?? "");
-            item.requestHost = Utile.UrlDecode(query["address"] ?? "");
-            item.shortId = Utile.UrlDecode(query["mtu"] ?? "");
+            item.publicKey = Utils.UrlDecode(query["publickey"] ?? "");
+            item.path = Utils.UrlDecode(query["reserved"] ?? "");
+            item.requestHost = Utils.UrlDecode(query["address"] ?? "");
+            item.shortId = Utils.UrlDecode(query["mtu"] ?? "");
 
             return item;
         }
@@ -939,47 +947,49 @@ namespace v2rayN.Handler
             item.flow = query["flow"] ?? "";
             item.streamSecurity = query["security"] ?? "";
             item.sni = query["sni"] ?? "";
-            item.alpn = Utile.UrlDecode(query["alpn"] ?? "");
-            item.fingerprint = Utile.UrlDecode(query["fp"] ?? "");
-            item.publicKey = Utile.UrlDecode(query["pbk"] ?? "");
-            item.shortId = Utile.UrlDecode(query["sid"] ?? "");
-            item.spiderX = Utile.UrlDecode(query["spx"] ?? "");
+            item.alpn = Utils.UrlDecode(query["alpn"] ?? "");
+            item.fingerprint = Utils.UrlDecode(query["fp"] ?? "");
+            item.publicKey = Utils.UrlDecode(query["pbk"] ?? "");
+            item.shortId = Utils.UrlDecode(query["sid"] ?? "");
+            item.spiderX = Utils.UrlDecode(query["spx"] ?? "");
 
-            item.network = query["type"] ?? "tcp";
+            item.network = query["type"] ?? nameof(ETransport.tcp);
             switch (item.network)
             {
-                case "tcp":
+                case nameof(ETransport.tcp):
                     item.headerType = query["headerType"] ?? Global.None;
-                    item.requestHost = Utile.UrlDecode(query["host"] ?? "");
+                    item.requestHost = Utils.UrlDecode(query["host"] ?? "");
 
                     break;
 
-                case "kcp":
+                case nameof(ETransport.kcp):
                     item.headerType = query["headerType"] ?? Global.None;
-                    item.path = Utile.UrlDecode(query["seed"] ?? "");
+                    item.path = Utils.UrlDecode(query["seed"] ?? "");
                     break;
 
-                case "ws":
-                    item.requestHost = Utile.UrlDecode(query["host"] ?? "");
-                    item.path = Utile.UrlDecode(query["path"] ?? "/");
+                case nameof(ETransport.ws):
+                case nameof(ETransport.httpupgrade):
+                    item.requestHost = Utils.UrlDecode(query["host"] ?? "");
+                    item.path = Utils.UrlDecode(query["path"] ?? "/");
                     break;
 
-                case "http":
-                case "h2":
-                    item.network = "h2";
-                    item.requestHost = Utile.UrlDecode(query["host"] ?? "");
-                    item.path = Utile.UrlDecode(query["path"] ?? "/");
+                case nameof(ETransport.http):
+                case nameof(ETransport.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"] ?? Global.None;
                     item.requestHost = query["quicSecurity"] ?? Global.None;
-                    item.path = Utile.UrlDecode(query["key"] ?? "");
+                    item.path = Utils.UrlDecode(query["key"] ?? "");
                     break;
 
-                case "grpc":
-                    item.path = Utile.UrlDecode(query["serviceName"] ?? "");
-                    item.headerType = Utile.UrlDecode(query["mode"] ?? Global.GrpcGunMode);
+                case nameof(ETransport.grpc):
+                    item.requestHost = Utils.UrlDecode(query["authority"] ?? "");
+                    item.path = Utils.UrlDecode(query["serviceName"] ?? "");
+                    item.headerType = Utils.UrlDecode(query["mode"] ?? Global.GrpcGunMode);
                     break;
 
                 default:

v2rayN/v2rayN/Handler/SpeedtestHandler.cs

@@ -2,7 +2,7 @@
 using System.Diagnostics;
 using System.Net;
 using System.Net.Sockets;
-using v2rayN.Model;
+using v2rayN.Models;
 using v2rayN.Resx;
 
 namespace v2rayN.Handler

v2rayN/v2rayN/Handler/StatisticsHandler.cs

@@ -1,6 +1,4 @@
-using System.Net;
-using System.Net.Sockets;
-using v2rayN.Model;
+using v2rayN.Models;
 
 namespace v2rayN.Handler
 {
@@ -133,27 +131,5 @@ namespace v2rayN.Handler
                 _serverStatItem.dateNow = ticks;
             }
         }
-
-        private int GetFreePort()
-        {
-            try
-            {
-                int defaultPort = 9090;
-                if (!Utile.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.Model;
+using v2rayN.Models;
 
 namespace v2rayN.Handler
 {
@@ -61,8 +61,13 @@ namespace v2rayN.Handler
 
             while (!_exitFlag)
             {
+                await Task.Delay(1000);
                 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 +89,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);
 
@@ -101,10 +106,6 @@ namespace v2rayN.Handler
                 catch
                 {
                 }
-                finally
-                {
-                    await Task.Delay(1000);
-                }
             }
         }
 
@@ -113,7 +114,7 @@ namespace v2rayN.Handler
             up = 0; down = 0;
             try
             {
-                var trafficItem = JsonUtile.Deserialize<TrafficItem>(source);
+                var trafficItem = JsonUtils.Deserialize<TrafficItem>(source);
                 if (trafficItem != null)
                 {
                     up = trafficItem.up;

v2rayN/v2rayN/Handler/StatisticsV2ray.cs

@@ -1,19 +1,19 @@
 using Grpc.Core;
 using Grpc.Net.Client;
 using ProtosLib.Statistics;
-using v2rayN.Model;
+using v2rayN.Models;
 
 namespace v2rayN.Handler
 {
     internal class StatisticsV2ray
     {
-        private Model.Config _config;
+        private Models.Config _config;
         private GrpcChannel? _channel;
         private StatsService.StatsServiceClient? _client;
         private bool _exitFlag;
         private Action<ServerSpeedItem> _updateFunc;
 
-        public StatisticsV2ray(Model.Config config, Action<ServerSpeedItem> update)
+        public StatisticsV2ray(Models.Config config, Action<ServerSpeedItem> update)
         {
             _config = config;
             _updateFunc = update;
@@ -49,14 +49,20 @@ namespace v2rayN.Handler
         {
             while (!_exitFlag)
             {
+                await Task.Delay(1000);
                 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;
                         try
                         {
-                            res = await _client.QueryStatsAsync(new QueryStatsRequest() { Pattern = "", Reset = true });
+                            if (_client != null)
+                                res = await _client.QueryStatsAsync(new QueryStatsRequest() { Pattern = "", Reset = true });
                         }
                         catch
                         {
@@ -68,8 +74,8 @@ namespace v2rayN.Handler
                             _updateFunc(server);
                         }
                     }
-                    await Task.Delay(1000);
-                    if (_channel != null) await _channel.ConnectAsync();
+                    if (_channel != null)
+                        await _channel.ConnectAsync();
                 }
                 catch
                 {

v2rayN/v2rayN/Handler/SysProxyHandle.cs

@@ -1,5 +1,5 @@
 using PacLib;
-using v2rayN.Model;
+using v2rayN.Models;
 
 namespace v2rayN.Handler
 {
@@ -41,9 +41,9 @@ namespace v2rayN.Handler
 
             try
             {
-                int port = LazyConfig.Instance.GetLocalPort(Global.InboundHttp);
-                int portSocks = LazyConfig.Instance.GetLocalPort(Global.InboundSocks);
-                int portPac = LazyConfig.Instance.GetLocalPort(ESysProxyType.Pac.ToString());
+                int port = LazyConfig.Instance.GetLocalPort(EInboundProtocol.http);
+                int portSocks = LazyConfig.Instance.GetLocalPort(EInboundProtocol.socks);
+                int portPac = LazyConfig.Instance.GetLocalPort(EInboundProtocol.pac);
                 if (port <= 0)
                 {
                     return false;
@@ -53,7 +53,7 @@ namespace v2rayN.Handler
                     var strExceptions = $"<local>;{config.constItem.defIEProxyExceptions};{config.systemProxyExceptions}";
 
                     var strProxy = string.Empty;
-                    if (Utile.IsNullOrEmpty(config.systemProxyAdvancedProtocol))
+                    if (Utils.IsNullOrEmpty(config.systemProxyAdvancedProtocol))
                     {
                         strProxy = $"{Global.Loopback}:{port}";
                     }
@@ -75,7 +75,7 @@ namespace v2rayN.Handler
                 }
                 else if (type == ESysProxyType.Pac)
                 {
-                    PacHandler.Start(Utile.GetConfigPath(), port, portPac);
+                    PacHandler.Start(Utils.GetConfigPath(), port, portPac);
                     var strProxy = $"{Global.HttpProtocol}{Global.Loopback}:{portPac}/pac?t={DateTime.Now.Ticks}";
                     ProxySetting.SetProxy(strProxy, "", 4); // use pac script url for auto-config proxy
                 }
@@ -97,7 +97,7 @@ namespace v2rayN.Handler
             try
             {
                 //TODO To be verified
-                Utile.RegWriteValue(@"Software\Microsoft\Windows\CurrentVersion\Internet Settings", "ProxyEnable", 0);
+                Utils.RegWriteValue(@"Software\Microsoft\Windows\CurrentVersion\Internet Settings", "ProxyEnable", 0);
             }
             catch
             {

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.Model;
+using v2rayN.Models;
 using v2rayN.Resx;
 
 namespace v2rayN.Handler
@@ -47,15 +47,15 @@ namespace v2rayN.Handler
 
                     try
                     {
-                        string fileName = Utile.GetTempPath(Utile.GetDownloadFileName(url));
-                        fileName = Utile.UrlEncode(fileName);
+                        string fileName = Utils.GetTempPath(Utils.GetDownloadFileName(url));
+                        fileName = Utils.UrlEncode(fileName);
                         Process process = new()
                         {
                             StartInfo = new ProcessStartInfo
                             {
                                 FileName = "v2rayUpgrade.exe",
                                 Arguments = fileName.AppendQuotes(),
-                                WorkingDirectory = Utile.StartupPath()
+                                WorkingDirectory = Utils.StartupPath()
                             }
                         };
                         process.Start();
@@ -179,7 +179,7 @@ namespace v2rayN.Handler
                     string url = item.url.TrimEx();
                     string userAgent = item.userAgent.TrimEx();
                     string hashCode = $"{item.remarks}->";
-                    if (Utile.IsNullOrEmpty(id) || Utile.IsNullOrEmpty(url) || (!Utile.IsNullOrEmpty(subId) && item.id != subId))
+                    if (Utils.IsNullOrEmpty(id) || Utils.IsNullOrEmpty(url) || (!Utils.IsNullOrEmpty(subId) && item.id != subId))
                     {
                         //_updateFunc(false, $"{hashCode}{ResUI.MsgNoValidSubscription}");
                         continue;
@@ -203,12 +203,12 @@ namespace v2rayN.Handler
                     _updateFunc(false, $"{hashCode}{ResUI.MsgStartGettingSubscriptions}");
 
                     //one url
-                    url = Utile.GetPunycode(url);
+                    url = Utils.GetPunycode(url);
                     //convert
-                    if (!Utile.IsNullOrEmpty(item.convertTarget))
+                    if (!Utils.IsNullOrEmpty(item.convertTarget))
                     {
-                        var subConvertUrl = string.IsNullOrEmpty(config.constItem.subConvertUrl) ? Global.SubConvertUrls.FirstOrDefault() : config.constItem.subConvertUrl;
-                        url = string.Format(subConvertUrl!, Utile.UrlEncode(url));
+                        var subConvertUrl = Utils.IsNullOrEmpty(config.constItem.subConvertUrl) ? Global.SubConvertUrls.FirstOrDefault() : config.constItem.subConvertUrl;
+                        url = string.Format(subConvertUrl!, Utils.UrlEncode(url));
                         if (!url.Contains("target="))
                         {
                             url += string.Format("&target={0}", item.convertTarget);
@@ -219,17 +219,17 @@ namespace v2rayN.Handler
                         }
                     }
                     var result = await downloadHandle.TryDownloadString(url, blProxy, userAgent);
-                    if (blProxy && Utile.IsNullOrEmpty(result))
+                    if (blProxy && Utils.IsNullOrEmpty(result))
                     {
                         result = await downloadHandle.TryDownloadString(url, false, userAgent);
                     }
 
                     //more url
-                    if (Utile.IsNullOrEmpty(item.convertTarget) && !Utile.IsNullOrEmpty(item.moreUrl.TrimEx()))
+                    if (Utils.IsNullOrEmpty(item.convertTarget) && !Utils.IsNullOrEmpty(item.moreUrl.TrimEx()))
                     {
-                        if (!Utile.IsNullOrEmpty(result) && Utile.IsBase64String(result!))
+                        if (!Utils.IsNullOrEmpty(result) && Utils.IsBase64String(result!))
                         {
-                            result = Utile.Base64Decode(result);
+                            result = Utils.Base64Decode(result);
                         }
 
                         var lstUrl = new List<string>
@@ -238,22 +238,22 @@ namespace v2rayN.Handler
                         };
                         foreach (var it in lstUrl)
                         {
-                            var url2 = Utile.GetPunycode(it);
-                            if (Utile.IsNullOrEmpty(url2))
+                            var url2 = Utils.GetPunycode(it);
+                            if (Utils.IsNullOrEmpty(url2))
                             {
                                 continue;
                             }
 
                             var result2 = await downloadHandle.TryDownloadString(url2, blProxy, userAgent);
-                            if (blProxy && Utile.IsNullOrEmpty(result2))
+                            if (blProxy && Utils.IsNullOrEmpty(result2))
                             {
                                 result2 = await downloadHandle.TryDownloadString(url2, false, userAgent);
                             }
-                            if (!Utile.IsNullOrEmpty(result2))
+                            if (!Utils.IsNullOrEmpty(result2))
                             {
-                                if (Utile.IsBase64String(result2!))
+                                if (Utils.IsBase64String(result2!))
                                 {
-                                    result += Utile.Base64Decode(result2);
+                                    result += Utils.Base64Decode(result2);
                                 }
                                 else
                                 {
@@ -263,14 +263,14 @@ namespace v2rayN.Handler
                         }
                     }
 
-                    if (Utile.IsNullOrEmpty(result))
+                    if (Utils.IsNullOrEmpty(result))
                     {
                         _updateFunc(false, $"{hashCode}{ResUI.MsgSubscriptionDecodingFailed}");
                     }
                     else
                     {
                         _updateFunc(false, $"{hashCode}{ResUI.MsgGetSubscriptionSuccessfully}");
-                        if (result!.Length < 99)
+                        if (result?.Length < 99)
                         {
                             _updateFunc(false, $"{hashCode}{result}");
                         }
@@ -325,7 +325,7 @@ namespace v2rayN.Handler
                 string url = coreInfo.coreReleaseApiUrl;
 
                 var result = await (new DownloadHandle()).DownloadStringAsync(url, true, "");
-                if (!Utile.IsNullOrEmpty(result))
+                if (!Utils.IsNullOrEmpty(result))
                 {
                     responseHandler(type, result, preRelease);
                 }
@@ -354,7 +354,7 @@ namespace v2rayN.Handler
                 foreach (string name in coreInfo.coreExes)
                 {
                     string vName = $"{name}.exe";
-                    vName = Utile.GetBinPath(vName, coreInfo.coreType.ToString());
+                    vName = Utils.GetBinPath(vName, coreInfo.coreType.ToString());
                     if (File.Exists(vName))
                     {
                         filePath = vName;
@@ -372,7 +372,7 @@ namespace v2rayN.Handler
                 using Process p = new();
                 p.StartInfo.FileName = filePath.AppendQuotes();
                 p.StartInfo.Arguments = coreInfo.versionArg;
-                p.StartInfo.WorkingDirectory = Utile.StartupPath();
+                p.StartInfo.WorkingDirectory = Utils.StartupPath();
                 p.StartInfo.UseShellExecute = false;
                 p.StartInfo.RedirectStandardOutput = true;
                 p.StartInfo.CreateNoWindow = true;
@@ -414,10 +414,10 @@ namespace v2rayN.Handler
         {
             try
             {
-                var gitHubReleases = JsonUtile.Deserialize<List<GitHubRelease>>(gitHubReleaseApi);
-                var gitHubRelease = preRelease ? gitHubReleases!.First() : gitHubReleases!.First(r => r.Prerelease == false);
-                var version = new SemanticVersion(gitHubRelease!.TagName);
-                var body = gitHubRelease!.Body;
+                var gitHubReleases = JsonUtils.Deserialize<List<GitHubRelease>>(gitHubReleaseApi);
+                var gitHubRelease = preRelease ? gitHubReleases?.First() : gitHubReleases?.First(r => r.Prerelease == false);
+                var version = new SemanticVersion(gitHubRelease?.TagName!);
+                var body = gitHubRelease?.Body;
 
                 var coreInfo = LazyConfig.Instance.GetCoreInfo(type);
 
@@ -498,7 +498,7 @@ namespace v2rayN.Handler
                         }
                     case ECoreType.v2rayN:
                         {
-                            curVersion = new SemanticVersion(FileVersionInfo.GetVersionInfo(Utile.GetExePath()).FileVersion.ToString());
+                            curVersion = new SemanticVersion(FileVersionInfo.GetVersionInfo(Utils.GetExePath()).FileVersion.ToString());
                             message = string.Format(ResUI.IsLatestN, type, curVersion);
                             switch (RuntimeInformation.ProcessArchitecture)
                             {
@@ -570,7 +570,7 @@ namespace v2rayN.Handler
 
                     try
                     {
-                        string fileName = Utile.GetTempPath(Utile.GetDownloadFileName(url));
+                        string fileName = Utils.GetTempPath(Utils.GetDownloadFileName(url));
                         if (File.Exists(fileName))
                         {
                             //Global.coreTypes.ForEach(it =>
@@ -578,7 +578,7 @@ namespace v2rayN.Handler
                             //    string targetPath = Utile.GetBinPath($"{geoName}.dat", (ECoreType)Enum.Parse(typeof(ECoreType), it));
                             //    File.Copy(fileName, targetPath, true);
                             //});
-                            string targetPath = Utile.GetBinPath($"{geoName}.dat");
+                            string targetPath = Utils.GetBinPath($"{geoName}.dat");
                             File.Copy(fileName, targetPath, true);
 
                             File.Delete(fileName);
@@ -602,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 = Utile.GetTempPath(Utile.GetDownloadFileName(url));
-                        if (File.Exists(fileName))
-                        {
-                            string targetPath = Utile.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.Model
+namespace v2rayN.Models
 {
     public class ComboItem
     {

v2rayN/v2rayN/Models/Config.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Model
+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.Model
+namespace v2rayN.Models
 {
     [Serializable]
     public class CoreBasicItem
@@ -31,6 +31,10 @@ namespace v2rayN.Model
         /// 默认用户代理
         /// </summary>
         public string defUserAgent { get; set; }
+
+        public bool enableFragment { get; set; }
+
+        public bool enableCacheFile4Sbox { get; set; } = true;
     }
 
     [Serializable]
@@ -43,8 +47,8 @@ namespace v2rayN.Model
         public bool udpEnabled { get; set; }
 
         public bool sniffingEnabled { get; set; } = true;
+        public List<string>? destOverride { get; set; } = ["http", "tls"];
         public bool routeOnly { get; set; }
-
         public bool allowLANConn { get; set; }
 
         public bool newPort4LAN { get; set; }
@@ -122,7 +126,7 @@ namespace v2rayN.Model
         public int currentFontSize { get; set; }
         public bool enableDragDropSort { get; set; }
         public bool doubleClick2Activate { get; set; }
-        public bool autoHideStartup { get; set; } = true;
+        public bool autoHideStartup { get; set; }
         public string mainMsgFilter { get; set; }
         public List<ColumnItem> mainColumnItem { get; set; }
     }
@@ -178,16 +182,11 @@ namespace v2rayN.Model
     [Serializable]
     public class RoutingBasicItem
     {
-        /// <summary>
-        /// 域名解析策略
-        /// </summary>
         public string domainStrategy { get; set; }
-
         public string domainStrategy4Singbox { get; set; }
-
         public string domainMatcher { get; set; }
         public string routingIndexId { get; set; }
-        public bool enableRoutingAdvanced { get; set; }
+        public bool enableRoutingAdvanced { get; set; }        
     }
 
     [Serializable]

v2rayN/v2rayN/Models/ConfigOld.cs

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

v2rayN/v2rayN/Models/CoreInfo.cs

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

v2rayN/v2rayN/Models/DNSItem.cs

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

v2rayN/v2rayN/Models/EConfigType.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Model
+namespace v2rayN.Models
 {
     public enum EConfigType
     {
@@ -10,6 +10,7 @@
         Trojan = 6,
         Hysteria2 = 7,
         Tuic = 8,
-        Wireguard = 9
+        Wireguard = 9,
+        Http = 10
     }
 }

v2rayN/v2rayN/Models/ECoreType.cs

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

v2rayN/v2rayN/Models/EGlobalHotkey.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Model
+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.Model
+namespace v2rayN.Models
 {
     public enum EMove
     {

v2rayN/v2rayN/Models/EServerColName.cs

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

v2rayN/v2rayN/Models/ESpeedActionType.cs

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

v2rayN/v2rayN/Models/ESysProxyType.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Model
+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.Model
+namespace v2rayN.Models
 {
     public enum EViewAction
     {

v2rayN/v2rayN/Models/GitHubRelease.cs

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

v2rayN/v2rayN/Models/ProfileExItem.cs

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

v2rayN/v2rayN/Models/ProfileItem.cs

@@ -1,6 +1,6 @@
 using SQLite;
 
-namespace v2rayN.Model
+namespace v2rayN.Models
 {
     [Serializable]
     public class ProfileItem
@@ -60,19 +60,19 @@ namespace v2rayN.Model
 
         public List<string> GetAlpn()
         {
-            if (Utile.IsNullOrEmpty(alpn))
+            if (Utils.IsNullOrEmpty(alpn))
             {
                 return null;
             }
             else
             {
-                return Utile.String2List(alpn);
+                return Utils.String2List(alpn);
             }
         }
 
         public string GetNetwork()
         {
-            if (Utile.IsNullOrEmpty(network) || !Global.Networks.Contains(network))
+            if (Utils.IsNullOrEmpty(network) || !Global.Networks.Contains(network))
             {
                 return Global.DefaultNetwork;
             }

v2rayN/v2rayN/Models/ProfileItemModel.cs

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

v2rayN/v2rayN/Models/RoutingItem.cs

@@ -1,6 +1,6 @@
 using SQLite;
 
-namespace v2rayN.Model
+namespace v2rayN.Models
 {
     [Serializable]
     public class RoutingItem
@@ -15,6 +15,7 @@ namespace v2rayN.Model
         public bool enabled { get; set; } = true;
         public bool locked { get; set; }
         public string customIcon { get; set; }
+        public string customRulesetPath4Singbox { get; set; }
         public string domainStrategy { get; set; }
         public string domainStrategy4Singbox { get; set; }
         public int sort { get; set; }

v2rayN/v2rayN/Models/RoutingItemModel.cs

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

v2rayN/v2rayN/Models/RulesItem.cs

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

v2rayN/v2rayN/Models/RulesItemModel.cs

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

v2rayN/v2rayN/Models/ServerSpeedItem.cs

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

v2rayN/v2rayN/Models/ServerStatItem.cs

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

v2rayN/v2rayN/Models/ServerTestItem.cs

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

v2rayN/v2rayN/Models/SingboxConfig.cs

@@ -1,13 +1,13 @@
-namespace v2rayN.Model
+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; }
-        public Experimental4Sbox experimental { get; set; }
+        public Experimental4Sbox? experimental { get; set; }
     }
 
     public class Log4Sbox
@@ -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
@@ -35,19 +35,21 @@
     {
         public bool? auto_detect_interface { get; set; }
         public List<Rule4Sbox> rules { get; set; }
+        public List<Ruleset4Sbox>? rule_set { get; set; }
     }
 
     [Serializable]
     public class Rule4Sbox
     {
-        public string outbound { get; set; }
-        public string server { get; set; }
+        public string? outbound { get; set; }
+        public string? server { get; set; }
         public bool? disable_cache { get; set; }
         public List<string>? inbound { get; set; }
         public List<string>? protocol { get; set; }
-        public string type { get; set; }
-        public string mode { get; set; }
-        public string network { get; set; }
+        public string? type { get; set; }
+        public string? mode { get; set; }
+        public string? network { get; set; }
+        public bool? ip_is_private { get; set; }
         public List<int>? port { get; set; }
         public List<string>? port_range { get; set; }
         public List<string>? geosite { get; set; }
@@ -58,8 +60,8 @@
         public List<string>? geoip { get; set; }
         public List<string>? ip_cidr { get; set; }
         public List<string>? source_ip_cidr { get; set; }
-
         public List<string>? process_name { get; set; }
+        public List<string>? rule_set { get; set; }
     }
 
     [Serializable]
@@ -93,7 +95,7 @@
     {
         public string type { get; set; }
         public string tag { get; set; }
-        public string server { get; set; }
+        public string? server { get; set; }
         public int? server_port { get; set; }
         public string uuid { get; set; }
         public string security { get; set; }
@@ -120,10 +122,10 @@
         public int? mtu { get; set; }
         public string? plugin { get; set; }
         public string? plugin_opts { get; set; }
-        public Tls4Sbox tls { get; set; }
-        public Multiplex4Sbox multiplex { get; set; }
-        public Transport4Sbox transport { get; set; }
-        public HyObfs4Sbox obfs { get; set; }
+        public Tls4Sbox? tls { get; set; }
+        public Multiplex4Sbox? multiplex { get; set; }
+        public Transport4Sbox? transport { get; set; }
+        public HyObfs4Sbox? obfs { get; set; }
     }
 
     public class Tls4Sbox
@@ -158,14 +160,14 @@
 
     public class Transport4Sbox
     {
-        public string type { get; set; }
-        public List<string>? host { get; set; }
+        public string? type { 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 idle_timeout { get; set; }
-        public string ping_timeout { get; set; }
+        public string? service_name { get; set; }
+        public string? idle_timeout { get; set; }
+        public string? ping_timeout { get; set; }
         public bool? permit_without_stream { get; set; }
     }
 
@@ -186,7 +188,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
@@ -230,4 +232,15 @@
         public string? cache_id { get; set; }
         public bool? store_fakeip { get; set; }
     }
+
+    public class Ruleset4Sbox
+    {
+        public string? tag { get; set; }
+        public string? type { get; set; }
+        public string? format { get; set; }
+        public string? path { get; set; }
+        public string? url { get; set; }
+        public string? download_detour { get; set; }
+        public string? update_interval { get; set; }  
+    }
 }

v2rayN/v2rayN/Models/SsSIP008.cs

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

v2rayN/v2rayN/Models/SubItem.cs

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

v2rayN/v2rayN/Models/SysProxyConfig.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Model
+namespace v2rayN.Models
 {
     internal class SysProxyConfig
     {

v2rayN/v2rayN/Models/V2rayConfig.cs

@@ -1,12 +1,17 @@
 using System.Text.Json.Serialization;
 
-namespace v2rayN.Model
+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>
@@ -190,7 +195,7 @@ namespace v2rayN.Model
     public class Sniffing4Ray
     {
         public bool enabled { get; set; }
-        public List<string> destOverride { get; set; }
+        public List<string>? destOverride { get; set; }
         public bool routeOnly { get; set; }
     }
 
@@ -227,7 +232,7 @@ namespace v2rayN.Model
         /// <summary>
         ///
         /// </summary>
-        public List<VnextItem4Ray> vnext { get; set; }
+        public List<VnextItem4Ray>? vnext { get; set; }
 
         /// <summary>
         ///
@@ -248,6 +253,8 @@ namespace v2rayN.Model
         ///
         /// </summary>
         public int? userLevel { get; set; }
+
+        public FragmentItem4Ray? fragment { get; set; }
     }
 
     public class VnextItem4Ray
@@ -283,17 +290,17 @@ namespace v2rayN.Model
         /// <summary>
         ///
         /// </summary>
-        public string method { get; set; }
+        public string? method { get; set; }
 
         /// <summary>
         ///
         /// </summary>
-        public bool ota { get; set; }
+        public bool? ota { get; set; }
 
         /// <summary>
         ///
         /// </summary>
-        public string password { get; set; }
+        public string? password { get; set; }
 
         /// <summary>
         ///
@@ -303,7 +310,7 @@ namespace v2rayN.Model
         /// <summary>
         ///
         /// </summary>
-        public int level { get; set; }
+        public int? level { get; set; }
 
         /// <summary>
         /// trojan
@@ -331,7 +338,7 @@ namespace v2rayN.Model
         /// <summary>
         ///
         /// </summary>
-        public int level { get; set; }
+        public int? level { get; set; }
     }
 
     public class Mux4Ray
@@ -384,19 +391,19 @@ namespace v2rayN.Model
     [Serializable]
     public class RulesItem4Ray
     {
-        public string type { get; set; }
+        public string? type { get; set; }
 
-        public string port { get; set; }
+        public string? port { get; set; }
 
-        public List<string> inboundTag { get; set; }
+        public List<string>? inboundTag { get; set; }
 
-        public string outboundTag { get; set; }
+        public string? outboundTag { get; set; }
 
-        public List<string> ip { get; set; }
+        public List<string>? ip { get; set; }
 
-        public List<string> domain { get; set; }
+        public List<string>? domain { get; set; }
 
-        public List<string> protocol { get; set; }
+        public List<string>? protocol { get; set; }
     }
 
     public class StreamSettings4Ray
@@ -431,6 +438,11 @@ namespace v2rayN.Model
         /// </summary>
         public WsSettings4Ray wsSettings { get; set; }
 
+        /// <summary>
+        ///
+        /// </summary>
+        public HttpupgradeSettings4Ray? httpupgradeSettings { get; set; }
+
         /// <summary>
         /// h2传输额外设置
         /// </summary>
@@ -583,6 +595,19 @@ namespace v2rayN.Model
         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 +641,8 @@ namespace v2rayN.Model
 
     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; }
@@ -641,4 +667,11 @@ namespace v2rayN.Model
     {
         public string? dialerProxy { get; set; }
     }
+
+    public class FragmentItem4Ray
+    {
+        public string? packets { get; set; }
+        public string? length { get; set; }
+        public string? interval { get; set; }
+    }
 }

v2rayN/v2rayN/Models/V2rayTcpRequest.cs

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

v2rayN/v2rayN/Models/VmessQRCode.cs

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

v2rayN/v2rayN/Resx/ResUI.Designer.cs

@@ -411,6 +411,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Custom the rule-set of sing-box 的本地化字符串。
+        /// </summary>
+        public static string LvCustomRulesetPath4Singbox {
+            get {
+                return ResourceManager.GetString("LvCustomRulesetPath4Singbox", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Enabled Update 的本地化字符串。
         /// </summary>
@@ -466,7 +475,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Previous proxy remakrs 的本地化字符串。
+        ///   查找类似 Previous proxy remarks 的本地化字符串。
         /// </summary>
         public static string LvPrevProfile {
             get {
@@ -618,6 +627,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Add [Http] server 的本地化字符串。
+        /// </summary>
+        public static string menuAddHttpServer {
+            get {
+                return ResourceManager.GetString("menuAddHttpServer", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Add [Hysteria2] server 的本地化字符串。
         /// </summary>
@@ -960,6 +978,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Open the storage location 的本地化字符串。
+        /// </summary>
+        public static string menuOpenTheFileLocation {
+            get {
+                return ResourceManager.GetString("menuOpenTheFileLocation", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Option Setting 的本地化字符串。
         /// </summary>
@@ -1563,6 +1590,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Successful operation. Click the settings menu to reboot the app. 的本地化字符串。
+        /// </summary>
+        public static string NeedRebootTips {
+            get {
+                return ResourceManager.GetString("NeedRebootTips", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Non-VMess or ss protocol 的本地化字符串。
         /// </summary>
@@ -2599,6 +2635,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Enable cache file for sing-box (ruleset files) 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsEnableCacheFile4Sbox {
+            get {
+                return ResourceManager.GetString("TbSettingsEnableCacheFile4Sbox", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Check for pre-release updates 的本地化字符串。
         /// </summary>
@@ -2626,6 +2671,24 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Enable fragment 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsEnableFragment {
+            get {
+                return ResourceManager.GetString("TbSettingsEnableFragment", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Use Xray and enable non-Tun mode, which conflicts with the group previous proxy 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsEnableFragmentTips {
+            get {
+                return ResourceManager.GetString("TbSettingsEnableFragmentTips", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Enable hardware acceleration(Require restart) 的本地化字符串。
         /// </summary>
@@ -2852,7 +2915,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 {
@@ -3149,7 +3212,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 * After setting this value, an socks service will be started using sing-box to provide functions such as speed display 的本地化字符串。
+        ///   查找类似 * After setting this value, an socks service will be started using Xray/sing-box(Tun) to provide functions such as speed display 的本地化字符串。
         /// </summary>
         public static string TipPreSocksPort {
             get {
@@ -3203,7 +3266,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 *ws path 的本地化字符串。
+        ///   查找类似 *ws/httpupgrade path 的本地化字符串。
         /// </summary>
         public static string TransportPathTip1 {
             get {
@@ -3257,7 +3320,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 *ws host 的本地化字符串。
+        ///   查找类似 *ws/httpupgrade host 的本地化字符串。
         /// </summary>
         public static string TransportRequestHostTip2 {
             get {
@@ -3283,6 +3346,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.fa-Ir.resx

@@ -698,7 +698,7 @@
     <value>txtPreSocksPort</value>
   </data>
   <data name="TipPreSocksPort" xml:space="preserve">
-    <value>* After setting this value, an socks service will be started using sing-box to provide functions such as speed display</value>
+    <value>* After setting this value, an socks service will be started using Xray/sing-box(Tun) to provide functions such as speed display</value>
   </data>
   <data name="TbBrowse" xml:space="preserve">
     <value>Browse</value>
@@ -1003,4 +1003,7 @@
   <data name="TbSettingsEnableHWA" xml:space="preserve">
     <value>فعال‌سازی شتاب‌دهنده سخت‌افزاری (نیاز به راه‌اندازی مجدد)</value>
   </data>
+  <data name="TbSettingsEnableCacheFile4Sbox" xml:space="preserve">
+    <value>فعال کردن کش فایل مجموعه قوانین برای sing-box</value>
+  </data>
 </root>

v2rayN/v2rayN/Resx/ResUI.resx

@@ -359,7 +359,7 @@
     <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>
@@ -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>
@@ -701,7 +701,7 @@
     <value>txtPreSocksPort</value>
   </data>
   <data name="TipPreSocksPort" xml:space="preserve">
-    <value>* After setting this value, an socks service will be started using sing-box to provide functions such as speed display</value>
+    <value>* After setting this value, an socks service will be started using Xray/sing-box(Tun) to provide functions such as speed display</value>
   </data>
   <data name="TbBrowse" xml:space="preserve">
     <value>Browse</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>
@@ -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>
@@ -1195,4 +1195,28 @@
   <data name="SpeedtestingStop" xml:space="preserve">
     <value>Test terminating...</value>
   </data>
+  <data name="TransportRequestHostTip5" xml:space="preserve">
+    <value>*grpc Authority</value>
+  </data>
+  <data name="menuAddHttpServer" xml:space="preserve">
+    <value>Add [Http] server</value>
+  </data>
+  <data name="TbSettingsEnableFragmentTips" xml:space="preserve">
+    <value>Use Xray and enable non-Tun mode, which conflicts with the group previous proxy</value>
+  </data>
+  <data name="TbSettingsEnableFragment" xml:space="preserve">
+    <value>Enable fragment</value>
+  </data>
+  <data name="TbSettingsEnableCacheFile4Sbox" xml:space="preserve">
+    <value>Enable cache file for sing-box (ruleset files)</value>
+  </data>
+  <data name="LvCustomRulesetPath4Singbox" xml:space="preserve">
+    <value>Custom the rule-set of sing-box</value>
+  </data>
+  <data name="NeedRebootTips" xml:space="preserve">
+    <value>Successful operation. Click the settings menu to reboot the app.</value>
+  </data>
+  <data name="menuOpenTheFileLocation" xml:space="preserve">
+    <value>Open the storage location</value>
+  </data>
 </root>

v2rayN/v2rayN/Resx/ResUI.ru.resx

@@ -701,7 +701,7 @@
     <value>txtPreSocksPort</value>
   </data>
   <data name="TipPreSocksPort" xml:space="preserve">
-    <value>* После установки этого значения служба socks будет запущена с использованием sing-box для обеспечения таких функций, как отображение скорости</value>
+    <value>* После установки этого значения служба socks будет запущена с использованием Xray/sing-box(Tun) для обеспечения таких функций, как отображение скорости</value>
   </data>
   <data name="TbBrowse" xml:space="preserve">
     <value>Просмотр</value>

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>
@@ -701,7 +701,7 @@
     <value>Socks端口</value>
   </data>
   <data name="TipPreSocksPort" xml:space="preserve">
-    <value>* 自定义配置的Socks端口值，可不设置；当设置此值后，将使用sing-box额外启动一个前置Socks服务，提供分流和速度显示等功能</value>
+    <value>* 自定义配置的Socks端口值，可不设置；当设置此值后，将使用Xray/sing-box(Tun)额外启动一个前置Socks服务，提供分流和速度显示等功能</value>
   </data>
   <data name="TbBrowse" 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；Pac端口=socks端口+4；API端口=socks端口+5；</value>
   </data>
   <data name="TbSettingsStartBootTip" xml:space="preserve">
     <value>以管理员权限设置此项，在启动后获得管理员权限</value>
@@ -1192,4 +1192,28 @@
   <data name="SpeedtestingStop" xml:space="preserve">
     <value>测试终止中...</value>
   </data>
+  <data name="TransportRequestHostTip5" xml:space="preserve">
+    <value>*grpc Authority</value>
+  </data>
+  <data name="menuAddHttpServer" xml:space="preserve">
+    <value>添加[Http]服务器</value>
+  </data>
+  <data name="TbSettingsEnableFragment" xml:space="preserve">
+    <value>启用分片（Fragment）</value>
+  </data>
+  <data name="TbSettingsEnableFragmentTips" xml:space="preserve">
+    <value>使用Xray且非Tun模式启用，和分组前置代理冲突</value>
+  </data>
+  <data name="TbSettingsEnableCacheFile4Sbox" xml:space="preserve">
+    <value>启用sing-box（规则集文件）的缓存文件</value>
+  </data>
+  <data name="LvCustomRulesetPath4Singbox" xml:space="preserve">
+    <value>自定义sing-box rule-set</value>
+  </data>
+  <data name="NeedRebootTips" xml:space="preserve">
+    <value>操作成功。请点击设置菜单重启应用。</value>
+  </data>
+  <data name="menuOpenTheFileLocation" xml:space="preserve">
+    <value>打开存储所在的位置</value>
+  </data>
 </root>

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

@@ -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>
@@ -700,7 +700,7 @@
     <value>SOCKS埠</value>
   </data>
   <data name="TipPreSocksPort" xml:space="preserve">
-    <value>* 自訂配置的Socks埠值，可不設定；當設定此值後，將使用sing-box額外啟動一個前置Socks服務，提供分流和速度顯示等功能</value>
+    <value>* 自訂配置的Socks埠值，可不設定；當設定此值後，將使用Xray/sing-box(Tun)額外啟動一個前置Socks服務，提供分流和速度顯示等功能</value>
   </data>
   <!--********************************************-->
   <data name="TbBrowse" xml:space="preserve">
@@ -1165,4 +1165,28 @@
   <data name="SpeedtestingStop" xml:space="preserve">
     <value>測試終止中...</value>
   </data>
+  <data name="TransportRequestHostTip5" xml:space="preserve">
+    <value>*grpc Authority</value>
+  </data>
+  <data name="menuAddHttpServer" xml:space="preserve">
+    <value>新增[Http]伺服器</value>
+  </data>
+  <data name="TbSettingsEnableFragment" xml:space="preserve">
+    <value>啟用分片（Fragment）</value>
+  </data>
+  <data name="TbSettingsEnableFragmentTips" xml:space="preserve">
+    <value>使用Xray且非Tun模式啟用，和分組前置代理衝突</value>
+  </data>
+  <data name="TbSettingsEnableCacheFile4Sbox" xml:space="preserve">
+    <value>啟用sing-box（規則集文件）的緩存文件</value>
+  </data>
+  <data name="LvCustomRulesetPath4Singbox" xml:space="preserve">
+    <value>自訂sing-box rule-set</value>
+  </data>
+  <data name="NeedRebootTips" xml:space="preserve">
+    <value>操作成功。 請點選設定選單重啟應用程式。</value>
+  </data>
+  <data name="menuOpenTheFileLocation" xml:space="preserve">
+    <value>打開儲存所在的位置</value>
+  </data>
 </root>

v2rayN/v2rayN/Sample/SampleClientConfig

@@ -4,56 +4,7 @@
 		"error": "Verror.log",
 		"loglevel": "warning"
 	},
-	"inbounds": [{
-			"tag": "tag1",
-			"port": 10808,
-			"protocol": "socks",
-			"listen": "127.0.0.1",
-			"settings": {
-				"auth": "noauth",
-				"udp": true
-			},
-			"sniffing": {
-				"enabled": true,
-				"destOverride": [
-					"http",
-					"tls"
-				]
-			}
-		},
-		{
-			"tag": "tag2",
-			"port": 10809,
-			"protocol": "http",
-			"listen": "127.0.0.1",
-			"settings": {
-				"allowTransparent": false
-			},
-			"sniffing": {
-				"enabled": true,
-				"destOverride": [
-					"http",
-					"tls"
-				]
-			}
-		},
-		{
-			"tag": "tag3",
-			"port": 10809,
-			"protocol": "http",
-			"listen": "127.0.0.1",
-			"settings": {
-				"allowTransparent": false
-			},
-			"sniffing": {
-				"enabled": true,
-				"destOverride": [
-					"http",
-					"tls"
-				]
-			}
-		}
-	],
+	"inbounds": [],
 	"outbounds": [{
 			"tag": "proxy",
 			"protocol": "vmess",

v2rayN/v2rayN/Sample/SingboxSampleClientConfig

@@ -3,14 +3,7 @@
 		"level": "debug",
 		"timestamp": true
 	},
-	"inbounds": [
-		{
-			"type": "socks",
-			"tag": "socks",
-			"listen": "127.0.0.1",
-			"listen_port": 10000
-		}
-	],
+	"inbounds": [],
 	"outbounds": [
 		{
 			"type": "vless",

v2rayN/v2rayN/Sample/custom_routing_black

@@ -13,20 +13,10 @@
   },
   {
     "outboundTag": "proxy",
-    "ip": [
-      "geoip:cloudflare",
-      "geoip:cloudfront",
-      "geoip:facebook",
-      "geoip:fastly",
-      "geoip:google",
-      "geoip:netflix",
-      "geoip:telegram",
-      "geoip:twitter"
-    ],
+
     "domain": [
-      "geosite:gfw",
-      "geosite:greatfire",
-      "geosite:tld-!cn"
+      "geosite:geolocation-!cn",
+      "geosite:greatfire"      
     ]
   },
   {

v2rayN/v2rayN/Sample/custom_routing_white

@@ -15,7 +15,8 @@
   {
     "outboundTag": "direct",
     "domain": [
-      "geosite:cn"
+      "geosite:cn",
+      "geosite:geolocation-cn"
     ]
   },
   {

v2rayN/v2rayN/Sample/dns_singbox_normal

@@ -3,11 +3,13 @@
     {
       "tag": "remote",
       "address": "tcp://8.8.8.8",
+      "strategy": "ipv4_only",
       "detour": "proxy"
     },
     {
       "tag": "local",
       "address": "223.5.5.5",
+      "strategy": "ipv4_only",
       "detour": "direct"
     },
     {
@@ -17,16 +19,17 @@
   ],
   "rules": [
     {
-      "geosite": [
-        "cn"
+      "rule_set": [
+        "geosite-geolocation-!cn"
       ],
-      "server": "local"
+      "server": "remote"
     },
     {
-      "geosite": [
-        "category-ads-all"
+      "rule_set": [
+        "geosite-category-ads-all"
       ],
       "server": "block"
     }
-  ]
+  ],
+  "final": "local"
 }

v2rayN/v2rayN/Sample/dns_v2ray_normal

@@ -7,7 +7,8 @@
     {
       "address": "223.5.5.5",
       "domains": [
-        "geosite:cn"
+        "geosite:cn",
+        "geosite:geolocation-cn"
       ],
       "expectIPs": [
         "geoip:cn"

v2rayN/v2rayN/Sample/tun_singbox_dns

@@ -3,11 +3,13 @@
     {
       "tag": "remote",
       "address": "tcp://8.8.8.8",
+      "strategy": "ipv4_only",
       "detour": "proxy"
     },
     {
       "tag": "local",
       "address": "223.5.5.5",
+      "strategy": "ipv4_only",
       "detour": "direct"
     },
     {
@@ -17,19 +19,17 @@
   ],
   "rules": [
     {
-      "geosite": [
-        "cn"
+      "rule_set": [
+        "geosite-geolocation-!cn"
       ],
-      "server": "local",
-      "disable_cache": true
+      "server": "remote"
     },
     {
-      "geosite": [
-        "category-ads-all"
+      "rule_set": [
+        "geosite-category-ads-all"
       ],
-      "server": "block",
-      "disable_cache": true
+      "server": "block"
     }
   ],
-  "strategy": "ipv4_only"
+  "final": "local"
 }

v2rayN/v2rayN/ViewModels/AddServer2ViewModel.cs

@@ -6,7 +6,7 @@ using System.IO;
 using System.Reactive;
 using System.Windows;
 using v2rayN.Handler;
-using v2rayN.Model;
+using v2rayN.Models;
 using v2rayN.Resx;
 
 namespace v2rayN.ViewModels
@@ -36,7 +36,7 @@ namespace v2rayN.ViewModels
             }
             else
             {
-                SelectedSource = JsonUtile.DeepCopy(profileItem);
+                SelectedSource = JsonUtils.DeepCopy(profileItem);
             }
 
             _view = view;
@@ -56,21 +56,21 @@ namespace v2rayN.ViewModels
                 SaveServer();
             });
 
-            Utile.SetDarkBorder(view, _config.uiItem.colorModeDark);
+            Utils.SetDarkBorder(view, _config.uiItem.followSystemTheme ? !Utils.IsLightTheme() : _config.uiItem.colorModeDark);
         }
 
         private void SaveServer()
         {
             string remarks = SelectedSource.remarks;
-            if (Utile.IsNullOrEmpty(remarks))
+            if (Utils.IsNullOrEmpty(remarks))
             {
-                UI.Show(ResUI.PleaseFillRemarks);
+                _noticeHandler?.Enqueue(ResUI.PleaseFillRemarks);
                 return;
             }
 
-            if (Utile.IsNullOrEmpty(SelectedSource.address))
+            if (Utils.IsNullOrEmpty(SelectedSource.address))
             {
-                UI.Show(ResUI.FillServerAddressCustom);
+                _noticeHandler?.Enqueue(ResUI.FillServerAddressCustom);
                 return;
             }
 
@@ -95,20 +95,20 @@ 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)
             {
                 return;
             }
-            if (Utile.IsNullOrEmpty(fileName))
+            if (Utils.IsNullOrEmpty(fileName))
             {
                 return;
             }
@@ -119,31 +119,31 @@ namespace v2rayN.ViewModels
             if (ConfigHandler.AddCustomServer(_config, item, false) == 0)
             {
                 _noticeHandler?.Enqueue(ResUI.SuccessfullyImportedCustomServer);
-                if (!Utile.IsNullOrEmpty(item.indexId))
+                if (!Utils.IsNullOrEmpty(item.indexId))
                 {
-                    SelectedSource = JsonUtile.DeepCopy(item);
+                    SelectedSource = JsonUtils.DeepCopy(item);
                 }
                 IsModified = true;
             }
             else
             {
-                UI.ShowWarning(ResUI.FailedImportedCustomServer);
+                _noticeHandler?.Enqueue(ResUI.FailedImportedCustomServer);
             }
         }
 
         private void EditServer()
         {
             var address = SelectedSource.address;
-            if (Utile.IsNullOrEmpty(address))
+            if (Utils.IsNullOrEmpty(address))
             {
-                UI.Show(ResUI.FillServerAddressCustom);
+                _noticeHandler?.Enqueue(ResUI.FillServerAddressCustom);
                 return;
             }
 
-            address = Utile.GetConfigPath(address);
+            address = Utils.GetConfigPath(address);
             if (File.Exists(address))
             {
-                Utile.ProcessStart(address);
+                Utils.ProcessStart(address);
             }
             else
             {

v2rayN/v2rayN/ViewModels/AddServerViewModel.cs

@@ -4,7 +4,7 @@ using Splat;
 using System.Reactive;
 using System.Windows;
 using v2rayN.Handler;
-using v2rayN.Model;
+using v2rayN.Models;
 using v2rayN.Resx;
 
 namespace v2rayN.ViewModels
@@ -36,7 +36,7 @@ namespace v2rayN.ViewModels
             }
             else
             {
-                SelectedSource = JsonUtile.DeepCopy(profileItem);
+                SelectedSource = JsonUtils.DeepCopy(profileItem);
             }
 
             SaveCmd = ReactiveCommand.Create(() =>
@@ -44,47 +44,48 @@ namespace v2rayN.ViewModels
                 SaveServer();
             });
 
-            Utile.SetDarkBorder(view, _config.uiItem.colorModeDark);
+            Utils.SetDarkBorder(view, _config.uiItem.followSystemTheme ? !Utils.IsLightTheme() : _config.uiItem.colorModeDark);
         }
 
         private void SaveServer()
         {
-            if (Utile.IsNullOrEmpty(SelectedSource.remarks))
+            if (Utils.IsNullOrEmpty(SelectedSource.remarks))
             {
-                UI.Show(ResUI.PleaseFillRemarks);
+                _noticeHandler?.Enqueue(ResUI.PleaseFillRemarks);
                 return;
             }
 
-            if (Utile.IsNullOrEmpty(SelectedSource.address))
+            if (Utils.IsNullOrEmpty(SelectedSource.address))
             {
-                UI.Show(ResUI.FillServerAddress);
+                _noticeHandler?.Enqueue(ResUI.FillServerAddress);
                 return;
             }
             var port = SelectedSource.port.ToString();
-            if (Utile.IsNullOrEmpty(port) || !Utile.IsNumeric(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 (Utile.IsNullOrEmpty(SelectedSource.id))
+                if (Utils.IsNullOrEmpty(SelectedSource.id))
                 {
-                    UI.Show(ResUI.FillPassword);
+                    _noticeHandler?.Enqueue(ResUI.FillPassword);
                     return;
                 }
-                if (Utile.IsNullOrEmpty(SelectedSource.security))
+                if (Utils.IsNullOrEmpty(SelectedSource.security))
                 {
-                    UI.Show(ResUI.PleaseSelectEncryption);
+                    _noticeHandler?.Enqueue(ResUI.PleaseSelectEncryption);
                     return;
                 }
             }
-            if (SelectedSource.configType != EConfigType.Socks)
+            if (SelectedSource.configType != EConfigType.Socks
+                && SelectedSource.configType != EConfigType.Http)
             {
-                if (Utile.IsNullOrEmpty(SelectedSource.id))
+                if (Utils.IsNullOrEmpty(SelectedSource.id))
                 {
-                    UI.Show(ResUI.FillUUID);
+                    _noticeHandler?.Enqueue(ResUI.FillUUID);
                     return;
                 }
             }
@@ -127,6 +128,7 @@ namespace v2rayN.ViewModels
                 EConfigType.VMess => ConfigHandler.AddServer(_config, item),
                 EConfigType.Shadowsocks => ConfigHandler.AddShadowsocksServer(_config, item),
                 EConfigType.Socks => ConfigHandler.AddSocksServer(_config, item),
+                EConfigType.Http => ConfigHandler.AddHttpServer(_config, item),
                 EConfigType.Trojan => ConfigHandler.AddTrojanServer(_config, item),
                 EConfigType.VLESS => ConfigHandler.AddVlessServer(_config, item),
                 EConfigType.Hysteria2 => ConfigHandler.AddHysteria2Server(_config, item),
@@ -143,7 +145,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.Model;
+using v2rayN.Models;
 using v2rayN.Resx;
 
 namespace v2rayN.ViewModels
@@ -47,23 +47,23 @@ namespace v2rayN.ViewModels
 
             ImportDefConfig4V2rayCmd = ReactiveCommand.Create(() =>
             {
-                normalDNS = Utile.GetEmbedText(Global.DNSV2rayNormalFileName);
+                normalDNS = Utils.GetEmbedText(Global.DNSV2rayNormalFileName);
             });
 
             ImportDefConfig4SingboxCmd = ReactiveCommand.Create(() =>
             {
-                normalDNS2 = Utile.GetEmbedText(Global.DNSSingboxNormalFileName);
-                tunDNS2 = Utile.GetEmbedText(Global.TunSingboxDNSFileName);
+                normalDNS2 = Utils.GetEmbedText(Global.DNSSingboxNormalFileName);
+                tunDNS2 = Utils.GetEmbedText(Global.TunSingboxDNSFileName);
             });
 
-            Utile.SetDarkBorder(view, _config.uiItem.colorModeDark);
+            Utils.SetDarkBorder(view, _config.uiItem.followSystemTheme ? !Utils.IsLightTheme() : _config.uiItem.colorModeDark);
         }
 
         private void SaveSetting()
         {
-            if (!Utile.IsNullOrEmpty(normalDNS))
+            if (!Utils.IsNullOrEmpty(normalDNS))
             {
-                var obj = JsonUtile.ParseJson(normalDNS);
+                var obj = JsonUtils.ParseJson(normalDNS);
                 if (obj != null && obj["servers"] != null)
                 {
                 }
@@ -71,26 +71,26 @@ namespace v2rayN.ViewModels
                 {
                     if (normalDNS.Contains("{") || normalDNS.Contains("}"))
                     {
-                        UI.Show(ResUI.FillCorrectDNSText);
+                        _noticeHandler?.Enqueue(ResUI.FillCorrectDNSText);
                         return;
                     }
                 }
             }
-            if (!Utile.IsNullOrEmpty(normalDNS2))
+            if (!Utils.IsNullOrEmpty(normalDNS2))
             {
-                var obj2 = JsonUtile.Deserialize<Dns4Sbox>(normalDNS2);
+                var obj2 = JsonUtils.Deserialize<Dns4Sbox>(normalDNS2);
                 if (obj2 == null)
                 {
-                    UI.Show(ResUI.FillCorrectDNSText);
+                    _noticeHandler?.Enqueue(ResUI.FillCorrectDNSText);
                     return;
                 }
             }
-            if (!Utile.IsNullOrEmpty(tunDNS2))
+            if (!Utils.IsNullOrEmpty(tunDNS2))
             {
-                var obj2 = JsonUtile.Deserialize<Dns4Sbox>(tunDNS2);
+                var obj2 = JsonUtils.Deserialize<Dns4Sbox>(tunDNS2);
                 if (obj2 == null)
                 {
-                    UI.Show(ResUI.FillCorrectDNSText);
+                    _noticeHandler?.Enqueue(ResUI.FillCorrectDNSText);
                     return;
                 }
             }
@@ -102,8 +102,8 @@ namespace v2rayN.ViewModels
             ConfigHandler.SaveDNSItems(_config, item);
 
             var item2 = LazyConfig.Instance.GetDNSItem(ECoreType.sing_box);
-            item2.normalDNS = JsonUtile.Serialize(JsonUtile.ParseJson(normalDNS2));
-            item2.tunDNS = JsonUtile.Serialize(JsonUtile.ParseJson(tunDNS2));
+            item2.normalDNS = JsonUtils.Serialize(JsonUtils.ParseJson(normalDNS2));
+            item2.tunDNS = JsonUtils.Serialize(JsonUtils.ParseJson(tunDNS2));
             ConfigHandler.SaveDNSItems(_config, item2);
 
             _noticeHandler?.Enqueue(ResUI.OperationSuccess);

v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs

@@ -15,7 +15,7 @@ using System.Text;
 using System.Windows;
 using System.Windows.Media;
 using v2rayN.Handler;
-using v2rayN.Model;
+using v2rayN.Models;
 using v2rayN.Resx;
 using v2rayN.Views;
 
@@ -86,6 +86,7 @@ namespace v2rayN.ViewModels
         public ReactiveCommand<Unit, Unit> AddVlessServerCmd { get; }
         public ReactiveCommand<Unit, Unit> AddShadowsocksServerCmd { get; }
         public ReactiveCommand<Unit, Unit> AddSocksServerCmd { get; }
+        public ReactiveCommand<Unit, Unit> AddHttpServerCmd { get; }
         public ReactiveCommand<Unit, Unit> AddTrojanServerCmd { get; }
         public ReactiveCommand<Unit, Unit> AddHysteria2ServerCmd { get; }
         public ReactiveCommand<Unit, Unit> AddTuicServerCmd { get; }
@@ -142,7 +143,8 @@ namespace v2rayN.ViewModels
         public ReactiveCommand<Unit, Unit> GlobalHotkeySettingCmd { get; }
         public ReactiveCommand<Unit, Unit> RebootAsAdminCmd { get; }
         public ReactiveCommand<Unit, Unit> ClearServerStatisticsCmd { get; }
-        public ReactiveCommand<Unit, Unit> ImportOldGuiConfigCmd { get; }
+        public ReactiveCommand<Unit, Unit> OpenTheFileLocationCmd { get; }
+        //public ReactiveCommand<Unit, Unit> ImportOldGuiConfigCmd { get; }
 
         //CheckUpdate
         public ReactiveCommand<Unit, Unit> CheckUpdateNCmd { get; }
@@ -265,7 +267,7 @@ namespace v2rayN.ViewModels
             SelectedMoveToGroup = new();
             SelectedRouting = new();
             SelectedServer = new();
-            if (_config.tunModeItem.enableTun && Utile.IsAdministrator())
+            if (_config.tunModeItem.enableTun && Utils.IsAdministrator())
             {
                 EnableTun = true;
             }
@@ -333,6 +335,10 @@ namespace v2rayN.ViewModels
             {
                 EditServer(true, EConfigType.Socks);
             });
+            AddHttpServerCmd = ReactiveCommand.Create(() =>
+            {
+                EditServer(true, EConfigType.Http);
+            });
             AddTrojanServerCmd = ReactiveCommand.Create(() =>
             {
                 EditServer(true, EConfigType.Trojan);
@@ -498,10 +504,14 @@ namespace v2rayN.ViewModels
                 _statistics?.ClearAllServerStatistics();
                 RefreshServers();
             });
-            ImportOldGuiConfigCmd = ReactiveCommand.Create(() =>
+            OpenTheFileLocationCmd = ReactiveCommand.Create(() =>
             {
-                ImportOldGuiConfig();
+                Utils.ProcessStart("Explorer", $"/select,{Utils.GetConfigPath()}");
             });
+            //ImportOldGuiConfigCmd = ReactiveCommand.Create(() =>
+            //{
+            //    ImportOldGuiConfig();
+            //});
 
             //CheckUpdate
             CheckUpdateNCmd = ReactiveCommand.Create(() =>
@@ -597,7 +607,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 +620,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,15 +648,15 @@ namespace v2rayN.ViewModels
         {
             try
             {
-                Application.Current.Dispatcher.Invoke((Action)(() =>
+                Application.Current?.Dispatcher.Invoke((Action)(() =>
                 {
                     if (!_showInTaskbar)
                     {
                         return;
                     }
 
-                    SpeedProxyDisplay = string.Format(ResUI.SpeedDisplayText, Global.ProxyTag, Utile.HumanFy(update.proxyUp), Utile.HumanFy(update.proxyDown));
-                    SpeedDirectDisplay = string.Format(ResUI.SpeedDisplayText, Global.DirectTag, Utile.HumanFy(update.directUp), Utile.HumanFy(update.directDown));
+                    SpeedProxyDisplay = string.Format(ResUI.SpeedDisplayText, Global.ProxyTag, Utils.HumanFy(update.proxyUp), Utils.HumanFy(update.proxyDown));
+                    SpeedDirectDisplay = string.Format(ResUI.SpeedDisplayText, Global.DirectTag, Utils.HumanFy(update.directUp), Utils.HumanFy(update.directDown));
 
                     if (update.proxyUp + update.proxyDown > 0)
                     {
@@ -652,20 +666,20 @@ namespace v2rayN.ViewModels
                             var item = _profileItems.Where(it => it.indexId == update.indexId).FirstOrDefault();
                             if (item != null)
                             {
-                                item.todayDown = Utile.HumanFy(update.todayDown);
-                                item.todayUp = Utile.HumanFy(update.todayUp);
-                                item.totalDown = Utile.HumanFy(update.totalDown);
-                                item.totalUp = Utile.HumanFy(update.totalUp);
+                                item.todayDown = Utils.HumanFy(update.todayDown);
+                                item.todayUp = Utils.HumanFy(update.todayUp);
+                                item.totalDown = Utils.HumanFy(update.totalDown);
+                                item.totalUp = Utils.HumanFy(update.totalUp);
 
                                 if (SelectedProfile?.indexId == item.indexId)
                                 {
-                                    var temp = JsonUtile.DeepCopy(item);
+                                    var temp = JsonUtils.DeepCopy(item);
                                     _profileItems.Replace(item, temp);
                                     SelectedProfile = temp;
                                 }
                                 else
                                 {
-                                    _profileItems.Replace(item, JsonUtile.DeepCopy(item));
+                                    _profileItems.Replace(item, JsonUtils.DeepCopy(item));
                                 }
                             }
                         }
@@ -680,7 +694,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);
             }));
@@ -688,7 +702,7 @@ namespace v2rayN.ViewModels
 
         private void SetTestResult(string indexId, string delay, string speed)
         {
-            if (Utile.IsNullOrEmpty(indexId))
+            if (Utils.IsNullOrEmpty(indexId))
             {
                 _noticeHandler?.SendMessage(delay, true);
                 _noticeHandler?.Enqueue(delay);
@@ -697,17 +711,17 @@ namespace v2rayN.ViewModels
             var item = _profileItems.Where(it => it.indexId == indexId).FirstOrDefault();
             if (item != null)
             {
-                if (!Utile.IsNullOrEmpty(delay))
+                if (!Utils.IsNullOrEmpty(delay))
                 {
                     int.TryParse(delay, out int temp);
                     item.delay = temp;
                     item.delayVal = $"{delay} {Global.DelayUnit}";
                 }
-                if (!Utile.IsNullOrEmpty(speed))
+                if (!Utils.IsNullOrEmpty(speed))
                 {
                     item.speedVal = $"{speed} {Global.SpeedUnit}";
                 }
-                _profileItems.Replace(item, JsonUtile.DeepCopy(item));
+                _profileItems.Replace(item, JsonUtils.DeepCopy(item));
             }
         }
 
@@ -743,7 +757,6 @@ namespace v2rayN.ViewModels
             {
                 Logging.SaveLog("MyAppExit Begin");
 
-                StorageUI();
                 ConfigHandler.SaveConfig(_config);
 
                 //HttpProxyHandle.CloseHttpAgent(config);
@@ -768,7 +781,6 @@ namespace v2rayN.ViewModels
             finally
             {
                 Application.Current.Shutdown();
-                Environment.Exit(0);
             }
         }
 
@@ -797,7 +809,7 @@ namespace v2rayN.ViewModels
                 return;
             }
             _serverFilter = ServerFilter;
-            if (Utile.IsNullOrEmpty(_serverFilter))
+            if (Utils.IsNullOrEmpty(_serverFilter))
             {
                 RefreshServers();
             }
@@ -837,14 +849,14 @@ namespace v2rayN.ViewModels
                             delay = t33 == null ? 0 : t33.delay,
                             delayVal = t33?.delay != 0 ? $"{t33?.delay} {Global.DelayUnit}" : string.Empty,
                             speedVal = t33?.speed != 0 ? $"{t33?.speed} {Global.SpeedUnit}" : string.Empty,
-                            todayDown = t22 == null ? "" : Utile.HumanFy(t22.todayDown),
-                            todayUp = t22 == null ? "" : Utile.HumanFy(t22.todayUp),
-                            totalDown = t22 == null ? "" : Utile.HumanFy(t22.totalDown),
-                            totalUp = t22 == null ? "" : Utile.HumanFy(t22.totalUp)
+                            todayDown = t22 == null ? "" : Utils.HumanFy(t22.todayDown),
+                            todayUp = t22 == null ? "" : Utils.HumanFy(t22.todayUp),
+                            totalDown = t22 == null ? "" : Utils.HumanFy(t22.totalDown),
+                            totalUp = t22 == null ? "" : Utils.HumanFy(t22.totalUp)
                         }).OrderBy(t => t.sort).ToList();
-            _lstProfile = JsonUtile.Deserialize<List<ProfileItem>>(JsonUtile.Serialize(lstModel));
+            _lstProfile = JsonUtils.Deserialize<List<ProfileItem>>(JsonUtils.Serialize(lstModel));
 
-            Application.Current.Dispatcher.Invoke((Action)(() =>
+            Application.Current?.Dispatcher.Invoke((Action)(() =>
             {
                 _profileItems.Clear();
                 _profileItems.AddRange(lstModel);
@@ -947,7 +959,7 @@ namespace v2rayN.ViewModels
             }
             else
             {
-                lstSelecteds = JsonUtile.Deserialize<List<ProfileItem>>(JsonUtile.Serialize(orderProfiles));
+                lstSelecteds = JsonUtils.Deserialize<List<ProfileItem>>(JsonUtils.Serialize(orderProfiles));
             }
 
             return 0;
@@ -967,7 +979,7 @@ namespace v2rayN.ViewModels
             }
             else
             {
-                if (Utile.IsNullOrEmpty(SelectedProfile?.indexId))
+                if (Utils.IsNullOrEmpty(SelectedProfile?.indexId))
                 {
                     return;
                 }
@@ -1000,7 +1012,7 @@ namespace v2rayN.ViewModels
 
         public void AddServerViaClipboard()
         {
-            var clipboardData = Utile.GetClipboardData();
+            var clipboardData = Utils.GetClipboardData();
             int ret = ConfigHandler.AddBatchServers(_config, clipboardData!, _subId, false);
             if (ret > 0)
             {
@@ -1014,15 +1026,15 @@ namespace v2rayN.ViewModels
         {
             ShowHideWindow(false);
 
-            var dpiXY = Utile.GetDpiXY(Application.Current.MainWindow);
+            var dpiXY = QRCodeHelper.GetDpiXY(Application.Current.MainWindow);
             string result = await Task.Run(() =>
             {
-                return Utile.ScanScreen(dpiXY.Item1, dpiXY.Item2);
+                return QRCodeHelper.ScanScreen(dpiXY.Item1, dpiXY.Item2);
             });
 
             ShowHideWindow(true);
 
-            if (Utile.IsNullOrEmpty(result))
+            if (Utils.IsNullOrEmpty(result))
             {
                 _noticeHandler?.Enqueue(ResUI.NoValidQRcodeFound);
             }
@@ -1084,7 +1096,7 @@ namespace v2rayN.ViewModels
 
         public void SetDefaultServer()
         {
-            if (Utile.IsNullOrEmpty(SelectedProfile?.indexId))
+            if (Utils.IsNullOrEmpty(SelectedProfile?.indexId))
             {
                 return;
             }
@@ -1093,7 +1105,7 @@ namespace v2rayN.ViewModels
 
         private void SetDefaultServer(string indexId)
         {
-            if (Utile.IsNullOrEmpty(indexId))
+            if (Utils.IsNullOrEmpty(indexId))
             {
                 return;
             }
@@ -1125,7 +1137,7 @@ namespace v2rayN.ViewModels
             {
                 return;
             }
-            if (Utile.IsNullOrEmpty(SelectedServer.ID))
+            if (Utils.IsNullOrEmpty(SelectedServer.ID))
             {
                 return;
             }
@@ -1141,7 +1153,7 @@ namespace v2rayN.ViewModels
                 return;
             }
             var url = ShareHandler.GetShareUrl(item);
-            if (Utile.IsNullOrEmpty(url))
+            if (Utils.IsNullOrEmpty(url))
             {
                 return;
             }
@@ -1157,7 +1169,7 @@ namespace v2rayN.ViewModels
 
         public void SortServer(string colName)
         {
-            if (Utile.IsNullOrEmpty(colName))
+            if (Utils.IsNullOrEmpty(colName))
             {
                 return;
             }
@@ -1182,7 +1194,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)
                     {
@@ -1282,7 +1294,7 @@ namespace v2rayN.ViewModels
             foreach (var it in lstSelecteds)
             {
                 string url = ShareHandler.GetShareUrl(it);
-                if (Utile.IsNullOrEmpty(url))
+                if (Utils.IsNullOrEmpty(url))
                 {
                     continue;
                 }
@@ -1291,7 +1303,7 @@ namespace v2rayN.ViewModels
             }
             if (sb.Length > 0)
             {
-                Utile.SetClipboardData(sb.ToString());
+                Utils.SetClipboardData(sb.ToString());
                 _noticeHandler?.SendMessage(ResUI.BatchExportURLSuccessfully);
             }
         }
@@ -1307,7 +1319,7 @@ namespace v2rayN.ViewModels
             foreach (var it in lstSelecteds)
             {
                 string? url = ShareHandler.GetShareUrl(it);
-                if (Utile.IsNullOrEmpty(url))
+                if (Utils.IsNullOrEmpty(url))
                 {
                     continue;
                 }
@@ -1316,7 +1328,7 @@ namespace v2rayN.ViewModels
             }
             if (sb.Length > 0)
             {
-                Utile.SetClipboardData(Utile.Base64Encode(sb.ToString()));
+                Utils.SetClipboardData(Utils.Base64Encode(sb.ToString()));
                 _noticeHandler?.SendMessage(ResUI.BatchExportSubscriptionSuccessfully);
             }
         }
@@ -1403,8 +1415,8 @@ namespace v2rayN.ViewModels
             {
                 UseShellExecute = true,
                 Arguments = Global.RebootAs,
-                WorkingDirectory = Utile.StartupPath(),
-                FileName = Utile.GetExePath().AppendQuotes(),
+                WorkingDirectory = Utils.StartupPath(),
+                FileName = Utils.GetExePath().AppendQuotes(),
                 Verb = "runas",
             };
             try
@@ -1415,32 +1427,32 @@ namespace v2rayN.ViewModels
             catch { }
         }
 
-        private void ImportOldGuiConfig()
-        {
-            if (UI.OpenFileDialog(out string fileName,
-                "guiNConfig|*.json|All|*.*") != true)
-            {
-                return;
-            }
-            if (Utile.IsNullOrEmpty(fileName))
-            {
-                return;
-            }
+        //private void ImportOldGuiConfig()
+        //{
+        //    if (UI.OpenFileDialog(out string fileName,
+        //        "guiNConfig|*.json|All|*.*") != true)
+        //    {
+        //        return;
+        //    }
+        //    if (Utils.IsNullOrEmpty(fileName))
+        //    {
+        //        return;
+        //    }
 
-            var ret = ConfigHandler.ImportOldGuiConfig(_config, fileName);
-            if (ret == 0)
-            {
-                RefreshRoutingsMenu();
-                InitSubscriptionView();
-                RefreshServers();
-                Reload();
-                UI.Show(ResUI.OperationSuccess);
-            }
-            else
-            {
-                _noticeHandler.Enqueue(ResUI.OperationFailed);
-            }
-        }
+        //    var ret = ConfigHandler.ImportOldGuiConfig(_config, fileName);
+        //    if (ret == 0)
+        //    {
+        //        RefreshRoutingsMenu();
+        //        InitSubscriptionView();
+        //        RefreshServers();
+        //        Reload();
+        //        _noticeHandler?.Enqueue(ResUI.OperationSuccess);
+        //    }
+        //    else
+        //    {
+        //        _noticeHandler?.Enqueue(ResUI.OperationFailed);
+        //    }
+        //}
 
         #endregion Setting
 
@@ -1466,10 +1478,10 @@ namespace v2rayN.ViewModels
                 _noticeHandler?.SendMessage(msg);
                 if (success)
                 {
-                    CloseV2ray();
+                    CloseCore();
 
-                    string fileName = Utile.GetTempPath(Utile.GetDownloadFileName(msg));
-                    string toPath = Utile.GetBinPath("", type.ToString());
+                    string fileName = Utils.GetTempPath(Utils.GetDownloadFileName(msg));
+                    string toPath = Utils.GetBinPath("", type.ToString());
 
                     FileManager.ZipExtractToFile(fileName, toPath, _config.guiItem.ignoreGeoUpdateCore ? "geo" : "");
 
@@ -1495,24 +1507,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 +1536,7 @@ namespace v2rayN.ViewModels
             });
         }
 
-        private void CloseV2ray()
+        private void CloseCore()
         {
             ConfigHandler.SaveConfig(_config, false);
 
@@ -1533,7 +1545,7 @@ namespace v2rayN.ViewModels
             _coreHandler.CoreStop();
         }
 
-        #endregion v2ray job
+        #endregion core job
 
         #region System proxy and Routings
 
@@ -1555,7 +1567,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);
@@ -1643,7 +1655,7 @@ namespace v2rayN.ViewModels
             {
                 _config.tunModeItem.enableTun = EnableTun;
                 // When running as a non-administrator, reboot to administrator mode
-                if (EnableTun && !Utile.IsAdministrator())
+                if (EnableTun && !Utils.IsAdministrator())
                 {
                     _config.tunModeItem.enableTun = false;
                     RebootAsAdmin();
@@ -1685,7 +1697,7 @@ namespace v2rayN.ViewModels
         {
             if (FollowSystemTheme)
             {
-                ModifyTheme(!Utile.IsLightTheme());
+                ModifyTheme(!Utils.IsLightTheme());
             }
             else
             {
@@ -1704,10 +1716,6 @@ namespace v2rayN.ViewModels
             }
         }
 
-        private void StorageUI()
-        {
-        }
-
         private void BindingUI()
         {
             ColorModeDark = _config.uiItem.colorModeDark;
@@ -1743,7 +1751,7 @@ namespace v2rayN.ViewModels
                             ConfigHandler.SaveConfig(_config);
                             if (FollowSystemTheme)
                             {
-                                ModifyTheme(!Utile.IsLightTheme());
+                                ModifyTheme(!Utils.IsLightTheme());
                             }
                             else
                             {
@@ -1795,7 +1803,7 @@ namespace v2rayN.ViewModels
              y => y != null && !y.IsNullOrEmpty())
                 .Subscribe(c =>
                 {
-                    if (!Utile.IsNullOrEmpty(CurrentLanguage))
+                    if (!Utils.IsNullOrEmpty(CurrentLanguage))
                     {
                         _config.uiItem.currentLanguage = CurrentLanguage;
                         Thread.CurrentThread.CurrentUICulture = new(CurrentLanguage);
@@ -1807,7 +1815,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 +1823,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 +1832,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
@@ -1844,10 +1852,10 @@ namespace v2rayN.ViewModels
         {
             var theme = _paletteHelper.GetTheme();
 
-            theme.SetBaseTheme(isDarkTheme ? Theme.Dark : Theme.Light);
+            theme.SetBaseTheme(isDarkTheme ? BaseTheme.Dark : BaseTheme.Light);
             _paletteHelper.SetTheme(theme);
 
-            Utile.SetDarkBorder(Application.Current.MainWindow, isDarkTheme);
+            Utils.SetDarkBorder(Application.Current.MainWindow, isDarkTheme);
         }
 
         public void ChangePrimaryColor(System.Windows.Media.Color color)
@@ -1869,7 +1877,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.Model;
+using v2rayN.Models;
 using v2rayN.Resx;
 
 namespace v2rayN.ViewModels
@@ -20,6 +20,7 @@ namespace v2rayN.ViewModels
         [Reactive] public int localPort { get; set; }
         [Reactive] public bool udpEnabled { get; set; }
         [Reactive] public bool sniffingEnabled { get; set; }
+        public IList<string> destOverride { get; set; }
         [Reactive] public bool routeOnly { get; set; }
         [Reactive] public bool allowLANConn { get; set; }
         [Reactive] public bool newPort4LAN { get; set; }
@@ -32,8 +33,10 @@ namespace v2rayN.ViewModels
         [Reactive] public string defFingerprint { get; set; }
         [Reactive] public string defUserAgent { get; set; }
         [Reactive] public string mux4SboxProtocol { get; set; }
+        [Reactive] public bool enableCacheFile4Sbox { get; set; }
         [Reactive] public int hyUpMbps { get; set; }
         [Reactive] public int hyDownMbps { get; set; }
+        [Reactive] public bool enableFragment { get; set; }
 
         #endregion Core
 
@@ -62,9 +65,9 @@ namespace v2rayN.ViewModels
         [Reactive] public bool EnableCheckPreReleaseUpdate { get; set; }
         [Reactive] public bool EnableDragDropSort { get; set; }
         [Reactive] public bool DoubleClick2Activate { get; set; }
-        [Reactive] public int autoUpdateInterval { get; set; }
-        [Reactive] public int trayMenuServersLimit { get; set; }
-        [Reactive] public string currentFontFamily { get; set; }
+        [Reactive] public int AutoUpdateInterval { get; set; }
+        [Reactive] public int TrayMenuServersLimit { get; set; }
+        [Reactive] public string CurrentFontFamily { get; set; }
         [Reactive] public int SpeedTestTimeout { get; set; }
         [Reactive] public string SpeedTestUrl { get; set; }
         [Reactive] public string SpeedPingTestUrl { get; set; }
@@ -127,8 +130,10 @@ namespace v2rayN.ViewModels
             defFingerprint = _config.coreBasicItem.defFingerprint;
             defUserAgent = _config.coreBasicItem.defUserAgent;
             mux4SboxProtocol = _config.mux4SboxItem.protocol;
+            enableCacheFile4Sbox = _config.coreBasicItem.enableCacheFile4Sbox;
             hyUpMbps = _config.hysteriaItem.up_mbps;
             hyDownMbps = _config.hysteriaItem.down_mbps;
+            enableFragment = _config.coreBasicItem.enableFragment;
 
             #endregion Core
 
@@ -157,9 +162,9 @@ namespace v2rayN.ViewModels
             EnableCheckPreReleaseUpdate = _config.guiItem.checkPreReleaseUpdate;
             EnableDragDropSort = _config.uiItem.enableDragDropSort;
             DoubleClick2Activate = _config.uiItem.doubleClick2Activate;
-            autoUpdateInterval = _config.guiItem.autoUpdateInterval;
-            trayMenuServersLimit = _config.guiItem.trayMenuServersLimit;
-            currentFontFamily = _config.uiItem.currentFontFamily;
+            AutoUpdateInterval = _config.guiItem.autoUpdateInterval;
+            TrayMenuServersLimit = _config.guiItem.trayMenuServersLimit;
+            CurrentFontFamily = _config.uiItem.currentFontFamily;
             SpeedTestTimeout = _config.speedTestItem.speedTestTimeout;
             SpeedTestUrl = _config.speedTestItem.speedTestUrl;
             SpeedPingTestUrl = _config.speedTestItem.speedPingTestUrl;
@@ -192,7 +197,7 @@ namespace v2rayN.ViewModels
                 SaveSetting();
             });
 
-            Utile.SetDarkBorder(view, _config.uiItem.colorModeDark);
+            Utils.SetDarkBorder(view, _config.uiItem.followSystemTheme ? !Utils.IsLightTheme() : _config.uiItem.colorModeDark);
         }
 
         private void InitCoreType()
@@ -249,12 +254,16 @@ namespace v2rayN.ViewModels
 
         private void SaveSetting()
         {
-            if (Utile.IsNullOrEmpty(localPort.ToString()) || !Utile.IsNumeric(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;
             }
+            var needReboot = (EnableStatistics != _config.guiItem.enableStatistics
+                            || EnableDragDropSort != _config.uiItem.enableDragDropSort
+                            || EnableHWA != _config.guiItem.enableHWA
+                            || CurrentFontFamily != _config.uiItem.currentFontFamily);  
 
             //if (Utile.IsNullOrEmpty(Kcpmtu.ToString()) || !Utile.IsNumeric(Kcpmtu.ToString())
             //       || Utile.IsNullOrEmpty(Kcptti.ToString()) || !Utile.IsNumeric(Kcptti.ToString())
@@ -263,7 +272,7 @@ namespace v2rayN.ViewModels
             //       || Utile.IsNullOrEmpty(KcpreadBufferSize.ToString()) || !Utile.IsNumeric(KcpreadBufferSize.ToString())
             //       || Utile.IsNullOrEmpty(KcpwriteBufferSize.ToString()) || !Utile.IsNumeric(KcpwriteBufferSize.ToString()))
             //{
-            //    UI.Show(ResUI.FillKcpParameters);
+            //    _noticeHandler?.Enqueue(ResUI.FillKcpParameters);
             //    return;
             //}
 
@@ -271,6 +280,7 @@ namespace v2rayN.ViewModels
             _config.inbound[0].localPort = localPort;
             _config.inbound[0].udpEnabled = udpEnabled;
             _config.inbound[0].sniffingEnabled = sniffingEnabled;
+            _config.inbound[0].destOverride = destOverride?.ToList();
             _config.inbound[0].routeOnly = routeOnly;
             _config.inbound[0].allowLANConn = allowLANConn;
             _config.inbound[0].newPort4LAN = newPort4LAN;
@@ -287,8 +297,10 @@ namespace v2rayN.ViewModels
             _config.coreBasicItem.defFingerprint = defFingerprint;
             _config.coreBasicItem.defUserAgent = defUserAgent;
             _config.mux4SboxItem.protocol = mux4SboxProtocol;
+            _config.coreBasicItem.enableCacheFile4Sbox = enableCacheFile4Sbox;
             _config.hysteriaItem.up_mbps = hyUpMbps;
             _config.hysteriaItem.down_mbps = hyDownMbps;
+            _config.coreBasicItem.enableFragment = enableFragment;
 
             //Kcp
             //_config.kcpItem.mtu = Kcpmtu;
@@ -300,7 +312,7 @@ namespace v2rayN.ViewModels
             //_config.kcpItem.congestion = Kcpcongestion;
 
             //UI
-            Utile.SetAutoRun(Global.AutoRunRegPath, Global.AutoRunName, AutoRun);
+            Utils.SetAutoRun(Global.AutoRunRegPath, Global.AutoRunName, AutoRun);
             _config.guiItem.autoRun = AutoRun;
             _config.guiItem.enableStatistics = EnableStatistics;
             _config.guiItem.keepOlderDedupl = KeepOlderDedupl;
@@ -309,12 +321,12 @@ namespace v2rayN.ViewModels
             _config.uiItem.enableUpdateSubOnlyRemarksExist = EnableUpdateSubOnlyRemarksExist;
             _config.guiItem.enableSecurityProtocolTls13 = EnableSecurityProtocolTls13;
             _config.uiItem.autoHideStartup = AutoHideStartup;
-            _config.guiItem.autoUpdateInterval = autoUpdateInterval;
+            _config.guiItem.autoUpdateInterval = AutoUpdateInterval;
             _config.guiItem.checkPreReleaseUpdate = EnableCheckPreReleaseUpdate;
             _config.uiItem.enableDragDropSort = EnableDragDropSort;
             _config.uiItem.doubleClick2Activate = DoubleClick2Activate;
-            _config.guiItem.trayMenuServersLimit = trayMenuServersLimit;
-            _config.uiItem.currentFontFamily = currentFontFamily;
+            _config.guiItem.trayMenuServersLimit = TrayMenuServersLimit;
+            _config.uiItem.currentFontFamily = CurrentFontFamily;
             _config.speedTestItem.speedTestTimeout = SpeedTestTimeout;
             _config.speedTestItem.speedTestUrl = SpeedTestUrl;
             _config.speedTestItem.speedPingTestUrl = SpeedPingTestUrl;
@@ -337,12 +349,19 @@ namespace v2rayN.ViewModels
 
             if (ConfigHandler.SaveConfig(_config) == 0)
             {
-                _noticeHandler?.Enqueue(ResUI.OperationSuccess);
+                if (needReboot)
+                {
+                    _noticeHandler?.Enqueue(ResUI.NeedRebootTips);
+                }
+                else
+                {
+                    _noticeHandler?.Enqueue(ResUI.OperationSuccess);
+                }
                 _view.DialogResult = true;
             }
             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.Model;
+using v2rayN.Models;
 using v2rayN.Resx;
 
 namespace v2rayN.ViewModels
@@ -43,7 +43,7 @@ namespace v2rayN.ViewModels
 
             if (rulesItem.id.IsNullOrEmpty())
             {
-                rulesItem.id = Utile.GetGUID(false);
+                rulesItem.id = Utils.GetGUID(false);
                 rulesItem.outboundTag = Global.ProxyTag;
                 rulesItem.enabled = true;
                 SelectedSource = rulesItem;
@@ -53,35 +53,35 @@ namespace v2rayN.ViewModels
                 SelectedSource = rulesItem;
             }
 
-            Domain = Utile.List2String(SelectedSource.domain, true);
-            IP = Utile.List2String(SelectedSource.ip, true);
-            Process = Utile.List2String(SelectedSource.process, true);
+            Domain = Utils.List2String(SelectedSource.domain, true);
+            IP = Utils.List2String(SelectedSource.ip, true);
+            Process = Utils.List2String(SelectedSource.process, true);
 
             SaveCmd = ReactiveCommand.Create(() =>
             {
                 SaveRules();
             });
 
-            Utile.SetDarkBorder(view, _config.uiItem.colorModeDark);
+            Utils.SetDarkBorder(view, _config.uiItem.followSystemTheme ? !Utils.IsLightTheme() : _config.uiItem.colorModeDark);
         }
 
         private void SaveRules()
         {
-            Domain = Utile.Convert2Comma(Domain);
-            IP = Utile.Convert2Comma(IP);
-            Process = Utile.Convert2Comma(Process);
+            Domain = Utils.Convert2Comma(Domain);
+            IP = Utils.Convert2Comma(IP);
+            Process = Utils.Convert2Comma(Process);
 
             if (AutoSort)
             {
-                SelectedSource.domain = Utile.String2ListSorted(Domain);
-                SelectedSource.ip = Utile.String2ListSorted(IP);
-                SelectedSource.process = Utile.String2ListSorted(Process);
+                SelectedSource.domain = Utils.String2ListSorted(Domain);
+                SelectedSource.ip = Utils.String2ListSorted(IP);
+                SelectedSource.process = Utils.String2ListSorted(Process);
             }
             else
             {
-                SelectedSource.domain = Utile.String2List(Domain);
-                SelectedSource.ip = Utile.String2List(IP);
-                SelectedSource.process = Utile.String2List(Process);
+                SelectedSource.domain = Utils.String2List(Domain);
+                SelectedSource.ip = Utils.String2List(IP);
+                SelectedSource.process = Utils.String2List(Process);
             }
             SelectedSource.protocol = ProtocolItems?.ToList();
             SelectedSource.inboundTag = InboundTagItems?.ToList();
@@ -90,11 +90,11 @@ namespace v2rayN.ViewModels
               || SelectedSource.ip?.Count > 0
               || SelectedSource.protocol?.Count > 0
               || SelectedSource.process?.Count > 0
-              || !Utile.IsNullOrEmpty(SelectedSource.port);
+              || !Utils.IsNullOrEmpty(SelectedSource.port);
 
             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.Model;
+using v2rayN.Models;
 using v2rayN.Resx;
 using v2rayN.Views;
 using Application = System.Windows.Application;
@@ -58,7 +58,7 @@ namespace v2rayN.ViewModels
             else
             {
                 SelectedRouting = routingItem;
-                _rules = JsonUtile.Deserialize<List<RulesItem>>(SelectedRouting.ruleSet);
+                _rules = JsonUtils.Deserialize<List<RulesItem>>(SelectedRouting.ruleSet);
             }
 
             RefreshRulesItems();
@@ -115,7 +115,7 @@ namespace v2rayN.ViewModels
                 SaveRouting();
             });
 
-            Utile.SetDarkBorder(view, _config.uiItem.colorModeDark);
+            Utils.SetDarkBorder(view, _config.uiItem.followSystemTheme ? !Utils.IsLightTheme() : _config.uiItem.colorModeDark);
         }
 
         public void RefreshRulesItems()
@@ -129,10 +129,10 @@ namespace v2rayN.ViewModels
                     id = item.id,
                     outboundTag = item.outboundTag,
                     port = item.port,
-                    protocols = Utile.List2String(item.protocol),
-                    inboundTags = Utile.List2String(item.inboundTag),
-                    domains = Utile.List2String(item.domain),
-                    ips = Utile.List2String(item.ip),
+                    protocols = Utils.List2String(item.protocol),
+                    inboundTags = Utils.List2String(item.inboundTag),
+                    domains = Utils.List2String(item.domain),
+                    ips = Utils.List2String(item.ip),
                     enabled = item.enabled,
                 };
                 _rulesItems.Add(it);
@@ -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,23 +192,24 @@ namespace v2rayN.ViewModels
         {
             if (SelectedSource is null || SelectedSource.outboundTag.IsNullOrEmpty())
             {
-                UI.Show(ResUI.PleaseSelectRules);
+                _noticeHandler?.Enqueue(ResUI.PleaseSelectRules);
                 return;
             }
 
-            var lst = new List<RulesItem>();
+            var lst = new List<RulesItem4Ray>();
             foreach (var it in SelectedSources)
             {
                 var item = _rules.FirstOrDefault(t => t.id == it?.id);
                 if (item != null)
                 {
-                    lst.Add(item);
+                    var item2 = JsonUtils.Deserialize<RulesItem4Ray>(JsonUtils.Serialize(item));
+                    lst.Add(item2 ?? new());
                 }
             }
             if (lst.Count > 0)
             {
-                Utile.SetClipboardData(JsonUtile.Serialize(lst));
-                //UI.Show(ResUI.OperationSuccess"));
+                Utils.SetClipboardData(JsonUtils.Serialize(lst));
+                //_noticeHandler?.Enqueue(ResUI.OperationSuccess"));
             }
         }
 
@@ -216,7 +217,7 @@ namespace v2rayN.ViewModels
         {
             if (SelectedSource is null || SelectedSource.outboundTag.IsNullOrEmpty())
             {
-                UI.Show(ResUI.PleaseSelectRules);
+                _noticeHandler?.Enqueue(ResUI.PleaseSelectRules);
                 return;
             }
 
@@ -235,18 +236,18 @@ namespace v2rayN.ViewModels
         private void SaveRouting()
         {
             string remarks = SelectedRouting.remarks;
-            if (Utile.IsNullOrEmpty(remarks))
+            if (Utils.IsNullOrEmpty(remarks))
             {
-                UI.Show(ResUI.PleaseFillRemarks);
+                _noticeHandler?.Enqueue(ResUI.PleaseFillRemarks);
                 return;
             }
             var item = SelectedRouting;
             foreach (var it in _rules)
             {
-                it.id = Utile.GetGUID(false);
+                it.id = Utils.GetGUID(false);
             }
             item.ruleNum = _rules.Count;
-            item.ruleSet = JsonUtile.Serialize(_rules, false);
+            item.ruleSet = JsonUtils.Serialize(_rules, false);
 
             if (ConfigHandler.SaveRoutingItem(_config, item) == 0)
             {
@@ -255,7 +256,7 @@ namespace v2rayN.ViewModels
             }
             else
             {
-                UI.ShowWarning(ResUI.OperationFailed);
+                _noticeHandler?.Enqueue(ResUI.OperationFailed);
             }
         }
 
@@ -268,13 +269,13 @@ namespace v2rayN.ViewModels
             {
                 return;
             }
-            if (Utile.IsNullOrEmpty(fileName))
+            if (Utils.IsNullOrEmpty(fileName))
             {
                 return;
             }
 
-            string result = Utile.LoadResource(fileName);
-            if (Utile.IsNullOrEmpty(result))
+            string result = Utils.LoadResource(fileName);
+            if (Utils.IsNullOrEmpty(result))
             {
                 return;
             }
@@ -282,26 +283,26 @@ namespace v2rayN.ViewModels
             if (AddBatchRoutingRules(SelectedRouting, result) == 0)
             {
                 RefreshRulesItems();
-                UI.Show(ResUI.OperationSuccess);
+                _noticeHandler?.Enqueue(ResUI.OperationSuccess);
             }
         }
 
         private void ImportRulesFromClipboard()
         {
-            string clipboardData = Utile.GetClipboardData();
+            string clipboardData = Utils.GetClipboardData();
             if (AddBatchRoutingRules(SelectedRouting, clipboardData) == 0)
             {
                 RefreshRulesItems();
-                UI.Show(ResUI.OperationSuccess);
+                _noticeHandler?.Enqueue(ResUI.OperationSuccess);
             }
         }
 
         private async Task ImportRulesFromUrl()
         {
             var url = SelectedRouting.url;
-            if (Utile.IsNullOrEmpty(url))
+            if (Utils.IsNullOrEmpty(url))
             {
-                UI.Show(ResUI.MsgNeedUrl);
+                _noticeHandler?.Enqueue(ResUI.MsgNeedUrl);
                 return;
             }
 
@@ -313,7 +314,7 @@ namespace v2rayN.ViewModels
                 {
                     RefreshRulesItems();
                 }));
-                UI.Show(ResUI.OperationSuccess);
+                _noticeHandler?.Enqueue(ResUI.OperationSuccess);
             }
         }
 
@@ -324,18 +325,18 @@ namespace v2rayN.ViewModels
             {
                 blReplace = true;
             }
-            if (Utile.IsNullOrEmpty(clipboardData))
+            if (Utils.IsNullOrEmpty(clipboardData))
             {
                 return -1;
             }
-            var lstRules = JsonUtile.Deserialize<List<RulesItem>>(clipboardData);
+            var lstRules = JsonUtils.Deserialize<List<RulesItem>>(clipboardData);
             if (lstRules == null)
             {
                 return -1;
             }
             foreach (var rule in lstRules)
             {
-                rule.id = Utile.GetGUID(false);
+                rule.id = Utils.GetGUID(false);
             }
 
             if (blReplace)

v2rayN/v2rayN/ViewModels/RoutingSettingViewModel.cs

@@ -5,7 +5,7 @@ using Splat;
 using System.Reactive;
 using System.Windows;
 using v2rayN.Handler;
-using v2rayN.Model;
+using v2rayN.Models;
 using v2rayN.Resx;
 using v2rayN.Views;
 
@@ -126,7 +126,7 @@ namespace v2rayN.ViewModels
                 SaveRouting();
             });
 
-            Utile.SetDarkBorder(view, _config.uiItem.colorModeDark);
+            Utils.SetDarkBorder(view, _config.uiItem.followSystemTheme ? !Utils.IsLightTheme() : _config.uiItem.colorModeDark);
         }
 
         #region locked
@@ -136,15 +136,15 @@ namespace v2rayN.ViewModels
             _lockedItem = ConfigHandler.GetLockedRoutingItem(_config);
             if (_lockedItem != null)
             {
-                _lockedRules = JsonUtile.Deserialize<List<RulesItem>>(_lockedItem.ruleSet);
-                ProxyDomain = Utile.List2String(_lockedRules[0].domain, true);
-                ProxyIP = Utile.List2String(_lockedRules[0].ip, true);
+                _lockedRules = JsonUtils.Deserialize<List<RulesItem>>(_lockedItem.ruleSet);
+                ProxyDomain = Utils.List2String(_lockedRules[0].domain, true);
+                ProxyIP = Utils.List2String(_lockedRules[0].ip, true);
 
-                DirectDomain = Utile.List2String(_lockedRules[1].domain, true);
-                DirectIP = Utile.List2String(_lockedRules[1].ip, true);
+                DirectDomain = Utils.List2String(_lockedRules[1].domain, true);
+                DirectIP = Utils.List2String(_lockedRules[1].ip, true);
 
-                BlockDomain = Utile.List2String(_lockedRules[2].domain, true);
-                BlockIP = Utile.List2String(_lockedRules[2].ip, true);
+                BlockDomain = Utils.List2String(_lockedRules[2].domain, true);
+                BlockIP = Utils.List2String(_lockedRules[2].ip, true);
             }
         }
 
@@ -152,16 +152,16 @@ namespace v2rayN.ViewModels
         {
             if (_lockedItem != null)
             {
-                _lockedRules[0].domain = Utile.String2List(Utile.Convert2Comma(ProxyDomain.TrimEx()));
-                _lockedRules[0].ip = Utile.String2List(Utile.Convert2Comma(ProxyIP.TrimEx()));
+                _lockedRules[0].domain = Utils.String2List(Utils.Convert2Comma(ProxyDomain.TrimEx()));
+                _lockedRules[0].ip = Utils.String2List(Utils.Convert2Comma(ProxyIP.TrimEx()));
 
-                _lockedRules[1].domain = Utile.String2List(Utile.Convert2Comma(DirectDomain.TrimEx()));
-                _lockedRules[1].ip = Utile.String2List(Utile.Convert2Comma(DirectIP.TrimEx()));
+                _lockedRules[1].domain = Utils.String2List(Utils.Convert2Comma(DirectDomain.TrimEx()));
+                _lockedRules[1].ip = Utils.String2List(Utils.Convert2Comma(DirectIP.TrimEx()));
 
-                _lockedRules[2].domain = Utile.String2List(Utile.Convert2Comma(BlockDomain.TrimEx()));
-                _lockedRules[2].ip = Utile.String2List(Utile.Convert2Comma(BlockIP.TrimEx()));
+                _lockedRules[2].domain = Utils.String2List(Utils.Convert2Comma(BlockDomain.TrimEx()));
+                _lockedRules[2].ip = Utils.String2List(Utils.Convert2Comma(BlockIP.TrimEx()));
 
-                _lockedItem.ruleSet = JsonUtile.Serialize(_lockedRules, false);
+                _lockedItem.ruleSet = JsonUtils.Serialize(_lockedRules, false);
 
                 ConfigHandler.SaveRoutingItem(_config, _lockedItem);
             }
@@ -192,6 +192,7 @@ namespace v2rayN.ViewModels
                     remarks = item.remarks,
                     url = item.url,
                     customIcon = item.customIcon,
+                    customRulesetPath4Singbox = item.customRulesetPath4Singbox,
                     sort = item.sort,
                 };
                 _routingItems.Add(it);
@@ -214,7 +215,7 @@ namespace v2rayN.ViewModels
             }
             else
             {
-                UI.ShowWarning(ResUI.OperationFailed);
+                _noticeHandler?.Enqueue(ResUI.OperationFailed);
             }
         }
 
@@ -229,7 +230,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 +260,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 +285,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.Model;
+using v2rayN.Models;
 using v2rayN.Resx;
 
 namespace v2rayN.ViewModels
@@ -32,7 +32,7 @@ namespace v2rayN.ViewModels
             }
             else
             {
-                SelectedSource = JsonUtile.DeepCopy(subItem);
+                SelectedSource = JsonUtils.DeepCopy(subItem);
             }
 
             SaveCmd = ReactiveCommand.Create(() =>
@@ -40,15 +40,15 @@ namespace v2rayN.ViewModels
                 SaveSub();
             });
 
-            Utile.SetDarkBorder(view, _config.uiItem.colorModeDark);
+            Utils.SetDarkBorder(view, _config.uiItem.followSystemTheme ? !Utils.IsLightTheme() : _config.uiItem.colorModeDark);
         }
 
         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.Model;
+using v2rayN.Models;
 using v2rayN.Resx;
 using v2rayN.Views;
 
@@ -62,7 +62,7 @@ namespace v2rayN.ViewModels
                 SubShare();
             }, canEditRemove);
 
-            Utile.SetDarkBorder(view, _config.uiItem.colorModeDark);
+            Utils.SetDarkBorder(view, _config.uiItem.followSystemTheme ? !Utils.IsLightTheme() : _config.uiItem.colorModeDark);
         }
 
         public void RefreshSubItems()
@@ -112,7 +112,7 @@ namespace v2rayN.ViewModels
 
         private async void SubShare()
         {
-            if (Utile.IsNullOrEmpty(SelectedSource?.url))
+            if (Utils.IsNullOrEmpty(SelectedSource?.url))
             {
                 return;
             }

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.Model;
+using v2rayN.Models;
 using v2rayN.ViewModels;
 
 namespace v2rayN.Views
@@ -51,6 +51,6 @@ namespace v2rayN.Views
         private void Window_Loaded(object sender, RoutedEventArgs e)
         {
             txtRemarks.Focus();
-        }         
+        }
     }
 }

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.Model;
+using v2rayN.Models;
 using v2rayN.Resx;
 using v2rayN.ViewModels;
 
@@ -92,6 +92,7 @@ namespace v2rayN.Views
                     break;
 
                 case EConfigType.Socks:
+                case EConfigType.Http:
                     gridSocks.Visibility = Visibility.Visible;
                     break;
 
@@ -174,6 +175,7 @@ namespace v2rayN.Views
                         break;
 
                     case EConfigType.Socks:
+                    case EConfigType.Http:
                         this.Bind(ViewModel, vm => vm.SelectedSource.id, v => v.txtId4.Text).DisposeWith(disposables);
                         this.Bind(ViewModel, vm => vm.SelectedSource.security, v => v.txtSecurity4.Text).DisposeWith(disposables);
                         break;
@@ -265,7 +267,7 @@ namespace v2rayN.Views
         private void btnGUID_Click(object sender, RoutedEventArgs e)
         {
             txtId.Text =
-            txtId5.Text = Utile.GetGUID();
+            txtId5.Text = Utils.GetGUID();
         }
 
         private void SetHeaderType()
@@ -273,18 +275,18 @@ namespace v2rayN.Views
             cmbHeaderType.Items.Clear();
 
             var network = cmbNetwork.SelectedItem.ToString();
-            if (Utile.IsNullOrEmpty(network))
+            if (Utils.IsNullOrEmpty(network))
             {
                 cmbHeaderType.Items.Add(Global.None);
                 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,7 +294,7 @@ 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.GrpcMultiMode);
@@ -307,7 +309,7 @@ namespace v2rayN.Views
         private void SetTips()
         {
             var network = cmbNetwork.SelectedItem.ToString();
-            if (Utile.IsNullOrEmpty(network))
+            if (Utils.IsNullOrEmpty(network))
             {
                 network = Global.DefaultNetwork;
             }
@@ -318,33 +320,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

@@ -88,6 +88,7 @@
                             Style="{StaticResource ToolbarTextBlock}">
                             <Hyperlink Click="linkDnsObjectDoc_Click">
                                 <TextBlock Text="{x:Static resx:ResUI.TbDnsObjectDoc}" />
+                                <materialDesign:PackIcon Kind="Link" />
                             </Hyperlink>
                         </TextBlock>
                         <Button
@@ -120,6 +121,7 @@
                             Style="{StaticResource ToolbarTextBlock}">
                             <Hyperlink Click="linkDnsSingboxObjectDoc_Click">
                                 <TextBlock Text="{x:Static resx:ResUI.TbDnsSingboxObjectDoc}" />
+                                <materialDesign:PackIcon Kind="Link" />
                             </Hyperlink>
                         </TextBlock>
                         <Button

v2rayN/v2rayN/Views/DNSSettingWindow.xaml.cs

@@ -2,7 +2,7 @@
 using System.Reactive.Disposables;
 using System.Windows;
 using v2rayN.Handler;
-using v2rayN.Model;
+using v2rayN.Models;
 using v2rayN.ViewModels;
 
 namespace v2rayN.Views
@@ -51,12 +51,12 @@ namespace v2rayN.Views
 
         private void linkDnsObjectDoc_Click(object sender, RoutedEventArgs e)
         {
-            Utile.ProcessStart("https://www.v2fly.org/config/dns.html#dnsobject");
+            Utils.ProcessStart("https://xtls.github.io/config/dns.html#dnsobject");
         }
 
         private void linkDnsSingboxObjectDoc_Click(object sender, RoutedEventArgs e)
         {
-            Utile.ProcessStart("https://sing-box.sagernet.org/zh/configuration/dns/");
+            Utils.ProcessStart("https://sing-box.sagernet.org/zh/configuration/dns/");
         }
     }
 }

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.Model;
+using v2rayN.Models;
 using v2rayN.Resx;
 
 namespace v2rayN.Views
@@ -39,7 +39,7 @@ namespace v2rayN.Views
 
             HotkeyHandler.Instance.IsPause = true;
             this.Closing += (s, e) => HotkeyHandler.Instance.IsPause = false;
-            Utile.SetDarkBorder(this, _config.uiItem.colorModeDark);
+            Utils.SetDarkBorder(this, _config.uiItem.followSystemTheme ? !Utils.IsLightTheme() : _config.uiItem.colorModeDark);
             InitData();
         }
 
@@ -70,7 +70,7 @@ namespace v2rayN.Views
 
         private KeyEventItem GetKeyEventItemByEGlobalHotkey(List<KeyEventItem> KEList, EGlobalHotkey eg)
         {
-            return JsonUtile.DeepCopy(KEList.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

@@ -15,6 +15,7 @@
     Title="v2rayN"
     Width="900"
     Height="700"
+    MinWidth="900"
     x:TypeArguments="vms:MainWindowViewModel"
     Background="{DynamicResource MaterialDesignPaper}"
     FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
@@ -37,6 +38,7 @@
 
     <materialDesign:DialogHost
         Identifier="RootDialog"
+        materialDesign:TransitionAssist.DisableTransitions="True"
         SnackbarMessageQueue="{Binding ElementName=MainSnackbar, Path=MessageQueue}"
         Style="{StaticResource MaterialDesignEmbeddedDialogHost}">
         <Grid>
@@ -79,6 +81,10 @@
                                     x:Name="menuAddSocksServer"
                                     Height="{StaticResource MenuItemHeight}"
                                     Header="{x:Static resx:ResUI.menuAddSocksServer}" />
+                                <MenuItem
+                                    x:Name="menuAddHttpServer"
+                                    Height="{StaticResource MenuItemHeight}"
+                                    Header="{x:Static resx:ResUI.menuAddHttpServer}" />
                                 <MenuItem
                                     x:Name="menuAddTrojanServer"
                                     Height="{StaticResource MenuItemHeight}"
@@ -186,9 +192,13 @@
                                     Header="{x:Static resx:ResUI.menuClearServerStatistics}" />
                                 <Separator Margin="-40,5" />
                                 <MenuItem
+                                    x:Name="menuOpenTheFileLocation"
+                                    Height="{StaticResource MenuItemHeight}"
+                                    Header="{x:Static resx:ResUI.menuOpenTheFileLocation}" />
+                                <!--<MenuItem
                                     x:Name="menuImportOldGuiConfig"
                                     Height="{StaticResource MenuItemHeight}"
-                                    Header="{x:Static resx:ResUI.menuImportOldGuiConfig}" />
+                                    Header="{x:Static resx:ResUI.menuImportOldGuiConfig}" />-->
                             </MenuItem>
                         </Menu>
                         <Separator />
@@ -665,9 +675,9 @@
                             <Style BasedOn="{StaticResource MaterialDesignDataGridCell}" TargetType="DataGridCell">
                                 <Style.Triggers>
                                     <DataTrigger Binding="{Binding isActive}" Value="True">
-                                        <Setter Property="Background" Value="{DynamicResource PrimaryHueLightBrush}" />
+                                        <Setter Property="Background" Value="{DynamicResource MaterialDesign.Brush.Primary.Light}" />
                                         <Setter Property="Foreground" Value="Black" />
-                                        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryHueLightBrush}" />
+                                        <Setter Property="BorderBrush" Value="{DynamicResource MaterialDesign.Brush.Primary.Light}" />
                                     </DataTrigger>
                                 </Style.Triggers>
                             </Style>

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.Model;
+using v2rayN.Models;
 using v2rayN.Resx;
 using v2rayN.ViewModels;
 using Point = System.Windows.Point;
@@ -86,6 +86,7 @@ namespace v2rayN.Views
                 this.BindCommand(ViewModel, vm => vm.AddVlessServerCmd, v => v.menuAddVlessServer).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.AddShadowsocksServerCmd, v => v.menuAddShadowsocksServer).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.AddSocksServerCmd, v => v.menuAddSocksServer).DisposeWith(disposables);
+                this.BindCommand(ViewModel, vm => vm.AddHttpServerCmd, v => v.menuAddHttpServer).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.AddTrojanServerCmd, v => v.menuAddTrojanServer).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.AddHysteria2ServerCmd, v => v.menuAddHysteria2Server).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.AddTuicServerCmd, v => v.menuAddTuicServer).DisposeWith(disposables);
@@ -137,7 +138,8 @@ namespace v2rayN.Views
                 this.BindCommand(ViewModel, vm => vm.GlobalHotkeySettingCmd, v => v.menuGlobalHotkeySetting).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.RebootAsAdminCmd, v => v.menuRebootAsAdmin).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.ClearServerStatisticsCmd, v => v.menuClearServerStatistics).DisposeWith(disposables);
-                this.BindCommand(ViewModel, vm => vm.ImportOldGuiConfigCmd, v => v.menuImportOldGuiConfig).DisposeWith(disposables);
+                this.BindCommand(ViewModel, vm => vm.OpenTheFileLocationCmd, v => v.menuOpenTheFileLocation).DisposeWith(disposables);
+                //this.BindCommand(ViewModel, vm => vm.ImportOldGuiConfigCmd, v => v.menuImportOldGuiConfig).DisposeWith(disposables);
 
                 //check update
                 this.BindCommand(ViewModel, vm => vm.CheckUpdateNCmd, v => v.menuCheckUpdateN).DisposeWith(disposables);
@@ -210,8 +212,8 @@ namespace v2rayN.Views
             RestoreUI();
             AddHelpMenuItem();
 
-            var IsAdministrator = Utile.IsAdministrator();
-            this.Title = $"{Utile.GetVersion()} - {(IsAdministrator ? ResUI.RunAsAdmin : ResUI.NotRunAsAdmin)}";
+            var IsAdministrator = Utils.IsAdministrator();
+            this.Title = $"{Utils.GetVersion()} - {(IsAdministrator ? ResUI.RunAsAdmin : ResUI.NotRunAsAdmin)}";
 
             //if (_config.uiItem.autoHideStartup)
             //{
@@ -234,7 +236,7 @@ namespace v2rayN.Views
                     {
                         if (wParam == IntPtr.Zero && Marshal.PtrToStringUni(lParam) == "ImmersiveColorSet")
                         {
-                            ViewModel?.ModifyTheme(!Utile.IsLightTheme());
+                            ViewModel?.ModifyTheme(!Utils.IsLightTheme());
                         }
                     }
                 }
@@ -421,7 +423,7 @@ namespace v2rayN.Views
 
         private void menuPromotion_Click(object sender, RoutedEventArgs e)
         {
-            Utile.ProcessStart($"{Utile.Base64Decode(Global.PromotionUrl)}?t={DateTime.Now.Ticks}");
+            Utils.ProcessStart($"{Utils.Base64Decode(Global.PromotionUrl)}?t={DateTime.Now.Ticks}");
         }
 
         private void txtRunningInfoDisplay_MouseDoubleClick(object sender, MouseButtonEventArgs e)
@@ -431,7 +433,7 @@ namespace v2rayN.Views
 
         private void menuSettingsSetUWP_Click(object sender, RoutedEventArgs e)
         {
-            Utile.ProcessStart(Utile.GetBinPath("EnableLoopback.exe"));
+            Utils.ProcessStart(Utils.GetBinPath("EnableLoopback.exe"));
         }
 
         private void BtnAutofitColumnWidth_Click(object sender, RoutedEventArgs e)
@@ -516,8 +518,8 @@ namespace v2rayN.Views
 
         private void StorageUI()
         {
-            _config.uiItem.mainWidth = Utile.ToInt(this.Width);
-            _config.uiItem.mainHeight = Utile.ToInt(this.Height);
+            _config.uiItem.mainWidth = Utils.ToInt(this.Width);
+            _config.uiItem.mainHeight = Utils.ToInt(this.Height);
 
             List<ColumnItem> lvColumnItem = new();
             for (int k = 0; k < lstProfiles.Columns.Count; k++)
@@ -526,7 +528,7 @@ namespace v2rayN.Views
                 lvColumnItem.Add(new()
                 {
                     Name = item2.ExName,
-                    Width = item2.Visibility == Visibility.Visible ? Utile.ToInt(item2.ActualWidth) : -1,
+                    Width = item2.Visibility == Visibility.Visible ? Utils.ToInt(item2.ActualWidth) : -1,
                     Index = item2.DisplayIndex
                 });
             }
@@ -559,7 +561,7 @@ namespace v2rayN.Views
         {
             if (sender is MenuItem item)
             {
-                Utile.ProcessStart(item.Tag.ToString());
+                Utils.ProcessStart(item.Tag.ToString());
             }
         }