up 6.46

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

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.27.0" />
+		<PackageReference Include="Grpc.Net.Client" Version="2.63.0" />
+		<PackageReference Include="Grpc.Tools" Version="2.64.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.Mode;
+using v2rayN.Models;
 
 namespace v2rayN
 {
@@ -34,7 +35,6 @@ namespace v2rayN
             if (!rebootas && !bCreatedNew)
             {
                 ProgramStarted.Set();
-                Current.Shutdown();
                 Environment.Exit(0);
                 return;
             }
@@ -54,15 +54,16 @@ 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;
             }
-            //if (RuntimeInformation.ProcessArchitecture != Architecture.X86 && RuntimeInformation.ProcessArchitecture != Architecture.X64)
-            //{
-            //    _config.guiItem.enableStatistics = false;
-            //}
+
+            //Under Win10
+            if (Environment.OSVersion.Version.Major < 10)
+            {
+                Environment.SetEnvironmentVariable("DOTNET_EnableWriteXorExecute", "0", EnvironmentVariableTarget.Process);
+            }
         }
 
         private void App_DispatcherUnhandledException(object sender, DispatcherUnhandledExceptionEventArgs e)
@@ -83,5 +84,12 @@ namespace v2rayN
         {
             Logging.SaveLog("TaskScheduler_UnobservedTaskException", e.Exception);
         }
+
+        protected override void OnExit(ExitEventArgs e)
+        {
+            Logging.SaveLog("OnExit");
+            base.OnExit(e);
+            Process.GetCurrentProcess().Kill();
+        }
     }
 }

v2rayN/v2rayN/Common/DownloaderHelper.cs

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

v2rayN/v2rayN/Common/FileManager.cs

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

v2rayN/v2rayN/Common/HttpClientHelper.cs

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

v2rayN/v2rayN/Common/JsonUtils.cs

@@ -28,7 +28,7 @@ namespace v2rayN
         {
             try
             {
-                if (string.IsNullOrEmpty(strJson))
+                if (string.IsNullOrWhiteSpace(strJson))
                 {
                     return default;
                 }
@@ -49,7 +49,7 @@ namespace v2rayN
         {
             try
             {
-                if (string.IsNullOrEmpty(strJson))
+                if (string.IsNullOrWhiteSpace(strJson))
                 {
                     return null;
                 }
@@ -105,9 +105,12 @@ namespace v2rayN
         /// <param name="filePath"></param>
         /// <param name="nullValue"></param>
         /// <returns></returns>
-        public static int ToFile(object? obj, string filePath, bool nullValue = true)
+        public static int ToFile(object? obj, string? filePath, bool nullValue = true)
         {
-            int result;
+            if (filePath is null)
+            {
+                return -1;
+            }
             try
             {
                 using FileStream file = File.Create(filePath);
@@ -119,14 +122,13 @@ namespace v2rayN
                 };
 
                 JsonSerializer.Serialize(file, obj, options);
-                result = 0;
+                return 0;
             }
             catch (Exception ex)
             {
                 Logging.SaveLog(ex.Message, ex);
-                result = -1;
+                return -1;
             }
-            return result;
         }
     }
 }

v2rayN/v2rayN/Common/QRCodeHelper.cs

@@ -1,6 +1,13 @@
 using QRCoder;
 using QRCoder.Xaml;
+using System.Drawing;
+using System.Windows;
+using System.Windows.Interop;
 using System.Windows.Media;
+using ZXing;
+using ZXing.Common;
+using ZXing.QrCode;
+using ZXing.Windows.Compatibility;
 
 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/QueryableExtension.cs

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

v2rayN/v2rayN/Common/SqliteHelper.cs

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

v2rayN/v2rayN/Common/UI.cs

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

v2rayN/v2rayN/Common/Utils.cs

@@ -18,10 +18,6 @@ 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
 {
@@ -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)
@@ -325,7 +324,10 @@ namespace v2rayN
                 var key = Uri.UnescapeDataString(keyValue[0]);
                 var val = Uri.UnescapeDataString(keyValue[1]);
 
-                result.Add(key, val);
+                if (result[key] is null)
+                {
+                    result.Add(key, val);
+                }
             }
 
             return result;
@@ -358,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;
                 }
@@ -388,7 +390,7 @@ namespace v2rayN
 
         public static string Convert2Comma(string text)
         {
-            if (string.IsNullOrWhiteSpace(text))
+            if (Utils.IsNullOrEmpty(text))
             {
                 return text;
             }
@@ -404,7 +406,7 @@ namespace v2rayN
         /// </summary>
         /// <param name="oText"></param>
         /// <returns></returns>
-        public static bool IsNumberic(string oText)
+        public static bool IsNumeric(string oText)
         {
             try
             {
@@ -425,7 +427,7 @@ namespace v2rayN
         /// <returns></returns>
         public static bool IsNullOrEmpty(string? text)
         {
-            if (string.IsNullOrEmpty(text))
+            if (string.IsNullOrWhiteSpace(text))
             {
                 return true;
             }
@@ -456,7 +458,7 @@ namespace v2rayN
                 string[] cidr = ip.Split('/');
                 if (cidr.Length == 2)
                 {
-                    if (!IsNumberic(cidr[0]))
+                    if (!IsNumeric(cidr[0]))
                     {
                         return false;
                     }
@@ -475,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))
@@ -576,11 +578,10 @@ namespace v2rayN
             return inUse;
         }
 
-        public static int GetFreePort()
+        public static int GetFreePort(int defaultPort = 9090)
         {
             try
             {
-                int defaultPort = 9090;
                 if (!Utils.PortInUse(defaultPort))
                 {
                     return defaultPort;
@@ -595,7 +596,7 @@ namespace v2rayN
             catch
             {
             }
-            return 69090;
+            return 59090;
         }
 
         #endregion 测速
@@ -739,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)
             {
@@ -838,7 +839,7 @@ namespace v2rayN
             {
                 Directory.CreateDirectory(_tempPath);
             }
-            if (string.IsNullOrEmpty(filename))
+            if (Utils.IsNullOrEmpty(filename))
             {
                 return _tempPath;
             }
@@ -874,7 +875,7 @@ namespace v2rayN
             {
                 Directory.CreateDirectory(_tempPath);
             }
-            if (string.IsNullOrEmpty(filename))
+            if (Utils.IsNullOrEmpty(filename))
             {
                 return _tempPath;
             }
@@ -899,7 +900,7 @@ namespace v2rayN
                     Directory.CreateDirectory(_tempPath);
                 }
             }
-            if (string.IsNullOrEmpty(filename))
+            if (Utils.IsNullOrEmpty(filename))
             {
                 return _tempPath;
             }
@@ -916,7 +917,7 @@ namespace v2rayN
             {
                 Directory.CreateDirectory(_tempPath);
             }
-            if (string.IsNullOrEmpty(filename))
+            if (Utils.IsNullOrEmpty(filename))
             {
                 return _tempPath;
             }
@@ -933,7 +934,7 @@ namespace v2rayN
             {
                 Directory.CreateDirectory(_tempPath);
             }
-            if (string.IsNullOrEmpty(filename))
+            if (Utils.IsNullOrEmpty(filename))
             {
                 return _tempPath;
             }
@@ -945,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>
@@ -1027,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());
                     }
                 }
             }
@@ -1105,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;
             }
@@ -1120,7 +1061,7 @@ namespace v2rayN
             {
                 taskService.RootFolder.DeleteTask(t.Name);
             }
-            if (string.IsNullOrEmpty(fileName))
+            if (Utils.IsNullOrEmpty(fileName))
             {
                 return;
             }
@@ -1134,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);
         }
@@ -1143,8 +1084,10 @@ namespace v2rayN
         {
             try
             {
+                var sum = MD5.HashData(Encoding.UTF8.GetBytes("wintunsingbox_tun"));
+                var guid = new Guid(sum);
                 string pnputilPath = @"C:\Windows\System32\pnputil.exe";
-                string arg = $" /remove-device /deviceid \"wintun\"";
+                string arg = $$""" /remove-device  "SWD\Wintun\{{{guid}}}" """;
 
                 // Try to remove the device
                 Process proc = new()

v2rayN/v2rayN/Converters/MaterialDesignFonts.cs

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

v2rayN/v2rayN/Enums/EConfigType.cs

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

v2rayN/v2rayN/Enums/ECoreType.cs

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

v2rayN/v2rayN/Enums/EGlobalHotkey.cs

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

v2rayN/v2rayN/Enums/EInboundProtocol.cs

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

v2rayN/v2rayN/Enums/EMove.cs

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

v2rayN/v2rayN/Enums/EServerColName.cs

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

v2rayN/v2rayN/Enums/ESpeedActionType.cs

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

v2rayN/v2rayN/Enums/ESysProxyType.cs

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

v2rayN/v2rayN/Enums/ETransport.cs

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

v2rayN/v2rayN/Enums/EViewAction.cs

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

v2rayN/v2rayN/Global.cs

@@ -1,4 +1,4 @@
-using v2rayN.Mode;
+using v2rayN.Enums;
 
 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";
@@ -35,8 +32,8 @@ namespace v2rayN
         public const string CoreSpeedtestConfigFileName = "configSpeedtest.json";
         public const string V2raySampleClient = "v2rayN.Sample.SampleClientConfig";
         public const string SingboxSampleClient = "v2rayN.Sample.SingboxSampleClientConfig";
-        public const string V2raySampleHttprequestFileName = "v2rayN.Sample.SampleHttprequest";
-        public const string V2raySampleHttpresponseFileName = "v2rayN.Sample.SampleHttpresponse";
+        public const string V2raySampleHttpRequestFileName = "v2rayN.Sample.SampleHttpRequest";
+        public const string V2raySampleHttpResponseFileName = "v2rayN.Sample.SampleHttpResponse";
         public const string V2raySampleInbound = "v2rayN.Sample.SampleInbound";
         public const string V2raySampleOutbound = "v2rayN.Sample.SampleOutbound";
         public const string SingboxSampleOutbound = "v2rayN.Sample.SingboxSampleOutbound";
@@ -56,28 +53,23 @@ namespace v2rayN
         public const string BlockTag = "block";
         public const string StreamSecurity = "tls";
         public const string StreamSecurityReality = "reality";
-        public const string InboundSocks = "socks";
-        public const string InboundHttp = "http";
-        public const string InboundSocks2 = "socks2";
-        public const string InboundHttp2 = "http2";
         public const string Loopback = "127.0.0.1";
-        public const string InboundAPITagName = "api";
-        public const string InboundAPIProtocal = "dokodemo-door";
+        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>";
-        public const string GrpcgunMode = "gun";
-        public const string GrpcmultiMode = "multi";
+        public const string GrpcGunMode = "gun";
+        public const string GrpcMultiMode = "multi";
         public const int MaxPort = 65536;
         public const string CommandClearMsg = "CommandClearMsg";
+        public const string CommandSendMsgView = "CommandSendMsgView";
+        public const string CommandStopSpeedTest = "CommandStopSpeedTest";
         public const string DelayUnit = "";
         public const string SpeedUnit = "";
         public const int MinFontSize = 10;
@@ -114,15 +106,16 @@ namespace v2rayN
             @"https://speed.cloudflare.com/__down?bytes=100000000",
             @"https://speed.cloudflare.com/__down?bytes=10000000",
             @"http://cachefly.cachefly.net/50mb.test",
-            @"http://cachefly.cachefly.net/100mb.test",
             @"http://cachefly.cachefly.net/10mb.test"
         };
 
         public static readonly List<string> SpeedPingTestUrls = new() {
             @"https://www.google.com/generate_204",
+            @"https://www.apple.com/library/test/success.html",
+            @"http://www.msftconnecttest.com/connecttest.txt",
         };
 
-        public static readonly Dictionary<string, string> UserAgentTxts = new()
+        public static readonly Dictionary<string, string> UserAgentTexts = new()
         {
             {"chrome","Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.131 Safari/537.36" },
             {"firefox","Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:90.0) Gecko/20100101 Firefox/90.0" },
@@ -150,6 +143,7 @@ namespace v2rayN
             {EConfigType.VMess,"vmess"},
             {EConfigType.Shadowsocks,"shadowsocks"},
             {EConfigType.Socks,"socks"},
+            {EConfigType.Http,"http"},
             {EConfigType.VLESS,"vless"},
             {EConfigType.Trojan,"trojan"},
             {EConfigType.Hysteria2,"hysteria2"},
@@ -157,29 +151,30 @@ namespace v2rayN
             {EConfigType.Wireguard,"wireguard"}
         };
 
-        public static readonly List<string> VmessSecuritys = new() { "aes-128-gcm", "chacha20-poly1305", "auto", "none", "zero" };
-        public static readonly List<string> SsSecuritys = new() { "aes-256-gcm", "aes-128-gcm", "chacha20-poly1305", "chacha20-ietf-poly1305", "none", "plain" };
-        public static readonly List<string> SsSecuritysInSagerNet = new() { "none", "2022-blake3-aes-128-gcm", "2022-blake3-aes-256-gcm", "2022-blake3-chacha20-poly1305", "aes-128-gcm", "aes-192-gcm", "aes-256-gcm", "chacha20-ietf-poly1305", "xchacha20-ietf-poly1305", "rc4", "rc4-md5", "aes-128-ctr", "aes-192-ctr", "aes-256-ctr", "aes-128-cfb", "aes-192-cfb", "aes-256-cfb", "aes-128-cfb8", "aes-192-cfb8", "aes-256-cfb8", "aes-128-ofb", "aes-192-ofb", "aes-256-ofb", "bf-cfb", "cast5-cfb", "des-cfb", "idea-cfb", "rc2-cfb", "seed-cfb", "camellia-128-cfb", "camellia-192-cfb", "camellia-256-cfb", "camellia-128-cfb8", "camellia-192-cfb8", "camellia-256-cfb8", "salsa20", "chacha20", "chacha20-ietf", "xchacha20" };
-        public static readonly List<string> SsSecuritysInXray = new() { "aes-256-gcm", "aes-128-gcm", "chacha20-poly1305", "chacha20-ietf-poly1305", "xchacha20-poly1305", "xchacha20-ietf-poly1305", "none", "plain", "2022-blake3-aes-128-gcm", "2022-blake3-aes-256-gcm", "2022-blake3-chacha20-poly1305" };
-        public static readonly List<string> SsSecuritysInSingbox = new() { "aes-256-gcm", "aes-192-gcm", "aes-128-gcm", "chacha20-ietf-poly1305", "xchacha20-ietf-poly1305", "none", "2022-blake3-aes-128-gcm", "2022-blake3-aes-256-gcm", "2022-blake3-chacha20-poly1305", "aes-128-ctr", "aes-192-ctr", "aes-256-ctr", "aes-128-cfb", "aes-192-cfb", "aes-256-cfb", "rc4-md5", "chacha20-ietf", "xchacha20" };
+        public static readonly List<string> VmessSecurities = new() { "aes-128-gcm", "chacha20-poly1305", "auto", "none", "zero" };
+        public static readonly List<string> SsSecurities = new() { "aes-256-gcm", "aes-128-gcm", "chacha20-poly1305", "chacha20-ietf-poly1305", "none", "plain" };
+        public static readonly List<string> SsSecuritiesInSagerNet = new() { "none", "2022-blake3-aes-128-gcm", "2022-blake3-aes-256-gcm", "2022-blake3-chacha20-poly1305", "aes-128-gcm", "aes-192-gcm", "aes-256-gcm", "chacha20-ietf-poly1305", "xchacha20-ietf-poly1305", "rc4", "rc4-md5", "aes-128-ctr", "aes-192-ctr", "aes-256-ctr", "aes-128-cfb", "aes-192-cfb", "aes-256-cfb", "aes-128-cfb8", "aes-192-cfb8", "aes-256-cfb8", "aes-128-ofb", "aes-192-ofb", "aes-256-ofb", "bf-cfb", "cast5-cfb", "des-cfb", "idea-cfb", "rc2-cfb", "seed-cfb", "camellia-128-cfb", "camellia-192-cfb", "camellia-256-cfb", "camellia-128-cfb8", "camellia-192-cfb8", "camellia-256-cfb8", "salsa20", "chacha20", "chacha20-ietf", "xchacha20" };
+        public static readonly List<string> 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", "splithttp", "h2", "quic", "grpc" };
         public static readonly List<string> KcpHeaderTypes = new() { "srtp", "utp", "wechat-video", "dtls", "wireguard" };
         public static readonly List<string> CoreTypes = new() { "v2fly", "SagerNet", "Xray", "sing_box" };
         public static readonly List<string> CoreTypes4VLESS = new() { "Xray", "sing_box" };
-        public static readonly List<string> DomainStrategys = new() { "AsIs", "IPIfNonMatch", "IPOnDemand" };
-        public static readonly List<string> DomainStrategys4Singbox = new() { "ipv4_only", "ipv6_only", "prefer_ipv4", "prefer_ipv6", "" };
+        public static readonly List<string> DomainStrategies = new() { "AsIs", "IPIfNonMatch", "IPOnDemand" };
+        public static readonly List<string> DomainStrategies4Singbox = new() { "ipv4_only", "ipv6_only", "prefer_ipv4", "prefer_ipv6", "" };
         public static readonly List<string> DomainMatchers = new() { "linear", "mph", "" };
         public static readonly List<string> Fingerprints = new() { "chrome", "firefox", "safari", "ios", "android", "edge", "360", "qq", "random", "randomized", "" };
         public static readonly List<string> UserAgent = new() { "chrome", "firefox", "safari", "edge", "none" };
 
-        public static readonly List<string> AllowInsecures = new() { "true", "false", "" };
+        public static readonly List<string> AllowInsecure = new() { "true", "false", "" };
         public static readonly List<string> DomainStrategy4Freedoms = new() { "AsIs", "UseIP", "UseIPv4", "UseIPv6", "" };
         public static readonly List<string> Languages = new() { "zh-Hans", "zh-Hant", "en", "fa-Ir", "ru" };
         public static readonly List<string> Alpns = new() { "h3", "h2", "http/1.1", "h3,h2,http/1.1", "h3,h2", "h2,http/1.1", "" };
         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,9 @@
 using System.Data;
 using System.IO;
 using System.Text.RegularExpressions;
-using v2rayN.Mode;
+using v2rayN.Enums;
+using v2rayN.Handler.Fmt;
+using v2rayN.Models;
 
 namespace v2rayN.Handler
 {
@@ -50,7 +52,6 @@ namespace v2rayN.Handler
                 {
                     logEnabled = false,
                     loglevel = "warning",
-
                     muxEnabled = false,
                 };
             }
@@ -61,7 +62,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 +70,12 @@ namespace v2rayN.Handler
                 };
 
                 config.inbound.Add(inItem);
-
-                //inItem = new InItem();
-                //inItem.protocol = "http";
-                //inItem.localPort = 1081;
-                //inItem.udpEnabled = true;
-
-                //config.inbound.Add(inItem);
             }
             else
             {
                 if (config.inbound.Count > 0)
                 {
-                    config.inbound[0].protocol = Global.InboundSocks;
+                    config.inbound[0].protocol = EInboundProtocol.socks.ToString();
                 }
             }
             if (config.routingBasicItem == null)
@@ -94,9 +88,9 @@ namespace v2rayN.Handler
             //路由规则
             if (Utils.IsNullOrEmpty(config.routingBasicItem.domainStrategy))
             {
-                config.routingBasicItem.domainStrategy = Global.DomainStrategys[0];//"IPIfNonMatch";
+                config.routingBasicItem.domainStrategy = Global.DomainStrategies[0];//"IPIfNonMatch";
             }
-            //if (Utils.IsNullOrEmpty(config.domainMatcher))
+            //if (Utile.IsNullOrEmpty(config.domainMatcher))
             //{
             //    config.domainMatcher = "linear";
             //}
@@ -187,10 +181,7 @@ namespace v2rayN.Handler
                 config.mux4SboxItem = new()
                 {
                     protocol = Global.SingboxMuxs[0],
-                    max_connections = 4,
-                    min_streams = 4,
-                    max_streams = 0,
-                    padding = true
+                    max_connections = 8
                 };
             }
 
@@ -251,103 +242,103 @@ namespace v2rayN.Handler
             }
         }
 
-        public static int ImportOldGuiConfig(Config config, string fileName)
-        {
-            var result = Utils.LoadResource(fileName);
-            if (Utils.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 = JsonUtils.Deserialize<ConfigOld>(result);
-            if (configOld == null)
-            {
-                return -1;
-            }
+        //    var configOld = JsonUtils.Deserialize<ConfigOld>(result);
+        //    if (configOld == null)
+        //    {
+        //        return -1;
+        //    }
 
-            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 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 = 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);
-            }
+        //    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 = 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);
+        //    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 (Utils.IsNullOrEmpty(routing.id))
-                {
-                    routing.id = Utils.GetGUID(false);
-                }
-                SqliteHelper.Instance.Replace(routing);
-            }
+        //        if (Utils.IsNullOrEmpty(routing.id))
+        //        {
+        //            routing.id = Utils.GetGUID(false);
+        //        }
+        //        SQLiteHelper.Instance.Replace(routing);
+        //    }
 
