Up 6.36

Fix the state ports conflicts when multiple `v2rayN` instances start in a short period.

.github/workflows/build.yml

@@ -0,0 +1,60 @@
+name: release
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        configuration: [Release]
+
+    runs-on: windows-latest 
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+
+    # - name: 删除工作流运行
+    #   uses: Mattraks/delete-workflow-runs@v2
+    #   with:
+    #     token: ${{ github.token }}
+    #     repository: ${{ github.repository }}
+    #     retain_days: 0
+    #     keep_minimum_runs: 1
+
+    - name: Build
+      run:  cd v2rayN && 
+        .\build.ps1
+        
+    # - name: Package
+    #   shell: pwsh
+    #   run: |
+    #     7z a -mx9 ..\v2rayN.7z $env:Wap_Project_Directory
+
+    - name: Upload build artifacts
+      uses: actions/upload-artifact@v4
+      with:
+        name: v2rayN
+        path: |
+          .\v2rayN\v2rayN.zip
+
+    # - name: Release
+    #   uses: softprops/action-gh-release@v1
+    #   env:
+    #       GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }}
+    #   with:
+    #     prerelease: ${{ contains(github.ref, '-') }}
+    #     draft: false
+    #     files: |
+    #         .\v2rayN\v2rayN.zip
+    #     body: |
+    #         [![](https://img.shields.io/badge/Telegram-Channel-blue)](https://t.me/netch_channel) [![](https://img.shields.io/badge/Telegram-Group-green)](https://t.me/netch_group)
+    #         ## Changelogs
+    #         * This is an automated deployment of GitHub Actions, the change log should be updated manually soon
+            
+    #         ## 更新日志
+    #         * 这是 GitHub Actions 自动化部署，更新日志应该很快会手动更新

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;
@@ -50,7 +49,7 @@ public class PacHandler
         _tcpListener = TcpListener.Create(_pacPort);
         _isRunning = true;
         _tcpListener.Start();
-        Task.Factory.StartNew(() =>
+        Task.Factory.StartNew(async () =>
         {
             while (_isRunning)
             {
@@ -58,25 +57,25 @@ public class PacHandler
                 {
                     if (!_tcpListener.Pending())
                     {
-                        Thread.Sleep(10);
+                        await Task.Delay(10);
                         continue;
                     }
 
                     var client = _tcpListener.AcceptTcpClient();
-                    Task.Run(() =>
-                    {
-                        var stream = client.GetStream();
-                        var sb = new StringBuilder();
-                        sb.AppendLine("HTTP/1.0 200 OK");
-                        sb.AppendLine("Content-type:application/x-ns-proxy-autoconfig");
-                        sb.AppendLine("Connection:close");
-                        sb.AppendLine("Content-Length:" + Encoding.UTF8.GetByteCount(_pacText));
-                        sb.AppendLine();
-                        sb.Append(_pacText);
-                        var content = Encoding.UTF8.GetBytes(sb.ToString());
-                        stream.Write(content, 0, content.Length);
-                        stream.Flush();
-                    });
+                    await Task.Run(() =>
+                      {
+                          var stream = client.GetStream();
+                          var sb = new StringBuilder();
+                          sb.AppendLine("HTTP/1.0 200 OK");
+                          sb.AppendLine("Content-type:application/x-ns-proxy-autoconfig");
+                          sb.AppendLine("Connection:close");
+                          sb.AppendLine("Content-Length:" + Encoding.UTF8.GetByteCount(_pacText));
+                          sb.AppendLine();
+                          sb.Append(_pacText);
+                          var content = Encoding.UTF8.GetBytes(sb.ToString());
+                          stream.Write(content, 0, content.Length);
+                          stream.Flush();
+                      });
                 }
                 catch (Exception e)
                 {

v2rayN/PacLib/PacLib.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 

v2rayN/PacLib/Resources/pac.txt

@@ -5982,7 +5982,8 @@ var rules = [
             "zyzc9.com",
             "zzcartoon.com",
             "zzcloud.me",
-            "zzux.com"
+            "zzux.com",
+            "chat.openai.com"
         ]
     ]
 ];

v2rayN/ProtosLib/ProtosLib.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>	  
   </PropertyGroup>
 	
@@ -9,9 +9,9 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Google.Protobuf" Version="3.22.3" />
-		<PackageReference Include="Grpc.Net.Client" Version="2.52.0" />
-		<PackageReference Include="Grpc.Tools" Version="2.53.0">
+		<PackageReference Include="Google.Protobuf" Version="3.25.2" />
+		<PackageReference Include="Grpc.Net.Client" Version="2.60.0" />
+		<PackageReference Include="Grpc.Tools" Version="2.61.0">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>

v2rayN/build.ps1

@@ -0,0 +1,39 @@
+param (
+	[Parameter()]
+	[ValidateNotNullOrEmpty()]
+	[string]
+	$OutputPath = '.\bin\v2rayN'
+)
+
+Write-Host 'Building'
+
+dotnet publish `
+	.\v2rayN\v2rayN.csproj `
+	-c Release `
+	--self-contained false `
+	-p:PublishReadyToRun=true `
+	-p:PublishSingleFile=true `
+	-o $OutputPath
+
+dotnet publish `
+	.\v2rayUpgrade\v2rayUpgrade.csproj `
+	-c Release `
+	--self-contained false `
+	-p:PublishReadyToRun=true `
+	-p:PublishSingleFile=true `
+	-o $OutputPath
+
+if ( -Not $? ) {
+	exit $lastExitCode
+	}
+
+if ( Test-Path -Path .\bin\v2rayN ) {
+    rm -Force "$OutputPath\*.pdb"
+    rm -Force "$OutputPath\*.xml"
+}
+
+Write-Host 'Build done'
+
+ls $OutputPath
+7z a  v2rayN.zip $OutputPath
+exit 0

v2rayN/v2rayN/App.xaml

@@ -11,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>
@@ -20,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"
@@ -32,6 +34,12 @@
                 Left="8"
                 Right="8"
                 Top="8" />
+            <Thickness
+                x:Key="OutlinedTextBoxDefaultPadding"
+                Bottom="12"
+                Left="16"
+                Right="12"
+                Top="12" />
             <Style
                 x:Key="ModuleTitle"
                 BasedOn="{StaticResource MaterialDesignTextBlock}"
@@ -127,6 +135,7 @@
                 BasedOn="{StaticResource MaterialDesignOutlinedTextBox}"
                 TargetType="{x:Type TextBox}">
                 <Setter Property="FontSize" Value="{DynamicResource StdFontSize}" />
+                <Setter Property="Padding" Value="{StaticResource OutlinedTextBoxDefaultPadding}" />
             </Style>
             <Style
                 x:Key="MyGroupBox"
@@ -140,6 +149,13 @@
                 TargetType="{x:Type ListBoxItem}">
                 <Setter Property="Margin" Value="-2,0" />
             </Style>
+            <Style
+                x:Key="MyOutlinedTextComboBox"
+                BasedOn="{StaticResource MaterialDesignOutlinedComboBox}"
+                TargetType="{x:Type ComboBox}">
+                <Setter Property="FontSize" Value="{DynamicResource StdFontSize}" />
+                <Setter Property="Padding" Value="{StaticResource OutlinedTextBoxDefaultPadding}" />
+            </Style>
         </ResourceDictionary>
     </Application.Resources>
 </Application>

v2rayN/v2rayN/App.xaml.cs

@@ -2,7 +2,6 @@
 using System.Windows.Threading;
 using v2rayN.Handler;
 using v2rayN.Mode;
-using v2rayN.Tool;
 
 namespace v2rayN
 {
@@ -28,10 +27,10 @@ namespace v2rayN
         /// <param name="e"></param>
         protected override void OnStartup(StartupEventArgs e)
         {
-            Global.ExePathKey = Utils.GetMD5(Utils.GetExePath());
+            var exePathKey = Utils.GetMD5(Utils.GetExePath());
 
             var rebootas = (e.Args ?? new string[] { }).Any(t => t == Global.RebootAs);
-            ProgramStarted = new EventWaitHandle(false, EventResetMode.AutoReset, Global.ExePathKey, out bool bCreatedNew);
+            ProgramStarted = new EventWaitHandle(false, EventResetMode.AutoReset, exePathKey, out bool bCreatedNew);
             if (!rebootas && !bCreatedNew)
             {
                 ProgramStarted.Set();
@@ -40,12 +39,10 @@ namespace v2rayN
                 return;
             }
 
-            Global.processJob = new Job();
-
             Logging.Setup();
             Init();
             Logging.LoggingEnabled(_config.guiItem.enableLog);
-            Utils.SaveLog($"v2rayN start up | {Utils.GetVersion()} | {Utils.GetExePath()}");
+            Logging.SaveLog($"v2rayN start up | {Utils.GetVersion()} | {Utils.GetExePath()}");
             Logging.ClearLogs();
 
             Thread.CurrentThread.CurrentUICulture = new(_config.uiItem.currentLanguage);
@@ -70,7 +67,7 @@ namespace v2rayN
 
         private void App_DispatcherUnhandledException(object sender, DispatcherUnhandledExceptionEventArgs e)
         {
-            Utils.SaveLog("App_DispatcherUnhandledException", e.Exception);
+            Logging.SaveLog("App_DispatcherUnhandledException", e.Exception);
             e.Handled = true;
         }
 
@@ -78,13 +75,13 @@ namespace v2rayN
         {
             if (e.ExceptionObject != null)
             {
-                Utils.SaveLog("CurrentDomain_UnhandledException", (Exception)e.ExceptionObject!);
+                Logging.SaveLog("CurrentDomain_UnhandledException", (Exception)e.ExceptionObject!);
             }
         }
 
         private void TaskScheduler_UnobservedTaskException(object? sender, UnobservedTaskExceptionEventArgs e)
         {
-            Utils.SaveLog("TaskScheduler_UnobservedTaskException", e.Exception);
+            Logging.SaveLog("TaskScheduler_UnobservedTaskException", e.Exception);
         }
     }
 }

v2rayN/v2rayN/Common/DownloaderHelper.cs

@@ -2,7 +2,7 @@
 using System.IO;
 using System.Net;
 
-namespace v2rayN.Base
+namespace v2rayN
 {
     internal class DownloaderHelper
     {
@@ -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;
@@ -63,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,
@@ -115,8 +111,9 @@ namespace v2rayN.Base
                 }
             };
             //progress.Report("......");
-
-            using var stream = await downloader.DownloadFileTaskAsync(address: url, cancellationToken: cancellationToken.Token);
+            using var cts = new CancellationTokenSource();
+            cts.CancelAfter(timeout * 1000);
+            using var stream = await downloader.DownloadFileTaskAsync(address: url, cts.Token);
 
             downloadOpt = null;
         }
@@ -136,9 +133,6 @@ namespace v2rayN.Base
                 File.Delete(fileName);
             }
 
-            var cancellationToken = new CancellationTokenSource();
-            cancellationToken.CancelAfter(timeout * 1000);
-
             var downloadOpt = new DownloadConfiguration()
             {
                 Timeout = timeout * 1000,
@@ -178,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/Common/FileManager.cs

@@ -2,7 +2,7 @@
 using System.IO.Compression;
 using System.Text;
 
-namespace v2rayN.Tool
+namespace v2rayN
 {
     public static class FileManager
     {
@@ -15,7 +15,7 @@ namespace v2rayN.Tool
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
             return false;
         }
@@ -30,7 +30,7 @@ namespace v2rayN.Tool
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
         }
 
@@ -49,7 +49,7 @@ namespace v2rayN.Tool
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 throw;
             }
         }
@@ -75,13 +75,13 @@ namespace v2rayN.Tool
                     }
                     catch (IOException ex)
                     {
-                        Utils.SaveLog(ex.Message, ex);
+                        Logging.SaveLog(ex.Message, ex);
                     }
                 }
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 return false;
             }
             return true;

v2rayN/v2rayN/Common/HttpClientHelper.cs

@@ -3,7 +3,7 @@ using System.Net.Http;
 using System.Net.Mime;
 using System.Text;
 
-namespace v2rayN.Base
+namespace v2rayN
 {
     /// <summary>
     /// </summary>
@@ -35,7 +35,7 @@ namespace v2rayN.Base
 
         public async Task PutAsync(string url, Dictionary<string, string> headers)
         {
-            var jsonContent = Utils.ToJson(headers);
+            var jsonContent = JsonUtils.Serialize(headers);
             var content = new StringContent(jsonContent, Encoding.UTF8, MediaTypeNames.Application.Json);
 
             var result = await httpClient.PutAsync(url, content);
@@ -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);

v2rayN/v2rayN/Common/Job.cs

@@ -52,7 +52,7 @@ namespace v2rayN
 
             if (!succ)
             {
-                Utils.SaveLog("Failed to call AssignProcessToJobObject! GetLastError=" + Marshal.GetLastWin32Error());
+                Logging.SaveLog("Failed to call AssignProcessToJobObject! GetLastError=" + Marshal.GetLastWin32Error());
             }
 
             return succ;

v2rayN/v2rayN/Common/JsonUtils.cs

@@ -0,0 +1,132 @@
+using System.IO;
+using System.Text.Json;
+using System.Text.Json.Nodes;
+using System.Text.Json.Serialization;
+
+namespace v2rayN
+{
+    internal class JsonUtils
+    {
+        /// <summary>
+        /// DeepCopy
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="obj"></param>
+        /// <returns></returns>
+        public static T DeepCopy<T>(T obj)
+        {
+            return Deserialize<T>(Serialize(obj, false))!;
+        }
+
+        /// <summary>
+        /// Deserialize to object
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="strJson"></param>
+        /// <returns></returns>
+        public static T? Deserialize<T>(string? strJson)
+        {
+            try
+            {
+                if (string.IsNullOrEmpty(strJson))
+                {
+                    return default;
+                }
+                return JsonSerializer.Deserialize<T>(strJson);
+            }
+            catch
+            {
+                return default;
+            }
+        }
+
+        /// <summary>
+        /// parse
+        /// </summary>
+        /// <param name="strJson"></param>
+        /// <returns></returns>
+        public static JsonNode? ParseJson(string strJson)
+        {
+            try
+            {
+                if (string.IsNullOrEmpty(strJson))
+                {
+                    return null;
+                }
+                return JsonNode.Parse(strJson);
+            }
+            catch
+            {
+                //SaveLog(ex.Message, ex);
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Serialize Object to Json string
+        /// </summary>
+        /// <param name="obj"></param>
+        /// <param name="indented"></param>
+        /// <returns></returns>
+        public static string Serialize(object? obj, bool indented = true)
+        {
+            string result = string.Empty;
+            try
+            {
+                if (obj == null)
+                {
+                    return result;
+                }
+                var options = new JsonSerializerOptions
+                {
+                    WriteIndented = indented ? true : false,
+                    DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
+                };
+                result = JsonSerializer.Serialize(obj, options);
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+            }
+            return result;
+        }
+
+        /// <summary>
+        /// SerializeToNode
+        /// </summary>
+        /// <param name="obj"></param>
+        /// <returns></returns>
+        public static JsonNode? SerializeToNode(object? obj) => JsonSerializer.SerializeToNode(obj);
+
+        /// <summary>
+        /// Save as json file
+        /// </summary>
+        /// <param name="obj"></param>
+        /// <param name="filePath"></param>
+        /// <param name="nullValue"></param>
+        /// <returns></returns>
+        public static int ToFile(object? obj, string filePath, bool nullValue = true)
+        {
+            int result;
+            try
+            {
+                using FileStream file = File.Create(filePath);
+
+                var options = new JsonSerializerOptions
+                {
+                    WriteIndented = true,
+                    DefaultIgnoreCondition = nullValue ? JsonIgnoreCondition.Never : JsonIgnoreCondition.WhenWritingNull
+                };
+
+                JsonSerializer.Serialize(file, obj, options);
+                result = 0;
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+                result = -1;
+            }
+            return result;
+        }
+    }
+}

v2rayN/v2rayN/Common/Logging.cs

@@ -3,7 +3,7 @@ using NLog.Config;
 using NLog.Targets;
 using System.IO;
 
-namespace v2rayN.Tool
+namespace v2rayN
 {
     public class Logging
     {
@@ -51,5 +51,28 @@ namespace v2rayN.Tool
                 catch { }
             });
         }
+
+        public static void SaveLog(string strContent)
+        {
+            if (LogManager.IsLoggingEnabled())
+            {
+                var logger = LogManager.GetLogger("Log1");
+                logger.Info(strContent);
+            }
+        }
+
+        public static void SaveLog(string strTitle, Exception ex)
+        {
+            if (LogManager.IsLoggingEnabled())
+            {
+                var logger = LogManager.GetLogger("Log2");
+                logger.Debug($"{strTitle},{ex.Message}");
+                logger.Debug(ex.StackTrace);
+                if (ex?.InnerException != null)
+                {
+                    logger.Error(ex.InnerException);
+                }
+            }
+        }
     }
 }

v2rayN/v2rayN/Common/QRCodeHelper.cs

@@ -2,15 +2,19 @@
 using QRCoder.Xaml;
 using System.Windows.Media;
 
-namespace v2rayN.Handler
+namespace v2rayN
 {
     /// <summary>
     /// 含有QR码的描述类和包装编码和渲染
     /// </summary>
     public class QRCodeHelper
     {
-        public static DrawingImage? GetQRCode(string strContent)
+        public static DrawingImage? GetQRCode(string? strContent)
         {
+            if (strContent is null)
+            {
+                return null;
+            }
             try
             {
                 QRCodeGenerator qrGenerator = new();

v2rayN/v2rayN/Common/QueryableExtension.cs

@@ -1,7 +1,7 @@
 using System.Linq.Expressions;
 using System.Reflection;
 
-namespace v2rayN.Tool
+namespace v2rayN
 {
     public static class QueryableExtension
     {

v2rayN/v2rayN/Common/SemanticVersion.cs

@@ -0,0 +1,180 @@
+namespace v2rayN
+{
+    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/Common/SqliteHelper.cs

@@ -1,7 +1,7 @@
 using SQLite;
 using System.Collections;
 
-namespace v2rayN.Base
+namespace v2rayN
 {
     public sealed class SqliteHelper
     {
@@ -11,10 +11,11 @@ namespace v2rayN.Base
         private SQLiteConnection _db;
         private SQLiteAsyncConnection _dbAsync;
         private static readonly object objLock = new();
+        public readonly string _configDB = "guiNDB.db";
 
         public SqliteHelper()
         {
-            _connstr = Utils.GetConfigPath(Global.ConfigDB);
+            _connstr = Utils.GetConfigPath(_configDB);
             _db = new SQLiteConnection(_connstr, false);
             _dbAsync = new SQLiteAsyncConnection(_connstr, false);
         }

v2rayN/v2rayN/Common/StringEx.cs

@@ -1,7 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
 
-namespace v2rayN.Base
+namespace v2rayN
 {
     internal static class StringEx
     {
@@ -46,5 +46,49 @@ 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;
+            }
+        }
+
+        public static string UpperFirstChar(this string value)
+        {
+            if (string.IsNullOrEmpty(value))
+            {
+                return string.Empty;
+            }
+
+            return char.ToUpper(value[0]) + value.Substring(1);
+        }
+
+        public static string AppendQuotes(this string value)
+        {
+            if (string.IsNullOrEmpty(value))
+            {
+                return string.Empty;
+            }
+
+            return $"\"{value}\"";
+        }
     }
 }

v2rayN/v2rayN/Common/UI.cs

@@ -1,4 +1,5 @@
-using System.Windows;
+using Microsoft.Win32;
+using System.Windows;
 
 namespace v2rayN
 {
@@ -20,5 +21,24 @@ namespace v2rayN
         {
             return MessageBox.Show(msg, caption, MessageBoxButton.YesNo, MessageBoxImage.Question);
         }
+
+        public static bool? OpenFileDialog(out string fileName, string filter)
+        {
+            fileName = string.Empty;
+
+            var fileDialog = new OpenFileDialog
+            {
+                Multiselect = false,
+                Filter = filter
+            };
+
+            if (fileDialog.ShowDialog() != true)
+            {
+                return false;
+            }
+            fileName = fileDialog.FileName;
+
+            return true;
+        }
     }
 }

v2rayN/v2rayN/Common/Utils.cs

@@ -1,8 +1,6 @@
 using Microsoft.Win32;
 using Microsoft.Win32.TaskScheduler;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using NLog;
+using System.Collections.Specialized;
 using System.Diagnostics;
 using System.Drawing;
 using System.IO;
@@ -12,18 +10,14 @@ using System.Net.NetworkInformation;
 using System.Net.Sockets;
 using System.Reflection;
 using System.Runtime.InteropServices;
-using System.Runtime.Serialization.Formatters.Binary;
 using System.Security.Cryptography;
 using System.Security.Principal;
 using System.Text;
 using System.Text.RegularExpressions;
-using System.Web;
 using System.Windows;
 using System.Windows.Interop;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
-using v2rayN.Base;
-using v2rayN.Mode;
 using ZXing;
 using ZXing.Common;
 using ZXing.QrCode;
@@ -54,7 +48,7 @@ namespace v2rayN
             }
             catch (Exception ex)
             {
-                SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
             return result;
         }
@@ -72,111 +66,11 @@ namespace v2rayN
             }
             catch (Exception ex)
             {
-                SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
             return null;
         }
 
-        /// <summary>
-        /// 反序列化成对象
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="strJson"></param>
-        /// <returns></returns>
-        public static T? FromJson<T>(string? strJson)
-        {
-            try
-            {
-                if (string.IsNullOrEmpty(strJson))
-                {
-                    return default;
-                }
-                return JsonConvert.DeserializeObject<T>(strJson);
-            }
-            catch
-            {
-                return default;
-            }
-        }
-
-        /// <summary>
-        /// 序列化成Json
-        /// </summary>
-        /// <param name="obj"></param>
-        /// <returns></returns>
-        public static string ToJson(object? obj, bool indented = true)
-        {
-            string result = string.Empty;
-            try
-            {
-                if (obj == null)
-                {
-                    return result;
-                }
-                if (indented)
-                {
-                    result = JsonConvert.SerializeObject(obj,
-                                           Formatting.Indented,
-                                           new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore });
-                }
-                else
-                {
-                    result = JsonConvert.SerializeObject(obj, new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore });
-                }
-            }
-            catch (Exception ex)
-            {
-                SaveLog(ex.Message, ex);
-            }
-            return result;
-        }
-
-        /// <summary>
-        /// 保存成json文件
-        /// </summary>
-        /// <param name="obj"></param>
-        /// <param name="filePath"></param>
-        /// <returns></returns>
-        public static int ToJsonFile(object? obj, string filePath, bool nullValue = true)
-        {
-            int result;
-            try
-            {
-                using StreamWriter file = File.CreateText(filePath);
-                JsonSerializer serializer;
-                if (nullValue)
-                {
-                    serializer = new JsonSerializer() { Formatting = Formatting.Indented };
-                }
-                else
-                {
-                    serializer = new JsonSerializer() { Formatting = Formatting.Indented, NullValueHandling = NullValueHandling.Ignore };
-                }
-
-                serializer.Serialize(file, obj);
-                result = 0;
-            }
-            catch (Exception ex)
-            {
-                SaveLog(ex.Message, ex);
-                result = -1;
-            }
-            return result;
-        }
-
-        public static JObject? ParseJson(string strJson)
-        {
-            try
-            {
-                return JObject.Parse(strJson);
-            }
-            catch (Exception ex)
-            {
-                //SaveLog(ex.Message, ex);
-                return null;
-            }
-        }
-
         #endregion 资源Json操作
 
         #region 转换函数
@@ -205,7 +99,7 @@ namespace v2rayN
             }
             catch (Exception ex)
             {
-                SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 return string.Empty;
             }
         }
@@ -224,7 +118,7 @@ namespace v2rayN
             }
             catch (Exception ex)
             {
-                SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 return new List<string>();
             }
         }
@@ -245,7 +139,7 @@ namespace v2rayN
             }
             catch (Exception ex)
             {
-                SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 return new List<string>();
             }
         }
@@ -264,7 +158,7 @@ namespace v2rayN
             }
             catch (Exception ex)
             {
-                SaveLog("Base64Encode", ex);
+                Logging.SaveLog("Base64Encode", ex);
                 return string.Empty;
             }
         }
@@ -278,7 +172,7 @@ namespace v2rayN
         {
             try
             {
-                plainText = plainText.TrimEx()
+                plainText = plainText.Trim()
                   .Replace(Environment.NewLine, "")
                   .Replace("\n", "")
                   .Replace("\r", "")
@@ -296,7 +190,7 @@ namespace v2rayN
             }
             catch (Exception ex)
             {
-                SaveLog("Base64Decode", ex);
+                Logging.SaveLog("Base64Decode", ex);
                 return string.Empty;
             }
         }
@@ -306,13 +200,13 @@ namespace v2rayN
         /// </summary>
         /// <param name="obj"></param>
         /// <returns></returns>
-        public static int ToInt(object obj)
+        public static int ToInt(object? obj)
         {
             try
             {
-                return Convert.ToInt32(obj);
+                return Convert.ToInt32(obj ?? string.Empty);
             }
-            catch (Exception ex)
+            catch //(Exception ex)
             {
                 //SaveLog(ex.Message, ex);
                 return 0;
@@ -325,7 +219,7 @@ namespace v2rayN
             {
                 return Convert.ToBoolean(obj);
             }
-            catch (Exception ex)
+            catch //(Exception ex)
             {
                 //SaveLog(ex.Message, ex);
                 return false;
@@ -338,7 +232,7 @@ namespace v2rayN
             {
                 return obj?.ToString() ?? string.Empty;
             }
-            catch (Exception ex)
+            catch// (Exception ex)
             {
                 //SaveLog(ex.Message, ex);
                 return string.Empty;
@@ -408,7 +302,33 @@ namespace v2rayN
 
         public static string UrlDecode(string url)
         {
-            return HttpUtility.UrlDecode(url);
+            return Uri.UnescapeDataString(url);
+            //return HttpUtility.UrlDecode(url);
+        }
+
+        public static NameValueCollection ParseQueryString(string query)
+        {
+            var result = new NameValueCollection(StringComparer.OrdinalIgnoreCase);
+            if (IsNullOrEmpty(query))
+            {
+                return result;
+            }
+
+            var parts = query[1..].Split(new[] { '&' }, StringSplitOptions.RemoveEmptyEntries);
+            foreach (var part in parts)
+            {
+                var keyValue = part.Split(['=']);
+                if (keyValue.Length != 2)
+                {
+                    continue;
+                }
+                var key = Uri.UnescapeDataString(keyValue[0]);
+                var val = Uri.UnescapeDataString(keyValue[1]);
+
+                result.Add(key, val);
+            }
+
+            return result;
         }
 
         public static string GetMD5(string str)
@@ -466,6 +386,15 @@ namespace v2rayN
             return Convert.TryFromBase64String(plainText, buffer, out int _);
         }
 
+        public static string Convert2Comma(string text)
+        {
+            if (string.IsNullOrWhiteSpace(text))
+            {
+                return text;
+            }
+            return text.Replace("，", ",").Replace(Environment.NewLine, ",");
+        }
+
         #endregion 转换函数
 
         #region 数据检查
@@ -484,7 +413,7 @@ namespace v2rayN
             }
             catch (Exception ex)
             {
-                SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 return false;
             }
         }
@@ -554,14 +483,7 @@ namespace v2rayN
                 return false;
             }
 
-            //清除要验证字符串中的空格
-            //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);
+            return Uri.CheckHostName(domain) == UriHostNameType.Dns;
         }
 
         /// <summary>
@@ -590,215 +512,6 @@ namespace v2rayN
 
         #endregion 数据检查
 
-        #region 开机自动启动
-
-        /// <summary>
-        /// 开机自动启动
-        /// </summary>
-        /// <param name="run"></param>
-        /// <returns></returns>
-        public static void SetAutoRun(bool run)
-        {
-            try
-            {
-                var autoRunName = $"{Global.AutoRunName}_{GetMD5(StartupPath())}";
-
-                //delete first
-                RegWriteValue(Global.AutoRunRegPath, autoRunName, "");
-                if (IsAdministrator())
-                {
-                    AutoStart(autoRunName, "", "");
-                }
-
-                if (run)
-                {
-                    string exePath = $"\"{GetExePath()}\"";
-                    if (IsAdministrator())
-                    {
-                        AutoStart(autoRunName, exePath, "");
-                    }
-                    else
-                    {
-                        RegWriteValue(Global.AutoRunRegPath, autoRunName, exePath);
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                SaveLog(ex.Message, ex);
-            }
-        }
-
-        /// <summary>
-        /// 是否已经设置开机自动启动
-        /// </summary>
-        /// <returns></returns>
-        public static bool IsAutoRun()
-        {
-            try
-            {
-                //clear
-                if (!RegReadValue(Global.AutoRunRegPath, Global.AutoRunName, "").IsNullOrEmpty())
-                {
-                    RegWriteValue(Global.AutoRunRegPath, Global.AutoRunName, "");
-                }
-
-                string value = RegReadValue(Global.AutoRunRegPath, Global.AutoRunName, "");
-                string exePath = GetExePath();
-                if (value == exePath || value == $"\"{exePath}\"")
-                {
-                    return true;
-                }
-            }
-            catch (Exception ex)
-            {
-                SaveLog(ex.Message, ex);
-            }
-            return false;
-        }
-
-        /// <summary>
-        /// 获取启动了应用程序的可执行文件的路径
-        /// </summary>
-        /// <returns></returns>
-        public static string GetPath(string fileName)
-        {
-            string startupPath = StartupPath();
-            if (IsNullOrEmpty(fileName))
-            {
-                return startupPath;
-            }
-            return Path.Combine(startupPath, fileName);
-        }
-
-        /// <summary>
-        /// 获取启动了应用程序的可执行文件的路径及文件名
-        /// </summary>
-        /// <returns></returns>
-        public static string GetExePath()
-        {
-            return Environment.ProcessPath;
-        }
-
-        public static string StartupPath()
-        {
-            return AppDomain.CurrentDomain.BaseDirectory;
-        }
-
-        public static string? RegReadValue(string path, string name, string def)
-        {
-            RegistryKey? regKey = null;
-            try
-            {
-                regKey = Registry.CurrentUser.OpenSubKey(path, false);
-                string? value = regKey?.GetValue(name) as string;
-                if (IsNullOrEmpty(value))
-                {
-                    return def;
-                }
-                else
-                {
-                    return value;
-                }
-            }
-            catch (Exception ex)
-            {
-                SaveLog(ex.Message, ex);
-            }
-            finally
-            {
-                regKey?.Close();
-            }
-            return def;
-        }
-
-        public static void RegWriteValue(string path, string name, object value)
-        {
-            RegistryKey? regKey = null;
-            try
-            {
-                regKey = Registry.CurrentUser.CreateSubKey(path);
-                if (IsNullOrEmpty(value.ToString()))
-                {
-                    regKey?.DeleteValue(name, false);
-                }
-                else
-                {
-                    regKey?.SetValue(name, value);
-                }
-            }
-            catch (Exception ex)
-            {
-                SaveLog(ex.Message, ex);
-            }
-            finally
-            {
-                regKey?.Close();
-            }
-        }
-
-        /// <summary>
-        /// 判断.Net Framework的Release是否符合
-        /// (.Net Framework 版本在4.0及以上)
-        /// </summary>
-        /// <param name="release">需要的版本4.6.2=394802;4.8=528040</param>
-        /// <returns></returns>
-        public static bool CheckForDotNetVersion(int release = 528040)
-        {
-            const string subkey = @"SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full\";
-            using RegistryKey? ndpKey = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry32).OpenSubKey(subkey);
-            if (ndpKey?.GetValue("Release") != null)
-            {
-                return (int)ndpKey.GetValue("Release") >= release;
-            }
-            return false;
-        }
-
-        /// <summary>
-        /// Auto Start via TaskService
-        /// </summary>
-        /// <param name="taskName"></param>
-        /// <param name="fileName"></param>
-        /// <param name="description"></param>
-        /// <exception cref="ArgumentNullException"></exception>
-        public static void AutoStart(string taskName, string fileName, string description)
-        {
-            if (string.IsNullOrEmpty(taskName))
-            {
-                return;
-            }
-            string TaskName = taskName;
-            var logonUser = WindowsIdentity.GetCurrent().Name;
-            string taskDescription = description;
-            string deamonFileName = fileName;
-
-            using var taskService = new TaskService();
-            var tasks = taskService.RootFolder.GetTasks(new Regex(TaskName));
-            foreach (var t in tasks)
-            {
-                taskService.RootFolder.DeleteTask(t.Name);
-            }
-            if (string.IsNullOrEmpty(fileName))
-            {
-                return;
-            }
-
-            var task = taskService.NewTask();
-            task.RegistrationInfo.Description = taskDescription;
-            task.Settings.DisallowStartIfOnBatteries = false;
-            task.Settings.StopIfGoingOnBatteries = false;
-            task.Settings.RunOnlyIfIdle = false;
-            task.Settings.IdleSettings.StopOnIdleEnd = false;
-            task.Settings.ExecutionTimeLimit = TimeSpan.Zero;
-            task.Triggers.Add(new LogonTrigger { UserId = logonUser, Delay = TimeSpan.FromSeconds(10) });
-            task.Principal.RunLevel = TaskRunLevel.Highest;
-            task.Actions.Add(new ExecAction(deamonFileName));
-
-            taskService.RootFolder.RegisterTaskDefinition(TaskName, task);
-        }
-
-        #endregion 开机自动启动
-
         #region 测速
 
         /// <summary>
@@ -858,11 +571,33 @@ namespace v2rayN
             }
             catch (Exception ex)
             {
-                SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
             return inUse;
         }
 
+        public static int GetFreePort()
+        {
+            try
+            {
+                int defaultPort = 9090;
+                if (!Utils.PortInUse(defaultPort))
+                {
+                    return defaultPort;
+                }
+
+                TcpListener l = new(IPAddress.Loopback, 0);
+                l.Start();
+                int port = ((IPEndPoint)l.LocalEndpoint).Port;
+                l.Stop();
+                return port;
+            }
+            catch
+            {
+            }
+            return 69090;
+        }
+
         #endregion 测速
 
         #region 杂项
@@ -879,41 +614,22 @@ namespace v2rayN
                 if (blFull)
                 {
                     return string.Format("v2rayN - V{0} - {1}",
-                            FileVersionInfo.GetVersionInfo(location).FileVersion.ToString(),
+                            FileVersionInfo.GetVersionInfo(location).FileVersion?.ToString(),
                             File.GetLastWriteTime(location).ToString("yyyy/MM/dd"));
                 }
                 else
                 {
                     return string.Format("v2rayN/{0}",
-                        FileVersionInfo.GetVersionInfo(location).FileVersion.ToString());
+                        FileVersionInfo.GetVersionInfo(location).FileVersion?.ToString());
                 }
             }
             catch (Exception ex)
             {
-                SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 return string.Empty;
             }
         }
 
-        /// <summary>
-        /// 深度拷贝
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="obj"></param>
-        /// <returns></returns>
-        public static T DeepCopy<T>(T obj)
-        {
-            object retval;
-            MemoryStream ms = new MemoryStream();
-            BinaryFormatter bf = new BinaryFormatter();
-            //序列化成流
-            bf.Serialize(ms, obj);
-            ms.Seek(0, SeekOrigin.Begin);
-            //反序列化成对象
-            retval = bf.Deserialize(ms);
-            return (T)retval;
-        }
-
         /// <summary>
         /// 获取剪贴板数
         /// </summary>
@@ -932,7 +648,7 @@ namespace v2rayN
             }
             catch (Exception ex)
             {
-                SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
             return strData;
         }
@@ -971,7 +687,7 @@ namespace v2rayN
             }
             catch (Exception ex)
             {
-                SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
             return string.Empty;
         }
@@ -991,7 +707,7 @@ namespace v2rayN
             }
             catch (Exception ex)
             {
-                SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 return false;
             }
         }
@@ -1031,7 +747,7 @@ namespace v2rayN
             }
             catch (Exception ex)
             {
-                SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
         }
 
@@ -1045,11 +761,76 @@ namespace v2rayN
             DwmSetWindowAttribute(hWnd, DWMWINDOWATTRIBUTE.DWMWA_USE_IMMERSIVE_DARK_MODE, ref attribute, attributeSize);
         }
 
+        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;
+        }
+
+        /// <summary>
+        /// 获取系统hosts
+        /// </summary>
+        /// <returns></returns>
+        public static Dictionary<string, string> GetSystemHosts()
+        {
+            var systemHosts = new Dictionary<string, string>();
+            var hostfile = @"C:\Windows\System32\drivers\etc\hosts";
+            try
+            {
+                if (File.Exists(hostfile))
+                {
+                    var hosts = File.ReadAllText(hostfile).Replace("\r", "");
+                    var hostsList = hosts.Split(new[] { '\n' }, StringSplitOptions.RemoveEmptyEntries);
+
+                    foreach (var host in hostsList)
+                    {
+                        if (host.StartsWith("#")) continue;
+                        var hostItem = host.Split(new[] { ' ', '\t' }, StringSplitOptions.RemoveEmptyEntries);
+                        if (hostItem.Length < 2) continue;
+                        systemHosts.Add(hostItem[1], hostItem[0]);
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+            }
+            return systemHosts;
+        }
+
         #endregion 杂项
 
         #region TempPath
 
-        // return path to store temporary files
+        /// <summary>
+        /// 获取启动了应用程序的可执行文件的路径
+        /// </summary>
+        /// <returns></returns>
+        public static string GetPath(string fileName)
+        {
+            string startupPath = StartupPath();
+            if (IsNullOrEmpty(fileName))
+            {
+                return startupPath;
+            }
+            return Path.Combine(startupPath, fileName);
+        }
+
+        /// <summary>
+        /// 获取启动了应用程序的可执行文件的路径及文件名
+        /// </summary>
+        /// <returns></returns>
+        public static string GetExePath()
+        {
+            return Environment.ProcessPath ?? string.Empty;
+        }
+
+        public static string StartupPath()
+        {
+            return AppDomain.CurrentDomain.BaseDirectory;
+        }
+
         public static string GetTempPath(string filename = "")
         {
             string _tempPath = Path.Combine(StartupPath(), "guiTemps");
@@ -1103,7 +884,7 @@ namespace v2rayN
             }
         }
 
-        public static string GetBinPath(string filename, ECoreType? coreType = null)
+        public static string GetBinPath(string filename, string? coreType = null)
         {
             string _tempPath = Path.Combine(StartupPath(), "bin");
             if (!Directory.Exists(_tempPath))
@@ -1164,33 +945,6 @@ namespace v2rayN
 
         #endregion TempPath
 
-        #region Log
-
-        public static void SaveLog(string strContent)
-        {
-            if (LogManager.IsLoggingEnabled())
-            {
-                var logger = LogManager.GetLogger("Log1");
-                logger.Info(strContent);
-            }
-        }
-
-        public static void SaveLog(string strTitle, Exception ex)
-        {
-            if (LogManager.IsLoggingEnabled())
-            {
-                var logger = LogManager.GetLogger("Log2");
-                logger.Debug($"{strTitle},{ex.Message}");
-                logger.Debug(ex.StackTrace);
-                if (ex?.InnerException != null)
-                {
-                    logger.Error(ex.InnerException);
-                }
-            }
-        }
-
-        #endregion Log
-
         #region scan screen
 
         public static string ScanScreen(float dpiX, float dpiY)
@@ -1236,7 +990,7 @@ namespace v2rayN
             }
             catch (Exception ex)
             {
-                SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
             return string.Empty;
         }
@@ -1251,6 +1005,171 @@ namespace v2rayN
 
         #endregion scan screen
 
+        #region 开机自动启动等
+
+        /// <summary>
+        /// 开机自动启动
+        /// </summary>
+        /// <param name="run"></param>
+        /// <returns></returns>
+        public static void SetAutoRun(string AutoRunRegPath, string AutoRunName, bool run)
+        {
+            try
+            {
+                var autoRunName = $"{AutoRunName}_{GetMD5(StartupPath())}";
+
+                //delete first
+                RegWriteValue(AutoRunRegPath, autoRunName, "");
+                if (IsAdministrator())
+                {
+                    AutoStart(autoRunName, "", "");
+                }
+
+                if (run)
+                {
+                    string exePath = $"\"{GetExePath()}\"";
+                    if (IsAdministrator())
+                    {
+                        AutoStart(autoRunName, exePath, "");
+                    }
+                    else
+                    {
+                        RegWriteValue(AutoRunRegPath, autoRunName, exePath);
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+            }
+        }
+
+        public static string? RegReadValue(string path, string name, string def)
+        {
+            RegistryKey? regKey = null;
+            try
+            {
+                regKey = Registry.CurrentUser.OpenSubKey(path, false);
+                string? value = regKey?.GetValue(name) as string;
+                if (IsNullOrEmpty(value))
+                {
+                    return def;
+                }
+                else
+                {
+                    return value;
+                }
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+            }
+            finally
+            {
+                regKey?.Close();
+            }
+            return def;
+        }
+
+        public static void RegWriteValue(string path, string name, object value)
+        {
+            RegistryKey? regKey = null;
+            try
+            {
+                regKey = Registry.CurrentUser.CreateSubKey(path);
+                if (IsNullOrEmpty(value.ToString()))
+                {
+                    regKey?.DeleteValue(name, false);
+                }
+                else
+                {
+                    regKey?.SetValue(name, value);
+                }
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+            }
+            finally
+            {
+                regKey?.Close();
+            }
+        }
+
+        /// <summary>
+        /// Auto Start via TaskService
+        /// </summary>
+        /// <param name="taskName"></param>
+        /// <param name="fileName"></param>
+        /// <param name="description"></param>
+        /// <exception cref="ArgumentNullException"></exception>
+        public static void AutoStart(string taskName, string fileName, string description)
+        {
+            if (string.IsNullOrEmpty(taskName))
+            {
+                return;
+            }
+            string TaskName = taskName;
+            var logonUser = WindowsIdentity.GetCurrent().Name;
+            string taskDescription = description;
+            string deamonFileName = fileName;
+
+            using var taskService = new TaskService();
+            var tasks = taskService.RootFolder.GetTasks(new Regex(TaskName));
+            foreach (var t in tasks)
+            {
+                taskService.RootFolder.DeleteTask(t.Name);
+            }
+            if (string.IsNullOrEmpty(fileName))
+            {
+                return;
+            }
+
+            var task = taskService.NewTask();
+            task.RegistrationInfo.Description = taskDescription;
+            task.Settings.DisallowStartIfOnBatteries = false;
+            task.Settings.StopIfGoingOnBatteries = false;
+            task.Settings.RunOnlyIfIdle = false;
+            task.Settings.IdleSettings.StopOnIdleEnd = false;
+            task.Settings.ExecutionTimeLimit = TimeSpan.Zero;
+            task.Triggers.Add(new LogonTrigger { UserId = logonUser, Delay = TimeSpan.FromSeconds(10) });
+            task.Principal.RunLevel = TaskRunLevel.Highest;
+            task.Actions.Add(new ExecAction(deamonFileName));
+
+            taskService.RootFolder.RegisterTaskDefinition(TaskName, task);
+        }
+
+        public static void RemoveTunDevice()
+        {
+            try
+            {
+                string pnputilPath = @"C:\Windows\System32\pnputil.exe";
+                string arg = $" /remove-device /deviceid \"wintun\"";
+
+                // Try to remove the device
+                Process proc = new()
+                {
+                    StartInfo = new()
+                    {
+                        FileName = pnputilPath,
+                        Arguments = arg,
+                        RedirectStandardOutput = true,
+                        UseShellExecute = false,
+                        CreateNoWindow = true
+                    }
+                };
+
+                proc.Start();
+                var output = proc.StandardOutput.ReadToEnd();
+                proc.WaitForExit();
+            }
+            catch
+            {
+            }
+        }
+
+        #endregion 开机自动启动等
+
         #region Windows API
 
         [Flags]

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,48 +1,59 @@
-namespace v2rayN
+using v2rayN.Mode;
+
+namespace v2rayN
 {
     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/";
+        public const string GithubUrl = "https://github.com";
+        public const string GithubApiUrl = "https://api.github.com/repos";
+        public const string V2rayWebsiteUrl = @"https://www.v2fly.org/";
         public const string AboutUrl = @"https://github.com/2dust/v2rayN";
         public const string UpdateUrl = AboutUrl + @"/releases";
-        public const string v2flyCoreUrl = "https://github.com/v2fly/v2ray-core/releases";
-        public const string xrayCoreUrl = "https://github.com/XTLS/Xray-core/releases";
+        public const string V2flyCoreUrl = "https://github.com/v2fly/v2ray-core/releases";
+        public const string XrayCoreUrl = "https://github.com/XTLS/Xray-core/releases";
         public const string SagerNetCoreUrl = "https://github.com/SagerNet/v2ray-core/releases";
         public const string NUrl = @"https://github.com/2dust/v2rayN/releases";
-        public const string clashCoreUrl = "https://github.com/Dreamacro/clash/releases";
-        public const string clashMetaCoreUrl = "https://github.com/MetaCubeX/Clash.Meta/releases";
-        public const string hysteriaCoreUrl = "https://github.com/apernet/hysteria/releases";
-        public const string naiveproxyCoreUrl = "https://github.com/klzgrad/naiveproxy/releases";
-        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 ClashCoreUrl = "https://github.com/Dreamacro/clash/releases";
+        public const string ClashMetaCoreUrl = "https://github.com/MetaCubeX/Clash.Meta/releases";
+        public const string MihomoCoreUrl = "https://github.com/MetaCubeX/mihomo/releases";
+        public const string HysteriaCoreUrl = "https://github.com/apernet/hysteria/releases";
+        public const string NaiveproxyCoreUrl = "https://github.com/klzgrad/naiveproxy/releases";
+        public const string TuicCoreUrl = "https://github.com/EAimTY/tuic/releases";
+        public const string SingboxCoreUrl = "https://github.com/SagerNet/sing-box/releases";
+        public const string GeoUrl = "https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/{0}.dat";
+        public const string SingboxGeoUrl = "https://github.com/soffchen/sing-{0}/releases/latest/download/{0}.db";
         public const string SpeedPingTestUrl = @"https://www.google.com/generate_204";
+        public const string JuicityCoreUrl = "https://github.com/juicity/juicity/releases";
         public const string CustomRoutingListUrl = @"https://raw.githubusercontent.com/2dust/v2rayCustomRoutingList/master/";
 
         public const string PromotionUrl = @"aHR0cHM6Ly85LjIzNDQ1Ni54eXovYWJjLmh0bWw=";
         public const string ConfigFileName = "guiNConfig.json";
-        public const string ConfigDB = "guiNDB.db";
-        public const string coreConfigFileName = "config.json";
-        public const string v2raySampleClient = "v2rayN.Sample.SampleClientConfig";
-        public const string v2raySampleServer = "v2rayN.Sample.SampleServerConfig";
-        public const string v2raySampleHttprequestFileName = "v2rayN.Sample.SampleHttprequest";
-        public const string v2raySampleHttpresponseFileName = "v2rayN.Sample.SampleHttpresponse";
+        public const string CoreConfigFileName = "config.json";
+        public const string CorePreConfigFileName = "configPre.json";
+        public const string CoreSpeedtestConfigFileName = "configSpeedtest.json";
+        public const string V2raySampleClient = "v2rayN.Sample.SampleClientConfig";
+        public const string SingboxSampleClient = "v2rayN.Sample.SingboxSampleClientConfig";
+        public const string V2raySampleHttprequestFileName = "v2rayN.Sample.SampleHttprequest";
+        public const string V2raySampleHttpresponseFileName = "v2rayN.Sample.SampleHttpresponse";
+        public const string V2raySampleInbound = "v2rayN.Sample.SampleInbound";
+        public const string V2raySampleOutbound = "v2rayN.Sample.SampleOutbound";
+        public const string SingboxSampleOutbound = "v2rayN.Sample.SingboxSampleOutbound";
         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 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";
         public const string TcpHeaderHttp = "http";
         public const string None = "none";
-        public const string agentTag = "proxy";
-        public const string directTag = "direct";
-        public const string blockTag = "block";
+        public const string ProxyTag = "proxy";
+        public const string DirectTag = "direct";
+        public const string BlockTag = "block";
         public const string StreamSecurity = "tls";
         public const string StreamSecurityReality = "reality";
         public const string InboundSocks = "socks";
@@ -52,21 +63,10 @@
         public const string Loopback = "127.0.0.1";
         public const string InboundAPITagName = "api";
         public const string InboundAPIProtocal = "dokodemo-door";
+        public const string HttpProtocol = "http://";
+        public const string HttpsProtocol = "https://";
 
-        public const string vmessProtocol = "vmess://";
-        public const string vmessProtocolLite = "vmess";
-        public const string ssProtocol = "ss://";
-        public const string ssProtocolLite = "shadowsocks";
-        public const string socksProtocol = "socks://";
-        public const string socksProtocolLite = "socks";
-        public const string httpProtocol = "http://";
-        public const string httpsProtocol = "https://";
-        public const string vlessProtocol = "vless://";
-        public const string vlessProtocolLite = "vless";
-        public const string trojanProtocol = "trojan://";
-        public const string trojanProtocolLite = "trojan";
-
-        public const string userEMail = "t@t.tt";
+        public const string UserEMail = "t@t.tt";
         public const string MyRegPath = "Software\\v2rayNGUI";
         public const string AutoRunRegPath = @"Software\Microsoft\Windows\CurrentVersion\Run";
         public const string AutoRunName = "v2rayNAutoRun";
@@ -111,11 +111,18 @@
             };
 
         public static readonly List<string> SpeedTestUrls = new() {
+            @"https://speed.cloudflare.com/__down?bytes=100000000",
+            @"https://speed.cloudflare.com/__down?bytes=10000000",
+            @"http://cachefly.cachefly.net/50mb.test",
             @"http://cachefly.cachefly.net/100mb.test",
             @"http://cachefly.cachefly.net/10mb.test"
         };
 
-        public static readonly Dictionary<string, string> userAgentTxt = new()
+        public static readonly List<string> SpeedPingTestUrls = new() {
+            @"https://www.google.com/generate_204",
+        };
+
+        public static readonly Dictionary<string, string> UserAgentTxts = new()
         {
             {"chrome","Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.131 Safari/537.36" },
             {"firefox","Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:90.0) Gecko/20100101 Firefox/90.0" },
@@ -124,40 +131,61 @@
             {"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" };
-        public static readonly List<string> coreTypes4VLESS = new() { "Xray" };
-        public static readonly List<string> domainStrategys = new() { "AsIs", "IPIfNonMatch", "IPOnDemand" };
-        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 const string Hysteria2ProtocolShare = "hy2://";
 
-        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" };
-        public static readonly List<string> alpns = new() { "h2", "http/1.1", "h2,http/1.1", "" };
-        public static readonly List<string> LogLevel = new() { "debug", "info", "warning", "error", "none" };
+        public static readonly Dictionary<EConfigType, string> ProtocolShares = new()
+        {
+            {EConfigType.VMess,"vmess://"},
+            {EConfigType.Shadowsocks,"ss://"},
+            {EConfigType.Socks,"socks://"},
+            {EConfigType.VLESS,"vless://"},
+            {EConfigType.Trojan,"trojan://"},
+            {EConfigType.Hysteria2,"hysteria2://"},
+            {EConfigType.Tuic,"tuic://"},
+            {EConfigType.Wireguard,"wireguard://"}
+        };
+
+        public static readonly Dictionary<EConfigType, string> ProtocolTypes = new()
+        {
+            {EConfigType.VMess,"vmess"},
+            {EConfigType.Shadowsocks,"shadowsocks"},
+            {EConfigType.Socks,"socks"},
+            {EConfigType.VLESS,"vless"},
+            {EConfigType.Trojan,"trojan"},
+            {EConfigType.Hysteria2,"hysteria2"},
+            {EConfigType.Tuic,"tuic"},
+            {EConfigType.Wireguard,"wireguard"}
+        };
+
+        public static readonly List<string> VmessSecuritys = new() { "aes-128-gcm", "chacha20-poly1305", "auto", "none", "zero" };
+        public static readonly List<string> SsSecuritys = new() { "aes-256-gcm", "aes-128-gcm", "chacha20-poly1305", "chacha20-ietf-poly1305", "none", "plain" };
+        public static readonly List<string> SsSecuritysInSagerNet = new() { "none", "2022-blake3-aes-128-gcm", "2022-blake3-aes-256-gcm", "2022-blake3-chacha20-poly1305", "aes-128-gcm", "aes-192-gcm", "aes-256-gcm", "chacha20-ietf-poly1305", "xchacha20-ietf-poly1305", "rc4", "rc4-md5", "aes-128-ctr", "aes-192-ctr", "aes-256-ctr", "aes-128-cfb", "aes-192-cfb", "aes-256-cfb", "aes-128-cfb8", "aes-192-cfb8", "aes-256-cfb8", "aes-128-ofb", "aes-192-ofb", "aes-256-ofb", "bf-cfb", "cast5-cfb", "des-cfb", "idea-cfb", "rc2-cfb", "seed-cfb", "camellia-128-cfb", "camellia-192-cfb", "camellia-256-cfb", "camellia-128-cfb8", "camellia-192-cfb8", "camellia-256-cfb8", "salsa20", "chacha20", "chacha20-ietf", "xchacha20" };
+        public static readonly List<string> SsSecuritysInXray = new() { "aes-256-gcm", "aes-128-gcm", "chacha20-poly1305", "chacha20-ietf-poly1305", "xchacha20-poly1305", "xchacha20-ietf-poly1305", "none", "plain", "2022-blake3-aes-128-gcm", "2022-blake3-aes-256-gcm", "2022-blake3-chacha20-poly1305" };
+        public static readonly List<string> SsSecuritysInSingbox = new() { "aes-256-gcm", "aes-192-gcm", "aes-128-gcm", "chacha20-ietf-poly1305", "xchacha20-ietf-poly1305", "none", "2022-blake3-aes-128-gcm", "2022-blake3-aes-256-gcm", "2022-blake3-chacha20-poly1305", "aes-128-ctr", "aes-192-ctr", "aes-256-ctr", "aes-128-cfb", "aes-192-cfb", "aes-256-cfb", "rc4-md5", "chacha20-ietf", "xchacha20" };
+        public static readonly List<string> 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", "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", "zh-Hant", "en", "fa-Ir", "ru" };
+        public static readonly List<string> Alpns = new() { "h3", "h2", "http/1.1", "h3,h2,http/1.1", "h3,h2", "h2,http/1.1", "" };
+        public static readonly List<string> LogLevels = new() { "debug", "info", "warning", "error", "none" };
         public static readonly List<string> InboundTags = new() { "socks", "http", "socks2", "http2" };
-        public static readonly List<string> Protocols = new() { "http", "tls", "bittorrent" };
-        public static readonly List<string> TunMtus = new() { "9000", "1500" };
+        public static readonly List<string> RuleProtocols = new() { "http", "tls", "bittorrent" };
+        public static readonly List<string> TunMtus = new() { "1280", "1408", "1500", "9000" };
         public static readonly List<string> TunStacks = new() { "gvisor", "system" };
         public static readonly List<string> PresetMsgFilters = new() { "proxy", "direct", "block", "" };
+        public static readonly List<string> SingboxMuxs = new() { "h2mux", "smux", "yamux", "" };
+        public static readonly List<string> TuicCongestionControls = new() { "cubic", "new_reno", "bbr" };
 
         #endregion const
-
-        #region global variable
-
-        public static int statePort { get; set; }
-        public static Job processJob { get; set; }
-        public static bool ShowInTaskbar { get; set; }
-        public static string ExePathKey { get; set; }
-
-        #endregion global variable
     }
 }

v2rayN/v2rayN/Handler/CoreConfigSingbox.cs

@@ -0,0 +1,963 @@
+using System.Net;
+using System.Net.NetworkInformation;
+using v2rayN.Mode;
+using v2rayN.Resx;
+
+namespace v2rayN.Handler
+{
+    internal class CoreConfigSingbox
+    {
+        private Config _config;
+
+        public CoreConfigSingbox(Config config)
+        {
+            _config = config;
+        }
+
+        public int GenerateClientConfigContent(ProfileItem node, out SingboxConfig? singboxConfig, out string msg)
+        {
+            singboxConfig = null;
+            try
+            {
+                if (node == null
+                    || node.port <= 0)
+                {
+                    msg = ResUI.CheckServerSettings;
+                    return -1;
+                }
+
+                msg = ResUI.InitialConfiguration;
+
+                string result = Utils.GetEmbedText(Global.SingboxSampleClient);
+                if (Utils.IsNullOrEmpty(result))
+                {
+                    msg = ResUI.FailedGetDefaultConfiguration;
+                    return -1;
+                }
+
+                singboxConfig = JsonUtils.Deserialize<SingboxConfig>(result);
+                if (singboxConfig == null)
+                {
+                    msg = ResUI.FailedGenDefaultConfiguration;
+                    return -1;
+                }
+
+                GenLog(singboxConfig);
+
+                GenInbounds(singboxConfig);
+
+                GenOutbound(node, singboxConfig.outbounds[0]);
+
+                GenMoreOutbounds(node, singboxConfig);
+
+                GenRouting(singboxConfig);
+
+                GenDns(node, singboxConfig);
+
+                GenStatistic(singboxConfig);
+
+                msg = string.Format(ResUI.SuccessfulConfiguration, "");
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog("GenerateClientConfig4Singbox", ex);
+                msg = ResUI.FailedGenDefaultConfiguration;
+                return -1;
+            }
+            return 0;
+        }
+
+        #region private gen function
+
+        private int GenLog(SingboxConfig singboxConfig)
+        {
+            try
+            {
+                switch (_config.coreBasicItem.loglevel)
+                {
+                    case "debug":
+                    case "info":
+                    case "error":
+                        singboxConfig.log.level = _config.coreBasicItem.loglevel;
+                        break;
+
+                    case "warning":
+                        singboxConfig.log.level = "warn";
+                        break;
+
+                    default:
+                        break;
+                }
+                if (_config.coreBasicItem.loglevel == "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)
+            {
+                Logging.SaveLog(ex.Message, ex);
+            }
+            return 0;
+        }
+
+        private int GenInbounds(SingboxConfig singboxConfig)
+        {
+            try
+            {
+                singboxConfig.inbounds.Clear();
+
+                if (!_config.tunModeItem.enableTun || (_config.tunModeItem.enableTun && _config.tunModeItem.enableExInbound))
+                {
+                    var inbound = new Inbound4Sbox()
+                    {
+                        type = Global.InboundSocks,
+                        tag = Global.InboundSocks,
+                        listen = Global.Loopback,
+                    };
+                    singboxConfig.inbounds.Add(inbound);
+
+                    inbound.listen_port = LazyConfig.Instance.GetLocalPort(Global.InboundSocks);
+                    inbound.sniff = _config.inbound[0].sniffingEnabled;
+                    inbound.sniff_override_destination = _config.inbound[0].routeOnly ? false : _config.inbound[0].sniffingEnabled;
+                    inbound.domain_strategy = Utils.IsNullOrEmpty(_config.routingBasicItem.domainStrategy4Singbox) ? null : _config.routingBasicItem.domainStrategy4Singbox;
+
+                    if (_config.routingBasicItem.enableRoutingAdvanced)
+                    {
+                        var routing = ConfigHandler.GetDefaultRouting(_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 = Utils.ToInt(Global.TunMtus[0]);
+                    }
+                    if (Utils.IsNullOrEmpty(_config.tunModeItem.stack))
+                    {
+                        _config.tunModeItem.stack = Global.TunStacks[0];
+                    }
+
+                    var tunInbound = JsonUtils.Deserialize<Inbound4Sbox>(Utils.GetEmbedText(Global.TunSingboxInboundFileName)) ?? new Inbound4Sbox { };
+                    tunInbound.mtu = _config.tunModeItem.mtu;
+                    tunInbound.strict_route = _config.tunModeItem.strictRoute;
+                    tunInbound.stack = _config.tunModeItem.stack;
+                    tunInbound.sniff = _config.inbound[0].sniffingEnabled;
+                    tunInbound.sniff_override_destination = _config.inbound[0].routeOnly ? false : _config.inbound[0].sniffingEnabled;
+                    if (_config.tunModeItem.enableIPv6Address == false)
+                    {
+                        tunInbound.inet6_address = null;
+                    }
+
+                    singboxConfig.inbounds.Add(tunInbound);
+                }
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+            }
+            return 0;
+        }
+
+        private Inbound4Sbox GetInbound(Inbound4Sbox inItem, string tag, int offset, bool bSocks)
+        {
+            var inbound = JsonUtils.DeepCopy(inItem);
+            inbound.tag = tag;
+            inbound.listen_port = inItem.listen_port + offset;
+            inbound.type = bSocks ? Global.InboundSocks : Global.InboundHttp;
+            return inbound;
+        }
+
+        private int GenOutbound(ProfileItem node, Outbound4Sbox outbound)
+        {
+            try
+            {
+                outbound.server = node.address;
+                outbound.server_port = node.port;
+
+                if (node.configType == EConfigType.VMess)
+                {
+                    outbound.type = Global.ProtocolTypes[EConfigType.VMess];
+
+                    outbound.uuid = node.id;
+                    outbound.alter_id = node.alterId;
+                    if (Global.VmessSecuritys.Contains(node.security))
+                    {
+                        outbound.security = node.security;
+                    }
+                    else
+                    {
+                        outbound.security = Global.DefaultSecurity;
+                    }
+
+                    GenOutboundMux(node, outbound);
+                }
+                else if (node.configType == EConfigType.Shadowsocks)
+                {
+                    outbound.type = Global.ProtocolTypes[EConfigType.Shadowsocks];
+
+                    outbound.method = LazyConfig.Instance.GetShadowsocksSecuritys(node).Contains(node.security) ? node.security : "none";
+                    outbound.password = node.id;
+
+                    GenOutboundMux(node, outbound);
+                }
+                else if (node.configType == EConfigType.Socks)
+                {
+                    outbound.type = Global.ProtocolTypes[EConfigType.Socks];
+
+                    outbound.version = "5";
+                    if (!Utils.IsNullOrEmpty(node.security)
+                      && !Utils.IsNullOrEmpty(node.id))
+                    {
+                        outbound.username = node.security;
+                        outbound.password = node.id;
+                    }
+                }
+                else if (node.configType == EConfigType.VLESS)
+                {
+                    outbound.type = Global.ProtocolTypes[EConfigType.VLESS];
+
+                    outbound.uuid = node.id;
+
+                    outbound.packet_encoding = "xudp";
+
+                    if (Utils.IsNullOrEmpty(node.flow))
+                    {
+                        GenOutboundMux(node, outbound);
+                    }
+                    else
+                    {
+                        outbound.flow = node.flow;
+                    }
+                }
+                else if (node.configType == EConfigType.Trojan)
+                {
+                    outbound.type = Global.ProtocolTypes[EConfigType.Trojan];
+
+                    outbound.password = node.id;
+
+                    GenOutboundMux(node, outbound);
+                }
+                else if (node.configType == EConfigType.Hysteria2)
+                {
+                    outbound.type = Global.ProtocolTypes[EConfigType.Hysteria2];
+
+                    outbound.password = node.id;
+
+                    if (!Utils.IsNullOrEmpty(node.path))
+                    {
+                        outbound.obfs = new()
+                        {
+                            type = "salamander",
+                            password = node.path.TrimEx(),
+                        };
+                    }
+
+                    outbound.up_mbps = _config.hysteriaItem.up_mbps > 0 ? _config.hysteriaItem.up_mbps : null;
+                    outbound.down_mbps = _config.hysteriaItem.down_mbps > 0 ? _config.hysteriaItem.down_mbps : null;
+                }
+                else if (node.configType == EConfigType.Tuic)
+                {
+                    outbound.type = Global.ProtocolTypes[EConfigType.Tuic];
+
+                    outbound.uuid = node.id;
+                    outbound.password = node.security;
+                    outbound.congestion_control = node.headerType;
+                }
+                else if (node.configType == EConfigType.Wireguard)
+                {
+                    outbound.type = Global.ProtocolTypes[EConfigType.Wireguard];
+
+                    outbound.private_key = node.id;
+                    outbound.peer_public_key = node.publicKey;
+                    outbound.reserved = Utils.String2List(node.path).Select(int.Parse).ToArray();
+                    outbound.local_address = [.. Utils.String2List(node.requestHost)];
+                    outbound.mtu = Utils.ToInt(node.shortId.IsNullOrEmpty() ? Global.TunMtus.FirstOrDefault() : node.shortId);
+                }
+
+                GenOutboundTls(node, outbound);
+
+                GenOutboundTransport(node, outbound);
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+            }
+            return 0;
+        }
+
+        private int GenOutboundMux(ProfileItem node, Outbound4Sbox outbound)
+        {
+            try
+            {
+                //if (_config.coreBasicItem.muxEnabled)
+                //{
+                //    var mux = new Multiplex4Sbox()
+                //    {
+                //        enabled = true,
+                //        protocol = _config.mux4SboxItem.protocol,
+                //        max_connections = _config.mux4SboxItem.max_connections,
+                //    };
+                //    outbound.multiplex = mux;
+                //}
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+            }
+            return 0;
+        }
+
+        private int GenOutboundTls(ProfileItem node, Outbound4Sbox outbound)
+        {
+            try
+            {
+                if (node.streamSecurity == Global.StreamSecurityReality || node.streamSecurity == Global.StreamSecurity)
+                {
+                    var server_name = string.Empty;
+                    if (!string.IsNullOrWhiteSpace(node.sni))
+                    {
+                        server_name = node.sni;
+                    }
+                    else if (!string.IsNullOrWhiteSpace(node.requestHost))
+                    {
+                        server_name = 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)
+            {
+                Logging.SaveLog(ex.Message, ex);
+            }
+            return 0;
+        }
+
+        private int GenOutboundTransport(ProfileItem node, Outbound4Sbox outbound)
+        {
+            try
+            {
+                var transport = new Transport4Sbox();
+
+                switch (node.GetNetwork())
+                {
+                    case "h2":
+                        transport.type = "http";
+                        transport.host = 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)
+            {
+                Logging.SaveLog(ex.Message, ex);
+            }
+            return 0;
+        }
+
+        private int GenMoreOutbounds(ProfileItem node, SingboxConfig singboxConfig)
+        {
+            if (node.subid.IsNullOrEmpty())
+            {
+                return 0;
+            }
+            try
+            {
+                var subItem = LazyConfig.Instance.GetSubItem(node.subid);
+                if (subItem is null)
+                {
+                    return 0;
+                }
+
+                //current proxy
+                var outbound = singboxConfig.outbounds[0];
+                var txtOutbound = Utils.GetEmbedText(Global.SingboxSampleOutbound);
+
+                //Previous proxy
+                var prevNode = LazyConfig.Instance.GetProfileItemViaRemarks(subItem.prevProfile!);
+                if (prevNode is not null
+                    && prevNode.configType != EConfigType.Custom)
+                {
+                    var prevOutbound = JsonUtils.Deserialize<Outbound4Sbox>(txtOutbound);
+                    GenOutbound(prevNode, prevOutbound);
+                    prevOutbound.tag = $"{Global.ProxyTag}2";
+                    singboxConfig.outbounds.Add(prevOutbound);
+
+                    outbound.detour = prevOutbound.tag;
+                }
+
+                //Next proxy
+                var nextNode = LazyConfig.Instance.GetProfileItemViaRemarks(subItem.nextProfile!);
+                if (nextNode is not null
+                    && nextNode.configType != EConfigType.Custom)
+                {
+                    var nextOutbound = JsonUtils.Deserialize<Outbound4Sbox>(txtOutbound);
+                    GenOutbound(nextNode, nextOutbound);
+                    nextOutbound.tag = Global.ProxyTag;
+                    singboxConfig.outbounds.Insert(0, nextOutbound);
+
+                    outbound.tag = $"{Global.ProxyTag}1";
+                    nextOutbound.detour = outbound.tag;
+                }
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+            }
+
+            return 0;
+        }
+
+        private int GenRouting(SingboxConfig singboxConfig)
+        {
+            try
+            {
+                if (_config.tunModeItem.enableTun)
+                {
+                    singboxConfig.route.auto_detect_interface = true;
+
+                    var tunRules = JsonUtils.Deserialize<List<Rule4Sbox>>(Utils.GetEmbedText(Global.TunSingboxRulesFileName));
+                    singboxConfig.route.rules.AddRange(tunRules);
+
+                    GenRoutingDirectExe(out List<string> lstDnsExe, out List<string> lstDirectExe);
+                    singboxConfig.route.rules.Add(new()
+                    {
+                        port = new() { 53 },
+                        outbound = "dns_out",
+                        process_name = lstDnsExe
+                    });
+
+                    singboxConfig.route.rules.Add(new()
+                    {
+                        outbound = "direct",
+                        process_name = lstDirectExe
+                    });
+                }
+
+                if (_config.routingBasicItem.enableRoutingAdvanced)
+                {
+                    var routing = ConfigHandler.GetDefaultRouting(_config);
+                    if (routing != null)
+                    {
+                        var rules = JsonUtils.Deserialize<List<RulesItem>>(routing.ruleSet);
+                        foreach (var item in rules!)
+                        {
+                            if (item.enabled)
+                            {
+                                GenRoutingUserRule(item, singboxConfig.route.rules);
+                            }
+                        }
+                    }
+                }
+                else
+                {
+                    var lockedItem = ConfigHandler.GetLockedRoutingItem(_config);
+                    if (lockedItem != null)
+                    {
+                        var rules = JsonUtils.Deserialize<List<RulesItem>>(lockedItem.ruleSet);
+                        foreach (var item in rules!)
+                        {
+                            GenRoutingUserRule(item, singboxConfig.route.rules);
+                        }
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+            }
+            return 0;
+        }
+
+        private void GenRoutingDirectExe(out List<string> lstDnsExe, out List<string> lstDirectExe)
+        {
+            lstDnsExe = new();
+            lstDirectExe = new();
+            var 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 GenRoutingUserRule(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 = JsonUtils.DeepCopy(rule);
+                var rule3 = JsonUtils.DeepCopy(rule);
+
+                var hasDomainIp = false;
+                if (item.domain?.Count > 0)
+                {
+                    foreach (var it in item.domain)
+                    {
+                        ParseV2Domain(it, rule);
+                    }
+                    rules.Add(rule);
+                    hasDomainIp = true;
+                }
+
+                if (item.ip?.Count > 0)
+                {
+                    foreach (var it in item.ip)
+                    {
+                        ParseV2Address(it, rule2);
+                    }
+                    rules.Add(rule2);
+                    hasDomainIp = true;
+                }
+
+                if (_config.tunModeItem.enableTun && item.process?.Count > 0)
+                {
+                    rule3.process_name = item.process;
+                    rules.Add(rule3);
+                    hasDomainIp = true;
+                }
+
+                if (!hasDomainIp)
+                {
+                    rules.Add(rule);
+                }
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+            }
+            return 0;
+        }
+
+        private void ParseV2Domain(string domain, Rule4Sbox rule)
+        {
+            if (domain.StartsWith("#") || domain.StartsWith("ext:") || domain.StartsWith("ext-domain:"))
+            {
+                return;
+            }
+            else if (domain.StartsWith("geosite:"))
+            {
+                rule.geosite ??= [];
+                rule.geosite?.Add(domain.Substring(8));
+            }
+            else if (domain.StartsWith("regexp:"))
+            {
+                rule.domain_regex ??= [];
+                rule.domain_regex?.Add(domain.Replace(Global.RoutingRuleComma, ",").Substring(7));
+            }
+            else if (domain.StartsWith("domain:"))
+            {
+                rule.domain ??= [];
+                rule.domain_suffix ??= [];
+                rule.domain?.Add(domain.Substring(7));
+                rule.domain_suffix?.Add("." + domain.Substring(7));
+            }
+            else if (domain.StartsWith("full:"))
+            {
+                rule.domain ??= [];
+                rule.domain?.Add(domain.Substring(5));
+            }
+            else if (domain.StartsWith("keyword:"))
+            {
+                rule.domain_keyword ??= [];
+                rule.domain_keyword?.Add(domain.Substring(8));
+            }
+            else
+            {
+                rule.domain_keyword ??= [];
+                rule.domain_keyword?.Add(domain);
+            }
+        }
+
+        private void ParseV2Address(string address, Rule4Sbox rule)
+        {
+            if (address.StartsWith("ext:") || address.StartsWith("ext-ip:"))
+            {
+                return;
+            }
+            else if (address.StartsWith("geoip:!"))
+            {
+                return;
+            }
+            else if (address.StartsWith("geoip:"))
+            {
+                if (rule.geoip is null) { rule.geoip = new(); }
+                rule.geoip?.Add(address.Substring(6));
+            }
+            else
+            {
+                if (rule.ip_cidr is null) { rule.ip_cidr = new(); }
+                rule.ip_cidr?.Add(address);
+            }
+        }
+
+        private int GenDns(ProfileItem node, SingboxConfig singboxConfig)
+        {
+            try
+            {
+                Dns4Sbox? dns4Sbox;
+                if (_config.tunModeItem.enableTun)
+                {
+                    var item = LazyConfig.Instance.GetDNSItem(ECoreType.sing_box);
+                    var tunDNS = item?.tunDNS;
+                    if (string.IsNullOrWhiteSpace(tunDNS))
+                    {
+                        tunDNS = Utils.GetEmbedText(Global.TunSingboxDNSFileName);
+                    }
+                    dns4Sbox = JsonUtils.Deserialize<Dns4Sbox>(tunDNS);
+                }
+                else
+                {
+                    var item = LazyConfig.Instance.GetDNSItem(ECoreType.sing_box);
+                    var normalDNS = item?.normalDNS;
+                    if (string.IsNullOrWhiteSpace(normalDNS))
+                    {
+                        normalDNS = "{\"servers\":[{\"address\":\"tcp://8.8.8.8\"}]}";
+                    }
+
+                    dns4Sbox = JsonUtils.Deserialize<Dns4Sbox>(normalDNS);
+                }
+                if (dns4Sbox is null)
+                {
+                    return 0;
+                }
+                //Add the dns of the remote server domain
+                if (dns4Sbox.rules is null)
+                {
+                    dns4Sbox.rules = new();
+                }
+                dns4Sbox.servers.Add(new()
+                {
+                    tag = "local_local",
+                    address = "223.5.5.5",
+                    detour = "direct"
+                });
+                dns4Sbox.rules.Add(new()
+                {
+                    server = "local_local",
+                    outbound = "any"
+                });
+
+                singboxConfig.dns = dns4Sbox;
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+            }
+            return 0;
+        }
+
+        private int GenStatistic(SingboxConfig singboxConfig)
+        {
+            if (_config.guiItem.enableStatistics)
+            {
+                singboxConfig.experimental = new Experimental4Sbox()
+                {
+                    //cache_file = new CacheFile4Sbox()
+                    //{
+                    //    enabled = true
+                    //},
+                    //v2ray_api = new V2ray_Api4Sbox()
+                    //{
+                    //    listen = $"{Global.Loopback}:{Global.StatePort}",
+                    //    stats = new Stats4Sbox()
+                    //    {
+                    //        enabled = true,
+                    //    }
+                    //},
+                    clash_api = new Clash_Api4Sbox()
+                    {
+                        external_controller = $"{Global.Loopback}:{LazyConfig.Instance.StatePort}",
+                    }
+                };
+            }
+            return 0;
+        }
+
+        #endregion private gen function
+
+        #region Gen speedtest config
+
+        public int GenerateClientSpeedtestConfig(List<ServerTestItem> selecteds, out SingboxConfig? singboxConfig, out string msg)
+        {
+            singboxConfig = null;
+            try
+            {
+                if (_config == null)
+                {
+                    msg = ResUI.CheckServerSettings;
+                    return -1;
+                }
+
+                msg = ResUI.InitialConfiguration;
+
+                string result = Utils.GetEmbedText(Global.SingboxSampleClient);
+                string txtOutbound = Utils.GetEmbedText(Global.SingboxSampleOutbound);
+                if (Utils.IsNullOrEmpty(result) || txtOutbound.IsNullOrEmpty())
+                {
+                    msg = ResUI.FailedGetDefaultConfiguration;
+                    return -1;
+                }
+
+                singboxConfig = JsonUtils.Deserialize<SingboxConfig>(result);
+                if (singboxConfig == null)
+                {
+                    msg = ResUI.FailedGenDefaultConfiguration;
+                    return -1;
+                }
+                List<IPEndPoint> lstIpEndPoints = new();
+                List<TcpConnectionInformation> lstTcpConns = new();
+                try
+                {
+                    lstIpEndPoints.AddRange(IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpListeners());
+                    lstIpEndPoints.AddRange(IPGlobalProperties.GetIPGlobalProperties().GetActiveUdpListeners());
+                    lstTcpConns.AddRange(IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpConnections());
+                }
+                catch (Exception ex)
+                {
+                    Logging.SaveLog(ex.Message, ex);
+                }
+
+                GenLog(singboxConfig);
+                GenDns(new(), singboxConfig);
+                singboxConfig.inbounds.Clear(); // Remove "proxy" service for speedtest, avoiding port conflicts.
+                singboxConfig.outbounds.RemoveAt(0);
+
+                int httpPort = LazyConfig.Instance.GetLocalPort("speedtest");
+
+                foreach (var it in selecteds)
+                {
+                    if (it.configType == EConfigType.Custom)
+                    {
+                        continue;
+                    }
+                    if (it.port <= 0)
+                    {
+                        continue;
+                    }
+                    if (it.configType is EConfigType.VMess or EConfigType.VLESS)
+                    {
+                        var item2 = LazyConfig.Instance.GetProfileItem(it.indexId);
+                        if (item2 is null || 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
+                    Inbound4Sbox inbound = new()
+                    {
+                        listen = Global.Loopback,
+                        listen_port = port,
+                        type = Global.InboundHttp
+                    };
+                    inbound.tag = Global.InboundHttp + inbound.listen_port.ToString();
+                    singboxConfig.inbounds.Add(inbound);
+
+                    //outbound
+                    var item = LazyConfig.Instance.GetProfileItem(it.indexId);
+                    if (item is null)
+                    {
+                        continue;
+                    }
+                    if (item.configType == EConfigType.Shadowsocks
+                        && !Global.SsSecuritysInSingbox.Contains(item.security))
+                    {
+                        continue;
+                    }
+                    if (item.configType == EConfigType.VLESS
+                     && !Global.Flows.Contains(item.flow))
+                    {
+                        continue;
+                    }
+
+                    var outbound = JsonUtils.Deserialize<Outbound4Sbox>(txtOutbound);
+                    GenOutbound(item, outbound);
+                    outbound.tag = Global.ProxyTag + inbound.listen_port.ToString();
+                    singboxConfig.outbounds.Add(outbound);
+
+                    //rule
+                    Rule4Sbox rule = new()
+                    {
+                        inbound = new List<string> { inbound.tag },
+                        outbound = outbound.tag
+                    };
+                    singboxConfig.route.rules.Add(rule);
+                }
+
+                //msg = string.Format(ResUI.SuccessfulConfiguration"), node.getSummary());
+                return 0;
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+                msg = ResUI.FailedGenDefaultConfiguration;
+                return -1;
+            }
+        }
+
+        #endregion Gen speedtest config
+    }
+}

v2rayN/v2rayN/Handler/CoreHandler.cs

@@ -1,5 +1,6 @@
 using System.Diagnostics;
 using System.IO;
+using System.Reactive.Linq;
 using System.Text;
 using v2rayN.Mode;
 using v2rayN.Resx;
@@ -11,35 +12,30 @@ namespace v2rayN.Handler
     /// </summary>
     internal class CoreHandler
     {
-        private static string _coreCConfigRes = Global.coreConfigFileName;
-        private CoreInfo? _coreInfo;
-        private int _processId = 0;
+        private Config _config;
         private Process? _process;
+        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(_config);
             if (node == null)
             {
                 ShowMsg(false, ResUI.CheckServerSettings);
                 return;
             }
 
-            if (SetCore(config, node) != 0)
-            {
-                ShowMsg(false, ResUI.CheckServerSettings);
-                return;
-            }
-            string fileName = Utils.GetConfigPath(_coreCConfigRes);
+            string fileName = Utils.GetConfigPath(Global.CoreConfigFileName);
             if (CoreConfigHandler.GenerateClientConfig(node, fileName, out string msg, out string content) != 0)
             {
                 ShowMsg(false, msg);
@@ -49,37 +45,47 @@ namespace v2rayN.Handler
                 ShowMsg(false, msg);
                 ShowMsg(true, $"{node.GetSummary()}");
                 CoreStop();
-                CoreStart(node);
-            }
+                if (_config.tunModeItem.enableTun)
+                {
+                    Thread.Sleep(1000);
+                    Utils.RemoveTunDevice();
+                }
 
-            //start a socks service
-            if (_process != null && !_process.HasExited && node.configType == EConfigType.Custom && node.preSocksPort > 0)
-            {
-                var itemSocks = new ProfileItem()
+                CoreStart(node);
+
+                //In tun mode, do a delay check and restart the core
+                if (_config.tunModeItem.enableTun)
                 {
-                    configType = EConfigType.Socks,
-                    address = Global.Loopback,
-                    port = node.preSocksPort
-                };
-                if (CoreConfigHandler.GenerateClientConfig(itemSocks, null, out string msg2, out string configStr) == 0)
-                {
-                    _processId = CoreStartViaString(configStr);
+                    Observable.Range(1, 1)
+                    .Delay(TimeSpan.FromSeconds(15))
+                    .Subscribe(x =>
+                    {
+                        {
+                            if (_process == null || _process.HasExited)
+                            {
+                                CoreStart(node);
+                                ShowMsg(false, "Tun mode restart the core once");
+                                Logging.SaveLog("Tun mode restart the core once");
+                            }
+                        }
+                    });
                 }
             }
         }
 
-        public int LoadCoreConfigString(Config config, List<ServerTestItem> _selecteds)
+        public int LoadCoreConfigSpeedtest(List<ServerTestItem> selecteds)
         {
             int pid = -1;
-            string configStr = CoreConfigHandler.GenerateClientSpeedtestConfigString(config, _selecteds, out string msg);
-            if (configStr == "")
+            var coreType = selecteds.Exists(t => t.configType == EConfigType.Hysteria2 || t.configType == EConfigType.Tuic || t.configType == EConfigType.Wireguard) ? ECoreType.sing_box : ECoreType.Xray;
+            string configPath = Utils.GetConfigPath(Global.CoreSpeedtestConfigFileName);
+            if (CoreConfigHandler.GenerateClientSpeedtestConfig(_config, configPath, selecteds, coreType, out string msg) != 0)
             {
                 ShowMsg(false, msg);
             }
             else
             {
                 ShowMsg(false, msg);
-                pid = CoreStartViaString(configStr);
+                pid = CoreStartSpeedtest(configPath, coreType);
             }
             return pid;
         }
@@ -88,41 +94,50 @@ 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;
-                    }
-                    foreach (string vName in _coreInfo.coreExes)
-                    {
-                        Process[] existing = Process.GetProcessesByName(vName);
-                        foreach (Process p in existing)
+                        if (it.coreType == ECoreType.v2rayN)
                         {
-                            string? path = p.MainModule?.FileName;
-                            if (path == $"{Utils.GetBinPath(vName, _coreInfo.coreType)}.exe")
+                            continue;
+                        }
+                        foreach (string vName in it.coreExes)
+                        {
+                            var existing = Process.GetProcessesByName(vName);
+                            foreach (Process p in existing)
                             {
-                                KillProcess(p);
+                                string? path = p.MainModule?.FileName;
+                                if (path == $"{Utils.GetBinPath(vName, it.coreType.ToString())}.exe")
+                                {
+                                    KillProcess(p);
+                                }
                             }
                         }
                     }
                 }
-
-                if (_processId > 0)
-                {
-                    CoreStopPid(_processId);
-                    _processId = 0;
-                }
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
         }
 
@@ -130,22 +145,24 @@ namespace v2rayN.Handler
         {
             try
             {
-                Process _p = Process.GetProcessById(pid);
+                var _p = Process.GetProcessById(pid);
                 KillProcess(_p);
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
         }
 
-        private string CoreFindexe(CoreInfo coreInfo)
+        #region Private
+
+        private string CoreFindExe(CoreInfo coreInfo)
         {
             string fileName = string.Empty;
             foreach (string name in coreInfo.coreExes)
             {
                 string vName = $"{name}.exe";
-                vName = Utils.GetBinPath(vName, coreInfo.coreType);
+                vName = Utils.GetBinPath(vName, coreInfo.coreType.ToString());
                 if (File.Exists(vName))
                 {
                     fileName = vName;
@@ -154,8 +171,8 @@ namespace v2rayN.Handler
             }
             if (Utils.IsNullOrEmpty(fileName))
             {
-                string msg = string.Format(ResUI.NotFoundCore, Utils.GetBinPath("", coreInfo.coreType), string.Join(", ", coreInfo.coreExes.ToArray()), coreInfo.coreUrl);
-                Utils.SaveLog(msg);
+                string msg = string.Format(ResUI.NotFoundCore, Utils.GetBinPath("", coreInfo.coreType.ToString()), string.Join(", ", coreInfo.coreExes.ToArray()), coreInfo.coreUrl);
+                Logging.SaveLog(msg);
                 ShowMsg(false, msg);
             }
             return fileName;
@@ -163,132 +180,73 @@ namespace v2rayN.Handler
 
         private void CoreStart(ProfileItem node)
         {
-            ShowMsg(false, string.Format(ResUI.StartService, DateTime.Now.ToString()));
+            ShowMsg(false, $"{Environment.OSVersion} - {(Environment.Is64BitOperatingSystem ? 64 : 32)}");
+            ShowMsg(false, string.Format(ResUI.StartService, DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss")));
 
-            try
+            ECoreType coreType;
+            if (node.configType != EConfigType.Custom && _config.tunModeItem.enableTun)
             {
-                string fileName = CoreFindexe(_coreInfo);
-                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.ErrorDataReceived += (sender, e) =>
-                    {
-                        if (!string.IsNullOrEmpty(e.Data))
-                        {
-                            string msg = e.Data + Environment.NewLine;
-                            ShowMsg(false, msg);
-                        }
-                    };
-                }
-                p.Start();
-                if (displayLog)
-                {
-                    p.BeginOutputReadLine();
-                    p.BeginErrorReadLine();
-                }
-                _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);
+                coreType = ECoreType.sing_box;
             }
-            catch (Exception ex)
+            else
             {
-                //Utils.SaveLog(Utils.ToJson(node));
-                Utils.SaveLog(ex.Message, ex);
-                string msg = ex.Message;
-                ShowMsg(true, msg);
+                coreType = LazyConfig.Instance.GetCoreType(node, node.configType);
+            }
+            var coreInfo = LazyConfig.Instance.GetCoreInfo(coreType);
+
+            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;
+                        }
+                    }
+                }
             }
         }
 
-        private int CoreStartViaString(string configStr)
+        private int CoreStartSpeedtest(string configPath, ECoreType coreType)
         {
-            ShowMsg(false, string.Format(ResUI.StartService, DateTime.Now.ToString()));
+            ShowMsg(false, string.Format(ResUI.StartService, DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss")));
 
+            ShowMsg(false, configPath);
             try
             {
-                var coreInfo = LazyConfig.Instance.GetCoreInfo(ECoreType.Xray);
-                string fileName = CoreFindexe(coreInfo);
-                if (fileName == "") return -1;
-
-                Process p = new()
+                var coreInfo = LazyConfig.Instance.GetCoreInfo(coreType);
+                var proc = RunProcess(new(), coreInfo, $" -c {Global.CoreSpeedtestConfigFileName}", true, ShowMsg);
+                if (proc is null)
                 {
-                    StartInfo = new ProcessStartInfo
-                    {
-                        FileName = fileName,
-                        Arguments = "-config stdin:",
-                        WorkingDirectory = Utils.GetConfigPath(),
-                        UseShellExecute = false,
-                        RedirectStandardInput = true,
-                        RedirectStandardOutput = true,
-                        RedirectStandardError = true,
-                        CreateNoWindow = true,
-                        StandardOutputEncoding = Encoding.UTF8,
-                        StandardErrorEncoding = Encoding.UTF8
-                    }
-                };
-                p.OutputDataReceived += (sender, e) =>
-                {
-                    if (!String.IsNullOrEmpty(e.Data))
-                    {
-                        string msg = e.Data + Environment.NewLine;
-                        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();
-
-                if (p.WaitForExit(1000))
-                {
-                    throw new Exception(p.StandardError.ReadToEnd());
+                    return -1;
                 }
 
-                Global.processJob.AddProcess(p.Handle);
-                return p.Id;
+                return proc.Id;
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 string msg = ex.Message;
                 ShowMsg(false, msg);
                 return -1;
@@ -300,39 +258,111 @@ namespace v2rayN.Handler
             _updateFunc(updateToTrayTooltip, msg);
         }
 
-        private void KillProcess(Process p)
+        #endregion Private
+
+        #region Process
+
+        private Process? RunProcess(ProfileItem node, CoreInfo coreInfo, string configPath, bool displayLog, Action<bool, string> update)
         {
             try
             {
-                p.CloseMainWindow();
-                p.WaitForExit(100);
-                if (!p.HasExited)
+                string fileName = CoreFindExe(coreInfo);
+                if (Utils.IsNullOrEmpty(fileName))
                 {
-                    p.Kill();
-                    p.WaitForExit(100);
+                    return null;
+                }
+                Process proc = new()
+                {
+                    StartInfo = new()
+                    {
+                        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,
+                    }
+                };
+                var startUpErrorMessage = new StringBuilder();
+                var startUpSuccessful = false;
+                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);
+
+                            if (!startUpSuccessful)
+                            {
+                                startUpErrorMessage.Append(msg);
+                            }
+                        }
+                    };
+                }
+                proc.Start();
+                if (displayLog)
+                {
+                    proc.BeginOutputReadLine();
+                    proc.BeginErrorReadLine();
+                }
+
+                if (proc.WaitForExit(1000))
+                {
+                    proc.CancelErrorRead();
+                    throw new Exception(displayLog ? startUpErrorMessage.ToString() : "启动进程失败并退出 (Failed to start the process and exited)");
+                }
+                else
+                {
+                    startUpSuccessful = true;
+                }
+
+                LazyConfig.Instance.AddProcess(proc.Handle);
+                return proc;
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+                string msg = ex.Message;
+                update(true, msg);
+                return null;
+            }
+        }
+
+        private void KillProcess(Process? proc)
+        {
+            if (proc is null)
+            {
+                return;
+            }
+            try
+            {
+                proc.CloseMainWindow();
+                proc.WaitForExit(100);
+                if (!proc.HasExited)
+                {
+                    proc.Kill();
+                    proc.WaitForExit(100);
                 }
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
         }
 
-        private int SetCore(Config config, ProfileItem node)
-        {
-            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;
-        }
+        #endregion Process
     }
 }

v2rayN/v2rayN/Handler/DownloadHandle.cs

@@ -4,7 +4,6 @@ using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Net.Sockets;
-using v2rayN.Base;
 using v2rayN.Resx;
 
 namespace v2rayN.Handler
@@ -62,12 +61,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) =>
@@ -76,7 +75,7 @@ namespace v2rayN.Handler
                 };
 
                 var webProxy = GetWebProxy(blProxy);
-                _ = DownloaderHelper.Instance.DownloadFileAsync(webProxy,
+                await DownloaderHelper.Instance.DownloadFileAsync(webProxy,
                     url,
                     Utils.GetTempPath(Utils.GetDownloadFileName(url)),
                     progress,
@@ -84,7 +83,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
 
                 Error?.Invoke(this, new ErrorEventArgs(ex));
                 if (ex.InnerException != null)
@@ -111,7 +110,7 @@ namespace v2rayN.Handler
             }
             else
             {
-                Utils.SaveLog("StatusCode error: " + url);
+                Logging.SaveLog("StatusCode error: " + url);
                 return null;
             }
         }
@@ -128,7 +127,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 Error?.Invoke(this, new ErrorEventArgs(ex));
                 if (ex.InnerException != null)
                 {
@@ -146,7 +145,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 Error?.Invoke(this, new ErrorEventArgs(ex));
                 if (ex.InnerException != null)
                 {
@@ -166,7 +165,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 Error?.Invoke(this, new ErrorEventArgs(ex));
                 if (ex.InnerException != null)
                 {
@@ -206,15 +205,13 @@ namespace v2rayN.Handler
                     client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic", Utils.Base64Encode(uri.UserInfo));
                 }
 
-                var cts = new CancellationTokenSource();
-                cts.CancelAfter(1000 * 30);
-
-                var result = await HttpClientHelper.Instance.GetAsync(client, url, cts.Token);
+                using var cts = new CancellationTokenSource();
+                var result = await HttpClientHelper.Instance.GetAsync(client, url, cts.Token).WaitAsync(TimeSpan.FromSeconds(30), cts.Token);
                 return result;
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 Error?.Invoke(this, new ErrorEventArgs(ex));
                 if (ex.InnerException != null)
                 {
@@ -245,7 +242,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 Error?.Invoke(this, new ErrorEventArgs(ex));
                 if (ex.InnerException != null)
                 {
@@ -255,61 +252,57 @@ namespace v2rayN.Handler
             return null;
         }
 
-        public int RunAvailabilityCheck(IWebProxy? webProxy)
+        public async Task<int> RunAvailabilityCheck(IWebProxy? webProxy)
         {
             try
             {
                 if (webProxy == null)
                 {
-                    var httpPort = LazyConfig.Instance.GetLocalPort(Global.InboundHttp);
-                    webProxy = new WebProxy(Global.Loopback, httpPort);
+                    webProxy = GetWebProxy(true);
                 }
 
                 try
                 {
                     var config = LazyConfig.Instance.GetConfig();
-                    string status = GetRealPingTime(config.speedTestItem.speedPingTestUrl, webProxy, 10, out int responseTime);
-                    bool noError = Utils.IsNullOrEmpty(status);
-                    return noError ? responseTime : -1;
+                    int responseTime = await GetRealPingTime(config.speedTestItem.speedPingTestUrl, webProxy, 10);
+                    return responseTime;
                 }
                 catch (Exception ex)
                 {
-                    Utils.SaveLog(ex.Message, ex);
+                    Logging.SaveLog(ex.Message, ex);
                     return -1;
                 }
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 return -1;
             }
         }
 
-        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;
-            responseTime = -1;
+            int 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();
-                if (myHttpWebResponse.StatusCode is not HttpStatusCode.OK and not HttpStatusCode.NoContent)
+                using var cts = new CancellationTokenSource();
+                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)
+            catch //(Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
-                msg = ex.Message;
+                //Utils.SaveLog(ex.Message, ex);
             }
-            return msg;
+            return responseTime;
         }
 
         private WebProxy? GetWebProxy(bool blProxy)

v2rayN/v2rayN/Handler/HotkeyHandler.cs

@@ -113,9 +113,9 @@ namespace v2rayN.Handler
 
             var mdif = (KeyModifiers)_fsModifiers;
             var key = KeyInterop.KeyFromVirtualKey(_vkey);
-            if ((mdif | KeyModifiers.Ctrl) == KeyModifiers.Ctrl) _hotkeyStr.Append($"{KeyModifiers.Ctrl}+");
-            if ((mdif | KeyModifiers.Alt) == KeyModifiers.Alt) _hotkeyStr.Append($"{KeyModifiers.Alt}+");
-            if ((mdif | KeyModifiers.Shift) == KeyModifiers.Shift) _hotkeyStr.Append($"{KeyModifiers.Shift}+");
+            if ((mdif & KeyModifiers.Ctrl) == KeyModifiers.Ctrl) _hotkeyStr.Append($"{KeyModifiers.Ctrl}+");
+            if ((mdif & KeyModifiers.Alt) == KeyModifiers.Alt) _hotkeyStr.Append($"{KeyModifiers.Alt}+");
+            if ((mdif & KeyModifiers.Shift) == KeyModifiers.Shift) _hotkeyStr.Append($"{KeyModifiers.Shift}+");
             _hotkeyStr.Append(key.ToString());
 
             foreach (var name in _hotkeyTriggerDic[hotkeycode])

v2rayN/v2rayN/Handler/LazyConfig.cs

@@ -1,4 +1,4 @@
-using v2rayN.Base;
+using System.Runtime.Intrinsics.X86;
 using v2rayN.Mode;
 
 namespace v2rayN.Handler
@@ -11,6 +11,23 @@ namespace v2rayN.Handler
 
         public static LazyConfig Instance => _instance.Value;
 
+        private int? _statePort;
+
+        public int StatePort
+        {
+            get
+            {
+                if (_statePort is null)
+                {
+                    _statePort = Utils.GetFreePort();
+                }
+
+                return _statePort.Value;
+            }
+        }
+
+        private Job _processJob = new();
+
         public LazyConfig()
         {
             SqliteHelper.Instance.CreateTable<SubItem>();
@@ -18,6 +35,7 @@ namespace v2rayN.Handler
             SqliteHelper.Instance.CreateTable<ServerStatItem>();
             SqliteHelper.Instance.CreateTable<RoutingItem>();
             SqliteHelper.Instance.CreateTable<ProfileExItem>();
+            SqliteHelper.Instance.CreateTable<DNSItem>();
         }
 
         #region Config
@@ -62,6 +80,15 @@ namespace v2rayN.Handler
             return localPort;
         }
 
+        public void AddProcess(IntPtr processHandle)
+        {
+            _processJob.AddProcess(processHandle);
+        }
+
+        #endregion Config
+
+        #region SqliteHelper
+
         public List<SubItem> SubItems()
         {
             return SqliteHelper.Instance.Table<SubItem>().ToList();
@@ -128,6 +155,15 @@ namespace v2rayN.Handler
             return SqliteHelper.Instance.Table<ProfileItem>().FirstOrDefault(it => it.indexId == indexId);
         }
 
+        public ProfileItem? GetProfileItemViaRemarks(string remarks)
+        {
+            if (Utils.IsNullOrEmpty(remarks))
+            {
+                return null;
+            }
+            return SqliteHelper.Instance.Table<ProfileItem>().FirstOrDefault(it => it.remarks == remarks);
+        }
+
         public List<RoutingItem> RoutingItems()
         {
             return SqliteHelper.Instance.Table<RoutingItem>().Where(it => it.locked == false).OrderBy(t => t.sort).ToList();
@@ -138,22 +174,35 @@ namespace v2rayN.Handler
             return SqliteHelper.Instance.Table<RoutingItem>().FirstOrDefault(it => it.locked == false && it.id == id);
         }
 
-        #endregion Config
+        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 SqliteHelper
 
         #region Core Type
 
         public List<string> GetShadowsocksSecuritys(ProfileItem profileItem)
         {
-            if (GetCoreType(profileItem, EConfigType.Shadowsocks) == ECoreType.v2fly)
+            var coreType = GetCoreType(profileItem, EConfigType.Shadowsocks);
+            switch (coreType)
             {
-                return Global.ssSecuritys;
-            }
-            if (GetCoreType(profileItem, EConfigType.Shadowsocks) == ECoreType.Xray)
-            {
-                return Global.ssSecuritysInXray;
-            }
+                case ECoreType.v2fly:
+                    return Global.SsSecuritys;
 
-            return Global.ssSecuritysInSagerNet;
+                case ECoreType.Xray:
+                    return Global.SsSecuritysInXray;
+
+                case ECoreType.sing_box:
+                    return Global.SsSecuritysInSingbox;
+            }
+            return Global.SsSecuritysInSagerNet;
         }
 
         public ECoreType GetCoreType(ProfileItem profileItem, EConfigType eConfigType)
@@ -184,13 +233,13 @@ namespace v2rayN.Handler
             return coreInfos!.FirstOrDefault(t => t.coreType == coreType);
         }
 
-        public List<CoreInfo>? GetCoreInfos()
+        public List<CoreInfo> GetCoreInfos()
         {
             if (coreInfos == null)
             {
                 InitCoreInfo();
             }
-            return coreInfos;
+            return coreInfos!;
         }
 
         private void InitCoreInfo()
@@ -201,7 +250,7 @@ namespace v2rayN.Handler
             {
                 coreType = ECoreType.v2rayN,
                 coreUrl = Global.NUrl,
-                coreReleaseApiUrl = Global.NUrl.Replace(Global.githubUrl, Global.githubApiUrl),
+                coreReleaseApiUrl = Global.NUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
                 coreDownloadUrl32 = Global.NUrl + "/download/{0}/v2rayN-32.zip",
                 coreDownloadUrl64 = Global.NUrl + "/download/{0}/v2rayN.zip",
                 coreDownloadUrlArm64 = Global.NUrl + "/download/{0}/v2rayN-arm64.zip"
@@ -212,11 +261,11 @@ namespace v2rayN.Handler
                 coreType = ECoreType.v2fly,
                 coreExes = new List<string> { "wv2ray", "v2ray" },
                 arguments = "",
-                coreUrl = Global.v2flyCoreUrl,
-                coreReleaseApiUrl = Global.v2flyCoreUrl.Replace(Global.githubUrl, Global.githubApiUrl),
-                coreDownloadUrl32 = Global.v2flyCoreUrl + "/download/{0}/v2ray-windows-{1}.zip",
-                coreDownloadUrl64 = Global.v2flyCoreUrl + "/download/{0}/v2ray-windows-{1}.zip",
-                coreDownloadUrlArm64 = Global.v2flyCoreUrl + "/download/{0}/v2ray-windows-{1}.zip",
+                coreUrl = Global.V2flyCoreUrl,
+                coreReleaseApiUrl = Global.V2flyCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
+                coreDownloadUrl32 = Global.V2flyCoreUrl + "/download/{0}/v2ray-windows-{1}.zip",
+                coreDownloadUrl64 = Global.V2flyCoreUrl + "/download/{0}/v2ray-windows-{1}.zip",
+                coreDownloadUrlArm64 = Global.V2flyCoreUrl + "/download/{0}/v2ray-windows-{1}.zip",
                 match = "V2Ray",
                 versionArg = "-version",
                 redirectInfo = true,
@@ -228,7 +277,7 @@ namespace v2rayN.Handler
                 coreExes = new List<string> { "SagerNet", "v2ray" },
                 arguments = "run",
                 coreUrl = Global.SagerNetCoreUrl,
-                coreReleaseApiUrl = Global.SagerNetCoreUrl.Replace(Global.githubUrl, Global.githubApiUrl),
+                coreReleaseApiUrl = Global.SagerNetCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
                 coreDownloadUrl32 = Global.SagerNetCoreUrl + "/download/{0}/v2ray-windows-{1}.zip",
                 coreDownloadUrl64 = Global.SagerNetCoreUrl + "/download/{0}/v2ray-windows-{1}.zip",
                 coreDownloadUrlArm64 = Global.SagerNetCoreUrl + "/download/{0}/v2ray-windows-{1}.zip",
@@ -241,12 +290,12 @@ namespace v2rayN.Handler
             {
                 coreType = ECoreType.v2fly_v5,
                 coreExes = new List<string> { "v2ray" },
-                arguments = "run",
-                coreUrl = Global.v2flyCoreUrl,
-                coreReleaseApiUrl = Global.v2flyCoreUrl.Replace(Global.githubUrl, Global.githubApiUrl),
-                coreDownloadUrl32 = Global.v2flyCoreUrl + "/download/{0}/v2ray-windows-{1}.zip",
-                coreDownloadUrl64 = Global.v2flyCoreUrl + "/download/{0}/v2ray-windows-{1}.zip",
-                coreDownloadUrlArm64 = Global.v2flyCoreUrl + "/download/{0}/v2ray-windows-{1}.zip",
+                arguments = "run -c config.json -format jsonv5",
+                coreUrl = Global.V2flyCoreUrl,
+                coreReleaseApiUrl = Global.V2flyCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
+                coreDownloadUrl32 = Global.V2flyCoreUrl + "/download/{0}/v2ray-windows-{1}.zip",
+                coreDownloadUrl64 = Global.V2flyCoreUrl + "/download/{0}/v2ray-windows-{1}.zip",
+                coreDownloadUrlArm64 = Global.V2flyCoreUrl + "/download/{0}/v2ray-windows-{1}.zip",
                 match = "V2Ray",
                 versionArg = "version",
                 redirectInfo = true,
@@ -256,12 +305,12 @@ namespace v2rayN.Handler
             {
                 coreType = ECoreType.Xray,
                 coreExes = new List<string> { "xray", "wxray" },
-                arguments = "",
-                coreUrl = Global.xrayCoreUrl,
-                coreReleaseApiUrl = Global.xrayCoreUrl.Replace(Global.githubUrl, Global.githubApiUrl),
-                coreDownloadUrl32 = Global.xrayCoreUrl + "/download/{0}/Xray-windows-{1}.zip",
-                coreDownloadUrl64 = Global.xrayCoreUrl + "/download/{0}/Xray-windows-{1}.zip",
-                coreDownloadUrlArm64 = Global.xrayCoreUrl + "/download/{0}/Xray-windows-{1}.zip",
+                arguments = "run {0}",
+                coreUrl = Global.XrayCoreUrl,
+                coreReleaseApiUrl = Global.XrayCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
+                coreDownloadUrl32 = Global.XrayCoreUrl + "/download/{0}/Xray-windows-{1}.zip",
+                coreDownloadUrl64 = Global.XrayCoreUrl + "/download/{0}/Xray-windows-{1}.zip",
+                coreDownloadUrlArm64 = Global.XrayCoreUrl + "/download/{0}/Xray-windows-{1}.zip",
                 match = "Xray",
                 versionArg = "-version",
                 redirectInfo = true,
@@ -272,11 +321,11 @@ namespace v2rayN.Handler
                 coreType = ECoreType.clash,
                 coreExes = new List<string> { "clash-windows-amd64-v3", "clash-windows-amd64", "clash-windows-386", "clash" },
                 arguments = "-f config.json",
-                coreUrl = Global.clashCoreUrl,
-                coreReleaseApiUrl = Global.clashCoreUrl.Replace(Global.githubUrl, Global.githubApiUrl),
-                coreDownloadUrl32 = Global.clashCoreUrl + "/download/{0}/clash-windows-386-{0}.zip",
-                coreDownloadUrl64 = Global.clashCoreUrl + "/download/{0}/clash-windows-amd64-{0}.zip",
-                coreDownloadUrlArm64 = Global.clashCoreUrl + "/download/{0}/clash-windows-arm64-{0}.zip",
+                coreUrl = Global.ClashCoreUrl,
+                coreReleaseApiUrl = Global.ClashCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
+                coreDownloadUrl32 = Global.ClashCoreUrl + "/download/{0}/clash-windows-386-{0}.zip",
+                coreDownloadUrl64 = Global.ClashCoreUrl + "/download/{0}/clash-windows-amd64-{0}.zip",
+                coreDownloadUrlArm64 = Global.ClashCoreUrl + "/download/{0}/clash-windows-arm64-{0}.zip",
                 match = "v",
                 versionArg = "-v",
                 redirectInfo = true,
@@ -287,26 +336,37 @@ namespace v2rayN.Handler
                 coreType = ECoreType.clash_meta,
                 coreExes = new List<string> { "Clash.Meta-windows-amd64-compatible", "Clash.Meta-windows-amd64", "Clash.Meta-windows-386", "Clash.Meta", "clash" },
                 arguments = "-f config.json",
-                coreUrl = Global.clashMetaCoreUrl,
-                coreReleaseApiUrl = Global.clashMetaCoreUrl.Replace(Global.githubUrl, Global.githubApiUrl),
-                coreDownloadUrl32 = Global.clashMetaCoreUrl + "/download/{0}/Clash.Meta-windows-386-{0}.zip",
-                coreDownloadUrl64 = Global.clashMetaCoreUrl + "/download/{0}/Clash.Meta-windows-amd64-compatible-{0}.zip",
-                coreDownloadUrlArm64 = Global.clashMetaCoreUrl + "/download/{0}/Clash.Meta-windows-arm64-{0}.zip",
+                coreUrl = Global.ClashMetaCoreUrl,
+                coreReleaseApiUrl = Global.ClashMetaCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
+                coreDownloadUrl32 = Global.ClashMetaCoreUrl + "/download/{0}/Clash.Meta-windows-386-{0}.zip",
+                coreDownloadUrl64 = Global.ClashMetaCoreUrl + "/download/{0}/Clash.Meta-windows-amd64-compatible-{0}.zip",
+                coreDownloadUrlArm64 = Global.ClashMetaCoreUrl + "/download/{0}/Clash.Meta-windows-arm64-{0}.zip",
                 match = "v",
                 versionArg = "-v",
                 redirectInfo = true,
             });
 
+            coreInfos.Add(new CoreInfo
+            {
+                coreType = ECoreType.mihomo,
+                coreExes = new List<string> { $"mihomo-windows-amd64{(Avx2.X64.IsSupported ? "" : "-compatible")}", "mihomo-windows-amd64-compatible", "mihomo-windows-amd64", "mihomo-windows-386", "mihomo", "clash" },
+                arguments = "-f config.json",
+                coreUrl = Global.MihomoCoreUrl,
+                coreReleaseApiUrl = Global.MihomoCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
+                match = "Mihomo",
+                redirectInfo = true,
+            });
+
             coreInfos.Add(new CoreInfo
             {
                 coreType = ECoreType.hysteria,
                 coreExes = new List<string> { "hysteria-windows-amd64", "hysteria-windows-386", "hysteria" },
                 arguments = "",
-                coreUrl = Global.hysteriaCoreUrl,
-                coreReleaseApiUrl = Global.hysteriaCoreUrl.Replace(Global.githubUrl, Global.githubApiUrl),
-                coreDownloadUrl32 = Global.hysteriaCoreUrl + "/download/{0}/hysteria-windows-386.exe",
-                coreDownloadUrl64 = Global.hysteriaCoreUrl + "/download/{0}/hysteria-windows-amd64.exe",
-                coreDownloadUrlArm64 = Global.hysteriaCoreUrl + "/download/{0}/hysteria-windows-arm64.exe",
+                coreUrl = Global.HysteriaCoreUrl,
+                coreReleaseApiUrl = Global.HysteriaCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
+                coreDownloadUrl32 = Global.HysteriaCoreUrl + "/download/{0}/hysteria-windows-386.exe",
+                coreDownloadUrl64 = Global.HysteriaCoreUrl + "/download/{0}/hysteria-windows-amd64.exe",
+                coreDownloadUrlArm64 = Global.HysteriaCoreUrl + "/download/{0}/hysteria-windows-arm64.exe",
                 redirectInfo = true,
             });
 
@@ -315,7 +375,7 @@ namespace v2rayN.Handler
                 coreType = ECoreType.naiveproxy,
                 coreExes = new List<string> { "naiveproxy", "naive" },
                 arguments = "config.json",
-                coreUrl = Global.naiveproxyCoreUrl,
+                coreUrl = Global.NaiveproxyCoreUrl,
                 redirectInfo = false,
             });
 
@@ -324,7 +384,7 @@ namespace v2rayN.Handler
                 coreType = ECoreType.tuic,
                 coreExes = new List<string> { "tuic-client", "tuic" },
                 arguments = "-c config.json",
-                coreUrl = Global.tuicCoreUrl,
+                coreUrl = Global.TuicCoreUrl,
                 redirectInfo = true,
             });
 
@@ -332,16 +392,37 @@ namespace v2rayN.Handler
             {
                 coreType = ECoreType.sing_box,
                 coreExes = new List<string> { "sing-box-client", "sing-box" },
-                arguments = "run",
-                coreUrl = Global.singboxCoreUrl,
+                arguments = "run {0} --disable-color",
+                coreUrl = Global.SingboxCoreUrl,
                 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",
-                coreDownloadUrlArm64 = Global.singboxCoreUrl + "/download/{0}/sing-box-{1}-windows-arm64.zip",
+                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",
+                coreDownloadUrlArm64 = Global.SingboxCoreUrl + "/download/{0}/sing-box-{1}-windows-arm64.zip",
                 match = "sing-box",
                 versionArg = "version",
             });
+
+            coreInfos.Add(new CoreInfo
+            {
+                coreType = ECoreType.juicity,
+                coreExes = new List<string> { "juicity-client", "juicity" },
+                arguments = "run -c config.json",
+                coreUrl = Global.JuicityCoreUrl
+            });
+
+            coreInfos.Add(new CoreInfo
+            {
+                coreType = ECoreType.hysteria2,
+                coreExes = new List<string> { "hysteria-windows-amd64", "hysteria-windows-386", "hysteria" },
+                arguments = "",
+                coreUrl = Global.HysteriaCoreUrl,
+                coreReleaseApiUrl = Global.HysteriaCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
+                coreDownloadUrl32 = Global.HysteriaCoreUrl + "/download/{0}/hysteria-windows-386.exe",
+                coreDownloadUrl64 = Global.HysteriaCoreUrl + "/download/{0}/hysteria-windows-amd64.exe",
+                coreDownloadUrlArm64 = Global.HysteriaCoreUrl + "/download/{0}/hysteria-windows-arm64.exe",
+                redirectInfo = true,
+            });
         }
 
         #endregion Core Type

v2rayN/v2rayN/Handler/MainFormHandler.cs

@@ -42,7 +42,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 return Properties.Resources.NotifyIcon1;
             }
         }
@@ -77,7 +77,7 @@ namespace v2rayN.Handler
                     return null;
                 }
 
-                var item = ConfigHandler.GetDefaultRouting(ref config);
+                var item = ConfigHandler.GetDefaultRouting(config);
                 if (item == null || Utils.IsNullOrEmpty(item.customIcon) || !File.Exists(item.customIcon))
                 {
                     return null;
@@ -112,7 +112,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 return null;
             }
         }
@@ -144,9 +144,7 @@ namespace v2rayN.Handler
             {
                 return;
             }
-            //Config configCopy = Utils.DeepCopy(config);
-            //configCopy.index = index;
-            if (CoreConfigHandler.Export2ClientConfig(item, fileName, out string msg) != 0)
+            if (CoreConfigHandler.GenerateClientConfig(item, fileName, out string msg, out string content) != 0)
             {
                 UI.Show(msg);
             }
@@ -156,135 +154,16 @@ 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);
-            Utils.SaveLog("UpdateTaskRunSubscription");
+            await Task.Delay(60000);
+            Logging.SaveLog("UpdateTaskRunSubscription");
 
             var updateHandle = new UpdateHandle();
             while (true)
@@ -301,23 +180,23 @@ namespace v2rayN.Handler
                     {
                         update(success, msg);
                         if (success)
-                            Utils.SaveLog("subscription" + msg);
+                            Logging.SaveLog("subscription" + msg);
                     });
                     item.updateTime = updateTime;
-                    ConfigHandler.AddSubItem(ref config, item);
+                    ConfigHandler.AddSubItem(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);
-            Utils.SaveLog("UpdateTaskRunGeo");
+            await Task.Delay(1000 * 120);
+            Logging.SaveLog("UpdateTaskRunGeo");
 
             var updateHandle = new UpdateHandle();
             while (true)
@@ -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);
             }
         }
 

v2rayN/v2rayN/Handler/NoticeHandler.cs

@@ -26,7 +26,7 @@ namespace v2rayN.Handler
 
         public void SendMessage(string msg, bool time)
         {
-            msg = $"{DateTime.Now} {msg}";
+            msg = $"{DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss")} {msg}";
             MessageBus.Current.SendMessage(msg, "MsgView");
         }
     }

v2rayN/v2rayN/Handler/ProfileExHandler.cs

@@ -1,6 +1,5 @@
 using System.Collections.Concurrent;
 using System.Reactive.Linq;
-using v2rayN.Base;
 using v2rayN.Mode;
 
 namespace v2rayN.Handler
@@ -24,7 +23,7 @@ namespace v2rayN.Handler
 
             _lstProfileEx = new(SqliteHelper.Instance.Table<ProfileExItem>());
 
-            Task.Run(() =>
+            Task.Run(async () =>
             {
                 while (true)
                 {
@@ -38,7 +37,7 @@ namespace v2rayN.Handler
                             SqliteHelper.Instance.Replace(item);
                         }
                     }
-                    Thread.Sleep(1000 * 60);
+                    await Task.Delay(1000 * 60);
                 }
             });
         }
@@ -51,7 +50,7 @@ namespace v2rayN.Handler
             }
         }
 
-        private void AddProfileEx(string indexId, ref ProfileExItem profileEx)
+        private void AddProfileEx(string indexId, ref ProfileExItem? profileEx)
         {
             profileEx = new()
             {
@@ -82,7 +81,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
         }
 

v2rayN/v2rayN/Handler/ProxySetting.cs

@@ -1,37 +1,67 @@
-using Microsoft.Win32;
-using System.Runtime.InteropServices;
+using System.Runtime.InteropServices;
+using static v2rayN.Handler.ProxySetting.InternetConnectionOption;
 
 namespace v2rayN.Handler
 {
     internal class ProxySetting
     {
+        /// <summary>
+        // set to use no proxy
+        /// </summary>
+        /// <exception cref="ApplicationException">Error message with win32 error code</exception>
         public static bool UnsetProxy()
         {
             return SetProxy(null, null, 1);
         }
 
+        /// <summary>
+        /// Set system proxy settings
+        /// </summary>
+        /// <param name="strProxy"> proxy address</param>
+        /// <param name="exceptions">exception addresses that do not use proxy</param>
+        /// <param name="type">type of proxy defined in PerConnFlags
+        ///     PROXY_TYPE_DIRECT           = 0x00000001, // direct connection (no proxy)
+        ///     PROXY_TYPE_PROXY            = 0x00000002, // via named proxy
+        ///     PROXY_TYPE_AUTO_PROXY_URL   = 0x00000004, // autoproxy script URL
+        ///     PROXY_TYPE_AUTO_DETECT      = 0x00000008  // use autoproxy detection
+        /// </param>
+        /// <exception cref="ApplicationException">Error message with win32 error code</exception>
+        /// <returns>true: one of connnection is successfully updated proxy settings</returns>
         public static bool SetProxy(string? strProxy, string? exceptions, int type)
+        {
+            // set proxy for LAN
+            bool result = SetConnectionProxy(null, strProxy, exceptions, type);
+            // set proxy for dial up connections
+            var connections = EnumerateRasEntries();
+            foreach (var connection in connections)
+            {
+                result |= SetConnectionProxy(connection, strProxy, exceptions, type);
+            }
+            return result;
+        }
+
+        private static bool SetConnectionProxy(string? connectionName, string? strProxy, string? exceptions, int type)
         {
             InternetPerConnOptionList list = new();
 
             int optionCount = 1;
-            if (type == 1)
+            if (type == 1) // No proxy
             {
                 optionCount = 1;
             }
-            else if (type is 2 or 4)
+            else if (type is 2 or 4) // named proxy or autoproxy script URL
             {
                 optionCount = Utils.IsNullOrEmpty(exceptions) ? 2 : 3;
             }
 
             int m_Int = (int)PerConnFlags.PROXY_TYPE_DIRECT;
             PerConnOption m_Option = PerConnOption.INTERNET_PER_CONN_FLAGS;
-            if (type == 2)
+            if (type == 2) // named proxy
             {
                 m_Int = (int)(PerConnFlags.PROXY_TYPE_DIRECT | PerConnFlags.PROXY_TYPE_PROXY);
                 m_Option = PerConnOption.INTERNET_PER_CONN_PROXY_SERVER;
             }
-            else if (type == 4)
+            else if (type == 4) // autoproxy script url
             {
                 m_Int = (int)(PerConnFlags.PROXY_TYPE_DIRECT | PerConnFlags.PROXY_TYPE_AUTO_PROXY_URL);
                 m_Option = PerConnOption.INTERNET_PER_CONN_AUTOCONFIG_URL;
@@ -47,24 +77,31 @@ namespace v2rayN.Handler
             if (optionCount > 1)
             {
                 options[1].m_Option = m_Option;
-                options[1].m_Value.m_StringPtr = Marshal.StringToHGlobalAuto(strProxy);
+                options[1].m_Value.m_StringPtr = Marshal.StringToHGlobalAuto(strProxy); // !! remember to deallocate memory 1
                 // except for these addresses ...
                 if (optionCount > 2)
                 {
                     options[2].m_Option = PerConnOption.INTERNET_PER_CONN_PROXY_BYPASS;
-                    options[2].m_Value.m_StringPtr = Marshal.StringToHGlobalAuto(exceptions);
+                    options[2].m_Value.m_StringPtr = Marshal.StringToHGlobalAuto(exceptions); // !! remember to deallocate memory 2
                 }
             }
 
             // default stuff
             list.dwSize = Marshal.SizeOf(list);
-            list.szConnection = IntPtr.Zero;
+            if (connectionName != null)
+            {
+                list.szConnection = Marshal.StringToHGlobalAuto(connectionName); // !! remember to deallocate memory 3
+            }
+            else
+            {
+                list.szConnection = IntPtr.Zero;
+            }
             list.dwOptionCount = options.Length;
             list.dwOptionError = 0;
 
             int optSize = Marshal.SizeOf(typeof(InternetConnectionOption));
             // make a pointer out of all that ...
-            IntPtr optionsPtr = Marshal.AllocCoTaskMem(optSize * options.Length);
+            IntPtr optionsPtr = Marshal.AllocCoTaskMem(optSize * options.Length); // !! remember to deallocate memory 4
             // copy the array over into that spot in memory ...
             for (int i = 0; i < options.Length; ++i)
             {
@@ -83,26 +120,82 @@ namespace v2rayN.Handler
             list.options = optionsPtr;
 
             // and then make a pointer out of the whole list
-            IntPtr ipcoListPtr = Marshal.AllocCoTaskMem(list.dwSize);
+            IntPtr ipcoListPtr = Marshal.AllocCoTaskMem(list.dwSize); // !! remember to deallocate memory 5
             Marshal.StructureToPtr(list, ipcoListPtr, false);
 
             // and finally, call the API method!
-            int returnvalue = NativeMethods.InternetSetOption(IntPtr.Zero,
+            bool isSuccess = NativeMethods.InternetSetOption(IntPtr.Zero,
                InternetOption.INTERNET_OPTION_PER_CONNECTION_OPTION,
-               ipcoListPtr, list.dwSize) ? -1 : 0;
-            if (returnvalue == 0)
+               ipcoListPtr, list.dwSize);
+            int returnvalue = 0; // ERROR_SUCCESS
+            if (!isSuccess)
             {  // get the error codes, they might be helpful
-                returnvalue = Marshal.GetLastWin32Error();
+                returnvalue = Marshal.GetLastPInvokeError();
             }
-            // FREE the data ASAP
-            Marshal.FreeCoTaskMem(optionsPtr);
-            Marshal.FreeCoTaskMem(ipcoListPtr);
-            if (returnvalue > 0)
-            {  // throw the error codes, they might be helpful
-                //throw new Win32Exception(Marshal.GetLastWin32Error());
+            else
+            {
+                // Notify the system that the registry settings have been changed and cause them to be refreshed
+                NativeMethods.InternetSetOption(IntPtr.Zero, InternetOption.INTERNET_OPTION_SETTINGS_CHANGED, IntPtr.Zero, 0);
+                NativeMethods.InternetSetOption(IntPtr.Zero, InternetOption.INTERNET_OPTION_REFRESH, IntPtr.Zero, 0);
             }
 
-            return (returnvalue < 0);
+            // FREE the data ASAP
+            if (list.szConnection != IntPtr.Zero) Marshal.FreeHGlobal(list.szConnection); // release mem 3
+            if (optionCount > 1)
+            {
+                Marshal.FreeHGlobal(options[1].m_Value.m_StringPtr); // release mem 1
+                if (optionCount > 2)
+                {
+                    Marshal.FreeHGlobal(options[2].m_Value.m_StringPtr); // release mem 2
+                }
+            }
+            Marshal.FreeCoTaskMem(optionsPtr); // release mem 4
+            Marshal.FreeCoTaskMem(ipcoListPtr); // release mem 5
+            if (returnvalue != 0)
+            {
+                // throw the error codes, they might be helpful
+                throw new ApplicationException($"Set Internet Proxy failed with error code: {Marshal.GetLastWin32Error()}");
+            }
+
+            return true;
+        }
+
+        /// <summary>
+        /// Retrieve list of connections including LAN and WAN to support PPPoE connection
+        /// </summary>
+        /// <returns>A list of RAS connection names. May be empty list if no dial up connection.</returns>
+        /// <exception cref="ApplicationException">Error message with win32 error code</exception>
+        private static IEnumerable<string> EnumerateRasEntries()
+        {
+            int entries = 0;
+            // attempt to query with 1 entry buffer
+            RASENTRYNAME[] rasEntryNames = new RASENTRYNAME[1];
+            int bufferSize = Marshal.SizeOf(typeof(RASENTRYNAME));
+            rasEntryNames[0].dwSize = Marshal.SizeOf(typeof(RASENTRYNAME));
+
+            uint result = NativeMethods.RasEnumEntries(null, null, rasEntryNames, ref bufferSize, ref entries);
+            // increase buffer if the buffer is not large enough
+            if (result == (uint)ErrorCode.ERROR_BUFFER_TOO_SMALL)
+            {
+                rasEntryNames = new RASENTRYNAME[bufferSize / Marshal.SizeOf(typeof(RASENTRYNAME))];
+                for (int i = 0; i < rasEntryNames.Length; i++)
+                {
+                    rasEntryNames[i].dwSize = Marshal.SizeOf(typeof(RASENTRYNAME));
+                }
+
+                result = NativeMethods.RasEnumEntries(null, null, rasEntryNames, ref bufferSize, ref entries);
+            }
+            if (result == 0)
+            {
+                var entryNames = new List<string>();
+                for (int i = 0; i < entries; i++)
+                {
+                    entryNames.Add(rasEntryNames[i].szEntryName);
+                }
+
+                return entryNames;
+            }
+            throw new ApplicationException($"RasEnumEntries failed with error code: {result}");
         }
 
         #region WinInet structures
@@ -145,6 +238,25 @@ namespace v2rayN.Handler
                 [FieldOffset(0)]
                 public IntPtr m_StringPtr;
             }
+
+            [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
+            public struct RASENTRYNAME
+            {
+                public int dwSize;
+
+                [MarshalAs(UnmanagedType.ByValTStr, SizeConst = RAS_MaxEntryName + 1)]
+                public string szEntryName;
+
+                public int dwFlags;
+
+                [MarshalAs(UnmanagedType.ByValTStr, SizeConst = MAX_PATH + 1)]
+                public string szPhonebookPath;
+            }
+
+            // Constants
+            public const int RAS_MaxEntryName = 256;
+
+            public const int MAX_PATH = 260; // Standard MAX_PATH value in Windows
         }
 
         #endregion WinInet structures
@@ -156,7 +268,9 @@ namespace v2rayN.Handler
         //
         public enum InternetOption : uint
         {
-            INTERNET_OPTION_PER_CONNECTION_OPTION = 75
+            INTERNET_OPTION_PER_CONNECTION_OPTION = 75,
+            INTERNET_OPTION_REFRESH = 37,
+            INTERNET_OPTION_SETTINGS_CHANGED = 39
         }
 
         //
@@ -182,6 +296,12 @@ namespace v2rayN.Handler
             PROXY_TYPE_AUTO_DETECT = 0x00000008   // use autoproxy detection
         }
 
+        public enum ErrorCode : uint
+        {
+            ERROR_BUFFER_TOO_SMALL = 603,
+            ERROR_INVALID_SIZE = 632
+        }
+
         #endregion WinInet enums
 
         internal static class NativeMethods
@@ -189,28 +309,15 @@ namespace v2rayN.Handler
             [DllImport("WinInet.dll", SetLastError = true, CharSet = CharSet.Auto)]
             [return: MarshalAs(UnmanagedType.Bool)]
             public static extern bool InternetSetOption(IntPtr hInternet, InternetOption dwOption, IntPtr lpBuffer, int dwBufferLength);
-        }
 
-        //判断是否使用代理
-        public static bool UsedProxy()
-        {
-            using RegistryKey? rk = Registry.CurrentUser.OpenSubKey(@"Software\Microsoft\Windows\CurrentVersion\Internet Settings", true);
-            if (rk?.GetValue("ProxyEnable")?.ToString() == "1")
-            {
-                return true;
-            }
-            else
-            {
-                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;
+            [DllImport("Rasapi32.dll", CharSet = CharSet.Auto)]
+            public static extern uint RasEnumEntries(
+                string? reserved,          // Reserved, must be null
+                string? lpszPhonebook,     // Pointer to full path and filename of phone-book file. If this parameter is NULL, the entries are enumerated from all the remote access phone-book files
+                [In, Out] RASENTRYNAME[]? lprasentryname, // Buffer to receive RAS entry names
+                ref int lpcb,             // Size of the buffer
+                ref int lpcEntries        // Number of entries written to the buffer
+            );
         }
     }
 }

v2rayN/v2rayN/Handler/ShareHandler.cs

@@ -1,7 +1,5 @@
 using System.Collections.Specialized;
 using System.Text.RegularExpressions;
-using System.Web;
-using v2rayN.Base;
 using v2rayN.Mode;
 using v2rayN.Resx;
 
@@ -29,6 +27,9 @@ namespace v2rayN.Handler
                     EConfigType.Socks => ShareSocks(item),
                     EConfigType.Trojan => ShareTrojan(item),
                     EConfigType.VLESS => ShareVLESS(item),
+                    EConfigType.Hysteria2 => ShareHysteria2(item),
+                    EConfigType.Tuic => ShareTuic(item),
+                    EConfigType.Wireguard => ShareWireguard(item),
                     _ => null,
                 };
 
@@ -36,7 +37,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 return "";
             }
         }
@@ -47,12 +48,12 @@ namespace v2rayN.Handler
 
             VmessQRCode vmessQRCode = new()
             {
-                v = item.configVersion.ToString(),
+                v = item.configVersion,
                 ps = item.remarks.TrimEx(),
                 add = item.address,
-                port = item.port.ToString(),
+                port = item.port,
                 id = item.id,
-                aid = item.alterId.ToString(),
+                aid = item.alterId,
                 scy = item.security,
                 net = item.network,
                 type = item.headerType,
@@ -64,9 +65,9 @@ namespace v2rayN.Handler
                 fp = item.fingerprint
             };
 
-            url = Utils.ToJson(vmessQRCode);
+            url = JsonUtils.Serialize(vmessQRCode);
             url = Utils.Base64Encode(url);
-            url = $"{Global.vmessProtocol}{url}";
+            url = $"{Global.ProtocolShares[EConfigType.VMess]}{url}";
 
             return url;
         }
@@ -89,7 +90,7 @@ namespace v2rayN.Handler
             //new Sip002
             var pw = Utils.Base64Encode($"{item.security}:{item.id}");
             url = $"{pw}@{GetIpv6(item.address)}:{item.port}";
-            url = $"{Global.ssProtocol}{url}{remark}";
+            url = $"{Global.ProtocolShares[EConfigType.Shadowsocks]}{url}{remark}";
             return url;
         }
 
@@ -110,7 +111,7 @@ namespace v2rayN.Handler
             //new
             var pw = Utils.Base64Encode($"{item.security}:{item.id}");
             url = $"{pw}@{GetIpv6(item.address)}:{item.port}";
-            url = $"{Global.socksProtocol}{url}{remark}";
+            url = $"{Global.ProtocolShares[EConfigType.Socks]}{url}{remark}";
             return url;
         }
 
@@ -130,7 +131,7 @@ namespace v2rayN.Handler
             item.id,
             GetIpv6(item.address),
             item.port);
-            url = $"{Global.trojanProtocol}{url}{query}{remark}";
+            url = $"{Global.ProtocolShares[EConfigType.Trojan]}{url}{query}{remark}";
             return url;
         }
 
@@ -158,7 +159,106 @@ namespace v2rayN.Handler
             item.id,
             GetIpv6(item.address),
             item.port);
-            url = $"{Global.vlessProtocol}{url}{query}{remark}";
+            url = $"{Global.ProtocolShares[EConfigType.VLESS]}{url}{query}{remark}";
+            return url;
+        }
+
+        private static string ShareHysteria2(ProfileItem item)
+        {
+            string url = string.Empty;
+            string remark = string.Empty;
+            if (!Utils.IsNullOrEmpty(item.remarks))
+            {
+                remark = "#" + Utils.UrlEncode(item.remarks);
+            }
+            var dicQuery = new Dictionary<string, string>();
+            if (!Utils.IsNullOrEmpty(item.sni))
+            {
+                dicQuery.Add("sni", item.sni);
+            }
+            if (!Utils.IsNullOrEmpty(item.alpn))
+            {
+                dicQuery.Add("alpn", Utils.UrlEncode(item.alpn));
+            }
+            if (!Utils.IsNullOrEmpty(item.path))
+            {
+                dicQuery.Add("obfs", "salamander");
+                dicQuery.Add("obfs-password", Utils.UrlEncode(item.path));
+            }
+            dicQuery.Add("insecure", item.allowInsecure.ToLower() == "true" ? "1" : "0");
+
+            string query = "?" + string.Join("&", dicQuery.Select(x => x.Key + "=" + x.Value).ToArray());
+
+            url = string.Format("{0}@{1}:{2}",
+            item.id,
+            GetIpv6(item.address),
+            item.port);
+            url = $"{Global.ProtocolShares[EConfigType.Hysteria2]}{url}/{query}{remark}";
+            return url;
+        }
+
+        private static string ShareTuic(ProfileItem item)
+        {
+            string url = string.Empty;
+            string remark = string.Empty;
+            if (!Utils.IsNullOrEmpty(item.remarks))
+            {
+                remark = "#" + Utils.UrlEncode(item.remarks);
+            }
+            var dicQuery = new Dictionary<string, string>();
+            if (!Utils.IsNullOrEmpty(item.sni))
+            {
+                dicQuery.Add("sni", item.sni);
+            }
+            if (!Utils.IsNullOrEmpty(item.alpn))
+            {
+                dicQuery.Add("alpn", Utils.UrlEncode(item.alpn));
+            }
+            dicQuery.Add("congestion_control", item.headerType);
+
+            string query = "?" + string.Join("&", dicQuery.Select(x => x.Key + "=" + x.Value).ToArray());
+
+            url = string.Format("{0}@{1}:{2}",
+            $"{item.id}:{item.security}",
+            GetIpv6(item.address),
+            item.port);
+            url = $"{Global.ProtocolShares[EConfigType.Tuic]}{url}{query}{remark}";
+            return url;
+        }
+
+        private static string ShareWireguard(ProfileItem item)
+        {
+            string url = string.Empty;
+            string remark = string.Empty;
+            if (!Utils.IsNullOrEmpty(item.remarks))
+            {
+                remark = "#" + Utils.UrlEncode(item.remarks);
+            }
+
+            var dicQuery = new Dictionary<string, string>();
+            if (!Utils.IsNullOrEmpty(item.publicKey))
+            {
+                dicQuery.Add("publickey", Utils.UrlEncode(item.publicKey));
+            }
+            if (!Utils.IsNullOrEmpty(item.path))
+            {
+                dicQuery.Add("reserved", Utils.UrlEncode(item.path));
+            }
+            if (!Utils.IsNullOrEmpty(item.requestHost))
+            {
+                dicQuery.Add("address", Utils.UrlEncode(item.requestHost));
+            }
+            if (!Utils.IsNullOrEmpty(item.shortId))
+            {
+                dicQuery.Add("mtu", Utils.UrlEncode(item.shortId));
+            }
+            string query = "?" + string.Join("&", dicQuery.Select(x => x.Key + "=" + x.Value).ToArray());
+
+            url = string.Format("{0}@{1}:{2}",
+            Utils.UrlEncode(item.id),
+            GetIpv6(item.address),
+            item.port);
+            url = $"{Global.ProtocolShares[EConfigType.Wireguard]}{url}/{query}{remark}";
             return url;
         }
 
@@ -285,21 +385,19 @@ namespace v2rayN.Handler
         /// <returns></returns>
         public static ProfileItem? ImportFromClipboardConfig(string clipboardData, out string msg)
         {
-            msg = string.Empty;
-
-            ProfileItem profileItem = new();
+            msg = ResUI.ConfigurationFormatIncorrect;
+            ProfileItem? profileItem;
 
             try
             {
-                //载入配置文件
-                string result = clipboardData.TrimEx();// Utils.GetClipboardData();
+                string result = clipboardData.TrimEx();
                 if (Utils.IsNullOrEmpty(result))
                 {
                     msg = ResUI.FailedReadConfiguration;
                     return null;
                 }
 
-                if (result.StartsWith(Global.vmessProtocol))
+                if (result.StartsWith(Global.ProtocolShares[EConfigType.VMess]))
                 {
                     int indexSplit = result.IndexOf("?");
                     if (indexSplit > 0)
@@ -311,10 +409,8 @@ namespace v2rayN.Handler
                         profileItem = ResolveVmess(result, out msg);
                     }
                 }
-                else if (result.StartsWith(Global.ssProtocol))
+                else if (result.StartsWith(Global.ProtocolShares[EConfigType.Shadowsocks]))
                 {
-                    msg = ResUI.ConfigurationFormatIncorrect;
-
                     profileItem = ResolveSSLegacy(result) ?? ResolveSip002(result);
                     if (profileItem == null)
                     {
@@ -327,10 +423,8 @@ namespace v2rayN.Handler
 
                     profileItem.configType = EConfigType.Shadowsocks;
                 }
-                else if (result.StartsWith(Global.socksProtocol))
+                else if (result.StartsWith(Global.ProtocolShares[EConfigType.Socks]))
                 {
-                    msg = ResUI.ConfigurationFormatIncorrect;
-
                     profileItem = ResolveSocksNew(result) ?? ResolveSocks(result);
                     if (profileItem == null)
                     {
@@ -343,16 +437,26 @@ namespace v2rayN.Handler
 
                     profileItem.configType = EConfigType.Socks;
                 }
-                else if (result.StartsWith(Global.trojanProtocol))
+                else if (result.StartsWith(Global.ProtocolShares[EConfigType.Trojan]))
                 {
-                    msg = ResUI.ConfigurationFormatIncorrect;
-
                     profileItem = ResolveTrojan(result);
                 }
-                else if (result.StartsWith(Global.vlessProtocol))
+                else if (result.StartsWith(Global.ProtocolShares[EConfigType.VLESS]))
                 {
                     profileItem = ResolveStdVLESS(result);
                 }
+                else if (result.StartsWith(Global.ProtocolShares[EConfigType.Hysteria2]) || result.StartsWith(Global.Hysteria2ProtocolShare))
+                {
+                    profileItem = ResolveHysteria2(result);
+                }
+                else if (result.StartsWith(Global.ProtocolShares[EConfigType.Tuic]))
+                {
+                    profileItem = ResolveTuic(result);
+                }
+                else if (result.StartsWith(Global.ProtocolShares[EConfigType.Wireguard]))
+                {
+                    profileItem = ResolveWireguard(result);
+                }
                 else
                 {
                     msg = ResUI.NonvmessOrssProtocol;
@@ -361,7 +465,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 msg = ResUI.Incorrectconfiguration;
                 return null;
             }
@@ -377,11 +481,11 @@ namespace v2rayN.Handler
                 configType = EConfigType.VMess
             };
 
-            result = result[Global.vmessProtocol.Length..];
+            result = result[Global.ProtocolShares[EConfigType.VMess].Length..];
             result = Utils.Base64Decode(result);
 
             //转成Json
-            VmessQRCode? vmessQRCode = Utils.FromJson<VmessQRCode>(result);
+            VmessQRCode? vmessQRCode = JsonUtils.Deserialize<VmessQRCode>(result);
             if (vmessQRCode == null)
             {
                 msg = ResUI.FailedConversionConfiguration;
@@ -425,7 +529,7 @@ namespace v2rayN.Handler
             {
                 configType = EConfigType.VMess
             };
-            result = result[Global.vmessProtocol.Length..];
+            result = result[Global.ProtocolShares[EConfigType.VMess].Length..];
             int indexSplit = result.IndexOf("?");
             if (indexSplit > 0)
             {
@@ -470,7 +574,7 @@ namespace v2rayN.Handler
             i.address = u.IdnHost;
             i.port = u.Port;
             i.remarks = u.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
-            var q = HttpUtility.ParseQueryString(u.Query);
+            var query = Utils.ParseQueryString(u.Query);
 
             var m = StdVmessUserInfo.Match(u.UserInfo);
             if (!m.Success) return null;
@@ -484,7 +588,6 @@ namespace v2rayN.Handler
             switch (i.streamSecurity)
             {
                 case "tls":
-                    // TODO tls config
                     break;
 
                 default:
@@ -497,20 +600,17 @@ namespace v2rayN.Handler
             switch (i.network)
             {
                 case "tcp":
-                    string t1 = q["type"] ?? "none";
+                    string t1 = query["type"] ?? "none";
                     i.headerType = t1;
-                    // TODO http option
-
                     break;
 
                 case "kcp":
-                    i.headerType = q["type"] ?? "none";
-                    // TODO kcp seed
+                    i.headerType = query["type"] ?? "none";
                     break;
 
                 case "ws":
-                    string p1 = q["path"] ?? "/";
-                    string h1 = q["host"] ?? "";
+                    string p1 = query["path"] ?? "/";
+                    string h1 = query["host"] ?? "";
                     i.requestHost = Utils.UrlDecode(h1);
                     i.path = p1;
                     break;
@@ -518,16 +618,16 @@ namespace v2rayN.Handler
                 case "http":
                 case "h2":
                     i.network = "h2";
-                    string p2 = q["path"] ?? "/";
-                    string h2 = q["host"] ?? "";
+                    string p2 = query["path"] ?? "/";
+                    string h2 = query["host"] ?? "";
                     i.requestHost = Utils.UrlDecode(h2);
                     i.path = p2;
                     break;
 
                 case "quic":
-                    string s = q["security"] ?? "none";
-                    string k = q["key"] ?? "";
-                    string t3 = q["type"] ?? "none";
+                    string s = query["security"] ?? "none";
+                    string k = query["key"] ?? "";
+                    string t3 = query["type"] ?? "none";
                     i.headerType = t3;
                     i.requestHost = Utils.UrlDecode(s);
                     i.path = k;
@@ -582,7 +682,7 @@ namespace v2rayN.Handler
                 server.id = userInfoParts[1];
             }
 
-            NameValueCollection queryParameters = HttpUtility.ParseQueryString(parsedUrl.Query);
+            var queryParameters = Utils.ParseQueryString(parsedUrl.Query);
             if (queryParameters["plugin"] != null)
             {
                 //obfs-host exists
@@ -633,7 +733,7 @@ namespace v2rayN.Handler
             server.security = details.Groups["method"].Value;
             server.id = details.Groups["password"].Value;
             server.address = details.Groups["hostname"].Value;
-            server.port = int.Parse(details.Groups["port"].Value);
+            server.port = Utils.ToInt(details.Groups["port"].Value);
             return server;
         }
 
@@ -646,7 +746,7 @@ namespace v2rayN.Handler
             {
                 configType = EConfigType.Socks
             };
-            result = result[Global.socksProtocol.Length..];
+            result = result[Global.ProtocolShares[EConfigType.Socks].Length..];
             //remark
             int indexRemark = result.IndexOf("#");
             if (indexRemark > 0)
@@ -731,9 +831,9 @@ namespace v2rayN.Handler
             item.address = url.IdnHost;
             item.port = url.Port;
             item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
-            item.id = url.UserInfo;
+            item.id = Utils.UrlDecode(url.UserInfo);
 
-            var query = HttpUtility.ParseQueryString(url.Query);
+            var query = Utils.ParseQueryString(url.Query);
             ResolveStdTransport(query, ref item);
 
             return item;
@@ -752,9 +852,9 @@ namespace v2rayN.Handler
             item.address = url.IdnHost;
             item.port = url.Port;
             item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
-            item.id = url.UserInfo;
+            item.id = Utils.UrlDecode(url.UserInfo);
 
-            var query = HttpUtility.ParseQueryString(url.Query);
+            var query = Utils.ParseQueryString(url.Query);
             item.security = query["encryption"] ?? "none";
             item.streamSecurity = query["security"] ?? "";
             ResolveStdTransport(query, ref item);
@@ -762,6 +862,78 @@ namespace v2rayN.Handler
             return item;
         }
 
+        private static ProfileItem ResolveHysteria2(string result)
+        {
+            ProfileItem item = new()
+            {
+                configType = EConfigType.Hysteria2
+            };
+
+            Uri url = new(result);
+
+            item.address = url.IdnHost;
+            item.port = url.Port;
+            item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
+            item.id = Utils.UrlDecode(url.UserInfo);
+
+            var query = Utils.ParseQueryString(url.Query);
+            ResolveStdTransport(query, ref item);
+            item.path = Utils.UrlDecode(query["obfs-password"] ?? "");
+            item.allowInsecure = (query["insecure"] ?? "") == "1" ? "true" : "false";
+
+            return item;
+        }
+
+        private static ProfileItem ResolveTuic(string result)
+        {
+            ProfileItem item = new()
+            {
+                configType = EConfigType.Tuic
+            };
+
+            Uri url = new(result);
+
+            item.address = url.IdnHost;
+            item.port = url.Port;
+            item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
+            var userInfoParts = url.UserInfo.Split(new[] { ':' }, 2);
+            if (userInfoParts.Length == 2)
+            {
+                item.id = userInfoParts[0];
+                item.security = userInfoParts[1];
+            }
+
+            var query = Utils.ParseQueryString(url.Query);
+            ResolveStdTransport(query, ref item);
+            item.headerType = query["congestion_control"] ?? "";
+
+            return item;
+        }
+
+        private static ProfileItem ResolveWireguard(string result)
+        {
+            ProfileItem item = new()
+            {
+                configType = EConfigType.Wireguard
+            };
+
+            Uri url = new(result);
+
+            item.address = url.IdnHost;
+            item.port = url.Port;
+            item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
+            item.id = Utils.UrlDecode(url.UserInfo);
+
+            var query = Utils.ParseQueryString(url.Query);
+
+            item.publicKey = Utils.UrlDecode(query["publickey"] ?? "");
+            item.path = Utils.UrlDecode(query["reserved"] ?? "");
+            item.requestHost = Utils.UrlDecode(query["address"] ?? "");
+            item.shortId = Utils.UrlDecode(query["mtu"] ?? "");
+
+            return item;
+        }
+
         private static int ResolveStdTransport(NameValueCollection query, ref ProfileItem item)
         {
             item.flow = query["flow"] ?? "";

v2rayN/v2rayN/Handler/SpeedtestHandler.cs

@@ -1,6 +1,5 @@
 using System.Diagnostics;
 using System.Net;
-using System.Net.NetworkInformation;
 using System.Net.Sockets;
 using v2rayN.Mode;
 using v2rayN.Resx;
@@ -9,7 +8,7 @@ namespace v2rayN.Handler
 {
     internal class SpeedtestHandler
     {
-        private Config _config;
+        private Config? _config;
         private CoreHandler _coreHandler;
         private List<ServerTestItem> _selecteds;
         private ESpeedActionType _actionType;
@@ -51,7 +50,6 @@ namespace v2rayN.Handler
             {
                 switch (actionType)
                 {
-                    case ESpeedActionType.Ping:
                     case ESpeedActionType.Tcping:
                     case ESpeedActionType.Realping:
                         UpdateFunc(it.indexId, ResUI.Speedtesting, "");
@@ -73,10 +71,6 @@ namespace v2rayN.Handler
 
             switch (actionType)
             {
-                case ESpeedActionType.Ping:
-                    Task.Run(RunPing);
-                    break;
-
                 case ESpeedActionType.Tcping:
                     Task.Run(RunTcping);
                     break;
@@ -95,52 +89,45 @@ namespace v2rayN.Handler
             }
         }
 
-        private void RunPingSub(Action<ServerTestItem> updateFun)
+        private Task RunTcping()
         {
             try
             {
-                foreach (var it in _selecteds.Where(it => it.configType != EConfigType.Custom))
+                List<Task> tasks = [];
+                foreach (var it in _selecteds)
                 {
-                    try
+                    if (it.configType == EConfigType.Custom)
                     {
-                        Task.Run(() => updateFun(it));
+                        continue;
                     }
-                    catch (Exception ex)
+                    tasks.Add(Task.Run(() =>
                     {
-                        Utils.SaveLog(ex.Message, ex);
-                    }
-                }
+                        try
+                        {
+                            int time = GetTcpingTime(it.address, it.port);
+                            var output = FormatOut(time, Global.DelayUnit);
 
-                Thread.Sleep(10);
+                            ProfileExHandler.Instance.SetTestDelay(it.indexId, output);
+                            UpdateFunc(it.indexId, output);
+                        }
+                        catch (Exception ex)
+                        {
+                            Logging.SaveLog(ex.Message, ex);
+                        }
+                    }));
+                }
+                Task.WaitAll([.. tasks]);
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
-        }
-
-        private void RunPing()
-        {
-            RunPingSub((ServerTestItem it) =>
+            finally
             {
-                long time = Ping(it.address);
-                var output = FormatOut(time, Global.DelayUnit);
+                ProfileExHandler.Instance.SaveTo();
+            }
 
-                ProfileExHandler.Instance.SetTestDelay(it.indexId, output);
-                UpdateFunc(it.indexId, output);
-            });
-        }
-
-        private void RunTcping()
-        {
-            RunPingSub((ServerTestItem it) =>
-            {
-                int time = GetTcpingTime(it.address, it.port);
-                var output = FormatOut(time, Global.DelayUnit);
-
-                ProfileExHandler.Instance.SetTestDelay(it.indexId, output);
-                UpdateFunc(it.indexId, output);
-            });
+            return Task.CompletedTask;
         }
 
         private Task RunRealPing()
@@ -150,7 +137,7 @@ namespace v2rayN.Handler
             {
                 string msg = string.Empty;
 
-                pid = _coreHandler.LoadCoreConfigString(_config, _selecteds);
+                pid = _coreHandler.LoadCoreConfigSpeedtest(_selecteds);
                 if (pid < 0)
                 {
                     UpdateFunc("", ResUI.FailedToRunCore);
@@ -158,7 +145,7 @@ namespace v2rayN.Handler
                 }
 
                 DownloadHandle downloadHandle = new DownloadHandle();
-                //Thread.Sleep(5000);
+
                 List<Task> tasks = new();
                 foreach (var it in _selecteds)
                 {
@@ -170,12 +157,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);
@@ -184,20 +171,22 @@ namespace v2rayN.Handler
                         }
                         catch (Exception ex)
                         {
-                            Utils.SaveLog(ex.Message, ex);
+                            Logging.SaveLog(ex.Message, ex);
                         }
                     }));
-                    //Thread.Sleep(100);
                 }
                 Task.WaitAll(tasks.ToArray());
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
             finally
             {
-                if (pid > 0) _coreHandler.CoreStopPid(pid);
+                if (pid > 0)
+                {
+                    _coreHandler.CoreStopPid(pid);
+                }
                 ProfileExHandler.Instance.SaveTo();
             }
 
@@ -212,7 +201,7 @@ namespace v2rayN.Handler
             //    _selecteds = _selecteds.OrderBy(t => t.delay).ToList();
             //}
 
-            pid = _coreHandler.LoadCoreConfigString(_config, _selecteds);
+            pid = _coreHandler.LoadCoreConfigSpeedtest(_selecteds);
             if (pid < 0)
             {
                 UpdateFunc("", ResUI.FailedToRunCore);
@@ -269,7 +258,7 @@ namespace v2rayN.Handler
         private async Task RunSpeedTestMulti()
         {
             int pid = -1;
-            pid = _coreHandler.LoadCoreConfigString(_config, _selecteds);
+            pid = _coreHandler.LoadCoreConfigSpeedtest(_selecteds);
             if (pid < 0)
             {
                 UpdateFunc("", ResUI.FailedToRunCore);
@@ -312,10 +301,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)
             {
@@ -329,16 +318,16 @@ namespace v2rayN.Handler
         {
             await RunRealPing();
 
-            Thread.Sleep(1000);
+            await Task.Delay(1000);
 
             await RunSpeedTestMulti();
         }
 
-        public string GetRealPingTime(DownloadHandle downloadHandle, IWebProxy webProxy)
+        private 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)
@@ -347,7 +336,7 @@ namespace v2rayN.Handler
 
             try
             {
-                if (!IPAddress.TryParse(url, out IPAddress ipAddress))
+                if (!IPAddress.TryParse(url, out IPAddress? ipAddress))
                 {
                     IPHostEntry ipHostInfo = System.Net.Dns.GetHostEntry(url);
                     ipAddress = ipHostInfo.AddressList[0];
@@ -369,48 +358,11 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
             return responseTime;
         }
 
-        /// <summary>
-        /// Ping
-        /// </summary>
-        /// <param name="host"></param>
-        /// <returns></returns>
-        public long Ping(string host)
-        {
-            long roundtripTime = -1;
-            try
-            {
-                int timeout = 30;
-                int echoNum = 2;
-                using Ping pingSender = new();
-                for (int i = 0; i < echoNum; i++)
-                {
-                    PingReply reply = pingSender.Send(host, timeout);
-                    if (reply.Status == IPStatus.Success)
-                    {
-                        if (reply.RoundtripTime < 0)
-                        {
-                            continue;
-                        }
-                        if (roundtripTime < 0 || reply.RoundtripTime < roundtripTime)
-                        {
-                            roundtripTime = reply.RoundtripTime;
-                        }
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                Utils.SaveLog(ex.Message, ex);
-                return -1;
-            }
-            return roundtripTime;
-        }
-
         private string FormatOut(object time, string unit)
         {
             //if (time.ToString().Equals("-1"))

v2rayN/v2rayN/Handler/StatisticsHandler.cs

@@ -1,115 +1,48 @@
-using Grpc.Core;
-using Grpc.Net.Client;
-using ProtosLib.Statistics;
-using System.Net;
+using System.Net;
 using System.Net.Sockets;
-using v2rayN.Base;
 using v2rayN.Mode;
 
 namespace v2rayN.Handler
 {
     internal class StatisticsHandler
     {
-        private Mode.Config config_;
-        private GrpcChannel _channel;
-        private StatsService.StatsServiceClient _client;
-        private bool _exitFlag;
+        private Config _config;
         private ServerStatItem? _serverStatItem;
         private List<ServerStatItem> _lstServerStat;
-        public List<ServerStatItem> ServerStat => _lstServerStat;
-
         private Action<ServerSpeedItem> _updateFunc;
+        private StatisticsV2ray? _statisticsV2Ray;
+        private StatisticsSingbox? _statisticsSingbox;
 
-        public bool Enable
-        {
-            get; set;
-        }
+        public List<ServerStatItem> ServerStat => _lstServerStat;
+        public bool Enable { get; set; }
 
-        public StatisticsHandler(Mode.Config config, Action<ServerSpeedItem> update)
+        public StatisticsHandler(Config config, Action<ServerSpeedItem> update)
         {
-            config_ = config;
+            _config = config;
             Enable = config.guiItem.enableStatistics;
+            if (!Enable)
+            {
+                return;
+            }
+
             _updateFunc = update;
-            _exitFlag = false;
 
             Init();
-            GrpcInit();
 
-            Task.Run(Run);
-        }
-
-        private void GrpcInit()
-        {
-            if (_channel == null)
-            {
-                Global.statePort = GetFreePort();
-
-                _channel = GrpcChannel.ForAddress($"{Global.httpProtocol}{Global.Loopback}:{Global.statePort}");
-                _client = new StatsService.StatsServiceClient(_channel);
-            }
+            _statisticsV2Ray = new StatisticsV2ray(config, UpdateServerStat);
+            _statisticsSingbox = new StatisticsSingbox(config, UpdateServerStat);
         }
 
         public void Close()
         {
             try
             {
-                _exitFlag = true;
-                //channel_.ShutdownAsync();
+                _statisticsV2Ray?.Close();
+                _statisticsSingbox?.Close();
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
-            }
-        }
-
-        public async void Run()
-        {
-            while (!_exitFlag)
-            {
-                try
-                {
-                    if (Enable && _channel.State == ConnectivityState.Ready)
-                    {
-                        QueryStatsResponse? res = null;
-                        try
-                        {
-                            res = await _client.QueryStatsAsync(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);
-                    await _channel.ConnectAsync();
-                }
-                catch
-                {
-                }
+                Logging.SaveLog(ex.Message, ex);
             }
         }
 
@@ -128,7 +61,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
         }
 
@@ -142,6 +75,30 @@ namespace v2rayN.Handler
             _lstServerStat = SqliteHelper.Instance.Table<ServerStatItem>().ToList();
         }
 
+        private void UpdateServerStat(ServerSpeedItem server)
+        {
+            GetServerStatItem(_config.indexId);
+
+            if (_serverStatItem is null)
+            {
+                return;
+            }
+            if (server.proxyUp != 0 || server.proxyDown != 0)
+            {
+                _serverStatItem.todayUp += server.proxyUp;
+                _serverStatItem.todayDown += server.proxyDown;
+                _serverStatItem.totalUp += server.proxyUp;
+                _serverStatItem.totalDown += server.proxyDown;
+            }
+
+            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,71 +134,26 @@ 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;
+                if (!Utils.PortInUse(defaultPort))
+                {
+                    return defaultPort;
+                }
+
                 TcpListener l = new(IPAddress.Loopback, 0);
                 l.Start();
                 int port = ((IPEndPoint)l.LocalEndpoint).Port;
                 l.Stop();
                 return port;
             }
-            catch (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}:{LazyConfig.Instance.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)
+            {
+                Logging.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 = JsonUtils.Deserialize<TrafficItem>(source);
+                if (trafficItem != null)
+                {
+                    up = trafficItem.up;
+                    down = trafficItem.down;
+                }
+            }
+            catch
+            {
+            }
+        }
+    }
+}

v2rayN/v2rayN/Handler/StatisticsV2ray.cs

@@ -0,0 +1,126 @@
+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 is null)
+            {
+                try
+                {
+                    _channel = GrpcChannel.ForAddress($"{Global.HttpProtocol}{Global.Loopback}:{LazyConfig.Instance.StatePort}");
+                    _client = new StatsService.StatsServiceClient(_channel);
+                }
+                catch (Exception ex)
+                {
+                    Logging.SaveLog(ex.Message, ex);
+                }
+            }
+        }
+
+        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);
+                    if (_channel != null) 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.ProxyTag)
+                    {
+                        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

@@ -1,10 +1,5 @@
 using PacLib;
-using System.Diagnostics;
-using System.IO;
-using System.Text;
 using v2rayN.Mode;
-using v2rayN.Properties;
-using v2rayN.Tool;
 
 namespace v2rayN.Handler
 {
@@ -20,7 +15,6 @@ namespace v2rayN.Handler
         //  <proxy-server><CR-LF>
         //  <bypass-list><CR-LF>
         //  <pac-url>
-        private static SysproxyConfig? _userSettings = null;
 
         private enum RET_ERRORS : int
         {
@@ -34,15 +28,6 @@ namespace v2rayN.Handler
 
         static SysProxyHandle()
         {
-            try
-            {
-                FileManager.UncompressFile(Utils.GetTempPath("sysproxy.exe"),
-                    Environment.Is64BitOperatingSystem ? Resources.sysproxy64_exe : Resources.sysproxy_exe);
-            }
-            catch (IOException ex)
-            {
-                Utils.SaveLog(ex.Message, ex);
-            }
         }
 
         public static bool UpdateSysProxy(Config config, bool forceDisable)
@@ -65,7 +50,7 @@ namespace v2rayN.Handler
                 }
                 if (type == ESysProxyType.ForcedChange)
                 {
-                    var strExceptions = $"{config.constItem.defIEProxyExceptions};{config.systemProxyExceptions}";
+                    var strExceptions = $"<local>;{config.constItem.defIEProxyExceptions};{config.systemProxyExceptions}";
 
                     var strProxy = string.Empty;
                     if (Utils.IsNullOrEmpty(config.systemProxyAdvancedProtocol))
@@ -79,11 +64,11 @@ namespace v2rayN.Handler
                             .Replace("{http_port}", port.ToString())
                             .Replace("{socks_port}", portSocks.ToString());
                     }
-                    SetIEProxy(true, strProxy, strExceptions);
+                    ProxySetting.SetProxy(strProxy, strExceptions, 2); // set a named proxy
                 }
                 else if (type == ESysProxyType.ForcedClear)
                 {
-                    ResetIEProxy();
+                    ProxySetting.UnsetProxy(); // set to no proxy
                 }
                 else if (type == ESysProxyType.Unchanged)
                 {
@@ -91,8 +76,8 @@ namespace v2rayN.Handler
                 else if (type == ESysProxyType.Pac)
                 {
                     PacHandler.Start(Utils.GetConfigPath(), port, portPac);
-                    var strProxy = $"{Global.httpProtocol}{Global.Loopback}:{portPac}/pac?t={DateTime.Now.Ticks}";
-                    SetIEProxy(false, strProxy, "");
+                    var strProxy = $"{Global.HttpProtocol}{Global.Loopback}:{portPac}/pac?t={DateTime.Now.Ticks}";
+                    ProxySetting.SetProxy(strProxy, "", 4); // use pac script url for auto-config proxy
                 }
 
                 if (type != ESysProxyType.Pac)
@@ -102,7 +87,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
             return true;
         }
@@ -118,115 +103,5 @@ namespace v2rayN.Handler
             {
             }
         }
-
-        public static void SetIEProxy(bool global, string strProxy, string strExceptions)
-        {
-            string arguments = global
-                ? $"global {strProxy} {strExceptions}"
-                : $"pac {strProxy}";
-
-            ExecSysproxy(arguments);
-        }
-
-        // set system proxy to 1 (null) (null) (null)
-        public static bool ResetIEProxy()
-        {
-            try
-            {
-                // 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)
-        {
-            // using event to avoid hanging when redirect standard output/error
-            // ref: https://stackoverflow.com/questions/139593/processstartinfo-hanging-on-waitforexit-why
-            // and http://blog.csdn.net/zhangweixing0/article/details/7356841
-            using AutoResetEvent outputWaitHandle = new(false);
-            using AutoResetEvent errorWaitHandle = new(false);
-            using Process process = new();
-
-            // Configure the process using the StartInfo properties.
-            process.StartInfo.FileName = Utils.GetTempPath("sysproxy.exe");
-            process.StartInfo.Arguments = arguments;
-            process.StartInfo.WorkingDirectory = Utils.GetTempPath();
-            process.StartInfo.WindowStyle = ProcessWindowStyle.Hidden;
-            process.StartInfo.UseShellExecute = false;
-            process.StartInfo.RedirectStandardError = true;
-            process.StartInfo.RedirectStandardOutput = true;
-
-            // Need to provide encoding info, or output/error strings we got will be wrong.
-            process.StartInfo.StandardOutputEncoding = Encoding.Unicode;
-            process.StartInfo.StandardErrorEncoding = Encoding.Unicode;
-
-            process.StartInfo.CreateNoWindow = true;
-
-            StringBuilder output = new(1024);
-            StringBuilder error = new(1024);
-
-            process.OutputDataReceived += (sender, e) =>
-            {
-                if (e.Data == null)
-                {
-                    outputWaitHandle.Set();
-                }
-                else
-                {
-                    output.AppendLine(e.Data);
-                }
-            };
-            process.ErrorDataReceived += (sender, e) =>
-            {
-                if (e.Data == null)
-                {
-                    errorWaitHandle.Set();
-                }
-                else
-                {
-                    error.AppendLine(e.Data);
-                }
-            };
-            try
-            {
-                process.Start();
-
-                process.BeginErrorReadLine();
-                process.BeginOutputReadLine();
-
-                process.WaitForExit();
-            }
-            catch (System.ComponentModel.Win32Exception e)
-            {
-                // log the arguments
-                throw new Exception(process.StartInfo.Arguments);
-            }
-            string stderr = error.ToString();
-            string stdout = output.ToString();
-
-            int exitCode = process.ExitCode;
-            if (exitCode != (int)RET_ERRORS.RET_NO_ERROR)
-            {
-                throw new Exception(stderr);
-            }
-
-            //if (arguments == "query")
-            //{
-            //    if (stdout.IsNullOrWhiteSpace() || stdout.IsNullOrEmpty())
-            //    {
-            //        throw new Exception("failed to query wininet settings");
-            //    }
-            //    _queryStr = stdout;
-            //}
-        }
     }
 }

v2rayN/v2rayN/Handler/TunHandler.cs

@@ -1,358 +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

@@ -6,7 +6,6 @@ using System.Runtime.InteropServices;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Windows;
-using v2rayN.Base;
 using v2rayN.Mode;
 using v2rayN.Resx;
 
@@ -23,11 +22,13 @@ namespace v2rayN.Handler
         {
             public bool Success;
             public string Msg;
+            public string Url;
 
-            public ResultEventArgs(bool success, string msg)
+            public ResultEventArgs(bool success, string msg, string url = "")
             {
                 Success = success;
                 Msg = msg;
+                Url = url;
             }
         }
 
@@ -53,7 +54,7 @@ namespace v2rayN.Handler
                             StartInfo = new ProcessStartInfo
                             {
                                 FileName = "v2rayUpgrade.exe",
-                                Arguments = $"\"{fileName}\"",
+                                Arguments = fileName.AppendQuotes(),
                                 WorkingDirectory = Utils.StartupPath()
                             }
                         };
@@ -82,9 +83,13 @@ namespace v2rayN.Handler
                 if (args.Success)
                 {
                     _updateFunc(false, string.Format(ResUI.MsgParsingSuccessfully, "v2rayN"));
+                    _updateFunc(false, args.Msg);
 
-                    url = args.Msg;
-                    askToDownload(downloadHandle, url, true);
+                    url = args.Url;
+                    AskToDownload(downloadHandle, url, true).ContinueWith(task =>
+                    {
+                        _updateFunc(false, url);
+                    });
                 }
                 else
                 {
@@ -134,8 +139,13 @@ namespace v2rayN.Handler
                 if (args.Success)
                 {
                     _updateFunc(false, string.Format(ResUI.MsgParsingSuccessfully, "Core"));
-                    url = args.Msg;
-                    askToDownload(downloadHandle, url, true);
+                    _updateFunc(false, args.Msg);
+
+                    url = args.Url;
+                    AskToDownload(downloadHandle, url, true).ContinueWith(task =>
+                    {
+                        _updateFunc(false, url);
+                    });
                 }
                 else
                 {
@@ -153,7 +163,7 @@ namespace v2rayN.Handler
             _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)
             {
@@ -174,6 +184,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}");
@@ -213,7 +227,7 @@ namespace v2rayN.Handler
                     //more url
                     if (Utils.IsNullOrEmpty(item.convertTarget) && !Utils.IsNullOrEmpty(item.moreUrl.TrimEx()))
                     {
-                        if (!Utils.IsNullOrEmpty(result) && Utils.IsBase64String(result))
+                        if (!Utils.IsNullOrEmpty(result) && Utils.IsBase64String(result!))
                         {
                             result = Utils.Base64Decode(result);
                         }
@@ -237,7 +251,7 @@ namespace v2rayN.Handler
                             }
                             if (!Utils.IsNullOrEmpty(result2))
                             {
-                                if (Utils.IsBase64String(result2))
+                                if (Utils.IsBase64String(result2!))
                                 {
                                     result += Utils.Base64Decode(result2);
                                 }
@@ -261,11 +275,11 @@ namespace v2rayN.Handler
                             _updateFunc(false, $"{hashCode}{result}");
                         }
 
-                        int ret = ConfigHandler.AddBatchServers(ref config, result, id, true);
+                        int ret = ConfigHandler.AddBatchServers(config, result, id, true);
                         if (ret <= 0)
                         {
-                            Utils.SaveLog("FailedImportSubscription");
-                            Utils.SaveLog(result);
+                            Logging.SaveLog("FailedImportSubscription");
+                            Logging.SaveLog(result);
                         }
                         _updateFunc(false,
                             ret > 0
@@ -279,11 +293,273 @@ namespace v2rayN.Handler
             });
         }
 
-        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
+                {
+                    Logging.SaveLog("StatusCode error: " + url);
+                    return;
+                }
+            }
+            catch (Exception ex)
+            {
+                Logging.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.ToString());
+                    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.AppendQuotes();
+                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:
+                    case ECoreType.mihomo:
+                        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)
+            {
+                Logging.SaveLog(ex.Message, ex);
+                _updateFunc(false, ex.Message);
+                return new SemanticVersion("");
+            }
+        }
+
+        private void responseHandler(ECoreType type, string gitHubReleaseApi, bool preRelease)
+        {
+            try
+            {
+                var gitHubReleases = JsonUtils.Deserialize<List<GitHubRelease>>(gitHubReleaseApi);
+                var gitHubRelease = preRelease ? gitHubReleases!.First() : gitHubReleases!.First(r => r.Prerelease == false);
+                var version = new SemanticVersion(gitHubRelease!.TagName);
+                var body = gitHubRelease!.Body;
+
+                var 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, type, 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:
+                    case ECoreType.mihomo:
+                        {
+                            curVersion = getCoreVersion(type);
+                            message = string.Format(ResUI.IsLatestCore, type, 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, type, 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, type, 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 && version != new SemanticVersion(0, 0, 0))
+                {
+                    AbsoluteCompleted?.Invoke(this, new ResultEventArgs(false, message));
+                    return;
+                }
+
+                AbsoluteCompleted?.Invoke(this, new ResultEventArgs(true, body, url));
+            }
+            catch (Exception ex)
+            {
+                Logging.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;
-            var url = string.Format(Global.geoUrl, geoName);
+            var url = string.Format(Global.GeoUrl, geoName);
 
             DownloadHandle downloadHandle = new();
             downloadHandle.UpdateCompleted += (sender2, args) =>
@@ -323,271 +599,55 @@ 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 += async (sender2, args) =>
             {
-                var time = (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))
+                if (args.Success)
                 {
-                    responseHandler(type, result, preRelease);
+                    _updateFunc(false, string.Format(ResUI.MsgDownloadGeoFileSuccessfully, geoName));
+                    var coreHandler = Locator.Current.GetService<CoreHandler>();
+
+                    try
+                    {
+                        if (needStop)
+                        {
+                            coreHandler?.CoreStop();
+                            await Task.Delay(3000);
+                        }
+                        string fileName = Utils.GetTempPath(Utils.GetDownloadFileName(url));
+                        if (File.Exists(fileName))
+                        {
+                            string targetPath = Utils.GetConfigPath($"{geoName}.db");
+                            File.Copy(fileName, targetPath, true);
+
+                            File.Delete(fileName);
+                        }
+                        if (needStop) coreHandler?.LoadCore();
+                    }
+                    catch (Exception ex)
+                    {
+                        _updateFunc(false, ex.Message);
+                    }
                 }
                 else
                 {
-                    Utils.SaveLog("StatusCode error: " + url);
-                    return;
+                    _updateFunc(false, args.Msg);
                 }
-            }
-            catch (Exception ex)
+            };
+            downloadHandle.Error += (sender2, args) =>
             {
-                Utils.SaveLog(ex.Message, ex);
-                _updateFunc(false, ex.Message);
-            }
-        }
-
-        /// <summary>
-        /// 获取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);
-            }
+                _updateFunc(false, args.GetException().Message);
+            };
+            await AskToDownload(downloadHandle, url, false);
         }
 
         #endregion private

v2rayN/v2rayN/Mode/Config.cs

@@ -10,14 +10,6 @@
 
         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; }
@@ -35,6 +27,8 @@
         public UIItem uiItem { get; set; }
         public ConstItem constItem { get; set; }
         public SpeedTestItem speedTestItem { get; set; }
+        public Mux4SboxItem mux4SboxItem { get; set; }
+        public HysteriaItem hysteriaItem { get; set; }
         public List<InItem> inbound { get; set; }
         public List<KeyEventItem> globalHotkeys { get; set; }
         public List<CoreTypeItem> coreTypeItem { get; set; }

v2rayN/v2rayN/Mode/ConfigItems.cs

@@ -88,8 +88,6 @@ namespace v2rayN.Mode
 
         public bool enableStatistics { get; set; }
 
-        public int statisticsFreshRate { get; set; }
-
         public bool keepOlderDedupl { get; set; }
 
         public bool ignoreGeoUpdateCore { get; set; } = true;
@@ -111,11 +109,13 @@ namespace v2rayN.Mode
     public class UIItem
     {
         public bool enableAutoAdjustMainLvColWidth { get; set; }
+        public bool enableUpdateSubOnlyRemarksExist { get; set; }
         public double mainWidth { get; set; }
         public double mainHeight { get; set; }
         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; }
@@ -124,7 +124,6 @@ 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; }
     }
 
@@ -161,19 +160,11 @@ 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 bool strictRoute { get; set; } = true;
         public string stack { get; set; }
         public int mtu { get; set; }
-        public string customTemplate { 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; }
+        public bool enableExInbound { get; set; }
+        public bool enableIPv6Address { get; set; } = true;
     }
 
     [Serializable]
@@ -192,6 +183,8 @@ 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; }
@@ -204,4 +197,18 @@ namespace v2rayN.Mode
         public int Width { get; set; }
         public int Index { get; set; }
     }
+
+    [Serializable]
+    public class Mux4SboxItem
+    {
+        public string protocol { get; set; }
+        public int max_connections { get; set; }
+    }
+
+    [Serializable]
+    public class HysteriaItem
+    {
+        public int up_mbps { get; set; }
+        public int down_mbps { get; set; }
+    }
 }

v2rayN/v2rayN/Mode/DNSItem.cs

@@ -0,0 +1,19 @@
+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 bool useSystemHosts { get; set; }
+        public string? normalDNS { get; set; }
+        public string? tunDNS { get; set; }
+        public string? domainStrategy4Freedom { get; set; }
+    }
+}

v2rayN/v2rayN/Mode/EConfigType.cs

@@ -7,6 +7,9 @@
         Shadowsocks = 3,
         Socks = 4,
         VLESS = 5,
-        Trojan = 6
+        Trojan = 6,
+        Hysteria2 = 7,
+        Tuic = 8,
+        Wireguard = 9
     }
 }

v2rayN/v2rayN/Mode/ECoreType.cs

@@ -8,10 +8,13 @@
         v2fly_v5 = 4,
         clash = 11,
         clash_meta = 12,
+        mihomo = 13,
         hysteria = 21,
         naiveproxy = 22,
         tuic = 23,
         sing_box = 24,
+        juicity = 25,
+        hysteria2 = 26,
         v2rayN = 99
     }
 }

v2rayN/v2rayN/Mode/EServerColName.cs

@@ -7,7 +7,6 @@
         remarks,
         address,
         port,
-        security,
         network,
         streamSecurity,
         subRemarks,

v2rayN/v2rayN/Mode/ESpeedActionType.cs

@@ -2,7 +2,6 @@
 {
     public enum ESpeedActionType
     {
-        Ping,
         Tcping,
         Realping,
         Speedtest,

v2rayN/v2rayN/Mode/GitHubRelease.cs

@@ -1,68 +1,68 @@
-using Newtonsoft.Json;
+using System.Text.Json.Serialization;
 
 namespace v2rayN.Mode
 {
     public class GitHubReleaseAsset
     {
-        [JsonProperty("url")] public string Url { get; set; }
+        [JsonPropertyName("url")] public string Url { get; set; }
 
-        [JsonProperty("id")] public int Id { get; set; }
+        [JsonPropertyName("id")] public int Id { get; set; }
 
-        [JsonProperty("node_id")] public string NodeId { get; set; }
+        [JsonPropertyName("node_id")] public string NodeId { get; set; }
 
-        [JsonProperty("name")] public string Name { get; set; }
+        [JsonPropertyName("name")] public string Name { get; set; }
 
-        [JsonProperty("label")] public object Label { get; set; }
+        [JsonPropertyName("label")] public object Label { get; set; }
 
-        [JsonProperty("content_type")] public string ContentType { get; set; }
+        [JsonPropertyName("content_type")] public string ContentType { get; set; }
 
-        [JsonProperty("state")] public string State { get; set; }
+        [JsonPropertyName("state")] public string State { get; set; }
 
-        [JsonProperty("size")] public int Size { get; set; }
+        [JsonPropertyName("size")] public int Size { get; set; }
 
-        [JsonProperty("download_count")] public int DownloadCount { get; set; }
+        [JsonPropertyName("download_count")] public int DownloadCount { get; set; }
 
-        [JsonProperty("created_at")] public DateTime CreatedAt { get; set; }
+        [JsonPropertyName("created_at")] public DateTime CreatedAt { get; set; }
 
-        [JsonProperty("updated_at")] public DateTime UpdatedAt { get; set; }
+        [JsonPropertyName("updated_at")] public DateTime UpdatedAt { get; set; }
 
-        [JsonProperty("browser_download_url")] public string BrowserDownloadUrl { get; set; }
+        [JsonPropertyName("browser_download_url")] public string BrowserDownloadUrl { get; set; }
     }
 
     public class GitHubRelease
     {
-        [JsonProperty("url")] public string Url { get; set; }
+        [JsonPropertyName("url")] public string Url { get; set; }
 
-        [JsonProperty("assets_url")] public string AssetsUrl { get; set; }
+        [JsonPropertyName("assets_url")] public string AssetsUrl { get; set; }
 
-        [JsonProperty("upload_url")] public string UploadUrl { get; set; }
+        [JsonPropertyName("upload_url")] public string UploadUrl { get; set; }
 
-        [JsonProperty("html_url")] public string HtmlUrl { get; set; }
+        [JsonPropertyName("html_url")] public string HtmlUrl { get; set; }
 
-        [JsonProperty("id")] public int Id { get; set; }
+        [JsonPropertyName("id")] public int Id { get; set; }
 
-        [JsonProperty("node_id")] public string NodeId { get; set; }
+        [JsonPropertyName("node_id")] public string NodeId { get; set; }
 
-        [JsonProperty("tag_name")] public string TagName { get; set; }
+        [JsonPropertyName("tag_name")] public string TagName { get; set; }
 
-        [JsonProperty("target_commitish")] public string TargetCommitish { get; set; }
+        [JsonPropertyName("target_commitish")] public string TargetCommitish { get; set; }
 
-        [JsonProperty("name")] public string Name { get; set; }
+        [JsonPropertyName("name")] public string Name { get; set; }
 
-        [JsonProperty("draft")] public bool Draft { get; set; }
+        [JsonPropertyName("draft")] public bool Draft { get; set; }
 
-        [JsonProperty("prerelease")] public bool Prerelease { get; set; }
+        [JsonPropertyName("prerelease")] public bool Prerelease { get; set; }
 
-        [JsonProperty("created_at")] public DateTime CreatedAt { get; set; }
+        [JsonPropertyName("created_at")] public DateTime CreatedAt { get; set; }
 
-        [JsonProperty("published_at")] public DateTime PublishedAt { get; set; }
+        [JsonPropertyName("published_at")] public DateTime PublishedAt { get; set; }
 
-        [JsonProperty("assets")] public List<GitHubReleaseAsset> Assets { get; set; }
+        [JsonPropertyName("assets")] public List<GitHubReleaseAsset> Assets { get; set; }
 
-        [JsonProperty("tarball_url")] public string TarballUrl { get; set; }
+        [JsonPropertyName("tarball_url")] public string TarballUrl { get; set; }
 
-        [JsonProperty("zipball_url")] public string ZipballUrl { get; set; }
+        [JsonPropertyName("zipball_url")] public string ZipballUrl { get; set; }
 
-        [JsonProperty("body")] public string Body { get; set; }
+        [JsonPropertyName("body")] public string Body { get; set; }
     }
 }

v2rayN/v2rayN/Mode/ProfileItem.cs

@@ -1,5 +1,4 @@
 using SQLite;
-using v2rayN.Base;
 
 namespace v2rayN.Mode
 {
@@ -48,16 +47,12 @@ namespace v2rayN.Mode
             }
             switch (configType)
             {
-                case EConfigType.VMess:
-                case EConfigType.Shadowsocks:
-                case EConfigType.Socks:
-                case EConfigType.VLESS:
-                case EConfigType.Trojan:
-                    summary += string.Format("{0}({1}:{2})", remarks, addr, port);
+                case EConfigType.Custom:
+                    summary += string.Format("{0}", remarks);
                     break;
 
                 default:
-                    summary += string.Format("{0}", remarks);
+                    summary += string.Format("{0}({1}:{2})", remarks, addr, port);
                     break;
             }
             return summary;
@@ -77,7 +72,7 @@ namespace v2rayN.Mode
 
         public string GetNetwork()
         {
-            if (Utils.IsNullOrEmpty(network) || !Global.networks.Contains(network))
+            if (Utils.IsNullOrEmpty(network) || !Global.Networks.Contains(network))
             {
                 return Global.DefaultNetwork;
             }

v2rayN/v2rayN/Mode/RoutingItem.cs

@@ -16,6 +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/RulesItem.cs

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

v2rayN/v2rayN/Mode/ServerSpeedItem.cs

@@ -23,4 +23,18 @@
             get; set;
         }
     }
+
+    [Serializable]
+    public class TrafficItem
+    {
+        public ulong up
+        {
+            get; set;
+        }
+
+        public ulong down
+        {
+            get; set;
+        }
+    }
 }

v2rayN/v2rayN/Mode/SingboxConfig.cs

@@ -0,0 +1,231 @@
+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 congestion_control { get; set; }
+        public string? version { get; set; }
+        public string? network { get; set; }
+        public string? packet_encoding { get; set; }
+        public string[]? local_address { get; set; }
+        public string? private_key { get; set; }
+        public string? peer_public_key { get; set; }
+        public int[]? reserved { get; set; }
+        public int? mtu { get; set; }
+        public Tls4Sbox tls { get; set; }
+        public Multiplex4Sbox multiplex { get; set; }
+        public Transport4Sbox transport { get; set; }
+        public HyObfs4Sbox obfs { get; set; }
+    }
+
+    public 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 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 HyObfs4Sbox
+    {
+        public string? type { get; set; }
+        public string? password { 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 CacheFile4Sbox? cache_file { get; set; }
+        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; }
+    }
+
+    public class CacheFile4Sbox
+    {
+        public bool enabled { get; set; }
+        public string? path { get; set; }
+        public string? cache_id { get; set; }
+        public bool? store_fakeip { get; set; }
+    }
+}

v2rayN/v2rayN/Mode/SubItem.cs

@@ -27,5 +27,9 @@ namespace v2rayN.Mode
         public long updateTime { get; set; }
 
         public string? convertTarget { get; set; }
+
+        public string? prevProfile { get; set; }
+
+        public string? nextProfile { get; set; }
     }
 }

v2rayN/v2rayN/Mode/V2rayConfig.cs

@@ -1,38 +1,37 @@
-using Newtonsoft.Json;
+using System.Text.Json.Serialization;
 
 namespace v2rayN.Mode
 {
     /// <summary>
-    /// v2ray配置文件实体类
-    /// 例子SampleConfig.txt
+    /// v2ray配置文件实体类 例子SampleConfig.txt
     /// </summary>
     public class V2rayConfig
     {
         /// <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 { get; set; }
 
         /// <summary>
         /// DNS 配置
@@ -42,30 +41,30 @@ namespace v2rayN.Mode
         /// <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 { get; set; }
     }
 
-    public class SystemPolicy
+    public class SystemPolicy4Ray
     {
-        public bool statsOutboundUplink;
-        public bool statsOutboundDownlink;
+        public bool statsOutboundUplink { get; set; }
+        public bool statsOutboundDownlink { get; set; }
     }
 
-    public class Log
+    public class Log4Ray
     {
         /// <summary>
         ///
@@ -83,7 +82,7 @@ namespace v2rayN.Mode
         public string loglevel { get; set; }
     }
 
-    public class Inbounds
+    public class Inbounds4Ray
     {
         public string tag { get; set; }
 
@@ -105,20 +104,20 @@ namespace v2rayN.Mode
         /// <summary>
         ///
         /// </summary>
-        public Sniffing sniffing { get; set; }
+        public Sniffing4Ray sniffing { get; set; }
 
         /// <summary>
         ///
         /// </summary>
-        public Inboundsettings settings { get; set; }
+        public Inboundsettings4Ray settings { get; set; }
 
         /// <summary>
         ///
         /// </summary>
-        public StreamSettings streamSettings { get; set; }
+        public StreamSettings4Ray streamSettings { get; set; }
     }
 
-    public class Inboundsettings
+    public class Inboundsettings4Ray
     {
         /// <summary>
         ///
@@ -143,7 +142,7 @@ namespace v2rayN.Mode
         /// <summary>
         ///
         /// </summary>
-        public List<UsersItem> clients { get; set; }
+        public List<UsersItem4Ray> clients { get; set; }
 
         /// <summary>
         /// VLESS
@@ -152,10 +151,10 @@ 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>
         ///
@@ -185,17 +184,17 @@ 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
@@ -210,35 +209,35 @@ namespace v2rayN.Mode
         /// <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; }
+        public List<ServersItem4Ray> servers { get; set; }
 
         /// <summary>
         ///
         /// </summary>
-        public Response response { get; set; }
+        public Response4Ray response { get; set; }
 
         /// <summary>
         ///
@@ -251,7 +250,7 @@ namespace v2rayN.Mode
         public int? userLevel { get; set; }
     }
 
-    public class VnextItem
+    public class VnextItem4Ray
     {
         /// <summary>
         ///
@@ -266,10 +265,10 @@ namespace v2rayN.Mode
         /// <summary>
         ///
         /// </summary>
-        public List<UsersItem> users { get; set; }
+        public List<UsersItem4Ray> users { get; set; }
     }
 
-    public class ServersItem
+    public class ServersItem4Ray
     {
         /// <summary>
         ///
@@ -314,10 +313,10 @@ namespace v2rayN.Mode
         /// <summary>
         ///
         /// </summary>
-        public List<SocksUsersItem> users { get; set; }
+        public List<SocksUsersItem4Ray> users { get; set; }
     }
 
-    public class SocksUsersItem
+    public class SocksUsersItem4Ray
     {
         /// <summary>
         ///
@@ -335,7 +334,7 @@ namespace v2rayN.Mode
         public int level { get; set; }
     }
 
-    public class Mux
+    public class Mux4Ray
     {
         /// <summary>
         ///
@@ -348,7 +347,7 @@ namespace v2rayN.Mode
         public int concurrency { get; set; }
     }
 
-    public class Response
+    public class Response4Ray
     {
         /// <summary>
         ///
@@ -356,7 +355,7 @@ namespace v2rayN.Mode
         public string type { get; set; }
     }
 
-    public class Dns
+    public class Dns4Ray
     {
         /// <summary>
         ///
@@ -364,7 +363,7 @@ namespace v2rayN.Mode
         public List<string> servers { get; set; }
     }
 
-    public class Routing
+    public class Routing4Ray
     {
         /// <summary>
         ///
@@ -379,10 +378,28 @@ namespace v2rayN.Mode
         /// <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>
         ///
@@ -397,45 +414,50 @@ namespace v2rayN.Mode
         /// <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; }
+
+        /// <summary>
+        /// sockopt
+        /// </summary>
+        public Sockopt4Ray? sockopt { get; set; }
     }
 
-    public class TlsSettings
+    public class TlsSettings4Ray
     {
         /// <summary>
         /// 是否允许不安全连接（用于客户端）
@@ -460,15 +482,15 @@ namespace v2rayN.Mode
         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>
         /// 伪装
@@ -486,7 +508,7 @@ namespace v2rayN.Mode
         public object response { get; set; }
     }
 
-    public class KcpSettings
+    public class KcpSettings4Ray
     {
         /// <summary>
         ///
@@ -526,7 +548,7 @@ namespace v2rayN.Mode
         /// <summary>
         ///
         /// </summary>
-        public Header header { get; set; }
+        public Header4Ray header { get; set; }
 
         /// <summary>
         ///
@@ -534,7 +556,7 @@ namespace v2rayN.Mode
         public string seed { get; set; }
     }
 
-    public class WsSettings
+    public class WsSettings4Ray
     {
         /// <summary>
         ///
@@ -544,10 +566,10 @@ namespace v2rayN.Mode
         /// <summary>
         ///
         /// </summary>
-        public Headers headers { get; set; }
+        public Headers4Ray headers { get; set; }
     }
 
-    public class Headers
+    public class Headers4Ray
     {
         /// <summary>
         ///
@@ -557,11 +579,11 @@ namespace v2rayN.Mode
         /// <summary>
         /// 用户代理
         /// </summary>
-        [JsonProperty("User-Agent")]
+        [JsonPropertyName("User-Agent")]
         public string UserAgent { get; set; }
     }
 
-    public class HttpSettings
+    public class HttpSettings4Ray
     {
         /// <summary>
         ///
@@ -574,7 +596,7 @@ namespace v2rayN.Mode
         public List<string> host { get; set; }
     }
 
-    public class QuicSettings
+    public class QuicSettings4Ray
     {
         /// <summary>
         ///
@@ -589,10 +611,10 @@ namespace v2rayN.Mode
         /// <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; }
@@ -602,7 +624,7 @@ namespace v2rayN.Mode
         public int initial_windows_size { get; set; }
     }
 
-    public class AccountsItem
+    public class AccountsItem4Ray
     {
         /// <summary>
         ///
@@ -614,4 +636,9 @@ namespace v2rayN.Mode
         /// </summary>
         public string pass { get; set; }
     }
+
+    public class Sockopt4Ray
+    {
+        public string? dialerProxy { get; set; }
+    }
 }

v2rayN/v2rayN/Mode/VmessQRCode.cs

@@ -1,4 +1,6 @@
-namespace v2rayN.Mode
+using System.Text.Json.Serialization;
+
+namespace v2rayN.Mode
 {
     /// <summary>
     /// https://github.com/2dust/v2rayN/wiki/
@@ -6,79 +8,37 @@
     [Serializable]
     internal class VmessQRCode
     {
-        /// <summary>
-        ///
-        /// </summary>
-        public string v { get; set; } = string.Empty;
+        [JsonNumberHandling(JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+        public int v { get; set; } = 2;
 
-        /// <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;
+        [JsonNumberHandling(JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+        public int port { get; set; } = 0;
 
-        /// <summary>
-        ///
-        /// </summary>
         public string id { get; set; } = string.Empty;
 
-        /// <summary>
-        ///
-        /// </summary>
-        public string aid { get; set; } = string.Empty;
+        [JsonNumberHandling(JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+        public int aid { get; set; } = 0;
 
-        /// <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/Properties/Resources.Designer.cs

@@ -219,25 +219,5 @@ namespace v2rayN.Properties {
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
-        
-        /// <summary>
-        ///   查找 System.Byte[] 类型的本地化资源。
-        /// </summary>
-        internal static byte[] sysproxy_exe {
-            get {
-                object obj = ResourceManager.GetObject("sysproxy_exe", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   查找 System.Byte[] 类型的本地化资源。
-        /// </summary>
-        internal static byte[] sysproxy64_exe {
-            get {
-                object obj = ResourceManager.GetObject("sysproxy64_exe", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
     }
 }

v2rayN/v2rayN/Properties/Resources.resx

@@ -118,12 +118,6 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="sysproxy_exe" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\resources\sysproxy.exe.gz;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="sysproxy64_exe" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\resources\sysproxy64.exe.gz;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
   <data name="NotifyIcon1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\NotifyIcon1.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>

v2rayN/v2rayN/Resx/ResUI.Designer.cs

@@ -169,7 +169,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似  Failed to get the default configuration 的本地化字符串。
+        ///   查找类似 Failed to get the default configuration 的本地化字符串。
         /// </summary>
         public static string FailedGetDefaultConfiguration {
             get {
@@ -286,7 +286,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似  is not the correct client configuration file, please check 的本地化字符串。
+        ///   查找类似 Is not the correct client configuration file, please check 的本地化字符串。
         /// </summary>
         public static string IncorrectClientConfiguration {
             get {
@@ -295,7 +295,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似  is not the correct configuration, please check 的本地化字符串。
+        ///   查找类似 Is not the correct configuration, please check 的本地化字符串。
         /// </summary>
         public static string Incorrectconfiguration {
             get {
@@ -304,7 +304,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似  is not the correct server configuration file, please check 的本地化字符串。
+        ///   查找类似 Is not the correct server configuration file, please check 的本地化字符串。
         /// </summary>
         public static string IncorrectServerConfiguration {
             get {
@@ -322,7 +322,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 {0} already up to date. 的本地化字符串。
+        ///   查找类似 {0} {1} already up to date. 的本地化字符串。
         /// </summary>
         public static string IsLatestCore {
             get {
@@ -331,7 +331,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 {0} already up to date. 的本地化字符串。
+        ///   查找类似 {0} {1} already up to date. 的本地化字符串。
         /// </summary>
         public static string IsLatestN {
             get {
@@ -447,6 +447,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Next proxy remarks 的本地化字符串。
+        /// </summary>
+        public static string LvNextProfile {
+            get {
+                return ResourceManager.GetString("LvNextProfile", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Port 的本地化字符串。
         /// </summary>
@@ -456,6 +465,24 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Previous proxy remakrs 的本地化字符串。
+        /// </summary>
+        public static string LvPrevProfile {
+            get {
+                return ResourceManager.GetString("LvPrevProfile", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Please make sure the remarks exists and is unique 的本地化字符串。
+        /// </summary>
+        public static string LvPrevProfileTip {
+            get {
+                return ResourceManager.GetString("LvPrevProfileTip", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Remarks 的本地化字符串。
         /// </summary>
@@ -591,6 +618,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Add [Hysteria2] server 的本地化字符串。
+        /// </summary>
+        public static string menuAddHysteria2Server {
+            get {
+                return ResourceManager.GetString("menuAddHysteria2Server", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Import bulk URL from clipboard (Ctrl+V) 的本地化字符串。
         /// </summary>
@@ -636,6 +672,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Add [Tuic] server 的本地化字符串。
+        /// </summary>
+        public static string menuAddTuicServer {
+            get {
+                return ResourceManager.GetString("menuAddTuicServer", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Add [VLESS] server 的本地化字符串。
         /// </summary>
@@ -654,6 +699,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Add [Wireguard] server 的本地化字符串。
+        /// </summary>
+        public static string menuAddWireguardServer {
+            get {
+                return ResourceManager.GetString("menuAddWireguardServer", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Check Update 的本地化字符串。
         /// </summary>
@@ -690,6 +744,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 DNS Settings 的本地化字符串。
+        /// </summary>
+        public static string menuDNSSetting {
+            get {
+                return ResourceManager.GetString("menuDNSSetting", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Edit Server (Ctrl+D) 的本地化字符串。
         /// </summary>
@@ -717,15 +780,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>
@@ -915,15 +969,6 @@ namespace v2rayN.Resx {
             }
         }
         
-        /// <summary>
-        ///   查找类似 Test servers ping (Ctrl+P) 的本地化字符串。
-        /// </summary>
-        public static string menuPingServer {
-            get {
-                return ResourceManager.GetString("menuPingServer", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 Promotion 的本地化字符串。
         /// </summary>
@@ -1015,7 +1060,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Remove selected 的本地化字符串。
+        ///   查找类似 Remove selected (Delete) 的本地化字符串。
         /// </summary>
         public static string menuRoutingAdvancedRemove {
             get {
@@ -1024,7 +1069,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Set as active rule 的本地化字符串。
+        ///   查找类似 Set as active rule(Enter) 的本地化字符串。
         /// </summary>
         public static string menuRoutingAdvancedSetDefault {
             get {
@@ -1105,7 +1150,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Remove Rules 的本地化字符串。
+        ///   查找类似 Remove Rules (Delete) 的本地化字符串。
         /// </summary>
         public static string menuRuleRemove {
             get {
@@ -1474,7 +1519,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 is unpacking... 的本地化字符串。
+        ///   查找类似 Is unpacking...... 的本地化字符串。
         /// </summary>
         public static string MsgUnpacking {
             get {
@@ -1528,7 +1573,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似  non-standard service, this feature is invalid 的本地化字符串。
+        ///   查找类似 Non-standard service, this feature is invalid 的本地化字符串。
         /// </summary>
         public static string NonVmessService {
             get {
@@ -1564,7 +1609,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似  operation failed, please check and retry 的本地化字符串。
+        ///   查找类似 Operation failed, please check and retry 的本地化字符串。
         /// </summary>
         public static string OperationFailed {
             get {
@@ -1699,16 +1744,7 @@ 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↓ 的本地化字符串。
+        ///   查找类似 {0} : {1}/s↑ | {2}/s↓ 的本地化字符串。
         /// </summary>
         public static string SpeedDisplayText {
             get {
@@ -1744,7 +1780,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Waiting for testing 的本地化字符串。
+        ///   查找类似 Waiting for testing...... 的本地化字符串。
         /// </summary>
         public static string SpeedtestingWait {
             get {
@@ -1781,7 +1817,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Custom configuration server imported successfully. 的本地化字符串。
+        ///   查找类似 Custom configuration server imported successfully 的本地化字符串。
         /// </summary>
         public static string SuccessfullyImportedCustomServer {
             get {
@@ -1790,7 +1826,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 {0} servers have been imported from clipboard. 的本地化字符串。
+        ///   查找类似 {0} servers have been imported from clipboard 的本地化字符串。
         /// </summary>
         public static string SuccessfullyImportedServerViaClipboard {
             get {
@@ -1862,7 +1898,16 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Domain and ip are auto sorted when saving 的本地化字符串。
+        ///   查找类似 Auto ScrollToEnd 的本地化字符串。
+        /// </summary>
+        public static string TbAutoScrollToEnd {
+            get {
+                return ResourceManager.GetString("TbAutoScrollToEnd", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Domain, ip, process are auto sorted when saving 的本地化字符串。
         /// </summary>
         public static string TbAutoSort {
             get {
@@ -1934,7 +1979,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Support DnsObject 的本地化字符串。
+        ///   查找类似 Support DnsObject, Click to view the document 的本地化字符串。
         /// </summary>
         public static string TbDnsObjectDoc {
             get {
@@ -1942,6 +1987,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>
@@ -1960,6 +2014,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 sing-box domain strategy 的本地化字符串。
+        /// </summary>
+        public static string TbdomainStrategy4Singbox {
+            get {
+                return ResourceManager.GetString("TbdomainStrategy4Singbox", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Edit 的本地化字符串。
         /// </summary>
@@ -2041,6 +2104,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Congestion control 的本地化字符串。
+        /// </summary>
+        public static string TbHeaderType8 {
+            get {
+                return ResourceManager.GetString("TbHeaderType8", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 UUID(id) 的本地化字符串。
         /// </summary>
@@ -2077,6 +2149,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Address(Ip,Ipv6) 的本地化字符串。
+        /// </summary>
+        public static string TbLocalAddress {
+            get {
+                return ResourceManager.GetString("TbLocalAddress", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Transport protocol(network) 的本地化字符串。
         /// </summary>
@@ -2104,6 +2185,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 obfs password 的本地化字符串。
+        /// </summary>
+        public static string TbPath7 {
+            get {
+                return ResourceManager.GetString("TbPath7", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Port 的本地化字符串。
         /// </summary>
@@ -2122,6 +2212,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 PrivateKey 的本地化字符串。
+        /// </summary>
+        public static string TbPrivateKey {
+            get {
+                return ResourceManager.GetString("TbPrivateKey", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 PublicKey 的本地化字符串。
         /// </summary>
@@ -2149,6 +2248,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Reserved(2,3,4) 的本地化字符串。
+        /// </summary>
+        public static string TbReserved {
+            get {
+                return ResourceManager.GetString("TbReserved", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Reset 的本地化字符串。
         /// </summary>
@@ -2158,6 +2266,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>
@@ -2203,6 +2338,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 (Domain or IP or ProcName) and Port and Protocol and InboundTag =&gt; OutboundTag 的本地化字符串。
+        /// </summary>
+        public static string TbRuleMatchingTips {
+            get {
+                return ResourceManager.GetString("TbRuleMatchingTips", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Ruleobject Doc 的本地化字符串。
         /// </summary>
@@ -2257,6 +2401,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>
@@ -2285,7 +2438,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Automatic update interval of and Geo (hours) 的本地化字符串。
+        ///   查找类似 Automatic update interval of Geo (hours) 的本地化字符串。
         /// </summary>
         public static string TbSettingsAutoUpdateInterval {
             get {
@@ -2321,7 +2474,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Core: DNS settings 的本地化字符串。
+        ///   查找类似 V2ray DNS settings 的本地化字符串。
         /// </summary>
         public static string TbSettingsCoreDns {
             get {
@@ -2329,6 +2482,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>
@@ -2357,7 +2519,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Copy the font TTF file to the directory guiFonts, restart the settings 的本地化字符串。
+        ///   查找类似 Copy the font TTF/TTC file to the directory guiFonts, restart the settings 的本地化字符串。
         /// </summary>
         public static string TbSettingsCurrentFontFamilyTip {
             get {
@@ -2446,6 +2608,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Enable additional Inbound 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsEnableExInbound {
+            get {
+                return ResourceManager.GetString("TbSettingsEnableExInbound", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Enable hardware acceleration(Require restart) 的本地化字符串。
         /// </summary>
@@ -2455,6 +2626,24 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Enable IPv6 Address 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsEnableIPv6Address {
+            get {
+                return ResourceManager.GetString("TbSettingsEnableIPv6Address", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Updating subscription, only determine remarks exists 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsEnableUpdateSubOnlyRemarksExist {
+            get {
+                return ResourceManager.GetString("TbSettingsEnableUpdateSubOnlyRemarksExist", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Exception 的本地化字符串。
         /// </summary>
@@ -2473,6 +2662,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Follow System Theme 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsFollowSystemTheme {
+            get {
+                return ResourceManager.GetString("TbSettingsFollowSystemTheme", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 FontSize 的本地化字符串。
         /// </summary>
@@ -2491,6 +2689,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Hysteria Max bandwidth (Up/Dw) 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsHysteriaBandwidth {
+            get {
+                return ResourceManager.GetString("TbSettingsHysteriaBandwidth", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Ignore Geo files when updating core 的本地化字符串。
         /// </summary>
@@ -2545,6 +2752,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>
@@ -2635,6 +2851,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Speed Ping Test Url 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsSpeedPingTestUrl {
+            get {
+                return ResourceManager.GetString("TbSettingsSpeedPingTestUrl", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 SpeedTest Single Timeout Value 的本地化字符串。
         /// </summary>
@@ -2680,15 +2905,6 @@ namespace v2rayN.Resx {
             }
         }
         
-        /// <summary>
-        ///   查找类似 Statistics freshrate (second) 的本地化字符串。
-        /// </summary>
-        public static string TbSettingsStatisticsFreshRate {
-            get {
-                return ResourceManager.GetString("TbSettingsStatisticsFreshRate", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 Subscription conversion Url 的本地化字符串。
         /// </summary>
@@ -2743,15 +2959,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>
@@ -2833,6 +3040,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Use System Hosts 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsUseSystemHosts {
+            get {
+                return ResourceManager.GetString("TbSettingsUseSystemHosts", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 ShortId 的本地化字符串。
         /// </summary>
@@ -2924,7 +3140,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

@@ -187,10 +187,10 @@
     <value>پیکربندی اولیه</value>
   </data>
   <data name="IsLatestCore" xml:space="preserve">
-    <value>{0} در حال حاضر به روز است.</value>
+    <value>{0} {1} در حال حاضر به روز است.</value>
   </data>
   <data name="IsLatestN" xml:space="preserve">
-    <value>{0} در حال حاضر به روز است.</value>
+    <value>{0} {1} در حال حاضر به روز است.</value>
   </data>
   <data name="LvAddress" xml:space="preserve">
     <value>آدرس</value>
@@ -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>
@@ -532,9 +529,6 @@
   <data name="menuClearServerStatistics" xml:space="preserve">
     <value>تمام آمار خدمات را پاک کنید</value>
   </data>
-  <data name="menuPingServer" xml:space="preserve">
-    <value>تست پینگ سرورها (Ctrl+P)</value>
-  </data>
   <data name="menuRealPingServer" xml:space="preserve">
     <value>آزمایش سرورها با تاخیر واقعی (Ctrl+R)</value>
   </data>
@@ -553,9 +547,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 +698,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 +722,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 +790,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

@@ -148,7 +148,7 @@
     <value>Failed to generate default configuration file</value>
   </data>
   <data name="FailedGetDefaultConfiguration" xml:space="preserve">
-    <value> Failed to get the default configuration</value>
+    <value>Failed to get the default configuration</value>
   </data>
   <data name="FailedImportedCustomServer" xml:space="preserve">
     <value>Failed to import custom configuration server</value>
@@ -175,22 +175,22 @@
     <value>Please fill in the user ID</value>
   </data>
   <data name="IncorrectClientConfiguration" xml:space="preserve">
-    <value> is not the correct client configuration file, please check</value>
+    <value>Is not the correct client configuration file, please check</value>
   </data>
   <data name="Incorrectconfiguration" xml:space="preserve">
-    <value> is not the correct configuration, please check</value>
+    <value>Is not the correct configuration, please check</value>
   </data>
   <data name="IncorrectServerConfiguration" xml:space="preserve">
-    <value> is not the correct server configuration file, please check</value>
+    <value>Is not the correct server configuration file, please check</value>
   </data>
   <data name="InitialConfiguration" xml:space="preserve">
     <value>Initial Configuration</value>
   </data>
   <data name="IsLatestCore" xml:space="preserve">
-    <value>{0} already up to date.</value>
+    <value>{0} {1} already up to date.</value>
   </data>
   <data name="IsLatestN" xml:space="preserve">
-    <value>{0} already up to date.</value>
+    <value>{0} {1} already up to date.</value>
   </data>
   <data name="LvAddress" xml:space="preserve">
     <value>Address</value>
@@ -250,7 +250,7 @@
     <value>Invalid subscription content</value>
   </data>
   <data name="MsgUnpacking" xml:space="preserve">
-    <value>is unpacking...</value>
+    <value>Is unpacking......</value>
   </data>
   <data name="MsgUpdateSubscriptionEnd" xml:space="preserve">
     <value>Update subscription end</value>
@@ -268,7 +268,7 @@
     <value>Non-VMess or ss protocol</value>
   </data>
   <data name="NonVmessService" xml:space="preserve">
-    <value> non-standard service, this feature is invalid</value>
+    <value>Non-standard service, this feature is invalid</value>
   </data>
   <data name="NotFoundCore" xml:space="preserve">
     <value>The Core file (file name: {1}) was not found under the folder ({0}), please download and put it in the folder, download address: {2}</value>
@@ -277,7 +277,7 @@
     <value>Scan completed, no valid QR code found</value>
   </data>
   <data name="OperationFailed" xml:space="preserve">
-    <value> operation failed, please check and retry</value>
+    <value>Operation failed, please check and retry</value>
   </data>
   <data name="PleaseFillRemarks" xml:space="preserve">
     <value>Please Fill Remarks</value>
@@ -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>
@@ -311,10 +308,10 @@
 {0}</value>
   </data>
   <data name="SuccessfullyImportedCustomServer" xml:space="preserve">
-    <value>Custom configuration server imported successfully.</value>
+    <value>Custom configuration server imported successfully</value>
   </data>
   <data name="SuccessfullyImportedServerViaClipboard" xml:space="preserve">
-    <value>{0} servers have been imported from clipboard.</value>
+    <value>{0} servers have been imported from clipboard</value>
   </data>
   <data name="SuccessfullyImportedServerViaScan" xml:space="preserve">
     <value>Scan import URL successfully</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>
@@ -532,9 +532,6 @@
   <data name="menuClearServerStatistics" xml:space="preserve">
     <value>Clear all service statistics</value>
   </data>
-  <data name="menuPingServer" xml:space="preserve">
-    <value>Test servers ping (Ctrl+P)</value>
-  </data>
   <data name="menuRealPingServer" xml:space="preserve">
     <value>Test servers real delay (Ctrl+R)</value>
   </data>
@@ -553,9 +550,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 +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>
@@ -725,13 +719,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 +793,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>
@@ -884,10 +875,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>
@@ -941,19 +932,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>
@@ -1043,7 +1034,7 @@
     <value>FontFamily(Require restart)</value>
   </data>
   <data name="TbSettingsCurrentFontFamilyTip" xml:space="preserve">
-    <value>Copy the font TTF file to the directory guiFonts, restart the settings</value>
+    <value>Copy the font TTF/TTC file to the directory guiFonts, restart the settings</value>
   </data>
   <data name="TbSettingsSocksPortTip" xml:space="preserve">
     <value>http port=socks port+1</value>
@@ -1063,9 +1054,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>
@@ -1091,7 +1079,7 @@
     <value>Enable hardware acceleration(Require restart)</value>
   </data>
   <data name="SpeedtestingWait" xml:space="preserve">
-    <value>Waiting for testing</value>
+    <value>Waiting for testing......</value>
   </data>
   <data name="TipDisplayLog" xml:space="preserve">
     <value>Please turn off when there is an abnormal disconnection</value>
@@ -1106,7 +1094,7 @@
     <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>
+    <value>{0} : {1}/s↑ | {2}/s↓</value>
   </data>
   <data name="LvAutoUpdateInterval" xml:space="preserve">
     <value>Automatic update interval(minutes)</value>
@@ -1120,4 +1108,88 @@
   <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>
+  <data name="menuAddHysteria2Server" xml:space="preserve">
+    <value>Add [Hysteria2] server</value>
+  </data>
+  <data name="TbSettingsHysteriaBandwidth" xml:space="preserve">
+    <value>Hysteria Max bandwidth (Up/Dw)</value>
+  </data>
+  <data name="TbSettingsUseSystemHosts" xml:space="preserve">
+    <value>Use System Hosts</value>
+  </data>
+  <data name="menuAddTuicServer" xml:space="preserve">
+    <value>Add [Tuic] server</value>
+  </data>
+  <data name="TbHeaderType8" xml:space="preserve">
+    <value>Congestion control</value>
+  </data>
+  <data name="LvPrevProfile" xml:space="preserve">
+    <value>Previous proxy remakrs</value>
+  </data>
+  <data name="LvNextProfile" xml:space="preserve">
+    <value>Next proxy remarks</value>
+  </data>
+  <data name="LvPrevProfileTip" xml:space="preserve">
+    <value>Please make sure the remarks exists and is unique</value>
+  </data>
+  <data name="TbSettingsEnableExInbound" xml:space="preserve">
+    <value>Enable additional Inbound</value>
+  </data>
+  <data name="TbSettingsEnableIPv6Address" xml:space="preserve">
+    <value>Enable IPv6 Address</value>
+  </data>
+  <data name="menuAddWireguardServer" xml:space="preserve">
+    <value>Add [Wireguard] server</value>
+  </data>
+  <data name="TbPrivateKey" xml:space="preserve">
+    <value>PrivateKey</value>
+  </data>
+  <data name="TbReserved" xml:space="preserve">
+    <value>Reserved(2,3,4)</value>
+  </data>
+  <data name="TbLocalAddress" xml:space="preserve">
+    <value>Address(Ip,Ipv6)</value>
+  </data>
+  <data name="TbPath7" xml:space="preserve">
+    <value>obfs password</value>
+  </data>
+  <data name="TbRuleMatchingTips" xml:space="preserve">
+    <value>(Domain or IP or ProcName) and Port and Protocol and InboundTag =&gt; OutboundTag</value>
+  </data>
+  <data name="TbAutoScrollToEnd" xml:space="preserve">
+    <value>Auto ScrollToEnd</value>
+  </data>
+  <data name="TbSettingsSpeedPingTestUrl" xml:space="preserve">
+    <value>Speed Ping Test Url</value>
+  </data>
+  <data name="TbSettingsEnableUpdateSubOnlyRemarksExist" xml:space="preserve">
+    <value>Updating subscription, only determine remarks exists</value>
+  </data>
 </root>

v2rayN/v2rayN/Resx/ResUI.ru.resx

@@ -187,10 +187,10 @@
     <value>Исходная конфигурация</value>
   </data>
   <data name="IsLatestCore" xml:space="preserve">
-    <value>{0} является последней версией.</value>
+    <value>{0} {1} является последней версией.</value>
   </data>
   <data name="IsLatestN" xml:space="preserve">
-    <value>{0} является последней версией.</value>
+    <value>{0} {1} является последней версией.</value>
   </data>
   <data name="LvAddress" xml:space="preserve">
     <value>Адрес</value>
@@ -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>
@@ -320,7 +317,7 @@
     <value>Сканирование URL-адреса импорта успешна.</value>
   </data>
   <data name="TestMeOutput" xml:space="preserve">
-    <value>Пинг текущей службы: {0} мс</value>
+    <value>Задержка текущего сервера: {0} мс</value>
   </data>
   <data name="OperationSuccess" xml:space="preserve">
     <value>Операция успешна</value>
@@ -338,7 +335,7 @@
     <value>Примечания</value>
   </data>
   <data name="LvUrl" xml:space="preserve">
-    <value>Url(Необязательно)</value>
+    <value>URL (необязательно)</value>
   </data>
   <data name="LvCount" xml:space="preserve">
     <value>Количество</value>
@@ -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>
@@ -532,20 +532,17 @@
   <data name="menuClearServerStatistics" xml:space="preserve">
     <value>Очистить всю статистику</value>
   </data>
-  <data name="menuPingServer" xml:space="preserve">
-    <value>Проверить пинг серверов (Ctrl+P)</value>
-  </data>
   <data name="menuRealPingServer" xml:space="preserve">
-    <value>Тест на реальную задержку серверов (Ctrl+R)</value>
+    <value>Тест на реальную задержку сервера (Ctrl+R)</value>
   </data>
   <data name="menuSortServerResult" xml:space="preserve">
     <value>Сортировать по результату теста</value>
   </data>
   <data name="menuSpeedServer" xml:space="preserve">
-    <value>Проверить скорость загрузки серверов (Ctrl+T)</value>
+    <value>Тест на скорость загрузки сервера (Ctrl+T)</value>
   </data>
   <data name="menuTcpingServer" xml:space="preserve">
-    <value>Тестировать сервера с tcping (Ctrl+O)</value>
+    <value>Тест задержки с tcping (Ctrl+O)</value>
   </data>
   <data name="menuTestMe" xml:space="preserve">
     <value>Проверить текущий статус службы</value>
@@ -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>
@@ -647,7 +641,7 @@
     <value>Тип камуфляжа</value>
   </data>
   <data name="TbId" xml:space="preserve">
-    <value>UUID(id)</value>
+    <value>UUID (id)</value>
   </data>
   <data name="TbNetwork" xml:space="preserve">
     <value>Транспортный протокол сети</value>
@@ -659,7 +653,7 @@
     <value>Порт</value>
   </data>
   <data name="TbRemarks" xml:space="preserve">
-    <value>Псевдоним (примечания)</value>
+    <value>Примечание</value>
   </data>
   <data name="TbRequestHost" xml:space="preserve">
     <value>Маскирующий домен (хост)</value>
@@ -707,7 +701,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>
@@ -722,16 +716,22 @@
     <value>Разрешить подключения из локальной сети</value>
   </data>
   <data name="TbSettingsAutoHideStartup" xml:space="preserve">
-    <value>Auto hide startup</value>
+    <value>Автоскрытие при автозапуске</value>
   </data>
   <data name="TbSettingsAutoUpdateInterval" xml:space="preserve">
     <value>Интервал автоматического обновления Geo в часах</value>
   </data>
+  <data name="LvAutoUpdateInterval" xml:space="preserve">
+    <value>Интервал автоматического обновления в минутах</value>
+  </data>
   <data name="TbSettingsCore" xml:space="preserve">
     <value>Ядро: базовые настройки</value>
   </data>
   <data name="TbSettingsCoreDns" xml:space="preserve">
-    <value>Ядро: настройки DNS</value>
+    <value>Настройки DNS V2ray</value>
+  </data>
+  <data name="TbSettingsCoreDnsSingbox" xml:space="preserve">
+    <value>Настройки DNS sing-box</value>
   </data>
   <data name="TbSettingsCoreKcp" xml:space="preserve">
     <value>Ядро: настройки KCP</value>
@@ -799,9 +799,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>
@@ -812,7 +809,7 @@
     <value>Включить протокол безопасности TLS v1.3 (обновление подписки)</value>
   </data>
   <data name="TbSettingsTrayMenuServersLimit" xml:space="preserve">
-    <value>Tray right-click menu servers display limit</value>
+    <value>Лимит серверов в меню трея</value>
   </data>
   <data name="TbSettingsUdpEnabled" xml:space="preserve">
     <value>Включить UDP</value>
@@ -941,7 +938,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>
@@ -956,7 +953,7 @@
     <value>Поддержка DnsObject</value>
   </data>
   <data name="SubUrlTips" xml:space="preserve">
-    <value>Group please leave blank here</value>
+    <value>Необязательное поле</value>
   </data>
   <data name="TipChangeRouting" xml:space="preserve">
     <value>Настройки маршрутизации изменены</value>
@@ -968,7 +965,7 @@
     <value>Только маршрут</value>
   </data>
   <data name="menuMixedTestServer" xml:space="preserve">
-    <value>Тест задержки и скорости (Ctrl+E)</value>
+    <value>Тест задержки и скорости всех серверов (Ctrl+E)</value>
   </data>
   <data name="LvTestDelay" xml:space="preserve">
     <value>Задержка (ms)</value>
@@ -989,7 +986,7 @@
     <value>Импортировать старый конфиг guiNConfig</value>
   </data>
   <data name="TbEnableTunAs" xml:space="preserve">
-    <value>Включить интерфейс</value>
+    <value>Режим VPN</value>
   </data>
   <data name="TbSettingsNewPort4LAN" xml:space="preserve">
     <value>Новый порт для локальной сети</value>
@@ -1043,7 +1040,7 @@
     <value>Шрифт (требуется перезагрузка)</value>
   </data>
   <data name="TbSettingsCurrentFontFamilyTip" xml:space="preserve">
-    <value>Скопируйте файл шрифта TTF в каталог guiFonts, перезапустите настройки</value>
+    <value>Скопируйте файл шрифта TTF/TTC в каталог guiFonts, перезапустите настройки</value>
   </data>
   <data name="TbSettingsSocksPortTip" xml:space="preserve">
     <value>HTTP port=socks port+1</value>
@@ -1057,4 +1054,19 @@
   <data name="TbSettingsEnableHWA" xml:space="preserve">
     <value>Включить аппаратное ускорение (требуется перезагрузка)</value>
   </data>
+  <data name="menuRebootAsAdmin" xml:space="preserve">
+    <value>Перезагрузить как администратор</value>
+  </data>
+  <data name="menuDNSSetting" xml:space="preserve">
+    <value>Настройки DNS</value>
+  </data>
+  <data name="TbSettingsLogEnabledToFile" xml:space="preserve">
+    <value>Включить логгирование в файл</value>
+  </data>
+  <data name="TbSettingsSpeedTestTimeout" xml:space="preserve">
+    <value>Таймаут одиночного спидтеста</value>
+  </data>
+  <data name="TbSettingsSpeedTestUrl" xml:space="preserve">
+    <value>URL спидтеста</value>
+  </data>
 </root>

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

@@ -187,10 +187,10 @@
     <value>初始化配置</value>
   </data>
   <data name="IsLatestCore" xml:space="preserve">
-    <value>{0} 已是最新版本。</value>
+    <value>{0} {1} 已是最新版本。</value>
   </data>
   <data name="IsLatestN" xml:space="preserve">
-    <value>{0} 已是最新版本。</value>
+    <value>{0} {1} 已是最新版本。</value>
   </data>
   <data name="LvAddress" xml:space="preserve">
     <value>地址</value>
@@ -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>
@@ -532,9 +532,6 @@
   <data name="menuClearServerStatistics" xml:space="preserve">
     <value>清除所有服务统计数据</value>
   </data>
-  <data name="menuPingServer" xml:space="preserve">
-    <value>测试服务器延迟Ping(多选) (Ctrl+P)</value>
-  </data>
   <data name="menuRealPingServer" xml:space="preserve">
     <value>测试服务器真连接延迟(多选) (Ctrl+R)</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>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 +725,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 +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>订阅转换网址(可选)</value>
   </data>
@@ -884,10 +875,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 +893,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 +932,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>
@@ -1043,7 +1034,7 @@
     <value>当前字体(需重启)</value>
   </data>
   <data name="TbSettingsCurrentFontFamilyTip" xml:space="preserve">
-    <value>拷贝字体TTF文件到目录guiFonts，重启设置</value>
+    <value>拷贝字体TTF/TTC文件到目录guiFonts，重启设置</value>
   </data>
   <data name="TbSettingsSocksPortTip" xml:space="preserve">
     <value>http端口=socks端口+1</value>
@@ -1063,9 +1054,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>
@@ -1091,7 +1079,7 @@
     <value>启用硬件加速(需重启)</value>
   </data>
   <data name="SpeedtestingWait" xml:space="preserve">
-    <value>等待测试中...</value>
+    <value>等待测试中......</value>
   </data>
   <data name="TipDisplayLog" xml:space="preserve">
     <value>当有异常断流时请关闭</value>
@@ -1117,4 +1105,88 @@
   <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>
+  <data name="menuAddHysteria2Server" xml:space="preserve">
+    <value>添加[Hysteria2]服务器</value>
+  </data>
+  <data name="TbSettingsHysteriaBandwidth" xml:space="preserve">
+    <value>Hysteria 最大带宽(Up/Dw)</value>
+  </data>
+  <data name="TbSettingsUseSystemHosts" xml:space="preserve">
+    <value>使用系统hosts</value>
+  </data>
+  <data name="menuAddTuicServer" xml:space="preserve">
+    <value>添加[Tuic]服务器</value>
+  </data>
+  <data name="TbHeaderType8" xml:space="preserve">
+    <value>拥塞控制算法</value>
+  </data>
+  <data name="LvPrevProfile" xml:space="preserve">
+    <value>前置代理别名</value>
+  </data>
+  <data name="LvNextProfile" xml:space="preserve">
+    <value>落地代理別名</value>
+  </data>
+  <data name="LvPrevProfileTip" xml:space="preserve">
+    <value>请确保别名存在并唯一</value>
+  </data>
+  <data name="TbSettingsEnableExInbound" xml:space="preserve">
+    <value>启用额外监听端口</value>
+  </data>
+  <data name="TbSettingsEnableIPv6Address" xml:space="preserve">
+    <value>启用IPv6</value>
+  </data>
+  <data name="menuAddWireguardServer" xml:space="preserve">
+    <value>添加[Wireguard]服务器</value>
+  </data>
+  <data name="TbPrivateKey" xml:space="preserve">
+    <value>PrivateKey</value>
+  </data>
+  <data name="TbReserved" xml:space="preserve">
+    <value>Reserved(2,3,4)</value>
+  </data>
+  <data name="TbLocalAddress" xml:space="preserve">
+    <value>Address(Ip,Ipv6)</value>
+  </data>
+  <data name="TbPath7" xml:space="preserve">
+    <value>混淆密码(obfs password)</value>
+  </data>
+  <data name="TbRuleMatchingTips" xml:space="preserve">
+    <value>(Domain 或 IP 或 进程名) 与 Port 与 Protocol 与 InboundTag =&gt; OutboundTag</value>
+  </data>
+  <data name="TbAutoScrollToEnd" xml:space="preserve">
+    <value>自动滚动到末尾</value>
+  </data>
+  <data name="TbSettingsSpeedPingTestUrl" xml:space="preserve">
+    <value>真连接测试地址</value>
+  </data>
+  <data name="TbSettingsEnableUpdateSubOnlyRemarksExist" xml:space="preserve">
+    <value>更新订阅时只判断别名已存在否</value>
+  </data>
 </root>

v2rayN/v2rayN/Sample/SampleOutbound

@@ -0,0 +1,34 @@
+{
+	"tag": "proxy",
+	"protocol": "vmess",
+	"settings": {
+		"vnext": [
+			{
+				"address": "v2ray.cool",
+				"port": 10086,
+				"users": [
+					{
+						"id": "a3482e88-686a-4a58-8126-99c9df64b7bf",
+						"security": "auto"
+					}
+				]
+			}
+		],
+		"servers": [
+			{
+				"address": "v2ray.cool",
+				"method": "chacha20",
+				"ota": false,
+				"password": "123456",
+				"port": 10086,
+				"level": 1
+			}
+		]
+	},
+	"streamSettings": {
+		"network": "tcp"
+	},
+	"mux": {
+		"enabled": false
+	}
+}

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,42 @@
+{
+	"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"
+		},
+		{
+			"tag": "dns_out",
+			"type": "dns"
+		}
+	],
+	"route": {
+		"rules": [
+			{
+				"protocol": [ "dns" ],
+				"outbound": "dns_out"
+			}
+		]
+	}
+}

v2rayN/v2rayN/Sample/SingboxSampleOutbound

@@ -0,0 +1,6 @@
+{
+	"type": "vless",
+	"tag": "proxy",
+	"server": "",
+	"server_port": 443
+}

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": [
-      {
-        "tag": "out_dns",
-        "address": "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",
-        "disable_cache": true
-      },
-      {
-        "geosite": "category-ads-all",
-        "server": "block",
-        "disable_cache": true
-      }
-    ],
-    "strategy": "ipv4_only"
-  }
+{
+  "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",
+      "disable_cache": true
+    },
+    {
+      "geosite": [
+        "category-ads-all"
+      ],
+      "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,20 @@
+[
+  {
+    "network": "udp",
+    "port": [
+      135,
+      137,
+      138,
+      139,
+      5353
+    ],
+    "outbound": "block"
+  },
+  {
+    "ip_cidr": [
+      "224.0.0.0/3",
+      "ff00::/8"
+    ],
+    "outbound": "block"
+  }
+]

v2rayN/v2rayN/ViewModels/AddServer2ViewModel.cs

@@ -1,4 +1,3 @@
-using Microsoft.Win32;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
 using ReactiveUI.Validation.Helpers;
@@ -6,7 +5,6 @@ using Splat;
 using System.IO;
 using System.Reactive;
 using System.Windows;
-using v2rayN.Base;
 using v2rayN.Handler;
 using v2rayN.Mode;
 using v2rayN.Resx;
@@ -38,7 +36,7 @@ namespace v2rayN.ViewModels
             }
             else
             {
-                SelectedSource = Utils.DeepCopy(profileItem);
+                SelectedSource = JsonUtils.DeepCopy(profileItem);
             }
 
             _view = view;
@@ -90,7 +88,7 @@ namespace v2rayN.ViewModels
                 item.preSocksPort = SelectedSource.preSocksPort;
             }
 
-            if (ConfigHandler.EditCustomServer(ref _config, item) == 0)
+            if (ConfigHandler.EditCustomServer(_config, item) == 0)
             {
                 _noticeHandler?.Enqueue(ResUI.OperationSuccess);
                 _view.DialogResult = true;
@@ -103,31 +101,27 @@ namespace v2rayN.ViewModels
 
         private void BrowseServer()
         {
-            UI.Show(ResUI.CustomServerTips);
+            //UI.Show(ResUI.CustomServerTips);
 
-            OpenFileDialog fileDialog = new()
-            {
-                Multiselect = false,
-                Filter = "Config|*.json|YAML|*.yaml;*.yml|All|*.*"
-            };
-            if (fileDialog.ShowDialog() != true)
+            if (UI.OpenFileDialog(out string fileName,
+                "Config|*.json|YAML|*.yaml;*.yml|All|*.*") != true)
             {
                 return;
             }
-            string fileName = fileDialog.FileName;
             if (Utils.IsNullOrEmpty(fileName))
             {
                 return;
             }
+
             var item = LazyConfig.Instance.GetProfileItem(SelectedSource.indexId);
             item ??= SelectedSource;
             item.address = fileName;
-            if (ConfigHandler.AddCustomServer(ref _config, item, false) == 0)
+            if (ConfigHandler.AddCustomServer(_config, item, false) == 0)
             {
                 _noticeHandler?.Enqueue(ResUI.SuccessfullyImportedCustomServer);
                 if (!Utils.IsNullOrEmpty(item.indexId))
                 {
-                    SelectedSource = Utils.DeepCopy(item);
+                    SelectedSource = JsonUtils.DeepCopy(item);
                 }
                 IsModified = true;
             }

v2rayN/v2rayN/ViewModels/AddServerViewModel.cs

@@ -3,7 +3,6 @@ using ReactiveUI.Fody.Helpers;
 using Splat;
 using System.Reactive;
 using System.Windows;
-using v2rayN.Base;
 using v2rayN.Handler;
 using v2rayN.Mode;
 using v2rayN.Resx;
@@ -37,7 +36,7 @@ namespace v2rayN.ViewModels
             }
             else
             {
-                SelectedSource = Utils.DeepCopy(profileItem);
+                SelectedSource = JsonUtils.DeepCopy(profileItem);
             }
 
             SaveCmd = ReactiveCommand.Create(() =>
@@ -123,29 +122,18 @@ namespace v2rayN.ViewModels
                 item.spiderX = SelectedSource.spiderX;
             }
 
-            int ret = -1;
-            switch (item.configType)
+            var ret = item.configType switch
             {
-                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;
-            }
+                EConfigType.VMess => ConfigHandler.AddServer(_config, item),
+                EConfigType.Shadowsocks => ConfigHandler.AddShadowsocksServer(_config, item),
+                EConfigType.Socks => ConfigHandler.AddSocksServer(_config, item),
+                EConfigType.Trojan => ConfigHandler.AddTrojanServer(_config, item),
+                EConfigType.VLESS => ConfigHandler.AddVlessServer(_config, item),
+                EConfigType.Hysteria2 => ConfigHandler.AddHysteria2Server(_config, item),
+                EConfigType.Tuic => ConfigHandler.AddTuicServer(_config, item),
+                EConfigType.Wireguard => ConfigHandler.AddWireguardServer(_config, item),
+                _ => -1,
+            };
 
             if (ret == 0)
             {

v2rayN/v2rayN/ViewModels/DNSSettingViewModel.cs

@@ -0,0 +1,113 @@
+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 bool useSystemHosts { get; set; }
+        [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);
+            useSystemHosts = item.useSystemHosts;
+            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 = JsonUtils.ParseJson(normalDNS);
+                if (obj != null && obj["servers"] != null)
+                {
+                }
+                else
+                {
+                    if (normalDNS.Contains("{") || normalDNS.Contains("}"))
+                    {
+                        UI.Show(ResUI.FillCorrectDNSText);
+                        return;
+                    }
+                }
+            }
+            if (!Utils.IsNullOrEmpty(normalDNS2))
+            {
+                var obj2 = JsonUtils.Deserialize<Dns4Sbox>(normalDNS2);
+                if (obj2 == null)
+                {
+                    UI.Show(ResUI.FillCorrectDNSText);
+                    return;
+                }
+            }
+            if (!Utils.IsNullOrEmpty(tunDNS2))
+            {
+                var obj2 = JsonUtils.Deserialize<Dns4Sbox>(tunDNS2);
+                if (obj2 == null)
+                {
+                    UI.Show(ResUI.FillCorrectDNSText);
+                    return;
+                }
+            }
+
+            var item = LazyConfig.Instance.GetDNSItem(ECoreType.Xray);
+            item.domainStrategy4Freedom = domainStrategy4Freedom;
+            item.useSystemHosts = useSystemHosts;
+            item.normalDNS = normalDNS;
+            ConfigHandler.SaveDNSItems(_config, item);
+
+            var item2 = LazyConfig.Instance.GetDNSItem(ECoreType.sing_box);
+            item2.normalDNS = JsonUtils.Serialize(JsonUtils.ParseJson(normalDNS2));
+            item2.tunDNS = JsonUtils.Serialize(JsonUtils.ParseJson(tunDNS2));
+            ConfigHandler.SaveDNSItems(_config, item2);
+
+            _noticeHandler?.Enqueue(ResUI.OperationSuccess);
+            _view.DialogResult = true;
+        }
+    }
+}

v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs

@@ -3,7 +3,6 @@ using DynamicData.Binding;
 using MaterialDesignColors;
 using MaterialDesignColors.ColorManipulation;
 using MaterialDesignThemes.Wpf;
-using Microsoft.Win32;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
 using Splat;
@@ -15,11 +14,9 @@ using System.Reactive.Linq;
 using System.Text;
 using System.Windows;
 using System.Windows.Media;
-using v2rayN.Base;
 using v2rayN.Handler;
 using v2rayN.Mode;
 using v2rayN.Resx;
-using v2rayN.Tool;
 using v2rayN.Views;
 
 namespace v2rayN.ViewModels
@@ -38,6 +35,7 @@ namespace v2rayN.ViewModels
         private readonly PaletteHelper _paletteHelper = new();
         private Dictionary<string, bool> _dicHeaderSort = new();
         private Action<EViewAction> _updateView;
+        private bool _showInTaskbar;
 
         #endregion private prop
 
@@ -89,6 +87,9 @@ namespace v2rayN.ViewModels
         public ReactiveCommand<Unit, Unit> AddShadowsocksServerCmd { get; }
         public ReactiveCommand<Unit, Unit> AddSocksServerCmd { get; }
         public ReactiveCommand<Unit, Unit> AddTrojanServerCmd { get; }
+        public ReactiveCommand<Unit, Unit> AddHysteria2ServerCmd { get; }
+        public ReactiveCommand<Unit, Unit> AddTuicServerCmd { get; }
+        public ReactiveCommand<Unit, Unit> AddWireguardServerCmd { get; }
         public ReactiveCommand<Unit, Unit> AddCustomServerCmd { get; }
         public ReactiveCommand<Unit, Unit> AddServerViaClipboardCmd { get; }
         public ReactiveCommand<Unit, Unit> AddServerViaScanCmd { get; }
@@ -112,7 +113,6 @@ namespace v2rayN.ViewModels
         //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; }
@@ -121,7 +121,6 @@ namespace v2rayN.ViewModels
         //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; }
 
@@ -129,6 +128,7 @@ namespace v2rayN.ViewModels
         public ReactiveCommand<Unit, Unit> SubSettingCmd { get; }
 
         public ReactiveCommand<Unit, Unit> AddSubCmd { get; }
+        public ReactiveCommand<Unit, Unit> EditSubCmd { get; }
         public ReactiveCommand<Unit, Unit> SubUpdateCmd { get; }
         public ReactiveCommand<Unit, Unit> SubUpdateViaProxyCmd { get; }
         public ReactiveCommand<Unit, Unit> SubGroupUpdateCmd { get; }
@@ -138,6 +138,7 @@ namespace v2rayN.ViewModels
         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; }
@@ -146,12 +147,15 @@ 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> 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> CheckUpdateClashCoreCmd { get; }
+        //public ReactiveCommand<Unit, Unit> CheckUpdateClashMetaCoreCmd { get; }
         public ReactiveCommand<Unit, Unit> CheckUpdateSingBoxCoreCmd { get; }
+
         public ReactiveCommand<Unit, Unit> CheckUpdateGeoCmd { get; }
 
         public ReactiveCommand<Unit, Unit> ReloadCmd { get; }
@@ -167,8 +171,8 @@ namespace v2rayN.ViewModels
         [Reactive]
         public ImageSource AppIcon { get; set; }
 
-        [Reactive]
-        public bool BlShowTrayTip { get; set; }
+        //[Reactive]
+        //public bool BlShowTrayTip { get; set; }
 
         #endregion Menu
 
@@ -237,6 +241,9 @@ namespace v2rayN.ViewModels
         [Reactive]
         public int CurrentFontSize { get; set; }
 
+        [Reactive]
+        public bool FollowSystemTheme { get; set; }
+
         [Reactive]
         public string CurrentLanguage { get; set; }
 
@@ -252,8 +259,6 @@ namespace v2rayN.ViewModels
             Locator.CurrentMutable.RegisterLazySingleton(() => new NoticeHandler(snackbarMessageQueue), typeof(NoticeHandler));
             _noticeHandler = Locator.Current.GetService<NoticeHandler>();
             _config = LazyConfig.Instance.GetConfig();
-            //ThreadPool.RegisterWaitForSingleObject(App.ProgramStarted, OnProgramStarted, null, -1, false);
-            Init();
 
             SelectedProfile = new();
             SelectedSub = new();
@@ -266,9 +271,11 @@ namespace v2rayN.ViewModels
             }
             _subId = _config.subIndexId;
 
-            InitSubscriptionView();
-            RefreshRoutingsMenu();
-            RefreshServers();
+            Init();
+            BindingUI();
+            RestoreUI();
+
+            #region WhenAnyValue && ReactiveCommand
 
             var canEditRemove = this.WhenAnyValue(
                x => x.SelectedProfile,
@@ -309,10 +316,6 @@ namespace v2rayN.ViewModels
                y => y == true)
                   .Subscribe(c => DoEnableTun(c));
 
-            BindingUI();
-            RestoreUI();
-            AutoHideStartup();
-
             //servers
             AddVmessServerCmd = ReactiveCommand.Create(() =>
             {
@@ -334,6 +337,18 @@ namespace v2rayN.ViewModels
             {
                 EditServer(true, EConfigType.Trojan);
             });
+            AddHysteria2ServerCmd = ReactiveCommand.Create(() =>
+            {
+                EditServer(true, EConfigType.Hysteria2);
+            });
+            AddTuicServerCmd = ReactiveCommand.Create(() =>
+            {
+                EditServer(true, EConfigType.Tuic);
+            });
+            AddWireguardServerCmd = ReactiveCommand.Create(() =>
+            {
+                EditServer(true, EConfigType.Wireguard);
+            });
             AddCustomServerCmd = ReactiveCommand.Create(() =>
             {
                 EditServer(true, EConfigType.Custom);
@@ -394,10 +409,6 @@ namespace v2rayN.ViewModels
             {
                 ServerSpeedtest(ESpeedActionType.Mixedtest);
             });
-            PingServerCmd = ReactiveCommand.Create(() =>
-            {
-                ServerSpeedtest(ESpeedActionType.Ping);
-            }, canEditRemove);
             TcpingServerCmd = ReactiveCommand.Create(() =>
             {
                 ServerSpeedtest(ESpeedActionType.Tcping);
@@ -419,10 +430,6 @@ namespace v2rayN.ViewModels
             {
                 Export2ClientConfig();
             }, canEditRemove);
-            Export2ServerConfigCmd = ReactiveCommand.Create(() =>
-            {
-                Export2ServerConfig();
-            }, canEditRemove);
             Export2ShareUrlCmd = ReactiveCommand.Create(() =>
             {
                 Export2ShareUrl();
@@ -439,7 +446,11 @@ namespace v2rayN.ViewModels
             });
             AddSubCmd = ReactiveCommand.Create(() =>
             {
-                AddSub();
+                EditSub(true);
+            });
+            EditSubCmd = ReactiveCommand.Create(() =>
+            {
+                EditSub(false);
             });
             SubUpdateCmd = ReactiveCommand.Create(() =>
             {
@@ -467,6 +478,10 @@ namespace v2rayN.ViewModels
             {
                 RoutingSetting();
             });
+            DNSSettingCmd = ReactiveCommand.Create(() =>
+            {
+                DNSSetting();
+            });
             GlobalHotkeySettingCmd = ReactiveCommand.Create(() =>
             {
                 if ((new GlobalHotkeySettingWindow()).ShowDialog() == true)
@@ -493,26 +508,26 @@ namespace v2rayN.ViewModels
             {
                 CheckUpdateN();
             });
-            CheckUpdateV2flyCoreCmd = ReactiveCommand.Create(() =>
-            {
-                CheckUpdateCore(ECoreType.v2fly_v5);
-            });
-            CheckUpdateSagerNetCoreCmd = ReactiveCommand.Create(() =>
-            {
-                CheckUpdateCore(ECoreType.SagerNet);
-            });
+            //CheckUpdateV2flyCoreCmd = ReactiveCommand.Create(() =>
+            //{
+            //    CheckUpdateCore(ECoreType.v2fly_v5);
+            //});
+            //CheckUpdateSagerNetCoreCmd = ReactiveCommand.Create(() =>
+            //{
+            //    CheckUpdateCore(ECoreType.SagerNet);
+            //});
             CheckUpdateXrayCoreCmd = ReactiveCommand.Create(() =>
             {
                 CheckUpdateCore(ECoreType.Xray);
             });
-            CheckUpdateClashCoreCmd = ReactiveCommand.Create(() =>
-            {
-                CheckUpdateCore(ECoreType.clash);
-            });
-            CheckUpdateClashMetaCoreCmd = ReactiveCommand.Create(() =>
-            {
-                CheckUpdateCore(ECoreType.clash_meta);
-            });
+            //CheckUpdateClashCoreCmd = ReactiveCommand.Create(() =>
+            //{
+            //    CheckUpdateCore(ECoreType.clash);
+            //});
+            //CheckUpdateClashMetaCoreCmd = ReactiveCommand.Create(() =>
+            //{
+            //    CheckUpdateCore(ECoreType.clash_meta);
+            //});
             CheckUpdateSingBoxCoreCmd = ReactiveCommand.Create(() =>
             {
                 CheckUpdateCore(ECoreType.sing_box);
@@ -550,14 +565,19 @@ namespace v2rayN.ViewModels
                 SetListenerType(ESysProxyType.Pac);
             });
 
-            Global.ShowInTaskbar = true;
+            #endregion WhenAnyValue && ReactiveCommand
+
+            AutoHideStartup();
+
+            _showInTaskbar = true;
         }
 
         private void Init()
         {
-            ConfigHandler.InitBuiltinRouting(ref _config);
-            //MainFormHandler.Instance.BackupGuiNConfig(_config, true);
-            _coreHandler = new CoreHandler(UpdateHandler);
+            ConfigHandler.InitBuiltinRouting(_config);
+            ConfigHandler.InitBuiltinDNS(_config);
+            _coreHandler = new CoreHandler(_config, UpdateHandler);
+            Locator.CurrentMutable.RegisterLazySingleton(() => _coreHandler, typeof(CoreHandler));
 
             if (_config.guiItem.enableStatistics)
             {
@@ -567,6 +587,10 @@ namespace v2rayN.ViewModels
             MainFormHandler.Instance.UpdateTask(_config, UpdateTaskHandler);
             MainFormHandler.Instance.RegisterGlobalHotkey(_config, OnHotkeyHandler, UpdateTaskHandler);
 
+            InitSubscriptionView();
+            RefreshRoutingsMenu();
+            RefreshServers();
+
             Reload();
             ChangeSystemProxyStatus(_config.sysProxyType, true);
         }
@@ -612,13 +636,13 @@ namespace v2rayN.ViewModels
             {
                 Application.Current.Dispatcher.Invoke((Action)(() =>
                 {
-                    if (!Global.ShowInTaskbar)
+                    if (!_showInTaskbar)
                     {
                         return;
                     }
 
-                    SpeedProxyDisplay = string.Format(ResUI.SpeedDisplayText, Global.agentTag, Utils.HumanFy(update.proxyUp), Utils.HumanFy(update.proxyDown));
-                    SpeedDirectDisplay = string.Format(ResUI.SpeedDisplayText, Global.directTag, Utils.HumanFy(update.directUp), Utils.HumanFy(update.directDown));
+                    SpeedProxyDisplay = string.Format(ResUI.SpeedDisplayText, Global.ProxyTag, Utils.HumanFy(update.proxyUp), Utils.HumanFy(update.proxyDown));
+                    SpeedDirectDisplay = string.Format(ResUI.SpeedDisplayText, Global.DirectTag, Utils.HumanFy(update.directUp), Utils.HumanFy(update.directDown));
 
                     if (update.proxyUp + update.proxyDown > 0)
                     {
@@ -635,13 +659,13 @@ namespace v2rayN.ViewModels
 
                                 if (SelectedProfile?.indexId == item.indexId)
                                 {
-                                    var temp = Utils.DeepCopy(item);
+                                    var temp = JsonUtils.DeepCopy(item);
                                     _profileItems.Replace(item, temp);
                                     SelectedProfile = temp;
                                 }
                                 else
                                 {
-                                    _profileItems.Replace(item, Utils.DeepCopy(item));
+                                    _profileItems.Replace(item, JsonUtils.DeepCopy(item));
                                 }
                             }
                         }
@@ -650,7 +674,7 @@ namespace v2rayN.ViewModels
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
         }
 
@@ -683,7 +707,7 @@ namespace v2rayN.ViewModels
                 {
                     item.speedVal = $"{speed} {Global.SpeedUnit}";
                 }
-                _profileItems.Replace(item, Utils.DeepCopy(item));
+                _profileItems.Replace(item, JsonUtils.DeepCopy(item));
             }
         }
 
@@ -717,10 +741,10 @@ namespace v2rayN.ViewModels
         {
             try
             {
-                Utils.SaveLog("MyAppExit Begin");
+                Logging.SaveLog("MyAppExit Begin");
 
                 StorageUI();
-                ConfigHandler.SaveConfig(ref _config);
+                ConfigHandler.SaveConfig(_config);
 
                 //HttpProxyHandle.CloseHttpAgent(config);
                 if (blWindowsShutDown)
@@ -738,7 +762,7 @@ namespace v2rayN.ViewModels
                 _statistics?.Close();
 
                 _coreHandler.CoreStop();
-                Utils.SaveLog("MyAppExit End");
+                Logging.SaveLog("MyAppExit End");
             }
             catch { }
             finally
@@ -818,7 +842,7 @@ namespace v2rayN.ViewModels
                             totalDown = t22 == null ? "" : Utils.HumanFy(t22.totalDown),
                             totalUp = t22 == null ? "" : Utils.HumanFy(t22.totalUp)
                         }).OrderBy(t => t.sort).ToList();
-            _lstProfile = Utils.FromJson<List<ProfileItem>>(Utils.ToJson(lstModel));
+            _lstProfile = JsonUtils.Deserialize<List<ProfileItem>>(JsonUtils.Serialize(lstModel));
 
             Application.Current.Dispatcher.Invoke((Action)(() =>
             {
@@ -840,12 +864,11 @@ namespace v2rayN.ViewModels
                 RefreshServersMenu();
 
                 //display running server
-                var running = ConfigHandler.GetDefaultServer(ref _config);
+                var running = ConfigHandler.GetDefaultServer(_config);
                 if (running != null)
                 {
-                    var runningSummary = running.GetSummary();
-                    RunningServerDisplay = $"{ResUI.menuServers}:{runningSummary}";
-                    RunningServerToolTipText = runningSummary;
+                    RunningServerDisplay =
+                    RunningServerToolTipText = running.GetSummary();
                 }
                 else
                 {
@@ -924,7 +947,7 @@ namespace v2rayN.ViewModels
             }
             else
             {
-                lstSelecteds = Utils.FromJson<List<ProfileItem>>(Utils.ToJson(orderProfiles));
+                lstSelecteds = JsonUtils.Deserialize<List<ProfileItem>>(JsonUtils.Serialize(orderProfiles));
             }
 
             return 0;
@@ -939,6 +962,7 @@ namespace v2rayN.ViewModels
                 {
                     subid = _subId,
                     configType = eConfigType,
+                    isSub = false,
                 };
             }
             else
@@ -977,7 +1001,7 @@ namespace v2rayN.ViewModels
         public void AddServerViaClipboard()
         {
             var clipboardData = Utils.GetClipboardData();
-            int ret = ConfigHandler.AddBatchServers(ref _config, clipboardData!, _subId, false);
+            int ret = ConfigHandler.AddBatchServers(_config, clipboardData!, _subId, false);
             if (ret > 0)
             {
                 InitSubscriptionView();
@@ -1004,7 +1028,7 @@ namespace v2rayN.ViewModels
             }
             else
             {
-                int ret = ConfigHandler.AddBatchServers(ref _config, result, _subId, false);
+                int ret = ConfigHandler.AddBatchServers(_config, result, _subId, false);
                 if (ret > 0)
                 {
                     InitSubscriptionView();
@@ -1051,7 +1075,7 @@ namespace v2rayN.ViewModels
             {
                 return;
             }
-            if (ConfigHandler.CopyServer(ref _config, lstSelecteds) == 0)
+            if (ConfigHandler.CopyServer(_config, lstSelecteds) == 0)
             {
                 RefreshServers();
                 _noticeHandler?.Enqueue(ResUI.OperationSuccess);
@@ -1084,7 +1108,7 @@ namespace v2rayN.ViewModels
                 return;
             }
 
-            if (ConfigHandler.SetDefaultServerIndex(ref _config, indexId) == 0)
+            if (ConfigHandler.SetDefaultServerIndex(_config, indexId) == 0)
             {
                 RefreshServers();
                 Reload();
@@ -1116,7 +1140,7 @@ namespace v2rayN.ViewModels
                 _noticeHandler?.Enqueue(ResUI.PleaseSelectServer);
                 return;
             }
-            string url = ShareHandler.GetShareUrl(item);
+            var url = ShareHandler.GetShareUrl(item);
             if (Utils.IsNullOrEmpty(url))
             {
                 return;
@@ -1140,7 +1164,7 @@ namespace v2rayN.ViewModels
 
             _dicHeaderSort.TryAdd(colName, true);
             _dicHeaderSort.TryGetValue(colName, out bool asc);
-            if (ConfigHandler.SortServers(ref _config, _subId, colName, asc) != 0)
+            if (ConfigHandler.SortServers(_config, _subId, colName, asc) != 0)
             {
                 return;
             }
@@ -1150,7 +1174,7 @@ namespace v2rayN.ViewModels
 
         public void TestServerAvailability()
         {
-            var item = ConfigHandler.GetDefaultServer(ref _config);
+            var item = ConfigHandler.GetDefaultServer(_config);
             if (item == null || item.configType == EConfigType.Custom)
             {
                 return;
@@ -1160,7 +1184,7 @@ namespace v2rayN.ViewModels
                 _noticeHandler?.SendMessage(msg, true);
                 Application.Current.Dispatcher.Invoke((Action)(() =>
                 {
-                    if (!Global.ShowInTaskbar)
+                    if (!_showInTaskbar)
                     {
                         return;
                     }
@@ -1204,7 +1228,7 @@ namespace v2rayN.ViewModels
             {
                 return;
             }
-            if (ConfigHandler.MoveServer(ref _config, ref _lstProfile, index, eMove) == 0)
+            if (ConfigHandler.MoveServer(_config, ref _lstProfile, index, eMove) == 0)
             {
                 RefreshServers();
             }
@@ -1215,7 +1239,7 @@ namespace v2rayN.ViewModels
             var targetIndex = _profileItems.IndexOf(targetItem);
             if (startIndex >= 0 && targetIndex >= 0 && startIndex != targetIndex)
             {
-                if (ConfigHandler.MoveServer(ref _config, ref _lstProfile, startIndex, EMove.Position, targetIndex) == 0)
+                if (ConfigHandler.MoveServer(_config, ref _lstProfile, startIndex, EMove.Position, targetIndex) == 0)
                 {
                     RefreshServers();
                 }
@@ -1247,17 +1271,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)
@@ -1321,9 +1334,21 @@ namespace v2rayN.ViewModels
             }
         }
 
-        private void AddSub()
+        private void EditSub(bool blNew)
         {
-            SubItem item = new();
+            SubItem item;
+            if (blNew)
+            {
+                item = new();
+            }
+            else
+            {
+                item = LazyConfig.Instance.GetSubItem(_subId);
+                if (item is null)
+                {
+                    return;
+                }
+            }
             var ret = (new SubEditWindow(item)).ShowDialog();
             if (ret == true)
             {
@@ -1348,7 +1373,6 @@ namespace v2rayN.ViewModels
             {
                 //RefreshServers();
                 Reload();
-                TunModeSwitch();
             }
         }
 
@@ -1357,13 +1381,22 @@ namespace v2rayN.ViewModels
             var ret = (new RoutingSettingWindow()).ShowDialog();
             if (ret == true)
             {
-                ConfigHandler.InitBuiltinRouting(ref _config);
+                ConfigHandler.InitBuiltinRouting(_config);
                 RefreshRoutingsMenu();
                 //RefreshServers();
                 Reload();
             }
         }
 
+        private void DNSSetting()
+        {
+            var ret = (new DNSSettingWindow()).ShowDialog();
+            if (ret == true)
+            {
+                Reload();
+            }
+        }
+
         private void RebootAsAdmin()
         {
             ProcessStartInfo startInfo = new()
@@ -1371,7 +1404,7 @@ namespace v2rayN.ViewModels
                 UseShellExecute = true,
                 Arguments = Global.RebootAs,
                 WorkingDirectory = Utils.StartupPath(),
-                FileName = Utils.GetExePath(),
+                FileName = Utils.GetExePath().AppendQuotes(),
                 Verb = "runas",
             };
             try
@@ -1384,22 +1417,17 @@ namespace v2rayN.ViewModels
 
         private void ImportOldGuiConfig()
         {
-            OpenFileDialog fileDialog = new()
-            {
-                Multiselect = false,
-                Filter = "guiNConfig|*.json|All|*.*"
-            };
-            if (fileDialog.ShowDialog() != true)
+            if (UI.OpenFileDialog(out string fileName,
+                "guiNConfig|*.json|All|*.*") != true)
             {
                 return;
             }
-            string fileName = fileDialog.FileName;
             if (Utils.IsNullOrEmpty(fileName))
             {
                 return;
             }
 
-            var ret = ConfigHandler.ImportOldGuiConfig(ref _config, fileName);
+            var ret = ConfigHandler.ImportOldGuiConfig(_config, fileName);
             if (ret == 0)
             {
                 RefreshRoutingsMenu();
@@ -1441,7 +1469,7 @@ namespace v2rayN.ViewModels
                     CloseV2ray();
 
                     string fileName = Utils.GetTempPath(Utils.GetDownloadFileName(msg));
-                    string toPath = Utils.GetBinPath("", type);
+                    string toPath = Utils.GetBinPath("", type.ToString());
 
                     FileManager.ZipExtractToFile(fileName, toPath, _config.guiItem.ignoreGeoUpdateCore ? "geo" : "");
 
@@ -1462,12 +1490,7 @@ namespace v2rayN.ViewModels
 
         private void CheckUpdateGeo()
         {
-            Task.Run(() =>
-            {
-                var updateHandle = new UpdateHandle();
-                updateHandle.UpdateGeoFile("geosite", _config, UpdateTaskHandler);
-                updateHandle.UpdateGeoFile("geoip", _config, UpdateTaskHandler);
-            });
+            (new UpdateHandle()).UpdateGeoFileAll(_config, UpdateTaskHandler);
         }
 
         #endregion CheckUpdate
@@ -1476,40 +1499,34 @@ namespace v2rayN.ViewModels
 
         public void Reload()
         {
-            _ = LoadV2ray();
+            BlReloadEnabled = false;
+
+            LoadV2ray().ContinueWith(task =>
+            {
+                TestServerAvailability();
+
+                Application.Current.Dispatcher.Invoke((Action)(() =>
+                {
+                    BlReloadEnabled = true;
+                }));
+            });
         }
 
         private 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);
+                //ConfigHandler.SaveConfig(_config, false);
 
                 ChangeSystemProxyStatus(_config.sysProxyType, false);
             });
-
-            TestServerAvailability();
-
-            Application.Current.Dispatcher.Invoke((Action)(() =>
-            {
-                BlReloadEnabled = true;
-            }));
         }
 
         private void CloseV2ray()
         {
-            ConfigHandler.SaveConfig(ref _config, false);
+            ConfigHandler.SaveConfig(_config, false);
 
             ChangeSystemProxyStatus(ESysProxyType.ForcedClear, false);
 
@@ -1530,13 +1547,13 @@ namespace v2rayN.ViewModels
             ChangeSystemProxyStatus(type, true);
 
             SystemProxySelected = (int)_config.sysProxyType;
-            ConfigHandler.SaveConfig(ref _config, false);
+            ConfigHandler.SaveConfig(_config, false);
         }
 
         private void ChangeSystemProxyStatus(ESysProxyType type, bool blChange)
         {
-            SysProxyHandle.UpdateSysProxy(_config, false);
-            _noticeHandler?.SendMessage(ResUI.TipChangeSystemProxy, true);
+            SysProxyHandle.UpdateSysProxy(_config, _config.tunModeItem.enableTun ? true : false);
+            _noticeHandler?.SendMessage(ResUI.TipChangeSystemProxy + _config.sysProxyType.ToString(), true);
 
             Application.Current.Dispatcher.Invoke((Action)(() =>
             {
@@ -1598,10 +1615,12 @@ namespace v2rayN.ViewModels
                 return;
             }
 
-            if (ConfigHandler.SetDefaultRouting(ref _config, item) == 0)
+            if (ConfigHandler.SetDefaultRouting(_config, item) == 0)
             {
                 _noticeHandler?.SendMessage(ResUI.TipChangeRouting, true);
                 Reload();
+                NotifyIcon = MainFormHandler.Instance.GetNotifyIcon(_config);
+                AppIcon = MainFormHandler.Instance.GetAppIcon(_config);
             }
         }
 
@@ -1623,19 +1642,14 @@ namespace v2rayN.ViewModels
             if (_config.tunModeItem.enableTun != EnableTun)
             {
                 _config.tunModeItem.enableTun = EnableTun;
-            }
-            TunModeSwitch();
-        }
-
-        private void TunModeSwitch()
-        {
-            if (EnableTun)
-            {
-                TunHandler.Instance.Start();
-            }
-            else
-            {
-                TunHandler.Instance.Stop();
+                // When running as a non-administrator, reboot to administrator mode
+                if (EnableTun && !Utils.IsAdministrator())
+                {
+                    _config.tunModeItem.enableTun = false;
+                    RebootAsAdmin();
+                    return;
+                }
+                Reload();
             }
         }
 
@@ -1645,7 +1659,7 @@ namespace v2rayN.ViewModels
 
         public void ShowHideWindow(bool? blShow)
         {
-            var bl = blShow ?? !Global.ShowInTaskbar;
+            var bl = blShow ?? !_showInTaskbar;
             if (bl)
             {
                 //Application.Current.MainWindow.ShowInTaskbar = true;
@@ -1664,12 +1678,19 @@ namespace v2rayN.ViewModels
                 //IntPtr windowHandle = new WindowInteropHelper(Application.Current.MainWindow).Handle;
                 //Utils.RegWriteValue(Global.MyRegPath, Utils.WindowHwndKey, Convert.ToString((long)windowHandle));
             }
-            Global.ShowInTaskbar = bl;
+            _showInTaskbar = bl;
         }
 
         private void RestoreUI()
         {
-            ModifyTheme(_config.uiItem.colorModeDark);
+            if (FollowSystemTheme)
+            {
+                ModifyTheme(!Utils.IsLightTheme());
+            }
+            else
+            {
+                ModifyTheme(_config.uiItem.colorModeDark);
+            }
 
             if (!_config.uiItem.colorPrimaryName.IsNullOrEmpty())
             {
@@ -1690,6 +1711,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())
             {
@@ -1697,7 +1719,6 @@ namespace v2rayN.ViewModels
             }
             CurrentFontSize = _config.uiItem.currentFontSize;
             CurrentLanguage = _config.uiItem.currentLanguage;
-            BlShowTrayTip = _config.uiItem.showTrayTip;
 
             this.WhenAnyValue(
                   x => x.ColorModeDark,
@@ -1708,10 +1729,29 @@ namespace v2rayN.ViewModels
                           {
                               _config.uiItem.colorModeDark = ColorModeDark;
                               ModifyTheme(ColorModeDark);
-                              ConfigHandler.SaveConfig(ref _config);
+                              ConfigHandler.SaveConfig(_config);
                           }
                       });
 
+            this.WhenAnyValue(x => x.FollowSystemTheme,
+                y => y == true)
+                    .Subscribe(c =>
+                    {
+                        if (_config.uiItem.followSystemTheme != FollowSystemTheme)
+                        {
+                            _config.uiItem.followSystemTheme = FollowSystemTheme;
+                            ConfigHandler.SaveConfig(_config);
+                            if (FollowSystemTheme)
+                            {
+                                ModifyTheme(!Utils.IsLightTheme());
+                            }
+                            else
+                            {
+                                ModifyTheme(ColorModeDark);
+                            }
+                        }
+                    });
+
             this.WhenAnyValue(
               x => x.SelectedSwatch,
               y => y != null && !y.Name.IsNullOrEmpty())
@@ -1728,7 +1768,7 @@ namespace v2rayN.ViewModels
                      {
                          _config.uiItem.colorPrimaryName = SelectedSwatch?.Name;
                          ChangePrimaryColor(SelectedSwatch.ExemplarHue.Color);
-                         ConfigHandler.SaveConfig(ref _config);
+                         ConfigHandler.SaveConfig(_config);
                      }
                  });
 
@@ -1746,7 +1786,7 @@ namespace v2rayN.ViewModels
                           Application.Current.Resources["StdFontSize2"] = size + 2;
                           Application.Current.Resources["StdFontSizeMsg"] = size - 1;
 
-                          ConfigHandler.SaveConfig(ref _config);
+                          ConfigHandler.SaveConfig(_config);
                       }
                   });
 
@@ -1759,7 +1799,7 @@ namespace v2rayN.ViewModels
                     {
                         _config.uiItem.currentLanguage = CurrentLanguage;
                         Thread.CurrentThread.CurrentUICulture = new(CurrentLanguage);
-                        ConfigHandler.SaveConfig(ref _config);
+                        ConfigHandler.SaveConfig(_config);
                     }
                 });
         }

v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs

@@ -31,16 +31,12 @@ namespace v2rayN.ViewModels
         [Reactive] public bool defAllowInsecure { get; set; }
         [Reactive] public string defFingerprint { get; set; }
         [Reactive] public string defUserAgent { get; set; }
+        [Reactive] public string mux4SboxProtocol { get; set; }
+        [Reactive] public int hyUpMbps { get; set; }
+        [Reactive] public int hyDownMbps { get; set; }
 
         #endregion Core
 
-        #region Core DNS
-
-        [Reactive] public string domainStrategy4Freedom { get; set; }
-        [Reactive] public string remoteDNS { get; set; }
-
-        #endregion Core DNS
-
         #region Core KCP
 
         //[Reactive] public int Kcpmtu { get; set; }
@@ -57,10 +53,10 @@ namespace v2rayN.ViewModels
 
         [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; }
+        [Reactive] public bool EnableUpdateSubOnlyRemarksExist { get; set; }
         [Reactive] public bool EnableSecurityProtocolTls13 { get; set; }
         [Reactive] public bool AutoHideStartup { get; set; }
         [Reactive] public bool EnableCheckPreReleaseUpdate { get; set; }
@@ -71,6 +67,7 @@ namespace v2rayN.ViewModels
         [Reactive] public string currentFontFamily { get; set; }
         [Reactive] public int SpeedTestTimeout { get; set; }
         [Reactive] public string SpeedTestUrl { get; set; }
+        [Reactive] public string SpeedPingTestUrl { get; set; }
         [Reactive] public bool EnableHWA { get; set; }
         [Reactive] public string SubConvertUrl { get; set; }
 
@@ -85,20 +82,11 @@ namespace v2rayN.ViewModels
 
         #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; }
-        [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; }
+        [Reactive] public bool TunEnableExInbound { get; set; }
+        [Reactive] public bool TunEnableIPv6Address { get; set; }
 
         #endregion Tun mode
 
@@ -138,16 +126,12 @@ namespace v2rayN.ViewModels
             defAllowInsecure = _config.coreBasicItem.defAllowInsecure;
             defFingerprint = _config.coreBasicItem.defFingerprint;
             defUserAgent = _config.coreBasicItem.defUserAgent;
+            mux4SboxProtocol = _config.mux4SboxItem.protocol;
+            hyUpMbps = _config.hysteriaItem.up_mbps;
+            hyDownMbps = _config.hysteriaItem.down_mbps;
 
             #endregion Core
 
-            #region Core DNS
-
-            domainStrategy4Freedom = _config.domainStrategy4Freedom;
-            remoteDNS = _config.remoteDNS;
-
-            #endregion Core DNS
-
             #region Core KCP
 
             //Kcpmtu = _config.kcpItem.mtu;
@@ -164,10 +148,10 @@ namespace v2rayN.ViewModels
 
             AutoRun = _config.guiItem.autoRun;
             EnableStatistics = _config.guiItem.enableStatistics;
-            StatisticsFreshRate = _config.guiItem.statisticsFreshRate;
             KeepOlderDedupl = _config.guiItem.keepOlderDedupl;
             IgnoreGeoUpdateCore = _config.guiItem.ignoreGeoUpdateCore;
             EnableAutoAdjustMainLvColWidth = _config.uiItem.enableAutoAdjustMainLvColWidth;
+            EnableUpdateSubOnlyRemarksExist = _config.uiItem.enableUpdateSubOnlyRemarksExist;
             EnableSecurityProtocolTls13 = _config.guiItem.enableSecurityProtocolTls13;
             AutoHideStartup = _config.uiItem.autoHideStartup;
             EnableCheckPreReleaseUpdate = _config.guiItem.checkPreReleaseUpdate;
@@ -178,6 +162,7 @@ namespace v2rayN.ViewModels
             currentFontFamily = _config.uiItem.currentFontFamily;
             SpeedTestTimeout = _config.speedTestItem.speedTestTimeout;
             SpeedTestUrl = _config.speedTestItem.speedTestUrl;
+            SpeedPingTestUrl = _config.speedTestItem.speedPingTestUrl;
             EnableHWA = _config.guiItem.enableHWA;
             SubConvertUrl = _config.constItem.subConvertUrl;
 
@@ -192,22 +177,11 @@ namespace v2rayN.ViewModels
 
             #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);
+            TunEnableExInbound = _config.tunModeItem.enableExInbound;
+            TunEnableIPv6Address = _config.tunModeItem.enableIPv6Address;
 
             #endregion Tun mode
 
@@ -282,19 +256,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())
@@ -325,10 +286,9 @@ namespace v2rayN.ViewModels
             _config.coreBasicItem.defAllowInsecure = defAllowInsecure;
             _config.coreBasicItem.defFingerprint = defFingerprint;
             _config.coreBasicItem.defUserAgent = defUserAgent;
-
-            //DNS
-            _config.remoteDNS = remoteDNS;
-            _config.domainStrategy4Freedom = domainStrategy4Freedom;
+            _config.mux4SboxItem.protocol = mux4SboxProtocol;
+            _config.hysteriaItem.up_mbps = hyUpMbps;
+            _config.hysteriaItem.down_mbps = hyDownMbps;
 
             //Kcp
             //_config.kcpItem.mtu = Kcpmtu;
@@ -340,17 +300,13 @@ namespace v2rayN.ViewModels
             //_config.kcpItem.congestion = Kcpcongestion;
 
             //UI
-            Utils.SetAutoRun(AutoRun);
+            Utils.SetAutoRun(Global.AutoRunRegPath, Global.AutoRunName, 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;
+            _config.uiItem.enableUpdateSubOnlyRemarksExist = EnableUpdateSubOnlyRemarksExist;
             _config.guiItem.enableSecurityProtocolTls13 = EnableSecurityProtocolTls13;
             _config.uiItem.autoHideStartup = AutoHideStartup;
             _config.guiItem.autoUpdateInterval = autoUpdateInterval;
@@ -361,6 +317,7 @@ namespace v2rayN.ViewModels
             _config.uiItem.currentFontFamily = currentFontFamily;
             _config.speedTestItem.speedTestTimeout = SpeedTestTimeout;
             _config.speedTestItem.speedTestUrl = SpeedTestUrl;
+            _config.speedTestItem.speedPingTestUrl = SpeedPingTestUrl;
             _config.guiItem.enableHWA = EnableHWA;
             _config.constItem.subConvertUrl = SubConvertUrl;
 
@@ -369,24 +326,16 @@ namespace v2rayN.ViewModels
             _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));
+            _config.tunModeItem.enableExInbound = TunEnableExInbound;
+            _config.tunModeItem.enableIPv6Address = TunEnableIPv6Address;
 
             //coreType
             SaveCoreType();
 
-            if (ConfigHandler.SaveConfig(ref _config) == 0)
+            if (ConfigHandler.SaveConfig(_config) == 0)
             {
                 _noticeHandler?.Enqueue(ResUI.OperationSuccess);
                 _view.DialogResult = true;
@@ -428,6 +377,9 @@ namespace v2rayN.ViewModels
                     case 6:
                         type = CoreType6;
                         break;
+
+                    default:
+                        continue;
                 }
                 item.coreType = (ECoreType)Enum.Parse(typeof(ECoreType), type);
             }

v2rayN/v2rayN/ViewModels/RoutingRuleDetailsViewModel.cs

@@ -3,7 +3,6 @@ using ReactiveUI.Fody.Helpers;
 using Splat;
 using System.Reactive;
 using System.Windows;
-using v2rayN.Base;
 using v2rayN.Handler;
 using v2rayN.Mode;
 using v2rayN.Resx;
@@ -28,6 +27,9 @@ namespace v2rayN.ViewModels
         [Reactive]
         public string IP { get; set; }
 
+        [Reactive]
+        public string Process { get; set; }
+
         [Reactive]
         public bool AutoSort { get; set; }
 
@@ -42,7 +44,7 @@ namespace v2rayN.ViewModels
             if (rulesItem.id.IsNullOrEmpty())
             {
                 rulesItem.id = Utils.GetGUID(false);
-                rulesItem.outboundTag = Global.agentTag;
+                rulesItem.outboundTag = Global.ProxyTag;
                 rulesItem.enabled = true;
                 SelectedSource = rulesItem;
             }
@@ -53,6 +55,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(() =>
             {
@@ -64,31 +67,34 @@ namespace v2rayN.ViewModels
 
         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 =
-              SelectedSource.domain != null
-              && SelectedSource.domain.Count > 0
-              || SelectedSource.ip != null
-              && SelectedSource.ip.Count > 0
-              || SelectedSource.protocol != null
-              && SelectedSource.protocol.Count > 0
+            bool hasRule = SelectedSource.domain?.Count > 0
+              || SelectedSource.ip?.Count > 0
+              || SelectedSource.protocol?.Count > 0
+              || SelectedSource.process?.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);

v2rayN/v2rayN/ViewModels/RoutingRuleSettingViewModel.cs

@@ -1,11 +1,9 @@
 using DynamicData.Binding;
-using Microsoft.Win32;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
 using Splat;
 using System.Reactive;
 using System.Windows;
-using v2rayN.Base;
 using v2rayN.Handler;
 using v2rayN.Mode;
 using v2rayN.Resx;
@@ -60,7 +58,7 @@ namespace v2rayN.ViewModels
             else
             {
                 SelectedRouting = routingItem;
-                _rules = Utils.FromJson<List<RulesItem>>(SelectedRouting.ruleSet);
+                _rules = JsonUtils.Deserialize<List<RulesItem>>(SelectedRouting.ruleSet);
             }
 
             RefreshRulesItems();
@@ -81,9 +79,9 @@ namespace v2rayN.ViewModels
             {
                 ImportRulesFromClipboard();
             });
-            ImportRulesFromUrlCmd = ReactiveCommand.Create(() =>
+            ImportRulesFromUrlCmd = ReactiveCommand.CreateFromTask(() =>
             {
-                ImportRulesFromUrl();
+                return ImportRulesFromUrl();
             });
 
             RuleRemoveCmd = ReactiveCommand.Create(() =>
@@ -143,7 +141,7 @@ namespace v2rayN.ViewModels
 
         public void RuleEdit(bool blNew)
         {
-            RulesItem item;
+            RulesItem? item;
             if (blNew)
             {
                 item = new();
@@ -167,7 +165,7 @@ namespace v2rayN.ViewModels
             }
         }
 
-        private void RuleRemove()
+        public void RuleRemove()
         {
             if (SelectedSource is null || SelectedSource.outboundTag.IsNullOrEmpty())
             {
@@ -209,7 +207,7 @@ namespace v2rayN.ViewModels
             }
             if (lst.Count > 0)
             {
-                Utils.SetClipboardData(Utils.ToJson(lst));
+                Utils.SetClipboardData(JsonUtils.Serialize(lst));
                 //UI.Show(ResUI.OperationSuccess"));
             }
         }
@@ -248,9 +246,9 @@ namespace v2rayN.ViewModels
                 it.id = Utils.GetGUID(false);
             }
             item.ruleNum = _rules.Count;
-            item.ruleSet = Utils.ToJson(_rules, false);
+            item.ruleSet = JsonUtils.Serialize(_rules, false);
 
-            if (ConfigHandler.SaveRoutingItem(ref _config, item) == 0)
+            if (ConfigHandler.SaveRoutingItem(_config, item) == 0)
             {
                 _noticeHandler?.Enqueue(ResUI.OperationSuccess);
                 _view.DialogResult = true;
@@ -265,20 +263,16 @@ namespace v2rayN.ViewModels
 
         private void ImportRulesFromFile()
         {
-            OpenFileDialog fileDialog = new OpenFileDialog
-            {
-                Multiselect = false,
-                Filter = "Rules|*.json|All|*.*"
-            };
-            if (fileDialog.ShowDialog() != true)
+            if (UI.OpenFileDialog(out string fileName,
+                "Rules|*.json|All|*.*") != true)
             {
                 return;
             }
-            string fileName = fileDialog.FileName;
             if (Utils.IsNullOrEmpty(fileName))
             {
                 return;
             }
+
             string result = Utils.LoadResource(fileName);
             if (Utils.IsNullOrEmpty(result))
             {
@@ -312,7 +306,7 @@ namespace v2rayN.ViewModels
             }
 
             DownloadHandle downloadHandle = new DownloadHandle();
-            string result = await downloadHandle.TryDownloadString(url, true, "");
+            var result = await downloadHandle.TryDownloadString(url, true, "");
             if (AddBatchRoutingRules(SelectedRouting, result) == 0)
             {
                 Application.Current.Dispatcher.Invoke((Action)(() =>
@@ -323,7 +317,7 @@ namespace v2rayN.ViewModels
             }
         }
 
-        private int AddBatchRoutingRules(RoutingItem routingItem, string clipboardData)
+        private int AddBatchRoutingRules(RoutingItem routingItem, string? clipboardData)
         {
             bool blReplace = false;
             if (UI.ShowYesNo(ResUI.AddBatchRoutingRulesYesNo) == MessageBoxResult.No)
@@ -334,7 +328,7 @@ namespace v2rayN.ViewModels
             {
                 return -1;
             }
-            var lstRules = Utils.FromJson<List<RulesItem>>(clipboardData);
+            var lstRules = JsonUtils.Deserialize<List<RulesItem>>(clipboardData);
             if (lstRules == null)
             {
                 return -1;

v2rayN/v2rayN/ViewModels/RoutingSettingViewModel.cs

@@ -4,7 +4,6 @@ using ReactiveUI.Fody.Helpers;
 using Splat;
 using System.Reactive;
 using System.Windows;
-using v2rayN.Base;
 using v2rayN.Handler;
 using v2rayN.Mode;
 using v2rayN.Resx;
@@ -42,6 +41,9 @@ namespace v2rayN.ViewModels
         [Reactive]
         public string domainMatcher { get; set; }
 
+        [Reactive]
+        public string domainStrategy4Singbox { get; set; }
+
         [Reactive]
         public string ProxyDomain { get; set; }
 
@@ -78,11 +80,12 @@ namespace v2rayN.ViewModels
             _view = view;
             SelectedSource = new();
 
-            ConfigHandler.InitBuiltinRouting(ref _config);
+            ConfigHandler.InitBuiltinRouting(_config);
 
             enableRoutingAdvanced = _config.routingBasicItem.enableRoutingAdvanced;
             domainStrategy = _config.routingBasicItem.domainStrategy;
             domainMatcher = _config.routingBasicItem.domainMatcher;
+            domainStrategy4Singbox = _config.routingBasicItem.domainStrategy4Singbox;
 
             RefreshRoutingItems();
 
@@ -130,10 +133,10 @@ namespace v2rayN.ViewModels
 
         private void BindingLockedData()
         {
-            _lockedItem = ConfigHandler.GetLockedRoutingItem(ref _config);
+            _lockedItem = ConfigHandler.GetLockedRoutingItem(_config);
             if (_lockedItem != null)
             {
-                _lockedRules = Utils.FromJson<List<RulesItem>>(_lockedItem.ruleSet);
+                _lockedRules = JsonUtils.Deserialize<List<RulesItem>>(_lockedItem.ruleSet);
                 ProxyDomain = Utils.List2String(_lockedRules[0].domain, true);
                 ProxyIP = Utils.List2String(_lockedRules[0].ip, true);
 
@@ -149,18 +152,18 @@ namespace v2rayN.ViewModels
         {
             if (_lockedItem != null)
             {
-                _lockedRules[0].domain = Utils.String2List(ProxyDomain.TrimEx());
-                _lockedRules[0].ip = Utils.String2List(ProxyIP.TrimEx());
+                _lockedRules[0].domain = Utils.String2List(Utils.Convert2Comma(ProxyDomain.TrimEx()));
+                _lockedRules[0].ip = Utils.String2List(Utils.Convert2Comma(ProxyIP.TrimEx()));
 
-                _lockedRules[1].domain = Utils.String2List(DirectDomain.TrimEx());
-                _lockedRules[1].ip = Utils.String2List(DirectIP.TrimEx());
+                _lockedRules[1].domain = Utils.String2List(Utils.Convert2Comma(DirectDomain.TrimEx()));
+                _lockedRules[1].ip = Utils.String2List(Utils.Convert2Comma(DirectIP.TrimEx()));
 
-                _lockedRules[2].domain = Utils.String2List(BlockDomain.TrimEx());
-                _lockedRules[2].ip = Utils.String2List(BlockIP.TrimEx());
+                _lockedRules[2].domain = Utils.String2List(Utils.Convert2Comma(BlockDomain.TrimEx()));
+                _lockedRules[2].ip = Utils.String2List(Utils.Convert2Comma(BlockIP.TrimEx()));
 
-                _lockedItem.ruleSet = Utils.ToJson(_lockedRules, false);
+                _lockedItem.ruleSet = JsonUtils.Serialize(_lockedRules, false);
 
-                ConfigHandler.SaveRoutingItem(ref _config, _lockedItem);
+                ConfigHandler.SaveRoutingItem(_config, _lockedItem);
             }
         }
 
@@ -200,10 +203,11 @@ namespace v2rayN.ViewModels
             _config.routingBasicItem.domainStrategy = domainStrategy;
             _config.routingBasicItem.enableRoutingAdvanced = enableRoutingAdvanced;
             _config.routingBasicItem.domainMatcher = domainMatcher;
+            _config.routingBasicItem.domainStrategy4Singbox = domainStrategy4Singbox;
 
             EndBindingLockedData();
 
-            if (ConfigHandler.SaveConfig(ref _config) == 0)
+            if (ConfigHandler.SaveConfig(_config) == 0)
             {
                 _noticeHandler?.Enqueue(ResUI.OperationSuccess);
                 _view.DialogResult = true;
@@ -251,7 +255,7 @@ namespace v2rayN.ViewModels
             }
         }
 
-        private void RoutingAdvancedRemove()
+        public void RoutingAdvancedRemove()
         {
             if (SelectedSource is null || SelectedSource.remarks.IsNullOrEmpty())
             {
@@ -275,7 +279,7 @@ namespace v2rayN.ViewModels
             IsModified = true;
         }
 
-        private void RoutingAdvancedSetDefault()
+        public void RoutingAdvancedSetDefault()
         {
             var item = LazyConfig.Instance.GetRoutingItem(SelectedSource?.id);
             if (item is null)
@@ -284,7 +288,7 @@ namespace v2rayN.ViewModels
                 return;
             }
 
-            if (ConfigHandler.SetDefaultRouting(ref _config, item) == 0)
+            if (ConfigHandler.SetDefaultRouting(_config, item) == 0)
             {
                 RefreshRoutingItems();
                 IsModified = true;
@@ -293,7 +297,7 @@ namespace v2rayN.ViewModels
 
         private void RoutingAdvancedImportRules()
         {
-            if (ConfigHandler.InitBuiltinRouting(ref _config, true) == 0)
+            if (ConfigHandler.InitBuiltinRouting(_config, true) == 0)
             {
                 RefreshRoutingItems();
                 IsModified = true;

v2rayN/v2rayN/ViewModels/SubEditViewModel.cs

@@ -3,7 +3,6 @@ using ReactiveUI.Fody.Helpers;
 using Splat;
 using System.Reactive;
 using System.Windows;
-using v2rayN.Base;
 using v2rayN.Handler;
 using v2rayN.Mode;
 using v2rayN.Resx;
@@ -33,7 +32,7 @@ namespace v2rayN.ViewModels
             }
             else
             {
-                SelectedSource = Utils.DeepCopy(subItem);
+                SelectedSource = JsonUtils.DeepCopy(subItem);
             }
 
             SaveCmd = ReactiveCommand.Create(() =>
@@ -47,7 +46,7 @@ namespace v2rayN.ViewModels
         private void SaveSub()
         {
             string remarks = SelectedSource.remarks;
-            if (Utils.IsNullOrEmpty(remarks))
+            if (string.IsNullOrEmpty(remarks))
             {
                 UI.Show(ResUI.PleaseFillRemarks);
                 return;
@@ -69,9 +68,11 @@ namespace v2rayN.ViewModels
                 item.sort = SelectedSource.sort;
                 item.filter = SelectedSource.filter;
                 item.convertTarget = SelectedSource.convertTarget;
+                item.prevProfile = SelectedSource.prevProfile;
+                item.nextProfile = SelectedSource.nextProfile;
             }
 
-            if (ConfigHandler.AddSubItem(ref _config, item) == 0)
+            if (ConfigHandler.AddSubItem(_config, item) == 0)
             {
                 _noticeHandler?.Enqueue(ResUI.OperationSuccess);
                 _view.DialogResult = true;

v2rayN/v2rayN/ViewModels/SubSettingViewModel.cs

@@ -6,7 +6,6 @@ using ReactiveUI.Fody.Helpers;
 using Splat;
 using System.Reactive;
 using System.Windows;
-using v2rayN.Base;
 using v2rayN.Handler;
 using v2rayN.Mode;
 using v2rayN.Resx;
@@ -104,7 +103,7 @@ namespace v2rayN.ViewModels
 
             foreach (var it in SelectedSources)
             {
-                ConfigHandler.DeleteSubItem(ref _config, it?.id);
+                ConfigHandler.DeleteSubItem(_config, it.id);
             }
             RefreshSubItems();
             _noticeHandler?.Enqueue(ResUI.OperationSuccess);

v2rayN/v2rayN/Views/AddServer2Window.xaml

@@ -2,10 +2,8 @@
     x:Class="v2rayN.Views.AddServer2Window"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:Views="clr-namespace:v2rayN.Views"
     xmlns:conv="clr-namespace:v2rayN.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="clr-namespace:v2rayN"
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:reactiveui="http://reactiveui.net"
@@ -25,183 +23,185 @@
     TextOptions.TextRenderingMode="Auto"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
-    <ScrollViewer
-        materialDesign:ScrollViewerAssist.IsAutoHideEnabled="True"
-        HorizontalScrollBarVisibility="Auto"
-        VerticalScrollBarVisibility="Auto">
-        <Grid Margin="8">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-            <Grid Grid.Row="0">
+    <DockPanel Margin="8">
+        <StackPanel
+            Margin="4"
+            HorizontalAlignment="Center"
+            DockPanel.Dock="Bottom"
+            Orientation="Horizontal">
+            <Button
+                x:Name="btnSave"
+                Width="100"
+                Content="{x:Static resx:ResUI.TbConfirm}"
+                Cursor="Hand"
+                Style="{StaticResource DefButton}" />
+            <Button
+                x:Name="btnCancel"
+                Width="100"
+                Margin="8,0"
+                Content="{x:Static resx:ResUI.TbCancel}"
+                Cursor="Hand"
+                IsCancel="true"
+                Style="{StaticResource DefButton}" />
+        </StackPanel>
+        <ScrollViewer
+            materialDesign:ScrollViewerAssist.IsAutoHideEnabled="True"
+            HorizontalScrollBarVisibility="Auto"
+            VerticalScrollBarVisibility="Auto">
+            <Grid>
                 <Grid.RowDefinitions>
                     <RowDefinition Height="Auto" />
                     <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="Auto" />
-                </Grid.ColumnDefinitions>
+                <Grid Grid.Row="0">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
 
-                <TextBlock
-                    Grid.Row="0"
-                    Grid.Column="0"
-                    Margin="4"
-                    Style="{StaticResource ModuleTitle}"
-                    Text="{x:Static resx:ResUI.menuServers}" />
-
-                <TextBlock
-                    Grid.Row="1"
-                    Grid.Column="0"
-                    Margin="4"
-                    VerticalAlignment="Center"
-                    Style="{StaticResource ToolbarTextBlock}"
-                    Text="{x:Static resx:ResUI.TbRemarks}" />
-
-                <TextBox
-                    x:Name="txtRemarks"
-                    Grid.Row="1"
-                    Grid.Column="1"
-                    Width="400"
-                    Margin="4"
-                    VerticalAlignment="Top"
-                    AcceptsReturn="True"
-                    Style="{StaticResource MyOutlinedTextBox}" />
-
-                <TextBlock
-                    Grid.Row="2"
-                    Grid.Column="0"
-                    Margin="4"
-                    VerticalAlignment="Center"
-                    Style="{StaticResource ToolbarTextBlock}"
-                    Text="{x:Static resx:ResUI.TbAddress}" />
-                <TextBox
-                    x:Name="txtAddress"
-                    Grid.Row="2"
-                    Grid.Column="1"
-                    Width="400"
-                    Margin="4"
-                    VerticalAlignment="Top"
-                    AcceptsReturn="True"
-                    IsReadOnly="True"
-                    Style="{StaticResource MyOutlinedTextBox}" />
-                <StackPanel
-                    Grid.Row="2"
-                    Grid.Column="2"
-                    VerticalAlignment="Center"
-                    Orientation="Vertical">
-                    <Button
-                        x:Name="btnBrowse"
-                        Width="100"
-                        Margin="2,0,8,0"
-                        Content="{x:Static resx:ResUI.TbBrowse}"
-                        Style="{StaticResource DefButton}" />
-                    <Button
-                        x:Name="btnEdit"
-                        Width="100"
-                        Margin="2,2,8,0"
-                        Content="{x:Static resx:ResUI.TbEdit}"
-                        Style="{StaticResource DefButton}" />
-                </StackPanel>
-
-                <TextBlock
-                    Grid.Row="3"
-                    Grid.Column="0"
-                    Margin="4"
-                    VerticalAlignment="Center"
-                    Style="{StaticResource ToolbarTextBlock}"
-                    Text="{x:Static resx:ResUI.TbCoreType}" />
-                <ComboBox
-                    x:Name="cmbCoreType"
-                    Grid.Row="3"
-                    Grid.Column="1"
-                    Width="200"
-                    Margin="4"
-                    HorizontalAlignment="Left"
-                    FontSize="{DynamicResource StdFontSize}"
-                    MaxDropDownHeight="1000"
-                    Style="{StaticResource MaterialDesignOutlinedComboBox}" />
-
-                <TextBlock
-                    Grid.Row="4"
-                    Grid.Column="0"
-                    Margin="4"
-                    VerticalAlignment="Center"
-                    Style="{StaticResource ToolbarTextBlock}"
-                    Text="{x:Static resx:ResUI.TbDisplayLog}" />
-                <StackPanel
-                    Grid.Row="4"
-                    Grid.Column="1"
-                    Margin="4"
-                    Orientation="Horizontal">
-                    <ToggleButton x:Name="togDisplayLog" HorizontalAlignment="Left" />
                     <TextBlock
-                        Margin="8,0"
+                        Grid.Row="0"
+                        Grid.Column="0"
+                        Margin="4"
+                        Style="{StaticResource ModuleTitle}"
+                        Text="{x:Static resx:ResUI.menuServers}" />
+
+                    <TextBlock
+                        Grid.Row="1"
+                        Grid.Column="0"
+                        Margin="4"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
-                        Text="{x:Static resx:ResUI.TipDisplayLog}" />
-                </StackPanel>
+                        Text="{x:Static resx:ResUI.TbRemarks}" />
+
+                    <TextBox
+                        x:Name="txtRemarks"
+                        Grid.Row="1"
+                        Grid.Column="1"
+                        Width="400"
+                        Margin="4"
+                        VerticalAlignment="Top"
+                        AcceptsReturn="True"
+                        Style="{StaticResource MyOutlinedTextBox}" />
 
-                <TextBlock
-                    Grid.Row="5"
-                    Grid.Column="0"
-                    Margin="4"
-                    VerticalAlignment="Center"
-                    Style="{StaticResource ToolbarTextBlock}"
-                    Text="{x:Static resx:ResUI.TbPreSocksPort}" />
-                <TextBox
-                    x:Name="txtPreSocksPort"
-                    Grid.Row="5"
-                    Grid.Column="1"
-                    Width="200"
-                    Margin="4"
-                    HorizontalAlignment="Left"
-                    AcceptsReturn="True"
-                    Style="{StaticResource MyOutlinedTextBox}" />
-                <StackPanel
-                    Grid.Row="6"
-                    Grid.Column="1"
-                    Grid.ColumnSpan="2">
                     <TextBlock
-                        Width="500"
+                        Grid.Row="2"
+                        Grid.Column="0"
+                        Margin="4"
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
-                        Text="{x:Static resx:ResUI.TipPreSocksPort}"
-                        TextWrapping="Wrap" />
-                </StackPanel>
-            </Grid>
+                        Text="{x:Static resx:ResUI.TbAddress}" />
+                    <TextBox
+                        x:Name="txtAddress"
+                        Grid.Row="2"
+                        Grid.Column="1"
+                        Width="400"
+                        Margin="4"
+                        VerticalAlignment="Top"
+                        AcceptsReturn="True"
+                        IsReadOnly="True"
+                        Style="{StaticResource MyOutlinedTextBox}" />
+                    <StackPanel
+                        Grid.Row="2"
+                        Grid.Column="2"
+                        VerticalAlignment="Center"
+                        Orientation="Horizontal">
+                        <Button
+                            x:Name="btnBrowse"
+                            Margin="2,0"
+                            Content="{x:Static resx:ResUI.TbBrowse}"
+                            Style="{StaticResource DefButton}" />
+                        <Button
+                            x:Name="btnEdit"
+                            Margin="2,0"
+                            Content="{x:Static resx:ResUI.TbEdit}"
+                            Style="{StaticResource DefButton}" />
+                    </StackPanel>
 
-            <Grid
-                Grid.Row="1"
-                Margin="8"
-                HorizontalAlignment="Center">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="200" />
-                    <ColumnDefinition Width="200" />
-                </Grid.ColumnDefinitions>
-                <Button
-                    x:Name="btnSave"
-                    Grid.Column="0"
-                    Margin="4"
-                    Content="{x:Static resx:ResUI.TbConfirm}"
-                    Style="{StaticResource DefButton}" />
-                <Button
-                    x:Name="btnCancel"
-                    Grid.Column="1"
-                    Margin="4"
-                    Click="btnCancel_Click"
-                    Content="{x:Static resx:ResUI.TbCancel}"
-                    IsCancel="true"
-                    Style="{StaticResource DefButton}" />
+                    <TextBlock
+                        Grid.Row="3"
+                        Grid.Column="0"
+                        Margin="4"
+                        VerticalAlignment="Center"
+                        Style="{StaticResource ToolbarTextBlock}"
+                        Text="{x:Static resx:ResUI.TbCoreType}" />
+                    <ComboBox
+                        x:Name="cmbCoreType"
+                        Grid.Row="3"
+                        Grid.Column="1"
+                        Width="200"
+                        Margin="4"
+                        HorizontalAlignment="Left"
+                        MaxDropDownHeight="1000"
+                        Style="{StaticResource MyOutlinedTextComboBox}" />
+
+                    <TextBlock
+                        Grid.Row="4"
+                        Grid.Column="0"
+                        Margin="4"
+                        VerticalAlignment="Center"
+                        Style="{StaticResource ToolbarTextBlock}"
+                        Text="{x:Static resx:ResUI.TbDisplayLog}" />
+                    <StackPanel
+                        Grid.Row="4"
+                        Grid.Column="1"
+                        Margin="4"
+                        Orientation="Horizontal">
+                        <ToggleButton x:Name="togDisplayLog" HorizontalAlignment="Left" />
+                        <TextBlock
+                            Margin="8,0"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TipDisplayLog}" />
+                    </StackPanel>
+
+                    <TextBlock
+                        Grid.Row="5"
+                        Grid.Column="0"
+                        Margin="4"
+                        VerticalAlignment="Center"
+                        Style="{StaticResource ToolbarTextBlock}"
+                        Text="{x:Static resx:ResUI.TbPreSocksPort}" />
+                    <TextBox
+                        x:Name="txtPreSocksPort"
+                        Grid.Row="5"
+                        Grid.Column="1"
+                        Width="200"
+                        Margin="4"
+                        HorizontalAlignment="Left"
+                        AcceptsReturn="True"
+                        Style="{StaticResource MyOutlinedTextBox}" />
+                    <StackPanel
+                        Grid.Row="6"
+                        Grid.Column="1"
+                        Grid.ColumnSpan="2">
+                        <TextBlock
+                            Width="500"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TipPreSocksPort}"
+                            TextWrapping="Wrap" />
+                        <TextBlock
+                            Width="500"
+                            Margin="8,0"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.CustomServerTips}"
+                            TextWrapping="Wrap" />
+                    </StackPanel>
+                </Grid>
             </Grid>
-        </Grid>
-    </ScrollViewer>
+        </ScrollViewer>
+    </DockPanel>
 </reactiveui:ReactiveWindow>

v2rayN/v2rayN/Views/AddServer2Window.xaml.cs

@@ -11,6 +11,17 @@ namespace v2rayN.Views
         public AddServer2Window(ProfileItem profileItem)
         {
             InitializeComponent();
+
+            // 设置窗口的尺寸不大于屏幕的尺寸
+            if (this.Width > SystemParameters.WorkArea.Width)
+            {
+                this.Width = SystemParameters.WorkArea.Width;
+            }
+            if (this.Height > SystemParameters.WorkArea.Height)
+            {
+                this.Height = SystemParameters.WorkArea.Height;
+            }
+
             this.Owner = Application.Current.MainWindow;
             this.Loaded += Window_Loaded;
             ViewModel = new AddServer2ViewModel(profileItem, this);
@@ -40,18 +51,6 @@ namespace v2rayN.Views
         private void Window_Loaded(object sender, RoutedEventArgs e)
         {
             txtRemarks.Focus();
-        }
-
-        private void btnCancel_Click(object sender, System.Windows.RoutedEventArgs e)
-        {
-            if (ViewModel?.IsModified == true)
-            {
-                this.DialogResult = true;
-            }
-            else
-            {
-                this.Close();
-            }
-        }
+        }         
     }
 }

v2rayN/v2rayN/Views/AddServerWindow.xaml.cs

@@ -2,7 +2,6 @@
 using System.Reactive.Disposables;
 using System.Windows;
 using System.Windows.Controls;
-using v2rayN.Base;
 using v2rayN.Handler;
 using v2rayN.Mode;
 using v2rayN.Resx;
@@ -15,6 +14,17 @@ namespace v2rayN.Views
         public AddServerWindow(ProfileItem profileItem)
         {
             InitializeComponent();
+
+            // 设置窗口的尺寸不大于屏幕的尺寸
+            if (this.Width > SystemParameters.WorkArea.Width)
+            {
+                this.Width = SystemParameters.WorkArea.Width;
+            }
+            if (this.Height > SystemParameters.WorkArea.Height)
+            {
+                this.Height = SystemParameters.WorkArea.Height;
+            }
+
             this.Owner = Application.Current.MainWindow;
             this.Loaded += Window_Loaded;
             cmbNetwork.SelectionChanged += CmbNetwork_SelectionChanged;
@@ -24,14 +34,14 @@ namespace v2rayN.Views
 
             if (profileItem.configType == EConfigType.VLESS)
             {
-                Global.coreTypes4VLESS.ForEach(it =>
+                Global.CoreTypes4VLESS.ForEach(it =>
                 {
                     cmbCoreType.Items.Add(it);
                 });
             }
             else
             {
-                Global.coreTypes.ForEach(it =>
+                Global.CoreTypes.ForEach(it =>
                 {
                     cmbCoreType.Items.Add(it);
                 });
@@ -41,20 +51,20 @@ namespace v2rayN.Views
             cmbStreamSecurity.Items.Add(string.Empty);
             cmbStreamSecurity.Items.Add(Global.StreamSecurity);
 
-            Global.networks.ForEach(it =>
+            Global.Networks.ForEach(it =>
             {
                 cmbNetwork.Items.Add(it);
             });
-            Global.fingerprints.ForEach(it =>
+            Global.Fingerprints.ForEach(it =>
             {
                 cmbFingerprint.Items.Add(it);
                 cmbFingerprint2.Items.Add(it);
             });
-            Global.allowInsecures.ForEach(it =>
+            Global.AllowInsecures.ForEach(it =>
             {
                 cmbAllowInsecure.Items.Add(it);
             });
-            Global.alpns.ForEach(it =>
+            Global.Alpns.ForEach(it =>
             {
                 cmbAlpn.Items.Add(it);
             });
@@ -63,7 +73,7 @@ namespace v2rayN.Views
             {
                 case EConfigType.VMess:
                     gridVMess.Visibility = Visibility.Visible;
-                    Global.vmessSecuritys.ForEach(it =>
+                    Global.VmessSecuritys.ForEach(it =>
                     {
                         cmbSecurity.Items.Add(it);
                     });
@@ -88,7 +98,7 @@ namespace v2rayN.Views
                 case EConfigType.VLESS:
                     gridVLESS.Visibility = Visibility.Visible;
                     cmbStreamSecurity.Items.Add(Global.StreamSecurityReality);
-                    Global.flows.ForEach(it =>
+                    Global.Flows.ForEach(it =>
                     {
                         cmbFlow5.Items.Add(it);
                     });
@@ -100,11 +110,45 @@ namespace v2rayN.Views
 
                 case EConfigType.Trojan:
                     gridTrojan.Visibility = Visibility.Visible;
-                    Global.flows.ForEach(it =>
+                    cmbStreamSecurity.Items.Add(Global.StreamSecurityReality);
+                    Global.Flows.ForEach(it =>
                     {
                         cmbFlow6.Items.Add(it);
                     });
                     break;
+
+                case EConfigType.Hysteria2:
+                    gridHysteria2.Visibility = Visibility.Visible;
+                    sepa2.Visibility = Visibility.Collapsed;
+                    gridTransport.Visibility = Visibility.Collapsed;
+                    cmbCoreType.IsEnabled = false;
+                    cmbFingerprint.IsEnabled = false;
+                    cmbFingerprint.Text = string.Empty;
+                    break;
+
+                case EConfigType.Tuic:
+                    gridTuic.Visibility = Visibility.Visible;
+                    sepa2.Visibility = Visibility.Collapsed;
+                    gridTransport.Visibility = Visibility.Collapsed;
+                    cmbCoreType.IsEnabled = false;
+                    cmbFingerprint.IsEnabled = false;
+                    cmbFingerprint.Text = string.Empty;
+
+                    Global.TuicCongestionControls.ForEach(it =>
+                    {
+                        cmbHeaderType8.Items.Add(it);
+                    });
+                    break;
+
+                case EConfigType.Wireguard:
+                    gridWireguard.Visibility = Visibility.Visible;
+
+                    sepa2.Visibility = Visibility.Collapsed;
+                    gridTransport.Visibility = Visibility.Collapsed;
+                    gridTls.Visibility = Visibility.Collapsed;
+                    cmbCoreType.IsEnabled = false;
+
+                    break;
             }
 
             gridTlsMore.Visibility = Visibility.Hidden;
@@ -144,6 +188,25 @@ namespace v2rayN.Views
                         this.Bind(ViewModel, vm => vm.SelectedSource.id, v => v.txtId6.Text).DisposeWith(disposables);
                         this.Bind(ViewModel, vm => vm.SelectedSource.flow, v => v.cmbFlow6.Text).DisposeWith(disposables);
                         break;
+
+                    case EConfigType.Hysteria2:
+                        this.Bind(ViewModel, vm => vm.SelectedSource.id, v => v.txtId7.Text).DisposeWith(disposables);
+                        this.Bind(ViewModel, vm => vm.SelectedSource.path, v => v.txtPath7.Text).DisposeWith(disposables);
+                        break;
+
+                    case EConfigType.Tuic:
+                        this.Bind(ViewModel, vm => vm.SelectedSource.id, v => v.txtId8.Text).DisposeWith(disposables);
+                        this.Bind(ViewModel, vm => vm.SelectedSource.security, v => v.txtSecurity8.Text).DisposeWith(disposables);
+                        this.Bind(ViewModel, vm => vm.SelectedSource.headerType, v => v.cmbHeaderType8.Text).DisposeWith(disposables);
+                        break;
+
+                    case EConfigType.Wireguard:
+                        this.Bind(ViewModel, vm => vm.SelectedSource.id, v => v.txtId9.Text).DisposeWith(disposables);
+                        this.Bind(ViewModel, vm => vm.SelectedSource.publicKey, v => v.txtPublicKey9.Text).DisposeWith(disposables);
+                        this.Bind(ViewModel, vm => vm.SelectedSource.path, v => v.txtPath9.Text).DisposeWith(disposables);
+                        this.Bind(ViewModel, vm => vm.SelectedSource.requestHost, v => v.txtRequestHost9.Text).DisposeWith(disposables);
+                        this.Bind(ViewModel, vm => vm.SelectedSource.shortId, v => v.txtShortId9.Text).DisposeWith(disposables);
+                        break;
                 }
                 this.Bind(ViewModel, vm => vm.SelectedSource.network, v => v.cmbNetwork.Text).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.SelectedSource.headerType, v => v.cmbHeaderType.Text).DisposeWith(disposables);
@@ -224,7 +287,7 @@ namespace v2rayN.Views
             else if (network is "kcp" or "quic")
             {
                 cmbHeaderType.Items.Add(Global.None);
-                Global.kcpHeaderTypes.ForEach(it =>
+                Global.KcpHeaderTypes.ForEach(it =>
                 {
                     cmbHeaderType.Items.Add(it);
                 });
@@ -288,10 +351,5 @@ namespace v2rayN.Views
                     break;
             }
         }
-
-        private void btnCancel_Click(object sender, RoutedEventArgs e)
-        {
-            this.Close();
-        }
     }
 }

v2rayN/v2rayN/Views/DNSSettingWindow.xaml

@@ -0,0 +1,168 @@
+<reactiveui:ReactiveWindow
+    x:Class="v2rayN.Views.DNSSettingWindow"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:conv="clr-namespace:v2rayN.Converters"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:reactiveui="http://reactiveui.net"
+    xmlns:resx="clr-namespace:v2rayN.Resx"
+    xmlns:vms="clr-namespace:v2rayN.ViewModels"
+    Title="{x:Static resx:ResUI.menuDNSSetting}"
+    Width="1000"
+    Height="700"
+    x:TypeArguments="vms:DNSSettingViewModel"
+    Background="{DynamicResource MaterialDesignPaper}"
+    FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
+    ResizeMode="NoResize"
+    ShowInTaskbar="False"
+    TextElement.FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
+    TextElement.Foreground="{DynamicResource MaterialDesignBody}"
+    TextOptions.TextFormattingMode="Display"
+    TextOptions.TextRenderingMode="Auto"
+    WindowStartupLocation="CenterScreen"
+    mc:Ignorable="d">
+    <DockPanel Margin="8">
+        <StackPanel
+            Margin="4"
+            HorizontalAlignment="Center"
+            DockPanel.Dock="Bottom"
+            Orientation="Horizontal">
+            <Button
+                x:Name="btnSave"
+                Width="100"
+                Content="{x:Static resx:ResUI.TbConfirm}"
+                Cursor="Hand"
+                Style="{StaticResource DefButton}" />
+            <Button
+                x:Name="btnCancel"
+                Width="100"
+                Margin="8,0"
+                Content="{x:Static resx:ResUI.TbCancel}"
+                Cursor="Hand"
+                IsCancel="true"
+                Style="{StaticResource DefButton}" />
+        </StackPanel>
+
+        <TabControl HorizontalContentAlignment="Left">
+
+            <TabItem Header="{x:Static resx:ResUI.TbSettingsCoreDns}">
+                <DockPanel Margin="{StaticResource SettingItemMargin}">
+                    <StackPanel DockPanel.Dock="Bottom" Orientation="Horizontal">
+                        <TextBlock
+                            Margin="{StaticResource SettingItemMargin}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbSettingsDomainStrategy4Freedom}" />
+                        <ComboBox
+                            x:Name="cmbdomainStrategy4Freedom"
+                            Width="200"
+                            Margin="{StaticResource SettingItemMargin}"
+                            Style="{StaticResource DefComboBox}" />
+                    </StackPanel>
+
+                    <StackPanel DockPanel.Dock="Bottom" Orientation="Horizontal">
+                        <TextBlock
+                            Margin="{StaticResource SettingItemMargin}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbSettingsUseSystemHosts}" />
+                        <ToggleButton
+                            x:Name="togUseSystemHosts"
+                            Grid.Row="5"
+                            Grid.Column="1"
+                            Margin="{StaticResource SettingItemMargin}"
+                            HorizontalAlignment="Left" />
+                    </StackPanel>
+
+                    <StackPanel DockPanel.Dock="Top" Orientation="Horizontal">
+                        <TextBlock
+                            Margin="{StaticResource SettingItemMargin}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbSettingsRemoteDNS}" />
+                        <TextBlock
+                            Margin="8,0,0,0"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}">
+                            <Hyperlink Click="linkDnsObjectDoc_Click">
+                                <TextBlock Text="{x:Static resx:ResUI.TbDnsObjectDoc}" />
+                            </Hyperlink>
+                        </TextBlock>
+                        <Button
+                            x:Name="btnImportDefConfig4V2ray"
+                            Margin="8,0,0,0"
+                            Content="{x:Static resx:ResUI.TbSettingDnsImportDefConfig}"
+                            Cursor="Hand"
+                            Style="{StaticResource DefButton}" />
+                    </StackPanel>
+
+                    <TextBox
+                        x:Name="txtnormalDNS"
+                        Margin="{StaticResource SettingItemMargin}"
+                        VerticalAlignment="Stretch"
+                        materialDesign:HintAssist.Hint="Http/Socks"
+                        AcceptsReturn="True"
+                        BorderThickness="1"
+                        Style="{StaticResource MaterialDesignOutlinedTextBox}"
+                        TextWrapping="Wrap"
+                        VerticalScrollBarVisibility="Auto" />
+                </DockPanel>
+            </TabItem>
+
+            <TabItem Header="{x:Static resx:ResUI.TbSettingsCoreDnsSingbox}">
+                <DockPanel Margin="{StaticResource SettingItemMargin}">
+                    <StackPanel DockPanel.Dock="Top" Orientation="Horizontal">
+                        <TextBlock
+                            Margin="8,0,0,0"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}">
+                            <Hyperlink Click="linkDnsSingboxObjectDoc_Click">
+                                <TextBlock Text="{x:Static resx:ResUI.TbDnsSingboxObjectDoc}" />
+                            </Hyperlink>
+                        </TextBlock>
+                        <Button
+                            x:Name="btnImportDefConfig4Singbox"
+                            Margin="8,0,0,0"
+                            Content="{x:Static resx:ResUI.TbSettingDnsImportDefConfig}"
+                            Cursor="Hand"
+                            Style="{StaticResource DefButton}" />
+                    </StackPanel>
+
+                    <Grid Margin="{StaticResource SettingItemMargin}">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="1*" />
+                            <ColumnDefinition Width="10" />
+                            <ColumnDefinition Width="1*" />
+                        </Grid.ColumnDefinitions>
+
+                        <TextBox
+                            x:Name="txtnormalDNS2"
+                            Grid.Column="0"
+                            VerticalAlignment="Stretch"
+                            materialDesign:HintAssist.Hint="Http/Socks"
+                            AcceptsReturn="True"
+                            BorderThickness="1"
+                            Style="{StaticResource MaterialDesignOutlinedTextBox}"
+                            TextWrapping="Wrap"
+                            VerticalScrollBarVisibility="Auto" />
+
+                        <GridSplitter Grid.Column="1" HorizontalAlignment="Stretch" />
+
+                        <TextBox
+                            x:Name="txttunDNS2"
+                            Grid.Column="2"
+                            VerticalAlignment="Stretch"
+                            materialDesign:HintAssist.Hint="{x:Static resx:ResUI.TbSettingsTunMode}"
+                            AcceptsReturn="True"
+                            BorderThickness="1"
+                            Style="{StaticResource MaterialDesignOutlinedTextBox}"
+                            TextWrapping="Wrap"
+                            VerticalScrollBarVisibility="Auto" />
+                    </Grid>
+                </DockPanel>
+            </TabItem>
+        </TabControl>
+    </DockPanel>
+</reactiveui:ReactiveWindow>

v2rayN/v2rayN/Views/DNSSettingWindow.xaml.cs

@@ -0,0 +1,62 @@
+using ReactiveUI;
+using System.Reactive.Disposables;
+using System.Windows;
+using v2rayN.Handler;
+using v2rayN.Mode;
+using v2rayN.ViewModels;
+
+namespace v2rayN.Views
+{
+    public partial class DNSSettingWindow
+    {
+        private static Config _config;
+
+        public DNSSettingWindow()
+        {
+            InitializeComponent();
+
+            // 设置窗口的尺寸不大于屏幕的尺寸
+            if (this.Width > SystemParameters.WorkArea.Width)
+            {
+                this.Width = SystemParameters.WorkArea.Width;
+            }
+            if (this.Height > SystemParameters.WorkArea.Height)
+            {
+                this.Height = SystemParameters.WorkArea.Height;
+            }
+
+            this.Owner = Application.Current.MainWindow;
+            _config = LazyConfig.Instance.GetConfig();
+
+            ViewModel = new DNSSettingViewModel(this);
+
+            Global.DomainStrategy4Freedoms.ForEach(it =>
+            {
+                cmbdomainStrategy4Freedom.Items.Add(it);
+            });
+
+            this.WhenActivated(disposables =>
+            {
+                this.Bind(ViewModel, vm => vm.useSystemHosts, v => v.togUseSystemHosts.IsChecked).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.domainStrategy4Freedom, v => v.cmbdomainStrategy4Freedom.Text).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.normalDNS, v => v.txtnormalDNS.Text).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.normalDNS2, v => v.txtnormalDNS2.Text).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.tunDNS2, v => v.txttunDNS2.Text).DisposeWith(disposables);
+
+                this.BindCommand(ViewModel, vm => vm.SaveCmd, v => v.btnSave).DisposeWith(disposables);
+                this.BindCommand(ViewModel, vm => vm.ImportDefConfig4V2rayCmd, v => v.btnImportDefConfig4V2ray).DisposeWith(disposables);
+                this.BindCommand(ViewModel, vm => vm.ImportDefConfig4SingboxCmd, v => v.btnImportDefConfig4Singbox).DisposeWith(disposables);
+            });
+        }
+
+        private void linkDnsObjectDoc_Click(object sender, RoutedEventArgs e)
+        {
+            Utils.ProcessStart("https://www.v2fly.org/config/dns.html#dnsobject");
+        }
+
+        private void linkDnsSingboxObjectDoc_Click(object sender, RoutedEventArgs e)
+        {
+            Utils.ProcessStart("https://sing-box.sagernet.org/zh/configuration/dns/");
+        }
+    }
+}

v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml

@@ -2,7 +2,6 @@
     x:Class="v2rayN.Views.GlobalHotkeySettingWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:Views="clr-namespace:v2rayN.Views"
     xmlns:conv="clr-namespace:v2rayN.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
@@ -11,7 +10,7 @@
     xmlns:resx="clr-namespace:v2rayN.Resx"
     xmlns:vms="clr-namespace:v2rayN.ViewModels"
     Title="{x:Static resx:ResUI.menuSetting}"
-    Width="600"
+    Width="700"
     Height="500"
     x:TypeArguments="vms:SubEditViewModel"
     Background="{DynamicResource MaterialDesignPaper}"
@@ -25,160 +24,163 @@
     TextOptions.TextRenderingMode="Auto"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
-    <ScrollViewer
-        materialDesign:ScrollViewerAssist.IsAutoHideEnabled="True"
-        HorizontalScrollBarVisibility="Auto"
-        VerticalScrollBarVisibility="Auto">
-        <Grid Margin="8">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-            <Grid x:Name="gridText" Grid.Row="0">
+    <DockPanel Margin="8">
+        <StackPanel
+            Margin="4"
+            HorizontalAlignment="Center"
+            DockPanel.Dock="Bottom"
+            Orientation="Horizontal">
+            <Button
+                x:Name="btnReset"
+                Width="100"
+                Margin="8,0"
+                Click="btnReset_Click"
+                Content="{x:Static resx:ResUI.TbReset}"
+                Style="{StaticResource DefButton}" />
+            <Button
+                x:Name="btnSave"
+                Width="100"
+                Click="btnSave_Click"
+                Content="{x:Static resx:ResUI.TbConfirm}"
+                Cursor="Hand"
+                Style="{StaticResource DefButton}" />
+            <Button
+                x:Name="btnCancel"
+                Width="100"
+                Margin="8,0"
+                Content="{x:Static resx:ResUI.TbCancel}"
+                Cursor="Hand"
+                IsCancel="true"
+                Style="{StaticResource DefButton}" />
+        </StackPanel>
+        <ScrollViewer
+            materialDesign:ScrollViewerAssist.IsAutoHideEnabled="True"
+            HorizontalScrollBarVisibility="Auto"
+            VerticalScrollBarVisibility="Auto">
+            <Grid>
                 <Grid.RowDefinitions>
                     <RowDefinition Height="Auto" />
                     <RowDefinition Height="Auto" />
                     <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="300" />
-                </Grid.ColumnDefinitions>
+                <Grid x:Name="gridText" Grid.Row="0">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="400" />
+                    </Grid.ColumnDefinitions>
 
-                <TextBlock
-                    Grid.Row="0"
-                    Grid.Column="0"
-                    Margin="4"
-                    Style="{StaticResource ModuleTitle}"
-                    Text="{x:Static resx:ResUI.TbGlobalHotkeySetting}" />
+                    <TextBlock
+                        Grid.Row="0"
+                        Grid.Column="0"
+                        Margin="4"
+                        Style="{StaticResource ModuleTitle}"
+                        Text="{x:Static resx:ResUI.TbGlobalHotkeySetting}" />
+
+                    <TextBlock
+                        Grid.Row="1"
+                        Grid.Column="0"
+                        Margin="4"
+                        VerticalAlignment="Center"
+                        Style="{StaticResource ToolbarTextBlock}"
+                        Text="{x:Static resx:ResUI.TbDisplayGUI}" />
+
+                    <TextBox
+                        x:Name="txtGlobalHotkey0"
+                        Grid.Row="1"
+                        Grid.Column="1"
+                        Margin="4"
+                        VerticalAlignment="Top"
+                        AcceptsReturn="True"
+                        IsReadOnly="True"
+                        PreviewKeyDown="TxtGlobalHotkey_PreviewKeyDown"
+                        Style="{StaticResource MyOutlinedTextBox}" />
+
+                    <TextBlock
+                        Grid.Row="2"
+                        Grid.Column="0"
+                        Margin="4"
+                        VerticalAlignment="Center"
+                        Style="{StaticResource ToolbarTextBlock}"
+                        Text="{x:Static resx:ResUI.TbClearSystemProxy}" />
+                    <TextBox
+                        x:Name="txtGlobalHotkey1"
+                        Grid.Row="2"
+                        Grid.Column="1"
+                        Margin="4"
+                        VerticalAlignment="Top"
+                        AcceptsReturn="True"
+                        IsReadOnly="True"
+                        PreviewKeyDown="TxtGlobalHotkey_PreviewKeyDown"
+                        Style="{StaticResource MyOutlinedTextBox}" />
+
+                    <TextBlock
+                        Grid.Row="3"
+                        Grid.Column="0"
+                        Margin="4"
+                        VerticalAlignment="Center"
+                        Style="{StaticResource ToolbarTextBlock}"
+                        Text="{x:Static resx:ResUI.TbSetSystemProxy}" />
+                    <TextBox
+                        x:Name="txtGlobalHotkey2"
+                        Grid.Row="3"
+                        Grid.Column="1"
+                        Margin="4"
+                        VerticalAlignment="Top"
+                        AcceptsReturn="True"
+                        IsReadOnly="True"
+                        PreviewKeyDown="TxtGlobalHotkey_PreviewKeyDown"
+                        Style="{StaticResource MyOutlinedTextBox}" />
+                    <TextBlock
+                        Grid.Row="4"
+                        Grid.Column="0"
+                        Margin="4"
+                        VerticalAlignment="Center"
+                        Style="{StaticResource ToolbarTextBlock}"
+                        Text="{x:Static resx:ResUI.TbNotChangeSystemProxy}" />
+                    <TextBox
+                        x:Name="txtGlobalHotkey3"
+                        Grid.Row="4"
+                        Grid.Column="1"
+                        Margin="4"
+                        VerticalAlignment="Top"
+                        AcceptsReturn="True"
+                        IsReadOnly="True"
+                        PreviewKeyDown="TxtGlobalHotkey_PreviewKeyDown"
+                        Style="{StaticResource MyOutlinedTextBox}" />
+                    <TextBlock
+                        Grid.Row="5"
+                        Grid.Column="0"
+                        Margin="4"
+                        VerticalAlignment="Center"
+                        Style="{StaticResource ToolbarTextBlock}"
+                        Text="{x:Static resx:ResUI.TbSystemProxyPac}" />
+                    <TextBox
+                        x:Name="txtGlobalHotkey4"
+                        Grid.Row="5"
+                        Grid.Column="1"
+                        Margin="4"
+                        VerticalAlignment="Top"
+                        AcceptsReturn="True"
+                        IsReadOnly="True"
+                        PreviewKeyDown="TxtGlobalHotkey_PreviewKeyDown"
+                        Style="{StaticResource MyOutlinedTextBox}" />
+                </Grid>
 
                 <TextBlock
                     Grid.Row="1"
-                    Grid.Column="0"
                     Margin="4"
                     VerticalAlignment="Center"
                     Style="{StaticResource ToolbarTextBlock}"
-                    Text="{x:Static resx:ResUI.TbDisplayGUI}" />
-
-                <TextBox
-                    x:Name="txtGlobalHotkey0"
-                    Grid.Row="1"
-                    Grid.Column="1"
-                    Margin="4"
-                    VerticalAlignment="Top"
-                    AcceptsReturn="True"
-                    IsReadOnly="True"
-                    Style="{StaticResource MyOutlinedTextBox}" />
-
-                <TextBlock
-                    Grid.Row="2"
-                    Grid.Column="0"
-                    Margin="4"
-                    VerticalAlignment="Center"
-                    Style="{StaticResource ToolbarTextBlock}"
-                    Text="{x:Static resx:ResUI.TbClearSystemProxy}" />
-                <TextBox
-                    x:Name="txtGlobalHotkey1"
-                    Grid.Row="2"
-                    Grid.Column="1"
-                    Margin="4"
-                    VerticalAlignment="Top"
-                    AcceptsReturn="True"
-                    IsReadOnly="True"
-                    Style="{StaticResource MyOutlinedTextBox}" />
-
-                <TextBlock
-                    Grid.Row="3"
-                    Grid.Column="0"
-                    Margin="4"
-                    VerticalAlignment="Center"
-                    Style="{StaticResource ToolbarTextBlock}"
-                    Text="{x:Static resx:ResUI.TbSetSystemProxy}" />
-                <TextBox
-                    x:Name="txtGlobalHotkey2"
-                    Grid.Row="3"
-                    Grid.Column="1"
-                    Margin="4"
-                    VerticalAlignment="Top"
-                    AcceptsReturn="True"
-                    IsReadOnly="True"
-                    Style="{StaticResource MyOutlinedTextBox}" />
-                <TextBlock
-                    Grid.Row="4"
-                    Grid.Column="0"
-                    Margin="4"
-                    VerticalAlignment="Center"
-                    Style="{StaticResource ToolbarTextBlock}"
-                    Text="{x:Static resx:ResUI.TbNotChangeSystemProxy}" />
-                <TextBox
-                    x:Name="txtGlobalHotkey3"
-                    Grid.Row="4"
-                    Grid.Column="1"
-                    Margin="4"
-                    VerticalAlignment="Top"
-                    AcceptsReturn="True"
-                    IsReadOnly="True"
-                    Style="{StaticResource MyOutlinedTextBox}" />
-                <TextBlock
-                    Grid.Row="5"
-                    Grid.Column="0"
-                    Margin="4"
-                    VerticalAlignment="Center"
-                    Style="{StaticResource ToolbarTextBlock}"
-                    Text="{x:Static resx:ResUI.TbSystemProxyPac}" />
-                <TextBox
-                    x:Name="txtGlobalHotkey4"
-                    Grid.Row="5"
-                    Grid.Column="1"
-                    Margin="4"
-                    VerticalAlignment="Top"
-                    AcceptsReturn="True"
-                    IsReadOnly="True"
-                    Style="{StaticResource MyOutlinedTextBox}" />
+                    Text="{x:Static resx:ResUI.TbGlobalHotkeySettingTip}" />
             </Grid>
-
-            <TextBlock
-                Grid.Row="1"
-                Margin="4"
-                VerticalAlignment="Center"
-                Style="{StaticResource ToolbarTextBlock}"
-                Text="{x:Static resx:ResUI.TbGlobalHotkeySettingTip}" />
-
-            <Grid
-                Grid.Row="2"
-                Margin="8"
-                HorizontalAlignment="Center">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="150" />
-                    <ColumnDefinition Width="150" />
-                    <ColumnDefinition Width="150" />
-                </Grid.ColumnDefinitions>
-                <Button
-                    x:Name="btnReset"
-                    Grid.Column="0"
-                    Margin="4"
-                    Click="btnReset_Click"
-                    Content="{x:Static resx:ResUI.TbReset}"
-                    Style="{StaticResource DefButton}" />
-                <Button
-                    x:Name="btnSave"
-                    Grid.Column="1"
-                    Margin="4"
-                    Click="btnSave_Click"
-                    Content="{x:Static resx:ResUI.TbConfirm}"
-                    Style="{StaticResource DefButton}" />
-                <Button
-                    x:Name="btnCancel"
-                    Grid.Column="2"
-                    Margin="4"
-                    Click="btnCancel_Click"
-                    Content="{x:Static resx:ResUI.TbCancel}"
-                    Style="{StaticResource DefButton}" />
-            </Grid>
-        </Grid>
-    </ScrollViewer>
+        </ScrollViewer>
+    </DockPanel>
 </reactiveui:ReactiveWindow>

v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml.cs

@@ -16,15 +16,26 @@ namespace v2rayN.Views
         public GlobalHotkeySettingWindow()
         {
             InitializeComponent();
+
+            // 设置窗口的尺寸不大于屏幕的尺寸
+            if (this.Width > SystemParameters.WorkArea.Width)
+            {
+                this.Width = SystemParameters.WorkArea.Width;
+            }
+            if (this.Height > SystemParameters.WorkArea.Height)
+            {
+                this.Height = SystemParameters.WorkArea.Height;
+            }
+
             this.Owner = Application.Current.MainWindow;
             _config = LazyConfig.Instance.GetConfig();
             _config.globalHotkeys ??= new List<KeyEventItem>();
 
-            txtGlobalHotkey0.KeyDown += TxtGlobalHotkey_KeyDown;
-            txtGlobalHotkey1.KeyDown += TxtGlobalHotkey_KeyDown;
-            txtGlobalHotkey2.KeyDown += TxtGlobalHotkey_KeyDown;
-            txtGlobalHotkey3.KeyDown += TxtGlobalHotkey_KeyDown;
-            txtGlobalHotkey4.KeyDown += TxtGlobalHotkey_KeyDown;
+            txtGlobalHotkey0.KeyDown += TxtGlobalHotkey_PreviewKeyDown;
+            txtGlobalHotkey1.KeyDown += TxtGlobalHotkey_PreviewKeyDown;
+            txtGlobalHotkey2.KeyDown += TxtGlobalHotkey_PreviewKeyDown;
+            txtGlobalHotkey3.KeyDown += TxtGlobalHotkey_PreviewKeyDown;
+            txtGlobalHotkey4.KeyDown += TxtGlobalHotkey_PreviewKeyDown;
 
             HotkeyHandler.Instance.IsPause = true;
             this.Closing += (s, e) => HotkeyHandler.Instance.IsPause = false;
@@ -45,7 +56,7 @@ namespace v2rayN.Views
             BindingData();
         }
 
-        private void TxtGlobalHotkey_KeyDown(object sender, KeyEventArgs e)
+        private void TxtGlobalHotkey_PreviewKeyDown(object sender, KeyEventArgs e)
         {
             e.Handled = true;
             var _ModifierKeys = new Key[] { Key.LeftCtrl, Key.RightCtrl, Key.LeftShift,
@@ -59,7 +70,7 @@ namespace v2rayN.Views
 
         private KeyEventItem GetKeyEventItemByEGlobalHotkey(List<KeyEventItem> KELsit, EGlobalHotkey eg)
         {
-            return Utils.DeepCopy(KELsit.Find((it) => it.eGlobalHotkey == eg) ?? new()
+            return JsonUtils.DeepCopy(KELsit.Find((it) => it.eGlobalHotkey == eg) ?? new()
             {
                 eGlobalHotkey = eg,
                 Control = false,
@@ -101,7 +112,7 @@ namespace v2rayN.Views
         {
             _config.globalHotkeys = _TextBoxKeyEventItem.Values.ToList();
 
-            if (ConfigHandler.SaveConfig(ref _config, false) == 0)
+            if (ConfigHandler.SaveConfig(_config, false) == 0)
             {
                 HotkeyHandler.Instance.ReLoad();
                 this.DialogResult = true;
@@ -112,11 +123,6 @@ namespace v2rayN.Views
             }
         }
 
-        private void btnCancel_Click(object sender, RoutedEventArgs e)
-        {
-            this.Close();
-        }
-
         private void btnReset_Click(object sender, RoutedEventArgs e)
         {
             foreach (var k in _TextBoxKeyEventItem.Keys)

v2rayN/v2rayN/Views/MainWindow.xaml

@@ -15,8 +15,6 @@
     Title="v2rayN"
     Width="900"
     Height="700"
-    MinWidth="900"
-    MinHeight="700"
     x:TypeArguments="vms:MainWindowViewModel"
     Background="{DynamicResource MaterialDesignPaper}"
     FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
@@ -86,6 +84,19 @@
                                     Height="{StaticResource MenuItemHeight}"
                                     Header="{x:Static resx:ResUI.menuAddTrojanServer}" />
                                 <Separator Margin="-40,5" />
+                                <MenuItem
+                                    x:Name="menuAddHysteria2Server"
+                                    Height="{StaticResource MenuItemHeight}"
+                                    Header="{x:Static resx:ResUI.menuAddHysteria2Server}" />
+                                <MenuItem
+                                    x:Name="menuAddTuicServer"
+                                    Height="{StaticResource MenuItemHeight}"
+                                    Header="{x:Static resx:ResUI.menuAddTuicServer}" />
+                                <MenuItem
+                                    x:Name="menuAddWireguardServer"
+                                    Height="{StaticResource MenuItemHeight}"
+                                    Header="{x:Static resx:ResUI.menuAddWireguardServer}" />
+                                <Separator Margin="-40,5" />
                                 <MenuItem
                                     x:Name="menuAddServerViaClipboard"
                                     Height="{StaticResource MenuItemHeight}"
@@ -151,6 +162,10 @@
                                     x:Name="menuRoutingSetting"
                                     Height="{StaticResource MenuItemHeight}"
                                     Header="{x:Static resx:ResUI.menuRoutingSetting}" />
+                                <MenuItem
+                                    x:Name="menuDNSSetting"
+                                    Height="{StaticResource MenuItemHeight}"
+                                    Header="{x:Static resx:ResUI.menuDNSSetting}" />
                                 <MenuItem
                                     x:Name="menuGlobalHotkeySetting"
                                     Height="{StaticResource MenuItemHeight}"
@@ -205,20 +220,20 @@
                                 <MenuItem
                                     x:Name="menuCheckUpdateN"
                                     Height="{StaticResource MenuItemHeight}"
-                                    Header="v2rayN" />
-                                <MenuItem
+                                    Header="V2rayN" />
+                                <!--<MenuItem
                                     x:Name="menuCheckUpdateV2flyCore"
                                     Height="{StaticResource MenuItemHeight}"
                                     Header="V2fly v5 Core" />
-                                <MenuItem
+                              <MenuItem
                                     x:Name="menuCheckUpdateSagerNetCore"
                                     Height="{StaticResource MenuItemHeight}"
-                                    Header="SagerNet Core" />
+                                    Header="SagerNet Core" />-->
                                 <MenuItem
                                     x:Name="menuCheckUpdateXrayCore"
                                     Height="{StaticResource MenuItemHeight}"
                                     Header="Xray Core" />
-                                <Separator Margin="-40,5" />
+                                <!--<Separator Margin="-40,5" />
                                 <MenuItem
                                     x:Name="menuCheckUpdateClashCore"
                                     Height="{StaticResource MenuItemHeight}"
@@ -227,11 +242,11 @@
                                     x:Name="menuCheckUpdateClashMetaCore"
                                     Height="{StaticResource MenuItemHeight}"
                                     Header="Clash.Meta Core" />
-                                <Separator Margin="-40,5" />
+                                <Separator Margin="-40,5" />-->
                                 <MenuItem
                                     x:Name="menuCheckUpdateSingBoxCore"
                                     Height="{StaticResource MenuItemHeight}"
-                                    Header="SingBox Core" />
+                                    Header="Sing-box Core" />
                                 <Separator Margin="-40,5" />
                                 <MenuItem
                                     x:Name="menuCheckUpdateGeo"
@@ -300,6 +315,7 @@
                                         <RowDefinition Height="Auto" />
                                         <RowDefinition Height="Auto" />
                                         <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
                                     </Grid.RowDefinitions>
                                     <Grid.ColumnDefinitions>
                                         <ColumnDefinition Width="Auto" />
@@ -315,17 +331,30 @@
                                         x:Name="togDarkMode"
                                         Grid.Row="0"
                                         Grid.Column="1"
-                                        Margin="8" />
+                                        Margin="8"
+                                        IsEnabled="{Binding ElementName=followSystemTheme, Path=IsChecked, Converter={StaticResource InverseBooleanConverter}}" />
 
                                     <TextBlock
                                         Grid.Row="1"
                                         Grid.Column="0"
                                         VerticalAlignment="Center"
                                         Style="{StaticResource ToolbarTextBlock}"
+                                        Text="{x:Static resx:ResUI.TbSettingsFollowSystemTheme}" />
+                                    <ToggleButton
+                                        x:Name="followSystemTheme"
+                                        Grid.Row="1"
+                                        Grid.Column="1"
+                                        Margin="8" />
+
+                                    <TextBlock
+                                        Grid.Row="2"
+                                        Grid.Column="0"
+                                        VerticalAlignment="Center"
+                                        Style="{StaticResource ToolbarTextBlock}"
                                         Text="{x:Static resx:ResUI.TbSettingsColor}" />
                                     <ComboBox
                                         x:Name="cmbSwatches"
-                                        Grid.Row="1"
+                                        Grid.Row="2"
                                         Grid.Column="1"
                                         Width="100"
                                         Margin="8"
@@ -333,28 +362,28 @@
                                         Style="{StaticResource DefComboBox}" />
 
                                     <TextBlock
-                                        Grid.Row="2"
+                                        Grid.Row="3"
                                         Grid.Column="0"
                                         VerticalAlignment="Center"
                                         Style="{StaticResource ToolbarTextBlock}"
                                         Text="{x:Static resx:ResUI.TbSettingsFontSize}" />
                                     <ComboBox
                                         x:Name="cmbCurrentFontSize"
-                                        Grid.Row="2"
+                                        Grid.Row="3"
                                         Grid.Column="1"
                                         Width="100"
                                         Margin="8"
                                         Style="{StaticResource DefComboBox}" />
 
                                     <TextBlock
-                                        Grid.Row="3"
+                                        Grid.Row="4"
                                         Grid.Column="0"
                                         VerticalAlignment="Center"
                                         Style="{StaticResource ToolbarTextBlock}"
                                         Text="{x:Static resx:ResUI.TbSettingsLanguage}" />
                                     <ComboBox
                                         x:Name="cmbCurrentLanguage"
-                                        Grid.Row="3"
+                                        Grid.Row="4"
                                         Grid.Column="1"
                                         Width="100"
                                         Margin="8"
@@ -368,6 +397,7 @@
                 <WrapPanel Margin="2" DockPanel.Dock="Top">
                     <ListBox
                         x:Name="lstGroup"
+                        MaxHeight="120"
                         FontSize="{DynamicResource StdFontSize}"
                         ItemContainerStyle="{StaticResource MyChipListBoxItem}"
                         Style="{StaticResource MaterialDesignChoiceChipPrimaryOutlineListBox}">
@@ -377,6 +407,15 @@
                             </DataTemplate>
                         </ListBox.ItemTemplate>
                     </ListBox>
+
+                    <Button
+                        x:Name="btnEditSub"
+                        Width="30"
+                        Height="30"
+                        Margin="4,0"
+                        Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}">
+                        <materialDesign:PackIcon VerticalAlignment="Center" Kind="Edit" />
+                    </Button>
                     <Button
                         x:Name="btnAddSub"
                         Width="30"
@@ -385,11 +424,12 @@
                         Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}">
                         <materialDesign:PackIcon VerticalAlignment="Center" Kind="Plus" />
                     </Button>
+
                     <Button
                         x:Name="btnAutofitColumnWidth"
                         Width="30"
                         Height="30"
-                        Margin="4,0"
+                        Margin="20,0"
                         Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}">
                         <materialDesign:PackIcon VerticalAlignment="Center" Kind="ArrowSplitVertical" />
                     </Button>
@@ -541,10 +581,6 @@
                                     x:Name="menuMixedTestServer"
                                     Height="{StaticResource MenuItemHeight}"
                                     Header="{x:Static resx:ResUI.menuMixedTestServer}" />
-                                <MenuItem
-                                    x:Name="menuPingServer"
-                                    Height="{StaticResource MenuItemHeight}"
-                                    Header="{x:Static resx:ResUI.menuPingServer}" />
                                 <MenuItem
                                     x:Name="menuTcpingServer"
                                     Height="{StaticResource MenuItemHeight}"
@@ -608,10 +644,6 @@
                                     x:Name="menuExport2ClientConfig"
                                     Height="{StaticResource MenuItemHeight}"
                                     Header="{x:Static resx:ResUI.menuExport2ClientConfig}" />
-                                <MenuItem
-                                    x:Name="menuExport2ServerConfig"
-                                    Height="{StaticResource MenuItemHeight}"
-                                    Header="{x:Static resx:ResUI.menuExport2ServerConfig}" />
                                 <MenuItem
                                     x:Name="menuExport2ShareUrl"
                                     Height="{StaticResource MenuItemHeight}"
@@ -662,11 +694,6 @@
                                 Binding="{Binding port}"
                                 ExName="port"
                                 Header="{x:Static resx:ResUI.LvPort}" />
-                            <base:MyDGTextColumn
-                                Width="100"
-                                Binding="{Binding security}"
-                                ExName="security"
-                                Header="{x:Static resx:ResUI.LvEncryptionMethod}" />
                             <base:MyDGTextColumn
                                 Width="100"
                                 Binding="{Binding network}"
@@ -734,12 +761,17 @@
                     </DataGrid>
                     <GridSplitter Grid.Row="1" HorizontalAlignment="Stretch" />
                     <local:MsgView Grid.Row="2" />
+                    <materialDesign:Snackbar
+                        x:Name="MainSnackbar"
+                        Grid.Row="2"
+                        MessageQueue="{materialDesign:MessageQueue}" />
                 </Grid>
             </DockPanel>
             <tb:TaskbarIcon
                 x:Name="tbNotify"
                 IconSource="/v2rayN.ico"
-                NoLeftClickDelay="True">
+                NoLeftClickDelay="True"
+                ToolTipText="v2rayN">
                 <tb:TaskbarIcon.ContextMenu>
                     <ContextMenu Style="{StaticResource DefContextMenu}">
                         <MenuItem x:Name="menuSystemProxyClear" Height="{StaticResource MenuItemHeight}">
@@ -842,25 +874,7 @@
                             Header="{x:Static resx:ResUI.menuExit}" />
                     </ContextMenu>
                 </tb:TaskbarIcon.ContextMenu>
-                <tb:TaskbarIcon.TrayToolTip>
-                    <Border
-                        x:Name="borTrayToolTip"
-                        Width="Auto"
-                        Height="Auto"
-                        Background="{DynamicResource MaterialDesignLightBackground}"
-                        BorderBrush="{DynamicResource MaterialDesignDarkBackground}"
-                        BorderThickness="0"
-                        CornerRadius="4">
-                        <TextBlock
-                            Margin="8"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center"
-                            Foreground="{DynamicResource MaterialDesignDarkBackground}"
-                            Text="{Binding Mode=OneWay, Path=ToolTipText}" />
-                    </Border>
-                </tb:TaskbarIcon.TrayToolTip>
             </tb:TaskbarIcon>
-            <materialDesign:Snackbar x:Name="MainSnackbar" MessageQueue="{materialDesign:MessageQueue}" />
         </Grid>
     </materialDesign:DialogHost>
 </reactiveui:ReactiveWindow>

v2rayN/v2rayN/Views/MainWindow.xaml.cs

@@ -2,6 +2,7 @@
 using Splat;
 using System.ComponentModel;
 using System.Reactive.Disposables;
+using System.Runtime.InteropServices;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
@@ -24,6 +25,19 @@ namespace v2rayN.Views
         public MainWindow()
         {
             InitializeComponent();
+
+            // 设置窗口的尺寸不大于屏幕的尺寸
+            if (this.Width > SystemParameters.WorkArea.Width)
+            {
+                this.Width = SystemParameters.WorkArea.Width;
+            }
+            if (this.Height > SystemParameters.WorkArea.Height)
+            {
+                this.Height = SystemParameters.WorkArea.Height;
+            }
+
+            lstGroup.MaxHeight = Math.Floor(SystemParameters.WorkArea.Height * 0.20 / 40) * 40;
+
             _config = LazyConfig.Instance.GetConfig();
 
             App.Current.SessionEnding += Current_SessionEnding;
@@ -65,6 +79,7 @@ namespace v2rayN.Views
                 this.Bind(ViewModel, vm => vm.SelectedSub, v => v.lstGroup.SelectedItem).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.ServerFilter, v => v.txtServerFilter.Text).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.AddSubCmd, v => v.btnAddSub).DisposeWith(disposables);
+                this.BindCommand(ViewModel, vm => vm.EditSubCmd, v => v.btnEditSub).DisposeWith(disposables);
 
                 //servers
                 this.BindCommand(ViewModel, vm => vm.AddVmessServerCmd, v => v.menuAddVmessServer).DisposeWith(disposables);
@@ -72,6 +87,9 @@ namespace v2rayN.Views
                 this.BindCommand(ViewModel, vm => vm.AddShadowsocksServerCmd, v => v.menuAddShadowsocksServer).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.AddSocksServerCmd, v => v.menuAddSocksServer).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.AddTrojanServerCmd, v => v.menuAddTrojanServer).DisposeWith(disposables);
+                this.BindCommand(ViewModel, vm => vm.AddHysteria2ServerCmd, v => v.menuAddHysteria2Server).DisposeWith(disposables);
+                this.BindCommand(ViewModel, vm => vm.AddTuicServerCmd, v => v.menuAddTuicServer).DisposeWith(disposables);
+                this.BindCommand(ViewModel, vm => vm.AddWireguardServerCmd, v => v.menuAddWireguardServer).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.AddCustomServerCmd, v => v.menuAddCustomServer).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.AddServerViaClipboardCmd, v => v.menuAddServerViaClipboard).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.AddServerViaScanCmd, v => v.menuAddServerViaScan).DisposeWith(disposables);
@@ -95,7 +113,6 @@ namespace v2rayN.Views
 
                 //servers ping
                 this.BindCommand(ViewModel, vm => vm.MixedTestServerCmd, v => v.menuMixedTestServer).DisposeWith(disposables);
-                this.BindCommand(ViewModel, vm => vm.PingServerCmd, v => v.menuPingServer).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.TcpingServerCmd, v => v.menuTcpingServer).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.RealPingServerCmd, v => v.menuRealPingServer).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.SpeedServerCmd, v => v.menuSpeedServer).DisposeWith(disposables);
@@ -103,7 +120,6 @@ namespace v2rayN.Views
 
                 //servers export
                 this.BindCommand(ViewModel, vm => vm.Export2ClientConfigCmd, v => v.menuExport2ClientConfig).DisposeWith(disposables);
-                this.BindCommand(ViewModel, vm => vm.Export2ServerConfigCmd, v => v.menuExport2ServerConfig).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.Export2ShareUrlCmd, v => v.menuExport2ShareUrl).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.Export2SubContentCmd, v => v.menuExport2SubContent).DisposeWith(disposables);
 
@@ -117,6 +133,7 @@ namespace v2rayN.Views
                 //setting
                 this.BindCommand(ViewModel, vm => vm.OptionSettingCmd, v => v.menuOptionSetting).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.RoutingSettingCmd, v => v.menuRoutingSetting).DisposeWith(disposables);
+                this.BindCommand(ViewModel, vm => vm.DNSSettingCmd, v => v.menuDNSSetting).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.GlobalHotkeySettingCmd, v => v.menuGlobalHotkeySetting).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.RebootAsAdminCmd, v => v.menuRebootAsAdmin).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.ClearServerStatisticsCmd, v => v.menuClearServerStatistics).DisposeWith(disposables);
@@ -124,11 +141,11 @@ namespace v2rayN.Views
 
                 //checkupdate
                 this.BindCommand(ViewModel, vm => vm.CheckUpdateNCmd, v => v.menuCheckUpdateN).DisposeWith(disposables);
-                this.BindCommand(ViewModel, vm => vm.CheckUpdateV2flyCoreCmd, v => v.menuCheckUpdateV2flyCore).DisposeWith(disposables);
-                this.BindCommand(ViewModel, vm => vm.CheckUpdateSagerNetCoreCmd, v => v.menuCheckUpdateSagerNetCore).DisposeWith(disposables);
+                //this.BindCommand(ViewModel, vm => vm.CheckUpdateV2flyCoreCmd, v => v.menuCheckUpdateV2flyCore).DisposeWith(disposables);
+                //this.BindCommand(ViewModel, vm => vm.CheckUpdateSagerNetCoreCmd, v => v.menuCheckUpdateSagerNetCore).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.CheckUpdateXrayCoreCmd, v => v.menuCheckUpdateXrayCore).DisposeWith(disposables);
-                this.BindCommand(ViewModel, vm => vm.CheckUpdateClashCoreCmd, v => v.menuCheckUpdateClashCore).DisposeWith(disposables);
-                this.BindCommand(ViewModel, vm => vm.CheckUpdateClashMetaCoreCmd, v => v.menuCheckUpdateClashMetaCore).DisposeWith(disposables);
+                //this.BindCommand(ViewModel, vm => vm.CheckUpdateClashCoreCmd, v => v.menuCheckUpdateClashCore).DisposeWith(disposables);
+                //this.BindCommand(ViewModel, vm => vm.CheckUpdateClashMetaCoreCmd, v => v.menuCheckUpdateClashMetaCore).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.CheckUpdateSingBoxCoreCmd, v => v.menuCheckUpdateSingBoxCore).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.CheckUpdateGeoCmd, v => v.menuCheckUpdateGeo).DisposeWith(disposables);
 
@@ -165,7 +182,7 @@ namespace v2rayN.Views
                 this.OneWayBind(ViewModel, vm => vm.RunningServerToolTipText, v => v.tbNotify.ToolTipText).DisposeWith(disposables);
                 this.OneWayBind(ViewModel, vm => vm.NotifyLeftClickCmd, v => v.tbNotify.LeftClickCommand).DisposeWith(disposables);
                 this.OneWayBind(ViewModel, vm => vm.AppIcon, v => v.Icon).DisposeWith(disposables);
-                this.OneWayBind(ViewModel, vm => vm.BlShowTrayTip, v => v.borTrayToolTip.Visibility).DisposeWith(disposables);
+                //this.OneWayBind(ViewModel, vm => vm.BlShowTrayTip, v => v.borTrayToolTip.Visibility).DisposeWith(disposables);
 
                 //status bar
                 this.OneWayBind(ViewModel, vm => vm.InboundDisplay, v => v.txtInboundDisplay.Text).DisposeWith(disposables);
@@ -183,6 +200,7 @@ namespace v2rayN.Views
 
                 //UI
                 this.Bind(ViewModel, vm => vm.ColorModeDark, v => v.togDarkMode.IsChecked).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.FollowSystemTheme, v => v.followSystemTheme.IsChecked).DisposeWith(disposables);
                 this.OneWayBind(ViewModel, vm => vm.Swatches, v => v.cmbSwatches.ItemsSource).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.SelectedSwatch, v => v.cmbSwatches.SelectedItem).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.CurrentFontSize, v => v.cmbCurrentFontSize.Text).DisposeWith(disposables);
@@ -195,8 +213,6 @@ namespace v2rayN.Views
             var IsAdministrator = Utils.IsAdministrator();
             this.Title = $"{Utils.GetVersion()} - {(IsAdministrator ? ResUI.RunAsAdmin : ResUI.NotRunAsAdmin)}";
 
-            spEnableTun.Visibility = IsAdministrator ? Visibility.Visible : Visibility.Collapsed;
-
             //if (_config.uiItem.autoHideStartup)
             //{
             //    WindowState = WindowState.Minimized;
@@ -206,6 +222,25 @@ namespace v2rayN.Views
             {
                 RenderOptions.ProcessRenderMode = RenderMode.SoftwareOnly;
             }
+
+            var helper = new WindowInteropHelper(this);
+            var hwndSource = HwndSource.FromHwnd(helper.EnsureHandle());
+            hwndSource.AddHook((IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled) =>
+            {
+                if (_config.uiItem.followSystemTheme)
+                {
+                    const int WM_SETTINGCHANGE = 0x001A;
+                    if (msg == WM_SETTINGCHANGE)
+                    {
+                        if (wParam == IntPtr.Zero && Marshal.PtrToStringUni(lParam) == "ImmersiveColorSet")
+                        {
+                            ViewModel?.ModifyTheme(!Utils.IsLightTheme());
+                        }
+                    }
+                }
+
+                return IntPtr.Zero;
+            });
         }
 
         #region Event
@@ -240,7 +275,7 @@ namespace v2rayN.Views
 
         private void Current_SessionEnding(object sender, SessionEndingCancelEventArgs e)
         {
-            Utils.SaveLog("Current_SessionEnding");
+            Logging.SaveLog("Current_SessionEnding");
             StorageUI();
             ViewModel?.MyAppExit(true);
         }
@@ -252,12 +287,7 @@ namespace v2rayN.Views
 
         private void LstProfiles_LoadingRow(object? sender, DataGridRowEventArgs e)
         {
-            //if (e.Row.GetIndex() == 0)
-            //{
-            //    lstProfiles.Focus();
-            //}
-
-            e.Row.Header = e.Row.GetIndex() + 1;
+            e.Row.Header = $" {e.Row.GetIndex() + 1}";
         }
 
         private void LstProfiles_MouseDoubleClick(object sender, MouseButtonEventArgs e)
@@ -293,33 +323,31 @@ namespace v2rayN.Views
         {
             if (Keyboard.IsKeyDown(Key.LeftCtrl) || Keyboard.IsKeyDown(Key.RightCtrl))
             {
-                if (e.Key == Key.V)
+                switch (e.Key)
                 {
-                    ViewModel?.AddServerViaClipboard();
-                }
-                else if (e.Key == Key.P)
-                {
-                    ViewModel?.ServerSpeedtest(ESpeedActionType.Ping);
-                }
-                else if (e.Key == Key.O)
-                {
-                    ViewModel?.ServerSpeedtest(ESpeedActionType.Tcping);
-                }
-                else if (e.Key == Key.R)
-                {
-                    ViewModel?.ServerSpeedtest(ESpeedActionType.Realping);
-                }
-                else if (e.Key == Key.S)
-                {
-                    _ = ViewModel?.ScanScreenTaskAsync();
-                }
-                else if (e.Key == Key.T)
-                {
-                    ViewModel?.ServerSpeedtest(ESpeedActionType.Speedtest);
-                }
-                else if (e.Key == Key.E)
-                {
-                    ViewModel?.ServerSpeedtest(ESpeedActionType.Mixedtest);
+                    case Key.V:
+                        ViewModel?.AddServerViaClipboard();
+                        break;
+
+                    case Key.O:
+                        ViewModel?.ServerSpeedtest(ESpeedActionType.Tcping);
+                        break;
+
+                    case Key.R:
+                        ViewModel?.ServerSpeedtest(ESpeedActionType.Realping);
+                        break;
+
+                    case Key.S:
+                        ViewModel?.ScanScreenTaskAsync().ContinueWith(_ => { });
+                        break;
+
+                    case Key.T:
+                        ViewModel?.ServerSpeedtest(ESpeedActionType.Speedtest);
+                        break;
+
+                    case Key.E:
+                        ViewModel?.ServerSpeedtest(ESpeedActionType.Mixedtest);
+                        break;
                 }
             }
             else
@@ -446,12 +474,11 @@ namespace v2rayN.Views
             }
 
             var lvColumnItem = _config.uiItem.mainColumnItem.OrderBy(t => t.Index).ToList();
-            for (int i = 0; i < lvColumnItem.Count; i++)
+            var displayIndex = 0;
+            foreach(var item in lvColumnItem)
             {
-                var item = lvColumnItem[i];
-                for (int k = 1; k < lstProfiles.Columns.Count; k++)
-                {
-                    var item2 = (MyDGTextColumn)lstProfiles.Columns[k];
+                foreach (MyDGTextColumn item2 in lstProfiles.Columns) 
+                { 
                     if (item2.ExName == item.Name)
                     {
                         if (item.Width < 0)
@@ -461,7 +488,7 @@ namespace v2rayN.Views
                         else
                         {
                             item2.Width = item.Width;
-                            item2.DisplayIndex = i;
+                            item2.DisplayIndex = displayIndex++;
                         }
                     }
                 }
@@ -469,17 +496,24 @@ namespace v2rayN.Views
 
             if (!_config.guiItem.enableStatistics)
             {
-                colTodayUp.Visibility = Visibility.Hidden;
-                colTodayDown.Visibility = Visibility.Hidden;
-                colTotalUp.Visibility = Visibility.Hidden;
+                colTodayUp.Visibility =
+                colTodayDown.Visibility =
+                colTotalUp.Visibility =
                 colTotalDown.Visibility = Visibility.Hidden;
             }
+            else
+            {
+                colTodayUp.Visibility =
+                colTodayDown.Visibility =
+                colTotalUp.Visibility =
+                colTotalDown.Visibility = Visibility.Visible;
+            }
         }
 
         private void StorageUI()
         {
-            _config.uiItem.mainWidth = this.Width;
-            _config.uiItem.mainHeight = this.Height;
+            _config.uiItem.mainWidth = Utils.ToInt(this.Width);
+            _config.uiItem.mainHeight = Utils.ToInt(this.Height);
 
             List<ColumnItem> lvColumnItem = new();
             for (int k = 0; k < lstProfiles.Columns.Count; k++)
@@ -488,7 +522,7 @@ namespace v2rayN.Views
                 lvColumnItem.Add(new()
                 {
                     Name = item2.ExName,
-                    Width = item2.Visibility == Visibility.Visible ? Convert.ToInt32(item2.ActualWidth) : 0,
+                    Width = item2.Visibility == Visibility.Visible ? Utils.ToInt(item2.ActualWidth) : -1,
                     Index = item2.DisplayIndex
                 });
             }
@@ -501,12 +535,16 @@ namespace v2rayN.Views
         private void AddHelpMenuItem()
         {
             var coreInfos = LazyConfig.Instance.GetCoreInfos();
-            foreach (var it in coreInfos)
+            foreach (var it in coreInfos
+                .Where(t => t.coreType != ECoreType.v2fly
+                            && t.coreType != ECoreType.clash
+                            && t.coreType != ECoreType.clash_meta
+                            && t.coreType != ECoreType.hysteria))
             {
                 var item = new MenuItem()
                 {
                     Tag = it.coreUrl.Replace(@"/releases", ""),
-                    Header = string.Format(Resx.ResUI.menuWebsiteItem, it.coreType.ToString().Replace("_", " "))
+                    Header = string.Format(Resx.ResUI.menuWebsiteItem, it.coreType.ToString().Replace("_", " ")).UpperFirstChar()
                 };
                 item.Click += MenuItem_Click;
                 menuHelp.Items.Add(item);

v2rayN/v2rayN/Views/MsgView.xaml

@@ -3,11 +3,9 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="clr-namespace:v2rayN.Views"
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:resx="clr-namespace:v2rayN.Resx"
-    xmlns:vms="clr-namespace:v2rayN.ViewModels"
     d:DesignHeight="450"
     d:DesignWidth="800"
     mc:Ignorable="d">
@@ -41,6 +39,16 @@
                 Margin="8,0"
                 HorizontalAlignment="Left"
                 IsChecked="True" />
+            <TextBlock
+                Margin="8,0"
+                VerticalAlignment="Center"
+                Style="{StaticResource ToolbarTextBlock}"
+                Text="{x:Static resx:ResUI.TbAutoScrollToEnd}" />
+            <ToggleButton
+                x:Name="togScrollToEnd"
+                Margin="8,0"
+                HorizontalAlignment="Left"
+                IsChecked="True" />
         </StackPanel>
         <TextBox
             Name="txtMsg"