Up 6.44

Optimize code for better performance

.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 自动化部署，更新日志应该很快会手动更新

.gitignore

@@ -16,3 +16,4 @@
 /v2rayN/v2rayUpgrade/bin/Release
 /v2rayN/v2rayUpgrade/obj/
 *.user
+/.vs/v2rayN

README.md

@@ -1,5 +1,5 @@
 # v2rayN
-A V2Ray client for Windows, support [Xray core](https://github.com/XTLS/Xray-core) and [v2fly core](https://github.com/v2fly/v2ray-core)
+A GUI client for Windows, support [Xray core](https://github.com/XTLS/Xray-core) and [v2fly core](https://github.com/v2fly/v2ray-core) and [others](https://github.com/2dust/v2rayN/wiki/List-of-supported-cores)
 
 
 [![GitHub commit activity](https://img.shields.io/github/commit-activity/m/2dust/v2rayN)](https://github.com/2dust/v2rayN/commits/master)
@@ -7,15 +7,17 @@ A V2Ray client for Windows, support [Xray core](https://github.com/XTLS/Xray-cor
 [![GitHub Releases](https://img.shields.io/github/downloads/2dust/v2rayN/latest/total?logo=github)](https://github.com/2dust/v2rayN/releases)
 [![Chat on Telegram](https://img.shields.io/badge/Chat%20on-Telegram-brightgreen.svg)](https://t.me/v2rayn)
 
-### How to use
-- If you are new to this, please download v2rayN-Core.zip from [releases](https://github.com/2dust/v2rayN/releases)
-- Otherwise please download v2rayN.zip (you will also need to download v2ray core into the same folder with v2rayN.exe)
+
+## How to use
+- If you are new to this, please download v2rayN-With-Core.zip from [releases](https://github.com/2dust/v2rayN/releases)
+- Otherwise please download v2rayN.zip (you will also need to download cores in the bin directory)
 - Run v2rayN.exe
 
-### Requirements  
-- Microsoft [.NET Framework 4.8 Runtime](https://dotnet.microsoft.com/zh-cn/download/dotnet-framework/thank-you/net48-offline-installer)
-- v2fly core [https://github.com/v2fly/v2ray-core/releases](https://github.com/v2fly/v2ray-core/releases)
-- Xray core [https://github.com/XTLS/Xray-core/releases](https://github.com/XTLS/Xray-core/releases)
+## Requirements  
+- (6.35 and above)[Microsoft .NET 8.0 Desktop Runtime ](https://dotnet.microsoft.com/en-us/download/dotnet/8.0)
+- (6.33 and below)[Microsoft .NET 6.0 Desktop Runtime ](https://dotnet.microsoft.com/en-us/download/dotnet/6.0)
+- [Supported cores](https://github.com/2dust/v2rayN/wiki/List-of-supported-cores)
 
-### Telegram Channel
+
+## Telegram Channel
 [github_2dust](https://t.me/github_2dust)

v2rayN/PacLib/PacHandler.cs

@@ -2,7 +2,6 @@
 using System.IO;
 using System.Net.Sockets;
 using System.Text;
-using System.Threading;
 using System.Threading.Tasks;
 
 namespace PacLib;
@@ -17,16 +16,9 @@ public class PacHandler
     private static bool _isRunning;
     private static bool _needRestart = true;
 
-
     public static void Start(string configPath, int httpPort, int pacPort)
     {
-        if (configPath.Equals(_configPath)
-            && httpPort.Equals(_httpPort)
-            && pacPort.Equals(_pacPort)
-            && _isRunning)
-        {
-            _needRestart = false;
-        }
+        _needRestart = (configPath != _configPath || httpPort != _httpPort || pacPort != _pacPort || !_isRunning);
 
         _configPath = configPath;
         _httpPort = httpPort;
@@ -57,7 +49,7 @@ public class PacHandler
         _tcpListener = TcpListener.Create(_pacPort);
         _isRunning = true;
         _tcpListener.Start();
-        Task.Factory.StartNew(() =>
+        Task.Factory.StartNew(async () =>
         {
             while (_isRunning)
             {
@@ -65,12 +57,12 @@ public class PacHandler
                 {
                     if (!_tcpListener.Pending())
                     {
-                        Thread.Sleep(10);
+                        await Task.Delay(10);
                         continue;
                     }
 
                     var client = _tcpListener.AcceptTcpClient();
-                    Task.Run(() =>
+                    await Task.Run(() =>
                       {
                           var stream = client.GetStream();
                           var sb = new StringBuilder();
@@ -89,9 +81,7 @@ public class PacHandler
                 {
                 }
             }
-
         }, TaskCreationOptions.LongRunning);
-
     }
 
     public static void Stop()

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,13 +9,9 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Google.Protobuf">
-			<Version>3.21.9</Version>
-		</PackageReference>
-		<PackageReference Include="Grpc.Core">
-			<Version>2.46.5</Version>
-		</PackageReference>
-		<PackageReference Include="Grpc.Tools" Version="2.50.0">
+		<PackageReference Include="Google.Protobuf" Version="3.26.1" />
+		<PackageReference Include="Grpc.Net.Client" Version="2.62.0" />
+		<PackageReference Include="Grpc.Tools" Version="2.63.0">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>

v2rayN/ProtosLib/Tests.cs

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

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

@@ -1,9 +1,9 @@
 <Application
     x:Class="v2rayN.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="clr-namespace:v2rayN"
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:conv="clr-namespace:v2rayN.Converters"
     ShutdownMode="OnExplicitShutdown"
     StartupUri="Views/MainWindow.xaml">
     <Application.Resources>
@@ -11,11 +11,17 @@
             <ResourceDictionary.MergedDictionaries>
                 <materialDesign:BundledTheme
                     BaseTheme="Light"
-                    PrimaryColor="DeepPurple"
+                    PrimaryColor="Blue"
                     SecondaryColor="Lime" />
-                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesign2.Defaults.xaml" />
             </ResourceDictionary.MergedDictionaries>
             <system:Double x:Key="MenuItemHeight">26</system:Double>
+            <system:Double x:Key="StdFontSize">12</system:Double>
+            <system:Double x:Key="StdFontSize1">13</system:Double>
+            <system:Double x:Key="StdFontSize2">14</system:Double>
+            <system:Double x:Key="StdFontSizeMsg">11</system:Double>
+
+            <conv:InverseBooleanConverter x:Key="InverseBooleanConverter" />
             <Thickness
                 x:Key="ServerItemMargin"
                 Bottom="4"
@@ -28,23 +34,29 @@
                 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}"
                 TargetType="{x:Type TextBlock}">
-                <Setter Property="FontSize" Value="16" />
+                <Setter Property="FontSize" Value="{DynamicResource StdFontSize2}" />
             </Style>
             <Style
                 x:Key="ToolbarTextBlock"
                 BasedOn="{StaticResource MaterialDesignTextBlock}"
                 TargetType="{x:Type TextBlock}">
-                <Setter Property="FontSize" Value="12" />
+                <Setter Property="FontSize" Value="{DynamicResource StdFontSize}" />
             </Style>
             <Style
                 x:Key="StatusbarItem"
                 BasedOn="{StaticResource MaterialDesignTextBlock}"
                 TargetType="{x:Type TextBlock}">
-                <Setter Property="FontSize" Value="12" />
+                <Setter Property="FontSize" Value="{DynamicResource StdFontSize}" />
                 <Setter Property="Padding" Value="0" />
             </Style>
             <Style TargetType="{x:Type TextElement}">
@@ -57,13 +69,13 @@
             </Style>
             <Style x:Key="lvItemSelected" TargetType="{x:Type ListViewItem}">
                 <Setter Property="Height" Value="20" />
-                <Setter Property="FontSize" Value="12" />
+                <Setter Property="FontSize" Value="{DynamicResource StdFontSize}" />
                 <Style.Triggers>
                     <Trigger Property="IsSelected" Value="true">
-                        <Setter Property="Background" Value="{DynamicResource PrimaryHueLightBrush}" />
+                        <Setter Property="Background" Value="{DynamicResource MaterialDesign.Brush.Primary.Light}" />
                     </Trigger>
                     <Trigger Property="IsMouseOver" Value="true">
-                        <Setter Property="Background" Value="{DynamicResource PrimaryHueMidBrush}" />
+                        <Setter Property="Background" Value="{DynamicResource MaterialDesign.Brush.Primary}" />
                     </Trigger>
                 </Style.Triggers>
             </Style>
@@ -75,46 +87,75 @@
                 x:Key="ListItemCheckBox"
                 BasedOn="{StaticResource MaterialDesignUserForegroundCheckBox}"
                 TargetType="{x:Type CheckBox}">
-                <Setter Property="FontSize" Value="12" />
-            </Style>
-            <Style x:Key="ListItemChip" TargetType="{x:Type materialDesign:Chip}">
-                <Setter Property="FontSize" Value="11" />
+                <Setter Property="FontSize" Value="{DynamicResource StdFontSize}" />
             </Style>
             <Style
                 x:Key="DefButton"
                 BasedOn="{StaticResource MaterialDesignRaisedButton}"
                 TargetType="{x:Type ButtonBase}">
-                <Setter Property="FontSize" Value="14" />
+                <Setter Property="FontSize" Value="{DynamicResource StdFontSize1}" />
             </Style>
             <Style
                 x:Key="DefContextMenu"
                 BasedOn="{StaticResource MaterialDesignContextMenu}"
                 TargetType="{x:Type ContextMenu}">
-                <Setter Property="FontSize" Value="13" />
+                <Setter Property="FontSize" Value="{DynamicResource StdFontSize1}" />
+                <Setter Property="FontFamily" Value="{x:Static conv:MaterialDesignFonts.MyFont}" />
             </Style>
 
             <Style
                 x:Key="ToolbarMenu"
                 BasedOn="{StaticResource MaterialDesignMenu}"
                 TargetType="{x:Type Menu}">
-                <Setter Property="FontSize" Value="13" />
+                <Setter Property="FontSize" Value="{DynamicResource StdFontSize1}" />
+                <Setter Property="FontFamily" Value="{x:Static conv:MaterialDesignFonts.MyFont}" />
             </Style>
 
             <Style
                 x:Key="DefComboBox"
                 BasedOn="{StaticResource MaterialDesignComboBox}"
                 TargetType="{x:Type ComboBox}">
-                <Setter Property="FontSize" Value="12" />
+                <Setter Property="FontSize" Value="{DynamicResource StdFontSize}" />
                 <Setter Property="HorizontalAlignment" Value="Left" />
             </Style>
             <Style
                 x:Key="DefDataGrid"
                 BasedOn="{StaticResource MaterialDesignDataGrid}"
                 TargetType="{x:Type DataGrid}">
-                <Setter Property="FontSize" Value="12" />
+                <Setter Property="FontSize" Value="{DynamicResource StdFontSize}" />
+            </Style>
+            <Style
+                x:Key="DefTextBox"
+                BasedOn="{StaticResource MaterialDesignTextBox}"
+                TargetType="{x:Type TextBox}">
+                <Setter Property="FontSize" Value="{DynamicResource StdFontSize}" />
+            </Style>
+            <Style
+                x:Key="MyOutlinedTextBox"
+                BasedOn="{StaticResource MaterialDesignOutlinedTextBox}"
+                TargetType="{x:Type TextBox}">
+                <Setter Property="FontSize" Value="{DynamicResource StdFontSize}" />
+                <Setter Property="Padding" Value="{StaticResource OutlinedTextBoxDefaultPadding}" />
+            </Style>
+            <Style
+                x:Key="MyGroupBox"
+                BasedOn="{StaticResource MaterialDesignGroupBox}"
+                TargetType="{x:Type GroupBox}">
+                <Setter Property="FontSize" Value="{DynamicResource StdFontSize}" />
+            </Style>
+            <Style
+                x:Key="MyChipListBoxItem"
+                BasedOn="{StaticResource MaterialDesignChoiceChipPrimaryOutlineListBoxItem}"
+                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

@@ -1,8 +1,8 @@
-using System.Windows;
+using System.Diagnostics;
+using System.Windows;
 using System.Windows.Threading;
 using v2rayN.Handler;
-using v2rayN.Mode;
-using v2rayN.Tool;
+using v2rayN.Models;
 
 namespace v2rayN
 {
@@ -28,44 +28,45 @@ namespace v2rayN
         /// <param name="e"></param>
         protected override void OnStartup(StartupEventArgs e)
         {
-            Global.ExePathKey = Utils.GetMD5(Utils.GetExePath());
+            var exePathKey = Utils.GetMD5(Utils.GetExePath());
 
-            ProgramStarted = new EventWaitHandle(false, EventResetMode.AutoReset, Global.ExePathKey, out bool bCreatedNew);
-            if (!bCreatedNew)
+            var rebootas = (e.Args ?? new string[] { }).Any(t => t == Global.RebootAs);
+            ProgramStarted = new EventWaitHandle(false, EventResetMode.AutoReset, exePathKey, out bool bCreatedNew);
+            if (!rebootas && !bCreatedNew)
             {
                 ProgramStarted.Set();
-                Current.Shutdown();
                 Environment.Exit(0);
                 return;
             }
 
-            Global.processJob = new Job();
-
             Logging.Setup();
-            Utils.SaveLog($"v2rayN start up | {Utils.GetVersion()} | {Utils.GetExePath()}");
-            Logging.ClearLogs();
-
             Init();
+            Logging.LoggingEnabled(_config.guiItem.enableLog);
+            Logging.SaveLog($"v2rayN start up | {Utils.GetVersion()} | {Utils.GetExePath()}");
+            Logging.ClearLogs();
 
             Thread.CurrentThread.CurrentUICulture = new(_config.uiItem.currentLanguage);
 
             base.OnStartup(e);
         }
 
-
         private void Init()
         {
             if (ConfigHandler.LoadConfig(ref _config) != 0)
             {
-                UI.ShowWarning($"Loading GUI configuration file is abnormal,please restart the application{Environment.NewLine}加载GUI配置文件异常,请重启应用");
-                Application.Current.Shutdown();
+                UI.Show($"Loading GUI configuration file is abnormal,please restart the application{Environment.NewLine}加载GUI配置文件异常,请重启应用");
                 Environment.Exit(0);
                 return;
             }
+            //if (RuntimeInformation.ProcessArchitecture != Architecture.X86 && RuntimeInformation.ProcessArchitecture != Architecture.X64)
+            //{
+            //    _config.guiItem.enableStatistics = false;
+            //}
         }
+
         private void App_DispatcherUnhandledException(object sender, DispatcherUnhandledExceptionEventArgs e)
         {
-            Utils.SaveLog("App_DispatcherUnhandledException", e.Exception);
+            Logging.SaveLog("App_DispatcherUnhandledException", e.Exception);
             e.Handled = true;
         }
 
@@ -73,13 +74,20 @@ 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)
+        private void TaskScheduler_UnobservedTaskException(object? sender, UnobservedTaskExceptionEventArgs e)
         {
-            Utils.SaveLog("TaskScheduler_UnobservedTaskException", e.Exception);
+            Logging.SaveLog("TaskScheduler_UnobservedTaskException", e.Exception);
+        }
+
+        protected override void OnExit(ExitEventArgs e)
+        {
+            Logging.SaveLog("OnExit");
+            base.OnExit(e);
+            Process.GetCurrentProcess().Kill();
         }
     }
 }

v2rayN/v2rayN/Base/HttpClientHelper.cs

@@ -1,216 +0,0 @@
-using System.IO;
-using System.Net.Http;
-using System.Net.Http.Headers;
-
-namespace v2rayN.Base
-{
-    /// <summary>
-    /// </summary>
-    public class HttpClientHelper
-    {
-        private static HttpClientHelper httpClientHelper = null;
-        private HttpClient httpClient;
-
-        /// <summary>
-        /// </summary>
-        private HttpClientHelper() { }
-
-        /// <summary>
-        /// </summary>
-        /// <returns></returns>
-        public static HttpClientHelper GetInstance()
-        {
-            if (httpClientHelper != null)
-            {
-                return httpClientHelper;
-            }
-            else
-            {
-                HttpClientHelper httpClientHelper = new HttpClientHelper();
-
-                HttpClientHandler handler = new HttpClientHandler() { UseCookies = false };
-                httpClientHelper.httpClient = new HttpClient(handler);
-                return httpClientHelper;
-            }
-        }
-        public async Task<string> GetAsync(string url)
-        {
-            if (string.IsNullOrEmpty(url))
-            {
-                return null;
-            }
-            HttpResponseMessage response = await httpClient.GetAsync(url);
-
-            return await response.Content.ReadAsStringAsync();
-        }
-        public async Task<string> GetAsync(HttpClient client, string url, CancellationToken token)
-        {
-            if (string.IsNullOrEmpty(url))
-            {
-                return null;
-            }
-            HttpResponseMessage response = await client.GetAsync(url, token);
-            if (!response.IsSuccessStatusCode)
-            {
-                throw new Exception(string.Format("{0}", response.StatusCode));
-            }
-            return await response.Content.ReadAsStringAsync();
-        }
-
-        public async Task PutAsync(string url, Dictionary<string, string> headers)
-        {
-            var myContent = Utils.ToJson(headers);
-            var buffer = System.Text.Encoding.UTF8.GetBytes(myContent);
-            var byteContent = new ByteArrayContent(buffer);
-            byteContent.Headers.ContentType = new MediaTypeHeaderValue("application/json");
-
-            var result = await httpClient.PutAsync(url, byteContent);
-        }
-
-        public async Task DownloadFileAsync(HttpClient client, string url, string fileName, IProgress<double> progress, CancellationToken token)
-        {
-            if (string.IsNullOrEmpty(url))
-            {
-                throw new ArgumentNullException("url");
-            }
-            if (string.IsNullOrEmpty(fileName))
-            {
-                throw new ArgumentNullException("fileName");
-            }
-            if (File.Exists(fileName))
-            {
-                File.Delete(fileName);
-            }
-
-            var response = await client.GetAsync(url, HttpCompletionOption.ResponseHeadersRead, token);
-
-            if (!response.IsSuccessStatusCode)
-            {
-                throw new Exception(string.Format("{0}", response.StatusCode));
-            }
-
-            var total = response.Content.Headers.ContentLength.HasValue ? response.Content.Headers.ContentLength.Value : -1L;
-            var canReportProgress = total != -1 && progress != null;
-
-            using (var stream = await response.Content.ReadAsStreamAsync())
-            {
-                using (var file = File.Create(fileName))
-                {
-                    var totalRead = 0L;
-                    var buffer = new byte[1024 * 1024];
-                    var isMoreToRead = true;
-                    var progressPercentage = 0;
-
-                    do
-                    {
-                        token.ThrowIfCancellationRequested();
-
-                        var read = await stream.ReadAsync(buffer, 0, buffer.Length, token);
-
-                        if (read == 0)
-                        {
-                            isMoreToRead = false;
-                        }
-                        else
-                        {
-                            var data = new byte[read];
-                            buffer.ToList().CopyTo(0, data, 0, read);
-
-                            // TODO: put here the code to write the file to disk
-                            file.Write(data, 0, read);
-
-                            totalRead += read;
-
-                            if (canReportProgress)
-                            {
-                                var percent = Convert.ToInt32((totalRead * 1d) / (total * 1d) * 100);
-                                if (progressPercentage != percent && percent % 10 == 0)
-                                {
-                                    progressPercentage = percent;
-                                    progress.Report(percent);
-                                }
-                            }
-                        }
-                    } while (isMoreToRead);
-                    file.Close();
-                    if (canReportProgress)
-                    {
-                        progress.Report(101);
-
-                    }
-                }
-            }
-        }
-
-        public async Task DownloadDataAsync4Speed(HttpClient client, string url, IProgress<string> progress, CancellationToken token)
-        {
-            if (string.IsNullOrEmpty(url))
-            {
-                throw new ArgumentNullException("url");
-            }
-
-            var response = await client.GetAsync(url, HttpCompletionOption.ResponseHeadersRead, token);
-
-            if (!response.IsSuccessStatusCode)
-            {
-                throw new Exception(string.Format("{0}", response.StatusCode));
-            }
-
-            //var total = response.Content.Headers.ContentLength.HasValue ? response.Content.Headers.ContentLength.Value : -1L;
-            //var canReportProgress = total != -1 && progress != null;
-
-            using (var stream = await response.Content.ReadAsStreamAsync())
-            {
-                var totalRead = 0L;
-                var buffer = new byte[1024 * 64];
-                var isMoreToRead = true;
-                string progressSpeed = string.Empty;
-                DateTime totalDatetime = DateTime.Now;
-                int totalSecond = 0;
-
-                do
-                {
-                    if (token.IsCancellationRequested)
-                    {
-                        if (totalRead > 0)
-                        {
-                            return;
-                        }
-                        else
-                        {
-                            token.ThrowIfCancellationRequested();
-                        }
-                    }
-
-                    var read = await stream.ReadAsync(buffer, 0, buffer.Length, token);
-
-                    if (read == 0)
-                    {
-                        isMoreToRead = false;
-                    }
-                    else
-                    {
-                        var data = new byte[read];
-                        buffer.ToList().CopyTo(0, data, 0, read);
-
-                        // TODO:   
-                        totalRead += read;
-
-                        TimeSpan ts = (DateTime.Now - totalDatetime);
-                        if (progress != null && ts.Seconds > totalSecond)
-                        {
-                            totalSecond = ts.Seconds;
-                            var speed = (totalRead * 1d / ts.TotalMilliseconds / 1000).ToString("#0.0");
-                            if (progressSpeed != speed)
-                            {
-                                progressSpeed = speed;
-                                progress.Report(speed);
-                            }
-                        }
-                    }
-                } while (isMoreToRead);
-            }
-        }
-
-    }
-}

v2rayN/v2rayN/Base/MyDGTextColumn.cs

@@ -0,0 +1,9 @@
+using System.Windows.Controls;
+
+namespace v2rayN.Base
+{
+    internal class MyDGTextColumn : DataGridTextColumn
+    {
+        public string ExName { get; set; }
+    }
+}

v2rayN/v2rayN/Base/StringEx.cs

@@ -1,50 +0,0 @@
-using System.IO;
-
-namespace v2rayN.Base
-{
-    static class StringEx
-    {
-        public static bool IsNullOrEmpty(this string value)
-        {
-            return string.IsNullOrEmpty(value);
-        }
-
-        public static bool IsNullOrWhiteSpace(this string value)
-        {
-            return string.IsNullOrWhiteSpace(value);
-        }
-
-        public static bool BeginWithAny(this string s, IEnumerable<char> chars)
-        {
-            if (s.IsNullOrEmpty()) return false;
-            return chars.Contains(s[0]);
-        }
-
-        public static bool IsWhiteSpace(this string value)
-        {
-            foreach (char c in value)
-            {
-                if (char.IsWhiteSpace(c)) continue;
-
-                return false;
-            }
-            return true;
-        }
-
-
-        public static IEnumerable<string> NonWhiteSpaceLines(this TextReader reader)
-        {
-            string line;
-            while ((line = reader.ReadLine()) != null)
-            {
-                if (line.IsWhiteSpace()) continue;
-                yield return line;
-            }
-        }
-
-        public static string TrimEx(this string value)
-        {
-            return value == null ? string.Empty : value.Trim();
-        }
-    }
-}

v2rayN/v2rayN/Common/DownloaderHelper.cs

@@ -0,0 +1,181 @@
+using Downloader;
+using System.IO;
+using System.Net;
+
+namespace v2rayN
+{
+    internal class DownloaderHelper
+    {
+        private static readonly Lazy<DownloaderHelper> _instance = new(() => new());
+        public static DownloaderHelper Instance => _instance.Value;
+
+        public async Task<string?> DownloadStringAsync(IWebProxy? webProxy, string url, string? userAgent, int timeout)
+        {
+            if (Utils.IsNullOrEmpty(url))
+            {
+                return null;
+            }
+
+            Uri uri = new(url);
+            //Authorization Header
+            var headers = new WebHeaderCollection();
+            if (!Utils.IsNullOrEmpty(uri.UserInfo))
+            {
+                headers.Add(HttpRequestHeader.Authorization, "Basic " + Utils.Base64Encode(uri.UserInfo));
+            }
+
+            var downloadOpt = new DownloadConfiguration()
+            {
+                Timeout = timeout * 1000,
+                MaxTryAgainOnFailover = 2,
+                RequestConfiguration =
+                {
+                    Headers = headers,
+                    UserAgent = userAgent,
+                    Timeout = timeout * 1000,
+                    Proxy = webProxy
+                }
+            };
+
+            using var downloader = new DownloadService(downloadOpt);
+            downloader.DownloadFileCompleted += (sender, value) =>
+            {
+                if (value.Error != null)
+                {
+                    throw value.Error;
+                }
+            };
+
+            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;
+
+            return reader.ReadToEnd();
+        }
+
+        public async Task DownloadDataAsync4Speed(IWebProxy webProxy, string url, IProgress<string> progress, int timeout)
+        {
+            if (Utils.IsNullOrEmpty(url))
+            {
+                throw new ArgumentNullException(nameof(url));
+            }
+
+            var downloadOpt = new DownloadConfiguration()
+            {
+                Timeout = timeout * 1000,
+                MaxTryAgainOnFailover = 2,
+                RequestConfiguration =
+                {
+                    Timeout= timeout * 1000,
+                    Proxy = webProxy
+                }
+            };
+
+            DateTime totalDatetime = DateTime.Now;
+            int totalSecond = 0;
+            var hasValue = false;
+            double maxSpeed = 0;
+            using var downloader = new DownloadService(downloadOpt);
+            //downloader.DownloadStarted += (sender, value) =>
+            //{
+            //    if (progress != null)
+            //    {
+            //        progress.Report("Start download data...");
+            //    }
+            //};
+            downloader.DownloadProgressChanged += (sender, value) =>
+            {
+                TimeSpan ts = (DateTime.Now - totalDatetime);
+                if (progress != null && ts.Seconds > totalSecond)
+                {
+                    hasValue = true;
+                    totalSecond = ts.Seconds;
+                    if (value.BytesPerSecondSpeed > maxSpeed)
+                    {
+                        maxSpeed = value.BytesPerSecondSpeed;
+                        var speed = (maxSpeed / 1000 / 1000).ToString("#0.0");
+                        progress.Report(speed);
+                    }
+                }
+            };
+            downloader.DownloadFileCompleted += (sender, value) =>
+            {
+                if (progress != null)
+                {
+                    if (!hasValue && value.Error != null)
+                    {
+                        progress.Report(value.Error?.Message);
+                    }
+                }
+            };
+            //progress.Report("......");
+            using var cts = new CancellationTokenSource();
+            cts.CancelAfter(timeout * 1000);
+            using var stream = await downloader.DownloadFileTaskAsync(address: url, cts.Token);
+
+            downloadOpt = null;
+        }
+
+        public async Task DownloadFileAsync(IWebProxy? webProxy, string url, string fileName, IProgress<double> progress, int timeout)
+        {
+            if (Utils.IsNullOrEmpty(url))
+            {
+                throw new ArgumentNullException(nameof(url));
+            }
+            if (Utils.IsNullOrEmpty(fileName))
+            {
+                throw new ArgumentNullException(nameof(fileName));
+            }
+            if (File.Exists(fileName))
+            {
+                File.Delete(fileName);
+            }
+
+            var downloadOpt = new DownloadConfiguration()
+            {
+                Timeout = timeout * 1000,
+                MaxTryAgainOnFailover = 2,
+                RequestConfiguration =
+                {
+                    Timeout= timeout * 1000,
+                    Proxy = webProxy
+                }
+            };
+
+            var progressPercentage = 0;
+            var hasValue = false;
+            using var downloader = new DownloadService(downloadOpt);
+            downloader.DownloadStarted += (sender, value) =>
+            {
+                progress?.Report(0);
+            };
+            downloader.DownloadProgressChanged += (sender, value) =>
+            {
+                hasValue = true;
+                var percent = (int)value.ProgressPercentage;//   Convert.ToInt32((totalRead * 1d) / (total * 1d) * 100);
+                if (progressPercentage != percent && percent % 10 == 0)
+                {
+                    progressPercentage = percent;
+                    progress.Report(percent);
+                }
+            };
+            downloader.DownloadFileCompleted += (sender, value) =>
+            {
+                if (progress != null)
+                {
+                    if (hasValue && value.Error == null)
+                    {
+                        progress.Report(101);
+                    }
+                }
+            };
+
+            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

@@ -0,0 +1,90 @@
+using System.IO;
+using System.IO.Compression;
+using System.Text;
+
+namespace v2rayN
+{
+    public static class FileManager
+    {
+        public static bool ByteArrayToFile(string fileName, byte[] content)
+        {
+            try
+            {
+                File.WriteAllBytes(fileName, content);
+                return true;
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+            }
+            return false;
+        }
+
+        public static void UncompressedFile(string fileName, byte[] content)
+        {
+            try
+            {
+                using FileStream fs = File.Create(fileName);
+                using GZipStream input = new(new MemoryStream(content), CompressionMode.Decompress, false);
+                input.CopyTo(fs);
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+            }
+        }
+
+        public static string NonExclusiveReadAllText(string path)
+        {
+            return NonExclusiveReadAllText(path, Encoding.Default);
+        }
+
+        public static string NonExclusiveReadAllText(string path, Encoding encoding)
+        {
+            try
+            {
+                using FileStream fs = new(path, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
+                using StreamReader sr = new(fs, encoding);
+                return sr.ReadToEnd();
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+                throw;
+            }
+        }
+
+        public static bool ZipExtractToFile(string fileName, string toPath, string ignoredName)
+        {
+            try
+            {
+                using ZipArchive archive = ZipFile.OpenRead(fileName);
+                foreach (ZipArchiveEntry entry in archive.Entries)
+                {
+                    if (entry.Length == 0)
+                    {
+                        continue;
+                    }
+                    try
+                    {
+                        if (!Utils.IsNullOrEmpty(ignoredName) && entry.Name.Contains(ignoredName))
+                        {
+                            continue;
+                        }
+                        entry.ExtractToFile(Path.Combine(toPath, entry.Name), true);
+                    }
+                    catch (IOException ex)
+                    {
+                        Logging.SaveLog(ex.Message, ex);
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+                return false;
+            }
+            return true;
+        }
+    }
+}

v2rayN/v2rayN/Common/HttpClientHelper.cs

@@ -0,0 +1,156 @@
+using System.IO;
+using System.Net.Http;
+using System.Net.Mime;
+using System.Text;
+
+namespace v2rayN
+{
+    /// <summary>
+    /// </summary>
+    public class HttpClientHelper
+    {
+        private static readonly Lazy<HttpClientHelper> _instance = new(() =>
+        {
+            HttpClientHandler handler = new() { UseCookies = false };
+            HttpClientHelper helper = new(new HttpClient(handler));
+            return helper;
+        });
+
+        public static HttpClientHelper Instance => _instance.Value;
+        private readonly HttpClient httpClient;
+
+        private HttpClientHelper(HttpClient httpClient) => this.httpClient = httpClient;
+
+        public async Task<string?> GetAsync(string url)
+        {
+            if (Utils.IsNullOrEmpty(url)) return null;
+            return await httpClient.GetStringAsync(url);
+        }
+
+        public async Task<string?> GetAsync(HttpClient client, string url, CancellationToken token = default)
+        {
+            if (Utils.IsNullOrEmpty(url)) return null;
+            return await client.GetStringAsync(url, token);
+        }
+
+        public async Task PutAsync(string url, Dictionary<string, string> headers)
+        {
+            var jsonContent = JsonUtils.Serialize(headers);
+            var content = new StringContent(jsonContent, Encoding.UTF8, MediaTypeNames.Application.Json);
+
+            var result = await httpClient.PutAsync(url, content);
+        }
+
+        public static async Task DownloadFileAsync(HttpClient client, string url, string fileName, IProgress<double>? progress, CancellationToken token = default)
+        {
+            ArgumentNullException.ThrowIfNull(url);
+            ArgumentNullException.ThrowIfNull(fileName);
+            if (File.Exists(fileName)) File.Delete(fileName);
+
+            using var response = await client.GetAsync(url, HttpCompletionOption.ResponseHeadersRead, token);
+
+            if (!response.IsSuccessStatusCode) throw new Exception(response.StatusCode.ToString());
+
+            var total = response.Content.Headers.ContentLength ?? -1L;
+            var canReportProgress = total != -1 && progress != null;
+
+            using var stream = await response.Content.ReadAsStreamAsync(token);
+            using var file = File.Create(fileName);
+            var totalRead = 0L;
+            var buffer = new byte[1024 * 1024];
+            var progressPercentage = 0;
+
+            while (true)
+            {
+                token.ThrowIfCancellationRequested();
+
+                var read = await stream.ReadAsync(buffer, token);
+                totalRead += read;
+
+                if (read == 0) break;
+                file.Write(buffer, 0, read);
+
+                if (canReportProgress)
+                {
+                    var percent = (int)(100.0 * totalRead / total);
+                    //if (progressPercentage != percent && percent % 10 == 0)
+                    {
+                        progressPercentage = percent;
+                        progress?.Report(percent);
+                    }
+                }
+            }
+            if (canReportProgress)
+            {
+                progress?.Report(101);
+            }
+        }
+
+        public async Task DownloadDataAsync4Speed(HttpClient client, string url, IProgress<string> progress, CancellationToken token = default)
+        {
+            if (Utils.IsNullOrEmpty(url))
+            {
+                throw new ArgumentNullException(nameof(url));
+            }
+
+            var response = await client.GetAsync(url, HttpCompletionOption.ResponseHeadersRead, token);
+
+            if (!response.IsSuccessStatusCode)
+            {
+                throw new Exception(response.StatusCode.ToString());
+            }
+
+            //var total = response.Content.Headers.ContentLength.HasValue ? response.Content.Headers.ContentLength.Value : -1L;
+            //var canReportProgress = total != -1 && progress != null;
+
+            using var stream = await response.Content.ReadAsStreamAsync(token);
+            var totalRead = 0L;
+            var buffer = new byte[1024 * 64];
+            var isMoreToRead = true;
+            string progressSpeed = string.Empty;
+            DateTime totalDatetime = DateTime.Now;
+            int totalSecond = 0;
+
+            do
+            {
+                if (token.IsCancellationRequested)
+                {
+                    if (totalRead > 0)
+                    {
+                        return;
+                    }
+                    else
+                    {
+                        token.ThrowIfCancellationRequested();
+                    }
+                }
+
+                var read = await stream.ReadAsync(buffer, token);
+
+                if (read == 0)
+                {
+                    isMoreToRead = false;
+                }
+                else
+                {
+                    var data = new byte[read];
+                    buffer.ToList().CopyTo(0, data, 0, read);
+
+                    totalRead += read;
+
+                    TimeSpan ts = (DateTime.Now - totalDatetime);
+                    if (progress != null && ts.Seconds > totalSecond)
+                    {
+                        totalSecond = ts.Seconds;
+                        var speed = (totalRead * 1d / ts.TotalMilliseconds / 1000).ToString("#0.0");
+                        if (progressSpeed != speed)
+                        {
+                            progressSpeed = speed;
+                            progress.Report(speed);
+                        }
+                    }
+                }
+            } while (isMoreToRead);
+        }
+    }
+}

v2rayN/v2rayN/Common/Job.cs

@@ -1,13 +1,13 @@
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 
-
 namespace v2rayN
 {
     /*
      * See:
      * http://stackoverflow.com/questions/6266820/working-example-of-createjobobject-setinformationjobobject-pinvoke-in-net
      */
+
     public class Job : IDisposable
     {
         private IntPtr handle = IntPtr.Zero;
@@ -16,12 +16,12 @@ namespace v2rayN
         {
             handle = CreateJobObject(IntPtr.Zero, null);
             IntPtr extendedInfoPtr = IntPtr.Zero;
-            JOBOBJECT_BASIC_LIMIT_INFORMATION info = new JOBOBJECT_BASIC_LIMIT_INFORMATION
+            JOBOBJECT_BASIC_LIMIT_INFORMATION info = new()
             {
                 LimitFlags = 0x2000
             };
 
-            JOBOBJECT_EXTENDED_LIMIT_INFORMATION extendedInfo = new JOBOBJECT_EXTENDED_LIMIT_INFORMATION
+            JOBOBJECT_EXTENDED_LIMIT_INFORMATION extendedInfo = new()
             {
                 BasicLimitInformation = info
             };
@@ -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;
@@ -95,12 +95,12 @@ namespace v2rayN
             Dispose(false);
         }
 
-        #endregion
+        #endregion IDisposable
 
         #region Interop
 
         [DllImport("kernel32.dll", CharSet = CharSet.Unicode)]
-        private static extern IntPtr CreateJobObject(IntPtr a, string lpName);
+        private static extern IntPtr CreateJobObject(IntPtr a, string? lpName);
 
         [DllImport("kernel32.dll", SetLastError = true)]
         private static extern bool SetInformationJobObject(IntPtr hJob, JobObjectInfoType infoType, IntPtr lpJobObjectInfo, UInt32 cbJobObjectInfoLength);
@@ -112,13 +112,13 @@ namespace v2rayN
         [return: MarshalAs(UnmanagedType.Bool)]
         private static extern bool CloseHandle(IntPtr hObject);
 
-        #endregion
+        #endregion Interop
     }
 
     #region Helper classes
 
     [StructLayout(LayoutKind.Sequential)]
-    struct IO_COUNTERS
+    internal struct IO_COUNTERS
     {
         public UInt64 ReadOperationCount;
         public UInt64 WriteOperationCount;
@@ -128,9 +128,8 @@ namespace v2rayN
         public UInt64 OtherTransferCount;
     }
 
-
     [StructLayout(LayoutKind.Sequential)]
-    struct JOBOBJECT_BASIC_LIMIT_INFORMATION
+    internal struct JOBOBJECT_BASIC_LIMIT_INFORMATION
     {
         public Int64 PerProcessUserTimeLimit;
         public Int64 PerJobUserTimeLimit;
@@ -152,7 +151,7 @@ namespace v2rayN
     }
 
     [StructLayout(LayoutKind.Sequential)]
-    struct JOBOBJECT_EXTENDED_LIMIT_INFORMATION
+    internal struct JOBOBJECT_EXTENDED_LIMIT_INFORMATION
     {
         public JOBOBJECT_BASIC_LIMIT_INFORMATION BasicLimitInformation;
         public IO_COUNTERS IoInfo;
@@ -173,5 +172,5 @@ namespace v2rayN
         GroupInformation = 11
     }
 
-    #endregion
+    #endregion Helper classes
 }

v2rayN/v2rayN/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.IsNullOrWhiteSpace(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.IsNullOrWhiteSpace(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,14 +3,14 @@ using NLog.Config;
 using NLog.Targets;
 using System.IO;
 
-namespace v2rayN.Tool
+namespace v2rayN
 {
     public class Logging
     {
         public static void Setup()
         {
-            LoggingConfiguration config = new LoggingConfiguration();
-            FileTarget fileTarget = new FileTarget();
+            LoggingConfiguration config = new();
+            FileTarget fileTarget = new();
             config.AddTarget("file", fileTarget);
             fileTarget.Layout = "${longdate}-${level:uppercase=true} ${message}";
             fileTarget.FileName = Utils.GetLogPath("${shortdate}.txt");
@@ -18,6 +18,14 @@ namespace v2rayN.Tool
             LogManager.Configuration = config;
         }
 
+        public static void LoggingEnabled(bool enable)
+        {
+            if (!enable)
+            {
+                LogManager.SuspendLogging();
+            }
+        }
+
         public static void ClearLogs()
         {
             Task.Run(() =>
@@ -43,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,20 +2,24 @@
 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 QRCodeGenerator();
+                QRCodeGenerator qrGenerator = new();
                 QRCodeData qrCodeData = qrGenerator.CreateQrCode(strContent, QRCodeGenerator.ECCLevel.H);
-                XamlQRCode qrCode = new XamlQRCode(qrCodeData);
+                XamlQRCode qrCode = new(qrCodeData);
                 DrawingImage qrCodeAsXaml = qrCode.GetGraphic(40);
                 return qrCodeAsXaml;
             }
@@ -24,7 +28,5 @@ namespace v2rayN.Handler
                 return null;
             }
         }
-
-
     }
 }

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
     {
@@ -9,12 +9,13 @@ namespace v2rayN.Tool
         {
             return _OrderBy<T>(query, propertyName, false);
         }
+
         public static IOrderedQueryable<T> OrderByDescending<T>(this IQueryable<T> query, string propertyName)
         {
             return _OrderBy<T>(query, propertyName, true);
         }
 
-        static IOrderedQueryable<T> _OrderBy<T>(IQueryable<T> query, string propertyName, bool isDesc)
+        private static IOrderedQueryable<T> _OrderBy<T>(IQueryable<T> query, string propertyName, bool isDesc)
         {
             string methodname = (isDesc) ? "OrderByDescendingInternal" : "OrderByInternal";
 
@@ -25,22 +26,25 @@ namespace v2rayN.Tool
 
             return (IOrderedQueryable<T>)method.Invoke(null, new object[] { query, memberProp });
         }
+
         public static IOrderedQueryable<T> OrderByInternal<T, TProp>(IQueryable<T> query, PropertyInfo memberProperty)
         {//public
-            return query.OrderBy(_GetLamba<T, TProp>(memberProperty));
+            return query.OrderBy(_GetLambda<T, TProp>(memberProperty));
         }
+
         public static IOrderedQueryable<T> OrderByDescendingInternal<T, TProp>(IQueryable<T> query, PropertyInfo memberProperty)
         {//public
-            return query.OrderByDescending(_GetLamba<T, TProp>(memberProperty));
+            return query.OrderByDescending(_GetLambda<T, TProp>(memberProperty));
         }
-        static Expression<Func<T, TProp>> _GetLamba<T, TProp>(PropertyInfo memberProperty)
+
+        private static Expression<Func<T, TProp>> _GetLambda<T, TProp>(PropertyInfo memberProperty)
         {
             if (memberProperty.PropertyType != typeof(TProp)) throw new Exception();
 
             var thisArg = Expression.Parameter(typeof(T));
-            var lamba = Expression.Lambda<Func<T, TProp>>(Expression.Property(thisArg, memberProperty), thisArg);
+            var lambda = Expression.Lambda<Func<T, TProp>>(Expression.Property(thisArg, memberProperty), thisArg);
 
-            return lamba;
+            return lambda;
         }
     }
 }

v2rayN/v2rayN/Common/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,20 +1,21 @@
-
-using SQLite;
+using SQLite;
 using System.Collections;
 
-namespace v2rayN.Base
+namespace v2rayN
 {
-    public sealed class SqliteHelper
+    public sealed class SQLiteHelper
     {
-        private static readonly Lazy<SqliteHelper> _instance = new Lazy<SqliteHelper>(() => new());
-        public static SqliteHelper Instance => _instance.Value;
+        private static readonly Lazy<SQLiteHelper> _instance = new(() => new());
+        public static SQLiteHelper Instance => _instance.Value;
         private string _connstr;
-        public SQLiteConnection _db;
-        public SQLiteAsyncConnection _dbAsync;
+        private SQLiteConnection _db;
+        private SQLiteAsyncConnection _dbAsync;
+        private static readonly object objLock = new();
+        public readonly string _configDB = "guiNDB.db";
 
-        public SqliteHelper()
+        public SQLiteHelper()
         {
-            _connstr = Utils.GetConfigPath(Global.ConfigDB);
+            _connstr = Utils.GetConfigPath(_configDB);
             _db = new SQLiteConnection(_connstr, false);
             _dbAsync = new SQLiteAsyncConnection(_connstr, false);
         }
@@ -24,56 +25,86 @@ namespace v2rayN.Base
             return _db.CreateTable<T>();
         }
 
-        public int Add(object model)
+        public int Insert(object model)
         {
             return _db.Insert(model);
         }
-        public async Task<int> AddAsync(object model)
+
+        public int InsertAll(IEnumerable models)
+        {
+            lock (objLock)
+            {
+                return _db.InsertAll(models);
+            }
+        }
+
+        public async Task<int> InsertAsync(object model)
         {
             return await _dbAsync.InsertAsync(model);
         }
+
         public int Replace(object model)
+        {
+            lock (objLock)
             {
                 return _db.InsertOrReplace(model);
             }
-        public async Task<int> Replacesync(object model)
+        }
+
+        public async Task<int> ReplaceAsync(object model)
         {
             return await _dbAsync.InsertOrReplaceAsync(model);
         }
 
         public int Update(object model)
+        {
+            lock (objLock)
             {
                 return _db.Update(model);
             }
+        }
+
         public async Task<int> UpdateAsync(object model)
         {
             return await _dbAsync.UpdateAsync(model);
         }
+
         public int UpdateAll(IEnumerable models)
+        {
+            lock (objLock)
             {
                 return _db.UpdateAll(models);
             }
+        }
 
         public int Delete(object model)
+        {
+            lock (objLock)
             {
                 return _db.Delete(model);
             }
+        }
+
         public async Task<int> DeleteAsync(object model)
         {
             return await _dbAsync.DeleteAsync(model);
         }
+
         public List<T> Query<T>(string sql) where T : new()
         {
             return _db.Query<T>(sql);
         }
+
         public async Task<List<T>> QueryAsync<T>(string sql) where T : new()
         {
             return await _dbAsync.QueryAsync<T>(sql);
         }
+
         public int Execute(string sql)
         {
             return _db.Execute(sql);
         }
+
         public async Task<int> ExecuteAsync(string sql)
         {
             return await _dbAsync.ExecuteAsync(sql);
@@ -83,6 +114,7 @@ namespace v2rayN.Base
         {
             return _db.Table<T>();
         }
+
         public AsyncTableQuery<T> TableAsync<T>() where T : new()
         {
             return _dbAsync.Table<T>();

v2rayN/v2rayN/Common/StringEx.cs

@@ -0,0 +1,94 @@
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
+
+namespace v2rayN
+{
+    internal static class StringEx
+    {
+        public static bool IsNullOrEmpty([NotNullWhen(false)] this string? value)
+        {
+            return string.IsNullOrEmpty(value);
+        }
+
+        public static bool IsNullOrWhiteSpace([NotNullWhen(false)] this string? value)
+        {
+            return string.IsNullOrWhiteSpace(value);
+        }
+
+        public static bool BeginWithAny(this string s, IEnumerable<char> chars)
+        {
+            if (s.IsNullOrEmpty()) return false;
+            return chars.Contains(s[0]);
+        }
+
+        public static bool IsWhiteSpace(this string value)
+        {
+            foreach (char c in value)
+            {
+                if (char.IsWhiteSpace(c)) continue;
+
+                return false;
+            }
+            return true;
+        }
+
+        public static IEnumerable<string> NonWhiteSpaceLines(this TextReader reader)
+        {
+            string? line;
+            while ((line = reader.ReadLine()) != null)
+            {
+                if (line.IsWhiteSpace()) continue;
+                yield return line;
+            }
+        }
+
+        public static string TrimEx(this string? value)
+        {
+            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

@@ -0,0 +1,39 @@
+using Microsoft.Win32;
+using System.Windows;
+
+namespace v2rayN
+{
+    internal class UI
+    {
+        private static readonly string caption = "v2rayN";
+
+        public static void Show(string msg)
+        {
+            MessageBox.Show(msg, caption, MessageBoxButton.OK, MessageBoxImage.Information, MessageBoxResult.OK);
+        }
+
+        public static MessageBoxResult ShowYesNo(string msg)
+        {
+            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/Converters/DelayColorConverter.cs

@@ -17,7 +17,7 @@ namespace v2rayN.Converters
                 return new SolidColorBrush(Colors.IndianRed);
         }
 
-        public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+        public object? ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
         {
             return null;
         }

v2rayN/v2rayN/Converters/InverseBooleanConverter.cs

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

v2rayN/v2rayN/Converters/MaterialDesignFonts.cs

@@ -0,0 +1,27 @@
+using System.Windows.Media;
+using v2rayN.Handler;
+
+namespace v2rayN.Converters
+{
+    public class MaterialDesignFonts
+    {
+        public static FontFamily MyFont { get; }
+
+        static MaterialDesignFonts()
+        {
+            try
+            {
+                var fontFamily = LazyConfig.Instance.GetConfig().uiItem.currentFontFamily;
+                if (!Utils.IsNullOrEmpty(fontFamily))
+                {
+                    var fontPath = Utils.GetFontsPath();
+                    MyFont = new FontFamily(new Uri(@$"file:///{fontPath}\"), $"./#{fontFamily}");
+                }
+            }
+            catch
+            {
+            }
+            MyFont ??= new FontFamily("Microsoft YaHei");
+        }
+    }
+}

v2rayN/v2rayN/Global.cs

@@ -1,122 +1,186 @@
-namespace v2rayN
+using v2rayN.Models;
+
+namespace v2rayN
 {
-    class Global
+    internal class Global
     {
         #region const
-        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 GithubUrl = "https://github.com";
+        public const string GithubApiUrl = "https://api.github.com/repos";
+        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/HyNetwork/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 SpeedTestUrl = @"http://cachefly.cachefly.net/10mb.test";
+        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 SpeedPingTestUrl = @"https://www.google.com/generate_204";
+        public const string JuicityCoreUrl = "https://github.com/juicity/juicity/releases";
         public const string CustomRoutingListUrl = @"https://raw.githubusercontent.com/2dust/v2rayCustomRoutingList/master/";
+        public const string SingboxRulesetUrl = @"https://raw.githubusercontent.com/SagerNet/sing-{0}/rule-set/{1}.srs";
 
         public const string PromotionUrl = @"aHR0cHM6Ly85LjIzNDQ1Ni54eXovYWJjLmh0bWw=";
         public const string ConfigFileName = "guiNConfig.json";
-        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 StreamSecurityX = "xtls";
-        public const string InboundSocks = "socks";
-        public const string InboundHttp = "http";
-        public const string InboundSocks2 = "socks2";
-        public const string InboundHttp2 = "http2";
+        public const string StreamSecurityReality = "reality";
         public const string Loopback = "127.0.0.1";
-        public const string InboundAPITagName = "api";
-        public const string InboundAPIProtocal = "dokodemo-door";
+        public const string InboundAPIProtocol = "dokodemo-door";
+        public const string HttpProtocol = "http://";
+        public const string HttpsProtocol = "https://";
 
-        public const string 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 MyRegPath = "Software\\v2rayNGUI";
+        public const string UserEMail = "t@t.tt";
         public const string AutoRunRegPath = @"Software\Microsoft\Windows\CurrentVersion\Run";
         public const string AutoRunName = "v2rayNAutoRun";
-        public const string MyRegKeyLanguage = "CurrentLanguage";
         public const string CustomIconName = "v2rayN.ico";
         public const string IEProxyExceptions = "localhost;127.*;10.*;172.16.*;172.17.*;172.18.*;172.19.*;172.20.*;172.21.*;172.22.*;172.23.*;172.24.*;172.25.*;172.26.*;172.27.*;172.28.*;172.29.*;172.30.*;172.31.*;192.168.*";
         public const string RoutingRuleComma = "<COMMA>";
-        public const string GrpcgunMode = "gun";
-        public const string GrpcmultiMode = "multi";
+        public const string GrpcGunMode = "gun";
+        public const string GrpcMultiMode = "multi";
         public const int MaxPort = 65536;
         public const string CommandClearMsg = "CommandClearMsg";
+        public const string CommandSendMsgView = "CommandSendMsgView";
+        public const string CommandStopSpeedTest = "CommandStopSpeedTest";
         public const string DelayUnit = "";
         public const string SpeedUnit = "";
+        public const int MinFontSize = 10;
+        public const string RebootAs = "rebootas";
 
-        public static readonly List<string> IEProxyProtocols = new List<string> {
+        public static readonly List<string> IEProxyProtocols = new() {
                         "{ip}:{http_port}",
                         "socks={ip}:{socks_port}",
                         "http={ip}:{http_port};https={ip}:{http_port};ftp={ip}:{http_port};socks={ip}:{socks_port}",
                         "http=http://{ip}:{http_port};https=http://{ip}:{http_port}",
                         ""
                     };
-        public static readonly List<string> vmessSecuritys = new List<string> { "aes-128-gcm", "chacha20-poly1305", "auto", "none", "zero" };
-        public static readonly List<string> ssSecuritys = new List<string> { "aes-256-gcm", "aes-128-gcm", "chacha20-poly1305", "chacha20-ietf-poly1305", "none", "plain" };
-        public static readonly List<string> ssSecuritysInSagerNet = new List<string> { "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 List<string> { "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> xtlsFlows = new List<string> { "", "xtls-rprx-origin", "xtls-rprx-origin-udp443", "xtls-rprx-direct", "xtls-rprx-direct-udp443", "xtls-rprx-vision", "xtls-rprx-vision-udp443" };
-        public static readonly List<string> networks = new List<string> { "tcp", "kcp", "ws", "h2", "quic", "grpc" };
-        public static readonly List<string> kcpHeaderTypes = new List<string> { "srtp", "utp", "wechat-video", "dtls", "wireguard" };
-        public static readonly List<string> coreTypes = new List<string> { "v2fly", "SagerNet", "Xray", "v2fly_v5" };
-        public static readonly List<string> domainStrategys = new List<string> { "AsIs", "IPIfNonMatch", "IPOnDemand" };
-        public static readonly List<string> domainMatchers = new List<string> { "linear", "mph", "" };
-        public static readonly List<string> fingerprints = new List<string> { "chrome", "firefox", "safari", "randomized", "" };
-        public static readonly List<string> allowInsecures = new List<string> { "true", "false", "" };
-        public static readonly List<string> domainStrategy4Freedoms = new List<string> { "AsIs", "UseIP", "UseIPv4", "UseIPv6", "" };
-        public static readonly List<string> Languages = new List<string> { "zh-Hans", "en" ,"fa-Ir" };
-        public static readonly List<string> alpns = new List<string> { "h2", "http/1.1", "h2,http/1.1", "" };
-        public static readonly List<string> LogLevel = new List<string> { "debug", "info", "warning", "error", "none" };
-        public static readonly List<string> InboundTags = new List<string> { "socks", "http", "socks2", "http2" };
-        public static readonly List<string> Protocols = new List<string> { "http", "tls", "bittorrent" };
-        public static readonly List<string> TunMtus = new List<string> { "9000", "1500" };
-        public static readonly List<string> TunStacks = new List<string> { "gvisor", "system" };
 
-        #endregion
+        public static readonly List<string> SubConvertUrls = new List<string> {
+                @"https://sub.xeton.dev/sub?url={0}",
+                @"https://api.dler.io/sub?url={0}",
+                @"http://127.0.0.1:25500/sub?url={0}",
+                ""
+            };
 
-        #region global variable
+        public static readonly List<string> SubConvertConfig = new List<string> {
+                @"https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/config/ACL4SSR_Online.ini"
+            };
 
-        public static bool reloadCore { get; set; }
-        public static int statePort { get; set; }
-        public static Job processJob { get; set; }
-        public static bool ShowInTaskbar { get; set; }
-        public static string ExePathKey { get; set; }
+        public static readonly List<string> SubConvertTargets = new List<string> {
+                "",
+                "mixed",
+                "v2ray",
+                "clash",
+                "ss",
+            };
 
-        #endregion
+        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 List<string> SpeedPingTestUrls = new() {
+            @"https://www.google.com/generate_204",
+            @"https://www.apple.com/library/test/success.html",
+            @"http://www.msftconnecttest.com/connecttest.txt",
+        };
+
+        public static readonly Dictionary<string, string> UserAgentTexts = new()
+        {
+            {"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" },
+            {"safari","Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/14.1.1 Safari/605.1.15" },
+            {"edge","Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36 Edg/91.0.864.70" },
+            {"none",""}
+        };
+
+        public const string Hysteria2ProtocolShare = "hy2://";
+
+        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.Http,"http"},
+            {EConfigType.VLESS,"vless"},
+            {EConfigType.Trojan,"trojan"},
+            {EConfigType.Hysteria2,"hysteria2"},
+            {EConfigType.Tuic,"tuic"},
+            {EConfigType.Wireguard,"wireguard"}
+        };
+
+        public static readonly List<string> VmessSecurities = new() { "aes-128-gcm", "chacha20-poly1305", "auto", "none", "zero" };
+        public static readonly List<string> SsSecurities = new() { "aes-256-gcm", "aes-128-gcm", "chacha20-poly1305", "chacha20-ietf-poly1305", "none", "plain" };
+        public static readonly List<string> SsSecuritiesInSagerNet = new() { "none", "2022-blake3-aes-128-gcm", "2022-blake3-aes-256-gcm", "2022-blake3-chacha20-poly1305", "aes-128-gcm", "aes-192-gcm", "aes-256-gcm", "chacha20-ietf-poly1305", "xchacha20-ietf-poly1305", "rc4", "rc4-md5", "aes-128-ctr", "aes-192-ctr", "aes-256-ctr", "aes-128-cfb", "aes-192-cfb", "aes-256-cfb", "aes-128-cfb8", "aes-192-cfb8", "aes-256-cfb8", "aes-128-ofb", "aes-192-ofb", "aes-256-ofb", "bf-cfb", "cast5-cfb", "des-cfb", "idea-cfb", "rc2-cfb", "seed-cfb", "camellia-128-cfb", "camellia-192-cfb", "camellia-256-cfb", "camellia-128-cfb8", "camellia-192-cfb8", "camellia-256-cfb8", "salsa20", "chacha20", "chacha20-ietf", "xchacha20" };
+        public static readonly List<string> SsSecuritiesInXray = new() { "aes-256-gcm", "aes-128-gcm", "chacha20-poly1305", "chacha20-ietf-poly1305", "xchacha20-poly1305", "xchacha20-ietf-poly1305", "none", "plain", "2022-blake3-aes-128-gcm", "2022-blake3-aes-256-gcm", "2022-blake3-chacha20-poly1305" };
+        public static readonly List<string> SsSecuritiesInSingbox = new() { "aes-256-gcm", "aes-192-gcm", "aes-128-gcm", "chacha20-ietf-poly1305", "xchacha20-ietf-poly1305", "none", "2022-blake3-aes-128-gcm", "2022-blake3-aes-256-gcm", "2022-blake3-chacha20-poly1305", "aes-128-ctr", "aes-192-ctr", "aes-256-ctr", "aes-128-cfb", "aes-192-cfb", "aes-256-cfb", "rc4-md5", "chacha20-ietf", "xchacha20" };
+        public static readonly List<string> Flows = new() { "", "xtls-rprx-vision", "xtls-rprx-vision-udp443" };
+        public static readonly List<string> Networks = new() { "tcp", "kcp", "ws", "httpupgrade", "h2", "quic", "grpc" };
+        public static readonly List<string> KcpHeaderTypes = new() { "srtp", "utp", "wechat-video", "dtls", "wireguard" };
+        public static readonly List<string> CoreTypes = new() { "v2fly", "SagerNet", "Xray", "sing_box" };
+        public static readonly List<string> CoreTypes4VLESS = new() { "Xray", "sing_box" };
+        public static readonly List<string> DomainStrategies = new() { "AsIs", "IPIfNonMatch", "IPOnDemand" };
+        public static readonly List<string> DomainStrategies4Singbox = new() { "ipv4_only", "ipv6_only", "prefer_ipv4", "prefer_ipv6", "" };
+        public static readonly List<string> DomainMatchers = new() { "linear", "mph", "" };
+        public static readonly List<string> Fingerprints = new() { "chrome", "firefox", "safari", "ios", "android", "edge", "360", "qq", "random", "randomized", "" };
+        public static readonly List<string> UserAgent = new() { "chrome", "firefox", "safari", "edge", "none" };
+
+        public static readonly List<string> AllowInsecure = new() { "true", "false", "" };
+        public static readonly List<string> DomainStrategy4Freedoms = new() { "AsIs", "UseIP", "UseIPv4", "UseIPv6", "" };
+        public static readonly List<string> Languages = new() { "zh-Hans", "zh-Hant", "en", "fa-Ir", "ru" };
+        public static readonly List<string> Alpns = new() { "h3", "h2", "http/1.1", "h3,h2,http/1.1", "h3,h2", "h2,http/1.1", "" };
+        public static readonly List<string> LogLevels = new() { "debug", "info", "warning", "error", "none" };
+        public static readonly List<string> InboundTags = new() { "socks", "http", "socks2", "http2" };
+        public static readonly List<string> RuleProtocols = new() { "http", "tls", "bittorrent" };
+        public static readonly List<string> 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
     }
 }

v2rayN/v2rayN/Handler/CoreHandler.cs

@@ -1,7 +1,8 @@
 using System.Diagnostics;
 using System.IO;
+using System.Reactive.Linq;
 using System.Text;
-using v2rayN.Mode;
+using v2rayN.Models;
 using v2rayN.Resx;
 
 namespace v2rayN.Handler
@@ -9,36 +10,32 @@ namespace v2rayN.Handler
     /// <summary>
     /// Core process processing class
     /// </summary>
-    class CoreHandler
+    internal class CoreHandler
     {
-        private static string _coreCConfigRes = Global.coreConfigFileName;
-        private CoreInfo _coreInfo;
-        private int _processId = 0;
-        private Process _process;
-        Action<bool, string> _updateFunc;
+        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()
         {
-            if (Global.reloadCore)
-            {
-                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);
@@ -48,38 +45,47 @@ namespace v2rayN.Handler
                 ShowMsg(false, msg);
                 ShowMsg(true, $"{node.GetSummary()}");
                 CoreStop();
+                if (_config.tunModeItem.enableTun)
+                {
+                    Thread.Sleep(1000);
+                    Utils.RemoveTunDevice();
+                }
+
                 CoreStart(node);
-                }
 
-                //start a socks service
-                if (_process != null && !_process.HasExited && node.configType == EConfigType.Custom && node.preSocksPort > 0)
+                //In tun mode, do a delay check and restart the core
+                if (_config.tunModeItem.enableTun)
                 {
-                    var itemSocks = new ProfileItem()
+                    Observable.Range(1, 1)
+                    .Delay(TimeSpan.FromSeconds(15))
+                    .Subscribe(x =>
                     {
-                        configType = EConfigType.Socks,
-                        address = Global.Loopback,
-                        port = node.preSocksPort
-                    };
-                    if (CoreConfigHandler.GenerateClientConfig(itemSocks, null, out string msg2, out string configStr) == 0)
                         {
-                        _processId = CoreStartViaString(configStr);
+                            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,42 +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)
-                    {
-                        return;
+                    KillProcess(_processPre);
+                    _processPre.Dispose();
+                    _processPre = null;
+                    hasProc = true;
                 }
-                    foreach (string vName in _coreInfo.coreExes)
+
+                if (!hasProc)
                 {
-                        Process[] existing = Process.GetProcessesByName(vName);
+                    var coreInfo = LazyConfig.Instance.GetCoreInfo();
+                    foreach (var it in coreInfo)
+                    {
+                        if (it.coreType == ECoreType.v2rayN)
+                        {
+                            continue;
+                        }
+                        foreach (string vName in it.coreExes)
+                        {
+                            var existing = Process.GetProcessesByName(vName);
                             foreach (Process p in existing)
                             {
-                            string path = p.MainModule.FileName;
-                            if (path == $"{Utils.GetBinPath(vName, _coreInfo.coreType)}.exe")
+                                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);
             }
         }
 
@@ -131,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;
@@ -155,7 +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);
+                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,156 +180,192 @@ 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")));
 
+            ECoreType coreType;
+            if (node.configType != EConfigType.Custom && _config.tunModeItem.enableTun)
+            {
+                coreType = ECoreType.sing_box;
+            }
+            else
+            {
+                coreType = LazyConfig.Instance.GetCoreType(node, node.configType);
+            }
+            _config.runningCoreType = coreType;
+            var coreInfo = LazyConfig.Instance.GetCoreInfo(coreType);
+
+            var displayLog = node.configType != EConfigType.Custom || node.displayLog;
+            var proc = RunProcess(node, coreInfo, "", displayLog);
+            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 preCoreType = _config.tunModeItem.enableTun ? ECoreType.sing_box : ECoreType.Xray;
+                    var itemSocks = new ProfileItem()
+                    {
+                        coreType = preCoreType,
+                        configType = EConfigType.Socks,
+                        address = Global.Loopback,
+                        port = node.preSocksPort
+                    };
+                    _config.runningCoreType = preCoreType;
+                    string fileName2 = Utils.GetConfigPath(Global.CorePreConfigFileName);
+                    if (CoreConfigHandler.GenerateClientConfig(itemSocks, fileName2, out string msg2, out string configStr) == 0)
+                    {
+                        var coreInfo2 = LazyConfig.Instance.GetCoreInfo(preCoreType);
+                        var proc2 = RunProcess(node, coreInfo2, $" -c {Global.CorePreConfigFileName}", true);
+                        if (proc2 is not null)
+                        {
+                            _processPre = proc2;
+                        }
+                    }
+                }
+            }
+        }
+
+        private int CoreStartSpeedtest(string configPath, ECoreType coreType)
+        {
+            ShowMsg(false, string.Format(ResUI.StartService, DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss")));
+
+            ShowMsg(false, configPath);
             try
             {
-                string fileName = CoreFindexe(_coreInfo);
-                if (fileName == "") return;
-
-                Process p = new Process
+                var coreInfo = LazyConfig.Instance.GetCoreInfo(coreType);
+                var proc = RunProcess(new(), coreInfo, $" -c {Global.CoreSpeedtestConfigFileName}", true);
+                if (proc is null)
                 {
-                    StartInfo = new ProcessStartInfo
+                    return -1;
+                }
+
+                return proc.Id;
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+                string msg = ex.Message;
+                ShowMsg(false, msg);
+                return -1;
+            }
+        }
+
+        private void ShowMsg(bool notify, string msg)
+        {
+            _updateFunc(notify, msg);
+        }
+
+        #endregion Private
+
+        #region Process
+
+        private Process? RunProcess(ProfileItem node, CoreInfo coreInfo, string configPath, bool displayLog)
+        {
+            try
+            {
+                string fileName = CoreFindExe(coreInfo);
+                if (Utils.IsNullOrEmpty(fileName))
+                {
+                    return null;
+                }
+                Process proc = new()
+                {
+                    StartInfo = new()
                     {
                         FileName = fileName,
-                        Arguments = _coreInfo.arguments,
+                        Arguments = string.Format(coreInfo.arguments, configPath),
                         WorkingDirectory = Utils.GetConfigPath(),
                         UseShellExecute = false,
-                        RedirectStandardOutput = node.displayLog,
-                        RedirectStandardError = node.displayLog,
+                        RedirectStandardOutput = displayLog,
+                        RedirectStandardError = displayLog,
                         CreateNoWindow = true,
-                        StandardOutputEncoding = node.displayLog ? Encoding.UTF8 : null,
-                        StandardErrorEncoding = node.displayLog ? Encoding.UTF8 : null,
+                        StandardOutputEncoding = displayLog ? Encoding.UTF8 : null,
+                        StandardErrorEncoding = displayLog ? Encoding.UTF8 : null,
                     }
                 };
-                if (node.displayLog)
+                var startUpErrorMessage = new StringBuilder();
+                var startUpSuccessful = false;
+                if (displayLog)
                 {
-                    p.OutputDataReceived += (sender, e) =>
+                    proc.OutputDataReceived += (sender, e) =>
                     {
-                        if (!String.IsNullOrEmpty(e.Data))
+                        if (!Utils.IsNullOrEmpty(e.Data))
                         {
                             string msg = e.Data + Environment.NewLine;
                             ShowMsg(false, msg);
                         }
                     };
-                }
-                p.Start();
-                if (node.displayLog)
+                    proc.ErrorDataReceived += (sender, e) =>
                     {
-                    p.BeginOutputReadLine();
-                }
-                _process = p;
+                        if (!Utils.IsNullOrEmpty(e.Data))
+                        {
+                            string msg = e.Data + Environment.NewLine;
+                            ShowMsg(false, msg);
 
-                if (p.WaitForExit(1000))
+                            if (!startUpSuccessful)
                             {
-                    throw new Exception(node.displayLog ? p.StandardError.ReadToEnd() : "启动进程失败并退出 (Failed to start the process and exited)");
+                                startUpErrorMessage.Append(msg);
+                            }
+                        }
+                    };
+                }
+                proc.Start();
+                if (displayLog)
+                {
+                    proc.BeginOutputReadLine();
+                    proc.BeginErrorReadLine();
                 }
 
-                Global.processJob.AddProcess(p.Handle);
+                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)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 string msg = ex.Message;
                 ShowMsg(true, msg);
+                return null;
             }
         }
 
-        private int CoreStartViaString(string configStr)
+        private void KillProcess(Process? proc)
         {
-            ShowMsg(false, string.Format(ResUI.StartService, DateTime.Now.ToString()));
-
+            if (proc is null)
+            {
+                return;
+            }
             try
             {
-                var coreInfo = LazyConfig.Instance.GetCoreInfo(ECoreType.Xray);
-                string fileName = CoreFindexe(coreInfo);
-                if (fileName == "") return -1;
-
-                Process p = new Process
+                proc.Kill();
+                proc.WaitForExit(100);
+                if (!proc.HasExited)
                 {
-                    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.Start();
-                p.BeginOutputReadLine();
-
-                p.StandardInput.Write(configStr);
-                p.StandardInput.Close();
-
-                if (p.WaitForExit(1000))
-                {
-                    throw new Exception(p.StandardError.ReadToEnd());
-                }
-
-                Global.processJob.AddProcess(p.Handle);
-                return p.Id;
-            }
-            catch (Exception ex)
-            {
-                Utils.SaveLog(ex.Message, ex);
-                string msg = ex.Message;
-                ShowMsg(false, msg);
-                return -1;
-            }
-        }
-
-        private void ShowMsg(bool updateToTrayTooltip, string msg)
-        {
-            _updateFunc(updateToTrayTooltip, msg);
-        }
-
-        private void KillProcess(Process p)
-        {
-            try
-            {
-                p.CloseMainWindow();
-                p.WaitForExit(100);
-                if (!p.HasExited)
-                {
-                    p.Kill();
-                    p.WaitForExit(100);
+                    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,7 @@ using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Net.Sockets;
-using v2rayN.Base;
+using v2rayN.Models;
 using v2rayN.Resx;
 
 namespace v2rayN.Handler
@@ -12,12 +12,11 @@ namespace v2rayN.Handler
     /// <summary>
     ///Download
     /// </summary>
-    class DownloadHandle
+    internal class DownloadHandle
     {
-        public event EventHandler<ResultEventArgs> UpdateCompleted;
-
-        public event ErrorEventHandler Error;
+        public event EventHandler<ResultEventArgs>? UpdateCompleted;
 
+        public event ErrorEventHandler? Error;
 
         public class ResultEventArgs : EventArgs
         {
@@ -33,20 +32,13 @@ namespace v2rayN.Handler
 
         public async Task<int> DownloadDataAsync(string url, WebProxy webProxy, int downloadTimeout, Action<bool, string> update)
         {
-            var hasValue = false;
             try
             {
-                Utils.SetSecurityProtocol(LazyConfig.Instance.GetConfig().enableSecurityProtocolTls13);
-
-                var client = new HttpClient(new SocketsHttpHandler()
-                {
-                    Proxy = webProxy
-                });
+                Utils.SetSecurityProtocol(LazyConfig.Instance.GetConfig().guiItem.enableSecurityProtocolTls13);
 
                 var progress = new Progress<string>();
                 progress.ProgressChanged += (sender, value) =>
                 {
-                    hasValue = true;
                     if (update != null)
                     {
                         string msg = $"{value}";
@@ -54,16 +46,12 @@ namespace v2rayN.Handler
                     }
                 };
 
-                var cancellationToken = new CancellationTokenSource();
-                cancellationToken.CancelAfter(downloadTimeout * 1000);
-                await HttpClientHelper.GetInstance().DownloadDataAsync4Speed(client,
+                await DownloaderHelper.Instance.DownloadDataAsync4Speed(webProxy,
                       url,
                       progress,
-                      cancellationToken.Token);
+                      downloadTimeout);
             }
             catch (Exception ex)
-            {
-                if (!hasValue)
             {
                 update(false, ex.Message);
                 if (ex.InnerException != null)
@@ -71,42 +59,32 @@ namespace v2rayN.Handler
                     update(false, ex.InnerException.Message);
                 }
             }
-            }
             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().enableSecurityProtocolTls13);
-                UpdateCompleted?.Invoke(this, new ResultEventArgs(false, ResUI.Downloading));
-
-                var client = new HttpClient(new SocketsHttpHandler()
-                {
-                    Proxy = GetWebProxy(blProxy)
-                });
+                Utils.SetSecurityProtocol(LazyConfig.Instance.GetConfig().guiItem.enableSecurityProtocolTls13);
+                UpdateCompleted?.Invoke(this, new ResultEventArgs(false, $"{ResUI.Downloading}   {url}"));
 
                 var progress = new Progress<double>();
                 progress.ProgressChanged += (sender, value) =>
                 {
-                    if (UpdateCompleted != null)
-                    {
-                        string msg = $"...{value}%";
-                        UpdateCompleted(this, new ResultEventArgs(value > 100 ? true : false, msg));
-                    }
+                    UpdateCompleted?.Invoke(this, new ResultEventArgs(value > 100, $"...{value}%"));
                 };
 
-                var cancellationToken = new CancellationTokenSource();
-                _ = HttpClientHelper.GetInstance().DownloadFileAsync(client,
+                var webProxy = GetWebProxy(blProxy);
+                await DownloaderHelper.Instance.DownloadFileAsync(webProxy,
                     url,
                     Utils.GetTempPath(Utils.GetDownloadFileName(url)),
                     progress,
-                       cancellationToken.Token);
+                    downloadTimeout);
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
 
                 Error?.Invoke(this, new ErrorEventArgs(ex));
                 if (ex.InnerException != null)
@@ -116,64 +94,125 @@ namespace v2rayN.Handler
             }
         }
 
-        public async Task<string> UrlRedirectAsync(string url, bool blProxy)
+        public async Task<string?> UrlRedirectAsync(string url, bool blProxy)
         {
-            Utils.SetSecurityProtocol(LazyConfig.Instance.GetConfig().enableSecurityProtocolTls13);
+            Utils.SetSecurityProtocol(LazyConfig.Instance.GetConfig().guiItem.enableSecurityProtocolTls13);
             var webRequestHandler = new SocketsHttpHandler
             {
                 AllowAutoRedirect = false,
                 Proxy = GetWebProxy(blProxy)
             };
-            HttpClient client = new HttpClient(webRequestHandler);
+            HttpClient client = new(webRequestHandler);
 
             HttpResponseMessage response = await client.GetAsync(url);
-            if (response.StatusCode.ToString() == "Redirect")
+            if (response.StatusCode == HttpStatusCode.Redirect && response.Headers.Location is not null)
             {
                 return response.Headers.Location.ToString();
             }
             else
             {
-                Utils.SaveLog("StatusCode error: " + url);
+                Logging.SaveLog("StatusCode error: " + url);
                 return null;
             }
         }
 
+        public async Task<string?> TryDownloadString(string url, bool blProxy, string userAgent)
+        {
+            try
+            {
+                var result1 = await DownloadStringAsync(url, blProxy, userAgent);
+                if (!Utils.IsNullOrEmpty(result1))
+                {
+                    return result1;
+                }
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+                Error?.Invoke(this, new ErrorEventArgs(ex));
+                if (ex.InnerException != null)
+                {
+                    Error?.Invoke(this, new ErrorEventArgs(ex.InnerException));
+                }
+            }
+
+            try
+            {
+                var result2 = await DownloadStringViaDownloader(url, blProxy, userAgent);
+                if (!Utils.IsNullOrEmpty(result2))
+                {
+                    return result2;
+                }
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+                Error?.Invoke(this, new ErrorEventArgs(ex));
+                if (ex.InnerException != null)
+                {
+                    Error?.Invoke(this, new ErrorEventArgs(ex.InnerException));
+                }
+            }
+
+            try
+            {
+                using var wc = new WebClient();
+                wc.Proxy = GetWebProxy(blProxy);
+                var result3 = await wc.DownloadStringTaskAsync(url);
+                if (!Utils.IsNullOrEmpty(result3))
+                {
+                    return result3;
+                }
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+                Error?.Invoke(this, new ErrorEventArgs(ex));
+                if (ex.InnerException != null)
+                {
+                    Error?.Invoke(this, new ErrorEventArgs(ex.InnerException));
+                }
+            }
+
+            return null;
+        }
+
         /// <summary>
         /// DownloadString
         /// </summary>
         /// <param name="url"></param>
-        public async Task<string> DownloadStringAsync(string url, bool blProxy, string userAgent)
+        public async Task<string?> DownloadStringAsync(string url, bool blProxy, string userAgent)
         {
             try
             {
-                Utils.SetSecurityProtocol(LazyConfig.Instance.GetConfig().enableSecurityProtocolTls13);
+                Utils.SetSecurityProtocol(LazyConfig.Instance.GetConfig().guiItem.enableSecurityProtocolTls13);
+                var webProxy = GetWebProxy(blProxy);
                 var client = new HttpClient(new SocketsHttpHandler()
                 {
-                    Proxy = GetWebProxy(blProxy)
+                    Proxy = webProxy,
+                    UseProxy = webProxy != null
                 });
 
                 if (Utils.IsNullOrEmpty(userAgent))
                 {
-                    userAgent = $"{Utils.GetVersion(false)}";
+                    userAgent = Utils.GetVersion(false);
                 }
                 client.DefaultRequestHeaders.UserAgent.TryParseAdd(userAgent);
 
-                Uri uri = new Uri(url);
+                Uri uri = new(url);
                 //Authorization Header
                 if (!Utils.IsNullOrEmpty(uri.UserInfo))
                 {
                     client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic", Utils.Base64Encode(uri.UserInfo));
                 }
 
-                var cts = new CancellationTokenSource();
-                cts.CancelAfter(1000 * 30);
-
-                var result = await HttpClientHelper.GetInstance().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)
                 {
@@ -183,74 +222,97 @@ namespace v2rayN.Handler
             return null;
         }
 
-        public int RunAvailabilityCheck(WebProxy webProxy)
+        /// <summary>
+        /// DownloadString
+        /// </summary>
+        /// <param name="url"></param>
+        public async Task<string?> DownloadStringViaDownloader(string url, bool blProxy, string userAgent)
+        {
+            try
+            {
+                Utils.SetSecurityProtocol(LazyConfig.Instance.GetConfig().guiItem.enableSecurityProtocolTls13);
+
+                var webProxy = GetWebProxy(blProxy);
+
+                if (Utils.IsNullOrEmpty(userAgent))
+                {
+                    userAgent = Utils.GetVersion(false);
+                }
+                var result = await DownloaderHelper.Instance.DownloadStringAsync(webProxy, url, userAgent, 30);
+                return result;
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+                Error?.Invoke(this, new ErrorEventArgs(ex));
+                if (ex.InnerException != null)
+                {
+                    Error?.Invoke(this, new ErrorEventArgs(ex.InnerException));
+                }
+            }
+            return null;
+        }
+
+        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
                 {
-                    string status = GetRealPingTime(Global.SpeedPingTestUrl, webProxy, 10, out int responseTime);
-                    bool noError = Utils.IsNullOrEmpty(status);
-                    return noError ? responseTime : -1;
+                    var config = LazyConfig.Instance.GetConfig();
+                    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, WebProxy 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();
 
-                Stopwatch timer = new Stopwatch();
-                timer.Start();
-
-                HttpWebResponse myHttpWebResponse = (HttpWebResponse)myHttpWebRequest.GetResponse();
-                if (myHttpWebResponse.StatusCode != HttpStatusCode.OK
-                    && myHttpWebResponse.StatusCode != HttpStatusCode.NoContent)
+                using var cts = new CancellationTokenSource();
+                cts.CancelAfter(TimeSpan.FromSeconds(downloadTimeout));
+                using var client = new HttpClient(new SocketsHttpHandler()
                 {
-                    msg = myHttpWebResponse.StatusDescription;
-                }
-                timer.Stop();
+                    Proxy = webProxy,
+                    UseProxy = webProxy != null
+                });
+                await client.GetAsync(url, cts.Token);
+
                 responseTime = timer.Elapsed.Milliseconds;
-
-                myHttpWebResponse.Close();
             }
-            catch (Exception ex)
+            catch //(Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
-                msg = ex.Message;
+                //Utile.SaveLog(ex.Message, ex);
             }
-            return msg;
+            return responseTime;
         }
 
-        private WebProxy GetWebProxy(bool blProxy)
+        private WebProxy? GetWebProxy(bool blProxy)
         {
             if (!blProxy)
             {
                 return null;
             }
-            var httpPort = LazyConfig.Instance.GetLocalPort(Global.InboundHttp);
+            var httpPort = LazyConfig.Instance.GetLocalPort(EInboundProtocol.http);
             if (!SocketCheck(Global.Loopback, httpPort))
             {
                 return null;
@@ -261,25 +323,17 @@ namespace v2rayN.Handler
 
         private bool SocketCheck(string ip, int port)
         {
-            Socket sock = null;
             try
             {
-                IPAddress ipa = IPAddress.Parse(ip);
-                IPEndPoint point = new IPEndPoint(ipa, port);
-                sock = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+                IPEndPoint point = new(IPAddress.Parse(ip), port);
+                using Socket? sock = new(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
                 sock.Connect(point);
                 return true;
             }
-            catch { }
-            finally
+            catch (Exception)
             {
-                if (sock != null)
-                {
-                    sock.Close();
-                    sock.Dispose();
-                }
-            }
                 return false;
             }
         }
+    }
 }

v2rayN/v2rayN/Handler/HotkeyHandler.cs

@@ -0,0 +1,180 @@
+using System.ComponentModel;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Windows;
+using System.Windows.Input;
+using System.Windows.Interop;
+using v2rayN.Models;
+using v2rayN.Resx;
+
+namespace v2rayN.Handler
+{
+    public sealed class HotkeyHandler
+    {
+        private static readonly Lazy<HotkeyHandler> _instance = new(() => new());
+        public static HotkeyHandler Instance = _instance.Value;
+
+        private const int WmHotkey = 0x0312;
+
+        private Config _config
+        {
+            get => LazyConfig.Instance.GetConfig();
+        }
+
+        private Dictionary<int, List<EGlobalHotkey>> _hotkeyTriggerDic;
+
+        public bool IsPause { get; set; } = false;
+
+        public event Action<bool, string>? UpdateViewEvent;
+
+        public event Action<EGlobalHotkey>? HotkeyTriggerEvent;
+
+        public HotkeyHandler()
+        {
+            _hotkeyTriggerDic = new();
+            ComponentDispatcher.ThreadPreprocessMessage += OnThreadPreProcessMessage;
+            Init();
+        }
+
+        private void Init()
+        {
+            _hotkeyTriggerDic.Clear();
+            if (_config.globalHotkeys == null) return;
+            foreach (var item in _config.globalHotkeys)
+            {
+                if (item.KeyCode != null && item.KeyCode != Key.None)
+                {
+                    int key = KeyInterop.VirtualKeyFromKey((Key)item.KeyCode);
+                    KeyModifiers modifiers = KeyModifiers.None;
+                    if (item.Control) modifiers |= KeyModifiers.Ctrl;
+                    if (item.Shift) modifiers |= KeyModifiers.Shift;
+                    if (item.Alt) modifiers |= KeyModifiers.Alt;
+                    key = (key << 16) | (int)modifiers;
+                    if (!_hotkeyTriggerDic.ContainsKey(key))
+                    {
+                        _hotkeyTriggerDic.Add(key, new() { item.eGlobalHotkey });
+                    }
+                    else
+                    {
+                        if (!_hotkeyTriggerDic[key].Contains(item.eGlobalHotkey))
+                            _hotkeyTriggerDic[key].Add(item.eGlobalHotkey);
+                    }
+                }
+            }
+        }
+
+        public void Load()
+        {
+            foreach (var _hotkeyCode in _hotkeyTriggerDic.Keys)
+            {
+                var hotkeyInfo = GetHotkeyInfo(_hotkeyCode);
+                bool isSuccess = false;
+                string msg;
+
+                Application.Current.Dispatcher.Invoke(() =>
+                {
+                    isSuccess = RegisterHotKey(IntPtr.Zero, _hotkeyCode, hotkeyInfo.fsModifiers, hotkeyInfo.vKey);
+                });
+                foreach (var name in hotkeyInfo.Names)
+                {
+                    if (isSuccess)
+                    {
+                        msg = string.Format(ResUI.RegisterGlobalHotkeySuccessfully, $"{name}({hotkeyInfo.hotkeyStr})");
+                    }
+                    else
+                    {
+                        var errInfo = new Win32Exception(Marshal.GetLastWin32Error()).Message;
+                        msg = string.Format(ResUI.RegisterGlobalHotkeyFailed, $"{name}({hotkeyInfo.hotkeyStr})", errInfo);
+                    }
+                    UpdateViewEvent?.Invoke(false, msg);
+                }
+            }
+        }
+
+        public void ReLoad()
+        {
+            foreach (var hotkey in _hotkeyTriggerDic.Keys)
+            {
+                Application.Current.Dispatcher.Invoke(() =>
+                {
+                    UnregisterHotKey(IntPtr.Zero, hotkey);
+                });
+            }
+            Init();
+            Load();
+        }
+
+        private (int fsModifiers, int vKey, string hotkeyStr, List<string> Names) GetHotkeyInfo(int hotkeycode)
+        {
+            var _fsModifiers = hotkeycode & 0xffff;
+            var _vkey = (hotkeycode >> 16) & 0xffff;
+            var _hotkeyStr = new StringBuilder();
+            var _names = new List<string>();
+
+            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}+");
+            _hotkeyStr.Append(key.ToString());
+
+            foreach (var name in _hotkeyTriggerDic[hotkeycode])
+            {
+                _names.Add(name.ToString());
+            }
+
+            return (_fsModifiers, _vkey, _hotkeyStr.ToString(), _names);
+        }
+
+        private void OnThreadPreProcessMessage(ref MSG msg, ref bool handled)
+        {
+            if (msg.message != WmHotkey || !_hotkeyTriggerDic.ContainsKey((int)msg.lParam))
+            {
+                return;
+            }
+            handled = true;
+            var _hotKeyCode = (int)msg.lParam;
+            if (IsPause)
+            {
+                Application.Current.Dispatcher.Invoke(() =>
+                {
+                    UIElement? element = Keyboard.FocusedElement as UIElement;
+                    if (element != null)
+                    {
+                        var _keyEventArgs = new KeyEventArgs(Keyboard.PrimaryDevice,
+                            PresentationSource.FromVisual(element), 0,
+                            KeyInterop.KeyFromVirtualKey(GetHotkeyInfo(_hotKeyCode).vKey))
+                        {
+                            RoutedEvent = UIElement.KeyDownEvent
+                        };
+                        element.RaiseEvent(_keyEventArgs);
+                    }
+                });
+            }
+            else
+            {
+                foreach (var keyEvent in _hotkeyTriggerDic[(int)msg.lParam])
+                {
+                    HotkeyTriggerEvent?.Invoke(keyEvent);
+                }
+            }
+        }
+
+        [DllImport("user32.dll", SetLastError = true)]
+        private static extern bool RegisterHotKey(IntPtr hWnd, int id, int fsModifiers, int vlc);
+
+        [DllImport("user32.dll", SetLastError = true)]
+        private static extern bool UnregisterHotKey(IntPtr hWnd, int id);
+
+        [Flags]
+        private enum KeyModifiers
+        {
+            None = 0x0000,
+            Alt = 0x0001,
+            Ctrl = 0x0002,
+            Shift = 0x0004,
+            Win = 0x0008,
+            NoRepeat = 0x4000
+        }
+    }
+}

v2rayN/v2rayN/Handler/LazyConfig.cs

@@ -1,84 +1,101 @@
-using v2rayN.Base;
-using v2rayN.Mode;
+using System.Runtime.Intrinsics.X86;
+using v2rayN.Models;
 
 namespace v2rayN.Handler
 {
     public sealed class LazyConfig
     {
-        private static readonly Lazy<LazyConfig> _instance = new Lazy<LazyConfig>(() => new());
+        private static readonly Lazy<LazyConfig> _instance = new(() => new());
         private Config _config;
-        private List<CoreInfo> coreInfos;
+        private List<CoreInfo> coreInfo;
 
         public static LazyConfig Instance => _instance.Value;
 
+        private int? _statePort;
+
+        public int StatePort
+        {
+            get
+            {
+                if (_statePort is null)
+                {
+                    _statePort = Utils.GetFreePort(GetLocalPort(EInboundProtocol.api));
+                }
+
+                return _statePort.Value;
+            }
+        }
+
+        private Job _processJob = new();
+
         public LazyConfig()
         {
-            SqliteHelper.Instance.CreateTable<SubItem>();
-            SqliteHelper.Instance.CreateTable<ProfileItem>();
-            SqliteHelper.Instance.CreateTable<ServerStatItem>();
-            SqliteHelper.Instance.CreateTable<RoutingItem>();
+            SQLiteHelper.Instance.CreateTable<SubItem>();
+            SQLiteHelper.Instance.CreateTable<ProfileItem>();
+            SQLiteHelper.Instance.CreateTable<ServerStatItem>();
+            SQLiteHelper.Instance.CreateTable<RoutingItem>();
+            SQLiteHelper.Instance.CreateTable<ProfileExItem>();
+            SQLiteHelper.Instance.CreateTable<DNSItem>();
         }
 
         #region Config
 
-        public void SetConfig(ref Config config)
+        public void SetConfig(Config config)
         {
             _config = config;
         }
+
         public Config GetConfig()
         {
             return _config;
         }
 
-        public int GetLocalPort(string protocol)
+        public int GetLocalPort(EInboundProtocol protocol)
         {
-            int localPort = _config.inbound.FirstOrDefault(t => t.protocol == Global.InboundSocks).localPort;
-            if (protocol == Global.InboundSocks)
+            var localPort = _config.inbound.FirstOrDefault(t => t.protocol == nameof(EInboundProtocol.socks))?.localPort ?? 10808;
+            return localPort + (int)protocol;
+        }
+
+        public void AddProcess(IntPtr processHandle)
         {
-                return localPort;
-            }
-            else if (protocol == Global.InboundHttp)
-            {
-                return localPort + 1;
-            }
-            else if (protocol == Global.InboundSocks2)
-            {
-                return localPort + 2;
-            }
-            else if (protocol == Global.InboundHttp2)
-            {
-                return localPort + 3;
-            }
-            else if (protocol == ESysProxyType.Pac.ToString())
-            {
-                return localPort + 4;
-            }
-            else if (protocol == "speedtest")
-            {
-                return localPort + 103;
-            }
-            return localPort;
+            _processJob.AddProcess(processHandle);
         }
 
+        #endregion Config
+
+        #region SqliteHelper
+
         public List<SubItem> SubItems()
         {
-            return SqliteHelper.Instance.Table<SubItem>().ToList();
+            return SQLiteHelper.Instance.Table<SubItem>().ToList();
         }
+
         public SubItem GetSubItem(string subid)
         {
-            return SqliteHelper.Instance.Table<SubItem>().FirstOrDefault(t => t.id == subid);
+            return SQLiteHelper.Instance.Table<SubItem>().FirstOrDefault(t => t.id == subid);
         }
 
         public List<ProfileItem> ProfileItems(string subid)
         {
             if (Utils.IsNullOrEmpty(subid))
             {
-                return SqliteHelper.Instance.Table<ProfileItem>().ToList();
-
+                return SQLiteHelper.Instance.Table<ProfileItem>().ToList();
             }
             else
             {
-                return SqliteHelper.Instance.Table<ProfileItem>().Where(t => t.subid == subid).ToList();
+                return SQLiteHelper.Instance.Table<ProfileItem>().Where(t => t.subid == subid).ToList();
+            }
+        }
+
+        public List<string> ProfileItemIndexes(string subid)
+        {
+            if (Utils.IsNullOrEmpty(subid))
+            {
+                return SQLiteHelper.Instance.Table<ProfileItem>().Select(t => t.indexId).ToList();
+            }
+            else
+            {
+                return SQLiteHelper.Instance.Table<ProfileItem>().Where(t => t.subid == subid).Select(t => t.indexId).ToList();
             }
         }
 
@@ -86,89 +103,87 @@ namespace v2rayN.Handler
         {
             var sql = @$"select a.*
                            ,b.remarks subRemarks
-                           ,case when a.indexId = '{_config.indexId}' then true else false end isActive
                         from ProfileItem a
                         left join SubItem b on a.subid = b.id
                         where 1=1 ";
             if (!Utils.IsNullOrEmpty(subid))
             {
-                sql += $" and a.subid = {subid}";
+                sql += $" and a.subid = '{subid}'";
             }
             if (!Utils.IsNullOrEmpty(filter))
             {
-                sql += $" and a.remarks like '%{filter}%'";
+                if (filter.Contains('\''))
+                {
+                    filter = filter.Replace("'", "");
                 }
-            sql += " order by a.sort";
-
-            return SqliteHelper.Instance.Query<ProfileItemModel>(sql).ToList();
+                sql += String.Format(" and (a.remarks like '%{0}%' or a.address like '%{0}%') ", filter);
             }
 
-        public ProfileItem GetProfileItem(string indexId)
+            return SQLiteHelper.Instance.Query<ProfileItemModel>(sql).ToList();
+        }
+
+        public ProfileItem? GetProfileItem(string indexId)
         {
             if (Utils.IsNullOrEmpty(indexId))
             {
                 return null;
             }
-            return SqliteHelper.Instance.Table<ProfileItem>().FirstOrDefault(it => it.indexId == indexId);
+            return SQLiteHelper.Instance.Table<ProfileItem>().FirstOrDefault(it => it.indexId == indexId);
         }
 
-        public Task SetTestResult(string indexId, string delayVal, string speedVal)
+        public ProfileItem? GetProfileItemViaRemarks(string remarks)
         {
-            string sql = string.Empty;
-            if (!Utils.IsNullOrEmpty(delayVal) && !Utils.IsNullOrEmpty(speedVal))
+            if (Utils.IsNullOrEmpty(remarks))
             {
-                int.TryParse(delayVal, out int delay);
-                decimal.TryParse(speedVal, out decimal speed);
-                sql = $"update ProfileItem set delay={delay},speed={speed} where indexId = '{indexId}'";
+                return null;
             }
-            else if (!Utils.IsNullOrEmpty(delayVal))
-            {
-                int.TryParse(delayVal, out int delay);
-                sql = $"update ProfileItem set delay={delay} where indexId = '{indexId}'";
-            }
-            else if (!Utils.IsNullOrEmpty(speedVal))
-            {
-                decimal.TryParse(speedVal, out decimal speed);
-                sql = $"update ProfileItem set speed={speed} where indexId = '{indexId}'";
-            }
-            return SqliteHelper.Instance.ExecuteAsync(sql);
-        }
-
-        public List<ServerStatItem> ServerStatItems()
-        {
-            return SqliteHelper.Instance.Table<ServerStatItem>().ToList();
+            return SQLiteHelper.Instance.Table<ProfileItem>().FirstOrDefault(it => it.remarks == remarks);
         }
 
         public List<RoutingItem> RoutingItems()
         {
-            return SqliteHelper.Instance.Table<RoutingItem>().Where(it => it.locked == false).ToList();
-        }
-        public RoutingItem GetRoutingItem(string id)
-        {
-            return SqliteHelper.Instance.Table<RoutingItem>().FirstOrDefault(it => it.locked == false && it.id == id);
+            return SQLiteHelper.Instance.Table<RoutingItem>().Where(it => it.locked == false).OrderBy(t => t.sort).ToList();
         }
 
-        #endregion
+        public RoutingItem GetRoutingItem(string id)
+        {
+            return SQLiteHelper.Instance.Table<RoutingItem>().FirstOrDefault(it => it.locked == false && it.id == id);
+        }
+
+        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)
+        public List<string> GetShadowsocksSecurities(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.SsSecurities;
 
-            return Global.ssSecuritysInSagerNet;
+                case ECoreType.Xray:
+                    return Global.SsSecuritiesInXray;
+
+                case ECoreType.sing_box:
+                    return Global.SsSecuritiesInSingbox;
+            }
+            return Global.SsSecuritiesInSagerNet;
         }
 
         public ECoreType GetCoreType(ProfileItem profileItem, EConfigType eConfigType)
         {
-            if (profileItem != null && profileItem.coreType != null)
+            if (profileItem?.coreType != null)
             {
                 return (ECoreType)profileItem.coreType;
             }
@@ -185,161 +200,207 @@ namespace v2rayN.Handler
             return item.coreType;
         }
 
-        public CoreInfo GetCoreInfo(ECoreType coreType)
+        public CoreInfo? GetCoreInfo(ECoreType coreType)
         {
-            if (coreInfos == null)
+            if (coreInfo == null)
             {
                 InitCoreInfo();
             }
-            return coreInfos.Where(t => t.coreType == coreType).FirstOrDefault();
+            return coreInfo?.FirstOrDefault(t => t.coreType == coreType);
         }
 
-        public List<CoreInfo> GetCoreInfos()
+        public List<CoreInfo> GetCoreInfo()
         {
-            if (coreInfos == null)
+            if (coreInfo == null)
             {
                 InitCoreInfo();
             }
-            return coreInfos;
+            return coreInfo!;
         }
 
         private void InitCoreInfo()
         {
-            coreInfos = new List<CoreInfo>();
+            coreInfo = new(16);
 
-            coreInfos.Add(new CoreInfo
+            coreInfo.Add(new CoreInfo
             {
                 coreType = ECoreType.v2rayN,
                 coreUrl = Global.NUrl,
-                coreReleaseApiUrl = Global.NUrl.Replace(@"https://github.com", @"https://api.github.com/repos"),
-                coreDownloadUrl32 = Global.NUrl + "/download/{0}/v2rayN.zip",
+                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"
             });
 
-            coreInfos.Add(new CoreInfo
+            coreInfo.Add(new CoreInfo
             {
                 coreType = ECoreType.v2fly,
                 coreExes = new List<string> { "wv2ray", "v2ray" },
                 arguments = "",
-                coreUrl = Global.v2flyCoreUrl,
-                coreReleaseApiUrl = Global.v2flyCoreUrl.Replace(@"https://github.com", @"https://api.github.com/repos"),
-                coreDownloadUrl32 = Global.v2flyCoreUrl + "/download/{0}/v2ray-windows-{1}.zip",
-                coreDownloadUrl64 = 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,
             });
 
-            coreInfos.Add(new CoreInfo
+            coreInfo.Add(new CoreInfo
             {
                 coreType = ECoreType.SagerNet,
                 coreExes = new List<string> { "SagerNet", "v2ray" },
                 arguments = "run",
                 coreUrl = Global.SagerNetCoreUrl,
-                coreReleaseApiUrl = Global.SagerNetCoreUrl.Replace(@"https://github.com", @"https://api.github.com/repos"),
+                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",
                 match = "V2Ray",
                 versionArg = "version",
                 redirectInfo = true,
             });
 
-            coreInfos.Add(new CoreInfo
+            coreInfo.Add(new CoreInfo
             {
                 coreType = ECoreType.v2fly_v5,
                 coreExes = new List<string> { "v2ray" },
-                arguments = "run",
-                coreUrl = Global.v2flyCoreUrl,
-                coreReleaseApiUrl = Global.v2flyCoreUrl.Replace(@"https://github.com", @"https://api.github.com/repos"),
-                coreDownloadUrl32 = Global.v2flyCoreUrl + "/download/{0}/v2ray-windows-{1}.zip",
-                coreDownloadUrl64 = 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,
             });
 
-            coreInfos.Add(new CoreInfo
+            coreInfo.Add(new CoreInfo
             {
                 coreType = ECoreType.Xray,
                 coreExes = new List<string> { "xray", "wxray" },
-                arguments = "",
-                coreUrl = Global.xrayCoreUrl,
-                coreReleaseApiUrl = Global.xrayCoreUrl.Replace(@"https://github.com", @"https://api.github.com/repos"),
-                coreDownloadUrl32 = Global.xrayCoreUrl + "/download/{0}/Xray-windows-{1}.zip",
-                coreDownloadUrl64 = 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,
             });
 
-            coreInfos.Add(new CoreInfo
+            coreInfo.Add(new CoreInfo
             {
                 coreType = ECoreType.clash,
                 coreExes = new List<string> { "clash-windows-amd64-v3", "clash-windows-amd64", "clash-windows-386", "clash" },
                 arguments = "-f config.json",
-                coreUrl = Global.clashCoreUrl,
-                coreReleaseApiUrl = Global.clashCoreUrl.Replace(@"https://github.com", @"https://api.github.com/repos"),
-                coreDownloadUrl32 = Global.clashCoreUrl + "/download/{0}/clash-windows-386-{0}.zip",
-                coreDownloadUrl64 = Global.clashCoreUrl + "/download/{0}/clash-windows-amd64-{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,
             });
 
-            coreInfos.Add(new CoreInfo
+            coreInfo.Add(new CoreInfo
             {
                 coreType = ECoreType.clash_meta,
                 coreExes = new List<string> { "Clash.Meta-windows-amd64-compatible", "Clash.Meta-windows-amd64", "Clash.Meta-windows-386", "Clash.Meta", "clash" },
                 arguments = "-f config.json",
-                coreUrl = Global.clashMetaCoreUrl,
-                coreReleaseApiUrl = Global.clashMetaCoreUrl.Replace(@"https://github.com", @"https://api.github.com/repos"),
-                coreDownloadUrl32 = Global.clashMetaCoreUrl + "/download/{0}/Clash.Meta-windows-386-{0}.zip",
-                coreDownloadUrl64 = Global.clashMetaCoreUrl + "/download/{0}/Clash.Meta-windows-amd64-compatible-{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
+            coreInfo.Add(new CoreInfo
+            {
+                coreType = ECoreType.mihomo,
+                coreExes = new List<string> { $"mihomo-windows-amd64{(Avx2.X64.IsSupported ? "" : "-compatible")}", "mihomo-windows-amd64-compatible", "mihomo-windows-amd64", "mihomo-windows-386", "mihomo", "clash" },
+                arguments = "-f config.json",
+                coreUrl = Global.MihomoCoreUrl,
+                coreReleaseApiUrl = Global.MihomoCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
+                match = "Mihomo",
+                redirectInfo = true,
+            });
+
+            coreInfo.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(@"https://github.com", @"https://api.github.com/repos"),
-                coreDownloadUrl32 = Global.hysteriaCoreUrl + "/download/{0}/hysteria-windows-386.exe",
-                coreDownloadUrl64 = Global.hysteriaCoreUrl + "/download/{0}/hysteria-windows-amd64.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,
             });
 
-            coreInfos.Add(new CoreInfo
+            coreInfo.Add(new CoreInfo
             {
                 coreType = ECoreType.naiveproxy,
                 coreExes = new List<string> { "naiveproxy", "naive" },
                 arguments = "config.json",
-                coreUrl = Global.naiveproxyCoreUrl,
+                coreUrl = Global.NaiveproxyCoreUrl,
                 redirectInfo = false,
             });
 
-            coreInfos.Add(new CoreInfo
+            coreInfo.Add(new CoreInfo
             {
                 coreType = ECoreType.tuic,
                 coreExes = new List<string> { "tuic-client", "tuic" },
                 arguments = "-c config.json",
-                coreUrl = Global.tuicCoreUrl,
+                coreUrl = Global.TuicCoreUrl,
                 redirectInfo = true,
             });
 
-            coreInfos.Add(new CoreInfo
+            coreInfo.Add(new CoreInfo
             {
                 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",
+                match = "sing-box",
+                versionArg = "version",
+            });
+
+            coreInfo.Add(new CoreInfo
+            {
+                coreType = ECoreType.juicity,
+                coreExes = new List<string> { "juicity-client", "juicity" },
+                arguments = "run -c config.json",
+                coreUrl = Global.JuicityCoreUrl
+            });
+
+            coreInfo.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
+        #endregion Core Type
     }
 }

v2rayN/v2rayN/Handler/MainFormHandler.cs

@@ -1,26 +1,16 @@
-using NHotkey;
-using NHotkey.Wpf;
+using Microsoft.Win32;
+using Splat;
 using System.Drawing;
 using System.IO;
-using System.Windows.Forms;
-using System.Windows.Input;
 using System.Windows.Media.Imaging;
-using v2rayN.Mode;
+using v2rayN.Models;
 using v2rayN.Resx;
 
 namespace v2rayN.Handler
 {
     public sealed class MainFormHandler
     {
-        private static readonly Lazy<MainFormHandler> instance = new Lazy<MainFormHandler>(() => new MainFormHandler());
-        //Action<bool, string> _updateUI;
-
-        //private DownloadHandle downloadHandle2;
-        //private Config _config;
-        //private V2rayHandler _v2rayHandler;
-        //private List<int> _selecteds;
-        //private Thread _workThread;
-        //Action<int, string> _updateFunc;
+        private static readonly Lazy<MainFormHandler> instance = new(() => new());
         public static MainFormHandler Instance => instance.Value;
 
         public Icon GetNotifyIcon(Config config)
@@ -42,23 +32,18 @@ namespace v2rayN.Handler
                 {
                     return new Icon(fileName);
                 }
-                switch (index)
+                return index switch
                 {
-                    case 0:
-                        return Properties.Resources.NotifyIcon1;
-                    case 1:
-                        return Properties.Resources.NotifyIcon2;
-                    case 2:
-                        return Properties.Resources.NotifyIcon3;
-                    case 3:
-                        return Properties.Resources.NotifyIcon2;
-                }
-
-                return Properties.Resources.NotifyIcon1;
+                    0 => Properties.Resources.NotifyIcon1,
+                    1 => Properties.Resources.NotifyIcon2,
+                    2 => Properties.Resources.NotifyIcon3,
+                    3 => Properties.Resources.NotifyIcon2,
+                    _ => Properties.Resources.NotifyIcon1, // default
+                };
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 return Properties.Resources.NotifyIcon1;
             }
         }
@@ -66,32 +51,34 @@ namespace v2rayN.Handler
         public System.Windows.Media.ImageSource GetAppIcon(Config config)
         {
             int index = 1;
-            switch ((int)config.sysProxyType)
+            switch (config.sysProxyType)
             {
-                case 0:
+                case ESysProxyType.ForcedClear:
                     index = 1;
                     break;
-                case 1:
-                case 3:
+
+                case ESysProxyType.ForcedChange:
+                case ESysProxyType.Pac:
                     index = 2;
                     break;
-                case 2:
+
+                case ESysProxyType.Unchanged:
                     index = 3;
                     break;
             }
             return BitmapFrame.Create(new Uri($"pack://application:,,,/Resources/NotifyIcon{index}.ico", UriKind.RelativeOrAbsolute));
         }
 
-        private Icon GetNotifyIcon4Routing(Config config)
+        private Icon? GetNotifyIcon4Routing(Config config)
         {
             try
             {
-                if (!config.enableRoutingAdvanced)
+                if (!config.routingBasicItem.enableRoutingAdvanced)
                 {
                     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;
@@ -107,9 +94,9 @@ namespace v2rayN.Handler
                 int width = 128;
                 int height = 128;
 
-                Bitmap bitmap = new Bitmap(width, height);
+                Bitmap bitmap = new(width, height);
                 Graphics graphics = Graphics.FromImage(bitmap);
-                SolidBrush drawBrush = new SolidBrush(color);
+                SolidBrush drawBrush = new(color);
 
                 graphics.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
                 //graphics.FillRectangle(drawBrush, new Rectangle(0, 0, width, height));
@@ -126,7 +113,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 return null;
             }
         }
@@ -139,17 +126,17 @@ namespace v2rayN.Handler
             }
             if (item.configType == EConfigType.Custom)
             {
-                UI.Show(ResUI.NonVmessService);
+                Locator.Current.GetService<NoticeHandler>()?.Enqueue(ResUI.NonVmessService);
                 return;
             }
 
-            SaveFileDialog fileDialog = new SaveFileDialog
+            SaveFileDialog fileDialog = new()
             {
                 Filter = "Config|*.json",
                 FilterIndex = 2,
                 RestoreDirectory = true
             };
-            if (fileDialog.ShowDialog() != DialogResult.OK)
+            if (fileDialog.ShowDialog() != true)
             {
                 return;
             }
@@ -158,240 +145,86 @@ 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);
+                Locator.Current.GetService<NoticeHandler>()?.Enqueue(msg);
             }
             else
             {
-                UI.ShowWarning(string.Format(ResUI.SaveClientConfigurationIn, fileName));
+                msg = string.Format(ResUI.SaveClientConfigurationIn, fileName);
+                Locator.Current.GetService<NoticeHandler>()?.SendMessageAndEnqueue(msg);
             }
         }
 
-        public void Export2ServerConfig(ProfileItem item, Config config)
-        {
-            if (item == null)
-            {
-                return;
-            }
-            if (item.configType != EConfigType.VMess
-                && item.configType != EConfigType.VLESS)
-            {
-                UI.Show(ResUI.NonVmessService);
-                return;
-            }
-
-            SaveFileDialog fileDialog = new SaveFileDialog
-            {
-                Filter = "Config|*.json",
-                FilterIndex = 2,
-                RestoreDirectory = true
-            };
-            if (fileDialog.ShowDialog() != DialogResult.OK)
-            {
-                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.ToString("yyyy_MM_dd_HH_mm_ss_fff")}.json";
-            if (auto)
-            {
-                fileName = Utils.GetBackupPath(fileName);
-            }
-            else
-            {
-                SaveFileDialog fileDialog = new SaveFileDialog
-                {
-                    FileName = fileName,
-                    Filter = "guiNConfig|*.json",
-                    FilterIndex = 2,
-                    RestoreDirectory = true
-                };
-                if (fileDialog.ShowDialog() != DialogResult.OK)
-                {
-                    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;
-            using (OpenFileDialog fileDialog = new OpenFileDialog())
-            {
-                fileDialog.InitialDirectory = Utils.GetBackupPath("");
-                fileDialog.Filter = "guiNConfig|*.json|All|*.*";
-                fileDialog.FilterIndex = 2;
-                fileDialog.RestoreDirectory = true;
-
-                if (fileDialog.ShowDialog() == DialogResult.OK)
-                {
-                    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(ref config);
-
-            return true;
-        }
-
         public void UpdateTask(Config config, Action<bool, string> update)
         {
-            Task.Run(() => UpdateTaskRun(config, update));
+            Task.Run(() => UpdateTaskRunSubscription(config, update));
+            Task.Run(() => UpdateTaskRunGeo(config, update));
         }
 
-        private void UpdateTaskRun(Config config, Action<bool, string> update)
+        private async Task UpdateTaskRunSubscription(Config config, Action<bool, string> update)
+        {
+            await Task.Delay(60000);
+            Logging.SaveLog("UpdateTaskRunSubscription");
+
+            var updateHandle = new UpdateHandle();
+            while (true)
+            {
+                var updateTime = ((DateTimeOffset)DateTime.Now).ToUnixTimeSeconds();
+                var lstSubs = LazyConfig.Instance.SubItems()
+                            .Where(t => t.autoUpdateInterval > 0)
+                            .Where(t => updateTime - t.updateTime >= t.autoUpdateInterval * 60)
+                            .ToList();
+
+                foreach (var item in lstSubs)
+                {
+                    updateHandle.UpdateSubscriptionProcess(config, item.id, true, (bool success, string msg) =>
+                    {
+                        update(success, msg);
+                        if (success)
+                            Logging.SaveLog("subscription" + msg);
+                    });
+                    item.updateTime = updateTime;
+                    ConfigHandler.AddSubItem(config, item);
+
+                    await Task.Delay(5000);
+                }
+                await Task.Delay(60000);
+            }
+        }
+
+        private async Task UpdateTaskRunGeo(Config config, Action<bool, string> update)
         {
-            var autoUpdateSubTime = DateTime.Now;
             var autoUpdateGeoTime = DateTime.Now;
 
-            Thread.Sleep(60000);
-            Utils.SaveLog("UpdateTaskRun");
+            await Task.Delay(1000 * 120);
+            Logging.SaveLog("UpdateTaskRunGeo");
 
             var updateHandle = new UpdateHandle();
             while (true)
             {
                 var dtNow = DateTime.Now;
-
-                if (config.autoUpdateSubInterval > 0)
+                if (config.guiItem.autoUpdateInterval > 0)
                 {
-                    if ((dtNow - autoUpdateSubTime).Hours % config.autoUpdateSubInterval == 0)
+                    if ((dtNow - autoUpdateGeoTime).Hours % config.guiItem.autoUpdateInterval == 0)
                     {
-                        updateHandle.UpdateSubscriptionProcess(config, "", true, (bool success, string msg) =>
-                        {
-                            update(success, msg);
-                            if (success)
-                                Utils.SaveLog("subscription" + msg);
-                        });
-                        autoUpdateSubTime = dtNow;
-                    }
-                    Thread.Sleep(60000);
-                }
-
-                if (config.autoUpdateInterval > 0)
-                {
-                    if ((dtNow - autoUpdateGeoTime).Hours % config.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);
             }
         }
 
-        public void RegisterGlobalHotkey(Config config, EventHandler<HotkeyEventArgs> handler, Action<bool, string> update)
+        public void RegisterGlobalHotkey(Config config, Action<EGlobalHotkey> handler, Action<bool, string> update)
         {
-            if (config.globalHotkeys == null)
-            {
-                return;
+            HotkeyHandler.Instance.UpdateViewEvent += update;
+            HotkeyHandler.Instance.HotkeyTriggerEvent += handler;
+            HotkeyHandler.Instance.Load();
         }
-
-            foreach (var item in config.globalHotkeys)
-            {
-                if (item.KeyCode == null)
-                {
-                    continue;
-                }
-
-                var modifiers = ModifierKeys.None;
-                if (item.Control)
-                {
-                    modifiers |= ModifierKeys.Control;
-                }
-                if (item.Alt)
-                {
-                    modifiers |= ModifierKeys.Alt;
-                }
-                if (item.Shift)
-                {
-                    modifiers |= ModifierKeys.Shift;
-                }
-
-                var gesture = new KeyGesture(KeyInterop.KeyFromVirtualKey((int)item.KeyCode), modifiers);
-                try
-                {
-                    HotkeyManager.Current.AddOrReplace(((int)item.eGlobalHotkey).ToString(), gesture, handler);
-                    var msg = string.Format(ResUI.RegisterGlobalHotkeySuccessfully, $"{item.eGlobalHotkey.ToString()}");
-                    update(false, msg);
-                }
-                catch (Exception ex)
-                {
-                    var msg = string.Format(ResUI.RegisterGlobalHotkeyFailed, $"{item.eGlobalHotkey.ToString()}", ex.Message);
-                    update(false, msg);
-                    Utils.SaveLog(msg);
-                }
-            }
-        }
-
     }
 }

v2rayN/v2rayN/Handler/NoticeHandler.cs

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

v2rayN/v2rayN/Handler/ProfileExHandler.cs

@@ -0,0 +1,174 @@
+using System.Collections.Concurrent;
+using System.Reactive.Linq;
+using v2rayN.Models;
+
+namespace v2rayN.Handler
+{
+    internal class ProfileExHandler
+    {
+        private static readonly Lazy<ProfileExHandler> _instance = new(() => new());
+        private ConcurrentBag<ProfileExItem> _lstProfileEx = [];
+        private Queue<string> _queIndexIds = new();
+        public ConcurrentBag<ProfileExItem> ProfileExs => _lstProfileEx;
+        public static ProfileExHandler Instance => _instance.Value;
+
+        public ProfileExHandler()
+        {
+            Init();
+
+            Task.Run(async () =>
+            {
+                while (true)
+                {
+                    SaveQueueIndexIds();
+                    await Task.Delay(1000 * 600);
+                }
+            });
+        }
+
+        private void Init()
+        {
+            SQLiteHelper.Instance.Execute($"delete from ProfileExItem where indexId not in ( select indexId from ProfileItem )");
+
+            _lstProfileEx = new(SQLiteHelper.Instance.Table<ProfileExItem>());
+        }
+
+        private void IndexIdEnqueue(string indexId)
+        {
+            if (!Utils.IsNullOrEmpty(indexId) && !_queIndexIds.Contains(indexId))
+            {
+                _queIndexIds.Enqueue(indexId);
+            }
+        }
+
+        private void SaveQueueIndexIds()
+        {
+            var cnt = _queIndexIds.Count;
+            if (cnt > 0)
+            {
+                var lstExists = SQLiteHelper.Instance.Table<ProfileExItem>();
+                List<ProfileExItem> lstInserts = [];
+                List<ProfileExItem> lstUpdates = [];
+
+                for (int i = 0; i < cnt; i++)
+                {
+                    var id = _queIndexIds.Dequeue();
+                    var item = lstExists.FirstOrDefault(t => t.indexId == id);
+                    var itemNew = _lstProfileEx?.FirstOrDefault(t => t.indexId == id);
+                    if (itemNew is null)
+                    {
+                        continue;
+                    }
+
+                    if (item is not null)
+                    {
+                        lstUpdates.Add(itemNew);
+                    }
+                    else
+                    {
+                        lstInserts.Add(itemNew);
+                    }
+                }
+                try
+                {
+                    if (lstInserts.Count() > 0)
+                        SQLiteHelper.Instance.InsertAll(lstInserts);
+
+                    if (lstUpdates.Count() > 0)
+                        SQLiteHelper.Instance.UpdateAll(lstUpdates);
+                }
+                catch (Exception ex)
+                {
+                    Logging.SaveLog("ProfileExHandler", ex);
+                }
+            }
+        }
+
+        private void AddProfileEx(string indexId, ref ProfileExItem? profileEx)
+        {
+            profileEx = new()
+            {
+                indexId = indexId,
+                delay = 0,
+                speed = 0,
+                sort = 0
+            };
+            _lstProfileEx.Add(profileEx);
+            IndexIdEnqueue(indexId);
+        }
+
+        public void ClearAll()
+        {
+            SQLiteHelper.Instance.Execute($"delete from ProfileExItem ");
+            _lstProfileEx = new();
+        }
+
+        public void SaveTo()
+        {
+            try
+            {
+                SaveQueueIndexIds();
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+            }
+        }
+
+        public void SetTestDelay(string indexId, string delayVal)
+        {
+            var profileEx = _lstProfileEx.FirstOrDefault(t => t.indexId == indexId);
+            if (profileEx == null)
+            {
+                AddProfileEx(indexId, ref profileEx);
+            }
+
+            int.TryParse(delayVal, out int delay);
+            profileEx.delay = delay;
+            IndexIdEnqueue(indexId);
+        }
+
+        public void SetTestSpeed(string indexId, string speedVal)
+        {
+            var profileEx = _lstProfileEx.FirstOrDefault(t => t.indexId == indexId);
+            if (profileEx == null)
+            {
+                AddProfileEx(indexId, ref profileEx);
+            }
+
+            decimal.TryParse(speedVal, out decimal speed);
+            profileEx.speed = speed;
+            IndexIdEnqueue(indexId);
+        }
+
+        public void SetSort(string indexId, int sort)
+        {
+            var profileEx = _lstProfileEx.FirstOrDefault(t => t.indexId == indexId);
+            if (profileEx == null)
+            {
+                AddProfileEx(indexId, ref profileEx);
+            }
+            profileEx.sort = sort;
+            IndexIdEnqueue(indexId);
+        }
+
+        public int GetSort(string indexId)
+        {
+            var profileEx = _lstProfileEx.FirstOrDefault(t => t.indexId == indexId);
+            if (profileEx == null)
+            {
+                return 0;
+            }
+            return profileEx.sort;
+        }
+
+        public int GetMaxSort()
+        {
+            if (_lstProfileEx.Count <= 0)
+            {
+                return 0;
+            }
+            return _lstProfileEx.Max(t => t == null ? 0 : t.sort);
+        }
+    }
+}

v2rayN/v2rayN/Handler/ProxySetting.cs

@@ -1,43 +1,73 @@
-using Microsoft.Win32;
-using System.Runtime.InteropServices;
+using System.Runtime.InteropServices;
+using static v2rayN.Handler.ProxySetting.InternetConnectionOption;
 
 namespace v2rayN.Handler
 {
-    class ProxySetting
+    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);
         }
 
-        public static bool SetProxy(string strProxy, string exceptions, int type)
+        /// <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 connection is successfully updated proxy settings</returns>
+        public static bool SetProxy(string? strProxy, string? exceptions, int type)
         {
-            InternetPerConnOptionList list = new InternetPerConnOptionList();
+            // 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 == 2 || type == 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;
             }
 
-            //int optionCount = Utils.IsNullOrEmpty(strProxy) ? 1 : (Utils.IsNullOrEmpty(exceptions) ? 2 : 3);
+            //int optionCount = Utile.IsNullOrEmpty(strProxy) ? 1 : (Utile.IsNullOrEmpty(exceptions) ? 2 : 3);
             InternetConnectionOption[] options = new InternetConnectionOption[optionCount];
             // USE a proxy server ...
             options[0].m_Option = PerConnOption.INTERNET_PER_CONN_FLAGS;
@@ -47,36 +77,42 @@ 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);
+            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)
             {
                 if (Environment.Is64BitOperatingSystem)
                 {
-                    IntPtr opt = new IntPtr(optionsPtr.ToInt64() + (i * optSize));
+                    IntPtr opt = new(optionsPtr.ToInt64() + (i * optSize));
                     Marshal.StructureToPtr(options[i], opt, false);
                 }
                 else
                 {
-                    IntPtr opt = new IntPtr(optionsPtr.ToInt32() + (i * optSize));
+                    IntPtr opt = new(optionsPtr.ToInt32() + (i * optSize));
                     Marshal.StructureToPtr(options[i], opt, false);
                 }
             }
@@ -84,30 +120,86 @@ namespace v2rayN.Handler
             list.options = optionsPtr;
 
             // and then make a pointer out of the whole list
-            IntPtr ipcoListPtr = Marshal.AllocCoTaskMem((int)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();
             }
+            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);
+            }
+
             // 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());
+            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 (returnvalue < 0);
+            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
+
         [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
         public struct InternetPerConnOptionList
         {
@@ -115,6 +207,7 @@ namespace v2rayN.Handler
             public IntPtr szConnection;         // connection name to set/query options
             public int dwOptionCount;        // number of options to set/query
             public int dwOptionError;           // on error, which option failed
+
             //[MarshalAs(UnmanagedType.)]
             public IntPtr options;
         };
@@ -122,9 +215,10 @@ namespace v2rayN.Handler
         [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
         public struct InternetConnectionOption
         {
-            static readonly int Size;
+            private static readonly int Size;
             public PerConnOption m_Option;
             public InternetConnectionOptionValue m_Value;
+
             static InternetConnectionOption()
             {
                 Size = Marshal.SizeOf(typeof(InternetConnectionOption));
@@ -137,21 +231,46 @@ namespace v2rayN.Handler
                 // Fields
                 [FieldOffset(0)]
                 public System.Runtime.InteropServices.ComTypes.FILETIME m_FileTime;
+
                 [FieldOffset(0)]
                 public int m_Int;
+
                 [FieldOffset(0)]
                 public IntPtr m_StringPtr;
             }
+
+            [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;
             }
-        #endregion
+
+            // Constants
+            public const int RAS_MaxEntryName = 256;
+
+            public const int MAX_PATH = 260; // Standard MAX_PATH value in Windows
+        }
+
+        #endregion WinInet structures
 
         #region WinInet enums
+
         //
         // options manifests for Internet{Query|Set}Option
         //
         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
         }
 
         //
@@ -163,7 +282,6 @@ namespace v2rayN.Handler
             INTERNET_PER_CONN_PROXY_SERVER = 2, // Sets or retrieves a string containing the proxy servers.
             INTERNET_PER_CONN_PROXY_BYPASS = 3, // Sets or retrieves a string containing the URLs that do not use the proxy server.
             INTERNET_PER_CONN_AUTOCONFIG_URL = 4//, // Sets or retrieves a string containing the URL to the automatic configuration script.
-
         }
 
         //
@@ -177,38 +295,29 @@ namespace v2rayN.Handler
             PROXY_TYPE_AUTO_PROXY_URL = 0x00000004,  // autoproxy URL
             PROXY_TYPE_AUTO_DETECT = 0x00000008   // use autoproxy detection
         }
-        #endregion
+
+        public enum ErrorCode : uint
+        {
+            ERROR_BUFFER_TOO_SMALL = 603,
+            ERROR_INVALID_SIZE = 632
+        }
+
+        #endregion WinInet enums
 
         internal static class NativeMethods
         {
             [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()
-        {
-            RegistryKey rk = Registry.CurrentUser.OpenSubKey(@"Software\Microsoft\Windows\CurrentVersion\Internet Settings", true);
-            if (rk.GetValue("ProxyEnable").ToString() == "1")
-            {
-                rk.Close();
-                return true;
-            }
-            else
-            {
-                rk.Close();
-                return false;
-            }
-        }
-        //获得代理的IP和端口
-        public static string GetProxyProxyServer()
-        {
-            RegistryKey rk = Registry.CurrentUser.OpenSubKey(@"Software\Microsoft\Windows\CurrentVersion\Internet Settings", true);
-            string ProxyServer = rk.GetValue("ProxyServer").ToString();
-            rk.Close();
-            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,15 +1,12 @@
 using System.Collections.Specialized;
 using System.Text.RegularExpressions;
-using System.Web;
-using v2rayN.Base;
-using v2rayN.Mode;
+using v2rayN.Models;
 using v2rayN.Resx;
 
 namespace v2rayN.Handler
 {
-    class ShareHandler
+    internal class ShareHandler
     {
-
         #region GetShareUrl
 
         /// <summary>
@@ -17,37 +14,30 @@ namespace v2rayN.Handler
         /// </summary>
         /// <param name="item"></param>
         /// <returns></returns>
-        public static string GetShareUrl(ProfileItem item)
+        public static string? GetShareUrl(ProfileItem item)
         {
             try
             {
-                string url = string.Empty;
+                string? url = string.Empty;
 
-                switch (item.configType)
+                url = item.configType switch
                 {
-                    case EConfigType.VMess:
-                        url = ShareVmess(item);
-                        break;
-                    case EConfigType.Shadowsocks:
-                        url = ShareShadowsocks(item);
-                        break;
-                    case EConfigType.Socks:
-                        url = ShareSocks(item);
-                        break;
-                    case EConfigType.Trojan:
-                        url = ShareTrojan(item);
-                        break;
-                    case EConfigType.VLESS:
-                        url = ShareVLESS(item);
-                        break;
-                    default:
-                        break;
-                }
+                    EConfigType.VMess => ShareVmess(item),
+                    EConfigType.Shadowsocks => ShareShadowsocks(item),
+                    EConfigType.Socks => ShareSocks(item),
+                    EConfigType.Trojan => ShareTrojan(item),
+                    EConfigType.VLESS => ShareVLESS(item),
+                    EConfigType.Hysteria2 => ShareHysteria2(item),
+                    EConfigType.Tuic => ShareTuic(item),
+                    EConfigType.Wireguard => ShareWireguard(item),
+                    _ => null,
+                };
+
                 return url;
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 return "";
             }
         }
@@ -56,14 +46,14 @@ namespace v2rayN.Handler
         {
             string url = string.Empty;
 
-            VmessQRCode vmessQRCode = new VmessQRCode
+            VmessQRCode vmessQRCode = new()
             {
-                v = item.configVersion.ToString(),
-                ps = item.remarks.TrimEx(), //备注也许很长 ;
+                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,
@@ -71,12 +61,13 @@ namespace v2rayN.Handler
                 path = item.path,
                 tls = item.streamSecurity,
                 sni = item.sni,
-                alpn = item.alpn
+                alpn = item.alpn,
+                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;
         }
@@ -95,11 +86,11 @@ namespace v2rayN.Handler
             //    item.id,
             //    item.address,
             //    item.port);
-            //url = Utils.Base64Encode(url);
+            //url = Utile.Base64Encode(url);
             //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;
         }
 
@@ -116,11 +107,11 @@ namespace v2rayN.Handler
             //    item.id,
             //    item.address,
             //    item.port);
-            //url = Utils.Base64Encode(url);
+            //url = Utile.Base64Encode(url);
             //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;
         }
 
@@ -140,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;
         }
 
@@ -159,24 +150,129 @@ namespace v2rayN.Handler
             }
             else
             {
-                dicQuery.Add("encryption", "none");
+                dicQuery.Add("encryption", Global.None);
             }
-            GetStdTransport(item, "none", ref dicQuery);
+            GetStdTransport(item, Global.None, ref dicQuery);
             string query = "?" + string.Join("&", dicQuery.Select(x => x.Key + "=" + x.Value).ToArray());
 
             url = string.Format("{0}@{1}:{2}",
             item.id,
             GetIpv6(item.address),
             item.port);
-            url = $"{Global.vlessProtocol}{url}{query}{remark}";
+            url = $"{Global.ProtocolShares[EConfigType.VLESS]}{url}{query}{remark}";
             return url;
         }
-        private static string GetIpv6(string address)
+
+        private static string ShareHysteria2(ProfileItem item)
         {
-            return Utils.IsIpv6(address) ? $"[{address}]" : address;
+            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 int GetStdTransport(ProfileItem item, string securityDef, ref Dictionary<string, string> dicQuery)
+        private static string ShareTuic(ProfileItem item)
+        {
+            string url = string.Empty;
+            string remark = string.Empty;
+            if (!Utils.IsNullOrEmpty(item.remarks))
+            {
+                remark = "#" + Utils.UrlEncode(item.remarks);
+            }
+            var dicQuery = new Dictionary<string, string>();
+            if (!Utils.IsNullOrEmpty(item.sni))
+            {
+                dicQuery.Add("sni", item.sni);
+            }
+            if (!Utils.IsNullOrEmpty(item.alpn))
+            {
+                dicQuery.Add("alpn", Utils.UrlEncode(item.alpn));
+            }
+            dicQuery.Add("congestion_control", item.headerType);
+
+            string query = "?" + string.Join("&", dicQuery.Select(x => x.Key + "=" + x.Value).ToArray());
+
+            url = string.Format("{0}@{1}:{2}",
+            $"{item.id}:{item.security}",
+            GetIpv6(item.address),
+            item.port);
+            url = $"{Global.ProtocolShares[EConfigType.Tuic]}{url}{query}{remark}";
+            return url;
+        }
+
+        private static string ShareWireguard(ProfileItem item)
+        {
+            string url = string.Empty;
+            string remark = string.Empty;
+            if (!Utils.IsNullOrEmpty(item.remarks))
+            {
+                remark = "#" + Utils.UrlEncode(item.remarks);
+            }
+
+            var dicQuery = new Dictionary<string, string>();
+            if (!Utils.IsNullOrEmpty(item.publicKey))
+            {
+                dicQuery.Add("publickey", Utils.UrlEncode(item.publicKey));
+            }
+            if (!Utils.IsNullOrEmpty(item.path))
+            {
+                dicQuery.Add("reserved", Utils.UrlEncode(item.path));
+            }
+            if (!Utils.IsNullOrEmpty(item.requestHost))
+            {
+                dicQuery.Add("address", Utils.UrlEncode(item.requestHost));
+            }
+            if (!Utils.IsNullOrEmpty(item.shortId))
+            {
+                dicQuery.Add("mtu", Utils.UrlEncode(item.shortId));
+            }
+            string query = "?" + string.Join("&", dicQuery.Select(x => x.Key + "=" + x.Value).ToArray());
+
+            url = string.Format("{0}@{1}:{2}",
+            Utils.UrlEncode(item.id),
+            GetIpv6(item.address),
+            item.port);
+            url = $"{Global.ProtocolShares[EConfigType.Wireguard]}{url}/{query}{remark}";
+            return url;
+        }
+
+        private static string GetIpv6(string address)
+        {
+            if (Utils.IsIpv6(address))
+            {
+                // 检查地址是否已经被方括号包围，如果没有，则添加方括号
+                return address.StartsWith('[') && address.EndsWith(']') ? address : $"[{address}]";
+            }
+            return address;  // 如果不是IPv6地址，直接返回原地址
+        }
+
+        private static int GetStdTransport(ProfileItem item, string? securityDef, ref Dictionary<string, string> dicQuery)
         {
             if (!Utils.IsNullOrEmpty(item.flow))
             {
@@ -202,27 +298,45 @@ namespace v2rayN.Handler
             {
                 dicQuery.Add("alpn", Utils.UrlEncode(item.alpn));
             }
+            if (!Utils.IsNullOrEmpty(item.fingerprint))
+            {
+                dicQuery.Add("fp", Utils.UrlEncode(item.fingerprint));
+            }
+            if (!Utils.IsNullOrEmpty(item.publicKey))
+            {
+                dicQuery.Add("pbk", Utils.UrlEncode(item.publicKey));
+            }
+            if (!Utils.IsNullOrEmpty(item.shortId))
+            {
+                dicQuery.Add("sid", Utils.UrlEncode(item.shortId));
+            }
+            if (!Utils.IsNullOrEmpty(item.spiderX))
+            {
+                dicQuery.Add("spx", Utils.UrlEncode(item.spiderX));
+            }
 
-            dicQuery.Add("type", !Utils.IsNullOrEmpty(item.network) ? item.network : "tcp");
+            dicQuery.Add("type", !Utils.IsNullOrEmpty(item.network) ? item.network : nameof(ETransport.tcp));
 
             switch (item.network)
             {
-                case "tcp":
-                    dicQuery.Add("headerType", !Utils.IsNullOrEmpty(item.headerType) ? item.headerType : "none");
+                case nameof(ETransport.tcp):
+                    dicQuery.Add("headerType", !Utils.IsNullOrEmpty(item.headerType) ? item.headerType : Global.None);
                     if (!Utils.IsNullOrEmpty(item.requestHost))
                     {
                         dicQuery.Add("host", Utils.UrlEncode(item.requestHost));
                     }
                     break;
-                case "kcp":
-                    dicQuery.Add("headerType", !Utils.IsNullOrEmpty(item.headerType) ? item.headerType : "none");
+
+                case nameof(ETransport.kcp):
+                    dicQuery.Add("headerType", !Utils.IsNullOrEmpty(item.headerType) ? item.headerType : Global.None);
                     if (!Utils.IsNullOrEmpty(item.path))
                     {
                         dicQuery.Add("seed", Utils.UrlEncode(item.path));
                     }
                     break;
 
-                case "ws":
+                case nameof(ETransport.ws):
+                case nameof(ETransport.httpupgrade):
                     if (!Utils.IsNullOrEmpty(item.requestHost))
                     {
                         dicQuery.Add("host", Utils.UrlEncode(item.requestHost));
@@ -233,9 +347,9 @@ namespace v2rayN.Handler
                     }
                     break;
 
-                case "http":
-                case "h2":
-                    dicQuery["type"] = "http";
+                case nameof(ETransport.http):
+                case nameof(ETransport.h2):
+                    dicQuery["type"] = nameof(ETransport.http);
                     if (!Utils.IsNullOrEmpty(item.requestHost))
                     {
                         dicQuery.Add("host", Utils.UrlEncode(item.requestHost));
@@ -246,16 +360,18 @@ namespace v2rayN.Handler
                     }
                     break;
 
-                case "quic":
-                    dicQuery.Add("headerType", !Utils.IsNullOrEmpty(item.headerType) ? item.headerType : "none");
+                case nameof(ETransport.quic):
+                    dicQuery.Add("headerType", !Utils.IsNullOrEmpty(item.headerType) ? item.headerType : Global.None);
                     dicQuery.Add("quicSecurity", Utils.UrlEncode(item.requestHost));
                     dicQuery.Add("key", Utils.UrlEncode(item.path));
                     break;
-                case "grpc":
+
+                case nameof(ETransport.grpc):
                     if (!Utils.IsNullOrEmpty(item.path))
                     {
+                        dicQuery.Add("authority", Utils.UrlEncode(item.requestHost));
                         dicQuery.Add("serviceName", Utils.UrlEncode(item.path));
-                        if (item.headerType == Global.GrpcgunMode || item.headerType == Global.GrpcmultiMode)
+                        if (item.headerType is Global.GrpcGunMode or Global.GrpcMultiMode)
                         {
                             dicQuery.Add("mode", Utils.UrlEncode(item.headerType));
                         }
@@ -265,33 +381,30 @@ namespace v2rayN.Handler
             return 0;
         }
 
-        #endregion
+        #endregion GetShareUrl
 
         #region ImportShareUrl
 
-
         /// <summary>
         /// 从剪贴板导入URL
         /// </summary>
-        /// <param name="fileName"></param>
         /// <param name="msg"></param>
         /// <returns></returns>
-        public static ProfileItem ImportFromClipboardConfig(string clipboardData, out string msg)
+        public static ProfileItem? ImportFromClipboardConfig(string clipboardData, out string msg)
         {
-            msg = string.Empty;
-            ProfileItem profileItem = new ProfileItem();
+            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)
@@ -302,12 +415,9 @@ 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)
                     {
@@ -320,10 +430,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)
                     {
@@ -336,16 +444,25 @@ 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
                 {
@@ -355,7 +472,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 msg = ResUI.Incorrectconfiguration;
                 return null;
             }
@@ -363,7 +480,7 @@ namespace v2rayN.Handler
             return profileItem;
         }
 
-        private static ProfileItem ResolveVmess(string result, out string msg)
+        private static ProfileItem? ResolveVmess(string result, out string msg)
         {
             msg = string.Empty;
             var profileItem = new ProfileItem
@@ -371,11 +488,11 @@ namespace v2rayN.Handler
                 configType = EConfigType.VMess
             };
 
-            result = result.Substring(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;
@@ -408,21 +525,22 @@ namespace v2rayN.Handler
             profileItem.streamSecurity = Utils.ToString(vmessQRCode.tls);
             profileItem.sni = Utils.ToString(vmessQRCode.sni);
             profileItem.alpn = Utils.ToString(vmessQRCode.alpn);
+            profileItem.fingerprint = Utils.ToString(vmessQRCode.fp);
 
             return profileItem;
         }
 
-        private static ProfileItem ResolveVmess4Kitsunebi(string result)
+        private static ProfileItem? ResolveVmess4Kitsunebi(string result)
         {
-            ProfileItem profileItem = new ProfileItem
+            ProfileItem profileItem = new()
             {
                 configType = EConfigType.VMess
             };
-            result = result.Substring(Global.vmessProtocol.Length);
+            result = result[Global.ProtocolShares[EConfigType.VMess].Length..];
             int indexSplit = result.IndexOf("?");
             if (indexSplit > 0)
             {
-                result = result.Substring(0, indexSplit);
+                result = result[..indexSplit];
             }
             result = Utils.Base64Decode(result);
 
@@ -433,7 +551,7 @@ namespace v2rayN.Handler
             }
             string[] arr21 = arr1[0].Split(':');
             string[] arr22 = arr1[1].Split(':');
-            if (arr21.Length != 2 || arr21.Length != 2)
+            if (arr21.Length != 2 || arr22.Length != 2)
             {
                 return null;
             }
@@ -450,20 +568,20 @@ namespace v2rayN.Handler
             return profileItem;
         }
 
-        private static ProfileItem ResolveStdVmess(string result)
+        private static ProfileItem? ResolveStdVmess(string result)
         {
-            ProfileItem i = new ProfileItem
+            ProfileItem i = new()
             {
                 configType = EConfigType.VMess,
                 security = "auto"
             };
 
-            Uri u = new Uri(result);
+            Uri u = new(result);
 
             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;
@@ -476,11 +594,11 @@ namespace v2rayN.Handler
             }
             switch (i.streamSecurity)
             {
-                case "tls":
-                    // TODO tls config
+                case Global.StreamSecurity:
                     break;
+
                 default:
-                    if (!string.IsNullOrWhiteSpace(i.streamSecurity))
+                    if (!Utils.IsNullOrEmpty(i.streamSecurity))
                         return null;
                     break;
             }
@@ -488,37 +606,36 @@ namespace v2rayN.Handler
             i.network = m.Groups["network"].Value;
             switch (i.network)
             {
-                case "tcp":
-                    string t1 = q["type"] ?? "none";
+                case nameof(ETransport.tcp):
+                    string t1 = query["type"] ?? Global.None;
                     i.headerType = t1;
-                    // TODO http option
-
-                    break;
-                case "kcp":
-                    i.headerType = q["type"] ?? "none";
-                    // TODO kcp seed
                     break;
 
-                case "ws":
-                    string p1 = q["path"] ?? "/";
-                    string h1 = q["host"] ?? "";
+                case nameof(ETransport.kcp):
+                    i.headerType = query["type"] ?? Global.None;
+                    break;
+
+                case nameof(ETransport.ws):
+                case nameof(ETransport.httpupgrade):
+                    string p1 = query["path"] ?? "/";
+                    string h1 = query["host"] ?? "";
                     i.requestHost = Utils.UrlDecode(h1);
                     i.path = p1;
                     break;
 
-                case "http":
-                case "h2":
-                    i.network = "h2";
-                    string p2 = q["path"] ?? "/";
-                    string h2 = q["host"] ?? "";
+                case nameof(ETransport.http):
+                case nameof(ETransport.h2):
+                    i.network = nameof(ETransport.h2);
+                    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";
+                case nameof(ETransport.quic):
+                    string s = query["security"] ?? Global.None;
+                    string k = query["key"] ?? "";
+                    string t3 = query["type"] ?? Global.None;
                     i.headerType = t3;
                     i.requestHost = Utils.UrlDecode(s);
                     i.path = k;
@@ -531,7 +648,7 @@ namespace v2rayN.Handler
             return i;
         }
 
-        private static ProfileItem ResolveSip002(string result)
+        private static ProfileItem? ResolveSip002(string result)
         {
             Uri parsedUrl;
             try
@@ -542,7 +659,7 @@ namespace v2rayN.Handler
             {
                 return null;
             }
-            ProfileItem server = new ProfileItem
+            ProfileItem server = new()
             {
                 remarks = parsedUrl.GetComponents(UriComponents.Fragment, UriFormat.Unescaped),
                 address = parsedUrl.IdnHost,
@@ -550,7 +667,7 @@ namespace v2rayN.Handler
             };
             string rawUserInfo = parsedUrl.GetComponents(UriComponents.UserInfo, UriFormat.UriEscaped);
             //2022-blake3
-            if (rawUserInfo.Contains(":"))
+            if (rawUserInfo.Contains(':'))
             {
                 string[] userInfoParts = rawUserInfo.Split(new[] { ':' }, 2);
                 if (userInfoParts.Length != 2)
@@ -573,17 +690,17 @@ 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
-                var obfsHost = queryParameters["plugin"].Split(';').FirstOrDefault(t => t.Contains("obfs-host"));
+                var obfsHost = queryParameters["plugin"]?.Split(';').FirstOrDefault(t => t.Contains("obfs-host"));
                 if (queryParameters["plugin"].Contains("obfs=http") && !Utils.IsNullOrEmpty(obfsHost))
                 {
-                    obfsHost = obfsHost.Replace("obfs-host=", "");
+                    obfsHost = obfsHost?.Replace("obfs-host=", "");
                     server.network = Global.DefaultNetwork;
                     server.headerType = Global.TcpHeaderHttp;
-                    server.requestHost = obfsHost;
+                    server.requestHost = obfsHost ?? "";
                 }
                 else
                 {
@@ -594,16 +711,16 @@ namespace v2rayN.Handler
             return server;
         }
 
-        private static readonly Regex UrlFinder = new Regex(@"ss://(?<base64>[A-Za-z0-9+-/=_]+)(?:#(?<tag>\S+))?", RegexOptions.IgnoreCase);
-        private static readonly Regex DetailsParser = new Regex(@"^((?<method>.+?):(?<password>.*)@(?<hostname>.+?):(?<port>\d+?))$", RegexOptions.IgnoreCase);
+        private static readonly Regex UrlFinder = new(@"ss://(?<base64>[A-Za-z0-9+-/=_]+)(?:#(?<tag>\S+))?", RegexOptions.IgnoreCase | RegexOptions.Compiled);
+        private static readonly Regex DetailsParser = new(@"^((?<method>.+?):(?<password>.*)@(?<hostname>.+?):(?<port>\d+?))$", RegexOptions.IgnoreCase | RegexOptions.Compiled);
 
-        private static ProfileItem ResolveSSLegacy(string result)
+        private static ProfileItem? ResolveSSLegacy(string result)
         {
             var match = UrlFinder.Match(result);
             if (!match.Success)
                 return null;
 
-            ProfileItem server = new ProfileItem();
+            ProfileItem server = new();
             var base64 = match.Groups["base64"].Value.TrimEnd('/');
             var tag = match.Groups["tag"].Value;
             if (!Utils.IsNullOrEmpty(tag))
@@ -624,21 +741,20 @@ 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;
         }
 
+        private static readonly Regex StdVmessUserInfo = new(
+            @"^(?<network>[a-z]+)(\+(?<streamSecurity>[a-z]+))?:(?<id>[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})$", RegexOptions.Compiled);
 
-        private static readonly Regex StdVmessUserInfo = new Regex(
-            @"^(?<network>[a-z]+)(\+(?<streamSecurity>[a-z]+))?:(?<id>[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})$");
-
-        private static ProfileItem ResolveSocks(string result)
+        private static ProfileItem? ResolveSocks(string result)
         {
-            ProfileItem profileItem = new ProfileItem
+            ProfileItem profileItem = new()
             {
                 configType = EConfigType.Socks
             };
-            result = result.Substring(Global.socksProtocol.Length);
+            result = result[Global.ProtocolShares[EConfigType.Socks].Length..];
             //remark
             int indexRemark = result.IndexOf("#");
             if (indexRemark > 0)
@@ -648,7 +764,7 @@ namespace v2rayN.Handler
                     profileItem.remarks = Utils.UrlDecode(result.Substring(indexRemark + 1, result.Length - indexRemark - 1));
                 }
                 catch { }
-                result = result.Substring(0, indexRemark);
+                result = result[..indexRemark];
             }
             //part decode
             int indexS = result.IndexOf("@");
@@ -672,15 +788,15 @@ namespace v2rayN.Handler
             {
                 return null;
             }
-            profileItem.address = arr1[1].Substring(0, indexPort);
-            profileItem.port = Utils.ToInt(arr1[1].Substring(indexPort + 1, arr1[1].Length - (indexPort + 1)));
+            profileItem.address = arr1[1][..indexPort];
+            profileItem.port = Utils.ToInt(arr1[1][(indexPort + 1)..]);
             profileItem.security = arr21[0];
             profileItem.id = arr21[1];
 
             return profileItem;
         }
 
-        private static ProfileItem ResolveSocksNew(string result)
+        private static ProfileItem? ResolveSocksNew(string result)
         {
             Uri parsedUrl;
             try
@@ -691,7 +807,7 @@ namespace v2rayN.Handler
             {
                 return null;
             }
-            ProfileItem server = new ProfileItem
+            ProfileItem server = new()
             {
                 remarks = parsedUrl.GetComponents(UriComponents.Fragment, UriFormat.Unescaped),
                 address = parsedUrl.IdnHost,
@@ -713,92 +829,175 @@ namespace v2rayN.Handler
 
         private static ProfileItem ResolveTrojan(string result)
         {
-            ProfileItem item = new ProfileItem
+            ProfileItem item = new()
             {
                 configType = EConfigType.Trojan
             };
 
-            Uri url = new Uri(result);
+            Uri url = new(result);
 
             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;
         }
+
         private static ProfileItem ResolveStdVLESS(string result)
         {
-            ProfileItem item = new ProfileItem
+            ProfileItem item = new()
             {
                 configType = EConfigType.VLESS,
-                security = "none"
+                security = Global.None
             };
 
-            Uri url = new Uri(result);
+            Uri url = new(result);
 
             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);
-            item.security = query["encryption"] ?? "none";
+            var query = Utils.ParseQueryString(url.Query);
+            item.security = query["encryption"] ?? Global.None;
             item.streamSecurity = query["security"] ?? "";
             ResolveStdTransport(query, ref item);
 
             return item;
         }
 
+        private static ProfileItem ResolveHysteria2(string result)
+        {
+            ProfileItem item = new()
+            {
+                configType = EConfigType.Hysteria2
+            };
+
+            Uri url = new(result);
+
+            item.address = url.IdnHost;
+            item.port = url.Port;
+            item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
+            item.id = Utils.UrlDecode(url.UserInfo);
+
+            var query = Utils.ParseQueryString(url.Query);
+            ResolveStdTransport(query, ref item);
+            item.path = Utils.UrlDecode(query["obfs-password"] ?? "");
+            item.allowInsecure = (query["insecure"] ?? "") == "1" ? "true" : "false";
+
+            return item;
+        }
+
+        private static ProfileItem ResolveTuic(string result)
+        {
+            ProfileItem item = new()
+            {
+                configType = EConfigType.Tuic
+            };
+
+            Uri url = new(result);
+
+            item.address = url.IdnHost;
+            item.port = url.Port;
+            item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
+            var userInfoParts = url.UserInfo.Split(new[] { ':' }, 2);
+            if (userInfoParts.Length == 2)
+            {
+                item.id = userInfoParts[0];
+                item.security = userInfoParts[1];
+            }
+
+            var query = Utils.ParseQueryString(url.Query);
+            ResolveStdTransport(query, ref item);
+            item.headerType = query["congestion_control"] ?? "";
+
+            return item;
+        }
+
+        private static ProfileItem ResolveWireguard(string result)
+        {
+            ProfileItem item = new()
+            {
+                configType = EConfigType.Wireguard
+            };
+
+            Uri url = new(result);
+
+            item.address = url.IdnHost;
+            item.port = url.Port;
+            item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
+            item.id = Utils.UrlDecode(url.UserInfo);
+
+            var query = Utils.ParseQueryString(url.Query);
+
+            item.publicKey = Utils.UrlDecode(query["publickey"] ?? "");
+            item.path = Utils.UrlDecode(query["reserved"] ?? "");
+            item.requestHost = Utils.UrlDecode(query["address"] ?? "");
+            item.shortId = Utils.UrlDecode(query["mtu"] ?? "");
+
+            return item;
+        }
+
         private static int ResolveStdTransport(NameValueCollection query, ref ProfileItem item)
         {
             item.flow = query["flow"] ?? "";
             item.streamSecurity = query["security"] ?? "";
             item.sni = query["sni"] ?? "";
             item.alpn = Utils.UrlDecode(query["alpn"] ?? "");
-            item.network = query["type"] ?? "tcp";
+            item.fingerprint = Utils.UrlDecode(query["fp"] ?? "");
+            item.publicKey = Utils.UrlDecode(query["pbk"] ?? "");
+            item.shortId = Utils.UrlDecode(query["sid"] ?? "");
+            item.spiderX = Utils.UrlDecode(query["spx"] ?? "");
+
+            item.network = query["type"] ?? nameof(ETransport.tcp);
             switch (item.network)
             {
-                case "tcp":
-                    item.headerType = query["headerType"] ?? "none";
+                case nameof(ETransport.tcp):
+                    item.headerType = query["headerType"] ?? Global.None;
                     item.requestHost = Utils.UrlDecode(query["host"] ?? "");
 
                     break;
-                case "kcp":
-                    item.headerType = query["headerType"] ?? "none";
+
+                case nameof(ETransport.kcp):
+                    item.headerType = query["headerType"] ?? Global.None;
                     item.path = Utils.UrlDecode(query["seed"] ?? "");
                     break;
 
-                case "ws":
+                case nameof(ETransport.ws):
+                case nameof(ETransport.httpupgrade):
                     item.requestHost = Utils.UrlDecode(query["host"] ?? "");
                     item.path = Utils.UrlDecode(query["path"] ?? "/");
                     break;
 
-                case "http":
-                case "h2":
-                    item.network = "h2";
+                case nameof(ETransport.http):
+                case nameof(ETransport.h2):
+                    item.network = nameof(ETransport.h2);
                     item.requestHost = Utils.UrlDecode(query["host"] ?? "");
                     item.path = Utils.UrlDecode(query["path"] ?? "/");
                     break;
 
-                case "quic":
-                    item.headerType = query["headerType"] ?? "none";
-                    item.requestHost = query["quicSecurity"] ?? "none";
+                case nameof(ETransport.quic):
+                    item.headerType = query["headerType"] ?? Global.None;
+                    item.requestHost = query["quicSecurity"] ?? Global.None;
                     item.path = Utils.UrlDecode(query["key"] ?? "");
                     break;
-                case "grpc":
+
+                case nameof(ETransport.grpc):
+                    item.requestHost = Utils.UrlDecode(query["authority"] ?? "");
                     item.path = Utils.UrlDecode(query["serviceName"] ?? "");
-                    item.headerType = Utils.UrlDecode(query["mode"] ?? Global.GrpcgunMode);
+                    item.headerType = Utils.UrlDecode(query["mode"] ?? Global.GrpcGunMode);
                     break;
+
                 default:
                     break;
             }
             return 0;
         }
 
-        #endregion
+        #endregion ImportShareUrl
     }
 }

v2rayN/v2rayN/Handler/SpeedtestHandler.cs

@@ -1,18 +1,19 @@
-using System.Diagnostics;
+using ReactiveUI;
+using System.Diagnostics;
 using System.Net;
-using System.Net.NetworkInformation;
 using System.Net.Sockets;
-using v2rayN.Mode;
+using v2rayN.Models;
 using v2rayN.Resx;
 
 namespace v2rayN.Handler
 {
-    class SpeedtestHandler
+    internal class SpeedtestHandler
     {
-        private Config _config;
+        private Config? _config;
         private CoreHandler _coreHandler;
         private List<ServerTestItem> _selecteds;
-        Action<string, string, string> _updateFunc;
+        private ESpeedActionType _actionType;
+        private Action<string, string, string> _updateFunc;
 
         public SpeedtestHandler(Config config)
         {
@@ -23,12 +24,20 @@ namespace v2rayN.Handler
         {
             _config = config;
             _coreHandler = coreHandler;
-            //_selecteds = Utils.DeepCopy(selecteds);
+            _actionType = actionType;
             _updateFunc = update;
 
             _selecteds = new List<ServerTestItem>();
             foreach (var it in selecteds)
             {
+                if (it.configType == EConfigType.Custom)
+                {
+                    continue;
+                }
+                if (it.port <= 0)
+                {
+                    continue;
+                }
                 _selecteds.Add(new ServerTestItem()
                 {
                     indexId = it.indexId,
@@ -37,98 +46,57 @@ namespace v2rayN.Handler
                     configType = it.configType
                 });
             }
+            //clear test result
+            foreach (var it in _selecteds)
+            {
                 switch (actionType)
                 {
-                case ESpeedActionType.Ping:
-                    Task.Run(RunPing);
+                    case ESpeedActionType.Tcping:
+                    case ESpeedActionType.Realping:
+                        UpdateFunc(it.indexId, ResUI.Speedtesting, "");
+                        ProfileExHandler.Instance.SetTestDelay(it.indexId, "0");
                         break;
+
+                    case ESpeedActionType.Speedtest:
+                        UpdateFunc(it.indexId, "", ResUI.SpeedtestingWait);
+                        ProfileExHandler.Instance.SetTestSpeed(it.indexId, "0");
+                        break;
+
+                    case ESpeedActionType.Mixedtest:
+                        UpdateFunc(it.indexId, ResUI.Speedtesting, ResUI.SpeedtestingWait);
+                        ProfileExHandler.Instance.SetTestDelay(it.indexId, "0");
+                        ProfileExHandler.Instance.SetTestSpeed(it.indexId, "0");
+                        break;
+                }
+            }
+
+            switch (actionType)
+            {
                 case ESpeedActionType.Tcping:
                     Task.Run(RunTcping);
                     break;
+
                 case ESpeedActionType.Realping:
                     Task.Run(RunRealPing);
                     break;
+
                 case ESpeedActionType.Speedtest:
                     Task.Run(RunSpeedTestAsync);
                     break;
+
                 case ESpeedActionType.Mixedtest:
                     Task.Run(RunMixedtestAsync);
                     break;
             }
         }
 
-        private void RunPingSub(Action<ServerTestItem> updateFun)
+        private Task RunTcping()
         {
             try
             {
-                foreach (var it in _selecteds.Where(it => it.configType != EConfigType.Custom))
-                {
-                    try
-                    {
-                        Task.Run(() => updateFun(it));
-                    }
-                    catch (Exception ex)
-                    {
-                        Utils.SaveLog(ex.Message, ex);
-                    }
-                }
-
-                Thread.Sleep(10);
-            }
-            catch (Exception ex)
-            {
-                Utils.SaveLog(ex.Message, ex);
-            }
-        }
-
-
-        private void RunPing()
-        {
-            RunPingSub((ServerTestItem it) =>
-            {
-                long time = Ping(it.address);
-                var output = FormatOut(time, Global.DelayUnit);
-
-                LazyConfig.Instance.SetTestResult(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);
-
-                LazyConfig.Instance.SetTestResult(it.indexId, output, "");
-                UpdateFunc(it.indexId, output);
-            });
-        }
-
-        private async Task RunRealPing()
-        {
-            int pid = -1;
-            try
-            {
-                string msg = string.Empty;
-
-                pid = _coreHandler.LoadCoreConfigString(_config, _selecteds);
-                if (pid < 0)
-                {
-                    UpdateFunc("", ResUI.FailedToRunCore);
-                    return;
-                }
-
-                DownloadHandle downloadHandle = new DownloadHandle();
-                //Thread.Sleep(5000);
-                List<Task> tasks = new List<Task>();
+                List<Task> tasks = [];
                 foreach (var it in _selecteds)
                 {
-                    if (!it.allowTest)
-                    {
-                        continue;
-                    }
                     if (it.configType == EConfigType.Custom)
                     {
                         continue;
@@ -137,52 +105,51 @@ namespace v2rayN.Handler
                     {
                         try
                         {
-                            LazyConfig.Instance.SetTestResult(it.indexId, "-1", "");
+                            int time = GetTcpingTime(it.address, it.port);
+                            var output = FormatOut(time, Global.DelayUnit);
 
-                            WebProxy webProxy = new WebProxy(Global.Loopback, it.port);
-                            string output = GetRealPingTime(downloadHandle, webProxy);
-
-                            LazyConfig.Instance.SetTestResult(it.indexId, output, "");
+                            ProfileExHandler.Instance.SetTestDelay(it.indexId, output);
                             UpdateFunc(it.indexId, output);
                         }
                         catch (Exception ex)
                         {
-                            Utils.SaveLog(ex.Message, ex);
+                            Logging.SaveLog(ex.Message, ex);
                         }
                     }));
-                    //Thread.Sleep(100);
                 }
-                Task.WaitAll(tasks.ToArray());
+                Task.WaitAll([.. tasks]);
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
             finally
             {
-                if (pid > 0) _coreHandler.CoreStopPid(pid);
+                ProfileExHandler.Instance.SaveTo();
             }
-        }
-        private async Task RunSpeedTestAsync()
-        {
-            string testIndexId = string.Empty;
-            int pid = -1;
 
-            pid = _coreHandler.LoadCoreConfigString(_config, _selecteds);
+            return Task.CompletedTask;
+        }
+
+        private Task RunRealPing()
+        {
+            int pid = -1;
+            try
+            {
+                string msg = string.Empty;
+
+                pid = _coreHandler.LoadCoreConfigSpeedtest(_selecteds);
                 if (pid < 0)
                 {
                     UpdateFunc("", ResUI.FailedToRunCore);
-                return;
+                    return Task.CompletedTask;
                 }
 
-            string url = _config.constItem.speedTestUrl;
                 DownloadHandle downloadHandle = new DownloadHandle();
 
-            var timeout = 10;
+                List<Task> tasks = new();
                 foreach (var it in _selecteds)
                 {
-                _ = LazyConfig.Instance.SetTestResult(it.indexId, "", "-1");
-                UpdateFunc(it.indexId, "", ResUI.Speedtesting);
                     if (!it.allowTest)
                     {
                         continue;
@@ -191,19 +158,107 @@ namespace v2rayN.Handler
                     {
                         continue;
                     }
-                testIndexId = it.indexId;
+                    tasks.Add(Task.Run(async () =>
+                    {
+                        try
+                        {
+                            WebProxy webProxy = new(Global.Loopback, it.port);
+                            string output = await GetRealPingTime(downloadHandle, webProxy);
+
+                            ProfileExHandler.Instance.SetTestDelay(it.indexId, output);
+                            UpdateFunc(it.indexId, output);
+                            int.TryParse(output, out int delay);
+                            it.delay = delay;
+                        }
+                        catch (Exception ex)
+                        {
+                            Logging.SaveLog(ex.Message, ex);
+                        }
+                    }));
+                }
+                Task.WaitAll(tasks.ToArray());
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+            }
+            finally
+            {
+                if (pid > 0)
+                {
+                    _coreHandler.CoreStopPid(pid);
+                }
+                ProfileExHandler.Instance.SaveTo();
+            }
+
+            return Task.CompletedTask;
+        }
+
+        private async Task RunSpeedTestAsync()
+        {
+            int pid = -1;
+            //if (_actionType == ESpeedActionType.Mixedtest)
+            //{
+            //    _selecteds = _selecteds.OrderBy(t => t.delay).ToList();
+            //}
+
+            pid = _coreHandler.LoadCoreConfigSpeedtest(_selecteds);
+            if (pid < 0)
+            {
+                UpdateFunc("", ResUI.FailedToRunCore);
+                return;
+            }
+
+            string url = _config.speedTestItem.speedTestUrl;
+            var timeout = _config.speedTestItem.speedTestTimeout;
+
+            DownloadHandle downloadHandle = new();
+
+            var exitLoop = false;
+            MessageBus.Current.Listen<string>(Global.CommandStopSpeedTest)
+                .Subscribe(x =>
+                {
+                    if (!exitLoop)
+                    {
+                        UpdateFunc("", ResUI.SpeedtestingStop);
+                    }
+                    exitLoop = true;
+                });
+
+            foreach (var it in _selecteds)
+            {
+                if (exitLoop)
+                {
+                    UpdateFunc(it.indexId, "", ResUI.SpeedtestingSkip);
+                    continue;
+                }
+                if (!it.allowTest)
+                {
+                    continue;
+                }
+                if (it.configType == EConfigType.Custom)
+                {
+                    continue;
+                }
+                //if (it.delay < 0)
+                //{
+                //    UpdateFunc(it.indexId, "", ResUI.SpeedtestingSkip);
+                //    continue;
+                //}
+                ProfileExHandler.Instance.SetTestSpeed(it.indexId, "-1");
+                UpdateFunc(it.indexId, "", ResUI.Speedtesting);
 
                 var item = LazyConfig.Instance.GetProfileItem(it.indexId);
                 if (item is null) continue;
 
-                WebProxy webProxy = new WebProxy(Global.Loopback, it.port);
+                WebProxy webProxy = new(Global.Loopback, it.port);
 
                 await downloadHandle.DownloadDataAsync(url, webProxy, timeout, (bool success, string msg) =>
                 {
                     decimal.TryParse(msg, out decimal dec);
                     if (dec > 0)
                     {
-                        _ = LazyConfig.Instance.SetTestResult(it.indexId, "", msg);
+                        ProfileExHandler.Instance.SetTestSpeed(it.indexId, msg);
                     }
                     UpdateFunc(it.indexId, "", msg);
                 });
@@ -213,19 +268,100 @@ namespace v2rayN.Handler
             {
                 _coreHandler.CoreStopPid(pid);
             }
+            UpdateFunc("", ResUI.SpeedtestingCompleted);
+            ProfileExHandler.Instance.SaveTo();
         }
+
+        private async Task RunSpeedTestMulti()
+        {
+            int pid = -1;
+            pid = _coreHandler.LoadCoreConfigSpeedtest(_selecteds);
+            if (pid < 0)
+            {
+                UpdateFunc("", ResUI.FailedToRunCore);
+                return;
+            }
+
+            string url = _config.speedTestItem.speedTestUrl;
+            var timeout = _config.speedTestItem.speedTestTimeout;
+
+            DownloadHandle downloadHandle = new();
+
+            var exitLoop = false;
+            MessageBus.Current.Listen<string>(Global.CommandStopSpeedTest)
+                .Subscribe(x =>
+                {
+                    if (!exitLoop)
+                    {
+                        UpdateFunc("", ResUI.SpeedtestingStop);
+                    }
+                    exitLoop = true;
+                });
+
+            foreach (var it in _selecteds)
+            {
+                if (exitLoop)
+                {
+                    UpdateFunc(it.indexId, "", ResUI.SpeedtestingSkip);
+                    continue;
+                }
+
+                if (!it.allowTest)
+                {
+                    continue;
+                }
+                if (it.configType == EConfigType.Custom)
+                {
+                    continue;
+                }
+                if (it.delay < 0)
+                {
+                    UpdateFunc(it.indexId, "", ResUI.SpeedtestingSkip);
+                    continue;
+                }
+                ProfileExHandler.Instance.SetTestSpeed(it.indexId, "-1");
+                UpdateFunc(it.indexId, "", ResUI.Speedtesting);
+
+                var item = LazyConfig.Instance.GetProfileItem(it.indexId);
+                if (item is null) continue;
+
+                WebProxy webProxy = new(Global.Loopback, it.port);
+                _ = downloadHandle.DownloadDataAsync(url, webProxy, timeout, (bool success, string msg) =>
+                {
+                    decimal.TryParse(msg, out decimal dec);
+                    if (dec > 0)
+                    {
+                        ProfileExHandler.Instance.SetTestSpeed(it.indexId, msg);
+                    }
+                    UpdateFunc(it.indexId, "", msg);
+                });
+                await Task.Delay(2000);
+            }
+
+            await Task.Delay((timeout + 2) * 1000);
+
+            if (pid > 0)
+            {
+                _coreHandler.CoreStopPid(pid);
+            }
+            UpdateFunc("", ResUI.SpeedtestingCompleted);
+            ProfileExHandler.Instance.SaveTo();
+        }
+
         private async Task RunMixedtestAsync()
         {
             await RunRealPing();
 
-            await RunSpeedTestAsync();
+            await Task.Delay(1000);
+
+            await RunSpeedTestMulti();
         }
 
-        public string GetRealPingTime(DownloadHandle downloadHandle, WebProxy webProxy)
+        private async Task<string> GetRealPingTime(DownloadHandle downloadHandle, IWebProxy webProxy)
         {
-            string status = downloadHandle.GetRealPingTime(_config.constItem.speedPingTestUrl, webProxy, 10, out int responseTime);
-            //string output = Utils.IsNullOrEmpty(status) ? FormatOut(responseTime, "ms") : status;
-            return FormatOut(Utils.IsNullOrEmpty(status) ? responseTime : -1, Global.DelayUnit);
+            int responseTime = await downloadHandle.GetRealPingTime(_config.speedTestItem.speedPingTestUrl, webProxy, 10);
+            //string output = Utile.IsNullOrEmpty(status) ? FormatOut(responseTime, "ms") : status;
+            return FormatOut(responseTime, Global.DelayUnit);
         }
 
         private int GetTcpingTime(string url, int port)
@@ -234,17 +370,17 @@ 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];
                 }
 
-                Stopwatch timer = new Stopwatch();
+                Stopwatch timer = new();
                 timer.Start();
 
-                IPEndPoint endPoint = new IPEndPoint(ipAddress, port);
-                Socket clientSocket = new Socket(endPoint.AddressFamily, SocketType.Stream, ProtocolType.Tcp);
+                IPEndPoint endPoint = new(ipAddress, port);
+                using Socket clientSocket = new(endPoint.AddressFamily, SocketType.Stream, ProtocolType.Tcp);
 
                 IAsyncResult result = clientSocket.BeginConnect(endPoint, null, null);
                 if (!result.AsyncWaitHandle.WaitOne(TimeSpan.FromSeconds(5)))
@@ -253,53 +389,14 @@ namespace v2rayN.Handler
 
                 timer.Stop();
                 responseTime = timer.Elapsed.Milliseconds;
-                clientSocket.Close();
             }
             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;
-                Ping pingSender = new Ping();
-                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,125 +1,100 @@
-using Grpc.Core;
-using ProtosLib.Statistics;
-using System.Net;
-using System.Net.Sockets;
-using v2rayN.Base;
-using v2rayN.Mode;
+using v2rayN.Models;
 
 namespace v2rayN.Handler
 {
-    class StatisticsHandler
+    internal class StatisticsHandler
     {
-        private Mode.Config config_;
-        private Channel channel_;
-        private StatsService.StatsServiceClient client_;
-        private bool exitFlag_;
-        private ServerStatItem _serverStatItem;
+        private Config _config;
+        private ServerStatItem? _serverStatItem;
+        private List<ServerStatItem> _lstServerStat;
+        private Action<ServerSpeedItem> _updateFunc;
+        private StatisticsV2ray? _statisticsV2Ray;
+        private StatisticsSingbox? _statisticsSingbox;
 
-        Action<ServerSpeedItem> updateFunc_;
+        public List<ServerStatItem> ServerStat => _lstServerStat;
+        public bool Enable { get; set; }
 
-        public bool Enable
+        public StatisticsHandler(Config config, Action<ServerSpeedItem> update)
         {
-            get; set;
+            _config = config;
+            Enable = config.guiItem.enableStatistics;
+            if (!Enable)
+            {
+                return;
             }
 
-        public StatisticsHandler(Mode.Config config, Action<ServerSpeedItem> update)
-        {
-            config_ = config;
-            Enable = config.enableStatistics;
-            updateFunc_ = update;
-            exitFlag_ = false;
+            _updateFunc = update;
 
             Init();
-            GrpcInit();
 
-            Task.Run(Run);
-        }
-
-        private void GrpcInit()
-        {
-            if (channel_ == null)
-            {
-                Global.statePort = GetFreePort();
-
-                channel_ = new Channel($"{Global.Loopback}:{Global.statePort}", ChannelCredentials.Insecure);
-                channel_.ConnectAsync();
-                client_ = new StatsService.StatsServiceClient(channel_);
-            }
+            _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 void Run()
-        {
-            while (!exitFlag_)
-            {
-                try
-                {
-                    if (Enable && channel_.State == ChannelState.Ready)
-                    {
-                        QueryStatsResponse res = null;
-                        try
-                        {
-                            res = client_.QueryStats(new QueryStatsRequest() { Pattern = "", Reset = true });
-                        }
-                        catch (Exception ex)
-                        {
-                            //Utils.SaveLog(ex.Message, ex);
-                        }
-
-                        if (res != null)
-                        {
-                            GetServerStatItem(config_.indexId);
-                            ParseOutput(res.Stat, out ServerSpeedItem server);
-
-                            _serverStatItem.todayUp += server.proxyUp;
-                            _serverStatItem.todayDown += server.proxyDown;
-                            _serverStatItem.totalUp += server.proxyUp;
-                            _serverStatItem.totalDown += server.proxyDown;
-
-                            if (Global.ShowInTaskbar)
-                            {
-                                server.indexId = config_.indexId;
-                                updateFunc_(server);
-                            }
-                            if (server.proxyUp != 0 || server.proxyDown != 0)
-                            {
-                                _ = SqliteHelper.Instance.UpdateAsync(_serverStatItem);
-                            }
-
-                        }
-                    }
-                    var sleep = config_.statisticsFreshRate < 1 ? 1 : config_.statisticsFreshRate;
-                    Thread.Sleep(1000 * sleep);
-                    channel_.ConnectAsync();
-                }
-                catch
-                {
-                }
+                Logging.SaveLog(ex.Message, ex);
             }
         }
 
         public void ClearAllServerStatistics()
         {
-            SqliteHelper.Instance.Execute($"delete from ServerStatItem ");
+            SQLiteHelper.Instance.Execute($"delete from ServerStatItem ");
             _serverStatItem = null;
+            _lstServerStat = new();
+        }
+
+        public void SaveTo()
+        {
+            try
+            {
+                SQLiteHelper.Instance.UpdateAll(_lstServerStat);
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+            }
         }
 
         private void Init()
         {
+            SQLiteHelper.Instance.Execute($"delete from ServerStatItem where indexId not in ( select indexId from ProfileItem )");
+
             long ticks = DateTime.Now.Date.Ticks;
-            SqliteHelper.Instance.Execute($"update ServerStatItem set todayUp = 0,todayDown=0,dateNow={ticks} where dateNow<>{ticks}");
+            SQLiteHelper.Instance.Execute($"update ServerStatItem set todayUp = 0,todayDown=0,dateNow={ticks} where dateNow<>{ticks}");
+
+            _lstServerStat = SQLiteHelper.Instance.Table<ServerStatItem>().ToList();
+        }
+
+        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)
@@ -132,7 +107,7 @@ namespace v2rayN.Handler
 
             if (_serverStatItem == null)
             {
-                _serverStatItem = SqliteHelper.Instance.Table<ServerStatItem>().FirstOrDefault(t => t.indexId == indexId);
+                _serverStatItem = _lstServerStat.FirstOrDefault(t => t.indexId == indexId);
                 if (_serverStatItem == null)
                 {
                     _serverStatItem = new ServerStatItem
@@ -144,7 +119,8 @@ namespace v2rayN.Handler
                         todayDown = 0,
                         dateNow = ticks
                     };
-                    _ = SqliteHelper.Instance.Replacesync(_serverStatItem);
+                    SQLiteHelper.Instance.Replace(_serverStatItem);
+                    _lstServerStat.Add(_serverStatItem);
                 }
             }
 
@@ -155,73 +131,5 @@ namespace v2rayN.Handler
                 _serverStatItem.dateNow = ticks;
             }
         }
-
-        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
-                TcpListener l = new TcpListener(IPAddress.Loopback, 0);
-                l.Start();
-                int port = ((IPEndPoint)l.LocalEndpoint).Port;
-                l.Stop();
-                return port;
-            }
-            catch (Exception ex)
-            {
-                // in case access denied
-                Utils.SaveLog(ex.Message, ex);
-                return defaultPort;
-            }
-        }
     }
 }

v2rayN/v2rayN/Handler/StatisticsSingbox.cs

@@ -0,0 +1,129 @@
+using System.Net.WebSockets;
+using System.Text;
+using v2rayN.Models;
+
+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)
+            {
+                await Task.Delay(1000);
+                try
+                {
+                    if (!(_config.runningCoreType is ECoreType.sing_box or ECoreType.clash or ECoreType.clash_meta or ECoreType.mihomo))
+                    {
+                        continue;
+                    }
+                    if (webSocket != null)
+                    {
+                        if (webSocket.State == WebSocketState.Aborted
+                            || 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 (!Utils.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
+                {
+                }
+            }
+        }
+
+        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,132 @@
+using Grpc.Core;
+using Grpc.Net.Client;
+using ProtosLib.Statistics;
+using v2rayN.Models;
+
+namespace v2rayN.Handler
+{
+    internal class StatisticsV2ray
+    {
+        private Models.Config _config;
+        private GrpcChannel? _channel;
+        private StatsService.StatsServiceClient? _client;
+        private bool _exitFlag;
+        private Action<ServerSpeedItem> _updateFunc;
+
+        public StatisticsV2ray(Models.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)
+            {
+                await Task.Delay(1000);
+                try
+                {
+                    if (!(_config.runningCoreType is ECoreType.Xray or ECoreType.v2fly or ECoreType.v2fly_v5 or ECoreType.SagerNet))
+                    {
+                        continue;
+                    }
+                    if (_channel?.State == ConnectivityState.Ready)
+                    {
+                        QueryStatsResponse? res = null;
+                        try
+                        {
+                            if (_client != null)
+                                res = await _client.QueryStatsAsync(new QueryStatsRequest() { Pattern = "", Reset = true });
+                        }
+                        catch
+                        {
+                        }
+
+                        if (res != null)
+                        {
+                            ParseOutput(res.Stat, out ServerSpeedItem server);
+                            _updateFunc(server);
+                        }
+                    }
+                    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;
+using v2rayN.Models;
 
 namespace v2rayN.Handler
 {
@@ -20,9 +15,8 @@ namespace v2rayN.Handler
         //  <proxy-server><CR-LF>
         //  <bypass-list><CR-LF>
         //  <pac-url>
-        private static SysproxyConfig _userSettings = null;
 
-        enum RET_ERRORS : int
+        private enum RET_ERRORS : int
         {
             RET_NO_ERROR = 0,
             INVALID_FORMAT = 1,
@@ -34,39 +28,29 @@ 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)
         {
             var type = config.sysProxyType;
 
-            if (forceDisable && type == ESysProxyType.ForcedChange)
+            if (forceDisable && type != ESysProxyType.Unchanged)
             {
                 type = ESysProxyType.ForcedClear;
             }
 
             try
             {
-                int port = LazyConfig.Instance.GetLocalPort(Global.InboundHttp);
-                int portSocks = LazyConfig.Instance.GetLocalPort(Global.InboundSocks);
-                int portPac = LazyConfig.Instance.GetLocalPort(ESysProxyType.Pac.ToString());
+                int port = LazyConfig.Instance.GetLocalPort(EInboundProtocol.http);
+                int portSocks = LazyConfig.Instance.GetLocalPort(EInboundProtocol.socks);
+                int portPac = LazyConfig.Instance.GetLocalPort(EInboundProtocol.pac);
                 if (port <= 0)
                 {
                     return false;
                 }
                 if (type == ESysProxyType.ForcedChange)
                 {
-                    var strExceptions = $"{config.constItem.defIEProxyExceptions};{config.systemProxyExceptions}";
+                    var strExceptions = $"<local>;{config.constItem.defIEProxyExceptions};{config.systemProxyExceptions}";
 
                     var strProxy = string.Empty;
                     if (Utils.IsNullOrEmpty(config.systemProxyAdvancedProtocol))
@@ -80,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)
                 {
@@ -92,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)
@@ -103,7 +87,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
             return true;
         }
@@ -119,122 +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 AutoResetEvent(false))
-            using (AutoResetEvent errorWaitHandle = new AutoResetEvent(false))
-            {
-                using (Process process = new Process())
-                {
-                    // 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 StringBuilder();
-                    StringBuilder error = new StringBuilder();
-
-                    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,249 +0,0 @@
-using System.Diagnostics;
-using System.IO;
-using System.Reactive.Linq;
-using v2rayN.Handler;
-using v2rayN.Mode;
-
-namespace v2rayN.Base
-{
-    public sealed class TunHandler
-    {
-        private static readonly Lazy<TunHandler> _instance = new Lazy<TunHandler>(() => 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.Equals(_socksPort)
-                && _process != null
-                && !_process.HasExited)
-            {
-                _needRestart = false;
-            }
-
-            _socksPort = socksPort;
-
-            if (_needRestart)
-            {
-                CoreStop();
-                if (Init() == false)
-                {
-                    return;
-                }
-                CoreStart();
-            }
-        }
-
-        public void Stop()
-        {
-            CoreStop();
-        }
-
-        private bool Init()
-        {
-            coreInfo = LazyConfig.Instance.GetCoreInfo(ECoreType.sing_box);
-            string configStr = Utils.GetEmbedText(Global.TunSingboxFileName);
-            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}");
-
-
-            //port
-            configStr = configStr.Replace("$socksPort$", $"{_socksPort}");
-
-            //exe
-            List<string> lstDnsExe = new List<string>();
-            List<string> lstDirectExe = new List<string>();
-            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}\"");
-
-
-            //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));
-            }
-            else
-            {
-                configStr = configStr.Replace("$ruleDirectIPs$", "");
-            }
-            //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
-            {
-                configStr = configStr.Replace("$ruleDirectProcess$", "");
-            }
-
-            File.WriteAllText(Utils.GetConfigPath(_tunConfigName), configStr);
-
-            return true;
-        }
-
-        private void CoreStop()
-        {
-            try
-            {
-                _isRunning = false;
-                if (_process != null)
-                {
-                    KillProcess(_process);
-                    _process.Dispose();
-                    _process = null;
-                }
-            }
-            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))
-            {
-
-            }
-            return fileName;
-        }
-
-        private void CoreStart()
-        {
-            try
-            {
-                string fileName = CoreFindexe();
-                if (fileName == "")
-                {
-                    return;
-                }
-                Process p = new Process
-                {
-                    StartInfo = new ProcessStartInfo
-                    {
-                        FileName = fileName,
-                        Arguments = $"run -c {Utils.GetConfigPath(_tunConfigName)}",
-                        WorkingDirectory = Utils.GetConfigPath(),
-                        UseShellExecute = _config.tunModeItem.showWindow,
-                        CreateNoWindow = !_config.tunModeItem.showWindow,
-                        Verb = "runas",
-                    }
-                };
-                p.Start();
-                _process = p;
-                _isRunning = true;
-                if (p.WaitForExit(1000))
-                {
-                    throw new Exception("start tun mode fail");
-                }
-
-                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);
-            }
-        }
-    }
-}

v2rayN/v2rayN/Handler/UpdateHandle.cs

@@ -1,18 +1,19 @@
-using Splat;
+using DynamicData;
+using Splat;
 using System.Diagnostics;
 using System.IO;
+using System.Runtime.InteropServices;
 using System.Text;
 using System.Text.RegularExpressions;
-using System.Windows.Forms;
-using v2rayN.Base;
-using v2rayN.Mode;
+using System.Windows;
+using v2rayN.Models;
 using v2rayN.Resx;
 
 namespace v2rayN.Handler
 {
-    class UpdateHandle
+    internal class UpdateHandle
     {
-        Action<bool, string> _updateFunc;
+        private Action<bool, string> _updateFunc;
         private Config _config;
 
         public event EventHandler<ResultEventArgs> AbsoluteCompleted;
@@ -21,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;
             }
         }
 
@@ -35,11 +38,7 @@ namespace v2rayN.Handler
             _updateFunc = update;
             var url = string.Empty;
 
-            DownloadHandle downloadHandle = null;
-            if (downloadHandle == null)
-            {
-                downloadHandle = new DownloadHandle();
-
+            DownloadHandle downloadHandle = new();
             downloadHandle.UpdateCompleted += (sender2, args) =>
             {
                 if (args.Success)
@@ -50,12 +49,12 @@ namespace v2rayN.Handler
                     {
                         string fileName = Utils.GetTempPath(Utils.GetDownloadFileName(url));
                         fileName = Utils.UrlEncode(fileName);
-                            Process process = new Process
+                        Process process = new()
                         {
                             StartInfo = new ProcessStartInfo
                             {
                                 FileName = "v2rayUpgrade.exe",
-                                    Arguments = "\"" + fileName + "\"",
+                                Arguments = fileName.AppendQuotes(),
                                 WorkingDirectory = Utils.StartupPath()
                             }
                         };
@@ -79,15 +78,18 @@ namespace v2rayN.Handler
             {
                 _updateFunc(false, args.GetException().Message);
             };
-            }
             AbsoluteCompleted += (sender2, args) =>
             {
                 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
                 {
@@ -99,17 +101,13 @@ namespace v2rayN.Handler
             CheckUpdateAsync(ECoreType.v2rayN, preRelease);
         }
 
-
         public void CheckUpdateCore(ECoreType type, Config config, Action<bool, string> update, bool preRelease)
         {
             _config = config;
             _updateFunc = update;
             var url = string.Empty;
 
-            DownloadHandle downloadHandle = null;
-            if (downloadHandle == null)
-            {
-                downloadHandle = new DownloadHandle();
+            DownloadHandle downloadHandle = new();
             downloadHandle.UpdateCompleted += (sender2, args) =>
             {
                 if (args.Success)
@@ -135,15 +133,19 @@ namespace v2rayN.Handler
             {
                 _updateFunc(true, args.GetException().Message);
             };
-            }
 
             AbsoluteCompleted += (sender2, args) =>
             {
                 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
                 {
@@ -155,14 +157,13 @@ namespace v2rayN.Handler
             CheckUpdateAsync(type, preRelease);
         }
 
-
         public void UpdateSubscriptionProcess(Config config, string subId, bool blProxy, Action<bool, string> update)
         {
             _config = config;
             _updateFunc = update;
 
             _updateFunc(false, ResUI.MsgUpdateSubscriptionStart);
-            var subItem = LazyConfig.Instance.SubItems();
+            var subItem = LazyConfig.Instance.SubItems().OrderBy(t => t.sort).ToList();
 
             if (subItem == null || subItem.Count <= 0)
             {
@@ -172,36 +173,26 @@ namespace v2rayN.Handler
 
             Task.Run(async () =>
             {
-                //Turn off system proxy
-                bool bSysProxyType = false;
-                if (!blProxy && config.sysProxyType == ESysProxyType.ForcedChange)
-                {
-                    bSysProxyType = true;
-                    config.sysProxyType = ESysProxyType.ForcedClear;
-                    SysProxyHandle.UpdateSysProxy(config, false);
-                    Thread.Sleep(3000);
-                }
-
                 foreach (var item in subItem)
                 {
-                    if (item.enabled == false)
-                    {
-                        continue;
-                    }
-                    if (!Utils.IsNullOrEmpty(subId) && item.id != subId)
-                    {
-                        continue;
-                    }
-
                     string id = item.id.TrimEx();
                     string url = item.url.TrimEx();
                     string userAgent = item.userAgent.TrimEx();
                     string hashCode = $"{item.remarks}->";
-                    if (Utils.IsNullOrEmpty(id) || Utils.IsNullOrEmpty(url))
+                    if (Utils.IsNullOrEmpty(id) || Utils.IsNullOrEmpty(url) || (!Utils.IsNullOrEmpty(subId) && item.id != subId))
                     {
                         //_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}");
+                        continue;
+                    }
 
                     var downloadHandle = new DownloadHandle();
                     downloadHandle.Error += (sender2, args) =>
@@ -209,14 +200,67 @@ namespace v2rayN.Handler
                         _updateFunc(false, $"{hashCode}{args.GetException().Message}");
                     };
 
-                    //idn to idc
-                    url = Utils.GetPunycode(url);
-
                     _updateFunc(false, $"{hashCode}{ResUI.MsgStartGettingSubscriptions}");
-                    var result = await downloadHandle.DownloadStringAsync(url, blProxy, userAgent);
+
+                    //one url
+                    url = Utils.GetPunycode(url);
+                    //convert
+                    if (!Utils.IsNullOrEmpty(item.convertTarget))
+                    {
+                        var subConvertUrl = Utils.IsNullOrEmpty(config.constItem.subConvertUrl) ? Global.SubConvertUrls.FirstOrDefault() : config.constItem.subConvertUrl;
+                        url = string.Format(subConvertUrl!, Utils.UrlEncode(url));
+                        if (!url.Contains("target="))
+                        {
+                            url += string.Format("&target={0}", item.convertTarget);
+                        }
+                        if (!url.Contains("config="))
+                        {
+                            url += string.Format("&config={0}", Global.SubConvertConfig.FirstOrDefault());
+                        }
+                    }
+                    var result = await downloadHandle.TryDownloadString(url, blProxy, userAgent);
                     if (blProxy && Utils.IsNullOrEmpty(result))
                     {
-                        result = await downloadHandle.DownloadStringAsync(url, false, userAgent);
+                        result = await downloadHandle.TryDownloadString(url, false, userAgent);
+                    }
+
+                    //more url
+                    if (Utils.IsNullOrEmpty(item.convertTarget) && !Utils.IsNullOrEmpty(item.moreUrl.TrimEx()))
+                    {
+                        if (!Utils.IsNullOrEmpty(result) && Utils.IsBase64String(result!))
+                        {
+                            result = Utils.Base64Decode(result);
+                        }
+
+                        var lstUrl = new List<string>
+                        {
+                            item.moreUrl.TrimEx().Split(",")
+                        };
+                        foreach (var it in lstUrl)
+                        {
+                            var url2 = Utils.GetPunycode(it);
+                            if (Utils.IsNullOrEmpty(url2))
+                            {
+                                continue;
+                            }
+
+                            var result2 = await downloadHandle.TryDownloadString(url2, blProxy, userAgent);
+                            if (blProxy && Utils.IsNullOrEmpty(result2))
+                            {
+                                result2 = await downloadHandle.TryDownloadString(url2, false, userAgent);
+                            }
+                            if (!Utils.IsNullOrEmpty(result2))
+                            {
+                                if (Utils.IsBase64String(result2!))
+                                {
+                                    result += Utils.Base64Decode(result2);
+                                }
+                                else
+                                {
+                                    result += result2;
+                                }
+                            }
+                        }
                     }
 
                     if (Utils.IsNullOrEmpty(result))
@@ -226,12 +270,17 @@ namespace v2rayN.Handler
                     else
                     {
                         _updateFunc(false, $"{hashCode}{ResUI.MsgGetSubscriptionSuccessfully}");
-                        if (result.Length < 99)
+                        if (result?.Length < 99)
                         {
                             _updateFunc(false, $"{hashCode}{result}");
                         }
 
-                        int ret = ConfigHandler.AddBatchServers(ref config, result, id, true);
+                        int ret = ConfigHandler.AddBatchServers(config, result, id, true);
+                        if (ret <= 0)
+                        {
+                            Logging.SaveLog("FailedImportSubscription");
+                            Logging.SaveLog(result);
+                        }
                         _updateFunc(false,
                             ret > 0
                                 ? $"{hashCode}{ResUI.MsgUpdateSubscriptionEnd}"
@@ -239,72 +288,28 @@ namespace v2rayN.Handler
                     }
                     _updateFunc(false, "-------------------------------------------------------");
                 }
-                //restore system proxy
-                if (bSysProxyType)
-                {
-                    config.sysProxyType = ESysProxyType.ForcedChange;
-                    SysProxyHandle.UpdateSysProxy(config, false);
-                }
+
                 _updateFunc(true, $"{ResUI.MsgUpdateSubscriptionEnd}");
-
             });
         }
 
+        public void UpdateGeoFileAll(Config config, Action<bool, string> update)
+        {
+            Task.Run(async () =>
+            {
+                await UpdateGeoFile("geosite", _config, update);
+                await UpdateGeoFile("geoip", _config, update);
 
-        public void UpdateGeoFile(string geoName, Config config, Action<bool, string> update)
-        {
-            _config = config;
-            _updateFunc = update;
-            var url = string.Format(Global.geoUrl, geoName);
-
-            DownloadHandle downloadHandle = null;
-            if (downloadHandle == null)
-            {
-                downloadHandle = new DownloadHandle();
-
-                downloadHandle.UpdateCompleted += (sender2, args) =>
-                {
-                    if (args.Success)
-                    {
-                        _updateFunc(false, string.Format(ResUI.MsgDownloadGeoFileSuccessfully, geoName));
-
-                        try
-                        {
-                            string fileName = Utils.GetTempPath(Utils.GetDownloadFileName(url));
-                            if (File.Exists(fileName))
-                            {
-                                Global.coreTypes.ForEach(it =>
-                                {
-                                    string targetPath = Utils.GetBinPath($"{geoName}.dat", (ECoreType)Enum.Parse(typeof(ECoreType), it));
-                                    File.Copy(fileName, targetPath, true);
+                //await UpdateGeoFile4Singbox("geosite", _config, false, update);
+                //await UpdateGeoFile4Singbox("geoip", _config, true, update);
             });
-                                //_updateFunc(true, "");
-                            }
-                        }
-                        catch (Exception ex)
-                        {
-                            _updateFunc(false, ex.Message);
-                        }
-                    }
-                    else
-                    {
-                        _updateFunc(false, args.Msg);
-                    }
-                };
-                downloadHandle.Error += (sender2, args) =>
-                {
-                    _updateFunc(false, args.GetException().Message);
-                };
-            }
-            askToDownload(downloadHandle, url, false);
-
         }
 
         public void RunAvailabilityCheck(Action<bool, string> update)
         {
-            Task.Run(() =>
+            Task.Run(async () =>
             {
-                var time = (new DownloadHandle()).RunAvailabilityCheck(null);
+                var time = await (new DownloadHandle()).RunAvailabilityCheck(null);
 
                 update(false, string.Format(ResUI.TestMeOutput, time));
             });
@@ -326,13 +331,13 @@ namespace v2rayN.Handler
                 }
                 else
                 {
-                    Utils.SaveLog("StatusCode error: " + url);
+                    Logging.SaveLog("StatusCode error: " + url);
                     return;
                 }
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 _updateFunc(false, ex.Message);
             }
         }
@@ -340,17 +345,16 @@ namespace v2rayN.Handler
         /// <summary>
         /// 获取V2RayCore版本
         /// </summary>
-        private string getCoreVersion(ECoreType type)
+        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);
+                    vName = Utils.GetBinPath(vName, coreInfo.coreType.ToString());
                     if (File.Exists(vName))
                     {
                         filePath = vName;
@@ -362,11 +366,11 @@ namespace v2rayN.Handler
                 {
                     string msg = string.Format(ResUI.NotFoundCore, @"", "", "");
                     //ShowMsg(true, msg);
-                    return "";
+                    return new SemanticVersion("");
                 }
 
-                Process p = new Process();
-                p.StartInfo.FileName = filePath;
+                using Process p = new();
+                p.StartInfo.FileName = filePath.AppendQuotes();
                 p.StartInfo.Arguments = coreInfo.versionArg;
                 p.StartInfo.WorkingDirectory = Utils.StartupPath();
                 p.StartInfo.UseShellExecute = false;
@@ -385,37 +389,39 @@ namespace v2rayN.Handler
                     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 version;
+                return new SemanticVersion(version);
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 _updateFunc(false, ex.Message);
-                return "";
+                return new SemanticVersion("");
             }
         }
+
         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 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);
 
-                string curVersion;
+                SemanticVersion curVersion;
                 string message;
                 string url;
                 switch (type)
@@ -425,59 +431,116 @@ namespace v2rayN.Handler
                     case ECoreType.Xray:
                     case ECoreType.v2fly_v5:
                         {
-                            curVersion = "v" + getCoreVersion(type);
-                            message = string.Format(ResUI.IsLatestCore, curVersion);
-                            string osBit = Environment.Is64BitProcess ? "64" : "32";
-                            url = string.Format(coreInfo.coreDownloadUrl64, version, osBit);
+                            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, curVersion);
-                            if (Environment.Is64BitProcess)
+                            message = string.Format(ResUI.IsLatestCore, type, curVersion);
+                            switch (RuntimeInformation.ProcessArchitecture)
                             {
-                                url = string.Format(coreInfo.coreDownloadUrl64, version);
+                                case Architecture.Arm64:
+                                    url = coreInfo.coreDownloadUrlArm64;
+                                    break;
+
+                                case Architecture.X86:
+                                    url = coreInfo.coreDownloadUrl32;
+                                    break;
+
+                                default:
+                                    url = coreInfo.coreDownloadUrl64;
+                                    break;
                             }
-                            else
+                            url = string.Format(url, version.ToVersionString("v"));
+                            break;
+                        }
+                    case ECoreType.sing_box:
                         {
-                                url = string.Format(coreInfo.coreDownloadUrl32, version);
+                            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 = FileVersionInfo.GetVersionInfo(Utils.GetExePath()).FileVersion.ToString();
-                            message = string.Format(ResUI.IsLatestN, curVersion);
+                            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)
+                if (curVersion >= version && version != new SemanticVersion(0, 0, 0))
                 {
                     AbsoluteCompleted?.Invoke(this, new ResultEventArgs(false, message));
                     return;
                 }
 
-                AbsoluteCompleted?.Invoke(this, new ResultEventArgs(true, url));
+                AbsoluteCompleted?.Invoke(this, new ResultEventArgs(true, body, url));
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 _updateFunc(false, ex.Message);
             }
         }
 
-        private void askToDownload(DownloadHandle downloadHandle, string url, bool blAsk)
+        private async Task AskToDownload(DownloadHandle downloadHandle, string url, bool blAsk)
         {
             bool blDownload = false;
             if (blAsk)
             {
-                if (UI.ShowYesNo(string.Format(ResUI.DownloadYesNo, url)) == DialogResult.Yes)
+                if (UI.ShowYesNo(string.Format(ResUI.DownloadYesNo, url)) == MessageBoxResult.Yes)
                 {
                     blDownload = true;
                 }
@@ -488,9 +551,57 @@ namespace v2rayN.Handler
             }
             if (blDownload)
             {
-                downloadHandle.DownloadFileAsync(url, true, 600);
+                await downloadHandle.DownloadFileAsync(url, true, 600);
             }
         }
-        #endregion
+
+        private async Task UpdateGeoFile(string geoName, Config config, Action<bool, string> update)
+        {
+            _config = config;
+            _updateFunc = update;
+            var url = string.Format(Global.GeoUrl, geoName);
+
+            DownloadHandle downloadHandle = new();
+            downloadHandle.UpdateCompleted += (sender2, args) =>
+            {
+                if (args.Success)
+                {
+                    _updateFunc(false, string.Format(ResUI.MsgDownloadGeoFileSuccessfully, geoName));
+
+                    try
+                    {
+                        string fileName = Utils.GetTempPath(Utils.GetDownloadFileName(url));
+                        if (File.Exists(fileName))
+                        {
+                            //Global.coreTypes.ForEach(it =>
+                            //{
+                            //    string targetPath = Utile.GetBinPath($"{geoName}.dat", (ECoreType)Enum.Parse(typeof(ECoreType), it));
+                            //    File.Copy(fileName, targetPath, true);
+                            //});
+                            string targetPath = Utils.GetBinPath($"{geoName}.dat");
+                            File.Copy(fileName, targetPath, true);
+
+                            File.Delete(fileName);
+                            //_updateFunc(true, "");
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        _updateFunc(false, ex.Message);
+                    }
+                }
+                else
+                {
+                    _updateFunc(false, args.Msg);
+                }
+            };
+            downloadHandle.Error += (sender2, args) =>
+            {
+                _updateFunc(false, args.GetException().Message);
+            };
+            await AskToDownload(downloadHandle, url, false);
+        }
+
+        #endregion private
     }
 }

v2rayN/v2rayN/Mode/Config.cs

@@ -1,160 +0,0 @@
-namespace v2rayN.Mode
-{
-    /// <summary>
-    /// 本软件配置文件实体类
-    /// </summary>
-    [Serializable]
-    public class Config
-    {
-        #region property
-
-        /// <summary>
-        /// 允许日志
-        /// </summary>
-        public bool logEnabled
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// 日志等级
-        /// </summary>
-        public string loglevel
-        {
-            get; set;
-        }
-
-        public string indexId
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// 允许Mux多路复用
-        /// </summary>
-        public bool muxEnabled
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public ESysProxyType sysProxyType
-        {
-            get; set;
-        }
-
-        public bool autoRun { get; set; }
-
-        /// <summary>
-        /// 启用实时网速和流量统计
-        /// </summary>
-        public bool enableStatistics
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// 去重时优先保留较旧（顶部）节点
-        /// </summary>
-        public bool keepOlderDedupl
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// 视图刷新率
-        /// </summary>
-        public int statisticsFreshRate
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// 自定义远程DNS
-        /// </summary>
-        public string remoteDNS
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// Outbound Freedom domainStrategy
-        /// </summary>
-        public string domainStrategy4Freedom
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// 是否允许不安全连接
-        /// </summary>
-        public bool defAllowInsecure
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// 域名解析策略
-        /// </summary>
-        public string domainStrategy
-        {
-            get; set;
-        }
-        public string domainMatcher
-        {
-            get; set;
-        }
-        public string routingIndexId { get; set; }
-        public bool enableRoutingAdvanced
-        {
-            get; set;
-        }
-
-        public bool ignoreGeoUpdateCore
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// systemProxyExceptions
-        /// </summary>
-        public string systemProxyExceptions
-        {
-            get; set;
-        }
-        public string systemProxyAdvancedProtocol { get; set; }
-
-        public int autoUpdateInterval { get; set; } = 10;
-
-        public int autoUpdateSubInterval { get; set; } = 10;
-
-        public bool checkPreReleaseUpdate { get; set; } = false;
-
-        public bool enableSecurityProtocolTls13
-        {
-            get; set;
-        }
-
-        public int trayMenuServersLimit { get; set; } = 20;
-
-        public bool autoHideStartup { get; set; }
-
-        #endregion
-
-        #region other entities
-
-        public TunModeItem tunModeItem { get; set; }
-        public KcpItem kcpItem { get; set; }
-        public GrpcItem grpcItem { get; set; }
-        public UIItem uiItem { get; set; }
-        public ConstItem constItem { get; set; }
-        public List<InItem> inbound { get; set; }
-        public List<KeyEventItem> globalHotkeys { get; set; }
-        public List<CoreTypeItem> coreTypeItem { get; set; }
-
-        #endregion
-
-    }
-}

v2rayN/v2rayN/Mode/ConfigItems.cs

@@ -1,109 +0,0 @@
-using System.Windows.Forms;
-
-namespace v2rayN.Mode
-{
-    [Serializable]
-    public class InItem
-    {
-        public int localPort { get; set; }
-
-        public string protocol { get; set; }
-
-        public bool udpEnabled { get; set; }
-
-        public bool sniffingEnabled { get; set; } = true;
-        public bool routeOnly { get; set; }
-
-        public bool allowLANConn { get; set; }
-
-        public bool newPort4LAN { get; set; }
-
-        public string user { get; set; }
-
-        public string pass { get; set; }
-
-    }
-
-    [Serializable]
-    public class KcpItem
-    {
-        public int mtu { get; set; }
-
-        public int tti { get; set; }
-
-        public int uplinkCapacity { get; set; }
-
-        public int downlinkCapacity { get; set; }
-
-        public bool congestion { get; set; }
-
-        public int readBufferSize { get; set; }
-
-        public int writeBufferSize { get; set; }
-    }
-
-    [Serializable]
-    public class GrpcItem
-    {
-        public int idle_timeout { get; set; }
-        public int health_check_timeout { get; set; }
-        public bool permit_without_stream { get; set; }
-        public int initial_windows_size { get; set; }
-    }
-
-    [Serializable]
-    public class UIItem
-    {
-        public bool enableAutoAdjustMainLvColWidth { get; set; }
-        public double mainWidth { get; set; }
-        public double mainHeight { get; set; }
-        public bool colorModeDark { get; set; }
-        public string? colorPrimaryName { get; set; }
-        public string currentLanguage { get; set; }
-        public Dictionary<string, int> mainLvColWidth { get; set; }
-    }
-
-    [Serializable]
-    public class ConstItem
-    {
-        public string speedTestUrl { get; set; }
-        public string speedPingTestUrl { get; set; }
-        public string defIEProxyExceptions { get; set; }
-    }
-
-    [Serializable]
-    public class KeyEventItem
-    {
-        public EGlobalHotkey eGlobalHotkey { get; set; }
-
-        public bool Alt { get; set; }
-
-        public bool Control { get; set; }
-
-        public bool Shift { get; set; }
-
-        public Keys? KeyCode { get; set; }
-
-    }
-
-    [Serializable]
-    public class CoreTypeItem
-    {
-        public EConfigType configType { get; set; }
-
-        public ECoreType coreType { get; set; }
-    }
-
-    [Serializable]
-    public class TunModeItem
-    {
-        public bool enableTun { get; set; }
-        public bool showWindow { get; set; }
-        public bool strictRoute { get; set; }
-        public string stack { get; set; }
-        public int mtu { get; set; }
-        public List<string> directIP { get; set; }
-        public List<string> directProcess { get; set; }
-
-    }
-}

v2rayN/v2rayN/Mode/GitHubRelease.cs

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

v2rayN/v2rayN/Mode/ServerTestItem.cs

@@ -1,27 +0,0 @@
-namespace v2rayN.Mode
-{
-    [Serializable]
-    class ServerTestItem
-    {
-        public string indexId
-        {
-            get; set;
-        }
-        public string address
-        {
-            get; set;
-        }
-        public int port
-        {
-            get; set;
-        }
-        public EConfigType configType
-        {
-            get; set;
-        }
-        public bool allowTest
-        {
-            get; set;
-        }
-    }
-}

v2rayN/v2rayN/Mode/SubItem.cs

@@ -1,51 +0,0 @@
-using SQLite;
-
-namespace v2rayN.Mode
-{
-    [Serializable]
-    public class SubItem
-    {
-        [PrimaryKey]
-        public string id
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// 备注
-        /// </summary>
-        public string remarks
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// url
-        /// </summary>
-        public string url
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// enable
-        /// </summary>
-        public bool enabled { get; set; } = true;
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public string userAgent
-        {
-            get; set;
-        } = string.Empty;
-
-
-        public int sort
-        {
-            get; set;
-        }
-        public string filter { get; set; }
-
-    }
-}

v2rayN/v2rayN/Mode/VmessQRCode.cs

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

v2rayN/v2rayN/Models/ComboItem.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Mode
+namespace v2rayN.Models
 {
     public class ComboItem
     {
@@ -6,6 +6,7 @@
         {
             get; set;
         }
+
         public string Text
         {
             get; set;

v2rayN/v2rayN/Models/Config.cs

@@ -0,0 +1,40 @@
+namespace v2rayN.Models
+{
+    /// <summary>
+    /// 本软件配置文件实体类
+    /// </summary>
+    [Serializable]
+    public class Config
+    {
+        #region property
+
+        public string indexId { get; set; }
+        public string subIndexId { get; set; }
+        public ESysProxyType sysProxyType { get; set; }
+        public string systemProxyExceptions { get; set; }
+        public string systemProxyAdvancedProtocol { get; set; }
+
+        public ECoreType runningCoreType { get; set; }
+
+        #endregion property
+
+        #region other entities
+
+        public CoreBasicItem coreBasicItem { get; set; }
+        public TunModeItem tunModeItem { get; set; }
+        public KcpItem kcpItem { get; set; }
+        public GrpcItem grpcItem { get; set; }
+        public RoutingBasicItem routingBasicItem { get; set; }
+        public GUIItem guiItem { get; set; }
+        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; }
+
+        #endregion other entities
+    }
+}

v2rayN/v2rayN/Models/ConfigItems.cs

@@ -0,0 +1,213 @@
+using System.Windows.Input;
+
+namespace v2rayN.Models
+{
+    [Serializable]
+    public class CoreBasicItem
+    {
+        /// <summary>
+        /// 允许日志
+        /// </summary>
+        public bool logEnabled { get; set; }
+
+        /// <summary>
+        /// 日志等级
+        /// </summary>
+        public string loglevel { get; set; }
+
+        /// <summary>
+        /// 允许Mux多路复用
+        /// </summary>
+        public bool muxEnabled { get; set; }
+
+        /// <summary>
+        /// 是否允许不安全连接
+        /// </summary>
+        public bool defAllowInsecure { get; set; }
+
+        public string defFingerprint { get; set; }
+
+        /// <summary>
+        /// 默认用户代理
+        /// </summary>
+        public string defUserAgent { get; set; }
+
+        public bool enableFragment { get; set; }
+
+        public bool enableCacheFile4Sbox { get; set; } = true;
+    }
+
+    [Serializable]
+    public class InItem
+    {
+        public int localPort { get; set; }
+
+        public string protocol { get; set; }
+
+        public bool udpEnabled { get; set; }
+
+        public bool sniffingEnabled { get; set; } = true;
+        public bool routeOnly { get; set; }
+
+        public bool allowLANConn { get; set; }
+
+        public bool newPort4LAN { get; set; }
+
+        public string user { get; set; }
+
+        public string pass { get; set; }
+    }
+
+    [Serializable]
+    public class KcpItem
+    {
+        public int mtu { get; set; }
+
+        public int tti { get; set; }
+
+        public int uplinkCapacity { get; set; }
+
+        public int downlinkCapacity { get; set; }
+
+        public bool congestion { get; set; }
+
+        public int readBufferSize { get; set; }
+
+        public int writeBufferSize { get; set; }
+    }
+
+    [Serializable]
+    public class GrpcItem
+    {
+        public int idle_timeout { get; set; }
+        public int health_check_timeout { get; set; }
+        public bool permit_without_stream { get; set; }
+        public int initial_windows_size { get; set; }
+    }
+
+    [Serializable]
+    public class GUIItem
+    {
+        public bool autoRun { get; set; }
+
+        public bool enableStatistics { get; set; }
+
+        public bool keepOlderDedupl { get; set; }
+
+        public bool ignoreGeoUpdateCore { get; set; } = true;
+
+        public int autoUpdateInterval { get; set; } = 10;
+
+        public bool checkPreReleaseUpdate { get; set; } = false;
+
+        public bool enableSecurityProtocolTls13 { get; set; }
+
+        public int trayMenuServersLimit { get; set; } = 20;
+
+        public bool enableHWA { get; set; } = false;
+
+        public bool enableLog { get; set; } = true;
+    }
+
+    [Serializable]
+    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; }
+        public int currentFontSize { get; set; }
+        public bool enableDragDropSort { get; set; }
+        public bool doubleClick2Activate { get; set; }
+        public bool autoHideStartup { get; set; }
+        public string mainMsgFilter { get; set; }
+        public List<ColumnItem> mainColumnItem { get; set; }
+    }
+
+    [Serializable]
+    public class ConstItem
+    {
+        public string defIEProxyExceptions { get; set; }
+        public string subConvertUrl { get; set; } = string.Empty;
+    }
+
+    [Serializable]
+    public class KeyEventItem
+    {
+        public EGlobalHotkey eGlobalHotkey { get; set; }
+
+        public bool Alt { get; set; }
+
+        public bool Control { get; set; }
+
+        public bool Shift { get; set; }
+
+        public Key? KeyCode { get; set; }
+    }
+
+    [Serializable]
+    public class CoreTypeItem
+    {
+        public EConfigType configType { get; set; }
+
+        public ECoreType coreType { get; set; }
+    }
+
+    [Serializable]
+    public class TunModeItem
+    {
+        public bool enableTun { get; set; }
+        public bool strictRoute { get; set; } = true;
+        public string stack { get; set; }
+        public int mtu { get; set; }
+        public bool enableExInbound { get; set; }
+        public bool enableIPv6Address { get; set; } = true;
+    }
+
+    [Serializable]
+    public class SpeedTestItem
+    {
+        public int speedTestTimeout { get; set; }
+        public string speedTestUrl { get; set; }
+        public string speedPingTestUrl { get; set; }
+    }
+
+    [Serializable]
+    public class RoutingBasicItem
+    {
+        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; }        
+    }
+
+    [Serializable]
+    public class ColumnItem
+    {
+        public string Name { get; set; }
+        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/Models/ConfigOld.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Mode
+namespace v2rayN.Models
 {
     [Serializable]
     public class ConfigOld
@@ -97,14 +97,17 @@
         {
             get; set;
         }
+
         public string domainMatcher
         {
             get; set;
         }
+
         public int routingIndex
         {
             get; set;
         }
+
         public bool enableRoutingAdvanced
         {
             get; set;
@@ -122,6 +125,7 @@
         {
             get; set;
         }
+
         public string systemProxyAdvancedProtocol { get; set; }
 
         public int autoUpdateInterval { get; set; } = 0;
@@ -137,7 +141,7 @@
 
         public int trayMenuServersLimit { get; set; }
 
-        #endregion
+        #endregion property
 
         #region other entities
 
@@ -172,6 +176,7 @@
         {
             get; set;
         }
+
         /// <summary>
         /// UI
         /// </summary>
@@ -179,6 +184,7 @@
         {
             get; set;
         }
+
         public List<RoutingItemOld> routings
         {
             get; set;
@@ -194,14 +200,12 @@
             get; set;
         }
 
-
         public List<CoreTypeItem> coreTypeItem
         {
             get; set;
         }
 
-        #endregion
-
+        #endregion other entities
     }
 
     [Serializable]
@@ -231,7 +235,6 @@
             groupId = string.Empty;
         }
 
-
         public string indexId
         {
             get; set;
@@ -265,6 +268,7 @@
         {
             get; set;
         }
+
         /// <summary>
         /// 远程服务器端口
         /// </summary>
@@ -272,6 +276,7 @@
         {
             get; set;
         }
+
         /// <summary>
         /// 远程服务器ID
         /// </summary>
@@ -279,6 +284,7 @@
         {
             get; set;
         }
+
         /// <summary>
         /// 远程服务器额外ID
         /// </summary>
@@ -286,6 +292,7 @@
         {
             get; set;
         }
+
         /// <summary>
         /// 本地安全策略
         /// </summary>
@@ -293,6 +300,7 @@
         {
             get; set;
         }
+
         /// <summary>
         /// tcp,kcp,ws,h2,quic
         /// </summary>
@@ -300,8 +308,9 @@
         {
             get; set;
         }
+
         /// <summary>
-        /// 备注或别名
+        ///
         /// </summary>
         public string remarks
         {
@@ -371,6 +380,7 @@
         {
             get; set;
         }
+
         /// <summary>
         /// tls sni
         /// </summary>
@@ -404,20 +414,24 @@
         {
             get; set;
         }
+
         public string url
         {
             get; set;
         }
+
         public List<RulesItem> rules
         {
             get; set;
         }
+
         public bool enabled { get; set; } = true;
 
         public bool locked
         {
             get; set;
         }
+
         public string customIcon
         {
             get; set;

v2rayN/v2rayN/Models/CoreInfo.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Mode
+namespace v2rayN.Models
 {
     [Serializable]
     public class CoreInfo
@@ -17,10 +17,11 @@
 
         public string coreDownloadUrl64 { get; set; }
 
+        public string coreDownloadUrlArm64 { get; set; }
+
         public string match { get; set; }
         public string versionArg { get; set; }
 
         public bool redirectInfo { get; set; }
-
     }
 }

v2rayN/v2rayN/Models/DNSItem.cs

@@ -0,0 +1,19 @@
+using SQLite;
+
+namespace v2rayN.Models
+{
+    [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/Models/EConfigType.cs

@@ -1,5 +1,4 @@
-
-namespace v2rayN.Mode
+namespace v2rayN.Models
 {
     public enum EConfigType
     {
@@ -8,6 +7,10 @@ namespace v2rayN.Mode
         Shadowsocks = 3,
         Socks = 4,
         VLESS = 5,
-        Trojan = 6
+        Trojan = 6,
+        Hysteria2 = 7,
+        Tuic = 8,
+        Wireguard = 9,
+        Http = 10
     }
 }

v2rayN/v2rayN/Models/ECoreType.cs

@@ -1,5 +1,4 @@
-
-namespace v2rayN.Mode
+namespace v2rayN.Models
 {
     public enum ECoreType
     {
@@ -9,10 +8,13 @@ namespace v2rayN.Mode
         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/Models/EGlobalHotkey.cs

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

v2rayN/v2rayN/Models/EInboundProtocol.cs

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

v2rayN/v2rayN/Models/EMove.cs

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

v2rayN/v2rayN/Models/EServerColName.cs

@@ -1,5 +1,4 @@
-
-namespace v2rayN.Mode
+namespace v2rayN.Models
 {
     public enum EServerColName
     {
@@ -8,12 +7,11 @@ namespace v2rayN.Mode
         remarks,
         address,
         port,
-        security,
         network,
         streamSecurity,
         subRemarks,
-        delay,
-        speed,
+        delayVal,
+        speedVal,
 
         todayDown,
         todayUp,

v2rayN/v2rayN/Models/ESpeedActionType.cs

@@ -1,9 +1,7 @@
-
-namespace v2rayN.Mode
+namespace v2rayN.Models
 {
     public enum ESpeedActionType
     {
-        Ping,
         Tcping,
         Realping,
         Speedtest,

v2rayN/v2rayN/Models/ESysProxyType.cs

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

v2rayN/v2rayN/Models/ETransport.cs

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

v2rayN/v2rayN/Models/EViewAction.cs

@@ -0,0 +1,8 @@
+namespace v2rayN.Models
+{
+    public enum EViewAction
+    {
+        AdjustMainLvColWidth,
+        ProfilesFocus
+    }
+}

v2rayN/v2rayN/Models/GitHubRelease.cs

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

v2rayN/v2rayN/Models/ProfileExItem.cs

@@ -0,0 +1,15 @@
+using SQLite;
+
+namespace v2rayN.Models
+{
+    [Serializable]
+    public class ProfileExItem
+    {
+        [PrimaryKey]
+        public string indexId { get; set; }
+
+        public int delay { get; set; }
+        public decimal speed { get; set; }
+        public int sort { get; set; }
+    }
+}

v2rayN/v2rayN/Models/ProfileItem.cs

@@ -1,7 +1,6 @@
 using SQLite;
-using v2rayN.Base;
 
-namespace v2rayN.Mode
+namespace v2rayN.Models
 {
     [Serializable]
     public class ProfileItem
@@ -11,7 +10,6 @@ namespace v2rayN.Mode
             indexId = string.Empty;
             configType = EConfigType.VMess;
             configVersion = 2;
-            sort = 0;
             address = string.Empty;
             port = 0;
             id = string.Empty;
@@ -29,6 +27,7 @@ namespace v2rayN.Mode
         }
 
         #region function
+
         public string GetSummary()
         {
             string summary = string.Format("[{0}] ", (configType).ToString());
@@ -48,16 +47,13 @@ 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);
-                    break;
-                default:
+                case EConfigType.Custom:
                     summary += string.Format("{0}", remarks);
                     break;
+
+                default:
+                    summary += string.Format("{0}({1}:{2})", remarks, addr, port);
+                    break;
             }
             return summary;
         }
@@ -76,176 +72,119 @@ 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;
             }
             return network.TrimEx();
         }
 
-        #endregion
+        #endregion function
 
         [PrimaryKey]
-        public string indexId
-        {
-            get; set;
-        }
+        public string indexId { get; set; }
 
         /// <summary>
         /// config type(1=normal,2=custom)
         /// </summary>
-        public EConfigType configType
-        {
-            get; set;
-        }
+        public EConfigType configType { get; set; }
 
         /// <summary>
         /// 版本(现在=2)
         /// </summary>
-        public int configVersion
-        {
-            get; set;
-        }
-
-        public int sort
-        {
-            get; set;
-        }
+        public int configVersion { get; set; }
 
         /// <summary>
         /// 远程服务器地址
         /// </summary>
-        public string address
-        {
-            get; set;
-        }
+        public string address { get; set; }
+
         /// <summary>
         /// 远程服务器端口
         /// </summary>
-        public int port
-        {
-            get; set;
-        }
+        public int port { get; set; }
+
         /// <summary>
         /// 远程服务器ID
         /// </summary>
-        public string id
-        {
-            get; set;
-        }
+        public string id { get; set; }
+
         /// <summary>
         /// 远程服务器额外ID
         /// </summary>
-        public int alterId
-        {
-            get; set;
-        }
+        public int alterId { get; set; }
+
         /// <summary>
         /// 本地安全策略
         /// </summary>
-        public string security
-        {
-            get; set;
-        }
+        public string security { get; set; }
+
         /// <summary>
         /// tcp,kcp,ws,h2,quic
         /// </summary>
-        public string network
-        {
-            get; set;
-        }
+        public string network { get; set; }
+
         /// <summary>
-        /// 备注或别名
+        ///
         /// </summary>
-        public string remarks
-        {
-            get; set;
-        }
+        public string remarks { get; set; }
 
         /// <summary>
         /// 伪装类型
         /// </summary>
-        public string headerType
-        {
-            get; set;
-        }
+        public string headerType { get; set; }
 
         /// <summary>
         /// 伪装的域名
         /// </summary>
-        public string requestHost
-        {
-            get; set;
-        }
+        public string requestHost { get; set; }
 
         /// <summary>
         /// ws h2 path
         /// </summary>
-        public string path
-        {
-            get; set;
-        }
+        public string path { get; set; }
 
         /// <summary>
         /// 传输层安全
         /// </summary>
-        public string streamSecurity
-        {
-            get; set;
-        }
+        public string streamSecurity { get; set; }
 
         /// <summary>
         /// 是否允许不安全连接（用于客户端）
         /// </summary>
-        public string allowInsecure
-        {
-            get; set;
-        }
-
-        public int delay { get; set; }
-        public decimal speed { get; set; }
+        public string allowInsecure { get; set; }
 
         /// <summary>
         /// SubItem id
         /// </summary>
-        public string subid
-        {
-            get; set;
-        }
+        public string subid { get; set; }
+
         public bool isSub { get; set; } = true;
 
         /// <summary>
         /// VLESS flow
         /// </summary>
-        public string flow
-        {
-            get; set;
-        }
+        public string flow { get; set; }
+
         /// <summary>
         /// tls sni
         /// </summary>
-        public string sni
-        {
-            get; set;
-        }
+        public string sni { get; set; }
+
         /// <summary>
         /// tls alpn
         /// </summary>
         public string alpn { get; set; } = string.Empty;
 
+        public ECoreType? coreType { get; set; }
 
-        public ECoreType? coreType
-        {
-            get; set;
-        }
-
-        public int preSocksPort
-        {
-            get; set;
-        }
+        public int preSocksPort { get; set; }
 
         public string fingerprint { get; set; }
 
         public bool displayLog { get; set; } = true;
+        public string publicKey { get; set; }
+        public string shortId { get; set; }
+        public string spiderX { get; set; }
     }
 }

v2rayN/v2rayN/Models/ProfileItemModel.cs

@@ -1,16 +1,18 @@
-namespace v2rayN.Mode
+namespace v2rayN.Models
 {
     [Serializable]
     public class ProfileItemModel : ProfileItem
     {
         public bool isActive { get; set; }
         public string subRemarks { get; set; }
+        public int delay { get; set; }
+        public decimal speed { get; set; }
+        public int sort { get; set; }
         public string delayVal { get; set; }
         public string speedVal { get; set; }
         public string todayUp { get; set; }
         public string todayDown { get; set; }
         public string totalUp { get; set; }
         public string totalDown { get; set; }
-
     }
 }

v2rayN/v2rayN/Models/RoutingItem.cs

@@ -1,12 +1,13 @@
 using SQLite;
 
-namespace v2rayN.Mode
+namespace v2rayN.Models
 {
     [Serializable]
     public class RoutingItem
     {
         [PrimaryKey]
         public string id { get; set; }
+
         public string remarks { get; set; }
         public string url { get; set; }
         public string ruleSet { get; set; }
@@ -14,7 +15,9 @@ namespace v2rayN.Mode
         public bool enabled { get; set; } = true;
         public bool locked { get; set; }
         public string customIcon { get; set; }
+        public string customRulesetPath4Singbox { get; set; }
         public string domainStrategy { get; set; }
-
+        public string domainStrategy4Singbox { get; set; }
+        public int sort { get; set; }
     }
 }

v2rayN/v2rayN/Models/RoutingItemModel.cs

@@ -1,9 +1,8 @@
-namespace v2rayN.Mode
+namespace v2rayN.Models
 {
     [Serializable]
     public class RoutingItemModel : RoutingItem
     {
         public bool isActive { get; set; }
-
     }
 }

v2rayN/v2rayN/Models/RulesItem.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Mode
+namespace v2rayN.Models
 {
     [Serializable]
     public class RulesItem
@@ -18,8 +18,8 @@
 
         public List<string> protocol { get; set; }
 
+        public List<string> process { get; set; }
+
         public bool enabled { get; set; } = true;
-
     }
-
 }

v2rayN/v2rayN/Models/RulesItemModel.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Mode
+namespace v2rayN.Models
 {
     [Serializable]
     public class RulesItemModel : RulesItem
@@ -10,6 +10,5 @@
         public string domains { get; set; }
 
         public string protocols { get; set; }
-
     }
 }

v2rayN/v2rayN/Models/ServerSpeedItem.cs

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

v2rayN/v2rayN/Models/ServerStatItem.cs

@@ -1,6 +1,6 @@
 using SQLite;
 
-namespace v2rayN.Mode
+namespace v2rayN.Models
 {
     [Serializable]
     public class ServerStatItem
@@ -10,22 +10,27 @@ namespace v2rayN.Mode
         {
             get; set;
         }
+
         public long totalUp
         {
             get; set;
         }
+
         public long totalDown
         {
             get; set;
         }
+
         public long todayUp
         {
             get; set;
         }
+
         public long todayDown
         {
             get; set;
         }
+
         public long dateNow
         {
             get; set;

v2rayN/v2rayN/Models/ServerTestItem.cs

@@ -0,0 +1,13 @@
+namespace v2rayN.Models
+{
+    [Serializable]
+    internal class ServerTestItem
+    {
+        public string indexId { get; set; }
+        public string address { get; set; }
+        public int port { get; set; }
+        public EConfigType configType { get; set; }
+        public bool allowTest { get; set; }
+        public int delay { get; set; }
+    }
+}

v2rayN/v2rayN/Models/SingboxConfig.cs

@@ -0,0 +1,246 @@
+namespace v2rayN.Models
+{
+    public class SingboxConfig
+    {
+        public Log4Sbox log { get; set; }
+        public Dns4Sbox? dns { get; set; }
+        public List<Inbound4Sbox> inbounds { get; set; }
+        public List<Outbound4Sbox> outbounds { get; set; }
+        public Route4Sbox route { get; set; }
+        public Experimental4Sbox? experimental { get; set; }
+    }
+
+    public 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; }
+        public List<Ruleset4Sbox>? rule_set { 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 bool? ip_is_private { get; set; }
+        public List<int>? port { get; set; }
+        public List<string>? port_range { get; set; }
+        public List<string>? geosite { get; set; }
+        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; }
+        public List<string>? rule_set { 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 string? plugin { get; set; }
+        public string? plugin_opts { get; set; }
+        public Tls4Sbox? tls { get; set; }
+        public Multiplex4Sbox? multiplex { get; set; }
+        public Transport4Sbox? transport { get; set; }
+        public HyObfs4Sbox? obfs { get; set; }
+    }
+
+    public class Tls4Sbox
+    {
+        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 object? host { get; set; }
+        public string? path { get; set; }
+        public Headers4Sbox? headers { get; set; }
+
+        public string? service_name { get; set; }
+        public string? idle_timeout { get; set; }
+        public string? ping_timeout { get; set; }
+        public 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; }
+    }
+
+    public class Ruleset4Sbox
+    {
+        public string? tag { get; set; }
+        public string? type { get; set; }
+        public string? format { get; set; }
+        public string? path { get; set; }
+        public string? url { get; set; }
+        public string? download_detour { get; set; }
+        public string? update_interval { get; set; }  
+    }
+}

v2rayN/v2rayN/Models/SsSIP008.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Mode
+namespace v2rayN.Models
 {
     public class SsSIP008
     {
@@ -15,5 +15,4 @@
         public string password { get; set; }
         public string plugin { get; set; }
     }
-
 }

v2rayN/v2rayN/Models/SubItem.cs

@@ -0,0 +1,35 @@
+using SQLite;
+
+namespace v2rayN.Models
+{
+    [Serializable]
+    public class SubItem
+    {
+        [PrimaryKey]
+        public string id { get; set; }
+
+        public string remarks { get; set; }
+
+        public string url { get; set; }
+
+        public string moreUrl { get; set; }
+
+        public bool enabled { get; set; } = true;
+
+        public string userAgent { get; set; } = string.Empty;
+
+        public int sort { get; set; }
+
+        public string? filter { get; set; }
+
+        public int autoUpdateInterval { get; set; }
+
+        public long updateTime { get; set; }
+
+        public string? convertTarget { get; set; }
+
+        public string? prevProfile { get; set; }
+
+        public string? nextProfile { get; set; }
+    }
+}

v2rayN/v2rayN/Models/SysProxyConfig.cs

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

v2rayN/v2rayN/Models/V2rayConfig.cs

@@ -1,121 +1,139 @@
-namespace v2rayN.Mode
+using System.Text.Json.Serialization;
+
+namespace v2rayN.Models
 {
     /// <summary>
-    /// v2ray配置文件实体类
-    /// 例子SampleConfig.txt
+    /// v2ray配置文件实体类 例子SampleConfig.txt
     /// </summary>
     public class V2rayConfig
     {
+        /// <summary>
+        /// Properties that do not belong to Ray
+        /// </summary>
+        public string? remarks { get; set; }
+
         /// <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 配置
         /// </summary>
         public object dns { get; set; }
+
         /// <summary>
         /// 路由配置
         /// </summary>
-        public Routing routing { get; set; }
+        public Routing4Ray routing { get; set; }
     }
 
-    public class Stats { };
+    public class Stats4Ray
+    { };
 
-    public class API
+    public class API4Ray
     {
         public string tag { get; set; }
         public List<string> services { get; set; }
     }
 
-    public class Policy
+    public class Policy4Ray
     {
-        public SystemPolicy system;
+        public SystemPolicy4Ray system { 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>
         ///
         /// </summary>
         public string access { get; set; }
+
         /// <summary>
         ///
         /// </summary>
         public string error { get; set; }
+
         /// <summary>
         ///
         /// </summary>
         public string loglevel { get; set; }
     }
 
-    public class Inbounds
+    public class Inbounds4Ray
     {
         public string tag { get; set; }
+
         /// <summary>
         ///
         /// </summary>
         public int port { get; set; }
+
         /// <summary>
         ///
         /// </summary>
         public string listen { get; set; }
+
         /// <summary>
         ///
         /// </summary>
         public string protocol { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
-        public Sniffing sniffing { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
-        public Inboundsettings settings { get; set; }
 
         /// <summary>
         ///
         /// </summary>
-        public StreamSettings streamSettings { get; set; }
+        public Sniffing4Ray sniffing { get; set; }
 
+        /// <summary>
+        ///
+        /// </summary>
+        public Inboundsettings4Ray settings { get; set; }
+
+        /// <summary>
+        ///
+        /// </summary>
+        public StreamSettings4Ray streamSettings { get; set; }
     }
 
-    public class Inboundsettings
+    public class Inboundsettings4Ray
     {
         /// <summary>
         ///
         /// </summary>
         public string auth { get; set; }
+
         /// <summary>
         ///
         /// </summary>
         public bool udp { get; set; }
+
         /// <summary>
         ///
         /// </summary>
@@ -129,8 +147,7 @@
         /// <summary>
         ///
         /// </summary>
-        public List<UsersItem> clients { get; set; }
-
+        public List<UsersItem4Ray> clients { get; set; }
 
         /// <summary>
         /// VLESS
@@ -139,23 +156,26 @@
 
         public bool allowTransparent { get; set; }
 
-        public List<AccountsItem> accounts { get; set; }
+        public List<AccountsItem4Ray> accounts { get; set; }
     }
 
-    public class UsersItem
+    public class UsersItem4Ray
     {
         /// <summary>
         ///
         /// </summary>
         public string id { get; set; }
+
         /// <summary>
         ///
         /// </summary>
         public int alterId { get; set; }
+
         /// <summary>
         ///
         /// </summary>
         public string email { get; set; }
+
         /// <summary>
         ///
         /// </summary>
@@ -169,54 +189,60 @@
         /// <summary>
         /// VLESS
         /// </summary>
-        public string flow { get; set; }
+        public string? flow { get; set; }
     }
-    public class Sniffing
+
+    public class Sniffing4Ray
     {
         public bool enabled { get; set; }
         public List<string> destOverride { get; set; }
         public bool routeOnly { get; set; }
     }
 
-    public class Outbounds
+    public class Outbounds4Ray
     {
         /// <summary>
         /// 默认值agentout
         /// </summary>
         public string tag { get; set; }
+
         /// <summary>
         ///
         /// </summary>
         public string protocol { get; set; }
+
         /// <summary>
         ///
         /// </summary>
-        public Outboundsettings settings { get; set; }
+        public Outboundsettings4Ray settings { get; set; }
+
         /// <summary>
         ///
         /// </summary>
-        public StreamSettings streamSettings { get; set; }
+        public StreamSettings4Ray streamSettings { get; set; }
+
         /// <summary>
         ///
         /// </summary>
-        public Mux mux { get; set; }
+        public Mux4Ray mux { get; set; }
     }
 
-    public class Outboundsettings
+    public class Outboundsettings4Ray
     {
         /// <summary>
         ///
         /// </summary>
-        public List<VnextItem> vnext { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
-        public List<ServersItem> servers { get; set; }
+        public List<VnextItem4Ray>? vnext { get; set; }
 
         /// <summary>
         ///
         /// </summary>
-        public Response response { get; set; }
+        public List<ServersItem4Ray> servers { get; set; }
+
+        /// <summary>
+        ///
+        /// </summary>
+        public Response4Ray response { get; set; }
 
         /// <summary>
         ///
@@ -227,53 +253,64 @@
         ///
         /// </summary>
         public int? userLevel { get; set; }
+
+        public FragmentItem4Ray? fragment { get; set; }
     }
 
-    public class VnextItem
+    public class VnextItem4Ray
     {
         /// <summary>
         ///
         /// </summary>
         public string address { get; set; }
+
         /// <summary>
         ///
         /// </summary>
         public int port { get; set; }
+
         /// <summary>
         ///
         /// </summary>
-        public List<UsersItem> users { get; set; }
+        public List<UsersItem4Ray> users { get; set; }
     }
-    public class ServersItem
+
+    public class ServersItem4Ray
     {
         /// <summary>
         ///
         /// </summary>
         public string email { get; set; }
+
         /// <summary>
         ///
         /// </summary>
         public string address { get; set; }
+
         /// <summary>
         ///
         /// </summary>
-        public string method { get; set; }
+        public string? method { get; set; }
+
         /// <summary>
         ///
         /// </summary>
-        public bool ota { get; set; }
+        public bool? ota { get; set; }
+
         /// <summary>
         ///
         /// </summary>
-        public string password { get; set; }
+        public string? password { get; set; }
+
         /// <summary>
         ///
         /// </summary>
         public int port { get; set; }
+
         /// <summary>
         ///
         /// </summary>
-        public int level { get; set; }
+        public int? level { get; set; }
 
         /// <summary>
         /// trojan
@@ -283,27 +320,28 @@
         /// <summary>
         ///
         /// </summary>
-        public List<SocksUsersItem> users { get; set; }
+        public List<SocksUsersItem4Ray> users { get; set; }
     }
 
-    public class SocksUsersItem
+    public class SocksUsersItem4Ray
     {
         /// <summary>
         ///
         /// </summary>
         public string user { get; set; }
+
         /// <summary>
         ///
         /// </summary>
         public string pass { get; set; }
+
         /// <summary>
         ///
         /// </summary>
-        public int level { get; set; }
+        public int? level { get; set; }
     }
 
-
-    public class Mux
+    public class Mux4Ray
     {
         /// <summary>
         ///
@@ -316,7 +354,7 @@
         public int concurrency { get; set; }
     }
 
-    public class Response
+    public class Response4Ray
     {
         /// <summary>
         ///
@@ -324,7 +362,7 @@
         public string type { get; set; }
     }
 
-    public class Dns
+    public class Dns4Ray
     {
         /// <summary>
         ///
@@ -332,28 +370,49 @@
         public List<string> servers { get; set; }
     }
 
-    public class Routing
+    public class Routing4Ray
     {
         /// <summary>
         ///
         /// </summary>
         public string domainStrategy { get; set; }
+
         /// <summary>
         ///
         /// </summary>
         public string domainMatcher { get; set; }
+
         /// <summary>
         ///
         /// </summary>
-        public List<RulesItem> rules { get; set; }
+        public List<RulesItem4Ray> rules { get; set; }
     }
 
-    public class StreamSettings
+    [Serializable]
+    public class RulesItem4Ray
+    {
+        public string? type { get; set; }
+
+        public string? port { get; set; }
+
+        public List<string>? inboundTag { get; set; }
+
+        public string? outboundTag { get; set; }
+
+        public List<string>? ip { get; set; }
+
+        public List<string>? domain { get; set; }
+
+        public List<string>? protocol { get; set; }
+    }
+
+    public class StreamSettings4Ray
     {
         /// <summary>
         ///
         /// </summary>
         public string network { get; set; }
+
         /// <summary>
         ///
         /// </summary>
@@ -362,132 +421,154 @@
         /// <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>
+        ///
+        /// </summary>
+        public HttpupgradeSettings4Ray? httpupgradeSettings { 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 xtls
+        /// VLESS only
         /// </summary>
-        public TlsSettings xtlsSettings { 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>
         /// 是否允许不安全连接（用于客户端）
         /// </summary>
-        public bool allowInsecure { get; set; }
+        public bool? allowInsecure { get; set; }
 
         /// <summary>
         ///
         /// </summary>
-        public string serverName { get; set; }
+        public string? serverName { get; set; }
+
         /// <summary>
         ///
         /// </summary>
-        public List<string> alpn
-        {
-            get; set;
+        public List<string>? alpn { get; set; }
+
+        public string? fingerprint { get; set; }
+
+        public bool? show { get; set; } = false;
+        public string? publicKey { get; set; }
+        public string? shortId { get; set; }
+        public string? spiderX { get; set; }
     }
 
-        /// <summary>
-        /// "chrome" | "firefox" | "safari" | "randomized"
-        /// </summary>
-        public string fingerprint { get; set; }
-
-    }
-
-    public class TcpSettings
+    public class TcpSettings4Ray
     {
         /// <summary>
         /// 数据包头部伪装设置
         /// </summary>
-        public Header header { get; set; }
+        public Header4Ray header { get; set; }
     }
 
-    public class Header
+    public class Header4Ray
     {
         /// <summary>
         /// 伪装
         /// </summary>
         public string type { get; set; }
+
         /// <summary>
         /// 结构复杂，直接存起来
         /// </summary>
         public object request { get; set; }
+
         /// <summary>
         /// 结构复杂，直接存起来
         /// </summary>
         public object response { get; set; }
     }
 
-    public class KcpSettings
+    public class KcpSettings4Ray
     {
         /// <summary>
         ///
         /// </summary>
         public int mtu { get; set; }
+
         /// <summary>
         ///
         /// </summary>
         public int tti { get; set; }
+
         /// <summary>
         ///
         /// </summary>
         public int uplinkCapacity { get; set; }
+
         /// <summary>
         ///
         /// </summary>
         public int downlinkCapacity { get; set; }
+
         /// <summary>
         ///
         /// </summary>
         public bool congestion { get; set; }
+
         /// <summary>
         ///
         /// </summary>
         public int readBufferSize { get; set; }
+
         /// <summary>
         ///
         /// </summary>
         public int writeBufferSize { get; set; }
+
         /// <summary>
         ///
         /// </summary>
-        public Header header { get; set; }
+        public Header4Ray header { get; set; }
+
         /// <summary>
         ///
         /// </summary>
         public string seed { get; set; }
     }
 
-    public class WsSettings
+    public class WsSettings4Ray
     {
         /// <summary>
         ///
@@ -497,17 +578,37 @@
         /// <summary>
         ///
         /// </summary>
-        public Headers headers { get; set; }
+        public Headers4Ray headers { get; set; }
     }
-    public class Headers
+
+    public class Headers4Ray
     {
         /// <summary>
         ///
         /// </summary>
         public string Host { get; set; }
+
+        /// <summary>
+        /// 用户代理
+        /// </summary>
+        [JsonPropertyName("User-Agent")]
+        public string UserAgent { get; set; }
     }
 
-    public class HttpSettings
+    public class HttpupgradeSettings4Ray
+    {
+        /// <summary>
+        ///
+        /// </summary>
+        public string? path { get; set; }
+
+        /// <summary>
+        ///
+        /// </summary>
+        public string? host { get; set; }
+    }
+
+    public class HttpSettings4Ray
     {
         /// <summary>
         ///
@@ -518,15 +619,15 @@
         ///
         /// </summary>
         public List<string> host { get; set; }
-
     }
 
-    public class QuicSettings
+    public class QuicSettings4Ray
     {
         /// <summary>
         ///
         /// </summary>
         public string security { get; set; }
+
         /// <summary>
         ///
         /// </summary>
@@ -535,12 +636,13 @@
         /// <summary>
         ///
         /// </summary>
-        public Header header { get; set; }
+        public Header4Ray header { get; set; }
     }
 
-    public class GrpcSettings
+    public class GrpcSettings4Ray
     {
-        public string serviceName { get; set; }
+        public string? authority { get; set; }
+        public string? serviceName { get; set; }
         public bool multiMode { get; set; }
         public int idle_timeout { get; set; }
         public int health_check_timeout { get; set; }
@@ -548,15 +650,28 @@
         public int initial_windows_size { get; set; }
     }
 
-    public class AccountsItem
+    public class AccountsItem4Ray
     {
         /// <summary>
         ///
         /// </summary>
         public string user { get; set; }
+
         /// <summary>
         ///
         /// </summary>
         public string pass { get; set; }
     }
+
+    public class Sockopt4Ray
+    {
+        public string? dialerProxy { get; set; }
+    }
+
+    public class FragmentItem4Ray
+    {
+        public string? packets { get; set; }
+        public string? length { get; set; }
+        public string? interval { get; set; }
+    }
 }

v2rayN/v2rayN/Models/V2rayTcpRequest.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Mode
+namespace v2rayN.Models
 {
     /// <summary>
     /// Tcp伪装http的Request，只要Host
@@ -18,6 +18,4 @@
         /// </summary>
         public List<string> Host { get; set; }
     }
-
-
 }

v2rayN/v2rayN/Models/VmessQRCode.cs

@@ -0,0 +1,44 @@
+using System.Text.Json.Serialization;
+
+namespace v2rayN.Models
+{
+    /// <summary>
+    /// https://github.com/2dust/v2rayN/wiki/
+    /// </summary>
+    [Serializable]
+    internal class VmessQRCode
+    {
+        [JsonNumberHandling(JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+        public int v { get; set; } = 2;
+
+        public string ps { get; set; } = string.Empty;
+
+        public string add { get; set; } = string.Empty;
+
+        [JsonNumberHandling(JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+        public int port { get; set; } = 0;
+
+        public string id { get; set; } = string.Empty;
+
+        [JsonNumberHandling(JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+        public int aid { get; set; } = 0;
+
+        public string scy { get; set; } = string.Empty;
+
+        public string net { get; set; } = string.Empty;
+
+        public string type { get; set; } = string.Empty;
+
+        public string host { get; set; } = string.Empty;
+
+        public string path { get; set; } = string.Empty;
+
+        public string tls { get; set; } = string.Empty;
+
+        public string sni { get; set; } = string.Empty;
+
+        public string alpn { get; set; } = string.Empty;
+
+        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.fa-Ir.resx

@@ -118,22 +118,22 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="BatchExportSubscriptionSuccessfully" xml:space="preserve">
-    <value>Batch export subscription to clipboard successfully</value>
+    <value>صادرات دسته ای محتوای اشتراک به کلیپ بورد با موفقیت انجام شد</value>
   </data>
   <data name="BatchExportURLSuccessfully" xml:space="preserve">
     <value>Batch export share URL to clipboard successfully</value>
   </data>
   <data name="CheckServerSettings" xml:space="preserve">
-    <value>Please check the server settings first</value>
+    <value>لطفا ابتدا تنظیمات سرور را بررسی کنید</value>
   </data>
   <data name="ConfigurationFormatIncorrect" xml:space="preserve">
-    <value>Invalid configuration format</value>
+    <value>فرمت پیکربندی نادرست است</value>
   </data>
   <data name="CustomServerTips" xml:space="preserve">
-    <value>Note that custom configuration relies entirely on your own configuration and does not work with all settings. If you want to use the system proxy, please modify the listening port manually.</value>
+    <value>توجه داشته باشید که پیکربندی سفارشی کاملاً به پیکربندی خود شما بستگی دارد و با همه تنظیمات کار نمی کند. اگر می خواهید از پروکسی سیستم استفاده کنید، لطفاً پورت درحال شنود را به صورت دستی تغییر دهید.</value>
   </data>
   <data name="Downloading" xml:space="preserve">
-    <value>Downloading...</value>
+    <value>درحال دانلود...</value>
   </data>
   <data name="downloadSpeed" xml:space="preserve">
     <value>دانلود</value>
@@ -142,62 +142,59 @@
     <value>Whether to download? {0}</value>
   </data>
   <data name="FailedConversionConfiguration" xml:space="preserve">
-    <value>Failed to convert configuration file</value>
+    <value>تبدیل فایل پیکربندی انجام نشد</value>
   </data>
   <data name="FailedGenDefaultConfiguration" xml:space="preserve">
-    <value>Failed to generate default configuration file</value>
+    <value>فایل پیکربندی پیش فرض ایجاد نشد</value>
   </data>
   <data name="FailedGetDefaultConfiguration" xml:space="preserve">
-    <value> Failed to get the default configuration</value>
+    <value>پیکربندی پیش فرض دریافت نشد</value>
   </data>
   <data name="FailedImportedCustomServer" xml:space="preserve">
-    <value>Failed to import custom configuration server</value>
+    <value>سرور پیکربندی سفارشی وارد نشد</value>
   </data>
   <data name="FailedReadConfiguration" xml:space="preserve">
-    <value>Failed to read configuration file</value>
+    <value>فایل پیکربندی خوانده نشد</value>
   </data>
   <data name="FillCorrectServerPort" xml:space="preserve">
-    <value>Please fill in the correct format server port</value>
+    <value>لطفا فرمت صحیح پورت سرور را پر کنید</value>
   </data>
   <data name="FillKcpParameters" xml:space="preserve">
-    <value>Please fill in the KCP parameters correctly</value>
+    <value>لطفاً پارامترهای KCP را به درستی پر کنید</value>
   </data>
   <data name="FillLocalListeningPort" xml:space="preserve">
-    <value>Please fill in the local listening port</value>
+    <value>لطفاً پورت گوش دادن محلی را پر کنید</value>
   </data>
   <data name="FillPassword" xml:space="preserve">
-    <value>Please fill in the password</value>
+    <value>لطفا رمز عبور را وارد کنید</value>
   </data>
   <data name="FillServerAddress" xml:space="preserve">
-    <value>Please fill in the server address</value>
+    <value>لطفا آدرس سرور را وارد کنید</value>
   </data>
   <data name="FillUUID" xml:space="preserve">
-    <value>Please fill in the user ID</value>
+    <value>لطفا شناسه کاربری را وارد کنید</value>
   </data>
   <data name="IncorrectClientConfiguration" xml:space="preserve">
-    <value> is not the correct client configuration file, please check</value>
+    <value>فایل پیکربندی مشتری صحیح نیست، لطفا بررسی کنید</value>
   </data>
   <data name="Incorrectconfiguration" xml:space="preserve">
-    <value> is not the correct configuration, please check</value>
+    <value>پیکربندی درستی نیست، لطفا بررسی کنید</value>
   </data>
   <data name="IncorrectServerConfiguration" xml:space="preserve">
-    <value> is not the correct server configuration file, please check</value>
+    <value>فایل پیکربندی سرور صحیح نیست، لطفا بررسی کنید</value>
   </data>
   <data name="InitialConfiguration" xml:space="preserve">
-    <value>Initial Configuration</value>
+    <value>پیکربندی اولیه</value>
   </data>
   <data name="IsLatestCore" xml:space="preserve">
-    <value>{0} already up to date.</value>
+    <value>{0} {1} در حال حاضر به روز است.</value>
   </data>
   <data name="IsLatestN" xml:space="preserve">
-    <value>{0} already up to date.</value>
+    <value>{0} {1} در حال حاضر به روز است.</value>
   </data>
   <data name="LvAddress" xml:space="preserve">
     <value>آدرس</value>
   </data>
-  <data name="LvAlias" xml:space="preserve">
-    <value>Alias</value>
-  </data>
   <data name="LvEncryptionMethod" xml:space="preserve">
     <value>امنیت</value>
   </data>
@@ -205,88 +202,67 @@
     <value>پورت</value>
   </data>
   <data name="LvServiceType" xml:space="preserve">
-    <value>Type</value>
+    <value>نوع</value>
   </data>
   <data name="LvSubscription" xml:space="preserve">
-    <value>Subs group</value>
-  </data>
-  <data name="LvTestResults" xml:space="preserve">
-    <value>Test Results</value>
+    <value>گروه فرعی</value>
   </data>
   <data name="LvTodayDownloadDataAmount" xml:space="preserve">
-    <value>Download traffic today</value>
+    <value> ترافیک دانلود امروز</value>
   </data>
   <data name="LvTodayUploadDataAmount" xml:space="preserve">
-    <value>Upload traffic today</value>
+    <value> ترافیک اپلود امروز</value>
   </data>
   <data name="LvTotalDownloadDataAmount" xml:space="preserve">
-    <value>Total download traffic</value>
+    <value>کل ترافیک دانلود</value>
   </data>
   <data name="LvTotalUploadDataAmount" xml:space="preserve">
-    <value>Total upload traffic</value>
+    <value>کل ترافیک آپلود</value>
   </data>
   <data name="LvTransportProtocol" xml:space="preserve">
-    <value>Transport</value>
-  </data>
-  <data name="MediumFresh" xml:space="preserve">
-    <value>Medium</value>
+    <value>جابجایی</value>
   </data>
   <data name="MsgClearSubscription" xml:space="preserve">
-    <value>Clear original subscription content</value>
+    <value>محتوای اشتراک اصلی را پاک کنید</value>
   </data>
   <data name="MsgDownloadV2rayCoreSuccessfully" xml:space="preserve">
-    <value>Download Core successfully</value>
+    <value>دانلود Core با موفقیت</value>
   </data>
   <data name="MsgFailedImportSubscription" xml:space="preserve">
-    <value>Failed to import subscription content</value>
+    <value>محتوای اشتراک وارد نشد</value>
   </data>
   <data name="MsgGetSubscriptionSuccessfully" xml:space="preserve">
-    <value>Get subscription content successfully</value>
+    <value>محتوای اشتراک با موفقیت دریافت شد</value>
   </data>
   <data name="MsgNoValidSubscription" xml:space="preserve">
-    <value>No valid subscriptions set</value>
-  </data>
-  <data name="MsgPACUpdateFailed" xml:space="preserve">
-    <value>PAC update failed</value>
-  </data>
-  <data name="MsgPACUpdateSuccessfully" xml:space="preserve">
-    <value>PAC update succeeded</value>
+    <value>هیچ اشتراک معتبری تنظیم نشده است</value>
   </data>
   <data name="MsgParsingSuccessfully" xml:space="preserve">
     <value>Resolve {0} successfully</value>
   </data>
-  <data name="MsgSimplifyPAC" xml:space="preserve">
-    <value>Simplify PAC Success</value>
-  </data>
   <data name="MsgStartGettingSubscriptions" xml:space="preserve">
-    <value>Start getting subscriptions</value>
+    <value>شروع به دریافت اشتراک شد</value>
   </data>
   <data name="MsgStartUpdating" xml:space="preserve">
-    <value>Start updating {0}...</value>
-  </data>
-  <data name="MsgStartUpdatingPAC" xml:space="preserve">
-    <value>Start updating PAC...</value>
+    <value>شروع بروزرسانی {0}...</value>
   </data>
   <data name="MsgSubscriptionDecodingFailed" xml:space="preserve">
-    <value>Invalid subscription content</value>
+    <value>محتوای اشتراک نامعتبر است</value>
   </data>
   <data name="MsgUnpacking" xml:space="preserve">
-    <value>is unpacking...</value>
+    <value>در حال باز کردن بسته می باشد ...</value>
   </data>
   <data name="MsgUpdateSubscriptionEnd" xml:space="preserve">
-    <value>Update subscription end</value>
+    <value>بروزرسانی اشتراک به پایان رسید</value>
   </data>
   <data name="MsgUpdateSubscriptionStart" xml:space="preserve">
-    <value>Update subscription starts</value>
+    <value>بروزرسانی اشتراک شروع شد</value>
   </data>
   <data name="MsgUpdateV2rayCoreSuccessfully" xml:space="preserve">
-    <value>Update Core successfully</value>
+    <value>هسته با موفقیت بروزرسانی شد</value>
   </data>
   <data name="MsgUpdateV2rayCoreSuccessfullyMore" xml:space="preserve">
-    <value>Update Core successfully! Restarting service...</value>
-  </data>
-  <data name="NeedHttpGlobalProxy" xml:space="preserve">
-    <value> This feature relies on the Http global proxy, please set it correctly first.</value>
+    <value>هسته با موفقیت بروزرسانی شد! راه اندازی مجدد سرویس...</value>
   </data>
   <data name="NonvmessOrssProtocol" xml:space="preserve">
     <value>Non-VMess or ss protocol</value>
@@ -301,74 +277,59 @@
     <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> عملیات انجام نشد، لطفا بررسی کنید و دوباره امتحان کنید</value>
   </data>
   <data name="PleaseFillRemarks" xml:space="preserve">
     <value>Please Fill Remarks</value>
   </data>
   <data name="PleaseSelectEncryption" xml:space="preserve">
-    <value>Please select the encryption method</value>
+    <value>لطفاً روش رمزگذاری را انتخاب کنید</value>
   </data>
   <data name="PleaseSelectProtocol" xml:space="preserve">
-    <value>Please select a protocol</value>
+    <value>لطفا یک پروتکل انتخاب کنید</value>
   </data>
   <data name="PleaseSelectServer" xml:space="preserve">
-    <value>Please select the server first</value>
-  </data>
-  <data name="QuickFresh" xml:space="preserve">
-    <value>Fast</value>
+    <value>لطفا ابتدا سرور را انتخاب کنید</value>
   </data>
   <data name="RemoveDuplicateServerResult" xml:space="preserve">
     <value>Servers deduplication completed. Old: {0}, New: {1}.</value>
   </data>
   <data name="RemoveServer" xml:space="preserve">
-    <value>Are you sure to remove the server?</value>
+    <value>آیا مطمئن هستید که سرور را حذف می کنید؟</value>
   </data>
   <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="SlowFresh" xml:space="preserve">
-    <value>Slow</value>
-  </data>
-  <data name="SpeedServerTips" xml:space="preserve">
-    <value>Note: This feature relies on the Http global proxy. Please manually adjust the Http global proxy and active node after testing.</value>
-  </data>
-  <data name="StartPacFailed" xml:space="preserve">
-    <value>PAC failed to start. Please run this program as Administrator.</value>
-  </data>
   <data name="StartService" xml:space="preserve">
     <value>Start service ({0})...</value>
   </data>
   <data name="SuccessfulConfiguration" xml:space="preserve">
-    <value>Configuration successful
+    <value>پیکربندی با موفقیت انجام شد
 {0}</value>
   </data>
   <data name="SuccessfullyImportedCustomServer" xml:space="preserve">
-    <value>Custom configuration server imported successfully.</value>
+    <value>سرور پیکربندی سفارشی با موفقیت وارد شد.</value>
   </data>
   <data name="SuccessfullyImportedServerViaClipboard" xml:space="preserve">
-    <value>{0} servers have been imported from clipboard.</value>
+    <value>{0} سرورها از کلیپ بورد وارد شده اند.</value>
   </data>
   <data name="SuccessfullyImportedServerViaScan" xml:space="preserve">
-    <value>Scan import URL successfully</value>
+    <value>اسکن URL وارد کردن با موفقیت</value>
   </data>
   <data name="TestMeOutput" xml:space="preserve">
-    <value>The ping of current service: {0} ms</value>
+    <value>پینگ سرویس فعلی: {0} ms</value>
   </data>
   <data name="OperationSuccess" xml:space="preserve">
-    <value>Operation success</value>
+    <value>موفقیت عملیات</value>
   </data>
   <data name="PleaseSelectRules" xml:space="preserve">
-    <value>Please select rules</value>
+    <value>لطفا قوانین را انتخاب کنید</value>
   </data>
   <data name="RemoveRules" xml:space="preserve">
-    <value>Are you sure to remove the rules?</value>
+    <value>آیا مطمئن هستید که قوانین را حذف می کنید؟</value>
   </data>
   <data name="RoutingRuleDetailRequiredTips" xml:space="preserve">
-    <value>{0},One of the required.</value>
+    <value>{0},یکی از مورد نیاز.</value>
   </data>
   <data name="LvRemarks" xml:space="preserve">
     <value>Remarks</value>
@@ -386,16 +347,16 @@
     <value>Do you want to append rules? Choose yes to append, choose otherwise to replace</value>
   </data>
   <data name="MsgDownloadGeoFileSuccessfully" xml:space="preserve">
-    <value>Download GeoFile: {0} successfully</value>
+    <value>دانلود GeoFile: {0} با موفقیت</value>
   </data>
   <data name="MsgInformationTitle" xml:space="preserve">
-    <value>Information</value>
+    <value>اطلاعات</value>
   </data>
   <data name="LvCustomIcon" xml:space="preserve">
-    <value>Custom Icon</value>
+    <value>نماد سفارشی</value>
   </data>
   <data name="FillCorrectDNSText" xml:space="preserve">
-    <value>Please fill in the correct custom DNS</value>
+    <value>لطفاً DNS سفارشی صحیح را پر کنید</value>
   </data>
   <data name="TransportPathTip1" xml:space="preserve">
     <value>*ws path</value>
@@ -446,34 +407,31 @@
     <value>Global hotkey {0} registered successfully</value>
   </data>
   <data name="UngroupedServers" xml:space="preserve">
-    <value>Ungrouped</value>
+    <value>گروه بندی نشده</value>
   </data>
   <data name="AllGroupServers" xml:space="preserve">
-    <value>All servers</value>
+    <value>همه سرورها</value>
   </data>
   <data name="FillServerAddressCustom" xml:space="preserve">
     <value>Please browse to import server configuration</value>
   </data>
   <data name="SystemProxy" xml:space="preserve">
-    <value>System proxy</value>
+    <value>پروکسی سیستم</value>
   </data>
   <data name="Speedtesting" xml:space="preserve">
-    <value>Testing...</value>
+    <value>درحال تست کردن...</value>
   </data>
   <data name="TooManyServersTip" xml:space="preserve">
-    <value>Too many servers, please open the main interface</value>
+    <value>تعداد سرورها خیلی زیاد است، لطفا رابط اصلی را باز کنید</value>
   </data>
   <data name="LabLAN" xml:space="preserve">
     <value>LAN</value>
   </data>
   <data name="LabLocal" xml:space="preserve">
-    <value>Local</value>
+    <value>محلی</value>
   </data>
   <data name="MsgServerTitle" xml:space="preserve">
-    <value>Servers Filter</value>
-  </data>
-  <data name="NetFrameworkRequirementsTip" xml:space="preserve">
-    <value>Normal use of this version requires .NET Framework 4.8</value>
+    <value>فیلتر سرورها</value>
   </data>
   <data name="menuCheckUpdate" xml:space="preserve">
     <value>بررسی بروزرسانی</value>
@@ -491,10 +449,10 @@
     <value>کمک</value>
   </data>
   <data name="menuOptionSetting" xml:space="preserve">
-    <value>تنظیمات گزینه</value>
+    <value>تنظیمات پارامتر</value>
   </data>
   <data name="menuPromotion" xml:space="preserve">
-    <value>Promotion</value>
+    <value>ترفیع</value>
   </data>
   <data name="menuReload" xml:space="preserve">
     <value>بارگذاری مجدد</value>
@@ -524,7 +482,7 @@
     <value>اشتراک را بدون پروکسی به روز شود</value>
   </data>
   <data name="menuSubUpdateViaProxy" xml:space="preserve">
-    <value>Update subscription with proxy</value>
+    <value>اشتراک را با پروکسی به روز شود</value>
   </data>
   <data name="menuSystemproxy" xml:space="preserve">
     <value>پروکسی سیستم</value>
@@ -536,7 +494,7 @@
     <value>پروکسی سیستم تغییر نکند</value>
   </data>
   <data name="menuSystemProxyPac" xml:space="preserve">
-    <value>Pac Mode</value>
+    <value>حالت Pac</value>
   </data>
   <data name="menuSystemProxySet" xml:space="preserve">
     <value>تنظیم پراکسی سیستم</value>
@@ -551,91 +509,85 @@
     <value>زبان</value>
   </data>
   <data name="menuAddServerViaClipboard" xml:space="preserve">
-    <value>Import bulk URL from clipboard (Ctrl+V)</value>
+    <value>وارد کردن URL انبوه از کلیپ بورد (Ctrl+V)</value>
   </data>
   <data name="menuAddServerViaScan" xml:space="preserve">
-    <value>Scan QR code on the screen (Ctrl+S)</value>
+    <value>اسکن کد QR روی صفحه (Ctrl+S)</value>
   </data>
   <data name="menuCopyServer" xml:space="preserve">
-    <value>Clone selected server</value>
+    <value>سرور انتخاب شده را شبیه سازی کنید</value>
   </data>
   <data name="menuRemoveDuplicateServer" xml:space="preserve">
-    <value>Remove duplicate servers</value>
+    <value>سرورهای تکراری را حذف کنید</value>
   </data>
   <data name="menuRemoveServer" xml:space="preserve">
-    <value>Remove selected servers (Delete)</value>
+    <value>حذف سرورهای انتخابی (Delete)</value>
   </data>
   <data name="menuSetDefaultServer" xml:space="preserve">
-    <value>Set as active server (Enter)</value>
+    <value>به عنوان سرور فعال تنظیم کنید (Enter)</value>
   </data>
   <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>
+    <value>تمام آمار خدمات را پاک کنید</value>
   </data>
   <data name="menuRealPingServer" xml:space="preserve">
-    <value>Test servers real delay (Ctrl+R)</value>
+    <value>آزمایش سرورها با تاخیر واقعی (Ctrl+R)</value>
   </data>
   <data name="menuSortServerResult" xml:space="preserve">
-    <value>Sort by test result</value>
+    <value>مرتب سازی بر اساس نتیجه تست</value>
   </data>
   <data name="menuSpeedServer" xml:space="preserve">
-    <value>Test servers download speed (Ctrl+T)</value>
+    <value>تست سرعت دانلود سرورها (Ctrl+T)</value>
   </data>
   <data name="menuTcpingServer" xml:space="preserve">
-    <value>Test servers with tcping (Ctrl+O)</value>
+    <value>تست سرورها با tcping (Ctrl+O)</value>
   </data>
   <data name="menuTestMe" xml:space="preserve">
-    <value>Test current service status</value>
+    <value>وضعیت سرویس فعلی را تست کنید</value>
   </data>
   <data name="menuExport2ClientConfig" xml:space="preserve">
     <value>سرور انتخابی را برای پیکربندی کلاینت صادر کنید</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>
+    <value>URL های اشتراک گذاری را به کلیپ بورد صادر کنید (Ctrl+C)</value>
   </data>
   <data name="menuExport2SubContent" xml:space="preserve">
-    <value>Export subscription (base64) share to clipboard</value>
+    <value>اشتراک (base64) را به کلیپ بورد صادر کنید</value>
   </data>
   <data name="menuAddCustomServer" xml:space="preserve">
     <value>یک سرور پیکربندی سفارشی اضافه شود</value>
   </data>
   <data name="menuAddShadowsocksServer" xml:space="preserve">
-    <value>Add [Shadowsocks] server</value>
+    <value>سرور [شادوساکس] را اضافه کنید</value>
   </data>
   <data name="menuAddSocksServer" xml:space="preserve">
-    <value>Add [Socks] server</value>
+    <value>سرور [ساکس] را اضافه کنید</value>
   </data>
   <data name="menuAddTrojanServer" xml:space="preserve">
-    <value>Add [Trojan] server</value>
+    <value>سرور [تروجان] را اضافه کنید</value>
   </data>
   <data name="menuAddVlessServer" xml:space="preserve">
-    <value>Add [VLESS] server</value>
+    <value>سرور [VLESS] را اضافه کنید</value>
   </data>
   <data name="menuAddVmessServer" xml:space="preserve">
-    <value>Add [VMess] server</value>
+    <value>سرور [VMess] را اضافه کنید</value>
   </data>
   <data name="menuSelectAll" xml:space="preserve">
-    <value>Select All (Ctrl+A)</value>
+    <value>انتخاب همه (Ctrl+A)</value>
   </data>
   <data name="menuMsgViewClear" xml:space="preserve">
-    <value>Clear All</value>
+    <value>همه را پاک کن</value>
   </data>
   <data name="menuMsgViewCopy" xml:space="preserve">
-    <value>Copy (Ctrl+C)</value>
+    <value>کپی (Ctrl+C)</value>
   </data>
   <data name="menuMsgViewCopyAll" xml:space="preserve">
-    <value>Copy All</value>
+    <value>کپی همه</value>
   </data>
   <data name="menuMsgViewFilter" xml:space="preserve">
-    <value>Set message filters</value>
+    <value>فیلترهای پیام را تنظیم کنید</value>
   </data>
   <data name="menuMsgViewSelectAll" xml:space="preserve">
-    <value>Select All (Ctrl+A)</value>
+    <value>انتخاب همه (Ctrl+A)</value>
   </data>
   <data name="menuSubAdd" xml:space="preserve">
     <value>اضافه کردن</value>
@@ -665,7 +617,7 @@
     <value>تایید</value>
   </data>
   <data name="GbTransport" xml:space="preserve">
-    <value>Transport</value>
+    <value>انتقال</value>
   </data>
   <data name="TbAddress" xml:space="preserve">
     <value>آدرس</value>
@@ -689,7 +641,7 @@
     <value>UUID(id)</value>
   </data>
   <data name="TbNetwork" xml:space="preserve">
-    <value>Transport protocol(network)</value>
+    <value>پروتکل جابجایی (شبکه)</value>
   </data>
   <data name="TbPath" xml:space="preserve">
     <value>مسیر</value>
@@ -716,10 +668,10 @@
     <value>*Default value tcp</value>
   </data>
   <data name="TbCoreType" xml:space="preserve">
-    <value>Core Type</value>
+    <value>نوع هسته</value>
   </data>
   <data name="TbFlow5" xml:space="preserve">
-    <value>Flow</value>
+    <value>جریان</value>
   </data>
   <data name="TbGUID" xml:space="preserve">
     <value>Generate</value>
@@ -728,25 +680,25 @@
     <value>رمزعبور</value>
   </data>
   <data name="TbId4" xml:space="preserve">
-    <value>Password(Optional)</value>
+    <value>رمز عبور (اختیاری)</value>
   </data>
   <data name="TbId5" xml:space="preserve">
     <value>UUID(id)</value>
   </data>
   <data name="TbSecurity3" xml:space="preserve">
-    <value>Encryption</value>
+    <value>رمزگذاری</value>
   </data>
   <data name="TbSecurity4" xml:space="preserve">
-    <value>User(Optional)</value>
+    <value>کاربر (اختیاری)</value>
   </data>
   <data name="TbSecurity5" xml:space="preserve">
-    <value>Encryption</value>
+    <value>رمزگذاری</value>
   </data>
   <data name="TbPreSocksPort" xml:space="preserve">
     <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 Xray/sing-box(Tun) to provide functions such as speed display</value>
   </data>
   <data name="TbBrowse" xml:space="preserve">
     <value>Browse</value>
@@ -755,46 +707,40 @@
     <value>ویرایش</value>
   </data>
   <data name="TbSettingsAdvancedProtocol" xml:space="preserve">
-    <value>Advanced proxy settings, protocol selection (optional)</value>
+    <value>تنظیمات پیشرفته پروکسی، انتخاب پروتکل (اختیاری)</value>
   </data>
   <data name="TbSettingsAllowLAN" xml:space="preserve">
-    <value>Allow connections from the LAN</value>
+    <value>اتصالات از LAN را مجاز کنید</value>
   </data>
   <data name="TbSettingsAutoHideStartup" xml:space="preserve">
     <value>Auto hide startup</value>
   </data>
-  <data name="TbSettingsAutoTest" xml:space="preserve">
-    <value>Automatic latency test interval (minutes)</value>
-  </data>
-  <data name="TbSettingsAutoUpdate" xml:space="preserve">
-    <value>Automatic update interval of subscriptions (hours)</value>
-  </data>
   <data name="TbSettingsAutoUpdateInterval" xml:space="preserve">
-    <value>Automatic update interval of and Geo (hours)</value>
+    <value>فاصله به روز رسانی خودکار و Geo (ساعت)</value>
   </data>
   <data name="TbSettingsCore" xml:space="preserve">
-    <value>Core: basic settings</value>
+    <value>هسته: تنظیمات اولیه</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>
+    <value>هسته: تنظیمات KCP</value>
   </data>
   <data name="TbSettingsCoreType" xml:space="preserve">
-    <value>CoreType settings</value>
+    <value>تنظیمات CoreType</value>
   </data>
   <data name="TbSettingsDefAllowInsecure" xml:space="preserve">
-    <value>AllowInsecure</value>
+    <value>اجازه ناامن</value>
   </data>
   <data name="TbSettingsDomainStrategy4Freedom" xml:space="preserve">
     <value>Outbound Freedom domainStrategy</value>
   </data>
   <data name="TbSettingsEnableAutoAdjustMainLvColWidth" xml:space="preserve">
-    <value>Automatically adjust column width after updating subscription</value>
+    <value>پس از به‌روزرسانی اشتراک، عرض ستون را به صورت خودکار تنظیم شود</value>
   </data>
   <data name="TbSettingsEnableCheckPreReleaseUpdate" xml:space="preserve">
-    <value>Check for pre-release updates</value>
+    <value>به روز رسانی های پیش از انتشار را بررسی شود</value>
   </data>
   <data name="TbSettingsException" xml:space="preserve">
     <value>استثنا</value>
@@ -803,40 +749,31 @@
     <value>Exception. Do not use proxy server for addresses beginning with,Use semicolon (;)</value>
   </data>
   <data name="TbSettingsHttpPort" xml:space="preserve">
-    <value>Http Port</value>
+    <value>پورت Http</value>
   </data>
   <data name="TbSettingsIgnoreGeoUpdateCore" xml:space="preserve">
-    <value>Ignore Geo files when updating core</value>
-  </data>
-  <data name="TbSettingsIpv6" xml:space="preserve">
-    <value>Enable IPv6</value>
+    <value>هنگام به‌روزرسانی هسته، فایل‌های Geo را نادیده بگیرید</value>
   </data>
   <data name="TbSettingsKeepOlderDedupl" xml:space="preserve">
     <value>Keep older when deduplication</value>
   </data>
   <data name="TbSettingsLogEnabled" xml:space="preserve">
-    <value>Record local logs</value>
+    <value>ثبت گزارش های محلی</value>
   </data>
   <data name="TbSettingsLogLevel" xml:space="preserve">
-    <value>Log Level</value>
+    <value>سطح ثبت رویداد</value>
   </data>
   <data name="TbSettingsMuxEnabled" xml:space="preserve">
     <value>Turn on Mux Multiplexing</value>
   </data>
   <data name="TbSettingsN" xml:space="preserve">
-    <value>v2rayN settings</value>
-  </data>
-  <data name="TbSettingsPacListenPort" xml:space="preserve">
-    <value>Pac listen port</value>
+    <value>تنظیمات v2rayN</value>
   </data>
   <data name="TbSettingsPass" xml:space="preserve">
     <value>Auth pass</value>
   </data>
   <data name="TbSettingsRemoteDNS" xml:space="preserve">
-    <value>Custom DNS (multiple, separated by commas (,))</value>
-  </data>
-  <data name="TbSettingsSaveTip" xml:space="preserve">
-    <value>After modifying the following parameters, click Save to take effect</value>
+    <value>سفارشی DNS (multiple, separated by commas (,))</value>
   </data>
   <data name="TbSettingsSetUWP" xml:space="preserve">
     <value>Set Win10 UWP Loopback</value>
@@ -845,22 +782,19 @@
     <value>Turn on Sniffing</value>
   </data>
   <data name="TbSettingsSocksPort" xml:space="preserve">
-    <value>Socks Port</value>
+    <value>ساکس Port</value>
   </data>
   <data name="TbSettingsStartBoot" xml:space="preserve">
-    <value>Start on boot</value>
+    <value>درهنگام راه ائدازی شروع شود</value>
   </data>
   <data name="TbSettingsStatistics" xml:space="preserve">
-    <value>Enable Statistics (Require restart)</value>
-  </data>
-  <data name="TbSettingsStatisticsFreshRate" xml:space="preserve">
-    <value>Statistics freshrate (second)</value>
+    <value>فعال کردن آمار (نیاز به راه اندازی مجدد)</value>
   </data>
   <data name="TbSettingsSubConvert" xml:space="preserve">
     <value>Subscription conversion Url</value>
   </data>
   <data name="TbSettingsSystemproxy" xml:space="preserve">
-    <value>System proxy settings</value>
+    <value>تنظیمات پراکسی سیستم</value>
   </data>
   <data name="TbSettingsTLS13" xml:space="preserve">
     <value>Enable Security Protocol TLS v1.3 (subscription/update)</value>
@@ -875,19 +809,19 @@
     <value>Auth user</value>
   </data>
   <data name="TbClearSystemProxy" xml:space="preserve">
-    <value>Clear system proxy</value>
+    <value>پاک کردن پروکسی سیستم</value>
   </data>
   <data name="TbDisplayGUI" xml:space="preserve">
-    <value>Display GUI</value>
+    <value>نمایش رابط کاربری گرافیکی</value>
   </data>
   <data name="TbGlobalHotkeySetting" xml:space="preserve">
-    <value>GlobalHotkey Setting</value>
+    <value>تنظیم کلید میانبر جهانی</value>
   </data>
   <data name="TbGlobalHotkeySettingTip" xml:space="preserve">
-    <value>Set directly by pressing the keyboard, Take effect after restart</value>
+    <value>مستقیماً با فشار دادن صفحه کلید تنظیم کنید، بعد از راه اندازی مجدد اعمال شود</value>
   </data>
   <data name="TbNotChangeSystemProxy" xml:space="preserve">
-    <value>Do not change system proxy</value>
+    <value>پروکسی سیستم را تغییر ندهید</value>
   </data>
   <data name="TbReset" xml:space="preserve">
     <value>بازنشانی</value>
@@ -896,10 +830,10 @@
     <value>تنظیم پراکسی سیستم</value>
   </data>
   <data name="TbSystemProxyPac" xml:space="preserve">
-    <value>Pac Mode</value>
+    <value>حالت Pac</value>
   </data>
   <data name="menuShareServer" xml:space="preserve">
-    <value>Share Server (Ctrl+D)</value>
+    <value>اشتراک گذاری سرور(Ctrl+F)</value>
   </data>
   <data name="menuRouting" xml:space="preserve">
     <value>مسیریابی</value>
@@ -911,10 +845,10 @@
     <value>اجرا به عنوان ادمین</value>
   </data>
   <data name="menuMoveBottom" xml:space="preserve">
-    <value>Move to bottom (B)</value>
+    <value>به پایین حرکت شود(B)</value>
   </data>
   <data name="menuMoveDown" xml:space="preserve">
-    <value>Down (D)</value>
+    <value>پایین (D)</value>
   </data>
   <data name="menuMoveTop" xml:space="preserve">
     <value>Move to top (T)</value>
@@ -929,31 +863,31 @@
     <value>{0} Website</value>
   </data>
   <data name="menuRoutingAdvanced" xml:space="preserve">
-    <value>Advanced Function</value>
+    <value>عملکرد پیشرفته</value>
   </data>
   <data name="menuRoutingAdvancedAdd" xml:space="preserve">
     <value>اضافه کردن</value>
   </data>
   <data name="menuRoutingAdvancedImportRules" xml:space="preserve">
-    <value>Import Advanced Rules</value>
+    <value>وارد کردن قوانین پیشرفته</value>
   </data>
   <data name="menuRoutingAdvancedRemove" xml:space="preserve">
-    <value>Remove selected</value>
+    <value>حذف انتخاب شده</value>
   </data>
   <data name="menuRoutingAdvancedSetDefault" xml:space="preserve">
     <value>Set as active rule</value>
   </data>
   <data name="menuRoutingBasic" xml:space="preserve">
-    <value>Basic Function</value>
+    <value>عملکرد پایه</value>
   </data>
   <data name="menuRoutingBasicImportRules" xml:space="preserve">
-    <value>Import Basic Rules</value>
+    <value>واردات قوانین اساسی</value>
   </data>
   <data name="TbdomainMatcher" xml:space="preserve">
-    <value>Domain Matcher</value>
+    <value>تطبیق دامنه</value>
   </data>
   <data name="TbdomainStrategy" xml:space="preserve">
-    <value>Domain strategy</value>
+    <value>استراتژی دامنه</value>
   </data>
   <data name="TbenableRoutingAdvanced" xml:space="preserve">
     <value>فعال کردن عملکرد پیشرفته</value>
@@ -968,58 +902,58 @@
     <value>1.Proxy Domain or IP</value>
   </data>
   <data name="TbRoutingTabRuleList" xml:space="preserve">
-    <value>Pre-defined Rule Set List</value>
+    <value>لیست مجموعه قوانین از پیش تعریف شده</value>
   </data>
   <data name="TbRoutingTips" xml:space="preserve">
     <value>*Set the rules, separated by commas (,); The comma in the regular is replaced by &lt;COMMA&gt;</value>
   </data>
   <data name="menuImportRulesFromClipboard" xml:space="preserve">
-    <value>Import Rules From Clipboard</value>
+    <value>وارد کردن قوانین از کلیپ بورد</value>
   </data>
   <data name="menuImportRulesFromFile" xml:space="preserve">
-    <value>Import Rules From File</value>
+    <value>وارد کردن قوانین از فایل</value>
   </data>
   <data name="menuImportRulesFromUrl" xml:space="preserve">
-    <value>Import Rules From Sub Url</value>
+    <value>وارد کردن قوانین از Sub Url</value>
   </data>
   <data name="menuRoutingRuleSetting" xml:space="preserve">
     <value>تنظیم قانون</value>
   </data>
   <data name="menuRuleAdd" xml:space="preserve">
-    <value>Rule Add</value>
+    <value>اضافه کردن قانون</value>
   </data>
   <data name="menuRuleExportSelected" xml:space="preserve">
-    <value>Export Selected Rules</value>
+    <value>صادر کردن قوانین انتخاب شده</value>
   </data>
   <data name="menuRuleList" xml:space="preserve">
-    <value>Rule List</value>
+    <value>فهرست قوانین</value>
   </data>
   <data name="menuRuleRemove" xml:space="preserve">
-    <value>Remove Rules</value>
+    <value>حذف قوانین</value>
   </data>
   <data name="menuRoutingRuleDetailsSetting" xml:space="preserve">
-    <value>RoutingRuleDetailsSetting</value>
+    <value>تنظیم جزئیات قانون مسیریابی</value>
   </data>
   <data name="TbAutoSort" xml:space="preserve">
-    <value>Domain and ip are auto sorted when saving</value>
+    <value>دامنه و آی پی در هنگام ذخیره به طور خودکار مرتب می شوند</value>
   </data>
   <data name="TbRuleobjectDoc" xml:space="preserve">
     <value>Ruleobject Doc</value>
   </data>
   <data name="TbDnsObjectDoc" xml:space="preserve">
-    <value>Support DnsObject</value>
+    <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>Routing setting is changed</value>
+    <value>تنظیمات مسیریابی تغییر کرده است</value>
   </data>
   <data name="TipChangeSystemProxy" xml:space="preserve">
-    <value>System proxy setting is changed</value>
+    <value>تنظیمات پراکسی سیستم تغییر کرده است</value>
   </data>
   <data name="TbSettingsRouteOnly" xml:space="preserve">
-    <value>RouteOnly</value>
+    <value>فقط مسیر</value>
   </data>
   <data name="menuMixedTestServer" xml:space="preserve">
     <value>One-click test Latency and speed (Ctrl+E)</value>
@@ -1031,25 +965,25 @@
     <value>Speed(M/s)</value>
   </data>
   <data name="FailedToRunCore" xml:space="preserve">
-    <value>Failed to run Core, please see the log</value>
+    <value>Core اجرا نشد، لطفاً گزارش را ببینید</value>
   </data>
   <data name="LvFilter" xml:space="preserve">
     <value>Remarks regular filter</value>
   </data>
   <data name="TbDisplayLog" xml:space="preserve">
-    <value>Display Log</value>
+    <value>نمایش گزارش</value>
   </data>
   <data name="menuImportOldGuiConfig" xml:space="preserve">
-    <value>Import old config guiNConfig</value>
+    <value>پیکربندی قدیمی guiNConfig را وارد شود</value>
   </data>
   <data name="TbEnableTunAs" xml:space="preserve">
-    <value>Enable Tun</value>
+    <value>Tun را فعال شود</value>
   </data>
   <data name="TbSettingsNewPort4LAN" xml:space="preserve">
-    <value>New Port for LAN</value>
+    <value>پورت جدید برای LAN</value>
   </data>
   <data name="TbSettingsTunMode" xml:space="preserve">
-    <value>TunMode settings</value>
+    <value>تنظیمات TunMode</value>
   </data>
   <data name="TbSettingsTunModeDirectIP" xml:space="preserve">
     <value>Direct IP CIDR, separated by commas (,)</value>
@@ -1060,4 +994,16 @@
   <data name="TbSettingsTunModeShowWindow" xml:space="preserve">
     <value>نمایش کنسول</value>
   </data>
+  <data name="TbSettingsDefUserAgent" xml:space="preserve">
+    <value>User-Agent</value>
+  </data>
+  <data name="TbSettingsDefUserAgentTips" xml:space="preserve">
+    <value>This parameter is valid only for tcp/http and ws</value>
+  </data>
+  <data name="TbSettingsEnableHWA" xml:space="preserve">
+    <value>فعال‌سازی شتاب‌دهنده سخت‌افزاری (نیاز به راه‌اندازی مجدد)</value>
+  </data>
+  <data name="TbSettingsEnableCacheFile4Sbox" xml:space="preserve">
+    <value>فعال کردن کش فایل مجموعه قوانین برای sing-box</value>
+  </data>
 </root>

v2rayN/v2rayN/Resx/ResUI.resx

@@ -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,29 +175,26 @@
     <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>
   </data>
-  <data name="LvAlias" xml:space="preserve">
-    <value>Alias</value>
-  </data>
   <data name="LvEncryptionMethod" xml:space="preserve">
     <value>Security</value>
   </data>
@@ -210,9 +207,6 @@
   <data name="LvSubscription" xml:space="preserve">
     <value>Subs group</value>
   </data>
-  <data name="LvTestResults" xml:space="preserve">
-    <value>Test Results</value>
-  </data>
   <data name="LvTodayDownloadDataAmount" xml:space="preserve">
     <value>Download traffic today</value>
   </data>
@@ -228,9 +222,6 @@
   <data name="LvTransportProtocol" xml:space="preserve">
     <value>Transport</value>
   </data>
-  <data name="MediumFresh" xml:space="preserve">
-    <value>Medium</value>
-  </data>
   <data name="MsgClearSubscription" xml:space="preserve">
     <value>Clear original subscription content</value>
   </data>
@@ -246,32 +237,20 @@
   <data name="MsgNoValidSubscription" xml:space="preserve">
     <value>No valid subscriptions set</value>
   </data>
-  <data name="MsgPACUpdateFailed" xml:space="preserve">
-    <value>PAC update failed</value>
-  </data>
-  <data name="MsgPACUpdateSuccessfully" xml:space="preserve">
-    <value>PAC update succeeded</value>
-  </data>
   <data name="MsgParsingSuccessfully" xml:space="preserve">
     <value>Resolve {0} successfully</value>
   </data>
-  <data name="MsgSimplifyPAC" xml:space="preserve">
-    <value>Simplify PAC Success</value>
-  </data>
   <data name="MsgStartGettingSubscriptions" xml:space="preserve">
     <value>Start getting subscriptions</value>
   </data>
   <data name="MsgStartUpdating" xml:space="preserve">
     <value>Start updating {0}...</value>
   </data>
-  <data name="MsgStartUpdatingPAC" xml:space="preserve">
-    <value>Start updating PAC...</value>
-  </data>
   <data name="MsgSubscriptionDecodingFailed" xml:space="preserve">
     <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>
@@ -285,14 +264,11 @@
   <data name="MsgUpdateV2rayCoreSuccessfullyMore" xml:space="preserve">
     <value>Update Core successfully! Restarting service...</value>
   </data>
-  <data name="NeedHttpGlobalProxy" xml:space="preserve">
-    <value> This feature relies on the Http global proxy, please set it correctly first.</value>
-  </data>
   <data name="NonvmessOrssProtocol" xml:space="preserve">
     <value>Non-VMess or ss protocol</value>
   </data>
   <data name="NonVmessService" xml:space="preserve">
-    <value> non-standard service, this feature is invalid</value>
+    <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>
@@ -301,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>
@@ -315,9 +291,6 @@
   <data name="PleaseSelectServer" xml:space="preserve">
     <value>Please select the server first</value>
   </data>
-  <data name="QuickFresh" xml:space="preserve">
-    <value>Fast</value>
-  </data>
   <data name="RemoveDuplicateServerResult" xml:space="preserve">
     <value>Servers deduplication completed. Old: {0}, New: {1}.</value>
   </data>
@@ -327,18 +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="SlowFresh" xml:space="preserve">
-    <value>Slow</value>
-  </data>
-  <data name="SpeedServerTips" xml:space="preserve">
-    <value>Note: This feature relies on the Http global proxy. Please manually adjust the Http global proxy and active node after testing.</value>
-  </data>
-  <data name="StartPacFailed" xml:space="preserve">
-    <value>PAC failed to start. Please run this program as Administrator.</value>
-  </data>
   <data name="StartService" xml:space="preserve">
     <value>Start service ({0})...</value>
   </data>
@@ -347,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>
@@ -374,13 +335,13 @@
     <value>Remarks</value>
   </data>
   <data name="LvUrl" xml:space="preserve">
-    <value>Url(Optional)</value>
+    <value>URL(Optional)</value>
   </data>
   <data name="LvCount" xml:space="preserve">
     <value>Count</value>
   </data>
   <data name="MsgNeedUrl" xml:space="preserve">
-    <value>Please fill in the address (Url)</value>
+    <value>Please fill in the URL</value>
   </data>
   <data name="AddBatchRoutingRulesYesNo" xml:space="preserve">
     <value>Do you want to append rules? Choose yes to append, choose otherwise to replace</value>
@@ -398,13 +359,13 @@
     <value>Please fill in the correct custom DNS</value>
   </data>
   <data name="TransportPathTip1" xml:space="preserve">
-    <value>*ws path</value>
+    <value>*ws/httpupgrade path</value>
   </data>
   <data name="TransportPathTip2" xml:space="preserve">
     <value>*h2 path</value>
   </data>
   <data name="TransportPathTip3" xml:space="preserve">
-    <value>*QUIC key/Kcp seed</value>
+    <value>*QUIC key/KCP seed</value>
   </data>
   <data name="TransportPathTip4" xml:space="preserve">
     <value>*grpc serviceName</value>
@@ -413,13 +374,13 @@
     <value>*http host Separated by commas (,)</value>
   </data>
   <data name="TransportRequestHostTip2" xml:space="preserve">
-    <value>*ws host</value>
+    <value>*ws/httpupgrade host</value>
   </data>
   <data name="TransportRequestHostTip3" xml:space="preserve">
     <value>*h2 host Separated by commas (,)</value>
   </data>
   <data name="TransportRequestHostTip4" xml:space="preserve">
-    <value>*QUIC securty</value>
+    <value>*QUIC security</value>
   </data>
   <data name="TransportHeaderTypeTip1" xml:space="preserve">
     <value>*tcp camouflage type</value>
@@ -437,7 +398,7 @@
     <value>TLS</value>
   </data>
   <data name="TransportPathTip5" xml:space="preserve">
-    <value>*Kcp seed</value>
+    <value>*kcp seed</value>
   </data>
   <data name="RegisterGlobalHotkeyFailed" xml:space="preserve">
     <value>Global hotkey {0} registered failed, reason {1}</value>
@@ -449,7 +410,7 @@
     <value>Ungrouped</value>
   </data>
   <data name="AllGroupServers" xml:space="preserve">
-    <value>All servers</value>
+    <value>All</value>
   </data>
   <data name="FillServerAddressCustom" xml:space="preserve">
     <value>Please browse to import server configuration</value>
@@ -470,10 +431,7 @@
     <value>Local</value>
   </data>
   <data name="MsgServerTitle" xml:space="preserve">
-    <value>Servers Filter</value>
-  </data>
-  <data name="NetFrameworkRequirementsTip" xml:space="preserve">
-    <value>Normal use of this version requires .NET Framework 4.8</value>
+    <value>Servers Filter, press Enter to execute</value>
   </data>
   <data name="menuCheckUpdate" xml:space="preserve">
     <value>Check Update</value>
@@ -485,13 +443,13 @@
     <value>Exit</value>
   </data>
   <data name="menuGlobalHotkeySetting" xml:space="preserve">
-    <value>GlobalHotkeySetting</value>
+    <value>Global Hotkey Setting</value>
   </data>
   <data name="menuHelp" xml:space="preserve">
     <value>Help</value>
   </data>
   <data name="menuOptionSetting" xml:space="preserve">
-    <value>OptionSetting</value>
+    <value>Option Setting</value>
   </data>
   <data name="menuPromotion" xml:space="preserve">
     <value>Promotion</value>
@@ -500,13 +458,13 @@
     <value>Reload</value>
   </data>
   <data name="menuRoutingSetting" xml:space="preserve">
-    <value>RoutingSetting</value>
+    <value>Routing Setting</value>
   </data>
   <data name="menuServers" xml:space="preserve">
     <value>Servers</value>
   </data>
   <data name="menuSetting" xml:space="preserve">
-    <value>Setting</value>
+    <value>Settings</value>
   </data>
   <data name="menuSubGroupUpdate" xml:space="preserve">
     <value>Update current subscription without proxy</value>
@@ -518,7 +476,7 @@
     <value>Subscription group</value>
   </data>
   <data name="menuSubSetting" xml:space="preserve">
-    <value>Subscription group Setting</value>
+    <value>Subscription group settings</value>
   </data>
   <data name="menuSubUpdate" xml:space="preserve">
     <value>Update subscription without proxy</value>
@@ -536,7 +494,7 @@
     <value>Do not change system proxy</value>
   </data>
   <data name="menuSystemProxyPac" xml:space="preserve">
-    <value>Pac Mode</value>
+    <value>PAC mode</value>
   </data>
   <data name="menuSystemProxySet" xml:space="preserve">
     <value>Set system proxy</value>
@@ -547,8 +505,11 @@
   <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</value>
+    <value>Language (Restart)</value>
   </data>
   <data name="menuAddServerViaClipboard" xml:space="preserve">
     <value>Import bulk URL from clipboard (Ctrl+V)</value>
@@ -571,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>
@@ -592,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>
@@ -620,22 +575,22 @@
     <value>Add [VMess] server</value>
   </data>
   <data name="menuSelectAll" xml:space="preserve">
-    <value>Select All (Ctrl+A)</value>
+    <value>Select all (Ctrl+A)</value>
   </data>
   <data name="menuMsgViewClear" xml:space="preserve">
-    <value>Clear All</value>
+    <value>Clear all</value>
   </data>
   <data name="menuMsgViewCopy" xml:space="preserve">
     <value>Copy (Ctrl+C)</value>
   </data>
   <data name="menuMsgViewCopyAll" xml:space="preserve">
-    <value>Copy All</value>
+    <value>Copy all</value>
   </data>
   <data name="menuMsgViewFilter" xml:space="preserve">
     <value>Set message filters</value>
   </data>
   <data name="menuMsgViewSelectAll" xml:space="preserve">
-    <value>Select All (Ctrl+A)</value>
+    <value>Select all (Ctrl+A)</value>
   </data>
   <data name="menuSubAdd" xml:space="preserve">
     <value>Add</value>
@@ -674,10 +629,10 @@
     <value>AllowInsecure</value>
   </data>
   <data name="TbAlpn" xml:space="preserve">
-    <value>Alpn</value>
+    <value>ALPN</value>
   </data>
   <data name="TbAlterId" xml:space="preserve">
-    <value>AlterId</value>
+    <value>AlterID</value>
   </data>
   <data name="TbFingerprint" xml:space="preserve">
     <value>Fingerprint</value>
@@ -746,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 Xray/sing-box(Tun) to provide functions such as speed display</value>
   </data>
   <data name="TbBrowse" xml:space="preserve">
     <value>Browse</value>
@@ -763,20 +718,14 @@
   <data name="TbSettingsAutoHideStartup" xml:space="preserve">
     <value>Auto hide startup</value>
   </data>
-  <data name="TbSettingsAutoTest" xml:space="preserve">
-    <value>Automatic latency test interval (minutes)</value>
-  </data>
-  <data name="TbSettingsAutoUpdate" xml:space="preserve">
-    <value>Automatic update interval of subscriptions (hours)</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>
@@ -803,19 +752,16 @@
     <value>Exception. Do not use proxy server for addresses beginning with,Use semicolon (;)</value>
   </data>
   <data name="TbSettingsHttpPort" xml:space="preserve">
-    <value>Http Port</value>
+    <value>HTTP Port</value>
   </data>
   <data name="TbSettingsIgnoreGeoUpdateCore" xml:space="preserve">
     <value>Ignore Geo files when updating core</value>
   </data>
-  <data name="TbSettingsIpv6" xml:space="preserve">
-    <value>Enable IPv6</value>
-  </data>
   <data name="TbSettingsKeepOlderDedupl" xml:space="preserve">
     <value>Keep older when deduplication</value>
   </data>
   <data name="TbSettingsLogEnabled" xml:space="preserve">
-    <value>Record local logs</value>
+    <value>Enable Log</value>
   </data>
   <data name="TbSettingsLogLevel" xml:space="preserve">
     <value>Log Level</value>
@@ -826,18 +772,12 @@
   <data name="TbSettingsN" xml:space="preserve">
     <value>v2rayN settings</value>
   </data>
-  <data name="TbSettingsPacListenPort" xml:space="preserve">
-    <value>Pac listen port</value>
-  </data>
   <data name="TbSettingsPass" xml:space="preserve">
     <value>Auth pass</value>
   </data>
   <data name="TbSettingsRemoteDNS" xml:space="preserve">
     <value>Custom DNS (multiple, separated by commas (,))</value>
   </data>
-  <data name="TbSettingsSaveTip" xml:space="preserve">
-    <value>After modifying the following parameters, click Save to take effect</value>
-  </data>
   <data name="TbSettingsSetUWP" xml:space="preserve">
     <value>Set Win10 UWP Loopback</value>
   </data>
@@ -845,7 +785,7 @@
     <value>Turn on Sniffing</value>
   </data>
   <data name="TbSettingsSocksPort" xml:space="preserve">
-    <value>Socks Port</value>
+    <value>SOCKS Port</value>
   </data>
   <data name="TbSettingsStartBoot" xml:space="preserve">
     <value>Start on boot</value>
@@ -853,11 +793,8 @@
   <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>
+    <value>Subscription conversion URL</value>
   </data>
   <data name="TbSettingsSystemproxy" xml:space="preserve">
     <value>System proxy settings</value>
@@ -881,10 +818,10 @@
     <value>Display GUI</value>
   </data>
   <data name="TbGlobalHotkeySetting" xml:space="preserve">
-    <value>GlobalHotkey Setting</value>
+    <value>Global Hotkey Settings</value>
   </data>
   <data name="TbGlobalHotkeySettingTip" xml:space="preserve">
-    <value>Set directly by pressing the keyboard, Take effect after restart</value>
+    <value>Set directly by pressing the keyboard, take effect after restart</value>
   </data>
   <data name="TbNotChangeSystemProxy" xml:space="preserve">
     <value>Do not change system proxy</value>
@@ -896,19 +833,19 @@
     <value>Set system proxy</value>
   </data>
   <data name="TbSystemProxyPac" xml:space="preserve">
-    <value>Pac Mode</value>
+    <value>PAC mode</value>
   </data>
   <data name="menuShareServer" xml:space="preserve">
-    <value>Share Server (Ctrl+D)</value>
+    <value>Share Server (Ctrl+F)</value>
   </data>
   <data name="menuRouting" xml:space="preserve">
     <value>Routing</value>
   </data>
   <data name="NotRunAsAdmin" xml:space="preserve">
-    <value>Not Run As Admin</value>
+    <value>Not run as Admin</value>
   </data>
   <data name="RunAsAdmin" xml:space="preserve">
-    <value>Run As Admin</value>
+    <value>Run as Admin</value>
   </data>
   <data name="menuMoveBottom" xml:space="preserve">
     <value>Move to bottom (B)</value>
@@ -938,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>
@@ -980,13 +917,13 @@
     <value>Import Rules From File</value>
   </data>
   <data name="menuImportRulesFromUrl" xml:space="preserve">
-    <value>Import Rules From Sub Url</value>
+    <value>Import Rules From Subscription URL</value>
   </data>
   <data name="menuRoutingRuleSetting" xml:space="preserve">
-    <value>Rule Setting</value>
+    <value>Rule Settings</value>
   </data>
   <data name="menuRuleAdd" xml:space="preserve">
-    <value>Rule Add</value>
+    <value>Add Rule</value>
   </data>
   <data name="menuRuleExportSelected" xml:space="preserve">
     <value>Export Selected Rules</value>
@@ -995,19 +932,19 @@
     <value>Rule List</value>
   </data>
   <data name="menuRuleRemove" xml:space="preserve">
-    <value>Remove Rules</value>
+    <value>Remove Rule (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>
@@ -1022,7 +959,7 @@
     <value>RouteOnly</value>
   </data>
   <data name="menuMixedTestServer" xml:space="preserve">
-    <value>One-click test Latency and speed (Ctrl+E)</value>
+    <value>One-click multi test Latency and speed (Ctrl+E)</value>
   </data>
   <data name="LvTestDelay" xml:space="preserve">
     <value>Delay(ms)</value>
@@ -1040,7 +977,7 @@
     <value>Display Log</value>
   </data>
   <data name="menuImportOldGuiConfig" xml:space="preserve">
-    <value>Import old config guiNConfig</value>
+    <value>Import old config (guiNConfig)</value>
   </data>
   <data name="TbEnableTunAs" xml:space="preserve">
     <value>Enable Tun</value>
@@ -1060,4 +997,226 @@
   <data name="TbSettingsTunModeShowWindow" xml:space="preserve">
     <value>Show console</value>
   </data>
+  <data name="menuMoveToGroup" xml:space="preserve">
+    <value>Move to group</value>
+  </data>
+  <data name="TbSettingsTunModeCustomTemplate" xml:space="preserve">
+    <value>Custom Template</value>
+  </data>
+  <data name="TbSettingsEnableDragDropSort" xml:space="preserve">
+    <value>Enable Server Drag Drop Sort(Require restart)</value>
+  </data>
+  <data name="TbAutoRefresh" xml:space="preserve">
+    <value>AutoRefresh</value>
+  </data>
+  <data name="SpeedtestingSkip" xml:space="preserve">
+    <value>Skip test</value>
+  </data>
+  <data name="menuEditServer" xml:space="preserve">
+    <value>Edit Server (Ctrl+D)</value>
+  </data>
+  <data name="TbSettingsDoubleClick2Activate" xml:space="preserve">
+    <value>Double-click server make active</value>
+  </data>
+  <data name="SpeedtestingCompleted" xml:space="preserve">
+    <value>Test completed</value>
+  </data>
+  <data name="TbSettingsDefFingerprint" xml:space="preserve">
+    <value>Default TLS fingerprint</value>
+  </data>
+  <data name="TbSettingsDefUserAgent" xml:space="preserve">
+    <value>User-Agent</value>
+  </data>
+  <data name="TbSettingsDefUserAgentTips" xml:space="preserve">
+    <value>This parameter is valid only for tcp/http and ws</value>
+  </data>
+  <data name="TbSettingsCurrentFontFamily" xml:space="preserve">
+    <value>FontFamily(Require restart)</value>
+  </data>
+  <data name="TbSettingsCurrentFontFamilyTip" xml:space="preserve">
+    <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;Pac port=SOCKS port+4;API port=SOCKS port+5;</value>
+  </data>
+  <data name="TbSettingsStartBootTip" xml:space="preserve">
+    <value>Set this with admin privileges, get admin privileges after startup</value>
+  </data>
+  <data name="TbSettingsFontSize" xml:space="preserve">
+    <value>Font Size</value>
+  </data>
+  <data name="TbSettingsTunModeProxyIP" xml:space="preserve">
+    <value>Proxy IP CIDR, separated by commas (,)</value>
+  </data>
+  <data name="TbSettingsTunModeProxyProcess" xml:space="preserve">
+    <value>Proxy Process name, separated by commas (,)</value>
+  </data>
+  <data name="TbSettingsTunModeBypassMode" xml:space="preserve">
+    <value>Bypass Mode</value>
+  </data>
+  <data name="TbSettingsSpeedTestTimeout" xml:space="preserve">
+    <value>SpeedTest Single Timeout Value</value>
+  </data>
+  <data name="TbSettingsSpeedTestUrl" xml:space="preserve">
+    <value>SpeedTest URL</value>
+  </data>
+  <data name="TbSettingsTunModeDNS" xml:space="preserve">
+    <value>DNS object, e.g. {"servers":[]}</value>
+  </data>
+  <data name="menuMoveTo" xml:space="preserve">
+    <value>Move up and down</value>
+  </data>
+  <data name="TbPublicKey" xml:space="preserve">
+    <value>PublicKey</value>
+  </data>
+  <data name="TbShortId" xml:space="preserve">
+    <value>ShortId</value>
+  </data>
+  <data name="TbSpiderX" xml:space="preserve">
+    <value>SpiderX</value>
+  </data>
+  <data name="TbSettingsEnableHWA" xml:space="preserve">
+    <value>Enable hardware acceleration(Require restart)</value>
+  </data>
+  <data name="SpeedtestingWait" xml:space="preserve">
+    <value>Waiting for testing (press ESC to terminate)...</value>
+  </data>
+  <data name="TipDisplayLog" xml:space="preserve">
+    <value>Please turn off when there is an abnormal disconnection</value>
+  </data>
+  <data name="MsgSkipSubscriptionUpdate" xml:space="preserve">
+    <value>Updates are not enabled, skip this subscription</value>
+  </data>
+  <data name="menuRebootAsAdmin" xml:space="preserve">
+    <value>Restart as Administrator</value>
+  </data>
+  <data name="LvMoreUrl" xml:space="preserve">
+    <value>More urls, separated by commas;Subscription conversion will be invalid</value>
+  </data>
+  <data name="SpeedDisplayText" xml:space="preserve">
+    <value>{0} : {1}/s↑ | {2}/s↓</value>
+  </data>
+  <data name="LvAutoUpdateInterval" xml:space="preserve">
+    <value>Automatic update interval(minutes)</value>
+  </data>
+  <data name="TbSettingsLogEnabledToFile" xml:space="preserve">
+    <value>Enable logging to file</value>
+  </data>
+  <data name="LvConvertTarget" xml:space="preserve">
+    <value>Convert target type</value>
+  </data>
+  <data name="LvConvertTargetTip" xml:space="preserve">
+    <value>Please leave blank if no conversion is required</value>
+  </data>
+  <data name="menuDNSSetting" xml:space="preserve">
+    <value>DNS Settings</value>
+  </data>
+  <data name="TbSettingsCoreDnsSingbox" xml:space="preserve">
+    <value>sing-box DNS settings</value>
+  </data>
+  <data name="TbDnsSingboxObjectDoc" xml:space="preserve">
+    <value>Please fill in DNS Structure, Click to view the document</value>
+  </data>
+  <data name="TbSettingDnsImportDefConfig" xml:space="preserve">
+    <value>Click to import default DNS config</value>
+  </data>
+  <data name="TbdomainStrategy4Singbox" xml:space="preserve">
+    <value>sing-box domain strategy</value>
+  </data>
+  <data name="TbSettingsMux4SboxProtocol" xml:space="preserve">
+    <value>sing-box Mux Protocol</value>
+  </data>
+  <data name="TbRoutingRuleProcess" xml:space="preserve">
+    <value>Full process name (Tun mode)</value>
+  </data>
+  <data name="TbRoutingRuleIP" xml:space="preserve">
+    <value>IP or IP CIDR</value>
+  </data>
+  <data name="TbRoutingRuleDomain" xml:space="preserve">
+    <value>Domain</value>
+  </data>
+  <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 remarks</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>
+  <data name="SpeedtestingStop" xml:space="preserve">
+    <value>Test terminating...</value>
+  </data>
+  <data name="TransportRequestHostTip5" xml:space="preserve">
+    <value>*grpc Authority</value>
+  </data>
+  <data name="menuAddHttpServer" xml:space="preserve">
+    <value>Add [Http] server</value>
+  </data>
+  <data name="TbSettingsEnableFragmentTips" xml:space="preserve">
+    <value>Use Xray and enable non-Tun mode, which conflicts with the group previous proxy</value>
+  </data>
+  <data name="TbSettingsEnableFragment" xml:space="preserve">
+    <value>Enable fragment</value>
+  </data>
+  <data name="TbSettingsEnableCacheFile4Sbox" xml:space="preserve">
+    <value>Enable cache file for sing-box (ruleset files)</value>
+  </data>
+  <data name="LvCustomRulesetPath4Singbox" xml:space="preserve">
+    <value>Custom the rule-set of sing-box</value>
+  </data>
+  <data name="NeedRebootTips" xml:space="preserve">
+    <value>Successful operation. Click the settings menu to reboot the app.</value>
+  </data>
+  <data name="menuOpenTheFileLocation" xml:space="preserve">
+    <value>Open the storage location</value>
+  </data>
 </root>

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

@@ -130,7 +130,7 @@
     <value>配置格式不正确</value>
   </data>
   <data name="CustomServerTips" xml:space="preserve">
-    <value>注意,自定义配置完全依赖您自己的配置，不能使用所有设置功能。如需使用系统代理请手工修改监听端口。</value>
+    <value>注意,自定义配置完全依赖您自己的配置，不能使用所有设置功能。如需使用系统代理请手动修改监听端口。</value>
   </data>
   <data name="Downloading" xml:space="preserve">
     <value>下载开始...</value>
@@ -148,7 +148,7 @@
     <value>生成默认配置文件失败</value>
   </data>
   <data name="FailedGetDefaultConfiguration" xml:space="preserve">
-    <value>取得默认配置失败</value>
+    <value>获取默认配置失败</value>
   </data>
   <data name="FailedImportedCustomServer" xml:space="preserve">
     <value>导入自定义配置服务器失败</value>
@@ -187,17 +187,14 @@
     <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>
   </data>
-  <data name="LvAlias" xml:space="preserve">
-    <value>别名</value>
-  </data>
   <data name="LvEncryptionMethod" xml:space="preserve">
     <value>加密方式</value>
   </data>
@@ -210,9 +207,6 @@
   <data name="LvSubscription" xml:space="preserve">
     <value>订阅分组</value>
   </data>
-  <data name="LvTestResults" xml:space="preserve">
-    <value>测试结果</value>
-  </data>
   <data name="LvTodayDownloadDataAmount" xml:space="preserve">
     <value>今日下载</value>
   </data>
@@ -228,9 +222,6 @@
   <data name="LvTransportProtocol" xml:space="preserve">
     <value>传输协议</value>
   </data>
-  <data name="MediumFresh" xml:space="preserve">
-    <value>中等</value>
-  </data>
   <data name="MsgClearSubscription" xml:space="preserve">
     <value>清除原订阅内容</value>
   </data>
@@ -246,27 +237,15 @@
   <data name="MsgNoValidSubscription" xml:space="preserve">
     <value>未设置有效的订阅</value>
   </data>
-  <data name="MsgPACUpdateFailed" xml:space="preserve">
-    <value>PAC更新失败</value>
-  </data>
-  <data name="MsgPACUpdateSuccessfully" xml:space="preserve">
-    <value>PAC更新成功</value>
-  </data>
   <data name="MsgParsingSuccessfully" xml:space="preserve">
     <value>解析{0}成功</value>
   </data>
-  <data name="MsgSimplifyPAC" xml:space="preserve">
-    <value>简化PAC成功</value>
-  </data>
   <data name="MsgStartGettingSubscriptions" xml:space="preserve">
     <value>开始获取订阅内容</value>
   </data>
   <data name="MsgStartUpdating" xml:space="preserve">
     <value>开始更新 {0}...</value>
   </data>
-  <data name="MsgStartUpdatingPAC" xml:space="preserve">
-    <value>开始更新 PAC...</value>
-  </data>
   <data name="MsgSubscriptionDecodingFailed" xml:space="preserve">
     <value>无效的订阅内容</value>
   </data>
@@ -285,9 +264,6 @@
   <data name="MsgUpdateV2rayCoreSuccessfullyMore" xml:space="preserve">
     <value>更新Core成功！正在重启服务...</value>
   </data>
-  <data name="NeedHttpGlobalProxy" xml:space="preserve">
-    <value>此功能依赖Http全局代理,请先设置正确。</value>
-  </data>
   <data name="NonvmessOrssProtocol" xml:space="preserve">
     <value>非VMess或ss协议</value>
   </data>
@@ -304,7 +280,7 @@
     <value>操作失败，请检查重试</value>
   </data>
   <data name="PleaseFillRemarks" xml:space="preserve">
-    <value>请填写备注</value>
+    <value>请填写别名</value>
   </data>
   <data name="PleaseSelectEncryption" xml:space="preserve">
     <value>请选择加密方式</value>
@@ -315,9 +291,6 @@
   <data name="PleaseSelectServer" xml:space="preserve">
     <value>请先选择服务器</value>
   </data>
-  <data name="QuickFresh" xml:space="preserve">
-    <value>快</value>
-  </data>
   <data name="RemoveDuplicateServerResult" xml:space="preserve">
     <value>服务器去重完成。原数量: {0}，现数量: {1}</value>
   </data>
@@ -327,18 +300,6 @@
   <data name="SaveClientConfigurationIn" xml:space="preserve">
     <value>客户端配置文件保存在:{0}</value>
   </data>
-  <data name="SaveServerConfigurationIn" xml:space="preserve">
-    <value>服务端配置文件保存在:{0}</value>
-  </data>
-  <data name="SlowFresh" xml:space="preserve">
-    <value>慢</value>
-  </data>
-  <data name="SpeedServerTips" xml:space="preserve">
-    <value>注意：此功能依赖Http全局代理!测试完成后,请手工调整Http全局代理和活动节点。</value>
-  </data>
-  <data name="StartPacFailed" xml:space="preserve">
-    <value>PAC服务启动失败,请用管理员启动</value>
-  </data>
   <data name="StartService" xml:space="preserve">
     <value>启动服务({0})...</value>
   </data>
@@ -380,7 +341,7 @@
     <value>数量</value>
   </data>
   <data name="MsgNeedUrl" xml:space="preserve">
-    <value>请填写地址(Url)</value>
+    <value>请填写Url</value>
   </data>
   <data name="AddBatchRoutingRulesYesNo" xml:space="preserve">
     <value>是否追加规则?选择是则追加,选择否则替换</value>
@@ -398,7 +359,7 @@
     <value>请填写正确的自定义DNS</value>
   </data>
   <data name="TransportPathTip1" xml:space="preserve">
-    <value>*ws path</value>
+    <value>*ws/httpupgrade path</value>
   </data>
   <data name="TransportPathTip2" xml:space="preserve">
     <value>*h2 path</value>
@@ -410,13 +371,13 @@
     <value>*grpc serviceName</value>
   </data>
   <data name="TransportRequestHostTip1" xml:space="preserve">
-    <value>*http host中间逗号(,)隔开</value>
+    <value>*http host中间逗号(,)分隔</value>
   </data>
   <data name="TransportRequestHostTip2" xml:space="preserve">
-    <value>*ws host</value>
+    <value>*ws/httpupgrade host</value>
   </data>
   <data name="TransportRequestHostTip3" xml:space="preserve">
-    <value>*h2 host中间逗号(,)隔开</value>
+    <value>*h2 host中间逗号(,)分隔</value>
   </data>
   <data name="TransportRequestHostTip4" xml:space="preserve">
     <value>*QUIC 加密方式</value>
@@ -449,7 +410,7 @@
     <value>未分组服务器</value>
   </data>
   <data name="AllGroupServers" xml:space="preserve">
-    <value>所有服务器</value>
+    <value>所有</value>
   </data>
   <data name="FillServerAddressCustom" xml:space="preserve">
     <value>请浏览导入服务器配置</value>
@@ -470,10 +431,7 @@
     <value>本地</value>
   </data>
   <data name="MsgServerTitle" xml:space="preserve">
-    <value>服务器过滤器</value>
-  </data>
-  <data name="NetFrameworkRequirementsTip" xml:space="preserve">
-    <value>正常使用此版本需要.NET Framework 4.8，请更新后重启</value>
+    <value>服务器过滤器，按回车执行</value>
   </data>
   <data name="menuCheckUpdate" xml:space="preserve">
     <value>检查更新</value>
@@ -547,8 +505,11 @@
   <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>
+    <value>语言(重启)</value>
   </data>
   <data name="menuAddServerViaClipboard" xml:space="preserve">
     <value>从剪贴板导入批量URL (Ctrl+V)</value>
@@ -571,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>
@@ -592,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>
@@ -710,7 +665,7 @@
     <value>SNI</value>
   </data>
   <data name="TbStreamSecurity" xml:space="preserve">
-    <value>TLS</value>
+    <value>传输层安全(TLS)</value>
   </data>
   <data name="TipNetwork" xml:space="preserve">
     <value>*默认tcp,选错会无法连接</value>
@@ -746,7 +701,7 @@
     <value>Socks端口</value>
   </data>
   <data name="TipPreSocksPort" xml:space="preserve">
-    <value>* 自定义配置的Socks端口值，可不设置；当设置此值后，将使用V2ray-core额外启动一个前置Socks服务，提供分流和速度显示等功能</value>
+    <value>* 自定义配置的Socks端口值，可不设置；当设置此值后，将使用Xray/sing-box(Tun)额外启动一个前置Socks服务，提供分流和速度显示等功能</value>
   </data>
   <data name="TbBrowse" xml:space="preserve">
     <value>浏览</value>
@@ -763,12 +718,6 @@
   <data name="TbSettingsAutoHideStartup" xml:space="preserve">
     <value>启动后隐藏窗口</value>
   </data>
-  <data name="TbSettingsAutoTest" xml:space="preserve">
-    <value>自动延迟测试的间隔 (单位分钟)</value>
-  </data>
-  <data name="TbSettingsAutoUpdate" xml:space="preserve">
-    <value>自动更新订阅的间隔(单位小时)</value>
-  </data>
   <data name="TbSettingsAutoUpdateInterval" xml:space="preserve">
     <value>自动更新Geo文件的间隔(单位小时)</value>
   </data>
@@ -776,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>
@@ -808,14 +757,11 @@
   <data name="TbSettingsIgnoreGeoUpdateCore" xml:space="preserve">
     <value>更新Core时忽略Geo文件</value>
   </data>
-  <data name="TbSettingsIpv6" xml:space="preserve">
-    <value>启用IPv6</value>
-  </data>
   <data name="TbSettingsKeepOlderDedupl" xml:space="preserve">
     <value>去重时保留序号较小的项</value>
   </data>
   <data name="TbSettingsLogEnabled" xml:space="preserve">
-    <value>记录本地日志(默认关闭)</value>
+    <value>启用日志</value>
   </data>
   <data name="TbSettingsLogLevel" xml:space="preserve">
     <value>日志等级</value>
@@ -826,17 +772,11 @@
   <data name="TbSettingsN" xml:space="preserve">
     <value>v2rayN 设置</value>
   </data>
-  <data name="TbSettingsPacListenPort" xml:space="preserve">
-    <value>Pac监听端口号</value>
-  </data>
   <data name="TbSettingsPass" xml:space="preserve">
     <value>认证密码</value>
   </data>
   <data name="TbSettingsRemoteDNS" xml:space="preserve">
-    <value>自定义DNS(可多个,用逗号(,)隔开)</value>
-  </data>
-  <data name="TbSettingsSaveTip" xml:space="preserve">
-    <value>修改以下参数后，点击保存才生效</value>
+    <value>自定义DNS(可多个,用逗号(,)分隔)</value>
   </data>
   <data name="TbSettingsSetUWP" xml:space="preserve">
     <value>解除Win10 UWP应用回环代理限制</value>
@@ -851,10 +791,7 @@
     <value>开机启动(可能会不成功)</value>
   </data>
   <data name="TbSettingsStatistics" xml:space="preserve">
-    <value>启用统计(实时网速显示，需要重启)</value>
-  </data>
-  <data name="TbSettingsStatisticsFreshRate" xml:space="preserve">
-    <value>统计刷新频率(单位秒)</value>
+    <value>启用统计(实时网速显示，需重启)</value>
   </data>
   <data name="TbSettingsSubConvert" xml:space="preserve">
     <value>订阅转换网址(可选)</value>
@@ -899,13 +836,13 @@
     <value>Pac模式</value>
   </data>
   <data name="menuShareServer" xml:space="preserve">
-    <value>分享服务器 (Ctrl+D)</value>
+    <value>分享服务器 (Ctrl+F)</value>
   </data>
   <data name="menuRouting" xml:space="preserve">
     <value>路由</value>
   </data>
   <data name="NotRunAsAdmin" xml:space="preserve">
-    <value>非以管理员身份运行</value>
+    <value>以非管理员身份运行</value>
   </data>
   <data name="RunAsAdmin" xml:space="preserve">
     <value>以管理员身份运行</value>
@@ -938,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>
@@ -956,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>
@@ -995,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>
@@ -1022,7 +959,7 @@
     <value>RouteOnly</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>
@@ -1060,4 +997,223 @@
   <data name="TbSettingsTunModeShowWindow" xml:space="preserve">
     <value>显示控制台</value>
   </data>
+  <data name="menuMoveToGroup" xml:space="preserve">
+    <value>移至订阅分组</value>
+  </data>
+  <data name="TbSettingsTunModeCustomTemplate" xml:space="preserve">
+    <value>自定义配置模板</value>
+  </data>
+  <data name="TbSettingsEnableDragDropSort" xml:space="preserve">
+    <value>启用服务器拖放排序(需重启)</value>
+  </data>
+  <data name="TbAutoRefresh" xml:space="preserve">
+    <value>自动刷新</value>
+  </data>
+  <data name="SpeedtestingSkip" xml:space="preserve">
+    <value>跳过测试</value>
+  </data>
+  <data name="menuEditServer" xml:space="preserve">
+    <value>编辑服务器 (Ctrl+D)</value>
+  </data>
+  <data name="TbSettingsDoubleClick2Activate" xml:space="preserve">
+    <value>主界面双击设为活动服务器</value>
+  </data>
+  <data name="SpeedtestingCompleted" xml:space="preserve">
+    <value>测试完成</value>
+  </data>
+  <data name="TbSettingsDefFingerprint" xml:space="preserve">
+    <value>默认TLS指纹(fingerprint)</value>
+  </data>
+  <data name="TbSettingsDefUserAgent" xml:space="preserve">
+    <value>用户代理(User-Agent)</value>
+  </data>
+  <data name="TbSettingsDefUserAgentTips" xml:space="preserve">
+    <value>仅对tcp/http、ws协议生效</value>
+  </data>
+  <data name="TbSettingsCurrentFontFamily" xml:space="preserve">
+    <value>当前字体(需重启)</value>
+  </data>
+  <data name="TbSettingsCurrentFontFamilyTip" xml:space="preserve">
+    <value>拷贝字体TTF/TTC文件到目录guiFonts，重启设置</value>
+  </data>
+  <data name="TbSettingsSocksPortTip" xml:space="preserve">
+    <value>http端口=socks端口+1；Pac端口=socks端口+4；API端口=socks端口+5；</value>
+  </data>
+  <data name="TbSettingsStartBootTip" xml:space="preserve">
+    <value>以管理员权限设置此项，在启动后获得管理员权限</value>
+  </data>
+  <data name="TbSettingsFontSize" xml:space="preserve">
+    <value>字体大小</value>
+  </data>
+  <data name="TbSettingsTunModeProxyIP" xml:space="preserve">
+    <value>代理的IP CIDR，用逗号(,)分隔</value>
+  </data>
+  <data name="TbSettingsTunModeProxyProcess" xml:space="preserve">
+    <value>代理的进程名，用逗号(,)分隔</value>
+  </data>
+  <data name="TbSettingsTunModeBypassMode" xml:space="preserve">
+    <value>绕行模式</value>
+  </data>
+  <data name="TbSettingsSpeedTestTimeout" xml:space="preserve">
+    <value>测速单个超时值</value>
+  </data>
+  <data name="TbSettingsSpeedTestUrl" xml:space="preserve">
+    <value>测速文件地址</value>
+  </data>
+  <data name="TbSettingsTunModeDNS" xml:space="preserve">
+    <value>DNS对象，例如 {"servers":[]}</value>
+  </data>
+  <data name="menuMoveTo" xml:space="preserve">
+    <value>移至上下</value>
+  </data>
+  <data name="TbPublicKey" xml:space="preserve">
+    <value>PublicKey</value>
+  </data>
+  <data name="TbShortId" xml:space="preserve">
+    <value>ShortId</value>
+  </data>
+  <data name="TbSpiderX" xml:space="preserve">
+    <value>SpiderX</value>
+  </data>
+  <data name="TbSettingsEnableHWA" xml:space="preserve">
+    <value>启用硬件加速(需重启)</value>
+  </data>
+  <data name="SpeedtestingWait" xml:space="preserve">
+    <value>等待测试中（按ESC终止）...</value>
+  </data>
+  <data name="TipDisplayLog" xml:space="preserve">
+    <value>当有异常断流时请关闭</value>
+  </data>
+  <data name="MsgSkipSubscriptionUpdate" xml:space="preserve">
+    <value>未启用更新，跳过此订阅</value>
+  </data>
+  <data name="menuRebootAsAdmin" xml:space="preserve">
+    <value>以管理员身份重启</value>
+  </data>
+  <data name="LvMoreUrl" xml:space="preserve">
+    <value>更多地址(url)，用逗号(,)分隔；订阅转换将失效</value>
+  </data>
+  <data name="LvAutoUpdateInterval" xml:space="preserve">
+    <value>自动更新间隔(分钟)</value>
+  </data>
+  <data name="TbSettingsLogEnabledToFile" xml:space="preserve">
+    <value>启用日志存到文件</value>
+  </data>
+  <data name="LvConvertTarget" xml:space="preserve">
+    <value>订阅转换目标类型</value>
+  </data>
+  <data name="LvConvertTargetTip" xml:space="preserve">
+    <value>不需要转换时请留空</value>
+  </data>
+  <data name="menuDNSSetting" xml:space="preserve">
+    <value>DNS设置</value>
+  </data>
+  <data name="TbSettingsCoreDnsSingbox" xml:space="preserve">
+    <value>sing-box DNS设置</value>
+  </data>
+  <data name="TbDnsSingboxObjectDoc" xml:space="preserve">
+    <value>请填写 DNS JSON 结构，点击查看文档</value>
+  </data>
+  <data name="TbSettingDnsImportDefConfig" xml:space="preserve">
+    <value>点击导入默认DNS配置</value>
+  </data>
+  <data name="TbdomainStrategy4Singbox" xml:space="preserve">
+    <value>sing-box域名解析策略</value>
+  </data>
+  <data name="TbSettingsMux4SboxProtocol" xml:space="preserve">
+    <value>sing-box Mux 多路复用协议</value>
+  </data>
+  <data name="TbRoutingRuleProcess" xml:space="preserve">
+    <value>进程名全称 (Tun模式)</value>
+  </data>
+  <data name="TbRoutingRuleDomain" xml:space="preserve">
+    <value>Domain</value>
+  </data>
+  <data name="TbRoutingRuleIP" xml:space="preserve">
+    <value>IP 或 IP CIDR</value>
+  </data>
+  <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>
+  <data name="SpeedtestingStop" xml:space="preserve">
+    <value>测试终止中...</value>
+  </data>
+  <data name="TransportRequestHostTip5" xml:space="preserve">
+    <value>*grpc Authority</value>
+  </data>
+  <data name="menuAddHttpServer" xml:space="preserve">
+    <value>添加[Http]服务器</value>
+  </data>
+  <data name="TbSettingsEnableFragment" xml:space="preserve">
+    <value>启用分片（Fragment）</value>
+  </data>
+  <data name="TbSettingsEnableFragmentTips" xml:space="preserve">
+    <value>使用Xray且非Tun模式启用，和分组前置代理冲突</value>
+  </data>
+  <data name="TbSettingsEnableCacheFile4Sbox" xml:space="preserve">
+    <value>启用sing-box（规则集文件）的缓存文件</value>
+  </data>
+  <data name="LvCustomRulesetPath4Singbox" xml:space="preserve">
+    <value>自定义sing-box rule-set</value>
+  </data>
+  <data name="NeedRebootTips" xml:space="preserve">
+    <value>操作成功。请点击设置菜单重启应用。</value>
+  </data>
+  <data name="menuOpenTheFileLocation" xml:space="preserve">
+    <value>打开存储所在的位置</value>
+  </data>
 </root>