up 6.55

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

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.3" />
+		<PackageReference Include="Grpc.Net.Client" Version="2.65.0" />
+		<PackageReference Include="Grpc.Tools" Version="2.65.0">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>

v2rayN/v2rayN/App.xaml

@@ -1,9 +1,9 @@
 <Application
     x:Class="v2rayN.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:conv="clr-namespace:v2rayN.Converters"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     ShutdownMode="OnExplicitShutdown"
     StartupUri="Views/MainWindow.xaml">
     <Application.Resources>
@@ -13,13 +13,14 @@
                     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>
             <system:Double x:Key="StdFontSize1">13</system:Double>
             <system:Double x:Key="StdFontSize2">14</system:Double>
             <system:Double x:Key="StdFontSizeMsg">11</system:Double>
+            <system:Double x:Key="StdFontSize-1">11</system:Double>
 
             <conv:InverseBooleanConverter x:Key="InverseBooleanConverter" />
             <Thickness
@@ -61,23 +62,26 @@
             </Style>
             <Style TargetType="{x:Type TextElement}">
                 <Setter Property="FontWeight" Value="Regular" />
-                <Setter Property="Foreground" Value="{DynamicResource MaterialDesignBody}" />
             </Style>
             <Style TargetType="{x:Type TextBlock}">
                 <Setter Property="FontWeight" Value="Regular" />
-                <Setter Property="Foreground" Value="{DynamicResource MaterialDesignBody}" />
             </Style>
             <Style x:Key="lvItemSelected" TargetType="{x:Type ListViewItem}">
-                <Setter Property="Height" Value="20" />
-                <Setter Property="FontSize" Value="{DynamicResource StdFontSize}" />
-                <Style.Triggers>
-                    <Trigger Property="IsSelected" Value="true">
-                        <Setter Property="Background" Value="{DynamicResource PrimaryHueLightBrush}" />
-                    </Trigger>
-                    <Trigger Property="IsMouseOver" Value="true">
-                        <Setter Property="Background" Value="{DynamicResource PrimaryHueMidBrush}" />
-                    </Trigger>
-                </Style.Triggers>
+                <Setter Property="Margin" Value="2" />
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="ListViewItem">
+                            <materialDesign:Card Name="_Card" SnapsToDevicePixels="true">
+                                <ContentPresenter />
+                            </materialDesign:Card>
+                            <ControlTemplate.Triggers>
+                                <Trigger Property="IsSelected" Value="true">
+                                    <Setter TargetName="_Card" Property="Background" Value="{DynamicResource MaterialDesign.Brush.Primary.Light}" />
+                                </Trigger>
+                            </ControlTemplate.Triggers>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
             </Style>
 
             <Style x:Key="GridViewColumnHeaderStyle" TargetType="{x:Type GridViewColumnHeader}">
@@ -156,6 +160,27 @@
                 <Setter Property="FontSize" Value="{DynamicResource StdFontSize}" />
                 <Setter Property="Padding" Value="{StaticResource OutlinedTextBoxDefaultPadding}" />
             </Style>
+            <Style x:Key="ListItemChip" TargetType="{x:Type materialDesign:Chip}">
+                <Setter Property="FontSize" Value="{DynamicResource StdFontSize1}" />
+            </Style>
+            <Style
+                x:Key="ListItemTitle"
+                BasedOn="{StaticResource MaterialDesignTextBlock}"
+                TargetType="{x:Type TextBlock}">
+                <Setter Property="FontSize" Value="{DynamicResource StdFontSize1}" />
+            </Style>
+            <Style
+                x:Key="ListItemSubTitle"
+                BasedOn="{StaticResource MaterialDesignTextBlock}"
+                TargetType="{x:Type TextBlock}">
+                <Setter Property="FontSize" Value="{DynamicResource StdFontSize}" />
+            </Style>
+            <Style
+                x:Key="ListItemSubTitle2"
+                BasedOn="{StaticResource MaterialDesignTextBlock}"
+                TargetType="{x:Type TextBlock}">
+                <Setter Property="FontSize" Value="{DynamicResource StdFontSize-1}" />
+            </Style>
         </ResourceDictionary>
     </Application.Resources>
 </Application>

v2rayN/v2rayN/App.xaml.cs

@@ -1,7 +1,8 @@
-using System.Windows;
+using System.Diagnostics;
+using System.Windows;
 using System.Windows.Threading;
 using v2rayN.Handler;
-using v2rayN.Model;
+using v2rayN.Models;
 
 namespace v2rayN
 {
@@ -27,14 +28,13 @@ namespace v2rayN
         /// <param name="e"></param>
         protected override void OnStartup(StartupEventArgs e)
         {
-            var exePathKey = Utile.GetMD5(Utile.GetExePath());
+            var exePathKey = Utils.GetMD5(Utils.GetExePath());
 
             var rebootas = (e.Args ?? new string[] { }).Any(t => t == Global.RebootAs);
             ProgramStarted = new EventWaitHandle(false, EventResetMode.AutoReset, exePathKey, out bool bCreatedNew);
             if (!rebootas && !bCreatedNew)
             {
                 ProgramStarted.Set();
-                Current.Shutdown();
                 Environment.Exit(0);
                 return;
             }
@@ -42,7 +42,8 @@ namespace v2rayN
             Logging.Setup();
             Init();
             Logging.LoggingEnabled(_config.guiItem.enableLog);
-            Logging.SaveLog($"v2rayN start up | {Utile.GetVersion()} | {Utile.GetExePath()}");
+            Logging.SaveLog($"v2rayN start up | {Utils.GetVersion()} | {Utils.GetExePath()}");
+            Logging.SaveLog($"{Environment.OSVersion} - {(Environment.Is64BitOperatingSystem ? 64 : 32)}");
             Logging.ClearLogs();
 
             Thread.CurrentThread.CurrentUICulture = new(_config.uiItem.currentLanguage);
@@ -54,15 +55,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.User);
+            }
         }
 
         private void App_DispatcherUnhandledException(object sender, DispatcherUnhandledExceptionEventArgs e)
@@ -83,5 +85,12 @@ namespace v2rayN
         {
             Logging.SaveLog("TaskScheduler_UnobservedTaskException", e.Exception);
         }
+
+        protected override void OnExit(ExitEventArgs e)
+        {
+            Logging.SaveLog("OnExit");
+            base.OnExit(e);
+            Process.GetCurrentProcess().Kill();
+        }
     }
 }

v2rayN/v2rayN/Common/DownloaderHelper.cs

