up 6.26

Fix download url

v2rayN/PacLib/PacHandler.cs

@@ -2,7 +2,6 @@
 using System.IO;
 using System.Net.Sockets;
 using System.Text;
-using System.Threading;
 using System.Threading.Tasks;
 
 namespace PacLib;
@@ -17,11 +16,10 @@ public class PacHandler
     private static bool _isRunning;
     private static bool _needRestart = true;
 
-
     public static void Start(string configPath, int httpPort, int pacPort)
     {
         _needRestart = (configPath != _configPath || httpPort != _httpPort || pacPort != _pacPort || !_isRunning);
-      
+
         _configPath = configPath;
         _httpPort = httpPort;
         _pacPort = pacPort;
@@ -51,7 +49,7 @@ public class PacHandler
         _tcpListener = TcpListener.Create(_pacPort);
         _isRunning = true;
         _tcpListener.Start();
-        Task.Factory.StartNew(() =>
+        Task.Factory.StartNew(async () =>
         {
             while (_isRunning)
             {
@@ -59,33 +57,31 @@ public class PacHandler
                 {
                     if (!_tcpListener.Pending())
                     {
-                        Thread.Sleep(10);
+                        await Task.Delay(10);
                         continue;
                     }
 
                     var client = _tcpListener.AcceptTcpClient();
-                    Task.Run(() =>
+                    await Task.Run(() =>
-                    {
+                      {
-                        var stream = client.GetStream();
+                          var stream = client.GetStream();
-                        var sb = new StringBuilder();
+                          var sb = new StringBuilder();
-                        sb.AppendLine("HTTP/1.0 200 OK");
+                          sb.AppendLine("HTTP/1.0 200 OK");
-                        sb.AppendLine("Content-type:application/x-ns-proxy-autoconfig");
+                          sb.AppendLine("Content-type:application/x-ns-proxy-autoconfig");
-                        sb.AppendLine("Connection:close");
+                          sb.AppendLine("Connection:close");
-                        sb.AppendLine("Content-Length:" + Encoding.UTF8.GetByteCount(_pacText));
+                          sb.AppendLine("Content-Length:" + Encoding.UTF8.GetByteCount(_pacText));
-                        sb.AppendLine();
+                          sb.AppendLine();
-                        sb.Append(_pacText);
+                          sb.Append(_pacText);
-                        var content = Encoding.UTF8.GetBytes(sb.ToString());
+                          var content = Encoding.UTF8.GetBytes(sb.ToString());
-                        stream.Write(content, 0, content.Length);
+                          stream.Write(content, 0, content.Length);
-                        stream.Flush();
+                          stream.Flush();
-                    });
+                      });
                 }
                 catch (Exception e)
                 {
                 }
             }
-
         }, TaskCreationOptions.LongRunning);
-
     }
 
     public static void Stop()

v2rayN/ProtosLib/ProtosLib.csproj

@@ -9,9 +9,9 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Google.Protobuf" Version="3.22.3" />
+		<PackageReference Include="Google.Protobuf" Version="3.23.2" />
-		<PackageReference Include="Grpc.Core" Version="2.46.6" />
+		<PackageReference Include="Grpc.Net.Client" Version="2.53.0" />
-		<PackageReference Include="Grpc.Tools" Version="2.53.0">
+		<PackageReference Include="Grpc.Tools" Version="2.54.0">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>

v2rayN/ProtosLib/Tests.cs

@@ -8,8 +8,6 @@ namespace ProtosLib
 
         public Tests()
         {
-
-
         }
     }
-}
+}

v2rayN/v2rayN/App.xaml

@@ -1,10 +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:local="clr-namespace:v2rayN"
-    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     ShutdownMode="OnExplicitShutdown"
     StartupUri="Views/MainWindow.xaml">
     <Application.Resources>
@@ -12,7 +11,7 @@
             <ResourceDictionary.MergedDictionaries>
                 <materialDesign:BundledTheme
                     BaseTheme="Light"
-                    PrimaryColor="DeepPurple"
+                    PrimaryColor="Blue"
                     SecondaryColor="Lime" />
                 <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
             </ResourceDictionary.MergedDictionaries>
@@ -21,6 +20,8 @@
             <system:Double x:Key="StdFontSize1">13</system:Double>
             <system:Double x:Key="StdFontSize2">14</system:Double>
             <system:Double x:Key="StdFontSizeMsg">11</system:Double>
+
+            <conv:InverseBooleanConverter x:Key="InverseBooleanConverter" />
             <Thickness
                 x:Key="ServerItemMargin"
                 Bottom="4"
@@ -141,10 +142,6 @@
                 TargetType="{x:Type ListBoxItem}">
                 <Setter Property="Margin" Value="-2,0" />
             </Style>
-
-
         </ResourceDictionary>
-
     </Application.Resources>
-
+</Application>
-</Application>

v2rayN/v2rayN/App.xaml.cs

@@ -1,5 +1,4 @@
-using System.Runtime.InteropServices;
+using System.Windows;
-using System.Windows;
 using System.Windows.Threading;
 using v2rayN.Handler;
 using v2rayN.Mode;
@@ -49,13 +48,11 @@ namespace v2rayN
             Utils.SaveLog($"v2rayN start up | {Utils.GetVersion()} | {Utils.GetExePath()}");
             Logging.ClearLogs();
 
-
             Thread.CurrentThread.CurrentUICulture = new(_config.uiItem.currentLanguage);
 
             base.OnStartup(e);
         }
 
-
         private void Init()
         {
             if (ConfigHandler.LoadConfig(ref _config) != 0)
@@ -65,11 +62,12 @@ namespace v2rayN
                 Environment.Exit(0);
                 return;
             }
-            if (RuntimeInformation.ProcessArchitecture != Architecture.X86 && RuntimeInformation.ProcessArchitecture != Architecture.X64)
+            //if (RuntimeInformation.ProcessArchitecture != Architecture.X86 && RuntimeInformation.ProcessArchitecture != Architecture.X64)
-            {
+            //{
-                _config.guiItem.enableStatistics = false;
+            //    _config.guiItem.enableStatistics = false;
-            }
+            //}
         }
+
         private void App_DispatcherUnhandledException(object sender, DispatcherUnhandledExceptionEventArgs e)
         {
             Utils.SaveLog("App_DispatcherUnhandledException", e.Exception);
@@ -89,4 +87,4 @@ namespace v2rayN
             Utils.SaveLog("TaskScheduler_UnobservedTaskException", e.Exception);
         }
     }
-}
+}

v2rayN/v2rayN/AssemblyInfo.cs

@@ -7,4 +7,4 @@ using System.Windows;
     ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
                                               //(used if a resource is not found in the page,
                                               // app, or any theme specific resource dictionaries)
-)]
+)]

v2rayN/v2rayN/Base/DownloaderHelper.cs

@@ -16,9 +16,6 @@ namespace v2rayN.Base
                 return null;
             }
 
-            var cancellationToken = new CancellationTokenSource();
-            cancellationToken.CancelAfter(timeout * 1000);
-
             Uri uri = new(url);
             //Authorization Header
             var headers = new WebHeaderCollection();
@@ -48,7 +45,9 @@ namespace v2rayN.Base
                     throw value.Error;
                 }
             };
-            using var stream = await downloader.DownloadFileTaskAsync(address: url, cancellationToken: cancellationToken.Token);
+
+            using var cts = new CancellationTokenSource();
+            using var stream = await downloader.DownloadFileTaskAsync(address: url, cts.Token).WaitAsync(TimeSpan.FromSeconds(timeout), cts.Token);
             using StreamReader reader = new(stream);
 
             downloadOpt = null;
@@ -56,7 +55,6 @@ namespace v2rayN.Base
             return reader.ReadToEnd();
         }
 
-
         public async Task DownloadDataAsync4Speed(IWebProxy webProxy, string url, IProgress<string> progress, int timeout)
         {
             if (string.IsNullOrEmpty(url))
@@ -64,9 +62,6 @@ namespace v2rayN.Base
                 throw new ArgumentNullException(nameof(url));
             }
 
-            var cancellationToken = new CancellationTokenSource();
-            cancellationToken.CancelAfter(timeout * 1000);
-
             var downloadOpt = new DownloadConfiguration()
             {
                 Timeout = timeout * 1000,
@@ -116,8 +111,9 @@ namespace v2rayN.Base
                 }
             };
             //progress.Report("......");
-
+            using var cts = new CancellationTokenSource();
-            using var stream = await downloader.DownloadFileTaskAsync(address: url, cancellationToken: cancellationToken.Token);
+            cts.CancelAfter(timeout * 1000);
+            using var stream = await downloader.DownloadFileTaskAsync(address: url, cts.Token);
 
             downloadOpt = null;
         }
@@ -137,9 +133,6 @@ namespace v2rayN.Base
                 File.Delete(fileName);
             }
 
-            var cancellationToken = new CancellationTokenSource();
-            cancellationToken.CancelAfter(timeout * 1000);
-
             var downloadOpt = new DownloadConfiguration()
             {
                 Timeout = timeout * 1000,
@@ -179,7 +172,8 @@ namespace v2rayN.Base
                 }
             };
 
-            await downloader.DownloadFileTaskAsync(url, fileName, cancellationToken: cancellationToken.Token);
+            using var cts = new CancellationTokenSource();
+            await downloader.DownloadFileTaskAsync(url, fileName, cts.Token).WaitAsync(TimeSpan.FromSeconds(timeout), cts.Token);
 
             downloadOpt = null;
         }

v2rayN/v2rayN/Base/HttpClientHelper.cs

@@ -9,12 +9,13 @@ namespace v2rayN.Base
     /// </summary>
     public class HttpClientHelper
     {
-        private readonly static Lazy<HttpClientHelper> _instance = new(() =>
+        private static readonly Lazy<HttpClientHelper> _instance = new(() =>
         {
             HttpClientHandler handler = new() { UseCookies = false };
             HttpClientHelper helper = new(new HttpClient(handler));
             return helper;
         });
+
         public static HttpClientHelper Instance => _instance.Value;
         private readonly HttpClient httpClient;
 
@@ -82,7 +83,6 @@ namespace v2rayN.Base
             if (canReportProgress)
             {
                 progress!.Report(101);
-
             }
         }
 
@@ -136,7 +136,6 @@ namespace v2rayN.Base
                     var data = new byte[read];
                     buffer.ToList().CopyTo(0, data, 0, read);
 
-                    // TODO:   
                     totalRead += read;
 
                     TimeSpan ts = (DateTime.Now - totalDatetime);
@@ -153,6 +152,5 @@ namespace v2rayN.Base
                 }
             } while (isMoreToRead);
         }
-
     }
-}
+}

v2rayN/v2rayN/Base/MyDGTextColumn.cs

@@ -5,6 +5,5 @@ namespace v2rayN.Base
     internal class MyDGTextColumn : DataGridTextColumn
     {
         public string ExName { get; set; }
-
     }
 }

v2rayN/v2rayN/Base/SqliteHelper.cs

@@ -1,5 +1,4 @@
-
+using SQLite;
-using SQLite;
 using System.Collections;
 
 namespace v2rayN.Base
@@ -29,6 +28,7 @@ namespace v2rayN.Base
         {
             return _db.Insert(model);
         }
+
         public int InsertAll(IEnumerable models)
         {
             lock (objLock)
@@ -36,10 +36,12 @@ namespace v2rayN.Base
                 return _db.InsertAll(models);
             }
         }
+
         public async Task<int> InsertAsync(object model)
         {
             return await _dbAsync.InsertAsync(model);
         }
+
         public int Replace(object model)
         {
             lock (objLock)
@@ -47,6 +49,7 @@ namespace v2rayN.Base
                 return _db.InsertOrReplace(model);
             }
         }
+
         public async Task<int> Replacesync(object model)
         {
             return await _dbAsync.InsertOrReplaceAsync(model);
@@ -59,10 +62,12 @@ namespace v2rayN.Base
                 return _db.Update(model);
             }
         }
+
         public async Task<int> UpdateAsync(object model)
         {
             return await _dbAsync.UpdateAsync(model);
         }
+
         public int UpdateAll(IEnumerable models)
         {
             lock (objLock)
@@ -78,22 +83,27 @@ namespace v2rayN.Base
                 return _db.Delete(model);
             }
         }
+
         public async Task<int> DeleteAsync(object model)
         {
             return await _dbAsync.DeleteAsync(model);
         }
+
         public List<T> Query<T>(string sql) where T : new()
         {
             return _db.Query<T>(sql);
         }
+
         public async Task<List<T>> QueryAsync<T>(string sql) where T : new()
         {
             return await _dbAsync.QueryAsync<T>(sql);
         }
+
         public int Execute(string sql)
         {
             return _db.Execute(sql);
         }
+
         public async Task<int> ExecuteAsync(string sql)
         {
             return await _dbAsync.ExecuteAsync(sql);
@@ -103,6 +113,7 @@ namespace v2rayN.Base
         {
             return _db.Table<T>();
         }
+
         public AsyncTableQuery<T> TableAsync<T>() where T : new()
         {
             return _dbAsync.Table<T>();

v2rayN/v2rayN/Base/StringEx.cs

@@ -3,7 +3,7 @@ using System.IO;
 
 namespace v2rayN.Base
 {
-    static class StringEx
+    internal static class StringEx
     {
         public static bool IsNullOrEmpty([NotNullWhen(false)] this string? value)
         {
@@ -32,7 +32,6 @@ namespace v2rayN.Base
             return true;
         }
 
-
         public static IEnumerable<string> NonWhiteSpaceLines(this TextReader reader)
         {
             string? line;
@@ -47,5 +46,29 @@ namespace v2rayN.Base
         {
             return value == null ? string.Empty : value.Trim();
         }
+
+        public static string RemovePrefix(this string value, char prefix)
+        {
+            if (value.StartsWith(prefix))
+            {
+                return value.Substring(1);
+            }
+            else
+            {
+                return value;
+            }
+        }
+
+        public static string RemovePrefix(this string value, string prefix)
+        {
+            if (value.StartsWith(prefix))
+            {
+                return value.Substring(prefix.Length);
+            }
+            else
+            {
+                return value;
+            }
+        }
     }
-}
+}

v2rayN/v2rayN/Converters/DelayColorConverter.cs

@@ -22,4 +22,4 @@ namespace v2rayN.Converters
             return null;
         }
     }
-}
+}

v2rayN/v2rayN/Converters/InverseBooleanConverter.cs

@@ -0,0 +1,24 @@
+using System.Globalization;
+using System.Windows.Data;
+
+namespace v2rayN.Converters
+{
+    [ValueConversion(typeof(bool), typeof(bool))]
+    public class InverseBooleanConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (targetType != typeof(bool))
+            {
+                throw new InvalidOperationException("The target must be a boolean");
+            }
+
+            return !(bool)value;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

v2rayN/v2rayN/Global.cs

@@ -1,8 +1,9 @@
 namespace v2rayN
 {
-    class Global
+    internal class Global
     {
         #region const
+
         public const string githubUrl = "https://github.com";
         public const string githubApiUrl = "https://api.github.com/repos";
         public const string v2rayWebsiteUrl = @"https://www.v2fly.org/";
@@ -19,6 +20,7 @@
         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 CustomRoutingListUrl = @"https://raw.githubusercontent.com/2dust/v2rayCustomRoutingList/master/";
 
@@ -26,14 +28,21 @@
         public const string ConfigFileName = "guiNConfig.json";
         public const string ConfigDB = "guiNDB.db";
         public const string coreConfigFileName = "config.json";
+        public const string corePreConfigFileName = "configPre.json";
+
         public const string v2raySampleClient = "v2rayN.Sample.SampleClientConfig";
-        public const string v2raySampleServer = "v2rayN.Sample.SampleServerConfig";
+        public const string SingboxSampleClient = "v2rayN.Sample.SingboxSampleClientConfig";
         public const string v2raySampleHttprequestFileName = "v2rayN.Sample.SampleHttprequest";
         public const string v2raySampleHttpresponseFileName = "v2rayN.Sample.SampleHttpresponse";
-        public const string CustomRoutingFileName = "v2rayN.Sample.custom_routing_";
         public const string v2raySampleInbound = "v2rayN.Sample.SampleInbound";
-        public const string TunSingboxFileName = "v2rayN.Sample.tun_singbox";
+        public const string CustomRoutingFileName = "v2rayN.Sample.custom_routing_";
+
         public const string TunSingboxDNSFileName = "v2rayN.Sample.tun_singbox_dns";
+        public const string TunSingboxInboundFileName = "v2rayN.Sample.tun_singbox_inbound";
+        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 DefaultSecurity = "auto";
         public const string DefaultNetwork = "tcp";
@@ -89,18 +98,31 @@
                         "http=http://{ip}:{http_port};https=http://{ip}:{http_port}",
                         ""
                     };
-        public static readonly List<string> vmessSecuritys = new() { "aes-128-gcm", "chacha20-poly1305", "auto", "none", "zero" };
+
-        public static readonly List<string> ssSecuritys = new() { "aes-256-gcm", "aes-128-gcm", "chacha20-poly1305", "chacha20-ietf-poly1305", "none", "plain" };
+        public static readonly List<string> SubConvertUrls = new List<string> {
-        public static readonly List<string> ssSecuritysInSagerNet = new() { "none", "2022-blake3-aes-128-gcm", "2022-blake3-aes-256-gcm", "2022-blake3-chacha20-poly1305", "aes-128-gcm", "aes-192-gcm", "aes-256-gcm", "chacha20-ietf-poly1305", "xchacha20-ietf-poly1305", "rc4", "rc4-md5", "aes-128-ctr", "aes-192-ctr", "aes-256-ctr", "aes-128-cfb", "aes-192-cfb", "aes-256-cfb", "aes-128-cfb8", "aes-192-cfb8", "aes-256-cfb8", "aes-128-ofb", "aes-192-ofb", "aes-256-ofb", "bf-cfb", "cast5-cfb", "des-cfb", "idea-cfb", "rc2-cfb", "seed-cfb", "camellia-128-cfb", "camellia-192-cfb", "camellia-256-cfb", "camellia-128-cfb8", "camellia-192-cfb8", "camellia-256-cfb8", "salsa20", "chacha20", "chacha20-ietf", "xchacha20" };
+                @"https://sub.xeton.dev/sub?url={0}",
-        public static readonly List<string> ssSecuritysInXray = new() { "aes-256-gcm", "aes-128-gcm", "chacha20-poly1305", "chacha20-ietf-poly1305", "xchacha20-poly1305", "xchacha20-ietf-poly1305", "none", "plain", "2022-blake3-aes-128-gcm", "2022-blake3-aes-256-gcm", "2022-blake3-chacha20-poly1305" };
+                @"https://api.dler.io/sub?url={0}",
-        public static readonly List<string> flows = new() { "", "xtls-rprx-vision", "xtls-rprx-vision-udp443" };
+                @"http://127.0.0.1:25500/sub?url={0}",
-        public static readonly List<string> networks = new() { "tcp", "kcp", "ws", "h2", "quic", "grpc" };
+                ""
-        public static readonly List<string> kcpHeaderTypes = new() { "srtp", "utp", "wechat-video", "dtls", "wireguard" };
+            };
-        public static readonly List<string> coreTypes = new() { "v2fly", "SagerNet", "Xray", "v2fly_v5" };
+
-        public static readonly List<string> domainStrategys = new() { "AsIs", "IPIfNonMatch", "IPOnDemand" };
+        public static readonly List<string> SubConvertConfig = new List<string> {
-        public static readonly List<string> domainMatchers = new() { "linear", "mph", "" };
+                @"https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/config/ACL4SSR_Online.ini"
-        public static readonly List<string> fingerprints = new() { "chrome", "firefox", "safari", "ios", "android", "edge", "360", "qq", "random", "randomized", "" };
+            };
-        public static readonly List<string> userAgent = new() { "chrome", "firefox", "safari", "edge", "none" };
+
+        public static readonly List<string> SubConvertTargets = new List<string> {
+                "",
+                "mixed",
+                "v2ray",
+                "clash",
+                "ss",
+            };
+
+        public static readonly List<string> SpeedTestUrls = new() {
+            @"http://cachefly.cachefly.net/100mb.test",
+            @"http://cachefly.cachefly.net/10mb.test"
+        };
+
         public static readonly Dictionary<string, string> userAgentTxt = new()
         {
             {"chrome","Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.131 Safari/537.36" },
@@ -109,6 +131,22 @@
             {"edge","Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36 Edg/91.0.864.70" },
             {"none",""}
         };
+
+        public static readonly List<string> vmessSecuritys = new() { "aes-128-gcm", "chacha20-poly1305", "auto", "none", "zero" };
+        public static readonly List<string> ssSecuritys = new() { "aes-256-gcm", "aes-128-gcm", "chacha20-poly1305", "chacha20-ietf-poly1305", "none", "plain" };
+        public static readonly List<string> ssSecuritysInSagerNet = new() { "none", "2022-blake3-aes-128-gcm", "2022-blake3-aes-256-gcm", "2022-blake3-chacha20-poly1305", "aes-128-gcm", "aes-192-gcm", "aes-256-gcm", "chacha20-ietf-poly1305", "xchacha20-ietf-poly1305", "rc4", "rc4-md5", "aes-128-ctr", "aes-192-ctr", "aes-256-ctr", "aes-128-cfb", "aes-192-cfb", "aes-256-cfb", "aes-128-cfb8", "aes-192-cfb8", "aes-256-cfb8", "aes-128-ofb", "aes-192-ofb", "aes-256-ofb", "bf-cfb", "cast5-cfb", "des-cfb", "idea-cfb", "rc2-cfb", "seed-cfb", "camellia-128-cfb", "camellia-192-cfb", "camellia-256-cfb", "camellia-128-cfb8", "camellia-192-cfb8", "camellia-256-cfb8", "salsa20", "chacha20", "chacha20-ietf", "xchacha20" };
+        public static readonly List<string> ssSecuritysInXray = new() { "aes-256-gcm", "aes-128-gcm", "chacha20-poly1305", "chacha20-ietf-poly1305", "xchacha20-poly1305", "xchacha20-ietf-poly1305", "none", "plain", "2022-blake3-aes-128-gcm", "2022-blake3-aes-256-gcm", "2022-blake3-chacha20-poly1305" };
+        public static readonly List<string> flows = new() { "", "xtls-rprx-vision", "xtls-rprx-vision-udp443" };
+        public static readonly List<string> networks = new() { "tcp", "kcp", "ws", "h2", "quic", "grpc" };
+        public static readonly List<string> kcpHeaderTypes = new() { "srtp", "utp", "wechat-video", "dtls", "wireguard" };
+        public static readonly List<string> coreTypes = new() { "v2fly", "SagerNet", "Xray", "v2fly_v5", "sing_box" };
+        public static readonly List<string> coreTypes4VLESS = new() { "Xray", "sing_box" };
+        public static readonly List<string> domainStrategys = new() { "AsIs", "IPIfNonMatch", "IPOnDemand" };
+        public static readonly List<string> domainStrategys4Singbox = new() { "ipv4_only", "ipv6_only", "prefer_ipv4", "prefer_ipv6", "" };
+        public static readonly List<string> domainMatchers = new() { "linear", "mph", "" };
+        public static readonly List<string> fingerprints = new() { "chrome", "firefox", "safari", "ios", "android", "edge", "360", "qq", "random", "randomized", "" };
+        public static readonly List<string> userAgent = new() { "chrome", "firefox", "safari", "edge", "none" };
+
         public static readonly List<string> allowInsecures = new() { "true", "false", "" };
         public static readonly List<string> domainStrategy4Freedoms = new() { "AsIs", "UseIP", "UseIPv4", "UseIPv6", "" };
         public static readonly List<string> Languages = new() { "zh-Hans", "en", "fa-Ir", "ru" };
@@ -119,9 +157,9 @@
         public static readonly List<string> TunMtus = new() { "9000", "1500" };
         public static readonly List<string> TunStacks = new() { "gvisor", "system" };
         public static readonly List<string> PresetMsgFilters = new() { "proxy", "direct", "block", "" };
-        public static readonly List<string> SpeedTestUrls = new() { @"http://cachefly.cachefly.net/100mb.test", @"http://cachefly.cachefly.net/10mb.test" };
+        public static readonly List<string> SingboxMuxs = new() { "h2mux", "smux", "yamux", "" };
 
-        #endregion
+        #endregion const
 
         #region global variable
 
@@ -130,7 +168,6 @@
         public static bool ShowInTaskbar { get; set; }
         public static string ExePathKey { get; set; }
 
-        #endregion
+        #endregion global variable
-
     }
-}
+}

v2rayN/v2rayN/Handler/ConfigHandler.cs

@@ -10,7 +10,7 @@ namespace v2rayN.Handler
     /// <summary>
     /// 本软件配置文件处理类
     /// </summary>
-    class ConfigHandler
+    internal class ConfigHandler
     {
         private static string configRes = Global.ConfigFileName;
         private static readonly object objLock = new();
@@ -24,7 +24,7 @@ namespace v2rayN.Handler
         /// <returns></returns>
         public static int LoadConfig(ref Config config)
         {
-            //载入配置文件 
+            //载入配置文件
             string result = Utils.LoadResource(Utils.GetConfigPath(configRes));
             if (!Utils.IsNullOrEmpty(result))
             {
@@ -132,7 +132,6 @@ namespace v2rayN.Handler
                 config.tunModeItem = new TunModeItem
                 {
                     enableTun = false,
-                    showWindow = true,
                     mtu = 9000,
                 };
             }
@@ -141,7 +140,6 @@ namespace v2rayN.Handler
                 config.guiItem = new()
                 {
                     enableStatistics = false,
-                    statisticsFreshRate = 1,
                 };
             }
             if (config.uiItem == null)
@@ -168,10 +166,6 @@ namespace v2rayN.Handler
             {
                 config.constItem.defIEProxyExceptions = Global.IEProxyExceptions;
             }
-            //if (Utils.IsNullOrEmpty(config.remoteDNS))
-            //{
-            //    config.remoteDNS = "1.1.1.1";
-            //}
 
             if (config.speedTestItem == null)
             {
@@ -190,14 +184,22 @@ namespace v2rayN.Handler
                 config.speedTestItem.speedPingTestUrl = Global.SpeedPingTestUrl;
             }
 
-            if (config.guiItem.statisticsFreshRate is > 100 or < 1)
+            if (config.mux4Sbox == null)
             {
-                config.guiItem.statisticsFreshRate = 1;
+                config.mux4Sbox = new()
+                {
+                    protocol = Global.SingboxMuxs[0],
+                    max_connections = 4,
+                    min_streams = 4,
+                    max_streams = 0,
+                    padding = true
+                };
             }
 
             LazyConfig.Instance.SetConfig(config);
             return 0;
         }
+
         /// <summary>
         /// 保参数
         /// </summary>
@@ -205,7 +207,6 @@ namespace v2rayN.Handler
         /// <returns></returns>
         public static int SaveConfig(ref Config config, bool reload = true)
         {
-
             ToJsonFile(config);
 
             return 0;
@@ -221,7 +222,6 @@ namespace v2rayN.Handler
             {
                 try
                 {
-
                     //save temp file
                     var resPath = Utils.GetConfigPath(configRes);
                     var tempPath = $"{resPath}_temp";
@@ -325,7 +325,6 @@ namespace v2rayN.Handler
                 config.guiItem = new()
                 {
                     enableStatistics = configOld.enableStatistics,
-                    statisticsFreshRate = configOld.statisticsFreshRate,
                     keepOlderDedupl = configOld.keepOlderDedupl,
                     ignoreGeoUpdateCore = configOld.ignoreGeoUpdateCore,
                     autoUpdateInterval = configOld.autoUpdateInterval,
@@ -342,7 +341,8 @@ namespace v2rayN.Handler
 
             return 0;
         }
-        #endregion
+
+        #endregion ConfigHandler
 
         #region Server
 
@@ -467,6 +467,7 @@ namespace v2rayN.Handler
             }
             return SetDefaultServerIndex(ref config, SqliteHelper.Instance.Table<ProfileItem>().Where(t => t.port > 0).Select(t => t.indexId).FirstOrDefault());
         }
+
         public static ProfileItem? GetDefaultServer(ref Config config)
         {
             var item = LazyConfig.Instance.GetProfileItem(config.indexId);
@@ -592,10 +593,8 @@ namespace v2rayN.Handler
                 profileItem.remarks = $"import custom@{DateTime.Now.ToShortDateString()}";
             }
 
-
             AddServerCommon(ref config, profileItem, true);
 
-
             return 0;
         }
 
@@ -682,7 +681,6 @@ namespace v2rayN.Handler
             return 0;
         }
 
-
         public static int SortServers(ref Config config, string subId, string colName, bool asc)
         {
             var lstModel = LazyConfig.Instance.ProfileItems(subId, "");
@@ -709,7 +707,6 @@ namespace v2rayN.Handler
                                   sort = t33 == null ? 0 : t33.sort
                               }).ToList();
 
-
             Enum.TryParse(colName, true, out EServerColName name);
             var propertyName = string.Empty;
             switch (name)
@@ -723,15 +720,19 @@ namespace v2rayN.Handler
                 case EServerColName.streamSecurity:
                     propertyName = name.ToString();
                     break;
+
                 case EServerColName.delayVal:
                     propertyName = "delay";
                     break;
+
                 case EServerColName.speedVal:
                     propertyName = "speed";
                     break;
+
                 case EServerColName.subRemarks:
                     propertyName = "subid";
                     break;
+
                 default:
                     return -1;
             }
@@ -811,7 +812,7 @@ namespace v2rayN.Handler
 
             List<ProfileItem> lstKeep = new();
             List<ProfileItem> lstRemove = new();
-            if (config.guiItem.keepOlderDedupl) lstProfile.Reverse();
+            if (!config.guiItem.keepOlderDedupl) lstProfile.Reverse();
 
             foreach (ProfileItem item in lstProfile)
             {
@@ -850,10 +851,18 @@ namespace v2rayN.Handler
                 profileItem.network = Global.DefaultNetwork;
             }
 
+            var maxSort = -1;
             if (Utils.IsNullOrEmpty(profileItem.indexId))
             {
                 profileItem.indexId = Utils.GetGUID(false);
-                var maxSort = ProfileExHandler.Instance.GetMaxSort();
+                maxSort = ProfileExHandler.Instance.GetMaxSort();
+            }
+            if (!toFile && maxSort < 0)
+            {
+                maxSort = ProfileExHandler.Instance.GetMaxSort();
+            }
+            if (maxSort > 0)
+            {
                 ProfileExHandler.Instance.SetSort(profileItem.indexId, maxSort + 1);
             }
 
@@ -910,7 +919,8 @@ namespace v2rayN.Handler
 
             return 0;
         }
-        #endregion
+
+        #endregion Server
 
         #region Batch add servers
 
@@ -1017,7 +1027,7 @@ namespace v2rayN.Handler
                     addStatus = AddVlessServer(ref config, profileItem, false);
                 }
 
-                if (addStatus == 0 && profileItem.port > 0)
+                if (addStatus == 0)
                 {
                     countServers++;
                     lstAdd.Add(profileItem);
@@ -1123,7 +1133,6 @@ namespace v2rayN.Handler
             if (AddCustomServer(ref config, profileItem, true) == 0)
             {
                 return 1;
-
             }
             else
             {
@@ -1209,7 +1218,7 @@ namespace v2rayN.Handler
                 counter = AddBatchServers4SsSIP008(ref config, clipboardData, subid, isSub, lstOriSub);
             }
 
-            //maybe other sub 
+            //maybe other sub
             if (counter < 1)
             {
                 counter = AddBatchServers4Custom(ref config, clipboardData, subid, isSub, lstOriSub);
@@ -1218,8 +1227,7 @@ namespace v2rayN.Handler
             return counter;
         }
 
-
+        #endregion Batch add servers
-        #endregion
 
         #region Sub & Group
 
@@ -1273,7 +1281,6 @@ namespace v2rayN.Handler
             }
         }
 
-
         /// <summary>
         /// 移除服务器
         /// </summary>
@@ -1326,9 +1333,10 @@ namespace v2rayN.Handler
 
             return 0;
         }
-        #endregion
 
-        #region Routing        
+        #endregion Sub & Group
+
+        #region Routing
 
         public static int SaveRoutingItem(ref Config config, RoutingItem item)
         {
@@ -1461,7 +1469,6 @@ namespace v2rayN.Handler
                         rules.Remove(removeItem);
                         break;
                     }
-
             }
             return 0;
         }
@@ -1477,6 +1484,7 @@ namespace v2rayN.Handler
 
             return 0;
         }
+
         public static RoutingItem GetDefaultRouting(ref Config config)
         {
             var item = LazyConfig.Instance.GetRoutingItem(config.routingBasicItem.routingIndexId);
@@ -1551,6 +1559,51 @@ namespace v2rayN.Handler
         {
             SqliteHelper.Instance.Delete(routingItem);
         }
-        #endregion
+
+        #endregion Routing
+
+        #region DNS
+
+        public static int InitBuiltinDNS(Config config)
+        {
+            var items = LazyConfig.Instance.DNSItems();
+            if (items.Count <= 0)
+            {
+                var item = new DNSItem()
+                {
+                    remarks = "V2ray",
+                    coreType = ECoreType.Xray,
+                };
+                SaveDNSItems(config, item);
+
+                var item2 = new DNSItem()
+                {
+                    remarks = "sing-box",
+                    coreType = ECoreType.sing_box,
+                };
+                SaveDNSItems(config, item2);
+            }
+
+            return 0;
+        }
+
+        public static int SaveDNSItems(Config config, DNSItem item)
+        {
+            if (Utils.IsNullOrEmpty(item.id))
+            {
+                item.id = Utils.GetGUID(false);
+            }
+
+            if (SqliteHelper.Instance.Replace(item) > 0)
+            {
+                return 0;
+            }
+            else
+            {
+                return -1;
+            }
+        }
+
+        #endregion DNS
     }
-}
+}

v2rayN/v2rayN/Handler/CoreConfigSingbox.cs

@@ -0,0 +1,740 @@
+using v2rayN.Base;
+using v2rayN.Mode;
+using v2rayN.Resx;
+
+namespace v2rayN.Handler
+{
+    internal class CoreConfigSingbox
+    {
+        private string SampleClient = Global.SingboxSampleClient;
+        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 = Utils.GetEmbedText(SampleClient);
+                if (Utils.IsNullOrEmpty(result))
+                {
+                    msg = ResUI.FailedGetDefaultConfiguration;
+                    return -1;
+                }
+
+                singboxConfig = Utils.FromJson<SingboxConfig>(result);
+                if (singboxConfig == null)
+                {
+                    msg = ResUI.FailedGenDefaultConfiguration;
+                    return -1;
+                }
+
+                log(singboxConfig);
+
+                inbound(singboxConfig);
+
+                outbound(node, singboxConfig);
+
+                routing(singboxConfig);
+
+                dns(node, singboxConfig);
+
+                statistic(singboxConfig);
+
+                msg = string.Format(ResUI.SuccessfulConfiguration, "");
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog("GenerateClientConfig4Singbox", ex);
+                msg = ResUI.FailedGenDefaultConfiguration;
+                return -1;
+            }
+            return 0;
+        }
+
+        private int log(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 == "none")
+                {
+                    singboxConfig.log.disabled = true;
+                }
+                if (_config.coreBasicItem.logEnabled)
+                {
+                    var dtNow = DateTime.Now;
+                    singboxConfig.log.output = Utils.GetLogPath($"sbox_{dtNow:yyyy-MM-dd}.txt");
+                }
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+            }
+            return 0;
+        }
+
+        #region inbound private
+
+        private int inbound(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 = Utils.IsNullOrEmpty(_config.routingBasicItem.domainStrategy4Singbox) ? null : _config.routingBasicItem.domainStrategy4Singbox;
+
+                    if (_config.routingBasicItem.enableRoutingAdvanced)
+                    {
+                        var routing = ConfigHandler.GetDefaultRouting(ref _config);
+                        if (!Utils.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 (!Utils.IsNullOrEmpty(_config.inbound[0].user) && !Utils.IsNullOrEmpty(_config.inbound[0].pass))
+                            {
+                                inbound3.users = new() { new() { username = _config.inbound[0].user, password = _config.inbound[0].pass } };
+                                inbound4.users = new() { new() { username = _config.inbound[0].user, password = _config.inbound[0].pass } };
+                            }
+                        }
+                        else
+                        {
+                            inbound.listen = "::";
+                            inbound2.listen = "::";
+                        }
+                    }
+                }
+
+                if (_config.tunModeItem.enableTun)
+                {
+                    if (_config.tunModeItem.mtu <= 0)
+                    {
+                        _config.tunModeItem.mtu = Convert.ToInt32(Global.TunMtus[0]);
+                    }
+                    if (Utils.IsNullOrEmpty(_config.tunModeItem.stack))
+                    {
+                        _config.tunModeItem.stack = Global.TunStacks[0];
+                    }
+
+                    var tunInbound = Utils.FromJson<Inbound4Sbox>(Utils.GetEmbedText(Global.TunSingboxInboundFileName));
+                    tunInbound.mtu = _config.tunModeItem.mtu;
+                    tunInbound.strict_route = _config.tunModeItem.strictRoute;
+                    tunInbound.stack = _config.tunModeItem.stack;
+
+                    singboxConfig.inbounds.Add(tunInbound);
+                }
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+            }
+            return 0;
+        }
+
+        private Inbound4Sbox? GetInbound(Inbound4Sbox inItem, string tag, int offset, bool bSocks)
+        {
+            var inbound = Utils.DeepCopy(inItem);
+            inbound.tag = tag;
+            inbound.listen_port = inItem.listen_port + offset;
+            inbound.type = bSocks ? Global.InboundSocks : Global.InboundHttp;
+            return inbound;
+        }
+
+        #endregion inbound private
+
+        #region outbound private
+
+        private int outbound(ProfileItem node, SingboxConfig singboxConfig)
+        {
+            try
+            {
+                if (_config.tunModeItem.enableTun)
+                {
+                    singboxConfig.outbounds.Add(new()
+                    {
+                        type = "dns",
+                        tag = "dns_out"
+                    });
+                }
+
+                var outbound = singboxConfig.outbounds[0];
+                outbound.server = node.address;
+                outbound.server_port = node.port;
+
+                if (node.configType == EConfigType.VMess)
+                {
+                    outbound.type = Global.vmessProtocolLite;
+
+                    outbound.uuid = node.id;
+                    outbound.alter_id = node.alterId;
+                    if (Global.vmessSecuritys.Contains(node.security))
+                    {
+                        outbound.security = node.security;
+                    }
+                    else
+                    {
+                        outbound.security = Global.DefaultSecurity;
+                    }
+
+                    outboundMux(node, outbound);
+                }
+                else if (node.configType == EConfigType.Shadowsocks)
+                {
+                    outbound.type = Global.ssProtocolLite;
+
+                    outbound.method = LazyConfig.Instance.GetShadowsocksSecuritys(node).Contains(node.security) ? node.security : "none";
+                    outbound.password = node.id;
+
+                    outboundMux(node, outbound);
+                }
+                else if (node.configType == EConfigType.Socks)
+                {
+                    outbound.type = Global.socksProtocolLite;
+
+                    outbound.version = "5";
+                    if (!Utils.IsNullOrEmpty(node.security)
+                      && !Utils.IsNullOrEmpty(node.id))
+                    {
+                        outbound.username = node.security;
+                        outbound.password = node.id;
+                    }
+                }
+                else if (node.configType == EConfigType.VLESS)
+                {
+                    outbound.type = Global.vlessProtocolLite;
+
+                    outbound.uuid = node.id;
+
+                    outbound.packet_encoding = "xudp";
+
+                    if (Utils.IsNullOrEmpty(node.flow))
+                    {
+                        outboundMux(node, outbound);
+                    }
+                    else
+                    {
+                        outbound.flow = node.flow;
+                    }
+                }
+                else if (node.configType == EConfigType.Trojan)
+                {
+                    outbound.type = Global.trojanProtocolLite;
+
+                    outbound.password = node.id;
+
+                    outboundMux(node, outbound);
+                }
+
+                outboundTls(node, outbound);
+
+                outboundTransport(node, outbound);
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+            }
+            return 0;
+        }
+
+        private int outboundMux(ProfileItem node, Outbound4Sbox outbound)
+        {
+            try
+            {
+                //if (_config.coreBasicItem.muxEnabled)
+                //{
+                //    var mux = new Multiplex4Sbox()
+                //    {
+                //        enabled = true,
+                //        protocol = _config.mux4Sbox.protocol,
+                //        max_connections = _config.mux4Sbox.max_connections,
+                //        min_streams = _config.mux4Sbox.min_streams,
+                //        max_streams = _config.mux4Sbox.max_streams,
+                //        padding = _config.mux4Sbox.padding
+                //    };
+                //    outbound.multiplex = mux;
+                //}
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+            }
+            return 0;
+        }
+
+        private int outboundTls(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 = Utils.String2List(node.requestHost)[0];
+                    }
+                    var tls = new Tls4Sbox()
+                    {
+                        enabled = true,
+                        server_name = server_name,
+                        insecure = Utils.ToBool(node.allowInsecure.IsNullOrEmpty() ? _config.coreBasicItem.defAllowInsecure.ToString().ToLower() : node.allowInsecure),
+                        alpn = node.GetAlpn(),
+                    };
+                    if (!Utils.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)
+            {
+                Utils.SaveLog(ex.Message, ex);
+            }
+            return 0;
+        }
+
+        private int outboundTransport(ProfileItem node, Outbound4Sbox outbound)
+        {
+            try
+            {
+                var transport = new Transport4Sbox();
+
+                switch (node.GetNetwork())
+                {
+                    case "h2":
+                        transport.type = "http";
+                        transport.host = Utils.IsNullOrEmpty(node.requestHost) ? null : Utils.String2List(node.requestHost);
+                        transport.path = Utils.IsNullOrEmpty(node.path) ? null : node.path;
+                        break;
+
+                    case "ws":
+                        transport.type = "ws";
+                        transport.path = Utils.IsNullOrEmpty(node.path) ? null : node.path;
+                        if (!Utils.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)
+            {
+                Utils.SaveLog(ex.Message, ex);
+            }
+            return 0;
+        }
+
+        #endregion outbound private
+
+        #region routing rule private
+
+        private int routing(SingboxConfig singboxConfig)
+        {
+            try
+            {
+                if (_config.tunModeItem.enableTun)
+                {
+                    singboxConfig.route.auto_detect_interface = true;
+
+                    var tunRules = Utils.FromJson<List<Rule4Sbox>>(Utils.GetEmbedText(Global.TunSingboxRulesFileName));
+                    singboxConfig.route.rules.AddRange(tunRules);
+
+                    routingDirectExe(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(ref _config);
+                    if (routing != null)
+                    {
+                        var rules = Utils.FromJson<List<RulesItem>>(routing.ruleSet);
+                        foreach (var item in rules!)
+                        {
+                            if (item.enabled)
+                            {
+                                routingUserRule(item, singboxConfig.route.rules);
+                            }
+                        }
+                    }
+                }
+                else
+                {
+                    var lockedItem = ConfigHandler.GetLockedRoutingItem(ref _config);
+                    if (lockedItem != null)
+                    {
+                        var rules = Utils.FromJson<List<RulesItem>>(lockedItem.ruleSet);
+                        foreach (var item in rules!)
+                        {
+                            routingUserRule(item, singboxConfig.route.rules);
+                        }
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+            }
+            return 0;
+        }
+
+        private void routingDirectExe(out List<string> lstDnsExe, out List<string> lstDirectExe)
+        {
+            lstDnsExe = new();
+            lstDirectExe = new();
+            var coreInfos = LazyConfig.Instance.GetCoreInfos();
+            foreach (var it in coreInfos)
+            {
+                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 routingUserRule(RulesItem item, List<Rule4Sbox> rules)
+        {
+            try
+            {
+                if (item == null)
+                {
+                    return 0;
+                }
+
+                var rule = new Rule4Sbox()
+                {
+                    outbound = item.outboundTag,
+                };
+
+                if (!Utils.IsNullOrEmpty(item.port))
+                {
+                    if (item.port.Contains("-"))
+                    {
+                        rule.port_range = new List<string> { item.port.Replace("-", ":") };
+                    }
+                    else
+                    {
+                        rule.port = new List<int> { Utils.ToInt(item.port) };
+                    }
+                }
+                if (item.protocol?.Count > 0)
+                {
+                    rule.protocol = item.protocol;
+                }
+                if (item.inboundTag?.Count >= 0)
+                {
+                    rule.inbound = item.inboundTag;
+                }
+                var rule2 = Utils.DeepCopy(rule);
+                var rule3 = Utils.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)
+            {
+                Utils.SaveLog(ex.Message, ex);
+            }
+            return 0;
+        }
+
+        private void parseV2Domain(string domain, Rule4Sbox rule)
+        {
+            if (domain.StartsWith("ext:") || domain.StartsWith("ext-domain:"))
+            {
+                return;
+            }
+            else if (domain.StartsWith("geosite:"))
+            {
+                if (rule.geosite is null) { rule.geosite = new(); }
+                rule.geosite?.Add(domain.Substring(8));
+            }
+            else if (domain.StartsWith("regexp:"))
+            {
+                if (rule.domain_regex is null) { rule.domain_regex = new(); }
+                rule.domain_regex?.Add(domain.Replace(Global.RoutingRuleComma, ",").Substring(7));
+            }
+            else if (domain.StartsWith("domain:"))
+            {
+                if (rule.domain is null) { rule.domain = new(); }
+                if (rule.domain_suffix is null) { rule.domain_suffix = new(); }
+                rule.domain?.Add(domain.Substring(7));
+                rule.domain_suffix?.Add("." + domain.Substring(7));
+            }
+            else if (domain.StartsWith("full:"))
+            {
+                if (rule.domain is null) { rule.domain = new(); }
+                rule.domain?.Add(domain.Substring(5));
+            }
+            else if (domain.StartsWith("keyword:"))
+            {
+                if (rule.domain_keyword is null) { rule.domain_keyword = new(); }
+                rule.domain_keyword?.Add(domain.Substring(8));
+            }
+            else
+            {
+                if (rule.domain_keyword is null) { rule.domain_keyword = new(); }
+                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);
+            }
+        }
+
+        #endregion routing rule private
+
+        #region dns private
+
+        private int dns(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 = Utils.GetEmbedText(Global.TunSingboxDNSFileName);
+                    }
+                    dns4Sbox = Utils.FromJson<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 = Utils.FromJson<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)
+            {
+                Utils.SaveLog(ex.Message, ex);
+            }
+            return 0;
+        }
+
+        #endregion dns private
+
+        private int statistic(SingboxConfig singboxConfig)
+        {
+            if (_config.guiItem.enableStatistics)
+            {
+                singboxConfig.experimental = new Experimental4Sbox()
+                {
+                    //v2ray_api = new V2ray_Api4Sbox()
+                    //{
+                    //    listen = $"{Global.Loopback}:{Global.statePort}",
+                    //    stats = new Stats4Sbox()
+                    //    {
+                    //        enabled = true,
+                    //    }
+                    //}
+                    clash_api = new Clash_Api4Sbox()
+                    {
+                        external_controller = $"{Global.Loopback}:{Global.statePort}",
+                        store_selected = true
+                    }
+                };
+            }
+            return 0;
+        }
+    }
+}

v2rayN/v2rayN/Handler/CoreConfigV2ray.cs

@@ -0,0 +1,949 @@
+using System.Net;
+using System.Net.NetworkInformation;
+using v2rayN.Base;
+using v2rayN.Mode;
+using v2rayN.Resx;
+
+namespace v2rayN.Handler
+{
+    internal class CoreConfigV2ray
+    {
+        private string SampleClient = Global.v2raySampleClient;
+        private Config _config;
+
+        public CoreConfigV2ray(Config config)
+        {
+            _config = config;
+        }
+
+        public int GenerateClientConfigContent(ProfileItem node, out V2rayConfig? v2rayConfig, out string msg)
+        {
+            v2rayConfig = null;
+            try
+            {
+                if (node == null
+                    || node.port <= 0)
+                {
+                    msg = ResUI.CheckServerSettings;
+                    return -1;
+                }
+
+                msg = ResUI.InitialConfiguration;
+
+                string result = Utils.GetEmbedText(SampleClient);
+                if (Utils.IsNullOrEmpty(result))
+                {
+                    msg = ResUI.FailedGetDefaultConfiguration;
+                    return -1;
+                }
+
+                v2rayConfig = Utils.FromJson<V2rayConfig>(result);
+                if (v2rayConfig == null)
+                {
+                    msg = ResUI.FailedGenDefaultConfiguration;
+                    return -1;
+                }
+
+                log(v2rayConfig);
+
+                inbound(v2rayConfig);
+
+                routing(v2rayConfig);
+
+                outbound(node, v2rayConfig);
+
+                dns(v2rayConfig);
+
+                statistic(v2rayConfig);
+
+                msg = string.Format(ResUI.SuccessfulConfiguration, "");
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog("GenerateClientConfig4V2ray", ex);
+                msg = ResUI.FailedGenDefaultConfiguration;
+                return -1;
+            }
+            return 0;
+        }
+
+        private int log(V2rayConfig v2rayConfig)
+        {
+            try
+            {
+                if (_config.coreBasicItem.logEnabled)
+                {
+                    var dtNow = DateTime.Now;
+                    v2rayConfig.log.loglevel = _config.coreBasicItem.loglevel;
+                    v2rayConfig.log.access = Utils.GetLogPath($"Vaccess_{dtNow:yyyy-MM-dd}.txt");
+                    v2rayConfig.log.error = Utils.GetLogPath($"Verror_{dtNow:yyyy-MM-dd}.txt");
+                }
+                else
+                {
+                    v2rayConfig.log.loglevel = _config.coreBasicItem.loglevel;
+                    v2rayConfig.log.access = "";
+                    v2rayConfig.log.error = "";
+                }
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+            }
+            return 0;
+        }
+
+        private int inbound(V2rayConfig v2rayConfig)
+        {
+            try
+            {
+                v2rayConfig.inbounds = new List<Inbounds4Ray>();
+
+                Inbounds4Ray? inbound = GetInbound(_config.inbound[0], Global.InboundSocks, 0, true);
+                v2rayConfig.inbounds.Add(inbound);
+
+                //http
+                Inbounds4Ray? inbound2 = GetInbound(_config.inbound[0], Global.InboundHttp, 1, false);
+                v2rayConfig.inbounds.Add(inbound2);
+
+                if (_config.inbound[0].allowLANConn)
+                {
+                    if (_config.inbound[0].newPort4LAN)
+                    {
+                        Inbounds4Ray inbound3 = GetInbound(_config.inbound[0], Global.InboundSocks2, 2, true);
+                        inbound3.listen = "0.0.0.0";
+                        v2rayConfig.inbounds.Add(inbound3);
+
+                        Inbounds4Ray inbound4 = GetInbound(_config.inbound[0], Global.InboundHttp2, 3, false);
+                        inbound4.listen = "0.0.0.0";
+                        v2rayConfig.inbounds.Add(inbound4);
+
+                        //auth
+                        if (!Utils.IsNullOrEmpty(_config.inbound[0].user) && !Utils.IsNullOrEmpty(_config.inbound[0].pass))
+                        {
+                            inbound3.settings.auth = "password";
+                            inbound3.settings.accounts = new List<AccountsItem4Ray> { new AccountsItem4Ray() { user = _config.inbound[0].user, pass = _config.inbound[0].pass } };
+
+                            inbound4.settings.auth = "password";
+                            inbound4.settings.accounts = new List<AccountsItem4Ray> { new AccountsItem4Ray() { user = _config.inbound[0].user, pass = _config.inbound[0].pass } };
+                        }
+                    }
+                    else
+                    {
+                        inbound.listen = "0.0.0.0";
+                        inbound2.listen = "0.0.0.0";
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+            }
+            return 0;
+        }
+
+        private Inbounds4Ray? GetInbound(InItem inItem, string tag, int offset, bool bSocks)
+        {
+            string result = Utils.GetEmbedText(Global.v2raySampleInbound);
+            if (Utils.IsNullOrEmpty(result))
+            {
+                return null;
+            }
+
+            var inbound = Utils.FromJson<Inbounds4Ray>(result);
+            if (inbound == null)
+            {
+                return null;
+            }
+            inbound.tag = tag;
+            inbound.port = inItem.localPort + offset;
+            inbound.protocol = bSocks ? Global.InboundSocks : Global.InboundHttp;
+            inbound.settings.udp = inItem.udpEnabled;
+            inbound.sniffing.enabled = inItem.sniffingEnabled;
+            inbound.sniffing.routeOnly = inItem.routeOnly;
+
+            return inbound;
+        }
+
+        private int routing(V2rayConfig v2rayConfig)
+        {
+            try
+            {
+                if (v2rayConfig.routing?.rules != null)
+                {
+                    v2rayConfig.routing.domainStrategy = _config.routingBasicItem.domainStrategy;
+                    v2rayConfig.routing.domainMatcher = Utils.IsNullOrEmpty(_config.routingBasicItem.domainMatcher) ? null : _config.routingBasicItem.domainMatcher;
+
+                    if (_config.routingBasicItem.enableRoutingAdvanced)
+                    {
+                        var routing = ConfigHandler.GetDefaultRouting(ref _config);
+                        if (routing != null)
+                        {
+                            if (!Utils.IsNullOrEmpty(routing.domainStrategy))
+                            {
+                                v2rayConfig.routing.domainStrategy = routing.domainStrategy;
+                            }
+                            var rules = Utils.FromJson<List<RulesItem>>(routing.ruleSet);
+                            foreach (var item in rules)
+                            {
+                                if (item.enabled)
+                                {
+                                    var item2 = Utils.FromJson<RulesItem4Ray>(Utils.ToJson(item));
+                                    routingUserRule(item2, v2rayConfig);
+                                }
+                            }
+                        }
+                    }
+                    else
+                    {
+                        var lockedItem = ConfigHandler.GetLockedRoutingItem(ref _config);
+                        if (lockedItem != null)
+                        {
+                            var rules = Utils.FromJson<List<RulesItem>>(lockedItem.ruleSet);
+                            foreach (var item in rules)
+                            {
+                                var item2 = Utils.FromJson<RulesItem4Ray>(Utils.ToJson(item));
+                                routingUserRule(item2, v2rayConfig);
+                            }
+                        }
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+            }
+            return 0;
+        }
+
+        private int routingUserRule(RulesItem4Ray rules, V2rayConfig v2rayConfig)
+        {
+            try
+            {
+                if (rules == null)
+                {
+                    return 0;
+                }
+                if (Utils.IsNullOrEmpty(rules.port))
+                {
+                    rules.port = null;
+                }
+                if (rules.domain?.Count == 0)
+                {
+                    rules.domain = null;
+                }
+                if (rules.ip?.Count == 0)
+                {
+                    rules.ip = null;
+                }
+                if (rules.protocol?.Count == 0)
+                {
+                    rules.protocol = null;
+                }
+                if (rules.inboundTag?.Count == 0)
+                {
+                    rules.inboundTag = null;
+                }
+
+                var hasDomainIp = false;
+                if (rules.domain?.Count > 0)
+                {
+                    var it = Utils.DeepCopy(rules);
+                    it.ip = null;
+                    it.type = "field";
+                    for (int k = it.domain.Count - 1; k >= 0; k--)
+                    {
+                        if (it.domain[k].StartsWith("#"))
+                        {
+                            it.domain.RemoveAt(k);
+                        }
+                        it.domain[k] = it.domain[k].Replace(Global.RoutingRuleComma, ",");
+                    }
+                    v2rayConfig.routing.rules.Add(it);
+                    hasDomainIp = true;
+                }
+                if (rules.ip?.Count > 0)
+                {
+                    var it = Utils.DeepCopy(rules);
+                    it.domain = null;
+                    it.type = "field";
+                    v2rayConfig.routing.rules.Add(it);
+                    hasDomainIp = true;
+                }
+                if (!hasDomainIp)
+                {
+                    if (!Utils.IsNullOrEmpty(rules.port)
+                        || (rules.protocol?.Count > 0)
+                        || (rules.inboundTag?.Count > 0)
+                        )
+                    {
+                        var it = Utils.DeepCopy(rules);
+                        it.type = "field";
+                        v2rayConfig.routing.rules.Add(it);
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+            }
+            return 0;
+        }
+
+        private int outbound(ProfileItem node, V2rayConfig v2rayConfig)
+        {
+            try
+            {
+                Outbounds4Ray outbound = v2rayConfig.outbounds[0];
+                if (node.configType == EConfigType.VMess)
+                {
+                    VnextItem4Ray vnextItem;
+                    if (outbound.settings.vnext.Count <= 0)
+                    {
+                        vnextItem = new VnextItem4Ray();
+                        outbound.settings.vnext.Add(vnextItem);
+                    }
+                    else
+                    {
+                        vnextItem = outbound.settings.vnext[0];
+                    }
+                    vnextItem.address = node.address;
+                    vnextItem.port = node.port;
+
+                    UsersItem4Ray usersItem;
+                    if (vnextItem.users.Count <= 0)
+                    {
+                        usersItem = new UsersItem4Ray();
+                        vnextItem.users.Add(usersItem);
+                    }
+                    else
+                    {
+                        usersItem = vnextItem.users[0];
+                    }
+                    //远程服务器用户ID
+                    usersItem.id = node.id;
+                    usersItem.alterId = node.alterId;
+                    usersItem.email = Global.userEMail;
+                    if (Global.vmessSecuritys.Contains(node.security))
+                    {
+                        usersItem.security = node.security;
+                    }
+                    else
+                    {
+                        usersItem.security = Global.DefaultSecurity;
+                    }
+
+                    outboundMux(node, outbound, _config.coreBasicItem.muxEnabled);
+
+                    outbound.protocol = Global.vmessProtocolLite;
+                    outbound.settings.servers = null;
+                }
+                else if (node.configType == EConfigType.Shadowsocks)
+                {
+                    ServersItem4Ray serversItem;
+                    if (outbound.settings.servers.Count <= 0)
+                    {
+                        serversItem = new ServersItem4Ray();
+                        outbound.settings.servers.Add(serversItem);
+                    }
+                    else
+                    {
+                        serversItem = outbound.settings.servers[0];
+                    }
+                    serversItem.address = node.address;
+                    serversItem.port = node.port;
+                    serversItem.password = node.id;
+                    serversItem.method = LazyConfig.Instance.GetShadowsocksSecuritys(node).Contains(node.security) ? node.security : "none";
+
+                    serversItem.ota = false;
+                    serversItem.level = 1;
+
+                    outboundMux(node, outbound, false);
+
+                    outbound.protocol = Global.ssProtocolLite;
+                    outbound.settings.vnext = null;
+                }
+                else if (node.configType == EConfigType.Socks)
+                {
+                    ServersItem4Ray serversItem;
+                    if (outbound.settings.servers.Count <= 0)
+                    {
+                        serversItem = new ServersItem4Ray();
+                        outbound.settings.servers.Add(serversItem);
+                    }
+                    else
+                    {
+                        serversItem = outbound.settings.servers[0];
+                    }
+                    serversItem.address = node.address;
+                    serversItem.port = node.port;
+                    serversItem.method = null;
+                    serversItem.password = null;
+
+                    if (!Utils.IsNullOrEmpty(node.security)
+                        && !Utils.IsNullOrEmpty(node.id))
+                    {
+                        SocksUsersItem4Ray socksUsersItem = new()
+                        {
+                            user = node.security,
+                            pass = node.id,
+                            level = 1
+                        };
+
+                        serversItem.users = new List<SocksUsersItem4Ray>() { socksUsersItem };
+                    }
+
+                    outboundMux(node, outbound, false);
+
+                    outbound.protocol = Global.socksProtocolLite;
+                    outbound.settings.vnext = null;
+                }
+                else if (node.configType == EConfigType.VLESS)
+                {
+                    VnextItem4Ray vnextItem;
+                    if (outbound.settings.vnext.Count <= 0)
+                    {
+                        vnextItem = new VnextItem4Ray();
+                        outbound.settings.vnext.Add(vnextItem);
+                    }
+                    else
+                    {
+                        vnextItem = outbound.settings.vnext[0];
+                    }
+                    vnextItem.address = node.address;
+                    vnextItem.port = node.port;
+
+                    UsersItem4Ray usersItem;
+                    if (vnextItem.users.Count <= 0)
+                    {
+                        usersItem = new UsersItem4Ray();
+                        vnextItem.users.Add(usersItem);
+                    }
+                    else
+                    {
+                        usersItem = vnextItem.users[0];
+                    }
+                    usersItem.id = node.id;
+                    usersItem.email = Global.userEMail;
+                    usersItem.encryption = node.security;
+
+                    outboundMux(node, outbound, _config.coreBasicItem.muxEnabled);
+
+                    if (node.streamSecurity == Global.StreamSecurityReality
+                        || node.streamSecurity == Global.StreamSecurity)
+                    {
+                        if (!Utils.IsNullOrEmpty(node.flow))
+                        {
+                            usersItem.flow = node.flow;
+
+                            outboundMux(node, outbound, false);
+                        }
+                    }
+                    if (node.streamSecurity == Global.StreamSecurityReality && Utils.IsNullOrEmpty(node.flow))
+                    {
+                        outboundMux(node, outbound, _config.coreBasicItem.muxEnabled);
+                    }
+
+                    outbound.protocol = Global.vlessProtocolLite;
+                    outbound.settings.servers = null;
+                }
+                else if (node.configType == EConfigType.Trojan)
+                {
+                    ServersItem4Ray serversItem;
+                    if (outbound.settings.servers.Count <= 0)
+                    {
+                        serversItem = new ServersItem4Ray();
+                        outbound.settings.servers.Add(serversItem);
+                    }
+                    else
+                    {
+                        serversItem = outbound.settings.servers[0];
+                    }
+                    serversItem.address = node.address;
+                    serversItem.port = node.port;
+                    serversItem.password = node.id;
+
+                    serversItem.ota = false;
+                    serversItem.level = 1;
+
+                    outboundMux(node, outbound, false);
+
+                    outbound.protocol = Global.trojanProtocolLite;
+                    outbound.settings.vnext = null;
+                }
+                boundStreamSettings(node, outbound.streamSettings);
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+            }
+            return 0;
+        }
+
+        private int outboundMux(ProfileItem node, Outbounds4Ray outbound, bool enabled)
+        {
+            try
+            {
+                if (enabled)
+                {
+                    outbound.mux.enabled = true;
+                    outbound.mux.concurrency = 8;
+                }
+                else
+                {
+                    outbound.mux.enabled = false;
+                    outbound.mux.concurrency = -1;
+                }
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+            }
+            return 0;
+        }
+
+        private int boundStreamSettings(ProfileItem node, StreamSettings4Ray streamSettings)
+        {
+            try
+            {
+                streamSettings.network = node.GetNetwork();
+                string host = node.requestHost.TrimEx();
+                string sni = node.sni;
+                string useragent = "";
+                if (!_config.coreBasicItem.defUserAgent.IsNullOrEmpty())
+                {
+                    try
+                    {
+                        useragent = Global.userAgentTxt[_config.coreBasicItem.defUserAgent];
+                    }
+                    catch (KeyNotFoundException)
+                    {
+                        useragent = _config.coreBasicItem.defUserAgent;
+                    }
+                }
+
+                //if tls
+                if (node.streamSecurity == Global.StreamSecurity)
+                {
+                    streamSettings.security = node.streamSecurity;
+
+                    TlsSettings4Ray tlsSettings = new()
+                    {
+                        allowInsecure = Utils.ToBool(node.allowInsecure.IsNullOrEmpty() ? _config.coreBasicItem.defAllowInsecure.ToString().ToLower() : node.allowInsecure),
+                        alpn = node.GetAlpn(),
+                        fingerprint = node.fingerprint.IsNullOrEmpty() ? _config.coreBasicItem.defFingerprint : node.fingerprint
+                    };
+                    if (!string.IsNullOrWhiteSpace(sni))
+                    {
+                        tlsSettings.serverName = sni;
+                    }
+                    else if (!string.IsNullOrWhiteSpace(host))
+                    {
+                        tlsSettings.serverName = Utils.String2List(host)[0];
+                    }
+                    streamSettings.tlsSettings = tlsSettings;
+                }
+
+                //if Reality
+                if (node.streamSecurity == Global.StreamSecurityReality)
+                {
+                    streamSettings.security = node.streamSecurity;
+
+                    TlsSettings4Ray realitySettings = new()
+                    {
+                        fingerprint = node.fingerprint.IsNullOrEmpty() ? _config.coreBasicItem.defFingerprint : node.fingerprint,
+                        serverName = sni,
+                        publicKey = node.publicKey,
+                        shortId = node.shortId,
+                        spiderX = node.spiderX,
+                    };
+
+                    streamSettings.realitySettings = realitySettings;
+                }
+
+                //streamSettings
+                switch (node.GetNetwork())
+                {
+                    case "kcp":
+                        KcpSettings4Ray kcpSettings = new()
+                        {
+                            mtu = _config.kcpItem.mtu,
+                            tti = _config.kcpItem.tti
+                        };
+
+                        kcpSettings.uplinkCapacity = _config.kcpItem.uplinkCapacity;
+                        kcpSettings.downlinkCapacity = _config.kcpItem.downlinkCapacity;
+
+                        kcpSettings.congestion = _config.kcpItem.congestion;
+                        kcpSettings.readBufferSize = _config.kcpItem.readBufferSize;
+                        kcpSettings.writeBufferSize = _config.kcpItem.writeBufferSize;
+                        kcpSettings.header = new Header4Ray
+                        {
+                            type = node.headerType
+                        };
+                        if (!Utils.IsNullOrEmpty(node.path))
+                        {
+                            kcpSettings.seed = node.path;
+                        }
+                        streamSettings.kcpSettings = kcpSettings;
+                        break;
+                    //ws
+                    case "ws":
+                        WsSettings4Ray wsSettings = new();
+                        wsSettings.headers = new Headers4Ray();
+                        string path = node.path;
+                        if (!string.IsNullOrWhiteSpace(host))
+                        {
+                            wsSettings.headers.Host = host;
+                        }
+                        if (!string.IsNullOrWhiteSpace(path))
+                        {
+                            wsSettings.path = path;
+                        }
+                        if (!string.IsNullOrWhiteSpace(useragent))
+                        {
+                            wsSettings.headers.UserAgent = useragent;
+                        }
+                        streamSettings.wsSettings = wsSettings;
+
+                        break;
+                    //h2
+                    case "h2":
+                        HttpSettings4Ray httpSettings = new();
+
+                        if (!string.IsNullOrWhiteSpace(host))
+                        {
+                            httpSettings.host = Utils.String2List(host);
+                        }
+                        httpSettings.path = node.path;
+
+                        streamSettings.httpSettings = httpSettings;
+
+                        break;
+                    //quic
+                    case "quic":
+                        QuicSettings4Ray quicsettings = new()
+                        {
+                            security = host,
+                            key = node.path,
+                            header = new Header4Ray
+                            {
+                                type = node.headerType
+                            }
+                        };
+                        streamSettings.quicSettings = quicsettings;
+                        if (node.streamSecurity == Global.StreamSecurity)
+                        {
+                            if (!string.IsNullOrWhiteSpace(sni))
+                            {
+                                streamSettings.tlsSettings.serverName = sni;
+                            }
+                            else
+                            {
+                                streamSettings.tlsSettings.serverName = node.address;
+                            }
+                        }
+                        break;
+
+                    case "grpc":
+                        GrpcSettings4Ray grpcSettings = new()
+                        {
+                            serviceName = node.path,
+                            multiMode = (node.headerType == Global.GrpcmultiMode),
+                            idle_timeout = _config.grpcItem.idle_timeout,
+                            health_check_timeout = _config.grpcItem.health_check_timeout,
+                            permit_without_stream = _config.grpcItem.permit_without_stream,
+                            initial_windows_size = _config.grpcItem.initial_windows_size,
+                        };
+                        streamSettings.grpcSettings = grpcSettings;
+                        break;
+
+                    default:
+                        //tcp
+                        if (node.headerType == Global.TcpHeaderHttp)
+                        {
+                            TcpSettings4Ray tcpSettings = new()
+                            {
+                                header = new Header4Ray
+                                {
+                                    type = node.headerType
+                                }
+                            };
+
+                            //request Host
+                            string request = Utils.GetEmbedText(Global.v2raySampleHttprequestFileName);
+                            string[] arrHost = host.Split(',');
+                            string host2 = string.Join("\",\"", arrHost);
+                            request = request.Replace("$requestHost$", $"\"{host2}\"");
+                            //request = request.Replace("$requestHost$", string.Format("\"{0}\"", config.requestHost()));
+                            request = request.Replace("$requestUserAgent$", $"\"{useragent}\"");
+                            //Path
+                            string pathHttp = @"/";
+                            if (!Utils.IsNullOrEmpty(node.path))
+                            {
+                                string[] arrPath = node.path.Split(',');
+                                pathHttp = string.Join("\",\"", arrPath);
+                            }
+                            request = request.Replace("$requestPath$", $"\"{pathHttp}\"");
+                            tcpSettings.header.request = Utils.FromJson<object>(request);
+
+                            streamSettings.tcpSettings = tcpSettings;
+                        }
+                        break;
+                }
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+            }
+            return 0;
+        }
+
+        private int dns(V2rayConfig v2rayConfig)
+        {
+            try
+            {
+                var item = LazyConfig.Instance.GetDNSItem(ECoreType.Xray);
+                var normalDNS = item?.normalDNS;
+                var domainStrategy4Freedom = item?.domainStrategy4Freedom;
+                if (string.IsNullOrWhiteSpace(normalDNS))
+                {
+                    normalDNS = "1.1.1.1,8.8.8.8";
+                }
+
+                //Outbound Freedom domainStrategy
+                if (!string.IsNullOrWhiteSpace(domainStrategy4Freedom))
+                {
+                    var outbound = v2rayConfig.outbounds[1];
+                    outbound.settings.domainStrategy = domainStrategy4Freedom;
+                    outbound.settings.userLevel = 0;
+                }
+
+                var obj = Utils.ParseJson(normalDNS);
+                if (obj?.ContainsKey("servers") == true)
+                {
+                    v2rayConfig.dns = obj;
+                }
+                else
+                {
+                    List<string> servers = new();
+
+                    string[] arrDNS = normalDNS.Split(',');
+                    foreach (string str in arrDNS)
+                    {
+                        //if (Utils.IsIP(str))
+                        //{
+                        servers.Add(str);
+                        //}
+                    }
+                    //servers.Add("localhost");
+                    v2rayConfig.dns = new Mode.Dns4Ray
+                    {
+                        servers = servers
+                    };
+                }
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+            }
+            return 0;
+        }
+
+        private int statistic(V2rayConfig v2rayConfig)
+        {
+            if (_config.guiItem.enableStatistics)
+            {
+                string tag = Global.InboundAPITagName;
+                API4Ray apiObj = new();
+                Policy4Ray policyObj = new();
+                SystemPolicy4Ray policySystemSetting = new();
+
+                string[] services = { "StatsService" };
+
+                v2rayConfig.stats = new Stats4Ray();
+
+                apiObj.tag = tag;
+                apiObj.services = services.ToList();
+                v2rayConfig.api = apiObj;
+
+                policySystemSetting.statsOutboundDownlink = true;
+                policySystemSetting.statsOutboundUplink = true;
+                policyObj.system = policySystemSetting;
+                v2rayConfig.policy = policyObj;
+
+                if (!v2rayConfig.inbounds.Exists(item => item.tag == tag))
+                {
+                    Inbounds4Ray apiInbound = new();
+                    Inboundsettings4Ray apiInboundSettings = new();
+                    apiInbound.tag = tag;
+                    apiInbound.listen = Global.Loopback;
+                    apiInbound.port = Global.statePort;
+                    apiInbound.protocol = Global.InboundAPIProtocal;
+                    apiInboundSettings.address = Global.Loopback;
+                    apiInbound.settings = apiInboundSettings;
+                    v2rayConfig.inbounds.Add(apiInbound);
+                }
+
+                if (!v2rayConfig.routing.rules.Exists(item => item.outboundTag == tag))
+                {
+                    RulesItem4Ray apiRoutingRule = new()
+                    {
+                        inboundTag = new List<string> { tag },
+                        outboundTag = tag,
+                        type = "field"
+                    };
+
+                    v2rayConfig.routing.rules.Add(apiRoutingRule);
+                }
+            }
+            return 0;
+        }
+
+        #region Gen speedtest config
+
+        public string GenerateClientSpeedtestConfigString(List<ServerTestItem> selecteds, out string msg)
+        {
+            try
+            {
+                if (_config == null)
+                {
+                    msg = ResUI.CheckServerSettings;
+                    return "";
+                }
+
+                msg = ResUI.InitialConfiguration;
+
+                Config configCopy = Utils.DeepCopy(_config);
+
+                string result = Utils.GetEmbedText(SampleClient);
+                if (Utils.IsNullOrEmpty(result))
+                {
+                    msg = ResUI.FailedGetDefaultConfiguration;
+                    return "";
+                }
+
+                V2rayConfig? v2rayConfig = Utils.FromJson<V2rayConfig>(result);
+                if (v2rayConfig == null)
+                {
+                    msg = ResUI.FailedGenDefaultConfiguration;
+                    return "";
+                }
+                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)
+                {
+                    Utils.SaveLog(ex.Message, ex);
+                }
+
+                log(v2rayConfig);
+                v2rayConfig.inbounds.Clear(); // Remove "proxy" service for speedtest, avoiding port conflicts.
+
+                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 || Utils.IsNullOrEmpty(item2.id) || !Utils.IsGuidByParse(item2.id))
+                        {
+                            continue;
+                        }
+                    }
+
+                    //find unuse 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
+                    Inbounds4Ray inbound = new()
+                    {
+                        listen = Global.Loopback,
+                        port = port,
+                        protocol = Global.InboundHttp
+                    };
+                    inbound.tag = Global.InboundHttp + inbound.port.ToString();
+                    v2rayConfig.inbounds.Add(inbound);
+
+                    //outbound
+                    V2rayConfig? v2rayConfigCopy = Utils.FromJson<V2rayConfig>(result);
+                    var item = LazyConfig.Instance.GetProfileItem(it.indexId);
+                    if (item is null)
+                    {
+                        continue;
+                    }
+                    if (item.configType == EConfigType.Shadowsocks
+                        && !Global.ssSecuritysInXray.Contains(item.security))
+                    {
+                        continue;
+                    }
+                    if (item.configType == EConfigType.VLESS
+                     && !Global.flows.Contains(item.flow))
+                    {
+                        continue;
+                    }
+
+                    outbound(item, v2rayConfigCopy);
+                    v2rayConfigCopy.outbounds[0].tag = Global.agentTag + inbound.port.ToString();
+                    v2rayConfig.outbounds.Add(v2rayConfigCopy.outbounds[0]);
+
+                    //rule
+                    RulesItem4Ray rule = new()
+                    {
+                        inboundTag = new List<string> { inbound.tag },
+                        outboundTag = v2rayConfigCopy.outbounds[0].tag,
+                        type = "field"
+                    };
+                    v2rayConfig.routing.rules.Add(rule);
+                }
+
+                //msg = string.Format(ResUI.SuccessfulConfiguration"), node.getSummary());
+                return Utils.ToJson(v2rayConfig);
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+                msg = ResUI.FailedGenDefaultConfiguration;
+                return "";
+            }
+        }
+
+        #endregion Gen speedtest config
+    }
+}

v2rayN/v2rayN/Handler/CoreHandler.cs

@@ -9,37 +9,32 @@ namespace v2rayN.Handler
     /// <summary>
     /// Core process processing class
     /// </summary>
-    class CoreHandler
+    internal class CoreHandler
     {
-        private static string _coreCConfigRes = Global.coreConfigFileName;
+        private Config _config;
-        private CoreInfo? _coreInfo;
-        private int _processId = 0;
         private Process? _process;
-        Action<bool, string> _updateFunc;
+        private Process? _processPre;
+        private Action<bool, string> _updateFunc;
 
-        public CoreHandler(Action<bool, string> update)
+        public CoreHandler(Config config, Action<bool, string> update)
         {
+            _config = config;
             _updateFunc = update;
 
             Environment.SetEnvironmentVariable("v2ray.location.asset", Utils.GetBinPath(""), EnvironmentVariableTarget.Process);
             Environment.SetEnvironmentVariable("xray.location.asset", Utils.GetBinPath(""), EnvironmentVariableTarget.Process);
         }
 
-        public void LoadCore(Config config)
+        public void LoadCore()
         {
-            var node = ConfigHandler.GetDefaultServer(ref config);
+            var node = ConfigHandler.GetDefaultServer(ref _config);
             if (node == null)
             {
                 ShowMsg(false, ResUI.CheckServerSettings);
                 return;
             }
 
-            if (SetCore(config, node) != 0)
+            string fileName = Utils.GetConfigPath(Global.coreConfigFileName);
-            {
-                ShowMsg(false, ResUI.CheckServerSettings);
-                return;
-            }
-            string fileName = Utils.GetConfigPath(_coreCConfigRes);
             if (CoreConfigHandler.GenerateClientConfig(node, fileName, out string msg, out string content) != 0)
             {
                 ShowMsg(false, msg);
@@ -51,27 +46,12 @@ namespace v2rayN.Handler
                 CoreStop();
                 CoreStart(node);
             }
-
-            //start a socks service
-            if (_process != null && !_process.HasExited && node.configType == EConfigType.Custom && node.preSocksPort > 0)
-            {
-                var itemSocks = new ProfileItem()
-                {
-                    configType = EConfigType.Socks,
-                    address = Global.Loopback,
-                    port = node.preSocksPort
-                };
-                if (CoreConfigHandler.GenerateClientConfig(itemSocks, null, out string msg2, out string configStr) == 0)
-                {
-                    _processId = CoreStartViaString(configStr);
-                }
-            }
         }
 
-        public int LoadCoreConfigString(Config config, List<ServerTestItem> _selecteds)
+        public int LoadCoreConfigString(List<ServerTestItem> _selecteds)
         {
             int pid = -1;
-            string configStr = CoreConfigHandler.GenerateClientSpeedtestConfigString(config, _selecteds, out string msg);
+            string configStr = CoreConfigHandler.GenerateClientSpeedtestConfigString(_config, _selecteds, out string msg);
             if (configStr == "")
             {
                 ShowMsg(false, msg);
@@ -88,38 +68,46 @@ namespace v2rayN.Handler
         {
             try
             {
+                bool hasProc = false;
                 if (_process != null)
                 {
                     KillProcess(_process);
                     _process.Dispose();
                     _process = null;
+                    hasProc = true;
                 }
-                else
+
+                if (_processPre != null)
                 {
-                    if (_coreInfo == null || _coreInfo.coreExes == null)
+                    KillProcess(_processPre);
+                    _processPre.Dispose();
+                    _processPre = null;
+                    hasProc = true;
+                }
+
+                if (!hasProc)
+                {
+                    var coreInfos = LazyConfig.Instance.GetCoreInfos();
+                    foreach (var it in coreInfos)
                     {
-                        return;
+                        if (it.coreType == ECoreType.v2rayN)
-                    }
-                    foreach (string vName in _coreInfo.coreExes)
-                    {
-                        Process[] existing = Process.GetProcessesByName(vName);
-                        foreach (Process p in existing)
                         {
-                            string? path = p.MainModule?.FileName;
+                            continue;
-                            if (path == $"{Utils.GetBinPath(vName, _coreInfo.coreType)}.exe")
+                        }
+                        foreach (string vName in it.coreExes)
+                        {
+                            Process[] existing = Process.GetProcessesByName(vName);
+                            foreach (Process p in existing)
                             {
-                                KillProcess(p);
+                                string? path = p.MainModule?.FileName;
+                                if (path == $"{Utils.GetBinPath(vName, it.coreType)}.exe")
+                                {
+                                    KillProcess(p);
+                                }
                             }
                         }
                     }
                 }
-
-                if (_processId > 0)
-                {
-                    CoreStopPid(_processId);
-                    _processId = 0;
-                }
-
             }
             catch (Exception ex)
             {
@@ -166,58 +154,48 @@ namespace v2rayN.Handler
         {
             ShowMsg(false, string.Format(ResUI.StartService, DateTime.Now.ToString()));
 
-            try
+            ECoreType coreType;
+            if (node.configType != EConfigType.Custom && _config.tunModeItem.enableTun)
             {
-                string fileName = CoreFindexe(_coreInfo);
+                coreType = ECoreType.sing_box;
-                if (fileName == "") return;
-
-                var displayLog = node.configType != EConfigType.Custom || node.displayLog;
-                Process p = new()
-                {
-                    StartInfo = new ProcessStartInfo
-                    {
-                        FileName = fileName,
-                        Arguments = _coreInfo.arguments,
-                        WorkingDirectory = Utils.GetConfigPath(),
-                        UseShellExecute = false,
-                        RedirectStandardOutput = displayLog,
-                        RedirectStandardError = displayLog,
-                        CreateNoWindow = true,
-                        StandardOutputEncoding = displayLog ? Encoding.UTF8 : null,
-                        StandardErrorEncoding = displayLog ? Encoding.UTF8 : null,
-                    }
-                };
-                if (displayLog)
-                {
-                    p.OutputDataReceived += (sender, e) =>
-                    {
-                        if (!string.IsNullOrEmpty(e.Data))
-                        {
-                            string msg = e.Data + Environment.NewLine;
-                            ShowMsg(false, msg);
-                        }
-                    };
-                }
-                p.Start();
-                if (displayLog)
-                {
-                    p.BeginOutputReadLine();
-                }
-                _process = p;
-
-                if (p.WaitForExit(1000))
-                {
-                    throw new Exception(displayLog ? p.StandardError.ReadToEnd() : "启动进程失败并退出 (Failed to start the process and exited)");
-                }
-
-                Global.processJob.AddProcess(p.Handle);
             }
-            catch (Exception ex)
+            else
             {
-                //Utils.SaveLog(Utils.ToJson(node));
+                coreType = LazyConfig.Instance.GetCoreType(node, node.configType);
-                Utils.SaveLog(ex.Message, ex);
+            }
-                string msg = ex.Message;
+            var coreInfo = LazyConfig.Instance.GetCoreInfo(coreType);
-                ShowMsg(true, msg);
+
+            var displayLog = node.configType != EConfigType.Custom || node.displayLog;
+            var proc = RunProcess(node, coreInfo, "", displayLog, ShowMsg);
+            if (proc is null)
+            {
+                return;
+            }
+            _process = proc;
+
+            //start a socks service
+            if (_process != null && !_process.HasExited)
+            {
+                if ((node.configType == EConfigType.Custom && node.preSocksPort > 0))
+                {
+                    var itemSocks = new ProfileItem()
+                    {
+                        coreType = ECoreType.sing_box,
+                        configType = EConfigType.Socks,
+                        address = Global.Loopback,
+                        port = node.preSocksPort
+                    };
+                    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);
+                        if (proc2 is not null)
+                        {
+                            _processPre = proc2;
+                        }
+                    }
+                }
             }
         }
 
@@ -255,8 +233,17 @@ namespace v2rayN.Handler
                         ShowMsg(false, msg);
                     }
                 };
+                p.ErrorDataReceived += (sender, e) =>
+                {
+                    if (!string.IsNullOrEmpty(e.Data))
+                    {
+                        string msg = e.Data + Environment.NewLine;
+                        ShowMsg(false, msg);
+                    }
+                };
                 p.Start();
                 p.BeginOutputReadLine();
+                p.BeginErrorReadLine();
 
                 p.StandardInput.Write(configStr);
                 p.StandardInput.Close();
@@ -283,6 +270,75 @@ namespace v2rayN.Handler
             _updateFunc(updateToTrayTooltip, msg);
         }
 
+        #region Process
+
+        private Process? RunProcess(ProfileItem node, CoreInfo coreInfo, string configPath, bool displayLog, Action<bool, string> update)
+        {
+            try
+            {
+                string fileName = CoreFindexe(coreInfo);
+                if (Utils.IsNullOrEmpty(fileName))
+                {
+                    return null;
+                }
+                Process proc = new()
+                {
+                    StartInfo = new ProcessStartInfo
+                    {
+                        FileName = fileName,
+                        Arguments = string.Format(coreInfo.arguments, configPath),
+                        WorkingDirectory = Utils.GetConfigPath(),
+                        UseShellExecute = false,
+                        RedirectStandardOutput = displayLog,
+                        RedirectStandardError = displayLog,
+                        CreateNoWindow = true,
+                        StandardOutputEncoding = displayLog ? Encoding.UTF8 : null,
+                        StandardErrorEncoding = displayLog ? Encoding.UTF8 : null,
+                    }
+                };
+                if (displayLog)
+                {
+                    proc.OutputDataReceived += (sender, e) =>
+                    {
+                        if (!string.IsNullOrEmpty(e.Data))
+                        {
+                            string msg = e.Data + Environment.NewLine;
+                            update(false, msg);
+                        }
+                    };
+                    proc.ErrorDataReceived += (sender, e) =>
+                    {
+                        if (!string.IsNullOrEmpty(e.Data))
+                        {
+                            string msg = e.Data + Environment.NewLine;
+                            update(false, msg);
+                        }
+                    };
+                }
+                proc.Start();
+                if (displayLog)
+                {
+                    proc.BeginOutputReadLine();
+                    proc.BeginErrorReadLine();
+                }
+
+                if (proc.WaitForExit(1000))
+                {
+                    throw new Exception(displayLog ? proc.StandardError.ReadToEnd() : "启动进程失败并退出 (Failed to start the process and exited)");
+                }
+
+                Global.processJob.AddProcess(proc.Handle);
+                return proc;
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+                string msg = ex.Message;
+                update(true, msg);
+                return null;
+            }
+        }
+
         private void KillProcess(Process p)
         {
             try
@@ -301,21 +357,6 @@ namespace v2rayN.Handler
             }
         }
 
-        private int SetCore(Config config, ProfileItem node)
+        #endregion Process
-        {
-            if (node == null)
-            {
-                return -1;
-            }
-            var coreType = LazyConfig.Instance.GetCoreType(node, node.configType);
-
-            _coreInfo = LazyConfig.Instance.GetCoreInfo(coreType);
-
-            if (_coreInfo == null)
-            {
-                return -1;
-            }
-            return 0;
-        }
     }
-}
+}

v2rayN/v2rayN/Handler/DownloadHandle.cs

@@ -12,13 +12,12 @@ namespace v2rayN.Handler
     /// <summary>
     ///Download
     /// </summary>
-    class DownloadHandle
+    internal class DownloadHandle
     {
         public event EventHandler<ResultEventArgs>? UpdateCompleted;
 
         public event ErrorEventHandler? Error;
 
-
         public class ResultEventArgs : EventArgs
         {
             public bool Success;
@@ -63,12 +62,12 @@ namespace v2rayN.Handler
             return 0;
         }
 
-        public void DownloadFileAsync(string url, bool blProxy, int downloadTimeout)
+        public async Task DownloadFileAsync(string url, bool blProxy, int downloadTimeout)
         {
             try
             {
                 Utils.SetSecurityProtocol(LazyConfig.Instance.GetConfig().guiItem.enableSecurityProtocolTls13);
-                UpdateCompleted?.Invoke(this, new ResultEventArgs(false, ResUI.Downloading));
+                UpdateCompleted?.Invoke(this, new ResultEventArgs(false, $"{ResUI.Downloading}   {url}"));
 
                 var progress = new Progress<double>();
                 progress.ProgressChanged += (sender, value) =>
@@ -77,7 +76,7 @@ namespace v2rayN.Handler
                 };
 
                 var webProxy = GetWebProxy(blProxy);
-                _ = DownloaderHelper.Instance.DownloadFileAsync(webProxy,
+                await DownloaderHelper.Instance.DownloadFileAsync(webProxy,
                     url,
                     Utils.GetTempPath(Utils.GetDownloadFileName(url)),
                     progress,
@@ -175,13 +174,12 @@ namespace v2rayN.Handler
                 }
             }
 
-
             return null;
         }
 
         /// <summary>
         /// DownloadString
-        /// </summary> 
+        /// </summary>
         /// <param name="url"></param>
         public async Task<string?> DownloadStringAsync(string url, bool blProxy, string userAgent)
         {
@@ -208,10 +206,8 @@ namespace v2rayN.Handler
                     client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic", Utils.Base64Encode(uri.UserInfo));
                 }
 
-                var cts = new CancellationTokenSource();
+                using var cts = new CancellationTokenSource();
-                cts.CancelAfter(1000 * 30);
+                var result = await HttpClientHelper.Instance.GetAsync(client, url, cts.Token).WaitAsync(TimeSpan.FromSeconds(30), cts.Token);
-
-                var result = await HttpClientHelper.Instance.GetAsync(client, url, cts.Token);
                 return result;
             }
             catch (Exception ex)
@@ -228,7 +224,7 @@ namespace v2rayN.Handler
 
         /// <summary>
         /// DownloadString
-        /// </summary> 
+        /// </summary>
         /// <param name="url"></param>
         public async Task<string?> DownloadStringViaDownloader(string url, bool blProxy, string userAgent)
         {
@@ -257,23 +253,20 @@ namespace v2rayN.Handler
             return null;
         }
 
-
+        public async Task<int> RunAvailabilityCheck(IWebProxy? webProxy)
-        public int RunAvailabilityCheck(IWebProxy? webProxy)
         {
             try
             {
                 if (webProxy == null)
                 {
-                    var httpPort = LazyConfig.Instance.GetLocalPort(Global.InboundHttp);
+                    webProxy = GetWebProxy(true);
-                    webProxy = new WebProxy(Global.Loopback, httpPort);
                 }
 
                 try
                 {
                     var config = LazyConfig.Instance.GetConfig();
-                    string status = GetRealPingTime(config.speedTestItem.speedPingTestUrl, webProxy, 10, out int responseTime);
+                    int responseTime = await GetRealPingTime(config.speedTestItem.speedPingTestUrl, webProxy, 10);
-                    bool noError = Utils.IsNullOrEmpty(status);
+                    return responseTime;
-                    return noError ? responseTime : -1;
                 }
                 catch (Exception ex)
                 {
@@ -288,31 +281,29 @@ namespace v2rayN.Handler
             }
         }
 
-        public string GetRealPingTime(string url, IWebProxy? webProxy, int downloadTimeout, out int responseTime)
+        public async Task<int> GetRealPingTime(string url, IWebProxy? webProxy, int downloadTimeout)
         {
-            string msg = string.Empty;
+            int responseTime = -1;
-            responseTime = -1;
             try
             {
-                HttpWebRequest myHttpWebRequest = (HttpWebRequest)WebRequest.Create(url);
-                myHttpWebRequest.Timeout = downloadTimeout * 1000;
-                myHttpWebRequest.Proxy = webProxy;
-
                 Stopwatch timer = Stopwatch.StartNew();
 
-                using HttpWebResponse myHttpWebResponse = (HttpWebResponse)myHttpWebRequest.GetResponse();
+                using var cts = new CancellationTokenSource();
-                if (myHttpWebResponse.StatusCode is not HttpStatusCode.OK and not HttpStatusCode.NoContent)
+                cts.CancelAfter(TimeSpan.FromSeconds(downloadTimeout));
+                using var client = new HttpClient(new SocketsHttpHandler()
                 {
-                    msg = myHttpWebResponse.StatusDescription;
+                    Proxy = webProxy,
-                }
+                    UseProxy = webProxy != null
+                });
+                await client.GetAsync(url, cts.Token);
+
                 responseTime = timer.Elapsed.Milliseconds;
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                //Utils.SaveLog(ex.Message, ex);
-                msg = ex.Message;
             }
-            return msg;
+            return responseTime;
         }
 
         private WebProxy? GetWebProxy(bool blProxy)
@@ -345,4 +336,4 @@ namespace v2rayN.Handler
             }
         }
     }
-}
+}

v2rayN/v2rayN/Handler/HotkeyHandler.cs

@@ -15,15 +15,20 @@ namespace v2rayN.Handler
         public static HotkeyHandler Instance = _instance.Value;
 
         private const int WmHotkey = 0x0312;
+
         private Config _config
         {
             get => LazyConfig.Instance.GetConfig();
         }
+
         private Dictionary<int, List<EGlobalHotkey>> _hotkeyTriggerDic;
 
         public bool IsPause { get; set; } = false;
+
         public event Action<bool, string>? UpdateViewEvent;
+
         public event Action<EGlobalHotkey>? HotkeyTriggerEvent;
+
         public HotkeyHandler()
         {
             _hotkeyTriggerDic = new();
@@ -57,6 +62,7 @@ namespace v2rayN.Handler
                 }
             }
         }
+
         public void Load()
         {
             foreach (var _hotkeyCode in _hotkeyTriggerDic.Keys)
@@ -82,7 +88,6 @@ namespace v2rayN.Handler
                     }
                     UpdateViewEvent?.Invoke(false, msg);
                 }
-
             }
         }
 
@@ -98,6 +103,7 @@ namespace v2rayN.Handler
             Init();
             Load();
         }
+
         private (int fsModifiers, int vKey, string hotkeyStr, List<string> Names) GetHotkeyInfo(int hotkeycode)
         {
             var _fsModifiers = hotkeycode & 0xffff;
@@ -117,9 +123,9 @@ namespace v2rayN.Handler
                 _names.Add(name.ToString());
             }
 
-
             return (_fsModifiers, _vkey, _hotkeyStr.ToString(), _names);
         }
+
         private void OnThreadPreProcessMessage(ref MSG msg, ref bool handled)
         {
             if (msg.message != WmHotkey || !_hotkeyTriggerDic.ContainsKey((int)msg.lParam))
@@ -153,11 +159,13 @@ namespace v2rayN.Handler
                 }
             }
         }
+
         [DllImport("user32.dll", SetLastError = true)]
         private static extern bool RegisterHotKey(IntPtr hWnd, int id, int fsModifiers, int vlc);
 
         [DllImport("user32.dll", SetLastError = true)]
         private static extern bool UnregisterHotKey(IntPtr hWnd, int id);
+
         [Flags]
         private enum KeyModifiers
         {
@@ -169,4 +177,4 @@ namespace v2rayN.Handler
             NoRepeat = 0x4000
         }
     }
-}
+}

v2rayN/v2rayN/Handler/LazyConfig.cs

@@ -18,6 +18,7 @@ namespace v2rayN.Handler
             SqliteHelper.Instance.CreateTable<ServerStatItem>();
             SqliteHelper.Instance.CreateTable<RoutingItem>();
             SqliteHelper.Instance.CreateTable<ProfileExItem>();
+            SqliteHelper.Instance.CreateTable<DNSItem>();
         }
 
         #region Config
@@ -26,6 +27,7 @@ namespace v2rayN.Handler
         {
             _config = config;
         }
+
         public Config GetConfig()
         {
             return _config;
@@ -65,6 +67,7 @@ namespace v2rayN.Handler
         {
             return SqliteHelper.Instance.Table<SubItem>().ToList();
         }
+
         public SubItem GetSubItem(string subid)
         {
             return SqliteHelper.Instance.Table<SubItem>().FirstOrDefault(t => t.id == subid);
@@ -75,19 +78,18 @@ namespace v2rayN.Handler
             if (Utils.IsNullOrEmpty(subid))
             {
                 return SqliteHelper.Instance.Table<ProfileItem>().ToList();
-
             }
             else
             {
                 return SqliteHelper.Instance.Table<ProfileItem>().Where(t => t.subid == subid).ToList();
             }
         }
+
         public List<string> ProfileItemIndexs(string subid)
         {
             if (Utils.IsNullOrEmpty(subid))
             {
                 return SqliteHelper.Instance.Table<ProfileItem>().Select(t => t.indexId).ToList();
-
             }
             else
             {
@@ -97,10 +99,10 @@ namespace v2rayN.Handler
 
         public List<ProfileItemModel> ProfileItems(string subid, string filter)
         {
-            var sql = @$"select a.* 
+            var sql = @$"select a.*
-                           ,b.remarks subRemarks                           
+                           ,b.remarks subRemarks
                         from ProfileItem a
-                        left join SubItem b on a.subid = b.id 
+                        left join SubItem b on a.subid = b.id
                         where 1=1 ";
             if (!Utils.IsNullOrEmpty(subid))
             {
@@ -131,12 +133,23 @@ namespace v2rayN.Handler
         {
             return SqliteHelper.Instance.Table<RoutingItem>().Where(it => it.locked == false).OrderBy(t => t.sort).ToList();
         }
+
         public RoutingItem GetRoutingItem(string id)
         {
             return SqliteHelper.Instance.Table<RoutingItem>().FirstOrDefault(it => it.locked == false && it.id == id);
         }
 
-        #endregion
+        public List<DNSItem> DNSItems()
+        {
+            return SqliteHelper.Instance.Table<DNSItem>().ToList();
+        }
+
+        public DNSItem GetDNSItem(ECoreType eCoreType)
+        {
+            return SqliteHelper.Instance.Table<DNSItem>().FirstOrDefault(it => it.coreType == eCoreType);
+        }
+
+        #endregion Config
 
         #region Core Type
 
@@ -330,9 +343,9 @@ namespace v2rayN.Handler
             {
                 coreType = ECoreType.sing_box,
                 coreExes = new List<string> { "sing-box-client", "sing-box" },
-                arguments = "run",
+                arguments = "run{0}",
                 coreUrl = Global.singboxCoreUrl,
-                redirectInfo = true,                 
+                redirectInfo = true,
                 coreReleaseApiUrl = Global.singboxCoreUrl.Replace(Global.githubUrl, Global.githubApiUrl),
                 coreDownloadUrl32 = Global.singboxCoreUrl + "/download/{0}/sing-box-{1}-windows-386.zip",
                 coreDownloadUrl64 = Global.singboxCoreUrl + "/download/{0}/sing-box-{1}-windows-amd64.zip",
@@ -342,6 +355,6 @@ namespace v2rayN.Handler
             });
         }
 
-        #endregion
+        #endregion Core Type
     }
-}
+}

v2rayN/v2rayN/Handler/MainFormHandler.cs

@@ -1,5 +1,4 @@
-
+using Microsoft.Win32;
-using Microsoft.Win32;
 using System.Drawing;
 using System.IO;
 using System.Windows.Media.Imaging;
@@ -56,10 +55,12 @@ namespace v2rayN.Handler
                 case 0:
                     index = 1;
                     break;
+
                 case 1:
                 case 3:
                     index = 2;
                     break;
+
                 case 2:
                     index = 3;
                     break;
@@ -97,7 +98,7 @@ namespace v2rayN.Handler
                 SolidBrush drawBrush = new(color);
 
                 graphics.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
-                //graphics.FillRectangle(drawBrush, new Rectangle(0, 0, width, height));                
+                //graphics.FillRectangle(drawBrush, new Rectangle(0, 0, width, height));
                 graphics.DrawImage(new Bitmap(item.customIcon), 0, 0, width, height);
                 graphics.FillEllipse(drawBrush, width / 2, width / 2, width / 2, width / 2);
 
@@ -143,9 +144,7 @@ namespace v2rayN.Handler
             {
                 return;
             }
-            //Config configCopy = Utils.DeepCopy(config);
+            if (CoreConfigHandler.GenerateClientConfig(item, fileName, out string msg, out string content) != 0)
-            //configCopy.index = index;
-            if (CoreConfigHandler.Export2ClientConfig(item, fileName, out string msg) != 0)
             {
                 UI.Show(msg);
             }
@@ -155,135 +154,15 @@ namespace v2rayN.Handler
             }
         }
 
-        public void Export2ServerConfig(ProfileItem item, Config config)
-        {
-            if (item == null)
-            {
-                return;
-            }
-            if (item.configType is not EConfigType.VMess and not EConfigType.VLESS)
-            {
-                UI.Show(ResUI.NonVmessService);
-                return;
-            }
-
-            SaveFileDialog fileDialog = new()
-            {
-                Filter = "Config|*.json",
-                FilterIndex = 2,
-                RestoreDirectory = true
-            };
-            if (fileDialog.ShowDialog() != true)
-            {
-                return;
-            }
-            string fileName = fileDialog.FileName;
-            if (Utils.IsNullOrEmpty(fileName))
-            {
-                return;
-            }
-            //Config configCopy = Utils.DeepCopy(config);
-            //configCopy.index = index;
-            if (CoreConfigHandler.Export2ServerConfig(item, fileName, out string msg) != 0)
-            {
-                UI.Show(msg);
-            }
-            else
-            {
-                UI.ShowWarning(string.Format(ResUI.SaveServerConfigurationIn, fileName));
-            }
-        }
-
-        public void BackupGuiNConfig(Config config, bool auto = false)
-        {
-            string fileName = $"guiNConfig_{DateTime.Now:yyyy_MM_dd_HH_mm_ss_fff}.json";
-            if (auto)
-            {
-                fileName = Utils.GetBackupPath(fileName);
-            }
-            else
-            {
-                SaveFileDialog fileDialog = new()
-                {
-                    FileName = fileName,
-                    Filter = "guiNConfig|*.json",
-                    FilterIndex = 2,
-                    RestoreDirectory = true
-                };
-                if (fileDialog.ShowDialog() != true)
-                {
-                    return;
-                }
-                fileName = fileDialog.FileName;
-            }
-            if (Utils.IsNullOrEmpty(fileName))
-            {
-                return;
-            }
-            var ret = Utils.ToJsonFile(config, fileName);
-            if (!auto)
-            {
-                if (ret == 0)
-                {
-
-                    UI.Show(ResUI.OperationSuccess);
-                }
-                else
-                {
-                    UI.ShowWarning(ResUI.OperationFailed);
-                }
-            }
-        }
-
-        public bool RestoreGuiNConfig(ref Config config)
-        {
-            var fileContent = string.Empty;
-            OpenFileDialog fileDialog = new();
-
-            fileDialog.InitialDirectory = Utils.GetBackupPath("");
-            fileDialog.Filter = "guiNConfig|*.json|All|*.*";
-            fileDialog.FilterIndex = 2;
-            fileDialog.RestoreDirectory = true;
-
-            if (fileDialog.ShowDialog() == true)
-            {
-                fileContent = Utils.LoadResource(fileDialog.FileName);
-            }
-            else
-            {
-                return false;
-            }
-
-            if (Utils.IsNullOrEmpty(fileContent))
-            {
-                UI.ShowWarning(ResUI.OperationFailed);
-                return false;
-            }
-
-            var resConfig = Utils.FromJson<Config>(fileContent);
-            if (resConfig == null)
-            {
-                UI.ShowWarning(ResUI.OperationFailed);
-                return false;
-            }
-            //backup first
-            BackupGuiNConfig(config, true);
-
-            config = resConfig;
-            LazyConfig.Instance.SetConfig(config);
-
-            return true;
-        }
-
         public void UpdateTask(Config config, Action<bool, string> update)
         {
             Task.Run(() => UpdateTaskRunSubscription(config, update));
             Task.Run(() => UpdateTaskRunGeo(config, update));
         }
 
-        private void UpdateTaskRunSubscription(Config config, Action<bool, string> update)
+        private async Task UpdateTaskRunSubscription(Config config, Action<bool, string> update)
         {
-            Thread.Sleep(60000);
+            await Task.Delay(60000);
             Utils.SaveLog("UpdateTaskRunSubscription");
 
             var updateHandle = new UpdateHandle();
@@ -306,17 +185,17 @@ namespace v2rayN.Handler
                     item.updateTime = updateTime;
                     ConfigHandler.AddSubItem(ref config, item);
 
-                    Thread.Sleep(5000);
+                    await Task.Delay(5000);
                 }
-                Thread.Sleep(60000);
+                await Task.Delay(60000);
             }
         }
 
-        private void UpdateTaskRunGeo(Config config, Action<bool, string> update)
+        private async Task UpdateTaskRunGeo(Config config, Action<bool, string> update)
         {
             var autoUpdateGeoTime = DateTime.Now;
 
-            Thread.Sleep(1000 * 120);
+            await Task.Delay(1000 * 120);
             Utils.SaveLog("UpdateTaskRunGeo");
 
             var updateHandle = new UpdateHandle();
@@ -327,24 +206,15 @@ namespace v2rayN.Handler
                 {
                     if ((dtNow - autoUpdateGeoTime).Hours % config.guiItem.autoUpdateInterval == 0)
                     {
-                        updateHandle.UpdateGeoFile("geosite", config, (bool success, string msg) =>
+                        updateHandle.UpdateGeoFileAll(config, (bool success, string msg) =>
                         {
                             update(false, msg);
-                            if (success)
-                                Utils.SaveLog("geosite" + msg);
-                        });
-
-                        updateHandle.UpdateGeoFile("geoip", config, (bool success, string msg) =>
-                        {
-                            update(false, msg);
-                            if (success)
-                                Utils.SaveLog("geoip" + msg);
                         });
                         autoUpdateGeoTime = dtNow;
                     }
                 }
 
-                Thread.Sleep(1000 * 3600);
+                await Task.Delay(1000 * 3600);
             }
         }
 
@@ -354,6 +224,5 @@ namespace v2rayN.Handler
             HotkeyHandler.Instance.HotkeyTriggerEvent += handler;
             HotkeyHandler.Instance.Load();
         }
-
     }
 }

v2rayN/v2rayN/Handler/NoticeHandler.cs

@@ -18,16 +18,16 @@ namespace v2rayN.Handler
         {
             _snackbarMessageQueue?.Enqueue(content);
         }
+
         public void SendMessage(string msg)
         {
             MessageBus.Current.SendMessage(msg, "MsgView");
         }
+
         public void SendMessage(string msg, bool time)
         {
             msg = $"{DateTime.Now} {msg}";
             MessageBus.Current.SendMessage(msg, "MsgView");
         }
-
-
     }
-}
+}

v2rayN/v2rayN/Handler/ProfileExHandler.cs

@@ -5,7 +5,7 @@ using v2rayN.Mode;
 
 namespace v2rayN.Handler
 {
-    class ProfileExHandler
+    internal class ProfileExHandler
     {
         private static readonly Lazy<ProfileExHandler> _instance = new(() => new());
         private ConcurrentBag<ProfileExItem> _lstProfileEx;
@@ -24,7 +24,7 @@ namespace v2rayN.Handler
 
             _lstProfileEx = new(SqliteHelper.Instance.Table<ProfileExItem>());
 
-            Task.Run(() =>
+            Task.Run(async () =>
             {
                 while (true)
                 {
@@ -38,7 +38,7 @@ namespace v2rayN.Handler
                             SqliteHelper.Instance.Replace(item);
                         }
                     }
-                    Thread.Sleep(1000 * 60);
+                    await Task.Delay(1000 * 60);
                 }
             });
         }
@@ -132,6 +132,7 @@ namespace v2rayN.Handler
             }
             return profileEx.sort;
         }
+
         public int GetMaxSort()
         {
             if (_lstProfileEx.Count <= 0)
@@ -141,4 +142,4 @@ namespace v2rayN.Handler
             return _lstProfileEx.Max(t => t == null ? 0 : t.sort);
         }
     }
-}
+}

v2rayN/v2rayN/Handler/ProxySetting.cs

@@ -3,7 +3,7 @@ using System.Runtime.InteropServices;
 
 namespace v2rayN.Handler
 {
-    class ProxySetting
+    internal class ProxySetting
     {
         public static bool UnsetProxy()
         {
@@ -62,7 +62,6 @@ namespace v2rayN.Handler
             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);
@@ -106,8 +105,8 @@ namespace v2rayN.Handler
             return (returnvalue < 0);
         }
 
-
         #region WinInet structures
+
         [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
         public struct InternetPerConnOptionList
         {
@@ -115,6 +114,7 @@ namespace v2rayN.Handler
             public IntPtr 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;
         };
@@ -122,9 +122,10 @@ namespace v2rayN.Handler
         [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
         public struct InternetConnectionOption
         {
-            static readonly int Size;
+            private static readonly int Size;
             public PerConnOption m_Option;
             public InternetConnectionOptionValue m_Value;
+
             static InternetConnectionOption()
             {
                 Size = Marshal.SizeOf(typeof(InternetConnectionOption));
@@ -137,15 +138,19 @@ namespace v2rayN.Handler
                 // Fields
                 [FieldOffset(0)]
                 public System.Runtime.InteropServices.ComTypes.FILETIME m_FileTime;
+
                 [FieldOffset(0)]
                 public int m_Int;
+
                 [FieldOffset(0)]
                 public IntPtr m_StringPtr;
             }
         }
-        #endregion
+
+        #endregion WinInet structures
 
         #region WinInet enums
+
         //
         // options manifests for Internet{Query|Set}Option
         //
@@ -159,11 +164,10 @@ namespace v2rayN.Handler
         //
         public enum PerConnOption
         {
-            INTERNET_PER_CONN_FLAGS = 1, // Sets or retrieves the connection type. The Value member will contain one or more of the values from PerConnFlags 
+            INTERNET_PER_CONN_FLAGS = 1, // Sets or retrieves the connection type. The Value member will contain one or more of the values from PerConnFlags
-            INTERNET_PER_CONN_PROXY_SERVER = 2, // Sets or retrieves a string containing the proxy servers.  
+            INTERNET_PER_CONN_PROXY_SERVER = 2, // Sets or retrieves a string containing the proxy servers.
-            INTERNET_PER_CONN_PROXY_BYPASS = 3, // Sets or retrieves a string containing the URLs that do not use the proxy server.  
+            INTERNET_PER_CONN_PROXY_BYPASS = 3, // Sets or retrieves a string containing the URLs that do not use the proxy server.
-            INTERNET_PER_CONN_AUTOCONFIG_URL = 4//, // Sets or retrieves a string containing the URL to the automatic configuration script.  
+            INTERNET_PER_CONN_AUTOCONFIG_URL = 4//, // Sets or retrieves a string containing the URL to the automatic configuration script.
-
         }
 
         //
@@ -177,7 +181,8 @@ namespace v2rayN.Handler
             PROXY_TYPE_AUTO_PROXY_URL = 0x00000004,  // autoproxy URL
             PROXY_TYPE_AUTO_DETECT = 0x00000008   // use autoproxy detection
         }
-        #endregion
+
+        #endregion WinInet enums
 
         internal static class NativeMethods
         {
@@ -199,13 +204,13 @@ namespace v2rayN.Handler
                 return false;
             }
         }
+
         //获得代理的IP和端口
         public static string? GetProxyProxyServer()
         {
             using RegistryKey? rk = Registry.CurrentUser.OpenSubKey(@"Software\Microsoft\Windows\CurrentVersion\Internet Settings", true);
             string ProxyServer = rk.GetValue("ProxyServer").ToString();
             return ProxyServer;
-
         }
     }
-}
+}

v2rayN/v2rayN/Handler/QRCodeHelper.cs

@@ -24,7 +24,5 @@ namespace v2rayN.Handler
                 return null;
             }
         }
-
-
     }
-}
+}

v2rayN/v2rayN/Handler/ShareHandler.cs

@@ -7,9 +7,8 @@ using v2rayN.Resx;
 
 namespace v2rayN.Handler
 {
-    class ShareHandler
+    internal class ShareHandler
     {
-
         #region GetShareUrl
 
         /// <summary>
@@ -162,6 +161,7 @@ namespace v2rayN.Handler
             url = $"{Global.vlessProtocol}{url}{query}{remark}";
             return url;
         }
+
         private static string GetIpv6(string address)
         {
             return Utils.IsIpv6(address) ? $"[{address}]" : address;
@@ -221,6 +221,7 @@ namespace v2rayN.Handler
                         dicQuery.Add("host", Utils.UrlEncode(item.requestHost));
                     }
                     break;
+
                 case "kcp":
                     dicQuery.Add("headerType", !Utils.IsNullOrEmpty(item.headerType) ? item.headerType : "none");
                     if (!Utils.IsNullOrEmpty(item.path))
@@ -258,6 +259,7 @@ namespace v2rayN.Handler
                     dicQuery.Add("quicSecurity", Utils.UrlEncode(item.requestHost));
                     dicQuery.Add("key", Utils.UrlEncode(item.path));
                     break;
+
                 case "grpc":
                     if (!Utils.IsNullOrEmpty(item.path))
                     {
@@ -272,10 +274,9 @@ namespace v2rayN.Handler
             return 0;
         }
 
-        #endregion
+        #endregion GetShareUrl
-
-        #region  ImportShareUrl 
 
+        #region ImportShareUrl
 
         /// <summary>
         /// 从剪贴板导入URL
@@ -290,7 +291,7 @@ namespace v2rayN.Handler
 
             try
             {
-                //载入配置文件 
+                //载入配置文件
                 string result = clipboardData.TrimEx();// Utils.GetClipboardData();
                 if (Utils.IsNullOrEmpty(result))
                 {
@@ -309,7 +310,6 @@ namespace v2rayN.Handler
                     {
                         profileItem = ResolveVmess(result, out msg);
                     }
-
                 }
                 else if (result.StartsWith(Global.ssProtocol))
                 {
@@ -352,7 +352,6 @@ namespace v2rayN.Handler
                 else if (result.StartsWith(Global.vlessProtocol))
                 {
                     profileItem = ResolveStdVLESS(result);
-
                 }
                 else
                 {
@@ -485,8 +484,8 @@ namespace v2rayN.Handler
             switch (i.streamSecurity)
             {
                 case "tls":
-                    // TODO tls config
                     break;
+
                 default:
                     if (!string.IsNullOrWhiteSpace(i.streamSecurity))
                         return null;
@@ -499,12 +498,10 @@ namespace v2rayN.Handler
                 case "tcp":
                     string t1 = q["type"] ?? "none";
                     i.headerType = t1;
-                    // TODO http option
-
                     break;
+
                 case "kcp":
                     i.headerType = q["type"] ?? "none";
-                    // TODO kcp seed
                     break;
 
                 case "ws":
@@ -636,7 +633,6 @@ namespace v2rayN.Handler
             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);
 
@@ -738,6 +734,7 @@ namespace v2rayN.Handler
 
             return item;
         }
+
         private static ProfileItem ResolveStdVLESS(string result)
         {
             ProfileItem item = new()
@@ -780,6 +777,7 @@ namespace v2rayN.Handler
                     item.requestHost = Utils.UrlDecode(query["host"] ?? "");
 
                     break;
+
                 case "kcp":
                     item.headerType = query["headerType"] ?? "none";
                     item.path = Utils.UrlDecode(query["seed"] ?? "");
@@ -802,16 +800,18 @@ namespace v2rayN.Handler
                     item.requestHost = query["quicSecurity"] ?? "none";
                     item.path = Utils.UrlDecode(query["key"] ?? "");
                     break;
+
                 case "grpc":
                     item.path = Utils.UrlDecode(query["serviceName"] ?? "");
                     item.headerType = Utils.UrlDecode(query["mode"] ?? Global.GrpcgunMode);
                     break;
+
                 default:
                     break;
             }
             return 0;
         }
 
-        #endregion
+        #endregion ImportShareUrl
     }
-}
+}

v2rayN/v2rayN/Handler/SpeedtestHandler.cs

@@ -7,13 +7,13 @@ using v2rayN.Resx;
 
 namespace v2rayN.Handler
 {
-    class SpeedtestHandler
+    internal class SpeedtestHandler
     {
         private Config _config;
         private CoreHandler _coreHandler;
         private List<ServerTestItem> _selecteds;
         private ESpeedActionType _actionType;
-        Action<string, string, string> _updateFunc;
+        private Action<string, string, string> _updateFunc;
 
         public SpeedtestHandler(Config config)
         {
@@ -57,10 +57,12 @@ namespace v2rayN.Handler
                         UpdateFunc(it.indexId, ResUI.Speedtesting, "");
                         ProfileExHandler.Instance.SetTestDelay(it.indexId, "0");
                         break;
+
                     case ESpeedActionType.Speedtest:
                         UpdateFunc(it.indexId, "", ResUI.SpeedtestingWait);
                         ProfileExHandler.Instance.SetTestSpeed(it.indexId, "0");
                         break;
+
                     case ESpeedActionType.Mixedtest:
                         UpdateFunc(it.indexId, ResUI.Speedtesting, ResUI.SpeedtestingWait);
                         ProfileExHandler.Instance.SetTestDelay(it.indexId, "0");
@@ -74,22 +76,26 @@ namespace v2rayN.Handler
                 case ESpeedActionType.Ping:
                     Task.Run(RunPing);
                     break;
+
                 case ESpeedActionType.Tcping:
                     Task.Run(RunTcping);
                     break;
+
                 case ESpeedActionType.Realping:
                     Task.Run(RunRealPing);
                     break;
+
                 case ESpeedActionType.Speedtest:
                     Task.Run(RunSpeedTestAsync);
                     break;
+
                 case ESpeedActionType.Mixedtest:
                     Task.Run(RunMixedtestAsync);
                     break;
             }
         }
 
-        private void RunPingSub(Action<ServerTestItem> updateFun)
+        private async Task RunPingSubAsync(Action<ServerTestItem> updateFun)
         {
             try
             {
@@ -105,7 +111,7 @@ namespace v2rayN.Handler
                     }
                 }
 
-                Thread.Sleep(10);
+                await Task.Delay(10);
             }
             catch (Exception ex)
             {
@@ -113,22 +119,21 @@ namespace v2rayN.Handler
             }
         }
 
-
+        private async void RunPing()
-        private void RunPing()
         {
-            RunPingSub((ServerTestItem it) =>
+            await RunPingSubAsync((ServerTestItem it) =>
-            {
+             {
-                long time = Ping(it.address);
+                 long time = Ping(it.address);
-                var output = FormatOut(time, Global.DelayUnit);
+                 var output = FormatOut(time, Global.DelayUnit);
 
-                ProfileExHandler.Instance.SetTestDelay(it.indexId, output);
+                 ProfileExHandler.Instance.SetTestDelay(it.indexId, output);
-                UpdateFunc(it.indexId, output);
+                 UpdateFunc(it.indexId, output);
-            });
+             });
         }
 
-        private void RunTcping()
+        private async void RunTcping()
         {
-            RunPingSub((ServerTestItem it) =>
+            await RunPingSubAsync((ServerTestItem it) =>
             {
                 int time = GetTcpingTime(it.address, it.port);
                 var output = FormatOut(time, Global.DelayUnit);
@@ -145,7 +150,7 @@ namespace v2rayN.Handler
             {
                 string msg = string.Empty;
 
-                pid = _coreHandler.LoadCoreConfigString(_config, _selecteds);
+                pid = _coreHandler.LoadCoreConfigString(_selecteds);
                 if (pid < 0)
                 {
                     UpdateFunc("", ResUI.FailedToRunCore);
@@ -153,7 +158,7 @@ namespace v2rayN.Handler
                 }
 
                 DownloadHandle downloadHandle = new DownloadHandle();
-                //Thread.Sleep(5000);
+
                 List<Task> tasks = new();
                 foreach (var it in _selecteds)
                 {
@@ -165,13 +170,12 @@ namespace v2rayN.Handler
                     {
                         continue;
                     }
-                    tasks.Add(Task.Run(() =>
+                    tasks.Add(Task.Run(async () =>
                     {
                         try
                         {
-
                             WebProxy webProxy = new(Global.Loopback, it.port);
-                            string output = GetRealPingTime(downloadHandle, webProxy);
+                            string output = await GetRealPingTime(downloadHandle, webProxy);
 
                             ProfileExHandler.Instance.SetTestDelay(it.indexId, output);
                             UpdateFunc(it.indexId, output);
@@ -183,7 +187,6 @@ namespace v2rayN.Handler
                             Utils.SaveLog(ex.Message, ex);
                         }
                     }));
-                    //Thread.Sleep(100);
                 }
                 Task.WaitAll(tasks.ToArray());
             }
@@ -208,7 +211,7 @@ namespace v2rayN.Handler
             //    _selecteds = _selecteds.OrderBy(t => t.delay).ToList();
             //}
 
-            pid = _coreHandler.LoadCoreConfigString(_config, _selecteds);
+            pid = _coreHandler.LoadCoreConfigString(_selecteds);
             if (pid < 0)
             {
                 UpdateFunc("", ResUI.FailedToRunCore);
@@ -265,7 +268,7 @@ namespace v2rayN.Handler
         private async Task RunSpeedTestMulti()
         {
             int pid = -1;
-            pid = _coreHandler.LoadCoreConfigString(_config, _selecteds);
+            pid = _coreHandler.LoadCoreConfigString(_selecteds);
             if (pid < 0)
             {
                 UpdateFunc("", ResUI.FailedToRunCore);
@@ -287,6 +290,11 @@ namespace v2rayN.Handler
                 {
                     continue;
                 }
+                if (it.delay < 0)
+                {
+                    UpdateFunc(it.indexId, "", ResUI.SpeedtestingSkip);
+                    continue;
+                }
                 ProfileExHandler.Instance.SetTestSpeed(it.indexId, "-1");
                 UpdateFunc(it.indexId, "", ResUI.Speedtesting);
 
@@ -303,10 +311,10 @@ namespace v2rayN.Handler
                     }
                     UpdateFunc(it.indexId, "", msg);
                 });
-                Thread.Sleep(2000);
+                await Task.Delay(2000);
             }
 
-            Thread.Sleep((timeout + 2) * 1000);
+            await Task.Delay((timeout + 2) * 1000);
 
             if (pid > 0)
             {
@@ -320,16 +328,16 @@ namespace v2rayN.Handler
         {
             await RunRealPing();
 
-            Thread.Sleep(1000);
+            await Task.Delay(1000);
 
             await RunSpeedTestMulti();
         }
 
-        public string GetRealPingTime(DownloadHandle downloadHandle, IWebProxy webProxy)
+        public async Task<string> GetRealPingTime(DownloadHandle downloadHandle, IWebProxy webProxy)
         {
-            string status = downloadHandle.GetRealPingTime(_config.speedTestItem.speedPingTestUrl, webProxy, 10, out int responseTime);
+            int responseTime = await downloadHandle.GetRealPingTime(_config.speedTestItem.speedPingTestUrl, webProxy, 10);
             //string output = Utils.IsNullOrEmpty(status) ? FormatOut(responseTime, "ms") : status;
-            return FormatOut(Utils.IsNullOrEmpty(status) ? responseTime : -1, Global.DelayUnit);
+            return FormatOut(responseTime, Global.DelayUnit);
         }
 
         private int GetTcpingTime(string url, int port)
@@ -365,7 +373,6 @@ namespace v2rayN.Handler
             return responseTime;
         }
 
-
         /// <summary>
         /// Ping
         /// </summary>
@@ -417,4 +424,4 @@ namespace v2rayN.Handler
             _updateFunc(indexId, delay, speed);
         }
     }
-}
+}

v2rayN/v2rayN/Handler/StatisticsHandler.cs

@@ -1,60 +1,46 @@
-using Grpc.Core;
+using System.Net;
-using ProtosLib.Statistics;
-using System.Net;
 using System.Net.Sockets;
 using v2rayN.Base;
 using v2rayN.Mode;
 
 namespace v2rayN.Handler
 {
-    class StatisticsHandler
+    internal class StatisticsHandler
     {
-        private Mode.Config config_;
+        private Config _config;
-        private Channel channel_;
-        private StatsService.StatsServiceClient client_;
-        private bool exitFlag_;
         private ServerStatItem? _serverStatItem;
         private List<ServerStatItem> _lstServerStat;
+        private Action<ServerSpeedItem> _updateFunc;
+        private StatisticsV2ray? _statisticsV2Ray;
+        private StatisticsSingbox? _statisticsSingbox;
+
         public List<ServerStatItem> ServerStat => _lstServerStat;
+        public bool Enable { get; set; }
 
-        Action<ServerSpeedItem> updateFunc_;
+        public StatisticsHandler(Config config, Action<ServerSpeedItem> update)
-
-        public bool Enable
         {
-            get; set;
+            _config = config;
-        }
-
-        public StatisticsHandler(Mode.Config config, Action<ServerSpeedItem> update)
-        {
-            config_ = config;
             Enable = config.guiItem.enableStatistics;
-            updateFunc_ = update;
+            if (!Enable)
-            exitFlag_ = false;
+            {
+                return;
+            }
+
+            _updateFunc = update;
 
             Init();
-            GrpcInit();
+            Global.statePort = GetFreePort();
 
-            Task.Run(Run);
+            _statisticsV2Ray = new StatisticsV2ray(config, UpdateServerStat);
-        }
+            _statisticsSingbox = new StatisticsSingbox(config, UpdateServerStat);
-
-        private void GrpcInit()
-        {
-            if (channel_ == null)
-            {
-                Global.statePort = GetFreePort();
-
-                channel_ = new Channel($"{Global.Loopback}:{Global.statePort}", ChannelCredentials.Insecure);
-                channel_.ConnectAsync();
-                client_ = new StatsService.StatsServiceClient(channel_);
-            }
         }
 
         public void Close()
         {
             try
             {
-                exitFlag_ = true;
+                _statisticsV2Ray?.Close();
-                channel_.ShutdownAsync();
+                _statisticsSingbox?.Close();
             }
             catch (Exception ex)
             {
@@ -62,57 +48,6 @@ namespace v2rayN.Handler
             }
         }
 
-        public void Run()
-        {
-            while (!exitFlag_)
-            {
-                try
-                {
-                    if (Enable && channel_.State == ChannelState.Ready)
-                    {
-                        QueryStatsResponse? res = null;
-                        try
-                        {
-                            res = client_.QueryStats(new QueryStatsRequest() { Pattern = "", Reset = true });
-                        }
-                        catch (Exception ex)
-                        {
-                            //Utils.SaveLog(ex.Message, ex);
-                        }
-
-                        if (res != null)
-                        {
-                            GetServerStatItem(config_.indexId);
-                            ParseOutput(res.Stat, out ServerSpeedItem server);
-
-                            if (server.proxyUp != 0 || server.proxyDown != 0)
-                            {
-                                _serverStatItem.todayUp += server.proxyUp;
-                                _serverStatItem.todayDown += server.proxyDown;
-                                _serverStatItem.totalUp += server.proxyUp;
-                                _serverStatItem.totalDown += server.proxyDown;
-                            }
-                            if (Global.ShowInTaskbar)
-                            {
-                                server.indexId = config_.indexId;
-                                server.todayUp = _serverStatItem.todayUp;
-                                server.todayDown = _serverStatItem.todayDown;
-                                server.totalUp = _serverStatItem.totalUp;
-                                server.totalDown = _serverStatItem.totalDown;
-                                updateFunc_(server);
-                            }
-                        }
-                    }
-                    var sleep = config_.guiItem.statisticsFreshRate < 1 ? 1 : config_.guiItem.statisticsFreshRate;
-                    Thread.Sleep(1000 * sleep);
-                    channel_.ConnectAsync();
-                }
-                catch
-                {
-                }
-            }
-        }
-
         public void ClearAllServerStatistics()
         {
             SqliteHelper.Instance.Execute($"delete from ServerStatItem ");
@@ -142,6 +77,28 @@ namespace v2rayN.Handler
             _lstServerStat = SqliteHelper.Instance.Table<ServerStatItem>().ToList();
         }
 
+        private void UpdateServerStat(ServerSpeedItem server)
+        {
+            GetServerStatItem(_config.indexId);
+
+            if (server.proxyUp != 0 || server.proxyDown != 0)
+            {
+                _serverStatItem.todayUp += server.proxyUp;
+                _serverStatItem.todayDown += server.proxyDown;
+                _serverStatItem.totalUp += server.proxyUp;
+                _serverStatItem.totalDown += server.proxyDown;
+            }
+            if (Global.ShowInTaskbar)
+            {
+                server.indexId = _config.indexId;
+                server.todayUp = _serverStatItem.todayUp;
+                server.todayDown = _serverStatItem.todayDown;
+                server.totalUp = _serverStatItem.totalUp;
+                server.totalDown = _serverStatItem.totalDown;
+                _updateFunc(server);
+            }
+        }
+
         private void GetServerStatItem(string indexId)
         {
             long ticks = DateTime.Now.Date.Ticks;
@@ -177,72 +134,28 @@ namespace v2rayN.Handler
             }
         }
 
-        private void ParseOutput(Google.Protobuf.Collections.RepeatedField<Stat> source, out ServerSpeedItem server)
-        {
-            server = new();
-            try
-            {
-
-                foreach (Stat stat in source)
-                {
-                    string name = stat.Name;
-                    long value = stat.Value / 1024;    //KByte
-                    string[] nStr = name.Split(">>>".ToCharArray(), StringSplitOptions.RemoveEmptyEntries);
-                    string type = "";
-
-                    name = name.Trim();
-
-                    name = nStr[1];
-                    type = nStr[3];
-
-                    if (name == Global.agentTag)
-                    {
-                        if (type == "uplink")
-                        {
-                            server.proxyUp = value;
-                        }
-                        else if (type == "downlink")
-                        {
-                            server.proxyDown = value;
-                        }
-                    }
-                    else if (name == Global.directTag)
-                    {
-                        if (type == "uplink")
-                        {
-                            server.directUp = value;
-                        }
-                        else if (type == "downlink")
-                        {
-                            server.directDown = value;
-                        }
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                //Utils.SaveLog(ex.Message, ex);
-            }
-        }
-
         private int GetFreePort()
         {
-            int defaultPort = 28123;
             try
             {
-                // TCP stack please do me a favor
+                int defaultPort = 9090;
-                TcpListener l = new(IPAddress.Loopback, 0);
+                if (!Utils.PortInUse(defaultPort))
-                l.Start();
+                {
-                int port = ((IPEndPoint)l.LocalEndpoint).Port;
+                    return defaultPort;
-                l.Stop();
+                }
-                return port;
+                for (int i = 0; i < 3; i++)
+                {
+                    TcpListener l = new(IPAddress.Loopback, 0);
+                    l.Start();
+                    int port = ((IPEndPoint)l.LocalEndpoint).Port;
+                    l.Stop();
+                    return port;
+                }
             }
-            catch (Exception ex)
+            catch
             {
-                // in case access denied
-                Utils.SaveLog(ex.Message, ex);
-                return defaultPort;
             }
+            return 69090;
         }
     }
-}
+}

v2rayN/v2rayN/Handler/StatisticsSingbox.cs

@@ -0,0 +1,128 @@
+using System.Net.WebSockets;
+using System.Text;
+using v2rayN.Mode;
+
+namespace v2rayN.Handler
+{
+    internal class StatisticsSingbox
+    {
+        private Config _config;
+        private bool _exitFlag;
+        private ClientWebSocket? webSocket;
+        private string url = string.Empty;
+        private Action<ServerSpeedItem> _updateFunc;
+
+        public StatisticsSingbox(Config config, Action<ServerSpeedItem> update)
+        {
+            _config = config;
+            _updateFunc = update;
+            _exitFlag = false;
+
+            Task.Run(() => Run());
+        }
+
+        private async void Init()
+        {
+            await Task.Delay(5000);
+
+            try
+            {
+                url = $"ws://{Global.Loopback}:{Global.statePort}/traffic";
+
+                if (webSocket == null)
+                {
+                    webSocket = new ClientWebSocket();
+                    await webSocket.ConnectAsync(new Uri(url), CancellationToken.None);
+                }
+            }
+            catch { }
+        }
+
+        public void Close()
+        {
+            try
+            {
+                _exitFlag = true;
+                if (webSocket != null)
+                {
+                    webSocket.Abort();
+                    webSocket = null;
+                }
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+            }
+        }
+
+        private async void Run()
+        {
+            Init();
+
+            while (!_exitFlag)
+            {
+                try
+                {
+                    if (webSocket != null)
+                    {
+                        if (webSocket.State == WebSocketState.Aborted
+                            || webSocket.State == WebSocketState.Closed)
+                        {
+                            webSocket.Abort();
+                            webSocket = null;
+                            Init();
+                            continue;
+                        }
+
+                        if (webSocket.State != WebSocketState.Open)
+                        {
+                            continue;
+                        }
+
+                        var buffer = new byte[1024];
+                        var res = await webSocket.ReceiveAsync(new ArraySegment<byte>(buffer), CancellationToken.None);
+                        while (!res.CloseStatus.HasValue)
+                        {
+                            var result = Encoding.UTF8.GetString(buffer, 0, res.Count);
+                            if (!string.IsNullOrEmpty(result))
+                            {
+                                ParseOutput(result, out ulong up, out ulong down);
+
+                                _updateFunc(new ServerSpeedItem()
+                                {
+                                    proxyUp = (long)(up / 1000),
+                                    proxyDown = (long)(down / 1000)
+                                });
+                            }
+                            res = await webSocket.ReceiveAsync(new ArraySegment<byte>(buffer), CancellationToken.None);
+                        }
+                    }
+                }
+                catch
+                {
+                }
+                finally
+                {
+                    await Task.Delay(1000);
+                }
+            }
+        }
+
+        private void ParseOutput(string source, out ulong up, out ulong down)
+        {
+            up = 0; down = 0;
+            try
+            {
+                var trafficItem = Utils.FromJson<TrafficItem>(source);
+                if (trafficItem != null)
+                {
+                    up = trafficItem.up;
+                    down = trafficItem.down;
+                }
+            }
+            catch
+            {
+            }
+        }
+    }
+}

v2rayN/v2rayN/Handler/StatisticsV2ray.cs

@@ -0,0 +1,119 @@
+using Grpc.Core;
+using Grpc.Net.Client;
+using ProtosLib.Statistics;
+using v2rayN.Mode;
+
+namespace v2rayN.Handler
+{
+    internal class StatisticsV2ray
+    {
+        private Mode.Config _config;
+        private GrpcChannel _channel;
+        private StatsService.StatsServiceClient _client;
+        private bool _exitFlag;
+        private Action<ServerSpeedItem> _updateFunc;
+
+        public StatisticsV2ray(Mode.Config config, Action<ServerSpeedItem> update)
+        {
+            _config = config;
+            _updateFunc = update;
+            _exitFlag = false;
+
+            GrpcInit();
+
+            Task.Run(Run);
+        }
+
+        private void GrpcInit()
+        {
+            if (_channel == null)
+            {
+                _channel = GrpcChannel.ForAddress($"{Global.httpProtocol}{Global.Loopback}:{Global.statePort}");
+                _client = new StatsService.StatsServiceClient(_channel);
+            }
+        }
+
+        public void Close()
+        {
+            _exitFlag = true;
+        }
+
+        private async void Run()
+        {
+            while (!_exitFlag)
+            {
+                try
+                {
+                    if (_channel.State == ConnectivityState.Ready)
+                    {
+                        QueryStatsResponse? res = null;
+                        try
+                        {
+                            res = await _client.QueryStatsAsync(new QueryStatsRequest() { Pattern = "", Reset = true });
+                        }
+                        catch
+                        {
+                        }
+
+                        if (res != null)
+                        {
+                            ParseOutput(res.Stat, out ServerSpeedItem server);
+                            _updateFunc(server);
+                        }
+                    }
+                    await Task.Delay(1000);
+                    await _channel.ConnectAsync();
+                }
+                catch
+                {
+                }
+            }
+        }
+
+        private void ParseOutput(Google.Protobuf.Collections.RepeatedField<Stat> source, out ServerSpeedItem server)
+        {
+            server = new();
+            try
+            {
+                foreach (Stat stat in source)
+                {
+                    string name = stat.Name;
+                    long value = stat.Value / 1024;    //KByte
+                    string[] nStr = name.Split(">>>".ToCharArray(), StringSplitOptions.RemoveEmptyEntries);
+                    string type = "";
+
+                    name = name.Trim();
+
+                    name = nStr[1];
+                    type = nStr[3];
+
+                    if (name == Global.agentTag)
+                    {
+                        if (type == "uplink")
+                        {
+                            server.proxyUp = value;
+                        }
+                        else if (type == "downlink")
+                        {
+                            server.proxyDown = value;
+                        }
+                    }
+                    else if (name == Global.directTag)
+                    {
+                        if (type == "uplink")
+                        {
+                            server.directUp = value;
+                        }
+                        else if (type == "downlink")
+                        {
+                            server.directDown = value;
+                        }
+                    }
+                }
+            }
+            catch
+            {
+            }
+        }
+    }
+}

v2rayN/v2rayN/Handler/SysProxyHandle.cs

@@ -22,7 +22,7 @@ namespace v2rayN.Handler
         //  <pac-url>
         private static SysproxyConfig? _userSettings = null;
 
-        enum RET_ERRORS : int
+        private enum RET_ERRORS : int
         {
             RET_NO_ERROR = 0,
             INVALID_FORMAT = 1,
@@ -45,7 +45,6 @@ namespace v2rayN.Handler
             }
         }
 
-
         public static bool UpdateSysProxy(Config config, bool forceDisable)
         {
             var type = config.sysProxyType;
@@ -80,10 +79,12 @@ namespace v2rayN.Handler
                             .Replace("{http_port}", port.ToString())
                             .Replace("{socks_port}", portSocks.ToString());
                     }
+                    ProxySetting.SetProxy(strProxy, strExceptions, 2);
                     SetIEProxy(true, strProxy, strExceptions);
                 }
                 else if (type == ESysProxyType.ForcedClear)
                 {
+                    ProxySetting.UnsetProxy();
                     ResetIEProxy();
                 }
                 else if (type == ESysProxyType.Unchanged)
@@ -93,6 +94,7 @@ namespace v2rayN.Handler
                 {
                     PacHandler.Start(Utils.GetConfigPath(), port, portPac);
                     var strProxy = $"{Global.httpProtocol}{Global.Loopback}:{portPac}/pac?t={DateTime.Now.Ticks}";
+                    ProxySetting.SetProxy(strProxy, "", 4);
                     SetIEProxy(false, strProxy, "");
                 }
 
@@ -120,7 +122,6 @@ namespace v2rayN.Handler
             }
         }
 
-
         public static void SetIEProxy(bool global, string strProxy, string strExceptions)
         {
             string arguments = global
@@ -131,22 +132,9 @@ namespace v2rayN.Handler
         }
 
         // set system proxy to 1 (null) (null) (null)
-        public static bool ResetIEProxy()
+        public static void ResetIEProxy()
         {
-            try
+            ExecSysproxy("set 1 - - -");
-            {
-                // clear user-wininet.json
-                //_userSettings = new SysproxyConfig();
-                //Save();
-                // clear system setting
-                ExecSysproxy("set 1 - - -");
-            }
-            catch (Exception)
-            {
-                return false;
-            }
-
-            return true;
         }
 
         private static void ExecSysproxy(string arguments)
@@ -209,7 +197,6 @@ namespace v2rayN.Handler
             }
             catch (System.ComponentModel.Win32Exception e)
             {
-
                 // log the arguments
                 throw new Exception(process.StartInfo.Arguments);
             }
@@ -231,7 +218,5 @@ namespace v2rayN.Handler
             //    _queryStr = stdout;
             //}
         }
-
-
     }
-}
+}

v2rayN/v2rayN/Handler/TunHandler.cs

@@ -1,359 +0,0 @@
-using System.Diagnostics;
-using System.IO;
-using System.Reactive.Linq;
-using v2rayN.Handler;
-using v2rayN.Mode;
-using v2rayN.Resx;
-
-namespace v2rayN.Base
-{
-    public sealed class TunHandler
-    {
-        private static readonly Lazy<TunHandler> _instance = new(() => new());
-        public static TunHandler Instance => _instance.Value;
-        private string _tunConfigName = "tunConfig.json";
-        private static Config _config;
-        private CoreInfo coreInfo;
-        private Process? _process;
-        private static int _socksPort;
-        private static bool _needRestart = true;
-        private static bool _isRunning = false;
-
-        public TunHandler()
-        {
-            _config = LazyConfig.Instance.GetConfig();
-
-            Observable.Interval(TimeSpan.FromSeconds(10))
-                 .Subscribe(x =>
-                 {
-                     if (_isRunning && _config.tunModeItem.enableTun)
-                     {
-                         if (_process == null || _process.HasExited)
-                         {
-                             if (Init() == false)
-                             {
-                                 return;
-                             }
-                             CoreStart();
-                             Utils.SaveLog("Tun mode monitors restart");
-                         }
-                     }
-                 });
-        }
-
-        public void Start()
-        {
-            var socksPort = LazyConfig.Instance.GetLocalPort(Global.InboundSocks);
-
-            if (socksPort == _socksPort
-                && _process != null
-                && !_process.HasExited)
-            {
-                _needRestart = false;
-            }
-
-            _socksPort = socksPort;
-
-            if (_needRestart)
-            {
-                CoreStop();
-                if (Init() == false)
-                {
-                    return;
-                }
-                CoreStartTest();
-                CoreStart();
-            }
-        }
-
-        public void Stop()
-        {
-            CoreStop();
-        }
-
-        private bool Init()
-        {
-            coreInfo = LazyConfig.Instance.GetCoreInfo(ECoreType.sing_box);
-            //Template
-            string configStr = Utils.GetEmbedText(Global.TunSingboxFileName);
-            if (!Utils.IsNullOrEmpty(_config.tunModeItem.customTemplate) && File.Exists(_config.tunModeItem.customTemplate))
-            {
-                var customTemplate = File.ReadAllText(_config.tunModeItem.customTemplate);
-                if (!Utils.IsNullOrEmpty(customTemplate))
-                {
-                    configStr = customTemplate;
-                }
-            }
-            if (Utils.IsNullOrEmpty(configStr))
-            {
-                return false;
-            }
-
-            //settings
-            if (_config.tunModeItem.mtu <= 0)
-            {
-                _config.tunModeItem.mtu = Convert.ToInt32(Global.TunMtus[0]);
-            }
-            if (Utils.IsNullOrEmpty(_config.tunModeItem.stack))
-            {
-                _config.tunModeItem.stack = Global.TunStacks[0];
-            }
-            configStr = configStr.Replace("$mtu$", $"{_config.tunModeItem.mtu}");
-            configStr = configStr.Replace("$strict_route$", $"{_config.tunModeItem.strictRoute.ToString().ToLower()}");
-            configStr = configStr.Replace("$stack$", $"{_config.tunModeItem.stack}");
-
-            //logs
-            configStr = configStr.Replace("$log_disabled$", $"{(!_config.tunModeItem.enabledLog).ToString().ToLower()}");
-            if (_config.tunModeItem.showWindow)
-            {
-                configStr = configStr.Replace("$log_output$", $"");
-            }
-            else
-            {
-                var dtNow = DateTime.Now;
-                var log_output = $"\"output\": \"{Utils.GetLogPath($"singbox_{dtNow:yyyy-MM-dd}.txt")}\", ";
-                configStr = configStr.Replace("$log_output$", $"{log_output.Replace(@"\", @"\\")}");
-            }
-
-            //port
-            configStr = configStr.Replace("$socksPort$", $"{_socksPort}");
-
-            //dns
-            string dnsObject = String.Empty;
-            if (_config.tunModeItem.bypassMode)
-            {
-                dnsObject = _config.tunModeItem.directDNS;
-            }
-            else
-            {
-                dnsObject = _config.tunModeItem.proxyDNS;
-            }
-            if (dnsObject.IsNullOrEmpty() || Utils.ParseJson(dnsObject)?.ContainsKey("servers") == false)
-            {
-                dnsObject = Utils.GetEmbedText(Global.TunSingboxDNSFileName);
-            }
-            configStr = configStr.Replace("$dns_object$", dnsObject);
-
-            //exe
-            List<string> lstDnsExe = new();
-            List<string> lstDirectExe = new();
-            var coreInfos = LazyConfig.Instance.GetCoreInfos();
-            foreach (var it in coreInfos)
-            {
-                if (it.coreType == ECoreType.v2rayN)
-                {
-                    continue;
-                }
-                foreach (var it2 in it.coreExes)
-                {
-                    if (!lstDnsExe.Contains(it2) && it.coreType != ECoreType.sing_box)
-                    {
-                        //lstDnsExe.Add(it2);
-                        lstDnsExe.Add($"{it2}.exe");
-                    }
-
-                    if (!lstDirectExe.Contains(it2))
-                    {
-                        //lstDirectExe.Add(it2);
-                        lstDirectExe.Add($"{it2}.exe");
-                    }
-                }
-            }
-            string strDns = string.Join("\",\"", lstDnsExe.ToArray());
-            configStr = configStr.Replace("$dnsProcessName$", $"\"{strDns}\"");
-
-            string strDirect = string.Join("\",\"", lstDirectExe.ToArray());
-            configStr = configStr.Replace("$directProcessName$", $"\"{strDirect}\"");
-
-            if (_config.tunModeItem.bypassMode)
-            {
-                //direct ips
-                if (_config.tunModeItem.directIP != null && _config.tunModeItem.directIP.Count > 0)
-                {
-                    var ips = new { outbound = "direct", ip_cidr = _config.tunModeItem.directIP };
-                    configStr = configStr.Replace("$ruleDirectIPs$", "," + Utils.ToJson(ips));
-                }
-                //direct process
-                if (_config.tunModeItem.directProcess != null && _config.tunModeItem.directProcess.Count > 0)
-                {
-                    var process = new { outbound = "direct", process_name = _config.tunModeItem.directProcess };
-                    configStr = configStr.Replace("$ruleDirectProcess$", "," + Utils.ToJson(process));
-                }
-            }
-            else
-            {
-                //proxy ips
-                if (_config.tunModeItem.proxyIP != null && _config.tunModeItem.proxyIP.Count > 0)
-                {
-                    var ips = new { outbound = "proxy", ip_cidr = _config.tunModeItem.proxyIP };
-                    configStr = configStr.Replace("$ruleProxyIPs$", "," + Utils.ToJson(ips));
-                }
-                //proxy process
-                if (_config.tunModeItem.proxyProcess != null && _config.tunModeItem.proxyProcess.Count > 0)
-                {
-                    var process = new { outbound = "proxy", process_name = _config.tunModeItem.proxyProcess };
-                    configStr = configStr.Replace("$ruleProxyProcess$", "," + Utils.ToJson(process));
-                }
-
-                var final = new { outbound = "direct", inbound = "tun-in" };
-                configStr = configStr.Replace("$ruleFinally$", "," + Utils.ToJson(final));
-            }
-            configStr = configStr.Replace("$ruleDirectIPs$", "");
-            configStr = configStr.Replace("$ruleDirectProcess$", "");
-            configStr = configStr.Replace("$ruleProxyIPs$", "");
-            configStr = configStr.Replace("$ruleProxyProcess$", "");
-            configStr = configStr.Replace("$ruleFinally$", "");
-
-
-            File.WriteAllText(Utils.GetConfigPath(_tunConfigName), configStr);
-
-            return true;
-        }
-
-        private void CoreStop()
-        {
-            try
-            {
-                _isRunning = false;
-                if (_process != null)
-                {
-                    KillProcess(_process);
-                    _process.Dispose();
-                    _process = null;
-                    _needRestart = true;
-                }
-            }
-            catch (Exception ex)
-            {
-                Utils.SaveLog(ex.Message, ex);
-            }
-        }
-
-        private string CoreFindexe()
-        {
-            string fileName = string.Empty;
-            foreach (string name in coreInfo.coreExes)
-            {
-                string vName = $"{name}.exe";
-                vName = Utils.GetBinPath(vName, coreInfo.coreType);
-                if (File.Exists(vName))
-                {
-                    fileName = vName;
-                    break;
-                }
-            }
-            if (Utils.IsNullOrEmpty(fileName))
-            {
-                string msg = string.Format(ResUI.NotFoundCore, Utils.GetBinPath("", coreInfo.coreType), string.Join(", ", coreInfo.coreExes.ToArray()), coreInfo.coreUrl);
-                Utils.SaveLog(msg);
-            }
-            return fileName;
-        }
-
-        private void CoreStart()
-        {
-            try
-            {
-                string fileName = CoreFindexe();
-                if (Utils.IsNullOrEmpty(fileName))
-                {
-                    return;
-                }
-                var showWindow = _config.tunModeItem.showWindow;
-                Process p = new()
-                {
-                    StartInfo = new ProcessStartInfo
-                    {
-                        FileName = fileName,
-                        Arguments = $"run -c \"{Utils.GetConfigPath(_tunConfigName)}\"",
-                        WorkingDirectory = Utils.GetConfigPath(),
-                        UseShellExecute = showWindow,
-                        CreateNoWindow = !showWindow,
-                        //RedirectStandardError = !showWindow,
-                        Verb = "runas",
-                    }
-                };
-                p.Start();
-                _process = p;
-                _isRunning = true;
-                if (p.WaitForExit(1000))
-                {
-                    //if (showWindow)
-                    //{
-                    throw new Exception("start tun mode fail");
-                    //}
-                    //else
-                    //{
-                    //    throw new Exception(p.StandardError.ReadToEnd());
-                    //}
-                }
-
-                Global.processJob.AddProcess(p.Handle);
-            }
-            catch (Exception ex)
-            {
-                Utils.SaveLog(ex.Message, ex);
-            }
-        }
-
-        private void KillProcess(Process p)
-        {
-            try
-            {
-                p.CloseMainWindow();
-                p.WaitForExit(100);
-                if (!p.HasExited)
-                {
-                    p.Kill();
-                    p.WaitForExit(100);
-                }
-            }
-            catch (Exception ex)
-            {
-                Utils.SaveLog(ex.Message, ex);
-            }
-        }
-
-        private int CoreStartTest()
-        {
-            Utils.SaveLog("Tun mode configuration file test start");
-            try
-            {
-                string fileName = CoreFindexe();
-                if (fileName == "")
-                {
-                    return -1;
-                }
-                Process p = new Process
-                {
-                    StartInfo = new ProcessStartInfo
-                    {
-                        FileName = fileName,
-                        Arguments = $"run -c \"{Utils.GetConfigPath(_tunConfigName)}\"",
-                        WorkingDirectory = Utils.GetConfigPath(),
-                        UseShellExecute = false,
-                        CreateNoWindow = true,
-                        RedirectStandardError = true,
-                        Verb = "runas",
-                    }
-                };
-                p.Start();
-                if (p.WaitForExit(2000))
-                {
-                    throw new Exception(p.StandardError.ReadToEnd());
-                }
-                KillProcess(p);
-                return 0;
-            }
-            catch (Exception ex)
-            {
-                Utils.SaveLog(ex.Message, ex);
-                return -1;
-            }
-            finally
-            {
-                Utils.SaveLog("Tun mode configuration file test end");
-            }
-        }
-    }
-}

v2rayN/v2rayN/Handler/UpdateHandle.cs

@@ -9,12 +9,13 @@ using System.Windows;
 using v2rayN.Base;
 using v2rayN.Mode;
 using v2rayN.Resx;
+using v2rayN.Tool;
 
 namespace v2rayN.Handler
 {
-    class UpdateHandle
+    internal class UpdateHandle
     {
-        Action<bool, string> _updateFunc;
+        private Action<bool, string> _updateFunc;
         private Config _config;
 
         public event EventHandler<ResultEventArgs> AbsoluteCompleted;
@@ -84,7 +85,7 @@ namespace v2rayN.Handler
                     _updateFunc(false, string.Format(ResUI.MsgParsingSuccessfully, "v2rayN"));
 
                     url = args.Msg;
-                    askToDownload(downloadHandle, url, true);
+                    _ = askToDownload(downloadHandle, url, true);
                 }
                 else
                 {
@@ -96,7 +97,6 @@ namespace v2rayN.Handler
             CheckUpdateAsync(ECoreType.v2rayN, preRelease);
         }
 
-
         public void CheckUpdateCore(ECoreType type, Config config, Action<bool, string> update, bool preRelease)
         {
             _config = config;
@@ -136,7 +136,7 @@ namespace v2rayN.Handler
                 {
                     _updateFunc(false, string.Format(ResUI.MsgParsingSuccessfully, "Core"));
                     url = args.Msg;
-                    askToDownload(downloadHandle, url, true);
+                    _ = askToDownload(downloadHandle, url, true);
                 }
                 else
                 {
@@ -148,14 +148,13 @@ namespace v2rayN.Handler
             CheckUpdateAsync(type, preRelease);
         }
 
-
         public void UpdateSubscriptionProcess(Config config, string subId, bool blProxy, Action<bool, string> update)
         {
             _config = config;
             _updateFunc = update;
 
             _updateFunc(false, ResUI.MsgUpdateSubscriptionStart);
-            var subItem = LazyConfig.Instance.SubItems();
+            var subItem = LazyConfig.Instance.SubItems().OrderBy(t => t.sort).ToList();
 
             if (subItem == null || subItem.Count <= 0)
             {
@@ -176,6 +175,10 @@ namespace v2rayN.Handler
                         //_updateFunc(false, $"{hashCode}{ResUI.MsgNoValidSubscription}");
                         continue;
                     }
+                    if (!url.StartsWith(Global.httpsProtocol) && !url.StartsWith(Global.httpProtocol))
+                    {
+                        continue;
+                    }
                     if (item.enabled == false)
                     {
                         _updateFunc(false, $"{hashCode}{ResUI.MsgSkipSubscriptionUpdate}");
@@ -192,6 +195,20 @@ namespace v2rayN.Handler
 
                     //one url
                     url = Utils.GetPunycode(url);
+                    //convert
+                    if (!Utils.IsNullOrEmpty(item.convertTarget))
+                    {
+                        var subConvertUrl = string.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);
+                        }
+                        if (!url.Contains("config="))
+                        {
+                            url += string.Format("&config={0}", Global.SubConvertConfig.FirstOrDefault());
+                        }
+                    }
                     var result = await downloadHandle.TryDownloadString(url, blProxy, userAgent);
                     if (blProxy && Utils.IsNullOrEmpty(result))
                     {
@@ -199,7 +216,7 @@ namespace v2rayN.Handler
                     }
 
                     //more url
-                    if (!Utils.IsNullOrEmpty(item.moreUrl.TrimEx()))
+                    if (Utils.IsNullOrEmpty(item.convertTarget) && !Utils.IsNullOrEmpty(item.moreUrl.TrimEx()))
                     {
                         if (!Utils.IsNullOrEmpty(result) && Utils.IsBase64String(result))
                         {
@@ -264,11 +281,275 @@ namespace v2rayN.Handler
                 }
 
                 _updateFunc(true, $"{ResUI.MsgUpdateSubscriptionEnd}");
-
             });
         }
 
-        public void UpdateGeoFile(string geoName, Config config, Action<bool, string> update)
+        public void UpdateGeoFileAll(Config config, Action<bool, string> update)
+        {
+            Task.Run(async () =>
+            {
+                await UpdateGeoFile("geosite", _config, update);
+                await UpdateGeoFile("geoip", _config, update);
+
+                await UpdateGeoFile4Singbox("geosite", _config, false, update);
+                await UpdateGeoFile4Singbox("geoip", _config, true, update);
+            });
+        }
+
+        public void RunAvailabilityCheck(Action<bool, string> update)
+        {
+            Task.Run(async () =>
+            {
+                var time = await (new DownloadHandle()).RunAvailabilityCheck(null);
+
+                update(false, string.Format(ResUI.TestMeOutput, time));
+            });
+        }
+
+        #region private
+
+        private async void CheckUpdateAsync(ECoreType type, bool preRelease)
+        {
+            try
+            {
+                var coreInfo = LazyConfig.Instance.GetCoreInfo(type);
+                string url = coreInfo.coreReleaseApiUrl;
+
+                var result = await (new DownloadHandle()).DownloadStringAsync(url, true, "");
+                if (!Utils.IsNullOrEmpty(result))
+                {
+                    responseHandler(type, result, preRelease);
+                }
+                else
+                {
+                    Utils.SaveLog("StatusCode error: " + url);
+                    return;
+                }
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+                _updateFunc(false, ex.Message);
+            }
+        }
+
+        /// <summary>
+        /// 获取V2RayCore版本
+        /// </summary>
+        private SemanticVersion getCoreVersion(ECoreType type)
+        {
+            try
+            {
+                var coreInfo = LazyConfig.Instance.GetCoreInfo(type);
+                string filePath = string.Empty;
+                foreach (string name in coreInfo.coreExes)
+                {
+                    string vName = $"{name}.exe";
+                    vName = Utils.GetBinPath(vName, coreInfo.coreType);
+                    if (File.Exists(vName))
+                    {
+                        filePath = vName;
+                        break;
+                    }
+                }
+
+                if (!File.Exists(filePath))
+                {
+                    string msg = string.Format(ResUI.NotFoundCore, @"", "", "");
+                    //ShowMsg(true, msg);
+                    return new SemanticVersion("");
+                }
+
+                using Process p = new();
+                p.StartInfo.FileName = filePath;
+                p.StartInfo.Arguments = coreInfo.versionArg;
+                p.StartInfo.WorkingDirectory = Utils.StartupPath();
+                p.StartInfo.UseShellExecute = false;
+                p.StartInfo.RedirectStandardOutput = true;
+                p.StartInfo.CreateNoWindow = true;
+                p.StartInfo.StandardOutputEncoding = Encoding.UTF8;
+                p.Start();
+                p.WaitForExit(5000);
+                string echo = p.StandardOutput.ReadToEnd();
+                string version = string.Empty;
+                switch (type)
+                {
+                    case ECoreType.v2fly:
+                    case ECoreType.SagerNet:
+                    case ECoreType.Xray:
+                    case ECoreType.v2fly_v5:
+                        version = Regex.Match(echo, $"{coreInfo.match} ([0-9.]+) \\(").Groups[1].Value;
+                        break;
+
+                    case ECoreType.clash:
+                    case ECoreType.clash_meta:
+                        version = Regex.Match(echo, $"v[0-9.]+").Groups[0].Value;
+                        break;
+
+                    case ECoreType.sing_box:
+                        version = Regex.Match(echo, $"([0-9.]+)").Groups[1].Value;
+                        break;
+                }
+                return new SemanticVersion(version);
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+                _updateFunc(false, ex.Message);
+                return new SemanticVersion("");
+            }
+        }
+
+        private void responseHandler(ECoreType type, string gitHubReleaseApi, bool preRelease)
+        {
+            try
+            {
+                var gitHubReleases = Utils.FromJson<List<GitHubRelease>>(gitHubReleaseApi);
+                SemanticVersion version;
+                if (preRelease)
+                {
+                    version = new SemanticVersion(gitHubReleases!.First().TagName);
+                }
+                else
+                {
+                    version = new SemanticVersion(gitHubReleases!.First(r => r.Prerelease == false).TagName);
+                }
+                var coreInfo = LazyConfig.Instance.GetCoreInfo(type);
+
+                SemanticVersion curVersion;
+                string message;
+                string url;
+                switch (type)
+                {
+                    case ECoreType.v2fly:
+                    case ECoreType.SagerNet:
+                    case ECoreType.Xray:
+                    case ECoreType.v2fly_v5:
+                        {
+                            curVersion = getCoreVersion(type);
+                            message = string.Format(ResUI.IsLatestCore, curVersion.ToVersionString("v"));
+                            string osBit = "64";
+                            switch (RuntimeInformation.ProcessArchitecture)
+                            {
+                                case Architecture.Arm64:
+                                    osBit = "arm64-v8a";
+                                    break;
+
+                                case Architecture.X86:
+                                    osBit = "32";
+                                    break;
+
+                                default:
+                                    osBit = "64";
+                                    break;
+                            }
+
+                            url = string.Format(coreInfo.coreDownloadUrl64, version.ToVersionString("v"), osBit);
+                            break;
+                        }
+                    case ECoreType.clash:
+                    case ECoreType.clash_meta:
+                        {
+                            curVersion = getCoreVersion(type);
+                            message = string.Format(ResUI.IsLatestCore, curVersion);
+                            switch (RuntimeInformation.ProcessArchitecture)
+                            {
+                                case Architecture.Arm64:
+                                    url = coreInfo.coreDownloadUrlArm64;
+                                    break;
+
+                                case Architecture.X86:
+                                    url = coreInfo.coreDownloadUrl32;
+                                    break;
+
+                                default:
+                                    url = coreInfo.coreDownloadUrl64;
+                                    break;
+                            }
+                            url = string.Format(url, version.ToVersionString("v"));
+                            break;
+                        }
+                    case ECoreType.sing_box:
+                        {
+                            curVersion = getCoreVersion(type);
+                            message = string.Format(ResUI.IsLatestCore, curVersion.ToVersionString("v"));
+                            switch (RuntimeInformation.ProcessArchitecture)
+                            {
+                                case Architecture.Arm64:
+                                    url = coreInfo.coreDownloadUrlArm64;
+                                    break;
+
+                                case Architecture.X86:
+                                    url = coreInfo.coreDownloadUrl32;
+                                    break;
+
+                                default:
+                                    url = coreInfo.coreDownloadUrl64;
+                                    break;
+                            }
+                            url = string.Format(url, version.ToVersionString("v"), version);
+                            break;
+                        }
+                    case ECoreType.v2rayN:
+                        {
+                            curVersion = new SemanticVersion(FileVersionInfo.GetVersionInfo(Utils.GetExePath()).FileVersion.ToString());
+                            message = string.Format(ResUI.IsLatestN, curVersion);
+                            switch (RuntimeInformation.ProcessArchitecture)
+                            {
+                                case Architecture.Arm64:
+                                    url = string.Format(coreInfo.coreDownloadUrlArm64, version);
+                                    break;
+
+                                case Architecture.X86:
+                                    url = string.Format(coreInfo.coreDownloadUrl32, version);
+                                    break;
+
+                                default:
+                                    url = string.Format(coreInfo.coreDownloadUrl64, version);
+                                    break;
+                            }
+                            break;
+                        }
+                    default:
+                        throw new ArgumentException("Type");
+                }
+
+                if (curVersion >= version)
+                {
+                    AbsoluteCompleted?.Invoke(this, new ResultEventArgs(false, message));
+                    return;
+                }
+
+                AbsoluteCompleted?.Invoke(this, new ResultEventArgs(true, url));
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+                _updateFunc(false, ex.Message);
+            }
+        }
+
+        private async Task askToDownload(DownloadHandle downloadHandle, string url, bool blAsk)
+        {
+            bool blDownload = false;
+            if (blAsk)
+            {
+                if (UI.ShowYesNo(string.Format(ResUI.DownloadYesNo, url)) == MessageBoxResult.Yes)
+                {
+                    blDownload = true;
+                }
+            }
+            else
+            {
+                blDownload = true;
+            }
+            if (blDownload)
+            {
+                await downloadHandle.DownloadFileAsync(url, true, 600);
+            }
+        }
+
+        private async Task UpdateGeoFile(string geoName, Config config, Action<bool, string> update)
         {
             _config = config;
             _updateFunc = update;
@@ -312,263 +593,54 @@ namespace v2rayN.Handler
             {
                 _updateFunc(false, args.GetException().Message);
             };
-            askToDownload(downloadHandle, url, false);
+            await askToDownload(downloadHandle, url, false);
-
         }
 
-        public void RunAvailabilityCheck(Action<bool, string> update)
+        private async Task UpdateGeoFile4Singbox(string geoName, Config config, bool needStop, Action<bool, string> update)
         {
-            Task.Run(() =>
+            _config = config;
+            _updateFunc = update;
+            var url = string.Format(Global.singboxGeoUrl, geoName);
+
+            DownloadHandle downloadHandle = new();
+            downloadHandle.UpdateCompleted += (sender2, args) =>
             {
-                var time = (new DownloadHandle()).RunAvailabilityCheck(null);
+                if (args.Success)
-
-                update(false, string.Format(ResUI.TestMeOutput, time));
-            });
-        }
-
-        #region private
-
-        private async void CheckUpdateAsync(ECoreType type, bool preRelease)
-        {
-            try
-            {
-                var coreInfo = LazyConfig.Instance.GetCoreInfo(type);
-                string url = coreInfo.coreReleaseApiUrl;
-
-                var result = await (new DownloadHandle()).DownloadStringAsync(url, true, "");
-                if (!Utils.IsNullOrEmpty(result))
                 {
-                    responseHandler(type, result, preRelease);
+                    _updateFunc(false, string.Format(ResUI.MsgDownloadGeoFileSuccessfully, geoName));
+                    var coreHandler = Locator.Current.GetService<CoreHandler>();
+
+                    try
+                    {
+                        if (needStop) coreHandler?.CoreStop();
+                        Task.Delay(1000);
+                        string fileName = Utils.GetTempPath(Utils.GetDownloadFileName(url));
+                        if (File.Exists(fileName))
+                        {
+                            string targetPath = Utils.GetConfigPath($"{geoName}.db");
+                            File.Copy(fileName, targetPath, true);
+
+                            File.Delete(fileName);
+                        }
+                        if (needStop) coreHandler?.LoadCore();
+                    }
+                    catch (Exception ex)
+                    {
+                        _updateFunc(false, ex.Message);
+                    }
                 }
                 else
                 {
-                    Utils.SaveLog("StatusCode error: " + url);
+                    _updateFunc(false, args.Msg);
-                    return;
                 }
-            }
+            };
-            catch (Exception ex)
+            downloadHandle.Error += (sender2, args) =>
             {
-                Utils.SaveLog(ex.Message, ex);
+                _updateFunc(false, args.GetException().Message);
-                _updateFunc(false, ex.Message);
+            };
-            }
+            await askToDownload(downloadHandle, url, false);
         }
 
-        /// <summary>
+        #endregion private
-        /// 获取V2RayCore版本
-        /// </summary>
-        private string getCoreVersion(ECoreType type)
-        {
-            try
-            {
-
-                var coreInfo = LazyConfig.Instance.GetCoreInfo(type);
-                string filePath = string.Empty;
-                foreach (string name in coreInfo.coreExes)
-                {
-                    string vName = $"{name}.exe";
-                    vName = Utils.GetBinPath(vName, coreInfo.coreType);
-                    if (File.Exists(vName))
-                    {
-                        filePath = vName;
-                        break;
-                    }
-                }
-
-                if (!File.Exists(filePath))
-                {
-                    string msg = string.Format(ResUI.NotFoundCore, @"", "", "");
-                    //ShowMsg(true, msg);
-                    return "";
-                }
-
-                using Process p = new();
-                p.StartInfo.FileName = filePath;
-                p.StartInfo.Arguments = coreInfo.versionArg;
-                p.StartInfo.WorkingDirectory = Utils.StartupPath();
-                p.StartInfo.UseShellExecute = false;
-                p.StartInfo.RedirectStandardOutput = true;
-                p.StartInfo.CreateNoWindow = true;
-                p.StartInfo.StandardOutputEncoding = Encoding.UTF8;
-                p.Start();
-                p.WaitForExit(5000);
-                string echo = p.StandardOutput.ReadToEnd();
-                string version = string.Empty;
-                switch (type)
-                {
-                    case ECoreType.v2fly:
-                    case ECoreType.SagerNet:
-                    case ECoreType.Xray:
-                    case ECoreType.v2fly_v5:
-                        version = Regex.Match(echo, $"{coreInfo.match} ([0-9.]+) \\(").Groups[1].Value;
-                        break;
-                    case ECoreType.clash:
-                    case ECoreType.clash_meta:
-                        version = Regex.Match(echo, $"v[0-9.]+").Groups[0].Value; 
-                        break;
-                    case ECoreType.sing_box:
-                        version = Regex.Match(echo, $"([0-9.]+)").Groups[1].Value;
-                        break;
-                }
-                return version;
-            }
-            catch (Exception ex)
-            {
-                Utils.SaveLog(ex.Message, ex);
-                _updateFunc(false, ex.Message);
-                return "";
-            }
-        }
-        private void responseHandler(ECoreType type, string gitHubReleaseApi, bool preRelease)
-        {
-            try
-            {
-                var gitHubReleases = Utils.FromJson<List<GitHubRelease>>(gitHubReleaseApi);
-                string version;
-                if (preRelease)
-                {
-                    version = gitHubReleases!.First().TagName;
-                }
-                else
-                {
-                    version = gitHubReleases!.First(r => r.Prerelease == false).TagName;
-                }
-                var coreInfo = LazyConfig.Instance.GetCoreInfo(type);
-
-                string curVersion;
-                string message;
-                string url;
-                switch (type)
-                {
-                    case ECoreType.v2fly:
-                    case ECoreType.SagerNet:
-                    case ECoreType.Xray:
-                    case ECoreType.v2fly_v5:
-                        {
-                            curVersion = "v" + getCoreVersion(type);
-                            message = string.Format(ResUI.IsLatestCore, curVersion);
-                            string osBit = "64";
-                            switch (RuntimeInformation.ProcessArchitecture)
-                            {
-                                case Architecture.Arm64:
-                                    osBit = "arm64-v8a";
-                                    break;
-                                case Architecture.X86:
-                                    osBit = "32";
-                                    break;
-                                default:
-                                    osBit = "64";
-                                    break;
-                            }
-
-                            url = string.Format(coreInfo.coreDownloadUrl64, version, osBit);
-                            break;
-                        }
-                    case ECoreType.clash:
-                    case ECoreType.clash_meta:
-                        {
-                            curVersion = getCoreVersion(type);
-                            message = string.Format(ResUI.IsLatestCore, curVersion);
-                            switch (RuntimeInformation.ProcessArchitecture)
-                            {
-                                case Architecture.Arm64:
-                                    url = coreInfo.coreDownloadUrlArm64;
-                                    break;
-                                case Architecture.X86:
-                                    url = coreInfo.coreDownloadUrl32;
-                                    break;
-                                default:
-                                    url = coreInfo.coreDownloadUrl64;
-                                    break;
-                            }
-                            url = string.Format(url, version);
-                            break;
-                        }
-                    case ECoreType.sing_box:
-                        {
-                            curVersion = "v" + getCoreVersion(type);
-                            message = string.Format(ResUI.IsLatestCore, curVersion);
-                            switch (RuntimeInformation.ProcessArchitecture)
-                            {
-                                case Architecture.Arm64:
-                                    url = coreInfo.coreDownloadUrlArm64;
-                                    break;
-                                case Architecture.X86:
-                                    url = coreInfo.coreDownloadUrl32;
-                                    break;
-                                default:
-                                    url = coreInfo.coreDownloadUrl64;
-                                    break;
-                            }
-                            url = string.Format(url, version, version.Replace("v", ""));
-                            break;
-                        }
-                    case ECoreType.v2rayN:
-                        {
-                            curVersion = FileVersionInfo.GetVersionInfo(Utils.GetExePath()).FileVersion.ToString();
-                            message = string.Format(ResUI.IsLatestN, curVersion);
-                            switch (RuntimeInformation.ProcessArchitecture)
-                            {
-                                case Architecture.Arm64:
-                                    url = string.Format(coreInfo.coreDownloadUrlArm64, version);
-                                    break;
-                                case Architecture.X86:
-                                    url = string.Format(coreInfo.coreDownloadUrl32, version);
-                                    break;
-                                default:
-                                    url = string.Format(coreInfo.coreDownloadUrl64, version);
-                                    break;
-                            }
-                            break;
-                        }
-                    default:
-                        throw new ArgumentException("Type");
-                }
-
-                if (type == ECoreType.v2rayN)
-                {
-                    decimal.TryParse(curVersion, out decimal decCur);
-                    decimal.TryParse(version, out decimal dec);
-                    if (decCur >= dec)
-                    {
-                        AbsoluteCompleted?.Invoke(this, new ResultEventArgs(false, message));
-                        return;
-                    }
-                }
-
-                if (curVersion == version)
-                {
-                    AbsoluteCompleted?.Invoke(this, new ResultEventArgs(false, message));
-                    return;
-                }
-
-                AbsoluteCompleted?.Invoke(this, new ResultEventArgs(true, url));
-            }
-            catch (Exception ex)
-            {
-                Utils.SaveLog(ex.Message, ex);
-                _updateFunc(false, ex.Message);
-            }
-        }
-
-        private void askToDownload(DownloadHandle downloadHandle, string url, bool blAsk)
-        {
-            bool blDownload = false;
-            if (blAsk)
-            {
-                if (UI.ShowYesNo(string.Format(ResUI.DownloadYesNo, url)) == MessageBoxResult.Yes)
-                {
-                    blDownload = true;
-                }
-            }
-            else
-            {
-                blDownload = true;
-            }
-            if (blDownload)
-            {
-                downloadHandle.DownloadFileAsync(url, true, 600);
-            }
-        }
-        #endregion
     }
-}
+}

v2rayN/v2rayN/Mode/ComboItem.cs

@@ -6,9 +6,10 @@
         {
             get; set;
         }
+
         public string Text
         {
             get; set;
         }
     }
-}
+}

v2rayN/v2rayN/Mode/Config.cs

@@ -10,18 +10,11 @@
 
         public string indexId { get; set; }
         public string subIndexId { get; set; }
-
-        public string remoteDNS { get; set; }
-        /// <summary>
-        /// Outbound Freedom domainStrategy
-        /// </summary>
-        public string domainStrategy4Freedom { get; set; }
-
         public ESysProxyType sysProxyType { get; set; }
         public string systemProxyExceptions { get; set; }
         public string systemProxyAdvancedProtocol { get; set; }
 
-        #endregion
+        #endregion property
 
         #region other entities
 
@@ -34,11 +27,11 @@
         public UIItem uiItem { get; set; }
         public ConstItem constItem { get; set; }
         public SpeedTestItem speedTestItem { get; set; }
+        public Mux4Sbox mux4Sbox { get; set; }
         public List<InItem> inbound { get; set; }
         public List<KeyEventItem> globalHotkeys { get; set; }
         public List<CoreTypeItem> coreTypeItem { get; set; }
 
-        #endregion
+        #endregion other entities
-
     }
-}
+}

v2rayN/v2rayN/Mode/ConfigItems.cs

@@ -1,4 +1,5 @@
 using System.Windows.Input;
+
 namespace v2rayN.Mode
 {
     [Serializable]
@@ -51,7 +52,6 @@ namespace v2rayN.Mode
         public string user { get; set; }
 
         public string pass { get; set; }
-
     }
 
     [Serializable]
@@ -88,16 +88,12 @@ namespace v2rayN.Mode
 
         public bool enableStatistics { get; set; }
 
-        public int statisticsFreshRate { get; set; }
-
         public bool keepOlderDedupl { get; set; }
 
         public bool ignoreGeoUpdateCore { get; set; } = true;
 
         public int autoUpdateInterval { get; set; } = 10;
 
-        public int autoUpdateSubInterval { get; set; } = 10;
-
         public bool checkPreReleaseUpdate { get; set; } = false;
 
         public bool enableSecurityProtocolTls13 { get; set; }
@@ -118,6 +114,7 @@ namespace v2rayN.Mode
         public double mainGirdHeight1 { get; set; }
         public double mainGirdHeight2 { get; set; }
         public bool colorModeDark { get; set; }
+        public bool followSystemTheme { get; set; }
         public string? colorPrimaryName { get; set; }
         public string currentLanguage { get; set; }
         public string currentFontFamily { get; set; }
@@ -126,14 +123,15 @@ namespace v2rayN.Mode
         public bool doubleClick2Activate { get; set; }
         public bool autoHideStartup { get; set; } = true;
         public string mainMsgFilter { get; set; }
+        public bool showTrayTip { get; set; }
         public List<ColumnItem> mainColumnItem { get; set; }
-
     }
 
     [Serializable]
     public class ConstItem
     {
         public string defIEProxyExceptions { get; set; }
+        public string subConvertUrl { get; set; } = string.Empty;
     }
 
     [Serializable]
@@ -148,7 +146,6 @@ namespace v2rayN.Mode
         public bool Shift { get; set; }
 
         public Key? KeyCode { get; set; }
-
     }
 
     [Serializable]
@@ -163,20 +160,10 @@ namespace v2rayN.Mode
     public class TunModeItem
     {
         public bool enableTun { get; set; }
-        public bool showWindow { get; set; }
-        public bool enabledLog { get; set; }
         public bool strictRoute { get; set; }
         public string stack { get; set; }
         public int mtu { get; set; }
-        public string customTemplate { get; set; }
+        public bool enableExInbound { get; set; }
-        public bool bypassMode { get; set; } = true;
-        public List<string> directIP { get; set; }
-        public List<string> directProcess { get; set; }
-        public string directDNS { get; set; }
-        public List<string> proxyIP { get; set; }
-        public List<string> proxyProcess { get; set; }
-        public string proxyDNS { get; set; }
-
     }
 
     [Serializable]
@@ -185,7 +172,6 @@ namespace v2rayN.Mode
         public int speedTestTimeout { get; set; }
         public string speedTestUrl { get; set; }
         public string speedPingTestUrl { get; set; }
-
     }
 
     [Serializable]
@@ -195,6 +181,9 @@ namespace v2rayN.Mode
         /// 域名解析策略
         /// </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; }
@@ -207,4 +196,14 @@ namespace v2rayN.Mode
         public int Width { get; set; }
         public int Index { get; set; }
     }
-}
+
+    [Serializable]
+    public class Mux4Sbox
+    {
+        public string protocol { get; set; }
+        public int max_connections { get; set; }
+        public int min_streams { get; set; }
+        public int max_streams { get; set; }
+        public bool padding { get; set; }
+    }
+}

v2rayN/v2rayN/Mode/ConfigOld.cs

@@ -35,7 +35,7 @@
         }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public ESysProxyType sysProxyType
         {
@@ -97,14 +97,17 @@
         {
             get; set;
         }
+
         public string domainMatcher
         {
             get; set;
         }
+
         public int routingIndex
         {
             get; set;
         }
+
         public bool enableRoutingAdvanced
         {
             get; set;
@@ -122,6 +125,7 @@
         {
             get; set;
         }
+
         public string systemProxyAdvancedProtocol { get; set; }
 
         public int autoUpdateInterval { get; set; } = 0;
@@ -137,7 +141,7 @@
 
         public int trayMenuServersLimit { get; set; }
 
-        #endregion
+        #endregion property
 
         #region other entities
 
@@ -172,6 +176,7 @@
         {
             get; set;
         }
+
         /// <summary>
         /// UI
         /// </summary>
@@ -179,6 +184,7 @@
         {
             get; set;
         }
+
         public List<RoutingItemOld> routings
         {
             get; set;
@@ -194,14 +200,12 @@
             get; set;
         }
 
-
         public List<CoreTypeItem> coreTypeItem
         {
             get; set;
         }
 
-        #endregion
+        #endregion other entities
-
     }
 
     [Serializable]
@@ -231,7 +235,6 @@
             groupId = string.Empty;
         }
 
-
         public string indexId
         {
             get; set;
@@ -265,6 +268,7 @@
         {
             get; set;
         }
+
         /// <summary>
         /// 远程服务器端口
         /// </summary>
@@ -272,6 +276,7 @@
         {
             get; set;
         }
+
         /// <summary>
         /// 远程服务器ID
         /// </summary>
@@ -279,6 +284,7 @@
         {
             get; set;
         }
+
         /// <summary>
         /// 远程服务器额外ID
         /// </summary>
@@ -286,6 +292,7 @@
         {
             get; set;
         }
+
         /// <summary>
         /// 本地安全策略
         /// </summary>
@@ -293,6 +300,7 @@
         {
             get; set;
         }
+
         /// <summary>
         /// tcp,kcp,ws,h2,quic
         /// </summary>
@@ -300,8 +308,9 @@
         {
             get; set;
         }
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public string remarks
         {
@@ -349,7 +358,7 @@
         }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public string testResult
         {
@@ -371,6 +380,7 @@
         {
             get; set;
         }
+
         /// <summary>
         /// tls sni
         /// </summary>
@@ -404,23 +414,27 @@
         {
             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/Mode/CoreInfo.cs

@@ -23,6 +23,5 @@
         public string versionArg { get; set; }
 
         public bool redirectInfo { get; set; }
-
     }
-}
+}

v2rayN/v2rayN/Mode/DNSItem.cs

@@ -0,0 +1,18 @@
+using SQLite;
+
+namespace v2rayN.Mode
+{
+    [Serializable]
+    public class DNSItem
+    {
+        [PrimaryKey]
+        public string id { get; set; }
+
+        public string remarks { get; set; }
+        public bool enabled { get; set; } = true;
+        public ECoreType coreType { get; set; }
+        public string? normalDNS { get; set; }
+        public string? tunDNS { get; set; }
+        public string? domainStrategy4Freedom { get; set; }
+    }
+}

v2rayN/v2rayN/Mode/EConfigType.cs

@@ -1,5 +1,4 @@
-
+namespace v2rayN.Mode
-namespace v2rayN.Mode
 {
     public enum EConfigType
     {
@@ -10,4 +9,4 @@ namespace v2rayN.Mode
         VLESS = 5,
         Trojan = 6
     }
-}
+}

v2rayN/v2rayN/Mode/ECoreType.cs

@@ -1,5 +1,4 @@
-
+namespace v2rayN.Mode
-namespace v2rayN.Mode
 {
     public enum ECoreType
     {
@@ -15,4 +14,4 @@ namespace v2rayN.Mode
         sing_box = 24,
         v2rayN = 99
     }
-}
+}

v2rayN/v2rayN/Mode/EGlobalHotkey.cs

@@ -1,5 +1,4 @@
-
+namespace v2rayN.Mode
-namespace v2rayN.Mode
 {
     public enum EGlobalHotkey
     {
@@ -9,4 +8,4 @@ namespace v2rayN.Mode
         SystemProxyUnchanged = 3,
         SystemProxyPac = 4,
     }
-}
+}

v2rayN/v2rayN/Mode/EMove.cs

@@ -1,5 +1,4 @@
-
+namespace v2rayN.Mode
-namespace v2rayN.Mode
 {
     public enum EMove
     {
@@ -9,4 +8,4 @@ namespace v2rayN.Mode
         Bottom = 4,
         Position = 5
     }
-}
+}

v2rayN/v2rayN/Mode/EServerColName.cs

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

v2rayN/v2rayN/Mode/ESpeedActionType.cs

@@ -1,5 +1,4 @@
-
+namespace v2rayN.Mode
-namespace v2rayN.Mode
 {
     public enum ESpeedActionType
     {
@@ -9,4 +8,4 @@ namespace v2rayN.Mode
         Speedtest,
         Mixedtest
     }
-}
+}

v2rayN/v2rayN/Mode/ESysProxyType.cs

@@ -1,5 +1,4 @@
-
+namespace v2rayN.Mode
-namespace v2rayN.Mode
 {
     public enum ESysProxyType
     {
@@ -8,4 +7,4 @@ namespace v2rayN.Mode
         Unchanged = 2,
         Pac = 3
     }
-}
+}

v2rayN/v2rayN/Mode/EViewAction.cs

@@ -4,6 +4,5 @@
     {
         AdjustMainLvColWidth,
         ProfilesFocus
-
     }
-}
+}

v2rayN/v2rayN/Mode/ProfileExItem.cs

@@ -7,8 +7,9 @@ namespace v2rayN.Mode
     {
         [PrimaryKey]
         public string indexId { get; set; }
+
         public int delay { get; set; }
         public decimal speed { get; set; }
         public int sort { get; set; }
     }
-}
+}

v2rayN/v2rayN/Mode/ProfileItem.cs

@@ -28,6 +28,7 @@ namespace v2rayN.Mode
         }
 
         #region function
+
         public string GetSummary()
         {
             string summary = string.Format("[{0}] ", (configType).ToString());
@@ -54,6 +55,7 @@ namespace v2rayN.Mode
                 case EConfigType.Trojan:
                     summary += string.Format("{0}({1}:{2})", remarks, addr, port);
                     break;
+
                 default:
                     summary += string.Format("{0}", remarks);
                     break;
@@ -82,7 +84,7 @@ namespace v2rayN.Mode
             return network.TrimEx();
         }
 
-        #endregion
+        #endregion function
 
         [PrimaryKey]
         public string indexId { get; set; }
@@ -91,6 +93,7 @@ namespace v2rayN.Mode
         /// config type(1=normal,2=custom)
         /// </summary>
         public EConfigType configType { get; set; }
+
         /// <summary>
         /// 版本(现在=2)
         /// </summary>
@@ -100,28 +103,34 @@ namespace v2rayN.Mode
         /// 远程服务器地址
         /// </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; }
 
@@ -154,22 +163,24 @@ namespace v2rayN.Mode
         /// SubItem id
         /// </summary>
         public string subid { get; set; }
+
         public bool isSub { get; set; } = true;
 
         /// <summary>
         /// VLESS flow
         /// </summary>
         public string flow { get; set; }
+
         /// <summary>
         /// tls sni
         /// </summary>
         public string sni { get; set; }
+
         /// <summary>
         /// tls alpn
         /// </summary>
         public string alpn { get; set; } = string.Empty;
 
-
         public ECoreType? coreType { get; set; }
 
         public int preSocksPort { get; set; }
@@ -181,4 +192,4 @@ namespace v2rayN.Mode
         public string shortId { get; set; }
         public string spiderX { get; set; }
     }
-}
+}

v2rayN/v2rayN/Mode/ProfileItemModel.cs

@@ -14,6 +14,5 @@
         public string todayDown { get; set; }
         public string totalUp { get; set; }
         public string totalDown { get; set; }
-
     }
-}
+}

v2rayN/v2rayN/Mode/RoutingItem.cs

@@ -7,6 +7,7 @@ namespace v2rayN.Mode
     {
         [PrimaryKey]
         public string id { get; set; }
+
         public string remarks { get; set; }
         public string url { get; set; }
         public string ruleSet { get; set; }
@@ -15,7 +16,7 @@ namespace v2rayN.Mode
         public bool locked { get; set; }
         public string customIcon { get; set; }
         public string domainStrategy { get; set; }
+        public string domainStrategy4Singbox { get; set; }
         public int sort { get; set; }
-
     }
-}
+}

v2rayN/v2rayN/Mode/RoutingItemModel.cs

@@ -4,6 +4,5 @@
     public class RoutingItemModel : RoutingItem
     {
         public bool isActive { get; set; }
-
     }
-}
+}

v2rayN/v2rayN/Mode/RulesItem.cs

@@ -18,8 +18,8 @@
 
         public List<string> protocol { get; set; }
 
+        public List<string> process { get; set; }
+
         public bool enabled { get; set; } = true;
-
     }
-
+}
-}

v2rayN/v2rayN/Mode/RulesItemModel.cs

@@ -10,6 +10,5 @@
         public string domains { get; set; }
 
         public string protocols { get; set; }
-
     }
-}
+}

v2rayN/v2rayN/Mode/ServerSpeedItem.cs

@@ -1,23 +1,40 @@
 namespace v2rayN.Mode
 {
     [Serializable]
-    class ServerSpeedItem : ServerStatItem
+    internal class ServerSpeedItem : ServerStatItem
     {
         public long proxyUp
         {
             get; set;
         }
+
         public long proxyDown
         {
             get; set;
         }
+
         public long directUp
         {
             get; set;
         }
+
         public long directDown
         {
             get; set;
         }
     }
-}
+
+    [Serializable]
+    public class TrafficItem
+    {
+        public ulong up
+        {
+            get; set;
+        }
+
+        public ulong down
+        {
+            get; set;
+        }
+    }
+}

v2rayN/v2rayN/Mode/ServerStatItem.cs

@@ -10,25 +10,30 @@ namespace v2rayN.Mode
         {
             get; set;
         }
+
         public long totalUp
         {
             get; set;
         }
+
         public long totalDown
         {
             get; set;
         }
+
         public long todayUp
         {
             get; set;
         }
+
         public long todayDown
         {
             get; set;
         }
+
         public long dateNow
         {
             get; set;
         }
     }
-}
+}

v2rayN/v2rayN/Mode/ServerTestItem.cs

@@ -1,7 +1,7 @@
 namespace v2rayN.Mode
 {
     [Serializable]
-    class ServerTestItem
+    internal class ServerTestItem
     {
         public string indexId { get; set; }
         public string address { get; set; }
@@ -10,4 +10,4 @@
         public bool allowTest { get; set; }
         public int delay { get; set; }
     }
-}
+}

v2rayN/v2rayN/Mode/SingboxConfig.cs

@@ -0,0 +1,212 @@
+namespace v2rayN.Mode
+{
+    public class SingboxConfig
+    {
+        public Log4Sbox log { get; set; }
+        public object 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 class Log4Sbox
+    {
+        public bool? disabled { get; set; }
+        public string level { get; set; }
+        public string output { get; set; }
+        public bool timestamp { get; set; }
+    }
+
+    public class Dns4Sbox
+    {
+        public List<Server4Sbox> servers { get; set; }
+        public List<Rule4Sbox> rules { get; set; }
+        public string? final { get; set; }
+        public string? strategy { get; set; }
+        public bool? disable_cache { get; set; }
+        public bool? disable_expire { get; set; }
+        public bool? independent_cache { get; set; }
+        public bool? reverse_mapping { get; set; }
+        public Fakeip4Sbox? fakeip { get; set; }
+    }
+
+    public class Route4Sbox
+    {
+        public bool? auto_detect_interface { get; set; }
+        public List<Rule4Sbox> rules { get; set; }
+    }
+
+    [Serializable]
+    public class Rule4Sbox
+    {
+        public string outbound { get; set; }
+        public string server { get; set; }
+        public bool? disable_cache { get; set; }
+        public List<string>? inbound { get; set; }
+        public List<string>? protocol { get; set; }
+        public string type { get; set; }
+        public string mode { get; set; }
+        public string network { get; set; }
+        public List<int>? port { get; set; }
+        public List<string>? port_range { get; set; }
+        public List<string>? geosite { get; set; }
+        public List<string>? domain { get; set; }
+        public List<string>? domain_suffix { get; set; }
+        public List<string>? domain_keyword { get; set; }
+        public List<string>? domain_regex { get; set; }
+        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; }
+    }
+
+    [Serializable]
+    public class Inbound4Sbox
+    {
+        public string type { get; set; }
+        public string tag { get; set; }
+        public string listen { get; set; }
+        public int? listen_port { get; set; }
+        public string? domain_strategy { get; set; }
+        public string interface_name { get; set; }
+        public string inet4_address { get; set; }
+        public string inet6_address { get; set; }
+        public int? mtu { get; set; }
+        public bool? auto_route { get; set; }
+        public bool? strict_route { get; set; }
+        public bool? endpoint_independent_nat { get; set; }
+        public string? stack { get; set; }
+        public bool? sniff { get; set; }
+        public bool? sniff_override_destination { get; set; }
+        public List<User4Sbox> users { get; set; }
+    }
+
+    public class User4Sbox
+    {
+        public string username { get; set; }
+        public string password { get; set; }
+    }
+
+    public class Outbound4Sbox
+    {
+        public string type { get; set; }
+        public string tag { get; set; }
+        public string server { get; set; }
+        public int? server_port { get; set; }
+        public string uuid { get; set; }
+        public string security { get; set; }
+        public int? alter_id { get; set; }
+        public string flow { get; set; }
+        public int? up_mbps { get; set; }
+        public int? down_mbps { get; set; }
+        public string auth_str { get; set; }
+        public int? recv_window_conn { get; set; }
+        public int? recv_window { get; set; }
+        public bool? disable_mtu_discovery { get; set; }
+        public string detour { get; set; }
+        public string method { get; set; }
+        public string username { get; set; }
+        public string password { get; set; }
+        public string? version { get; set; }
+        public string? network { get; set; }
+        public string packet_encoding { get; set; }
+        public Tls4Sbox tls { get; set; }
+        public Multiplex4Sbox multiplex { get; set; }
+        public Transport4Sbox transport { get; set; }
+    }
+
+    public class Tls4Sbox
+    {
+        public bool enabled { get; set; }
+        public string server_name { get; set; }
+        public bool? insecure { get; set; }
+        public List<string> alpn { get; set; }
+        public Utls4Sbox utls { get; set; }
+        public Reality4Sbox reality { get; set; }
+    }
+
+    public class Multiplex4Sbox
+    {
+        public bool enabled { get; set; }
+        public string protocol { get; set; }
+        public int max_connections { get; set; }
+        public int min_streams { get; set; }
+        public int max_streams { get; set; }
+        public bool padding { get; set; }
+    }
+
+    public class Utls4Sbox
+    {
+        public bool enabled { get; set; }
+        public string fingerprint { get; set; }
+    }
+
+    public class Reality4Sbox
+    {
+        public bool enabled { get; set; }
+        public string public_key { get; set; }
+        public string short_id { get; set; }
+    }
+
+    public class Transport4Sbox
+    {
+        public string type { get; set; }
+        public List<string>? 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 bool? permit_without_stream { get; set; }
+    }
+
+    public class Headers4Sbox
+    {
+        public string? Host { get; set; }
+    }
+
+    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 class Experimental4Sbox
+    {
+        public V2ray_Api4Sbox v2ray_api { get; set; }
+        public Clash_Api4Sbox clash_api { get; set; }
+    }
+
+    public class V2ray_Api4Sbox
+    {
+        public string listen { get; set; }
+        public Stats4Sbox stats { get; set; }
+    }
+
+    public class Clash_Api4Sbox
+    {
+        public string external_controller { get; set; }
+        public bool store_selected { get; set; }
+    }
+
+    public class Stats4Sbox
+    {
+        public bool enabled { get; set; }
+        public List<string>? inbounds { get; set; }
+        public List<string>? outbounds { get; set; }
+        public List<string>? users { get; set; }
+    }
+
+    public class Fakeip4Sbox
+    {
+        public bool enabled { get; set; }
+        public string inet4_range { get; set; }
+        public string inet6_range { get; set; }
+    }
+}

v2rayN/v2rayN/Mode/SsSIP008.cs

@@ -15,5 +15,4 @@
         public string password { get; set; }
         public string plugin { get; set; }
     }
-
+}
-}

v2rayN/v2rayN/Mode/SubItem.cs

@@ -20,10 +20,12 @@ namespace v2rayN.Mode
 
         public int sort { get; set; }
 
-        public string filter { get; set; }
+        public string? filter { get; set; }
 
         public int autoUpdateInterval { get; set; }
 
         public long updateTime { get; set; }
+
+        public string? convertTarget { get; set; }
     }
-}
+}

v2rayN/v2rayN/Mode/SysproxyConfig.cs

@@ -1,7 +1,6 @@
-
+namespace v2rayN.Mode
-namespace v2rayN.Mode
 {
-    class SysproxyConfig
+    internal class SysproxyConfig
     {
         public bool UserSettingsRecorded;
         public string Flags;
@@ -18,4 +17,4 @@ namespace v2rayN.Mode
             PacUrl = "";
         }
     }
-}
+}

v2rayN/v2rayN/Mode/V2rayConfig.cs

@@ -11,115 +11,127 @@ namespace v2rayN.Mode
         /// <summary>
         /// 日志配置
         /// </summary>
-        public Log log { get; set; }
+        public Log4Ray log { get; set; }
+
         /// <summary>
         /// 传入连接配置
         /// </summary>
-        public List<Inbounds> inbounds { get; set; }
+        public List<Inbounds4Ray> inbounds { get; set; }
+
         /// <summary>
         /// 传出连接配置
         /// </summary>
-        public List<Outbounds> outbounds { get; set; }
+        public List<Outbounds4Ray> outbounds { get; set; }
 
         /// <summary>
         /// 统计需要， 空对象
         /// </summary>
-        public Stats stats { get; set; }
+        public Stats4Ray stats { get; set; }
 
         /// </summary>
-        public API api { get; set; }
+        public API4Ray api { get; set; }
 
         /// </summary>
-        public Policy policy;
+        public Policy4Ray policy;
 
         /// <summary>
         /// DNS 配置
         /// </summary>
         public object dns { get; set; }
+
         /// <summary>
         /// 路由配置
         /// </summary>
-        public Routing routing { get; set; }
+        public Routing4Ray routing { get; set; }
     }
 
-    public class Stats { };
+    public class Stats4Ray
+    { };
 
-    public class API
+    public class API4Ray
     {
         public string tag { get; set; }
         public List<string> services { get; set; }
     }
 
-    public class Policy
+    public class Policy4Ray
     {
-        public SystemPolicy system;
+        public SystemPolicy4Ray system;
     }
 
-    public class SystemPolicy
+    public class SystemPolicy4Ray
     {
         public bool statsOutboundUplink;
         public bool statsOutboundDownlink;
     }
 
-    public class Log
+    public class Log4Ray
     {
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public string access { get; set; }
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public string error { get; set; }
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public string loglevel { get; set; }
     }
 
-    public class Inbounds
+    public class Inbounds4Ray
     {
         public string tag { get; set; }
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public int port { get; set; }
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public string listen { get; set; }
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public string protocol { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
-        public Sniffing sniffing { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
-        public Inboundsettings settings { get; set; }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
-        public StreamSettings streamSettings { get; set; }
+        public Sniffing4Ray sniffing { get; set; }
 
+        /// <summary>
+        ///
+        /// </summary>
+        public Inboundsettings4Ray settings { get; set; }
+
+        /// <summary>
+        ///
+        /// </summary>
+        public StreamSettings4Ray streamSettings { get; set; }
     }
 
-    public class Inboundsettings
+    public class Inboundsettings4Ray
     {
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public string auth { get; set; }
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public bool udp { get; set; }
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public string ip { get; set; }
 
@@ -129,10 +141,9 @@ namespace v2rayN.Mode
         public string address { get; set; }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
-        public List<UsersItem> clients { get; set; }
+        public List<UsersItem4Ray> clients { get; set; }
-
 
         /// <summary>
         /// VLESS
@@ -141,25 +152,28 @@ namespace v2rayN.Mode
 
         public bool allowTransparent { get; set; }
 
-        public List<AccountsItem> accounts { get; set; }
+        public List<AccountsItem4Ray> accounts { get; set; }
     }
 
-    public class UsersItem
+    public class UsersItem4Ray
     {
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public string id { get; set; }
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public int alterId { get; set; }
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public string email { get; set; }
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public string security { get; set; }
 
@@ -171,109 +185,124 @@ namespace v2rayN.Mode
         /// <summary>
         /// VLESS
         /// </summary>
-        public string flow { get; set; }
+        public string? flow { get; set; }
     }
-    public class Sniffing
+
+    public class Sniffing4Ray
     {
         public bool enabled { get; set; }
         public List<string> destOverride { get; set; }
         public bool routeOnly { get; set; }
     }
 
-    public class Outbounds
+    public class Outbounds4Ray
     {
         /// <summary>
         /// 默认值agentout
         /// </summary>
         public string tag { get; set; }
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public string protocol { get; set; }
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
-        public Outboundsettings settings { get; set; }
+        public Outboundsettings4Ray settings { get; set; }
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
-        public StreamSettings streamSettings { get; set; }
+        public StreamSettings4Ray streamSettings { get; set; }
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
-        public Mux mux { get; set; }
+        public Mux4Ray mux { get; set; }
     }
 
-    public class Outboundsettings
+    public class Outboundsettings4Ray
     {
         /// <summary>
-        /// 
+        ///
         /// </summary>
-        public List<VnextItem> vnext { get; set; }
+        public List<VnextItem4Ray> vnext { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
-        public List<ServersItem> servers { get; set; }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
-        public Response response { get; set; }
+        public List<ServersItem4Ray> servers { get; set; }
 
         /// <summary>
-        /// 
+        ///
+        /// </summary>
+        public Response4Ray response { get; set; }
+
+        /// <summary>
+        ///
         /// </summary>
         public string domainStrategy { get; set; }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public int? userLevel { get; set; }
     }
 
-    public class VnextItem
+    public class VnextItem4Ray
     {
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public string address { get; set; }
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public int port { get; set; }
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
-        public List<UsersItem> users { get; set; }
+        public List<UsersItem4Ray> users { get; set; }
     }
-    public class ServersItem
+
+    public class ServersItem4Ray
     {
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public string email { get; set; }
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public string address { get; set; }
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public string method { get; set; }
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public bool ota { get; set; }
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public string password { get; set; }
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public int port { get; set; }
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public int level { get; set; }
 
@@ -283,123 +312,148 @@ namespace v2rayN.Mode
         public string flow { get; set; }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
-        public List<SocksUsersItem> users { get; set; }
+        public List<SocksUsersItem4Ray> users { get; set; }
     }
 
-    public class SocksUsersItem
+    public class SocksUsersItem4Ray
     {
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public string user { get; set; }
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public string pass { get; set; }
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public int level { get; set; }
     }
 
-
+    public class Mux4Ray
-    public class Mux
     {
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public bool enabled { get; set; }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public int concurrency { get; set; }
     }
 
-    public class Response
+    public class Response4Ray
     {
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public string type { get; set; }
     }
 
-    public class Dns
+    public class Dns4Ray
     {
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public List<string> servers { get; set; }
     }
 
-    public class Routing
+    public class Routing4Ray
     {
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public string domainStrategy { get; set; }
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public string domainMatcher { get; set; }
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
-        public List<RulesItem> rules { get; set; }
+        public List<RulesItem4Ray> rules { get; set; }
     }
 
-    public class StreamSettings
+    [Serializable]
+    public class RulesItem4Ray
+    {
+        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 class StreamSettings4Ray
     {
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public string network { get; set; }
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public string security { get; set; }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
-        public TlsSettings tlsSettings { get; set; }
+        public TlsSettings4Ray tlsSettings { get; set; }
 
         /// <summary>
         /// Tcp传输额外设置
         /// </summary>
-        public TcpSettings tcpSettings { get; set; }
+        public TcpSettings4Ray tcpSettings { get; set; }
+
         /// <summary>
         /// Kcp传输额外设置
         /// </summary>
-        public KcpSettings kcpSettings { get; set; }
+        public KcpSettings4Ray kcpSettings { get; set; }
+
         /// <summary>
         /// ws传输额外设置
         /// </summary>
-        public WsSettings wsSettings { get; set; }
+        public WsSettings4Ray wsSettings { get; set; }
+
         /// <summary>
         /// h2传输额外设置
         /// </summary>
-        public HttpSettings httpSettings { get; set; }
+        public HttpSettings4Ray httpSettings { get; set; }
 
         /// <summary>
         /// QUIC
         /// </summary>
-        public QuicSettings quicSettings { get; set; }
+        public QuicSettings4Ray quicSettings { get; set; }
 
         /// <summary>
         /// VLESS only
         /// </summary>
-        public TlsSettings realitySettings { get; set; }
+        public TlsSettings4Ray realitySettings { get; set; }
+
         /// <summary>
         /// grpc
         /// </summary>
-        public GrpcSettings grpcSettings { get; set; }
+        public GrpcSettings4Ray grpcSettings { get; set; }
-
     }
 
-    public class TlsSettings
+    public class TlsSettings4Ray
     {
         /// <summary>
         /// 是否允许不安全连接（用于客户端）
@@ -407,11 +461,12 @@ namespace v2rayN.Mode
         public bool? allowInsecure { get; set; }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public string? serverName { get; set; }
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public List<string>? alpn { get; set; }
 
@@ -421,89 +476,99 @@ namespace v2rayN.Mode
         public string? publicKey { get; set; }
         public string? shortId { get; set; }
         public string? spiderX { get; set; }
-
     }
 
-    public class TcpSettings
+    public class TcpSettings4Ray
     {
         /// <summary>
         /// 数据包头部伪装设置
         /// </summary>
-        public Header header { get; set; }
+        public Header4Ray header { get; set; }
     }
 
-    public class Header
+    public class Header4Ray
     {
         /// <summary>
         /// 伪装
         /// </summary>
         public string type { get; set; }
+
         /// <summary>
         /// 结构复杂，直接存起来
         /// </summary>
         public object request { get; set; }
+
         /// <summary>
         /// 结构复杂，直接存起来
         /// </summary>
         public object response { get; set; }
     }
 
-    public class KcpSettings
+    public class KcpSettings4Ray
     {
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public int mtu { get; set; }
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public int tti { get; set; }
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public int uplinkCapacity { get; set; }
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public int downlinkCapacity { get; set; }
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public bool congestion { get; set; }
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public int readBufferSize { get; set; }
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public int writeBufferSize { get; set; }
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
-        public Header header { get; set; }
+        public Header4Ray header { get; set; }
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public string seed { get; set; }
     }
 
-    public class WsSettings
+    public class WsSettings4Ray
     {
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public string path { get; set; }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
-        public Headers headers { get; set; }
+        public Headers4Ray headers { get; set; }
     }
-    public class Headers
+
+    public class Headers4Ray
     {
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public string Host { get; set; }
 
@@ -514,38 +579,38 @@ namespace v2rayN.Mode
         public string UserAgent { get; set; }
     }
 
-    public class HttpSettings
+    public class HttpSettings4Ray
     {
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public string path { get; set; }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public List<string> host { get; set; }
-
     }
 
-    public class QuicSettings
+    public class QuicSettings4Ray
     {
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public string security { get; set; }
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public string key { get; set; }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
-        public Header header { get; set; }
+        public Header4Ray header { get; set; }
     }
 
-    public class GrpcSettings
+    public class GrpcSettings4Ray
     {
         public string serviceName { get; set; }
         public bool multiMode { get; set; }
@@ -555,15 +620,16 @@ namespace v2rayN.Mode
         public int initial_windows_size { get; set; }
     }
 
-    public class AccountsItem
+    public class AccountsItem4Ray
     {
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public string user { get; set; }
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public string pass { get; set; }
     }
-}
+}

v2rayN/v2rayN/Mode/V2rayTcpRequest.cs

@@ -6,7 +6,7 @@
     public class V2rayTcpRequest
     {
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public RequestHeaders headers { get; set; }
     }
@@ -14,10 +14,8 @@
     public class RequestHeaders
     {
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public List<string> Host { get; set; }
     }
-
+}
-
-}

v2rayN/v2rayN/Mode/VmessQRCode.cs

@@ -4,69 +4,81 @@
     /// https://github.com/2dust/v2rayN/wiki/
     /// </summary>
     [Serializable]
-    class VmessQRCode
+    internal class VmessQRCode
     {
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public string v { get; set; } = string.Empty;
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public string ps { get; set; } = string.Empty;
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public string add { get; set; } = string.Empty;
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public string port { get; set; } = string.Empty;
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public string id { get; set; } = string.Empty;
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public string aid { get; set; } = string.Empty;
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public string scy { get; set; } = string.Empty;
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public string net { get; set; } = string.Empty;
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public string type { get; set; } = string.Empty;
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public string host { get; set; } = string.Empty;
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public string path { get; set; } = string.Empty;
+
         /// <summary>
         /// TLS
         /// </summary>
         public string tls { get; set; } = string.Empty;
+
         /// <summary>
         /// TLS SNI
         /// </summary>
         public string sni { get; set; } = string.Empty;
+
         /// <summary>
         /// TLS alpn
         /// </summary>
         public string alpn { get; set; } = string.Empty;
+
         /// <summary>
         /// TLS fingerprint
         /// </summary>
         public string fp { get; set; } = string.Empty;
-
     }
-}
+}

v2rayN/v2rayN/Resx/ResUI.Designer.cs

@@ -375,6 +375,24 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Convert target type 的本地化字符串。
+        /// </summary>
+        public static string LvConvertTarget {
+            get {
+                return ResourceManager.GetString("LvConvertTarget", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Please leave blank if no conversion is required 的本地化字符串。
+        /// </summary>
+        public static string LvConvertTargetTip {
+            get {
+                return ResourceManager.GetString("LvConvertTargetTip", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Count 的本地化字符串。
         /// </summary>
@@ -421,7 +439,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 More urls, separated by commas 的本地化字符串。
+        ///   查找类似 More urls, separated by commas;Subscription conversion will be invalid 的本地化字符串。
         /// </summary>
         public static string LvMoreUrl {
             get {
@@ -672,6 +690,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 DNS Settings 的本地化字符串。
+        /// </summary>
+        public static string menuDNSSetting {
+            get {
+                return ResourceManager.GetString("menuDNSSetting", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Edit Server (Ctrl+D) 的本地化字符串。
         /// </summary>
@@ -699,15 +726,6 @@ namespace v2rayN.Resx {
             }
         }
         
-        /// <summary>
-        ///   查找类似 Export selected server for server configuration 的本地化字符串。
-        /// </summary>
-        public static string menuExport2ServerConfig {
-            get {
-                return ResourceManager.GetString("menuExport2ServerConfig", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 Export share URLs to clipboard (Ctrl+C) 的本地化字符串。
         /// </summary>
@@ -997,7 +1015,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Remove selected 的本地化字符串。
+        ///   查找类似 Remove selected (Delete) 的本地化字符串。
         /// </summary>
         public static string menuRoutingAdvancedRemove {
             get {
@@ -1006,7 +1024,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Set as active rule 的本地化字符串。
+        ///   查找类似 Set as active rule(Enter) 的本地化字符串。
         /// </summary>
         public static string menuRoutingAdvancedSetDefault {
             get {
@@ -1042,7 +1060,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Rule Setting 的本地化字符串。
+        ///   查找类似 Rule Settings 的本地化字符串。
         /// </summary>
         public static string menuRoutingRuleSetting {
             get {
@@ -1087,7 +1105,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Remove Rules 的本地化字符串。
+        ///   查找类似 Remove Rules (Delete) 的本地化字符串。
         /// </summary>
         public static string menuRuleRemove {
             get {
@@ -1123,7 +1141,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Setting 的本地化字符串。
+        ///   查找类似 Settings 的本地化字符串。
         /// </summary>
         public static string menuSetting {
             get {
@@ -1213,7 +1231,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Subscription group Setting 的本地化字符串。
+        ///   查找类似 Subscription group Settings 的本地化字符串。
         /// </summary>
         public static string menuSubSetting {
             get {
@@ -1680,15 +1698,6 @@ namespace v2rayN.Resx {
             }
         }
         
-        /// <summary>
-        ///   查找类似 The server configuration file is saved at: {0} 的本地化字符串。
-        /// </summary>
-        public static string SaveServerConfigurationIn {
-            get {
-                return ResourceManager.GetString("SaveServerConfigurationIn", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 {0}:{1}/s↑ | {2}/s↓ 的本地化字符串。
         /// </summary>
@@ -1844,7 +1853,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Domain and ip are auto sorted when saving 的本地化字符串。
+        ///   查找类似 Domain, ip, process are auto sorted when saving 的本地化字符串。
         /// </summary>
         public static string TbAutoSort {
             get {
@@ -1916,7 +1925,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Support DnsObject 的本地化字符串。
+        ///   查找类似 Support DnsObject, Click to view the document 的本地化字符串。
         /// </summary>
         public static string TbDnsObjectDoc {
             get {
@@ -1924,6 +1933,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Please fill in DNS Structure, Click to view the document 的本地化字符串。
+        /// </summary>
+        public static string TbDnsSingboxObjectDoc {
+            get {
+                return ResourceManager.GetString("TbDnsSingboxObjectDoc", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Domain Matcher 的本地化字符串。
         /// </summary>
@@ -1942,6 +1960,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 sing-box domain strategy 的本地化字符串。
+        /// </summary>
+        public static string TbdomainStrategy4Singbox {
+            get {
+                return ResourceManager.GetString("TbdomainStrategy4Singbox", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Edit 的本地化字符串。
         /// </summary>
@@ -1988,7 +2015,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 GlobalHotkey Setting 的本地化字符串。
+        ///   查找类似 GlobalHotkey Settings 的本地化字符串。
         /// </summary>
         public static string TbGlobalHotkeySetting {
             get {
@@ -2140,6 +2167,33 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Domain 的本地化字符串。
+        /// </summary>
+        public static string TbRoutingRuleDomain {
+            get {
+                return ResourceManager.GetString("TbRoutingRuleDomain", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 IP or IP CIDR 的本地化字符串。
+        /// </summary>
+        public static string TbRoutingRuleIP {
+            get {
+                return ResourceManager.GetString("TbRoutingRuleIP", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Full process name (Tun mode) 的本地化字符串。
+        /// </summary>
+        public static string TbRoutingRuleProcess {
+            get {
+                return ResourceManager.GetString("TbRoutingRuleProcess", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 3.Block Domain or IP 的本地化字符串。
         /// </summary>
@@ -2239,6 +2293,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Click to import default DNS config 的本地化字符串。
+        /// </summary>
+        public static string TBSettingDnsImportDefConfig {
+            get {
+                return ResourceManager.GetString("TBSettingDnsImportDefConfig", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Advanced proxy settings, protocol selection (optional) 的本地化字符串。
         /// </summary>
@@ -2267,7 +2330,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Automatic update interval of and Geo (hours) 的本地化字符串。
+        ///   查找类似 Automatic update interval of Geo (hours) 的本地化字符串。
         /// </summary>
         public static string TbSettingsAutoUpdateInterval {
             get {
@@ -2303,7 +2366,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Core: DNS settings 的本地化字符串。
+        ///   查找类似 V2ray DNS settings 的本地化字符串。
         /// </summary>
         public static string TbSettingsCoreDns {
             get {
@@ -2311,6 +2374,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 sing-box DNS settings 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsCoreDnsSingbox {
+            get {
+                return ResourceManager.GetString("TbSettingsCoreDnsSingbox", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Core: KCP settings 的本地化字符串。
         /// </summary>
@@ -2455,6 +2527,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Follow System Theme 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsFollowSystemTheme {
+            get {
+                return ResourceManager.GetString("TbSettingsFollowSystemTheme", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 FontSize 的本地化字符串。
         /// </summary>
@@ -2527,6 +2608,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 sing-box Mux Protocol 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsMux4SboxProtocol {
+            get {
+                return ResourceManager.GetString("TbSettingsMux4SboxProtocol", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Turn on Mux Multiplexing 的本地化字符串。
         /// </summary>
@@ -2662,15 +2752,6 @@ namespace v2rayN.Resx {
             }
         }
         
-        /// <summary>
-        ///   查找类似 Statistics freshrate (second) 的本地化字符串。
-        /// </summary>
-        public static string TbSettingsStatisticsFreshRate {
-            get {
-                return ResourceManager.GetString("TbSettingsStatisticsFreshRate", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 Subscription conversion Url 的本地化字符串。
         /// </summary>
@@ -2725,15 +2806,6 @@ namespace v2rayN.Resx {
             }
         }
         
-        /// <summary>
-        ///   查找类似 Enable: If no route matches, the final proxy 的本地化字符串。
-        /// </summary>
-        public static string TbSettingsTunModeBypassModeTip {
-            get {
-                return ResourceManager.GetString("TbSettingsTunModeBypassModeTip", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 Custom Template 的本地化字符串。
         /// </summary>
@@ -2906,7 +2978,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 * After setting this value, an socks service will be started using V2ray to provide functions such as speed display 的本地化字符串。
+        ///   查找类似 * After setting this value, an socks service will be started using sing-box to provide functions such as speed display 的本地化字符串。
         /// </summary>
         public static string TipPreSocksPort {
             get {

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

@@ -300,9 +300,6 @@
   <data name="SaveClientConfigurationIn" xml:space="preserve">
     <value>The client configuration file is saved at: {0}</value>
   </data>
-  <data name="SaveServerConfigurationIn" xml:space="preserve">
-    <value>The server configuration file is saved at: {0}</value>
-  </data>
   <data name="StartService" xml:space="preserve">
     <value>Start service ({0})...</value>
   </data>
@@ -553,9 +550,6 @@
   <data name="menuExport2ClientConfig" xml:space="preserve">
     <value>سرور انتخابی را برای پیکربندی کلاینت صادر کنید</value>
   </data>
-  <data name="menuExport2ServerConfig" xml:space="preserve">
-    <value>سرور انتخاب شده را برای پیکربندی سرور صادر کنید</value>
-  </data>
   <data name="menuExport2ShareUrl" xml:space="preserve">
     <value>URL های اشتراک گذاری را به کلیپ بورد صادر کنید (Ctrl+C)</value>
   </data>
@@ -707,7 +701,7 @@
     <value>txtPreSocksPort</value>
   </data>
   <data name="TipPreSocksPort" xml:space="preserve">
-    <value>* After setting this value, an socks service will be started using V2ray to provide functions such as speed display</value>
+    <value>* After setting this value, an socks service will be started using sing-box to provide functions such as speed display</value>
   </data>
   <data name="TbBrowse" xml:space="preserve">
     <value>Browse</value>
@@ -731,7 +725,7 @@
     <value>هسته: تنظیمات اولیه</value>
   </data>
   <data name="TbSettingsCoreDns" xml:space="preserve">
-    <value>هسته: تنظیمات DNS</value>
+    <value>V2ray DNS settings</value>
   </data>
   <data name="TbSettingsCoreKcp" xml:space="preserve">
     <value>هسته: تنظیمات KCP</value>
@@ -799,9 +793,6 @@
   <data name="TbSettingsStatistics" xml:space="preserve">
     <value>فعال کردن آمار (نیاز به راه اندازی مجدد)</value>
   </data>
-  <data name="TbSettingsStatisticsFreshRate" xml:space="preserve">
-    <value>نرخ تازه سازی آمار (ثانیه)</value>
-  </data>
   <data name="TbSettingsSubConvert" xml:space="preserve">
     <value>Subscription conversion Url</value>
   </data>

v2rayN/v2rayN/Resx/ResUI.resx

@@ -300,9 +300,6 @@
   <data name="SaveClientConfigurationIn" xml:space="preserve">
     <value>The client configuration file is saved at: {0}</value>
   </data>
-  <data name="SaveServerConfigurationIn" xml:space="preserve">
-    <value>The server configuration file is saved at: {0}</value>
-  </data>
   <data name="StartService" xml:space="preserve">
     <value>Start service ({0})...</value>
   </data>
@@ -467,7 +464,7 @@
     <value>Servers</value>
   </data>
   <data name="menuSetting" xml:space="preserve">
-    <value>Setting</value>
+    <value>Settings</value>
   </data>
   <data name="menuSubGroupUpdate" xml:space="preserve">
     <value>Update current subscription without proxy</value>
@@ -479,7 +476,7 @@
     <value>Subscription group</value>
   </data>
   <data name="menuSubSetting" xml:space="preserve">
-    <value>Subscription group Setting</value>
+    <value>Subscription group Settings</value>
   </data>
   <data name="menuSubUpdate" xml:space="preserve">
     <value>Update subscription without proxy</value>
@@ -508,6 +505,9 @@
   <data name="TbSettingsColorMode" xml:space="preserve">
     <value>Dark Mode</value>
   </data>
+  <data name="TbSettingsFollowSystemTheme" xml:space="preserve">
+    <value>Follow System Theme</value>
+  </data>
   <data name="TbSettingsLanguage" xml:space="preserve">
     <value>Language(Restart)</value>
   </data>
@@ -553,9 +553,6 @@
   <data name="menuExport2ClientConfig" xml:space="preserve">
     <value>Export selected server for client configuration</value>
   </data>
-  <data name="menuExport2ServerConfig" xml:space="preserve">
-    <value>Export selected server for server configuration</value>
-  </data>
   <data name="menuExport2ShareUrl" xml:space="preserve">
     <value>Export share URLs to clipboard (Ctrl+C)</value>
   </data>
@@ -707,7 +704,7 @@
     <value>txtPreSocksPort</value>
   </data>
   <data name="TipPreSocksPort" xml:space="preserve">
-    <value>* After setting this value, an socks service will be started using V2ray to provide functions such as speed display</value>
+    <value>* After setting this value, an socks service will be started using sing-box to provide functions such as speed display</value>
   </data>
   <data name="TbBrowse" xml:space="preserve">
     <value>Browse</value>
@@ -725,13 +722,13 @@
     <value>Auto hide startup</value>
   </data>
   <data name="TbSettingsAutoUpdateInterval" xml:space="preserve">
-    <value>Automatic update interval of and Geo (hours)</value>
+    <value>Automatic update interval of Geo (hours)</value>
   </data>
   <data name="TbSettingsCore" xml:space="preserve">
     <value>Core: basic settings</value>
   </data>
   <data name="TbSettingsCoreDns" xml:space="preserve">
-    <value>Core: DNS settings</value>
+    <value>V2ray DNS settings</value>
   </data>
   <data name="TbSettingsCoreKcp" xml:space="preserve">
     <value>Core: KCP settings</value>
@@ -799,9 +796,6 @@
   <data name="TbSettingsStatistics" xml:space="preserve">
     <value>Enable Statistics (Require restart)</value>
   </data>
-  <data name="TbSettingsStatisticsFreshRate" xml:space="preserve">
-    <value>Statistics freshrate (second)</value>
-  </data>
   <data name="TbSettingsSubConvert" xml:space="preserve">
     <value>Subscription conversion Url</value>
   </data>
@@ -827,7 +821,7 @@
     <value>Display GUI</value>
   </data>
   <data name="TbGlobalHotkeySetting" xml:space="preserve">
-    <value>GlobalHotkey Setting</value>
+    <value>GlobalHotkey Settings</value>
   </data>
   <data name="TbGlobalHotkeySettingTip" xml:space="preserve">
     <value>Set directly by pressing the keyboard, Take effect after restart</value>
@@ -884,10 +878,10 @@
     <value>Import Advanced Rules</value>
   </data>
   <data name="menuRoutingAdvancedRemove" xml:space="preserve">
-    <value>Remove selected</value>
+    <value>Remove selected (Delete)</value>
   </data>
   <data name="menuRoutingAdvancedSetDefault" xml:space="preserve">
-    <value>Set as active rule</value>
+    <value>Set as active rule(Enter)</value>
   </data>
   <data name="menuRoutingBasic" xml:space="preserve">
     <value>Basic Function</value>
@@ -929,7 +923,7 @@
     <value>Import Rules From Sub Url</value>
   </data>
   <data name="menuRoutingRuleSetting" xml:space="preserve">
-    <value>Rule Setting</value>
+    <value>Rule Settings</value>
   </data>
   <data name="menuRuleAdd" xml:space="preserve">
     <value>Rule Add</value>
@@ -941,19 +935,19 @@
     <value>Rule List</value>
   </data>
   <data name="menuRuleRemove" xml:space="preserve">
-    <value>Remove Rules</value>
+    <value>Remove Rules (Delete)</value>
   </data>
   <data name="menuRoutingRuleDetailsSetting" xml:space="preserve">
     <value>RoutingRuleDetailsSetting</value>
   </data>
   <data name="TbAutoSort" xml:space="preserve">
-    <value>Domain and ip are auto sorted when saving</value>
+    <value>Domain, ip, process are auto sorted when saving</value>
   </data>
   <data name="TbRuleobjectDoc" xml:space="preserve">
     <value>Ruleobject Doc</value>
   </data>
   <data name="TbDnsObjectDoc" xml:space="preserve">
-    <value>Support DnsObject</value>
+    <value>Support DnsObject, Click to view the document</value>
   </data>
   <data name="SubUrlTips" xml:space="preserve">
     <value>Group please leave blank here</value>
@@ -1063,9 +1057,6 @@
   <data name="TbSettingsTunModeBypassMode" xml:space="preserve">
     <value>Bypass Mode</value>
   </data>
-  <data name="TbSettingsTunModeBypassModeTip" xml:space="preserve">
-    <value>Enable: If no route matches, the final proxy</value>
-  </data>
   <data name="TbSettingsSpeedTestTimeout" xml:space="preserve">
     <value>SpeedTest Single Timeout Value</value>
   </data>
@@ -1103,7 +1094,7 @@
     <value>Reboot as administrator</value>
   </data>
   <data name="LvMoreUrl" xml:space="preserve">
-    <value>More urls, separated by commas</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>
@@ -1114,4 +1105,37 @@
   <data name="TbSettingsLogEnabledToFile" xml:space="preserve">
     <value>Enable logging to file</value>
   </data>
+  <data name="LvConvertTarget" xml:space="preserve">
+    <value>Convert target type</value>
+  </data>
+  <data name="LvConvertTargetTip" xml:space="preserve">
+    <value>Please leave blank if no conversion is required</value>
+  </data>
+  <data name="menuDNSSetting" xml:space="preserve">
+    <value>DNS Settings</value>
+  </data>
+  <data name="TbSettingsCoreDnsSingbox" xml:space="preserve">
+    <value>sing-box DNS settings</value>
+  </data>
+  <data name="TbDnsSingboxObjectDoc" xml:space="preserve">
+    <value>Please fill in DNS Structure, Click to view the document</value>
+  </data>
+  <data name="TBSettingDnsImportDefConfig" xml:space="preserve">
+    <value>Click to import default DNS config</value>
+  </data>
+  <data name="TbdomainStrategy4Singbox" xml:space="preserve">
+    <value>sing-box domain strategy</value>
+  </data>
+  <data name="TbSettingsMux4SboxProtocol" xml:space="preserve">
+    <value>sing-box Mux Protocol</value>
+  </data>
+  <data name="TbRoutingRuleProcess" xml:space="preserve">
+    <value>Full process name (Tun mode)</value>
+  </data>
+  <data name="TbRoutingRuleIP" xml:space="preserve">
+    <value>IP or IP CIDR</value>
+  </data>
+  <data name="TbRoutingRuleDomain" xml:space="preserve">
+    <value>Domain</value>
+  </data>
 </root>

v2rayN/v2rayN/Resx/ResUI.ru.resx

@@ -300,9 +300,6 @@
   <data name="SaveClientConfigurationIn" xml:space="preserve">
     <value>Файл конфигурации клиента сохранен по адресу: {0}</value>
   </data>
-  <data name="SaveServerConfigurationIn" xml:space="preserve">
-    <value>Файл конфигурации сервера сохранен по адресу: {0}</value>
-  </data>
   <data name="StartService" xml:space="preserve">
     <value>Запуск сервиса ({0})...</value>
   </data>
@@ -508,6 +505,9 @@
   <data name="TbSettingsColorMode" xml:space="preserve">
     <value>Тёмный режим</value>
   </data>
+  <data name="TbSettingsFollowSystemTheme" xml:space="preserve">
+    <value>следить за системной темой</value>
+  </data>
   <data name="TbSettingsLanguage" xml:space="preserve">
     <value>Язык (требуется перезапуск)</value>
   </data>
@@ -553,9 +553,6 @@
   <data name="menuExport2ClientConfig" xml:space="preserve">
     <value>Экспортировать выбранный сервер для клиента</value>
   </data>
-  <data name="menuExport2ServerConfig" xml:space="preserve">
-    <value>Экспортировать выбранный сервер для сервера</value>
-  </data>
   <data name="menuExport2ShareUrl" xml:space="preserve">
     <value>Экспорт URL-адресов общего доступа в буфер обмена (Ctrl+C)</value>
   </data>
@@ -707,7 +704,7 @@
     <value>txtPreSocksPort</value>
   </data>
   <data name="TipPreSocksPort" xml:space="preserve">
-    <value>* После установки этого значения служба socks будет запущена с использованием V2ray для обеспечения таких функций, как отображение скорости</value>
+    <value>* После установки этого значения служба socks будет запущена с использованием sing-box для обеспечения таких функций, как отображение скорости</value>
   </data>
   <data name="TbBrowse" xml:space="preserve">
     <value>Просмотр</value>
@@ -731,7 +728,7 @@
     <value>Ядро: базовые настройки</value>
   </data>
   <data name="TbSettingsCoreDns" xml:space="preserve">
-    <value>Ядро: настройки DNS</value>
+    <value>V2ray DNS settings</value>
   </data>
   <data name="TbSettingsCoreKcp" xml:space="preserve">
     <value>Ядро: настройки KCP</value>
@@ -799,9 +796,6 @@
   <data name="TbSettingsStatistics" xml:space="preserve">
     <value>Включить статистику (требуется перезагрузка)</value>
   </data>
-  <data name="TbSettingsStatisticsFreshRate" xml:space="preserve">
-    <value>Частота обновления статистики в секундах</value>
-  </data>
   <data name="TbSettingsSubConvert" xml:space="preserve">
     <value>URL-адрес конверсии подписки</value>
   </data>
@@ -941,7 +935,7 @@
     <value>Список правил</value>
   </data>
   <data name="menuRuleRemove" xml:space="preserve">
-    <value>Удалить правила</value>
+    <value>Удалить правила (Delete)</value>
   </data>
   <data name="menuRoutingRuleDetailsSetting" xml:space="preserve">
     <value>RoutingRuleDetailsSetting</value>

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

@@ -300,9 +300,6 @@
   <data name="SaveClientConfigurationIn" xml:space="preserve">
     <value>客户端配置文件保存在:{0}</value>
   </data>
-  <data name="SaveServerConfigurationIn" xml:space="preserve">
-    <value>服务端配置文件保存在:{0}</value>
-  </data>
   <data name="StartService" xml:space="preserve">
     <value>启动服务({0})...</value>
   </data>
@@ -508,6 +505,9 @@
   <data name="TbSettingsColorMode" xml:space="preserve">
     <value>暗黑模式</value>
   </data>
+  <data name="TbSettingsFollowSystemTheme" xml:space="preserve">
+    <value>是否跟随系统主题</value>
+  </data>
   <data name="TbSettingsLanguage" xml:space="preserve">
     <value>语言(重启)</value>
   </data>
@@ -553,9 +553,6 @@
   <data name="menuExport2ClientConfig" xml:space="preserve">
     <value>导出所选服务器为客户端配置</value>
   </data>
-  <data name="menuExport2ServerConfig" xml:space="preserve">
-    <value>导出所选服务器为服务端配置</value>
-  </data>
   <data name="menuExport2ShareUrl" xml:space="preserve">
     <value>批量导出分享URL至剪贴板(多选) (Ctrl+C)</value>
   </data>
@@ -707,7 +704,7 @@
     <value>Socks端口</value>
   </data>
   <data name="TipPreSocksPort" xml:space="preserve">
-    <value>* 自定义配置的Socks端口值，可不设置；当设置此值后，将使用V2ray-core额外启动一个前置Socks服务，提供分流和速度显示等功能</value>
+    <value>* 自定义配置的Socks端口值，可不设置；当设置此值后，将使用sing-box额外启动一个前置Socks服务，提供分流和速度显示等功能</value>
   </data>
   <data name="TbBrowse" xml:space="preserve">
     <value>浏览</value>
@@ -731,7 +728,7 @@
     <value>Core: 基础设置</value>
   </data>
   <data name="TbSettingsCoreDns" xml:space="preserve">
-    <value>Core: DNS设置</value>
+    <value>V2ray DNS设置</value>
   </data>
   <data name="TbSettingsCoreKcp" xml:space="preserve">
     <value>Core: KCP设置</value>
@@ -799,9 +796,6 @@
   <data name="TbSettingsStatistics" xml:space="preserve">
     <value>启用统计(实时网速显示，需重启)</value>
   </data>
-  <data name="TbSettingsStatisticsFreshRate" xml:space="preserve">
-    <value>统计刷新频率(单位秒)</value>
-  </data>
   <data name="TbSettingsSubConvert" xml:space="preserve">
     <value>订阅转换网址(可选)</value>
   </data>
@@ -884,10 +878,10 @@
     <value>一键导入高级规则</value>
   </data>
   <data name="menuRoutingAdvancedRemove" xml:space="preserve">
-    <value>移除所选规则</value>
+    <value>移除所选规则 (Delete)</value>
   </data>
   <data name="menuRoutingAdvancedSetDefault" xml:space="preserve">
-    <value>设为活动规则</value>
+    <value>设为活动规则 (Enter)</value>
   </data>
   <data name="menuRoutingBasic" xml:space="preserve">
     <value>基础功能</value>
@@ -902,7 +896,7 @@
     <value>域名解析策略</value>
   </data>
   <data name="TbenableRoutingAdvanced" xml:space="preserve">
-    <value>启用路由高级功能</value>
+    <value>启用高级功能</value>
   </data>
   <data name="TbRoutingTabBlock" xml:space="preserve">
     <value>3.阻止的Domain或IP</value>
@@ -941,19 +935,19 @@
     <value>规则列表</value>
   </data>
   <data name="menuRuleRemove" xml:space="preserve">
-    <value>移除所选规则</value>
+    <value>移除所选规则 (Delete)</value>
   </data>
   <data name="menuRoutingRuleDetailsSetting" xml:space="preserve">
     <value>路由规则详情设置</value>
   </data>
   <data name="TbAutoSort" xml:space="preserve">
-    <value>保存时Domain和IP自动排序</value>
+    <value>保存时Domain, IP, 进程名 自动排序</value>
   </data>
   <data name="TbRuleobjectDoc" xml:space="preserve">
     <value>规则详细说明文档</value>
   </data>
   <data name="TbDnsObjectDoc" xml:space="preserve">
-    <value>支持填写DnsObject,JSON格式</value>
+    <value>支持填写DnsObject,JSON格式，点击查看文档</value>
   </data>
   <data name="SubUrlTips" xml:space="preserve">
     <value>普通分组此处请留空</value>
@@ -1063,9 +1057,6 @@
   <data name="TbSettingsTunModeBypassMode" xml:space="preserve">
     <value>绕行模式</value>
   </data>
-  <data name="TbSettingsTunModeBypassModeTip" xml:space="preserve">
-    <value>启用：路由无匹配则最终代理</value>
-  </data>
   <data name="TbSettingsSpeedTestTimeout" xml:space="preserve">
     <value>测速单个超时值</value>
   </data>
@@ -1103,7 +1094,7 @@
     <value>以管理员身份重启</value>
   </data>
   <data name="LvMoreUrl" xml:space="preserve">
-    <value>更多地址(url)，用逗号(,)分隔</value>
+    <value>更多地址(url)，用逗号(,)分隔；订阅转换将失效</value>
   </data>
   <data name="LvAutoUpdateInterval" xml:space="preserve">
     <value>自动更新间隔(分钟)</value>
@@ -1111,4 +1102,37 @@
   <data name="TbSettingsLogEnabledToFile" xml:space="preserve">
     <value>启用日志存到文件</value>
   </data>
+  <data name="LvConvertTarget" xml:space="preserve">
+    <value>订阅转换目标类型</value>
+  </data>
+  <data name="LvConvertTargetTip" xml:space="preserve">
+    <value>不需要转换时请留空</value>
+  </data>
+  <data name="menuDNSSetting" xml:space="preserve">
+    <value>DNS设置</value>
+  </data>
+  <data name="TbSettingsCoreDnsSingbox" xml:space="preserve">
+    <value>sing-box DNS设置</value>
+  </data>
+  <data name="TbDnsSingboxObjectDoc" xml:space="preserve">
+    <value>请填写 DNS JSON 结构，点击查看文档</value>
+  </data>
+  <data name="TBSettingDnsImportDefConfig" xml:space="preserve">
+    <value>点击导入默认DNS配置</value>
+  </data>
+  <data name="TbdomainStrategy4Singbox" xml:space="preserve">
+    <value>sing-box域名解析策略</value>
+  </data>
+  <data name="TbSettingsMux4SboxProtocol" xml:space="preserve">
+    <value>sing-box Mux 多路复用协议</value>
+  </data>
+  <data name="TbRoutingRuleProcess" xml:space="preserve">
+    <value>进程名全称 (Tun模式)</value>
+  </data>
+  <data name="TbRoutingRuleDomain" xml:space="preserve">
+    <value>Domain</value>
+  </data>
+  <data name="TbRoutingRuleIP" xml:space="preserve">
+    <value>IP 或 IP CIDR</value>
+  </data>
 </root>

v2rayN/v2rayN/Sample/SampleServerConfig

@@ -1,33 +0,0 @@
-{
-	"log": {
-		"access": "/var/log/v2ray/access.log",
-		"error": "/var/log/v2ray/error.log",
-		"loglevel": "warning"
-	},
-	"inbounds": [{
-		"port": 10086,
-		"protocol": "vmess",
-		"settings": {
-			"clients": [{
-				"id": "23ad6b10-8d1a-40f7-8ad0-e3e35cd38297",
-				"level": 1,
-				"email": "t@t.tt"
-			}]
-		},
-		"streamSettings": {
-			"network": "tcp"
-		}
-	}],
-	"outbounds": [{
-		"protocol": "freedom",
-		"settings": {}
-	}, {
-		"protocol": "blackhole",
-		"settings": {},
-		"tag": "block"
-	}],
-	"routing": {
-		"domainStrategy": "IPIfNonMatch",
-		"rules": []
-	}
-}

v2rayN/v2rayN/Sample/SingboxSampleClientConfig

@@ -0,0 +1,33 @@
+{
+	"log": {
+		"level": "debug",
+		"timestamp": true
+	},
+	"inbounds": [
+		{
+			"type": "socks",
+			"tag": "socks",
+			"listen": "127.0.0.1",
+			"listen_port": 10000
+		}
+	],
+	"outbounds": [
+		{
+			"type": "vless",
+			"tag": "proxy",
+			"server": "",
+			"server_port": 443
+		},
+		{
+			"type": "direct",
+			"tag": "direct"
+		},
+		{
+			"type": "block",
+			"tag": "block"
+		}
+	],
+	"route": {
+		"rules": []
+	}
+}

v2rayN/v2rayN/Sample/custom_routing_white

@@ -24,9 +24,5 @@
       "geoip:private",
       "geoip:cn"
     ]
-  },
-  {
-    "port": "0-65535",
-    "outboundTag": "proxy"
   }
 ]

v2rayN/v2rayN/Sample/dns_singbox_normal

@@ -0,0 +1,32 @@
+{
+  "servers": [
+    {
+      "tag": "remote",
+      "address": "tcp://8.8.8.8",
+      "detour": "proxy"
+    },
+    {
+      "tag": "local",
+      "address": "223.5.5.5",
+      "detour": "direct"
+    },
+    {
+      "tag": "block",
+      "address": "rcode://success"
+    }
+  ],
+  "rules": [
+    {
+      "geosite": [
+        "cn"
+      ],
+      "server": "local"
+    },
+    {
+      "geosite": [
+        "category-ads-all"
+      ],
+      "server": "block"
+    }
+  ]
+}

v2rayN/v2rayN/Sample/dns_v2ray_normal

@@ -0,0 +1,20 @@
+{
+  "hosts": {
+    "dns.google": "8.8.8.8",
+    "proxy.example.com": "127.0.0.1"
+  },
+  "servers": [
+    {
+      "address": "223.5.5.5",
+      "domains": [
+        "geosite:cn"
+      ],
+      "expectIPs": [
+        "geoip:cn"
+      ]
+    },
+    "1.1.1.1",
+    "8.8.8.8",
+    "https://dns.google/dns-query"
+  ]
+}

v2rayN/v2rayN/Sample/tun_singbox

@@ -1,97 +0,0 @@
-{
-  "log": {
-    "disabled": $log_disabled$,
-    "level": "debug",
-    $log_output$
-    "timestamp": true
-  },
-  "dns": $dns_object$ ,
-  "inbounds": [
-    {
-      "type": "tun",
-      "tag": "tun-in",
-      "interface_name": "singbox_tun",
-      "inet4_address": "172.19.0.1/30",
-
-      "mtu": $mtu$,
-      "auto_route": true,
-      "strict_route": $strict_route$,
-      "stack": "$stack$",
-      "endpoint_independent_nat": true,
-      "sniff": true
-    }
-  ],
-  "outbounds": [
-    {
-      "type": "socks",
-      "tag": "proxy",
-      "udp_fragment": true,
-      "server": "127.0.0.1",
-      "server_port": $socksPort$
-    },
-    {
-      "type": "block",
-      "tag": "block"
-    },
-    {
-      "type": "direct",
-      "tag": "direct"
-    },
-    {
-      "type": "dns",
-      "tag": "dns_out"
-    }
-  ],
-  "route": {
-    "auto_detect_interface": true,
-    "rules": [
-      {
-        "inbound": "dns_in",
-        "outbound": "dns_out"
-      },
-      {
-        "protocol": "dns",
-        "outbound": "dns_out"
-      },
-      {
-        "network": "udp",
-        "port": [
-          135,
-          137,
-          138,
-          139,
-          5353
-        ],
-        "outbound": "block"
-      },
-      {
-        "ip_cidr": [
-          "224.0.0.0/3",
-          "ff00::/8"
-        ],
-        "outbound": "block"
-      },
-      {
-        "source_ip_cidr": [
-          "224.0.0.0/3",
-          "ff00::/8"
-        ],
-        "outbound": "block"
-      },
-      {
-        "port": 53,
-        "process_name": [ $dnsProcessName$],
-        "outbound": "dns_out"
-      },
-      {
-        "process_name": [ $directProcessName$],
-        "outbound": "direct"
-      }
-      $ruleDirectIPs$
-      $ruleDirectProcess$
-      $ruleProxyIPs$
-      $ruleProxyProcess$
-      $ruleFinally$
-    ]
-  }
-}

v2rayN/v2rayN/Sample/tun_singbox_dns

@@ -1,31 +1,35 @@
-  {
+{
-    "servers": [
+  "servers": [
-      {
+    {
-        "tag": "out_dns",
+      "tag": "remote",
-        "address": "8.8.8.8",
+      "address": "tcp://8.8.8.8",
-        "detour": "proxy"
+      "detour": "proxy"
-      },
+    },
-      {
+    {
-        "tag": "local",
+      "tag": "local",
-        "address": "223.5.5.5",
+      "address": "223.5.5.5",
-        "detour": "direct"
+      "detour": "direct"
-      },
+    },
-      {
+    {
-        "tag": "block",
+      "tag": "block",
-        "address": "rcode://success"
+      "address": "rcode://success"
-      }
+    }
-    ],
+  ],
-    "rules": [
+  "rules": [
-      {
+    {
-        "geosite": "cn",
+      "geosite": [
-        "server": "local",
+        "cn"
-        "disable_cache": true
+      ],
-      },
+      "server": "local",
-      {
+      "disable_cache": true
-        "geosite": "category-ads-all",
+    },
-        "server": "block",
+    {
-        "disable_cache": true
+      "geosite": [
-      }
+        "category-ads-all"
-    ],
+      ],
-    "strategy": "ipv4_only"
+      "server": "block",
-  }
+      "disable_cache": true
+    }
+  ],
+  "strategy": "ipv4_only"
+}

v2rayN/v2rayN/Sample/tun_singbox_inbound

@@ -0,0 +1,12 @@
+{
+  "type": "tun",
+  "tag": "tun-in",
+  "interface_name": "singbox_tun",
+  "inet4_address": "172.19.0.1/30",
+  "inet6_address": "fdfe:dcba:9876::1/126",
+  "mtu": 9000,
+  "auto_route": true,
+  "strict_route": false,
+  "stack": "system",
+  "sniff": true
+}

v2rayN/v2rayN/Sample/tun_singbox_rules

@@ -0,0 +1,35 @@
+[
+  {
+    "inbound": [ "dns_in" ],
+    "outbound": "dns_out"
+  },
+  {
+    "protocol": [ "dns" ],
+    "outbound": "dns_out"
+  },
+  {
+    "network": "udp",
+    "port": [
+      135,
+      137,
+      138,
+      139,
+      5353
+    ],
+    "outbound": "block"
+  },
+  {
+    "ip_cidr": [
+      "224.0.0.0/3",
+      "ff00::/8"
+    ],
+    "outbound": "block"
+  },
+  {
+    "source_ip_cidr": [
+      "224.0.0.0/3",
+      "ff00::/8"
+    ],
+    "outbound": "block"
+  }
+]

v2rayN/v2rayN/Tool/FileManager.cs

@@ -53,6 +53,7 @@ namespace v2rayN.Tool
                 throw;
             }
         }
+
         public static bool ZipExtractToFile(string fileName, string toPath, string ignoredName)
         {
             try
@@ -86,4 +87,4 @@ namespace v2rayN.Tool
             return true;
         }
     }
-}
+}

v2rayN/v2rayN/Tool/Job.cs

@@ -1,13 +1,13 @@
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 
-
 namespace v2rayN
 {
     /*
      * See:
      * http://stackoverflow.com/questions/6266820/working-example-of-createjobobject-setinformationjobobject-pinvoke-in-net
      */
+
     public class Job : IDisposable
     {
         private IntPtr handle = IntPtr.Zero;
@@ -95,7 +95,7 @@ namespace v2rayN
             Dispose(false);
         }
 
-        #endregion
+        #endregion IDisposable
 
         #region Interop
 
@@ -112,13 +112,13 @@ namespace v2rayN
         [return: MarshalAs(UnmanagedType.Bool)]
         private static extern bool CloseHandle(IntPtr hObject);
 
-        #endregion
+        #endregion Interop
     }
 
     #region Helper classes
 
     [StructLayout(LayoutKind.Sequential)]
-    struct IO_COUNTERS
+    internal struct IO_COUNTERS
     {
         public UInt64 ReadOperationCount;
         public UInt64 WriteOperationCount;
@@ -128,9 +128,8 @@ namespace v2rayN
         public UInt64 OtherTransferCount;
     }
 
-
     [StructLayout(LayoutKind.Sequential)]
-    struct JOBOBJECT_BASIC_LIMIT_INFORMATION
+    internal struct JOBOBJECT_BASIC_LIMIT_INFORMATION
     {
         public Int64 PerProcessUserTimeLimit;
         public Int64 PerJobUserTimeLimit;
@@ -152,7 +151,7 @@ namespace v2rayN
     }
 
     [StructLayout(LayoutKind.Sequential)]
-    struct JOBOBJECT_EXTENDED_LIMIT_INFORMATION
+    internal struct JOBOBJECT_EXTENDED_LIMIT_INFORMATION
     {
         public JOBOBJECT_BASIC_LIMIT_INFORMATION BasicLimitInformation;
         public IO_COUNTERS IoInfo;
@@ -173,5 +172,5 @@ namespace v2rayN
         GroupInformation = 11
     }
 
-    #endregion
+    #endregion Helper classes
-}
+}

v2rayN/v2rayN/Tool/Logging.cs

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

v2rayN/v2rayN/Tool/QueryableExtension.cs

@@ -9,12 +9,13 @@ namespace v2rayN.Tool
         {
             return _OrderBy<T>(query, propertyName, false);
         }
+
         public static IOrderedQueryable<T> OrderByDescending<T>(this IQueryable<T> query, string propertyName)
         {
             return _OrderBy<T>(query, propertyName, true);
         }
 
-        static IOrderedQueryable<T> _OrderBy<T>(IQueryable<T> query, string propertyName, bool isDesc)
+        private static IOrderedQueryable<T> _OrderBy<T>(IQueryable<T> query, string propertyName, bool isDesc)
         {
             string methodname = (isDesc) ? "OrderByDescendingInternal" : "OrderByInternal";
 
@@ -25,15 +26,18 @@ namespace v2rayN.Tool
 
             return (IOrderedQueryable<T>)method.Invoke(null, new object[] { query, memberProp });
         }
+
         public static IOrderedQueryable<T> OrderByInternal<T, TProp>(IQueryable<T> query, PropertyInfo memberProperty)
         {//public
             return query.OrderBy(_GetLamba<T, TProp>(memberProperty));
         }
+
         public static IOrderedQueryable<T> OrderByDescendingInternal<T, TProp>(IQueryable<T> query, PropertyInfo memberProperty)
         {//public
             return query.OrderByDescending(_GetLamba<T, TProp>(memberProperty));
         }
-        static Expression<Func<T, TProp>> _GetLamba<T, TProp>(PropertyInfo memberProperty)
+
+        private static Expression<Func<T, TProp>> _GetLamba<T, TProp>(PropertyInfo memberProperty)
         {
             if (memberProperty.PropertyType != typeof(TProp)) throw new Exception();
 
@@ -43,4 +47,4 @@ namespace v2rayN.Tool
             return lamba;
         }
     }
-}
+}

v2rayN/v2rayN/Tool/SemanticVersion.cs

@@ -0,0 +1,182 @@
+using v2rayN.Base;
+
+namespace v2rayN.Tool
+{
+    public class SemanticVersion
+    {
+        private int major;
+        private int minor;
+        private int patch;
+        private string version;
+
+        public SemanticVersion(int major, int minor, int patch)
+        {
+            this.major = major;
+            this.minor = minor;
+            this.patch = patch;
+            this.version = $"{major}.{minor}.{patch}";
+        }
+
+        public SemanticVersion(string version)
+        {
+            this.version = version.RemovePrefix('v');
+            try
+            {
+                string[] parts = this.version.Split('.');
+                if (parts.Length == 2)
+                {
+                    this.major = int.Parse(parts[0]);
+                    this.minor = int.Parse(parts[1]);
+                    this.patch = 0;
+                }
+                else if (parts.Length == 3)
+                {
+                    this.major = int.Parse(parts[0]);
+                    this.minor = int.Parse(parts[1]);
+                    this.patch = int.Parse(parts[2]);
+                }
+                else
+                {
+                    throw new ArgumentException("Invalid version string");
+                }
+            }
+            catch
+            {
+                this.major = 0;
+                this.minor = 0;
+                this.patch = 0;
+                this.version = "0.0.0";
+            }
+        }
+
+        public override bool Equals(object? obj)
+        {
+            if (obj is SemanticVersion other)
+            {
+                return this.major == other.major && this.minor == other.minor && this.patch == other.patch;
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+        public override int GetHashCode()
+        {
+            return this.major.GetHashCode() ^ this.minor.GetHashCode() ^ this.patch.GetHashCode();
+        }
+
+        /// <summary>
+        /// Use ToVersionString(string? prefix) instead if possible.
+        /// </summary>
+        /// <returns>major.minor.patch</returns>
+        public override string ToString()
+        {
+            return this.version;
+        }
+
+        public string ToVersionString(string? prefix = null)
+        {
+            if (prefix == null)
+            {
+                return this.version;
+            }
+            else
+            {
+                return $"{prefix}{this.version}";
+            }
+        }
+
+        public static bool operator ==(SemanticVersion v1, SemanticVersion v2)
+        { return v1.Equals(v2); }
+
+        public static bool operator !=(SemanticVersion v1, SemanticVersion v2)
+        { return !v1.Equals(v2); }
+
+        public static bool operator >=(SemanticVersion v1, SemanticVersion v2)
+        { return v1.GreaterEquals(v2); }
+
+        public static bool operator <=(SemanticVersion v1, SemanticVersion v2)
+        { return v1.LessEquals(v2); }
+
+        #region Private
+
+        private bool GreaterEquals(SemanticVersion other)
+        {
+            if (this.major < other.major)
+            {
+                return false;
+            }
+            else if (this.major > other.major)
+            {
+                return true;
+            }
+            else
+            {
+                if (this.minor < other.minor)
+                {
+                    return false;
+                }
+                else if (this.minor > other.minor)
+                {
+                    return true;
+                }
+                else
+                {
+                    if (this.patch < other.patch)
+                    {
+                        return false;
+                    }
+                    else if (this.patch > other.patch)
+                    {
+                        return true;
+                    }
+                    else
+                    {
+                        return true;
+                    }
+                }
+            }
+        }
+
+        private bool LessEquals(SemanticVersion other)
+        {
+            if (this.major < other.major)
+            {
+                return true;
+            }
+            else if (this.major > other.major)
+            {
+                return false;
+            }
+            else
+            {
+                if (this.minor < other.minor)
+                {
+                    return true;
+                }
+                else if (this.minor > other.minor)
+                {
+                    return false;
+                }
+                else
+                {
+                    if (this.patch < other.patch)
+                    {
+                        return true;
+                    }
+                    else if (this.patch > other.patch)
+                    {
+                        return false;
+                    }
+                    else
+                    {
+                        return true;
+                    }
+                }
+            }
+        }
+
+        #endregion Private
+    }
+}

v2rayN/v2rayN/Tool/UI.cs

@@ -2,21 +2,23 @@
 
 namespace v2rayN
 {
-    class UI
+    internal class UI
     {
-        private readonly static string caption = "v2rayN";
+        private static readonly string caption = "v2rayN";
 
         public static void Show(string msg)
         {
             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/Tool/Utils.cs

@@ -31,9 +31,8 @@ using ZXing.Windows.Compatibility;
 
 namespace v2rayN
 {
-    class Utils
+    internal class Utils
     {
-
         #region 资源Json操作
 
         /// <summary>
@@ -60,7 +59,6 @@ namespace v2rayN
             return result;
         }
 
-
         /// <summary>
         /// 取得存储资源
         /// </summary>
@@ -178,7 +176,8 @@ namespace v2rayN
                 return null;
             }
         }
-        #endregion
+
+        #endregion 资源Json操作
 
         #region 转换函数
 
@@ -210,6 +209,7 @@ namespace v2rayN
                 return string.Empty;
             }
         }
+
         /// <summary>
         /// 逗号分隔的字符串,转List<string>
         /// </summary>
@@ -318,6 +318,7 @@ namespace v2rayN
                 return 0;
             }
         }
+
         public static bool ToBool(object obj)
         {
             try
@@ -370,19 +371,19 @@ namespace v2rayN
                         long TBs = GBs / factor;
                         if (TBs > 0)
                         {
-                            result = TBs + (GBs % factor / (factor + 0.0));
+                            result = TBs + ((GBs % factor) / (factor + 0.0));
                             unit = "TB";
                             return;
                         }
-                        result = GBs + (MBs % factor / (factor + 0.0));
+                        result = GBs + ((MBs % factor) / (factor + 0.0));
                         unit = "GB";
                         return;
                     }
-                    result = MBs + (KBs % factor / (factor + 0.0));
+                    result = MBs + ((KBs % factor) / (factor + 0.0));
                     unit = "MB";
                     return;
                 }
-                result = KBs + (amount % factor / (factor + 0.0));
+                result = KBs + ((amount % factor) / (factor + 0.0));
                 unit = "KB";
                 return;
             }
@@ -404,6 +405,7 @@ namespace v2rayN
             return Uri.EscapeDataString(url);
             //return  HttpUtility.UrlEncode(url);
         }
+
         public static string UrlDecode(string url)
         {
             return HttpUtility.UrlDecode(url);
@@ -420,6 +422,7 @@ namespace v2rayN
             }
             return sb.ToString();
         }
+
         public static ImageSource IconToImageSource(Icon icon)
         {
             return Imaging.CreateBitmapSourceFromHIcon(
@@ -463,8 +466,16 @@ namespace v2rayN
             return Convert.TryFromBase64String(plainText, buffer, out int _);
         }
 
-        #endregion
+        public static string Convert2Comma(string text)
+        {
+            if (string.IsNullOrWhiteSpace(text))
+            {
+                return text;
+            }
+            return text.Replace("，", ",").Replace(Environment.NewLine, ",");
+        }
 
+        #endregion 转换函数
 
         #region 数据检查
 
@@ -508,7 +519,7 @@ namespace v2rayN
         /// <summary>
         /// 验证IP地址是否合法
         /// </summary>
-        /// <param name="ip"></param>        
+        /// <param name="ip"></param>
         public static bool IsIP(string ip)
         {
             //如果为空
@@ -533,7 +544,6 @@ namespace v2rayN
                 }
             }
 
-
             //模式字符串
             string pattern = @"^((2[0-4]\d|25[0-5]|[01]?\d\d?)\.){3}(2[0-4]\d|25[0-5]|[01]?\d\d?)$";
 
@@ -544,7 +554,7 @@ namespace v2rayN
         /// <summary>
         /// 验证Domain地址是否合法
         /// </summary>
-        /// <param name="domain"></param>        
+        /// <param name="domain"></param>
         public static bool IsDomain(string domain)
         {
             //如果为空
@@ -553,21 +563,14 @@ namespace v2rayN
                 return false;
             }
 
-            //清除要验证字符串中的空格
+            return Uri.CheckHostName(domain) == UriHostNameType.Dns;
-            //domain = domain.TrimEx();
-
-            //模式字符串
-            string pattern = @"^(?=^.{3,255}$)[a-zA-Z0-9][-a-zA-Z0-9]{0,62}(\.[a-zA-Z0-9][-a-zA-Z0-9]{0,62})+$";
-
-            //验证
-            return IsMatch(domain, pattern);
         }
 
         /// <summary>
         /// 验证输入字符串是否与模式字符串匹配，匹配返回true
         /// </summary>
         /// <param name="input">输入字符串</param>
-        /// <param name="pattern">模式字符串</param>        
+        /// <param name="pattern">模式字符串</param>
         public static bool IsMatch(string input, string pattern)
         {
             return Regex.IsMatch(input, pattern, RegexOptions.IgnoreCase);
@@ -587,11 +590,10 @@ namespace v2rayN
             return false;
         }
 
-        #endregion
+        #endregion 数据检查
 
         #region 开机自动启动
 
-
         /// <summary>
         /// 开机自动启动
         /// </summary>
@@ -797,7 +799,7 @@ namespace v2rayN
             taskService.RootFolder.RegisterTaskDefinition(TaskName, task);
         }
 
-        #endregion
+        #endregion 开机自动启动
 
         #region 测速
 
@@ -862,7 +864,8 @@ namespace v2rayN
             }
             return inUse;
         }
-        #endregion
+
+        #endregion 测速
 
         #region 杂项
 
@@ -995,7 +998,6 @@ namespace v2rayN
             }
         }
 
-
         public static string GetDownloadFileName(string url)
         {
             var fileName = Path.GetFileName(url);
@@ -1022,6 +1024,7 @@ namespace v2rayN
         {
             return Guid.TryParse(strSrc, out Guid g);
         }
+
         public static void ProcessStart(string fileName)
         {
             try
@@ -1043,7 +1046,15 @@ namespace v2rayN
             DwmSetWindowAttribute(hWnd, DWMWINDOWATTRIBUTE.DWMWA_USE_IMMERSIVE_DARK_MODE_BEFORE_20H1, ref attribute, attributeSize);
             DwmSetWindowAttribute(hWnd, DWMWINDOWATTRIBUTE.DWMWA_USE_IMMERSIVE_DARK_MODE, ref attribute, attributeSize);
         }
-        #endregion
+
+        public static bool IsLightTheme()
+        {
+            using var key = Registry.CurrentUser.OpenSubKey(@"Software\Microsoft\Windows\CurrentVersion\Themes\Personalize");
+            var value = key?.GetValue("AppsUseLightTheme");
+            return value is int i && i > 0;
+        }
+
+        #endregion 杂项
 
         #region TempPath
 
@@ -1083,6 +1094,7 @@ namespace v2rayN
             }
             return Path.Combine(_tempPath, filename);
         }
+
         public static string GetConfigPath(string filename = "")
         {
             string _tempPath = Path.Combine(StartupPath(), "guiConfigs");
@@ -1099,6 +1111,7 @@ namespace v2rayN
                 return Path.Combine(_tempPath, filename);
             }
         }
+
         public static string GetBinPath(string filename, ECoreType? coreType = null)
         {
             string _tempPath = Path.Combine(StartupPath(), "bin");
@@ -1123,6 +1136,7 @@ namespace v2rayN
                 return Path.Combine(_tempPath, filename);
             }
         }
+
         public static string GetLogPath(string filename = "")
         {
             string _tempPath = Path.Combine(StartupPath(), "guiLogs");
@@ -1139,6 +1153,7 @@ namespace v2rayN
                 return Path.Combine(_tempPath, filename);
             }
         }
+
         public static string GetFontsPath(string filename = "")
         {
             string _tempPath = Path.Combine(StartupPath(), "guiFonts");
@@ -1156,7 +1171,7 @@ namespace v2rayN
             }
         }
 
-        #endregion
+        #endregion TempPath
 
         #region Log
 
@@ -1168,6 +1183,7 @@ namespace v2rayN
                 logger.Info(strContent);
             }
         }
+
         public static void SaveLog(string strTitle, Exception ex)
         {
             if (LogManager.IsLoggingEnabled())
@@ -1182,8 +1198,7 @@ namespace v2rayN
             }
         }
 
-        #endregion
+        #endregion Log
-
 
         #region scan screen
 
@@ -1243,12 +1258,10 @@ namespace v2rayN
             return new(96 / g.DpiX, 96 / g.DpiY);
         }
 
-        #endregion
+        #endregion scan screen
-
 
         #region Windows API
 
-
         [Flags]
         public enum DWMWINDOWATTRIBUTE : uint
         {
@@ -1259,6 +1272,6 @@ namespace v2rayN
         [DllImport("dwmapi.dll")]
         public static extern int DwmSetWindowAttribute(IntPtr hwnd, DWMWINDOWATTRIBUTE attribute, ref int attributeValue, uint attributeSize);
 
-        #endregion
+        #endregion Windows API
     }
-}
+}

v2rayN/v2rayN/ViewModels/AddServer2ViewModel.cs

@@ -22,7 +22,6 @@ namespace v2rayN.ViewModels
         [Reactive]
         public ProfileItem SelectedSource { get; set; }
 
-
         public ReactiveCommand<Unit, Unit> BrowseServerCmd { get; }
         public ReactiveCommand<Unit, Unit> EditServerCmd { get; }
         public ReactiveCommand<Unit, Unit> SaveServerCmd { get; }
@@ -158,4 +157,4 @@ namespace v2rayN.ViewModels
             }
         }
     }
-}
+}

v2rayN/v2rayN/ViewModels/AddServerViewModel.cs

@@ -21,7 +21,6 @@ namespace v2rayN.ViewModels
 
         public ReactiveCommand<Unit, Unit> SaveCmd { get; }
 
-
         public AddServerViewModel(ProfileItem profileItem, Window view)
         {
             _config = LazyConfig.Instance.GetConfig();
@@ -130,15 +129,19 @@ namespace v2rayN.ViewModels
                 case EConfigType.VMess:
                     ret = ConfigHandler.AddServer(ref _config, item);
                     break;
+
                 case EConfigType.Shadowsocks:
                     ret = ConfigHandler.AddShadowsocksServer(ref _config, item);
                     break;
+
                 case EConfigType.Socks:
                     ret = ConfigHandler.AddSocksServer(ref _config, item);
                     break;
+
                 case EConfigType.VLESS:
                     ret = ConfigHandler.AddVlessServer(ref _config, item);
                     break;
+
                 case EConfigType.Trojan:
                     ret = ConfigHandler.AddTrojanServer(ref _config, item);
                     break;
@@ -156,4 +159,4 @@ namespace v2rayN.ViewModels
             }
         }
     }
-}
+}

v2rayN/v2rayN/ViewModels/DNSSettingViewModel.cs

@@ -0,0 +1,110 @@
+using ReactiveUI;
+using ReactiveUI.Fody.Helpers;
+using Splat;
+using System.Reactive;
+using System.Windows;
+using v2rayN.Handler;
+using v2rayN.Mode;
+using v2rayN.Resx;
+
+namespace v2rayN.ViewModels
+{
+    public class DNSSettingViewModel : ReactiveObject
+    {
+        private static Config _config;
+        private NoticeHandler? _noticeHandler;
+        private Window _view;
+
+        [Reactive] public string domainStrategy4Freedom { get; set; }
+        [Reactive] public string normalDNS { get; set; }
+        [Reactive] public string normalDNS2 { get; set; }
+        [Reactive] public string tunDNS2 { get; set; }
+
+        public ReactiveCommand<Unit, Unit> SaveCmd { get; }
+        public ReactiveCommand<Unit, Unit> ImportDefConfig4V2rayCmd { get; }
+        public ReactiveCommand<Unit, Unit> ImportDefConfig4SingboxCmd { get; }
+
+        public DNSSettingViewModel(Window view)
+        {
+            _config = LazyConfig.Instance.GetConfig();
+            _noticeHandler = Locator.Current.GetService<NoticeHandler>();
+            _view = view;
+
+            var item = LazyConfig.Instance.GetDNSItem(ECoreType.Xray);
+            domainStrategy4Freedom = item?.domainStrategy4Freedom!;
+            normalDNS = item?.normalDNS!;
+
+            var item2 = LazyConfig.Instance.GetDNSItem(ECoreType.sing_box);
+            normalDNS2 = item2?.normalDNS!;
+            tunDNS2 = item2?.tunDNS!;
+
+            SaveCmd = ReactiveCommand.Create(() =>
+            {
+                SaveSetting();
+            });
+
+            ImportDefConfig4V2rayCmd = ReactiveCommand.Create(() =>
+            {
+                normalDNS = Utils.GetEmbedText(Global.DNSV2rayNormalFileName);
+            });
+
+            ImportDefConfig4SingboxCmd = ReactiveCommand.Create(() =>
+            {
+                normalDNS2 = Utils.GetEmbedText(Global.DNSSingboxNormalFileName);
+                tunDNS2 = Utils.GetEmbedText(Global.TunSingboxDNSFileName);
+            });
+
+            Utils.SetDarkBorder(view, _config.uiItem.colorModeDark);
+        }
+
+        private void SaveSetting()
+        {
+            if (!Utils.IsNullOrEmpty(normalDNS))
+            {
+                var obj = Utils.ParseJson(normalDNS);
+                if (obj != null && obj.ContainsKey("servers") == true)
+                {
+                }
+                else
+                {
+                    if (normalDNS.Contains("{") || normalDNS.Contains("}"))
+                    {
+                        UI.Show(ResUI.FillCorrectDNSText);
+                        return;
+                    }
+                }
+            }
+            if (!Utils.IsNullOrEmpty(normalDNS2))
+            {
+                var obj2 = Utils.FromJson<Dns4Sbox>(normalDNS2);
+                if (obj2 == null)
+                {
+                    UI.Show(ResUI.FillCorrectDNSText);
+                    return;
+                }
+            }
+            if (!Utils.IsNullOrEmpty(tunDNS2))
+            {
+                var obj2 = Utils.FromJson<Dns4Sbox>(tunDNS2);
+                if (obj2 == null)
+                {
+                    UI.Show(ResUI.FillCorrectDNSText);
+                    return;
+                }
+            }
+
+            var item = LazyConfig.Instance.GetDNSItem(ECoreType.Xray);
+            item.domainStrategy4Freedom = domainStrategy4Freedom;
+            item.normalDNS = normalDNS;
+            ConfigHandler.SaveDNSItems(_config, item);
+
+            var item2 = LazyConfig.Instance.GetDNSItem(ECoreType.sing_box);
+            item2.normalDNS = Utils.ToJson(Utils.ParseJson(normalDNS2));
+            item2.tunDNS = Utils.ToJson(Utils.ParseJson(tunDNS2));
+            ConfigHandler.SaveDNSItems(_config, item2);
+
+            _noticeHandler?.Enqueue(ResUI.OperationSuccess);
+            _view.DialogResult = true;
+        }
+    }
+}

v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs

@@ -22,7 +22,6 @@ using v2rayN.Resx;
 using v2rayN.Tool;
 using v2rayN.Views;
 
-
 namespace v2rayN.ViewModels
 {
     public class MainWindowViewModel : ReactiveObject
@@ -40,7 +39,7 @@ namespace v2rayN.ViewModels
         private Dictionary<string, bool> _dicHeaderSort = new();
         private Action<EViewAction> _updateView;
 
-        #endregion
+        #endregion private prop
 
         #region ObservableCollection
 
@@ -58,25 +57,34 @@ namespace v2rayN.ViewModels
 
         [Reactive]
         public ProfileItemModel SelectedProfile { get; set; }
+
         public IList<ProfileItemModel> SelectedProfiles { get; set; }
+
         [Reactive]
         public SubItem SelectedSub { get; set; }
+
         [Reactive]
         public SubItem SelectedMoveToGroup { get; set; }
+
         [Reactive]
         public RoutingItem SelectedRouting { get; set; }
+
         [Reactive]
         public ComboItem SelectedServer { get; set; }
+
         [Reactive]
         public string ServerFilter { get; set; }
+
         [Reactive]
         public bool BlServers { get; set; }
-        #endregion
+
+        #endregion ObservableCollection
 
         #region Menu
 
         //servers
         public ReactiveCommand<Unit, Unit> AddVmessServerCmd { get; }
+
         public ReactiveCommand<Unit, Unit> AddVlessServerCmd { get; }
         public ReactiveCommand<Unit, Unit> AddShadowsocksServerCmd { get; }
         public ReactiveCommand<Unit, Unit> AddSocksServerCmd { get; }
@@ -84,34 +92,41 @@ namespace v2rayN.ViewModels
         public ReactiveCommand<Unit, Unit> AddCustomServerCmd { get; }
         public ReactiveCommand<Unit, Unit> AddServerViaClipboardCmd { get; }
         public ReactiveCommand<Unit, Unit> AddServerViaScanCmd { get; }
+
         //servers delete
         public ReactiveCommand<Unit, Unit> EditServerCmd { get; }
+
         public ReactiveCommand<Unit, Unit> RemoveServerCmd { get; }
         public ReactiveCommand<Unit, Unit> RemoveDuplicateServerCmd { get; }
         public ReactiveCommand<Unit, Unit> CopyServerCmd { get; }
         public ReactiveCommand<Unit, Unit> SetDefaultServerCmd { get; }
         public ReactiveCommand<Unit, Unit> ShareServerCmd { get; }
-        //servers move   
+
+        //servers move
         public ReactiveCommand<Unit, Unit> MoveTopCmd { get; }
+
         public ReactiveCommand<Unit, Unit> MoveUpCmd { get; }
         public ReactiveCommand<Unit, Unit> MoveDownCmd { get; }
         public ReactiveCommand<Unit, Unit> MoveBottomCmd { get; }
 
-        //servers ping 
+        //servers ping
         public ReactiveCommand<Unit, Unit> MixedTestServerCmd { get; }
+
         public ReactiveCommand<Unit, Unit> PingServerCmd { get; }
         public ReactiveCommand<Unit, Unit> TcpingServerCmd { get; }
         public ReactiveCommand<Unit, Unit> RealPingServerCmd { get; }
         public ReactiveCommand<Unit, Unit> SpeedServerCmd { get; }
         public ReactiveCommand<Unit, Unit> SortServerResultCmd { get; }
+
         //servers export
         public ReactiveCommand<Unit, Unit> Export2ClientConfigCmd { get; }
-        public ReactiveCommand<Unit, Unit> Export2ServerConfigCmd { get; }
+
         public ReactiveCommand<Unit, Unit> Export2ShareUrlCmd { get; }
         public ReactiveCommand<Unit, Unit> Export2SubContentCmd { get; }
 
         //Subscription
         public ReactiveCommand<Unit, Unit> SubSettingCmd { get; }
+
         public ReactiveCommand<Unit, Unit> AddSubCmd { get; }
         public ReactiveCommand<Unit, Unit> SubUpdateCmd { get; }
         public ReactiveCommand<Unit, Unit> SubUpdateViaProxyCmd { get; }
@@ -120,7 +135,9 @@ namespace v2rayN.ViewModels
 
         //Setting
         public ReactiveCommand<Unit, Unit> OptionSettingCmd { get; }
+
         public ReactiveCommand<Unit, Unit> RoutingSettingCmd { get; }
+        public ReactiveCommand<Unit, Unit> DNSSettingCmd { get; }
         public ReactiveCommand<Unit, Unit> GlobalHotkeySettingCmd { get; }
         public ReactiveCommand<Unit, Unit> RebootAsAdminCmd { get; }
         public ReactiveCommand<Unit, Unit> ClearServerStatisticsCmd { get; }
@@ -128,36 +145,47 @@ namespace v2rayN.ViewModels
 
         //CheckUpdate
         public ReactiveCommand<Unit, Unit> CheckUpdateNCmd { get; }
+
         public ReactiveCommand<Unit, Unit> CheckUpdateV2flyCoreCmd { get; }
         public ReactiveCommand<Unit, Unit> CheckUpdateSagerNetCoreCmd { get; }
         public ReactiveCommand<Unit, Unit> CheckUpdateXrayCoreCmd { get; }
         public ReactiveCommand<Unit, Unit> CheckUpdateClashCoreCmd { get; }
         public ReactiveCommand<Unit, Unit> CheckUpdateClashMetaCoreCmd { get; }
-        public ReactiveCommand<Unit, Unit> CheckUpdateSingBoxCoreCmd { get; }        
+        public ReactiveCommand<Unit, Unit> CheckUpdateSingBoxCoreCmd { get; }
         public ReactiveCommand<Unit, Unit> CheckUpdateGeoCmd { get; }
 
-
-
         public ReactiveCommand<Unit, Unit> ReloadCmd { get; }
+
         [Reactive]
         public bool BlReloadEnabled { get; set; }
 
         public ReactiveCommand<Unit, Unit> NotifyLeftClickCmd { get; }
+
         [Reactive]
         public Icon NotifyIcon { get; set; }
+
         [Reactive]
         public ImageSource AppIcon { get; set; }
-        #endregion
 
-        #region System Proxy 
+        //[Reactive]
+        //public bool BlShowTrayTip { get; set; }
+
+        #endregion Menu
+
+        #region System Proxy
+
         [Reactive]
         public bool BlSystemProxyClear { get; set; }
+
         [Reactive]
         public bool BlSystemProxySet { get; set; }
+
         [Reactive]
         public bool BlSystemProxyNothing { get; set; }
+
         [Reactive]
         public bool BlSystemProxyPac { get; set; }
+
         public ReactiveCommand<Unit, Unit> SystemProxyClearCmd { get; }
         public ReactiveCommand<Unit, Unit> SystemProxySetCmd { get; }
         public ReactiveCommand<Unit, Unit> SystemProxyNothingCmd { get; }
@@ -165,41 +193,57 @@ namespace v2rayN.ViewModels
 
         [Reactive]
         public bool BlRouting { get; set; }
+
         [Reactive]
         public int SystemProxySelected { get; set; }
-        #endregion
+
+        #endregion System Proxy
 
         #region UI
 
         [Reactive]
         public string InboundDisplay { get; set; }
+
         [Reactive]
         public string InboundLanDisplay { get; set; }
+
         [Reactive]
         public string RunningServerDisplay { get; set; }
-        [Reactive]
+
-        public string RunningServerToolTipText { get; set; }
+        //[Reactive]
+        //public string RunningServerToolTipText { get; set; }
+
         [Reactive]
         public string RunningInfoDisplay { get; set; }
+
         [Reactive]
         public string SpeedProxyDisplay { get; set; }
+
         [Reactive]
         public string SpeedDirectDisplay { get; set; }
+
         [Reactive]
         public bool EnableTun { get; set; }
 
         [Reactive]
         public bool ColorModeDark { get; set; }
+
         private IObservableCollection<Swatch> _swatches = new ObservableCollectionExtended<Swatch>();
         public IObservableCollection<Swatch> Swatches => _swatches;
+
         [Reactive]
         public Swatch SelectedSwatch { get; set; }
+
         [Reactive]
         public int CurrentFontSize { get; set; }
 
+        [Reactive]
+        public bool FollowSystemTheme { get; set; }
+
         [Reactive]
         public string CurrentLanguage { get; set; }
-        #endregion
+
+        #endregion UI
 
         #region Init
 
@@ -330,7 +374,7 @@ namespace v2rayN.ViewModels
             {
                 ShareServer();
             }, canEditRemove);
-            //servers move   
+            //servers move
             MoveTopCmd = ReactiveCommand.Create(() =>
             {
                 MoveServer(EMove.Top);
@@ -378,10 +422,6 @@ namespace v2rayN.ViewModels
             {
                 Export2ClientConfig();
             }, canEditRemove);
-            Export2ServerConfigCmd = ReactiveCommand.Create(() =>
-            {
-                Export2ServerConfig();
-            }, canEditRemove);
             Export2ShareUrlCmd = ReactiveCommand.Create(() =>
             {
                 Export2ShareUrl();
@@ -391,7 +431,6 @@ namespace v2rayN.ViewModels
                 Export2SubContent();
             }, canEditRemove);
 
-
             //Subscription
             SubSettingCmd = ReactiveCommand.Create(() =>
             {
@@ -427,6 +466,10 @@ namespace v2rayN.ViewModels
             {
                 RoutingSetting();
             });
+            DNSSettingCmd = ReactiveCommand.Create(() =>
+            {
+                DNSSetting();
+            });
             GlobalHotkeySettingCmd = ReactiveCommand.Create(() =>
             {
                 if ((new GlobalHotkeySettingWindow()).ShowDialog() == true)
@@ -476,7 +519,7 @@ namespace v2rayN.ViewModels
             CheckUpdateSingBoxCoreCmd = ReactiveCommand.Create(() =>
             {
                 CheckUpdateCore(ECoreType.sing_box);
-            });            
+            });
             CheckUpdateGeoCmd = ReactiveCommand.Create(() =>
             {
                 CheckUpdateGeo();
@@ -510,15 +553,15 @@ namespace v2rayN.ViewModels
                 SetListenerType(ESysProxyType.Pac);
             });
 
-
             Global.ShowInTaskbar = true;
         }
 
         private void Init()
         {
             ConfigHandler.InitBuiltinRouting(ref _config);
-            //MainFormHandler.Instance.BackupGuiNConfig(_config, true);
+            ConfigHandler.InitBuiltinDNS(_config);
-            _coreHandler = new CoreHandler(UpdateHandler);
+            _coreHandler = new CoreHandler(_config, UpdateHandler);
+            Locator.CurrentMutable.RegisterLazySingleton(() => _coreHandler, typeof(CoreHandler));
 
             if (_config.guiItem.enableStatistics)
             {
@@ -531,6 +574,7 @@ namespace v2rayN.ViewModels
             Reload();
             ChangeSystemProxyStatus(_config.sysProxyType, true);
         }
+
         private void OnProgramStarted(object state, bool timeout)
         {
             Application.Current.Dispatcher.Invoke((Action)(() =>
@@ -539,13 +583,15 @@ namespace v2rayN.ViewModels
             }));
         }
 
-        #endregion
+        #endregion Init
 
         #region Actions
+
         private void UpdateHandler(bool notify, string msg)
         {
             _noticeHandler?.SendMessage(msg);
         }
+
         private void UpdateTaskHandler(bool success, string msg)
         {
             _noticeHandler?.SendMessage(msg);
@@ -563,6 +609,7 @@ namespace v2rayN.ViewModels
                 }
             }
         }
+
         private void UpdateStatisticsHandler(ServerSpeedItem update)
         {
             try
@@ -610,6 +657,7 @@ namespace v2rayN.ViewModels
                 Utils.SaveLog(ex.Message, ex);
             }
         }
+
         private void UpdateSpeedtestHandler(string indexId, string delay, string speed)
         {
             Application.Current.Dispatcher.Invoke((Action)(() =>
@@ -617,6 +665,7 @@ namespace v2rayN.ViewModels
                 SetTestResult(indexId, delay, speed);
             }));
         }
+
         private void SetTestResult(string indexId, string delay, string speed)
         {
             if (Utils.IsNullOrEmpty(indexId))
@@ -649,20 +698,25 @@ namespace v2rayN.ViewModels
                 case EGlobalHotkey.ShowForm:
                     ShowHideWindow(null);
                     break;
+
                 case EGlobalHotkey.SystemProxyClear:
                     SetListenerType(ESysProxyType.ForcedClear);
                     break;
+
                 case EGlobalHotkey.SystemProxySet:
                     SetListenerType(ESysProxyType.ForcedChange);
                     break;
+
                 case EGlobalHotkey.SystemProxyUnchanged:
                     SetListenerType(ESysProxyType.Unchanged);
                     break;
+
                 case EGlobalHotkey.SystemProxyPac:
                     SetListenerType(ESysProxyType.Pac);
                     break;
             }
         }
+
         public void MyAppExit(bool blWindowsShutDown)
         {
             try
@@ -698,7 +752,7 @@ namespace v2rayN.ViewModels
             }
         }
 
-        #endregion
+        #endregion Actions
 
         #region Servers && Groups
 
@@ -789,18 +843,18 @@ namespace v2rayN.ViewModels
 
                 RefreshServersMenu();
 
-                //display running server 
+                //display running server
                 var running = ConfigHandler.GetDefaultServer(ref _config);
                 if (running != null)
                 {
                     var runningSummary = running.GetSummary();
                     RunningServerDisplay = $"{ResUI.menuServers}:{runningSummary}";
-                    RunningServerToolTipText = runningSummary;
+                    //RunningServerToolTipText = runningSummary;
                 }
                 else
                 {
-                    RunningServerDisplay =
+                    RunningServerDisplay = ResUI.CheckServerSettings;
-                    RunningServerToolTipText = ResUI.CheckServerSettings;
+                    //RunningServerToolTipText = ResUI.CheckServerSettings;
                 }
             }));
         }
@@ -848,9 +902,10 @@ namespace v2rayN.ViewModels
             }
         }
 
-        #endregion
+        #endregion Servers && Groups
 
         #region Add Servers
+
         private int GetProfileItems(out List<ProfileItem> lstSelecteds, bool latest)
         {
             lstSelecteds = new List<ProfileItem>();
@@ -888,6 +943,7 @@ namespace v2rayN.ViewModels
                 {
                     subid = _subId,
                     configType = eConfigType,
+                    isSub = false,
                 };
             }
             else
@@ -934,6 +990,7 @@ namespace v2rayN.ViewModels
                 _noticeHandler?.Enqueue(string.Format(ResUI.SuccessfullyImportedServerViaClipboard, ret));
             }
         }
+
         public async Task ScanScreenTaskAsync()
         {
             ShowHideWindow(false);
@@ -961,9 +1018,10 @@ namespace v2rayN.ViewModels
                 }
             }
         }
+
         public void RemoveServer()
         {
-            if (GetProfileItems(out List<ProfileItem> lstSelecteds, false) < 0)
+            if (GetProfileItems(out List<ProfileItem> lstSelecteds, true) < 0)
             {
                 return;
             }
@@ -991,6 +1049,7 @@ namespace v2rayN.ViewModels
             Reload();
             _noticeHandler?.Enqueue(string.Format(ResUI.RemoveDuplicateServerResult, tuple.Item1, tuple.Item2));
         }
+
         private void CopyServer()
         {
             if (GetProfileItems(out List<ProfileItem> lstSelecteds, false) < 0)
@@ -1012,6 +1071,7 @@ namespace v2rayN.ViewModels
             }
             SetDefaultServer(SelectedProfile.indexId);
         }
+
         private void SetDefaultServer(string indexId)
         {
             if (Utils.IsNullOrEmpty(indexId))
@@ -1035,6 +1095,7 @@ namespace v2rayN.ViewModels
                 Reload();
             }
         }
+
         private void ServerSelectedChanged(bool c)
         {
             if (!c)
@@ -1052,7 +1113,6 @@ namespace v2rayN.ViewModels
             SetDefaultServer(SelectedServer.ID);
         }
 
-
         public async void ShareServer()
         {
             var item = LazyConfig.Instance.GetProfileItem(SelectedProfile.indexId);
@@ -1192,17 +1252,6 @@ namespace v2rayN.ViewModels
             MainFormHandler.Instance.Export2ClientConfig(item, _config);
         }
 
-        private void Export2ServerConfig()
-        {
-            var item = LazyConfig.Instance.GetProfileItem(SelectedProfile.indexId);
-            if (item is null)
-            {
-                _noticeHandler?.Enqueue(ResUI.PleaseSelectServer);
-                return;
-            }
-            MainFormHandler.Instance.Export2ServerConfig(item, _config);
-        }
-
         public void Export2ShareUrl()
         {
             if (GetProfileItems(out List<ProfileItem> lstSelecteds, true) < 0)
@@ -1253,7 +1302,7 @@ namespace v2rayN.ViewModels
             }
         }
 
-        #endregion
+        #endregion Add Servers
 
         #region Subscription
 
@@ -1265,6 +1314,7 @@ namespace v2rayN.ViewModels
                 SubSelectedChanged(true);
             }
         }
+
         private void AddSub()
         {
             SubItem item = new();
@@ -1281,7 +1331,7 @@ namespace v2rayN.ViewModels
             (new UpdateHandle()).UpdateSubscriptionProcess(_config, subId, blProxy, UpdateTaskHandler);
         }
 
-        #endregion
+        #endregion Subscription
 
         #region Setting
 
@@ -1292,9 +1342,9 @@ namespace v2rayN.ViewModels
             {
                 //RefreshServers();
                 Reload();
-                TunModeSwitch();
             }
         }
+
         private void RoutingSetting()
         {
             var ret = (new RoutingSettingWindow()).ShowDialog();
@@ -1307,6 +1357,15 @@ namespace v2rayN.ViewModels
             }
         }
 
+        private void DNSSetting()
+        {
+            var ret = (new DNSSettingWindow()).ShowDialog();
+            if (ret == true)
+            {
+                Reload();
+            }
+        }
+
         private void RebootAsAdmin()
         {
             ProcessStartInfo startInfo = new()
@@ -1357,7 +1416,7 @@ namespace v2rayN.ViewModels
             }
         }
 
-        #endregion
+        #endregion Setting
 
         #region CheckUpdate
 
@@ -1370,7 +1429,7 @@ namespace v2rayN.ViewModels
                 {
                     MyAppExit(false);
                 }
-            };
+            }
             (new UpdateHandle()).CheckUpdateGuiN(_config, _updateUI, _config.guiItem.checkPreReleaseUpdate);
         }
 
@@ -1399,21 +1458,16 @@ namespace v2rayN.ViewModels
                         File.Delete(fileName);
                     }
                 }
-            };
+            }
             (new UpdateHandle()).CheckUpdateCore(type, _config, _updateUI, _config.guiItem.checkPreReleaseUpdate);
         }
 
         private void CheckUpdateGeo()
         {
-            Task.Run(() =>
+            (new UpdateHandle()).UpdateGeoFileAll(_config, UpdateTaskHandler);
-            {
-                var updateHandle = new UpdateHandle();
-                updateHandle.UpdateGeoFile("geosite", _config, UpdateTaskHandler);
-                updateHandle.UpdateGeoFile("geoip", _config, UpdateTaskHandler);
-            });
         }
 
-        #endregion
+        #endregion CheckUpdate
 
         #region v2ray job
 
@@ -1422,21 +1476,16 @@ namespace v2rayN.ViewModels
             _ = LoadV2ray();
         }
 
-
+        private async Task LoadV2ray()
-        async Task LoadV2ray()
         {
             Application.Current.Dispatcher.Invoke((Action)(() =>
             {
                 BlReloadEnabled = false;
             }));
 
-            //if (Global.reloadV2ray)
-            //{
-            //    _noticeHandler?.SendMessage(Global.CommandClearMsg);
-            //}
             await Task.Run(() =>
             {
-                _coreHandler.LoadCore(_config);
+                _coreHandler.LoadCore();
 
                 //ConfigHandler.SaveConfig(ref _config, false);
 
@@ -1460,7 +1509,7 @@ namespace v2rayN.ViewModels
             _coreHandler.CoreStop();
         }
 
-        #endregion
+        #endregion v2ray job
 
         #region System proxy and Routings
 
@@ -1479,7 +1528,7 @@ namespace v2rayN.ViewModels
 
         private void ChangeSystemProxyStatus(ESysProxyType type, bool blChange)
         {
-            SysProxyHandle.UpdateSysProxy(_config, false);
+            SysProxyHandle.UpdateSysProxy(_config, _config.tunModeItem.enableTun ? true : false);
             _noticeHandler?.SendMessage(ResUI.TipChangeSystemProxy, true);
 
             Application.Current.Dispatcher.Invoke((Action)(() =>
@@ -1549,7 +1598,7 @@ namespace v2rayN.ViewModels
             }
         }
 
-        void DoSystemProxySelected(bool c)
+        private void DoSystemProxySelected(bool c)
         {
             if (!c)
             {
@@ -1562,28 +1611,16 @@ namespace v2rayN.ViewModels
             SetListenerType((ESysProxyType)SystemProxySelected);
         }
 
-        void DoEnableTun(bool c)
+        private void DoEnableTun(bool c)
         {
             if (_config.tunModeItem.enableTun != EnableTun)
             {
                 _config.tunModeItem.enableTun = EnableTun;
-            }
+                Reload();
-            TunModeSwitch();
-        }
-
-        void TunModeSwitch()
-        {
-            if (EnableTun)
-            {
-                TunHandler.Instance.Start();
-            }
-            else
-            {
-                TunHandler.Instance.Stop();
             }
         }
 
-        #endregion
+        #endregion System proxy and Routings
 
         #region UI
 
@@ -1607,13 +1644,20 @@ namespace v2rayN.ViewModels
                 //Application.Current.MainWindow.ShowInTaskbar = false;
                 //IntPtr windowHandle = new WindowInteropHelper(Application.Current.MainWindow).Handle;
                 //Utils.RegWriteValue(Global.MyRegPath, Utils.WindowHwndKey, Convert.ToString((long)windowHandle));
-            };
+            }
             Global.ShowInTaskbar = bl;
         }
 
         private void RestoreUI()
         {
-            ModifyTheme(_config.uiItem.colorModeDark);
+            if (FollowSystemTheme)
+            {
+                ModifyTheme(!Utils.IsLightTheme());
+            }
+            else
+            {
+                ModifyTheme(_config.uiItem.colorModeDark);
+            }
 
             if (!_config.uiItem.colorPrimaryName.IsNullOrEmpty())
             {
@@ -1626,6 +1670,7 @@ namespace v2rayN.ViewModels
                 }
             }
         }
+
         private void StorageUI()
         {
         }
@@ -1633,6 +1678,7 @@ namespace v2rayN.ViewModels
         private void BindingUI()
         {
             ColorModeDark = _config.uiItem.colorModeDark;
+            FollowSystemTheme = _config.uiItem.followSystemTheme;
             _swatches.AddRange(new SwatchesProvider().Swatches);
             if (!_config.uiItem.colorPrimaryName.IsNullOrEmpty())
             {
@@ -1640,6 +1686,7 @@ namespace v2rayN.ViewModels
             }
             CurrentFontSize = _config.uiItem.currentFontSize;
             CurrentLanguage = _config.uiItem.currentLanguage;
+            //BlShowTrayTip = _config.uiItem.showTrayTip;
 
             this.WhenAnyValue(
                   x => x.ColorModeDark,
@@ -1654,6 +1701,21 @@ namespace v2rayN.ViewModels
                           }
                       });
 
+            this.WhenAnyValue(x => x.FollowSystemTheme,
+                y => y == true)
+                    .Subscribe(c =>
+                    {
+                        if (_config.uiItem.followSystemTheme != FollowSystemTheme)
+                        {
+                            _config.uiItem.followSystemTheme = FollowSystemTheme;
+                            ConfigHandler.SaveConfig(ref _config);
+                            if (FollowSystemTheme)
+                            {
+                                ModifyTheme(!Utils.IsLightTheme());
+                            }
+                        }
+                    });
+
             this.WhenAnyValue(
               x => x.SelectedSwatch,
               y => y != null && !y.Name.IsNullOrEmpty())
@@ -1751,6 +1813,7 @@ namespace v2rayN.ViewModels
 
             Utils.SetDarkBorder(Application.Current.MainWindow, isDarkTheme);
         }
+
         public void ChangePrimaryColor(System.Windows.Media.Color color)
         {
             var theme = _paletteHelper.GetTheme();
@@ -1767,7 +1830,7 @@ namespace v2rayN.ViewModels
             if (_config.uiItem.autoHideStartup)
             {
                 Observable.Range(1, 1)
-                 .Delay(TimeSpan.FromSeconds(1))
+                 .Delay(TimeSpan.FromSeconds(2))
                  .Subscribe(x =>
                  {
                      Application.Current.Dispatcher.Invoke(() =>
@@ -1778,6 +1841,6 @@ namespace v2rayN.ViewModels
             }
         }
 
-        #endregion
+        #endregion UI
     }
-}
+}

v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs

@@ -16,6 +16,7 @@ namespace v2rayN.ViewModels
         private Window _view;
 
         #region Core
+
         [Reactive] public int localPort { get; set; }
         [Reactive] public bool udpEnabled { get; set; }
         [Reactive] public bool sniffingEnabled { get; set; }
@@ -30,14 +31,12 @@ namespace v2rayN.ViewModels
         [Reactive] public bool defAllowInsecure { get; set; }
         [Reactive] public string defFingerprint { get; set; }
         [Reactive] public string defUserAgent { get; set; }
-        #endregion
+        [Reactive] public string mux4SboxProtocol { get; set; }
 
-        #region Core DNS
+        #endregion Core
-        [Reactive] public string domainStrategy4Freedom { get; set; }
-        [Reactive] public string remoteDNS { get; set; }
-        #endregion
 
         #region Core KCP
+
         //[Reactive] public int Kcpmtu { get; set; }
         //[Reactive] public int Kcptti { get; set; }
         //[Reactive] public int KcpuplinkCapacity { get; set; }
@@ -45,12 +44,13 @@ namespace v2rayN.ViewModels
         //[Reactive] public int KcpreadBufferSize { get; set; }
         //[Reactive] public int KcpwriteBufferSize { get; set; }
         //[Reactive] public bool Kcpcongestion { get; set; }
-        #endregion
+
+        #endregion Core KCP
 
         #region UI
+
         [Reactive] public bool AutoRun { get; set; }
         [Reactive] public bool EnableStatistics { get; set; }
-        [Reactive] public int StatisticsFreshRate { get; set; }
         [Reactive] public bool KeepOlderDedupl { get; set; }
         [Reactive] public bool IgnoreGeoUpdateCore { get; set; }
         [Reactive] public bool EnableAutoAdjustMainLvColWidth { get; set; }
@@ -65,32 +65,27 @@ namespace v2rayN.ViewModels
         [Reactive] public int SpeedTestTimeout { get; set; }
         [Reactive] public string SpeedTestUrl { get; set; }
         [Reactive] public bool EnableHWA { get; set; }
+        [Reactive] public string SubConvertUrl { get; set; }
 
-        #endregion
+        #endregion UI
 
         #region System proxy
+
         [Reactive] public string systemProxyAdvancedProtocol { get; set; }
         [Reactive] public string systemProxyExceptions { get; set; }
-        #endregion
+
+        #endregion System proxy
 
         #region Tun mode
-        [Reactive] public bool TunShowWindow { get; set; }
+
-        [Reactive] public bool TunEnabledLog { get; set; }
         [Reactive] public bool TunStrictRoute { get; set; }
         [Reactive] public string TunStack { get; set; }
         [Reactive] public int TunMtu { get; set; }
-        [Reactive] public string TunCustomTemplate { get; set; }
+
-        [Reactive] public bool TunBypassMode { get; set; }
+        #endregion Tun mode
-        [Reactive] public bool TunBypassMode2 { get; set; }
-        [Reactive] public string TunDirectIP { get; set; }
-        [Reactive] public string TunDirectProcess { get; set; }
-        [Reactive] public string TunDirectDNS { get; set; }
-        [Reactive] public string TunProxyIP { get; set; }
-        [Reactive] public string TunProxyProcess { get; set; }
-        [Reactive] public string TunProxyDNS { get; set; }
-        #endregion
 
         #region CoreType
+
         [Reactive] public string CoreType1 { get; set; }
         [Reactive] public string CoreType2 { get; set; }
         [Reactive] public string CoreType3 { get; set; }
@@ -98,11 +93,10 @@ namespace v2rayN.ViewModels
         [Reactive] public string CoreType5 { get; set; }
         [Reactive] public string CoreType6 { get; set; }
 
-        #endregion
+        #endregion CoreType
 
         public ReactiveCommand<Unit, Unit> SaveCmd { get; }
 
-
         public OptionSettingViewModel(Window view)
         {
             _config = LazyConfig.Instance.GetConfig();
@@ -110,6 +104,7 @@ namespace v2rayN.ViewModels
             _view = view;
 
             #region Core
+
             var inbound = _config.inbound[0];
             localPort = inbound.localPort;
             udpEnabled = inbound.udpEnabled;
@@ -125,14 +120,12 @@ namespace v2rayN.ViewModels
             defAllowInsecure = _config.coreBasicItem.defAllowInsecure;
             defFingerprint = _config.coreBasicItem.defFingerprint;
             defUserAgent = _config.coreBasicItem.defUserAgent;
-            #endregion
+            mux4SboxProtocol = _config.mux4Sbox.protocol;
 
-            #region Core DNS
+            #endregion Core
-            domainStrategy4Freedom = _config.domainStrategy4Freedom;
-            remoteDNS = _config.remoteDNS;
-            #endregion
 
             #region Core KCP
+
             //Kcpmtu = _config.kcpItem.mtu;
             //Kcptti = _config.kcpItem.tti;
             //KcpuplinkCapacity = _config.kcpItem.uplinkCapacity;
@@ -140,12 +133,13 @@ namespace v2rayN.ViewModels
             //KcpreadBufferSize = _config.kcpItem.readBufferSize;
             //KcpwriteBufferSize = _config.kcpItem.writeBufferSize;
             //Kcpcongestion = _config.kcpItem.congestion;
-            #endregion
+
+            #endregion Core KCP
 
             #region UI
+
             AutoRun = _config.guiItem.autoRun;
             EnableStatistics = _config.guiItem.enableStatistics;
-            StatisticsFreshRate = _config.guiItem.statisticsFreshRate;
             KeepOlderDedupl = _config.guiItem.keepOlderDedupl;
             IgnoreGeoUpdateCore = _config.guiItem.ignoreGeoUpdateCore;
             EnableAutoAdjustMainLvColWidth = _config.uiItem.enableAutoAdjustMainLvColWidth;
@@ -160,34 +154,24 @@ namespace v2rayN.ViewModels
             SpeedTestTimeout = _config.speedTestItem.speedTestTimeout;
             SpeedTestUrl = _config.speedTestItem.speedTestUrl;
             EnableHWA = _config.guiItem.enableHWA;
+            SubConvertUrl = _config.constItem.subConvertUrl;
 
-            #endregion
+            #endregion UI
 
             #region System proxy
+
             systemProxyAdvancedProtocol = _config.systemProxyAdvancedProtocol;
             systemProxyExceptions = _config.systemProxyExceptions;
-            #endregion
+
+            #endregion System proxy
 
             #region Tun mode
 
-            TunShowWindow = _config.tunModeItem.showWindow;
-            TunEnabledLog = _config.tunModeItem.enabledLog;
             TunStrictRoute = _config.tunModeItem.strictRoute;
             TunStack = _config.tunModeItem.stack;
             TunMtu = _config.tunModeItem.mtu;
-            TunCustomTemplate = _config.tunModeItem.customTemplate;
-            TunBypassMode = _config.tunModeItem.bypassMode;
-            TunDirectIP = Utils.List2String(_config.tunModeItem.directIP, true);
-            TunDirectProcess = Utils.List2String(_config.tunModeItem.directProcess, true);
-            TunDirectDNS = _config.tunModeItem.directDNS;
-            TunProxyIP = Utils.List2String(_config.tunModeItem.proxyIP, true);
-            TunProxyProcess = Utils.List2String(_config.tunModeItem.proxyProcess, true);
-            TunProxyDNS = _config.tunModeItem.proxyDNS;
-            this.WhenAnyValue(
-              x => x.TunBypassMode)
-              .Subscribe(c => TunBypassMode2 = !TunBypassMode);
 
-            #endregion
+            #endregion Tun mode
 
             InitCoreType();
 
@@ -227,18 +211,23 @@ namespace v2rayN.ViewModels
                     case 1:
                         CoreType1 = type;
                         break;
+
                     case 2:
                         CoreType2 = type;
                         break;
+
                     case 3:
                         CoreType3 = type;
                         break;
+
                     case 4:
                         CoreType4 = type;
                         break;
+
                     case 5:
                         CoreType5 = type;
                         break;
+
                     case 6:
                         CoreType6 = type;
                         break;
@@ -246,7 +235,6 @@ namespace v2rayN.ViewModels
             });
         }
 
-
         private void SaveSetting()
         {
             if (Utils.IsNullOrEmpty(localPort.ToString()) || !Utils.IsNumberic(localPort.ToString())
@@ -256,19 +244,6 @@ namespace v2rayN.ViewModels
                 return;
             }
 
-            var obj = Utils.ParseJson(remoteDNS);
-            if (obj?.ContainsKey("servers") == true)
-            {
-            }
-            else
-            {
-                if (remoteDNS.Contains("{") || remoteDNS.Contains("}"))
-                {
-                    UI.Show(ResUI.FillCorrectDNSText);
-                    return;
-                }
-            }
-
             //if (Utils.IsNullOrEmpty(Kcpmtu.ToString()) || !Utils.IsNumberic(Kcpmtu.ToString())
             //       || Utils.IsNullOrEmpty(Kcptti.ToString()) || !Utils.IsNumberic(Kcptti.ToString())
             //       || Utils.IsNullOrEmpty(KcpuplinkCapacity.ToString()) || !Utils.IsNumberic(KcpuplinkCapacity.ToString())
@@ -299,12 +274,7 @@ namespace v2rayN.ViewModels
             _config.coreBasicItem.defAllowInsecure = defAllowInsecure;
             _config.coreBasicItem.defFingerprint = defFingerprint;
             _config.coreBasicItem.defUserAgent = defUserAgent;
-
+            _config.mux4Sbox.protocol = mux4SboxProtocol;
-
-            //DNS
-            _config.remoteDNS = remoteDNS;
-            _config.domainStrategy4Freedom = domainStrategy4Freedom;
-
 
             //Kcp
             //_config.kcpItem.mtu = Kcpmtu;
@@ -315,16 +285,10 @@ namespace v2rayN.ViewModels
             //_config.kcpItem.writeBufferSize = KcpwriteBufferSize;
             //_config.kcpItem.congestion = Kcpcongestion;
 
-
             //UI
             Utils.SetAutoRun(AutoRun);
             _config.guiItem.autoRun = AutoRun;
             _config.guiItem.enableStatistics = EnableStatistics;
-            _config.guiItem.statisticsFreshRate = StatisticsFreshRate;
-            if (_config.guiItem.statisticsFreshRate > 100 || _config.guiItem.statisticsFreshRate < 1)
-            {
-                _config.guiItem.statisticsFreshRate = 1;
-            }
             _config.guiItem.keepOlderDedupl = KeepOlderDedupl;
             _config.guiItem.ignoreGeoUpdateCore = IgnoreGeoUpdateCore;
             _config.uiItem.enableAutoAdjustMainLvColWidth = EnableAutoAdjustMainLvColWidth;
@@ -339,27 +303,18 @@ namespace v2rayN.ViewModels
             _config.speedTestItem.speedTestTimeout = SpeedTestTimeout;
             _config.speedTestItem.speedTestUrl = SpeedTestUrl;
             _config.guiItem.enableHWA = EnableHWA;
+            _config.constItem.subConvertUrl = SubConvertUrl;
 
             //systemProxy
             _config.systemProxyExceptions = systemProxyExceptions;
             _config.systemProxyAdvancedProtocol = systemProxyAdvancedProtocol;
 
             //tun mode
-            _config.tunModeItem.showWindow = TunShowWindow;
-            _config.tunModeItem.enabledLog = TunEnabledLog;
             _config.tunModeItem.strictRoute = TunStrictRoute;
             _config.tunModeItem.stack = TunStack;
             _config.tunModeItem.mtu = TunMtu;
-            _config.tunModeItem.customTemplate = TunCustomTemplate;
-            _config.tunModeItem.bypassMode = TunBypassMode;
-            _config.tunModeItem.directIP = Utils.String2List(TunDirectIP);
-            _config.tunModeItem.directProcess = Utils.String2List(TunDirectProcess);
-            _config.tunModeItem.directDNS = Utils.ToJson(Utils.ParseJson(TunDirectDNS));
-            _config.tunModeItem.proxyIP = Utils.String2List(TunProxyIP);
-            _config.tunModeItem.proxyProcess = Utils.String2List(TunProxyProcess);
-            _config.tunModeItem.proxyDNS = Utils.ToJson(Utils.ParseJson(TunProxyDNS));
 
-            //coreType 
+            //coreType
             SaveCoreType();
 
             if (ConfigHandler.SaveConfig(ref _config) == 0)
@@ -371,8 +326,8 @@ namespace v2rayN.ViewModels
             {
                 UI.ShowWarning(ResUI.OperationFailed);
             }
-
         }
+
         private int SaveCoreType()
         {
             for (int k = 1; k <= _config.coreTypeItem.Count; k++)
@@ -384,18 +339,23 @@ namespace v2rayN.ViewModels
                     case 1:
                         type = CoreType1;
                         break;
+
                     case 2:
                         type = CoreType2;
                         break;
+
                     case 3:
                         type = CoreType3;
                         break;
+
                     case 4:
                         type = CoreType4;
                         break;
+
                     case 5:
                         type = CoreType5;
                         break;
+
                     case 6:
                         type = CoreType6;
                         break;
@@ -405,4 +365,4 @@ namespace v2rayN.ViewModels
             return 0;
         }
     }
-}
+}

v2rayN/v2rayN/ViewModels/RoutingRuleDetailsViewModel.cs

@@ -28,13 +28,14 @@ namespace v2rayN.ViewModels
         [Reactive]
         public string IP { get; set; }
 
+        [Reactive]
+        public string Process { get; set; }
+
         [Reactive]
         public bool AutoSort { get; set; }
 
-
         public ReactiveCommand<Unit, Unit> SaveCmd { get; }
 
-
         public RoutingRuleDetailsViewModel(RulesItem rulesItem, Window view)
         {
             _config = LazyConfig.Instance.GetConfig();
@@ -55,6 +56,7 @@ namespace v2rayN.ViewModels
 
             Domain = Utils.List2String(SelectedSource.domain, true);
             IP = Utils.List2String(SelectedSource.ip, true);
+            Process = Utils.List2String(SelectedSource.process, true);
 
             SaveCmd = ReactiveCommand.Create(() =>
             {
@@ -63,37 +65,41 @@ namespace v2rayN.ViewModels
 
             Utils.SetDarkBorder(view, _config.uiItem.colorModeDark);
         }
+
         private void SaveRules()
         {
+            Domain = Utils.Convert2Comma(Domain);
+            IP = Utils.Convert2Comma(IP);
+            Process = Utils.Convert2Comma(Process);
+
             if (AutoSort)
             {
                 SelectedSource.domain = Utils.String2ListSorted(Domain);
                 SelectedSource.ip = Utils.String2ListSorted(IP);
+                SelectedSource.process = Utils.String2ListSorted(Process);
             }
             else
             {
                 SelectedSource.domain = Utils.String2List(Domain);
                 SelectedSource.ip = Utils.String2List(IP);
+                SelectedSource.process = Utils.String2List(Process);
             }
             SelectedSource.protocol = ProtocolItems?.ToList();
             SelectedSource.inboundTag = InboundTagItems?.ToList();
 
-            bool hasRule =
+            bool hasRule = SelectedSource.domain?.Count > 0
-              SelectedSource.domain != null
+              || SelectedSource.ip?.Count > 0
-              && SelectedSource.domain.Count > 0
+              || SelectedSource.protocol?.Count > 0
-              || SelectedSource.ip != null
+              || SelectedSource.process?.Count > 0
-              && SelectedSource.ip.Count > 0
-              || SelectedSource.protocol != null
-              && SelectedSource.protocol.Count > 0
               || !Utils.IsNullOrEmpty(SelectedSource.port);
 
             if (!hasRule)
             {
-                UI.ShowWarning(string.Format(ResUI.RoutingRuleDetailRequiredTips, "Port/Protocol/Domain/IP"));
+                UI.ShowWarning(string.Format(ResUI.RoutingRuleDetailRequiredTips, "Port/Protocol/Domain/IP/Process"));
                 return;
             }
             //_noticeHandler?.Enqueue(ResUI.OperationSuccess);
             _view.DialogResult = true;
         }
     }
-}
+}

v2rayN/v2rayN/ViewModels/RoutingRuleSettingViewModel.cs

@@ -26,8 +26,10 @@ namespace v2rayN.ViewModels
 
         private IObservableCollection<RulesItemModel> _rulesItems = new ObservableCollectionExtended<RulesItemModel>();
         public IObservableCollection<RulesItemModel> RulesItems => _rulesItems;
+
         [Reactive]
         public RulesItemModel SelectedSource { get; set; }
+
         public IList<RulesItemModel> SelectedSources { get; set; }
 
         public ReactiveCommand<Unit, Unit> RuleAddCmd { get; }
@@ -43,7 +45,6 @@ namespace v2rayN.ViewModels
 
         public ReactiveCommand<Unit, Unit> SaveCmd { get; }
 
-
         public RoutingRuleSettingViewModel(RoutingItem routingItem, Window view)
         {
             _config = LazyConfig.Instance.GetConfig();
@@ -166,7 +167,7 @@ namespace v2rayN.ViewModels
             }
         }
 
-        private void RuleRemove()
+        public void RuleRemove()
         {
             if (SelectedSource is null || SelectedSource.outboundTag.IsNullOrEmpty())
             {
@@ -188,6 +189,7 @@ namespace v2rayN.ViewModels
 
             RefreshRulesItems();
         }
+
         public void RuleExportSelected()
         {
             if (SelectedSource is null || SelectedSource.outboundTag.IsNullOrEmpty())
@@ -299,6 +301,7 @@ namespace v2rayN.ViewModels
                 UI.Show(ResUI.OperationSuccess);
             }
         }
+
         private async Task ImportRulesFromUrl()
         {
             var url = SelectedRouting.url;
@@ -319,6 +322,7 @@ namespace v2rayN.ViewModels
                 UI.Show(ResUI.OperationSuccess);
             }
         }
+
         private int AddBatchRoutingRules(RoutingItem routingItem, string clipboardData)
         {
             bool blReplace = false;
@@ -351,6 +355,6 @@ namespace v2rayN.ViewModels
             return 0;
         }
 
-        #endregion
+        #endregion Import rules
     }
-}
+}

v2rayN/v2rayN/ViewModels/RoutingSettingViewModel.cs

@@ -20,34 +20,46 @@ namespace v2rayN.ViewModels
         private RoutingItem _lockedItem;
         private List<RulesItem> _lockedRules;
 
-
         #region Reactive
 
         private IObservableCollection<RoutingItemModel> _routingItems = new ObservableCollectionExtended<RoutingItemModel>();
         public IObservableCollection<RoutingItemModel> RoutingItems => _routingItems;
+
         [Reactive]
         public RoutingItemModel SelectedSource { get; set; }
+
         public IList<RoutingItemModel> SelectedSources { get; set; }
 
         [Reactive]
         public bool enableRoutingAdvanced { get; set; }
+
         [Reactive]
         public bool enableRoutingBasic { get; set; }
+
         [Reactive]
         public string domainStrategy { get; set; }
+
         [Reactive]
         public string domainMatcher { get; set; }
 
+        [Reactive]
+        public string domainStrategy4Singbox { get; set; }
+
         [Reactive]
         public string ProxyDomain { get; set; }
+
         [Reactive]
         public string ProxyIP { get; set; }
+
         [Reactive]
         public string DirectDomain { get; set; }
+
         [Reactive]
         public string DirectIP { get; set; }
+
         [Reactive]
         public string BlockDomain { get; set; }
+
         [Reactive]
         public string BlockIP { get; set; }
 
@@ -59,7 +71,8 @@ namespace v2rayN.ViewModels
 
         public ReactiveCommand<Unit, Unit> SaveCmd { get; }
         public bool IsModified { get; set; }
-        #endregion
+
+        #endregion Reactive
 
         public RoutingSettingViewModel(Window view)
         {
@@ -73,6 +86,7 @@ namespace v2rayN.ViewModels
             enableRoutingAdvanced = _config.routingBasicItem.enableRoutingAdvanced;
             domainStrategy = _config.routingBasicItem.domainStrategy;
             domainMatcher = _config.routingBasicItem.domainMatcher;
+            domainStrategy4Singbox = _config.routingBasicItem.domainStrategy4Singbox;
 
             RefreshRoutingItems();
 
@@ -117,6 +131,7 @@ namespace v2rayN.ViewModels
         }
 
         #region locked
+
         private void BindingLockedData()
         {
             _lockedItem = ConfigHandler.GetLockedRoutingItem(ref _config);
@@ -133,27 +148,30 @@ namespace v2rayN.ViewModels
                 BlockIP = Utils.List2String(_lockedRules[2].ip, true);
             }
         }
+
         private void EndBindingLockedData()
         {
             if (_lockedItem != null)
             {
-                _lockedRules[0].domain = Utils.String2List(ProxyDomain.TrimEx());
+                _lockedRules[0].domain = Utils.String2List(Utils.Convert2Comma(ProxyDomain.TrimEx()));
-                _lockedRules[0].ip = Utils.String2List(ProxyIP.TrimEx());
+                _lockedRules[0].ip = Utils.String2List(Utils.Convert2Comma(ProxyIP.TrimEx()));
 
-                _lockedRules[1].domain = Utils.String2List(DirectDomain.TrimEx());
+                _lockedRules[1].domain = Utils.String2List(Utils.Convert2Comma(DirectDomain.TrimEx()));
-                _lockedRules[1].ip = Utils.String2List(DirectIP.TrimEx());
+                _lockedRules[1].ip = Utils.String2List(Utils.Convert2Comma(DirectIP.TrimEx()));
 
-                _lockedRules[2].domain = Utils.String2List(BlockDomain.TrimEx());
+                _lockedRules[2].domain = Utils.String2List(Utils.Convert2Comma(BlockDomain.TrimEx()));
-                _lockedRules[2].ip = Utils.String2List(BlockIP.TrimEx());
+                _lockedRules[2].ip = Utils.String2List(Utils.Convert2Comma(BlockIP.TrimEx()));
 
                 _lockedItem.ruleSet = Utils.ToJson(_lockedRules, false);
 
                 ConfigHandler.SaveRoutingItem(ref _config, _lockedItem);
             }
         }
-        #endregion
+
+        #endregion locked
 
         #region Refresh Save
+
         public void RefreshRoutingItems()
         {
             _routingItems.Clear();
@@ -180,11 +198,13 @@ namespace v2rayN.ViewModels
                 _routingItems.Add(it);
             }
         }
+
         private void SaveRouting()
         {
             _config.routingBasicItem.domainStrategy = domainStrategy;
             _config.routingBasicItem.enableRoutingAdvanced = enableRoutingAdvanced;
             _config.routingBasicItem.domainMatcher = domainMatcher;
+            _config.routingBasicItem.domainStrategy4Singbox = domainStrategy4Singbox;
 
             EndBindingLockedData();
 
@@ -199,7 +219,7 @@ namespace v2rayN.ViewModels
             }
         }
 
-        #endregion
+        #endregion Refresh Save
 
         private void RoutingBasicImportRules()
         {
@@ -236,7 +256,7 @@ namespace v2rayN.ViewModels
             }
         }
 
-        private void RoutingAdvancedRemove()
+        public void RoutingAdvancedRemove()
         {
             if (SelectedSource is null || SelectedSource.remarks.IsNullOrEmpty())
             {
@@ -260,7 +280,7 @@ namespace v2rayN.ViewModels
             IsModified = true;
         }
 
-        private void RoutingAdvancedSetDefault()
+        public void RoutingAdvancedSetDefault()
         {
             var item = LazyConfig.Instance.GetRoutingItem(SelectedSource?.id);
             if (item is null)
@@ -275,6 +295,7 @@ namespace v2rayN.ViewModels
                 IsModified = true;
             }
         }
+
         private void RoutingAdvancedImportRules()
         {
             if (ConfigHandler.InitBuiltinRouting(ref _config, true) == 0)
@@ -284,4 +305,4 @@ namespace v2rayN.ViewModels
             }
         }
     }
-}
+}

v2rayN/v2rayN/ViewModels/SubEditViewModel.cs

@@ -21,7 +21,6 @@ namespace v2rayN.ViewModels
 
         public ReactiveCommand<Unit, Unit> SaveCmd { get; }
 
-
         public SubEditViewModel(SubItem subItem, Window view)
         {
             _config = LazyConfig.Instance.GetConfig();
@@ -44,10 +43,11 @@ namespace v2rayN.ViewModels
 
             Utils.SetDarkBorder(view, _config.uiItem.colorModeDark);
         }
+
         private void SaveSub()
         {
             string remarks = SelectedSource.remarks;
-            if (Utils.IsNullOrEmpty(remarks))
+            if (string.IsNullOrEmpty(remarks))
             {
                 UI.Show(ResUI.PleaseFillRemarks);
                 return;
@@ -68,6 +68,7 @@ namespace v2rayN.ViewModels
                 item.userAgent = SelectedSource.userAgent;
                 item.sort = SelectedSource.sort;
                 item.filter = SelectedSource.filter;
+                item.convertTarget = SelectedSource.convertTarget;
             }
 
             if (ConfigHandler.AddSubItem(ref _config, item) == 0)
@@ -82,4 +83,4 @@ namespace v2rayN.ViewModels
             }
         }
     }
-}
+}

v2rayN/v2rayN/ViewModels/SubSettingViewModel.cs

@@ -21,8 +21,10 @@ namespace v2rayN.ViewModels
 
         private IObservableCollection<SubItem> _subItems = new ObservableCollectionExtended<SubItem>();
         public IObservableCollection<SubItem> SubItems => _subItems;
+
         [Reactive]
         public SubItem SelectedSource { get; set; }
+
         public IList<SubItem> SelectedSources { get; set; }
 
         public ReactiveCommand<Unit, Unit> SubAddCmd { get; }
@@ -91,7 +93,6 @@ namespace v2rayN.ViewModels
                 RefreshSubItems();
                 IsModified = true;
             }
-
         }
 
         private void DeleteSub()
@@ -125,6 +126,5 @@ namespace v2rayN.ViewModels
 
             await DialogHost.Show(dialog, "SubDialog");
         }
-
     }
-}
+}

v2rayN/v2rayN/Views/AddServer2Window.xaml

@@ -150,7 +150,6 @@
                         Text="{x:Static resx:ResUI.TipDisplayLog}" />
                 </StackPanel>
 
-
                 <TextBlock
                     Grid.Row="5"
                     Grid.Column="0"
@@ -178,7 +177,6 @@
                         Text="{x:Static resx:ResUI.TipPreSocksPort}"
                         TextWrapping="Wrap" />
                 </StackPanel>
-
             </Grid>
 
             <Grid
@@ -204,9 +202,6 @@
                     IsCancel="true"
                     Style="{StaticResource DefButton}" />
             </Grid>
-
-
-
         </Grid>
     </ScrollViewer>
 </reactiveui:ReactiveWindow>

v2rayN/v2rayN/Views/AddServer2Window.xaml.cs

@@ -34,15 +34,14 @@ namespace v2rayN.Views
                 this.BindCommand(ViewModel, vm => vm.BrowseServerCmd, v => v.btnBrowse).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.EditServerCmd, v => v.btnEdit).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.SaveServerCmd, v => v.btnSave).DisposeWith(disposables);
-
             });
         }
 
-
         private void Window_Loaded(object sender, RoutedEventArgs e)
         {
             txtRemarks.Focus();
         }
+
         private void btnCancel_Click(object sender, System.Windows.RoutedEventArgs e)
         {
             if (ViewModel?.IsModified == true)
@@ -54,8 +53,5 @@ namespace v2rayN.Views
                 this.Close();
             }
         }
-
     }
-}
+}
-
-

v2rayN/v2rayN/Views/AddServerWindow.xaml

@@ -193,7 +193,6 @@
                     Width="200"
                     Margin="{StaticResource ServerItemMargin}"
                     Style="{StaticResource DefComboBox}" />
-
             </Grid>
             <Grid
                 x:Name="gridSs"
@@ -239,7 +238,6 @@
                     Width="300"
                     Margin="{StaticResource ServerItemMargin}"
                     Style="{StaticResource DefComboBox}" />
-
             </Grid>
             <Grid
                 x:Name="gridSocks"
@@ -285,7 +283,6 @@
                     Width="400"
                     Margin="{StaticResource ServerItemMargin}"
                     Style="{StaticResource DefTextBox}" />
-
             </Grid>
             <Grid
                 x:Name="gridVLESS"
@@ -523,7 +520,6 @@
                     VerticalAlignment="Center"
                     Style="{StaticResource ToolbarTextBlock}"
                     Text="{x:Static resx:ResUI.TbPath}" />
-
             </Grid>
 
             <Separator
@@ -732,8 +728,6 @@
                     Margin="{StaticResource ServerItemMargin}"
                     HorizontalAlignment="Left"
                     Style="{StaticResource DefTextBox}" />
-
-
             </Grid>
             <Separator
                 Grid.Row="8"
@@ -765,7 +759,6 @@
                     IsCancel="true"
                     Style="{StaticResource DefButton}" />
             </Grid>
-
         </Grid>
     </ScrollViewer>
-</reactiveui:ReactiveWindow>
+</reactiveui:ReactiveWindow>