-            config = JsonUtils.Deserialize<Config>(JsonUtils.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
 
@@ -372,7 +363,7 @@ namespace v2rayN.Handler
             profileItem.path = profileItem.path.TrimEx();
             profileItem.streamSecurity = profileItem.streamSecurity.TrimEx();
 
-            if (!Global.VmessSecuritys.Contains(profileItem.security))
+            if (!Global.VmessSecurities.Contains(profileItem.security))
             {
                 return -1;
             }
@@ -390,17 +381,17 @@ namespace v2rayN.Handler
         /// 移除服务器
         /// </summary>
         /// <param name="config"></param>
-        /// <param name="indexs"></param>
+        /// <param name="indexes"></param>
         /// <returns></returns>
-        public static int RemoveServer(Config config, List<ProfileItem> indexs)
+        public static int RemoveServer(Config config, List<ProfileItem> indexes)
         {
             var subid = "TempRemoveSubId";
-            foreach (var item in indexs)
+            foreach (var item in indexes)
             {
                 item.subid = subid;
             }
 
-            SqliteHelper.Instance.UpdateAll(indexs);
+            SQLiteHelper.Instance.UpdateAll(indexes);
             RemoveServerViaSubid(config, subid, false);
 
             return 0;
@@ -412,9 +403,9 @@ namespace v2rayN.Handler
         /// <param name="config"></param>
         /// <param name="index"></param>
         /// <returns></returns>
-        public static int CopyServer(Config config, List<ProfileItem> indexs)
+        public static int CopyServer(Config config, List<ProfileItem> indexes)
         {
-            foreach (var it in indexs)
+            foreach (var it in indexes)
             {
                 var item = LazyConfig.Instance.GetProfileItem(it.indexId);
                 if (item is null)
@@ -468,7 +459,7 @@ namespace v2rayN.Handler
             {
                 return 0;
             }
-            if (SqliteHelper.Instance.Table<ProfileItem>().Where(t => t.indexId == config.indexId).Any())
+            if (SQLiteHelper.Instance.Table<ProfileItem>().Where(t => t.indexId == config.indexId).Any())
             {
                 return 0;
             }
@@ -476,7 +467,7 @@ namespace v2rayN.Handler
             {
                 return SetDefaultServerIndex(config, lstProfile.Where(t => t.port > 0).FirstOrDefault()?.indexId);
             }
-            return SetDefaultServerIndex(config, SqliteHelper.Instance.Table<ProfileItem>().Where(t => t.port > 0).Select(t => t.indexId).FirstOrDefault());
+            return SetDefaultServerIndex(config, SQLiteHelper.Instance.Table<ProfileItem>().Where(t => t.port > 0).Select(t => t.indexId).FirstOrDefault());
         }
 
         public static ProfileItem? GetDefaultServer(Config config)
@@ -484,7 +475,7 @@ namespace v2rayN.Handler
             var item = LazyConfig.Instance.GetProfileItem(config.indexId);
             if (item is null)
             {
-                var item2 = SqliteHelper.Instance.Table<ProfileItem>().FirstOrDefault();
+                var item2 = SQLiteHelper.Instance.Table<ProfileItem>().FirstOrDefault();
                 SetDefaultServerIndex(config, item2?.indexId);
                 return item2;
             }
@@ -581,7 +572,7 @@ namespace v2rayN.Handler
             }
             var ext = Path.GetExtension(fileName);
             string newFileName = $"{Utils.GetGUID()}{ext}";
-            //newFileName = Path.Combine(Utils.GetTempPath(), newFileName);
+            //newFileName = Path.Combine(Utile.GetTempPath(), newFileName);
 
             try
             {
@@ -617,7 +608,7 @@ namespace v2rayN.Handler
         /// <returns></returns>
         public static int EditCustomServer(Config config, ProfileItem profileItem)
         {
-            if (SqliteHelper.Instance.Update(profileItem) > 0)
+            if (SQLiteHelper.Instance.Update(profileItem) > 0)
             {
                 return 0;
             }
@@ -643,7 +634,7 @@ namespace v2rayN.Handler
             profileItem.id = profileItem.id.TrimEx();
             profileItem.security = profileItem.security.TrimEx();
 
-            if (!LazyConfig.Instance.GetShadowsocksSecuritys(profileItem).Contains(profileItem.security))
+            if (!LazyConfig.Instance.GetShadowsocksSecurities(profileItem).Contains(profileItem.security))
             {
                 return -1;
             }
@@ -674,6 +665,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>
@@ -923,6 +931,10 @@ namespace v2rayN.Handler
             {
                 return -1;
             }
+            if (!Utils.IsNullOrEmpty(profileItem.security) && profileItem.security != Global.None)
+            {
+                profileItem.security = Global.None;
+            }
 
             AddServerCommon(config, profileItem, toFile);
 
@@ -959,13 +971,21 @@ namespace v2rayN.Handler
 
             if (!Utils.IsNullOrEmpty(profileItem.streamSecurity))
             {
-                if (Utils.IsNullOrEmpty(profileItem.allowInsecure))
+                if (profileItem.streamSecurity != Global.StreamSecurity
+                     && profileItem.streamSecurity != Global.StreamSecurityReality)
                 {
-                    profileItem.allowInsecure = config.coreBasicItem.defAllowInsecure.ToString().ToLower();
+                    profileItem.streamSecurity = string.Empty;
                 }
-                if (Utils.IsNullOrEmpty(profileItem.fingerprint) && profileItem.streamSecurity == Global.StreamSecurityReality)
+                else
                 {
-                    profileItem.fingerprint = config.coreBasicItem.defFingerprint;
+                    if (Utils.IsNullOrEmpty(profileItem.allowInsecure))
+                    {
+                        profileItem.allowInsecure = config.coreBasicItem.defAllowInsecure.ToString().ToLower();
+                    }
+                    if (Utils.IsNullOrEmpty(profileItem.fingerprint) && profileItem.streamSecurity == Global.StreamSecurityReality)
+                    {
+                        profileItem.fingerprint = config.coreBasicItem.defFingerprint;
+                    }
                 }
             }
 
@@ -991,7 +1011,7 @@ namespace v2rayN.Handler
 
             if (toFile)
             {
-                SqliteHelper.Instance.Replace(profileItem);
+                SQLiteHelper.Instance.Replace(profileItem);
             }
             return 0;
         }
@@ -1033,7 +1053,7 @@ namespace v2rayN.Handler
                     File.Delete(Utils.GetConfigPath(item.address));
                 }
 
-                SqliteHelper.Instance.Delete(item);
+                SQLiteHelper.Instance.Delete(item);
             }
             catch (Exception ex)
             {
@@ -1051,12 +1071,12 @@ namespace v2rayN.Handler
         /// 批量添加服务器
         /// </summary>
         /// <param name="config"></param>
-        /// <param name="clipboardData"></param>
+        /// <param name="strData"></param>
         /// <param name="subid"></param>
         /// <returns>成功导入的数量</returns>
-        private static int AddBatchServers(Config config, string clipboardData, string subid, bool isSub, List<ProfileItem> lstOriSub)
+        private static int AddBatchServers(Config config, string strData, string subid, bool isSub, List<ProfileItem> lstOriSub)
         {
-            if (Utils.IsNullOrEmpty(clipboardData))
+            if (Utils.IsNullOrEmpty(strData))
             {
                 return -1;
             }
@@ -1073,7 +1093,7 @@ namespace v2rayN.Handler
             //Check for duplicate indexId
             List<string>? lstDbIndexId = null;
             List<ProfileItem> lstAdd = new();
-            var arrData = clipboardData.Split(Environment.NewLine.ToCharArray()).Where(t => !t.IsNullOrEmpty());
+            var arrData = strData.Split(Environment.NewLine.ToCharArray()).Where(t => !t.IsNullOrEmpty());
             if (isSub)
             {
                 arrData = arrData.Distinct();
@@ -1089,7 +1109,7 @@ namespace v2rayN.Handler
                     }
                     continue;
                 }
-                var profileItem = ShareHandler.ImportFromClipboardConfig(str, out string msg);
+                var profileItem = FmtHandler.ResolveConfig(str, out string msg);
                 if (profileItem is null)
                 {
                     continue;
@@ -1105,7 +1125,7 @@ namespace v2rayN.Handler
                         //Check for duplicate indexId
                         if (lstDbIndexId is null)
                         {
-                            lstDbIndexId = LazyConfig.Instance.ProfileItemIndexs("");
+                            lstDbIndexId = LazyConfig.Instance.ProfileItemIndexes("");
                         }
                         if (lstAdd.Any(t => t.indexId == existItem.indexId)
                             || lstDbIndexId.Any(t => t == existItem.indexId))
@@ -1151,82 +1171,87 @@ namespace v2rayN.Handler
 
             if (lstAdd.Count > 0)
             {
-                SqliteHelper.Instance.InsertAll(lstAdd);
+                SQLiteHelper.Instance.InsertAll(lstAdd);
             }
 
             ToJsonFile(config);
             return countServers;
         }
 
-        private static int AddBatchServers4Custom(Config config, string clipboardData, string subid, bool isSub, List<ProfileItem> lstOriSub)
+        private static int AddBatchServers4Custom(Config config, string strData, string subid, bool isSub, List<ProfileItem> lstOriSub)
         {
-            if (Utils.IsNullOrEmpty(clipboardData))
+            if (Utils.IsNullOrEmpty(strData))
             {
                 return -1;
             }
+            var subRemarks = LazyConfig.Instance.GetSubItem(subid)?.remarks;
 
-            //判断str是否包含s的任意一个字符串
-            static bool Containss(string str, params string[] s)
+            List<ProfileItem>? lstProfiles = null;
+            //Is sing-box array configuration
+            if (lstProfiles is null || lstProfiles.Count <= 0)
             {
-                foreach (var item in s)
+                lstProfiles = SingboxFmt.ResolveFullArray(strData, subRemarks);
+            }
+            //Is v2ray array configuration
+            if (lstProfiles is null || lstProfiles.Count <= 0)
+            {
+                lstProfiles = V2rayFmt.ResolveFullArray(strData, subRemarks);
+            }
+            if (lstProfiles != null && lstProfiles.Count > 0)
+            {
+                if (isSub && !Utils.IsNullOrEmpty(subid))
                 {
-                    if (str.Contains(item, StringComparison.OrdinalIgnoreCase)) return true;
+                    RemoveServerViaSubid(config, subid, isSub);
+                }
+                int count = 0;
+                foreach (var it in lstProfiles)
+                {
+                    it.subid = subid;
+                    it.isSub = isSub;
+                    if (AddCustomServer(config, it, true) == 0)
+                    {
+                        count++;
+                    }
+                }
+                if (count > 0)
+                {
+                    return count;
                 }
-                return false;
             }
 
-            ProfileItem profileItem = new();
-            //Is v2ray configuration
-            V2rayConfig? v2rayConfig = JsonUtils.Deserialize<V2rayConfig>(clipboardData);
-            if (v2rayConfig?.inbounds?.Count > 0
-                && v2rayConfig.outbounds?.Count > 0)
+            ProfileItem? profileItem = null;
+            //Is sing-box configuration
+            if (profileItem is null)
             {
-                var fileName = Utils.GetTempPath($"{Utils.GetGUID(false)}.json");
-                File.WriteAllText(fileName, clipboardData);
-
-                profileItem.coreType = ECoreType.Xray;
-                profileItem.address = fileName;
-                profileItem.remarks = "v2ray_custom";
+                profileItem = SingboxFmt.ResolveFull(strData, subRemarks);
+            }
+            //Is v2ray configuration
+            if (profileItem is null)
+            {
+                profileItem = V2rayFmt.ResolveFull(strData, subRemarks);
             }
             //Is Clash configuration
-            else if (Containss(clipboardData, "port", "socks-port", "proxies"))
+            if (profileItem is null)
             {
-                var fileName = Utils.GetTempPath($"{Utils.GetGUID(false)}.yaml");
-                File.WriteAllText(fileName, clipboardData);
-
-                profileItem.coreType = ECoreType.mihomo;
-                profileItem.address = fileName;
-                profileItem.remarks = "clash_custom";
+                profileItem = ClashFmt.ResolveFull(strData, subRemarks);
             }
             //Is hysteria configuration
-            else if (Containss(clipboardData, "server", "up", "down", "listen", "<html>", "<body>"))
+            if (profileItem is null)
             {
-                var fileName = Utils.GetTempPath($"{Utils.GetGUID(false)}.json");
-                File.WriteAllText(fileName, clipboardData);
-
-                profileItem.coreType = ECoreType.hysteria;
-                profileItem.address = fileName;
-                profileItem.remarks = "hysteria_custom";
+                profileItem = Hysteria2Fmt.ResolveFull2(strData, subRemarks);
+            }
+            if (profileItem is null)
+            {
+                profileItem = Hysteria2Fmt.ResolveFull(strData, subRemarks);
             }
             //Is naiveproxy configuration
-            else if (Containss(clipboardData, "listen", "proxy", "<html>", "<body>"))
+            if (profileItem is null)
             {
-                var fileName = Utils.GetTempPath($"{Utils.GetGUID(false)}.json");
-                File.WriteAllText(fileName, clipboardData);
-
-                profileItem.coreType = ECoreType.naiveproxy;
-                profileItem.address = fileName;
-                profileItem.remarks = "naiveproxy_custom";
+                profileItem = NaiveproxyFmt.ResolveFull(strData, subRemarks);
             }
-            //Is Other configuration
-            else
+            if (profileItem is null || Utils.IsNullOrEmpty(profileItem.address))
             {
                 return -1;
-                //var fileName = Utils.GetTempPath($"{Utils.GetGUID(false)}.txt");
-                //File.WriteAllText(fileName, clipboardData);
-
-                //profileItem.address = fileName;
-                //profileItem.remarks = "other_custom";
             }
 
             if (isSub && !Utils.IsNullOrEmpty(subid))
@@ -1239,12 +1264,6 @@ namespace v2rayN.Handler
             }
             profileItem.subid = subid;
             profileItem.isSub = isSub;
-
-            if (Utils.IsNullOrEmpty(profileItem.address))
-            {
-                return -1;
-            }
-
             if (AddCustomServer(config, profileItem, true) == 0)
             {
                 return 1;
@@ -1255,9 +1274,9 @@ namespace v2rayN.Handler
             }
         }
 
-        private static int AddBatchServers4SsSIP008(Config config, string clipboardData, string subid, bool isSub, List<ProfileItem> lstOriSub)
+        private static int AddBatchServers4SsSIP008(Config config, string strData, string subid, bool isSub, List<ProfileItem> lstOriSub)
         {
-            if (Utils.IsNullOrEmpty(clipboardData))
+            if (Utils.IsNullOrEmpty(strData))
             {
                 return -1;
             }
@@ -1267,31 +1286,12 @@ namespace v2rayN.Handler
                 RemoveServerViaSubid(config, subid, isSub);
             }
 
-            //SsSIP008
-            var lstSsServer = JsonUtils.Deserialize<List<SsServer>>(clipboardData);
-            if (lstSsServer?.Count <= 0)
-            {
-                var ssSIP008 = JsonUtils.Deserialize<SsSIP008>(clipboardData);
-                if (ssSIP008?.servers?.Count > 0)
-                {
-                    lstSsServer = ssSIP008.servers;
-                }
-            }
-
+            var lstSsServer = ShadowsocksFmt.ResolveSip008(strData);
             if (lstSsServer?.Count > 0)
             {
                 int counter = 0;
-                foreach (var it in lstSsServer)
+                foreach (var ssItem in lstSsServer)
                 {
-                    var ssItem = new ProfileItem()
-                    {
-                        subid = subid,
-                        remarks = it.remarks,
-                        security = it.method,
-                        id = it.password,
-                        address = it.server,
-                        port = Utils.ToInt(it.server_port)
-                    };
                     ssItem.subid = subid;
                     ssItem.isSub = isSub;
                     if (AddShadowsocksServer(config, ssItem) == 0)
@@ -1306,7 +1306,7 @@ namespace v2rayN.Handler
             return -1;
         }
 
-        public static int AddBatchServers(Config config, string clipboardData, string subid, bool isSub)
+        public static int AddBatchServers(Config config, string strData, string subid, bool isSub)
         {
             List<ProfileItem>? lstOriSub = null;
             if (isSub && !Utils.IsNullOrEmpty(subid))
@@ -1315,28 +1315,28 @@ namespace v2rayN.Handler
             }
 
             var counter = 0;
-            if (Utils.IsBase64String(clipboardData))
+            if (Utils.IsBase64String(strData))
             {
-                counter = AddBatchServers(config, Utils.Base64Decode(clipboardData), subid, isSub, lstOriSub);
+                counter = AddBatchServers(config, Utils.Base64Decode(strData), subid, isSub, lstOriSub);
             }
             if (counter < 1)
             {
-                counter = AddBatchServers(config, clipboardData, subid, isSub, lstOriSub);
+                counter = AddBatchServers(config, strData, subid, isSub, lstOriSub);
             }
             if (counter < 1)
             {
-                counter = AddBatchServers(config, Utils.Base64Decode(clipboardData), subid, isSub, lstOriSub);
+                counter = AddBatchServers(config, Utils.Base64Decode(strData), subid, isSub, lstOriSub);
             }
 
             if (counter < 1)
             {
-                counter = AddBatchServers4SsSIP008(config, clipboardData, subid, isSub, lstOriSub);
+                counter = AddBatchServers4SsSIP008(config, strData, subid, isSub, lstOriSub);
             }
 
             //maybe other sub
             if (counter < 1)
             {
-                counter = AddBatchServers4Custom(config, clipboardData, subid, isSub, lstOriSub);
+                counter = AddBatchServers4Custom(config, strData, subid, isSub, lstOriSub);
             }
 
             return counter;
@@ -1355,7 +1355,7 @@ namespace v2rayN.Handler
         public static int AddSubItem(Config config, string url)
         {
             //already exists
-            if (SqliteHelper.Instance.Table<SubItem>().Where(e => e.url == url).Count() > 0)
+            if (SQLiteHelper.Instance.Table<SubItem>().Where(e => e.url == url).Count() > 0)
             {
                 return 0;
             }
@@ -1379,14 +1379,14 @@ namespace v2rayN.Handler
                 if (subItem.sort <= 0)
                 {
                     var maxSort = 0;
-                    if (SqliteHelper.Instance.Table<SubItem>().Count() > 0)
+                    if (SQLiteHelper.Instance.Table<SubItem>().Count() > 0)
                     {
-                        maxSort = SqliteHelper.Instance.Table<SubItem>().Max(t => t == null ? 0 : t.sort);
+                        maxSort = SQLiteHelper.Instance.Table<SubItem>().Max(t => t == null ? 0 : t.sort);
                     }
                     subItem.sort = maxSort + 1;
                 }
             }
-            if (SqliteHelper.Instance.Replace(subItem) > 0)
+            if (SQLiteHelper.Instance.Replace(subItem) > 0)
             {
                 return 0;
             }
@@ -1408,14 +1408,14 @@ namespace v2rayN.Handler
             {
                 return -1;
             }
-            var customProfile = SqliteHelper.Instance.Table<ProfileItem>().Where(t => t.subid == subid && t.configType == EConfigType.Custom).ToList();
+            var customProfile = SQLiteHelper.Instance.Table<ProfileItem>().Where(t => t.subid == subid && t.configType == EConfigType.Custom).ToList();
             if (isSub)
             {
-                SqliteHelper.Instance.Execute($"delete from ProfileItem where isSub = 1 and subid = '{subid}'");
+                SQLiteHelper.Instance.Execute($"delete from ProfileItem where isSub = 1 and subid = '{subid}'");
             }
             else
             {
-                SqliteHelper.Instance.Execute($"delete from ProfileItem where subid = '{subid}'");
+                SQLiteHelper.Instance.Execute($"delete from ProfileItem where subid = '{subid}'");
             }
             foreach (var item in customProfile)
             {
@@ -1432,7 +1432,7 @@ namespace v2rayN.Handler
             {
                 return 0;
             }
-            SqliteHelper.Instance.Delete(item);
+            SQLiteHelper.Instance.Delete(item);
             RemoveServerViaSubid(config, id, false);
 
             return 0;
@@ -1444,7 +1444,7 @@ namespace v2rayN.Handler
             {
                 item.subid = subid;
             }
-            SqliteHelper.Instance.UpdateAll(lstProfile);
+            SQLiteHelper.Instance.UpdateAll(lstProfile);
 
             return 0;
         }
@@ -1460,7 +1460,7 @@ namespace v2rayN.Handler
                 item.id = Utils.GetGUID(false);
             }
 
-            if (SqliteHelper.Instance.Replace(item) > 0)
+            if (SQLiteHelper.Instance.Replace(item) > 0)
             {
                 return 0;
             }
@@ -1474,16 +1474,16 @@ namespace v2rayN.Handler
         /// AddBatchRoutingRules
         /// </summary>
         /// <param name="config"></param>
-        /// <param name="clipboardData"></param>
+        /// <param name="strData"></param>
         /// <returns></returns>
-        public static int AddBatchRoutingRules(ref RoutingItem routingItem, string clipboardData)
+        public static int AddBatchRoutingRules(ref RoutingItem routingItem, string strData)
         {
-            if (Utils.IsNullOrEmpty(clipboardData))
+            if (Utils.IsNullOrEmpty(strData))
             {
                 return -1;
             }
 
-            var lstRules = JsonUtils.Deserialize<List<RulesItem>>(clipboardData);
+            var lstRules = JsonUtils.Deserialize<List<RulesItem>>(strData);
             if (lstRules == null)
             {
                 return -1;
@@ -1501,7 +1501,7 @@ namespace v2rayN.Handler
                 routingItem.id = Utils.GetGUID(false);
             }
 
-            if (SqliteHelper.Instance.Replace(routingItem) > 0)
+            if (SQLiteHelper.Instance.Replace(routingItem) > 0)
             {
                 return 0;
             }
@@ -1590,7 +1590,7 @@ namespace v2rayN.Handler
 
         public static int SetDefaultRouting(Config config, RoutingItem routingItem)
         {
-            if (SqliteHelper.Instance.Table<RoutingItem>().Where(t => t.id == routingItem.id).Count() > 0)
+            if (SQLiteHelper.Instance.Table<RoutingItem>().Where(t => t.id == routingItem.id).Count() > 0)
             {
                 config.routingBasicItem.routingIndexId = routingItem.id;
             }
@@ -1605,7 +1605,7 @@ namespace v2rayN.Handler
             var item = LazyConfig.Instance.GetRoutingItem(config.routingBasicItem.routingIndexId);
             if (item is null)
             {
-                var item2 = SqliteHelper.Instance.Table<RoutingItem>().FirstOrDefault(t => t.locked == false);
+                var item2 = SQLiteHelper.Instance.Table<RoutingItem>().FirstOrDefault(t => t.locked == false);
                 SetDefaultRouting(config, item2);
                 return item2;
             }
@@ -1615,14 +1615,15 @@ 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,
                 };
@@ -1631,7 +1632,7 @@ namespace v2rayN.Handler
                 //Blacklist
                 var item3 = new RoutingItem()
                 {
-                    remarks = "黑名单(Blacklist)",
+                    remarks = $"{ver}黑名单(Blacklist)",
                     url = string.Empty,
                     sort = maxSort + 2,
                 };
@@ -1640,7 +1641,7 @@ namespace v2rayN.Handler
                 //Global
                 var item1 = new RoutingItem()
                 {
-                    remarks = "全局(Global)",
+                    remarks = $"{ver}全局(Global)",
                     url = string.Empty,
                     sort = maxSort + 3,
                 };
@@ -1667,12 +1668,12 @@ namespace v2rayN.Handler
 
         public static RoutingItem GetLockedRoutingItem(Config config)
         {
-            return SqliteHelper.Instance.Table<RoutingItem>().FirstOrDefault(it => it.locked == true);
+            return SQLiteHelper.Instance.Table<RoutingItem>().FirstOrDefault(it => it.locked == true);
         }
 
         public static void RemoveRoutingItem(RoutingItem routingItem)
         {
-            SqliteHelper.Instance.Delete(routingItem);
+            SQLiteHelper.Instance.Delete(routingItem);
         }
 
         #endregion Routing
@@ -1709,7 +1710,7 @@ namespace v2rayN.Handler
                 item.id = Utils.GetGUID(false);
             }
 
-            if (SqliteHelper.Instance.Replace(item) > 0)
+            if (SQLiteHelper.Instance.Replace(item) > 0)
             {
                 return 0;
             }

v2rayN/v2rayN/Handler/CoreConfig/CoreConfigHandler.cs

@@ -1,8 +1,9 @@
 using System.IO;
-using v2rayN.Mode;
+using v2rayN.Enums;
+using v2rayN.Models;
 using v2rayN.Resx;
 
-namespace v2rayN.Handler
+namespace v2rayN.Handler.CoreConfig
 {
     /// <summary>
     /// Core configuration file processing class
@@ -132,8 +133,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);
@@ -154,7 +155,7 @@ namespace v2rayN.Handler
         {
             if (coreType == ECoreType.sing_box)
             {
-                if ((new CoreConfigSingbox(config)).GenerateClientSpeedtestConfig(selecteds, out SingboxConfig? singboxConfig, out msg) != 0)
+                if (new CoreConfigSingbox(config).GenerateClientSpeedtestConfig(selecteds, out SingboxConfig? singboxConfig, out msg) != 0)
                 {
                     return -1;
                 }
@@ -162,7 +163,7 @@ namespace v2rayN.Handler
             }
             else
             {
-                if ((new CoreConfigV2ray(config)).GenerateClientSpeedtestConfig(selecteds, out V2rayConfig? v2rayConfig, out msg) != 0)
+                if (new CoreConfigV2ray(config).GenerateClientSpeedtestConfig(selecteds, out V2rayConfig? v2rayConfig, out msg) != 0)
                 {
                     return -1;
                 }

v2rayN/v2rayN/Handler/CoreConfig/CoreConfigSingbox.cs

@@ -1,9 +1,10 @@
 using System.Net;
 using System.Net.NetworkInformation;
-using v2rayN.Mode;
+using v2rayN.Enums;
+using v2rayN.Models;
 using v2rayN.Resx;
 
-namespace v2rayN.Handler
+namespace v2rayN.Handler.CoreConfig
 {
     internal class CoreConfigSingbox
     {
@@ -25,6 +26,11 @@ namespace v2rayN.Handler
                     msg = ResUI.CheckServerSettings;
                     return -1;
                 }
+                if (node.GetNetwork() is nameof(ETransport.kcp) or nameof(ETransport.splithttp))
+                {
+                    msg = ResUI.Incorrectconfiguration + $" - {node.GetNetwork()}";
+                    return -1;
+                }
 
                 msg = ResUI.InitialConfiguration;
 
@@ -54,7 +60,9 @@ namespace v2rayN.Handler
 
                 GenDns(node, singboxConfig);
 
-                GenStatistic(singboxConfig);
+                GenExperimental(singboxConfig);
+
+                ConvertGeo2Ruleset(singboxConfig);
 
                 msg = string.Format(ResUI.SuccessfulConfiguration, "");
             }
@@ -88,7 +96,7 @@ namespace v2rayN.Handler
                     default:
                         break;
                 }
-                if (_config.coreBasicItem.loglevel == "none")
+                if (_config.coreBasicItem.loglevel == Global.None)
                 {
                     singboxConfig.log.disabled = true;
                 }
@@ -109,19 +117,20 @@ namespace v2rayN.Handler
         {
             try
             {
-                singboxConfig.inbounds.Clear();
+                var listen = "::";
+                singboxConfig.inbounds = [];
 
-                if (!_config.tunModeItem.enableTun || (_config.tunModeItem.enableTun && _config.tunModeItem.enableExInbound))
+                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 = Utils.IsNullOrEmpty(_config.routingBasicItem.domainStrategy4Singbox) ? null : _config.routingBasicItem.domainStrategy4Singbox;
@@ -136,19 +145,19 @@ namespace v2rayN.Handler
                     }
 
                     //http
-                    var inbound2 = GetInbound(inbound, Global.InboundHttp, 1, false);
+                    var inbound2 = GetInbound(inbound, EInboundProtocol.http, false);
                     singboxConfig.inbounds.Add(inbound2);
 
                     if (_config.inbound[0].allowLANConn)
                     {
                         if (_config.inbound[0].newPort4LAN)
                         {
-                            var inbound3 = GetInbound(inbound, Global.InboundSocks2, 2, true);
-                            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
@@ -160,8 +169,8 @@ namespace v2rayN.Handler
                         }
                         else
                         {
-                            inbound.listen = "::";
-                            inbound2.listen = "::";
+                            inbound.listen = listen;
+                            inbound2.listen = listen;
                         }
                     }
                 }
@@ -170,7 +179,7 @@ namespace v2rayN.Handler
                 {
                     if (_config.tunModeItem.mtu <= 0)
                     {
-                        _config.tunModeItem.mtu = Convert.ToInt32(Global.TunMtus[0]);
+                        _config.tunModeItem.mtu = Utils.ToInt(Global.TunMtus[0]);
                     }
                     if (Utils.IsNullOrEmpty(_config.tunModeItem.stack))
                     {
@@ -198,12 +207,12 @@ namespace v2rayN.Handler
             return 0;
         }
 
-        private Inbound4Sbox GetInbound(Inbound4Sbox inItem, string tag, int offset, bool bSocks)
+        private Inbound4Sbox GetInbound(Inbound4Sbox inItem, EInboundProtocol protocol, bool bSocks)
         {
             var inbound = JsonUtils.DeepCopy(inItem);
-            inbound.tag = tag;
-            inbound.listen_port = inItem.listen_port + offset;
-            inbound.type = bSocks ? Global.InboundSocks : Global.InboundHttp;
+            inbound.tag = protocol.ToString();
+            inbound.listen_port = inItem.listen_port + (int)protocol;
+            inbound.type = bSocks ? EInboundProtocol.socks.ToString() : EInboundProtocol.http.ToString();
             return inbound;
         }
 
@@ -213,110 +222,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.VmessSecuritys.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.GetShadowsocksSecuritys(node).Contains(node.security) ? node.security : "none";
-                    outbound.password = node.id;
-
-                    GenOutboundMux(node, outbound);
-                }
-                else if (node.configType == EConfigType.Socks)
-                {
-                    outbound.type = Global.ProtocolTypes[EConfigType.Socks];
-
-                    outbound.version = "5";
-                    if (!Utils.IsNullOrEmpty(node.security)
-                      && !Utils.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 (Utils.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 (!Utils.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;
+                            GenOutboundMux(node, outbound);
+                            break;
+                        }
+                    case EConfigType.Shadowsocks:
+                        {
+                            outbound.method = LazyConfig.Instance.GetShadowsocksSecurities(node).Contains(node.security) ? node.security : Global.None;
+                            outbound.password = node.id;
 
-                    GenOutboundMux(node, outbound);
-                }
-                else if (node.configType == EConfigType.Tuic)
-                {
-                    outbound.type = Global.ProtocolTypes[EConfigType.Tuic];
+                            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.uuid = node.id;
-                    outbound.password = node.security;
-                    outbound.congestion_control = node.headerType;
+                            outbound.packet_encoding = "xudp";
 
-                    GenOutboundMux(node, outbound);
-                }
-                else if (node.configType == EConfigType.Wireguard)
-                {
-                    outbound.type = Global.ProtocolTypes[EConfigType.Wireguard];
+                            if (Utils.IsNullOrEmpty(node.flow))
+                            {
+                                GenOutboundMux(node, outbound);
+                            }
+                            else
+                            {
+                                outbound.flow = node.flow;
+                            }
+                            break;
+                        }
+                    case EConfigType.Trojan:
+                        {
+                            outbound.password = node.id;
 
-                    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);
-                    GenOutboundMux(node, outbound);
+                            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);
@@ -334,19 +344,16 @@ namespace v2rayN.Handler
         {
             try
             {
-                //if (_config.coreBasicItem.muxEnabled)
-                //{
-                //    var mux = new Multiplex4Sbox()
-                //    {
-                //        enabled = true,
-                //        protocol = _config.mux4Sbox.protocol,
-                //        max_connections = _config.mux4Sbox.max_connections,
-                //        min_streams = _config.mux4Sbox.min_streams,
-                //        max_streams = _config.mux4Sbox.max_streams,
-                //        padding = _config.mux4Sbox.padding
-                //    };
-                //    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,11 +369,11 @@ namespace v2rayN.Handler
                 if (node.streamSecurity == Global.StreamSecurityReality || node.streamSecurity == Global.StreamSecurity)
                 {
                     var server_name = string.Empty;
-                    if (!string.IsNullOrWhiteSpace(node.sni))
+                    if (!Utils.IsNullOrEmpty(node.sni))
                     {
                         server_name = node.sni;
                     }
-                    else if (!string.IsNullOrWhiteSpace(node.requestHost))
+                    else if (!Utils.IsNullOrEmpty(node.requestHost))
                     {
                         server_name = Utils.String2List(node.requestHost)[0];
                     }
@@ -413,14 +420,31 @@ namespace v2rayN.Handler
 
                 switch (node.GetNetwork())
                 {
-                    case "h2":
-                        transport.type = "http";
+                    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";
+                    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))
                         {
@@ -431,12 +455,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 +475,12 @@ namespace v2rayN.Handler
                         break;
 
                     default:
-                        transport = null;
                         break;
                 }
-
-                outbound.transport = transport;
+                if (transport.type != null)
+                {
+                    outbound.transport = transport;
+                }
             }
             catch (Exception ex)
             {
@@ -514,24 +546,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 = JsonUtils.Deserialize<List<Rule4Sbox>>(Utils.GetEmbedText(Global.TunSingboxRulesFileName));
-                    singboxConfig.route.rules.AddRange(tunRules);
+                    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
                     });
                 }
@@ -575,8 +621,8 @@ namespace v2rayN.Handler
         {
             lstDnsExe = new();
             lstDirectExe = new();
-            var coreInfos = LazyConfig.Instance.GetCoreInfos();
-            foreach (var it in coreInfos)
+            var coreInfo = LazyConfig.Instance.GetCoreInfo();
+            foreach (var it in coreInfo)
             {
                 if (it.coreType == ECoreType.v2rayN)
                 {
@@ -630,28 +676,37 @@ namespace v2rayN.Handler
                 {
                     rule.inbound = item.inboundTag;
                 }
+                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 +716,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 +729,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 +767,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 +794,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 = Utils.GetEmbedText(Global.TunSingboxDNSFileName);
-                    }
-                    dns4Sbox = JsonUtils.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 = JsonUtils.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 +828,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.Add(new()
+                {
+                    tag = tag,
+                    address = "223.5.5.5",
+                    detour = Global.DirectTag,
+                });
+                dns4Sbox.rules.Add(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;
         }
 
@@ -863,11 +1005,11 @@ namespace v2rayN.Handler
                 }
 
                 GenLog(singboxConfig);
-                GenDns(new(), singboxConfig);
+                //GenDns(new(), singboxConfig);
                 singboxConfig.inbounds.Clear(); // Remove "proxy" service for speedtest, avoiding port conflicts.
                 singboxConfig.outbounds.RemoveAt(0);
 
-                int httpPort = LazyConfig.Instance.GetLocalPort("speedtest");
+                int httpPort = LazyConfig.Instance.GetLocalPort(EInboundProtocol.speedtest);
 
                 foreach (var it in selecteds)
                 {
@@ -888,7 +1030,7 @@ namespace v2rayN.Handler
                         }
                     }
 
-                    //find unuse port
+                    //find unused port
                     var port = httpPort;
                     for (int k = httpPort; k < Global.MaxPort; k++)
                     {
@@ -919,9 +1061,9 @@ namespace v2rayN.Handler
                     {
                         listen = Global.Loopback,
                         listen_port = port,
-                        type = Global.InboundHttp
+                        type = EInboundProtocol.http.ToString(),
                     };
-                    inbound.tag = Global.InboundHttp + inbound.listen_port.ToString();
+                    inbound.tag = inbound.type + inbound.listen_port.ToString();
                     singboxConfig.inbounds.Add(inbound);
 
                     //outbound
@@ -931,7 +1073,7 @@ namespace v2rayN.Handler
                         continue;
                     }
                     if (item.configType == EConfigType.Shadowsocks
-                        && !Global.SsSecuritysInSingbox.Contains(item.security))
+                        && !Global.SsSecuritiesInSingbox.Contains(item.security))
                     {
                         continue;
                     }
@@ -955,6 +1097,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/CoreConfig/CoreConfigV2ray.cs

@@ -1,9 +1,10 @@
 using System.Net;
 using System.Net.NetworkInformation;
-using v2rayN.Mode;
+using v2rayN.Enums;
+using v2rayN.Models;
 using v2rayN.Resx;
 
-namespace v2rayN.Handler
+namespace v2rayN.Handler.CoreConfig
 {
     internal class CoreConfigV2ray
     {
@@ -98,25 +99,26 @@ 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
@@ -131,8 +133,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 +145,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 = Utils.GetEmbedText(Global.V2raySampleInbound);
             if (Utils.IsNullOrEmpty(result))
             {
-                return null;
+                return new();
             }
 
             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;
@@ -274,8 +277,8 @@ namespace v2rayN.Handler
                 if (!hasDomainIp)
                 {
                     if (!Utils.IsNullOrEmpty(rules.port)
-                        || (rules.protocol?.Count > 0)
-                        || (rules.inboundTag?.Count > 0)
+                        || rules.protocol?.Count > 0
+                        || rules.inboundTag?.Count > 0
                         )
                     {
                         var it = JsonUtils.DeepCopy(rules);
@@ -295,182 +298,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.VmessSecuritys.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.GetShadowsocksSecuritys(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 (!Utils.IsNullOrEmpty(node.security)
-                        && !Utils.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 (!Utils.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 && Utils.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)
@@ -514,7 +523,7 @@ namespace v2rayN.Handler
                 {
                     try
                     {
-                        useragent = Global.UserAgentTxts[_config.coreBasicItem.defUserAgent];
+                        useragent = Global.UserAgentTexts[_config.coreBasicItem.defUserAgent];
                     }
                     catch (KeyNotFoundException)
                     {
@@ -533,11 +542,11 @@ namespace v2rayN.Handler
                         alpn = node.GetAlpn(),
                         fingerprint = node.fingerprint.IsNullOrEmpty() ? _config.coreBasicItem.defFingerprint : node.fingerprint
                     };
-                    if (!string.IsNullOrWhiteSpace(sni))
+                    if (!Utils.IsNullOrEmpty(sni))
                     {
                         tlsSettings.serverName = sni;
                     }
-                    else if (!string.IsNullOrWhiteSpace(host))
+                    else if (!Utils.IsNullOrEmpty(host))
                     {
                         tlsSettings.serverName = Utils.String2List(host)[0];
                     }
@@ -556,6 +565,7 @@ namespace v2rayN.Handler
                         publicKey = node.publicKey,
                         shortId = node.shortId,
                         spiderX = node.spiderX,
+                        show = false,
                     };
 
                     streamSettings.realitySettings = realitySettings;
@@ -564,7 +574,7 @@ namespace v2rayN.Handler
                 //streamSettings
                 switch (node.GetNetwork())
                 {
-                    case "kcp":
+                    case nameof(ETransport.kcp):
                         KcpSettings4Ray kcpSettings = new()
                         {
                             mtu = _config.kcpItem.mtu,
@@ -588,30 +598,64 @@ namespace v2rayN.Handler
                         streamSettings.kcpSettings = kcpSettings;
                         break;
                     //ws
-                    case "ws":
+                    case nameof(ETransport.ws):
                         WsSettings4Ray wsSettings = new();
                         wsSettings.headers = new Headers4Ray();
                         string path = node.path;
-                        if (!string.IsNullOrWhiteSpace(host))
+                        if (!Utils.IsNullOrEmpty(host))
                         {
                             wsSettings.headers.Host = host;
                         }
-                        if (!string.IsNullOrWhiteSpace(path))
+                        if (!Utils.IsNullOrEmpty(path))
                         {
                             wsSettings.path = path;
                         }
-                        if (!string.IsNullOrWhiteSpace(useragent))
+                        if (!Utils.IsNullOrEmpty(useragent))
                         {
                             wsSettings.headers.UserAgent = useragent;
                         }
                         streamSettings.wsSettings = wsSettings;
 
+                        break;
+                    //httpupgrade
+                    case nameof(ETransport.httpupgrade):
+                        HttpupgradeSettings4Ray httpupgradeSettings = new();
+
+                        if (!Utils.IsNullOrEmpty(node.path))
+                        {
+                            httpupgradeSettings.path = node.path;
+                        }
+                        if (!Utils.IsNullOrEmpty(host))
+                        {
+                            httpupgradeSettings.host = host;
+                        }
+                        streamSettings.httpupgradeSettings = httpupgradeSettings;
+
+                        break;
+                    //splithttp
+                    case nameof(ETransport.splithttp):
+                        SplithttpSettings4Ray splithttpSettings = new()
+                        {
+                            maxUploadSize = 1000000,
+                            maxConcurrentUploads = 10
+                        };
+
+                        if (!Utils.IsNullOrEmpty(node.path))
+                        {
+                            splithttpSettings.path = node.path;
+                        }
+                        if (!Utils.IsNullOrEmpty(host))
+                        {
+                            splithttpSettings.host = host;
+                        }
+                        streamSettings.splithttpSettings = splithttpSettings;
+
                         break;
                     //h2
-                    case "h2":
+                    case nameof(ETransport.h2):
                         HttpSettings4Ray httpSettings = new();
 
-                        if (!string.IsNullOrWhiteSpace(host))
+                        if (!Utils.IsNullOrEmpty(host))
                         {
                             httpSettings.host = Utils.String2List(host);
                         }
@@ -621,7 +665,7 @@ namespace v2rayN.Handler
 
                         break;
                     //quic
-                    case "quic":
+                    case nameof(ETransport.quic):
                         QuicSettings4Ray quicsettings = new()
                         {
                             security = host,
@@ -634,7 +678,7 @@ namespace v2rayN.Handler
                         streamSettings.quicSettings = quicsettings;
                         if (node.streamSecurity == Global.StreamSecurity)
                         {
-                            if (!string.IsNullOrWhiteSpace(sni))
+                            if (!Utils.IsNullOrEmpty(sni))
                             {
                                 streamSettings.tlsSettings.serverName = sni;
                             }
@@ -645,11 +689,12 @@ namespace v2rayN.Handler
                         }
                         break;
 
-                    case "grpc":
+                    case nameof(ETransport.grpc):
                         GrpcSettings4Ray grpcSettings = new()
                         {
+                            authority = Utils.IsNullOrEmpty(host) ? null : host,
                             serviceName = node.path,
-                            multiMode = (node.headerType == Global.GrpcmultiMode),
+                            multiMode = node.headerType == Global.GrpcMultiMode,
                             idle_timeout = _config.grpcItem.idle_timeout,
                             health_check_timeout = _config.grpcItem.health_check_timeout,
                             permit_without_stream = _config.grpcItem.permit_without_stream,
@@ -671,7 +716,7 @@ namespace v2rayN.Handler
                             };
 
                             //request Host
-                            string request = Utils.GetEmbedText(Global.V2raySampleHttprequestFileName);
+                            string request = Utils.GetEmbedText(Global.V2raySampleHttpRequestFileName);
                             string[] arrHost = host.Split(',');
                             string host2 = string.Join("\",\"", arrHost);
                             request = request.Replace("$requestHost$", $"\"{host2}\"");
@@ -706,13 +751,13 @@ namespace v2rayN.Handler
                 var item = LazyConfig.Instance.GetDNSItem(ECoreType.Xray);
                 var normalDNS = item?.normalDNS;
                 var domainStrategy4Freedom = item?.domainStrategy4Freedom;
-                if (string.IsNullOrWhiteSpace(normalDNS))
+                if (Utils.IsNullOrEmpty(normalDNS))
                 {
-                    normalDNS = "1.1.1.1,8.8.8.8";
+                    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;
@@ -764,7 +809,7 @@ namespace v2rayN.Handler
         {
             if (_config.guiItem.enableStatistics)
             {
-                string tag = Global.InboundAPITagName;
+                string tag = EInboundProtocol.api.ToString();
                 API4Ray apiObj = new();
                 Policy4Ray policyObj = new();
                 SystemPolicy4Ray policySystemSetting = new();
@@ -789,7 +834,7 @@ namespace v2rayN.Handler
                     apiInbound.tag = tag;
                     apiInbound.listen = Global.Loopback;
                     apiInbound.port = LazyConfig.Instance.StatePort;
-                    apiInbound.protocol = Global.InboundAPIProtocal;
+                    apiInbound.protocol = Global.InboundAPIProtocol;
                     apiInboundSettings.address = Global.Loopback;
                     apiInbound.settings = apiInboundSettings;
                     v2rayConfig.inbounds.Add(apiInbound);
@@ -812,6 +857,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;
@@ -923,7 +995,7 @@ namespace v2rayN.Handler
                 v2rayConfig.inbounds.Clear(); // Remove "proxy" service for speedtest, avoiding port conflicts.
                 v2rayConfig.outbounds.RemoveAt(0);
 
-                int httpPort = LazyConfig.Instance.GetLocalPort("speedtest");
+                int httpPort = LazyConfig.Instance.GetLocalPort(EInboundProtocol.speedtest);
 
                 foreach (var it in selecteds)
                 {
@@ -944,7 +1016,7 @@ namespace v2rayN.Handler
                         }
                     }
 
-                    //find unuse port
+                    //find unused port
                     var port = httpPort;
                     for (int k = httpPort; k < Global.MaxPort; k++)
                     {
@@ -975,9 +1047,9 @@ namespace v2rayN.Handler
                     {
                         listen = Global.Loopback,
                         port = port,
-                        protocol = Global.InboundHttp
+                        protocol = EInboundProtocol.http.ToString(),
                     };
-                    inbound.tag = Global.InboundHttp + inbound.port.ToString();
+                    inbound.tag = inbound.protocol + inbound.port.ToString();
                     v2rayConfig.inbounds.Add(inbound);
 
                     //outbound
@@ -987,7 +1059,7 @@ namespace v2rayN.Handler
                         continue;
                     }
                     if (item.configType == EConfigType.Shadowsocks
-                        && !Global.SsSecuritysInXray.Contains(item.security))
+                        && !Global.SsSecuritiesInXray.Contains(item.security))
                     {
                         continue;
                     }

v2rayN/v2rayN/Handler/CoreHandler.cs

@@ -2,7 +2,9 @@
 using System.IO;
 using System.Reactive.Linq;
 using System.Text;
-using v2rayN.Mode;
+using v2rayN.Enums;
+using v2rayN.Handler.CoreConfig;
+using v2rayN.Models;
 using v2rayN.Resx;
 
 namespace v2rayN.Handler
@@ -39,6 +41,7 @@ namespace v2rayN.Handler
             if (CoreConfigHandler.GenerateClientConfig(node, fileName, out string msg, out string content) != 0)
             {
                 ShowMsg(false, msg);
+                return;
             }
             else
             {
@@ -113,8 +116,8 @@ namespace v2rayN.Handler
 
                 if (!hasProc)
                 {
-                    var coreInfos = LazyConfig.Instance.GetCoreInfos();
-                    foreach (var it in coreInfos)
+                    var coreInfo = LazyConfig.Instance.GetCoreInfo();
+                    foreach (var it in coreInfo)
                     {
                         if (it.coreType == ECoreType.v2rayN)
                         {
@@ -156,7 +159,7 @@ namespace v2rayN.Handler
 
         #region Private
 
-        private string CoreFindexe(CoreInfo coreInfo)
+        private string CoreFindExe(CoreInfo coreInfo)
         {
             string fileName = string.Empty;
             foreach (string name in coreInfo.coreExes)
@@ -192,10 +195,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 +211,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
                     };
+                    _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 +242,7 @@ namespace v2rayN.Handler
             try
             {
                 var coreInfo = LazyConfig.Instance.GetCoreInfo(coreType);
-                var proc = RunProcess(new(), coreInfo, $" -c {Global.CoreSpeedtestConfigFileName}", true, ShowMsg);
+                var proc = RunProcess(new(), coreInfo, $" -c {Global.CoreSpeedtestConfigFileName}", true);
                 if (proc is null)
                 {
                     return -1;
@@ -253,20 +259,20 @@ namespace v2rayN.Handler
             }
         }
 
-        private void ShowMsg(bool updateToTrayTooltip, string msg)
+        private void ShowMsg(bool notify, string msg)
         {
-            _updateFunc(updateToTrayTooltip, msg);
+            _updateFunc(notify, msg);
         }
 
         #endregion Private
 
         #region Process
 
-        private Process? RunProcess(ProfileItem node, CoreInfo coreInfo, string configPath, bool displayLog, Action<bool, string> update)
+        private Process? RunProcess(ProfileItem node, CoreInfo coreInfo, string configPath, bool displayLog)
         {
             try
             {
-                string fileName = CoreFindexe(coreInfo);
+                string fileName = CoreFindExe(coreInfo);
                 if (Utils.IsNullOrEmpty(fileName))
                 {
                     return null;
@@ -286,22 +292,29 @@ namespace v2rayN.Handler
                         StandardErrorEncoding = displayLog ? Encoding.UTF8 : null,
                     }
                 };
+                var startUpErrorMessage = new StringBuilder();
+                var startUpSuccessful = false;
                 if (displayLog)
                 {
                     proc.OutputDataReceived += (sender, e) =>
                     {
-                        if (!string.IsNullOrEmpty(e.Data))
+                        if (!Utils.IsNullOrEmpty(e.Data))
                         {
                             string msg = e.Data + Environment.NewLine;
-                            update(false, msg);
+                            ShowMsg(false, msg);
                         }
                     };
                     proc.ErrorDataReceived += (sender, e) =>
                     {
-                        if (!string.IsNullOrEmpty(e.Data))
+                        if (!Utils.IsNullOrEmpty(e.Data))
                         {
                             string msg = e.Data + Environment.NewLine;
-                            update(false, msg);
+                            ShowMsg(false, msg);
+
+                            if (!startUpSuccessful)
+                            {
+                                startUpErrorMessage.Append(msg);
+                            }
                         }
                     };
                 }
@@ -314,7 +327,12 @@ namespace v2rayN.Handler
 
                 if (proc.WaitForExit(1000))
                 {
-                    throw new Exception(displayLog ? proc.StandardError.ReadToEnd() : "启动进程失败并退出 (Failed to start the process and exited)");
+                    proc.CancelErrorRead();
+                    throw new Exception(displayLog ? startUpErrorMessage.ToString() : "启动进程失败并退出 (Failed to start the process and exited)");
+                }
+                else
+                {
+                    startUpSuccessful = true;
                 }
 
                 LazyConfig.Instance.AddProcess(proc.Handle);
@@ -324,7 +342,7 @@ namespace v2rayN.Handler
             {
                 Logging.SaveLog(ex.Message, ex);
                 string msg = ex.Message;
-                update(true, msg);
+                ShowMsg(true, msg);
                 return null;
             }
         }
@@ -337,7 +355,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.Enums;
 using v2rayN.Resx;
 
 namespace v2rayN.Handler
@@ -300,7 +301,7 @@ namespace v2rayN.Handler
             }
             catch //(Exception ex)
             {
-                //Utils.SaveLog(ex.Message, ex);
+                //Utile.SaveLog(ex.Message, ex);
             }
             return responseTime;
         }
@@ -311,7 +312,7 @@ namespace v2rayN.Handler
             {
                 return null;
             }
-            var httpPort = LazyConfig.Instance.GetLocalPort(Global.InboundHttp);
+            var httpPort = LazyConfig.Instance.GetLocalPort(EInboundProtocol.http);
             if (!SocketCheck(Global.Loopback, httpPort))
             {
                 return null;

v2rayN/v2rayN/Handler/Fmt/BaseFmt.cs

@@ -0,0 +1,203 @@
+using System.Collections.Specialized;
+using System.IO;
+using v2rayN.Enums;
+using v2rayN.Models;
+
+namespace v2rayN.Handler.Fmt
+{
+    internal class BaseFmt
+    {
+        protected static string GetIpv6(string address)
+        {
+            if (Utils.IsIpv6(address))
+            {
+                // 检查地址是否已经被方括号包围，如果没有，则添加方括号
+                return address.StartsWith('[') && address.EndsWith(']') ? address : $"[{address}]";
+            }
+            return address;  // 如果不是IPv6地址，直接返回原地址
+        }
+
+        protected static int GetStdTransport(ProfileItem item, string? securityDef, ref Dictionary<string, string> dicQuery)
+        {
+            if (!Utils.IsNullOrEmpty(item.flow))
+            {
+                dicQuery.Add("flow", item.flow);
+            }
+
+            if (!Utils.IsNullOrEmpty(item.streamSecurity))
+            {
+                dicQuery.Add("security", item.streamSecurity);
+            }
+            else
+            {
+                if (securityDef != null)
+                {
+                    dicQuery.Add("security", securityDef);
+                }
+            }
+            if (!Utils.IsNullOrEmpty(item.sni))
+            {
+                dicQuery.Add("sni", item.sni);
+            }
+            if (!Utils.IsNullOrEmpty(item.alpn))
+            {
+                dicQuery.Add("alpn", Utils.UrlEncode(item.alpn));
+            }
+            if (!Utils.IsNullOrEmpty(item.fingerprint))
+            {
+                dicQuery.Add("fp", Utils.UrlEncode(item.fingerprint));
+            }
+            if (!Utils.IsNullOrEmpty(item.publicKey))
+            {
+                dicQuery.Add("pbk", Utils.UrlEncode(item.publicKey));
+            }
+            if (!Utils.IsNullOrEmpty(item.shortId))
+            {
+                dicQuery.Add("sid", Utils.UrlEncode(item.shortId));
+            }
+            if (!Utils.IsNullOrEmpty(item.spiderX))
+            {
+                dicQuery.Add("spx", Utils.UrlEncode(item.spiderX));
+            }
+
+            dicQuery.Add("type", !Utils.IsNullOrEmpty(item.network) ? item.network : nameof(ETransport.tcp));
+
+            switch (item.network)
+            {
+                case nameof(ETransport.tcp):
+                    dicQuery.Add("headerType", !Utils.IsNullOrEmpty(item.headerType) ? item.headerType : Global.None);
+                    if (!Utils.IsNullOrEmpty(item.requestHost))
+                    {
+                        dicQuery.Add("host", Utils.UrlEncode(item.requestHost));
+                    }
+                    break;
+
+                case nameof(ETransport.kcp):
+                    dicQuery.Add("headerType", !Utils.IsNullOrEmpty(item.headerType) ? item.headerType : Global.None);
+                    if (!Utils.IsNullOrEmpty(item.path))
+                    {
+                        dicQuery.Add("seed", Utils.UrlEncode(item.path));
+                    }
+                    break;
+
+                case nameof(ETransport.ws):
+                case nameof(ETransport.httpupgrade):
+                case nameof(ETransport.splithttp):
+                    if (!Utils.IsNullOrEmpty(item.requestHost))
+                    {
+                        dicQuery.Add("host", Utils.UrlEncode(item.requestHost));
+                    }
+                    if (!Utils.IsNullOrEmpty(item.path))
+                    {
+                        dicQuery.Add("path", Utils.UrlEncode(item.path));
+                    }
+                    break;
+
+                case nameof(ETransport.http):
+                case nameof(ETransport.h2):
+                    dicQuery["type"] = nameof(ETransport.http);
+                    if (!Utils.IsNullOrEmpty(item.requestHost))
+                    {
+                        dicQuery.Add("host", Utils.UrlEncode(item.requestHost));
+                    }
+                    if (!Utils.IsNullOrEmpty(item.path))
+                    {
+                        dicQuery.Add("path", Utils.UrlEncode(item.path));
+                    }
+                    break;
+
+                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 nameof(ETransport.grpc):
+                    if (!Utils.IsNullOrEmpty(item.path))
+                    {
+                        dicQuery.Add("authority", Utils.UrlEncode(item.requestHost));
+                        dicQuery.Add("serviceName", Utils.UrlEncode(item.path));
+                        if (item.headerType is Global.GrpcGunMode or Global.GrpcMultiMode)
+                        {
+                            dicQuery.Add("mode", Utils.UrlEncode(item.headerType));
+                        }
+                    }
+                    break;
+            }
+            return 0;
+        }
+
+        protected static int ResolveStdTransport(NameValueCollection query, ref ProfileItem item)
+        {
+            item.flow = query["flow"] ?? "";
+            item.streamSecurity = query["security"] ?? "";
+            item.sni = query["sni"] ?? "";
+            item.alpn = Utils.UrlDecode(query["alpn"] ?? "");
+            item.fingerprint = Utils.UrlDecode(query["fp"] ?? "");
+            item.publicKey = Utils.UrlDecode(query["pbk"] ?? "");
+            item.shortId = Utils.UrlDecode(query["sid"] ?? "");
+            item.spiderX = Utils.UrlDecode(query["spx"] ?? "");
+
+            item.network = query["type"] ?? nameof(ETransport.tcp);
+            switch (item.network)
+            {
+                case nameof(ETransport.tcp):
+                    item.headerType = query["headerType"] ?? Global.None;
+                    item.requestHost = Utils.UrlDecode(query["host"] ?? "");
+
+                    break;
+
+                case nameof(ETransport.kcp):
+                    item.headerType = query["headerType"] ?? Global.None;
+                    item.path = Utils.UrlDecode(query["seed"] ?? "");
+                    break;
+
+                case nameof(ETransport.ws):
+                case nameof(ETransport.httpupgrade):
+                case nameof(ETransport.splithttp):
+                    item.requestHost = Utils.UrlDecode(query["host"] ?? "");
+                    item.path = Utils.UrlDecode(query["path"] ?? "/");
+                    break;
+
+                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 nameof(ETransport.quic):
+                    item.headerType = query["headerType"] ?? Global.None;
+                    item.requestHost = query["quicSecurity"] ?? Global.None;
+                    item.path = Utils.UrlDecode(query["key"] ?? "");
+                    break;
+
+                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:
+                    break;
+            }
+            return 0;
+        }
+
+        protected static bool Contains(string str, params string[] s)
+        {
+            foreach (var item in s)
+            {
+                if (str.Contains(item, StringComparison.OrdinalIgnoreCase)) return true;
+            }
+            return false;
+        }
+
+        protected static string WriteAllText(string strData, string ext = "json")
+        {
+            var fileName = Utils.GetTempPath($"{Utils.GetGUID(false)}.{ext}");
+            File.WriteAllText(fileName, strData);
+            return fileName;
+        }
+    }
+}

v2rayN/v2rayN/Handler/Fmt/ClashFmt.cs

@@ -0,0 +1,26 @@
+using v2rayN.Enums;
+using v2rayN.Models;
+
+namespace v2rayN.Handler.Fmt
+{
+    internal class ClashFmt : BaseFmt
+    {
+        public static ProfileItem? ResolveFull(string strData, string? subRemarks)
+        {
+            if (Contains(strData, "port", "socks-port", "proxies"))
+            {
+                var fileName = WriteAllText(strData, "yaml");
+
+                var profileItem = new ProfileItem
+                {
+                    coreType = ECoreType.mihomo,
+                    address = fileName,
+                    remarks = subRemarks ?? "clash_custom"
+                };
+                return profileItem;
+            }
+
+            return null;
+        }
+    }
+}

v2rayN/v2rayN/Handler/Fmt/FmtHandler.cs

@@ -0,0 +1,94 @@
+using v2rayN.Enums;
+using v2rayN.Models;
+using v2rayN.Resx;
+
+namespace v2rayN.Handler.Fmt
+{
+    internal class FmtHandler
+    {
+        public static string? GetShareUri(ProfileItem item)
+        {
+            try
+            {
+                var url = item.configType switch
+                {
+                    EConfigType.VMess => VmessFmt.ToUri(item),
+                    EConfigType.Shadowsocks => ShadowsocksFmt.ToUri(item),
+                    EConfigType.Socks => SocksFmt.ToUri(item),
+                    EConfigType.Trojan => TrojanFmt.ToUri(item),
+                    EConfigType.VLESS => VLESSFmt.ToUri(item),
+                    EConfigType.Hysteria2 => Hysteria2Fmt.ToUri(item),
+                    EConfigType.Tuic => TuicFmt.ToUri(item),
+                    EConfigType.Wireguard => WireguardFmt.ToUri(item),
+                    _ => null,
+                };
+
+                return url;
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+                return "";
+            }
+        }
+
+        public static ProfileItem? ResolveConfig(string config, out string msg)
+        {
+            msg = ResUI.ConfigurationFormatIncorrect;
+
+            try
+            {
+                string str = config.TrimEx();
+                if (Utils.IsNullOrEmpty(str))
+                {
+                    msg = ResUI.FailedReadConfiguration;
+                    return null;
+                }
+
+                if (str.StartsWith(Global.ProtocolShares[EConfigType.VMess]))
+                {
+                    return VmessFmt.Resolve(str, out msg);
+                }
+                else if (str.StartsWith(Global.ProtocolShares[EConfigType.Shadowsocks]))
+                {
+                    return ShadowsocksFmt.Resolve(str, out msg);
+                }
+                else if (str.StartsWith(Global.ProtocolShares[EConfigType.Socks]))
+                {
+                    return SocksFmt.Resolve(str, out msg);
+                }
+                else if (str.StartsWith(Global.ProtocolShares[EConfigType.Trojan]))
+                {
+                    return TrojanFmt.Resolve(str, out msg);
+                }
+                else if (str.StartsWith(Global.ProtocolShares[EConfigType.VLESS]))
+                {
+                    return VLESSFmt.Resolve(str, out msg);
+                }
+                else if (str.StartsWith(Global.ProtocolShares[EConfigType.Hysteria2]) || str.StartsWith(Global.Hysteria2ProtocolShare))
+                {
+                    return Hysteria2Fmt.Resolve(str, out msg);
+                }
+                else if (str.StartsWith(Global.ProtocolShares[EConfigType.Tuic]))
+                {
+                    return TuicFmt.Resolve(str, out msg);
+                }
+                else if (str.StartsWith(Global.ProtocolShares[EConfigType.Wireguard]))
+                {
+                    return WireguardFmt.Resolve(str, out msg);
+                }
+                else
+                {
+                    msg = ResUI.NonvmessOrssProtocol;
+                    return null;
+                }
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+                msg = ResUI.Incorrectconfiguration;
+                return null;
+            }
+        }
+    }
+}

v2rayN/v2rayN/Handler/Fmt/Hysteria2Fmt.cs

@@ -0,0 +1,104 @@
+using v2rayN.Enums;
+using v2rayN.Models;
+using v2rayN.Resx;
+
+namespace v2rayN.Handler.Fmt
+{
+    internal class Hysteria2Fmt : BaseFmt
+    {
+        public static ProfileItem? Resolve(string str, out string msg)
+        {
+            msg = ResUI.ConfigurationFormatIncorrect;
+            ProfileItem item = new()
+            {
+                configType = EConfigType.Hysteria2
+            };
+
+            Uri url = new(str);
+
+            item.address = url.IdnHost;
+            item.port = url.Port;
+            item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
+            item.id = Utils.UrlDecode(url.UserInfo);
+
+            var query = Utils.ParseQueryString(url.Query);
+            ResolveStdTransport(query, ref item);
+            item.path = Utils.UrlDecode(query["obfs-password"] ?? "");
+            item.allowInsecure = (query["insecure"] ?? "") == "1" ? "true" : "false";
+
+            return item;
+        }
+
+        public static string? ToUri(ProfileItem? item)
+        {
+            if (item == null) return null;
+            string url = string.Empty;
+
+            string remark = string.Empty;
+            if (!Utils.IsNullOrEmpty(item.remarks))
+            {
+                remark = "#" + Utils.UrlEncode(item.remarks);
+            }
+            var dicQuery = new Dictionary<string, string>();
+            if (!Utils.IsNullOrEmpty(item.sni))
+            {
+                dicQuery.Add("sni", item.sni);
+            }
+            if (!Utils.IsNullOrEmpty(item.alpn))
+            {
+                dicQuery.Add("alpn", Utils.UrlEncode(item.alpn));
+            }
+            if (!Utils.IsNullOrEmpty(item.path))
+            {
+                dicQuery.Add("obfs", "salamander");
+                dicQuery.Add("obfs-password", Utils.UrlEncode(item.path));
+            }
+            dicQuery.Add("insecure", item.allowInsecure.ToLower() == "true" ? "1" : "0");
+
+            string query = "?" + string.Join("&", dicQuery.Select(x => x.Key + "=" + x.Value).ToArray());
+
+            url = string.Format("{0}@{1}:{2}",
+            item.id,
+            GetIpv6(item.address),
+            item.port);
+            url = $"{Global.ProtocolShares[EConfigType.Hysteria2]}{url}/{query}{remark}";
+            return url;
+        }
+
+        public static ProfileItem? ResolveFull(string strData, string? subRemarks)
+        {
+            if (Contains(strData, "server", "up", "down", "listen", "<html>", "<body>"))
+            {
+                var fileName = WriteAllText(strData);
+
+                var profileItem = new ProfileItem
+                {
+                    coreType = ECoreType.hysteria,
+                    address = fileName,
+                    remarks = subRemarks ?? "hysteria_custom"
+                };
+                return profileItem;
+            }
+
+            return null;
+        }
+
+        public static ProfileItem? ResolveFull2(string strData, string? subRemarks)
+        {
+            if (Contains(strData, "server", "auth", "up", "down", "listen"))
+            {
+                var fileName = WriteAllText(strData);
+
+                var profileItem = new ProfileItem
+                {
+                    coreType = ECoreType.hysteria2,
+                    address = fileName,
+                    remarks = subRemarks ?? "hysteria2_custom"
+                };
+                return profileItem;
+            }
+
+            return null;
+        }
+    }
+}

v2rayN/v2rayN/Handler/Fmt/NaiveproxyFmt.cs

@@ -0,0 +1,26 @@
+using v2rayN.Enums;
+using v2rayN.Models;
+
+namespace v2rayN.Handler.Fmt
+{
+    internal class NaiveproxyFmt : BaseFmt
+    {
+        public static ProfileItem? ResolveFull(string strData, string? subRemarks)
+        {
+            if (Contains(strData, "listen", "proxy", "<html>", "<body>"))
+            {
+                var fileName = WriteAllText(strData);
+
+                var profileItem = new ProfileItem
+                {
+                    coreType = ECoreType.naiveproxy,
+                    address = fileName,
+                    remarks = subRemarks ?? "naiveproxy_custom"
+                };
+                return profileItem;
+            }
+
+            return null;
+        }
+    }
+}

v2rayN/v2rayN/Handler/Fmt/ShadowsocksFmt.cs

@@ -0,0 +1,183 @@
+using System.Text.RegularExpressions;
+using v2rayN.Enums;
+using v2rayN.Models;
+using v2rayN.Resx;
+
+namespace v2rayN.Handler.Fmt
+{
+    internal class ShadowsocksFmt : BaseFmt
+    {
+        public static ProfileItem? Resolve(string str, out string msg)
+        {
+            msg = ResUI.ConfigurationFormatIncorrect;
+            ProfileItem? item;
+
+            item = ResolveSSLegacy(str) ?? ResolveSip002(str);
+            if (item == null)
+            {
+                return null;
+            }
+            if (item.address.Length == 0 || item.port == 0 || item.security.Length == 0 || item.id.Length == 0)
+            {
+                return null;
+            }
+
+            item.configType = EConfigType.Shadowsocks;
+
+            return item;
+        }
+
+        public static string? ToUri(ProfileItem? item)
+        {
+            if (item == null) return null;
+            string url = string.Empty;
+
+            string remark = string.Empty;
+            if (!Utils.IsNullOrEmpty(item.remarks))
+            {
+                remark = "#" + Utils.UrlEncode(item.remarks);
+            }
+            //url = string.Format("{0}:{1}@{2}:{3}",
+            //    item.security,
+            //    item.id,
+            //    item.address,
+            //    item.port);
+            //url = Utile.Base64Encode(url);
+            //new Sip002
+            var pw = Utils.Base64Encode($"{item.security}:{item.id}");
+            url = $"{pw}@{GetIpv6(item.address)}:{item.port}";
+            url = $"{Global.ProtocolShares[EConfigType.Shadowsocks]}{url}{remark}";
+            return url;
+        }
+
+        private static readonly Regex UrlFinder = new(@"ss://(?<base64>[A-Za-z0-9+-/=_]+)(?:#(?<tag>\S+))?", RegexOptions.IgnoreCase | RegexOptions.Compiled);
+        private static readonly Regex DetailsParser = new(@"^((?<method>.+?):(?<password>.*)@(?<hostname>.+?):(?<port>\d+?))$", RegexOptions.IgnoreCase | RegexOptions.Compiled);
+
+        private static ProfileItem? ResolveSSLegacy(string result)
+        {
+            var match = UrlFinder.Match(result);
+            if (!match.Success)
+                return null;
+
+            ProfileItem item = new();
+            var base64 = match.Groups["base64"].Value.TrimEnd('/');
+            var tag = match.Groups["tag"].Value;
+            if (!Utils.IsNullOrEmpty(tag))
+            {
+                item.remarks = Utils.UrlDecode(tag);
+            }
+            Match details;
+            try
+            {
+                details = DetailsParser.Match(Utils.Base64Decode(base64));
+            }
+            catch (FormatException)
+            {
+                return null;
+            }
+            if (!details.Success)
+                return null;
+            item.security = details.Groups["method"].Value;
+            item.id = details.Groups["password"].Value;
+            item.address = details.Groups["hostname"].Value;
+            item.port = Utils.ToInt(details.Groups["port"].Value);
+            return item;
+        }
+
+        private static ProfileItem? ResolveSip002(string result)
+        {
+            Uri parsedUrl;
+            try
+            {
+                parsedUrl = new Uri(result);
+            }
+            catch (UriFormatException)
+            {
+                return null;
+            }
+            ProfileItem item = new()
+            {
+                remarks = parsedUrl.GetComponents(UriComponents.Fragment, UriFormat.Unescaped),
+                address = parsedUrl.IdnHost,
+                port = parsedUrl.Port,
+            };
+            string rawUserInfo = parsedUrl.GetComponents(UriComponents.UserInfo, UriFormat.UriEscaped);
+            //2022-blake3
+            if (rawUserInfo.Contains(':'))
+            {
+                string[] userInfoParts = rawUserInfo.Split(new[] { ':' }, 2);
+                if (userInfoParts.Length != 2)
+                {
+                    return null;
+                }
+                item.security = userInfoParts[0];
+                item.id = Utils.UrlDecode(userInfoParts[1]);
+            }
+            else
+            {
+                // parse base64 UserInfo
+                string userInfo = Utils.Base64Decode(rawUserInfo);
+                string[] userInfoParts = userInfo.Split(new[] { ':' }, 2);
+                if (userInfoParts.Length != 2)
+                {
+                    return null;
+                }
+                item.security = userInfoParts[0];
+                item.id = userInfoParts[1];
+            }
+
+            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") && !Utils.IsNullOrEmpty(obfsHost))
+                {
+                    obfsHost = obfsHost?.Replace("obfs-host=", "");
+                    item.network = Global.DefaultNetwork;
+                    item.headerType = Global.TcpHeaderHttp;
+                    item.requestHost = obfsHost ?? "";
+                }
+                else
+                {
+                    return null;
+                }
+            }
+
+            return item;
+        }
+
+        public static List<ProfileItem>? ResolveSip008(string result)
+        {
+            //SsSIP008
+            var lstSsServer = JsonUtils.Deserialize<List<SsServer>>(result);
+            if (lstSsServer?.Count <= 0)
+            {
+                var ssSIP008 = JsonUtils.Deserialize<SsSIP008>(result);
+                if (ssSIP008?.servers?.Count > 0)
+                {
+                    lstSsServer = ssSIP008.servers;
+                }
+            }
+
+            if (lstSsServer?.Count > 0)
+            {
+                List<ProfileItem> lst = [];
+                foreach (var it in lstSsServer)
+                {
+                    var ssItem = new ProfileItem()
+                    {
+                        remarks = it.remarks,
+                        security = it.method,
+                        id = it.password,
+                        address = it.server,
+                        port = Utils.ToInt(it.server_port)
+                    };
+                    lst.Add(ssItem);
+                }
+                return lst;
+            }
+            return null;
+        }
+    }
+}

v2rayN/v2rayN/Handler/Fmt/SingboxFmt.cs

@@ -0,0 +1,58 @@
+using v2rayN.Enums;
+using v2rayN.Models;
+
+namespace v2rayN.Handler.Fmt
+{
+    internal class SingboxFmt : BaseFmt
+    {
+        public static List<ProfileItem>? ResolveFullArray(string strData, string? subRemarks)
+        {
+            var configObjects = JsonUtils.Deserialize<Object[]>(strData);
+            if (configObjects != null && configObjects.Length > 0)
+            {
+                List<ProfileItem> lstResult = [];
+                foreach (var configObject in configObjects)
+                {
+                    var objectString = JsonUtils.Serialize(configObject);
+                    var singboxCon = JsonUtils.Deserialize<SingboxConfig>(objectString);
+                    if (singboxCon?.inbounds?.Count > 0
+                        && singboxCon.outbounds?.Count > 0
+                        && singboxCon.route != null)
+                    {
+                        var fileName = WriteAllText(objectString);
+
+                        var profileIt = new ProfileItem
+                        {
+                            coreType = ECoreType.sing_box,
+                            address = fileName,
+                            remarks = subRemarks ?? "singbox_custom",
+                        };
+                        lstResult.Add(profileIt);
+                    }
+                }
+                return lstResult;
+            }
+            return null;
+        }
+
+        public static ProfileItem? ResolveFull(string strData, string? subRemarks)
+        {
+            var singboxConfig = JsonUtils.Deserialize<SingboxConfig>(strData);
+            if (singboxConfig?.inbounds?.Count > 0
+                && singboxConfig.outbounds?.Count > 0
+                && singboxConfig.route != null)
+            {
+                var fileName = WriteAllText(strData);
+                var profileItem = new ProfileItem
+                {
+                    coreType = ECoreType.sing_box,
+                    address = fileName,
+                    remarks = subRemarks ?? "singbox_custom"
+                };
+
+                return profileItem;
+            }
+            return null;
+        }
+    }
+}

v2rayN/v2rayN/Handler/Fmt/SocksFmt.cs

@@ -0,0 +1,131 @@
+using v2rayN.Enums;
+using v2rayN.Models;
+using v2rayN.Resx;
+
+namespace v2rayN.Handler.Fmt
+{
+    internal class SocksFmt : BaseFmt
+    {
+        public static ProfileItem? Resolve(string str, out string msg)
+        {
+            msg = ResUI.ConfigurationFormatIncorrect;
+            ProfileItem? item;
+
+            item = ResolveSocksNew(str) ?? ResolveSocks(str);
+            if (item == null)
+            {
+                return null;
+            }
+            if (item.address.Length == 0 || item.port == 0)
+            {
+                return null;
+            }
+
+            item.configType = EConfigType.Socks;
+
+            return item;
+        }
+
+        public static string? ToUri(ProfileItem? item)
+        {
+            if (item == null) return null;
+            string url = string.Empty;
+
+            string remark = string.Empty;
+            if (!Utils.IsNullOrEmpty(item.remarks))
+            {
+                remark = "#" + Utils.UrlEncode(item.remarks);
+            }
+            //url = string.Format("{0}:{1}@{2}:{3}",
+            //    item.security,
+            //    item.id,
+            //    item.address,
+            //    item.port);
+            //url = Utile.Base64Encode(url);
+            //new
+            var pw = Utils.Base64Encode($"{item.security}:{item.id}");
+            url = $"{pw}@{GetIpv6(item.address)}:{item.port}";
+            url = $"{Global.ProtocolShares[EConfigType.Socks]}{url}{remark}";
+            return url;
+        }
+
+        private static ProfileItem? ResolveSocks(string result)
+        {
+            ProfileItem item = new()
+            {
+                configType = EConfigType.Socks
+            };
+            result = result[Global.ProtocolShares[EConfigType.Socks].Length..];
+            //remark
+            int indexRemark = result.IndexOf("#");
+            if (indexRemark > 0)
+            {
+                try
+                {
+                    item.remarks = Utils.UrlDecode(result.Substring(indexRemark + 1, result.Length - indexRemark - 1));
+                }
+                catch { }
+                result = result[..indexRemark];
+            }
+            //part decode
+            int indexS = result.IndexOf("@");
+            if (indexS > 0)
+            {
+            }
+            else
+            {
+                result = Utils.Base64Decode(result);
+            }
+
+            string[] arr1 = result.Split('@');
+            if (arr1.Length != 2)
+            {
+                return null;
+            }
+            string[] arr21 = arr1[0].Split(':');
+            //string[] arr22 = arr1[1].Split(':');
+            int indexPort = arr1[1].LastIndexOf(":");
+            if (arr21.Length != 2 || indexPort < 0)
+            {
+                return null;
+            }
+            item.address = arr1[1][..indexPort];
+            item.port = Utils.ToInt(arr1[1][(indexPort + 1)..]);
+            item.security = arr21[0];
+            item.id = arr21[1];
+
+            return item;
+        }
+
+        private static ProfileItem? ResolveSocksNew(string result)
+        {
+            Uri parsedUrl;
+            try
+            {
+                parsedUrl = new Uri(result);
+            }
+            catch (UriFormatException)
+            {
+                return null;
+            }
+            ProfileItem item = new()
+            {
+                remarks = parsedUrl.GetComponents(UriComponents.Fragment, UriFormat.Unescaped),
+                address = parsedUrl.IdnHost,
+                port = parsedUrl.Port,
+            };
+
+            // parse base64 UserInfo
+            string rawUserInfo = parsedUrl.GetComponents(UriComponents.UserInfo, UriFormat.Unescaped);
+            string userInfo = Utils.Base64Decode(rawUserInfo);
+            string[] userInfoParts = userInfo.Split(new[] { ':' }, 2);
+            if (userInfoParts.Length == 2)
+            {
+                item.security = userInfoParts[0];
+                item.id = userInfoParts[1];
+            }
+
+            return item;
+        }
+    }
+}

v2rayN/v2rayN/Handler/Fmt/TrojanFmt.cs

@@ -0,0 +1,53 @@
+using v2rayN.Enums;
+using v2rayN.Models;
+using v2rayN.Resx;
+
+namespace v2rayN.Handler.Fmt
+{
+    internal class TrojanFmt : BaseFmt
+    {
+        public static ProfileItem? Resolve(string str, out string msg)
+        {
+            msg = ResUI.ConfigurationFormatIncorrect;
+
+            ProfileItem item = new()
+            {
+                configType = EConfigType.Trojan
+            };
+
+            Uri url = new(str);
+
+            item.address = url.IdnHost;
+            item.port = url.Port;
+            item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
+            item.id = Utils.UrlDecode(url.UserInfo);
+
+            var query = Utils.ParseQueryString(url.Query);
+            ResolveStdTransport(query, ref item);
+
+            return item;
+        }
+
+        public static string? ToUri(ProfileItem? item)
+        {
+            if (item == null) return null;
+            string url = string.Empty;
+
+            string remark = string.Empty;
+            if (!Utils.IsNullOrEmpty(item.remarks))
+            {
+                remark = "#" + Utils.UrlEncode(item.remarks);
+            }
+            var dicQuery = new Dictionary<string, string>();
+            GetStdTransport(item, null, ref dicQuery);
+            string query = "?" + string.Join("&", dicQuery.Select(x => x.Key + "=" + x.Value).ToArray());
+
+            url = string.Format("{0}@{1}:{2}",
+            item.id,
+            GetIpv6(item.address),
+            item.port);
+            url = $"{Global.ProtocolShares[EConfigType.Trojan]}{url}{query}{remark}";
+            return url;
+        }
+    }
+}

v2rayN/v2rayN/Handler/Fmt/TuicFmt.cs

@@ -0,0 +1,68 @@
+using v2rayN.Enums;
+using v2rayN.Models;
+using v2rayN.Resx;
+
+namespace v2rayN.Handler.Fmt
+{
+    internal class TuicFmt : BaseFmt
+    {
+        public static ProfileItem? Resolve(string str, out string msg)
+        {
+            msg = ResUI.ConfigurationFormatIncorrect;
+
+            ProfileItem item = new()
+            {
+                configType = EConfigType.Tuic
+            };
+
+            Uri url = new(str);
+
+            item.address = url.IdnHost;
+            item.port = url.Port;
+            item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
+            var userInfoParts = url.UserInfo.Split(new[] { ':' }, 2);
+            if (userInfoParts.Length == 2)
+            {
+                item.id = userInfoParts[0];
+                item.security = userInfoParts[1];
+            }
+
+            var query = Utils.ParseQueryString(url.Query);
+            ResolveStdTransport(query, ref item);
+            item.headerType = query["congestion_control"] ?? "";
+
+            return item;
+        }
+
+        public static string? ToUri(ProfileItem? item)
+        {
+            if (item == null) return null;
+            string url = string.Empty;
+
+            string remark = string.Empty;
+            if (!Utils.IsNullOrEmpty(item.remarks))
+            {
+                remark = "#" + Utils.UrlEncode(item.remarks);
+            }
+            var dicQuery = new Dictionary<string, string>();
+            if (!Utils.IsNullOrEmpty(item.sni))
+            {
+                dicQuery.Add("sni", item.sni);
+            }
+            if (!Utils.IsNullOrEmpty(item.alpn))
+            {
+                dicQuery.Add("alpn", Utils.UrlEncode(item.alpn));
+            }
+            dicQuery.Add("congestion_control", item.headerType);
+
+            string query = "?" + string.Join("&", dicQuery.Select(x => x.Key + "=" + x.Value).ToArray());
+
+            url = string.Format("{0}@{1}:{2}",
+            $"{item.id}:{item.security}",
+            GetIpv6(item.address),
+            item.port);
+            url = $"{Global.ProtocolShares[EConfigType.Tuic]}{url}{query}{remark}";
+            return url;
+        }
+    }
+}

v2rayN/v2rayN/Handler/Fmt/V2rayFmt.cs

@@ -0,0 +1,59 @@
+using v2rayN.Enums;
+using v2rayN.Models;
+
+namespace v2rayN.Handler.Fmt
+{
+    internal class V2rayFmt : BaseFmt
+    {
+        public static List<ProfileItem>? ResolveFullArray(string strData, string? subRemarks)
+        {
+            var configObjects = JsonUtils.Deserialize<Object[]>(strData);
+            if (configObjects != null && configObjects.Length > 0)
+            {
+                List<ProfileItem> lstResult = [];
+                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
+                        && v2rayCon.routing != null)
+                    {
+                        var fileName = WriteAllText(objectString);
+
+                        var profileIt = new ProfileItem
+                        {
+                            coreType = ECoreType.Xray,
+                            address = fileName,
+                            remarks = v2rayCon.remarks ?? subRemarks ?? "v2ray_custom",
+                        };
+                        lstResult.Add(profileIt);
+                    }
+                }
+                return lstResult;
+            }
+            return null;
+        }
+
+        public static ProfileItem? ResolveFull(string strData, string? subRemarks)
+        {
+            var v2rayConfig = JsonUtils.Deserialize<V2rayConfig>(strData);
+            if (v2rayConfig?.inbounds?.Count > 0
+                && v2rayConfig.outbounds?.Count > 0
+                && v2rayConfig.routing != null)
+            {
+                var fileName = WriteAllText(strData);
+
+                var profileItem = new ProfileItem
+                {
+                    coreType = ECoreType.Xray,
+                    address = fileName,
+                    remarks = v2rayConfig.remarks ?? subRemarks ?? "v2ray_custom"
+                };
+
+                return profileItem;
+            }
+            return null;
+        }
+    }
+}

v2rayN/v2rayN/Handler/Fmt/VLESSFmt.cs

@@ -0,0 +1,64 @@
+using v2rayN.Enums;
+using v2rayN.Models;
+using v2rayN.Resx;
+
+namespace v2rayN.Handler.Fmt
+{
+    internal class VLESSFmt : BaseFmt
+    {
+        public static ProfileItem? Resolve(string str, out string msg)
+        {
+            msg = ResUI.ConfigurationFormatIncorrect;
+
+            ProfileItem item = new()
+            {
+                configType = EConfigType.VLESS,
+                security = Global.None
+            };
+
+            Uri url = new(str);
+
+            item.address = url.IdnHost;
+            item.port = url.Port;
+            item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
+            item.id = Utils.UrlDecode(url.UserInfo);
+
+            var query = Utils.ParseQueryString(url.Query);
+            item.security = query["encryption"] ?? Global.None;
+            item.streamSecurity = query["security"] ?? "";
+            ResolveStdTransport(query, ref item);
+
+            return item;
+        }
+
+        public static string? ToUri(ProfileItem? item)
+        {
+            if (item == null) return null;
+            string url = string.Empty;
+
+            string remark = string.Empty;
+            if (!Utils.IsNullOrEmpty(item.remarks))
+            {
+                remark = "#" + Utils.UrlEncode(item.remarks);
+            }
+            var dicQuery = new Dictionary<string, string>();
+            if (!Utils.IsNullOrEmpty(item.security))
+            {
+                dicQuery.Add("encryption", item.security);
+            }
+            else
+            {
+                dicQuery.Add("encryption", Global.None);
+            }
+            GetStdTransport(item, Global.None, ref dicQuery);
+            string query = "?" + string.Join("&", dicQuery.Select(x => x.Key + "=" + x.Value).ToArray());
+
+            url = string.Format("{0}@{1}:{2}",
+            item.id,
+            GetIpv6(item.address),
+            item.port);
+            url = $"{Global.ProtocolShares[EConfigType.VLESS]}{url}{query}{remark}";
+            return url;
+        }
+    }
+}

v2rayN/v2rayN/Handler/Fmt/VmessFmt.cs

@@ -0,0 +1,229 @@
+using System.Text.RegularExpressions;
+using v2rayN.Enums;
+using v2rayN.Models;
+using v2rayN.Resx;
+
+namespace v2rayN.Handler.Fmt
+{
+    internal class VmessFmt : BaseFmt
+    {
+        private static readonly Regex StdVmessUserInfo = new(
+            @"^(?<network>[a-z]+)(\+(?<streamSecurity>[a-z]+))?:(?<id>[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})$", RegexOptions.Compiled);
+
+        public static ProfileItem? Resolve(string str, out string msg)
+        {
+            msg = ResUI.ConfigurationFormatIncorrect;
+            ProfileItem? item;
+            int indexSplit = str.IndexOf("?");
+            if (indexSplit > 0)
+            {
+                item = ResolveStdVmess(str) ?? ResolveVmess4Kitsunebi(str);
+            }
+            else
+            {
+                item = ResolveVmess(str, out msg);
+            }
+            return item;
+        }
+
+        public static string? ToUri(ProfileItem? item)
+        {
+            if (item == null) return null;
+            string url = string.Empty;
+
+            VmessQRCode vmessQRCode = new()
+            {
+                v = item.configVersion,
+                ps = item.remarks.TrimEx(),
+                add = item.address,
+                port = item.port,
+                id = item.id,
+                aid = item.alterId,
+                scy = item.security,
+                net = item.network,
+                type = item.headerType,
+                host = item.requestHost,
+                path = item.path,
+                tls = item.streamSecurity,
+                sni = item.sni,
+                alpn = item.alpn,
+                fp = item.fingerprint
+            };
+
+            url = JsonUtils.Serialize(vmessQRCode);
+            url = Utils.Base64Encode(url);
+            url = $"{Global.ProtocolShares[EConfigType.VMess]}{url}";
+
+            return url;
+        }
+
+        private static ProfileItem? ResolveVmess(string result, out string msg)
+        {
+            msg = string.Empty;
+            var item = new ProfileItem
+            {
+                configType = EConfigType.VMess
+            };
+
+            result = result[Global.ProtocolShares[EConfigType.VMess].Length..];
+            result = Utils.Base64Decode(result);
+
+            //转成Json
+            VmessQRCode? vmessQRCode = JsonUtils.Deserialize<VmessQRCode>(result);
+            if (vmessQRCode == null)
+            {
+                msg = ResUI.FailedConversionConfiguration;
+                return null;
+            }
+
+            item.network = Global.DefaultNetwork;
+            item.headerType = Global.None;
+
+            item.configVersion = Utils.ToInt(vmessQRCode.v);
+            item.remarks = Utils.ToString(vmessQRCode.ps);
+            item.address = Utils.ToString(vmessQRCode.add);
+            item.port = Utils.ToInt(vmessQRCode.port);
+            item.id = Utils.ToString(vmessQRCode.id);
+            item.alterId = Utils.ToInt(vmessQRCode.aid);
+            item.security = Utils.ToString(vmessQRCode.scy);
+
+            item.security = !Utils.IsNullOrEmpty(vmessQRCode.scy) ? vmessQRCode.scy : Global.DefaultSecurity;
+            if (!Utils.IsNullOrEmpty(vmessQRCode.net))
+            {
+                item.network = vmessQRCode.net;
+            }
+            if (!Utils.IsNullOrEmpty(vmessQRCode.type))
+            {
+                item.headerType = vmessQRCode.type;
+            }
+
+            item.requestHost = Utils.ToString(vmessQRCode.host);
+            item.path = Utils.ToString(vmessQRCode.path);
+            item.streamSecurity = Utils.ToString(vmessQRCode.tls);
+            item.sni = Utils.ToString(vmessQRCode.sni);
+            item.alpn = Utils.ToString(vmessQRCode.alpn);
+            item.fingerprint = Utils.ToString(vmessQRCode.fp);
+
+            return item;
+        }
+
+        private static ProfileItem? ResolveStdVmess(string result)
+        {
+            ProfileItem item = new()
+            {
+                configType = EConfigType.VMess,
+                security = "auto"
+            };
+
+            Uri u = new(result);
+
+            item.address = u.IdnHost;
+            item.port = u.Port;
+            item.remarks = u.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
+            var query = Utils.ParseQueryString(u.Query);
+
+            var m = StdVmessUserInfo.Match(u.UserInfo);
+            if (!m.Success) return null;
+
+            item.id = m.Groups["id"].Value;
+
+            if (m.Groups["streamSecurity"].Success)
+            {
+                item.streamSecurity = m.Groups["streamSecurity"].Value;
+            }
+            switch (item.streamSecurity)
+            {
+                case Global.StreamSecurity:
+                    break;
+
+                default:
+                    if (!Utils.IsNullOrEmpty(item.streamSecurity))
+                        return null;
+                    break;
+            }
+
+            item.network = m.Groups["network"].Value;
+            switch (item.network)
+            {
+                case nameof(ETransport.tcp):
+                    string t1 = query["type"] ?? Global.None;
+                    item.headerType = t1;
+                    break;
+
+                case nameof(ETransport.kcp):
+                    item.headerType = query["type"] ?? Global.None;
+                    break;
+
+                case nameof(ETransport.ws):
+                case nameof(ETransport.httpupgrade):
+                case nameof(ETransport.splithttp):
+                    string p1 = query["path"] ?? "/";
+                    string h1 = query["host"] ?? "";
+                    item.requestHost = Utils.UrlDecode(h1);
+                    item.path = p1;
+                    break;
+
+                case nameof(ETransport.http):
+                case nameof(ETransport.h2):
+                    item.network = nameof(ETransport.h2);
+                    string p2 = query["path"] ?? "/";
+                    string h2 = query["host"] ?? "";
+                    item.requestHost = Utils.UrlDecode(h2);
+                    item.path = p2;
+                    break;
+
+                case nameof(ETransport.quic):
+                    string s = query["security"] ?? Global.None;
+                    string k = query["key"] ?? "";
+                    string t3 = query["type"] ?? Global.None;
+                    item.headerType = t3;
+                    item.requestHost = Utils.UrlDecode(s);
+                    item.path = k;
+                    break;
+
+                default:
+                    return null;
+            }
+
+            return item;
+        }
+
+        private static ProfileItem? ResolveVmess4Kitsunebi(string result)
+        {
+            ProfileItem item = new()
+            {
+                configType = EConfigType.VMess
+            };
+            result = result[Global.ProtocolShares[EConfigType.VMess].Length..];
+            int indexSplit = result.IndexOf("?");
+            if (indexSplit > 0)
+            {
+                result = result[..indexSplit];
+            }
+            result = Utils.Base64Decode(result);
+
+            string[] arr1 = result.Split('@');
+            if (arr1.Length != 2)
+            {
+                return null;
+            }
+            string[] arr21 = arr1[0].Split(':');
+            string[] arr22 = arr1[1].Split(':');
+            if (arr21.Length != 2 || arr22.Length != 2)
+            {
+                return null;
+            }
+
+            item.address = arr22[0];
+            item.port = Utils.ToInt(arr22[1]);
+            item.security = arr21[0];
+            item.id = arr21[1];
+
+            item.network = Global.DefaultNetwork;
+            item.headerType = Global.None;
+            item.remarks = "Alien";
+
+            return item;
+        }
+    }
+}

v2rayN/v2rayN/Handler/Fmt/WireguardFmt.cs

@@ -0,0 +1,73 @@
+using v2rayN.Enums;
+using v2rayN.Models;
+using v2rayN.Resx;
+
+namespace v2rayN.Handler.Fmt
+{
+    internal class WireguardFmt : BaseFmt
+    {
+        public static ProfileItem? Resolve(string str, out string msg)
+        {
+            msg = ResUI.ConfigurationFormatIncorrect;
+
+            ProfileItem item = new()
+            {
+                configType = EConfigType.Wireguard
+            };
+
+            Uri url = new(str);
+
+            item.address = url.IdnHost;
+            item.port = url.Port;
+            item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
+            item.id = Utils.UrlDecode(url.UserInfo);
+
+            var query = Utils.ParseQueryString(url.Query);
+
+            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;
+        }
+
+        public static string? ToUri(ProfileItem? item)
+        {
+            if (item == null) return null;
+            string url = string.Empty;
+
+            string remark = string.Empty;
+            if (!Utils.IsNullOrEmpty(item.remarks))
+            {
+                remark = "#" + Utils.UrlEncode(item.remarks);
+            }
+
+            var dicQuery = new Dictionary<string, string>();
+            if (!Utils.IsNullOrEmpty(item.publicKey))
+            {
+                dicQuery.Add("publickey", Utils.UrlEncode(item.publicKey));
+            }
+            if (!Utils.IsNullOrEmpty(item.path))
+            {
+                dicQuery.Add("reserved", Utils.UrlEncode(item.path));
+            }
+            if (!Utils.IsNullOrEmpty(item.requestHost))
+            {
+                dicQuery.Add("address", Utils.UrlEncode(item.requestHost));
+            }
+            if (!Utils.IsNullOrEmpty(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}",
+            Utils.UrlEncode(item.id),
+            GetIpv6(item.address),
+            item.port);
+            url = $"{Global.ProtocolShares[EConfigType.Wireguard]}{url}/{query}{remark}";
+            return url;
+        }
+    }
+}

v2rayN/v2rayN/Handler/HotkeyHandler.cs

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

v2rayN/v2rayN/Handler/LazyConfig.cs

@@ -1,5 +1,6 @@
 using System.Runtime.Intrinsics.X86;
-using v2rayN.Mode;
+using v2rayN.Enums;
+using v2rayN.Models;
 
 namespace v2rayN.Handler
 {
@@ -7,24 +8,35 @@ namespace v2rayN.Handler
     {
         private static readonly Lazy<LazyConfig> _instance = new(() => new());
         private Config _config;
-        private List<CoreInfo> coreInfos;
+        private List<CoreInfo> coreInfo;
 
         public static LazyConfig Instance => _instance.Value;
 
-        private int _statePort;
-        public int StatePort { get => _statePort; }
-        private Job _processJob  = new();
+        private int? _statePort;
+
+        public int StatePort
+        {
+            get
+            {
+                if (_statePort is null)
+                {
+                    _statePort = Utils.GetFreePort(GetLocalPort(EInboundProtocol.api));
+                }
+
+                return _statePort.Value;
+            }
+        }
+
+        private Job _processJob = new();
 
         public LazyConfig()
         {
-            _statePort = Utils.GetFreePort();
-
-            SqliteHelper.Instance.CreateTable<SubItem>();
-            SqliteHelper.Instance.CreateTable<ProfileItem>();
-            SqliteHelper.Instance.CreateTable<ServerStatItem>();
-            SqliteHelper.Instance.CreateTable<RoutingItem>();
-            SqliteHelper.Instance.CreateTable<ProfileExItem>();
-            SqliteHelper.Instance.CreateTable<DNSItem>();
+            SQLiteHelper.Instance.CreateTable<SubItem>();
+            SQLiteHelper.Instance.CreateTable<ProfileItem>();
+            SQLiteHelper.Instance.CreateTable<ServerStatItem>();
+            SQLiteHelper.Instance.CreateTable<RoutingItem>();
+            SQLiteHelper.Instance.CreateTable<ProfileExItem>();
+            SQLiteHelper.Instance.CreateTable<DNSItem>();
         }
 
         #region Config
@@ -39,36 +51,12 @@ 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)
         {
             _processJob.AddProcess(processHandle);
@@ -80,35 +68,35 @@ namespace v2rayN.Handler
 
         public List<SubItem> SubItems()
         {
-            return SqliteHelper.Instance.Table<SubItem>().ToList();
+            return SQLiteHelper.Instance.Table<SubItem>().ToList();
         }
 
         public SubItem GetSubItem(string subid)
         {
-            return SqliteHelper.Instance.Table<SubItem>().FirstOrDefault(t => t.id == subid);
+            return SQLiteHelper.Instance.Table<SubItem>().FirstOrDefault(t => t.id == subid);
         }
 
         public List<ProfileItem> ProfileItems(string subid)
         {
             if (Utils.IsNullOrEmpty(subid))
             {
-                return SqliteHelper.Instance.Table<ProfileItem>().ToList();
+                return SQLiteHelper.Instance.Table<ProfileItem>().ToList();
             }
             else
             {
-                return SqliteHelper.Instance.Table<ProfileItem>().Where(t => t.subid == subid).ToList();
+                return SQLiteHelper.Instance.Table<ProfileItem>().Where(t => t.subid == subid).ToList();
             }
         }
 
-        public List<string> ProfileItemIndexs(string subid)
+        public List<string> ProfileItemIndexes(string subid)
         {
             if (Utils.IsNullOrEmpty(subid))
             {
-                return SqliteHelper.Instance.Table<ProfileItem>().Select(t => t.indexId).ToList();
+                return SQLiteHelper.Instance.Table<ProfileItem>().Select(t => t.indexId).ToList();
             }
             else
             {
-                return SqliteHelper.Instance.Table<ProfileItem>().Where(t => t.subid == subid).Select(t => t.indexId).ToList();
+                return SQLiteHelper.Instance.Table<ProfileItem>().Where(t => t.subid == subid).Select(t => t.indexId).ToList();
             }
         }
 
@@ -132,7 +120,7 @@ namespace v2rayN.Handler
                 sql += String.Format(" and (a.remarks like '%{0}%' or a.address like '%{0}%') ", filter);
             }
 
-            return SqliteHelper.Instance.Query<ProfileItemModel>(sql).ToList();
+            return SQLiteHelper.Instance.Query<ProfileItemModel>(sql).ToList();
         }
 
         public ProfileItem? GetProfileItem(string indexId)
@@ -141,7 +129,7 @@ namespace v2rayN.Handler
             {
                 return null;
             }
-            return SqliteHelper.Instance.Table<ProfileItem>().FirstOrDefault(it => it.indexId == indexId);
+            return SQLiteHelper.Instance.Table<ProfileItem>().FirstOrDefault(it => it.indexId == indexId);
         }
 
         public ProfileItem? GetProfileItemViaRemarks(string remarks)
@@ -150,48 +138,48 @@ namespace v2rayN.Handler
             {
                 return null;
             }
-            return SqliteHelper.Instance.Table<ProfileItem>().FirstOrDefault(it => it.remarks == remarks);
+            return SQLiteHelper.Instance.Table<ProfileItem>().FirstOrDefault(it => it.remarks == remarks);
         }
 
         public List<RoutingItem> RoutingItems()
         {
-            return SqliteHelper.Instance.Table<RoutingItem>().Where(it => it.locked == false).OrderBy(t => t.sort).ToList();
+            return SQLiteHelper.Instance.Table<RoutingItem>().Where(it => it.locked == false).OrderBy(t => t.sort).ToList();
         }
 
         public RoutingItem GetRoutingItem(string id)
         {
-            return SqliteHelper.Instance.Table<RoutingItem>().FirstOrDefault(it => it.locked == false && it.id == id);
+            return SQLiteHelper.Instance.Table<RoutingItem>().FirstOrDefault(it => it.locked == false && it.id == id);
         }
 
         public List<DNSItem> DNSItems()
         {
-            return SqliteHelper.Instance.Table<DNSItem>().ToList();
+            return SQLiteHelper.Instance.Table<DNSItem>().ToList();
         }
 
         public DNSItem GetDNSItem(ECoreType eCoreType)
         {
-            return SqliteHelper.Instance.Table<DNSItem>().FirstOrDefault(it => it.coreType == eCoreType);
+            return SQLiteHelper.Instance.Table<DNSItem>().FirstOrDefault(it => it.coreType == eCoreType);
         }
 
         #endregion SqliteHelper
 
         #region Core Type
 
-        public List<string> GetShadowsocksSecuritys(ProfileItem profileItem)
+        public List<string> GetShadowsocksSecurities(ProfileItem profileItem)
         {
             var coreType = GetCoreType(profileItem, EConfigType.Shadowsocks);
             switch (coreType)
             {
                 case ECoreType.v2fly:
-                    return Global.SsSecuritys;
+                    return Global.SsSecurities;
 
                 case ECoreType.Xray:
-                    return Global.SsSecuritysInXray;
+                    return Global.SsSecuritiesInXray;
 
                 case ECoreType.sing_box:
-                    return Global.SsSecuritysInSingbox;
+                    return Global.SsSecuritiesInSingbox;
             }
-            return Global.SsSecuritysInSagerNet;
+            return Global.SsSecuritiesInSagerNet;
         }
 
         public ECoreType GetCoreType(ProfileItem profileItem, EConfigType eConfigType)
@@ -215,27 +203,27 @@ namespace v2rayN.Handler
 
         public CoreInfo? GetCoreInfo(ECoreType coreType)
         {
-            if (coreInfos == null)
+            if (coreInfo == null)
             {
                 InitCoreInfo();
             }
-            return coreInfos!.FirstOrDefault(t => t.coreType == coreType);
+            return coreInfo?.FirstOrDefault(t => t.coreType == coreType);
         }
 
-        public List<CoreInfo> GetCoreInfos()
+        public List<CoreInfo> GetCoreInfo()
         {
-            if (coreInfos == null)
+            if (coreInfo == null)
             {
                 InitCoreInfo();
             }
-            return coreInfos!;
+            return coreInfo!;
         }
 
         private void InitCoreInfo()
         {
-            coreInfos = new(16);
+            coreInfo = new(16);
 
-            coreInfos.Add(new CoreInfo
+            coreInfo.Add(new CoreInfo
             {
                 coreType = ECoreType.v2rayN,
                 coreUrl = Global.NUrl,
@@ -245,7 +233,7 @@ namespace v2rayN.Handler
                 coreDownloadUrlArm64 = Global.NUrl + "/download/{0}/v2rayN-arm64.zip"
             });
 
-            coreInfos.Add(new CoreInfo
+            coreInfo.Add(new CoreInfo
             {
                 coreType = ECoreType.v2fly,
                 coreExes = new List<string> { "wv2ray", "v2ray" },
@@ -260,7 +248,7 @@ namespace v2rayN.Handler
                 redirectInfo = true,
             });
 
-            coreInfos.Add(new CoreInfo
+            coreInfo.Add(new CoreInfo
             {
                 coreType = ECoreType.SagerNet,
                 coreExes = new List<string> { "SagerNet", "v2ray" },
@@ -275,7 +263,7 @@ namespace v2rayN.Handler
                 redirectInfo = true,
             });
 
-            coreInfos.Add(new CoreInfo
+            coreInfo.Add(new CoreInfo
             {
                 coreType = ECoreType.v2fly_v5,
                 coreExes = new List<string> { "v2ray" },
@@ -290,7 +278,7 @@ namespace v2rayN.Handler
                 redirectInfo = true,
             });
 
-            coreInfos.Add(new CoreInfo
+            coreInfo.Add(new CoreInfo
             {
                 coreType = ECoreType.Xray,
                 coreExes = new List<string> { "xray", "wxray" },
@@ -305,7 +293,7 @@ namespace v2rayN.Handler
                 redirectInfo = true,
             });
 
-            coreInfos.Add(new CoreInfo
+            coreInfo.Add(new CoreInfo
             {
                 coreType = ECoreType.clash,
                 coreExes = new List<string> { "clash-windows-amd64-v3", "clash-windows-amd64", "clash-windows-386", "clash" },
@@ -320,7 +308,7 @@ namespace v2rayN.Handler
                 redirectInfo = true,
             });
 
-            coreInfos.Add(new CoreInfo
+            coreInfo.Add(new CoreInfo
             {
                 coreType = ECoreType.clash_meta,
                 coreExes = new List<string> { "Clash.Meta-windows-amd64-compatible", "Clash.Meta-windows-amd64", "Clash.Meta-windows-386", "Clash.Meta", "clash" },
@@ -335,18 +323,18 @@ namespace v2rayN.Handler
                 redirectInfo = true,
             });
 
-            coreInfos.Add(new CoreInfo
+            coreInfo.Add(new CoreInfo
             {
                 coreType = ECoreType.mihomo,
                 coreExes = new List<string> { $"mihomo-windows-amd64{(Avx2.X64.IsSupported ? "" : "-compatible")}", "mihomo-windows-amd64-compatible", "mihomo-windows-amd64", "mihomo-windows-386", "mihomo", "clash" },
-                arguments = "-f config.yaml",
+                arguments = "-f config.json",
                 coreUrl = Global.MihomoCoreUrl,
                 coreReleaseApiUrl = Global.MihomoCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
                 match = "Mihomo",
                 redirectInfo = true,
             });
 
-            coreInfos.Add(new CoreInfo
+            coreInfo.Add(new CoreInfo
             {
                 coreType = ECoreType.hysteria,
                 coreExes = new List<string> { "hysteria-windows-amd64", "hysteria-windows-386", "hysteria" },
@@ -359,7 +347,7 @@ namespace v2rayN.Handler
                 redirectInfo = true,
             });
 
-            coreInfos.Add(new CoreInfo
+            coreInfo.Add(new CoreInfo
             {
                 coreType = ECoreType.naiveproxy,
                 coreExes = new List<string> { "naiveproxy", "naive" },
@@ -368,7 +356,7 @@ namespace v2rayN.Handler
                 redirectInfo = false,
             });
 
-            coreInfos.Add(new CoreInfo
+            coreInfo.Add(new CoreInfo
             {
                 coreType = ECoreType.tuic,
                 coreExes = new List<string> { "tuic-client", "tuic" },
@@ -377,7 +365,7 @@ namespace v2rayN.Handler
                 redirectInfo = true,
             });
 
-            coreInfos.Add(new CoreInfo
+            coreInfo.Add(new CoreInfo
             {
                 coreType = ECoreType.sing_box,
                 coreExes = new List<string> { "sing-box-client", "sing-box" },
@@ -392,7 +380,7 @@ namespace v2rayN.Handler
                 versionArg = "version",
             });
 
-            coreInfos.Add(new CoreInfo
+            coreInfo.Add(new CoreInfo
             {
                 coreType = ECoreType.juicity,
                 coreExes = new List<string> { "juicity-client", "juicity" },
@@ -400,7 +388,7 @@ namespace v2rayN.Handler
                 coreUrl = Global.JuicityCoreUrl
             });
 
-            coreInfos.Add(new CoreInfo
+            coreInfo.Add(new CoreInfo
             {
                 coreType = ECoreType.hysteria2,
                 coreExes = new List<string> { "hysteria-windows-amd64", "hysteria-windows-386", "hysteria" },

v2rayN/v2rayN/Handler/MainFormHandler.cs

@@ -1,8 +1,11 @@
 using Microsoft.Win32;
+using Splat;
 using System.Drawing;
 using System.IO;
 using System.Windows.Media.Imaging;
-using v2rayN.Mode;
+using v2rayN.Enums;
+using v2rayN.Handler.CoreConfig;
+using v2rayN.Models;
 using v2rayN.Resx;
 
 namespace v2rayN.Handler
@@ -50,18 +53,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;
             }
@@ -125,7 +128,7 @@ namespace v2rayN.Handler
             }
             if (item.configType == EConfigType.Custom)
             {
-                UI.Show(ResUI.NonVmessService);
+                Locator.Current.GetService<NoticeHandler>()?.Enqueue(ResUI.NonVmessService);
                 return;
             }
 
@@ -146,11 +149,12 @@ namespace v2rayN.Handler
             }
             if (CoreConfigHandler.GenerateClientConfig(item, fileName, out string msg, out string content) != 0)
             {
-                UI.Show(msg);
+                Locator.Current.GetService<NoticeHandler>()?.Enqueue(msg);
             }
             else
             {
-                UI.ShowWarning(string.Format(ResUI.SaveClientConfigurationIn, fileName));
+                msg = string.Format(ResUI.SaveClientConfigurationIn, fileName);
+                Locator.Current.GetService<NoticeHandler>()?.SendMessageAndEnqueue(msg);
             }
         }
 

v2rayN/v2rayN/Handler/NoticeHandler.cs

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

v2rayN/v2rayN/Handler/ProfileExHandler.cs

@@ -1,13 +1,13 @@
 using System.Collections.Concurrent;
 using System.Reactive.Linq;
-using v2rayN.Mode;
+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,33 +15,24 @@ namespace v2rayN.Handler
         public ProfileExHandler()
         {
             Init();
-        }
-
-        private void Init()
-        {
-            SqliteHelper.Instance.Execute($"delete from ProfileExItem where indexId not in ( select indexId from ProfileItem )");
-
-            _lstProfileEx = new(SqliteHelper.Instance.Table<ProfileExItem>());
 
             Task.Run(async () =>
             {
                 while (true)
                 {
-                    var cnt = _queIndexIds.Count;
-                    for (int i = 0; i < cnt; i++)
-                    {
-                        var id = _queIndexIds.Dequeue();
-                        var item = _lstProfileEx.FirstOrDefault(t => t.indexId == id);
-                        if (item is not null)
-                        {
-                            SqliteHelper.Instance.Replace(item);
-                        }
-                    }
-                    await Task.Delay(1000 * 60);
+                    SaveQueueIndexIds();
+                    await Task.Delay(1000 * 600);
                 }
             });
         }
 
+        private void Init()
+        {
+            SQLiteHelper.Instance.Execute($"delete from ProfileExItem where indexId not in ( select indexId from ProfileItem )");
+
+            _lstProfileEx = new(SQLiteHelper.Instance.Table<ProfileExItem>());
+        }
+
         private void IndexIdEnqueue(string indexId)
         {
             if (!Utils.IsNullOrEmpty(indexId) && !_queIndexIds.Contains(indexId))
@@ -50,6 +41,49 @@ namespace v2rayN.Handler
             }
         }
 
+        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()
@@ -65,7 +99,7 @@ namespace v2rayN.Handler
 
         public void ClearAll()
         {
-            SqliteHelper.Instance.Execute($"delete from ProfileExItem ");
+            SQLiteHelper.Instance.Execute($"delete from ProfileExItem ");
             _lstProfileEx = 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

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

v2rayN/v2rayN/Handler/ShareHandler.cs

@@ -1,993 +0,0 @@
-using System.Collections.Specialized;
-using System.Text.RegularExpressions;
-using v2rayN.Mode;
-using v2rayN.Resx;
-
-namespace v2rayN.Handler
-{
-    internal class ShareHandler
-    {
-        #region GetShareUrl
-
-        /// <summary>
-        /// GetShareUrl
-        /// </summary>
-        /// <param name="item"></param>
-        /// <returns></returns>
-        public static string? GetShareUrl(ProfileItem item)
-        {
-            try
-            {
-                string? url = string.Empty;
-
-                url = item.configType switch
-                {
-                    EConfigType.VMess => ShareVmess(item),
-                    EConfigType.Shadowsocks => ShareShadowsocks(item),
-                    EConfigType.Socks => ShareSocks(item),
-                    EConfigType.Trojan => ShareTrojan(item),
-                    EConfigType.VLESS => ShareVLESS(item),
-                    EConfigType.Hysteria2 => ShareHysteria2(item),
-                    EConfigType.Tuic => ShareTuic(item),
-                    EConfigType.Wireguard => ShareWireguard(item),
-                    _ => null,
-                };
-
-                return url;
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(ex.Message, ex);
-                return "";
-            }
-        }
-
-        private static string ShareVmess(ProfileItem item)
-        {
-            string url = string.Empty;
-
-            VmessQRCode vmessQRCode = new()
-            {
-                v = item.configVersion,
-                ps = item.remarks.TrimEx(),
-                add = item.address,
-                port = item.port,
-                id = item.id,
-                aid = item.alterId,
-                scy = item.security,
-                net = item.network,
-                type = item.headerType,
-                host = item.requestHost,
-                path = item.path,
-                tls = item.streamSecurity,
-                sni = item.sni,
-                alpn = item.alpn,
-                fp = item.fingerprint
-            };
-
-            url = JsonUtils.Serialize(vmessQRCode);
-            url = Utils.Base64Encode(url);
-            url = $"{Global.ProtocolShares[EConfigType.VMess]}{url}";
-
-            return url;
-        }
-
-        private static string ShareShadowsocks(ProfileItem item)
-        {
-            string url = string.Empty;
-
-            string remark = string.Empty;
-            if (!Utils.IsNullOrEmpty(item.remarks))
-            {
-                remark = "#" + Utils.UrlEncode(item.remarks);
-            }
-            //url = string.Format("{0}:{1}@{2}:{3}",
-            //    item.security,
-            //    item.id,
-            //    item.address,
-            //    item.port);
-            //url = Utils.Base64Encode(url);
-            //new Sip002
-            var pw = Utils.Base64Encode($"{item.security}:{item.id}");
-            url = $"{pw}@{GetIpv6(item.address)}:{item.port}";
-            url = $"{Global.ProtocolShares[EConfigType.Shadowsocks]}{url}{remark}";
-            return url;
-        }
-
-        private static string ShareSocks(ProfileItem item)
-        {
-            string url = string.Empty;
-            string remark = string.Empty;
-            if (!Utils.IsNullOrEmpty(item.remarks))
-            {
-                remark = "#" + Utils.UrlEncode(item.remarks);
-            }
-            //url = string.Format("{0}:{1}@{2}:{3}",
-            //    item.security,
-            //    item.id,
-            //    item.address,
-            //    item.port);
-            //url = Utils.Base64Encode(url);
-            //new
-            var pw = Utils.Base64Encode($"{item.security}:{item.id}");
-            url = $"{pw}@{GetIpv6(item.address)}:{item.port}";
-            url = $"{Global.ProtocolShares[EConfigType.Socks]}{url}{remark}";
-            return url;
-        }
-
-        private static string ShareTrojan(ProfileItem item)
-        {
-            string url = string.Empty;
-            string remark = string.Empty;
-            if (!Utils.IsNullOrEmpty(item.remarks))
-            {
-                remark = "#" + Utils.UrlEncode(item.remarks);
-            }
-            var dicQuery = new Dictionary<string, string>();
-            GetStdTransport(item, null, ref dicQuery);
-            string query = "?" + string.Join("&", dicQuery.Select(x => x.Key + "=" + x.Value).ToArray());
-
-            url = string.Format("{0}@{1}:{2}",
-            item.id,
-            GetIpv6(item.address),
-            item.port);
-            url = $"{Global.ProtocolShares[EConfigType.Trojan]}{url}{query}{remark}";
-            return url;
-        }
-
-        private static string ShareVLESS(ProfileItem item)
-        {
-            string url = string.Empty;
-            string remark = string.Empty;
-            if (!Utils.IsNullOrEmpty(item.remarks))
-            {
-                remark = "#" + Utils.UrlEncode(item.remarks);
-            }
-            var dicQuery = new Dictionary<string, string>();
-            if (!Utils.IsNullOrEmpty(item.security))
-            {
-                dicQuery.Add("encryption", item.security);
-            }
-            else
-            {
-                dicQuery.Add("encryption", "none");
-            }
-            GetStdTransport(item, "none", ref dicQuery);
-            string query = "?" + string.Join("&", dicQuery.Select(x => x.Key + "=" + x.Value).ToArray());
-
-            url = string.Format("{0}@{1}:{2}",
-            item.id,
-            GetIpv6(item.address),
-            item.port);
-            url = $"{Global.ProtocolShares[EConfigType.VLESS]}{url}{query}{remark}";
-            return url;
-        }
-
-        private static string ShareHysteria2(ProfileItem item)
-        {
-            string url = string.Empty;
-            string remark = string.Empty;
-            if (!Utils.IsNullOrEmpty(item.remarks))
-            {
-                remark = "#" + Utils.UrlEncode(item.remarks);
-            }
-            var dicQuery = new Dictionary<string, string>();
-            if (!Utils.IsNullOrEmpty(item.sni))
-            {
-                dicQuery.Add("sni", item.sni);
-            }
-            if (!Utils.IsNullOrEmpty(item.alpn))
-            {
-                dicQuery.Add("alpn", Utils.UrlEncode(item.alpn));
-            }
-            if (!Utils.IsNullOrEmpty(item.path))
-            {
-                dicQuery.Add("obfs", "salamander");
-                dicQuery.Add("obfs-password", Utils.UrlEncode(item.path));
-            }
-            dicQuery.Add("insecure", item.allowInsecure.ToLower() == "true" ? "1" : "0");
-
-            string query = "?" + string.Join("&", dicQuery.Select(x => x.Key + "=" + x.Value).ToArray());
-
-            url = string.Format("{0}@{1}:{2}",
-            item.id,
-            GetIpv6(item.address),
-            item.port);
-            url = $"{Global.ProtocolShares[EConfigType.Hysteria2]}{url}/{query}{remark}";
-            return url;
-        }
-
-        private static string ShareTuic(ProfileItem item)
-        {
-            string url = string.Empty;
-            string remark = string.Empty;
-            if (!Utils.IsNullOrEmpty(item.remarks))
-            {
-                remark = "#" + Utils.UrlEncode(item.remarks);
-            }
-            var dicQuery = new Dictionary<string, string>();
-            if (!Utils.IsNullOrEmpty(item.sni))
-            {
-                dicQuery.Add("sni", item.sni);
-            }
-            if (!Utils.IsNullOrEmpty(item.alpn))
-            {
-                dicQuery.Add("alpn", Utils.UrlEncode(item.alpn));
-            }
-            dicQuery.Add("congestion_control", item.headerType);
-
-            string query = "?" + string.Join("&", dicQuery.Select(x => x.Key + "=" + x.Value).ToArray());
-
-            url = string.Format("{0}@{1}:{2}",
-            $"{item.id}:{item.security}",
-            GetIpv6(item.address),
-            item.port);
-            url = $"{Global.ProtocolShares[EConfigType.Tuic]}{url}{query}{remark}";
-            return url;
-        }
-
-        private static string ShareWireguard(ProfileItem item)
-        {
-            string url = string.Empty;
-            string remark = string.Empty;
-            if (!Utils.IsNullOrEmpty(item.remarks))
-            {
-                remark = "#" + Utils.UrlEncode(item.remarks);
-            }
-
-            var dicQuery = new Dictionary<string, string>();
-            if (!Utils.IsNullOrEmpty(item.publicKey))
-            {
-                dicQuery.Add("publickey", Utils.UrlEncode(item.publicKey));
-            }
-            if (!Utils.IsNullOrEmpty(item.path))
-            {
-                dicQuery.Add("reserved", Utils.UrlEncode(item.path));
-            }
-            if (!Utils.IsNullOrEmpty(item.requestHost))
-            {
-                dicQuery.Add("address", Utils.UrlEncode(item.requestHost));
-            }
-            if (!Utils.IsNullOrEmpty(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}",
-            Utils.UrlEncode(item.id),
-            GetIpv6(item.address),
-            item.port);
-            url = $"{Global.ProtocolShares[EConfigType.Wireguard]}{url}/{query}{remark}";
-            return url;
-        }
-
-        private static string GetIpv6(string address)
-        {
-            return Utils.IsIpv6(address) ? $"[{address}]" : address;
-        }
-
-        private static int GetStdTransport(ProfileItem item, string? securityDef, ref Dictionary<string, string> dicQuery)
-        {
-            if (!Utils.IsNullOrEmpty(item.flow))
-            {
-                dicQuery.Add("flow", item.flow);
-            }
-
-            if (!Utils.IsNullOrEmpty(item.streamSecurity))
-            {
-                dicQuery.Add("security", item.streamSecurity);
-            }
-            else
-            {
-                if (securityDef != null)
-                {
-                    dicQuery.Add("security", securityDef);
-                }
-            }
-            if (!Utils.IsNullOrEmpty(item.sni))
-            {
-                dicQuery.Add("sni", item.sni);
-            }
-            if (!Utils.IsNullOrEmpty(item.alpn))
-            {
-                dicQuery.Add("alpn", Utils.UrlEncode(item.alpn));
-            }
-            if (!Utils.IsNullOrEmpty(item.fingerprint))
-            {
-                dicQuery.Add("fp", Utils.UrlEncode(item.fingerprint));
-            }
-            if (!Utils.IsNullOrEmpty(item.publicKey))
-            {
-                dicQuery.Add("pbk", Utils.UrlEncode(item.publicKey));
-            }
-            if (!Utils.IsNullOrEmpty(item.shortId))
-            {
-                dicQuery.Add("sid", Utils.UrlEncode(item.shortId));
-            }
-            if (!Utils.IsNullOrEmpty(item.spiderX))
-            {
-                dicQuery.Add("spx", Utils.UrlEncode(item.spiderX));
-            }
-
-            dicQuery.Add("type", !Utils.IsNullOrEmpty(item.network) ? item.network : "tcp");
-
-            switch (item.network)
-            {
-                case "tcp":
-                    dicQuery.Add("headerType", !Utils.IsNullOrEmpty(item.headerType) ? item.headerType : "none");
-                    if (!Utils.IsNullOrEmpty(item.requestHost))
-                    {
-                        dicQuery.Add("host", Utils.UrlEncode(item.requestHost));
-                    }
-                    break;
-
-                case "kcp":
-                    dicQuery.Add("headerType", !Utils.IsNullOrEmpty(item.headerType) ? item.headerType : "none");
-                    if (!Utils.IsNullOrEmpty(item.path))
-                    {
-                        dicQuery.Add("seed", Utils.UrlEncode(item.path));
-                    }
-                    break;
-
-                case "ws":
-                    if (!Utils.IsNullOrEmpty(item.requestHost))
-                    {
-                        dicQuery.Add("host", Utils.UrlEncode(item.requestHost));
-                    }
-                    if (!Utils.IsNullOrEmpty(item.path))
-                    {
-                        dicQuery.Add("path", Utils.UrlEncode(item.path));
-                    }
-                    break;
-
-                case "http":
-                case "h2":
-                    dicQuery["type"] = "http";
-                    if (!Utils.IsNullOrEmpty(item.requestHost))
-                    {
-                        dicQuery.Add("host", Utils.UrlEncode(item.requestHost));
-                    }
-                    if (!Utils.IsNullOrEmpty(item.path))
-                    {
-                        dicQuery.Add("path", Utils.UrlEncode(item.path));
-                    }
-                    break;
-
-                case "quic":
-                    dicQuery.Add("headerType", !Utils.IsNullOrEmpty(item.headerType) ? item.headerType : "none");
-                    dicQuery.Add("quicSecurity", Utils.UrlEncode(item.requestHost));
-                    dicQuery.Add("key", Utils.UrlEncode(item.path));
-                    break;
-
-                case "grpc":
-                    if (!Utils.IsNullOrEmpty(item.path))
-                    {
-                        dicQuery.Add("serviceName", Utils.UrlEncode(item.path));
-                        if (item.headerType is Global.GrpcgunMode or Global.GrpcmultiMode)
-                        {
-                            dicQuery.Add("mode", Utils.UrlEncode(item.headerType));
-                        }
-                    }
-                    break;
-            }
-            return 0;
-        }
-
-        #endregion GetShareUrl
-
-        #region ImportShareUrl
-
-        /// <summary>
-        /// 从剪贴板导入URL
-        /// </summary>
-        /// <param name="msg"></param>
-        /// <returns></returns>
-        public static ProfileItem? ImportFromClipboardConfig(string clipboardData, out string msg)
-        {
-            msg = ResUI.ConfigurationFormatIncorrect;
-            ProfileItem? profileItem;
-
-            try
-            {
-                string result = clipboardData.TrimEx();
-                if (Utils.IsNullOrEmpty(result))
-                {
-                    msg = ResUI.FailedReadConfiguration;
-                    return null;
-                }
-
-                if (result.StartsWith(Global.ProtocolShares[EConfigType.VMess]))
-                {
-                    int indexSplit = result.IndexOf("?");
-                    if (indexSplit > 0)
-                    {
-                        profileItem = ResolveStdVmess(result) ?? ResolveVmess4Kitsunebi(result);
-                    }
-                    else
-                    {
-                        profileItem = ResolveVmess(result, out msg);
-                    }
-                }
-                else if (result.StartsWith(Global.ProtocolShares[EConfigType.Shadowsocks]))
-                {
-                    profileItem = ResolveSSLegacy(result) ?? ResolveSip002(result);
-                    if (profileItem == null)
-                    {
-                        return null;
-                    }
-                    if (profileItem.address.Length == 0 || profileItem.port == 0 || profileItem.security.Length == 0 || profileItem.id.Length == 0)
-                    {
-                        return null;
-                    }
-
-                    profileItem.configType = EConfigType.Shadowsocks;
-                }
-                else if (result.StartsWith(Global.ProtocolShares[EConfigType.Socks]))
-                {
-                    profileItem = ResolveSocksNew(result) ?? ResolveSocks(result);
-                    if (profileItem == null)
-                    {
-                        return null;
-                    }
-                    if (profileItem.address.Length == 0 || profileItem.port == 0)
-                    {
-                        return null;
-                    }
-
-                    profileItem.configType = EConfigType.Socks;
-                }
-                else if (result.StartsWith(Global.ProtocolShares[EConfigType.Trojan]))
-                {
-                    profileItem = ResolveTrojan(result);
-                }
-                else if (result.StartsWith(Global.ProtocolShares[EConfigType.VLESS]))
-                {
-                    profileItem = ResolveStdVLESS(result);
-                }
-                else if (result.StartsWith(Global.ProtocolShares[EConfigType.Hysteria2]) || result.StartsWith(Global.Hysteria2ProtocolShare))
-                {
-                    profileItem = ResolveHysteria2(result);
-                }
-                else if (result.StartsWith(Global.ProtocolShares[EConfigType.Tuic]))
-                {
-                    profileItem = ResolveTuic(result);
-                }
-                else if (result.StartsWith(Global.ProtocolShares[EConfigType.Wireguard]))
-                {
-                    profileItem = ResolveWireguard(result);
-                }
-                else
-                {
-                    msg = ResUI.NonvmessOrssProtocol;
-                    return null;
-                }
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(ex.Message, ex);
-                msg = ResUI.Incorrectconfiguration;
-                return null;
-            }
-
-            return profileItem;
-        }
-
-        private static ProfileItem? ResolveVmess(string result, out string msg)
-        {
-            msg = string.Empty;
-            var profileItem = new ProfileItem
-            {
-                configType = EConfigType.VMess
-            };
-
-            result = result[Global.ProtocolShares[EConfigType.VMess].Length..];
-            result = Utils.Base64Decode(result);
-
-            //转成Json
-            VmessQRCode? vmessQRCode = JsonUtils.Deserialize<VmessQRCode>(result);
-            if (vmessQRCode == null)
-            {
-                msg = ResUI.FailedConversionConfiguration;
-                return null;
-            }
-
-            profileItem.network = Global.DefaultNetwork;
-            profileItem.headerType = Global.None;
-
-            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 = !Utils.IsNullOrEmpty(vmessQRCode.scy) ? vmessQRCode.scy : Global.DefaultSecurity;
-            if (!Utils.IsNullOrEmpty(vmessQRCode.net))
-            {
-                profileItem.network = vmessQRCode.net;
-            }
-            if (!Utils.IsNullOrEmpty(vmessQRCode.type))
-            {
-                profileItem.headerType = vmessQRCode.type;
-            }
-
-            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;
-        }
-
-        private static ProfileItem? ResolveVmess4Kitsunebi(string result)
-        {
-            ProfileItem profileItem = new()
-            {
-                configType = EConfigType.VMess
-            };
-            result = result[Global.ProtocolShares[EConfigType.VMess].Length..];
-            int indexSplit = result.IndexOf("?");
-            if (indexSplit > 0)
-            {
-                result = result[..indexSplit];
-            }
-            result = Utils.Base64Decode(result);
-
-            string[] arr1 = result.Split('@');
-            if (arr1.Length != 2)
-            {
-                return null;
-            }
-            string[] arr21 = arr1[0].Split(':');
-            string[] arr22 = arr1[1].Split(':');
-            if (arr21.Length != 2 || arr22.Length != 2)
-            {
-                return null;
-            }
-
-            profileItem.address = arr22[0];
-            profileItem.port = Utils.ToInt(arr22[1]);
-            profileItem.security = arr21[0];
-            profileItem.id = arr21[1];
-
-            profileItem.network = Global.DefaultNetwork;
-            profileItem.headerType = Global.None;
-            profileItem.remarks = "Alien";
-
-            return profileItem;
-        }
-
-        private static ProfileItem? ResolveStdVmess(string result)
-        {
-            ProfileItem i = new()
-            {
-                configType = EConfigType.VMess,
-                security = "auto"
-            };
-
-            Uri u = new(result);
-
-            i.address = u.IdnHost;
-            i.port = u.Port;
-            i.remarks = u.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
-            var query = Utils.ParseQueryString(u.Query);
-
-            var m = StdVmessUserInfo.Match(u.UserInfo);
-            if (!m.Success) return null;
-
-            i.id = m.Groups["id"].Value;
-
-            if (m.Groups["streamSecurity"].Success)
-            {
-                i.streamSecurity = m.Groups["streamSecurity"].Value;
-            }
-            switch (i.streamSecurity)
-            {
-                case "tls":
-                    break;
-
-                default:
-                    if (!string.IsNullOrWhiteSpace(i.streamSecurity))
-                        return null;
-                    break;
-            }
-
-            i.network = m.Groups["network"].Value;
-            switch (i.network)
-            {
-                case "tcp":
-                    string t1 = query["type"] ?? "none";
-                    i.headerType = t1;
-                    break;
-
-                case "kcp":
-                    i.headerType = query["type"] ?? "none";
-                    break;
-
-                case "ws":
-                    string p1 = query["path"] ?? "/";
-                    string h1 = query["host"] ?? "";
-                    i.requestHost = Utils.UrlDecode(h1);
-                    i.path = p1;
-                    break;
-
-                case "http":
-                case "h2":
-                    i.network = "h2";
-                    string p2 = query["path"] ?? "/";
-                    string h2 = query["host"] ?? "";
-                    i.requestHost = Utils.UrlDecode(h2);
-                    i.path = p2;
-                    break;
-
-                case "quic":
-                    string s = query["security"] ?? "none";
-                    string k = query["key"] ?? "";
-                    string t3 = query["type"] ?? "none";
-                    i.headerType = t3;
-                    i.requestHost = Utils.UrlDecode(s);
-                    i.path = k;
-                    break;
-
-                default:
-                    return null;
-            }
-
-            return i;
-        }
-
-        private static ProfileItem? ResolveSip002(string result)
-        {
-            Uri parsedUrl;
-            try
-            {
-                parsedUrl = new Uri(result);
-            }
-            catch (UriFormatException)
-            {
-                return null;
-            }
-            ProfileItem server = new()
-            {
-                remarks = parsedUrl.GetComponents(UriComponents.Fragment, UriFormat.Unescaped),
-                address = parsedUrl.IdnHost,
-                port = parsedUrl.Port,
-            };
-            string rawUserInfo = parsedUrl.GetComponents(UriComponents.UserInfo, UriFormat.UriEscaped);
-            //2022-blake3
-            if (rawUserInfo.Contains(':'))
-            {
-                string[] userInfoParts = rawUserInfo.Split(new[] { ':' }, 2);
-                if (userInfoParts.Length != 2)
-                {
-                    return null;
-                }
-                server.security = userInfoParts[0];
-                server.id = Utils.UrlDecode(userInfoParts[1]);
-            }
-            else
-            {
-                // parse base64 UserInfo
-                string userInfo = Utils.Base64Decode(rawUserInfo);
-                string[] userInfoParts = userInfo.Split(new[] { ':' }, 2);
-                if (userInfoParts.Length != 2)
-                {
-                    return null;
-                }
-                server.security = userInfoParts[0];
-                server.id = userInfoParts[1];
-            }
-
-            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") && !Utils.IsNullOrEmpty(obfsHost))
-                {
-                    obfsHost = obfsHost.Replace("obfs-host=", "");
-                    server.network = Global.DefaultNetwork;
-                    server.headerType = Global.TcpHeaderHttp;
-                    server.requestHost = obfsHost;
-                }
-                else
-                {
-                    return null;
-                }
-            }
-
-            return server;
-        }
-
-        private static readonly Regex UrlFinder = new(@"ss://(?<base64>[A-Za-z0-9+-/=_]+)(?:#(?<tag>\S+))?", RegexOptions.IgnoreCase | RegexOptions.Compiled);
-        private static readonly Regex DetailsParser = new(@"^((?<method>.+?):(?<password>.*)@(?<hostname>.+?):(?<port>\d+?))$", RegexOptions.IgnoreCase | RegexOptions.Compiled);
-
-        private static ProfileItem? ResolveSSLegacy(string result)
-        {
-            var match = UrlFinder.Match(result);
-            if (!match.Success)
-                return null;
-
-            ProfileItem server = new();
-            var base64 = match.Groups["base64"].Value.TrimEnd('/');
-            var tag = match.Groups["tag"].Value;
-            if (!Utils.IsNullOrEmpty(tag))
-            {
-                server.remarks = Utils.UrlDecode(tag);
-            }
-            Match details;
-            try
-            {
-                details = DetailsParser.Match(Utils.Base64Decode(base64));
-            }
-            catch (FormatException)
-            {
-                return null;
-            }
-            if (!details.Success)
-                return null;
-            server.security = details.Groups["method"].Value;
-            server.id = details.Groups["password"].Value;
-            server.address = details.Groups["hostname"].Value;
-            server.port = Utils.ToInt(details.Groups["port"].Value);
-            return server;
-        }
-
-        private static readonly Regex StdVmessUserInfo = new(
-            @"^(?<network>[a-z]+)(\+(?<streamSecurity>[a-z]+))?:(?<id>[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})$", RegexOptions.Compiled);
-
-        private static ProfileItem? ResolveSocks(string result)
-        {
-            ProfileItem profileItem = new()
-            {
-                configType = EConfigType.Socks
-            };
-            result = result[Global.ProtocolShares[EConfigType.Socks].Length..];
-            //remark
-            int indexRemark = result.IndexOf("#");
-            if (indexRemark > 0)
-            {
-                try
-                {
-                    profileItem.remarks = Utils.UrlDecode(result.Substring(indexRemark + 1, result.Length - indexRemark - 1));
-                }
-                catch { }
-                result = result[..indexRemark];
-            }
-            //part decode
-            int indexS = result.IndexOf("@");
-            if (indexS > 0)
-            {
-            }
-            else
-            {
-                result = Utils.Base64Decode(result);
-            }
-
-            string[] arr1 = result.Split('@');
-            if (arr1.Length != 2)
-            {
-                return null;
-            }
-            string[] arr21 = arr1[0].Split(':');
-            //string[] arr22 = arr1[1].Split(':');
-            int indexPort = arr1[1].LastIndexOf(":");
-            if (arr21.Length != 2 || indexPort < 0)
-            {
-                return null;
-            }
-            profileItem.address = arr1[1][..indexPort];
-            profileItem.port = Utils.ToInt(arr1[1][(indexPort + 1)..]);
-            profileItem.security = arr21[0];
-            profileItem.id = arr21[1];
-
-            return profileItem;
-        }
-
-        private static ProfileItem? ResolveSocksNew(string result)
-        {
-            Uri parsedUrl;
-            try
-            {
-                parsedUrl = new Uri(result);
-            }
-            catch (UriFormatException)
-            {
-                return null;
-            }
-            ProfileItem server = new()
-            {
-                remarks = parsedUrl.GetComponents(UriComponents.Fragment, UriFormat.Unescaped),
-                address = parsedUrl.IdnHost,
-                port = parsedUrl.Port,
-            };
-
-            // parse base64 UserInfo
-            string rawUserInfo = parsedUrl.GetComponents(UriComponents.UserInfo, UriFormat.Unescaped);
-            string userInfo = Utils.Base64Decode(rawUserInfo);
-            string[] userInfoParts = userInfo.Split(new[] { ':' }, 2);
-            if (userInfoParts.Length == 2)
-            {
-                server.security = userInfoParts[0];
-                server.id = userInfoParts[1];
-            }
-
-            return server;
-        }
-
-        private static ProfileItem ResolveTrojan(string result)
-        {
-            ProfileItem item = new()
-            {
-                configType = EConfigType.Trojan
-            };
-
-            Uri url = new(result);
-
-            item.address = url.IdnHost;
-            item.port = url.Port;
-            item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
-            item.id = Utils.UrlDecode(url.UserInfo);
-
-            var query = Utils.ParseQueryString(url.Query);
-            ResolveStdTransport(query, ref item);
-
-            return item;
-        }
-
-        private static ProfileItem ResolveStdVLESS(string result)
-        {
-            ProfileItem item = new()
-            {
-                configType = EConfigType.VLESS,
-                security = "none"
-            };
-
-            Uri url = new(result);
-
-            item.address = url.IdnHost;
-            item.port = url.Port;
-            item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
-            item.id = Utils.UrlDecode(url.UserInfo);
-
-            var query = Utils.ParseQueryString(url.Query);
-            item.security = query["encryption"] ?? "none";
-            item.streamSecurity = query["security"] ?? "";
-            ResolveStdTransport(query, ref item);
-
-            return item;
-        }
-
-        private static ProfileItem ResolveHysteria2(string result)
-        {
-            ProfileItem item = new()
-            {
-                configType = EConfigType.Hysteria2
-            };
-
-            Uri url = new(result);
-
-            item.address = url.IdnHost;
-            item.port = url.Port;
-            item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
-            item.id = Utils.UrlDecode(url.UserInfo);
-
-            var query = Utils.ParseQueryString(url.Query);
-            ResolveStdTransport(query, ref item);
-            item.path = Utils.UrlDecode(query["obfs-password"] ?? "");
-            item.allowInsecure = (query["insecure"] ?? "") == "1" ? "true" : "false";
-
-            return item;
-        }
-
-        private static ProfileItem ResolveTuic(string result)
-        {
-            ProfileItem item = new()
-            {
-                configType = EConfigType.Tuic
-            };
-
-            Uri url = new(result);
-
-            item.address = url.IdnHost;
-            item.port = url.Port;
-            item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
-            var userInfoParts = url.UserInfo.Split(new[] { ':' }, 2);
-            if (userInfoParts.Length == 2)
-            {
-                item.id = userInfoParts[0];
-                item.security = userInfoParts[1];
-            }
-
-            var query = Utils.ParseQueryString(url.Query);
-            ResolveStdTransport(query, ref item);
-            item.headerType = query["congestion_control"] ?? "";
-
-            return item;
-        }
-
-        private static ProfileItem ResolveWireguard(string result)
-        {
-            ProfileItem item = new()
-            {
-                configType = EConfigType.Wireguard
-            };
-
-            Uri url = new(result);
-
-            item.address = url.IdnHost;
-            item.port = url.Port;
-            item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
-            item.id = Utils.UrlDecode(url.UserInfo);
-
-            var query = Utils.ParseQueryString(url.Query);
-
-            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;
-        }
-
-        private static int ResolveStdTransport(NameValueCollection query, ref ProfileItem item)
-        {
-            item.flow = query["flow"] ?? "";
-            item.streamSecurity = query["security"] ?? "";
-            item.sni = query["sni"] ?? "";
-            item.alpn = Utils.UrlDecode(query["alpn"] ?? "");
-            item.fingerprint = Utils.UrlDecode(query["fp"] ?? "");
-            item.publicKey = Utils.UrlDecode(query["pbk"] ?? "");
-            item.shortId = Utils.UrlDecode(query["sid"] ?? "");
-            item.spiderX = Utils.UrlDecode(query["spx"] ?? "");
-
-            item.network = query["type"] ?? "tcp";
-            switch (item.network)
-            {
-                case "tcp":
-                    item.headerType = query["headerType"] ?? "none";
-                    item.requestHost = Utils.UrlDecode(query["host"] ?? "");
-
-                    break;
-
-                case "kcp":
-                    item.headerType = query["headerType"] ?? "none";
-                    item.path = Utils.UrlDecode(query["seed"] ?? "");
-                    break;
-
-                case "ws":
-                    item.requestHost = Utils.UrlDecode(query["host"] ?? "");
-                    item.path = Utils.UrlDecode(query["path"] ?? "/");
-                    break;
-
-                case "http":
-                case "h2":
-                    item.network = "h2";
-                    item.requestHost = Utils.UrlDecode(query["host"] ?? "");
-                    item.path = Utils.UrlDecode(query["path"] ?? "/");
-                    break;
-
-                case "quic":
-                    item.headerType = query["headerType"] ?? "none";
-                    item.requestHost = query["quicSecurity"] ?? "none";
-                    item.path = Utils.UrlDecode(query["key"] ?? "");
-                    break;
-
-                case "grpc":
-                    item.path = Utils.UrlDecode(query["serviceName"] ?? "");
-                    item.headerType = Utils.UrlDecode(query["mode"] ?? Global.GrpcgunMode);
-                    break;
-
-                default:
-                    break;
-            }
-            return 0;
-        }
-
-        #endregion ImportShareUrl
-    }
-}

v2rayN/v2rayN/Handler/SpeedtestHandler.cs

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

v2rayN/v2rayN/Handler/StatisticsHandler.cs

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

v2rayN/v2rayN/Handler/StatisticsSingbox.cs

@@ -1,6 +1,7 @@
 using System.Net.WebSockets;
 using System.Text;
-using v2rayN.Mode;
+using v2rayN.Enums;
+using v2rayN.Models;
 
 namespace v2rayN.Handler
 {
@@ -61,8 +62,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 +90,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 +107,6 @@ namespace v2rayN.Handler
                 catch
                 {
                 }
-                finally
-                {
-                    await Task.Delay(1000);
-                }
             }
         }
 

v2rayN/v2rayN/Handler/StatisticsV2ray.cs

@@ -1,19 +1,20 @@
 using Grpc.Core;
 using Grpc.Net.Client;
 using ProtosLib.Statistics;
-using v2rayN.Mode;
+using v2rayN.Enums;
+using v2rayN.Models;
 
 namespace v2rayN.Handler
 {
     internal class StatisticsV2ray
     {
-        private Mode.Config _config;
+        private Models.Config _config;
         private GrpcChannel? _channel;
         private StatsService.StatsServiceClient? _client;
         private bool _exitFlag;
         private Action<ServerSpeedItem> _updateFunc;
 
-        public StatisticsV2ray(Mode.Config config, Action<ServerSpeedItem> update)
+        public StatisticsV2ray(Models.Config config, Action<ServerSpeedItem> update)
         {
             _config = config;
             _updateFunc = update;
@@ -49,14 +50,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 +75,8 @@ namespace v2rayN.Handler
                             _updateFunc(server);
                         }
                     }
-                    await Task.Delay(1000);
-                    await _channel.ConnectAsync();
+                    if (_channel != null)
+                        await _channel.ConnectAsync();
                 }
                 catch
                 {
@@ -80,6 +87,8 @@ namespace v2rayN.Handler
         private void ParseOutput(Google.Protobuf.Collections.RepeatedField<Stat> source, out ServerSpeedItem server)
         {
             server = new();
+            long aggregateProxyUp = 0;
+            long aggregateProxyDown = 0;
             try
             {
                 foreach (Stat stat in source)
@@ -94,15 +103,15 @@ namespace v2rayN.Handler
                     name = nStr[1];
                     type = nStr[3];
 
-                    if (name == Global.ProxyTag)
+                    if (name.StartsWith(Global.ProxyTag))
                     {
                         if (type == "uplink")
                         {
-                            server.proxyUp = value;
+                            aggregateProxyUp += value;
                         }
                         else if (type == "downlink")
                         {
-                            server.proxyDown = value;
+                            aggregateProxyDown += value;
                         }
                     }
                     else if (name == Global.DirectTag)
@@ -117,6 +126,8 @@ namespace v2rayN.Handler
                         }
                     }
                 }
+                server.proxyUp = aggregateProxyUp;
+                server.proxyDown = aggregateProxyDown;
             }
             catch
             {

v2rayN/v2rayN/Handler/SysProxyHandle.cs

@@ -1,5 +1,6 @@
 using PacLib;
-using v2rayN.Mode;
+using v2rayN.Enums;
+using v2rayN.Models;
 
 namespace v2rayN.Handler
 {
@@ -41,9 +42,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;

v2rayN/v2rayN/Handler/UpdateHandle.cs

@@ -6,7 +6,8 @@ using System.Runtime.InteropServices;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Windows;
-using v2rayN.Mode;
+using v2rayN.Enums;
+using v2rayN.Models;
 using v2rayN.Resx;
 
 namespace v2rayN.Handler
@@ -54,7 +55,7 @@ namespace v2rayN.Handler
                             StartInfo = new ProcessStartInfo
                             {
                                 FileName = "v2rayUpgrade.exe",
-                                Arguments = fileName.AppendQuotes(),                                
+                                Arguments = fileName.AppendQuotes(),
                                 WorkingDirectory = Utils.StartupPath()
                             }
                         };
@@ -207,7 +208,7 @@ namespace v2rayN.Handler
                     //convert
                     if (!Utils.IsNullOrEmpty(item.convertTarget))
                     {
-                        var subConvertUrl = string.IsNullOrEmpty(config.constItem.subConvertUrl) ? Global.SubConvertUrls.FirstOrDefault() : config.constItem.subConvertUrl;
+                        var subConvertUrl = Utils.IsNullOrEmpty(config.constItem.subConvertUrl) ? Global.SubConvertUrls.FirstOrDefault() : config.constItem.subConvertUrl;
                         url = string.Format(subConvertUrl!, Utils.UrlEncode(url));
                         if (!url.Contains("target="))
                         {
@@ -270,7 +271,7 @@ namespace v2rayN.Handler
                     else
                     {
                         _updateFunc(false, $"{hashCode}{ResUI.MsgGetSubscriptionSuccessfully}");
-                        if (result!.Length < 99)
+                        if (result?.Length < 99)
                         {
                             _updateFunc(false, $"{hashCode}{result}");
                         }
@@ -299,9 +300,6 @@ namespace v2rayN.Handler
             {
                 await UpdateGeoFile("geosite", _config, update);
                 await UpdateGeoFile("geoip", _config, update);
-
-                //await UpdateGeoFile4Singbox("geosite", _config, false, update);
-                //await UpdateGeoFile4Singbox("geoip", _config, true, update);
             });
         }
 
@@ -327,7 +325,7 @@ namespace v2rayN.Handler
                 var result = await (new DownloadHandle()).DownloadStringAsync(url, true, "");
                 if (!Utils.IsNullOrEmpty(result))
                 {
-                    responseHandler(type, result, preRelease);
+                    ResponseHandler(type, result, preRelease);
                 }
                 else
                 {
@@ -345,7 +343,7 @@ namespace v2rayN.Handler
         /// <summary>
         /// 获取V2RayCore版本
         /// </summary>
-        private SemanticVersion getCoreVersion(ECoreType type)
+        private SemanticVersion GetCoreVersion(ECoreType type)
         {
             try
             {
@@ -392,6 +390,7 @@ namespace v2rayN.Handler
 
                     case ECoreType.clash:
                     case ECoreType.clash_meta:
+                    case ECoreType.mihomo:
                         version = Regex.Match(echo, $"v[0-9.]+").Groups[0].Value;
                         break;
 
@@ -409,14 +408,14 @@ namespace v2rayN.Handler
             }
         }
 
-        private void responseHandler(ECoreType type, string gitHubReleaseApi, bool preRelease)
+        private void ResponseHandler(ECoreType type, string gitHubReleaseApi, bool preRelease)
         {
             try
             {
                 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 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);
 
@@ -430,7 +429,7 @@ namespace v2rayN.Handler
                     case ECoreType.Xray:
                     case ECoreType.v2fly_v5:
                         {
-                            curVersion = getCoreVersion(type);
+                            curVersion = GetCoreVersion(type);
                             message = string.Format(ResUI.IsLatestCore, type, curVersion.ToVersionString("v"));
                             string osBit = "64";
                             switch (RuntimeInformation.ProcessArchitecture)
@@ -453,8 +452,9 @@ namespace v2rayN.Handler
                         }
                     case ECoreType.clash:
                     case ECoreType.clash_meta:
+                    case ECoreType.mihomo:
                         {
-                            curVersion = getCoreVersion(type);
+                            curVersion = GetCoreVersion(type);
                             message = string.Format(ResUI.IsLatestCore, type, curVersion);
                             switch (RuntimeInformation.ProcessArchitecture)
                             {
@@ -475,7 +475,7 @@ namespace v2rayN.Handler
                         }
                     case ECoreType.sing_box:
                         {
-                            curVersion = getCoreVersion(type);
+                            curVersion = GetCoreVersion(type);
                             message = string.Format(ResUI.IsLatestCore, type, curVersion.ToVersionString("v"));
                             switch (RuntimeInformation.ProcessArchitecture)
                             {
@@ -573,7 +573,7 @@ namespace v2rayN.Handler
                         {
                             //Global.coreTypes.ForEach(it =>
                             //{
-                            //    string targetPath = Utils.GetBinPath($"{geoName}.dat", (ECoreType)Enum.Parse(typeof(ECoreType), it));
+                            //    string targetPath = Utile.GetBinPath($"{geoName}.dat", (ECoreType)Enum.Parse(typeof(ECoreType), it));
                             //    File.Copy(fileName, targetPath, true);
                             //});
                             string targetPath = Utils.GetBinPath($"{geoName}.dat");
@@ -600,54 +600,6 @@ namespace v2rayN.Handler
             await AskToDownload(downloadHandle, url, false);
         }
 
-        private async Task UpdateGeoFile4Singbox(string geoName, Config config, bool needStop, Action<bool, string> update)
-        {
-            _config = config;
-            _updateFunc = update;
-            var url = string.Format(Global.SingboxGeoUrl, geoName);
-
-            DownloadHandle downloadHandle = new();
-            downloadHandle.UpdateCompleted += async (sender2, args) =>
-            {
-                if (args.Success)
-                {
-                    _updateFunc(false, string.Format(ResUI.MsgDownloadGeoFileSuccessfully, geoName));
-                    var coreHandler = Locator.Current.GetService<CoreHandler>();
-
-                    try
-                    {
-                        if (needStop)
-                        {
-                            coreHandler?.CoreStop();
-                            await Task.Delay(3000);
-                        }
-                        string fileName = Utils.GetTempPath(Utils.GetDownloadFileName(url));
-                        if (File.Exists(fileName))
-                        {
-                            string targetPath = Utils.GetConfigPath($"{geoName}.db");
-                            File.Copy(fileName, targetPath, true);
-
-                            File.Delete(fileName);
-                        }
-                        if (needStop) coreHandler?.LoadCore();
-                    }
-                    catch (Exception ex)
-                    {
-                        _updateFunc(false, ex.Message);
-                    }
-                }
-                else
-                {
-                    _updateFunc(false, args.Msg);
-                }
-            };
-            downloadHandle.Error += (sender2, args) =>
-            {
-                _updateFunc(false, args.GetException().Message);
-            };
-            await AskToDownload(downloadHandle, url, false);
-        }
-
         #endregion private
     }
 }

v2rayN/v2rayN/Mode/ConfigOld.cs

@@ -1,440 +0,0 @@
-namespace v2rayN.Mode
-{
-    [Serializable]
-    public class ConfigOld
-    {
-        #region property
-
-        /// <summary>
-        /// 允许日志
-        /// </summary>
-        public bool logEnabled
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// 日志等级
-        /// </summary>
-        public string loglevel
-        {
-            get; set;
-        }
-
-        public string indexId
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// 允许Mux多路复用
-        /// </summary>
-        public bool muxEnabled
-        {
-            get; set;
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        public ESysProxyType sysProxyType
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// 启用实时网速和流量统计
-        /// </summary>
-        public bool enableStatistics
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// 去重时优先保留较旧（顶部）节点
-        /// </summary>
-        public bool keepOlderDedupl
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// 视图刷新率
-        /// </summary>
-        public int statisticsFreshRate
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// 自定义远程DNS
-        /// </summary>
-        public string remoteDNS
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// Outbound Freedom domainStrategy
-        /// </summary>
-        public string domainStrategy4Freedom
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// 是否允许不安全连接
-        /// </summary>
-        public bool defAllowInsecure
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// 域名解析策略
-        /// </summary>
-        public string domainStrategy
-        {
-            get; set;
-        }
-
-        public string domainMatcher
-        {
-            get; set;
-        }
-
-        public int routingIndex
-        {
-            get; set;
-        }
-
-        public bool enableRoutingAdvanced
-        {
-            get; set;
-        }
-
-        public bool ignoreGeoUpdateCore
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// systemProxyExceptions
-        /// </summary>
-        public string systemProxyExceptions
-        {
-            get; set;
-        }
-
-        public string systemProxyAdvancedProtocol { get; set; }
-
-        public int autoUpdateInterval { get; set; } = 0;
-
-        public int autoUpdateSubInterval { get; set; } = 0;
-
-        public bool checkPreReleaseUpdate { get; set; } = false;
-
-        public bool enableSecurityProtocolTls13
-        {
-            get; set;
-        }
-
-        public int trayMenuServersLimit { get; set; }
-
-        #endregion property
-
-        #region other entities
-
-        /// <summary>
-        /// 本地监听
-        /// </summary>
-        public List<InItem> inbound
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// vmess服务器信息
-        /// </summary>
-        public List<VmessItem> vmess
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// KcpItem
-        /// </summary>
-        public KcpItem kcpItem
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// 订阅
-        /// </summary>
-        public List<SubItem> subItem
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// UI
-        /// </summary>
-        public UIItem uiItem
-        {
-            get; set;
-        }
-
-        public List<RoutingItemOld> routings
-        {
-            get; set;
-        }
-
-        public ConstItem constItem
-        {
-            get; set;
-        }
-
-        public List<KeyEventItem> globalHotkeys
-        {
-            get; set;
-        }
-
-        public List<CoreTypeItem> coreTypeItem
-        {
-            get; set;
-        }
-
-        #endregion other entities
-    }
-
-    [Serializable]
-    public class VmessItem
-    {
-        public VmessItem()
-        {
-            indexId = string.Empty;
-            configType = EConfigType.VMess;
-            configVersion = 2;
-            sort = 0;
-            address = string.Empty;
-            port = 0;
-            id = string.Empty;
-            alterId = 0;
-            security = string.Empty;
-            network = string.Empty;
-            remarks = string.Empty;
-            headerType = string.Empty;
-            requestHost = string.Empty;
-            path = string.Empty;
-            streamSecurity = string.Empty;
-            allowInsecure = string.Empty;
-            testResult = string.Empty;
-            subid = string.Empty;
-            flow = string.Empty;
-            groupId = string.Empty;
-        }
-
-        public string indexId
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// config type(1=normal,2=custom)
-        /// </summary>
-        public EConfigType configType
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// 版本(现在=2)
-        /// </summary>
-        public int configVersion
-        {
-            get; set;
-        }
-
-        public int sort
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// 远程服务器地址
-        /// </summary>
-        public string address
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// 远程服务器端口
-        /// </summary>
-        public int port
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// 远程服务器ID
-        /// </summary>
-        public string id
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// 远程服务器额外ID
-        /// </summary>
-        public int alterId
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// 本地安全策略
-        /// </summary>
-        public string security
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// tcp,kcp,ws,h2,quic
-        /// </summary>
-        public string network
-        {
-            get; set;
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        public string remarks
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// 伪装类型
-        /// </summary>
-        public string headerType
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// 伪装的域名
-        /// </summary>
-        public string requestHost
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// ws h2 path
-        /// </summary>
-        public string path
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// 传输层安全
-        /// </summary>
-        public string streamSecurity
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// 是否允许不安全连接（用于客户端）
-        /// </summary>
-        public string allowInsecure
-        {
-            get; set;
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        public string testResult
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// SubItem id
-        /// </summary>
-        public string subid
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// VLESS flow
-        /// </summary>
-        public string flow
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// tls sni
-        /// </summary>
-        public string sni
-        {
-            get; set;
-        }
-
-        public string groupId
-        {
-            get; set;
-        } = string.Empty;
-
-        public ECoreType? coreType
-        {
-            get; set;
-        }
-
-        public int preSocksPort
-        {
-            get; set;
-        }
-
-        public string fingerprint { get; set; }
-    }
-
-    [Serializable]
-    public class RoutingItemOld
-    {
-        public string remarks
-        {
-            get; set;
-        }
-
-        public string url
-        {
-            get; set;
-        }
-
-        public List<RulesItem> rules
-        {
-            get; set;
-        }
-
-        public bool enabled { get; set; } = true;
-
-        public bool locked
-        {
-            get; set;
-        }
-
-        public string customIcon
-        {
-            get; set;
-        }
-    }
-}

v2rayN/v2rayN/Models/ComboItem.cs

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

v2rayN/v2rayN/Models/Config.cs

@@ -1,4 +1,6 @@
-namespace v2rayN.Mode
+using v2rayN.Enums;
+
+namespace v2rayN.Models
 {
     /// <summary>
     /// 本软件配置文件实体类
@@ -14,6 +16,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,7 @@
 using System.Windows.Input;
+using v2rayN.Enums;
 
-namespace v2rayN.Mode
+namespace v2rayN.Models
 {
     [Serializable]
     public class CoreBasicItem
@@ -31,6 +32,10 @@ namespace v2rayN.Mode
         /// 默认用户代理
         /// </summary>
         public string defUserAgent { get; set; }
+
+        public bool enableFragment { get; set; }
+
+        public bool enableCacheFile4Sbox { get; set; } = true;
     }
 
     [Serializable]
@@ -43,8 +48,8 @@ namespace v2rayN.Mode
         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 +127,7 @@ namespace v2rayN.Mode
         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,13 +183,8 @@ namespace v2rayN.Mode
     [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; }
@@ -203,9 +203,6 @@ namespace v2rayN.Mode
     {
         public string protocol { get; set; }
         public int max_connections { get; set; }
-        public int min_streams { get; set; }
-        public int max_streams { get; set; }
-        public bool padding { get; set; }
     }
 
     [Serializable]

v2rayN/v2rayN/Models/CoreInfo.cs

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

v2rayN/v2rayN/Models/DNSItem.cs

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

v2rayN/v2rayN/Models/GitHubRelease.cs

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

v2rayN/v2rayN/Models/ProfileExItem.cs

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

v2rayN/v2rayN/Models/ProfileItem.cs

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

v2rayN/v2rayN/Models/ProfileItemModel.cs

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

v2rayN/v2rayN/Models/RoutingItem.cs

@@ -1,6 +1,6 @@
 using SQLite;
 
-namespace v2rayN.Mode
+namespace v2rayN.Models
 {
     [Serializable]
     public class RoutingItem
@@ -15,6 +15,7 @@ namespace v2rayN.Mode
         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.Mode
+namespace v2rayN.Models
 {
     [Serializable]
     public class RoutingItemModel : RoutingItem

v2rayN/v2rayN/Models/RulesItem.cs

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

v2rayN/v2rayN/Models/RulesItemModel.cs

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

v2rayN/v2rayN/Models/ServerSpeedItem.cs

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

v2rayN/v2rayN/Models/ServerStatItem.cs

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

v2rayN/v2rayN/Models/ServerTestItem.cs

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

v2rayN/v2rayN/Models/SingboxConfig.cs

@@ -1,13 +1,13 @@
-namespace v2rayN.Mode
+namespace v2rayN.Models
 {
     public class SingboxConfig
     {
         public Log4Sbox log { get; set; }
-        public object dns { get; set; }
+        public Dns4Sbox? dns { get; set; }
         public List<Inbound4Sbox> inbounds { get; set; }
         public List<Outbound4Sbox> outbounds { get; set; }
         public Route4Sbox route { get; set; }
-        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; }
@@ -118,10 +120,12 @@
         public string? peer_public_key { get; set; }
         public int[]? reserved { get; set; }
         public int? mtu { get; set; }
-        public Tls4Sbox tls { get; set; }
-        public Multiplex4Sbox multiplex { get; set; }
-        public Transport4Sbox transport { get; set; }
-        public HyObfs4Sbox obfs { 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 class Tls4Sbox
@@ -139,9 +143,6 @@
         public bool enabled { get; set; }
         public string protocol { get; set; }
         public int max_connections { get; set; }
-        public int min_streams { get; set; }
-        public int max_streams { get; set; }
-        public bool padding { get; set; }
     }
 
     public class Utls4Sbox
@@ -159,14 +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; }
     }
 
@@ -187,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
@@ -231,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.Mode
+namespace v2rayN.Models
 {
     public class SsSIP008
     {

v2rayN/v2rayN/Models/SubItem.cs

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

v2rayN/v2rayN/Models/SysProxyConfig.cs

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

v2rayN/v2rayN/Models/V2rayConfig.cs

@@ -1,12 +1,17 @@
 using System.Text.Json.Serialization;
 
-namespace v2rayN.Mode
+namespace v2rayN.Models
 {
     /// <summary>
     /// v2ray配置文件实体类 例子SampleConfig.txt
     /// </summary>
     public class V2rayConfig
     {
+        /// <summary>
+        /// Properties that do not belong to Ray
+        /// </summary>
+        public string? remarks { get; set; }
+
         /// <summary>
         /// 日志配置
         /// </summary>
@@ -190,7 +195,7 @@ namespace v2rayN.Mode
     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.Mode
         /// <summary>
         ///
         /// </summary>
-        public List<VnextItem4Ray> vnext { get; set; }
+        public List<VnextItem4Ray>? vnext { get; set; }
 
         /// <summary>
         ///
@@ -248,6 +253,8 @@ namespace v2rayN.Mode
         ///
         /// </summary>
         public int? userLevel { get; set; }
+
+        public FragmentItem4Ray? fragment { get; set; }
     }
 
     public class VnextItem4Ray
@@ -283,17 +290,17 @@ namespace v2rayN.Mode
         /// <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.Mode
         /// <summary>
         ///
         /// </summary>
-        public int level { get; set; }
+        public int? level { get; set; }
 
         /// <summary>
         /// trojan
@@ -331,7 +338,7 @@ namespace v2rayN.Mode
         /// <summary>
         ///
         /// </summary>
-        public int level { get; set; }
+        public int? level { get; set; }
     }
 
     public class Mux4Ray
@@ -384,19 +391,19 @@ namespace v2rayN.Mode
     [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
@@ -414,42 +421,52 @@ namespace v2rayN.Mode
         /// <summary>
         ///
         /// </summary>
-        public TlsSettings4Ray tlsSettings { get; set; }
+        public TlsSettings4Ray? tlsSettings { get; set; }
 
         /// <summary>
         /// Tcp传输额外设置
         /// </summary>
-        public TcpSettings4Ray tcpSettings { get; set; }
+        public TcpSettings4Ray? tcpSettings { get; set; }
 
         /// <summary>
         /// Kcp传输额外设置
         /// </summary>
-        public KcpSettings4Ray kcpSettings { get; set; }
+        public KcpSettings4Ray? kcpSettings { get; set; }
 
         /// <summary>
         /// ws传输额外设置
         /// </summary>
-        public WsSettings4Ray wsSettings { get; set; }
+        public WsSettings4Ray? wsSettings { get; set; }
+
+        /// <summary>
+        ///
+        /// </summary>
+        public HttpupgradeSettings4Ray? httpupgradeSettings { get; set; }
+
+        /// <summary>
+        ///
+        /// </summary>
+        public SplithttpSettings4Ray? splithttpSettings { get; set; }
 
         /// <summary>
         /// h2传输额外设置
         /// </summary>
-        public HttpSettings4Ray httpSettings { get; set; }
+        public HttpSettings4Ray? httpSettings { get; set; }
 
         /// <summary>
         /// QUIC
         /// </summary>
-        public QuicSettings4Ray quicSettings { get; set; }
+        public QuicSettings4Ray? quicSettings { get; set; }
 
         /// <summary>
         /// VLESS only
         /// </summary>
-        public TlsSettings4Ray realitySettings { get; set; }
+        public TlsSettings4Ray? realitySettings { get; set; }
 
         /// <summary>
         /// grpc
         /// </summary>
-        public GrpcSettings4Ray grpcSettings { get; set; }
+        public GrpcSettings4Ray? grpcSettings { get; set; }
 
         /// <summary>
         /// sockopt
@@ -476,7 +493,7 @@ namespace v2rayN.Mode
 
         public string? fingerprint { get; set; }
 
-        public bool? show { get; set; } = false;
+        public bool? show { get; set; }
         public string? publicKey { get; set; }
         public string? shortId { get; set; }
         public string? spiderX { get; set; }
@@ -583,6 +600,30 @@ namespace v2rayN.Mode
         public string UserAgent { get; set; }
     }
 
+    public class HttpupgradeSettings4Ray
+    {
+        /// <summary>
+        ///
+        /// </summary>
+        public string? path { get; set; }
+
+        /// <summary>
+        ///
+        /// </summary>
+        public string? host { get; set; }
+    }
+
+    public class SplithttpSettings4Ray
+    {
+        public string? path { get; set; }
+
+        public string? host { get; set; }
+
+        public int? maxUploadSize { get; set; }
+
+        public int? maxConcurrentUploads { get; set; }
+    }
+
     public class HttpSettings4Ray
     {
         /// <summary>
@@ -616,7 +657,8 @@ namespace v2rayN.Mode
 
     public class GrpcSettings4Ray
     {
-        public string serviceName { get; set; }
+        public string? authority { get; set; }
+        public string? serviceName { get; set; }
         public bool multiMode { get; set; }
         public int idle_timeout { get; set; }
         public int health_check_timeout { get; set; }
@@ -641,4 +683,11 @@ namespace v2rayN.Mode
     {
         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.Mode
+namespace v2rayN.Models
 {
     /// <summary>
     /// Tcp伪装http的Request，只要Host

v2rayN/v2rayN/Models/VmessQRCode.cs

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

v2rayN/v2rayN/Resx/ResUI.Designer.cs

@@ -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 {
@@ -592,7 +601,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Url(Optional) 的本地化字符串。
+        ///   查找类似 URL(Optional) 的本地化字符串。
         /// </summary>
         public static string LvUrl {
             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>
@@ -799,7 +817,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 GlobalHotkeySetting 的本地化字符串。
+        ///   查找类似 Global Hotkey Setting 的本地化字符串。
         /// </summary>
         public static string menuGlobalHotkeySetting {
             get {
@@ -817,7 +835,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Import old config guiNConfig 的本地化字符串。
+        ///   查找类似 Import old config (guiNConfig) 的本地化字符串。
         /// </summary>
         public static string menuImportOldGuiConfig {
             get {
@@ -844,7 +862,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Import Rules From Sub Url 的本地化字符串。
+        ///   查找类似 Import Rules From Subscription URL 的本地化字符串。
         /// </summary>
         public static string menuImportRulesFromUrl {
             get {
@@ -916,7 +934,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Clear All 的本地化字符串。
+        ///   查找类似 Clear all 的本地化字符串。
         /// </summary>
         public static string menuMsgViewClear {
             get {
@@ -934,7 +952,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Copy All 的本地化字符串。
+        ///   查找类似 Copy all 的本地化字符串。
         /// </summary>
         public static string menuMsgViewCopyAll {
             get {
@@ -952,7 +970,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Select All (Ctrl+A) 的本地化字符串。
+        ///   查找类似 Select all (Ctrl+A) 的本地化字符串。
         /// </summary>
         public static string menuMsgViewSelectAll {
             get {
@@ -961,7 +979,16 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 OptionSetting 的本地化字符串。
+        ///   查找类似 Open the storage location 的本地化字符串。
+        /// </summary>
+        public static string menuOpenTheFileLocation {
+            get {
+                return ResourceManager.GetString("menuOpenTheFileLocation", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Option Setting 的本地化字符串。
         /// </summary>
         public static string menuOptionSetting {
             get {
@@ -988,7 +1015,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Reboot as administrator 的本地化字符串。
+        ///   查找类似 Restart as Administrator 的本地化字符串。
         /// </summary>
         public static string menuRebootAsAdmin {
             get {
@@ -1114,7 +1141,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 RoutingSetting 的本地化字符串。
+        ///   查找类似 Routing Setting 的本地化字符串。
         /// </summary>
         public static string menuRoutingSetting {
             get {
@@ -1123,7 +1150,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Rule Add 的本地化字符串。
+        ///   查找类似 Add Rule 的本地化字符串。
         /// </summary>
         public static string menuRuleAdd {
             get {
@@ -1150,7 +1177,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Remove Rules (Delete) 的本地化字符串。
+        ///   查找类似 Remove Rule (Delete) 的本地化字符串。
         /// </summary>
         public static string menuRuleRemove {
             get {
@@ -1159,7 +1186,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Select All (Ctrl+A) 的本地化字符串。
+        ///   查找类似 Select all (Ctrl+A) 的本地化字符串。
         /// </summary>
         public static string menuSelectAll {
             get {
@@ -1276,7 +1303,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Subscription group Settings 的本地化字符串。
+        ///   查找类似 Subscription group settings 的本地化字符串。
         /// </summary>
         public static string menuSubSetting {
             get {
@@ -1339,7 +1366,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Pac Mode 的本地化字符串。
+        ///   查找类似 PAC mode 的本地化字符串。
         /// </summary>
         public static string menuSystemProxyPac {
             get {
@@ -1447,7 +1474,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Please fill in the Url 的本地化字符串。
+        ///   查找类似 Please fill in the URL 的本地化字符串。
         /// </summary>
         public static string MsgNeedUrl {
             get {
@@ -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>
@@ -1591,7 +1627,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Not Run As Admin 的本地化字符串。
+        ///   查找类似 Not run as Admin 的本地化字符串。
         /// </summary>
         public static string NotRunAsAdmin {
             get {
@@ -1726,7 +1762,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Run As Admin 的本地化字符串。
+        ///   查找类似 Run as Admin 的本地化字符串。
         /// </summary>
         public static string RunAsAdmin {
             get {
@@ -1780,7 +1816,16 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Waiting for testing...... 的本地化字符串。
+        ///   查找类似 Test terminating... 的本地化字符串。
+        /// </summary>
+        public static string SpeedtestingStop {
+            get {
+                return ResourceManager.GetString("SpeedtestingStop", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Waiting for testing (press ESC to terminate)... 的本地化字符串。
         /// </summary>
         public static string SpeedtestingWait {
             get {
@@ -1871,7 +1916,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Alpn 的本地化字符串。
+        ///   查找类似 ALPN 的本地化字符串。
         /// </summary>
         public static string TbAlpn {
             get {
@@ -1880,7 +1925,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 AlterId 的本地化字符串。
+        ///   查找类似 AlterID 的本地化字符串。
         /// </summary>
         public static string TbAlterId {
             get {
@@ -2069,7 +2114,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 GlobalHotkey Settings 的本地化字符串。
+        ///   查找类似 Global Hotkey Settings 的本地化字符串。
         /// </summary>
         public static string TbGlobalHotkeySetting {
             get {
@@ -2078,7 +2123,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Set directly by pressing the keyboard, Take effect after restart 的本地化字符串。
+        ///   查找类似 Set directly by pressing the keyboard, take effect after restart 的本地化字符串。
         /// </summary>
         public static string TbGlobalHotkeySettingTip {
             get {
@@ -2590,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>
@@ -2617,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>
@@ -2672,7 +2744,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 FontSize 的本地化字符串。
+        ///   查找类似 Font Size 的本地化字符串。
         /// </summary>
         public static string TbSettingsFontSize {
             get {
@@ -2681,7 +2753,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Http Port 的本地化字符串。
+        ///   查找类似 HTTP Port 的本地化字符串。
         /// </summary>
         public static string TbSettingsHttpPort {
             get {
@@ -2717,7 +2789,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Language(Restart) 的本地化字符串。
+        ///   查找类似 Language (Restart) 的本地化字符串。
         /// </summary>
         public static string TbSettingsLanguage {
             get {
@@ -2834,7 +2906,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Socks Port 的本地化字符串。
+        ///   查找类似 SOCKS Port 的本地化字符串。
         /// </summary>
         public static string TbSettingsSocksPort {
             get {
@@ -2843,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 {
@@ -2852,7 +2924,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Speed Ping Test Url 的本地化字符串。
+        ///   查找类似 Speed Ping Test URL 的本地化字符串。
         /// </summary>
         public static string TbSettingsSpeedPingTestUrl {
             get {
@@ -2870,7 +2942,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 SpeedTest Url 的本地化字符串。
+        ///   查找类似 SpeedTest URL 的本地化字符串。
         /// </summary>
         public static string TbSettingsSpeedTestUrl {
             get {
@@ -2906,7 +2978,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Subscription conversion Url 的本地化字符串。
+        ///   查找类似 Subscription conversion URL 的本地化字符串。
         /// </summary>
         public static string TbSettingsSubConvert {
             get {
@@ -3086,7 +3158,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Pac Mode 的本地化字符串。
+        ///   查找类似 PAC mode 的本地化字符串。
         /// </summary>
         public static string TbSystemProxyPac {
             get {
@@ -3140,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 {
@@ -3194,7 +3266,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 *ws path 的本地化字符串。
+        ///   查找类似 *ws/httpupgrade/splithttp path 的本地化字符串。
         /// </summary>
         public static string TransportPathTip1 {
             get {
@@ -3212,7 +3284,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 *QUIC key/Kcp seed 的本地化字符串。
+        ///   查找类似 *QUIC key/KCP seed 的本地化字符串。
         /// </summary>
         public static string TransportPathTip3 {
             get {
@@ -3230,7 +3302,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 *Kcp seed 的本地化字符串。
+        ///   查找类似 *kcp seed 的本地化字符串。
         /// </summary>
         public static string TransportPathTip5 {
             get {
@@ -3248,7 +3320,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 *ws host 的本地化字符串。
+        ///   查找类似 *ws/httpupgrade/splithttp host 的本地化字符串。
         /// </summary>
         public static string TransportRequestHostTip2 {
             get {
@@ -3274,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

@@ -335,13 +335,13 @@
     <value>Remarks</value>
   </data>
   <data name="LvUrl" xml:space="preserve">
-    <value>Url(Optional)</value>
+    <value>URL(Optional)</value>
   </data>
   <data name="LvCount" xml:space="preserve">
     <value>Count</value>
   </data>
   <data name="MsgNeedUrl" xml:space="preserve">
-    <value>Please fill in the Url</value>
+    <value>Please fill in the URL</value>
   </data>
   <data name="AddBatchRoutingRulesYesNo" xml:space="preserve">
     <value>Do you want to append rules? Choose yes to append, choose otherwise to replace</value>
@@ -359,13 +359,13 @@
     <value>Please fill in the correct custom DNS</value>
   </data>
   <data name="TransportPathTip1" xml:space="preserve">
-    <value>*ws path</value>
+    <value>*ws/httpupgrade/splithttp path</value>
   </data>
   <data name="TransportPathTip2" xml:space="preserve">
     <value>*h2 path</value>
   </data>
   <data name="TransportPathTip3" xml:space="preserve">
-    <value>*QUIC key/Kcp seed</value>
+    <value>*QUIC key/KCP seed</value>
   </data>
   <data name="TransportPathTip4" xml:space="preserve">
     <value>*grpc serviceName</value>
@@ -374,7 +374,7 @@
     <value>*http host Separated by commas (,)</value>
   </data>
   <data name="TransportRequestHostTip2" xml:space="preserve">
-    <value>*ws host</value>
+    <value>*ws/httpupgrade/splithttp host</value>
   </data>
   <data name="TransportRequestHostTip3" xml:space="preserve">
     <value>*h2 host Separated by commas (,)</value>
@@ -398,7 +398,7 @@
     <value>TLS</value>
   </data>
   <data name="TransportPathTip5" xml:space="preserve">
-    <value>*Kcp seed</value>
+    <value>*kcp seed</value>
   </data>
   <data name="RegisterGlobalHotkeyFailed" xml:space="preserve">
     <value>Global hotkey {0} registered failed, reason {1}</value>
@@ -443,13 +443,13 @@
     <value>Exit</value>
   </data>
   <data name="menuGlobalHotkeySetting" xml:space="preserve">
-    <value>GlobalHotkeySetting</value>
+    <value>Global Hotkey Setting</value>
   </data>
   <data name="menuHelp" xml:space="preserve">
     <value>Help</value>
   </data>
   <data name="menuOptionSetting" xml:space="preserve">
-    <value>OptionSetting</value>
+    <value>Option Setting</value>
   </data>
   <data name="menuPromotion" xml:space="preserve">
     <value>Promotion</value>
@@ -458,7 +458,7 @@
     <value>Reload</value>
   </data>
   <data name="menuRoutingSetting" xml:space="preserve">
-    <value>RoutingSetting</value>
+    <value>Routing Setting</value>
   </data>
   <data name="menuServers" xml:space="preserve">
     <value>Servers</value>
@@ -476,7 +476,7 @@
     <value>Subscription group</value>
   </data>
   <data name="menuSubSetting" xml:space="preserve">
-    <value>Subscription group Settings</value>
+    <value>Subscription group settings</value>
   </data>
   <data name="menuSubUpdate" xml:space="preserve">
     <value>Update subscription without proxy</value>
@@ -494,7 +494,7 @@
     <value>Do not change system proxy</value>
   </data>
   <data name="menuSystemProxyPac" xml:space="preserve">
-    <value>Pac Mode</value>
+    <value>PAC mode</value>
   </data>
   <data name="menuSystemProxySet" xml:space="preserve">
     <value>Set system proxy</value>
@@ -509,7 +509,7 @@
     <value>Follow System Theme</value>
   </data>
   <data name="TbSettingsLanguage" xml:space="preserve">
-    <value>Language(Restart)</value>
+    <value>Language (Restart)</value>
   </data>
   <data name="menuAddServerViaClipboard" xml:space="preserve">
     <value>Import bulk URL from clipboard (Ctrl+V)</value>
@@ -575,22 +575,22 @@
     <value>Add [VMess] server</value>
   </data>
   <data name="menuSelectAll" xml:space="preserve">
-    <value>Select All (Ctrl+A)</value>
+    <value>Select all (Ctrl+A)</value>
   </data>
   <data name="menuMsgViewClear" xml:space="preserve">
-    <value>Clear All</value>
+    <value>Clear all</value>
   </data>
   <data name="menuMsgViewCopy" xml:space="preserve">
     <value>Copy (Ctrl+C)</value>
   </data>
   <data name="menuMsgViewCopyAll" xml:space="preserve">
-    <value>Copy All</value>
+    <value>Copy all</value>
   </data>
   <data name="menuMsgViewFilter" xml:space="preserve">
     <value>Set message filters</value>
   </data>
   <data name="menuMsgViewSelectAll" xml:space="preserve">
-    <value>Select All (Ctrl+A)</value>
+    <value>Select all (Ctrl+A)</value>
   </data>
   <data name="menuSubAdd" xml:space="preserve">
     <value>Add</value>
@@ -629,10 +629,10 @@
     <value>AllowInsecure</value>
   </data>
   <data name="TbAlpn" xml:space="preserve">
-    <value>Alpn</value>
+    <value>ALPN</value>
   </data>
   <data name="TbAlterId" xml:space="preserve">
-    <value>AlterId</value>
+    <value>AlterID</value>
   </data>
   <data name="TbFingerprint" xml:space="preserve">
     <value>Fingerprint</value>
@@ -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>
@@ -752,7 +752,7 @@
     <value>Exception. Do not use proxy server for addresses beginning with,Use semicolon (;)</value>
   </data>
   <data name="TbSettingsHttpPort" xml:space="preserve">
-    <value>Http Port</value>
+    <value>HTTP Port</value>
   </data>
   <data name="TbSettingsIgnoreGeoUpdateCore" xml:space="preserve">
     <value>Ignore Geo files when updating core</value>
@@ -785,7 +785,7 @@
     <value>Turn on Sniffing</value>
   </data>
   <data name="TbSettingsSocksPort" xml:space="preserve">
-    <value>Socks Port</value>
+    <value>SOCKS Port</value>
   </data>
   <data name="TbSettingsStartBoot" xml:space="preserve">
     <value>Start on boot</value>
@@ -794,7 +794,7 @@
     <value>Enable Statistics (Require restart)</value>
   </data>
   <data name="TbSettingsSubConvert" xml:space="preserve">
-    <value>Subscription conversion Url</value>
+    <value>Subscription conversion URL</value>
   </data>
   <data name="TbSettingsSystemproxy" xml:space="preserve">
     <value>System proxy settings</value>
@@ -818,10 +818,10 @@
     <value>Display GUI</value>
   </data>
   <data name="TbGlobalHotkeySetting" xml:space="preserve">
-    <value>GlobalHotkey Settings</value>
+    <value>Global Hotkey Settings</value>
   </data>
   <data name="TbGlobalHotkeySettingTip" xml:space="preserve">
-    <value>Set directly by pressing the keyboard, Take effect after restart</value>
+    <value>Set directly by pressing the keyboard, take effect after restart</value>
   </data>
   <data name="TbNotChangeSystemProxy" xml:space="preserve">
     <value>Do not change system proxy</value>
@@ -833,7 +833,7 @@
     <value>Set system proxy</value>
   </data>
   <data name="TbSystemProxyPac" xml:space="preserve">
-    <value>Pac Mode</value>
+    <value>PAC mode</value>
   </data>
   <data name="menuShareServer" xml:space="preserve">
     <value>Share Server (Ctrl+F)</value>
@@ -842,10 +842,10 @@
     <value>Routing</value>
   </data>
   <data name="NotRunAsAdmin" xml:space="preserve">
-    <value>Not Run As Admin</value>
+    <value>Not run as Admin</value>
   </data>
   <data name="RunAsAdmin" xml:space="preserve">
-    <value>Run As Admin</value>
+    <value>Run as Admin</value>
   </data>
   <data name="menuMoveBottom" xml:space="preserve">
     <value>Move to bottom (B)</value>
@@ -917,13 +917,13 @@
     <value>Import Rules From File</value>
   </data>
   <data name="menuImportRulesFromUrl" xml:space="preserve">
-    <value>Import Rules From Sub Url</value>
+    <value>Import Rules From Subscription URL</value>
   </data>
   <data name="menuRoutingRuleSetting" xml:space="preserve">
     <value>Rule Settings</value>
   </data>
   <data name="menuRuleAdd" xml:space="preserve">
-    <value>Rule Add</value>
+    <value>Add Rule</value>
   </data>
   <data name="menuRuleExportSelected" xml:space="preserve">
     <value>Export Selected Rules</value>
@@ -932,7 +932,7 @@
     <value>Rule List</value>
   </data>
   <data name="menuRuleRemove" xml:space="preserve">
-    <value>Remove Rules (Delete)</value>
+    <value>Remove Rule (Delete)</value>
   </data>
   <data name="menuRoutingRuleDetailsSetting" xml:space="preserve">
     <value>RoutingRuleDetailsSetting</value>
@@ -977,7 +977,7 @@
     <value>Display Log</value>
   </data>
   <data name="menuImportOldGuiConfig" xml:space="preserve">
-    <value>Import old config guiNConfig</value>
+    <value>Import old config (guiNConfig)</value>
   </data>
   <data name="TbEnableTunAs" xml:space="preserve">
     <value>Enable Tun</value>
@@ -1037,13 +1037,13 @@
     <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>
   </data>
   <data name="TbSettingsFontSize" xml:space="preserve">
-    <value>FontSize</value>
+    <value>Font Size</value>
   </data>
   <data name="TbSettingsTunModeProxyIP" xml:space="preserve">
     <value>Proxy IP CIDR, separated by commas (,)</value>
@@ -1058,7 +1058,7 @@
     <value>SpeedTest Single Timeout Value</value>
   </data>
   <data name="TbSettingsSpeedTestUrl" xml:space="preserve">
-    <value>SpeedTest Url</value>
+    <value>SpeedTest URL</value>
   </data>
   <data name="TbSettingsTunModeDNS" xml:space="preserve">
     <value>DNS object, e.g. {"servers":[]}</value>
@@ -1079,7 +1079,7 @@
     <value>Enable hardware acceleration(Require restart)</value>
   </data>
   <data name="SpeedtestingWait" xml:space="preserve">
-    <value>Waiting for testing......</value>
+    <value>Waiting for testing (press ESC to terminate)...</value>
   </data>
   <data name="TipDisplayLog" xml:space="preserve">
     <value>Please turn off when there is an abnormal disconnection</value>
@@ -1088,7 +1088,7 @@
     <value>Updates are not enabled, skip this subscription</value>
   </data>
   <data name="menuRebootAsAdmin" xml:space="preserve">
-    <value>Reboot as administrator</value>
+    <value>Restart as Administrator</value>
   </data>
   <data name="LvMoreUrl" xml:space="preserve">
     <value>More urls, separated by commas;Subscription conversion will be invalid</value>
@@ -1151,7 +1151,7 @@
     <value>Congestion control</value>
   </data>
   <data name="LvPrevProfile" xml:space="preserve">
-    <value>Previous proxy remakrs</value>
+    <value>Previous proxy remarks</value>
   </data>
   <data name="LvNextProfile" xml:space="preserve">
     <value>Next proxy remarks</value>
@@ -1187,9 +1187,36 @@
     <value>Auto ScrollToEnd</value>
   </data>
   <data name="TbSettingsSpeedPingTestUrl" xml:space="preserve">
-    <value>Speed Ping Test Url</value>
+    <value>Speed Ping Test URL</value>
   </data>
   <data name="TbSettingsEnableUpdateSubOnlyRemarksExist" xml:space="preserve">
     <value>Updating subscription, only determine remarks exists</value>
   </data>
+  <data name="SpeedtestingStop" xml:space="preserve">
+    <value>Test terminating...</value>
+  </data>
+  <data name="TransportRequestHostTip5" xml:space="preserve">
+    <value>*grpc Authority</value>
+  </data>
+  <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/splithttp 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/splithttp 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>
@@ -1079,7 +1079,7 @@
     <value>启用硬件加速(需重启)</value>
   </data>
   <data name="SpeedtestingWait" xml:space="preserve">
-    <value>等待测试中......</value>
+    <value>等待测试中（按ESC终止）...</value>
   </data>
   <data name="TipDisplayLog" xml:space="preserve">
     <value>当有异常断流时请关闭</value>
@@ -1189,4 +1189,31 @@
   <data name="TbSettingsEnableUpdateSubOnlyRemarksExist" xml:space="preserve">
     <value>更新订阅时只判断别名已存在否</value>
   </data>
+  <data name="SpeedtestingStop" xml:space="preserve">
+    <value>测试终止中...</value>
+  </data>
+  <data name="TransportRequestHostTip5" xml:space="preserve">
+    <value>*grpc Authority</value>
+  </data>
+  <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

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

v2rayN/v2rayN/ViewModels/AddServerViewModel.cs

@@ -3,8 +3,9 @@ using ReactiveUI.Fody.Helpers;
 using Splat;
 using System.Reactive;
 using System.Windows;
+using v2rayN.Enums;
 using v2rayN.Handler;
-using v2rayN.Mode;
+using v2rayN.Models;
 using v2rayN.Resx;
 
 namespace v2rayN.ViewModels
@@ -44,47 +45,48 @@ namespace v2rayN.ViewModels
                 SaveServer();
             });
 
-            Utils.SetDarkBorder(view, _config.uiItem.colorModeDark);
+            Utils.SetDarkBorder(view, _config.uiItem.followSystemTheme ? !Utils.IsLightTheme() : _config.uiItem.colorModeDark);
         }
 
         private void SaveServer()
         {
             if (Utils.IsNullOrEmpty(SelectedSource.remarks))
             {
-                UI.Show(ResUI.PleaseFillRemarks);
+                _noticeHandler?.Enqueue(ResUI.PleaseFillRemarks);
                 return;
             }
 
             if (Utils.IsNullOrEmpty(SelectedSource.address))
             {
-                UI.Show(ResUI.FillServerAddress);
+                _noticeHandler?.Enqueue(ResUI.FillServerAddress);
                 return;
             }
             var port = SelectedSource.port.ToString();
-            if (Utils.IsNullOrEmpty(port) || !Utils.IsNumberic(port)
+            if (Utils.IsNullOrEmpty(port) || !Utils.IsNumeric(port)
                 || SelectedSource.port <= 0 || SelectedSource.port >= Global.MaxPort)
             {
-                UI.Show(ResUI.FillCorrectServerPort);
+                _noticeHandler?.Enqueue(ResUI.FillCorrectServerPort);
                 return;
             }
             if (SelectedSource.configType == EConfigType.Shadowsocks)
             {
                 if (Utils.IsNullOrEmpty(SelectedSource.id))
                 {
-                    UI.Show(ResUI.FillPassword);
+                    _noticeHandler?.Enqueue(ResUI.FillPassword);
                     return;
                 }
                 if (Utils.IsNullOrEmpty(SelectedSource.security))
                 {
-                    UI.Show(ResUI.PleaseSelectEncryption);
+                    _noticeHandler?.Enqueue(ResUI.PleaseSelectEncryption);
                     return;
                 }
             }
-            if (SelectedSource.configType != EConfigType.Socks)
+            if (SelectedSource.configType != EConfigType.Socks
+                && SelectedSource.configType != EConfigType.Http)
             {
                 if (Utils.IsNullOrEmpty(SelectedSource.id))
                 {
-                    UI.Show(ResUI.FillUUID);
+                    _noticeHandler?.Enqueue(ResUI.FillUUID);
                     return;
                 }
             }
@@ -127,6 +129,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 +146,7 @@ namespace v2rayN.ViewModels
             }
             else
             {
-                UI.Show(ResUI.OperationFailed);
+                _noticeHandler?.Enqueue(ResUI.OperationFailed);
             }
         }
     }

v2rayN/v2rayN/ViewModels/DNSSettingViewModel.cs

@@ -3,8 +3,9 @@ using ReactiveUI.Fody.Helpers;
 using Splat;
 using System.Reactive;
 using System.Windows;
+using v2rayN.Enums;
 using v2rayN.Handler;
-using v2rayN.Mode;
+using v2rayN.Models;
 using v2rayN.Resx;
 
 namespace v2rayN.ViewModels
@@ -56,7 +57,7 @@ namespace v2rayN.ViewModels
                 tunDNS2 = Utils.GetEmbedText(Global.TunSingboxDNSFileName);
             });
 
-            Utils.SetDarkBorder(view, _config.uiItem.colorModeDark);
+            Utils.SetDarkBorder(view, _config.uiItem.followSystemTheme ? !Utils.IsLightTheme() : _config.uiItem.colorModeDark);
         }
 
         private void SaveSetting()
@@ -71,7 +72,7 @@ namespace v2rayN.ViewModels
                 {
                     if (normalDNS.Contains("{") || normalDNS.Contains("}"))
                     {
-                        UI.Show(ResUI.FillCorrectDNSText);
+                        _noticeHandler?.Enqueue(ResUI.FillCorrectDNSText);
                         return;
                     }
                 }
@@ -81,7 +82,7 @@ namespace v2rayN.ViewModels
                 var obj2 = JsonUtils.Deserialize<Dns4Sbox>(normalDNS2);
                 if (obj2 == null)
                 {
-                    UI.Show(ResUI.FillCorrectDNSText);
+                    _noticeHandler?.Enqueue(ResUI.FillCorrectDNSText);
                     return;
                 }
             }
@@ -90,7 +91,7 @@ namespace v2rayN.ViewModels
                 var obj2 = JsonUtils.Deserialize<Dns4Sbox>(tunDNS2);
                 if (obj2 == null)
                 {
-                    UI.Show(ResUI.FillCorrectDNSText);
+                    _noticeHandler?.Enqueue(ResUI.FillCorrectDNSText);
                     return;
                 }
             }