@@ -11,7 +11,7 @@ namespace v2rayN
 
         public async Task<string?> DownloadStringAsync(IWebProxy? webProxy, string url, string? userAgent, int timeout)
         {
-            if (string.IsNullOrEmpty(url))
+            if (Utils.IsNullOrEmpty(url))
             {
                 return null;
             }
@@ -19,9 +19,9 @@ namespace v2rayN
             Uri uri = new(url);
             //Authorization Header
             var headers = new WebHeaderCollection();
-            if (!Utile.IsNullOrEmpty(uri.UserInfo))
+            if (!Utils.IsNullOrEmpty(uri.UserInfo))
             {
-                headers.Add(HttpRequestHeader.Authorization, "Basic " + Utile.Base64Encode(uri.UserInfo));
+                headers.Add(HttpRequestHeader.Authorization, "Basic " + Utils.Base64Encode(uri.UserInfo));
             }
 
             var downloadOpt = new DownloadConfiguration()
@@ -57,7 +57,7 @@ namespace v2rayN
 
         public async Task DownloadDataAsync4Speed(IWebProxy webProxy, string url, IProgress<string> progress, int timeout)
         {
-            if (string.IsNullOrEmpty(url))
+            if (Utils.IsNullOrEmpty(url))
             {
                 throw new ArgumentNullException(nameof(url));
             }
@@ -120,11 +120,11 @@ namespace v2rayN
 
         public async Task DownloadFileAsync(IWebProxy? webProxy, string url, string fileName, IProgress<double> progress, int timeout)
         {
-            if (string.IsNullOrEmpty(url))
+            if (Utils.IsNullOrEmpty(url))
             {
                 throw new ArgumentNullException(nameof(url));
             }
-            if (string.IsNullOrEmpty(fileName))
+            if (Utils.IsNullOrEmpty(fileName))
             {
                 throw new ArgumentNullException(nameof(fileName));
             }

v2rayN/v2rayN/Common/FileManager.cs

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

v2rayN/v2rayN/Common/HttpClientHelper.cs

@@ -1,5 +1,6 @@
 using System.IO;
 using System.Net.Http;
+using System.Net.Http.Headers;
 using System.Net.Mime;
 using System.Text;
 
@@ -21,26 +22,57 @@ namespace v2rayN
 
         private HttpClientHelper(HttpClient httpClient) => this.httpClient = httpClient;
 
+        public async Task<string?> TryGetAsync(string url)
+        {
+            if (string.IsNullOrEmpty(url))
+                return null;
+
+            try
+            {
+                HttpResponseMessage response = await httpClient.GetAsync(url);
+                return await response.Content.ReadAsStringAsync();
+            }
+            catch
+            {
+                return null;
+            }
+        }
+
         public async Task<string?> GetAsync(string url)
         {
-            if (string.IsNullOrEmpty(url)) return null;
+            if (Utils.IsNullOrEmpty(url)) return null;
             return await httpClient.GetStringAsync(url);
         }
 
         public async Task<string?> GetAsync(HttpClient client, string url, CancellationToken token = default)
         {
-            if (string.IsNullOrWhiteSpace(url)) return null;
+            if (Utils.IsNullOrEmpty(url)) return null;
             return await client.GetStringAsync(url, token);
         }
 
         public async Task PutAsync(string url, Dictionary<string, string> headers)
         {
-            var jsonContent = JsonUtile.Serialize(headers);
+            var jsonContent = JsonUtils.Serialize(headers);
             var content = new StringContent(jsonContent, Encoding.UTF8, MediaTypeNames.Application.Json);
 
             var result = await httpClient.PutAsync(url, content);
         }
 
+        public async Task PatchAsync(string url, Dictionary<string, string> headers)
+        {
+            var myContent = JsonUtils.Serialize(headers);
+            var buffer = System.Text.Encoding.UTF8.GetBytes(myContent);
+            var byteContent = new ByteArrayContent(buffer);
+            byteContent.Headers.ContentType = new MediaTypeHeaderValue("application/json");
+
+            await httpClient.PatchAsync(url, byteContent);
+        }
+
+        public async Task DeleteAsync(string url)
+        {
+            await httpClient.DeleteAsync(url);
+        }
+
         public static async Task DownloadFileAsync(HttpClient client, string url, string fileName, IProgress<double>? progress, CancellationToken token = default)
         {
             ArgumentNullException.ThrowIfNull(url);
@@ -76,19 +108,19 @@ namespace v2rayN
                     //if (progressPercentage != percent && percent % 10 == 0)
                     {
                         progressPercentage = percent;
-                        progress!.Report(percent);
+                        progress?.Report(percent);
                     }
                 }
             }
             if (canReportProgress)
             {
-                progress!.Report(101);
+                progress?.Report(101);
             }
         }
 
         public async Task DownloadDataAsync4Speed(HttpClient client, string url, IProgress<string> progress, CancellationToken token = default)
         {
-            if (string.IsNullOrEmpty(url))
+            if (Utils.IsNullOrEmpty(url))
             {
                 throw new ArgumentNullException(nameof(url));
             }

v2rayN/v2rayN/Common/JsonUtils.cs

@@ -5,7 +5,7 @@ using System.Text.Json.Serialization;
 
 namespace v2rayN
 {
-    internal class JsonUtile
+    internal class JsonUtils
     {
         /// <summary>
         /// DeepCopy
@@ -28,7 +28,7 @@ namespace v2rayN
         {
             try
             {
-                if (string.IsNullOrEmpty(strJson))
+                if (string.IsNullOrWhiteSpace(strJson))
                 {
                     return default;
                 }
@@ -49,7 +49,7 @@ namespace v2rayN
         {
             try
             {
-                if (string.IsNullOrEmpty(strJson))
+                if (string.IsNullOrWhiteSpace(strJson))
                 {
                     return null;
                 }
@@ -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/Logging.cs

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

v2rayN/v2rayN/Common/ProxySetting.cs

@@ -1,10 +1,38 @@
 using System.Runtime.InteropServices;
-using static v2rayN.Handler.ProxySetting.InternetConnectionOption;
+using static v2rayN.Common.ProxySetting.InternetConnectionOption;
 
-namespace v2rayN.Handler
+namespace v2rayN.Common
 {
     internal class ProxySetting
     {
+        private const string _regPath = @"Software\Microsoft\Windows\CurrentVersion\Internet Settings";
+
+        private static bool SetProxyFallback(string? strProxy, string? exceptions, int type)
+        {
+            if (type == 1)
+            {
+                Utils.RegWriteValue(_regPath, "ProxyEnable", 0);
+                Utils.RegWriteValue(_regPath, "ProxyServer", string.Empty);
+                Utils.RegWriteValue(_regPath, "ProxyOverride", string.Empty);
+                Utils.RegWriteValue(_regPath, "AutoConfigURL", string.Empty);
+            }
+            if (type == 2)
+            {
+                Utils.RegWriteValue(_regPath, "ProxyEnable", 1);
+                Utils.RegWriteValue(_regPath, "ProxyServer", strProxy ?? string.Empty);
+                Utils.RegWriteValue(_regPath, "ProxyOverride", exceptions ?? string.Empty);
+                Utils.RegWriteValue(_regPath, "AutoConfigURL", string.Empty);
+            }
+            else if (type == 4)
+            {
+                Utils.RegWriteValue(_regPath, "ProxyEnable", 0);
+                Utils.RegWriteValue(_regPath, "ProxyServer", string.Empty);
+                Utils.RegWriteValue(_regPath, "ProxyOverride", string.Empty);
+                Utils.RegWriteValue(_regPath, "AutoConfigURL", strProxy ?? string.Empty);
+            }
+            return true;
+        }
+
         /// <summary>
         // set to use no proxy
         /// </summary>
@@ -29,15 +57,24 @@ namespace v2rayN.Handler
         /// <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
-            bool result = SetConnectionProxy(null, strProxy, exceptions, type);
-            // set proxy for dial up connections
-            var connections = EnumerateRasEntries();
-            foreach (var connection in connections)
+            try
             {
-                result |= SetConnectionProxy(connection, strProxy, exceptions, type);
+                // set proxy for LAN
+                bool result = SetConnectionProxy(null, strProxy, exceptions, type);
+                // set proxy for dial up connections
+                var connections = EnumerateRasEntries();
+                foreach (var connection in connections)
+                {
+                    result |= SetConnectionProxy(connection, strProxy, exceptions, type);
+                }
+                return result;
+            }
+            catch (Exception ex)
+            {
+                SetProxyFallback(strProxy, exceptions, type);
+                Logging.SaveLog(ex.Message, ex);
+                return false;
             }
-            return result;
         }
 
         private static bool SetConnectionProxy(string? connectionName, string? strProxy, string? exceptions, int type)
@@ -51,7 +88,7 @@ namespace v2rayN.Handler
             }
             else if (type is 2 or 4) // named proxy or autoproxy script URL
             {
-                optionCount = Utile.IsNullOrEmpty(exceptions) ? 2 : 3;
+                optionCount = Utils.IsNullOrEmpty(exceptions) ? 2 : 3;
             }
 
             int m_Int = (int)PerConnFlags.PROXY_TYPE_DIRECT;
@@ -94,25 +131,25 @@ namespace v2rayN.Handler
             }
             else
             {
-                list.szConnection = IntPtr.Zero;
+                list.szConnection = nint.Zero;
             }
             list.dwOptionCount = options.Length;
             list.dwOptionError = 0;
 
             int optSize = Marshal.SizeOf(typeof(InternetConnectionOption));
             // make a pointer out of all that ...
-            IntPtr optionsPtr = Marshal.AllocCoTaskMem(optSize * options.Length); // !! remember to deallocate memory 4
+            nint optionsPtr = Marshal.AllocCoTaskMem(optSize * options.Length); // !! remember to deallocate memory 4
             // copy the array over into that spot in memory ...
             for (int i = 0; i < options.Length; ++i)
             {
                 if (Environment.Is64BitOperatingSystem)
                 {
-                    IntPtr opt = new(optionsPtr.ToInt64() + (i * optSize));
+                    nint opt = new(optionsPtr.ToInt64() + i * optSize);
                     Marshal.StructureToPtr(options[i], opt, false);
                 }
                 else
                 {
-                    IntPtr opt = new(optionsPtr.ToInt32() + (i * optSize));
+                    nint opt = new(optionsPtr.ToInt32() + i * optSize);
                     Marshal.StructureToPtr(options[i], opt, false);
                 }
             }
@@ -120,11 +157,11 @@ namespace v2rayN.Handler
             list.options = optionsPtr;
 
             // and then make a pointer out of the whole list
-            IntPtr ipcoListPtr = Marshal.AllocCoTaskMem(list.dwSize); // !! remember to deallocate memory 5
+            nint ipcoListPtr = Marshal.AllocCoTaskMem(list.dwSize); // !! remember to deallocate memory 5
             Marshal.StructureToPtr(list, ipcoListPtr, false);
 
             // and finally, call the API method!
-            bool isSuccess = NativeMethods.InternetSetOption(IntPtr.Zero,
+            bool isSuccess = NativeMethods.InternetSetOption(nint.Zero,
                InternetOption.INTERNET_OPTION_PER_CONNECTION_OPTION,
                ipcoListPtr, list.dwSize);
             int returnvalue = 0; // ERROR_SUCCESS
@@ -135,12 +172,12 @@ namespace v2rayN.Handler
             else
             {
                 // Notify the system that the registry settings have been changed and cause them to be refreshed
-                NativeMethods.InternetSetOption(IntPtr.Zero, InternetOption.INTERNET_OPTION_SETTINGS_CHANGED, IntPtr.Zero, 0);
-                NativeMethods.InternetSetOption(IntPtr.Zero, InternetOption.INTERNET_OPTION_REFRESH, IntPtr.Zero, 0);
+                NativeMethods.InternetSetOption(nint.Zero, InternetOption.INTERNET_OPTION_SETTINGS_CHANGED, nint.Zero, 0);
+                NativeMethods.InternetSetOption(nint.Zero, InternetOption.INTERNET_OPTION_REFRESH, nint.Zero, 0);
             }
 
             // FREE the data ASAP
-            if (list.szConnection != IntPtr.Zero) Marshal.FreeHGlobal(list.szConnection); // release mem 3
+            if (list.szConnection != nint.Zero) Marshal.FreeHGlobal(list.szConnection); // release mem 3
             if (optionCount > 1)
             {
                 Marshal.FreeHGlobal(options[1].m_Value.m_StringPtr); // release mem 1
@@ -204,12 +241,12 @@ namespace v2rayN.Handler
         public struct InternetPerConnOptionList
         {
             public int dwSize;               // size of the INTERNET_PER_CONN_OPTION_LIST struct
-            public IntPtr szConnection;         // connection name to set/query options
+            public nint szConnection;         // connection name to set/query options
             public int dwOptionCount;        // number of options to set/query
             public int dwOptionError;           // on error, which option failed
 
             //[MarshalAs(UnmanagedType.)]
-            public IntPtr options;
+            public nint options;
         };
 
         [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
@@ -236,7 +273,7 @@ namespace v2rayN.Handler
                 public int m_Int;
 
                 [FieldOffset(0)]
-                public IntPtr m_StringPtr;
+                public nint m_StringPtr;
             }
 
             [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
@@ -308,7 +345,7 @@ namespace v2rayN.Handler
         {
             [DllImport("WinInet.dll", SetLastError = true, CharSet = CharSet.Auto)]
             [return: MarshalAs(UnmanagedType.Bool)]
-            public static extern bool InternetSetOption(IntPtr hInternet, InternetOption dwOption, IntPtr lpBuffer, int dwBufferLength);
+            public static extern bool InternetSetOption(nint hInternet, InternetOption dwOption, nint lpBuffer, int dwBufferLength);
 
             [DllImport("Rasapi32.dll", CharSet = CharSet.Auto)]
             public static extern uint RasEnumEntries(

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

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

v2rayN/v2rayN/Common/UI.cs

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

v2rayN/v2rayN/Common/Utils.cs

@@ -18,14 +18,10 @@ using System.Windows;
 using System.Windows.Interop;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
-using ZXing;
-using ZXing.Common;
-using ZXing.QrCode;
-using ZXing.Windows.Compatibility;
 
 namespace v2rayN
 {
-    internal class Utile
+    internal class Utils
     {
         #region 资源Json操作
 
@@ -57,11 +53,14 @@ namespace v2rayN
         /// 取得存储资源
         /// </summary>
         /// <returns></returns>
-        public static string? LoadResource(string res)
+        public static string? LoadResource(string? res)
         {
             try
             {
-                if (!File.Exists(res)) return null;
+                if (!File.Exists(res))
+                {
+                    return null;
+                }
                 return File.ReadAllText(res);
             }
             catch (Exception ex)
@@ -80,7 +79,7 @@ namespace v2rayN
         /// </summary>
         /// <param name="lst"></param>
         /// <returns></returns>
-        public static string List2String(List<string> lst, bool wrap = false)
+        public static string List2String(List<string>? lst, bool wrap = false)
         {
             try
             {
@@ -361,14 +360,14 @@ namespace v2rayN
         /// <returns></returns>
         public static string GetPunycode(string url)
         {
-            if (string.IsNullOrWhiteSpace(url))
+            if (Utils.IsNullOrEmpty(url))
             {
                 return url;
             }
             try
             {
                 Uri uri = new(url);
-                if (uri.Host == uri.IdnHost)
+                if (uri.Host == uri.IdnHost || uri.Host == $"[{uri.IdnHost}]")
                 {
                     return url;
                 }
@@ -391,7 +390,7 @@ namespace v2rayN
 
         public static string Convert2Comma(string text)
         {
-            if (string.IsNullOrWhiteSpace(text))
+            if (Utils.IsNullOrEmpty(text))
             {
                 return text;
             }
@@ -428,7 +427,7 @@ namespace v2rayN
         /// <returns></returns>
         public static bool IsNullOrEmpty(string? text)
         {
-            if (string.IsNullOrEmpty(text))
+            if (string.IsNullOrWhiteSpace(text))
             {
                 return true;
             }
@@ -478,7 +477,7 @@ namespace v2rayN
         /// 验证Domain地址是否合法
         /// </summary>
         /// <param name="domain"></param>
-        public static bool IsDomain(string domain)
+        public static bool IsDomain(string? domain)
         {
             //如果为空
             if (IsNullOrEmpty(domain))
@@ -579,12 +578,11 @@ namespace v2rayN
             return inUse;
         }
 
-        public static int GetFreePort()
+        public static int GetFreePort(int defaultPort = 9090)
         {
             try
             {
-                int defaultPort = 9090;
-                if (!Utile.PortInUse(defaultPort))
+                if (!Utils.PortInUse(defaultPort))
                 {
                     return defaultPort;
                 }
@@ -598,7 +596,7 @@ namespace v2rayN
             catch
             {
             }
-            return 69090;
+            return 59090;
         }
 
         #endregion 测速
@@ -742,11 +740,11 @@ namespace v2rayN
             return Guid.TryParse(strSrc, out Guid g);
         }
 
-        public static void ProcessStart(string fileName)
+        public static void ProcessStart(string fileName, string arguments = "")
         {
             try
             {
-                Process.Start(new ProcessStartInfo(fileName) { UseShellExecute = true });
+                Process.Start(new ProcessStartInfo(fileName, arguments) { UseShellExecute = true });
             }
             catch (Exception ex)
             {
@@ -841,7 +839,7 @@ namespace v2rayN
             {
                 Directory.CreateDirectory(_tempPath);
             }
-            if (string.IsNullOrEmpty(filename))
+            if (Utils.IsNullOrEmpty(filename))
             {
                 return _tempPath;
             }
@@ -877,7 +875,7 @@ namespace v2rayN
             {
                 Directory.CreateDirectory(_tempPath);
             }
-            if (string.IsNullOrEmpty(filename))
+            if (Utils.IsNullOrEmpty(filename))
             {
                 return _tempPath;
             }
@@ -902,7 +900,7 @@ namespace v2rayN
                     Directory.CreateDirectory(_tempPath);
                 }
             }
-            if (string.IsNullOrEmpty(filename))
+            if (Utils.IsNullOrEmpty(filename))
             {
                 return _tempPath;
             }
@@ -919,7 +917,7 @@ namespace v2rayN
             {
                 Directory.CreateDirectory(_tempPath);
             }
-            if (string.IsNullOrEmpty(filename))
+            if (Utils.IsNullOrEmpty(filename))
             {
                 return _tempPath;
             }
@@ -936,7 +934,7 @@ namespace v2rayN
             {
                 Directory.CreateDirectory(_tempPath);
             }
-            if (string.IsNullOrEmpty(filename))
+            if (Utils.IsNullOrEmpty(filename))
             {
                 return _tempPath;
             }
@@ -948,66 +946,6 @@ namespace v2rayN
 
         #endregion TempPath
 
-        #region scan screen
-
-        public static string ScanScreen(float dpiX, float dpiY)
-        {
-            try
-            {
-                var left = (int)(SystemParameters.WorkArea.Left);
-                var top = (int)(SystemParameters.WorkArea.Top);
-                var width = (int)(SystemParameters.WorkArea.Width / dpiX);
-                var height = (int)(SystemParameters.WorkArea.Height / dpiY);
-
-                using Bitmap fullImage = new Bitmap(width, height);
-                using (Graphics g = Graphics.FromImage(fullImage))
-                {
-                    g.CopyFromScreen(left, top, 0, 0, fullImage.Size, CopyPixelOperation.SourceCopy);
-                }
-                int maxTry = 10;
-                for (int i = 0; i < maxTry; i++)
-                {
-                    int marginLeft = (int)((double)fullImage.Width * i / 2.5 / maxTry);
-                    int marginTop = (int)((double)fullImage.Height * i / 2.5 / maxTry);
-                    Rectangle cropRect = new(marginLeft, marginTop, fullImage.Width - marginLeft * 2, fullImage.Height - marginTop * 2);
-                    Bitmap target = new(width, height);
-
-                    double imageScale = (double)width / (double)cropRect.Width;
-                    using (Graphics g = Graphics.FromImage(target))
-                    {
-                        g.DrawImage(fullImage, new Rectangle(0, 0, target.Width, target.Height),
-                                        cropRect,
-                                        GraphicsUnit.Pixel);
-                    }
-
-                    BitmapLuminanceSource source = new(target);
-                    BinaryBitmap bitmap = new(new HybridBinarizer(source));
-                    QRCodeReader reader = new();
-                    Result result = reader.decode(bitmap);
-                    if (result != null)
-                    {
-                        string ret = result.Text;
-                        return ret;
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(ex.Message, ex);
-            }
-            return string.Empty;
-        }
-
-        public static Tuple<float, float> GetDpiXY(Window window)
-        {
-            IntPtr hWnd = new WindowInteropHelper(window).EnsureHandle();
-            Graphics g = Graphics.FromHwnd(hWnd);
-
-            return new(96 / g.DpiX, 96 / g.DpiY);
-        }
-
-        #endregion scan screen
-
         #region 开机自动启动等
 
         /// <summary>
@@ -1030,14 +968,14 @@ namespace v2rayN
 
                 if (run)
                 {
-                    string exePath = $"\"{GetExePath()}\"";
+                    string exePath = GetExePath();
                     if (IsAdministrator())
                     {
                         AutoStart(autoRunName, exePath, "");
                     }
                     else
                     {
-                        RegWriteValue(AutoRunRegPath, autoRunName, exePath);
+                        RegWriteValue(AutoRunRegPath, autoRunName, exePath.AppendQuotes());
                     }
                 }
             }
@@ -1108,7 +1046,7 @@ namespace v2rayN
         /// <exception cref="ArgumentNullException"></exception>
         public static void AutoStart(string taskName, string fileName, string description)
         {
-            if (string.IsNullOrEmpty(taskName))
+            if (Utils.IsNullOrEmpty(taskName))
             {
                 return;
             }
@@ -1123,7 +1061,7 @@ namespace v2rayN
             {
                 taskService.RootFolder.DeleteTask(t.Name);
             }
-            if (string.IsNullOrEmpty(fileName))
+            if (Utils.IsNullOrEmpty(fileName))
             {
                 return;
             }
@@ -1137,7 +1075,7 @@ namespace v2rayN
             task.Settings.ExecutionTimeLimit = TimeSpan.Zero;
             task.Triggers.Add(new LogonTrigger { UserId = logonUser, Delay = TimeSpan.FromSeconds(10) });
             task.Principal.RunLevel = TaskRunLevel.Highest;
-            task.Actions.Add(new ExecAction(deamonFileName));
+            task.Actions.Add(new ExecAction(deamonFileName.AppendQuotes(), null, Path.GetDirectoryName(deamonFileName)));
 
             taskService.RootFolder.RegisterTaskDefinition(TaskName, task);
         }
@@ -1146,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/Common/YamlUtils.cs

@@ -0,0 +1,58 @@
+using YamlDotNet.Serialization;
+using YamlDotNet.Serialization.NamingConventions;
+
+namespace v2rayN.Common
+{
+    internal class YamlUtils
+    {
+        #region YAML
+
+        /// <summary>
+        /// 反序列化成对象
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="str"></param>
+        /// <returns></returns>
+        public static T FromYaml<T>(string str)
+        {
+            var deserializer = new DeserializerBuilder()
+                .WithNamingConvention(PascalCaseNamingConvention.Instance)
+                .Build();
+            try
+            {
+                T obj = deserializer.Deserialize<T>(str);
+                return obj;
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog("FromYaml", ex);
+                return deserializer.Deserialize<T>("");
+            }
+        }
+
+        /// <summary>
+        /// 序列化
+        /// </summary>
+        /// <param name="obj"></param>
+        /// <returns></returns>
+        public static string ToYaml(Object obj)
+        {
+            var serializer = new SerializerBuilder()
+                    .WithNamingConvention(HyphenatedNamingConvention.Instance)
+                    .Build();
+
+            string result = string.Empty;
+            try
+            {
+                result = serializer.Serialize(obj);
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+            }
+            return result;
+        }
+
+        #endregion YAML
+    }
+}

v2rayN/v2rayN/Converters/DelayColorConverter.cs

@@ -11,7 +11,7 @@ namespace v2rayN.Converters
 
             if (delay <= 0)
                 return new SolidColorBrush(Colors.Red);
-            if (delay <= 200)
+            if (delay <= 500)
                 return new SolidColorBrush(Colors.Green);
             else
                 return new SolidColorBrush(Colors.IndianRed);

v2rayN/v2rayN/Converters/MaterialDesignFonts.cs

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

v2rayN/v2rayN/Enums/EConfigType.cs

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

v2rayN/v2rayN/Enums/EGirdOrientation.cs

@@ -0,0 +1,9 @@
+namespace v2rayN.Enums
+{
+    public enum EGirdOrientation
+    {
+        Horizontal,
+        Vertical,
+        Tab,
+    }
+}

v2rayN/v2rayN/Enums/EGlobalHotkey.cs

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

v2rayN/v2rayN/Enums/EInboundProtocol.cs

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

v2rayN/v2rayN/Enums/EMove.cs

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

v2rayN/v2rayN/Enums/ERuleMode.cs

@@ -0,0 +1,10 @@
+namespace v2rayN.Enums
+{
+    public enum ERuleMode
+    {
+        Rule = 0,
+        Global = 1,
+        Direct = 2,
+        Unchanged = 3
+    }
+}

v2rayN/v2rayN/Enums/EServerColName.cs

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

v2rayN/v2rayN/Enums/ESpeedActionType.cs

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

v2rayN/v2rayN/Enums/ESysProxyType.cs

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

v2rayN/v2rayN/Global.cs

@@ -1,4 +1,4 @@
-using v2rayN.Model;
+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,16 +20,18 @@ 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/2dust/sing-box-rules/rule-set-{0}/{1}.srs";
 
         public const string PromotionUrl = @"aHR0cHM6Ly85LjIzNDQ1Ni54eXovYWJjLmh0bWw=";
         public const string ConfigFileName = "guiNConfig.json";
         public const string CoreConfigFileName = "config.json";
         public const string CorePreConfigFileName = "configPre.json";
         public const string CoreSpeedtestConfigFileName = "configSpeedtest.json";
+        public const string CoreMultipleLoadConfigFileName = "configMultipleLoad.json";
+        public const string ClashMixinConfigFileName = "Mixin.yaml";
         public const string V2raySampleClient = "v2rayN.Sample.SampleClientConfig";
         public const string SingboxSampleClient = "v2rayN.Sample.SingboxSampleClientConfig";
         public const string V2raySampleHttpRequestFileName = "v2rayN.Sample.SampleHttpRequest";
@@ -46,6 +45,8 @@ namespace v2rayN
         public const string TunSingboxRulesFileName = "v2rayN.Sample.tun_singbox_rules";
         public const string DNSV2rayNormalFileName = "v2rayN.Sample.dns_v2ray_normal";
         public const string DNSSingboxNormalFileName = "v2rayN.Sample.dns_singbox_normal";
+        public const string ClashMixinYaml = "v2rayN.Sample.clash_mixin_yaml";
+        public const string ClashTunYaml = "v2rayN.Sample.clash_tun_yaml";
 
         public const string DefaultSecurity = "auto";
         public const string DefaultNetwork = "tcp";
@@ -56,21 +57,14 @@ namespace v2rayN
         public const string BlockTag = "block";
         public const string StreamSecurity = "tls";
         public const string StreamSecurityReality = "reality";
-        public const string InboundSocks = "socks";
-        public const string InboundHttp = "http";
-        public const string InboundSocks2 = "socks2";
-        public const string InboundHttp2 = "http2";
         public const string Loopback = "127.0.0.1";
-        public const string InboundAPITagName = "api";
         public const string InboundAPIProtocol = "dokodemo-door";
         public const string HttpProtocol = "http://";
         public const string HttpsProtocol = "https://";
 
         public const string UserEMail = "t@t.tt";
-        public const string MyRegPath = "Software\\v2rayNGUI";
         public const string AutoRunRegPath = @"Software\Microsoft\Windows\CurrentVersion\Run";
         public const string AutoRunName = "v2rayNAutoRun";
-        public const string MyRegKeyLanguage = "CurrentLanguage";
         public const string CustomIconName = "v2rayN.ico";
         public const string IEProxyExceptions = "localhost;127.*;10.*;172.16.*;172.17.*;172.18.*;172.19.*;172.20.*;172.21.*;172.22.*;172.23.*;172.24.*;172.25.*;172.26.*;172.27.*;172.28.*;172.29.*;172.30.*;172.31.*;192.168.*";
         public const string RoutingRuleComma = "<COMMA>";
@@ -80,6 +74,7 @@ namespace v2rayN
         public const string CommandClearMsg = "CommandClearMsg";
         public const string CommandSendMsgView = "CommandSendMsgView";
         public const string CommandStopSpeedTest = "CommandStopSpeedTest";
+        public const string CommandRefreshProfiles = "CommandRefreshProfiles";
         public const string DelayUnit = "";
         public const string SpeedUnit = "";
         public const int MinFontSize = 10;
@@ -116,12 +111,14 @@ 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.gstatic.com/generate_204",
+            @"https://www.apple.com/library/test/success.html",
+            @"http://www.msftconnecttest.com/connecttest.txt",
         };
 
         public static readonly Dictionary<string, string> UserAgentTexts = new()
@@ -152,6 +149,7 @@ namespace v2rayN
             {EConfigType.VMess,"vmess"},
             {EConfigType.Shadowsocks,"shadowsocks"},
             {EConfigType.Socks,"socks"},
+            {EConfigType.Http,"http"},
             {EConfigType.VLESS,"vless"},
             {EConfigType.Trojan,"trojan"},
             {EConfigType.Hysteria2,"hysteria2"},
@@ -165,7 +163,7 @@ namespace v2rayN
         public static readonly List<string> SsSecuritiesInXray = new() { "aes-256-gcm", "aes-128-gcm", "chacha20-poly1305", "chacha20-ietf-poly1305", "xchacha20-poly1305", "xchacha20-ietf-poly1305", "none", "plain", "2022-blake3-aes-128-gcm", "2022-blake3-aes-256-gcm", "2022-blake3-chacha20-poly1305" };
         public static readonly List<string> SsSecuritiesInSingbox = new() { "aes-256-gcm", "aes-192-gcm", "aes-128-gcm", "chacha20-ietf-poly1305", "xchacha20-ietf-poly1305", "none", "2022-blake3-aes-128-gcm", "2022-blake3-aes-256-gcm", "2022-blake3-chacha20-poly1305", "aes-128-ctr", "aes-192-ctr", "aes-256-ctr", "aes-128-cfb", "aes-192-cfb", "aes-256-cfb", "rc4-md5", "chacha20-ietf", "xchacha20" };
         public static readonly List<string> Flows = new() { "", "xtls-rprx-vision", "xtls-rprx-vision-udp443" };
-        public static readonly List<string> Networks = new() { "tcp", "kcp", "ws", "h2", "quic", "grpc" };
+        public static readonly List<string> Networks = new() { "tcp", "kcp", "ws", "httpupgrade", "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" };
@@ -177,17 +175,26 @@ namespace v2rayN
 
         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> SingboxDomainStrategy4Out = new() { "ipv4_only", "prefer_ipv4", "prefer_ipv6", "ipv6_only", "" };
+        public static readonly List<string> DomainDNSAddress = ["223.5.5.5", "223.6.6.6", "localhost"];
+        public static readonly List<string> SingboxDomainDNSAddress = ["223.5.5.5", "223.6.6.6", "dhcp://auto"];
         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> Alpns = new() { "h3", "h2", "http/1.1", "h3,h2", "h2,http/1.1", "h3,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> RuleNetworks = new() { "", "tcp", "udp", "tcp,udp" };
+        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", "" };
         public static readonly List<string> SingboxMuxs = new() { "h2mux", "smux", "yamux", "" };
         public static readonly List<string> TuicCongestionControls = new() { "cubic", "new_reno", "bbr" };
 
+        public static readonly List<string> allowSelectType = new List<string> { "selector", "urltest", "loadbalance", "fallback" };
+        public static readonly List<string> notAllowTestType = new List<string> { "selector", "urltest", "direct", "reject", "compatible", "pass", "loadbalance", "fallback" };
+        public static readonly List<string> proxyVehicleType = new List<string> { "file", "http" };
+
         #endregion const
     }
 }

v2rayN/v2rayN/Handler/ClashApiHandler.cs

@@ -0,0 +1,218 @@
+using v2rayN.Models;
+using static v2rayN.Models.ClashProxies;
+
+namespace v2rayN.Handler
+{
+    public sealed class ClashApiHandler
+    {
+        private static readonly Lazy<ClashApiHandler> instance = new(() => new());
+        public static ClashApiHandler Instance => instance.Value;
+
+        private Dictionary<String, ProxiesItem> _proxies;
+        public Dictionary<string, object> ProfileContent { get; set; }
+
+        public void SetProxies(Dictionary<String, ProxiesItem> proxies)
+        {
+            _proxies = proxies;
+        }
+
+        public Dictionary<String, ProxiesItem> GetProxies()
+        {
+            return _proxies;
+        }
+
+        public void GetClashProxies(Config config, Action<ClashProxies, ClashProviders> update)
+        {
+            Task.Run(() => GetClashProxiesAsync(config, update));
+        }
+
+        private async Task GetClashProxiesAsync(Config config, Action<ClashProxies, ClashProviders> update)
+        {
+            for (var i = 0; i < 5; i++)
+            {
+                var url = $"{GetApiUrl()}/proxies";
+                var result = await HttpClientHelper.Instance.TryGetAsync(url);
+                var clashProxies = JsonUtils.Deserialize<ClashProxies>(result);
+
+                var url2 = $"{GetApiUrl()}/providers/proxies";
+                var result2 = await HttpClientHelper.Instance.TryGetAsync(url2);
+                var clashProviders = JsonUtils.Deserialize<ClashProviders>(result2);
+
+                if (clashProxies != null || clashProviders != null)
+                {
+                    update(clashProxies, clashProviders);
+                    return;
+                }
+                Thread.Sleep(5000);
+            }
+            update(null, null);
+        }
+
+        public void ClashProxiesDelayTest(bool blAll, List<ClashProxyModel> lstProxy, Action<ClashProxyModel?, string> update)
+        {
+            Task.Run(() =>
+            {
+                if (blAll)
+                {
+                    for (int i = 0; i < 5; i++)
+                    {
+                        if (GetProxies() != null)
+                        {
+                            break;
+                        }
+                        Thread.Sleep(5000);
+                    }
+                    var proxies = GetProxies();
+                    if (proxies == null)
+                    {
+                        return;
+                    }
+                    lstProxy = new List<ClashProxyModel>();
+                    foreach (KeyValuePair<string, ProxiesItem> kv in proxies)
+                    {
+                        if (Global.notAllowTestType.Contains(kv.Value.type.ToLower()))
+                        {
+                            continue;
+                        }
+                        lstProxy.Add(new ClashProxyModel()
+                        {
+                            name = kv.Value.name,
+                            type = kv.Value.type.ToLower(),
+                        });
+                    }
+                }
+
+                if (lstProxy == null)
+                {
+                    return;
+                }
+                var urlBase = $"{GetApiUrl()}/proxies";
+                urlBase += @"/{0}/delay?timeout=10000&url=" + LazyConfig.Instance.GetConfig().speedTestItem.speedPingTestUrl;
+
+                List<Task> tasks = new List<Task>();
+                foreach (var it in lstProxy)
+                {
+                    if (Global.notAllowTestType.Contains(it.type.ToLower()))
+                    {
+                        continue;
+                    }
+                    var name = it.name;
+                    var url = string.Format(urlBase, name);
+                    tasks.Add(Task.Run(async () =>
+                    {
+                        var result = await HttpClientHelper.Instance.TryGetAsync(url);
+                        update(it, result);
+                    }));
+                }
+                Task.WaitAll(tasks.ToArray());
+
+                Thread.Sleep(1000);
+                update(null, "");
+            });
+        }
+
+        public List<ProxiesItem>? GetClashProxyGroups()
+        {
+            try
+            {
+                var fileContent = ProfileContent;
+                if (fileContent is null || fileContent?.ContainsKey("proxy-groups") == false)
+                {
+                    return null;
+                }
+                return JsonUtils.Deserialize<List<ProxiesItem>>(JsonUtils.Serialize(fileContent["proxy-groups"]));
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog("GetClashProxyGroups", ex);
+                return null;
+            }
+        }
+
+        public async void ClashSetActiveProxy(string name, string nameNode)
+        {
+            try
+            {
+                var url = $"{GetApiUrl()}/proxies/{name}";
+                Dictionary<string, string> headers = new Dictionary<string, string>();
+                headers.Add("name", nameNode);
+                await HttpClientHelper.Instance.PutAsync(url, headers);
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+            }
+        }
+
+        public void ClashConfigUpdate(Dictionary<string, string> headers)
+        {
+            Task.Run(async () =>
+            {
+                var proxies = GetProxies();
+                if (proxies == null)
+                {
+                    return;
+                }
+
+                var urlBase = $"{GetApiUrl()}/configs";
+
+                await HttpClientHelper.Instance.PatchAsync(urlBase, headers);
+            });
+        }
+
+        public async void ClashConfigReload(string filePath)
+        {
+            ClashConnectionClose("");
+            try
+            {
+                var url = $"{GetApiUrl()}/configs?force=true";
+                Dictionary<string, string> headers = new Dictionary<string, string>();
+                headers.Add("path", filePath);
+                await HttpClientHelper.Instance.PutAsync(url, headers);
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+            }
+        }
+
+        public void GetClashConnections(Config config, Action<ClashConnections> update)
+        {
+            Task.Run(() => GetClashConnectionsAsync(config, update));
+        }
+
+        private async Task GetClashConnectionsAsync(Config config, Action<ClashConnections> update)
+        {
+            try
+            {
+                var url = $"{GetApiUrl()}/connections";
+                var result = await HttpClientHelper.Instance.TryGetAsync(url);
+                var clashConnections = JsonUtils.Deserialize<ClashConnections>(result);
+
+                update(clashConnections);
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+            }
+        }
+
+        public async void ClashConnectionClose(string id)
+        {
+            try
+            {
+                var url = $"{GetApiUrl()}/connections/{id}";
+                await HttpClientHelper.Instance.DeleteAsync(url);
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+            }
+        }
+
+        private string GetApiUrl()
+        {
+            return $"{Global.HttpProtocol}{Global.Loopback}:{LazyConfig.Instance.StatePort2}";
+        }
+    }
+}

v2rayN/v2rayN/Handler/CoreConfig/CoreConfigClash.cs

@@ -0,0 +1,271 @@
+using System.IO;
+using v2rayN.Common;
+using v2rayN.Enums;
+using v2rayN.Models;
+using v2rayN.Resx;
+
+namespace v2rayN.Handler.CoreConfig
+{
+    /// <summary>
+    /// Core configuration file processing class
+    /// </summary>
+    internal class CoreConfigClash
+    {
+        private Config _config;
+
+        public CoreConfigClash(Config config)
+        {
+            _config = config;
+        }
+
+        /// <summary>
+        /// 生成配置文件
+        /// </summary>
+        /// <param name="node"></param>
+        /// <param name="fileName"></param>
+        /// <param name="msg"></param>
+        /// <returns></returns>
+        public int GenerateClientCustomConfig(ProfileItem node, string? fileName, out string msg)
+        {
+            if (node == null || fileName is null)
+            {
+                msg = ResUI.CheckServerSettings;
+                return -1;
+            }
+
+            msg = ResUI.InitialConfiguration;
+
+            try
+            {
+                if (node == null)
+                {
+                    msg = ResUI.CheckServerSettings;
+                    return -1;
+                }
+
+                if (File.Exists(fileName))
+                {
+                    File.Delete(fileName);
+                }
+
+                string addressFileName = node.address;
+                if (string.IsNullOrEmpty(addressFileName))
+                {
+                    msg = ResUI.FailedGetDefaultConfiguration;
+                    return -1;
+                }
+                if (!File.Exists(addressFileName))
+                {
+                    addressFileName = Path.Combine(Utils.GetConfigPath(), addressFileName);
+                }
+                if (!File.Exists(addressFileName))
+                {
+                    msg = ResUI.FailedReadConfiguration + "1";
+                    return -1;
+                }
+
+                string tagYamlStr1 = "!<str>";
+                string tagYamlStr2 = "__strn__";
+                string tagYamlStr3 = "!!str";
+                var txtFile = File.ReadAllText(addressFileName);
+                txtFile = txtFile.Replace(tagYamlStr1, tagYamlStr2);
+
+                var fileContent = YamlUtils.FromYaml<Dictionary<string, object>>(txtFile);
+                if (fileContent == null)
+                {
+                    msg = ResUI.FailedConversionConfiguration;
+                    return -1;
+                }
+
+                //port
+                fileContent["port"] = LazyConfig.Instance.GetLocalPort(EInboundProtocol.http);
+                //socks-port
+                fileContent["socks-port"] = LazyConfig.Instance.GetLocalPort(EInboundProtocol.socks);
+                //log-level
+                fileContent["log-level"] = GetLogLevel(_config.coreBasicItem.loglevel);
+
+                //external-controller
+                fileContent["external-controller"] = $"{Global.Loopback}:{LazyConfig.Instance.StatePort2}";
+                //allow-lan
+                if (_config.inbound[0].allowLANConn)
+                {
+                    fileContent["allow-lan"] = "true";
+                    fileContent["bind-address"] = "*";
+                }
+                else
+                {
+                    fileContent["allow-lan"] = "false";
+                }
+
+                //ipv6
+                fileContent["ipv6"] = _config.clashUIItem.enableIPv6;
+
+                //mode
+                if (!fileContent.ContainsKey("mode"))
+                {
+                    fileContent["mode"] = ERuleMode.Rule.ToString().ToLower();
+                }
+                else
+                {
+                    if (_config.clashUIItem.ruleMode != ERuleMode.Unchanged)
+                    {
+                        fileContent["mode"] = _config.clashUIItem.ruleMode.ToString().ToLower();
+                    }
+                }
+
+                //enable tun mode
+                if (_config.tunModeItem.enableTun)
+                {
+                    string tun = Utils.GetEmbedText(Global.ClashTunYaml);
+                    if (!string.IsNullOrEmpty(tun))
+                    {
+                        var tunContent = YamlUtils.FromYaml<Dictionary<string, object>>(tun);
+                        if (tunContent != null)
+                            fileContent["tun"] = tunContent["tun"];
+                    }
+                }
+
+                //Mixin
+                try
+                {
+                    MixinContent(fileContent, node);
+                }
+                catch (Exception ex)
+                {
+                    Logging.SaveLog("GenerateClientConfigClash-Mixin", ex);
+                }
+
+                var txtFileNew = YamlUtils.ToYaml(fileContent).Replace(tagYamlStr2, tagYamlStr3);
+                File.WriteAllText(fileName, txtFileNew);
+                //check again
+                if (!File.Exists(fileName))
+                {
+                    msg = ResUI.FailedReadConfiguration + "2";
+                    return -1;
+                }
+
+                ClashApiHandler.Instance.ProfileContent = fileContent;
+
+                msg = string.Format(ResUI.SuccessfulConfiguration, $"{node.GetSummary()}");
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog("GenerateClientConfigClash", ex);
+                msg = ResUI.FailedGenDefaultConfiguration;
+                return -1;
+            }
+            return 0;
+        }
+
+        private void MixinContent(Dictionary<string, object> fileContent, ProfileItem node)
+        {
+            //if (!_config.clashUIItem.enableMixinContent)
+            //{
+            //    return;
+            //}
+
+            var path = Utils.GetConfigPath(Global.ClashMixinConfigFileName);
+            if (!File.Exists(path))
+            {
+                return;
+            }
+
+            var txtFile = File.ReadAllText(Utils.GetConfigPath(Global.ClashMixinConfigFileName));
+
+            var mixinContent = YamlUtils.FromYaml<Dictionary<string, object>>(txtFile);
+            if (mixinContent == null)
+            {
+                return;
+            }
+            foreach (var item in mixinContent)
+            {
+                if (!_config.tunModeItem.enableTun && item.Key == "tun")
+                {
+                    continue;
+                }
+
+                if (item.Key.StartsWith("prepend-")
+                    || item.Key.StartsWith("append-")
+                    || item.Key.StartsWith("removed-"))
+                {
+                    ModifyContentMerge(fileContent, item.Key, item.Value);
+                }
+                else
+                {
+                    fileContent[item.Key] = item.Value;
+                }
+            }
+            return;
+        }
+
+        private void ModifyContentMerge(Dictionary<string, object> fileContent, string key, object value)
+        {
+            bool blPrepend = false;
+            bool blRemoved = false;
+            if (key.StartsWith("prepend-"))
+            {
+                blPrepend = true;
+                key = key.Replace("prepend-", "");
+            }
+            else if (key.StartsWith("append-"))
+            {
+                blPrepend = false;
+                key = key.Replace("append-", "");
+            }
+            else if (key.StartsWith("removed-"))
+            {
+                blRemoved = true;
+                key = key.Replace("removed-", "");
+            }
+            else
+            {
+                return;
+            }
+
+            if (!blRemoved && !fileContent.ContainsKey(key))
+            {
+                fileContent.Add(key, value);
+                return;
+            }
+            var lstOri = (List<object>)fileContent[key];
+            var lstValue = (List<object>)value;
+
+            if (blRemoved)
+            {
+                foreach (var item in lstValue)
+                {
+                    lstOri.RemoveAll(t => t.ToString().StartsWith(item.ToString()));
+                }
+                return;
+            }
+
+            if (blPrepend)
+            {
+                lstValue.Reverse();
+                foreach (var item in lstValue)
+                {
+                    lstOri.Insert(0, item);
+                }
+            }
+            else
+            {
+                foreach (var item in lstValue)
+                {
+                    lstOri.Add(item);
+                }
+            }
+        }
+
+        private string GetLogLevel(string level)
+        {
+            if (level == "none")
+            {
+                return "silent";
+            }
+            else
+            {
+                return level;
+            }
+        }
+    }
+}

v2rayN/v2rayN/Handler/CoreConfig/CoreConfigHandler.cs

@@ -1,8 +1,9 @@
 using System.IO;
-using v2rayN.Model;
+using v2rayN.Enums;
+using v2rayN.Models;
 using v2rayN.Resx;
 
-namespace v2rayN.Handler
+namespace v2rayN.Handler.CoreConfig
 {
     /// <summary>
     /// Core configuration file processing class
@@ -24,22 +25,35 @@ namespace v2rayN.Handler
                 msg = ResUI.InitialConfiguration;
                 if (node.configType == EConfigType.Custom)
                 {
-                    return GenerateClientCustomConfig(node, fileName, out msg);
+                    if (node.coreType is ECoreType.clash or ECoreType.clash_meta or ECoreType.mihomo)
+                    {
+                        var configGenClash = new CoreConfigClash(config);
+                        return configGenClash.GenerateClientCustomConfig(node, fileName, out msg);
+                    }
+                    if (node.coreType is ECoreType.sing_box)
+                    {
+                        var configGenSingbox = new CoreConfigSingbox(config);
+                        return configGenSingbox.GenerateClientCustomConfig(node, fileName, out msg);
+                    }
+                    else
+                    {
+                        return GenerateClientCustomConfig(node, fileName, out msg);
+                    }
                 }
-                else if (config.tunModeItem.enableTun || LazyConfig.Instance.GetCoreType(node, node.configType) == ECoreType.sing_box)
+                else if (LazyConfig.Instance.GetCoreType(node, node.configType) == ECoreType.sing_box)
                 {
                     var configGenSingbox = new CoreConfigSingbox(config);
                     if (configGenSingbox.GenerateClientConfigContent(node, out SingboxConfig? singboxConfig, out msg) != 0)
                     {
                         return -1;
                     }
-                    if (Utile.IsNullOrEmpty(fileName))
+                    if (Utils.IsNullOrEmpty(fileName))
                     {
-                        content = JsonUtile.Serialize(singboxConfig);
+                        content = JsonUtils.Serialize(singboxConfig);
                     }
                     else
                     {
-                        JsonUtile.ToFile(singboxConfig, fileName, false);
+                        JsonUtils.ToFile(singboxConfig, fileName, false);
                     }
                 }
                 else
@@ -49,13 +63,13 @@ namespace v2rayN.Handler
                     {
                         return -1;
                     }
-                    if (Utile.IsNullOrEmpty(fileName))
+                    if (Utils.IsNullOrEmpty(fileName))
                     {
-                        content = JsonUtile.Serialize(v2rayConfig);
+                        content = JsonUtils.Serialize(v2rayConfig);
                     }
                     else
                     {
-                        JsonUtile.ToFile(v2rayConfig, fileName, false);
+                        JsonUtils.ToFile(v2rayConfig, fileName, false);
                     }
                 }
             }
@@ -87,7 +101,7 @@ namespace v2rayN.Handler
                 string addressFileName = node.address;
                 if (!File.Exists(addressFileName))
                 {
-                    addressFileName = Utile.GetConfigPath(addressFileName);
+                    addressFileName = Utils.GetConfigPath(addressFileName);
                 }
                 if (!File.Exists(addressFileName))
                 {
@@ -104,41 +118,6 @@ namespace v2rayN.Handler
                     return -1;
                 }
 
-                //overwrite port
-                if (node.preSocksPort <= 0)
-                {
-                    var fileContent = File.ReadAllLines(fileName).ToList();
-                    var coreType = LazyConfig.Instance.GetCoreType(node, node.configType);
-                    switch (coreType)
-                    {
-                        case ECoreType.v2fly:
-                        case ECoreType.SagerNet:
-                        case ECoreType.Xray:
-                        case ECoreType.v2fly_v5:
-                            break;
-
-                        case ECoreType.clash:
-                        case ECoreType.clash_meta:
-                        case ECoreType.mihomo:
-                            //remove the original
-                            var indexPort = fileContent.FindIndex(t => t.Contains("port:"));
-                            if (indexPort >= 0)
-                            {
-                                fileContent.RemoveAt(indexPort);
-                            }
-                            indexPort = fileContent.FindIndex(t => t.Contains("socks-port:"));
-                            if (indexPort >= 0)
-                            {
-                                fileContent.RemoveAt(indexPort);
-                            }
-
-                            fileContent.Add($"port: {LazyConfig.Instance.GetLocalPort(Global.InboundHttp)}");
-                            fileContent.Add($"socks-port: {LazyConfig.Instance.GetLocalPort(Global.InboundSocks)}");
-                            break;
-                    }
-                    File.WriteAllLines(fileName, fileContent);
-                }
-
                 msg = string.Format(ResUI.SuccessfulConfiguration, "");
             }
             catch (Exception ex)
@@ -154,21 +133,44 @@ 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;
                 }
-                JsonUtile.ToFile(singboxConfig, fileName, false);
+                JsonUtils.ToFile(singboxConfig, fileName, false);
             }
             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;
                 }
-                JsonUtile.ToFile(v2rayConfig, fileName, false);
+                JsonUtils.ToFile(v2rayConfig, fileName, false);
             }
             return 0;
         }
+
+        public static int GenerateClientMultipleLoadConfig(Config config, string fileName, List<ProfileItem> selecteds, ECoreType coreType, out string msg)
+        {
+            msg = ResUI.CheckServerSettings;
+            if (coreType == ECoreType.sing_box)
+            {
+                if (new CoreConfigSingbox(config).GenerateClientMultipleLoadConfig(selecteds, out SingboxConfig? singboxConfig, out msg) != 0)
+                {
+                    return -1;
+                }
+                JsonUtils.ToFile(singboxConfig, fileName, false);
+            }
+            else if (coreType == ECoreType.Xray)
+            {
+                if (new CoreConfigV2ray(config).GenerateClientMultipleLoadConfig(selecteds, out V2rayConfig? v2rayConfig, out msg) != 0)
+                {
+                    return -1;
+                }
+                JsonUtils.ToFile(v2rayConfig, fileName, false);
+            }
+
+            return 0;
+        }
     }
 }

v2rayN/v2rayN/Handler/CoreConfigSingbox.cs

@@ -1,971 +0,0 @@
-using System.Net;
-using System.Net.NetworkInformation;
-using v2rayN.Model;
-using v2rayN.Resx;
-
-namespace v2rayN.Handler
-{
-    internal class CoreConfigSingbox
-    {
-        private Config _config;
-
-        public CoreConfigSingbox(Config config)
-        {
-            _config = config;
-        }
-
-        public int GenerateClientConfigContent(ProfileItem node, out SingboxConfig? singboxConfig, out string msg)
-        {
-            singboxConfig = null;
-            try
-            {
-                if (node == null
-                    || node.port <= 0)
-                {
-                    msg = ResUI.CheckServerSettings;
-                    return -1;
-                }
-
-                msg = ResUI.InitialConfiguration;
-
-                string result = Utile.GetEmbedText(Global.SingboxSampleClient);
-                if (Utile.IsNullOrEmpty(result))
-                {
-                    msg = ResUI.FailedGetDefaultConfiguration;
-                    return -1;
-                }
-
-                singboxConfig = JsonUtile.Deserialize<SingboxConfig>(result);
-                if (singboxConfig == null)
-                {
-                    msg = ResUI.FailedGenDefaultConfiguration;
-                    return -1;
-                }
-
-                GenLog(singboxConfig);
-
-                GenInbounds(singboxConfig);
-
-                GenOutbound(node, singboxConfig.outbounds[0]);
-
-                GenMoreOutbounds(node, singboxConfig);
-
-                GenRouting(singboxConfig);
-
-                GenDns(node, singboxConfig);
-
-                GenStatistic(singboxConfig);
-
-                msg = string.Format(ResUI.SuccessfulConfiguration, "");
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog("GenerateClientConfig4Singbox", ex);
-                msg = ResUI.FailedGenDefaultConfiguration;
-                return -1;
-            }
-            return 0;
-        }
-
-        #region private gen function
-
-        private int GenLog(SingboxConfig singboxConfig)
-        {
-            try
-            {
-                switch (_config.coreBasicItem.loglevel)
-                {
-                    case "debug":
-                    case "info":
-                    case "error":
-                        singboxConfig.log.level = _config.coreBasicItem.loglevel;
-                        break;
-
-                    case "warning":
-                        singboxConfig.log.level = "warn";
-                        break;
-
-                    default:
-                        break;
-                }
-                if (_config.coreBasicItem.loglevel == Global.None)
-                {
-                    singboxConfig.log.disabled = true;
-                }
-                if (_config.coreBasicItem.logEnabled)
-                {
-                    var dtNow = DateTime.Now;
-                    singboxConfig.log.output = Utile.GetLogPath($"sbox_{dtNow:yyyy-MM-dd}.txt");
-                }
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(ex.Message, ex);
-            }
-            return 0;
-        }
-
-        private int GenInbounds(SingboxConfig singboxConfig)
-        {
-            try
-            {
-                singboxConfig.inbounds.Clear();
-
-                if (!_config.tunModeItem.enableTun || (_config.tunModeItem.enableTun && _config.tunModeItem.enableExInbound))
-                {
-                    var inbound = new Inbound4Sbox()
-                    {
-                        type = Global.InboundSocks,
-                        tag = Global.InboundSocks,
-                        listen = Global.Loopback,
-                    };
-                    singboxConfig.inbounds.Add(inbound);
-
-                    inbound.listen_port = LazyConfig.Instance.GetLocalPort(Global.InboundSocks);
-                    inbound.sniff = _config.inbound[0].sniffingEnabled;
-                    inbound.sniff_override_destination = _config.inbound[0].routeOnly ? false : _config.inbound[0].sniffingEnabled;
-                    inbound.domain_strategy = Utile.IsNullOrEmpty(_config.routingBasicItem.domainStrategy4Singbox) ? null : _config.routingBasicItem.domainStrategy4Singbox;
-
-                    if (_config.routingBasicItem.enableRoutingAdvanced)
-                    {
-                        var routing = ConfigHandler.GetDefaultRouting(_config);
-                        if (!Utile.IsNullOrEmpty(routing.domainStrategy4Singbox))
-                        {
-                            inbound.domain_strategy = routing.domainStrategy4Singbox;
-                        }
-                    }
-
-                    //http
-                    var inbound2 = GetInbound(inbound, Global.InboundHttp, 1, 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 = "::";
-                            singboxConfig.inbounds.Add(inbound3);
-
-                            var inbound4 = GetInbound(inbound, Global.InboundHttp2, 3, false);
-                            inbound4.listen = "::";
-                            singboxConfig.inbounds.Add(inbound4);
-
-                            //auth
-                            if (!Utile.IsNullOrEmpty(_config.inbound[0].user) && !Utile.IsNullOrEmpty(_config.inbound[0].pass))
-                            {
-                                inbound3.users = new() { new() { username = _config.inbound[0].user, password = _config.inbound[0].pass } };
-                                inbound4.users = new() { new() { username = _config.inbound[0].user, password = _config.inbound[0].pass } };
-                            }
-                        }
-                        else
-                        {
-                            inbound.listen = "::";
-                            inbound2.listen = "::";
-                        }
-                    }
-                }
-
-                if (_config.tunModeItem.enableTun)
-                {
-                    if (_config.tunModeItem.mtu <= 0)
-                    {
-                        _config.tunModeItem.mtu = Utile.ToInt(Global.TunMtus[0]);
-                    }
-                    if (Utile.IsNullOrEmpty(_config.tunModeItem.stack))
-                    {
-                        _config.tunModeItem.stack = Global.TunStacks[0];
-                    }
-
-                    var tunInbound = JsonUtile.Deserialize<Inbound4Sbox>(Utile.GetEmbedText(Global.TunSingboxInboundFileName)) ?? new Inbound4Sbox { };
-                    tunInbound.mtu = _config.tunModeItem.mtu;
-                    tunInbound.strict_route = _config.tunModeItem.strictRoute;
-                    tunInbound.stack = _config.tunModeItem.stack;
-                    tunInbound.sniff = _config.inbound[0].sniffingEnabled;
-                    tunInbound.sniff_override_destination = _config.inbound[0].routeOnly ? false : _config.inbound[0].sniffingEnabled;
-                    if (_config.tunModeItem.enableIPv6Address == false)
-                    {
-                        tunInbound.inet6_address = null;
-                    }
-
-                    singboxConfig.inbounds.Add(tunInbound);
-                }
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(ex.Message, ex);
-            }
-            return 0;
-        }
-
-        private Inbound4Sbox GetInbound(Inbound4Sbox inItem, string tag, int offset, bool bSocks)
-        {
-            var inbound = JsonUtile.DeepCopy(inItem);
-            inbound.tag = tag;
-            inbound.listen_port = inItem.listen_port + offset;
-            inbound.type = bSocks ? Global.InboundSocks : Global.InboundHttp;
-            return inbound;
-        }
-
-        private int GenOutbound(ProfileItem node, Outbound4Sbox outbound)
-        {
-            try
-            {
-                outbound.server = node.address;
-                outbound.server_port = node.port;
-
-                if (node.configType == EConfigType.VMess)
-                {
-                    outbound.type = Global.ProtocolTypes[EConfigType.VMess];
-
-                    outbound.uuid = node.id;
-                    outbound.alter_id = node.alterId;
-                    if (Global.VmessSecurities.Contains(node.security))
-                    {
-                        outbound.security = node.security;
-                    }
-                    else
-                    {
-                        outbound.security = Global.DefaultSecurity;
-                    }
-
-                    GenOutboundMux(node, outbound);
-                }
-                else if (node.configType == EConfigType.Shadowsocks)
-                {
-                    outbound.type = Global.ProtocolTypes[EConfigType.Shadowsocks];
-
-                    outbound.method = LazyConfig.Instance.GetShadowsocksSecurities(node).Contains(node.security) ? node.security : Global.None;
-                    outbound.password = node.id;
-
-                    if (node.network == Global.DefaultNetwork
-                        && node.headerType == Global.TcpHeaderHttp
-                        && node.requestHost.IsNullOrEmpty() == false)
-                    {
-                        outbound.plugin = "obfs-local";
-                        outbound.plugin_opts = $"obfs=http;obfs-host={node.requestHost};";
-                    }
-
-                    GenOutboundMux(node, outbound);
-                }
-                else if (node.configType == EConfigType.Socks)
-                {
-                    outbound.type = Global.ProtocolTypes[EConfigType.Socks];
-
-                    outbound.version = "5";
-                    if (!Utile.IsNullOrEmpty(node.security)
-                      && !Utile.IsNullOrEmpty(node.id))
-                    {
-                        outbound.username = node.security;
-                        outbound.password = node.id;
-                    }
-                }
-                else if (node.configType == EConfigType.VLESS)
-                {
-                    outbound.type = Global.ProtocolTypes[EConfigType.VLESS];
-
-                    outbound.uuid = node.id;
-
-                    outbound.packet_encoding = "xudp";
-
-                    if (Utile.IsNullOrEmpty(node.flow))
-                    {
-                        GenOutboundMux(node, outbound);
-                    }
-                    else
-                    {
-                        outbound.flow = node.flow;
-                    }
-                }
-                else if (node.configType == EConfigType.Trojan)
-                {
-                    outbound.type = Global.ProtocolTypes[EConfigType.Trojan];
-
-                    outbound.password = node.id;
-
-                    GenOutboundMux(node, outbound);
-                }
-                else if (node.configType == EConfigType.Hysteria2)
-                {
-                    outbound.type = Global.ProtocolTypes[EConfigType.Hysteria2];
-
-                    outbound.password = node.id;
-
-                    if (!Utile.IsNullOrEmpty(node.path))
-                    {
-                        outbound.obfs = new()
-                        {
-                            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;
-                }
-                else if (node.configType == EConfigType.Tuic)
-                {
-                    outbound.type = Global.ProtocolTypes[EConfigType.Tuic];
-
-                    outbound.uuid = node.id;
-                    outbound.password = node.security;
-                    outbound.congestion_control = node.headerType;
-                }
-                else if (node.configType == EConfigType.Wireguard)
-                {
-                    outbound.type = Global.ProtocolTypes[EConfigType.Wireguard];
-
-                    outbound.private_key = node.id;
-                    outbound.peer_public_key = node.publicKey;
-                    outbound.reserved = Utile.String2List(node.path).Select(int.Parse).ToArray();
-                    outbound.local_address = [.. Utile.String2List(node.requestHost)];
-                    outbound.mtu = Utile.ToInt(node.shortId.IsNullOrEmpty() ? Global.TunMtus.FirstOrDefault() : node.shortId);
-                }
-
-                GenOutboundTls(node, outbound);
-
-                GenOutboundTransport(node, outbound);
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(ex.Message, ex);
-            }
-            return 0;
-        }
-
-        private int GenOutboundMux(ProfileItem node, Outbound4Sbox outbound)
-        {
-            try
-            {
-                //if (_config.coreBasicItem.muxEnabled)
-                //{
-                //    var mux = new Multiplex4Sbox()
-                //    {
-                //        enabled = true,
-                //        protocol = _config.mux4SboxItem.protocol,
-                //        max_connections = _config.mux4SboxItem.max_connections,
-                //    };
-                //    outbound.multiplex = mux;
-                //}
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(ex.Message, ex);
-            }
-            return 0;
-        }
-
-        private int GenOutboundTls(ProfileItem node, Outbound4Sbox outbound)
-        {
-            try
-            {
-                if (node.streamSecurity == Global.StreamSecurityReality || node.streamSecurity == Global.StreamSecurity)
-                {
-                    var server_name = string.Empty;
-                    if (!string.IsNullOrWhiteSpace(node.sni))
-                    {
-                        server_name = node.sni;
-                    }
-                    else if (!string.IsNullOrWhiteSpace(node.requestHost))
-                    {
-                        server_name = Utile.String2List(node.requestHost)[0];
-                    }
-                    var tls = new Tls4Sbox()
-                    {
-                        enabled = true,
-                        server_name = server_name,
-                        insecure = Utile.ToBool(node.allowInsecure.IsNullOrEmpty() ? _config.coreBasicItem.defAllowInsecure.ToString().ToLower() : node.allowInsecure),
-                        alpn = node.GetAlpn(),
-                    };
-                    if (!Utile.IsNullOrEmpty(node.fingerprint))
-                    {
-                        tls.utls = new Utls4Sbox()
-                        {
-                            enabled = true,
-                            fingerprint = node.fingerprint.IsNullOrEmpty() ? _config.coreBasicItem.defFingerprint : node.fingerprint
-                        };
-                    }
-                    if (node.streamSecurity == Global.StreamSecurityReality)
-                    {
-                        tls.reality = new Reality4Sbox()
-                        {
-                            enabled = true,
-                            public_key = node.publicKey,
-                            short_id = node.shortId
-                        };
-                        tls.insecure = false;
-                    }
-                    outbound.tls = tls;
-                }
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(ex.Message, ex);
-            }
-            return 0;
-        }
-
-        private int GenOutboundTransport(ProfileItem node, Outbound4Sbox outbound)
-        {
-            try
-            {
-                var transport = new Transport4Sbox();
-
-                switch (node.GetNetwork())
-                {
-                    case "h2":
-                        transport.type = "http";
-                        transport.host = Utile.IsNullOrEmpty(node.requestHost) ? null : Utile.String2List(node.requestHost);
-                        transport.path = Utile.IsNullOrEmpty(node.path) ? null : node.path;
-                        break;
-
-                    case "ws":
-                        transport.type = "ws";
-                        transport.path = Utile.IsNullOrEmpty(node.path) ? null : node.path;
-                        if (!Utile.IsNullOrEmpty(node.requestHost))
-                        {
-                            transport.headers = new()
-                            {
-                                Host = node.requestHost
-                            };
-                        }
-                        break;
-
-                    case "quic":
-                        transport.type = "quic";
-                        break;
-
-                    case "grpc":
-                        transport.type = "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");
-                        transport.permit_without_stream = _config.grpcItem.permit_without_stream;
-                        break;
-
-                    default:
-                        transport = null;
-                        break;
-                }
-
-                outbound.transport = transport;
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(ex.Message, ex);
-            }
-            return 0;
-        }
-
-        private int GenMoreOutbounds(ProfileItem node, SingboxConfig singboxConfig)
-        {
-            if (node.subid.IsNullOrEmpty())
-            {
-                return 0;
-            }
-            try
-            {
-                var subItem = LazyConfig.Instance.GetSubItem(node.subid);
-                if (subItem is null)
-                {
-                    return 0;
-                }
-
-                //current proxy
-                var outbound = singboxConfig.outbounds[0];
-                var txtOutbound = Utile.GetEmbedText(Global.SingboxSampleOutbound);
-
-                //Previous proxy
-                var prevNode = LazyConfig.Instance.GetProfileItemViaRemarks(subItem.prevProfile!);
-                if (prevNode is not null
-                    && prevNode.configType != EConfigType.Custom)
-                {
-                    var prevOutbound = JsonUtile.Deserialize<Outbound4Sbox>(txtOutbound);
-                    GenOutbound(prevNode, prevOutbound);
-                    prevOutbound.tag = $"{Global.ProxyTag}2";
-                    singboxConfig.outbounds.Add(prevOutbound);
-
-                    outbound.detour = prevOutbound.tag;
-                }
-
-                //Next proxy
-                var nextNode = LazyConfig.Instance.GetProfileItemViaRemarks(subItem.nextProfile!);
-                if (nextNode is not null
-                    && nextNode.configType != EConfigType.Custom)
-                {
-                    var nextOutbound = JsonUtile.Deserialize<Outbound4Sbox>(txtOutbound);
-                    GenOutbound(nextNode, nextOutbound);
-                    nextOutbound.tag = Global.ProxyTag;
-                    singboxConfig.outbounds.Insert(0, nextOutbound);
-
-                    outbound.tag = $"{Global.ProxyTag}1";
-                    nextOutbound.detour = outbound.tag;
-                }
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(ex.Message, ex);
-            }
-
-            return 0;
-        }
-
-        private int GenRouting(SingboxConfig singboxConfig)
-        {
-            try
-            {
-                if (_config.tunModeItem.enableTun)
-                {
-                    singboxConfig.route.auto_detect_interface = true;
-
-                    var tunRules = JsonUtile.Deserialize<List<Rule4Sbox>>(Utile.GetEmbedText(Global.TunSingboxRulesFileName));
-                    singboxConfig.route.rules.AddRange(tunRules);
-
-                    GenRoutingDirectExe(out List<string> lstDnsExe, out List<string> lstDirectExe);
-                    singboxConfig.route.rules.Add(new()
-                    {
-                        port = new() { 53 },
-                        outbound = "dns_out",
-                        process_name = lstDnsExe
-                    });
-
-                    singboxConfig.route.rules.Add(new()
-                    {
-                        outbound = "direct",
-                        process_name = lstDirectExe
-                    });
-                }
-
-                if (_config.routingBasicItem.enableRoutingAdvanced)
-                {
-                    var routing = ConfigHandler.GetDefaultRouting(_config);
-                    if (routing != null)
-                    {
-                        var rules = JsonUtile.Deserialize<List<RulesItem>>(routing.ruleSet);
-                        foreach (var item in rules!)
-                        {
-                            if (item.enabled)
-                            {
-                                GenRoutingUserRule(item, singboxConfig.route.rules);
-                            }
-                        }
-                    }
-                }
-                else
-                {
-                    var lockedItem = ConfigHandler.GetLockedRoutingItem(_config);
-                    if (lockedItem != null)
-                    {
-                        var rules = JsonUtile.Deserialize<List<RulesItem>>(lockedItem.ruleSet);
-                        foreach (var item in rules!)
-                        {
-                            GenRoutingUserRule(item, singboxConfig.route.rules);
-                        }
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(ex.Message, ex);
-            }
-            return 0;
-        }
-
-        private void GenRoutingDirectExe(out List<string> lstDnsExe, out List<string> lstDirectExe)
-        {
-            lstDnsExe = new();
-            lstDirectExe = new();
-            var coreInfo = LazyConfig.Instance.GetCoreInfo();
-            foreach (var it in coreInfo)
-            {
-                if (it.coreType == ECoreType.v2rayN)
-                {
-                    continue;
-                }
-                foreach (var it2 in it.coreExes)
-                {
-                    if (!lstDnsExe.Contains(it2) && it.coreType != ECoreType.sing_box)
-                    {
-                        lstDnsExe.Add($"{it2}.exe");
-                    }
-
-                    if (!lstDirectExe.Contains(it2))
-                    {
-                        lstDirectExe.Add($"{it2}.exe");
-                    }
-                }
-            }
-        }
-
-        private int GenRoutingUserRule(RulesItem item, List<Rule4Sbox> rules)
-        {
-            try
-            {
-                if (item == null)
-                {
-                    return 0;
-                }
-
-                var rule = new Rule4Sbox()
-                {
-                    outbound = item.outboundTag,
-                };
-
-                if (!Utile.IsNullOrEmpty(item.port))
-                {
-                    if (item.port.Contains("-"))
-                    {
-                        rule.port_range = new List<string> { item.port.Replace("-", ":") };
-                    }
-                    else
-                    {
-                        rule.port = new List<int> { Utile.ToInt(item.port) };
-                    }
-                }
-                if (item.protocol?.Count > 0)
-                {
-                    rule.protocol = item.protocol;
-                }
-                if (item.inboundTag?.Count >= 0)
-                {
-                    rule.inbound = item.inboundTag;
-                }
-                var rule2 = JsonUtile.DeepCopy(rule);
-                var rule3 = JsonUtile.DeepCopy(rule);
-
-                var hasDomainIp = false;
-                if (item.domain?.Count > 0)
-                {
-                    foreach (var it in item.domain)
-                    {
-                        ParseV2Domain(it, rule);
-                    }
-                    rules.Add(rule);
-                    hasDomainIp = true;
-                }
-
-                if (item.ip?.Count > 0)
-                {
-                    foreach (var it in item.ip)
-                    {
-                        ParseV2Address(it, rule2);
-                    }
-                    rules.Add(rule2);
-                    hasDomainIp = true;
-                }
-
-                if (_config.tunModeItem.enableTun && item.process?.Count > 0)
-                {
-                    rule3.process_name = item.process;
-                    rules.Add(rule3);
-                    hasDomainIp = true;
-                }
-
-                if (!hasDomainIp)
-                {
-                    rules.Add(rule);
-                }
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(ex.Message, ex);
-            }
-            return 0;
-        }
-
-        private void ParseV2Domain(string domain, Rule4Sbox rule)
-        {
-            if (domain.StartsWith("#") || domain.StartsWith("ext:") || domain.StartsWith("ext-domain:"))
-            {
-                return;
-            }
-            else if (domain.StartsWith("geosite:"))
-            {
-                rule.geosite ??= [];
-                rule.geosite?.Add(domain.Substring(8));
-            }
-            else if (domain.StartsWith("regexp:"))
-            {
-                rule.domain_regex ??= [];
-                rule.domain_regex?.Add(domain.Replace(Global.RoutingRuleComma, ",").Substring(7));
-            }
-            else if (domain.StartsWith("domain:"))
-            {
-                rule.domain ??= [];
-                rule.domain_suffix ??= [];
-                rule.domain?.Add(domain.Substring(7));
-                rule.domain_suffix?.Add("." + domain.Substring(7));
-            }
-            else if (domain.StartsWith("full:"))
-            {
-                rule.domain ??= [];
-                rule.domain?.Add(domain.Substring(5));
-            }
-            else if (domain.StartsWith("keyword:"))
-            {
-                rule.domain_keyword ??= [];
-                rule.domain_keyword?.Add(domain.Substring(8));
-            }
-            else
-            {
-                rule.domain_keyword ??= [];
-                rule.domain_keyword?.Add(domain);
-            }
-        }
-
-        private void ParseV2Address(string address, Rule4Sbox rule)
-        {
-            if (address.StartsWith("ext:") || address.StartsWith("ext-ip:"))
-            {
-                return;
-            }
-            else if (address.StartsWith("geoip:!"))
-            {
-                return;
-            }
-            else if (address.StartsWith("geoip:"))
-            {
-                if (rule.geoip is null) { rule.geoip = new(); }
-                rule.geoip?.Add(address.Substring(6));
-            }
-            else
-            {
-                if (rule.ip_cidr is null) { rule.ip_cidr = new(); }
-                rule.ip_cidr?.Add(address);
-            }
-        }
-
-        private int GenDns(ProfileItem node, SingboxConfig singboxConfig)
-        {
-            try
-            {
-                Dns4Sbox? dns4Sbox;
-                if (_config.tunModeItem.enableTun)
-                {
-                    var item = LazyConfig.Instance.GetDNSItem(ECoreType.sing_box);
-                    var tunDNS = item?.tunDNS;
-                    if (string.IsNullOrWhiteSpace(tunDNS))
-                    {
-                        tunDNS = Utile.GetEmbedText(Global.TunSingboxDNSFileName);
-                    }
-                    dns4Sbox = JsonUtile.Deserialize<Dns4Sbox>(tunDNS);
-                }
-                else
-                {
-                    var item = LazyConfig.Instance.GetDNSItem(ECoreType.sing_box);
-                    var normalDNS = item?.normalDNS;
-                    if (string.IsNullOrWhiteSpace(normalDNS))
-                    {
-                        normalDNS = "{\"servers\":[{\"address\":\"tcp://8.8.8.8\"}]}";
-                    }
-
-                    dns4Sbox = JsonUtile.Deserialize<Dns4Sbox>(normalDNS);
-                }
-                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;
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(ex.Message, ex);
-            }
-            return 0;
-        }
-
-        private int GenStatistic(SingboxConfig singboxConfig)
-        {
-            if (_config.guiItem.enableStatistics)
-            {
-                singboxConfig.experimental = new Experimental4Sbox()
-                {
-                    //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}",
-                    }
-                };
-            }
-            return 0;
-        }
-
-        #endregion private gen function
-
-        #region Gen speedtest config
-
-        public int GenerateClientSpeedtestConfig(List<ServerTestItem> selecteds, out SingboxConfig? singboxConfig, out string msg)
-        {
-            singboxConfig = null;
-            try
-            {
-                if (_config == null)
-                {
-                    msg = ResUI.CheckServerSettings;
-                    return -1;
-                }
-
-                msg = ResUI.InitialConfiguration;
-
-                string result = Utile.GetEmbedText(Global.SingboxSampleClient);
-                string txtOutbound = Utile.GetEmbedText(Global.SingboxSampleOutbound);
-                if (Utile.IsNullOrEmpty(result) || txtOutbound.IsNullOrEmpty())
-                {
-                    msg = ResUI.FailedGetDefaultConfiguration;
-                    return -1;
-                }
-
-                singboxConfig = JsonUtile.Deserialize<SingboxConfig>(result);
-                if (singboxConfig == null)
-                {
-                    msg = ResUI.FailedGenDefaultConfiguration;
-                    return -1;
-                }
-                List<IPEndPoint> lstIpEndPoints = new();
-                List<TcpConnectionInformation> lstTcpConns = new();
-                try
-                {
-                    lstIpEndPoints.AddRange(IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpListeners());
-                    lstIpEndPoints.AddRange(IPGlobalProperties.GetIPGlobalProperties().GetActiveUdpListeners());
-                    lstTcpConns.AddRange(IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpConnections());
-                }
-                catch (Exception ex)
-                {
-                    Logging.SaveLog(ex.Message, ex);
-                }
-
-                GenLog(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");
-
-                foreach (var it in selecteds)
-                {
-                    if (it.configType == EConfigType.Custom)
-                    {
-                        continue;
-                    }
-                    if (it.port <= 0)
-                    {
-                        continue;
-                    }
-                    if (it.configType is EConfigType.VMess or EConfigType.VLESS)
-                    {
-                        var item2 = LazyConfig.Instance.GetProfileItem(it.indexId);
-                        if (item2 is null || Utile.IsNullOrEmpty(item2.id) || !Utile.IsGuidByParse(item2.id))
-                        {
-                            continue;
-                        }
-                    }
-
-                    //find unused port
-                    var port = httpPort;
-                    for (int k = httpPort; k < Global.MaxPort; k++)
-                    {
-                        if (lstIpEndPoints?.FindIndex(_it => _it.Port == k) >= 0)
-                        {
-                            continue;
-                        }
-                        if (lstTcpConns?.FindIndex(_it => _it.LocalEndPoint.Port == k) >= 0)
-                        {
-                            continue;
-                        }
-                        //found
-                        port = k;
-                        httpPort = port + 1;
-                        break;
-                    }
-
-                    //Port In Used
-                    if (lstIpEndPoints?.FindIndex(_it => _it.Port == port) >= 0)
-                    {
-                        continue;
-                    }
-                    it.port = port;
-                    it.allowTest = true;
-
-                    //inbound
-                    Inbound4Sbox inbound = new()
-                    {
-                        listen = Global.Loopback,
-                        listen_port = port,
-                        type = Global.InboundHttp
-                    };
-                    inbound.tag = Global.InboundHttp + inbound.listen_port.ToString();
-                    singboxConfig.inbounds.Add(inbound);
-
-                    //outbound
-                    var item = LazyConfig.Instance.GetProfileItem(it.indexId);
-                    if (item is null)
-                    {
-                        continue;
-                    }
-                    if (item.configType == EConfigType.Shadowsocks
-                        && !Global.SsSecuritiesInSingbox.Contains(item.security))
-                    {
-                        continue;
-                    }
-                    if (item.configType == EConfigType.VLESS
-                     && !Global.Flows.Contains(item.flow))
-                    {
-                        continue;
-                    }
-
-                    var outbound = JsonUtile.Deserialize<Outbound4Sbox>(txtOutbound);
-                    GenOutbound(item, outbound);
-                    outbound.tag = Global.ProxyTag + inbound.listen_port.ToString();
-                    singboxConfig.outbounds.Add(outbound);
-
-                    //rule
-                    Rule4Sbox rule = new()
-                    {
-                        inbound = new List<string> { inbound.tag },
-                        outbound = outbound.tag
-                    };
-                    singboxConfig.route.rules.Add(rule);
-                }
-
-                //msg = string.Format(ResUI.SuccessfulConfiguration"), node.getSummary());
-                return 0;
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(ex.Message, ex);
-                msg = ResUI.FailedGenDefaultConfiguration;
-                return -1;
-            }
-        }
-
-        #endregion Gen speedtest config
-    }
-}

v2rayN/v2rayN/Handler/CoreHandler.cs

@@ -1,8 +1,9 @@
 using System.Diagnostics;
 using System.IO;
-using System.Reactive.Linq;
 using System.Text;
-using v2rayN.Model;
+using v2rayN.Enums;
+using v2rayN.Handler.CoreConfig;
+using v2rayN.Models;
 using v2rayN.Resx;
 
 namespace v2rayN.Handler
@@ -22,23 +23,23 @@ namespace v2rayN.Handler
             _config = config;
             _updateFunc = update;
 
-            Environment.SetEnvironmentVariable("v2ray.location.asset", Utile.GetBinPath(""), EnvironmentVariableTarget.Process);
-            Environment.SetEnvironmentVariable("xray.location.asset", Utile.GetBinPath(""), EnvironmentVariableTarget.Process);
+            Environment.SetEnvironmentVariable("v2ray.location.asset", Utils.GetBinPath(""), EnvironmentVariableTarget.Process);
+            Environment.SetEnvironmentVariable("xray.location.asset", Utils.GetBinPath(""), EnvironmentVariableTarget.Process);
         }
 
-        public void LoadCore()
+        public void LoadCore(ProfileItem? node)
         {
-            var node = ConfigHandler.GetDefaultServer(_config);
             if (node == null)
             {
                 ShowMsg(false, ResUI.CheckServerSettings);
                 return;
             }
 
-            string fileName = Utile.GetConfigPath(Global.CoreConfigFileName);
+            string fileName = Utils.GetConfigPath(Global.CoreConfigFileName);
             if (CoreConfigHandler.GenerateClientConfig(node, fileName, out string msg, out string content) != 0)
             {
                 ShowMsg(false, msg);
+                return;
             }
             else
             {
@@ -48,28 +49,28 @@ namespace v2rayN.Handler
                 if (_config.tunModeItem.enableTun)
                 {
                     Thread.Sleep(1000);
-                    Utile.RemoveTunDevice();
+                    Utils.RemoveTunDevice();
                 }
 
                 CoreStart(node);
 
                 //In tun mode, do a delay check and restart the core
-                if (_config.tunModeItem.enableTun)
-                {
-                    Observable.Range(1, 1)
-                    .Delay(TimeSpan.FromSeconds(15))
-                    .Subscribe(x =>
-                    {
-                        {
-                            if (_process == null || _process.HasExited)
-                            {
-                                CoreStart(node);
-                                ShowMsg(false, "Tun mode restart the core once");
-                                Logging.SaveLog("Tun mode restart the core once");
-                            }
-                        }
-                    });
-                }
+                //if (_config.tunModeItem.enableTun)
+                //{
+                //    Observable.Range(1, 1)
+                //    .Delay(TimeSpan.FromSeconds(15))
+                //    .Subscribe(x =>
+                //    {
+                //        {
+                //            if (_process == null || _process.HasExited)
+                //            {
+                //                CoreStart(node);
+                //                ShowMsg(false, "Tun mode restart the core once");
+                //                Logging.SaveLog("Tun mode restart the core once");
+                //            }
+                //        }
+                //    });
+                //}
             }
         }
 
@@ -77,7 +78,7 @@ namespace v2rayN.Handler
         {
             int pid = -1;
             var coreType = selecteds.Exists(t => t.configType == EConfigType.Hysteria2 || t.configType == EConfigType.Tuic || t.configType == EConfigType.Wireguard) ? ECoreType.sing_box : ECoreType.Xray;
-            string configPath = Utile.GetConfigPath(Global.CoreSpeedtestConfigFileName);
+            string configPath = Utils.GetConfigPath(Global.CoreSpeedtestConfigFileName);
             if (CoreConfigHandler.GenerateClientSpeedtestConfig(_config, configPath, selecteds, coreType, out string msg) != 0)
             {
                 ShowMsg(false, msg);
@@ -126,7 +127,7 @@ namespace v2rayN.Handler
                             foreach (Process p in existing)
                             {
                                 string? path = p.MainModule?.FileName;
-                                if (path == $"{Utile.GetBinPath(vName, it.coreType.ToString())}.exe")
+                                if (path == $"{Utils.GetBinPath(vName, it.coreType.ToString())}.exe")
                                 {
                                     KillProcess(p);
                                 }
@@ -162,16 +163,16 @@ namespace v2rayN.Handler
             foreach (string name in coreInfo.coreExes)
             {
                 string vName = $"{name}.exe";
-                vName = Utile.GetBinPath(vName, coreInfo.coreType.ToString());
+                vName = Utils.GetBinPath(vName, coreInfo.coreType.ToString());
                 if (File.Exists(vName))
                 {
                     fileName = vName;
                     break;
                 }
             }
-            if (Utile.IsNullOrEmpty(fileName))
+            if (Utils.IsNullOrEmpty(fileName))
             {
-                string msg = string.Format(ResUI.NotFoundCore, Utile.GetBinPath("", coreInfo.coreType.ToString()), string.Join(", ", coreInfo.coreExes.ToArray()), coreInfo.coreUrl);
+                string msg = string.Format(ResUI.NotFoundCore, Utils.GetBinPath("", coreInfo.coreType.ToString()), string.Join(", ", coreInfo.coreExes.ToArray()), coreInfo.coreUrl);
                 Logging.SaveLog(msg);
                 ShowMsg(false, msg);
             }
@@ -183,42 +184,62 @@ namespace v2rayN.Handler
             ShowMsg(false, $"{Environment.OSVersion} - {(Environment.Is64BitOperatingSystem ? 64 : 32)}");
             ShowMsg(false, string.Format(ResUI.StartService, DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss")));
 
-            ECoreType coreType;
-            if (node.configType != EConfigType.Custom && _config.tunModeItem.enableTun)
-            {
-                coreType = ECoreType.sing_box;
-            }
-            else
-            {
-                coreType = LazyConfig.Instance.GetCoreType(node, node.configType);
-            }
+            //ECoreType coreType;
+            //if (node.configType != EConfigType.Custom && _config.tunModeItem.enableTun)
+            //{
+            //    coreType = ECoreType.sing_box;
+            //}
+            //else
+            //{
+            //    coreType = LazyConfig.Instance.GetCoreType(node, node.configType);
+            //}
+            var 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;
             }
             _process = proc;
 
-            //start a socks service
+            //start a pre service
             if (_process != null && !_process.HasExited)
             {
-                if ((node.configType == EConfigType.Custom && node.preSocksPort > 0))
+                ProfileItem? itemSocks = null;
+                var preCoreType = ECoreType.sing_box;
+                if (node.configType != EConfigType.Custom && coreType != ECoreType.sing_box && _config.tunModeItem.enableTun)
                 {
-                    var itemSocks = new ProfileItem()
+                    itemSocks = new ProfileItem()
                     {
-                        coreType = ECoreType.sing_box,
+                        coreType = preCoreType,
+                        configType = EConfigType.Socks,
+                        address = Global.Loopback,
+                        sni = node.address, //Tun2SocksAddress
+                        port = LazyConfig.Instance.GetLocalPort(EInboundProtocol.socks)
+                    };
+                }
+                else if ((node.configType == EConfigType.Custom && node.preSocksPort > 0))
+                {
+                    preCoreType = _config.tunModeItem.enableTun ? ECoreType.sing_box : ECoreType.Xray;
+                    itemSocks = new ProfileItem()
+                    {
+                        coreType = preCoreType,
                         configType = EConfigType.Socks,
                         address = Global.Loopback,
                         port = node.preSocksPort
                     };
-                    string fileName2 = Utile.GetConfigPath(Global.CorePreConfigFileName);
+                    _config.runningCoreType = preCoreType;
+                }
+                if (itemSocks != null)
+                {
+                    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 +257,7 @@ namespace v2rayN.Handler
             try
             {
                 var coreInfo = LazyConfig.Instance.GetCoreInfo(coreType);
-                var proc = RunProcess(new(), coreInfo, $" -c {Global.CoreSpeedtestConfigFileName}", true, ShowMsg);
+                var proc = RunProcess(new(), coreInfo, $" -c {Global.CoreSpeedtestConfigFileName}", true);
                 if (proc is null)
                 {
                     return -1;
@@ -253,21 +274,21 @@ namespace v2rayN.Handler
             }
         }
 
-        private void ShowMsg(bool updateToTrayTooltip, string msg)
+        private void ShowMsg(bool notify, string msg)
         {
-            _updateFunc(updateToTrayTooltip, msg);
+            _updateFunc(notify, msg);
         }
 
         #endregion Private
 
         #region Process
 
-        private Process? RunProcess(ProfileItem node, CoreInfo coreInfo, string configPath, bool displayLog, Action<bool, string> update)
+        private Process? RunProcess(ProfileItem node, CoreInfo coreInfo, string configPath, bool displayLog)
         {
             try
             {
                 string fileName = CoreFindExe(coreInfo);
-                if (Utile.IsNullOrEmpty(fileName))
+                if (Utils.IsNullOrEmpty(fileName))
                 {
                     return null;
                 }
@@ -277,7 +298,7 @@ namespace v2rayN.Handler
                     {
                         FileName = fileName,
                         Arguments = string.Format(coreInfo.arguments, configPath),
-                        WorkingDirectory = Utile.GetConfigPath(),
+                        WorkingDirectory = Utils.GetConfigPath(),
                         UseShellExecute = false,
                         RedirectStandardOutput = displayLog,
                         RedirectStandardError = displayLog,
@@ -292,18 +313,18 @@ namespace v2rayN.Handler
                 {
                     proc.OutputDataReceived += (sender, e) =>
                     {
-                        if (!string.IsNullOrEmpty(e.Data))
+                        if (!Utils.IsNullOrEmpty(e.Data))
                         {
                             string msg = e.Data + Environment.NewLine;
-                            update(false, msg);
+                            ShowMsg(false, msg);
                         }
                     };
                     proc.ErrorDataReceived += (sender, e) =>
                     {
-                        if (!string.IsNullOrEmpty(e.Data))
+                        if (!Utils.IsNullOrEmpty(e.Data))
                         {
                             string msg = e.Data + Environment.NewLine;
-                            update(false, msg);
+                            ShowMsg(false, msg);
 
                             if (!startUpSuccessful)
                             {
@@ -336,7 +357,7 @@ namespace v2rayN.Handler
             {
                 Logging.SaveLog(ex.Message, ex);
                 string msg = ex.Message;
-                update(true, msg);
+                ShowMsg(true, msg);
                 return null;
             }
         }
@@ -349,7 +370,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
@@ -33,7 +34,7 @@ namespace v2rayN.Handler
         {
             try
             {
-                Utile.SetSecurityProtocol(LazyConfig.Instance.GetConfig().guiItem.enableSecurityProtocolTls13);
+                Utils.SetSecurityProtocol(LazyConfig.Instance.GetConfig().guiItem.enableSecurityProtocolTls13);
 
                 var progress = new Progress<string>();
                 progress.ProgressChanged += (sender, value) =>
@@ -65,7 +66,7 @@ namespace v2rayN.Handler
         {
             try
             {
-                Utile.SetSecurityProtocol(LazyConfig.Instance.GetConfig().guiItem.enableSecurityProtocolTls13);
+                Utils.SetSecurityProtocol(LazyConfig.Instance.GetConfig().guiItem.enableSecurityProtocolTls13);
                 UpdateCompleted?.Invoke(this, new ResultEventArgs(false, $"{ResUI.Downloading}   {url}"));
 
                 var progress = new Progress<double>();
@@ -77,7 +78,7 @@ namespace v2rayN.Handler
                 var webProxy = GetWebProxy(blProxy);
                 await DownloaderHelper.Instance.DownloadFileAsync(webProxy,
                     url,
-                    Utile.GetTempPath(Utile.GetDownloadFileName(url)),
+                    Utils.GetTempPath(Utils.GetDownloadFileName(url)),
                     progress,
                     downloadTimeout);
             }
@@ -95,7 +96,7 @@ namespace v2rayN.Handler
 
         public async Task<string?> UrlRedirectAsync(string url, bool blProxy)
         {
-            Utile.SetSecurityProtocol(LazyConfig.Instance.GetConfig().guiItem.enableSecurityProtocolTls13);
+            Utils.SetSecurityProtocol(LazyConfig.Instance.GetConfig().guiItem.enableSecurityProtocolTls13);
             var webRequestHandler = new SocketsHttpHandler
             {
                 AllowAutoRedirect = false,
@@ -120,7 +121,7 @@ namespace v2rayN.Handler
             try
             {
                 var result1 = await DownloadStringAsync(url, blProxy, userAgent);
-                if (!Utile.IsNullOrEmpty(result1))
+                if (!Utils.IsNullOrEmpty(result1))
                 {
                     return result1;
                 }
@@ -138,7 +139,7 @@ namespace v2rayN.Handler
             try
             {
                 var result2 = await DownloadStringViaDownloader(url, blProxy, userAgent);
-                if (!Utile.IsNullOrEmpty(result2))
+                if (!Utils.IsNullOrEmpty(result2))
                 {
                     return result2;
                 }
@@ -158,7 +159,7 @@ namespace v2rayN.Handler
                 using var wc = new WebClient();
                 wc.Proxy = GetWebProxy(blProxy);
                 var result3 = await wc.DownloadStringTaskAsync(url);
-                if (!Utile.IsNullOrEmpty(result3))
+                if (!Utils.IsNullOrEmpty(result3))
                 {
                     return result3;
                 }
@@ -184,7 +185,7 @@ namespace v2rayN.Handler
         {
             try
             {
-                Utile.SetSecurityProtocol(LazyConfig.Instance.GetConfig().guiItem.enableSecurityProtocolTls13);
+                Utils.SetSecurityProtocol(LazyConfig.Instance.GetConfig().guiItem.enableSecurityProtocolTls13);
                 var webProxy = GetWebProxy(blProxy);
                 var client = new HttpClient(new SocketsHttpHandler()
                 {
@@ -192,17 +193,17 @@ namespace v2rayN.Handler
                     UseProxy = webProxy != null
                 });
 
-                if (Utile.IsNullOrEmpty(userAgent))
+                if (Utils.IsNullOrEmpty(userAgent))
                 {
-                    userAgent = Utile.GetVersion(false);
+                    userAgent = Utils.GetVersion(false);
                 }
                 client.DefaultRequestHeaders.UserAgent.TryParseAdd(userAgent);
 
                 Uri uri = new(url);
                 //Authorization Header
-                if (!Utile.IsNullOrEmpty(uri.UserInfo))
+                if (!Utils.IsNullOrEmpty(uri.UserInfo))
                 {
-                    client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic", Utile.Base64Encode(uri.UserInfo));
+                    client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic", Utils.Base64Encode(uri.UserInfo));
                 }
 
                 using var cts = new CancellationTokenSource();
@@ -229,13 +230,13 @@ namespace v2rayN.Handler
         {
             try
             {
-                Utile.SetSecurityProtocol(LazyConfig.Instance.GetConfig().guiItem.enableSecurityProtocolTls13);
+                Utils.SetSecurityProtocol(LazyConfig.Instance.GetConfig().guiItem.enableSecurityProtocolTls13);
 
                 var webProxy = GetWebProxy(blProxy);
 
-                if (Utile.IsNullOrEmpty(userAgent))
+                if (Utils.IsNullOrEmpty(userAgent))
                 {
-                    userAgent = Utile.GetVersion(false);
+                    userAgent = Utils.GetVersion(false);
                 }
                 var result = await DownloaderHelper.Instance.DownloadStringAsync(webProxy, url, userAgent, 30);
                 return result;
@@ -285,8 +286,6 @@ namespace v2rayN.Handler
             int responseTime = -1;
             try
             {
-                Stopwatch timer = Stopwatch.StartNew();
-
                 using var cts = new CancellationTokenSource();
                 cts.CancelAfter(TimeSpan.FromSeconds(downloadTimeout));
                 using var client = new HttpClient(new SocketsHttpHandler()
@@ -294,9 +293,17 @@ namespace v2rayN.Handler
                     Proxy = webProxy,
                     UseProxy = webProxy != null
                 });
-                await client.GetAsync(url, cts.Token);
 
-                responseTime = timer.Elapsed.Milliseconds;
+                List<int> oneTime = [];
+                for (int i = 0; i < 2; i++)
+                {
+                    var timer = Stopwatch.StartNew();
+                    await client.GetAsync(url, cts.Token);
+                    timer.Stop();
+                    oneTime.Add((int)timer.Elapsed.TotalMilliseconds);
+                    await Task.Delay(100);
+                }
+                responseTime = oneTime.Where(x => x > 0).OrderBy(x => x).FirstOrDefault();
             }
             catch //(Exception ex)
             {
@@ -311,7 +318,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,208 @@
+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));
+            }
+            if (item.allowInsecure.Equals("true"))
+            {
+                dicQuery.Add("allowInsecure", "1");
+            }
+
+            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.allowInsecure = (query["allowInsecure"] ?? "") == "1" ? "true" : "";
+
+            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,126 @@
+using v2rayN.Enums;
+using v2rayN.Models;
+using v2rayN.Resx;
+
+namespace v2rayN.Handler.Fmt
+{
+    internal class VmessFmt : BaseFmt
+    {
+        public static ProfileItem? Resolve(string str, out string msg)
+        {
+            msg = ResUI.ConfigurationFormatIncorrect;
+            ProfileItem? item;
+            if (str.IndexOf('?') > 0 && str.IndexOf('&') > 0)
+            {
+                item = ResolveStdVmess(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;
+        }
+
+        public static ProfileItem? ResolveStdVmess(string str)
+        {
+            ProfileItem item = new()
+            {
+                configType = EConfigType.VMess,
+                security = "auto"
+            };
+
+            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;
+        }
+    }
+}

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.Model;
+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.Model;
+using v2rayN.Enums;
+using v2rayN.Models;
 
 namespace v2rayN.Handler
 {
@@ -12,20 +13,26 @@ namespace v2rayN.Handler
         public static LazyConfig Instance => _instance.Value;
 
         private int? _statePort;
+        private int? _statePort2;
 
         public int StatePort
         {
             get
             {
-                if (_statePort is null)
-                {
-                    _statePort = Utile.GetFreePort();
-                }
-
+                _statePort ??= Utils.GetFreePort(GetLocalPort(EInboundProtocol.api));
                 return _statePort.Value;
             }
         }
 
+        public int StatePort2
+        {
+            get
+            {
+                _statePort2 ??= Utils.GetFreePort(GetLocalPort(EInboundProtocol.api2));
+                return _statePort2.Value;
+            }
+        }
+
         private Job _processJob = new();
 
         public LazyConfig()
@@ -50,34 +57,10 @@ namespace v2rayN.Handler
             return _config;
         }
 
-        public int GetLocalPort(string protocol)
+        public int GetLocalPort(EInboundProtocol protocol)
         {
-            int localPort = _config.inbound.FirstOrDefault(t => t.protocol == Global.InboundSocks).localPort;
-            if (protocol == Global.InboundSocks)
-            {
-                return localPort;
-            }
-            else if (protocol == Global.InboundHttp)
-            {
-                return localPort + 1;
-            }
-            else if (protocol == Global.InboundSocks2)
-            {
-                return localPort + 2;
-            }
-            else if (protocol == Global.InboundHttp2)
-            {
-                return localPort + 3;
-            }
-            else if (protocol == ESysProxyType.Pac.ToString())
-            {
-                return localPort + 4;
-            }
-            else if (protocol == "speedtest")
-            {
-                return localPort + 103;
-            }
-            return localPort;
+            var localPort = _config.inbound.FirstOrDefault(t => t.protocol == nameof(EInboundProtocol.socks))?.localPort ?? 10808;
+            return localPort + (int)protocol;
         }
 
         public void AddProcess(IntPtr processHandle)
@@ -101,7 +84,7 @@ namespace v2rayN.Handler
 
         public List<ProfileItem> ProfileItems(string subid)
         {
-            if (Utile.IsNullOrEmpty(subid))
+            if (Utils.IsNullOrEmpty(subid))
             {
                 return SQLiteHelper.Instance.Table<ProfileItem>().ToList();
             }
@@ -113,7 +96,7 @@ namespace v2rayN.Handler
 
         public List<string> ProfileItemIndexes(string subid)
         {
-            if (Utile.IsNullOrEmpty(subid))
+            if (Utils.IsNullOrEmpty(subid))
             {
                 return SQLiteHelper.Instance.Table<ProfileItem>().Select(t => t.indexId).ToList();
             }
@@ -130,11 +113,11 @@ namespace v2rayN.Handler
                         from ProfileItem a
                         left join SubItem b on a.subid = b.id
                         where 1=1 ";
-            if (!Utile.IsNullOrEmpty(subid))
+            if (!Utils.IsNullOrEmpty(subid))
             {
                 sql += $" and a.subid = '{subid}'";
             }
-            if (!Utile.IsNullOrEmpty(filter))
+            if (!Utils.IsNullOrEmpty(filter))
             {
                 if (filter.Contains('\''))
                 {
@@ -148,7 +131,7 @@ namespace v2rayN.Handler
 
         public ProfileItem? GetProfileItem(string indexId)
         {
-            if (Utile.IsNullOrEmpty(indexId))
+            if (Utils.IsNullOrEmpty(indexId))
             {
                 return null;
             }
@@ -157,7 +140,7 @@ namespace v2rayN.Handler
 
         public ProfileItem? GetProfileItemViaRemarks(string remarks)
         {
-            if (Utile.IsNullOrEmpty(remarks))
+            if (Utils.IsNullOrEmpty(remarks))
             {
                 return null;
             }
@@ -230,7 +213,7 @@ namespace v2rayN.Handler
             {
                 InitCoreInfo();
             }
-            return coreInfo!.FirstOrDefault(t => t.coreType == coreType);
+            return coreInfo?.FirstOrDefault(t => t.coreType == coreType);
         }
 
         public List<CoreInfo> GetCoreInfo()
@@ -353,7 +336,11 @@ namespace v2rayN.Handler
                 arguments = "-f config.json",
                 coreUrl = Global.MihomoCoreUrl,
                 coreReleaseApiUrl = Global.MihomoCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
+                coreDownloadUrl32 = Global.ClashMetaCoreUrl + "/download/{0}/mihomo-windows-386-{0}.zip",
+                coreDownloadUrl64 = Global.ClashMetaCoreUrl + "/download/{0}/mihomo-windows-amd64-compatible-{0}.zip",
+                coreDownloadUrlArm64 = Global.ClashMetaCoreUrl + "/download/{0}/mihomo-windows-arm64-{0}.zip",
                 match = "Mihomo",
+                versionArg = "-v",
                 redirectInfo = true,
             });
 

v2rayN/v2rayN/Handler/MainFormHandler.cs

@@ -1,8 +1,14 @@
 using Microsoft.Win32;
+using Splat;
 using System.Drawing;
 using System.IO;
+using System.Runtime.InteropServices;
+using System.Windows;
+using System.Windows.Interop;
 using System.Windows.Media.Imaging;
-using v2rayN.Model;
+using v2rayN.Enums;
+using v2rayN.Handler.CoreConfig;
+using v2rayN.Models;
 using v2rayN.Resx;
 
 namespace v2rayN.Handler
@@ -16,7 +22,7 @@ namespace v2rayN.Handler
         {
             try
             {
-                int index = (int)config.sysProxyType;
+                int index = (int)config.systemProxyItem.sysProxyType;
 
                 //Load from routing setting
                 var createdIcon = GetNotifyIcon4Routing(config);
@@ -26,7 +32,7 @@ namespace v2rayN.Handler
                 }
 
                 //Load from local file
-                var fileName = Utile.GetPath($"NotifyIcon{index + 1}.ico");
+                var fileName = Utils.GetPath($"NotifyIcon{index + 1}.ico");
                 if (File.Exists(fileName))
                 {
                     return new Icon(fileName);
@@ -50,18 +56,18 @@ namespace v2rayN.Handler
         public System.Windows.Media.ImageSource GetAppIcon(Config config)
         {
             int index = 1;
-            switch ((int)config.sysProxyType)
+            switch (config.systemProxyItem.sysProxyType)
             {
-                case 0:
+                case ESysProxyType.ForcedClear:
                     index = 1;
                     break;
 
-                case 1:
-                case 3:
+                case ESysProxyType.ForcedChange:
+                case ESysProxyType.Pac:
                     index = 2;
                     break;
 
-                case 2:
+                case ESysProxyType.Unchanged:
                     index = 3;
                     break;
             }
@@ -78,13 +84,13 @@ namespace v2rayN.Handler
                 }
 
                 var item = ConfigHandler.GetDefaultRouting(config);
-                if (item == null || Utile.IsNullOrEmpty(item.customIcon) || !File.Exists(item.customIcon))
+                if (item == null || Utils.IsNullOrEmpty(item.customIcon) || !File.Exists(item.customIcon))
                 {
                     return null;
                 }
 
                 Color color = ColorTranslator.FromHtml("#3399CC");
-                int index = (int)config.sysProxyType;
+                int index = (int)config.systemProxyItem.sysProxyType;
                 if (index > 0)
                 {
                     color = (new[] { Color.Red, Color.Purple, Color.DarkGreen, Color.Orange, Color.DarkSlateBlue, Color.RoyalBlue })[index - 1];
@@ -123,11 +129,6 @@ namespace v2rayN.Handler
             {
                 return;
             }
-            if (item.configType == EConfigType.Custom)
-            {
-                UI.Show(ResUI.NonVmessService);
-                return;
-            }
 
             SaveFileDialog fileDialog = new()
             {
@@ -140,17 +141,18 @@ namespace v2rayN.Handler
                 return;
             }
             string fileName = fileDialog.FileName;
-            if (Utile.IsNullOrEmpty(fileName))
+            if (Utils.IsNullOrEmpty(fileName))
             {
                 return;
             }
             if (CoreConfigHandler.GenerateClientConfig(item, fileName, out string msg, out string content) != 0)
             {
-                UI.Show(msg);
+                Locator.Current.GetService<NoticeHandler>()?.Enqueue(msg);
             }
             else
             {
-                UI.ShowWarning(string.Format(ResUI.SaveClientConfigurationIn, fileName));
+                msg = string.Format(ResUI.SaveClientConfigurationIn, fileName);
+                Locator.Current.GetService<NoticeHandler>()?.SendMessageAndEnqueue(msg);
             }
         }
 
@@ -224,5 +226,27 @@ namespace v2rayN.Handler
             HotkeyHandler.Instance.HotkeyTriggerEvent += handler;
             HotkeyHandler.Instance.Load();
         }
+
+        public void RegisterSystemColorSet(Config config, Window window, Action<bool> update)
+        {
+            var helper = new WindowInteropHelper(window);
+            var hwndSource = HwndSource.FromHwnd(helper.EnsureHandle());
+            hwndSource.AddHook((IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled) =>
+            {
+                if (config.uiItem.followSystemTheme)
+                {
+                    const int WM_SETTINGCHANGE = 0x001A;
+                    if (msg == WM_SETTINGCHANGE)
+                    {
+                        if (wParam == IntPtr.Zero && Marshal.PtrToStringUni(lParam) == "ImmersiveColorSet")
+                        {
+                            update(!Utils.IsLightTheme());
+                        }
+                    }
+                }
+
+                return IntPtr.Zero;
+            });
+        }
     }
 }

v2rayN/v2rayN/Handler/NoticeHandler.cs

@@ -10,24 +10,40 @@ 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)
+        public void SendMessage(string? content)
         {
-            MessageBus.Current.SendMessage(msg, Global.CommandSendMsgView);
+            if (content.IsNullOrEmpty())
+            {
+                return;
+            }
+            MessageBus.Current.SendMessage(content, Global.CommandSendMsgView);
         }
 
-        public void SendMessage(string msg, bool time)
+        public void SendMessage(string? content, bool time)
         {
-            msg = $"{DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss")} {msg}";
-            MessageBus.Current.SendMessage(msg, Global.CommandSendMsgView);
+            if (content.IsNullOrEmpty())
+            {
+                return;
+            }
+            content = $"{DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss")} {content}";
+            SendMessage(content);
+        }
+
+        public void SendMessageAndEnqueue(string? msg)
+        {
+            Enqueue(msg);
+            SendMessage(msg);
         }
     }
 }

v2rayN/v2rayN/Handler/ProfileExHandler.cs

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

v2rayN/v2rayN/Handler/ShareHandler.cs

@@ -1,993 +0,0 @@
-using System.Collections.Specialized;
-using System.Text.RegularExpressions;
-using v2rayN.Model;
-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 = JsonUtile.Serialize(vmessQRCode);
-            url = Utile.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 (!Utile.IsNullOrEmpty(item.remarks))
-            {
-                remark = "#" + Utile.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 = Utile.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 (!Utile.IsNullOrEmpty(item.remarks))
-            {
-                remark = "#" + Utile.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 = Utile.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 (!Utile.IsNullOrEmpty(item.remarks))
-            {
-                remark = "#" + Utile.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 (!Utile.IsNullOrEmpty(item.remarks))
-            {
-                remark = "#" + Utile.UrlEncode(item.remarks);
-            }
-            var dicQuery = new Dictionary<string, string>();
-            if (!Utile.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;
-        }
-
-        private static string ShareHysteria2(ProfileItem item)
-        {
-            string url = string.Empty;
-            string remark = string.Empty;
-            if (!Utile.IsNullOrEmpty(item.remarks))
-            {
-                remark = "#" + Utile.UrlEncode(item.remarks);
-            }
-            var dicQuery = new Dictionary<string, string>();
-            if (!Utile.IsNullOrEmpty(item.sni))
-            {
-                dicQuery.Add("sni", item.sni);
-            }
-            if (!Utile.IsNullOrEmpty(item.alpn))
-            {
-                dicQuery.Add("alpn", Utile.UrlEncode(item.alpn));
-            }
-            if (!Utile.IsNullOrEmpty(item.path))
-            {
-                dicQuery.Add("obfs", "salamander");
-                dicQuery.Add("obfs-password", Utile.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 (!Utile.IsNullOrEmpty(item.remarks))
-            {
-                remark = "#" + Utile.UrlEncode(item.remarks);
-            }
-            var dicQuery = new Dictionary<string, string>();
-            if (!Utile.IsNullOrEmpty(item.sni))
-            {
-                dicQuery.Add("sni", item.sni);
-            }
-            if (!Utile.IsNullOrEmpty(item.alpn))
-            {
-                dicQuery.Add("alpn", Utile.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 (!Utile.IsNullOrEmpty(item.remarks))
-            {
-                remark = "#" + Utile.UrlEncode(item.remarks);
-            }
-
-            var dicQuery = new Dictionary<string, string>();
-            if (!Utile.IsNullOrEmpty(item.publicKey))
-            {
-                dicQuery.Add("publickey", Utile.UrlEncode(item.publicKey));
-            }
-            if (!Utile.IsNullOrEmpty(item.path))
-            {
-                dicQuery.Add("reserved", Utile.UrlEncode(item.path));
-            }
-            if (!Utile.IsNullOrEmpty(item.requestHost))
-            {
-                dicQuery.Add("address", Utile.UrlEncode(item.requestHost));
-            }
-            if (!Utile.IsNullOrEmpty(item.shortId))
-            {
-                dicQuery.Add("mtu", Utile.UrlEncode(item.shortId));
-            }
-            string query = "?" + string.Join("&", dicQuery.Select(x => x.Key + "=" + x.Value).ToArray());
-
-            url = string.Format("{0}@{1}:{2}",
-            Utile.UrlEncode(item.id),
-            GetIpv6(item.address),
-            item.port);
-            url = $"{Global.ProtocolShares[EConfigType.Wireguard]}{url}/{query}{remark}";
-            return url;
-        }
-
-        private static string GetIpv6(string address)
-        {
-            return Utile.IsIpv6(address) ? $"[{address}]" : address;
-        }
-
-        private static int GetStdTransport(ProfileItem item, string? securityDef, ref Dictionary<string, string> dicQuery)
-        {
-            if (!Utile.IsNullOrEmpty(item.flow))
-            {
-                dicQuery.Add("flow", item.flow);
-            }
-
-            if (!Utile.IsNullOrEmpty(item.streamSecurity))
-            {
-                dicQuery.Add("security", item.streamSecurity);
-            }
-            else
-            {
-                if (securityDef != null)
-                {
-                    dicQuery.Add("security", securityDef);
-                }
-            }
-            if (!Utile.IsNullOrEmpty(item.sni))
-            {
-                dicQuery.Add("sni", item.sni);
-            }
-            if (!Utile.IsNullOrEmpty(item.alpn))
-            {
-                dicQuery.Add("alpn", Utile.UrlEncode(item.alpn));
-            }
-            if (!Utile.IsNullOrEmpty(item.fingerprint))
-            {
-                dicQuery.Add("fp", Utile.UrlEncode(item.fingerprint));
-            }
-            if (!Utile.IsNullOrEmpty(item.publicKey))
-            {
-                dicQuery.Add("pbk", Utile.UrlEncode(item.publicKey));
-            }
-            if (!Utile.IsNullOrEmpty(item.shortId))
-            {
-                dicQuery.Add("sid", Utile.UrlEncode(item.shortId));
-            }
-            if (!Utile.IsNullOrEmpty(item.spiderX))
-            {
-                dicQuery.Add("spx", Utile.UrlEncode(item.spiderX));
-            }
-
-            dicQuery.Add("type", !Utile.IsNullOrEmpty(item.network) ? item.network : "tcp");
-
-            switch (item.network)
-            {
-                case "tcp":
-                    dicQuery.Add("headerType", !Utile.IsNullOrEmpty(item.headerType) ? item.headerType : Global.None);
-                    if (!Utile.IsNullOrEmpty(item.requestHost))
-                    {
-                        dicQuery.Add("host", Utile.UrlEncode(item.requestHost));
-                    }
-                    break;
-
-                case "kcp":
-                    dicQuery.Add("headerType", !Utile.IsNullOrEmpty(item.headerType) ? item.headerType : Global.None);
-                    if (!Utile.IsNullOrEmpty(item.path))
-                    {
-                        dicQuery.Add("seed", Utile.UrlEncode(item.path));
-                    }
-                    break;
-
-                case "ws":
-                    if (!Utile.IsNullOrEmpty(item.requestHost))
-                    {
-                        dicQuery.Add("host", Utile.UrlEncode(item.requestHost));
-                    }
-                    if (!Utile.IsNullOrEmpty(item.path))
-                    {
-                        dicQuery.Add("path", Utile.UrlEncode(item.path));
-                    }
-                    break;
-
-                case "http":
-                case "h2":
-                    dicQuery["type"] = "http";
-                    if (!Utile.IsNullOrEmpty(item.requestHost))
-                    {
-                        dicQuery.Add("host", Utile.UrlEncode(item.requestHost));
-                    }
-                    if (!Utile.IsNullOrEmpty(item.path))
-                    {
-                        dicQuery.Add("path", Utile.UrlEncode(item.path));
-                    }
-                    break;
-
-                case "quic":
-                    dicQuery.Add("headerType", !Utile.IsNullOrEmpty(item.headerType) ? item.headerType : Global.None);
-                    dicQuery.Add("quicSecurity", Utile.UrlEncode(item.requestHost));
-                    dicQuery.Add("key", Utile.UrlEncode(item.path));
-                    break;
-
-                case "grpc":
-                    if (!Utile.IsNullOrEmpty(item.path))
-                    {
-                        dicQuery.Add("serviceName", Utile.UrlEncode(item.path));
-                        if (item.headerType is Global.GrpcGunMode or Global.GrpcMultiMode)
-                        {
-                            dicQuery.Add("mode", Utile.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 (Utile.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 = Utile.Base64Decode(result);
-
-            //转成Json
-            VmessQRCode? vmessQRCode = JsonUtile.Deserialize<VmessQRCode>(result);
-            if (vmessQRCode == null)
-            {
-                msg = ResUI.FailedConversionConfiguration;
-                return null;
-            }
-
-            profileItem.network = Global.DefaultNetwork;
-            profileItem.headerType = Global.None;
-
-            profileItem.configVersion = Utile.ToInt(vmessQRCode.v);
-            profileItem.remarks = Utile.ToString(vmessQRCode.ps);
-            profileItem.address = Utile.ToString(vmessQRCode.add);
-            profileItem.port = Utile.ToInt(vmessQRCode.port);
-            profileItem.id = Utile.ToString(vmessQRCode.id);
-            profileItem.alterId = Utile.ToInt(vmessQRCode.aid);
-            profileItem.security = Utile.ToString(vmessQRCode.scy);
-
-            profileItem.security = !Utile.IsNullOrEmpty(vmessQRCode.scy) ? vmessQRCode.scy : Global.DefaultSecurity;
-            if (!Utile.IsNullOrEmpty(vmessQRCode.net))
-            {
-                profileItem.network = vmessQRCode.net;
-            }
-            if (!Utile.IsNullOrEmpty(vmessQRCode.type))
-            {
-                profileItem.headerType = vmessQRCode.type;
-            }
-
-            profileItem.requestHost = Utile.ToString(vmessQRCode.host);
-            profileItem.path = Utile.ToString(vmessQRCode.path);
-            profileItem.streamSecurity = Utile.ToString(vmessQRCode.tls);
-            profileItem.sni = Utile.ToString(vmessQRCode.sni);
-            profileItem.alpn = Utile.ToString(vmessQRCode.alpn);
-            profileItem.fingerprint = Utile.ToString(vmessQRCode.fp);
-
-            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 = Utile.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 = Utile.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 = Utile.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"] ?? Global.None;
-                    i.headerType = t1;
-                    break;
-
-                case "kcp":
-                    i.headerType = query["type"] ?? Global.None;
-                    break;
-
-                case "ws":
-                    string p1 = query["path"] ?? "/";
-                    string h1 = query["host"] ?? "";
-                    i.requestHost = Utile.UrlDecode(h1);
-                    i.path = p1;
-                    break;
-
-                case "http":
-                case "h2":
-                    i.network = "h2";
-                    string p2 = query["path"] ?? "/";
-                    string h2 = query["host"] ?? "";
-                    i.requestHost = Utile.UrlDecode(h2);
-                    i.path = p2;
-                    break;
-
-                case "quic":
-                    string s = query["security"] ?? Global.None;
-                    string k = query["key"] ?? "";
-                    string t3 = query["type"] ?? Global.None;
-                    i.headerType = t3;
-                    i.requestHost = Utile.UrlDecode(s);
-                    i.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 = Utile.UrlDecode(userInfoParts[1]);
-            }
-            else
-            {
-                // parse base64 UserInfo
-                string userInfo = Utile.Base64Decode(rawUserInfo);
-                string[] userInfoParts = userInfo.Split(new[] { ':' }, 2);
-                if (userInfoParts.Length != 2)
-                {
-                    return null;
-                }
-                server.security = userInfoParts[0];
-                server.id = userInfoParts[1];
-            }
-
-            var queryParameters = Utile.ParseQueryString(parsedUrl.Query);
-            if (queryParameters["plugin"] != null)
-            {
-                //obfs-host exists
-                var obfsHost = queryParameters["plugin"]?.Split(';').FirstOrDefault(t => t.Contains("obfs-host"));
-                if (queryParameters["plugin"].Contains("obfs=http") && !Utile.IsNullOrEmpty(obfsHost))
-                {
-                    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 (!Utile.IsNullOrEmpty(tag))
-            {
-                server.remarks = Utile.UrlDecode(tag);
-            }
-            Match details;
-            try
-            {
-                details = DetailsParser.Match(Utile.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 = Utile.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 = Utile.UrlDecode(result.Substring(indexRemark + 1, result.Length - indexRemark - 1));
-                }
-                catch { }
-                result = result[..indexRemark];
-            }
-            //part decode
-            int indexS = result.IndexOf("@");
-            if (indexS > 0)
-            {
-            }
-            else
-            {
-                result = Utile.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 = Utile.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 = Utile.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 = Utile.UrlDecode(url.UserInfo);
-
-            var query = Utile.ParseQueryString(url.Query);
-            ResolveStdTransport(query, ref item);
-
-            return item;
-        }
-
-        private static ProfileItem ResolveStdVLESS(string result)
-        {
-            ProfileItem item = new()
-            {
-                configType = EConfigType.VLESS,
-                security = Global.None
-            };
-
-            Uri url = new(result);
-
-            item.address = url.IdnHost;
-            item.port = url.Port;
-            item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
-            item.id = Utile.UrlDecode(url.UserInfo);
-
-            var query = Utile.ParseQueryString(url.Query);
-            item.security = query["encryption"] ?? Global.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 = Utile.UrlDecode(url.UserInfo);
-
-            var query = Utile.ParseQueryString(url.Query);
-            ResolveStdTransport(query, ref item);
-            item.path = Utile.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 = Utile.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 = Utile.UrlDecode(url.UserInfo);
-
-            var query = Utile.ParseQueryString(url.Query);
-
-            item.publicKey = Utile.UrlDecode(query["publickey"] ?? "");
-            item.path = Utile.UrlDecode(query["reserved"] ?? "");
-            item.requestHost = Utile.UrlDecode(query["address"] ?? "");
-            item.shortId = Utile.UrlDecode(query["mtu"] ?? "");
-
-            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 = Utile.UrlDecode(query["alpn"] ?? "");
-            item.fingerprint = Utile.UrlDecode(query["fp"] ?? "");
-            item.publicKey = Utile.UrlDecode(query["pbk"] ?? "");
-            item.shortId = Utile.UrlDecode(query["sid"] ?? "");
-            item.spiderX = Utile.UrlDecode(query["spx"] ?? "");
-
-            item.network = query["type"] ?? "tcp";
-            switch (item.network)
-            {
-                case "tcp":
-                    item.headerType = query["headerType"] ?? Global.None;
-                    item.requestHost = Utile.UrlDecode(query["host"] ?? "");
-
-                    break;
-
-                case "kcp":
-                    item.headerType = query["headerType"] ?? Global.None;
-                    item.path = Utile.UrlDecode(query["seed"] ?? "");
-                    break;
-
-                case "ws":
-                    item.requestHost = Utile.UrlDecode(query["host"] ?? "");
-                    item.path = Utile.UrlDecode(query["path"] ?? "/");
-                    break;
-
-                case "http":
-                case "h2":
-                    item.network = "h2";
-                    item.requestHost = Utile.UrlDecode(query["host"] ?? "");
-                    item.path = Utile.UrlDecode(query["path"] ?? "/");
-                    break;
-
-                case "quic":
-                    item.headerType = query["headerType"] ?? Global.None;
-                    item.requestHost = query["quicSecurity"] ?? Global.None;
-                    item.path = Utile.UrlDecode(query["key"] ?? "");
-                    break;
-
-                case "grpc":
-                    item.path = Utile.UrlDecode(query["serviceName"] ?? "");
-                    item.headerType = Utile.UrlDecode(query["mode"] ?? Global.GrpcGunMode);
-                    break;
-
-                default:
-                    break;
-            }
-            return 0;
-        }
-
-        #endregion ImportShareUrl
-    }
-}

v2rayN/v2rayN/Handler/SpeedtestHandler.cs

@@ -2,7 +2,8 @@
 using System.Diagnostics;
 using System.Net;
 using System.Net.Sockets;
-using v2rayN.Model;
+using v2rayN.Enums;
+using v2rayN.Models;
 using v2rayN.Resx;
 
 namespace v2rayN.Handler
@@ -376,19 +377,18 @@ namespace v2rayN.Handler
                     ipAddress = ipHostInfo.AddressList[0];
                 }
 
-                Stopwatch timer = new();
-                timer.Start();
+                var timer = Stopwatch.StartNew();
 
                 IPEndPoint endPoint = new(ipAddress, port);
                 using Socket clientSocket = new(endPoint.AddressFamily, SocketType.Stream, ProtocolType.Tcp);
 
-                IAsyncResult result = clientSocket.BeginConnect(endPoint, null, null);
+                var result = clientSocket.BeginConnect(endPoint, null, null);
                 if (!result.AsyncWaitHandle.WaitOne(TimeSpan.FromSeconds(5)))
                     throw new TimeoutException("connect timeout (5s): " + url);
                 clientSocket.EndConnect(result);
 
                 timer.Stop();
-                responseTime = timer.Elapsed.Milliseconds;
+                responseTime = (int)timer.Elapsed.TotalMilliseconds;
             }
             catch (Exception ex)
             {

v2rayN/v2rayN/Handler/Statistics/StatisticsHandler.cs

@@ -1,11 +1,12 @@
-using System.Net;
-using System.Net.Sockets;
-using v2rayN.Model;
+using v2rayN.Models;
 
-namespace v2rayN.Handler
+namespace v2rayN.Handler.Statistics
 {
     internal class StatisticsHandler
     {
+        private static readonly Lazy<StatisticsHandler> instance = new(() => new());
+        public static StatisticsHandler Instance => instance.Value;
+
         private Config _config;
         private ServerStatItem? _serverStatItem;
         private List<ServerStatItem> _lstServerStat;
@@ -14,20 +15,17 @@ namespace v2rayN.Handler
         private StatisticsSingbox? _statisticsSingbox;
 
         public List<ServerStatItem> ServerStat => _lstServerStat;
-        public bool Enable { get; set; }
 
-        public StatisticsHandler(Config config, Action<ServerSpeedItem> update)
+        public void Init(Config config, Action<ServerSpeedItem> update)
         {
             _config = config;
-            Enable = config.guiItem.enableStatistics;
-            if (!Enable)
+            _updateFunc = update;
+            if (!config.guiItem.enableStatistics)
             {
                 return;
             }
 
-            _updateFunc = update;
-
-            Init();
+            InitData();
 
             _statisticsV2Ray = new StatisticsV2ray(config, UpdateServerStat);
             _statisticsSingbox = new StatisticsSingbox(config, UpdateServerStat);
@@ -57,7 +55,10 @@ namespace v2rayN.Handler
         {
             try
             {
-                SQLiteHelper.Instance.UpdateAll(_lstServerStat);
+                if (_lstServerStat != null)
+                {
+                    SQLiteHelper.Instance.UpdateAll(_lstServerStat);
+                }
             }
             catch (Exception ex)
             {
@@ -65,7 +66,7 @@ namespace v2rayN.Handler
             }
         }
 
-        private void Init()
+        private void InitData()
         {
             SQLiteHelper.Instance.Execute($"delete from ServerStatItem where indexId not in ( select indexId from ProfileItem )");
 
@@ -133,27 +134,5 @@ namespace v2rayN.Handler
                 _serverStatItem.dateNow = ticks;
             }
         }
-
-        private int GetFreePort()
-        {
-            try
-            {
-                int defaultPort = 9090;
-                if (!Utile.PortInUse(defaultPort))
-                {
-                    return defaultPort;
-                }
-
-                TcpListener l = new(IPAddress.Loopback, 0);
-                l.Start();
-                int port = ((IPEndPoint)l.LocalEndpoint).Port;
-                l.Stop();
-                return port;
-            }
-            catch
-            {
-            }
-            return 69090;
-        }
     }
 }

v2rayN/v2rayN/Handler/Statistics/StatisticsSingbox.cs

@@ -1,8 +1,9 @@
 using System.Net.WebSockets;
 using System.Text;
-using v2rayN.Model;
+using v2rayN.Enums;
+using v2rayN.Models;
 
-namespace v2rayN.Handler
+namespace v2rayN.Handler.Statistics
 {
     internal class StatisticsSingbox
     {
@@ -27,7 +28,7 @@ namespace v2rayN.Handler
 
             try
             {
-                url = $"ws://{Global.Loopback}:{LazyConfig.Instance.StatePort}/traffic";
+                url = $"ws://{Global.Loopback}:{LazyConfig.Instance.StatePort2}/traffic";
 
                 if (webSocket == null)
                 {
@@ -61,8 +62,13 @@ namespace v2rayN.Handler
 
             while (!_exitFlag)
             {
+                await Task.Delay(1000);
                 try
                 {
+                    if (!(_config.IsRunningCore(ECoreType.clash)))
+                    {
+                        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);
-                }
             }
         }
 
@@ -113,7 +115,7 @@ namespace v2rayN.Handler
             up = 0; down = 0;
             try
             {
-                var trafficItem = JsonUtile.Deserialize<TrafficItem>(source);
+                var trafficItem = JsonUtils.Deserialize<TrafficItem>(source);
                 if (trafficItem != null)
                 {
                     up = trafficItem.up;

v2rayN/v2rayN/Handler/Statistics/StatisticsV2ray.cs

@@ -1,19 +1,20 @@
 using Grpc.Core;
 using Grpc.Net.Client;
 using ProtosLib.Statistics;
-using v2rayN.Model;
+using v2rayN.Enums;
+using v2rayN.Models;
 
-namespace v2rayN.Handler
+namespace v2rayN.Handler.Statistics
 {
     internal class StatisticsV2ray
     {
-        private Model.Config _config;
+        private Models.Config _config;
         private GrpcChannel? _channel;
         private StatsService.StatsServiceClient? _client;
         private bool _exitFlag;
         private Action<ServerSpeedItem> _updateFunc;
 
-        public StatisticsV2ray(Model.Config config, Action<ServerSpeedItem> update)
+        public StatisticsV2ray(Models.Config config, Action<ServerSpeedItem> update)
         {
             _config = config;
             _updateFunc = update;
@@ -49,14 +50,20 @@ namespace v2rayN.Handler
         {
             while (!_exitFlag)
             {
+                await Task.Delay(1000);
                 try
                 {
+                    if (!(_config.IsRunningCore(ECoreType.Xray)))
+                    {
+                        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);
-                    if (_channel != null) 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,38 +1,17 @@
 using PacLib;
-using v2rayN.Model;
+using v2rayN.Common;
+using v2rayN.Enums;
+using v2rayN.Models;
 
 namespace v2rayN.Handler
 {
     public static class SysProxyHandle
     {
-        //private const string _userWininetConfigFile = "user-wininet.json";
-
-        //private static string _queryStr;
-
-        // In general, this won't change
-        // format:
-        //  <flags><CR-LF>
-        //  <proxy-server><CR-LF>
-        //  <bypass-list><CR-LF>
-        //  <pac-url>
-
-        private enum RET_ERRORS : int
-        {
-            RET_NO_ERROR = 0,
-            INVALID_FORMAT = 1,
-            NO_PERMISSION = 2,
-            SYSCALL_FAILED = 3,
-            NO_MEMORY = 4,
-            INVAILD_OPTION_COUNT = 5,
-        };
-
-        static SysProxyHandle()
-        {
-        }
+        private const string _regPath = @"Software\Microsoft\Windows\CurrentVersion\Internet Settings";
 
         public static bool UpdateSysProxy(Config config, bool forceDisable)
         {
-            var type = config.sysProxyType;
+            var type = config.systemProxyItem.sysProxyType;
 
             if (forceDisable && type != ESysProxyType.Unchanged)
             {
@@ -41,43 +20,47 @@ 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;
                 }
                 if (type == ESysProxyType.ForcedChange)
                 {
-                    var strExceptions = $"<local>;{config.constItem.defIEProxyExceptions};{config.systemProxyExceptions}";
+                    var strExceptions = "";
+                    if (config.systemProxyItem.notProxyLocalAddress)
+                    {
+                        strExceptions = $"<local>;{config.constItem.defIEProxyExceptions};{config.systemProxyItem.systemProxyExceptions}";
+                    }
 
                     var strProxy = string.Empty;
-                    if (Utile.IsNullOrEmpty(config.systemProxyAdvancedProtocol))
+                    if (Utils.IsNullOrEmpty(config.systemProxyItem.systemProxyAdvancedProtocol))
                     {
                         strProxy = $"{Global.Loopback}:{port}";
                     }
                     else
                     {
-                        strProxy = config.systemProxyAdvancedProtocol
+                        strProxy = config.systemProxyItem.systemProxyAdvancedProtocol
                             .Replace("{ip}", Global.Loopback)
                             .Replace("{http_port}", port.ToString())
                             .Replace("{socks_port}", portSocks.ToString());
                     }
-                    ProxySetting.SetProxy(strProxy, strExceptions, 2); // set a named proxy
+                    ProxySetting.SetProxy(strProxy, strExceptions, 2);
                 }
                 else if (type == ESysProxyType.ForcedClear)
                 {
-                    ProxySetting.UnsetProxy(); // set to no proxy
+                    ProxySetting.UnsetProxy();
                 }
                 else if (type == ESysProxyType.Unchanged)
                 {
                 }
                 else if (type == ESysProxyType.Pac)
                 {
-                    PacHandler.Start(Utile.GetConfigPath(), port, portPac);
+                    PacHandler.Start(Utils.GetConfigPath(), port, portPac);
                     var strProxy = $"{Global.HttpProtocol}{Global.Loopback}:{portPac}/pac?t={DateTime.Now.Ticks}";
-                    ProxySetting.SetProxy(strProxy, "", 4); // use pac script url for auto-config proxy
+                    ProxySetting.SetProxy(strProxy, "", 4);
                 }
 
                 if (type != ESysProxyType.Pac)
@@ -94,14 +77,7 @@ namespace v2rayN.Handler
 
         public static void ResetIEProxy4WindowsShutDown()
         {
-            try
-            {
-                //TODO To be verified
-                Utile.RegWriteValue(@"Software\Microsoft\Windows\CurrentVersion\Internet Settings", "ProxyEnable", 0);
-            }
-            catch
-            {
-            }
+            ProxySetting.UnsetProxy();
         }
     }
 }

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.Model;
+using v2rayN.Enums;
+using v2rayN.Models;
 using v2rayN.Resx;
 
 namespace v2rayN.Handler
@@ -47,15 +48,15 @@ namespace v2rayN.Handler
 
                     try
                     {
-                        string fileName = Utile.GetTempPath(Utile.GetDownloadFileName(url));
-                        fileName = Utile.UrlEncode(fileName);
+                        string fileName = Utils.GetTempPath(Utils.GetDownloadFileName(url));
+                        fileName = Utils.UrlEncode(fileName);
                         Process process = new()
                         {
                             StartInfo = new ProcessStartInfo
                             {
                                 FileName = "v2rayUpgrade.exe",
                                 Arguments = fileName.AppendQuotes(),
-                                WorkingDirectory = Utile.StartupPath()
+                                WorkingDirectory = Utils.StartupPath()
                             }
                         };
                         process.Start();
@@ -179,7 +180,7 @@ namespace v2rayN.Handler
                     string url = item.url.TrimEx();
                     string userAgent = item.userAgent.TrimEx();
                     string hashCode = $"{item.remarks}->";
-                    if (Utile.IsNullOrEmpty(id) || Utile.IsNullOrEmpty(url) || (!Utile.IsNullOrEmpty(subId) && item.id != subId))
+                    if (Utils.IsNullOrEmpty(id) || Utils.IsNullOrEmpty(url) || (!Utils.IsNullOrEmpty(subId) && item.id != subId))
                     {
                         //_updateFunc(false, $"{hashCode}{ResUI.MsgNoValidSubscription}");
                         continue;
@@ -203,12 +204,12 @@ namespace v2rayN.Handler
                     _updateFunc(false, $"{hashCode}{ResUI.MsgStartGettingSubscriptions}");
 
                     //one url
-                    url = Utile.GetPunycode(url);
+                    url = Utils.GetPunycode(url);
                     //convert
-                    if (!Utile.IsNullOrEmpty(item.convertTarget))
+                    if (!Utils.IsNullOrEmpty(item.convertTarget))
                     {
-                        var subConvertUrl = string.IsNullOrEmpty(config.constItem.subConvertUrl) ? Global.SubConvertUrls.FirstOrDefault() : config.constItem.subConvertUrl;
-                        url = string.Format(subConvertUrl!, Utile.UrlEncode(url));
+                        var subConvertUrl = Utils.IsNullOrEmpty(config.constItem.subConvertUrl) ? Global.SubConvertUrls.FirstOrDefault() : config.constItem.subConvertUrl;
+                        url = string.Format(subConvertUrl!, Utils.UrlEncode(url));
                         if (!url.Contains("target="))
                         {
                             url += string.Format("&target={0}", item.convertTarget);
@@ -219,17 +220,17 @@ namespace v2rayN.Handler
                         }
                     }
                     var result = await downloadHandle.TryDownloadString(url, blProxy, userAgent);
-                    if (blProxy && Utile.IsNullOrEmpty(result))
+                    if (blProxy && Utils.IsNullOrEmpty(result))
                     {
                         result = await downloadHandle.TryDownloadString(url, false, userAgent);
                     }
 
                     //more url
-                    if (Utile.IsNullOrEmpty(item.convertTarget) && !Utile.IsNullOrEmpty(item.moreUrl.TrimEx()))
+                    if (Utils.IsNullOrEmpty(item.convertTarget) && !Utils.IsNullOrEmpty(item.moreUrl.TrimEx()))
                     {
-                        if (!Utile.IsNullOrEmpty(result) && Utile.IsBase64String(result!))
+                        if (!Utils.IsNullOrEmpty(result) && Utils.IsBase64String(result!))
                         {
-                            result = Utile.Base64Decode(result);
+                            result = Utils.Base64Decode(result);
                         }
 
                         var lstUrl = new List<string>
@@ -238,22 +239,22 @@ namespace v2rayN.Handler
                         };
                         foreach (var it in lstUrl)
                         {
-                            var url2 = Utile.GetPunycode(it);
-                            if (Utile.IsNullOrEmpty(url2))
+                            var url2 = Utils.GetPunycode(it);
+                            if (Utils.IsNullOrEmpty(url2))
                             {
                                 continue;
                             }
 
                             var result2 = await downloadHandle.TryDownloadString(url2, blProxy, userAgent);
-                            if (blProxy && Utile.IsNullOrEmpty(result2))
+                            if (blProxy && Utils.IsNullOrEmpty(result2))
                             {
                                 result2 = await downloadHandle.TryDownloadString(url2, false, userAgent);
                             }
-                            if (!Utile.IsNullOrEmpty(result2))
+                            if (!Utils.IsNullOrEmpty(result2))
                             {
-                                if (Utile.IsBase64String(result2!))
+                                if (Utils.IsBase64String(result2!))
                                 {
-                                    result += Utile.Base64Decode(result2);
+                                    result += Utils.Base64Decode(result2);
                                 }
                                 else
                                 {
@@ -263,14 +264,14 @@ namespace v2rayN.Handler
                         }
                     }
 
-                    if (Utile.IsNullOrEmpty(result))
+                    if (Utils.IsNullOrEmpty(result))
                     {
                         _updateFunc(false, $"{hashCode}{ResUI.MsgSubscriptionDecodingFailed}");
                     }
                     else
                     {
                         _updateFunc(false, $"{hashCode}{ResUI.MsgGetSubscriptionSuccessfully}");
-                        if (result!.Length < 99)
+                        if (result?.Length < 99)
                         {
                             _updateFunc(false, $"{hashCode}{result}");
                         }
@@ -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);
             });
         }
 
@@ -325,9 +323,9 @@ namespace v2rayN.Handler
                 string url = coreInfo.coreReleaseApiUrl;
 
                 var result = await (new DownloadHandle()).DownloadStringAsync(url, true, "");
-                if (!Utile.IsNullOrEmpty(result))
+                if (!Utils.IsNullOrEmpty(result))
                 {
-                    responseHandler(type, result, preRelease);
+                    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
             {
@@ -354,7 +352,7 @@ namespace v2rayN.Handler
                 foreach (string name in coreInfo.coreExes)
                 {
                     string vName = $"{name}.exe";
-                    vName = Utile.GetBinPath(vName, coreInfo.coreType.ToString());
+                    vName = Utils.GetBinPath(vName, coreInfo.coreType.ToString());
                     if (File.Exists(vName))
                     {
                         filePath = vName;
@@ -372,7 +370,7 @@ namespace v2rayN.Handler
                 using Process p = new();
                 p.StartInfo.FileName = filePath.AppendQuotes();
                 p.StartInfo.Arguments = coreInfo.versionArg;
-                p.StartInfo.WorkingDirectory = Utile.StartupPath();
+                p.StartInfo.WorkingDirectory = Utils.StartupPath();
                 p.StartInfo.UseShellExecute = false;
                 p.StartInfo.RedirectStandardOutput = true;
                 p.StartInfo.CreateNoWindow = true;
@@ -410,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 = JsonUtile.Deserialize<List<GitHubRelease>>(gitHubReleaseApi);
-                var gitHubRelease = preRelease ? gitHubReleases!.First() : gitHubReleases!.First(r => r.Prerelease == false);
-                var version = new SemanticVersion(gitHubRelease!.TagName);
-                var body = gitHubRelease!.Body;
+                var gitHubReleases = JsonUtils.Deserialize<List<GitHubRelease>>(gitHubReleaseApi);
+                var gitHubRelease = preRelease ? gitHubReleases?.First() : gitHubReleases?.First(r => r.Prerelease == false);
+                var version = new SemanticVersion(gitHubRelease?.TagName!);
+                var body = gitHubRelease?.Body;
 
                 var coreInfo = LazyConfig.Instance.GetCoreInfo(type);
 
@@ -431,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)
@@ -456,7 +454,7 @@ namespace v2rayN.Handler
                     case ECoreType.clash_meta:
                     case ECoreType.mihomo:
                         {
-                            curVersion = getCoreVersion(type);
+                            curVersion = GetCoreVersion(type);
                             message = string.Format(ResUI.IsLatestCore, type, curVersion);
                             switch (RuntimeInformation.ProcessArchitecture)
                             {
@@ -477,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)
                             {
@@ -498,7 +496,7 @@ namespace v2rayN.Handler
                         }
                     case ECoreType.v2rayN:
                         {
-                            curVersion = new SemanticVersion(FileVersionInfo.GetVersionInfo(Utile.GetExePath()).FileVersion.ToString());
+                            curVersion = new SemanticVersion(FileVersionInfo.GetVersionInfo(Utils.GetExePath()).FileVersion.ToString());
                             message = string.Format(ResUI.IsLatestN, type, curVersion);
                             switch (RuntimeInformation.ProcessArchitecture)
                             {
@@ -570,7 +568,7 @@ namespace v2rayN.Handler
 
                     try
                     {
-                        string fileName = Utile.GetTempPath(Utile.GetDownloadFileName(url));
+                        string fileName = Utils.GetTempPath(Utils.GetDownloadFileName(url));
                         if (File.Exists(fileName))
                         {
                             //Global.coreTypes.ForEach(it =>
@@ -578,7 +576,7 @@ namespace v2rayN.Handler
                             //    string targetPath = Utile.GetBinPath($"{geoName}.dat", (ECoreType)Enum.Parse(typeof(ECoreType), it));
                             //    File.Copy(fileName, targetPath, true);
                             //});
-                            string targetPath = Utile.GetBinPath($"{geoName}.dat");
+                            string targetPath = Utils.GetBinPath($"{geoName}.dat");
                             File.Copy(fileName, targetPath, true);
 
                             File.Delete(fileName);
@@ -602,54 +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 = Utile.GetTempPath(Utile.GetDownloadFileName(url));
-                        if (File.Exists(fileName))
-                        {
-                            string targetPath = Utile.GetConfigPath($"{geoName}.db");
-                            File.Copy(fileName, targetPath, true);
-
-                            File.Delete(fileName);
-                        }
-                        if (needStop) coreHandler?.LoadCore();
-                    }
-                    catch (Exception ex)
-                    {
-                        _updateFunc(false, ex.Message);
-                    }
-                }
-                else
-                {
-                    _updateFunc(false, args.Msg);
-                }
-            };
-            downloadHandle.Error += (sender2, args) =>
-            {
-                _updateFunc(false, args.GetException().Message);
-            };
-            await AskToDownload(downloadHandle, url, false);
-        }
-
         #endregion private
     }
 }

v2rayN/v2rayN/Model/ConfigOld.cs

@@ -1,440 +0,0 @@
-namespace v2rayN.Model
-{
-    [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/Model/RulesItem.cs

@@ -1,25 +0,0 @@
-namespace v2rayN.Model
-{
-    [Serializable]
-    public class RulesItem
-    {
-        public string id { get; set; }
-        public string type { get; set; }
-
-        public string port { get; set; }
-
-        public List<string> inboundTag { get; set; }
-
-        public string outboundTag { get; set; }
-
-        public List<string> ip { get; set; }
-
-        public List<string> domain { get; set; }
-
-        public List<string> protocol { get; set; }
-
-        public List<string> process { get; set; }
-
-        public bool enabled { get; set; } = true;
-    }
-}

v2rayN/v2rayN/Models/ClashConnectionModel.cs

@@ -0,0 +1,17 @@
+namespace v2rayN.Models
+{
+    public class ClashConnectionModel
+    {
+        public string id { get; set; }
+        public string network { get; set; }
+        public string type { get; set; }
+        public string host { get; set; }
+        public ulong upload { get; set; }
+        public ulong download { get; set; }
+        public string uploadTraffic { get; set; }
+        public string downloadTraffic { get; set; }
+        public double time { get; set; }
+        public string elapsed { get; set; }
+        public string chain { get; set; }
+    }
+}

v2rayN/v2rayN/Models/ClashConnections.cs

@@ -0,0 +1,37 @@
+namespace v2rayN.Models
+{
+    public class ClashConnections
+    {
+        public ulong downloadTotal { get; set; }
+        public ulong uploadTotal { get; set; }
+        public List<ConnectionItem>? connections { get; set; }
+    }
+
+    public class ConnectionItem
+    {
+        public string id { get; set; } = string.Empty;
+        public MetadataItem metadata { get; set; }
+        public ulong upload { get; set; }
+        public ulong download { get; set; }
+        public DateTime start { get; set; }
+        public List<string>? chains { get; set; }
+        public string rule { get; set; }
+        public string rulePayload { get; set; }
+    }
+
+    public class MetadataItem
+    {
+        public string network { get; set; }
+        public string type { get; set; }
+        public string sourceIP { get; set; }
+        public string destinationIP { get; set; }
+        public string sourcePort { get; set; }
+        public string destinationPort { get; set; }
+        public string host { get; set; }
+        public string nsMode { get; set; }
+        public object uid { get; set; }
+        public string process { get; set; }
+        public string processPath { get; set; }
+        public string remoteDestination { get; set; }
+    }
+}

v2rayN/v2rayN/Models/ClashProviders.cs

@@ -0,0 +1,17 @@
+using static v2rayN.Models.ClashProxies;
+
+namespace v2rayN.Models
+{
+    public class ClashProviders
+    {
+        public Dictionary<String, ProvidersItem> providers { get; set; }
+
+        public class ProvidersItem
+        {
+            public string name { get; set; }
+            public ProxiesItem[] proxies { get; set; }
+            public string type { get; set; }
+            public string vehicleType { get; set; }
+        }
+    }
+}

v2rayN/v2rayN/Models/ClashProxies.cs

@@ -0,0 +1,24 @@
+namespace v2rayN.Models
+{
+    public class ClashProxies
+    {
+        public Dictionary<String, ProxiesItem> proxies { get; set; }
+
+        public class ProxiesItem
+        {
+            public string[] all { get; set; }
+            public List<HistoryItem> history { get; set; }
+            public string name { get; set; }
+            public string type { get; set; }
+            public bool udp { get; set; }
+            public string now { get; set; }
+            public int delay { get; set; }
+        }
+
+        public class HistoryItem
+        {
+            public string time { get; set; }
+            public int delay { get; set; }
+        }
+    }
+}

v2rayN/v2rayN/Models/ClashProxyModel.cs

@@ -0,0 +1,26 @@
+using ReactiveUI.Fody.Helpers;
+
+namespace v2rayN.Models
+{
+    [Serializable]
+    public class ClashProxyModel
+    {
+        [Reactive]
+        public string name { get; set; }
+
+        [Reactive]
+        public string type { get; set; }
+
+        [Reactive]
+        public string now { get; set; }
+
+        [Reactive]
+        public int delay { get; set; }
+
+        [Reactive]
+        public string delayName { get; set; }
+
+        [Reactive]
+        public bool isActive { get; set; }
+    }
+}

v2rayN/v2rayN/Models/ComboItem.cs

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

v2rayN/v2rayN/Models/Config.cs

@@ -1,4 +1,6 @@
-namespace v2rayN.Model
+using v2rayN.Enums;
+
+namespace v2rayN.Models
 {
     /// <summary>
     /// 本软件配置文件实体类
@@ -10,10 +12,24 @@
 
         public string indexId { get; set; }
         public string subIndexId { get; set; }
-        public ESysProxyType sysProxyType { get; set; }
         public string systemProxyExceptions { get; set; }
         public string systemProxyAdvancedProtocol { get; set; }
 
+        public ECoreType runningCoreType { get; set; }
+
+        public bool IsRunningCore(ECoreType type)
+        {
+            if (type == ECoreType.Xray && runningCoreType is ECoreType.Xray or ECoreType.v2fly or ECoreType.v2fly_v5 or ECoreType.SagerNet)
+            {
+                return true;
+            }
+            if (type == ECoreType.clash && runningCoreType is ECoreType.sing_box or ECoreType.clash or ECoreType.clash_meta or ECoreType.mihomo)
+            {
+                return true;
+            }
+            return false;
+        }
+
         #endregion property
 
         #region other entities
@@ -29,6 +45,8 @@
         public SpeedTestItem speedTestItem { get; set; }
         public Mux4SboxItem mux4SboxItem { get; set; }
         public HysteriaItem hysteriaItem { get; set; }
+        public ClashUIItem clashUIItem { get; set; }
+        public SystemProxyItem systemProxyItem { get; set; }
         public List<InItem> inbound { get; set; }
         public List<KeyEventItem> globalHotkeys { get; set; }
         public List<CoreTypeItem> coreTypeItem { get; set; }

v2rayN/v2rayN/Models/ConfigItems.cs

@@ -1,6 +1,7 @@
 using System.Windows.Input;
+using v2rayN.Enums;
 
-namespace v2rayN.Model
+namespace v2rayN.Models
 {
     [Serializable]
     public class CoreBasicItem
@@ -31,6 +32,10 @@ namespace v2rayN.Model
         /// 默认用户代理
         /// </summary>
         public string defUserAgent { get; set; }
+
+        public bool enableFragment { get; set; }
+
+        public bool enableCacheFile4Sbox { get; set; } = true;
     }
 
     [Serializable]
@@ -43,8 +48,8 @@ namespace v2rayN.Model
         public bool udpEnabled { get; set; }
 
         public bool sniffingEnabled { get; set; } = true;
+        public List<string>? destOverride { get; set; } = ["http", "tls"];
         public bool routeOnly { get; set; }
-
         public bool allowLANConn { get; set; }
 
         public bool newPort4LAN { get; set; }
@@ -114,6 +119,7 @@ namespace v2rayN.Model
         public double mainHeight { get; set; }
         public double mainGirdHeight1 { get; set; }
         public double mainGirdHeight2 { get; set; }
+        public EGirdOrientation mainGirdOrientation { get; set; } = EGirdOrientation.Vertical;
         public bool colorModeDark { get; set; }
         public bool followSystemTheme { get; set; }
         public string? colorPrimaryName { get; set; }
@@ -122,9 +128,10 @@ namespace v2rayN.Model
         public int currentFontSize { get; set; }
         public bool enableDragDropSort { get; set; }
         public bool doubleClick2Activate { get; set; }
-        public bool autoHideStartup { get; set; } = true;
+        public bool autoHideStartup { get; set; }
         public string mainMsgFilter { get; set; }
         public List<ColumnItem> mainColumnItem { get; set; }
+        public bool showInTaskbar { get; set; }
     }
 
     [Serializable]
@@ -164,7 +171,7 @@ namespace v2rayN.Model
         public string stack { get; set; }
         public int mtu { get; set; }
         public bool enableExInbound { get; set; }
-        public bool enableIPv6Address { get; set; } = true;
+        public bool enableIPv6Address { get; set; }
     }
 
     [Serializable]
@@ -178,13 +185,8 @@ namespace v2rayN.Model
     [Serializable]
     public class RoutingBasicItem
     {
-        /// <summary>
-        /// 域名解析策略
-        /// </summary>
         public string domainStrategy { get; set; }
-
         public string domainStrategy4Singbox { get; set; }
-
         public string domainMatcher { get; set; }
         public string routingIndexId { get; set; }
         public bool enableRoutingAdvanced { get; set; }
@@ -211,4 +213,27 @@ namespace v2rayN.Model
         public int up_mbps { get; set; }
         public int down_mbps { get; set; }
     }
+
+    [Serializable]
+    public class ClashUIItem
+    {
+        public ERuleMode ruleMode { get; set; }
+        public bool enableIPv6 { get; set; }
+        public bool enableMixinContent { get; set; }
+        public int proxiesSorting { get; set; }
+        public bool proxiesAutoRefresh { get; set; }
+        public int proxiesAutoDelayTestInterval { get; set; } = 10;
+        public int connectionsSorting { get; set; }
+        public bool connectionsAutoRefresh { get; set; }
+        public int connectionsRefreshInterval { get; set; } = 2;
+    }
+
+    [Serializable]
+    public class SystemProxyItem
+    {
+        public ESysProxyType sysProxyType { get; set; }
+        public string systemProxyExceptions { get; set; }
+        public bool notProxyLocalAddress { get; set; } = true;
+        public string systemProxyAdvancedProtocol { get; set; }
+    }
 }

v2rayN/v2rayN/Models/CoreInfo.cs

@@ -1,4 +1,6 @@
-namespace v2rayN.Model
+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.Model
+namespace v2rayN.Models
 {
     [Serializable]
     public class DNSItem
@@ -15,5 +16,6 @@ namespace v2rayN.Model
         public string? normalDNS { get; set; }
         public string? tunDNS { get; set; }
         public string? domainStrategy4Freedom { get; set; }
+        public string? domainDNSAddress { get; set; }
     }
 }

v2rayN/v2rayN/Models/GitHubRelease.cs

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

v2rayN/v2rayN/Models/ProfileExItem.cs

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

v2rayN/v2rayN/Models/ProfileItem.cs

@@ -1,6 +1,7 @@
 using SQLite;
+using v2rayN.Enums;
 
-namespace v2rayN.Model
+namespace v2rayN.Models
 {
     [Serializable]
     public class ProfileItem
@@ -48,7 +49,7 @@ namespace v2rayN.Model
             switch (configType)
             {
                 case EConfigType.Custom:
-                    summary += string.Format("{0}", remarks);
+                    summary += string.Format("[{1}]{0}", remarks, coreType.ToString());
                     break;
 
                 default:
@@ -60,19 +61,19 @@ namespace v2rayN.Model
 
         public List<string> GetAlpn()
         {
-            if (Utile.IsNullOrEmpty(alpn))
+            if (Utils.IsNullOrEmpty(alpn))
             {
                 return null;
             }
             else
             {
-                return Utile.String2List(alpn);
+                return Utils.String2List(alpn);
             }
         }
 
         public string GetNetwork()
         {
-            if (Utile.IsNullOrEmpty(network) || !Global.Networks.Contains(network))
+            if (Utils.IsNullOrEmpty(network) || !Global.Networks.Contains(network))
             {
                 return Global.DefaultNetwork;
             }

v2rayN/v2rayN/Models/ProfileItemModel.cs

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

v2rayN/v2rayN/Models/RoutingItem.cs

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

v2rayN/v2rayN/Models/RoutingItemModel.cs

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

v2rayN/v2rayN/Models/RulesItem.cs

@@ -0,0 +1,26 @@
+namespace v2rayN.Models
+{
+    [Serializable]
+    public class RulesItem
+    {
+        public string id { get; set; }
+        public string? type { get; set; }
+
+        public string? port { get; set; }
+        public string? network { get; set; }
+
+        public List<string>? inboundTag { get; set; }
+
+        public string? outboundTag { get; set; }
+
+        public List<string>? ip { get; set; }
+
+        public List<string>? domain { get; set; }
+
+        public List<string>? protocol { get; set; }
+
+        public List<string>? process { get; set; }
+
+        public bool enabled { get; set; } = true;
+    }
+}

v2rayN/v2rayN/Models/RulesItemModel.cs

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

v2rayN/v2rayN/Models/ServerSpeedItem.cs

@@ -1,7 +1,7 @@
-namespace v2rayN.Model
+namespace v2rayN.Models
 {
     [Serializable]
-    internal class ServerSpeedItem : ServerStatItem
+    public class ServerSpeedItem : ServerStatItem
     {
         public long proxyUp
         {

v2rayN/v2rayN/Models/ServerStatItem.cs

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

v2rayN/v2rayN/Models/ServerTestItem.cs

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

v2rayN/v2rayN/Models/SingboxConfig.cs

@@ -1,13 +1,13 @@
-namespace v2rayN.Model
+namespace v2rayN.Models
 {
     public class SingboxConfig
     {
         public Log4Sbox log { get; set; }
-        public object dns { get; set; }
+        public Dns4Sbox? dns { get; set; }
         public List<Inbound4Sbox> inbounds { get; set; }
         public List<Outbound4Sbox> outbounds { get; set; }
         public Route4Sbox route { get; set; }
-        public Experimental4Sbox experimental { get; set; }
+        public Experimental4Sbox? experimental { get; set; }
     }
 
     public class Log4Sbox
@@ -15,7 +15,7 @@
         public bool? disabled { get; set; }
         public string level { get; set; }
         public string output { get; set; }
-        public bool timestamp { get; set; }
+        public bool? timestamp { get; set; }
     }
 
     public class Dns4Sbox
@@ -28,6 +28,7 @@
         public bool? disable_expire { get; set; }
         public bool? independent_cache { get; set; }
         public bool? reverse_mapping { get; set; }
+        public string? client_subnet { get; set; }
         public Fakeip4Sbox? fakeip { get; set; }
     }
 
@@ -35,19 +36,24 @@
     {
         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 string? type { get; set; }
+        public string? mode { get; set; }
+        public bool? ip_is_private { get; set; }
+        public string? client_subnet { get; set; }
+        public bool? invert { get; set; }
+        public string? clash_mode { 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 List<string>? network { get; set; }
         public List<int>? port { get; set; }
         public List<string>? port_range { get; set; }
         public List<string>? geosite { get; set; }
@@ -58,8 +64,9 @@
         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; }
+        public List<Rule4Sbox>? rules { get; set; }
     }
 
     [Serializable]
@@ -93,7 +100,7 @@
     {
         public string type { get; set; }
         public string tag { get; set; }
-        public string server { get; set; }
+        public string? server { get; set; }
         public int? server_port { get; set; }
         public string uuid { get; set; }
         public string security { get; set; }
@@ -120,10 +127,12 @@
         public int? mtu { get; set; }
         public string? plugin { get; set; }
         public string? plugin_opts { get; set; }
-        public Tls4Sbox tls { get; set; }
-        public Multiplex4Sbox multiplex { get; set; }
-        public Transport4Sbox transport { get; set; }
-        public HyObfs4Sbox obfs { get; set; }
+        public Tls4Sbox? tls { get; set; }
+        public Multiplex4Sbox? multiplex { get; set; }
+        public Transport4Sbox? transport { get; set; }
+        public HyObfs4Sbox? obfs { get; set; }
+        public List<string>? outbounds { get; set; }
+        public bool? interrupt_exist_connections { get; set; }
     }
 
     public class Tls4Sbox
@@ -158,14 +167,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; }
     }
 
@@ -182,11 +191,13 @@
 
     public class Server4Sbox
     {
-        public string tag { get; set; }
-        public string address { get; set; }
-        public string address_resolver { get; set; }
-        public string strategy { get; set; }
-        public string detour { get; set; }
+        public string? tag { get; set; }
+        public string? address { get; set; }
+        public string? address_resolver { get; set; }
+        public string? address_strategy { get; set; }
+        public string? strategy { get; set; }
+        public string? detour { get; set; }
+        public string? client_subnet { get; set; }
     }
 
     public class Experimental4Sbox
@@ -230,4 +241,15 @@
         public string? cache_id { get; set; }
         public bool? store_fakeip { get; set; }
     }
+
+    public class Ruleset4Sbox
+    {
+        public string? tag { get; set; }
+        public string? type { get; set; }
+        public string? format { get; set; }
+        public string? path { get; set; }
+        public string? url { get; set; }
+        public string? download_detour { get; set; }
+        public string? update_interval { get; set; }
+    }
 }

v2rayN/v2rayN/Models/SsSIP008.cs

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

v2rayN/v2rayN/Models/SubItem.cs

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

v2rayN/v2rayN/Models/SysProxyConfig.cs

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

v2rayN/v2rayN/Models/V2rayConfig.cs

@@ -1,12 +1,17 @@
 using System.Text.Json.Serialization;
 
-namespace v2rayN.Model
+namespace v2rayN.Models
 {
     /// <summary>
     /// v2ray配置文件实体类 例子SampleConfig.txt
     /// </summary>
     public class V2rayConfig
     {
+        /// <summary>
+        /// Properties that do not belong to Ray
+        /// </summary>
+        public string? remarks { get; set; }
+
         /// <summary>
         /// 日志配置
         /// </summary>
@@ -190,7 +195,7 @@ namespace v2rayN.Model
     public class Sniffing4Ray
     {
         public bool enabled { get; set; }
-        public List<string> destOverride { get; set; }
+        public List<string>? destOverride { get; set; }
         public bool routeOnly { get; set; }
     }
 
@@ -227,7 +232,7 @@ namespace v2rayN.Model
         /// <summary>
         ///
         /// </summary>
-        public List<VnextItem4Ray> vnext { get; set; }
+        public List<VnextItem4Ray>? vnext { get; set; }
 
         /// <summary>
         ///
@@ -248,6 +253,8 @@ namespace v2rayN.Model
         ///
         /// </summary>
         public int? userLevel { get; set; }
+
+        public FragmentItem4Ray? fragment { get; set; }
     }
 
     public class VnextItem4Ray
@@ -283,17 +290,17 @@ namespace v2rayN.Model
         /// <summary>
         ///
         /// </summary>
-        public string method { get; set; }
+        public string? method { get; set; }
 
         /// <summary>
         ///
         /// </summary>
-        public bool ota { get; set; }
+        public bool? ota { get; set; }
 
         /// <summary>
         ///
         /// </summary>
-        public string password { get; set; }
+        public string? password { get; set; }
 
         /// <summary>
         ///
@@ -303,7 +310,7 @@ namespace v2rayN.Model
         /// <summary>
         ///
         /// </summary>
-        public int level { get; set; }
+        public int? level { get; set; }
 
         /// <summary>
         /// trojan
@@ -331,7 +338,7 @@ namespace v2rayN.Model
         /// <summary>
         ///
         /// </summary>
-        public int level { get; set; }
+        public int? level { get; set; }
     }
 
     public class Mux4Ray
@@ -363,6 +370,12 @@ namespace v2rayN.Model
         public List<string> servers { get; set; }
     }
 
+    public class DnsServer4Ray
+    {
+        public string? address { get; set; }
+        public List<string>? domains { get; set; }
+    }
+
     public class Routing4Ray
     {
         /// <summary>
@@ -373,30 +386,47 @@ namespace v2rayN.Model
         /// <summary>
         ///
         /// </summary>
-        public string domainMatcher { get; set; }
+        public string? domainMatcher { get; set; }
 
         /// <summary>
         ///
         /// </summary>
         public List<RulesItem4Ray> rules { get; set; }
+
+        public List<BalancersItem4Ray>? balancers { get; set; }
     }
 
     [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 string? network { 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 string? balancerTag { get; set; }
 
-        public List<string> domain { get; set; }
+        public List<string>? ip { get; set; }
 
-        public List<string> protocol { get; set; }
+        public List<string>? domain { get; set; }
+
+        public List<string>? protocol { get; set; }
+    }
+
+    public class BalancersItem4Ray
+    {
+        public List<string>? selector { get; set; }
+        public BalancersStrategy4Ray? strategy { get; set; }
+        public string? tag { get; set; }
+    }
+
+    public class BalancersStrategy4Ray
+    {
+        public string? type { get; set; }
     }
 
     public class StreamSettings4Ray
@@ -414,42 +444,52 @@ namespace v2rayN.Model
         /// <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 +516,7 @@ namespace v2rayN.Model
 
         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 +623,30 @@ namespace v2rayN.Model
         public string UserAgent { get; set; }
     }
 
+    public class HttpupgradeSettings4Ray
+    {
+        /// <summary>
+        ///
+        /// </summary>
+        public string? path { get; set; }
+
+        /// <summary>
+        ///
+        /// </summary>
+        public string? host { get; set; }
+    }
+
+    public class 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 +680,8 @@ namespace v2rayN.Model
 
     public class GrpcSettings4Ray
     {
-        public string serviceName { get; set; }
+        public string? authority { get; set; }
+        public string? serviceName { get; set; }
         public bool multiMode { get; set; }
         public int idle_timeout { get; set; }
         public int health_check_timeout { get; set; }
@@ -641,4 +706,11 @@ namespace v2rayN.Model
     {
         public string? dialerProxy { get; set; }
     }
+
+    public class FragmentItem4Ray
+    {
+        public string? packets { get; set; }
+        public string? length { get; set; }
+        public string? interval { get; set; }
+    }
 }

v2rayN/v2rayN/Models/V2rayTcpRequest.cs

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

v2rayN/v2rayN/Models/VmessQRCode.cs

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

v2rayN/v2rayN/Resx/ResUI.Designer.cs

@@ -78,15 +78,6 @@ namespace v2rayN.Resx {
             }
         }
         
-        /// <summary>
-        ///   查找类似 Batch export subscription to clipboard successfully 的本地化字符串。
-        /// </summary>
-        public static string BatchExportSubscriptionSuccessfully {
-            get {
-                return ResourceManager.GetString("BatchExportSubscriptionSuccessfully", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 Batch export share URL to clipboard successfully 的本地化字符串。
         /// </summary>
@@ -222,15 +213,6 @@ namespace v2rayN.Resx {
             }
         }
         
-        /// <summary>
-        ///   查找类似 Please fill in the KCP parameters correctly 的本地化字符串。
-        /// </summary>
-        public static string FillKcpParameters {
-            get {
-                return ResourceManager.GetString("FillKcpParameters", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 Please fill in the local listening port 的本地化字符串。
         /// </summary>
@@ -285,15 +267,6 @@ namespace v2rayN.Resx {
             }
         }
         
-        /// <summary>
-        ///   查找类似 Is not the correct client configuration file, please check 的本地化字符串。
-        /// </summary>
-        public static string IncorrectClientConfiguration {
-            get {
-                return ResourceManager.GetString("IncorrectClientConfiguration", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 Is not the correct configuration, please check 的本地化字符串。
         /// </summary>
@@ -303,15 +276,6 @@ namespace v2rayN.Resx {
             }
         }
         
-        /// <summary>
-        ///   查找类似 Is not the correct server configuration file, please check 的本地化字符串。
-        /// </summary>
-        public static string IncorrectServerConfiguration {
-            get {
-                return ResourceManager.GetString("IncorrectServerConfiguration", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 Initial Configuration 的本地化字符串。
         /// </summary>
@@ -367,7 +331,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Automatic update interval(minutes) 的本地化字符串。
+        ///   查找类似 Automatic update interval (minutes) 的本地化字符串。
         /// </summary>
         public static string LvAutoUpdateInterval {
             get {
@@ -412,7 +376,16 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Enabled Update 的本地化字符串。
+        ///   查找类似 Custom the rule-set of sing-box 的本地化字符串。
+        /// </summary>
+        public static string LvCustomRulesetPath4Singbox {
+            get {
+                return ResourceManager.GetString("LvCustomRulesetPath4Singbox", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Enable update 的本地化字符串。
         /// </summary>
         public static string LvEnabled {
             get {
@@ -439,7 +412,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 More urls, separated by commas;Subscription conversion will be invalid 的本地化字符串。
+        ///   查找类似 More URLs, separated by commas; Subscription conversion will be invalid 的本地化字符串。
         /// </summary>
         public static string LvMoreUrl {
             get {
@@ -466,7 +439,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Previous proxy remakrs 的本地化字符串。
+        ///   查找类似 Previous proxy remarks 的本地化字符串。
         /// </summary>
         public static string LvPrevProfile {
             get {
@@ -618,6 +591,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Add [Http] server 的本地化字符串。
+        /// </summary>
+        public static string menuAddHttpServer {
+            get {
+                return ResourceManager.GetString("menuAddHttpServer", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Add [Hysteria2] server 的本地化字符串。
         /// </summary>
@@ -735,6 +717,24 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Close Connection 的本地化字符串。
+        /// </summary>
+        public static string menuConnectionClose {
+            get {
+                return ResourceManager.GetString("menuConnectionClose", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Close All Connection 的本地化字符串。
+        /// </summary>
+        public static string menuConnectionCloseAll {
+            get {
+                return ResourceManager.GetString("menuConnectionCloseAll", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Clone selected server 的本地化字符串。
         /// </summary>
@@ -789,15 +789,6 @@ namespace v2rayN.Resx {
             }
         }
         
-        /// <summary>
-        ///   查找类似 Export subscription (base64) share to clipboard 的本地化字符串。
-        /// </summary>
-        public static string menuExport2SubContent {
-            get {
-                return ResourceManager.GetString("menuExport2SubContent", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 Global Hotkey Setting 的本地化字符串。
         /// </summary>
@@ -861,6 +852,42 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Direct 的本地化字符串。
+        /// </summary>
+        public static string menuModeDirect {
+            get {
+                return ResourceManager.GetString("menuModeDirect", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Global 的本地化字符串。
+        /// </summary>
+        public static string menuModeGlobal {
+            get {
+                return ResourceManager.GetString("menuModeGlobal", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Do not change 的本地化字符串。
+        /// </summary>
+        public static string menuModeNothing {
+            get {
+                return ResourceManager.GetString("menuModeNothing", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Rule 的本地化字符串。
+        /// </summary>
+        public static string menuModeRule {
+            get {
+                return ResourceManager.GetString("menuModeRule", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Move to bottom (B) 的本地化字符串。
         /// </summary>
@@ -942,15 +969,6 @@ namespace v2rayN.Resx {
             }
         }
         
-        /// <summary>
-        ///   查找类似 Set message filters 的本地化字符串。
-        /// </summary>
-        public static string menuMsgViewFilter {
-            get {
-                return ResourceManager.GetString("menuMsgViewFilter", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 Select all (Ctrl+A) 的本地化字符串。
         /// </summary>
@@ -960,6 +978,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Open the storage location 的本地化字符串。
+        /// </summary>
+        public static string menuOpenTheFileLocation {
+            get {
+                return ResourceManager.GetString("menuOpenTheFileLocation", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Option Setting 的本地化字符串。
         /// </summary>
@@ -969,6 +996,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Auto column width adjustment 的本地化字符串。
+        /// </summary>
+        public static string menuProfileAutofitColumnWidth {
+            get {
+                return ResourceManager.GetString("menuProfileAutofitColumnWidth", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Promotion 的本地化字符串。
         /// </summary>
@@ -978,6 +1014,42 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Latency Test 的本地化字符串。
+        /// </summary>
+        public static string menuProxiesDelaytest {
+            get {
+                return ResourceManager.GetString("menuProxiesDelaytest", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Part Node Latency Test 的本地化字符串。
+        /// </summary>
+        public static string menuProxiesDelaytestPart {
+            get {
+                return ResourceManager.GetString("menuProxiesDelaytestPart", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Refresh Proxies 的本地化字符串。
+        /// </summary>
+        public static string menuProxiesReload {
+            get {
+                return ResourceManager.GetString("menuProxiesReload", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Select active node (Enter) 的本地化字符串。
+        /// </summary>
+        public static string menuProxiesSelectActivity {
+            get {
+                return ResourceManager.GetString("menuProxiesSelectActivity", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Test servers real delay (Ctrl+R) 的本地化字符串。
         /// </summary>
@@ -1149,6 +1221,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Rule mode 的本地化字符串。
+        /// </summary>
+        public static string menuRulemode {
+            get {
+                return ResourceManager.GetString("menuRulemode", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Remove Rule (Delete) 的本地化字符串。
         /// </summary>
@@ -1176,6 +1257,24 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Multi-server load balancing 的本地化字符串。
+        /// </summary>
+        public static string menuSetDefaultLoadBalanceServer {
+            get {
+                return ResourceManager.GetString("menuSetDefaultLoadBalanceServer", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Multi-Server lowest latency 的本地化字符串。
+        /// </summary>
+        public static string menuSetDefaultMultipleServer {
+            get {
+                return ResourceManager.GetString("menuSetDefaultMultipleServer", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Set as active server (Enter) 的本地化字符串。
         /// </summary>
@@ -1267,7 +1366,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Subscription group 的本地化字符串。
+        ///   查找类似 Subscription Group 的本地化字符串。
         /// </summary>
         public static string menuSubscription {
             get {
@@ -1294,7 +1393,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Update subscription without proxy 的本地化字符串。
+        ///   查找类似 Update subscriptions without proxy 的本地化字符串。
         /// </summary>
         public static string menuSubUpdate {
             get {
@@ -1303,7 +1402,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Update subscription with proxy 的本地化字符串。
+        ///   查找类似 Update subscriptions with proxy 的本地化字符串。
         /// </summary>
         public static string menuSubUpdateViaProxy {
             get {
@@ -1365,15 +1464,6 @@ namespace v2rayN.Resx {
             }
         }
         
-        /// <summary>
-        ///   查找类似 Test current service status 的本地化字符串。
-        /// </summary>
-        public static string menuTestMe {
-            get {
-                return ResourceManager.GetString("menuTestMe", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 {0} Website 的本地化字符串。
         /// </summary>
@@ -1528,7 +1618,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Update subscription end 的本地化字符串。
+        ///   查找类似 Update subscriptions end 的本地化字符串。
         /// </summary>
         public static string MsgUpdateSubscriptionEnd {
             get {
@@ -1537,7 +1627,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Update subscription starts 的本地化字符串。
+        ///   查找类似 Update subscriptions start 的本地化字符串。
         /// </summary>
         public static string MsgUpdateSubscriptionStart {
             get {
@@ -1563,6 +1653,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>
@@ -1572,15 +1671,6 @@ namespace v2rayN.Resx {
             }
         }
         
-        /// <summary>
-        ///   查找类似 Non-standard service, this feature is invalid 的本地化字符串。
-        /// </summary>
-        public static string NonVmessService {
-            get {
-                return ResourceManager.GetString("NonVmessService", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 The Core file (file name: {1}) was not found under the folder ({0}), please download and put it in the folder, download address: {2} 的本地化字符串。
         /// </summary>
@@ -1807,7 +1897,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Group please leave blank here 的本地化字符串。
+        ///   查找类似 For group please leave blank here 的本地化字符串。
         /// </summary>
         public static string SubUrlTips {
             get {
@@ -1852,15 +1942,6 @@ namespace v2rayN.Resx {
             }
         }
         
-        /// <summary>
-        ///   查找类似 System proxy 的本地化字符串。
-        /// </summary>
-        public static string SystemProxy {
-            get {
-                return ResourceManager.GetString("SystemProxy", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 Address 的本地化字符串。
         /// </summary>
@@ -1960,6 +2041,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Connections 的本地化字符串。
+        /// </summary>
+        public static string TbConnections {
+            get {
+                return ResourceManager.GetString("TbConnections", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Core Type 的本地化字符串。
         /// </summary>
@@ -2230,6 +2320,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Proxies 的本地化字符串。
+        /// </summary>
+        public static string TbProxies {
+            get {
+                return ResourceManager.GetString("TbProxies", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 PublicKey 的本地化字符串。
         /// </summary>
@@ -2572,6 +2671,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Outbound DNS address 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsDomainDNSAddress {
+            get {
+                return ResourceManager.GetString("TbSettingsDomainDNSAddress", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Outbound Freedom domainStrategy 的本地化字符串。
         /// </summary>
@@ -2581,6 +2689,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Default domain strategy for outbound 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsDomainStrategy4Out {
+            get {
+                return ResourceManager.GetString("TbSettingsDomainStrategy4Out", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Double-click server make active 的本地化字符串。
         /// </summary>
@@ -2599,6 +2716,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Enable cache file for sing-box (ruleset files) 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsEnableCacheFile4Sbox {
+            get {
+                return ResourceManager.GetString("TbSettingsEnableCacheFile4Sbox", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Check for pre-release updates 的本地化字符串。
         /// </summary>
@@ -2626,6 +2752,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>
@@ -2761,6 +2905,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Main layout orientation(Require restart) 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsMainGirdOrientation {
+            get {
+                return ResourceManager.GetString("TbSettingsMainGirdOrientation", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 sing-box Mux Protocol 的本地化字符串。
         /// </summary>
@@ -2797,6 +2950,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Do not use proxy servers for local (intranet) addresses 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsNotProxyLocalAddress {
+            get {
+                return ResourceManager.GetString("TbSettingsNotProxyLocalAddress", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Auth pass 的本地化字符串。
         /// </summary>
@@ -2852,7 +3014,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 HTTP port=SOCKS port+1 的本地化字符串。
+        ///   查找类似 http port = +1; Pac port = +4; *ray API port = +5; mihomo API port = +6; 的本地化字符串。
         /// </summary>
         public static string TbSettingsSocksPortTip {
             get {
@@ -2959,78 +3121,6 @@ namespace v2rayN.Resx {
             }
         }
         
-        /// <summary>
-        ///   查找类似 Bypass Mode 的本地化字符串。
-        /// </summary>
-        public static string TbSettingsTunModeBypassMode {
-            get {
-                return ResourceManager.GetString("TbSettingsTunModeBypassMode", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   查找类似 Custom Template 的本地化字符串。
-        /// </summary>
-        public static string TbSettingsTunModeCustomTemplate {
-            get {
-                return ResourceManager.GetString("TbSettingsTunModeCustomTemplate", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   查找类似 Direct IP CIDR, separated by commas (,) 的本地化字符串。
-        /// </summary>
-        public static string TbSettingsTunModeDirectIP {
-            get {
-                return ResourceManager.GetString("TbSettingsTunModeDirectIP", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   查找类似 Direct Process name, separated by commas (,) 的本地化字符串。
-        /// </summary>
-        public static string TbSettingsTunModeDirectProcess {
-            get {
-                return ResourceManager.GetString("TbSettingsTunModeDirectProcess", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   查找类似 DNS object, e.g. {&quot;servers&quot;:[]} 的本地化字符串。
-        /// </summary>
-        public static string TbSettingsTunModeDNS {
-            get {
-                return ResourceManager.GetString("TbSettingsTunModeDNS", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   查找类似 Proxy IP CIDR, separated by commas (,) 的本地化字符串。
-        /// </summary>
-        public static string TbSettingsTunModeProxyIP {
-            get {
-                return ResourceManager.GetString("TbSettingsTunModeProxyIP", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   查找类似 Proxy Process name, separated by commas (,) 的本地化字符串。
-        /// </summary>
-        public static string TbSettingsTunModeProxyProcess {
-            get {
-                return ResourceManager.GetString("TbSettingsTunModeProxyProcess", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   查找类似 Show console 的本地化字符串。
-        /// </summary>
-        public static string TbSettingsTunModeShowWindow {
-            get {
-                return ResourceManager.GetString("TbSettingsTunModeShowWindow", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 Enable UDP 的本地化字符串。
         /// </summary>
@@ -3076,6 +3166,123 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Sorting 的本地化字符串。
+        /// </summary>
+        public static string TbSorting {
+            get {
+                return ResourceManager.GetString("TbSorting", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Chain 的本地化字符串。
+        /// </summary>
+        public static string TbSortingChain {
+            get {
+                return ResourceManager.GetString("TbSortingChain", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Default 的本地化字符串。
+        /// </summary>
+        public static string TbSortingDefault {
+            get {
+                return ResourceManager.GetString("TbSortingDefault", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Delay 的本地化字符串。
+        /// </summary>
+        public static string TbSortingDelay {
+            get {
+                return ResourceManager.GetString("TbSortingDelay", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Download Speed 的本地化字符串。
+        /// </summary>
+        public static string TbSortingDownSpeed {
+            get {
+                return ResourceManager.GetString("TbSortingDownSpeed", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Download Traffic 的本地化字符串。
+        /// </summary>
+        public static string TbSortingDownTraffic {
+            get {
+                return ResourceManager.GetString("TbSortingDownTraffic", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Host 的本地化字符串。
+        /// </summary>
+        public static string TbSortingHost {
+            get {
+                return ResourceManager.GetString("TbSortingHost", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Name 的本地化字符串。
+        /// </summary>
+        public static string TbSortingName {
+            get {
+                return ResourceManager.GetString("TbSortingName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Network 的本地化字符串。
+        /// </summary>
+        public static string TbSortingNetwork {
+            get {
+                return ResourceManager.GetString("TbSortingNetwork", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Time 的本地化字符串。
+        /// </summary>
+        public static string TbSortingTime {
+            get {
+                return ResourceManager.GetString("TbSortingTime", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Type 的本地化字符串。
+        /// </summary>
+        public static string TbSortingType {
+            get {
+                return ResourceManager.GetString("TbSortingType", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Upload Speed 的本地化字符串。
+        /// </summary>
+        public static string TbSortingUpSpeed {
+            get {
+                return ResourceManager.GetString("TbSortingUpSpeed", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Upload Traffic 的本地化字符串。
+        /// </summary>
+        public static string TbSortingUpTraffic {
+            get {
+                return ResourceManager.GetString("TbSortingUpTraffic", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 SpiderX 的本地化字符串。
         /// </summary>
@@ -3149,7 +3356,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 {
@@ -3157,15 +3364,6 @@ namespace v2rayN.Resx {
             }
         }
         
-        /// <summary>
-        ///   查找类似 Too many servers, please open the main interface 的本地化字符串。
-        /// </summary>
-        public static string TooManyServersTip {
-            get {
-                return ResourceManager.GetString("TooManyServersTip", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 *tcp camouflage type 的本地化字符串。
         /// </summary>
@@ -3203,7 +3401,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 *ws path 的本地化字符串。
+        ///   查找类似 *ws/httpupgrade/splithttp path 的本地化字符串。
         /// </summary>
         public static string TransportPathTip1 {
             get {
@@ -3257,7 +3455,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 *ws host 的本地化字符串。
+        ///   查找类似 *ws/httpupgrade/splithttp host 的本地化字符串。
         /// </summary>
         public static string TransportRequestHostTip2 {
             get {
@@ -3283,6 +3481,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

@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="BatchExportSubscriptionSuccessfully" xml:space="preserve">
-    <value>صادرات دسته ای محتوای اشتراک به کلیپ بورد با موفقیت انجام شد</value>
-  </data>
   <data name="BatchExportURLSuccessfully" xml:space="preserve">
     <value>Batch export share URL to clipboard successfully</value>
   </data>
@@ -159,9 +156,6 @@
   <data name="FillCorrectServerPort" xml:space="preserve">
     <value>لطفا فرمت صحیح پورت سرور را پر کنید</value>
   </data>
-  <data name="FillKcpParameters" xml:space="preserve">
-    <value>لطفاً پارامترهای KCP را به درستی پر کنید</value>
-  </data>
   <data name="FillLocalListeningPort" xml:space="preserve">
     <value>لطفاً پورت گوش دادن محلی را پر کنید</value>
   </data>
@@ -174,15 +168,9 @@
   <data name="FillUUID" xml:space="preserve">
     <value>لطفا شناسه کاربری را وارد کنید</value>
   </data>
-  <data name="IncorrectClientConfiguration" xml:space="preserve">
-    <value>فایل پیکربندی مشتری صحیح نیست، لطفا بررسی کنید</value>
-  </data>
   <data name="Incorrectconfiguration" xml:space="preserve">
     <value>پیکربندی درستی نیست، لطفا بررسی کنید</value>
   </data>
-  <data name="IncorrectServerConfiguration" xml:space="preserve">
-    <value>فایل پیکربندی سرور صحیح نیست، لطفا بررسی کنید</value>
-  </data>
   <data name="InitialConfiguration" xml:space="preserve">
     <value>پیکربندی اولیه</value>
   </data>
@@ -267,9 +255,6 @@
   <data name="NonvmessOrssProtocol" xml:space="preserve">
     <value>Non-VMess or ss protocol</value>
   </data>
-  <data name="NonVmessService" xml:space="preserve">
-    <value> non-standard service, this feature is invalid</value>
-  </data>
   <data name="NotFoundCore" xml:space="preserve">
     <value>The Core file (file name: {1}) was not found under the folder ({0}), please download and put it in the folder, download address: {2}</value>
   </data>
@@ -415,15 +400,9 @@
   <data name="FillServerAddressCustom" xml:space="preserve">
     <value>Please browse to import server configuration</value>
   </data>
-  <data name="SystemProxy" xml:space="preserve">
-    <value>پروکسی سیستم</value>
-  </data>
   <data name="Speedtesting" xml:space="preserve">
     <value>درحال تست کردن...</value>
   </data>
-  <data name="TooManyServersTip" xml:space="preserve">
-    <value>تعداد سرورها خیلی زیاد است، لطفا رابط اصلی را باز کنید</value>
-  </data>
   <data name="LabLAN" xml:space="preserve">
     <value>LAN</value>
   </data>
@@ -541,18 +520,12 @@
   <data name="menuTcpingServer" xml:space="preserve">
     <value>تست سرورها با tcping (Ctrl+O)</value>
   </data>
-  <data name="menuTestMe" xml:space="preserve">
-    <value>وضعیت سرویس فعلی را تست کنید</value>
-  </data>
   <data name="menuExport2ClientConfig" xml:space="preserve">
     <value>سرور انتخابی را برای پیکربندی کلاینت صادر کنید</value>
   </data>
   <data name="menuExport2ShareUrl" xml:space="preserve">
     <value>URL های اشتراک گذاری را به کلیپ بورد صادر کنید (Ctrl+C)</value>
   </data>
-  <data name="menuExport2SubContent" xml:space="preserve">
-    <value>اشتراک (base64) را به کلیپ بورد صادر کنید</value>
-  </data>
   <data name="menuAddCustomServer" xml:space="preserve">
     <value>یک سرور پیکربندی سفارشی اضافه شود</value>
   </data>
@@ -583,9 +556,6 @@
   <data name="menuMsgViewCopyAll" xml:space="preserve">
     <value>کپی همه</value>
   </data>
-  <data name="menuMsgViewFilter" xml:space="preserve">
-    <value>فیلترهای پیام را تنظیم کنید</value>
-  </data>
   <data name="menuMsgViewSelectAll" xml:space="preserve">
     <value>انتخاب همه (Ctrl+A)</value>
   </data>
@@ -698,7 +668,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>
@@ -955,6 +925,9 @@
   <data name="TbSettingsRouteOnly" xml:space="preserve">
     <value>فقط مسیر</value>
   </data>
+  <data name="TbSettingsNotProxyLocalAddress" xml:space="preserve">
+    <value>يەرلىك (Intranet) ئادرېسلارغا ۋاكالەتچى مۇلازىمېتىر ئىشلەتمەڭ</value>
+  </data>
   <data name="menuMixedTestServer" xml:space="preserve">
     <value>One-click test Latency and speed (Ctrl+E)</value>
   </data>
@@ -985,15 +958,6 @@
   <data name="TbSettingsTunMode" xml:space="preserve">
     <value>تنظیمات TunMode</value>
   </data>
-  <data name="TbSettingsTunModeDirectIP" xml:space="preserve">
-    <value>Direct IP CIDR, separated by commas (,)</value>
-  </data>
-  <data name="TbSettingsTunModeDirectProcess" xml:space="preserve">
-    <value>Direct Process name, separated by commas (,)</value>
-  </data>
-  <data name="TbSettingsTunModeShowWindow" xml:space="preserve">
-    <value>نمایش کنسول</value>
-  </data>
   <data name="TbSettingsDefUserAgent" xml:space="preserve">
     <value>User-Agent</value>
   </data>
@@ -1003,4 +967,70 @@
   <data name="TbSettingsEnableHWA" xml:space="preserve">
     <value>فعال‌سازی شتاب‌دهنده سخت‌افزاری (نیاز به راه‌اندازی مجدد)</value>
   </data>
+  <data name="TbSettingsEnableCacheFile4Sbox" xml:space="preserve">
+    <value>فعال کردن کش فایل مجموعه قوانین برای sing-box</value>
+  </data>
+  <data name="TbSorting" xml:space="preserve">
+    <value>مرتب سازی</value>
+  </data>
+  <data name="TbSortingDefault" xml:space="preserve">
+    <value>Default</value>
+  </data>
+  <data name="TbSortingDelay" xml:space="preserve">
+    <value>تاخیر</value>
+  </data>
+  <data name="TbSortingDownSpeed" xml:space="preserve">
+    <value>سرعت دانلود</value>
+  </data>
+  <data name="TbSortingDownTraffic" xml:space="preserve">
+    <value>ترافیک دانلود</value>
+  </data>
+  <data name="TbSortingName" xml:space="preserve">
+    <value>نام</value>
+  </data>
+  <data name="TbSortingTime" xml:space="preserve">
+    <value>زمان</value>
+  </data>
+  <data name="TbSortingUpSpeed" xml:space="preserve">
+    <value>سرعت اپلود</value>
+  </data>
+  <data name="TbSortingUpTraffic" xml:space="preserve">
+    <value>ترافیک آپلود</value>
+  </data>
+  <data name="TbConnections" xml:space="preserve">
+    <value>اتصالات</value>
+  </data>
+  <data name="menuConnectionClose" xml:space="preserve">
+    <value>بستن اتصال</value>
+  </data>
+  <data name="menuConnectionCloseAll" xml:space="preserve">
+    <value>تمام اتصالات را ببندید</value>
+  </data>
+  <data name="TbProxies" xml:space="preserve">
+    <value>پروکسی</value>
+  </data>
+  <data name="menuRulemode" xml:space="preserve">
+    <value>نوع قانون</value>
+  </data>
+  <data name="menuModeDirect" xml:space="preserve">
+    <value>Direct</value>
+  </data>
+  <data name="menuModeGlobal" xml:space="preserve">
+    <value>Global</value>
+  </data>
+  <data name="menuModeNothing" xml:space="preserve">
+    <value>تغییر نده</value>
+  </data>
+  <data name="menuModeRule" xml:space="preserve">
+    <value>قانون</value>
+  </data>
+  <data name="menuProxiesDelaytest" xml:space="preserve">
+    <value>Latency Test</value>
+  </data>
+  <data name="menuProxiesDelaytestPart" xml:space="preserve">
+    <value>Part Node Latency Test</value>
+  </data>
+  <data name="menuProxiesSelectActivity" xml:space="preserve">
+    <value>Select active node (Enter)</value>
+  </data>
 </root>

v2rayN/v2rayN/Resx/ResUI.resx

@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="BatchExportSubscriptionSuccessfully" xml:space="preserve">
-    <value>Batch export subscription to clipboard successfully</value>
-  </data>
   <data name="BatchExportURLSuccessfully" xml:space="preserve">
     <value>Batch export share URL to clipboard successfully</value>
   </data>
@@ -159,9 +156,6 @@
   <data name="FillCorrectServerPort" xml:space="preserve">
     <value>Please fill in the correct format server port</value>
   </data>
-  <data name="FillKcpParameters" xml:space="preserve">
-    <value>Please fill in the KCP parameters correctly</value>
-  </data>
   <data name="FillLocalListeningPort" xml:space="preserve">
     <value>Please fill in the local listening port</value>
   </data>
@@ -174,15 +168,9 @@
   <data name="FillUUID" xml:space="preserve">
     <value>Please fill in the user ID</value>
   </data>
-  <data name="IncorrectClientConfiguration" xml:space="preserve">
-    <value>Is not the correct client configuration file, please check</value>
-  </data>
   <data name="Incorrectconfiguration" xml:space="preserve">
     <value>Is not the correct configuration, please check</value>
   </data>
-  <data name="IncorrectServerConfiguration" xml:space="preserve">
-    <value>Is not the correct server configuration file, please check</value>
-  </data>
   <data name="InitialConfiguration" xml:space="preserve">
     <value>Initial Configuration</value>
   </data>
@@ -253,10 +241,10 @@
     <value>Is unpacking......</value>
   </data>
   <data name="MsgUpdateSubscriptionEnd" xml:space="preserve">
-    <value>Update subscription end</value>
+    <value>Update subscriptions end</value>
   </data>
   <data name="MsgUpdateSubscriptionStart" xml:space="preserve">
-    <value>Update subscription starts</value>
+    <value>Update subscriptions start</value>
   </data>
   <data name="MsgUpdateV2rayCoreSuccessfully" xml:space="preserve">
     <value>Update Core successfully</value>
@@ -267,9 +255,6 @@
   <data name="NonvmessOrssProtocol" xml:space="preserve">
     <value>Non-VMess or ss protocol</value>
   </data>
-  <data name="NonVmessService" xml:space="preserve">
-    <value>Non-standard service, this feature is invalid</value>
-  </data>
   <data name="NotFoundCore" xml:space="preserve">
     <value>The Core file (file name: {1}) was not found under the folder ({0}), please download and put it in the folder, download address: {2}</value>
   </data>
@@ -359,7 +344,7 @@
     <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>
@@ -374,7 +359,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>
@@ -415,15 +400,9 @@
   <data name="FillServerAddressCustom" xml:space="preserve">
     <value>Please browse to import server configuration</value>
   </data>
-  <data name="SystemProxy" xml:space="preserve">
-    <value>System proxy</value>
-  </data>
   <data name="Speedtesting" xml:space="preserve">
     <value>Testing...</value>
   </data>
-  <data name="TooManyServersTip" xml:space="preserve">
-    <value>Too many servers, please open the main interface</value>
-  </data>
   <data name="LabLAN" xml:space="preserve">
     <value>LAN</value>
   </data>
@@ -473,16 +452,16 @@
     <value>Update current subscription with proxy</value>
   </data>
   <data name="menuSubscription" xml:space="preserve">
-    <value>Subscription group</value>
+    <value>Subscription Group</value>
   </data>
   <data name="menuSubSetting" xml:space="preserve">
     <value>Subscription group settings</value>
   </data>
   <data name="menuSubUpdate" xml:space="preserve">
-    <value>Update subscription without proxy</value>
+    <value>Update subscriptions without proxy</value>
   </data>
   <data name="menuSubUpdateViaProxy" xml:space="preserve">
-    <value>Update subscription with proxy</value>
+    <value>Update subscriptions with proxy</value>
   </data>
   <data name="menuSystemproxy" xml:space="preserve">
     <value>System proxy</value>
@@ -544,18 +523,12 @@
   <data name="menuTcpingServer" xml:space="preserve">
     <value>Test servers with tcping (Ctrl+O)</value>
   </data>
-  <data name="menuTestMe" xml:space="preserve">
-    <value>Test current service status</value>
-  </data>
   <data name="menuExport2ClientConfig" xml:space="preserve">
     <value>Export selected server for client configuration</value>
   </data>
   <data name="menuExport2ShareUrl" xml:space="preserve">
     <value>Export share URLs to clipboard (Ctrl+C)</value>
   </data>
-  <data name="menuExport2SubContent" xml:space="preserve">
-    <value>Export subscription (base64) share to clipboard</value>
-  </data>
   <data name="menuAddCustomServer" xml:space="preserve">
     <value>Add a custom configuration server</value>
   </data>
@@ -586,9 +559,6 @@
   <data name="menuMsgViewCopyAll" xml:space="preserve">
     <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>
   </data>
@@ -605,7 +575,7 @@
     <value>Share</value>
   </data>
   <data name="LvEnabled" xml:space="preserve">
-    <value>Enabled Update</value>
+    <value>Enable update</value>
   </data>
   <data name="LvSort" xml:space="preserve">
     <value>Sort</value>
@@ -701,7 +671,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>
@@ -947,7 +917,7 @@
     <value>Support DnsObject, Click to view the document</value>
   </data>
   <data name="SubUrlTips" xml:space="preserve">
-    <value>Group please leave blank here</value>
+    <value>For group please leave blank here</value>
   </data>
   <data name="TipChangeRouting" xml:space="preserve">
     <value>Routing setting is changed</value>
@@ -958,6 +928,9 @@
   <data name="TbSettingsRouteOnly" xml:space="preserve">
     <value>RouteOnly</value>
   </data>
+  <data name="TbSettingsNotProxyLocalAddress" xml:space="preserve">
+    <value>Do not use proxy servers for local (intranet) addresses</value>
+  </data>
   <data name="menuMixedTestServer" xml:space="preserve">
     <value>One-click multi test Latency and speed (Ctrl+E)</value>
   </data>
@@ -988,21 +961,9 @@
   <data name="TbSettingsTunMode" xml:space="preserve">
     <value>TunMode settings</value>
   </data>
-  <data name="TbSettingsTunModeDirectIP" xml:space="preserve">
-    <value>Direct IP CIDR, separated by commas (,)</value>
-  </data>
-  <data name="TbSettingsTunModeDirectProcess" xml:space="preserve">
-    <value>Direct Process name, separated by commas (,)</value>
-  </data>
-  <data name="TbSettingsTunModeShowWindow" xml:space="preserve">
-    <value>Show console</value>
-  </data>
   <data name="menuMoveToGroup" xml:space="preserve">
     <value>Move to group</value>
   </data>
-  <data name="TbSettingsTunModeCustomTemplate" xml:space="preserve">
-    <value>Custom Template</value>
-  </data>
   <data name="TbSettingsEnableDragDropSort" xml:space="preserve">
     <value>Enable Server Drag Drop Sort(Require restart)</value>
   </data>
@@ -1037,7 +998,7 @@
     <value>Copy the font TTF/TTC file to the directory guiFonts, restart the settings</value>
   </data>
   <data name="TbSettingsSocksPortTip" xml:space="preserve">
-    <value>HTTP port=SOCKS port+1</value>
+    <value>http port = +1; Pac port = +4; *ray API port = +5; mihomo API port = +6;</value>
   </data>
   <data name="TbSettingsStartBootTip" xml:space="preserve">
     <value>Set this with admin privileges, get admin privileges after startup</value>
@@ -1045,24 +1006,12 @@
   <data name="TbSettingsFontSize" xml:space="preserve">
     <value>Font Size</value>
   </data>
-  <data name="TbSettingsTunModeProxyIP" xml:space="preserve">
-    <value>Proxy IP CIDR, separated by commas (,)</value>
-  </data>
-  <data name="TbSettingsTunModeProxyProcess" xml:space="preserve">
-    <value>Proxy Process name, separated by commas (,)</value>
-  </data>
-  <data name="TbSettingsTunModeBypassMode" xml:space="preserve">
-    <value>Bypass Mode</value>
-  </data>
   <data name="TbSettingsSpeedTestTimeout" xml:space="preserve">
     <value>SpeedTest Single Timeout Value</value>
   </data>
   <data name="TbSettingsSpeedTestUrl" xml:space="preserve">
     <value>SpeedTest URL</value>
   </data>
-  <data name="TbSettingsTunModeDNS" xml:space="preserve">
-    <value>DNS object, e.g. {"servers":[]}</value>
-  </data>
   <data name="menuMoveTo" xml:space="preserve">
     <value>Move up and down</value>
   </data>
@@ -1091,13 +1040,13 @@
     <value>Restart as Administrator</value>
   </data>
   <data name="LvMoreUrl" xml:space="preserve">
-    <value>More urls, separated by commas;Subscription conversion will be invalid</value>
+    <value>More URLs, separated by commas; Subscription conversion will be invalid</value>
   </data>
   <data name="SpeedDisplayText" xml:space="preserve">
     <value>{0} : {1}/s↑ | {2}/s↓</value>
   </data>
   <data name="LvAutoUpdateInterval" xml:space="preserve">
-    <value>Automatic update interval(minutes)</value>
+    <value>Automatic update interval (minutes)</value>
   </data>
   <data name="TbSettingsLogEnabledToFile" xml:space="preserve">
     <value>Enable logging to file</value>
@@ -1151,7 +1100,7 @@
     <value>Congestion control</value>
   </data>
   <data name="LvPrevProfile" xml:space="preserve">
-    <value>Previous proxy remakrs</value>
+    <value>Previous proxy remarks</value>
   </data>
   <data name="LvNextProfile" xml:space="preserve">
     <value>Next proxy remarks</value>
@@ -1195,4 +1144,124 @@
   <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>
+  <data name="TbSorting" xml:space="preserve">
+    <value>Sorting</value>
+  </data>
+  <data name="TbSortingChain" xml:space="preserve">
+    <value>Chain</value>
+  </data>
+  <data name="TbSortingDefault" xml:space="preserve">
+    <value>Default</value>
+  </data>
+  <data name="TbSortingDelay" xml:space="preserve">
+    <value>Delay</value>
+  </data>
+  <data name="TbSortingDownSpeed" xml:space="preserve">
+    <value>Download Speed</value>
+  </data>
+  <data name="TbSortingDownTraffic" xml:space="preserve">
+    <value>Download Traffic</value>
+  </data>
+  <data name="TbSortingHost" xml:space="preserve">
+    <value>Host</value>
+  </data>
+  <data name="TbSortingName" xml:space="preserve">
+    <value>Name</value>
+  </data>
+  <data name="TbSortingNetwork" xml:space="preserve">
+    <value>Network</value>
+  </data>
+  <data name="TbSortingTime" xml:space="preserve">
+    <value>Time</value>
+  </data>
+  <data name="TbSortingType" xml:space="preserve">
+    <value>Type</value>
+  </data>
+  <data name="TbSortingUpSpeed" xml:space="preserve">
+    <value>Upload Speed</value>
+  </data>
+  <data name="TbSortingUpTraffic" xml:space="preserve">
+    <value>Upload Traffic</value>
+  </data>
+  <data name="TbConnections" xml:space="preserve">
+    <value>Connections</value>
+  </data>
+  <data name="menuConnectionClose" xml:space="preserve">
+    <value>Close Connection</value>
+  </data>
+  <data name="menuConnectionCloseAll" xml:space="preserve">
+    <value>Close All Connection</value>
+  </data>
+  <data name="TbProxies" xml:space="preserve">
+    <value>Proxies</value>
+  </data>
+  <data name="menuRulemode" xml:space="preserve">
+    <value>Rule mode</value>
+  </data>
+  <data name="menuModeDirect" xml:space="preserve">
+    <value>Direct</value>
+  </data>
+  <data name="menuModeGlobal" xml:space="preserve">
+    <value>Global</value>
+  </data>
+  <data name="menuModeNothing" xml:space="preserve">
+    <value>Do not change</value>
+  </data>
+  <data name="menuModeRule" xml:space="preserve">
+    <value>Rule</value>
+  </data>
+  <data name="menuProxiesDelaytest" xml:space="preserve">
+    <value>Latency Test</value>
+  </data>
+  <data name="menuProxiesDelaytestPart" xml:space="preserve">
+    <value>Part Node Latency Test</value>
+  </data>
+  <data name="menuProxiesReload" xml:space="preserve">
+    <value>Refresh Proxies</value>
+  </data>
+  <data name="menuProxiesSelectActivity" xml:space="preserve">
+    <value>Select active node (Enter)</value>
+  </data>
+  <data name="TbSettingsDomainStrategy4Out" xml:space="preserve">
+    <value>Default domain strategy for outbound</value>
+  </data>
+  <data name="menuSetDefaultMultipleServer" xml:space="preserve">
+    <value>Multi-Server lowest latency</value>
+  </data>
+  <data name="TbSettingsMainGirdOrientation" xml:space="preserve">
+    <value>Main layout orientation(Require restart)</value>
+  </data>
+  <data name="menuSetDefaultLoadBalanceServer" xml:space="preserve">
+    <value>Multi-server load balancing</value>
+  </data>
+  <data name="TbSettingsDomainDNSAddress" xml:space="preserve">
+    <value>Outbound DNS address</value>
+  </data>
+  <data name="menuProfileAutofitColumnWidth" xml:space="preserve">
+    <value>Auto column width adjustment</value>
+  </data>
 </root>

v2rayN/v2rayN/Resx/ResUI.ru.resx

@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="BatchExportSubscriptionSuccessfully" xml:space="preserve">
-    <value>Экспортирование подписок в буфер обмена успешно завершено</value>
-  </data>
   <data name="BatchExportURLSuccessfully" xml:space="preserve">
     <value>Экспортирование URL в буфер обмена успешно завершено</value>
   </data>
@@ -159,9 +156,6 @@
   <data name="FillCorrectServerPort" xml:space="preserve">
     <value>Пожалуйста, укажите порт сервера в правильном формате</value>
   </data>
-  <data name="FillKcpParameters" xml:space="preserve">
-    <value>Пожалуйста, заполните параметры KCP корректно</value>
-  </data>
   <data name="FillLocalListeningPort" xml:space="preserve">
     <value>Пожалуйста, укажите локальный порт прослушивания</value>
   </data>
@@ -174,15 +168,9 @@
   <data name="FillUUID" xml:space="preserve">
     <value>Пожалуйста, заполните идентификатор пользователя</value>
   </data>
-  <data name="IncorrectClientConfiguration" xml:space="preserve">
-    <value>Некорректный файл конфигурации клиента, пожалуйста, проверьте</value>
-  </data>
   <data name="Incorrectconfiguration" xml:space="preserve">
     <value>Некорректная конфигурация, пожалуйста, проверьте</value>
   </data>
-  <data name="IncorrectServerConfiguration" xml:space="preserve">
-    <value>Некорректный файл конфигурации сервера, пожалуйста, проверьте</value>
-  </data>
   <data name="InitialConfiguration" xml:space="preserve">
     <value>Исходная конфигурация</value>
   </data>
@@ -267,9 +255,6 @@
   <data name="NonvmessOrssProtocol" xml:space="preserve">
     <value>Не является протоколом Vmess или SS</value>
   </data>
-  <data name="NonVmessService" xml:space="preserve">
-    <value> нестандартный сервис, эта функция недействительна</value>
-  </data>
   <data name="NotFoundCore" xml:space="preserve">
     <value>Файл Core (имя файла: {1}) не найден в папке ({0}), загрузите и поместите его в папку, адрес загрузки: {2}</value>
   </data>
@@ -415,15 +400,9 @@
   <data name="FillServerAddressCustom" xml:space="preserve">
     <value>Пожалуйста, просмотрите, чтобы импортировать конфигурацию сервера</value>
   </data>
-  <data name="SystemProxy" xml:space="preserve">
-    <value>Системный прокси</value>
-  </data>
   <data name="Speedtesting" xml:space="preserve">
     <value>Тестирование...</value>
   </data>
-  <data name="TooManyServersTip" xml:space="preserve">
-    <value>Слишком много серверов, пожалуйста, откройте главный интерфейс</value>
-  </data>
   <data name="LabLAN" xml:space="preserve">
     <value>LAN</value>
   </data>
@@ -544,18 +523,12 @@
   <data name="menuTcpingServer" xml:space="preserve">
     <value>Тест задержки с tcping (Ctrl+O)</value>
   </data>
-  <data name="menuTestMe" xml:space="preserve">
-    <value>Проверить текущий статус службы</value>
-  </data>
   <data name="menuExport2ClientConfig" xml:space="preserve">
     <value>Экспортировать выбранный сервер для клиента</value>
   </data>
   <data name="menuExport2ShareUrl" xml:space="preserve">
     <value>Экспорт URL-адресов общего доступа в буфер обмена (Ctrl+C)</value>
   </data>
-  <data name="menuExport2SubContent" xml:space="preserve">
-    <value>Экспортировать ссылку-подписку (base64) в буфер обмена</value>
-  </data>
   <data name="menuAddCustomServer" xml:space="preserve">
     <value>Добавить сервер пользовательской конфигурации</value>
   </data>
@@ -586,9 +559,6 @@
   <data name="menuMsgViewCopyAll" xml:space="preserve">
     <value>Скопировать все</value>
   </data>
-  <data name="menuMsgViewFilter" xml:space="preserve">
-    <value>Установить фильтры сообщений</value>
-  </data>
   <data name="menuMsgViewSelectAll" xml:space="preserve">
     <value>Выбрать все (Ctrl+A)</value>
   </data>
@@ -701,7 +671,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>
@@ -964,6 +934,9 @@
   <data name="TbSettingsRouteOnly" xml:space="preserve">
     <value>Только маршрут</value>
   </data>
+  <data name="TbSettingsNotProxyLocalAddress" xml:space="preserve">
+    <value>Не используйте прокси-серверы для локальных (интранет) адресов</value>
+  </data>
   <data name="menuMixedTestServer" xml:space="preserve">
     <value>Тест задержки и скорости всех серверов (Ctrl+E)</value>
   </data>
@@ -994,21 +967,9 @@
   <data name="TbSettingsTunMode" xml:space="preserve">
     <value>Настройки TunMode</value>
   </data>
-  <data name="TbSettingsTunModeDirectIP" xml:space="preserve">
-    <value>Прямой IP CIDR, разделенный запятыми (,)</value>
-  </data>
-  <data name="TbSettingsTunModeDirectProcess" xml:space="preserve">
-    <value>Имя процесса, разделенное запятыми (,)</value>
-  </data>
-  <data name="TbSettingsTunModeShowWindow" xml:space="preserve">
-    <value>Показать консоль</value>
-  </data>
   <data name="menuMoveToGroup" xml:space="preserve">
     <value>Перейти в группу</value>
   </data>
-  <data name="TbSettingsTunModeCustomTemplate" xml:space="preserve">
-    <value>Пользовательский шаблон</value>
-  </data>
   <data name="TbSettingsEnableDragDropSort" xml:space="preserve">
     <value>Включить сортировку перетаскиванием сервера (требуется перезагрузка)</value>
   </data>
@@ -1042,9 +1003,6 @@
   <data name="TbSettingsCurrentFontFamilyTip" xml:space="preserve">
     <value>Скопируйте файл шрифта TTF/TTC в каталог guiFonts, перезапустите настройки</value>
   </data>
-  <data name="TbSettingsSocksPortTip" xml:space="preserve">
-    <value>HTTP port=socks port+1</value>
-  </data>
   <data name="TbSettingsStartBootTip" xml:space="preserve">
     <value>Установите это с правами администратора</value>
   </data>

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

@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="BatchExportSubscriptionSuccessfully" xml:space="preserve">
-    <value>批量导出订阅内容至剪贴板成功</value>
-  </data>
   <data name="BatchExportURLSuccessfully" xml:space="preserve">
     <value>批量导出分享URL至剪贴板成功</value>
   </data>
@@ -159,9 +156,6 @@
   <data name="FillCorrectServerPort" xml:space="preserve">
     <value>请填写正确格式服务器端口</value>
   </data>
-  <data name="FillKcpParameters" xml:space="preserve">
-    <value>请正确填写KCP参数</value>
-  </data>
   <data name="FillLocalListeningPort" xml:space="preserve">
     <value>请填写本地监听端口</value>
   </data>
@@ -174,15 +168,9 @@
   <data name="FillUUID" xml:space="preserve">
     <value>请填写用户ID</value>
   </data>
-  <data name="IncorrectClientConfiguration" xml:space="preserve">
-    <value>不是正确的客户端配置文件，请检查</value>
-  </data>
   <data name="Incorrectconfiguration" xml:space="preserve">
     <value>不是正确的配置，请检查</value>
   </data>
-  <data name="IncorrectServerConfiguration" xml:space="preserve">
-    <value>不是正确的服务端配置文件，请检查</value>
-  </data>
   <data name="InitialConfiguration" xml:space="preserve">
     <value>初始化配置</value>
   </data>
@@ -267,9 +255,6 @@
   <data name="NonvmessOrssProtocol" xml:space="preserve">
     <value>非VMess或ss协议</value>
   </data>
-  <data name="NonVmessService" xml:space="preserve">
-    <value>非标准服务，此功能无效</value>
-  </data>
   <data name="NotFoundCore" xml:space="preserve">
     <value>在文件夹 ({0}) 下未找到Core文件 (文件名:{1})，请下载后放入文件夹，下载地址: {2}</value>
   </data>
@@ -359,7 +344,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 +359,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>
@@ -415,15 +400,9 @@
   <data name="FillServerAddressCustom" xml:space="preserve">
     <value>请浏览导入服务器配置</value>
   </data>
-  <data name="SystemProxy" xml:space="preserve">
-    <value>系统代理</value>
-  </data>
   <data name="Speedtesting" xml:space="preserve">
     <value>测试中...</value>
   </data>
-  <data name="TooManyServersTip" xml:space="preserve">
-    <value>服务器太多，请打开主界面操作</value>
-  </data>
   <data name="LabLAN" xml:space="preserve">
     <value>局域网</value>
   </data>
@@ -544,18 +523,12 @@
   <data name="menuTcpingServer" xml:space="preserve">
     <value>测试服务器延迟Tcping(多选) (Ctrl+O)</value>
   </data>
-  <data name="menuTestMe" xml:space="preserve">
-    <value>测试当前服务状态</value>
-  </data>
   <data name="menuExport2ClientConfig" xml:space="preserve">
     <value>导出所选服务器为客户端配置</value>
   </data>
   <data name="menuExport2ShareUrl" xml:space="preserve">
     <value>批量导出分享URL至剪贴板(多选) (Ctrl+C)</value>
   </data>
-  <data name="menuExport2SubContent" xml:space="preserve">
-    <value>批量导出订阅内容至剪贴板(多选)</value>
-  </data>
   <data name="menuAddCustomServer" xml:space="preserve">
     <value>添加自定义配置服务器</value>
   </data>
@@ -586,9 +559,6 @@
   <data name="menuMsgViewCopyAll" xml:space="preserve">
     <value>复制所有</value>
   </data>
-  <data name="menuMsgViewFilter" xml:space="preserve">
-    <value>设置信息过滤器</value>
-  </data>
   <data name="menuMsgViewSelectAll" xml:space="preserve">
     <value>全选 (Ctrl+A)</value>
   </data>
@@ -701,7 +671,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>
@@ -958,6 +928,9 @@
   <data name="TbSettingsRouteOnly" xml:space="preserve">
     <value>RouteOnly</value>
   </data>
+  <data name="TbSettingsNotProxyLocalAddress" xml:space="preserve">
+    <value>请勿将代理服务器用于本地（Intranet）地址</value>
+  </data>
   <data name="menuMixedTestServer" xml:space="preserve">
     <value>一键多线程测试延迟和速度 (Ctrl+E)</value>
   </data>
@@ -988,21 +961,9 @@
   <data name="TbSettingsTunMode" xml:space="preserve">
     <value>Tun模式设置</value>
   </data>
-  <data name="TbSettingsTunModeDirectIP" xml:space="preserve">
-    <value>直连的IP CIDR，用逗号(,)分隔</value>
-  </data>
-  <data name="TbSettingsTunModeDirectProcess" xml:space="preserve">
-    <value>直连的进程名，用逗号(,)分隔</value>
-  </data>
-  <data name="TbSettingsTunModeShowWindow" xml:space="preserve">
-    <value>显示控制台</value>
-  </data>
   <data name="menuMoveToGroup" xml:space="preserve">
     <value>移至订阅分组</value>
   </data>
-  <data name="TbSettingsTunModeCustomTemplate" xml:space="preserve">
-    <value>自定义配置模板</value>
-  </data>
   <data name="TbSettingsEnableDragDropSort" xml:space="preserve">
     <value>启用服务器拖放排序(需重启)</value>
   </data>
@@ -1037,7 +998,7 @@
     <value>拷贝字体TTF/TTC文件到目录guiFonts，重启设置</value>
   </data>
   <data name="TbSettingsSocksPortTip" xml:space="preserve">
-    <value>http端口=socks端口+1</value>
+    <value>http端口= +1；Pac端口= +4；*ray API端口= +5；mihomo API端口= +6；</value>
   </data>
   <data name="TbSettingsStartBootTip" xml:space="preserve">
     <value>以管理员权限设置此项，在启动后获得管理员权限</value>
@@ -1045,24 +1006,12 @@
   <data name="TbSettingsFontSize" xml:space="preserve">
     <value>字体大小</value>
   </data>
-  <data name="TbSettingsTunModeProxyIP" xml:space="preserve">
-    <value>代理的IP CIDR，用逗号(,)分隔</value>
-  </data>
-  <data name="TbSettingsTunModeProxyProcess" xml:space="preserve">
-    <value>代理的进程名，用逗号(,)分隔</value>
-  </data>
-  <data name="TbSettingsTunModeBypassMode" xml:space="preserve">
-    <value>绕行模式</value>
-  </data>
   <data name="TbSettingsSpeedTestTimeout" xml:space="preserve">
     <value>测速单个超时值</value>
   </data>
   <data name="TbSettingsSpeedTestUrl" xml:space="preserve">
     <value>测速文件地址</value>
   </data>
-  <data name="TbSettingsTunModeDNS" xml:space="preserve">
-    <value>DNS对象，例如 {"servers":[]}</value>
-  </data>
   <data name="menuMoveTo" xml:space="preserve">
     <value>移至上下</value>
   </data>
@@ -1192,4 +1141,124 @@
   <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>
+  <data name="TbSorting" xml:space="preserve">
+    <value>排序</value>
+  </data>
+  <data name="TbSortingChain" xml:space="preserve">
+    <value>路由链</value>
+  </data>
+  <data name="TbSortingDefault" xml:space="preserve">
+    <value>默认</value>
+  </data>
+  <data name="TbSortingDelay" xml:space="preserve">
+    <value>延迟</value>
+  </data>
+  <data name="TbSortingDownSpeed" xml:space="preserve">
+    <value>下载速度</value>
+  </data>
+  <data name="TbSortingDownTraffic" xml:space="preserve">
+    <value>下载流量</value>
+  </data>
+  <data name="TbSortingHost" xml:space="preserve">
+    <value>主机</value>
+  </data>
+  <data name="TbSortingName" xml:space="preserve">
+    <value>名称</value>
+  </data>
+  <data name="TbSortingNetwork" xml:space="preserve">
+    <value>网络</value>
+  </data>
+  <data name="TbSortingTime" xml:space="preserve">
+    <value>时间</value>
+  </data>
+  <data name="TbSortingType" xml:space="preserve">
+    <value>类型</value>
+  </data>
+  <data name="TbSortingUpSpeed" xml:space="preserve">
+    <value>上传速度</value>
+  </data>
+  <data name="TbSortingUpTraffic" xml:space="preserve">
+    <value>上传流量</value>
+  </data>
+  <data name="TbConnections" xml:space="preserve">
+    <value>当前连接</value>
+  </data>
+  <data name="menuConnectionClose" xml:space="preserve">
+    <value>关闭连接</value>
+  </data>
+  <data name="menuConnectionCloseAll" xml:space="preserve">
+    <value>关闭所有连接</value>
+  </data>
+  <data name="TbProxies" xml:space="preserve">
+    <value>当前代理</value>
+  </data>
+  <data name="menuRulemode" xml:space="preserve">
+    <value>规则模式</value>
+  </data>
+  <data name="menuModeDirect" xml:space="preserve">
+    <value>直连</value>
+  </data>
+  <data name="menuModeGlobal" xml:space="preserve">
+    <value>全局</value>
+  </data>
+  <data name="menuModeNothing" xml:space="preserve">
+    <value>随原配置</value>
+  </data>
+  <data name="menuModeRule" xml:space="preserve">
+    <value>规则</value>
+  </data>
+  <data name="menuProxiesDelaytest" xml:space="preserve">
+    <value>延迟测试</value>
+  </data>
+  <data name="menuProxiesDelaytestPart" xml:space="preserve">
+    <value>当前部分节点延迟测试</value>
+  </data>
+  <data name="menuProxiesReload" xml:space="preserve">
+    <value>刷新</value>
+  </data>
+  <data name="menuProxiesSelectActivity" xml:space="preserve">
+    <value>设为活动节点 (Enter)</value>
+  </data>
+  <data name="TbSettingsDomainStrategy4Out" xml:space="preserve">
+    <value>Outbound默认解析策略</value>
+  </data>
+  <data name="menuSetDefaultMultipleServer" xml:space="preserve">
+    <value>多服务器最低延迟 (多选)</value>
+  </data>
+  <data name="TbSettingsMainGirdOrientation" xml:space="preserve">
+    <value>主界面布局方向(需重启)</value>
+  </data>
+  <data name="menuSetDefaultLoadBalanceServer" xml:space="preserve">
+    <value>多服务器负载均衡 (多选)</value>
+  </data>
+  <data name="TbSettingsDomainDNSAddress" xml:space="preserve">
+    <value>Outbound域名解析地址</value>
+  </data>
+  <data name="menuProfileAutofitColumnWidth" xml:space="preserve">
+    <value>自动调整列宽</value>
+  </data>
 </root>