Update 6.40

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

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

.github/workflows/dotnet-desktop.yml

@@ -1,106 +0,0 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-
-# This workflow will build, test, sign and package a WPF or Windows Forms desktop application
-# built on .NET Core.
-# To learn how to migrate your existing application to .NET Core,
-# refer to https://docs.microsoft.com/en-us/dotnet/desktop-wpf/migration/convert-project-from-net-framework
-#
-# To configure this workflow:
-#
-# 1. Configure environment variables
-# GitHub sets default environment variables for every workflow run.
-# Replace the variables relative to your project in the "env" section below.
-#
-# 2. Signing
-# Generate a signing certificate in the Windows Application
-# Packaging Project or add an existing signing certificate to the project.
-# Next, use PowerShell to encode the .pfx file using Base64 encoding
-# by running the following Powershell script to generate the output string:
-#
-# $pfx_cert = Get-Content '.\SigningCertificate.pfx' -Encoding Byte
-# [System.Convert]::ToBase64String($pfx_cert) | Out-File 'SigningCertificate_Encoded.txt'
-#
-# Open the output file, SigningCertificate_Encoded.txt, and copy the
-# string inside. Then, add the string to the repo as a GitHub secret
-# and name it "Base64_Encoded_Pfx."
-# For more information on how to configure your signing certificate for
-# this workflow, refer to https://github.com/microsoft/github-actions-for-desktop-apps#signing
-#
-# Finally, add the signing certificate password to the repo as a secret and name it "Pfx_Key".
-# See "Build the Windows Application Packaging project" below to see how the secret is used.
-#
-# For more information on GitHub Actions, refer to https://github.com/features/actions
-# For a complete CI/CD sample to get started with GitHub Action workflows for Desktop Applications,
-# refer to https://github.com/microsoft/github-actions-for-desktop-apps
-
-name: .NET Core Desktop
-
-on:
-  push:
-    branches: [ "master" ]
-  pull_request:
-    branches: [ "master" ]
-
-jobs:
-
-  build:
-
-    strategy:
-      matrix:
-        configuration: [Release]
-
-    runs-on: windows-latest  # For a list of available runner types, refer to
-                             # https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idruns-on
-
-    env:
-      Solution_Name: v2rayN\v2rayN.sln
-      #Test_Project_Path: your-test-project-path                 # Replace with the path to your test project, i.e. MyWpfApp.Tests\MyWpfApp.Tests.csproj.
-      Wap_Project_Directory: v2rayN\v2rayN\bin
-      #Wap_Project_Path: your-wap-project-path                   # Replace with the path to your Wap project, i.e. MyWpf.App.Package\MyWpfApp.Package.wapproj.
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    # Install the .NET Core workload
-    - name: Install .NET Core
-      uses: actions/setup-dotnet@v3
-      with:
-        dotnet-version: 6.0.x
-
-    # Add  MSBuild to the PATH: https://github.com/microsoft/setup-msbuild
-    - name: Setup MSBuild.exe
-      uses: microsoft/setup-msbuild@v1.0.2
-
-    # Restore the application to populate the obj folder with RuntimeIdentifiers
-    - name: Restore the application
-      run: msbuild $env:Solution_Name /t:Restore /p:Configuration=$env:Configuration
-      env:
-        Configuration: ${{ matrix.configuration }}
-
-
-    # Create the app package by building and packaging the Windows Application Packaging project
-    - name: Create the app package
-      run: msbuild $env:Solution_Name /p:Configuration=$env:Configuration 
-      env:
-        Appx_Bundle: Always
-        Appx_Bundle_Platforms: x86|x64
-        Appx_Package_Build_Mode: StoreUpload
-        Configuration: ${{ matrix.configuration }}
-
-    - name: check output
-      run: ls ${{ env.Wap_Project_Directory }}
-      env:
-        Configuration: ${{ matrix.configuration }}
-
-    # Upload the MSIX package: https://github.com/marketplace/actions/upload-a-build-artifact
-    - name: Upload build artifacts
-      uses: actions/upload-artifact@v3
-      with:
-        name: MSIX Package
-        path: ${{ env.Wap_Project_Directory }}\Release\net6.0-windows

README.md

@@ -14,7 +14,8 @@ A GUI client for Windows, support [Xray core](https://github.com/XTLS/Xray-core)
 - Run v2rayN.exe
 
 ## Requirements  
-- [Microsoft .NET 6.0 Desktop Runtime ](https://download.visualstudio.microsoft.com/download/pr/513d13b7-b456-45af-828b-b7b7981ff462/edf44a743b78f8b54a2cec97ce888346/windowsdesktop-runtime-6.0.15-win-x64.exe)
+- (6.35 and above)[Microsoft .NET 8.0 Desktop Runtime ](https://dotnet.microsoft.com/en-us/download/dotnet/8.0)
+- (6.33 and below)[Microsoft .NET 6.0 Desktop Runtime ](https://dotnet.microsoft.com/en-us/download/dotnet/6.0)
 - [Supported cores](https://github.com/2dust/v2rayN/wiki/List-of-supported-cores)
 
 

v2rayN/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/ProtosLib/ProtosLib.csproj

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

v2rayN/build.ps1

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

v2rayN/v2rayN/App.xaml

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

v2rayN/v2rayN/App.xaml.cs

@@ -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.Model;
 
 namespace v2rayN
 {
@@ -28,24 +28,21 @@ namespace v2rayN
         /// <param name="e"></param>
         protected override void OnStartup(StartupEventArgs e)
         {
-            Global.ExePathKey = Utils.GetMD5(Utils.GetExePath());
+            var exePathKey = Utils.GetMD5(Utils.GetExePath());
 
             var rebootas = (e.Args ?? new string[] { }).Any(t => t == Global.RebootAs);
-            ProgramStarted = new EventWaitHandle(false, EventResetMode.AutoReset, Global.ExePathKey, out bool bCreatedNew);
+            ProgramStarted = new EventWaitHandle(false, EventResetMode.AutoReset, exePathKey, out bool bCreatedNew);
             if (!rebootas && !bCreatedNew)
             {
                 ProgramStarted.Set();
-                Current.Shutdown();
                 Environment.Exit(0);
                 return;
             }
 
-            Global.processJob = new Job();
-
             Logging.Setup();
             Init();
             Logging.LoggingEnabled(_config.guiItem.enableLog);
-            Utils.SaveLog($"v2rayN start up | {Utils.GetVersion()} | {Utils.GetExePath()}");
+            Logging.SaveLog($"v2rayN start up | {Utils.GetVersion()} | {Utils.GetExePath()}");
             Logging.ClearLogs();
 
             Thread.CurrentThread.CurrentUICulture = new(_config.uiItem.currentLanguage);
@@ -57,8 +54,7 @@ namespace v2rayN
         {
             if (ConfigHandler.LoadConfig(ref _config) != 0)
             {
-                UI.ShowWarning($"Loading GUI configuration file is abnormal,please restart the application{Environment.NewLine}加载GUI配置文件异常,请重启应用");
-                Application.Current.Shutdown();
+                UI.Show($"Loading GUI configuration file is abnormal,please restart the application{Environment.NewLine}加载GUI配置文件异常,请重启应用");
                 Environment.Exit(0);
                 return;
             }
@@ -70,7 +66,7 @@ namespace v2rayN
 
         private void App_DispatcherUnhandledException(object sender, DispatcherUnhandledExceptionEventArgs e)
         {
-            Utils.SaveLog("App_DispatcherUnhandledException", e.Exception);
+            Logging.SaveLog("App_DispatcherUnhandledException", e.Exception);
             e.Handled = true;
         }
 
@@ -78,13 +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)
         {
-            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/Common/DownloaderHelper.cs

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

v2rayN/v2rayN/Common/FileManager.cs

@@ -2,7 +2,7 @@
 using System.IO.Compression;
 using System.Text;
 
-namespace v2rayN.Tool
+namespace v2rayN
 {
     public static class FileManager
     {
@@ -15,12 +15,12 @@ namespace v2rayN.Tool
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
             return false;
         }
 
-        public static void UncompressFile(string fileName, byte[] content)
+        public static void UncompressedFile(string fileName, byte[] content)
         {
             try
             {
@@ -30,7 +30,7 @@ namespace v2rayN.Tool
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
         }
 
@@ -49,7 +49,7 @@ namespace v2rayN.Tool
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 throw;
             }
         }
@@ -75,13 +75,13 @@ namespace v2rayN.Tool
                     }
                     catch (IOException ex)
                     {
-                        Utils.SaveLog(ex.Message, ex);
+                        Logging.SaveLog(ex.Message, ex);
                     }
                 }
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 return false;
             }
             return true;

v2rayN/v2rayN/Common/HttpClientHelper.cs

@@ -3,7 +3,7 @@ using System.Net.Http;
 using System.Net.Mime;
 using System.Text;
 
-namespace v2rayN.Base
+namespace v2rayN
 {
     /// <summary>
     /// </summary>
@@ -23,19 +23,19 @@ namespace v2rayN.Base
 
         public async Task<string?> GetAsync(string url)
         {
-            if (string.IsNullOrEmpty(url)) return null;
+            if (Utils.IsNullOrEmpty(url)) return null;
             return await httpClient.GetStringAsync(url);
         }
 
         public async Task<string?> GetAsync(HttpClient client, string url, CancellationToken token = default)
         {
-            if (string.IsNullOrWhiteSpace(url)) return null;
+            if (Utils.IsNullOrEmpty(url)) return null;
             return await client.GetStringAsync(url, token);
         }
 
         public async Task PutAsync(string url, Dictionary<string, string> headers)
         {
-            var jsonContent = Utils.ToJson(headers);
+            var jsonContent = JsonUtils.Serialize(headers);
             var content = new StringContent(jsonContent, Encoding.UTF8, MediaTypeNames.Application.Json);
 
             var result = await httpClient.PutAsync(url, content);
@@ -76,19 +76,19 @@ namespace v2rayN.Base
                     //if (progressPercentage != percent && percent % 10 == 0)
                     {
                         progressPercentage = percent;
-                        progress!.Report(percent);
+                        progress?.Report(percent);
                     }
                 }
             }
             if (canReportProgress)
             {
-                progress!.Report(101);
+                progress?.Report(101);
             }
         }
 
         public async Task DownloadDataAsync4Speed(HttpClient client, string url, IProgress<string> progress, CancellationToken token = default)
         {
-            if (string.IsNullOrEmpty(url))
+            if (Utils.IsNullOrEmpty(url))
             {
                 throw new ArgumentNullException(nameof(url));
             }

v2rayN/v2rayN/Common/Job.cs

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

v2rayN/v2rayN/Common/JsonUtils.cs

@@ -0,0 +1,132 @@
+using System.IO;
+using System.Text.Json;
+using System.Text.Json.Nodes;
+using System.Text.Json.Serialization;
+
+namespace v2rayN
+{
+    internal class JsonUtils
+    {
+        /// <summary>
+        /// DeepCopy
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="obj"></param>
+        /// <returns></returns>
+        public static T DeepCopy<T>(T obj)
+        {
+            return Deserialize<T>(Serialize(obj, false))!;
+        }
+
+        /// <summary>
+        /// Deserialize to object
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="strJson"></param>
+        /// <returns></returns>
+        public static T? Deserialize<T>(string? strJson)
+        {
+            try
+            {
+                if (string.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,7 +3,7 @@ using NLog.Config;
 using NLog.Targets;
 using System.IO;
 
-namespace v2rayN.Tool
+namespace v2rayN
 {
     public class Logging
     {
@@ -51,5 +51,28 @@ namespace v2rayN.Tool
                 catch { }
             });
         }
+
+        public static void SaveLog(string strContent)
+        {
+            if (LogManager.IsLoggingEnabled())
+            {
+                var logger = LogManager.GetLogger("Log1");
+                logger.Info(strContent);
+            }
+        }
+
+        public static void SaveLog(string strTitle, Exception ex)
+        {
+            if (LogManager.IsLoggingEnabled())
+            {
+                var logger = LogManager.GetLogger("Log2");
+                logger.Debug($"{strTitle},{ex.Message}");
+                logger.Debug(ex.StackTrace);
+                if (ex?.InnerException != null)
+                {
+                    logger.Error(ex.InnerException);
+                }
+            }
+        }
     }
 }

v2rayN/v2rayN/Common/QRCodeHelper.cs

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

v2rayN/v2rayN/Common/QueryableExtension.cs

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

v2rayN/v2rayN/Common/SemanticVersion.cs

@@ -1,6 +1,4 @@
-using v2rayN.Base;
-
-namespace v2rayN.Tool
+namespace v2rayN
 {
     public class SemanticVersion
     {

v2rayN/v2rayN/Common/SqliteHelper.cs

@@ -1,20 +1,21 @@
 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(() => new());
-        public static SqliteHelper Instance => _instance.Value;
+        private static readonly Lazy<SQLiteHelper> _instance = new(() => new());
+        public static SQLiteHelper Instance => _instance.Value;
         private string _connstr;
         private SQLiteConnection _db;
         private SQLiteAsyncConnection _dbAsync;
         private static readonly object objLock = new();
+        public readonly string _configDB = "guiNDB.db";
 
-        public SqliteHelper()
+        public SQLiteHelper()
         {
-            _connstr = Utils.GetConfigPath(Global.ConfigDB);
+            _connstr = Utils.GetConfigPath(_configDB);
             _db = new SQLiteConnection(_connstr, false);
             _dbAsync = new SQLiteAsyncConnection(_connstr, false);
         }
@@ -50,7 +51,7 @@ namespace v2rayN.Base
             }
         }
 
-        public async Task<int> Replacesync(object model)
+        public async Task<int> ReplaceAsync(object model)
         {
             return await _dbAsync.InsertOrReplaceAsync(model);
         }

v2rayN/v2rayN/Common/StringEx.cs

@@ -1,7 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
 
-namespace v2rayN.Base
+namespace v2rayN
 {
     internal static class StringEx
     {
@@ -80,5 +80,15 @@ namespace v2rayN.Base
 
             return char.ToUpper(value[0]) + value.Substring(1);
         }
+
+        public static string AppendQuotes(this string value)
+        {
+            if (string.IsNullOrEmpty(value))
+            {
+                return string.Empty;
+            }
+
+            return $"\"{value}\"";
+        }
     }
 }

v2rayN/v2rayN/Common/UI.cs

@@ -1,4 +1,5 @@
-using System.Windows;
+using Microsoft.Win32;
+using System.Windows;
 
 namespace v2rayN
 {
@@ -11,14 +12,28 @@ namespace v2rayN
             MessageBox.Show(msg, caption, MessageBoxButton.OK, MessageBoxImage.Information, MessageBoxResult.OK);
         }
 
-        public static void ShowWarning(string msg)
-        {
-            MessageBox.Show(msg, caption, MessageBoxButton.OK, MessageBoxImage.Warning, MessageBoxResult.OK);
-        }
-
         public static MessageBoxResult ShowYesNo(string msg)
         {
             return MessageBox.Show(msg, caption, MessageBoxButton.YesNo, MessageBoxImage.Question);
         }
+
+        public static bool? OpenFileDialog(out string fileName, string filter)
+        {
+            fileName = string.Empty;
+
+            var fileDialog = new OpenFileDialog
+            {
+                Multiselect = false,
+                Filter = filter
+            };
+
+            if (fileDialog.ShowDialog() != true)
+            {
+                return false;
+            }
+            fileName = fileDialog.FileName;
+
+            return true;
+        }
     }
 }

v2rayN/v2rayN/Common/Utils.cs

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

v2rayN/v2rayN/Converters/MaterialDesignFonts.cs

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

v2rayN/v2rayN/Global.cs

@@ -1,47 +1,45 @@
-namespace v2rayN
+using v2rayN.Model;
+
+namespace v2rayN
 {
     internal class Global
     {
         #region const
 
-        public const string githubUrl = "https://github.com";
-        public const string githubApiUrl = "https://api.github.com/repos";
-        public const string v2rayWebsiteUrl = @"https://www.v2fly.org/";
-        public const string 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/apernet/hysteria/releases";
-        public const string naiveproxyCoreUrl = "https://github.com/klzgrad/naiveproxy/releases";
-        public const string tuicCoreUrl = "https://github.com/EAimTY/tuic/releases";
-        public const string singboxCoreUrl = "https://github.com/SagerNet/sing-box/releases";
-        public const string geoUrl = "https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/{0}.dat";
-        public const string singboxGeoUrl = "https://github.com/soffchen/sing-{0}/releases/latest/download/{0}.db";
+        public const string 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 JuicityCoreUrl = "https://github.com/juicity/juicity/releases";
         public const string CustomRoutingListUrl = @"https://raw.githubusercontent.com/2dust/v2rayCustomRoutingList/master/";
 
         public const string PromotionUrl = @"aHR0cHM6Ly85LjIzNDQ1Ni54eXovYWJjLmh0bWw=";
         public const string ConfigFileName = "guiNConfig.json";
-        public const string ConfigDB = "guiNDB.db";
-        public const string coreConfigFileName = "config.json";
-        public const string corePreConfigFileName = "configPre.json";
-
-        public const string v2raySampleClient = "v2rayN.Sample.SampleClientConfig";
+        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 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 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";
 
@@ -49,44 +47,28 @@
         public const string DefaultNetwork = "tcp";
         public const string TcpHeaderHttp = "http";
         public const string None = "none";
-        public const string agentTag = "proxy";
-        public const string directTag = "direct";
-        public const string blockTag = "block";
+        public const string ProxyTag = "proxy";
+        public const string DirectTag = "direct";
+        public const string BlockTag = "block";
         public const string StreamSecurity = "tls";
         public const string StreamSecurityReality = "reality";
-        public const string InboundSocks = "socks";
-        public const string InboundHttp = "http";
-        public const string InboundSocks2 = "socks2";
-        public const string InboundHttp2 = "http2";
         public const string Loopback = "127.0.0.1";
-        public const string InboundAPITagName = "api";
-        public const string InboundAPIProtocal = "dokodemo-door";
+        public const string InboundAPIProtocol = "dokodemo-door";
+        public const string HttpProtocol = "http://";
+        public const string HttpsProtocol = "https://";
 
-        public const string 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;
@@ -127,7 +109,13 @@
             @"http://cachefly.cachefly.net/10mb.test"
         };
 
-        public static readonly Dictionary<string, string> userAgentTxt = new()
+        public static readonly List<string> SpeedPingTestUrls = new() {
+            @"https://www.google.com/generate_204",
+            @"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" },
@@ -136,42 +124,61 @@
             {"none",""}
         };
 
-        public static readonly List<string> vmessSecuritys = new() { "aes-128-gcm", "chacha20-poly1305", "auto", "none", "zero" };
-        public static readonly List<string> ssSecuritys = new() { "aes-256-gcm", "aes-128-gcm", "chacha20-poly1305", "chacha20-ietf-poly1305", "none", "plain" };
-        public static readonly List<string> ssSecuritysInSagerNet = new() { "none", "2022-blake3-aes-128-gcm", "2022-blake3-aes-256-gcm", "2022-blake3-chacha20-poly1305", "aes-128-gcm", "aes-192-gcm", "aes-256-gcm", "chacha20-ietf-poly1305", "xchacha20-ietf-poly1305", "rc4", "rc4-md5", "aes-128-ctr", "aes-192-ctr", "aes-256-ctr", "aes-128-cfb", "aes-192-cfb", "aes-256-cfb", "aes-128-cfb8", "aes-192-cfb8", "aes-256-cfb8", "aes-128-ofb", "aes-192-ofb", "aes-256-ofb", "bf-cfb", "cast5-cfb", "des-cfb", "idea-cfb", "rc2-cfb", "seed-cfb", "camellia-128-cfb", "camellia-192-cfb", "camellia-256-cfb", "camellia-128-cfb8", "camellia-192-cfb8", "camellia-256-cfb8", "salsa20", "chacha20", "chacha20-ietf", "xchacha20" };
-        public static readonly List<string> ssSecuritysInXray = new() { "aes-256-gcm", "aes-128-gcm", "chacha20-poly1305", "chacha20-ietf-poly1305", "xchacha20-poly1305", "xchacha20-ietf-poly1305", "none", "plain", "2022-blake3-aes-128-gcm", "2022-blake3-aes-256-gcm", "2022-blake3-chacha20-poly1305" };
-        public static readonly List<string> flows = new() { "", "xtls-rprx-vision", "xtls-rprx-vision-udp443" };
-        public static readonly List<string> networks = new() { "tcp", "kcp", "ws", "h2", "quic", "grpc" };
-        public static readonly List<string> kcpHeaderTypes = new() { "srtp", "utp", "wechat-video", "dtls", "wireguard" };
-        public static readonly List<string> coreTypes = new() { "v2fly", "SagerNet", "Xray", "sing_box" };
-        public static readonly List<string> coreTypes4VLESS = new() { "Xray", "sing_box" };
-        public static readonly List<string> domainStrategys = new() { "AsIs", "IPIfNonMatch", "IPOnDemand" };
-        public static readonly List<string> domainStrategys4Singbox = new() { "ipv4_only", "ipv6_only", "prefer_ipv4", "prefer_ipv6", "" };
-        public static readonly List<string> domainMatchers = new() { "linear", "mph", "" };
-        public static readonly List<string> fingerprints = new() { "chrome", "firefox", "safari", "ios", "android", "edge", "360", "qq", "random", "randomized", "" };
-        public static readonly List<string> userAgent = new() { "chrome", "firefox", "safari", "edge", "none" };
+        public const string Hysteria2ProtocolShare = "hy2://";
 
-        public static readonly List<string> allowInsecures = new() { "true", "false", "" };
-        public static readonly List<string> domainStrategy4Freedoms = new() { "AsIs", "UseIP", "UseIPv4", "UseIPv6", "" };
+        public static readonly Dictionary<EConfigType, string> ProtocolShares = new()
+        {
+            {EConfigType.VMess,"vmess://"},
+            {EConfigType.Shadowsocks,"ss://"},
+            {EConfigType.Socks,"socks://"},
+            {EConfigType.VLESS,"vless://"},
+            {EConfigType.Trojan,"trojan://"},
+            {EConfigType.Hysteria2,"hysteria2://"},
+            {EConfigType.Tuic,"tuic://"},
+            {EConfigType.Wireguard,"wireguard://"}
+        };
+
+        public static readonly Dictionary<EConfigType, string> ProtocolTypes = new()
+        {
+            {EConfigType.VMess,"vmess"},
+            {EConfigType.Shadowsocks,"shadowsocks"},
+            {EConfigType.Socks,"socks"},
+            {EConfigType.VLESS,"vless"},
+            {EConfigType.Trojan,"trojan"},
+            {EConfigType.Hysteria2,"hysteria2"},
+            {EConfigType.Tuic,"tuic"},
+            {EConfigType.Wireguard,"wireguard"}
+        };
+
+        public static readonly List<string> 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() { "h2", "http/1.1", "h2,http/1.1", "" };
-        public static readonly List<string> LogLevel = new() { "debug", "info", "warning", "error", "none" };
+        public static readonly List<string> Alpns = new() { "h3", "h2", "http/1.1", "h3,h2,http/1.1", "h3,h2", "h2,http/1.1", "" };
+        public static readonly List<string> LogLevels = new() { "debug", "info", "warning", "error", "none" };
         public static readonly List<string> InboundTags = new() { "socks", "http", "socks2", "http2" };
-        public static readonly List<string> Protocols = new() { "http", "tls", "bittorrent" };
-        public static readonly List<string> TunMtus = new() { "9000", "1500" };
+        public static readonly List<string> RuleProtocols = new() { "http", "tls", "bittorrent" };
+        public static readonly List<string> TunMtus = new() { "1280", "1408", "1500", "9000" };
         public static readonly List<string> TunStacks = new() { "gvisor", "system" };
         public static readonly List<string> PresetMsgFilters = new() { "proxy", "direct", "block", "" };
         public static readonly List<string> SingboxMuxs = new() { "h2mux", "smux", "yamux", "" };
+        public static readonly List<string> TuicCongestionControls = new() { "cubic", "new_reno", "bbr" };
 
         #endregion const
-
-        #region global variable
-
-        public static int statePort { get; set; }
-        public static Job processJob { get; set; }
-        public static bool ShowInTaskbar { get; set; }
-        public static string ExePathKey { get; set; }
-
-        #endregion global variable
     }
-}
+}

v2rayN/v2rayN/Handler/CoreConfigHandler.cs

@@ -1,5 +1,5 @@
 using System.IO;
-using v2rayN.Mode;
+using v2rayN.Model;
 using v2rayN.Resx;
 
 namespace v2rayN.Handler
@@ -35,11 +35,11 @@ namespace v2rayN.Handler
                     }
                     if (Utils.IsNullOrEmpty(fileName))
                     {
-                        content = Utils.ToJson(singboxConfig);
+                        content = JsonUtils.Serialize(singboxConfig);
                     }
                     else
                     {
-                        Utils.ToJsonFile(singboxConfig, fileName, false);
+                        JsonUtils.ToFile(singboxConfig, fileName, false);
                     }
                 }
                 else
@@ -51,17 +51,17 @@ namespace v2rayN.Handler
                     }
                     if (Utils.IsNullOrEmpty(fileName))
                     {
-                        content = Utils.ToJson(v2rayConfig);
+                        content = JsonUtils.Serialize(v2rayConfig);
                     }
                     else
                     {
-                        Utils.ToJsonFile(v2rayConfig, fileName, false);
+                        JsonUtils.ToFile(v2rayConfig, fileName, false);
                     }
                 }
             }
             catch (Exception ex)
             {
-                Utils.SaveLog("GenerateClientConfig", ex);
+                Logging.SaveLog("GenerateClientConfig", ex);
                 msg = ResUI.FailedGenDefaultConfiguration;
                 return -1;
             }
@@ -119,6 +119,7 @@ namespace v2rayN.Handler
 
                         case ECoreType.clash:
                         case ECoreType.clash_meta:
+                        case ECoreType.mihomo:
                             //remove the original
                             var indexPort = fileContent.FindIndex(t => t.Contains("port:"));
                             if (indexPort >= 0)
@@ -131,8 +132,8 @@ namespace v2rayN.Handler
                                 fileContent.RemoveAt(indexPort);
                             }
 
-                            fileContent.Add($"port: {LazyConfig.Instance.GetLocalPort(Global.InboundHttp)}");
-                            fileContent.Add($"socks-port: {LazyConfig.Instance.GetLocalPort(Global.InboundSocks)}");
+                            fileContent.Add($"port: {LazyConfig.Instance.GetLocalPort(EInboundProtocol.http)}");
+                            fileContent.Add($"socks-port: {LazyConfig.Instance.GetLocalPort(EInboundProtocol.socks)}");
                             break;
                     }
                     File.WriteAllLines(fileName, fileContent);
@@ -142,17 +143,32 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog("GenerateClientCustomConfig", ex);
+                Logging.SaveLog("GenerateClientCustomConfig", ex);
                 msg = ResUI.FailedGenDefaultConfiguration;
                 return -1;
             }
             return 0;
         }
 
-        public static string GenerateClientSpeedtestConfigString(Config config, List<ServerTestItem> selecteds, out string msg)
+        public static int GenerateClientSpeedtestConfig(Config config, string fileName, List<ServerTestItem> selecteds, ECoreType coreType, out string msg)
         {
-            var coreConfigV2ray = new CoreConfigV2ray(config);
-            return coreConfigV2ray.GenerateClientSpeedtestConfigString(selecteds, out msg);
+            if (coreType == ECoreType.sing_box)
+            {
+                if ((new CoreConfigSingbox(config)).GenerateClientSpeedtestConfig(selecteds, out SingboxConfig? singboxConfig, out msg) != 0)
+                {
+                    return -1;
+                }
+                JsonUtils.ToFile(singboxConfig, fileName, false);
+            }
+            else
+            {
+                if ((new CoreConfigV2ray(config)).GenerateClientSpeedtestConfig(selecteds, out V2rayConfig? v2rayConfig, out msg) != 0)
+                {
+                    return -1;
+                }
+                JsonUtils.ToFile(v2rayConfig, fileName, false);
+            }
+            return 0;
         }
     }
-}
+}

v2rayN/v2rayN/Handler/CoreConfigSingbox.cs

@@ -1,12 +1,12 @@
-using v2rayN.Base;
-using v2rayN.Mode;
+using System.Net;
+using System.Net.NetworkInformation;
+using v2rayN.Model;
 using v2rayN.Resx;
 
 namespace v2rayN.Handler
 {
     internal class CoreConfigSingbox
     {
-        private string SampleClient = Global.SingboxSampleClient;
         private Config _config;
 
         public CoreConfigSingbox(Config config)
@@ -28,44 +28,48 @@ namespace v2rayN.Handler
 
                 msg = ResUI.InitialConfiguration;
 
-                string result = Utils.GetEmbedText(SampleClient);
+                string result = Utils.GetEmbedText(Global.SingboxSampleClient);
                 if (Utils.IsNullOrEmpty(result))
                 {
                     msg = ResUI.FailedGetDefaultConfiguration;
                     return -1;
                 }
 
-                singboxConfig = Utils.FromJson<SingboxConfig>(result);
+                singboxConfig = JsonUtils.Deserialize<SingboxConfig>(result);
                 if (singboxConfig == null)
                 {
                     msg = ResUI.FailedGenDefaultConfiguration;
                     return -1;
                 }
 
-                log(singboxConfig);
+                GenLog(singboxConfig);
 
-                inbound(singboxConfig);
+                GenInbounds(singboxConfig);
 
-                outbound(node, singboxConfig);
+                GenOutbound(node, singboxConfig.outbounds[0]);
 
-                routing(singboxConfig);
+                GenMoreOutbounds(node, singboxConfig);
 
-                dns(node, singboxConfig);
+                GenRouting(singboxConfig);
 
-                statistic(singboxConfig);
+                GenDns(node, singboxConfig);
+
+                GenStatistic(singboxConfig);
 
                 msg = string.Format(ResUI.SuccessfulConfiguration, "");
             }
             catch (Exception ex)
             {
-                Utils.SaveLog("GenerateClientConfig4Singbox", ex);
+                Logging.SaveLog("GenerateClientConfig4Singbox", ex);
                 msg = ResUI.FailedGenDefaultConfiguration;
                 return -1;
             }
             return 0;
         }
 
-        private int log(SingboxConfig singboxConfig)
+        #region private gen function
+
+        private int GenLog(SingboxConfig singboxConfig)
         {
             try
             {
@@ -84,7 +88,7 @@ namespace v2rayN.Handler
                     default:
                         break;
                 }
-                if (_config.coreBasicItem.loglevel == "none")
+                if (_config.coreBasicItem.loglevel == Global.None)
                 {
                     singboxConfig.log.disabled = true;
                 }
@@ -96,14 +100,12 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
             return 0;
         }
 
-        #region inbound private
-
-        private int inbound(SingboxConfig singboxConfig)
+        private int GenInbounds(SingboxConfig singboxConfig)
         {
             try
             {
@@ -113,20 +115,20 @@ namespace v2rayN.Handler
                 {
                     var inbound = new Inbound4Sbox()
                     {
-                        type = Global.InboundSocks,
-                        tag = Global.InboundSocks,
+                        type = EInboundProtocol.socks.ToString(),
+                        tag = EInboundProtocol.socks.ToString(),
                         listen = Global.Loopback,
                     };
                     singboxConfig.inbounds.Add(inbound);
 
-                    inbound.listen_port = LazyConfig.Instance.GetLocalPort(Global.InboundSocks);
+                    inbound.listen_port = LazyConfig.Instance.GetLocalPort(EInboundProtocol.socks);
                     inbound.sniff = _config.inbound[0].sniffingEnabled;
                     inbound.sniff_override_destination = _config.inbound[0].routeOnly ? false : _config.inbound[0].sniffingEnabled;
                     inbound.domain_strategy = Utils.IsNullOrEmpty(_config.routingBasicItem.domainStrategy4Singbox) ? null : _config.routingBasicItem.domainStrategy4Singbox;
 
                     if (_config.routingBasicItem.enableRoutingAdvanced)
                     {
-                        var routing = ConfigHandler.GetDefaultRouting(ref _config);
+                        var routing = ConfigHandler.GetDefaultRouting(_config);
                         if (!Utils.IsNullOrEmpty(routing.domainStrategy4Singbox))
                         {
                             inbound.domain_strategy = routing.domainStrategy4Singbox;
@@ -134,18 +136,18 @@ namespace v2rayN.Handler
                     }
 
                     //http
-                    var inbound2 = GetInbound(inbound, Global.InboundHttp, 1, false);
+                    var inbound2 = GetInbound(inbound, EInboundProtocol.http, false);
                     singboxConfig.inbounds.Add(inbound2);
 
                     if (_config.inbound[0].allowLANConn)
                     {
                         if (_config.inbound[0].newPort4LAN)
                         {
-                            var inbound3 = GetInbound(inbound, Global.InboundSocks2, 2, true);
+                            var inbound3 = GetInbound(inbound, EInboundProtocol.socks2, true);
                             inbound3.listen = "::";
                             singboxConfig.inbounds.Add(inbound3);
 
-                            var inbound4 = GetInbound(inbound, Global.InboundHttp2, 3, false);
+                            var inbound4 = GetInbound(inbound, EInboundProtocol.http2, false);
                             inbound4.listen = "::";
                             singboxConfig.inbounds.Add(inbound4);
 
@@ -168,65 +170,57 @@ namespace v2rayN.Handler
                 {
                     if (_config.tunModeItem.mtu <= 0)
                     {
-                        _config.tunModeItem.mtu = Convert.ToInt32(Global.TunMtus[0]);
+                        _config.tunModeItem.mtu = Utils.ToInt(Global.TunMtus[0]);
                     }
                     if (Utils.IsNullOrEmpty(_config.tunModeItem.stack))
                     {
                         _config.tunModeItem.stack = Global.TunStacks[0];
                     }
 
-                    var tunInbound = Utils.FromJson<Inbound4Sbox>(Utils.GetEmbedText(Global.TunSingboxInboundFileName));
+                    var tunInbound = JsonUtils.Deserialize<Inbound4Sbox>(Utils.GetEmbedText(Global.TunSingboxInboundFileName)) ?? new Inbound4Sbox { };
                     tunInbound.mtu = _config.tunModeItem.mtu;
                     tunInbound.strict_route = _config.tunModeItem.strictRoute;
                     tunInbound.stack = _config.tunModeItem.stack;
+                    tunInbound.sniff = _config.inbound[0].sniffingEnabled;
+                    tunInbound.sniff_override_destination = _config.inbound[0].routeOnly ? false : _config.inbound[0].sniffingEnabled;
+                    if (_config.tunModeItem.enableIPv6Address == false)
+                    {
+                        tunInbound.inet6_address = null;
+                    }
 
                     singboxConfig.inbounds.Add(tunInbound);
                 }
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
             return 0;
         }
 
-        private Inbound4Sbox? GetInbound(Inbound4Sbox inItem, string tag, int offset, bool bSocks)
+        private Inbound4Sbox GetInbound(Inbound4Sbox inItem, EInboundProtocol protocol, bool bSocks)
         {
-            var inbound = Utils.DeepCopy(inItem);
-            inbound.tag = tag;
-            inbound.listen_port = inItem.listen_port + offset;
-            inbound.type = bSocks ? Global.InboundSocks : Global.InboundHttp;
+            var inbound = JsonUtils.DeepCopy(inItem);
+            inbound.tag = protocol.ToString();
+            inbound.listen_port = inItem.listen_port + (int)protocol;
+            inbound.type = bSocks ? EInboundProtocol.socks.ToString() : EInboundProtocol.http.ToString();
             return inbound;
         }
 
-        #endregion inbound private
-
-        #region outbound private
-
-        private int outbound(ProfileItem node, SingboxConfig singboxConfig)
+        private int GenOutbound(ProfileItem node, Outbound4Sbox outbound)
         {
             try
             {
-                if (_config.tunModeItem.enableTun)
-                {
-                    singboxConfig.outbounds.Add(new()
-                    {
-                        type = "dns",
-                        tag = "dns_out"
-                    });
-                }
-
-                var outbound = singboxConfig.outbounds[0];
                 outbound.server = node.address;
                 outbound.server_port = node.port;
 
                 if (node.configType == EConfigType.VMess)
                 {
-                    outbound.type = Global.vmessProtocolLite;
+                    outbound.type = Global.ProtocolTypes[EConfigType.VMess];
 
                     outbound.uuid = node.id;
                     outbound.alter_id = node.alterId;
-                    if (Global.vmessSecuritys.Contains(node.security))
+                    if (Global.VmessSecurities.Contains(node.security))
                     {
                         outbound.security = node.security;
                     }
@@ -235,20 +229,20 @@ namespace v2rayN.Handler
                         outbound.security = Global.DefaultSecurity;
                     }
 
-                    outboundMux(node, outbound);
+                    GenOutboundMux(node, outbound);
                 }
                 else if (node.configType == EConfigType.Shadowsocks)
                 {
-                    outbound.type = Global.ssProtocolLite;
+                    outbound.type = Global.ProtocolTypes[EConfigType.Shadowsocks];
 
-                    outbound.method = LazyConfig.Instance.GetShadowsocksSecuritys(node).Contains(node.security) ? node.security : "none";
+                    outbound.method = LazyConfig.Instance.GetShadowsocksSecurities(node).Contains(node.security) ? node.security : Global.None;
                     outbound.password = node.id;
 
-                    outboundMux(node, outbound);
+                    GenOutboundMux(node, outbound);
                 }
                 else if (node.configType == EConfigType.Socks)
                 {
-                    outbound.type = Global.socksProtocolLite;
+                    outbound.type = Global.ProtocolTypes[EConfigType.Socks];
 
                     outbound.version = "5";
                     if (!Utils.IsNullOrEmpty(node.security)
@@ -260,7 +254,7 @@ namespace v2rayN.Handler
                 }
                 else if (node.configType == EConfigType.VLESS)
                 {
-                    outbound.type = Global.vlessProtocolLite;
+                    outbound.type = Global.ProtocolTypes[EConfigType.VLESS];
 
                     outbound.uuid = node.id;
 
@@ -268,7 +262,7 @@ namespace v2rayN.Handler
 
                     if (Utils.IsNullOrEmpty(node.flow))
                     {
-                        outboundMux(node, outbound);
+                        GenOutboundMux(node, outbound);
                     }
                     else
                     {
@@ -277,25 +271,61 @@ namespace v2rayN.Handler
                 }
                 else if (node.configType == EConfigType.Trojan)
                 {
-                    outbound.type = Global.trojanProtocolLite;
+                    outbound.type = Global.ProtocolTypes[EConfigType.Trojan];
 
                     outbound.password = node.id;
 
-                    outboundMux(node, outbound);
+                    GenOutboundMux(node, outbound);
+                }
+                else if (node.configType == EConfigType.Hysteria2)
+                {
+                    outbound.type = Global.ProtocolTypes[EConfigType.Hysteria2];
+
+                    outbound.password = node.id;
+
+                    if (!Utils.IsNullOrEmpty(node.path))
+                    {
+                        outbound.obfs = new()
+                        {
+                            type = "salamander",
+                            password = node.path.TrimEx(),
+                        };
+                    }
+
+                    outbound.up_mbps = _config.hysteriaItem.up_mbps > 0 ? _config.hysteriaItem.up_mbps : null;
+                    outbound.down_mbps = _config.hysteriaItem.down_mbps > 0 ? _config.hysteriaItem.down_mbps : null;
+                }
+                else if (node.configType == EConfigType.Tuic)
+                {
+                    outbound.type = Global.ProtocolTypes[EConfigType.Tuic];
+
+                    outbound.uuid = node.id;
+                    outbound.password = node.security;
+                    outbound.congestion_control = node.headerType;
+                }
+                else if (node.configType == EConfigType.Wireguard)
+                {
+                    outbound.type = Global.ProtocolTypes[EConfigType.Wireguard];
+
+                    outbound.private_key = node.id;
+                    outbound.peer_public_key = node.publicKey;
+                    outbound.reserved = Utils.String2List(node.path).Select(int.Parse).ToArray();
+                    outbound.local_address = [.. Utils.String2List(node.requestHost)];
+                    outbound.mtu = Utils.ToInt(node.shortId.IsNullOrEmpty() ? Global.TunMtus.FirstOrDefault() : node.shortId);
                 }
 
-                outboundTls(node, outbound);
+                GenOutboundTls(node, outbound);
 
-                outboundTransport(node, outbound);
+                GenOutboundTransport(node, outbound);
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
             return 0;
         }
 
-        private int outboundMux(ProfileItem node, Outbound4Sbox outbound)
+        private int GenOutboundMux(ProfileItem node, Outbound4Sbox outbound)
         {
             try
             {
@@ -304,34 +334,31 @@ namespace v2rayN.Handler
                 //    var mux = new Multiplex4Sbox()
                 //    {
                 //        enabled = true,
-                //        protocol = _config.mux4Sbox.protocol,
-                //        max_connections = _config.mux4Sbox.max_connections,
-                //        min_streams = _config.mux4Sbox.min_streams,
-                //        max_streams = _config.mux4Sbox.max_streams,
-                //        padding = _config.mux4Sbox.padding
+                //        protocol = _config.mux4SboxItem.protocol,
+                //        max_connections = _config.mux4SboxItem.max_connections,
                 //    };
                 //    outbound.multiplex = mux;
                 //}
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
             return 0;
         }
 
-        private int outboundTls(ProfileItem node, Outbound4Sbox outbound)
+        private int GenOutboundTls(ProfileItem node, Outbound4Sbox outbound)
         {
             try
             {
                 if (node.streamSecurity == Global.StreamSecurityReality || node.streamSecurity == Global.StreamSecurity)
                 {
                     var server_name = string.Empty;
-                    if (!string.IsNullOrWhiteSpace(node.sni))
+                    if (!Utils.IsNullOrEmpty(node.sni))
                     {
                         server_name = node.sni;
                     }
-                    else if (!string.IsNullOrWhiteSpace(node.requestHost))
+                    else if (!Utils.IsNullOrEmpty(node.requestHost))
                     {
                         server_name = Utils.String2List(node.requestHost)[0];
                     }
@@ -365,12 +392,12 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
             return 0;
         }
 
-        private int outboundTransport(ProfileItem node, Outbound4Sbox outbound)
+        private int GenOutboundTransport(ProfileItem node, Outbound4Sbox outbound)
         {
             try
             {
@@ -378,14 +405,31 @@ namespace v2rayN.Handler
 
                 switch (node.GetNetwork())
                 {
-                    case "h2":
-                        transport.type = "http";
+                    case nameof(ETransport.h2):
+                        transport.type = nameof(ETransport.http);
                         transport.host = Utils.IsNullOrEmpty(node.requestHost) ? null : Utils.String2List(node.requestHost);
                         transport.path = Utils.IsNullOrEmpty(node.path) ? null : node.path;
                         break;
 
-                    case "ws":
-                        transport.type = "ws";
+                    case nameof(ETransport.tcp):   //http
+                        if (node.headerType == Global.TcpHeaderHttp)
+                        {
+                            if (node.configType == EConfigType.Shadowsocks)
+                            {
+                                outbound.plugin = "obfs-local";
+                                outbound.plugin_opts = $"obfs=http;obfs-host={node.requestHost};";
+                            }
+                            else
+                            {
+                                transport.type = nameof(ETransport.http);
+                                transport.host = Utils.IsNullOrEmpty(node.requestHost) ? null : Utils.String2List(node.requestHost);
+                                transport.path = Utils.IsNullOrEmpty(node.path) ? null : node.path;
+                            }
+                        }
+                        break;
+
+                    case nameof(ETransport.ws):
+                        transport.type = nameof(ETransport.ws);
                         transport.path = Utils.IsNullOrEmpty(node.path) ? null : node.path;
                         if (!Utils.IsNullOrEmpty(node.requestHost))
                         {
@@ -396,12 +440,19 @@ namespace v2rayN.Handler
                         }
                         break;
 
-                    case "quic":
-                        transport.type = "quic";
+                    case nameof(ETransport.httpupgrade):
+                        transport.type = nameof(ETransport.httpupgrade);
+                        transport.path = Utils.IsNullOrEmpty(node.path) ? null : node.path;
+                        transport.host = Utils.IsNullOrEmpty(node.requestHost) ? null : node.requestHost;
+
                         break;
 
-                    case "grpc":
-                        transport.type = "grpc";
+                    case nameof(ETransport.quic):
+                        transport.type = nameof(ETransport.quic);
+                        break;
+
+                    case nameof(ETransport.grpc):
+                        transport.type = nameof(ETransport.grpc);
                         transport.service_name = node.path;
                         transport.idle_timeout = _config.grpcItem.idle_timeout.ToString("##s");
                         transport.ping_timeout = _config.grpcItem.health_check_timeout.ToString("##s");
@@ -409,24 +460,74 @@ namespace v2rayN.Handler
                         break;
 
                     default:
-                        transport = null;
                         break;
                 }
-
-                outbound.transport = transport;
+                if (transport.type != null)
+                {
+                    outbound.transport = transport;
+                }
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
             return 0;
         }
 
-        #endregion outbound private
+        private int GenMoreOutbounds(ProfileItem node, SingboxConfig singboxConfig)
+        {
+            if (node.subid.IsNullOrEmpty())
+            {
+                return 0;
+            }
+            try
+            {
+                var subItem = LazyConfig.Instance.GetSubItem(node.subid);
+                if (subItem is null)
+                {
+                    return 0;
+                }
 
-        #region routing rule private
+                //current proxy
+                var outbound = singboxConfig.outbounds[0];
+                var txtOutbound = Utils.GetEmbedText(Global.SingboxSampleOutbound);
 
-        private int routing(SingboxConfig singboxConfig)
+                //Previous proxy
+                var prevNode = LazyConfig.Instance.GetProfileItemViaRemarks(subItem.prevProfile!);
+                if (prevNode is not null
+                    && prevNode.configType != EConfigType.Custom)
+                {
+                    var prevOutbound = JsonUtils.Deserialize<Outbound4Sbox>(txtOutbound);
+                    GenOutbound(prevNode, prevOutbound);
+                    prevOutbound.tag = $"{Global.ProxyTag}2";
+                    singboxConfig.outbounds.Add(prevOutbound);
+
+                    outbound.detour = prevOutbound.tag;
+                }
+
+                //Next proxy
+                var nextNode = LazyConfig.Instance.GetProfileItemViaRemarks(subItem.nextProfile!);
+                if (nextNode is not null
+                    && nextNode.configType != EConfigType.Custom)
+                {
+                    var nextOutbound = JsonUtils.Deserialize<Outbound4Sbox>(txtOutbound);
+                    GenOutbound(nextNode, nextOutbound);
+                    nextOutbound.tag = Global.ProxyTag;
+                    singboxConfig.outbounds.Insert(0, nextOutbound);
+
+                    outbound.tag = $"{Global.ProxyTag}1";
+                    nextOutbound.detour = outbound.tag;
+                }
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+            }
+
+            return 0;
+        }
+
+        private int GenRouting(SingboxConfig singboxConfig)
         {
             try
             {
@@ -434,10 +535,10 @@ namespace v2rayN.Handler
                 {
                     singboxConfig.route.auto_detect_interface = true;
 
-                    var tunRules = Utils.FromJson<List<Rule4Sbox>>(Utils.GetEmbedText(Global.TunSingboxRulesFileName));
+                    var tunRules = JsonUtils.Deserialize<List<Rule4Sbox>>(Utils.GetEmbedText(Global.TunSingboxRulesFileName));
                     singboxConfig.route.rules.AddRange(tunRules);
 
-                    routingDirectExe(out List<string> lstDnsExe, out List<string> lstDirectExe);
+                    GenRoutingDirectExe(out List<string> lstDnsExe, out List<string> lstDirectExe);
                     singboxConfig.route.rules.Add(new()
                     {
                         port = new() { 53 },
@@ -454,45 +555,45 @@ namespace v2rayN.Handler
 
                 if (_config.routingBasicItem.enableRoutingAdvanced)
                 {
-                    var routing = ConfigHandler.GetDefaultRouting(ref _config);
+                    var routing = ConfigHandler.GetDefaultRouting(_config);
                     if (routing != null)
                     {
-                        var rules = Utils.FromJson<List<RulesItem>>(routing.ruleSet);
+                        var rules = JsonUtils.Deserialize<List<RulesItem>>(routing.ruleSet);
                         foreach (var item in rules!)
                         {
                             if (item.enabled)
                             {
-                                routingUserRule(item, singboxConfig.route.rules);
+                                GenRoutingUserRule(item, singboxConfig.route.rules);
                             }
                         }
                     }
                 }
                 else
                 {
-                    var lockedItem = ConfigHandler.GetLockedRoutingItem(ref _config);
+                    var lockedItem = ConfigHandler.GetLockedRoutingItem(_config);
                     if (lockedItem != null)
                     {
-                        var rules = Utils.FromJson<List<RulesItem>>(lockedItem.ruleSet);
+                        var rules = JsonUtils.Deserialize<List<RulesItem>>(lockedItem.ruleSet);
                         foreach (var item in rules!)
                         {
-                            routingUserRule(item, singboxConfig.route.rules);
+                            GenRoutingUserRule(item, singboxConfig.route.rules);
                         }
                     }
                 }
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
             return 0;
         }
 
-        private void routingDirectExe(out List<string> lstDnsExe, out List<string> lstDirectExe)
+        private void GenRoutingDirectExe(out List<string> lstDnsExe, out List<string> lstDirectExe)
         {
             lstDnsExe = new();
             lstDirectExe = new();
-            var coreInfos = LazyConfig.Instance.GetCoreInfos();
-            foreach (var it in coreInfos)
+            var coreInfo = LazyConfig.Instance.GetCoreInfo();
+            foreach (var it in coreInfo)
             {
                 if (it.coreType == ECoreType.v2rayN)
                 {
@@ -513,7 +614,7 @@ namespace v2rayN.Handler
             }
         }
 
-        private int routingUserRule(RulesItem item, List<Rule4Sbox> rules)
+        private int GenRoutingUserRule(RulesItem item, List<Rule4Sbox> rules)
         {
             try
             {
@@ -546,15 +647,15 @@ namespace v2rayN.Handler
                 {
                     rule.inbound = item.inboundTag;
                 }
-                var rule2 = Utils.DeepCopy(rule);
-                var rule3 = Utils.DeepCopy(rule);
+                var rule2 = JsonUtils.DeepCopy(rule);
+                var rule3 = JsonUtils.DeepCopy(rule);
 
                 var hasDomainIp = false;
                 if (item.domain?.Count > 0)
                 {
                     foreach (var it in item.domain)
                     {
-                        parseV2Domain(it, rule);
+                        ParseV2Domain(it, rule);
                     }
                     rules.Add(rule);
                     hasDomainIp = true;
@@ -564,7 +665,7 @@ namespace v2rayN.Handler
                 {
                     foreach (var it in item.ip)
                     {
-                        parseV2Address(it, rule2);
+                        ParseV2Address(it, rule2);
                     }
                     rules.Add(rule2);
                     hasDomainIp = true;
@@ -584,52 +685,52 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
             return 0;
         }
 
-        private void parseV2Domain(string domain, Rule4Sbox rule)
+        private void ParseV2Domain(string domain, Rule4Sbox rule)
         {
-            if (domain.StartsWith("ext:") || domain.StartsWith("ext-domain:"))
+            if (domain.StartsWith("#") || domain.StartsWith("ext:") || domain.StartsWith("ext-domain:"))
             {
                 return;
             }
             else if (domain.StartsWith("geosite:"))
             {
-                if (rule.geosite is null) { rule.geosite = new(); }
+                rule.geosite ??= [];
                 rule.geosite?.Add(domain.Substring(8));
             }
             else if (domain.StartsWith("regexp:"))
             {
-                if (rule.domain_regex is null) { rule.domain_regex = new(); }
+                rule.domain_regex ??= [];
                 rule.domain_regex?.Add(domain.Replace(Global.RoutingRuleComma, ",").Substring(7));
             }
             else if (domain.StartsWith("domain:"))
             {
-                if (rule.domain is null) { rule.domain = new(); }
-                if (rule.domain_suffix is null) { rule.domain_suffix = new(); }
+                rule.domain ??= [];
+                rule.domain_suffix ??= [];
                 rule.domain?.Add(domain.Substring(7));
                 rule.domain_suffix?.Add("." + domain.Substring(7));
             }
             else if (domain.StartsWith("full:"))
             {
-                if (rule.domain is null) { rule.domain = new(); }
+                rule.domain ??= [];
                 rule.domain?.Add(domain.Substring(5));
             }
             else if (domain.StartsWith("keyword:"))
             {
-                if (rule.domain_keyword is null) { rule.domain_keyword = new(); }
+                rule.domain_keyword ??= [];
                 rule.domain_keyword?.Add(domain.Substring(8));
             }
             else
             {
-                if (rule.domain_keyword is null) { rule.domain_keyword = new(); }
+                rule.domain_keyword ??= [];
                 rule.domain_keyword?.Add(domain);
             }
         }
 
-        private void parseV2Address(string address, Rule4Sbox rule)
+        private void ParseV2Address(string address, Rule4Sbox rule)
         {
             if (address.StartsWith("ext:") || address.StartsWith("ext-ip:"))
             {
@@ -651,11 +752,7 @@ namespace v2rayN.Handler
             }
         }
 
-        #endregion routing rule private
-
-        #region dns private
-
-        private int dns(ProfileItem node, SingboxConfig singboxConfig)
+        private int GenDns(ProfileItem node, SingboxConfig singboxConfig)
         {
             try
             {
@@ -664,22 +761,22 @@ namespace v2rayN.Handler
                 {
                     var item = LazyConfig.Instance.GetDNSItem(ECoreType.sing_box);
                     var tunDNS = item?.tunDNS;
-                    if (string.IsNullOrWhiteSpace(tunDNS))
+                    if (Utils.IsNullOrEmpty(tunDNS))
                     {
                         tunDNS = Utils.GetEmbedText(Global.TunSingboxDNSFileName);
                     }
-                    dns4Sbox = Utils.FromJson<Dns4Sbox>(tunDNS);
+                    dns4Sbox = JsonUtils.Deserialize<Dns4Sbox>(tunDNS);
                 }
                 else
                 {
                     var item = LazyConfig.Instance.GetDNSItem(ECoreType.sing_box);
                     var normalDNS = item?.normalDNS;
-                    if (string.IsNullOrWhiteSpace(normalDNS))
+                    if (Utils.IsNullOrEmpty(normalDNS))
                     {
                         normalDNS = "{\"servers\":[{\"address\":\"tcp://8.8.8.8\"}]}";
                     }
 
-                    dns4Sbox = Utils.FromJson<Dns4Sbox>(normalDNS);
+                    dns4Sbox = JsonUtils.Deserialize<Dns4Sbox>(normalDNS);
                 }
                 if (dns4Sbox is null)
                 {
@@ -706,35 +803,193 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
             return 0;
         }
 
-        #endregion dns private
-
-        private int statistic(SingboxConfig singboxConfig)
+        private int GenStatistic(SingboxConfig singboxConfig)
         {
             if (_config.guiItem.enableStatistics)
             {
                 singboxConfig.experimental = new Experimental4Sbox()
                 {
+                    //cache_file = new CacheFile4Sbox()
+                    //{
+                    //    enabled = true
+                    //},
                     //v2ray_api = new V2ray_Api4Sbox()
                     //{
-                    //    listen = $"{Global.Loopback}:{Global.statePort}",
+                    //    listen = $"{Global.Loopback}:{Global.StatePort}",
                     //    stats = new Stats4Sbox()
                     //    {
                     //        enabled = true,
                     //    }
-                    //}
+                    //},
                     clash_api = new Clash_Api4Sbox()
                     {
-                        external_controller = $"{Global.Loopback}:{Global.statePort}",
-                        store_selected = true
+                        external_controller = $"{Global.Loopback}:{LazyConfig.Instance.StatePort}",
                     }
                 };
             }
             return 0;
         }
+
+        #endregion private gen function
+
+        #region Gen speedtest config
+
+        public int GenerateClientSpeedtestConfig(List<ServerTestItem> selecteds, out SingboxConfig? singboxConfig, out string msg)
+        {
+            singboxConfig = null;
+            try
+            {
+                if (_config == null)
+                {
+                    msg = ResUI.CheckServerSettings;
+                    return -1;
+                }
+
+                msg = ResUI.InitialConfiguration;
+
+                string result = Utils.GetEmbedText(Global.SingboxSampleClient);
+                string txtOutbound = Utils.GetEmbedText(Global.SingboxSampleOutbound);
+                if (Utils.IsNullOrEmpty(result) || txtOutbound.IsNullOrEmpty())
+                {
+                    msg = ResUI.FailedGetDefaultConfiguration;
+                    return -1;
+                }
+
+                singboxConfig = JsonUtils.Deserialize<SingboxConfig>(result);
+                if (singboxConfig == null)
+                {
+                    msg = ResUI.FailedGenDefaultConfiguration;
+                    return -1;
+                }
+                List<IPEndPoint> lstIpEndPoints = new();
+                List<TcpConnectionInformation> lstTcpConns = new();
+                try
+                {
+                    lstIpEndPoints.AddRange(IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpListeners());
+                    lstIpEndPoints.AddRange(IPGlobalProperties.GetIPGlobalProperties().GetActiveUdpListeners());
+                    lstTcpConns.AddRange(IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpConnections());
+                }
+                catch (Exception ex)
+                {
+                    Logging.SaveLog(ex.Message, ex);
+                }
+
+                GenLog(singboxConfig);
+                //GenDns(new(), singboxConfig);
+                singboxConfig.inbounds.Clear(); // Remove "proxy" service for speedtest, avoiding port conflicts.
+                singboxConfig.outbounds.RemoveAt(0);
+
+                int httpPort = LazyConfig.Instance.GetLocalPort(EInboundProtocol.speedtest);
+
+                foreach (var it in selecteds)
+                {
+                    if (it.configType == EConfigType.Custom)
+                    {
+                        continue;
+                    }
+                    if (it.port <= 0)
+                    {
+                        continue;
+                    }
+                    if (it.configType is EConfigType.VMess or EConfigType.VLESS)
+                    {
+                        var item2 = LazyConfig.Instance.GetProfileItem(it.indexId);
+                        if (item2 is null || Utils.IsNullOrEmpty(item2.id) || !Utils.IsGuidByParse(item2.id))
+                        {
+                            continue;
+                        }
+                    }
+
+                    //find unused port
+                    var port = httpPort;
+                    for (int k = httpPort; k < Global.MaxPort; k++)
+                    {
+                        if (lstIpEndPoints?.FindIndex(_it => _it.Port == k) >= 0)
+                        {
+                            continue;
+                        }
+                        if (lstTcpConns?.FindIndex(_it => _it.LocalEndPoint.Port == k) >= 0)
+                        {
+                            continue;
+                        }
+                        //found
+                        port = k;
+                        httpPort = port + 1;
+                        break;
+                    }
+
+                    //Port In Used
+                    if (lstIpEndPoints?.FindIndex(_it => _it.Port == port) >= 0)
+                    {
+                        continue;
+                    }
+                    it.port = port;
+                    it.allowTest = true;
+
+                    //inbound
+                    Inbound4Sbox inbound = new()
+                    {
+                        listen = Global.Loopback,
+                        listen_port = port,
+                        type = EInboundProtocol.http.ToString(),
+                    };
+                    inbound.tag = inbound.type + inbound.listen_port.ToString();
+                    singboxConfig.inbounds.Add(inbound);
+
+                    //outbound
+                    var item = LazyConfig.Instance.GetProfileItem(it.indexId);
+                    if (item is null)
+                    {
+                        continue;
+                    }
+                    if (item.configType == EConfigType.Shadowsocks
+                        && !Global.SsSecuritiesInSingbox.Contains(item.security))
+                    {
+                        continue;
+                    }
+                    if (item.configType == EConfigType.VLESS
+                     && !Global.Flows.Contains(item.flow))
+                    {
+                        continue;
+                    }
+
+                    var outbound = JsonUtils.Deserialize<Outbound4Sbox>(txtOutbound);
+                    GenOutbound(item, outbound);
+                    outbound.tag = Global.ProxyTag + inbound.listen_port.ToString();
+                    singboxConfig.outbounds.Add(outbound);
+
+                    //rule
+                    Rule4Sbox rule = new()
+                    {
+                        inbound = new List<string> { inbound.tag },
+                        outbound = outbound.tag
+                    };
+                    singboxConfig.route.rules.Add(rule);
+                }
+
+                GenDns(new(), singboxConfig);
+                var dnsServer = singboxConfig.dns?.servers.FirstOrDefault();
+                if (dnsServer != null)
+                {
+                    dnsServer.detour = singboxConfig.route.rules.LastOrDefault()?.outbound;
+                }
+
+                //msg = string.Format(ResUI.SuccessfulConfiguration"), node.getSummary());
+                return 0;
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+                msg = ResUI.FailedGenDefaultConfiguration;
+                return -1;
+            }
+        }
+
+        #endregion Gen speedtest config
     }
 }

v2rayN/v2rayN/Handler/CoreConfigV2ray.cs

@@ -1,14 +1,12 @@
 using System.Net;
 using System.Net.NetworkInformation;
-using v2rayN.Base;
-using v2rayN.Mode;
+using v2rayN.Model;
 using v2rayN.Resx;
 
 namespace v2rayN.Handler
 {
     internal class CoreConfigV2ray
     {
-        private string SampleClient = Global.v2raySampleClient;
         private Config _config;
 
         public CoreConfigV2ray(Config config)
@@ -30,44 +28,48 @@ namespace v2rayN.Handler
 
                 msg = ResUI.InitialConfiguration;
 
-                string result = Utils.GetEmbedText(SampleClient);
+                string result = Utils.GetEmbedText(Global.V2raySampleClient);
                 if (Utils.IsNullOrEmpty(result))
                 {
                     msg = ResUI.FailedGetDefaultConfiguration;
                     return -1;
                 }
 
-                v2rayConfig = Utils.FromJson<V2rayConfig>(result);
+                v2rayConfig = JsonUtils.Deserialize<V2rayConfig>(result);
                 if (v2rayConfig == null)
                 {
                     msg = ResUI.FailedGenDefaultConfiguration;
                     return -1;
                 }
 
-                log(v2rayConfig);
+                GenLog(v2rayConfig);
 
-                inbound(v2rayConfig);
+                GenInbounds(v2rayConfig);
 
-                routing(v2rayConfig);
+                GenRouting(v2rayConfig);
 
-                outbound(node, v2rayConfig);
+                GenOutbound(node, v2rayConfig.outbounds[0]);
 
-                dns(v2rayConfig);
+                GenMoreOutbounds(node, v2rayConfig);
 
-                statistic(v2rayConfig);
+                GenDns(v2rayConfig);
+
+                GenStatistic(v2rayConfig);
 
                 msg = string.Format(ResUI.SuccessfulConfiguration, "");
             }
             catch (Exception ex)
             {
-                Utils.SaveLog("GenerateClientConfig4V2ray", ex);
+                Logging.SaveLog("GenerateClientConfig4V2ray", ex);
                 msg = ResUI.FailedGenDefaultConfiguration;
                 return -1;
             }
             return 0;
         }
 
-        private int log(V2rayConfig v2rayConfig)
+        #region private gen function
+
+        private int GenLog(V2rayConfig v2rayConfig)
         {
             try
             {
@@ -87,33 +89,33 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
             return 0;
         }
 
-        private int inbound(V2rayConfig v2rayConfig)
+        private int GenInbounds(V2rayConfig v2rayConfig)
         {
             try
             {
                 v2rayConfig.inbounds = new List<Inbounds4Ray>();
 
-                Inbounds4Ray? inbound = GetInbound(_config.inbound[0], Global.InboundSocks, 0, true);
+                Inbounds4Ray? inbound = GetInbound(_config.inbound[0], EInboundProtocol.socks, true);
                 v2rayConfig.inbounds.Add(inbound);
 
                 //http
-                Inbounds4Ray? inbound2 = GetInbound(_config.inbound[0], Global.InboundHttp, 1, false);
+                Inbounds4Ray? inbound2 = GetInbound(_config.inbound[0], EInboundProtocol.http, false);
                 v2rayConfig.inbounds.Add(inbound2);
 
                 if (_config.inbound[0].allowLANConn)
                 {
                     if (_config.inbound[0].newPort4LAN)
                     {
-                        Inbounds4Ray inbound3 = GetInbound(_config.inbound[0], Global.InboundSocks2, 2, true);
+                        var inbound3 = GetInbound(_config.inbound[0], EInboundProtocol.socks2, true);
                         inbound3.listen = "0.0.0.0";
                         v2rayConfig.inbounds.Add(inbound3);
 
-                        Inbounds4Ray inbound4 = GetInbound(_config.inbound[0], Global.InboundHttp2, 3, false);
+                        var inbound4 = GetInbound(_config.inbound[0], EInboundProtocol.http2, false);
                         inbound4.listen = "0.0.0.0";
                         v2rayConfig.inbounds.Add(inbound4);
 
@@ -136,27 +138,27 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
             return 0;
         }
 
-        private Inbounds4Ray? GetInbound(InItem inItem, string tag, int offset, bool bSocks)
+        private Inbounds4Ray? GetInbound(InItem inItem, EInboundProtocol protocol, bool bSocks)
         {
-            string result = Utils.GetEmbedText(Global.v2raySampleInbound);
+            string result = Utils.GetEmbedText(Global.V2raySampleInbound);
             if (Utils.IsNullOrEmpty(result))
             {
                 return null;
             }
 
-            var inbound = Utils.FromJson<Inbounds4Ray>(result);
+            var inbound = JsonUtils.Deserialize<Inbounds4Ray>(result);
             if (inbound == null)
             {
                 return null;
             }
-            inbound.tag = tag;
-            inbound.port = inItem.localPort + offset;
-            inbound.protocol = bSocks ? Global.InboundSocks : Global.InboundHttp;
+            inbound.tag = protocol.ToString();
+            inbound.port = inItem.localPort + (int)protocol;
+            inbound.protocol = bSocks ? EInboundProtocol.socks.ToString() : EInboundProtocol.http.ToString();
             inbound.settings.udp = inItem.udpEnabled;
             inbound.sniffing.enabled = inItem.sniffingEnabled;
             inbound.sniffing.routeOnly = inItem.routeOnly;
@@ -164,7 +166,7 @@ namespace v2rayN.Handler
             return inbound;
         }
 
-        private int routing(V2rayConfig v2rayConfig)
+        private int GenRouting(V2rayConfig v2rayConfig)
         {
             try
             {
@@ -175,34 +177,34 @@ namespace v2rayN.Handler
 
                     if (_config.routingBasicItem.enableRoutingAdvanced)
                     {
-                        var routing = ConfigHandler.GetDefaultRouting(ref _config);
+                        var routing = ConfigHandler.GetDefaultRouting(_config);
                         if (routing != null)
                         {
                             if (!Utils.IsNullOrEmpty(routing.domainStrategy))
                             {
                                 v2rayConfig.routing.domainStrategy = routing.domainStrategy;
                             }
-                            var rules = Utils.FromJson<List<RulesItem>>(routing.ruleSet);
+                            var rules = JsonUtils.Deserialize<List<RulesItem>>(routing.ruleSet);
                             foreach (var item in rules)
                             {
                                 if (item.enabled)
                                 {
-                                    var item2 = Utils.FromJson<RulesItem4Ray>(Utils.ToJson(item));
-                                    routingUserRule(item2, v2rayConfig);
+                                    var item2 = JsonUtils.Deserialize<RulesItem4Ray>(JsonUtils.Serialize(item));
+                                    GenRoutingUserRule(item2, v2rayConfig);
                                 }
                             }
                         }
                     }
                     else
                     {
-                        var lockedItem = ConfigHandler.GetLockedRoutingItem(ref _config);
+                        var lockedItem = ConfigHandler.GetLockedRoutingItem(_config);
                         if (lockedItem != null)
                         {
-                            var rules = Utils.FromJson<List<RulesItem>>(lockedItem.ruleSet);
+                            var rules = JsonUtils.Deserialize<List<RulesItem>>(lockedItem.ruleSet);
                             foreach (var item in rules)
                             {
-                                var item2 = Utils.FromJson<RulesItem4Ray>(Utils.ToJson(item));
-                                routingUserRule(item2, v2rayConfig);
+                                var item2 = JsonUtils.Deserialize<RulesItem4Ray>(JsonUtils.Serialize(item));
+                                GenRoutingUserRule(item2, v2rayConfig);
                             }
                         }
                     }
@@ -210,12 +212,12 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
             return 0;
         }
 
-        private int routingUserRule(RulesItem4Ray rules, V2rayConfig v2rayConfig)
+        private int GenRoutingUserRule(RulesItem4Ray? rules, V2rayConfig v2rayConfig)
         {
             try
             {
@@ -247,7 +249,7 @@ namespace v2rayN.Handler
                 var hasDomainIp = false;
                 if (rules.domain?.Count > 0)
                 {
-                    var it = Utils.DeepCopy(rules);
+                    var it = JsonUtils.DeepCopy(rules);
                     it.ip = null;
                     it.type = "field";
                     for (int k = it.domain.Count - 1; k >= 0; k--)
@@ -263,7 +265,7 @@ namespace v2rayN.Handler
                 }
                 if (rules.ip?.Count > 0)
                 {
-                    var it = Utils.DeepCopy(rules);
+                    var it = JsonUtils.DeepCopy(rules);
                     it.domain = null;
                     it.type = "field";
                     v2rayConfig.routing.rules.Add(it);
@@ -276,7 +278,7 @@ namespace v2rayN.Handler
                         || (rules.inboundTag?.Count > 0)
                         )
                     {
-                        var it = Utils.DeepCopy(rules);
+                        var it = JsonUtils.DeepCopy(rules);
                         it.type = "field";
                         v2rayConfig.routing.rules.Add(it);
                     }
@@ -284,16 +286,15 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
             return 0;
         }
 
-        private int outbound(ProfileItem node, V2rayConfig v2rayConfig)
+        private int GenOutbound(ProfileItem node, Outbounds4Ray outbound)
         {
             try
             {
-                Outbounds4Ray outbound = v2rayConfig.outbounds[0];
                 if (node.configType == EConfigType.VMess)
                 {
                     VnextItem4Ray vnextItem;
@@ -322,8 +323,8 @@ namespace v2rayN.Handler
                     //远程服务器用户ID
                     usersItem.id = node.id;
                     usersItem.alterId = node.alterId;
-                    usersItem.email = Global.userEMail;
-                    if (Global.vmessSecuritys.Contains(node.security))
+                    usersItem.email = Global.UserEMail;
+                    if (Global.VmessSecurities.Contains(node.security))
                     {
                         usersItem.security = node.security;
                     }
@@ -332,9 +333,9 @@ namespace v2rayN.Handler
                         usersItem.security = Global.DefaultSecurity;
                     }
 
-                    outboundMux(node, outbound, _config.coreBasicItem.muxEnabled);
+                    GenOutboundMux(node, outbound, _config.coreBasicItem.muxEnabled);
 
-                    outbound.protocol = Global.vmessProtocolLite;
+                    outbound.protocol = Global.ProtocolTypes[EConfigType.VMess];
                     outbound.settings.servers = null;
                 }
                 else if (node.configType == EConfigType.Shadowsocks)
@@ -352,14 +353,14 @@ namespace v2rayN.Handler
                     serversItem.address = node.address;
                     serversItem.port = node.port;
                     serversItem.password = node.id;
-                    serversItem.method = LazyConfig.Instance.GetShadowsocksSecuritys(node).Contains(node.security) ? node.security : "none";
+                    serversItem.method = LazyConfig.Instance.GetShadowsocksSecurities(node).Contains(node.security) ? node.security : "none";
 
                     serversItem.ota = false;
                     serversItem.level = 1;
 
-                    outboundMux(node, outbound, false);
+                    GenOutboundMux(node, outbound, false);
 
-                    outbound.protocol = Global.ssProtocolLite;
+                    outbound.protocol = Global.ProtocolTypes[EConfigType.Shadowsocks];
                     outbound.settings.vnext = null;
                 }
                 else if (node.configType == EConfigType.Socks)
@@ -392,9 +393,9 @@ namespace v2rayN.Handler
                         serversItem.users = new List<SocksUsersItem4Ray>() { socksUsersItem };
                     }
 
-                    outboundMux(node, outbound, false);
+                    GenOutboundMux(node, outbound, false);
 
-                    outbound.protocol = Global.socksProtocolLite;
+                    outbound.protocol = Global.ProtocolTypes[EConfigType.Socks];
                     outbound.settings.vnext = null;
                 }
                 else if (node.configType == EConfigType.VLESS)
@@ -423,10 +424,10 @@ namespace v2rayN.Handler
                         usersItem = vnextItem.users[0];
                     }
                     usersItem.id = node.id;
-                    usersItem.email = Global.userEMail;
+                    usersItem.email = Global.UserEMail;
                     usersItem.encryption = node.security;
 
-                    outboundMux(node, outbound, _config.coreBasicItem.muxEnabled);
+                    GenOutboundMux(node, outbound, _config.coreBasicItem.muxEnabled);
 
                     if (node.streamSecurity == Global.StreamSecurityReality
                         || node.streamSecurity == Global.StreamSecurity)
@@ -435,15 +436,15 @@ namespace v2rayN.Handler
                         {
                             usersItem.flow = node.flow;
 
-                            outboundMux(node, outbound, false);
+                            GenOutboundMux(node, outbound, false);
                         }
                     }
                     if (node.streamSecurity == Global.StreamSecurityReality && Utils.IsNullOrEmpty(node.flow))
                     {
-                        outboundMux(node, outbound, _config.coreBasicItem.muxEnabled);
+                        GenOutboundMux(node, outbound, _config.coreBasicItem.muxEnabled);
                     }
 
-                    outbound.protocol = Global.vlessProtocolLite;
+                    outbound.protocol = Global.ProtocolTypes[EConfigType.VLESS];
                     outbound.settings.servers = null;
                 }
                 else if (node.configType == EConfigType.Trojan)
@@ -465,21 +466,21 @@ namespace v2rayN.Handler
                     serversItem.ota = false;
                     serversItem.level = 1;
 
-                    outboundMux(node, outbound, false);
+                    GenOutboundMux(node, outbound, false);
 
-                    outbound.protocol = Global.trojanProtocolLite;
+                    outbound.protocol = Global.ProtocolTypes[EConfigType.Trojan];
                     outbound.settings.vnext = null;
                 }
-                boundStreamSettings(node, outbound.streamSettings);
+                GenBoundStreamSettings(node, outbound.streamSettings);
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
             return 0;
         }
 
-        private int outboundMux(ProfileItem node, Outbounds4Ray outbound, bool enabled)
+        private int GenOutboundMux(ProfileItem node, Outbounds4Ray outbound, bool enabled)
         {
             try
             {
@@ -496,12 +497,12 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
             return 0;
         }
 
-        private int boundStreamSettings(ProfileItem node, StreamSettings4Ray streamSettings)
+        private int GenBoundStreamSettings(ProfileItem node, StreamSettings4Ray streamSettings)
         {
             try
             {
@@ -513,7 +514,7 @@ namespace v2rayN.Handler
                 {
                     try
                     {
-                        useragent = Global.userAgentTxt[_config.coreBasicItem.defUserAgent];
+                        useragent = Global.UserAgentTexts[_config.coreBasicItem.defUserAgent];
                     }
                     catch (KeyNotFoundException)
                     {
@@ -532,11 +533,11 @@ namespace v2rayN.Handler
                         alpn = node.GetAlpn(),
                         fingerprint = node.fingerprint.IsNullOrEmpty() ? _config.coreBasicItem.defFingerprint : node.fingerprint
                     };
-                    if (!string.IsNullOrWhiteSpace(sni))
+                    if (!Utils.IsNullOrEmpty(sni))
                     {
                         tlsSettings.serverName = sni;
                     }
-                    else if (!string.IsNullOrWhiteSpace(host))
+                    else if (!Utils.IsNullOrEmpty(host))
                     {
                         tlsSettings.serverName = Utils.String2List(host)[0];
                     }
@@ -563,7 +564,7 @@ namespace v2rayN.Handler
                 //streamSettings
                 switch (node.GetNetwork())
                 {
-                    case "kcp":
+                    case nameof(ETransport.kcp):
                         KcpSettings4Ray kcpSettings = new()
                         {
                             mtu = _config.kcpItem.mtu,
@@ -587,30 +588,45 @@ namespace v2rayN.Handler
                         streamSettings.kcpSettings = kcpSettings;
                         break;
                     //ws
-                    case "ws":
+                    case nameof(ETransport.ws):
                         WsSettings4Ray wsSettings = new();
                         wsSettings.headers = new Headers4Ray();
                         string path = node.path;
-                        if (!string.IsNullOrWhiteSpace(host))
+                        if (!Utils.IsNullOrEmpty(host))
                         {
                             wsSettings.headers.Host = host;
                         }
-                        if (!string.IsNullOrWhiteSpace(path))
+                        if (!Utils.IsNullOrEmpty(path))
                         {
                             wsSettings.path = path;
                         }
-                        if (!string.IsNullOrWhiteSpace(useragent))
+                        if (!Utils.IsNullOrEmpty(useragent))
                         {
                             wsSettings.headers.UserAgent = useragent;
                         }
                         streamSettings.wsSettings = wsSettings;
 
+                        break;
+                    //httpupgrade
+                    case nameof(ETransport.httpupgrade):
+                        HttpupgradeSettings4Ray httpupgradeSettings = new();
+
+                        if (!Utils.IsNullOrEmpty(node.path))
+                        {
+                            httpupgradeSettings.path = node.path;
+                        }
+                        if (!Utils.IsNullOrEmpty(host))
+                        {
+                            httpupgradeSettings.host = host;
+                        }
+                        streamSettings.httpupgradeSettings = httpupgradeSettings;
+
                         break;
                     //h2
-                    case "h2":
+                    case nameof(ETransport.h2):
                         HttpSettings4Ray httpSettings = new();
 
-                        if (!string.IsNullOrWhiteSpace(host))
+                        if (!Utils.IsNullOrEmpty(host))
                         {
                             httpSettings.host = Utils.String2List(host);
                         }
@@ -620,7 +636,7 @@ namespace v2rayN.Handler
 
                         break;
                     //quic
-                    case "quic":
+                    case nameof(ETransport.quic):
                         QuicSettings4Ray quicsettings = new()
                         {
                             security = host,
@@ -633,7 +649,7 @@ namespace v2rayN.Handler
                         streamSettings.quicSettings = quicsettings;
                         if (node.streamSecurity == Global.StreamSecurity)
                         {
-                            if (!string.IsNullOrWhiteSpace(sni))
+                            if (!Utils.IsNullOrEmpty(sni))
                             {
                                 streamSettings.tlsSettings.serverName = sni;
                             }
@@ -644,11 +660,12 @@ namespace v2rayN.Handler
                         }
                         break;
 
-                    case "grpc":
+                    case nameof(ETransport.grpc):
                         GrpcSettings4Ray grpcSettings = new()
                         {
+                            authority = Utils.IsNullOrEmpty(host) ? null : host,
                             serviceName = node.path,
-                            multiMode = (node.headerType == Global.GrpcmultiMode),
+                            multiMode = (node.headerType == Global.GrpcMultiMode),
                             idle_timeout = _config.grpcItem.idle_timeout,
                             health_check_timeout = _config.grpcItem.health_check_timeout,
                             permit_without_stream = _config.grpcItem.permit_without_stream,
@@ -670,7 +687,7 @@ namespace v2rayN.Handler
                             };
 
                             //request Host
-                            string request = Utils.GetEmbedText(Global.v2raySampleHttprequestFileName);
+                            string request = Utils.GetEmbedText(Global.V2raySampleHttpRequestFileName);
                             string[] arrHost = host.Split(',');
                             string host2 = string.Join("\",\"", arrHost);
                             request = request.Replace("$requestHost$", $"\"{host2}\"");
@@ -684,7 +701,7 @@ namespace v2rayN.Handler
                                 pathHttp = string.Join("\",\"", arrPath);
                             }
                             request = request.Replace("$requestPath$", $"\"{pathHttp}\"");
-                            tcpSettings.header.request = Utils.FromJson<object>(request);
+                            tcpSettings.header.request = JsonUtils.Deserialize<object>(request);
 
                             streamSettings.tcpSettings = tcpSettings;
                         }
@@ -693,67 +710,77 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
             return 0;
         }
 
-        private int dns(V2rayConfig v2rayConfig)
+        private int GenDns(V2rayConfig v2rayConfig)
         {
             try
             {
                 var item = LazyConfig.Instance.GetDNSItem(ECoreType.Xray);
                 var normalDNS = item?.normalDNS;
                 var domainStrategy4Freedom = item?.domainStrategy4Freedom;
-                if (string.IsNullOrWhiteSpace(normalDNS))
+                if (Utils.IsNullOrEmpty(normalDNS))
                 {
                     normalDNS = "1.1.1.1,8.8.8.8";
                 }
 
                 //Outbound Freedom domainStrategy
-                if (!string.IsNullOrWhiteSpace(domainStrategy4Freedom))
+                if (!Utils.IsNullOrEmpty(domainStrategy4Freedom))
                 {
                     var outbound = v2rayConfig.outbounds[1];
                     outbound.settings.domainStrategy = domainStrategy4Freedom;
                     outbound.settings.userLevel = 0;
                 }
 
-                var obj = Utils.ParseJson(normalDNS);
-                if (obj?.ContainsKey("servers") == true)
+                var obj = JsonUtils.ParseJson(normalDNS);
+                if (obj is null)
                 {
-                    v2rayConfig.dns = obj;
-                }
-                else
-                {
-                    List<string> servers = new();
-
+                    List<string> servers = [];
                     string[] arrDNS = normalDNS.Split(',');
                     foreach (string str in arrDNS)
                     {
-                        //if (Utils.IsIP(str))
-                        //{
                         servers.Add(str);
-                        //}
                     }
-                    //servers.Add("localhost");
-                    v2rayConfig.dns = new Mode.Dns4Ray
-                    {
-                        servers = servers
-                    };
+                    obj = JsonUtils.ParseJson("{}");
+                    obj["servers"] = JsonUtils.SerializeToNode(servers);
                 }
+
+                // 追加至 dns 设置
+                if (item.useSystemHosts)
+                {
+                    var systemHosts = Utils.GetSystemHosts();
+                    if (systemHosts.Count > 0)
+                    {
+                        var normalHost = obj["hosts"];
+                        if (normalHost != null)
+                        {
+                            foreach (var host in systemHosts)
+                            {
+                                if (normalHost[host.Key] != null)
+                                    continue;
+                                normalHost[host.Key] = host.Value;
+                            }
+                        }
+                    }
+                }
+
+                v2rayConfig.dns = obj;
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
             return 0;
         }
 
-        private int statistic(V2rayConfig v2rayConfig)
+        private int GenStatistic(V2rayConfig v2rayConfig)
         {
             if (_config.guiItem.enableStatistics)
             {
-                string tag = Global.InboundAPITagName;
+                string tag = EInboundProtocol.api.ToString();
                 API4Ray apiObj = new();
                 Policy4Ray policyObj = new();
                 SystemPolicy4Ray policySystemSetting = new();
@@ -777,8 +804,8 @@ namespace v2rayN.Handler
                     Inboundsettings4Ray apiInboundSettings = new();
                     apiInbound.tag = tag;
                     apiInbound.listen = Global.Loopback;
-                    apiInbound.port = Global.statePort;
-                    apiInbound.protocol = Global.InboundAPIProtocal;
+                    apiInbound.port = LazyConfig.Instance.StatePort;
+                    apiInbound.protocol = Global.InboundAPIProtocol;
                     apiInboundSettings.address = Global.Loopback;
                     apiInbound.settings = apiInboundSettings;
                     v2rayConfig.inbounds.Add(apiInbound);
@@ -799,34 +826,101 @@ namespace v2rayN.Handler
             return 0;
         }
 
+        private int GenMoreOutbounds(ProfileItem node, V2rayConfig v2rayConfig)
+        {
+            if (node.subid.IsNullOrEmpty())
+            {
+                return 0;
+            }
+            try
+            {
+                var subItem = LazyConfig.Instance.GetSubItem(node.subid);
+                if (subItem is null)
+                {
+                    return 0;
+                }
+
+                //current proxy
+                var outbound = v2rayConfig.outbounds[0];
+                var txtOutbound = Utils.GetEmbedText(Global.V2raySampleOutbound);
+
+                //Previous proxy
+                var prevNode = LazyConfig.Instance.GetProfileItemViaRemarks(subItem.prevProfile!);
+                if (prevNode is not null
+                    && prevNode.configType != EConfigType.Custom
+                    && prevNode.configType != EConfigType.Hysteria2
+                    && prevNode.configType != EConfigType.Tuic
+                    && prevNode.configType != EConfigType.Wireguard)
+                {
+                    var prevOutbound = JsonUtils.Deserialize<Outbounds4Ray>(txtOutbound);
+                    GenOutbound(prevNode, prevOutbound);
+                    prevOutbound.tag = $"{Global.ProxyTag}2";
+                    v2rayConfig.outbounds.Add(prevOutbound);
+
+                    outbound.streamSettings.sockopt = new()
+                    {
+                        dialerProxy = prevOutbound.tag
+                    };
+                }
+
+                //Next proxy
+                var nextNode = LazyConfig.Instance.GetProfileItemViaRemarks(subItem.nextProfile!);
+                if (nextNode is not null
+                    && nextNode.configType != EConfigType.Custom
+                    && nextNode.configType != EConfigType.Hysteria2
+                    && nextNode.configType != EConfigType.Tuic
+                    && nextNode.configType != EConfigType.Wireguard)
+                {
+                    var nextOutbound = JsonUtils.Deserialize<Outbounds4Ray>(txtOutbound);
+                    GenOutbound(nextNode, nextOutbound);
+                    nextOutbound.tag = Global.ProxyTag;
+                    v2rayConfig.outbounds.Insert(0, nextOutbound);
+
+                    outbound.tag = $"{Global.ProxyTag}1";
+                    nextOutbound.streamSettings.sockopt = new()
+                    {
+                        dialerProxy = outbound.tag
+                    };
+                }
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+            }
+
+            return 0;
+        }
+
+        #endregion private gen function
+
         #region Gen speedtest config
 
-        public string GenerateClientSpeedtestConfigString(List<ServerTestItem> selecteds, out string msg)
+        public int GenerateClientSpeedtestConfig(List<ServerTestItem> selecteds, out V2rayConfig? v2rayConfig, out string msg)
         {
+            v2rayConfig = null;
             try
             {
                 if (_config == null)
                 {
                     msg = ResUI.CheckServerSettings;
-                    return "";
+                    return -1;
                 }
 
                 msg = ResUI.InitialConfiguration;
 
-                Config configCopy = Utils.DeepCopy(_config);
-
-                string result = Utils.GetEmbedText(SampleClient);
-                if (Utils.IsNullOrEmpty(result))
+                string result = Utils.GetEmbedText(Global.V2raySampleClient);
+                string txtOutbound = Utils.GetEmbedText(Global.V2raySampleOutbound);
+                if (Utils.IsNullOrEmpty(result) || txtOutbound.IsNullOrEmpty())
                 {
                     msg = ResUI.FailedGetDefaultConfiguration;
-                    return "";
+                    return -1;
                 }
 
-                V2rayConfig? v2rayConfig = Utils.FromJson<V2rayConfig>(result);
+                v2rayConfig = JsonUtils.Deserialize<V2rayConfig>(result);
                 if (v2rayConfig == null)
                 {
                     msg = ResUI.FailedGenDefaultConfiguration;
-                    return "";
+                    return -1;
                 }
                 List<IPEndPoint> lstIpEndPoints = new();
                 List<TcpConnectionInformation> lstTcpConns = new();
@@ -838,13 +932,14 @@ namespace v2rayN.Handler
                 }
                 catch (Exception ex)
                 {
-                    Utils.SaveLog(ex.Message, ex);
+                    Logging.SaveLog(ex.Message, ex);
                 }
 
-                log(v2rayConfig);
+                GenLog(v2rayConfig);
                 v2rayConfig.inbounds.Clear(); // Remove "proxy" service for speedtest, avoiding port conflicts.
+                v2rayConfig.outbounds.RemoveAt(0);
 
-                int httpPort = LazyConfig.Instance.GetLocalPort("speedtest");
+                int httpPort = LazyConfig.Instance.GetLocalPort(EInboundProtocol.speedtest);
 
                 foreach (var it in selecteds)
                 {
@@ -865,7 +960,7 @@ namespace v2rayN.Handler
                         }
                     }
 
-                    //find unuse port
+                    //find unused port
                     var port = httpPort;
                     for (int k = httpPort; k < Global.MaxPort; k++)
                     {
@@ -896,51 +991,51 @@ namespace v2rayN.Handler
                     {
                         listen = Global.Loopback,
                         port = port,
-                        protocol = Global.InboundHttp
+                        protocol = EInboundProtocol.http.ToString(),
                     };
-                    inbound.tag = Global.InboundHttp + inbound.port.ToString();
+                    inbound.tag = inbound.protocol + inbound.port.ToString();
                     v2rayConfig.inbounds.Add(inbound);
 
                     //outbound
-                    V2rayConfig? v2rayConfigCopy = Utils.FromJson<V2rayConfig>(result);
                     var item = LazyConfig.Instance.GetProfileItem(it.indexId);
                     if (item is null)
                     {
                         continue;
                     }
                     if (item.configType == EConfigType.Shadowsocks
-                        && !Global.ssSecuritysInXray.Contains(item.security))
+                        && !Global.SsSecuritiesInXray.Contains(item.security))
                     {
                         continue;
                     }
                     if (item.configType == EConfigType.VLESS
-                     && !Global.flows.Contains(item.flow))
+                     && !Global.Flows.Contains(item.flow))
                     {
                         continue;
                     }
 
-                    outbound(item, v2rayConfigCopy);
-                    v2rayConfigCopy.outbounds[0].tag = Global.agentTag + inbound.port.ToString();
-                    v2rayConfig.outbounds.Add(v2rayConfigCopy.outbounds[0]);
+                    var outbound = JsonUtils.Deserialize<Outbounds4Ray>(txtOutbound);
+                    GenOutbound(item, outbound);
+                    outbound.tag = Global.ProxyTag + inbound.port.ToString();
+                    v2rayConfig.outbounds.Add(outbound);
 
                     //rule
                     RulesItem4Ray rule = new()
                     {
                         inboundTag = new List<string> { inbound.tag },
-                        outboundTag = v2rayConfigCopy.outbounds[0].tag,
+                        outboundTag = outbound.tag,
                         type = "field"
                     };
                     v2rayConfig.routing.rules.Add(rule);
                 }
 
                 //msg = string.Format(ResUI.SuccessfulConfiguration"), node.getSummary());
-                return Utils.ToJson(v2rayConfig);
+                return 0;
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 msg = ResUI.FailedGenDefaultConfiguration;
-                return "";
+                return -1;
             }
         }
 

v2rayN/v2rayN/Handler/CoreHandler.cs

@@ -2,7 +2,7 @@
 using System.IO;
 using System.Reactive.Linq;
 using System.Text;
-using v2rayN.Mode;
+using v2rayN.Model;
 using v2rayN.Resx;
 
 namespace v2rayN.Handler
@@ -28,14 +28,14 @@ namespace v2rayN.Handler
 
         public void LoadCore()
         {
-            var node = ConfigHandler.GetDefaultServer(ref _config);
+            var node = ConfigHandler.GetDefaultServer(_config);
             if (node == null)
             {
                 ShowMsg(false, ResUI.CheckServerSettings);
                 return;
             }
 
-            string fileName = Utils.GetConfigPath(Global.coreConfigFileName);
+            string fileName = Utils.GetConfigPath(Global.CoreConfigFileName);
             if (CoreConfigHandler.GenerateClientConfig(node, fileName, out string msg, out string content) != 0)
             {
                 ShowMsg(false, msg);
@@ -45,6 +45,12 @@ namespace v2rayN.Handler
                 ShowMsg(false, msg);
                 ShowMsg(true, $"{node.GetSummary()}");
                 CoreStop();
+                if (_config.tunModeItem.enableTun)
+                {
+                    Thread.Sleep(1000);
+                    Utils.RemoveTunDevice();
+                }
+
                 CoreStart(node);
 
                 //In tun mode, do a delay check and restart the core
@@ -59,27 +65,27 @@ namespace v2rayN.Handler
                             {
                                 CoreStart(node);
                                 ShowMsg(false, "Tun mode restart the core once");
-                                Utils.SaveLog("Tun mode restart the core once");
+                                Logging.SaveLog("Tun mode restart the core once");
                             }
                         }
-
                     });
                 }
             }
         }
 
-        public int LoadCoreConfigString(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;
         }
@@ -107,8 +113,8 @@ namespace v2rayN.Handler
 
                 if (!hasProc)
                 {
-                    var coreInfos = LazyConfig.Instance.GetCoreInfos();
-                    foreach (var it in coreInfos)
+                    var coreInfo = LazyConfig.Instance.GetCoreInfo();
+                    foreach (var it in coreInfo)
                     {
                         if (it.coreType == ECoreType.v2rayN)
                         {
@@ -116,11 +122,11 @@ namespace v2rayN.Handler
                         }
                         foreach (string vName in it.coreExes)
                         {
-                            Process[] existing = Process.GetProcessesByName(vName);
+                            var existing = Process.GetProcessesByName(vName);
                             foreach (Process p in existing)
                             {
                                 string? path = p.MainModule?.FileName;
-                                if (path == $"{Utils.GetBinPath(vName, it.coreType)}.exe")
+                                if (path == $"{Utils.GetBinPath(vName, it.coreType.ToString())}.exe")
                                 {
                                     KillProcess(p);
                                 }
@@ -131,7 +137,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
         }
 
@@ -139,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;
@@ -163,8 +171,8 @@ namespace v2rayN.Handler
             }
             if (Utils.IsNullOrEmpty(fileName))
             {
-                string msg = string.Format(ResUI.NotFoundCore, Utils.GetBinPath("", coreInfo.coreType), string.Join(", ", coreInfo.coreExes.ToArray()), coreInfo.coreUrl);
-                Utils.SaveLog(msg);
+                string msg = string.Format(ResUI.NotFoundCore, Utils.GetBinPath("", coreInfo.coreType.ToString()), string.Join(", ", coreInfo.coreExes.ToArray()), coreInfo.coreUrl);
+                Logging.SaveLog(msg);
                 ShowMsg(false, msg);
             }
             return fileName;
@@ -172,6 +180,7 @@ namespace v2rayN.Handler
 
         private void CoreStart(ProfileItem node)
         {
+            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;
@@ -183,10 +192,11 @@ namespace v2rayN.Handler
             {
                 coreType = LazyConfig.Instance.GetCoreType(node, node.configType);
             }
+            _config.runningCoreType = coreType;
             var coreInfo = LazyConfig.Instance.GetCoreInfo(coreType);
 
             var displayLog = node.configType != EConfigType.Custom || node.displayLog;
-            var proc = RunProcess(node, coreInfo, "", displayLog, ShowMsg);
+            var proc = RunProcess(node, coreInfo, "", displayLog);
             if (proc is null)
             {
                 return;
@@ -205,11 +215,12 @@ namespace v2rayN.Handler
                         address = Global.Loopback,
                         port = node.preSocksPort
                     };
-                    string fileName2 = Utils.GetConfigPath(Global.corePreConfigFileName);
+                    _config.runningCoreType = ECoreType.sing_box;
+                    string fileName2 = Utils.GetConfigPath(Global.CorePreConfigFileName);
                     if (CoreConfigHandler.GenerateClientConfig(itemSocks, fileName2, out string msg2, out string configStr) == 0)
                     {
                         var coreInfo2 = LazyConfig.Instance.GetCoreInfo(ECoreType.sing_box);
-                        var proc2 = RunProcess(node, coreInfo2, $" -c {Global.corePreConfigFileName}", true, ShowMsg);
+                        var proc2 = RunProcess(node, coreInfo2, $" -c {Global.CorePreConfigFileName}", true);
                         if (proc2 is not null)
                         {
                             _processPre = proc2;
@@ -219,91 +230,52 @@ namespace v2rayN.Handler
             }
         }
 
-        private int CoreStartViaString(string configStr)
+        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
             {
-                var coreInfo = LazyConfig.Instance.GetCoreInfo(ECoreType.Xray);
-                string fileName = CoreFindexe(coreInfo);
-                if (fileName == "") return -1;
-
-                Process p = new()
+                var coreInfo = LazyConfig.Instance.GetCoreInfo(coreType);
+                var proc = RunProcess(new(), coreInfo, $" -c {Global.CoreSpeedtestConfigFileName}", true);
+                if (proc is null)
                 {
-                    StartInfo = new ProcessStartInfo
-                    {
-                        FileName = fileName,
-                        Arguments = "-config stdin:",
-                        WorkingDirectory = Utils.GetConfigPath(),
-                        UseShellExecute = false,
-                        RedirectStandardInput = true,
-                        RedirectStandardOutput = true,
-                        RedirectStandardError = true,
-                        CreateNoWindow = true,
-                        StandardOutputEncoding = Encoding.UTF8,
-                        StandardErrorEncoding = Encoding.UTF8
-                    }
-                };
-                p.OutputDataReceived += (sender, e) =>
-                {
-                    if (!String.IsNullOrEmpty(e.Data))
-                    {
-                        string msg = e.Data + Environment.NewLine;
-                        ShowMsg(false, msg);
-                    }
-                };
-                p.ErrorDataReceived += (sender, e) =>
-                {
-                    if (!string.IsNullOrEmpty(e.Data))
-                    {
-                        string msg = e.Data + Environment.NewLine;
-                        ShowMsg(false, msg);
-                    }
-                };
-                p.Start();
-                p.BeginOutputReadLine();
-                p.BeginErrorReadLine();
-
-                p.StandardInput.Write(configStr);
-                p.StandardInput.Close();
-
-                if (p.WaitForExit(1000))
-                {
-                    throw new Exception(p.StandardError.ReadToEnd());
+                    return -1;
                 }
 
-                Global.processJob.AddProcess(p.Handle);
-                return p.Id;
+                return proc.Id;
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 string msg = ex.Message;
                 ShowMsg(false, msg);
                 return -1;
             }
         }
 
-        private void ShowMsg(bool updateToTrayTooltip, string msg)
+        private void ShowMsg(bool notify, string msg)
         {
-            _updateFunc(updateToTrayTooltip, msg);
+            _updateFunc(notify, msg);
         }
 
+        #endregion Private
+
         #region Process
 
-        private Process? RunProcess(ProfileItem node, CoreInfo coreInfo, string configPath, bool displayLog, Action<bool, string> update)
+        private Process? RunProcess(ProfileItem node, CoreInfo coreInfo, string configPath, bool displayLog)
         {
             try
             {
-                string fileName = CoreFindexe(coreInfo);
+                string fileName = CoreFindExe(coreInfo);
                 if (Utils.IsNullOrEmpty(fileName))
                 {
                     return null;
                 }
                 Process proc = new()
                 {
-                    StartInfo = new ProcessStartInfo
+                    StartInfo = new()
                     {
                         FileName = fileName,
                         Arguments = string.Format(coreInfo.arguments, configPath),
@@ -316,22 +288,29 @@ namespace v2rayN.Handler
                         StandardErrorEncoding = displayLog ? Encoding.UTF8 : null,
                     }
                 };
+                var startUpErrorMessage = new StringBuilder();
+                var startUpSuccessful = false;
                 if (displayLog)
                 {
                     proc.OutputDataReceived += (sender, e) =>
                     {
-                        if (!string.IsNullOrEmpty(e.Data))
+                        if (!Utils.IsNullOrEmpty(e.Data))
                         {
                             string msg = e.Data + Environment.NewLine;
-                            update(false, msg);
+                            ShowMsg(false, msg);
                         }
                     };
                     proc.ErrorDataReceived += (sender, e) =>
                     {
-                        if (!string.IsNullOrEmpty(e.Data))
+                        if (!Utils.IsNullOrEmpty(e.Data))
                         {
                             string msg = e.Data + Environment.NewLine;
-                            update(false, msg);
+                            ShowMsg(false, msg);
+
+                            if (!startUpSuccessful)
+                            {
+                                startUpErrorMessage.Append(msg);
+                            }
                         }
                     };
                 }
@@ -344,36 +323,45 @@ namespace v2rayN.Handler
 
                 if (proc.WaitForExit(1000))
                 {
-                    throw new Exception(displayLog ? proc.StandardError.ReadToEnd() : "启动进程失败并退出 (Failed to start the process and exited)");
+                    proc.CancelErrorRead();
+                    throw new Exception(displayLog ? startUpErrorMessage.ToString() : "启动进程失败并退出 (Failed to start the process and exited)");
+                }
+                else
+                {
+                    startUpSuccessful = true;
                 }
 
-                Global.processJob.AddProcess(proc.Handle);
+                LazyConfig.Instance.AddProcess(proc.Handle);
                 return proc;
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 string msg = ex.Message;
-                update(true, msg);
+                ShowMsg(true, msg);
                 return null;
             }
         }
 
-        private void KillProcess(Process p)
+        private void KillProcess(Process? proc)
         {
+            if (proc is null)
+            {
+                return;
+            }
             try
             {
-                p.CloseMainWindow();
-                p.WaitForExit(100);
-                if (!p.HasExited)
+                proc.Kill();
+                proc.WaitForExit(100);
+                if (!proc.HasExited)
                 {
-                    p.Kill();
-                    p.WaitForExit(100);
+                    proc.Kill();
+                    proc.WaitForExit(100);
                 }
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
         }
 

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.Model;
 using v2rayN.Resx;
 
 namespace v2rayN.Handler
@@ -84,7 +84,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
 
                 Error?.Invoke(this, new ErrorEventArgs(ex));
                 if (ex.InnerException != null)
@@ -111,7 +111,7 @@ namespace v2rayN.Handler
             }
             else
             {
-                Utils.SaveLog("StatusCode error: " + url);
+                Logging.SaveLog("StatusCode error: " + url);
                 return null;
             }
         }
@@ -128,7 +128,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 Error?.Invoke(this, new ErrorEventArgs(ex));
                 if (ex.InnerException != null)
                 {
@@ -146,7 +146,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 Error?.Invoke(this, new ErrorEventArgs(ex));
                 if (ex.InnerException != null)
                 {
@@ -166,7 +166,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 Error?.Invoke(this, new ErrorEventArgs(ex));
                 if (ex.InnerException != null)
                 {
@@ -212,7 +212,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 Error?.Invoke(this, new ErrorEventArgs(ex));
                 if (ex.InnerException != null)
                 {
@@ -243,7 +243,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 Error?.Invoke(this, new ErrorEventArgs(ex));
                 if (ex.InnerException != null)
                 {
@@ -270,13 +270,13 @@ namespace v2rayN.Handler
                 }
                 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;
             }
         }
@@ -299,9 +299,9 @@ namespace v2rayN.Handler
 
                 responseTime = timer.Elapsed.Milliseconds;
             }
-            catch (Exception ex)
+            catch //(Exception ex)
             {
-                //Utils.SaveLog(ex.Message, ex);
+                //Utile.SaveLog(ex.Message, ex);
             }
             return responseTime;
         }
@@ -312,7 +312,7 @@ namespace v2rayN.Handler
             {
                 return null;
             }
-            var httpPort = LazyConfig.Instance.GetLocalPort(Global.InboundHttp);
+            var httpPort = LazyConfig.Instance.GetLocalPort(EInboundProtocol.http);
             if (!SocketCheck(Global.Loopback, httpPort))
             {
                 return null;

v2rayN/v2rayN/Handler/HotkeyHandler.cs

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

v2rayN/v2rayN/Handler/LazyConfig.cs

@@ -1,5 +1,5 @@
-using v2rayN.Base;
-using v2rayN.Mode;
+using System.Runtime.Intrinsics.X86;
+using v2rayN.Model;
 
 namespace v2rayN.Handler
 {
@@ -7,18 +7,35 @@ namespace v2rayN.Handler
     {
         private static readonly Lazy<LazyConfig> _instance = new(() => new());
         private Config _config;
-        private List<CoreInfo> coreInfos;
+        private List<CoreInfo> coreInfo;
 
         public static LazyConfig Instance => _instance.Value;
 
+        private int? _statePort;
+
+        public int StatePort
+        {
+            get
+            {
+                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<ProfileExItem>();
-            SqliteHelper.Instance.CreateTable<DNSItem>();
+            SQLiteHelper.Instance.CreateTable<SubItem>();
+            SQLiteHelper.Instance.CreateTable<ProfileItem>();
+            SQLiteHelper.Instance.CreateTable<ServerStatItem>();
+            SQLiteHelper.Instance.CreateTable<RoutingItem>();
+            SQLiteHelper.Instance.CreateTable<ProfileExItem>();
+            SQLiteHelper.Instance.CreateTable<DNSItem>();
         }
 
         #region Config
@@ -33,67 +50,52 @@ namespace v2rayN.Handler
             return _config;
         }
 
-        public int GetLocalPort(string protocol)
+        public int GetLocalPort(EInboundProtocol protocol)
         {
-            int localPort = _config.inbound.FirstOrDefault(t => t.protocol == Global.InboundSocks).localPort;
-            if (protocol == Global.InboundSocks)
-            {
-                return localPort;
-            }
-            else if (protocol == Global.InboundHttp)
-            {
-                return localPort + 1;
-            }
-            else if (protocol == Global.InboundSocks2)
-            {
-                return localPort + 2;
-            }
-            else if (protocol == Global.InboundHttp2)
-            {
-                return localPort + 3;
-            }
-            else if (protocol == ESysProxyType.Pac.ToString())
-            {
-                return localPort + 4;
-            }
-            else if (protocol == "speedtest")
-            {
-                return localPort + 103;
-            }
-            return localPort;
+            var localPort = _config.inbound.FirstOrDefault(t => t.protocol == nameof(EInboundProtocol.socks))?.localPort ?? 10808;
+            return localPort + (int)protocol;
         }
 
+        public void AddProcess(IntPtr processHandle)
+        {
+            _processJob.AddProcess(processHandle);
+        }
+
+        #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> ProfileItemIndexs(string subid)
+        public List<string> ProfileItemIndexes(string subid)
         {
             if (Utils.IsNullOrEmpty(subid))
             {
-                return SqliteHelper.Instance.Table<ProfileItem>().Select(t => t.indexId).ToList();
+                return SQLiteHelper.Instance.Table<ProfileItem>().Select(t => t.indexId).ToList();
             }
             else
             {
-                return SqliteHelper.Instance.Table<ProfileItem>().Where(t => t.subid == subid).Select(t => t.indexId).ToList();
+                return SQLiteHelper.Instance.Table<ProfileItem>().Where(t => t.subid == subid).Select(t => t.indexId).ToList();
             }
         }
 
@@ -117,7 +119,7 @@ namespace v2rayN.Handler
                 sql += String.Format(" and (a.remarks like '%{0}%' or a.address like '%{0}%') ", filter);
             }
 
-            return SqliteHelper.Instance.Query<ProfileItemModel>(sql).ToList();
+            return SQLiteHelper.Instance.Query<ProfileItemModel>(sql).ToList();
         }
 
         public ProfileItem? GetProfileItem(string indexId)
@@ -126,45 +128,57 @@ namespace v2rayN.Handler
             {
                 return null;
             }
-            return SqliteHelper.Instance.Table<ProfileItem>().FirstOrDefault(it => it.indexId == indexId);
+            return SQLiteHelper.Instance.Table<ProfileItem>().FirstOrDefault(it => it.indexId == indexId);
+        }
+
+        public ProfileItem? GetProfileItemViaRemarks(string remarks)
+        {
+            if (Utils.IsNullOrEmpty(remarks))
+            {
+                return null;
+            }
+            return SQLiteHelper.Instance.Table<ProfileItem>().FirstOrDefault(it => it.remarks == remarks);
         }
 
         public List<RoutingItem> RoutingItems()
         {
-            return SqliteHelper.Instance.Table<RoutingItem>().Where(it => it.locked == false).OrderBy(t => t.sort).ToList();
+            return SQLiteHelper.Instance.Table<RoutingItem>().Where(it => it.locked == false).OrderBy(t => t.sort).ToList();
         }
 
         public RoutingItem GetRoutingItem(string id)
         {
-            return SqliteHelper.Instance.Table<RoutingItem>().FirstOrDefault(it => it.locked == false && it.id == id);
+            return SQLiteHelper.Instance.Table<RoutingItem>().FirstOrDefault(it => it.locked == false && it.id == id);
         }
 
         public List<DNSItem> DNSItems()
         {
-            return SqliteHelper.Instance.Table<DNSItem>().ToList();
+            return SQLiteHelper.Instance.Table<DNSItem>().ToList();
         }
 
         public DNSItem GetDNSItem(ECoreType eCoreType)
         {
-            return SqliteHelper.Instance.Table<DNSItem>().FirstOrDefault(it => it.coreType == eCoreType);
+            return SQLiteHelper.Instance.Table<DNSItem>().FirstOrDefault(it => it.coreType == eCoreType);
         }
 
-        #endregion Config
+        #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)
@@ -188,58 +202,58 @@ namespace v2rayN.Handler
 
         public CoreInfo? GetCoreInfo(ECoreType coreType)
         {
-            if (coreInfos == null)
+            if (coreInfo == null)
             {
                 InitCoreInfo();
             }
-            return coreInfos!.FirstOrDefault(t => t.coreType == coreType);
+            return coreInfo?.FirstOrDefault(t => t.coreType == coreType);
         }
 
-        public List<CoreInfo>? GetCoreInfos()
+        public List<CoreInfo> GetCoreInfo()
         {
-            if (coreInfos == null)
+            if (coreInfo == null)
             {
                 InitCoreInfo();
             }
-            return coreInfos;
+            return coreInfo!;
         }
 
         private void InitCoreInfo()
         {
-            coreInfos = new(16);
+            coreInfo = new(16);
 
-            coreInfos.Add(new CoreInfo
+            coreInfo.Add(new CoreInfo
             {
                 coreType = ECoreType.v2rayN,
                 coreUrl = Global.NUrl,
-                coreReleaseApiUrl = Global.NUrl.Replace(Global.githubUrl, Global.githubApiUrl),
+                coreReleaseApiUrl = Global.NUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
                 coreDownloadUrl32 = Global.NUrl + "/download/{0}/v2rayN-32.zip",
                 coreDownloadUrl64 = Global.NUrl + "/download/{0}/v2rayN.zip",
                 coreDownloadUrlArm64 = Global.NUrl + "/download/{0}/v2rayN-arm64.zip"
             });
 
-            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(Global.githubUrl, Global.githubApiUrl),
-                coreDownloadUrl32 = Global.v2flyCoreUrl + "/download/{0}/v2ray-windows-{1}.zip",
-                coreDownloadUrl64 = Global.v2flyCoreUrl + "/download/{0}/v2ray-windows-{1}.zip",
-                coreDownloadUrlArm64 = Global.v2flyCoreUrl + "/download/{0}/v2ray-windows-{1}.zip",
+                coreUrl = Global.V2flyCoreUrl,
+                coreReleaseApiUrl = Global.V2flyCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
+                coreDownloadUrl32 = Global.V2flyCoreUrl + "/download/{0}/v2ray-windows-{1}.zip",
+                coreDownloadUrl64 = Global.V2flyCoreUrl + "/download/{0}/v2ray-windows-{1}.zip",
+                coreDownloadUrlArm64 = Global.V2flyCoreUrl + "/download/{0}/v2ray-windows-{1}.zip",
                 match = "V2Ray",
                 versionArg = "-version",
                 redirectInfo = true,
             });
 
-            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(Global.githubUrl, Global.githubApiUrl),
+                coreReleaseApiUrl = Global.SagerNetCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
                 coreDownloadUrl32 = Global.SagerNetCoreUrl + "/download/{0}/v2ray-windows-{1}.zip",
                 coreDownloadUrl64 = Global.SagerNetCoreUrl + "/download/{0}/v2ray-windows-{1}.zip",
                 coreDownloadUrlArm64 = Global.SagerNetCoreUrl + "/download/{0}/v2ray-windows-{1}.zip",
@@ -248,134 +262,145 @@ namespace v2rayN.Handler
                 redirectInfo = true,
             });
 
-            coreInfos.Add(new CoreInfo
+            coreInfo.Add(new CoreInfo
             {
                 coreType = ECoreType.v2fly_v5,
                 coreExes = new List<string> { "v2ray" },
                 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",
+                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(Global.githubUrl, Global.githubApiUrl),
-                coreDownloadUrl32 = Global.xrayCoreUrl + "/download/{0}/Xray-windows-{1}.zip",
-                coreDownloadUrl64 = Global.xrayCoreUrl + "/download/{0}/Xray-windows-{1}.zip",
-                coreDownloadUrlArm64 = Global.xrayCoreUrl + "/download/{0}/Xray-windows-{1}.zip",
+                arguments = "run {0}",
+                coreUrl = Global.XrayCoreUrl,
+                coreReleaseApiUrl = Global.XrayCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
+                coreDownloadUrl32 = Global.XrayCoreUrl + "/download/{0}/Xray-windows-{1}.zip",
+                coreDownloadUrl64 = Global.XrayCoreUrl + "/download/{0}/Xray-windows-{1}.zip",
+                coreDownloadUrlArm64 = Global.XrayCoreUrl + "/download/{0}/Xray-windows-{1}.zip",
                 match = "Xray",
                 versionArg = "-version",
                 redirectInfo = true,
             });
 
-            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(Global.githubUrl, Global.githubApiUrl),
-                coreDownloadUrl32 = Global.clashCoreUrl + "/download/{0}/clash-windows-386-{0}.zip",
-                coreDownloadUrl64 = Global.clashCoreUrl + "/download/{0}/clash-windows-amd64-{0}.zip",
-                coreDownloadUrlArm64 = Global.clashCoreUrl + "/download/{0}/clash-windows-arm64-{0}.zip",
+                coreUrl = Global.ClashCoreUrl,
+                coreReleaseApiUrl = Global.ClashCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
+                coreDownloadUrl32 = Global.ClashCoreUrl + "/download/{0}/clash-windows-386-{0}.zip",
+                coreDownloadUrl64 = Global.ClashCoreUrl + "/download/{0}/clash-windows-amd64-{0}.zip",
+                coreDownloadUrlArm64 = Global.ClashCoreUrl + "/download/{0}/clash-windows-arm64-{0}.zip",
                 match = "v",
                 versionArg = "-v",
                 redirectInfo = true,
             });
 
-            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(Global.githubUrl, Global.githubApiUrl),
-                coreDownloadUrl32 = Global.clashMetaCoreUrl + "/download/{0}/Clash.Meta-windows-386-{0}.zip",
-                coreDownloadUrl64 = Global.clashMetaCoreUrl + "/download/{0}/Clash.Meta-windows-amd64-compatible-{0}.zip",
-                coreDownloadUrlArm64 = Global.clashMetaCoreUrl + "/download/{0}/Clash.Meta-windows-arm64-{0}.zip",
+                coreUrl = Global.ClashMetaCoreUrl,
+                coreReleaseApiUrl = Global.ClashMetaCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
+                coreDownloadUrl32 = Global.ClashMetaCoreUrl + "/download/{0}/Clash.Meta-windows-386-{0}.zip",
+                coreDownloadUrl64 = Global.ClashMetaCoreUrl + "/download/{0}/Clash.Meta-windows-amd64-compatible-{0}.zip",
+                coreDownloadUrlArm64 = Global.ClashMetaCoreUrl + "/download/{0}/Clash.Meta-windows-arm64-{0}.zip",
                 match = "v",
                 versionArg = "-v",
                 redirectInfo = true,
             });
 
-            coreInfos.Add(new CoreInfo
+            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(Global.githubUrl, Global.githubApiUrl),
-                coreDownloadUrl32 = Global.hysteriaCoreUrl + "/download/{0}/hysteria-windows-386.exe",
-                coreDownloadUrl64 = Global.hysteriaCoreUrl + "/download/{0}/hysteria-windows-amd64.exe",
-                coreDownloadUrlArm64 = Global.hysteriaCoreUrl + "/download/{0}/hysteria-windows-arm64.exe",
+                coreUrl = Global.HysteriaCoreUrl,
+                coreReleaseApiUrl = Global.HysteriaCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
+                coreDownloadUrl32 = Global.HysteriaCoreUrl + "/download/{0}/hysteria-windows-386.exe",
+                coreDownloadUrl64 = Global.HysteriaCoreUrl + "/download/{0}/hysteria-windows-amd64.exe",
+                coreDownloadUrlArm64 = Global.HysteriaCoreUrl + "/download/{0}/hysteria-windows-arm64.exe",
                 redirectInfo = true,
             });
 
-            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{0}",
-                coreUrl = Global.singboxCoreUrl,
+                arguments = "run {0} --disable-color",
+                coreUrl = Global.SingboxCoreUrl,
                 redirectInfo = true,
-                coreReleaseApiUrl = Global.singboxCoreUrl.Replace(Global.githubUrl, Global.githubApiUrl),
-                coreDownloadUrl32 = Global.singboxCoreUrl + "/download/{0}/sing-box-{1}-windows-386.zip",
-                coreDownloadUrl64 = Global.singboxCoreUrl + "/download/{0}/sing-box-{1}-windows-amd64.zip",
-                coreDownloadUrlArm64 = Global.singboxCoreUrl + "/download/{0}/sing-box-{1}-windows-arm64.zip",
+                coreReleaseApiUrl = Global.SingboxCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
+                coreDownloadUrl32 = Global.SingboxCoreUrl + "/download/{0}/sing-box-{1}-windows-386.zip",
+                coreDownloadUrl64 = Global.SingboxCoreUrl + "/download/{0}/sing-box-{1}-windows-amd64.zip",
+                coreDownloadUrlArm64 = Global.SingboxCoreUrl + "/download/{0}/sing-box-{1}-windows-arm64.zip",
                 match = "sing-box",
                 versionArg = "version",
             });
 
-            coreInfos.Add(new CoreInfo
+            coreInfo.Add(new CoreInfo
             {
                 coreType = ECoreType.juicity,
                 coreExes = new List<string> { "juicity-client", "juicity" },
                 arguments = "run -c config.json",
-                coreUrl = Global.juicityCoreUrl
+                coreUrl = Global.JuicityCoreUrl
             });
 
-            coreInfos.Add(new CoreInfo
+            coreInfo.Add(new CoreInfo
             {
                 coreType = ECoreType.hysteria2,
                 coreExes = new List<string> { "hysteria-windows-amd64", "hysteria-windows-386", "hysteria" },
                 arguments = "",
-                coreUrl = Global.hysteriaCoreUrl,
-                coreReleaseApiUrl = Global.hysteriaCoreUrl.Replace(Global.githubUrl, Global.githubApiUrl),
-                coreDownloadUrl32 = Global.hysteriaCoreUrl + "/download/{0}/hysteria-windows-386.exe",
-                coreDownloadUrl64 = Global.hysteriaCoreUrl + "/download/{0}/hysteria-windows-amd64.exe",
-                coreDownloadUrlArm64 = Global.hysteriaCoreUrl + "/download/{0}/hysteria-windows-arm64.exe",
+                coreUrl = Global.HysteriaCoreUrl,
+                coreReleaseApiUrl = Global.HysteriaCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
+                coreDownloadUrl32 = Global.HysteriaCoreUrl + "/download/{0}/hysteria-windows-386.exe",
+                coreDownloadUrl64 = Global.HysteriaCoreUrl + "/download/{0}/hysteria-windows-amd64.exe",
+                coreDownloadUrlArm64 = Global.HysteriaCoreUrl + "/download/{0}/hysteria-windows-arm64.exe",
                 redirectInfo = true,
             });
         }
 
         #endregion Core Type
     }
-}
+}

v2rayN/v2rayN/Handler/MainFormHandler.cs

@@ -1,8 +1,9 @@
 using Microsoft.Win32;
+using Splat;
 using System.Drawing;
 using System.IO;
 using System.Windows.Media.Imaging;
-using v2rayN.Mode;
+using v2rayN.Model;
 using v2rayN.Resx;
 
 namespace v2rayN.Handler
@@ -42,7 +43,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 return Properties.Resources.NotifyIcon1;
             }
         }
@@ -50,18 +51,18 @@ namespace v2rayN.Handler
         public System.Windows.Media.ImageSource GetAppIcon(Config config)
         {
             int index = 1;
-            switch ((int)config.sysProxyType)
+            switch (config.sysProxyType)
             {
-                case 0:
+                case ESysProxyType.ForcedClear:
                     index = 1;
                     break;
 
-                case 1:
-                case 3:
+                case ESysProxyType.ForcedChange:
+                case ESysProxyType.Pac:
                     index = 2;
                     break;
 
-                case 2:
+                case ESysProxyType.Unchanged:
                     index = 3;
                     break;
             }
@@ -77,7 +78,7 @@ namespace v2rayN.Handler
                     return null;
                 }
 
-                var item = ConfigHandler.GetDefaultRouting(ref config);
+                var item = ConfigHandler.GetDefaultRouting(config);
                 if (item == null || Utils.IsNullOrEmpty(item.customIcon) || !File.Exists(item.customIcon))
                 {
                     return null;
@@ -112,7 +113,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 return null;
             }
         }
@@ -125,7 +126,7 @@ namespace v2rayN.Handler
             }
             if (item.configType == EConfigType.Custom)
             {
-                UI.Show(ResUI.NonVmessService);
+                Locator.Current.GetService<NoticeHandler>()?.Enqueue(ResUI.NonVmessService);
                 return;
             }
 
@@ -146,11 +147,12 @@ namespace v2rayN.Handler
             }
             if (CoreConfigHandler.GenerateClientConfig(item, fileName, out string msg, out string content) != 0)
             {
-                UI.Show(msg);
+                Locator.Current.GetService<NoticeHandler>()?.Enqueue(msg);
             }
             else
             {
-                UI.ShowWarning(string.Format(ResUI.SaveClientConfigurationIn, fileName));
+                msg = string.Format(ResUI.SaveClientConfigurationIn, fileName);
+                Locator.Current.GetService<NoticeHandler>()?.SendMessageAndEnqueue(msg);
             }
         }
 
@@ -163,7 +165,7 @@ namespace v2rayN.Handler
         private async Task UpdateTaskRunSubscription(Config config, Action<bool, string> update)
         {
             await Task.Delay(60000);
-            Utils.SaveLog("UpdateTaskRunSubscription");
+            Logging.SaveLog("UpdateTaskRunSubscription");
 
             var updateHandle = new UpdateHandle();
             while (true)
@@ -180,10 +182,10 @@ namespace v2rayN.Handler
                     {
                         update(success, msg);
                         if (success)
-                            Utils.SaveLog("subscription" + msg);
+                            Logging.SaveLog("subscription" + msg);
                     });
                     item.updateTime = updateTime;
-                    ConfigHandler.AddSubItem(ref config, item);
+                    ConfigHandler.AddSubItem(config, item);
 
                     await Task.Delay(5000);
                 }
@@ -196,7 +198,7 @@ namespace v2rayN.Handler
             var autoUpdateGeoTime = DateTime.Now;
 
             await Task.Delay(1000 * 120);
-            Utils.SaveLog("UpdateTaskRunGeo");
+            Logging.SaveLog("UpdateTaskRunGeo");
 
             var updateHandle = new UpdateHandle();
             while (true)

v2rayN/v2rayN/Handler/NoticeHandler.cs

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

v2rayN/v2rayN/Handler/ProfileExHandler.cs

@@ -1,7 +1,6 @@
 using System.Collections.Concurrent;
 using System.Reactive.Linq;
-using v2rayN.Base;
-using v2rayN.Mode;
+using v2rayN.Model;
 
 namespace v2rayN.Handler
 {
@@ -20,9 +19,9 @@ namespace v2rayN.Handler
 
         private void Init()
         {
-            SqliteHelper.Instance.Execute($"delete from ProfileExItem where indexId not in ( select indexId from ProfileItem )");
+            SQLiteHelper.Instance.Execute($"delete from ProfileExItem where indexId not in ( select indexId from ProfileItem )");
 
-            _lstProfileEx = new(SqliteHelper.Instance.Table<ProfileExItem>());
+            _lstProfileEx = new(SQLiteHelper.Instance.Table<ProfileExItem>());
 
             Task.Run(async () =>
             {
@@ -35,7 +34,7 @@ namespace v2rayN.Handler
                         var item = _lstProfileEx.FirstOrDefault(t => t.indexId == id);
                         if (item is not null)
                         {
-                            SqliteHelper.Instance.Replace(item);
+                            SQLiteHelper.Instance.Replace(item);
                         }
                     }
                     await Task.Delay(1000 * 60);
@@ -51,7 +50,7 @@ namespace v2rayN.Handler
             }
         }
 
-        private void AddProfileEx(string indexId, ref ProfileExItem profileEx)
+        private void AddProfileEx(string indexId, ref ProfileExItem? profileEx)
         {
             profileEx = new()
             {
@@ -66,7 +65,7 @@ namespace v2rayN.Handler
 
         public void ClearAll()
         {
-            SqliteHelper.Instance.Execute($"delete from ProfileExItem ");
+            SQLiteHelper.Instance.Execute($"delete from ProfileExItem ");
             _lstProfileEx = new();
         }
 
@@ -76,13 +75,13 @@ namespace v2rayN.Handler
             {
                 //foreach (var item in _lstProfileEx)
                 //{
-                //    SqliteHelper.Instance.Replace(item);
+                //    SQLiteHelper.Instance.Replace(item);
                 //}
-                SqliteHelper.Instance.UpdateAll(_lstProfileEx);
+                SQLiteHelper.Instance.UpdateAll(_lstProfileEx);
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
         }
 

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

v2rayN/v2rayN/Handler/ShareHandler.cs

@@ -1,8 +1,6 @@
 using System.Collections.Specialized;
 using System.Text.RegularExpressions;
-using System.Web;
-using v2rayN.Base;
-using v2rayN.Mode;
+using v2rayN.Model;
 using v2rayN.Resx;
 
 namespace v2rayN.Handler
@@ -29,6 +27,9 @@ namespace v2rayN.Handler
                     EConfigType.Socks => ShareSocks(item),
                     EConfigType.Trojan => ShareTrojan(item),
                     EConfigType.VLESS => ShareVLESS(item),
+                    EConfigType.Hysteria2 => ShareHysteria2(item),
+                    EConfigType.Tuic => ShareTuic(item),
+                    EConfigType.Wireguard => ShareWireguard(item),
                     _ => null,
                 };
 
@@ -36,7 +37,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 return "";
             }
         }
@@ -47,12 +48,12 @@ namespace v2rayN.Handler
 
             VmessQRCode vmessQRCode = new()
             {
-                v = item.configVersion.ToString(),
+                v = item.configVersion,
                 ps = item.remarks.TrimEx(),
                 add = item.address,
-                port = item.port.ToString(),
+                port = item.port,
                 id = item.id,
-                aid = item.alterId.ToString(),
+                aid = item.alterId,
                 scy = item.security,
                 net = item.network,
                 type = item.headerType,
@@ -64,9 +65,9 @@ namespace v2rayN.Handler
                 fp = item.fingerprint
             };
 
-            url = Utils.ToJson(vmessQRCode);
+            url = JsonUtils.Serialize(vmessQRCode);
             url = Utils.Base64Encode(url);
-            url = $"{Global.vmessProtocol}{url}";
+            url = $"{Global.ProtocolShares[EConfigType.VMess]}{url}";
 
             return url;
         }
@@ -85,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;
         }
 
@@ -106,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;
         }
 
@@ -130,7 +131,7 @@ namespace v2rayN.Handler
             item.id,
             GetIpv6(item.address),
             item.port);
-            url = $"{Global.trojanProtocol}{url}{query}{remark}";
+            url = $"{Global.ProtocolShares[EConfigType.Trojan]}{url}{query}{remark}";
             return url;
         }
 
@@ -149,16 +150,115 @@ 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 ShareHysteria2(ProfileItem item)
+        {
+            string url = string.Empty;
+            string remark = string.Empty;
+            if (!Utils.IsNullOrEmpty(item.remarks))
+            {
+                remark = "#" + Utils.UrlEncode(item.remarks);
+            }
+            var dicQuery = new Dictionary<string, string>();
+            if (!Utils.IsNullOrEmpty(item.sni))
+            {
+                dicQuery.Add("sni", item.sni);
+            }
+            if (!Utils.IsNullOrEmpty(item.alpn))
+            {
+                dicQuery.Add("alpn", Utils.UrlEncode(item.alpn));
+            }
+            if (!Utils.IsNullOrEmpty(item.path))
+            {
+                dicQuery.Add("obfs", "salamander");
+                dicQuery.Add("obfs-password", Utils.UrlEncode(item.path));
+            }
+            dicQuery.Add("insecure", item.allowInsecure.ToLower() == "true" ? "1" : "0");
+
+            string query = "?" + string.Join("&", dicQuery.Select(x => x.Key + "=" + x.Value).ToArray());
+
+            url = string.Format("{0}@{1}:{2}",
+            item.id,
+            GetIpv6(item.address),
+            item.port);
+            url = $"{Global.ProtocolShares[EConfigType.Hysteria2]}{url}/{query}{remark}";
+            return url;
+        }
+
+        private static string ShareTuic(ProfileItem item)
+        {
+            string url = string.Empty;
+            string remark = string.Empty;
+            if (!Utils.IsNullOrEmpty(item.remarks))
+            {
+                remark = "#" + Utils.UrlEncode(item.remarks);
+            }
+            var dicQuery = new Dictionary<string, string>();
+            if (!Utils.IsNullOrEmpty(item.sni))
+            {
+                dicQuery.Add("sni", item.sni);
+            }
+            if (!Utils.IsNullOrEmpty(item.alpn))
+            {
+                dicQuery.Add("alpn", Utils.UrlEncode(item.alpn));
+            }
+            dicQuery.Add("congestion_control", item.headerType);
+
+            string query = "?" + string.Join("&", dicQuery.Select(x => x.Key + "=" + x.Value).ToArray());
+
+            url = string.Format("{0}@{1}:{2}",
+            $"{item.id}:{item.security}",
+            GetIpv6(item.address),
+            item.port);
+            url = $"{Global.ProtocolShares[EConfigType.Tuic]}{url}{query}{remark}";
+            return url;
+        }
+
+        private static string ShareWireguard(ProfileItem item)
+        {
+            string url = string.Empty;
+            string remark = string.Empty;
+            if (!Utils.IsNullOrEmpty(item.remarks))
+            {
+                remark = "#" + Utils.UrlEncode(item.remarks);
+            }
+
+            var dicQuery = new Dictionary<string, string>();
+            if (!Utils.IsNullOrEmpty(item.publicKey))
+            {
+                dicQuery.Add("publickey", Utils.UrlEncode(item.publicKey));
+            }
+            if (!Utils.IsNullOrEmpty(item.path))
+            {
+                dicQuery.Add("reserved", Utils.UrlEncode(item.path));
+            }
+            if (!Utils.IsNullOrEmpty(item.requestHost))
+            {
+                dicQuery.Add("address", Utils.UrlEncode(item.requestHost));
+            }
+            if (!Utils.IsNullOrEmpty(item.shortId))
+            {
+                dicQuery.Add("mtu", Utils.UrlEncode(item.shortId));
+            }
+            string query = "?" + string.Join("&", dicQuery.Select(x => x.Key + "=" + x.Value).ToArray());
+
+            url = string.Format("{0}@{1}:{2}",
+            Utils.UrlEncode(item.id),
+            GetIpv6(item.address),
+            item.port);
+            url = $"{Global.ProtocolShares[EConfigType.Wireguard]}{url}/{query}{remark}";
             return url;
         }
 
@@ -210,27 +310,28 @@ namespace v2rayN.Handler
                 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));
@@ -241,9 +342,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));
@@ -254,17 +355,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 is Global.GrpcgunMode or Global.GrpcmultiMode)
+                        if (item.headerType is Global.GrpcGunMode or Global.GrpcMultiMode)
                         {
                             dicQuery.Add("mode", Utils.UrlEncode(item.headerType));
                         }
@@ -285,21 +387,19 @@ namespace v2rayN.Handler
         /// <returns></returns>
         public static ProfileItem? ImportFromClipboardConfig(string clipboardData, out string msg)
         {
-            msg = string.Empty;
-
-            ProfileItem profileItem = new();
+            msg = ResUI.ConfigurationFormatIncorrect;
+            ProfileItem? profileItem;
 
             try
             {
-                //载入配置文件
-                string result = clipboardData.TrimEx();// Utils.GetClipboardData();
+                string result = clipboardData.TrimEx();
                 if (Utils.IsNullOrEmpty(result))
                 {
                     msg = ResUI.FailedReadConfiguration;
                     return null;
                 }
 
-                if (result.StartsWith(Global.vmessProtocol))
+                if (result.StartsWith(Global.ProtocolShares[EConfigType.VMess]))
                 {
                     int indexSplit = result.IndexOf("?");
                     if (indexSplit > 0)
@@ -311,10 +411,8 @@ namespace v2rayN.Handler
                         profileItem = ResolveVmess(result, out msg);
                     }
                 }
-                else if (result.StartsWith(Global.ssProtocol))
+                else if (result.StartsWith(Global.ProtocolShares[EConfigType.Shadowsocks]))
                 {
-                    msg = ResUI.ConfigurationFormatIncorrect;
-
                     profileItem = ResolveSSLegacy(result) ?? ResolveSip002(result);
                     if (profileItem == null)
                     {
@@ -327,10 +425,8 @@ namespace v2rayN.Handler
 
                     profileItem.configType = EConfigType.Shadowsocks;
                 }
-                else if (result.StartsWith(Global.socksProtocol))
+                else if (result.StartsWith(Global.ProtocolShares[EConfigType.Socks]))
                 {
-                    msg = ResUI.ConfigurationFormatIncorrect;
-
                     profileItem = ResolveSocksNew(result) ?? ResolveSocks(result);
                     if (profileItem == null)
                     {
@@ -343,16 +439,26 @@ namespace v2rayN.Handler
 
                     profileItem.configType = EConfigType.Socks;
                 }
-                else if (result.StartsWith(Global.trojanProtocol))
+                else if (result.StartsWith(Global.ProtocolShares[EConfigType.Trojan]))
                 {
-                    msg = ResUI.ConfigurationFormatIncorrect;
-
                     profileItem = ResolveTrojan(result);
                 }
-                else if (result.StartsWith(Global.vlessProtocol))
+                else if (result.StartsWith(Global.ProtocolShares[EConfigType.VLESS]))
                 {
                     profileItem = ResolveStdVLESS(result);
                 }
+                else if (result.StartsWith(Global.ProtocolShares[EConfigType.Hysteria2]) || result.StartsWith(Global.Hysteria2ProtocolShare))
+                {
+                    profileItem = ResolveHysteria2(result);
+                }
+                else if (result.StartsWith(Global.ProtocolShares[EConfigType.Tuic]))
+                {
+                    profileItem = ResolveTuic(result);
+                }
+                else if (result.StartsWith(Global.ProtocolShares[EConfigType.Wireguard]))
+                {
+                    profileItem = ResolveWireguard(result);
+                }
                 else
                 {
                     msg = ResUI.NonvmessOrssProtocol;
@@ -361,7 +467,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 msg = ResUI.Incorrectconfiguration;
                 return null;
             }
@@ -377,11 +483,11 @@ namespace v2rayN.Handler
                 configType = EConfigType.VMess
             };
 
-            result = result[Global.vmessProtocol.Length..];
+            result = result[Global.ProtocolShares[EConfigType.VMess].Length..];
             result = Utils.Base64Decode(result);
 
             //转成Json
-            VmessQRCode? vmessQRCode = Utils.FromJson<VmessQRCode>(result);
+            VmessQRCode? vmessQRCode = JsonUtils.Deserialize<VmessQRCode>(result);
             if (vmessQRCode == null)
             {
                 msg = ResUI.FailedConversionConfiguration;
@@ -425,7 +531,7 @@ namespace v2rayN.Handler
             {
                 configType = EConfigType.VMess
             };
-            result = result[Global.vmessProtocol.Length..];
+            result = result[Global.ProtocolShares[EConfigType.VMess].Length..];
             int indexSplit = result.IndexOf("?");
             if (indexSplit > 0)
             {
@@ -470,7 +576,7 @@ namespace v2rayN.Handler
             i.address = u.IdnHost;
             i.port = u.Port;
             i.remarks = u.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
-            var q = HttpUtility.ParseQueryString(u.Query);
+            var query = Utils.ParseQueryString(u.Query);
 
             var m = StdVmessUserInfo.Match(u.UserInfo);
             if (!m.Success) return null;
@@ -483,11 +589,11 @@ namespace v2rayN.Handler
             }
             switch (i.streamSecurity)
             {
-                case "tls":
+                case Global.StreamSecurity:
                     break;
 
                 default:
-                    if (!string.IsNullOrWhiteSpace(i.streamSecurity))
+                    if (!Utils.IsNullOrEmpty(i.streamSecurity))
                         return null;
                     break;
             }
@@ -495,35 +601,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;
                     break;
 
-                case "kcp":
-                    i.headerType = q["type"] ?? "none";
+                case nameof(ETransport.kcp):
+                    i.headerType = query["type"] ?? Global.None;
                     break;
 
-                case "ws":
-                    string p1 = q["path"] ?? "/";
-                    string h1 = q["host"] ?? "";
+                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;
@@ -578,17 +685,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
                 {
@@ -642,7 +749,7 @@ namespace v2rayN.Handler
             {
                 configType = EConfigType.Socks
             };
-            result = result[Global.socksProtocol.Length..];
+            result = result[Global.ProtocolShares[EConfigType.Socks].Length..];
             //remark
             int indexRemark = result.IndexOf("#");
             if (indexRemark > 0)
@@ -727,9 +834,9 @@ namespace v2rayN.Handler
             item.address = url.IdnHost;
             item.port = url.Port;
             item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
-            item.id = url.UserInfo;
+            item.id = Utils.UrlDecode(url.UserInfo);
 
-            var query = HttpUtility.ParseQueryString(url.Query);
+            var query = Utils.ParseQueryString(url.Query);
             ResolveStdTransport(query, ref item);
 
             return item;
@@ -740,7 +847,7 @@ namespace v2rayN.Handler
             ProfileItem item = new()
             {
                 configType = EConfigType.VLESS,
-                security = "none"
+                security = Global.None
             };
 
             Uri url = new(result);
@@ -748,16 +855,88 @@ namespace v2rayN.Handler
             item.address = url.IdnHost;
             item.port = url.Port;
             item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
-            item.id = url.UserInfo;
+            item.id = Utils.UrlDecode(url.UserInfo);
 
-            var query = HttpUtility.ParseQueryString(url.Query);
-            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"] ?? "";
@@ -769,41 +948,43 @@ namespace v2rayN.Handler
             item.shortId = Utils.UrlDecode(query["sid"] ?? "");
             item.spiderX = Utils.UrlDecode(query["spx"] ?? "");
 
-            item.network = query["type"] ?? "tcp";
+            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:

v2rayN/v2rayN/Handler/SpeedtestHandler.cs

@@ -1,15 +1,15 @@
-using System.Diagnostics;
+using ReactiveUI;
+using System.Diagnostics;
 using System.Net;
-using System.Net.NetworkInformation;
 using System.Net.Sockets;
-using v2rayN.Mode;
+using v2rayN.Model;
 using v2rayN.Resx;
 
 namespace v2rayN.Handler
 {
     internal class SpeedtestHandler
     {
-        private Config _config;
+        private Config? _config;
         private CoreHandler _coreHandler;
         private List<ServerTestItem> _selecteds;
         private ESpeedActionType _actionType;
@@ -51,7 +51,6 @@ namespace v2rayN.Handler
             {
                 switch (actionType)
                 {
-                    case ESpeedActionType.Ping:
                     case ESpeedActionType.Tcping:
                     case ESpeedActionType.Realping:
                         UpdateFunc(it.indexId, ResUI.Speedtesting, "");
@@ -73,10 +72,6 @@ namespace v2rayN.Handler
 
             switch (actionType)
             {
-                case ESpeedActionType.Ping:
-                    Task.Run(RunPing);
-                    break;
-
                 case ESpeedActionType.Tcping:
                     Task.Run(RunTcping);
                     break;
@@ -95,52 +90,45 @@ namespace v2rayN.Handler
             }
         }
 
-        private async Task RunPingSubAsync(Action<ServerTestItem> updateFun)
+        private Task RunTcping()
         {
             try
             {
-                foreach (var it in _selecteds.Where(it => it.configType != EConfigType.Custom))
+                List<Task> tasks = [];
+                foreach (var it in _selecteds)
                 {
-                    try
+                    if (it.configType == EConfigType.Custom)
                     {
-                        Task.Run(() => updateFun(it));
+                        continue;
                     }
-                    catch (Exception ex)
+                    tasks.Add(Task.Run(() =>
                     {
-                        Utils.SaveLog(ex.Message, ex);
-                    }
-                }
+                        try
+                        {
+                            int time = GetTcpingTime(it.address, it.port);
+                            var output = FormatOut(time, Global.DelayUnit);
 
-                await Task.Delay(10);
+                            ProfileExHandler.Instance.SetTestDelay(it.indexId, output);
+                            UpdateFunc(it.indexId, output);
+                        }
+                        catch (Exception ex)
+                        {
+                            Logging.SaveLog(ex.Message, ex);
+                        }
+                    }));
+                }
+                Task.WaitAll([.. tasks]);
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
-        }
-
-        private async void RunPing()
-        {
-            await RunPingSubAsync((ServerTestItem it) =>
-             {
-                 long time = Ping(it.address);
-                 var output = FormatOut(time, Global.DelayUnit);
-
-                 ProfileExHandler.Instance.SetTestDelay(it.indexId, output);
-                 UpdateFunc(it.indexId, output);
-             });
-        }
-
-        private async void RunTcping()
-        {
-            await RunPingSubAsync((ServerTestItem it) =>
+            finally
             {
-                int time = GetTcpingTime(it.address, it.port);
-                var output = FormatOut(time, Global.DelayUnit);
+                ProfileExHandler.Instance.SaveTo();
+            }
 
-                ProfileExHandler.Instance.SetTestDelay(it.indexId, output);
-                UpdateFunc(it.indexId, output);
-            });
+            return Task.CompletedTask;
         }
 
         private Task RunRealPing()
@@ -150,7 +138,7 @@ namespace v2rayN.Handler
             {
                 string msg = string.Empty;
 
-                pid = _coreHandler.LoadCoreConfigString(_selecteds);
+                pid = _coreHandler.LoadCoreConfigSpeedtest(_selecteds);
                 if (pid < 0)
                 {
                     UpdateFunc("", ResUI.FailedToRunCore);
@@ -184,7 +172,7 @@ namespace v2rayN.Handler
                         }
                         catch (Exception ex)
                         {
-                            Utils.SaveLog(ex.Message, ex);
+                            Logging.SaveLog(ex.Message, ex);
                         }
                     }));
                 }
@@ -192,11 +180,14 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
             finally
             {
-                if (pid > 0) _coreHandler.CoreStopPid(pid);
+                if (pid > 0)
+                {
+                    _coreHandler.CoreStopPid(pid);
+                }
                 ProfileExHandler.Instance.SaveTo();
             }
 
@@ -211,7 +202,7 @@ namespace v2rayN.Handler
             //    _selecteds = _selecteds.OrderBy(t => t.delay).ToList();
             //}
 
-            pid = _coreHandler.LoadCoreConfigString(_selecteds);
+            pid = _coreHandler.LoadCoreConfigSpeedtest(_selecteds);
             if (pid < 0)
             {
                 UpdateFunc("", ResUI.FailedToRunCore);
@@ -223,8 +214,24 @@ namespace v2rayN.Handler
 
             DownloadHandle downloadHandle = new();
 
+            var exitLoop = false;
+            MessageBus.Current.Listen<string>(Global.CommandStopSpeedTest)
+                .Subscribe(x =>
+                {
+                    if (!exitLoop)
+                    {
+                        UpdateFunc("", ResUI.SpeedtestingStop);
+                    }
+                    exitLoop = true;
+                });
+
             foreach (var it in _selecteds)
             {
+                if (exitLoop)
+                {
+                    UpdateFunc(it.indexId, "", ResUI.SpeedtestingSkip);
+                    continue;
+                }
                 if (!it.allowTest)
                 {
                     continue;
@@ -268,7 +275,7 @@ namespace v2rayN.Handler
         private async Task RunSpeedTestMulti()
         {
             int pid = -1;
-            pid = _coreHandler.LoadCoreConfigString(_selecteds);
+            pid = _coreHandler.LoadCoreConfigSpeedtest(_selecteds);
             if (pid < 0)
             {
                 UpdateFunc("", ResUI.FailedToRunCore);
@@ -280,8 +287,25 @@ namespace v2rayN.Handler
 
             DownloadHandle downloadHandle = new();
 
+            var exitLoop = false;
+            MessageBus.Current.Listen<string>(Global.CommandStopSpeedTest)
+                .Subscribe(x =>
+                {
+                    if (!exitLoop)
+                    {
+                        UpdateFunc("", ResUI.SpeedtestingStop);
+                    }
+                    exitLoop = true;
+                });
+
             foreach (var it in _selecteds)
             {
+                if (exitLoop)
+                {
+                    UpdateFunc(it.indexId, "", ResUI.SpeedtestingSkip);
+                    continue;
+                }
+
                 if (!it.allowTest)
                 {
                     continue;
@@ -333,10 +357,10 @@ namespace v2rayN.Handler
             await RunSpeedTestMulti();
         }
 
-        public async Task<string> GetRealPingTime(DownloadHandle downloadHandle, IWebProxy webProxy)
+        private async Task<string> GetRealPingTime(DownloadHandle downloadHandle, IWebProxy webProxy)
         {
             int responseTime = await downloadHandle.GetRealPingTime(_config.speedTestItem.speedPingTestUrl, webProxy, 10);
-            //string output = Utils.IsNullOrEmpty(status) ? FormatOut(responseTime, "ms") : status;
+            //string output = Utile.IsNullOrEmpty(status) ? FormatOut(responseTime, "ms") : status;
             return FormatOut(responseTime, Global.DelayUnit);
         }
 
@@ -346,7 +370,7 @@ namespace v2rayN.Handler
 
             try
             {
-                if (!IPAddress.TryParse(url, out IPAddress ipAddress))
+                if (!IPAddress.TryParse(url, out IPAddress? ipAddress))
                 {
                     IPHostEntry ipHostInfo = System.Net.Dns.GetHostEntry(url);
                     ipAddress = ipHostInfo.AddressList[0];
@@ -368,48 +392,11 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
             return responseTime;
         }
 
-        /// <summary>
-        /// Ping
-        /// </summary>
-        /// <param name="host"></param>
-        /// <returns></returns>
-        public long Ping(string host)
-        {
-            long roundtripTime = -1;
-            try
-            {
-                int timeout = 30;
-                int echoNum = 2;
-                using Ping pingSender = new();
-                for (int i = 0; i < echoNum; i++)
-                {
-                    PingReply reply = pingSender.Send(host, timeout);
-                    if (reply.Status == IPStatus.Success)
-                    {
-                        if (reply.RoundtripTime < 0)
-                        {
-                            continue;
-                        }
-                        if (roundtripTime < 0 || reply.RoundtripTime < roundtripTime)
-                        {
-                            roundtripTime = reply.RoundtripTime;
-                        }
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                Utils.SaveLog(ex.Message, ex);
-                return -1;
-            }
-            return roundtripTime;
-        }
-
         private string FormatOut(object time, string unit)
         {
             //if (time.ToString().Equals("-1"))

v2rayN/v2rayN/Handler/StatisticsHandler.cs

@@ -1,7 +1,4 @@
-using System.Net;
-using System.Net.Sockets;
-using v2rayN.Base;
-using v2rayN.Mode;
+using v2rayN.Model;
 
 namespace v2rayN.Handler
 {
@@ -29,7 +26,6 @@ namespace v2rayN.Handler
             _updateFunc = update;
 
             Init();
-            Global.statePort = GetFreePort();
 
             _statisticsV2Ray = new StatisticsV2ray(config, UpdateServerStat);
             _statisticsSingbox = new StatisticsSingbox(config, UpdateServerStat);
@@ -44,13 +40,13 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
         }
 
         public void ClearAllServerStatistics()
         {
-            SqliteHelper.Instance.Execute($"delete from ServerStatItem ");
+            SQLiteHelper.Instance.Execute($"delete from ServerStatItem ");
             _serverStatItem = null;
             _lstServerStat = new();
         }
@@ -59,28 +55,32 @@ namespace v2rayN.Handler
         {
             try
             {
-                SqliteHelper.Instance.UpdateAll(_lstServerStat);
+                SQLiteHelper.Instance.UpdateAll(_lstServerStat);
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
         }
 
         private void Init()
         {
-            SqliteHelper.Instance.Execute($"delete from ServerStatItem where indexId not in ( select indexId from ProfileItem )");
+            SQLiteHelper.Instance.Execute($"delete from ServerStatItem where indexId not in ( select indexId from ProfileItem )");
 
             long ticks = DateTime.Now.Date.Ticks;
-            SqliteHelper.Instance.Execute($"update ServerStatItem set todayUp = 0,todayDown=0,dateNow={ticks} where dateNow<>{ticks}");
+            SQLiteHelper.Instance.Execute($"update ServerStatItem set todayUp = 0,todayDown=0,dateNow={ticks} where dateNow<>{ticks}");
 
-            _lstServerStat = SqliteHelper.Instance.Table<ServerStatItem>().ToList();
+            _lstServerStat = SQLiteHelper.Instance.Table<ServerStatItem>().ToList();
         }
 
         private void UpdateServerStat(ServerSpeedItem server)
         {
             GetServerStatItem(_config.indexId);
 
+            if (_serverStatItem is null)
+            {
+                return;
+            }
             if (server.proxyUp != 0 || server.proxyDown != 0)
             {
                 _serverStatItem.todayUp += server.proxyUp;
@@ -88,15 +88,13 @@ namespace v2rayN.Handler
                 _serverStatItem.totalUp += server.proxyUp;
                 _serverStatItem.totalDown += server.proxyDown;
             }
-            if (Global.ShowInTaskbar)
-            {
-                server.indexId = _config.indexId;
-                server.todayUp = _serverStatItem.todayUp;
-                server.todayDown = _serverStatItem.todayDown;
-                server.totalUp = _serverStatItem.totalUp;
-                server.totalDown = _serverStatItem.totalDown;
-                _updateFunc(server);
-            }
+
+            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)
@@ -121,7 +119,7 @@ namespace v2rayN.Handler
                         todayDown = 0,
                         dateNow = ticks
                     };
-                    SqliteHelper.Instance.Replace(_serverStatItem);
+                    SQLiteHelper.Instance.Replace(_serverStatItem);
                     _lstServerStat.Add(_serverStatItem);
                 }
             }
@@ -133,29 +131,5 @@ namespace v2rayN.Handler
                 _serverStatItem.dateNow = ticks;
             }
         }
-
-        private int GetFreePort()
-        {
-            try
-            {
-                int defaultPort = 9090;
-                if (!Utils.PortInUse(defaultPort))
-                {
-                    return defaultPort;
-                }
-                for (int i = 0; i < 3; i++)
-                {
-                    TcpListener l = new(IPAddress.Loopback, 0);
-                    l.Start();
-                    int port = ((IPEndPoint)l.LocalEndpoint).Port;
-                    l.Stop();
-                    return port;
-                }
-            }
-            catch
-            {
-            }
-            return 69090;
-        }
     }
 }

v2rayN/v2rayN/Handler/StatisticsSingbox.cs

@@ -1,6 +1,6 @@
 using System.Net.WebSockets;
 using System.Text;
-using v2rayN.Mode;
+using v2rayN.Model;
 
 namespace v2rayN.Handler
 {
@@ -27,7 +27,7 @@ namespace v2rayN.Handler
 
             try
             {
-                url = $"ws://{Global.Loopback}:{Global.statePort}/traffic";
+                url = $"ws://{Global.Loopback}:{LazyConfig.Instance.StatePort}/traffic";
 
                 if (webSocket == null)
                 {
@@ -51,7 +51,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
         }
 
@@ -63,6 +63,10 @@ namespace v2rayN.Handler
             {
                 try
                 {
+                    if (!(_config.runningCoreType is ECoreType.sing_box or ECoreType.clash or ECoreType.clash_meta or ECoreType.mihomo))
+                    {
+                        continue;
+                    }
                     if (webSocket != null)
                     {
                         if (webSocket.State == WebSocketState.Aborted
@@ -84,7 +88,7 @@ namespace v2rayN.Handler
                         while (!res.CloseStatus.HasValue)
                         {
                             var result = Encoding.UTF8.GetString(buffer, 0, res.Count);
-                            if (!string.IsNullOrEmpty(result))
+                            if (!Utils.IsNullOrEmpty(result))
                             {
                                 ParseOutput(result, out ulong up, out ulong down);
 
@@ -113,7 +117,7 @@ namespace v2rayN.Handler
             up = 0; down = 0;
             try
             {
-                var trafficItem = Utils.FromJson<TrafficItem>(source);
+                var trafficItem = JsonUtils.Deserialize<TrafficItem>(source);
                 if (trafficItem != null)
                 {
                     up = trafficItem.up;

v2rayN/v2rayN/Handler/StatisticsV2ray.cs

@@ -1,19 +1,19 @@
 using Grpc.Core;
 using Grpc.Net.Client;
 using ProtosLib.Statistics;
-using v2rayN.Mode;
+using v2rayN.Model;
 
 namespace v2rayN.Handler
 {
     internal class StatisticsV2ray
     {
-        private Mode.Config _config;
-        private GrpcChannel _channel;
-        private StatsService.StatsServiceClient _client;
+        private Model.Config _config;
+        private GrpcChannel? _channel;
+        private StatsService.StatsServiceClient? _client;
         private bool _exitFlag;
         private Action<ServerSpeedItem> _updateFunc;
 
-        public StatisticsV2ray(Mode.Config config, Action<ServerSpeedItem> update)
+        public StatisticsV2ray(Model.Config config, Action<ServerSpeedItem> update)
         {
             _config = config;
             _updateFunc = update;
@@ -26,10 +26,17 @@ namespace v2rayN.Handler
 
         private void GrpcInit()
         {
-            if (_channel == null)
+            if (_channel is null)
             {
-                _channel = GrpcChannel.ForAddress($"{Global.httpProtocol}{Global.Loopback}:{Global.statePort}");
-                _client = new StatsService.StatsServiceClient(_channel);
+                try
+                {
+                    _channel = GrpcChannel.ForAddress($"{Global.HttpProtocol}{Global.Loopback}:{LazyConfig.Instance.StatePort}");
+                    _client = new StatsService.StatsServiceClient(_channel);
+                }
+                catch (Exception ex)
+                {
+                    Logging.SaveLog(ex.Message, ex);
+                }
             }
         }
 
@@ -44,7 +51,11 @@ namespace v2rayN.Handler
             {
                 try
                 {
-                    if (_channel.State == ConnectivityState.Ready)
+                    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
@@ -62,7 +73,7 @@ namespace v2rayN.Handler
                         }
                     }
                     await Task.Delay(1000);
-                    await _channel.ConnectAsync();
+                    if (_channel != null) await _channel.ConnectAsync();
                 }
                 catch
                 {
@@ -87,7 +98,7 @@ namespace v2rayN.Handler
                     name = nStr[1];
                     type = nStr[3];
 
-                    if (name == Global.agentTag)
+                    if (name == Global.ProxyTag)
                     {
                         if (type == "uplink")
                         {
@@ -98,7 +109,7 @@ namespace v2rayN.Handler
                             server.proxyDown = value;
                         }
                     }
-                    else if (name == Global.directTag)
+                    else if (name == Global.DirectTag)
                     {
                         if (type == "uplink")
                         {

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

v2rayN/v2rayN/Handler/UpdateHandle.cs

@@ -6,10 +6,8 @@ using System.Runtime.InteropServices;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Windows;
-using v2rayN.Base;
-using v2rayN.Mode;
+using v2rayN.Model;
 using v2rayN.Resx;
-using v2rayN.Tool;
 
 namespace v2rayN.Handler
 {
@@ -24,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;
             }
         }
 
@@ -54,7 +54,7 @@ namespace v2rayN.Handler
                             StartInfo = new ProcessStartInfo
                             {
                                 FileName = "v2rayUpgrade.exe",
-                                Arguments = $"\"{fileName}\"",
+                                Arguments = fileName.AppendQuotes(),
                                 WorkingDirectory = Utils.StartupPath()
                             }
                         };
@@ -83,9 +83,13 @@ namespace v2rayN.Handler
                 if (args.Success)
                 {
                     _updateFunc(false, string.Format(ResUI.MsgParsingSuccessfully, "v2rayN"));
+                    _updateFunc(false, args.Msg);
 
-                    url = args.Msg;
-                    _ = askToDownload(downloadHandle, url, true);
+                    url = args.Url;
+                    AskToDownload(downloadHandle, url, true).ContinueWith(task =>
+                    {
+                        _updateFunc(false, url);
+                    });
                 }
                 else
                 {
@@ -135,8 +139,13 @@ namespace v2rayN.Handler
                 if (args.Success)
                 {
                     _updateFunc(false, string.Format(ResUI.MsgParsingSuccessfully, "Core"));
-                    url = args.Msg;
-                    _ = askToDownload(downloadHandle, url, true);
+                    _updateFunc(false, args.Msg);
+
+                    url = args.Url;
+                    AskToDownload(downloadHandle, url, true).ContinueWith(task =>
+                    {
+                        _updateFunc(false, url);
+                    });
                 }
                 else
                 {
@@ -175,7 +184,7 @@ namespace v2rayN.Handler
                         //_updateFunc(false, $"{hashCode}{ResUI.MsgNoValidSubscription}");
                         continue;
                     }
-                    if (!url.StartsWith(Global.httpsProtocol) && !url.StartsWith(Global.httpProtocol))
+                    if (!url.StartsWith(Global.HttpsProtocol) && !url.StartsWith(Global.HttpProtocol))
                     {
                         continue;
                     }
@@ -198,7 +207,7 @@ namespace v2rayN.Handler
                     //convert
                     if (!Utils.IsNullOrEmpty(item.convertTarget))
                     {
-                        var subConvertUrl = string.IsNullOrEmpty(config.constItem.subConvertUrl) ? Global.SubConvertUrls.FirstOrDefault() : config.constItem.subConvertUrl;
+                        var subConvertUrl = Utils.IsNullOrEmpty(config.constItem.subConvertUrl) ? Global.SubConvertUrls.FirstOrDefault() : config.constItem.subConvertUrl;
                         url = string.Format(subConvertUrl!, Utils.UrlEncode(url));
                         if (!url.Contains("target="))
                         {
@@ -218,7 +227,7 @@ namespace v2rayN.Handler
                     //more url
                     if (Utils.IsNullOrEmpty(item.convertTarget) && !Utils.IsNullOrEmpty(item.moreUrl.TrimEx()))
                     {
-                        if (!Utils.IsNullOrEmpty(result) && Utils.IsBase64String(result))
+                        if (!Utils.IsNullOrEmpty(result) && Utils.IsBase64String(result!))
                         {
                             result = Utils.Base64Decode(result);
                         }
@@ -242,7 +251,7 @@ namespace v2rayN.Handler
                             }
                             if (!Utils.IsNullOrEmpty(result2))
                             {
-                                if (Utils.IsBase64String(result2))
+                                if (Utils.IsBase64String(result2!))
                                 {
                                     result += Utils.Base64Decode(result2);
                                 }
@@ -261,16 +270,16 @@ 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)
                         {
-                            Utils.SaveLog("FailedImportSubscription");
-                            Utils.SaveLog(result);
+                            Logging.SaveLog("FailedImportSubscription");
+                            Logging.SaveLog(result);
                         }
                         _updateFunc(false,
                             ret > 0
@@ -291,8 +300,8 @@ namespace v2rayN.Handler
                 await UpdateGeoFile("geosite", _config, update);
                 await UpdateGeoFile("geoip", _config, update);
 
-                await UpdateGeoFile4Singbox("geosite", _config, false, update);
-                await UpdateGeoFile4Singbox("geoip", _config, true, update);
+                //await UpdateGeoFile4Singbox("geosite", _config, false, update);
+                //await UpdateGeoFile4Singbox("geoip", _config, true, update);
             });
         }
 
@@ -322,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);
             }
         }
@@ -345,7 +354,7 @@ namespace v2rayN.Handler
                 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;
@@ -361,7 +370,7 @@ namespace v2rayN.Handler
                 }
 
                 using Process p = new();
-                p.StartInfo.FileName = filePath;
+                p.StartInfo.FileName = filePath.AppendQuotes();
                 p.StartInfo.Arguments = coreInfo.versionArg;
                 p.StartInfo.WorkingDirectory = Utils.StartupPath();
                 p.StartInfo.UseShellExecute = false;
@@ -383,6 +392,7 @@ namespace v2rayN.Handler
 
                     case ECoreType.clash:
                     case ECoreType.clash_meta:
+                    case ECoreType.mihomo:
                         version = Regex.Match(echo, $"v[0-9.]+").Groups[0].Value;
                         break;
 
@@ -394,7 +404,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
                 _updateFunc(false, ex.Message);
                 return new SemanticVersion("");
             }
@@ -404,16 +414,11 @@ namespace v2rayN.Handler
         {
             try
             {
-                var gitHubReleases = Utils.FromJson<List<GitHubRelease>>(gitHubReleaseApi);
-                SemanticVersion version;
-                if (preRelease)
-                {
-                    version = new SemanticVersion(gitHubReleases!.First().TagName);
-                }
-                else
-                {
-                    version = new SemanticVersion(gitHubReleases!.First(r => r.Prerelease == false).TagName);
-                }
+                var gitHubReleases = JsonUtils.Deserialize<List<GitHubRelease>>(gitHubReleaseApi);
+                var gitHubRelease = preRelease ? gitHubReleases?.First() : gitHubReleases?.First(r => r.Prerelease == false);
+                var version = new SemanticVersion(gitHubRelease?.TagName!);
+                var body = gitHubRelease?.Body;
+
                 var coreInfo = LazyConfig.Instance.GetCoreInfo(type);
 
                 SemanticVersion curVersion;
@@ -449,6 +454,7 @@ namespace v2rayN.Handler
                         }
                     case ECoreType.clash:
                     case ECoreType.clash_meta:
+                    case ECoreType.mihomo:
                         {
                             curVersion = getCoreVersion(type);
                             message = string.Format(ResUI.IsLatestCore, type, curVersion);
@@ -520,16 +526,16 @@ namespace v2rayN.Handler
                     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 async Task askToDownload(DownloadHandle downloadHandle, string url, bool blAsk)
+        private async Task AskToDownload(DownloadHandle downloadHandle, string url, bool blAsk)
         {
             bool blDownload = false;
             if (blAsk)
@@ -553,7 +559,7 @@ namespace v2rayN.Handler
         {
             _config = config;
             _updateFunc = update;
-            var url = string.Format(Global.geoUrl, geoName);
+            var url = string.Format(Global.GeoUrl, geoName);
 
             DownloadHandle downloadHandle = new();
             downloadHandle.UpdateCompleted += (sender2, args) =>
@@ -569,7 +575,7 @@ namespace v2rayN.Handler
                         {
                             //Global.coreTypes.ForEach(it =>
                             //{
-                            //    string targetPath = Utils.GetBinPath($"{geoName}.dat", (ECoreType)Enum.Parse(typeof(ECoreType), it));
+                            //    string targetPath = Utile.GetBinPath($"{geoName}.dat", (ECoreType)Enum.Parse(typeof(ECoreType), it));
                             //    File.Copy(fileName, targetPath, true);
                             //});
                             string targetPath = Utils.GetBinPath($"{geoName}.dat");
@@ -593,52 +599,7 @@ namespace v2rayN.Handler
             {
                 _updateFunc(false, args.GetException().Message);
             };
-            await askToDownload(downloadHandle, url, false);
-        }
-
-        private async Task UpdateGeoFile4Singbox(string geoName, Config config, bool needStop, Action<bool, string> update)
-        {
-            _config = config;
-            _updateFunc = update;
-            var url = string.Format(Global.singboxGeoUrl, geoName);
-
-            DownloadHandle downloadHandle = new();
-            downloadHandle.UpdateCompleted += (sender2, args) =>
-            {
-                if (args.Success)
-                {
-                    _updateFunc(false, string.Format(ResUI.MsgDownloadGeoFileSuccessfully, geoName));
-                    var coreHandler = Locator.Current.GetService<CoreHandler>();
-
-                    try
-                    {
-                        if (needStop) coreHandler?.CoreStop();
-                        Task.Delay(1000);
-                        string fileName = Utils.GetTempPath(Utils.GetDownloadFileName(url));
-                        if (File.Exists(fileName))
-                        {
-                            string targetPath = Utils.GetConfigPath($"{geoName}.db");
-                            File.Copy(fileName, targetPath, true);
-
-                            File.Delete(fileName);
-                        }
-                        if (needStop) coreHandler?.LoadCore();
-                    }
-                    catch (Exception ex)
-                    {
-                        _updateFunc(false, ex.Message);
-                    }
-                }
-                else
-                {
-                    _updateFunc(false, args.Msg);
-                }
-            };
-            downloadHandle.Error += (sender2, args) =>
-            {
-                _updateFunc(false, args.GetException().Message);
-            };
-            await askToDownload(downloadHandle, url, false);
+            await AskToDownload(downloadHandle, url, false);
         }
 
         #endregion private

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

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

v2rayN/v2rayN/Model/ComboItem.cs

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

v2rayN/v2rayN/Model/Config.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Mode
+namespace v2rayN.Model
 {
     /// <summary>
     /// 本软件配置文件实体类
@@ -14,6 +14,8 @@
         public string systemProxyExceptions { get; set; }
         public string systemProxyAdvancedProtocol { get; set; }
 
+        public ECoreType runningCoreType { get; set; }
+
         #endregion property
 
         #region other entities
@@ -27,7 +29,8 @@
         public UIItem uiItem { get; set; }
         public ConstItem constItem { get; set; }
         public SpeedTestItem speedTestItem { get; set; }
-        public Mux4Sbox mux4Sbox { get; set; }
+        public Mux4SboxItem mux4SboxItem { get; set; }
+        public HysteriaItem hysteriaItem { get; set; }
         public List<InItem> inbound { get; set; }
         public List<KeyEventItem> globalHotkeys { get; set; }
         public List<CoreTypeItem> coreTypeItem { get; set; }

v2rayN/v2rayN/Model/ConfigItems.cs

@@ -1,6 +1,6 @@
 using System.Windows.Input;
 
-namespace v2rayN.Mode
+namespace v2rayN.Model
 {
     [Serializable]
     public class CoreBasicItem
@@ -109,6 +109,7 @@ namespace v2rayN.Mode
     public class UIItem
     {
         public bool enableAutoAdjustMainLvColWidth { get; set; }
+        public bool enableUpdateSubOnlyRemarksExist { get; set; }
         public double mainWidth { get; set; }
         public double mainHeight { get; set; }
         public double mainGirdHeight1 { get; set; }
@@ -123,7 +124,6 @@ namespace v2rayN.Mode
         public bool doubleClick2Activate { get; set; }
         public bool autoHideStartup { get; set; } = true;
         public string mainMsgFilter { get; set; }
-        public bool showTrayTip { get; set; }
         public List<ColumnItem> mainColumnItem { get; set; }
     }
 
@@ -164,6 +164,7 @@ namespace v2rayN.Mode
         public string stack { get; set; }
         public int mtu { get; set; }
         public bool enableExInbound { get; set; }
+        public bool enableIPv6Address { get; set; } = true;
     }
 
     [Serializable]
@@ -198,12 +199,16 @@ namespace v2rayN.Mode
     }
 
     [Serializable]
-    public class Mux4Sbox
+    public class Mux4SboxItem
     {
         public string protocol { get; set; }
         public int max_connections { get; set; }
-        public int min_streams { get; set; }
-        public int max_streams { get; set; }
-        public bool padding { get; set; }
+    }
+
+    [Serializable]
+    public class HysteriaItem
+    {
+        public int up_mbps { get; set; }
+        public int down_mbps { get; set; }
     }
 }

v2rayN/v2rayN/Model/ConfigOld.cs

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

v2rayN/v2rayN/Model/CoreInfo.cs

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

v2rayN/v2rayN/Model/DNSItem.cs

@@ -1,6 +1,6 @@
 using SQLite;
 
-namespace v2rayN.Mode
+namespace v2rayN.Model
 {
     [Serializable]
     public class DNSItem
@@ -11,6 +11,7 @@ namespace v2rayN.Mode
         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/Model/EConfigType.cs

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

v2rayN/v2rayN/Model/ECoreType.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Mode
+namespace v2rayN.Model
 {
     public enum ECoreType
     {
@@ -8,6 +8,7 @@
         v2fly_v5 = 4,
         clash = 11,
         clash_meta = 12,
+        mihomo = 13,
         hysteria = 21,
         naiveproxy = 22,
         tuic = 23,
@@ -16,4 +17,4 @@
         hysteria2 = 26,
         v2rayN = 99
     }
-}
+}

v2rayN/v2rayN/Model/EGlobalHotkey.cs

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

v2rayN/v2rayN/Model/EInboundProtocol.cs

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

v2rayN/v2rayN/Model/EMove.cs

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

v2rayN/v2rayN/Model/EServerColName.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Mode
+namespace v2rayN.Model
 {
     public enum EServerColName
     {
@@ -7,7 +7,6 @@
         remarks,
         address,
         port,
-        security,
         network,
         streamSecurity,
         subRemarks,

v2rayN/v2rayN/Model/ESpeedActionType.cs

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

v2rayN/v2rayN/Model/ESysProxyType.cs

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

v2rayN/v2rayN/Model/ETransport.cs

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

v2rayN/v2rayN/Model/EViewAction.cs

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

v2rayN/v2rayN/Model/GitHubRelease.cs

@@ -0,0 +1,68 @@
+using System.Text.Json.Serialization;
+
+namespace v2rayN.Model
+{
+    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/Model/ProfileExItem.cs

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

v2rayN/v2rayN/Model/ProfileItem.cs

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

v2rayN/v2rayN/Model/ProfileItemModel.cs

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

v2rayN/v2rayN/Model/RoutingItem.cs

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

v2rayN/v2rayN/Model/RoutingItemModel.cs

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

v2rayN/v2rayN/Model/RulesItem.cs

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

v2rayN/v2rayN/Model/RulesItemModel.cs

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

v2rayN/v2rayN/Model/ServerSpeedItem.cs

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

v2rayN/v2rayN/Model/ServerStatItem.cs

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

v2rayN/v2rayN/Model/ServerTestItem.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Mode
+namespace v2rayN.Model
 {
     [Serializable]
     internal class ServerTestItem

v2rayN/v2rayN/Model/SingboxConfig.cs

@@ -1,9 +1,9 @@
-namespace v2rayN.Mode
+namespace v2rayN.Model
 {
     public class SingboxConfig
     {
         public Log4Sbox log { get; set; }
-        public object dns { get; set; }
+        public Dns4Sbox? dns { get; set; }
         public List<Inbound4Sbox> inbounds { get; set; }
         public List<Outbound4Sbox> outbounds { get; set; }
         public Route4Sbox route { get; set; }
@@ -15,7 +15,7 @@
         public bool? disabled { get; set; }
         public string level { get; set; }
         public string output { get; set; }
-        public bool timestamp { get; set; }
+        public bool? timestamp { get; set; }
     }
 
     public class Dns4Sbox
@@ -72,7 +72,7 @@
         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 string? inet6_address { get; set; }
         public int? mtu { get; set; }
         public bool? auto_route { get; set; }
         public bool? strict_route { get; set; }
@@ -105,16 +105,25 @@
         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? 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 Tls4Sbox tls { get; set; }
-        public Multiplex4Sbox multiplex { get; set; }
-        public Transport4Sbox transport { 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
@@ -132,9 +141,6 @@
         public bool enabled { get; set; }
         public string protocol { get; set; }
         public int max_connections { get; set; }
-        public int min_streams { get; set; }
-        public int max_streams { get; set; }
-        public bool padding { get; set; }
     }
 
     public class Utls4Sbox
@@ -152,14 +158,14 @@
 
     public class Transport4Sbox
     {
-        public string type { get; set; }
-        public List<string>? host { get; set; }
+        public string? type { get; set; }
+        public object? host { get; set; }
         public string? path { get; set; }
         public Headers4Sbox? headers { get; set; }
 
-        public string service_name { get; set; }
-        public string idle_timeout { get; set; }
-        public string ping_timeout { get; set; }
+        public string? service_name { get; set; }
+        public string? idle_timeout { get; set; }
+        public string? ping_timeout { get; set; }
         public bool? permit_without_stream { get; set; }
     }
 
@@ -168,19 +174,26 @@
         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 string? detour { get; set; }
     }
 
     public class Experimental4Sbox
     {
-        public V2ray_Api4Sbox v2ray_api { get; set; }
-        public Clash_Api4Sbox clash_api { get; set; }
+        public CacheFile4Sbox? cache_file { get; set; }
+        public V2ray_Api4Sbox? v2ray_api { get; set; }
+        public Clash_Api4Sbox? clash_api { get; set; }
     }
 
     public class V2ray_Api4Sbox
@@ -191,8 +204,8 @@
 
     public class Clash_Api4Sbox
     {
-        public string external_controller { get; set; }
-        public bool store_selected { get; set; }
+        public string? external_controller { get; set; }
+        public bool? store_selected { get; set; }
     }
 
     public class Stats4Sbox
@@ -209,4 +222,12 @@
         public string inet4_range { get; set; }
         public string inet6_range { get; set; }
     }
+
+    public class CacheFile4Sbox
+    {
+        public bool enabled { get; set; }
+        public string? path { get; set; }
+        public string? cache_id { get; set; }
+        public bool? store_fakeip { get; set; }
+    }
 }

v2rayN/v2rayN/Model/SsSIP008.cs

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

v2rayN/v2rayN/Model/SubItem.cs

@@ -1,6 +1,6 @@
 using SQLite;
 
-namespace v2rayN.Mode
+namespace v2rayN.Model
 {
     [Serializable]
     public class SubItem
@@ -27,5 +27,9 @@ namespace v2rayN.Mode
         public long updateTime { get; set; }
 
         public string? convertTarget { get; set; }
+
+        public string? prevProfile { get; set; }
+
+        public string? nextProfile { get; set; }
     }
 }

v2rayN/v2rayN/Model/SysProxyConfig.cs

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

v2rayN/v2rayN/Model/V2rayConfig.cs

@@ -1,13 +1,17 @@
-using Newtonsoft.Json;
+using System.Text.Json.Serialization;
 
-namespace v2rayN.Mode
+namespace v2rayN.Model
 {
     /// <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>
@@ -32,7 +36,7 @@ namespace v2rayN.Mode
         public API4Ray api { get; set; }
 
         /// </summary>
-        public Policy4Ray policy;
+        public Policy4Ray policy { get; set; }
 
         /// <summary>
         /// DNS 配置
@@ -56,13 +60,13 @@ namespace v2rayN.Mode
 
     public class Policy4Ray
     {
-        public SystemPolicy4Ray system;
+        public SystemPolicy4Ray system { get; set; }
     }
 
     public class SystemPolicy4Ray
     {
-        public bool statsOutboundUplink;
-        public bool statsOutboundDownlink;
+        public bool statsOutboundUplink { get; set; }
+        public bool statsOutboundDownlink { get; set; }
     }
 
     public class Log4Ray
@@ -432,6 +436,11 @@ namespace v2rayN.Mode
         /// </summary>
         public WsSettings4Ray wsSettings { get; set; }
 
+        /// <summary>
+        ///
+        /// </summary>
+        public HttpupgradeSettings4Ray? httpupgradeSettings { get; set; }
+
         /// <summary>
         /// h2传输额外设置
         /// </summary>
@@ -451,6 +460,11 @@ namespace v2rayN.Mode
         /// grpc
         /// </summary>
         public GrpcSettings4Ray grpcSettings { get; set; }
+
+        /// <summary>
+        /// sockopt
+        /// </summary>
+        public Sockopt4Ray? sockopt { get; set; }
     }
 
     public class TlsSettings4Ray
@@ -575,10 +589,23 @@ namespace v2rayN.Mode
         /// <summary>
         /// 用户代理
         /// </summary>
-        [JsonProperty("User-Agent")]
+        [JsonPropertyName("User-Agent")]
         public string UserAgent { get; set; }
     }
 
+    public class HttpupgradeSettings4Ray
+    {
+        /// <summary>
+        ///
+        /// </summary>
+        public string? path { get; set; }
+
+        /// <summary>
+        ///
+        /// </summary>
+        public string? host { get; set; }
+    }
+
     public class HttpSettings4Ray
     {
         /// <summary>
@@ -612,7 +639,8 @@ namespace v2rayN.Mode
 
     public class GrpcSettings4Ray
     {
-        public string serviceName { get; set; }
+        public string? authority { get; set; }
+        public string? serviceName { get; set; }
         public bool multiMode { get; set; }
         public int idle_timeout { get; set; }
         public int health_check_timeout { get; set; }
@@ -632,4 +660,9 @@ namespace v2rayN.Mode
         /// </summary>
         public string pass { get; set; }
     }
+
+    public class Sockopt4Ray
+    {
+        public string? dialerProxy { get; set; }
+    }
 }

v2rayN/v2rayN/Model/V2rayTcpRequest.cs

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

v2rayN/v2rayN/Model/VmessQRCode.cs

@@ -0,0 +1,44 @@
+using System.Text.Json.Serialization;
+
+namespace v2rayN.Model
+{
+    /// <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

@@ -529,9 +529,6 @@
   <data name="menuClearServerStatistics" xml:space="preserve">
     <value>تمام آمار خدمات را پاک کنید</value>
   </data>
-  <data name="menuPingServer" xml:space="preserve">
-    <value>تست پینگ سرورها (Ctrl+P)</value>
-  </data>
   <data name="menuRealPingServer" xml:space="preserve">
     <value>آزمایش سرورها با تاخیر واقعی (Ctrl+R)</value>
   </data>

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,13 +175,13 @@
     <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>
@@ -250,7 +250,7 @@
     <value>Invalid subscription content</value>
   </data>
   <data name="MsgUnpacking" xml:space="preserve">
-    <value>is unpacking...</value>
+    <value>Is unpacking......</value>
   </data>
   <data name="MsgUpdateSubscriptionEnd" xml:space="preserve">
     <value>Update subscription end</value>
@@ -268,7 +268,7 @@
     <value>Non-VMess or ss protocol</value>
   </data>
   <data name="NonVmessService" xml:space="preserve">
-    <value> non-standard service, this feature is invalid</value>
+    <value>Non-standard service, this feature is invalid</value>
   </data>
   <data name="NotFoundCore" xml:space="preserve">
     <value>The Core file (file name: {1}) was not found under the folder ({0}), please download and put it in the folder, download address: {2}</value>
@@ -277,7 +277,7 @@
     <value>Scan completed, no valid QR code found</value>
   </data>
   <data name="OperationFailed" xml:space="preserve">
-    <value> operation failed, please check and retry</value>
+    <value>Operation failed, please check and retry</value>
   </data>
   <data name="PleaseFillRemarks" xml:space="preserve">
     <value>Please Fill Remarks</value>
@@ -308,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>
@@ -335,13 +335,13 @@
     <value>Remarks</value>
   </data>
   <data name="LvUrl" xml:space="preserve">
-    <value>Url(Optional)</value>
+    <value>URL(Optional)</value>
   </data>
   <data name="LvCount" xml:space="preserve">
     <value>Count</value>
   </data>
   <data name="MsgNeedUrl" xml:space="preserve">
-    <value>Please fill in the Url</value>
+    <value>Please fill in the URL</value>
   </data>
   <data name="AddBatchRoutingRulesYesNo" xml:space="preserve">
     <value>Do you want to append rules? Choose yes to append, choose otherwise to replace</value>
@@ -359,13 +359,13 @@
     <value>Please fill in the correct custom DNS</value>
   </data>
   <data name="TransportPathTip1" xml:space="preserve">
-    <value>*ws path</value>
+    <value>*ws/httpupgrade path</value>
   </data>
   <data name="TransportPathTip2" xml:space="preserve">
     <value>*h2 path</value>
   </data>
   <data name="TransportPathTip3" xml:space="preserve">
-    <value>*QUIC key/Kcp seed</value>
+    <value>*QUIC key/KCP seed</value>
   </data>
   <data name="TransportPathTip4" xml:space="preserve">
     <value>*grpc serviceName</value>
@@ -374,7 +374,7 @@
     <value>*http host Separated by commas (,)</value>
   </data>
   <data name="TransportRequestHostTip2" xml:space="preserve">
-    <value>*ws host</value>
+    <value>*ws/httpupgrade host</value>
   </data>
   <data name="TransportRequestHostTip3" xml:space="preserve">
     <value>*h2 host Separated by commas (,)</value>
@@ -398,7 +398,7 @@
     <value>TLS</value>
   </data>
   <data name="TransportPathTip5" xml:space="preserve">
-    <value>*Kcp seed</value>
+    <value>*kcp seed</value>
   </data>
   <data name="RegisterGlobalHotkeyFailed" xml:space="preserve">
     <value>Global hotkey {0} registered failed, reason {1}</value>
@@ -443,13 +443,13 @@
     <value>Exit</value>
   </data>
   <data name="menuGlobalHotkeySetting" xml:space="preserve">
-    <value>GlobalHotkeySetting</value>
+    <value>Global Hotkey Setting</value>
   </data>
   <data name="menuHelp" xml:space="preserve">
     <value>Help</value>
   </data>
   <data name="menuOptionSetting" xml:space="preserve">
-    <value>OptionSetting</value>
+    <value>Option Setting</value>
   </data>
   <data name="menuPromotion" xml:space="preserve">
     <value>Promotion</value>
@@ -458,7 +458,7 @@
     <value>Reload</value>
   </data>
   <data name="menuRoutingSetting" xml:space="preserve">
-    <value>RoutingSetting</value>
+    <value>Routing Setting</value>
   </data>
   <data name="menuServers" xml:space="preserve">
     <value>Servers</value>
@@ -476,7 +476,7 @@
     <value>Subscription group</value>
   </data>
   <data name="menuSubSetting" xml:space="preserve">
-    <value>Subscription group Settings</value>
+    <value>Subscription group settings</value>
   </data>
   <data name="menuSubUpdate" xml:space="preserve">
     <value>Update subscription without proxy</value>
@@ -494,7 +494,7 @@
     <value>Do not change system proxy</value>
   </data>
   <data name="menuSystemProxyPac" xml:space="preserve">
-    <value>Pac Mode</value>
+    <value>PAC mode</value>
   </data>
   <data name="menuSystemProxySet" xml:space="preserve">
     <value>Set system proxy</value>
@@ -509,7 +509,7 @@
     <value>Follow System Theme</value>
   </data>
   <data name="TbSettingsLanguage" xml:space="preserve">
-    <value>Language(Restart)</value>
+    <value>Language (Restart)</value>
   </data>
   <data name="menuAddServerViaClipboard" xml:space="preserve">
     <value>Import bulk URL from clipboard (Ctrl+V)</value>
@@ -532,9 +532,6 @@
   <data name="menuClearServerStatistics" xml:space="preserve">
     <value>Clear all service statistics</value>
   </data>
-  <data name="menuPingServer" xml:space="preserve">
-    <value>Test servers ping (Ctrl+P)</value>
-  </data>
   <data name="menuRealPingServer" xml:space="preserve">
     <value>Test servers real delay (Ctrl+R)</value>
   </data>
@@ -578,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>
@@ -632,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>
@@ -755,7 +752,7 @@
     <value>Exception. Do not use proxy server for addresses beginning with,Use semicolon (;)</value>
   </data>
   <data name="TbSettingsHttpPort" xml:space="preserve">
-    <value>Http Port</value>
+    <value>HTTP Port</value>
   </data>
   <data name="TbSettingsIgnoreGeoUpdateCore" xml:space="preserve">
     <value>Ignore Geo files when updating core</value>
@@ -788,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>
@@ -797,7 +794,7 @@
     <value>Enable Statistics (Require restart)</value>
   </data>
   <data name="TbSettingsSubConvert" xml:space="preserve">
-    <value>Subscription conversion Url</value>
+    <value>Subscription conversion URL</value>
   </data>
   <data name="TbSettingsSystemproxy" xml:space="preserve">
     <value>System proxy settings</value>
@@ -821,10 +818,10 @@
     <value>Display GUI</value>
   </data>
   <data name="TbGlobalHotkeySetting" xml:space="preserve">
-    <value>GlobalHotkey Settings</value>
+    <value>Global Hotkey Settings</value>
   </data>
   <data name="TbGlobalHotkeySettingTip" xml:space="preserve">
-    <value>Set directly by pressing the keyboard, Take effect after restart</value>
+    <value>Set directly by pressing the keyboard, take effect after restart</value>
   </data>
   <data name="TbNotChangeSystemProxy" xml:space="preserve">
     <value>Do not change system proxy</value>
@@ -836,7 +833,7 @@
     <value>Set system proxy</value>
   </data>
   <data name="TbSystemProxyPac" xml:space="preserve">
-    <value>Pac Mode</value>
+    <value>PAC mode</value>
   </data>
   <data name="menuShareServer" xml:space="preserve">
     <value>Share Server (Ctrl+F)</value>
@@ -845,10 +842,10 @@
     <value>Routing</value>
   </data>
   <data name="NotRunAsAdmin" xml:space="preserve">
-    <value>Not Run As Admin</value>
+    <value>Not run as Admin</value>
   </data>
   <data name="RunAsAdmin" xml:space="preserve">
-    <value>Run As Admin</value>
+    <value>Run as Admin</value>
   </data>
   <data name="menuMoveBottom" xml:space="preserve">
     <value>Move to bottom (B)</value>
@@ -920,13 +917,13 @@
     <value>Import Rules From File</value>
   </data>
   <data name="menuImportRulesFromUrl" xml:space="preserve">
-    <value>Import Rules From Sub Url</value>
+    <value>Import Rules From Subscription URL</value>
   </data>
   <data name="menuRoutingRuleSetting" xml:space="preserve">
     <value>Rule Settings</value>
   </data>
   <data name="menuRuleAdd" xml:space="preserve">
-    <value>Rule Add</value>
+    <value>Add Rule</value>
   </data>
   <data name="menuRuleExportSelected" xml:space="preserve">
     <value>Export Selected Rules</value>
@@ -935,7 +932,7 @@
     <value>Rule List</value>
   </data>
   <data name="menuRuleRemove" xml:space="preserve">
-    <value>Remove Rules (Delete)</value>
+    <value>Remove Rule (Delete)</value>
   </data>
   <data name="menuRoutingRuleDetailsSetting" xml:space="preserve">
     <value>RoutingRuleDetailsSetting</value>
@@ -980,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>
@@ -1040,13 +1037,13 @@
     <value>Copy the font TTF/TTC file to the directory guiFonts, restart the settings</value>
   </data>
   <data name="TbSettingsSocksPortTip" xml:space="preserve">
-    <value>http port=socks port+1</value>
+    <value>HTTP port=SOCKS port+1;Pac port=SOCKS port+4;API port=SOCKS port+5;</value>
   </data>
   <data name="TbSettingsStartBootTip" xml:space="preserve">
     <value>Set this with admin privileges, get admin privileges after startup</value>
   </data>
   <data name="TbSettingsFontSize" xml:space="preserve">
-    <value>FontSize</value>
+    <value>Font Size</value>
   </data>
   <data name="TbSettingsTunModeProxyIP" xml:space="preserve">
     <value>Proxy IP CIDR, separated by commas (,)</value>
@@ -1061,7 +1058,7 @@
     <value>SpeedTest Single Timeout Value</value>
   </data>
   <data name="TbSettingsSpeedTestUrl" xml:space="preserve">
-    <value>SpeedTest Url</value>
+    <value>SpeedTest URL</value>
   </data>
   <data name="TbSettingsTunModeDNS" xml:space="preserve">
     <value>DNS object, e.g. {"servers":[]}</value>
@@ -1082,7 +1079,7 @@
     <value>Enable hardware acceleration(Require restart)</value>
   </data>
   <data name="SpeedtestingWait" xml:space="preserve">
-    <value>Waiting for testing</value>
+    <value>Waiting for testing (press ESC to terminate)...</value>
   </data>
   <data name="TipDisplayLog" xml:space="preserve">
     <value>Please turn off when there is an abnormal disconnection</value>
@@ -1091,13 +1088,13 @@
     <value>Updates are not enabled, skip this subscription</value>
   </data>
   <data name="menuRebootAsAdmin" xml:space="preserve">
-    <value>Reboot as administrator</value>
+    <value>Restart as Administrator</value>
   </data>
   <data name="LvMoreUrl" xml:space="preserve">
     <value>More urls, separated by commas;Subscription conversion will be invalid</value>
   </data>
   <data name="SpeedDisplayText" xml:space="preserve">
-    <value>{0}:{1}/s↑ | {2}/s↓</value>
+    <value>{0} : {1}/s↑ | {2}/s↓</value>
   </data>
   <data name="LvAutoUpdateInterval" xml:space="preserve">
     <value>Automatic update interval(minutes)</value>
@@ -1120,7 +1117,7 @@
   <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">
+  <data name="TbSettingDnsImportDefConfig" xml:space="preserve">
     <value>Click to import default DNS config</value>
   </data>
   <data name="TbdomainStrategy4Singbox" xml:space="preserve">
@@ -1138,4 +1135,67 @@
   <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>
 </root>

v2rayN/v2rayN/Resx/ResUI.ru.resx

@@ -532,9 +532,6 @@
   <data name="menuClearServerStatistics" xml:space="preserve">
     <value>Очистить всю статистику</value>
   </data>
-  <data name="menuPingServer" xml:space="preserve">
-    <value>Тест на задержку сервера (Ctrl+P)</value>
-  </data>
   <data name="menuRealPingServer" xml:space="preserve">
     <value>Тест на реальную задержку сервера (Ctrl+R)</value>
   </data>
@@ -1072,4 +1069,4 @@
   <data name="TbSettingsSpeedTestUrl" xml:space="preserve">
     <value>URL спидтеста</value>
   </data>
-</root>
+</root>

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

@@ -359,7 +359,7 @@
     <value>请填写正确的自定义DNS</value>
   </data>
   <data name="TransportPathTip1" xml:space="preserve">
-    <value>*ws path</value>
+    <value>*ws/httpupgrade path</value>
   </data>
   <data name="TransportPathTip2" xml:space="preserve">
     <value>*h2 path</value>
@@ -374,7 +374,7 @@
     <value>*http host中间逗号(,)分隔</value>
   </data>
   <data name="TransportRequestHostTip2" xml:space="preserve">
-    <value>*ws host</value>
+    <value>*ws/httpupgrade host</value>
   </data>
   <data name="TransportRequestHostTip3" xml:space="preserve">
     <value>*h2 host中间逗号(,)分隔</value>
@@ -532,9 +532,6 @@
   <data name="menuClearServerStatistics" xml:space="preserve">
     <value>清除所有服务统计数据</value>
   </data>
-  <data name="menuPingServer" xml:space="preserve">
-    <value>测试服务器延迟Ping(多选) (Ctrl+P)</value>
-  </data>
   <data name="menuRealPingServer" xml:space="preserve">
     <value>测试服务器真连接延迟(多选) (Ctrl+R)</value>
   </data>
@@ -1040,7 +1037,7 @@
     <value>拷贝字体TTF/TTC文件到目录guiFonts，重启设置</value>
   </data>
   <data name="TbSettingsSocksPortTip" xml:space="preserve">
-    <value>http端口=socks端口+1</value>
+    <value>http端口=socks端口+1；Pac端口=socks端口+4；API端口=socks端口+5；</value>
   </data>
   <data name="TbSettingsStartBootTip" xml:space="preserve">
     <value>以管理员权限设置此项，在启动后获得管理员权限</value>
@@ -1082,7 +1079,7 @@
     <value>启用硬件加速(需重启)</value>
   </data>
   <data name="SpeedtestingWait" xml:space="preserve">
-    <value>等待测试中...</value>
+    <value>等待测试中（按ESC终止）...</value>
   </data>
   <data name="TipDisplayLog" xml:space="preserve">
     <value>当有异常断流时请关闭</value>
@@ -1117,7 +1114,7 @@
   <data name="TbDnsSingboxObjectDoc" xml:space="preserve">
     <value>请填写 DNS JSON 结构，点击查看文档</value>
   </data>
-  <data name="TBSettingDnsImportDefConfig" xml:space="preserve">
+  <data name="TbSettingDnsImportDefConfig" xml:space="preserve">
     <value>点击导入默认DNS配置</value>
   </data>
   <data name="TbdomainStrategy4Singbox" xml:space="preserve">
@@ -1135,4 +1132,67 @@
   <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>
 </root>

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

@@ -130,7 +130,7 @@
     <value>配置格式不正確</value>
   </data>
   <data name="CustomServerTips" xml:space="preserve">
-    <value>注意,自訂配置完全依賴您自己的配置，不能使用所有設定功能。如需使用系統代理請手動修改監聽埠。</value>
+    <value>注意，自訂配置完全依賴您自己的配置，不能使用所有設定功能。如需使用系統代理請手動修改監聽埠。</value>
   </data>
   <data name="Downloading" xml:space="preserve">
     <value>下載開始...</value>
@@ -214,10 +214,10 @@
     <value>今日上傳</value>
   </data>
   <data name="LvTotalDownloadDataAmount" xml:space="preserve">
-    <value>縂下載</value>
+    <value>總下載</value>
   </data>
   <data name="LvTotalUploadDataAmount" xml:space="preserve">
-    <value>縂上傳</value>
+    <value>總上傳</value>
   </data>
   <data name="LvTransportProtocol" xml:space="preserve">
     <value>傳輸協定</value>
@@ -265,7 +265,7 @@
     <value>更新Core成功！正在重啟服務...</value>
   </data>
   <data name="NonvmessOrssProtocol" xml:space="preserve">
-    <value>非VMess或ss協定</value>
+    <value>非VMess或SS協定</value>
   </data>
   <data name="NonVmessService" xml:space="preserve">
     <value>非標準服務，此功能無效</value>
@@ -334,13 +334,13 @@
     <value>別名</value>
   </data>
   <data name="LvUrl" xml:space="preserve">
-    <value>可選位址(Url)</value>
+    <value>可選位址(URL)</value>
   </data>
   <data name="LvCount" xml:space="preserve">
     <value>數量</value>
   </data>
   <data name="MsgNeedUrl" xml:space="preserve">
-    <value>請填寫Url</value>
+    <value>請填寫URL</value>
   </data>
   <data name="AddBatchRoutingRulesYesNo" xml:space="preserve">
     <value>是否追加規則?選擇是則追加,選擇否則取代</value>
@@ -358,7 +358,7 @@
     <value>請填寫正確的自訂DNS</value>
   </data>
   <data name="TransportPathTip1" xml:space="preserve">
-    <value>*ws path</value>
+    <value>*ws/httpupgrade path</value>
   </data>
   <data name="TransportPathTip2" xml:space="preserve">
     <value>*h2 path</value>
@@ -373,7 +373,7 @@
     <value>*http host中間逗號(,)分隔</value>
   </data>
   <data name="TransportRequestHostTip2" xml:space="preserve">
-    <value>*ws host</value>
+    <value>*ws/httpupgrade host</value>
   </data>
   <data name="TransportRequestHostTip3" xml:space="preserve">
     <value>*h2 host中間逗號(,)分隔</value>
@@ -382,22 +382,22 @@
     <value>*QUIC 加密方式</value>
   </data>
   <data name="TransportHeaderTypeTip1" xml:space="preserve">
-    <value>*tcp偽裝類型</value>
+    <value>*TCP偽裝類型</value>
   </data>
   <data name="TransportHeaderTypeTip2" xml:space="preserve">
-    <value>*kcp偽裝類型</value>
+    <value>*KCP偽裝類型</value>
   </data>
   <data name="TransportHeaderTypeTip3" xml:space="preserve">
     <value>*QUIC偽裝類型</value>
   </data>
   <data name="TransportHeaderTypeTip4" xml:space="preserve">
-    <value>*grpc 模式</value>
+    <value>*GRPC 模式</value>
   </data>
   <data name="LvTLS" xml:space="preserve">
     <value>TLS</value>
   </data>
   <data name="TransportPathTip5" xml:space="preserve">
-    <value>*Kcp seed</value>
+    <value>*KCP seed</value>
   </data>
   <data name="RegisterGlobalHotkeyFailed" xml:space="preserve">
     <value>註冊全域快速鍵 {0} 失敗,原因 {1}</value>
@@ -445,7 +445,7 @@
     <value>全域快速鍵設定</value>
   </data>
   <data name="menuHelp" xml:space="preserve">
-    <value>幫助</value>
+    <value>說明</value>
   </data>
   <data name="menuOptionSetting" xml:space="preserve">
     <value>參數設定</value>
@@ -493,7 +493,7 @@
     <value>不改變系統代理</value>
   </data>
   <data name="menuSystemProxyPac" xml:space="preserve">
-    <value>Pac模式</value>
+    <value>PAC模式</value>
   </data>
   <data name="menuSystemProxySet" xml:space="preserve">
     <value>自動配置系統代理</value>
@@ -531,9 +531,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>
@@ -628,13 +625,13 @@
     <value>位址(address)</value>
   </data>
   <data name="TbAllowInsecure" xml:space="preserve">
-    <value>跳過證書驗證(allowInsecure)</value>
+    <value>跳過憑證驗證(allowinsecure)</value>
   </data>
   <data name="TbAlpn" xml:space="preserve">
-    <value>Alpn</value>
+    <value>ALPN</value>
   </data>
   <data name="TbAlterId" xml:space="preserve">
-    <value>額外ID(alterId)</value>
+    <value>額外ID(alterid)</value>
   </data>
   <data name="TbFingerprint" xml:space="preserve">
     <value>Fingerprint</value>
@@ -670,7 +667,7 @@
     <value>傳輸層安全(TLS)</value>
   </data>
   <data name="TipNetwork" xml:space="preserve">
-    <value>*預設tcp,選錯會無法連接</value>
+    <value>*預設TCP,選錯會無法連接</value>
   </data>
   <data name="TbCoreType" xml:space="preserve">
     <value>Core類型</value>
@@ -700,7 +697,7 @@
     <value>加密方式(encryption)</value>
   </data>
   <data name="TbPreSocksPort" xml:space="preserve">
-    <value>Socks埠</value>
+    <value>SOCKS埠</value>
   </data>
   <data name="TipPreSocksPort" xml:space="preserve">
     <value>* 自訂配置的Socks埠值，可不設定；當設定此值後，將使用sing-box額外啟動一個前置Socks服務，提供分流和速度顯示等功能</value>
@@ -737,13 +734,13 @@
     <value>Core類型設定</value>
   </data>
   <data name="TbSettingsDefAllowInsecure" xml:space="preserve">
-    <value>預設跳過證書驗證(allowInsecure)</value>
+    <value>預設跳過憑證驗證(allowinsecure)</value>
   </data>
   <data name="TbSettingsDomainStrategy4Freedom" xml:space="preserve">
     <value>Outbound Freedom domainStrategy</value>
   </data>
   <data name="TbSettingsEnableAutoAdjustMainLvColWidth" xml:space="preserve">
-    <value>自動調整伺服器列寬在更新訂閱後</value>
+    <value>在更新訂閱後自動調整伺服器列寬</value>
   </data>
   <data name="TbSettingsEnableCheckPreReleaseUpdate" xml:space="preserve">
     <value>檢查Pre-Release更新(請謹慎啟用)</value>
@@ -755,10 +752,10 @@
     <value>例外. 對於下列字元開頭的位址不使用代理配置檔案:使用分號(;)分隔</value>
   </data>
   <data name="TbSettingsHttpPort" xml:space="preserve">
-    <value>本機http監聽埠</value>
+    <value>本機HTTP監聽埠</value>
   </data>
   <data name="TbSettingsIgnoreGeoUpdateCore" xml:space="preserve">
-    <value>更新Core時忽略Geo文件</value>
+    <value>更新Core時忽略Geo檔案</value>
   </data>
   <data name="TbSettingsKeepOlderDedupl" xml:space="preserve">
     <value>去重時保留序號較小的項</value>
@@ -788,7 +785,7 @@
     <value>開啟流量探測</value>
   </data>
   <data name="TbSettingsSocksPort" xml:space="preserve">
-    <value>本機socks監聽埠</value>
+    <value>本機SOCKS監聽埠</value>
   </data>
   <data name="TbSettingsStartBoot" xml:space="preserve">
     <value>開機啟動(可能會不成功)</value>
@@ -836,7 +833,7 @@
     <value>自動配置系統代理</value>
   </data>
   <data name="TbSystemProxyPac" xml:space="preserve">
-    <value>Pac模式</value>
+    <value>PAC模式</value>
   </data>
   <data name="menuShareServer" xml:space="preserve">
     <value>分享伺服器 (Ctrl+F)</value>
@@ -851,13 +848,13 @@
     <value>以管理員身份執行</value>
   </data>
   <data name="menuMoveBottom" xml:space="preserve">
-    <value>下移至底 (B)</value>
+    <value>下移至底部 (B)</value>
   </data>
   <data name="menuMoveDown" xml:space="preserve">
     <value>下移 (D)</value>
   </data>
   <data name="menuMoveTop" xml:space="preserve">
-    <value>上移至頂 (T)</value>
+    <value>上移至頂部 (T)</value>
   </data>
   <data name="menuMoveUp" xml:space="preserve">
     <value>上移 (U)</value>
@@ -920,7 +917,7 @@
     <value>從文件中匯入規則</value>
   </data>
   <data name="menuImportRulesFromUrl" xml:space="preserve">
-    <value>從訂閱Url中匯入規則</value>
+    <value>從訂閱URL中匯入規則</value>
   </data>
   <data name="menuRoutingRuleSetting" xml:space="preserve">
     <value>規則集設定</value>
@@ -929,7 +926,7 @@
     <value>新增規則</value>
   </data>
   <data name="menuRuleExportSelected" xml:space="preserve">
-    <value>到處所選規則至剪貼簿</value>
+    <value>匯出所選規則至剪貼簿</value>
   </data>
   <data name="menuRuleList" xml:space="preserve">
     <value>規則列表</value>
@@ -953,10 +950,10 @@
     <value>普通分組此處請留空</value>
   </data>
   <data name="TipChangeRouting" xml:space="preserve">
-    <value>路由設定改變</value>
+    <value>路由設定已改變</value>
   </data>
   <data name="TipChangeSystemProxy" xml:space="preserve">
-    <value>系統代理設定改變</value>
+    <value>系統代理設定已改變</value>
   </data>
   <data name="TbSettingsRouteOnly" xml:space="preserve">
     <value>RouteOnly</value>
@@ -983,13 +980,13 @@
     <value>匯入舊的配置檔案guiNConfig</value>
   </data>
   <data name="TbEnableTunAs" xml:space="preserve">
-    <value>啟用Tun模式</value>
+    <value>啟用TUN模式</value>
   </data>
   <data name="TbSettingsNewPort4LAN" xml:space="preserve">
     <value>為區域網路開啟新的埠</value>
   </data>
   <data name="TbSettingsTunMode" xml:space="preserve">
-    <value>Tun模式設定</value>
+    <value>TUN模式設定</value>
   </data>
   <data name="TbSettingsTunModeDirectIP" xml:space="preserve">
     <value>直連的IP CIDR，用逗號(,)分隔</value>
@@ -1031,7 +1028,7 @@
     <value>使用者代理(User-Agent)</value>
   </data>
   <data name="TbSettingsDefUserAgentTips" xml:space="preserve">
-    <value>僅對tcp/http、ws協定生效</value>
+    <value>僅對TCP/HTTP、WS協定生效</value>
   </data>
   <data name="TbSettingsCurrentFontFamily" xml:space="preserve">
     <value>目前字型(需重啟)</value>
@@ -1040,7 +1037,7 @@
     <value>複製字型TTF/TTC文件到目錄guiFonts，重啟設定</value>
   </data>
   <data name="TbSettingsSocksPortTip" xml:space="preserve">
-    <value>http埠=socks埠+1</value>
+    <value>HTTP埠=SOCKS埠+1</value>
   </data>
   <data name="TbSettingsStartBootTip" xml:space="preserve">
     <value>以管理員權限設定此項，在啟動後獲得管理員權限</value>
@@ -1061,7 +1058,7 @@
     <value>測速單個超時值</value>
   </data>
   <data name="TbSettingsSpeedTestUrl" xml:space="preserve">
-    <value>測速文件位址</value>
+    <value>測速檔案位址</value>
   </data>
   <data name="TbSettingsTunModeDNS" xml:space="preserve">
     <value>DNS物件，例如 {"servers":[]}</value>
@@ -1082,7 +1079,7 @@
     <value>啟用硬體加速(需重啟)</value>
   </data>
   <data name="SpeedtestingWait" xml:space="preserve">
-    <value>等待測試中...</value>
+    <value>等待测试中（按ESC终止）...</value>
   </data>
   <data name="TipDisplayLog" xml:space="preserve">
     <value>當有異常斷流時請關閉</value>
@@ -1117,7 +1114,7 @@
   <data name="TbDnsSingboxObjectDoc" xml:space="preserve">
     <value>請填寫 DNS JSON 結構，點擊查看文件</value>
   </data>
-  <data name="TBSettingDnsImportDefConfig" xml:space="preserve">
+  <data name="TbSettingDnsImportDefConfig" xml:space="preserve">
     <value>點擊匯入預設DNS配置</value>
   </data>
   <data name="TbdomainStrategy4Singbox" xml:space="preserve">
@@ -1127,7 +1124,7 @@
     <value>sing-box Mux 多路復用協定</value>
   </data>
   <data name="TbRoutingRuleProcess" xml:space="preserve">
-    <value>行程名全稱 (Tun模式)</value>
+    <value>行程名全稱 (TUN模式)</value>
   </data>
   <data name="TbRoutingRuleDomain" xml:space="preserve">
     <value>Domain</value>
@@ -1135,4 +1132,40 @@
   <data name="TbRoutingRuleIP" xml:space="preserve">
     <value>IP 或 IP CIDR</value>
   </data>
-</root>
+  <data name="menuAddTuicServer" xml:space="preserve">
+    <value>新增[Tuic]伺服器</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="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>
+</root>

v2rayN/v2rayN/Sample/SampleOutbound

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

v2rayN/v2rayN/Sample/SingboxSampleClientConfig

@@ -25,9 +25,18 @@
 		{
 			"type": "block",
 			"tag": "block"
+		},
+		{
+			"tag": "dns_out",
+			"type": "dns"
 		}
 	],
 	"route": {
-		"rules": []
+		"rules": [
+			{
+				"protocol": [ "dns" ],
+				"outbound": "dns_out"
+			}
+		]
 	}
 }

v2rayN/v2rayN/Sample/SingboxSampleOutbound

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

v2rayN/v2rayN/Sample/custom_routing_white

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

v2rayN/v2rayN/Sample/tun_singbox_rules

@@ -1,12 +1,4 @@
 [
-  {
-    "inbound": [ "dns_in" ],
-    "outbound": "dns_out"
-  },
-  {
-    "protocol": [ "dns" ],
-    "outbound": "dns_out"
-  },
   {
     "network": "udp",
     "port": [
@@ -24,12 +16,5 @@
       "ff00::/8"
     ],
     "outbound": "block"
-  },
-  {
-    "source_ip_cidr": [
-      "224.0.0.0/3",
-      "ff00::/8"
-    ],
-    "outbound": "block"
   }
 ]

v2rayN/v2rayN/ViewModels/AddServer2ViewModel.cs

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

v2rayN/v2rayN/ViewModels/AddServerViewModel.cs

@@ -3,9 +3,8 @@ using ReactiveUI.Fody.Helpers;
 using Splat;
 using System.Reactive;
 using System.Windows;
-using v2rayN.Base;
 using v2rayN.Handler;
-using v2rayN.Mode;
+using v2rayN.Model;
 using v2rayN.Resx;
 
 namespace v2rayN.ViewModels
@@ -37,7 +36,7 @@ namespace v2rayN.ViewModels
             }
             else
             {
-                SelectedSource = Utils.DeepCopy(profileItem);
+                SelectedSource = JsonUtils.DeepCopy(profileItem);
             }
 
             SaveCmd = ReactiveCommand.Create(() =>
@@ -52,32 +51,32 @@ namespace v2rayN.ViewModels
         {
             if (Utils.IsNullOrEmpty(SelectedSource.remarks))
             {
-                UI.Show(ResUI.PleaseFillRemarks);
+                _noticeHandler?.Enqueue(ResUI.PleaseFillRemarks);
                 return;
             }
 
             if (Utils.IsNullOrEmpty(SelectedSource.address))
             {
-                UI.Show(ResUI.FillServerAddress);
+                _noticeHandler?.Enqueue(ResUI.FillServerAddress);
                 return;
             }
             var port = SelectedSource.port.ToString();
-            if (Utils.IsNullOrEmpty(port) || !Utils.IsNumberic(port)
+            if (Utils.IsNullOrEmpty(port) || !Utils.IsNumeric(port)
                 || SelectedSource.port <= 0 || SelectedSource.port >= Global.MaxPort)
             {
-                UI.Show(ResUI.FillCorrectServerPort);
+                _noticeHandler?.Enqueue(ResUI.FillCorrectServerPort);
                 return;
             }
             if (SelectedSource.configType == EConfigType.Shadowsocks)
             {
                 if (Utils.IsNullOrEmpty(SelectedSource.id))
                 {
-                    UI.Show(ResUI.FillPassword);
+                    _noticeHandler?.Enqueue(ResUI.FillPassword);
                     return;
                 }
                 if (Utils.IsNullOrEmpty(SelectedSource.security))
                 {
-                    UI.Show(ResUI.PleaseSelectEncryption);
+                    _noticeHandler?.Enqueue(ResUI.PleaseSelectEncryption);
                     return;
                 }
             }
@@ -85,7 +84,7 @@ namespace v2rayN.ViewModels
             {
                 if (Utils.IsNullOrEmpty(SelectedSource.id))
                 {
-                    UI.Show(ResUI.FillUUID);
+                    _noticeHandler?.Enqueue(ResUI.FillUUID);
                     return;
                 }
             }
@@ -123,29 +122,18 @@ namespace v2rayN.ViewModels
                 item.spiderX = SelectedSource.spiderX;
             }
 
-            int ret = -1;
-            switch (item.configType)
+            var ret = item.configType switch
             {
-                case EConfigType.VMess:
-                    ret = ConfigHandler.AddServer(ref _config, item);
-                    break;
-
-                case EConfigType.Shadowsocks:
-                    ret = ConfigHandler.AddShadowsocksServer(ref _config, item);
-                    break;
-
-                case EConfigType.Socks:
-                    ret = ConfigHandler.AddSocksServer(ref _config, item);
-                    break;
-
-                case EConfigType.VLESS:
-                    ret = ConfigHandler.AddVlessServer(ref _config, item);
-                    break;
-
-                case EConfigType.Trojan:
-                    ret = ConfigHandler.AddTrojanServer(ref _config, item);
-                    break;
-            }
+                EConfigType.VMess => ConfigHandler.AddServer(_config, item),
+                EConfigType.Shadowsocks => ConfigHandler.AddShadowsocksServer(_config, item),
+                EConfigType.Socks => ConfigHandler.AddSocksServer(_config, item),
+                EConfigType.Trojan => ConfigHandler.AddTrojanServer(_config, item),
+                EConfigType.VLESS => ConfigHandler.AddVlessServer(_config, item),
+                EConfigType.Hysteria2 => ConfigHandler.AddHysteria2Server(_config, item),
+                EConfigType.Tuic => ConfigHandler.AddTuicServer(_config, item),
+                EConfigType.Wireguard => ConfigHandler.AddWireguardServer(_config, item),
+                _ => -1,
+            };
 
             if (ret == 0)
             {
@@ -155,7 +143,7 @@ namespace v2rayN.ViewModels
             }
             else
             {
-                UI.Show(ResUI.OperationFailed);
+                _noticeHandler?.Enqueue(ResUI.OperationFailed);
             }
         }
     }

v2rayN/v2rayN/ViewModels/DNSSettingViewModel.cs

@@ -4,7 +4,7 @@ using Splat;
 using System.Reactive;
 using System.Windows;
 using v2rayN.Handler;
-using v2rayN.Mode;
+using v2rayN.Model;
 using v2rayN.Resx;
 
 namespace v2rayN.ViewModels
@@ -15,6 +15,7 @@ namespace v2rayN.ViewModels
         private NoticeHandler? _noticeHandler;
         private Window _view;
 
+        [Reactive] public bool useSystemHosts { get; set; }
         [Reactive] public string domainStrategy4Freedom { get; set; }
         [Reactive] public string normalDNS { get; set; }
         [Reactive] public string normalDNS2 { get; set; }
@@ -31,6 +32,7 @@ namespace v2rayN.ViewModels
             _view = view;
 
             var item = LazyConfig.Instance.GetDNSItem(ECoreType.Xray);
+            useSystemHosts = item.useSystemHosts;
             domainStrategy4Freedom = item?.domainStrategy4Freedom!;
             normalDNS = item?.normalDNS!;
 
@@ -61,46 +63,47 @@ namespace v2rayN.ViewModels
         {
             if (!Utils.IsNullOrEmpty(normalDNS))
             {
-                var obj = Utils.ParseJson(normalDNS);
-                if (obj != null && obj.ContainsKey("servers") == true)
+                var obj = JsonUtils.ParseJson(normalDNS);
+                if (obj != null && obj["servers"] != null)
                 {
                 }
                 else
                 {
                     if (normalDNS.Contains("{") || normalDNS.Contains("}"))
                     {
-                        UI.Show(ResUI.FillCorrectDNSText);
+                        _noticeHandler?.Enqueue(ResUI.FillCorrectDNSText);
                         return;
                     }
                 }
             }
             if (!Utils.IsNullOrEmpty(normalDNS2))
             {
-                var obj2 = Utils.FromJson<Dns4Sbox>(normalDNS2);
+                var obj2 = JsonUtils.Deserialize<Dns4Sbox>(normalDNS2);
                 if (obj2 == null)
                 {
-                    UI.Show(ResUI.FillCorrectDNSText);
+                    _noticeHandler?.Enqueue(ResUI.FillCorrectDNSText);
                     return;
                 }
             }
             if (!Utils.IsNullOrEmpty(tunDNS2))
             {
-                var obj2 = Utils.FromJson<Dns4Sbox>(tunDNS2);
+                var obj2 = JsonUtils.Deserialize<Dns4Sbox>(tunDNS2);
                 if (obj2 == null)
                 {
-                    UI.Show(ResUI.FillCorrectDNSText);
+                    _noticeHandler?.Enqueue(ResUI.FillCorrectDNSText);
                     return;
                 }
             }
 
             var item = LazyConfig.Instance.GetDNSItem(ECoreType.Xray);
             item.domainStrategy4Freedom = domainStrategy4Freedom;
+            item.useSystemHosts = useSystemHosts;
             item.normalDNS = normalDNS;
             ConfigHandler.SaveDNSItems(_config, item);
 
             var item2 = LazyConfig.Instance.GetDNSItem(ECoreType.sing_box);
-            item2.normalDNS = Utils.ToJson(Utils.ParseJson(normalDNS2));
-            item2.tunDNS = Utils.ToJson(Utils.ParseJson(tunDNS2));
+            item2.normalDNS = JsonUtils.Serialize(JsonUtils.ParseJson(normalDNS2));
+            item2.tunDNS = JsonUtils.Serialize(JsonUtils.ParseJson(tunDNS2));
             ConfigHandler.SaveDNSItems(_config, item2);
 
             _noticeHandler?.Enqueue(ResUI.OperationSuccess);

v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs

@@ -3,7 +3,6 @@ using DynamicData.Binding;
 using MaterialDesignColors;
 using MaterialDesignColors.ColorManipulation;
 using MaterialDesignThemes.Wpf;
-using Microsoft.Win32;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
 using Splat;
@@ -15,11 +14,9 @@ using System.Reactive.Linq;
 using System.Text;
 using System.Windows;
 using System.Windows.Media;
-using v2rayN.Base;
 using v2rayN.Handler;
-using v2rayN.Mode;
+using v2rayN.Model;
 using v2rayN.Resx;
-using v2rayN.Tool;
 using v2rayN.Views;
 
 namespace v2rayN.ViewModels
@@ -38,6 +35,7 @@ namespace v2rayN.ViewModels
         private readonly PaletteHelper _paletteHelper = new();
         private Dictionary<string, bool> _dicHeaderSort = new();
         private Action<EViewAction> _updateView;
+        private bool _showInTaskbar;
 
         #endregion private prop
 
@@ -89,6 +87,9 @@ namespace v2rayN.ViewModels
         public ReactiveCommand<Unit, Unit> AddShadowsocksServerCmd { get; }
         public ReactiveCommand<Unit, Unit> AddSocksServerCmd { get; }
         public ReactiveCommand<Unit, Unit> AddTrojanServerCmd { get; }
+        public ReactiveCommand<Unit, Unit> AddHysteria2ServerCmd { get; }
+        public ReactiveCommand<Unit, Unit> AddTuicServerCmd { get; }
+        public ReactiveCommand<Unit, Unit> AddWireguardServerCmd { get; }
         public ReactiveCommand<Unit, Unit> AddCustomServerCmd { get; }
         public ReactiveCommand<Unit, Unit> AddServerViaClipboardCmd { get; }
         public ReactiveCommand<Unit, Unit> AddServerViaScanCmd { get; }
@@ -112,7 +113,6 @@ namespace v2rayN.ViewModels
         //servers ping
         public ReactiveCommand<Unit, Unit> MixedTestServerCmd { get; }
 
-        public ReactiveCommand<Unit, Unit> PingServerCmd { get; }
         public ReactiveCommand<Unit, Unit> TcpingServerCmd { get; }
         public ReactiveCommand<Unit, Unit> RealPingServerCmd { get; }
         public ReactiveCommand<Unit, Unit> SpeedServerCmd { get; }
@@ -128,6 +128,7 @@ namespace v2rayN.ViewModels
         public ReactiveCommand<Unit, Unit> SubSettingCmd { get; }
 
         public ReactiveCommand<Unit, Unit> AddSubCmd { get; }
+        public ReactiveCommand<Unit, Unit> EditSubCmd { get; }
         public ReactiveCommand<Unit, Unit> SubUpdateCmd { get; }
         public ReactiveCommand<Unit, Unit> SubUpdateViaProxyCmd { get; }
         public ReactiveCommand<Unit, Unit> SubGroupUpdateCmd { get; }
@@ -146,12 +147,15 @@ namespace v2rayN.ViewModels
         //CheckUpdate
         public ReactiveCommand<Unit, Unit> CheckUpdateNCmd { get; }
 
-        public ReactiveCommand<Unit, Unit> CheckUpdateV2flyCoreCmd { get; }
+        //public ReactiveCommand<Unit, Unit> CheckUpdateV2flyCoreCmd { get; }
+
         //public ReactiveCommand<Unit, Unit> CheckUpdateSagerNetCoreCmd { get; }
         public ReactiveCommand<Unit, Unit> CheckUpdateXrayCoreCmd { get; }
+
         //public ReactiveCommand<Unit, Unit> CheckUpdateClashCoreCmd { get; }
         //public ReactiveCommand<Unit, Unit> CheckUpdateClashMetaCoreCmd { get; }
         public ReactiveCommand<Unit, Unit> CheckUpdateSingBoxCoreCmd { get; }
+
         public ReactiveCommand<Unit, Unit> CheckUpdateGeoCmd { get; }
 
         public ReactiveCommand<Unit, Unit> ReloadCmd { get; }
@@ -255,8 +259,6 @@ namespace v2rayN.ViewModels
             Locator.CurrentMutable.RegisterLazySingleton(() => new NoticeHandler(snackbarMessageQueue), typeof(NoticeHandler));
             _noticeHandler = Locator.Current.GetService<NoticeHandler>();
             _config = LazyConfig.Instance.GetConfig();
-            //ThreadPool.RegisterWaitForSingleObject(App.ProgramStarted, OnProgramStarted, null, -1, false);
-            Init();
 
             SelectedProfile = new();
             SelectedSub = new();
@@ -269,9 +271,11 @@ namespace v2rayN.ViewModels
             }
             _subId = _config.subIndexId;
 
-            InitSubscriptionView();
-            RefreshRoutingsMenu();
-            RefreshServers();
+            Init();
+            BindingUI();
+            RestoreUI();
+
+            #region WhenAnyValue && ReactiveCommand
 
             var canEditRemove = this.WhenAnyValue(
                x => x.SelectedProfile,
@@ -312,10 +316,6 @@ namespace v2rayN.ViewModels
                y => y == true)
                   .Subscribe(c => DoEnableTun(c));
 
-            BindingUI();
-            RestoreUI();
-            AutoHideStartup();
-
             //servers
             AddVmessServerCmd = ReactiveCommand.Create(() =>
             {
@@ -337,6 +337,18 @@ namespace v2rayN.ViewModels
             {
                 EditServer(true, EConfigType.Trojan);
             });
+            AddHysteria2ServerCmd = ReactiveCommand.Create(() =>
+            {
+                EditServer(true, EConfigType.Hysteria2);
+            });
+            AddTuicServerCmd = ReactiveCommand.Create(() =>
+            {
+                EditServer(true, EConfigType.Tuic);
+            });
+            AddWireguardServerCmd = ReactiveCommand.Create(() =>
+            {
+                EditServer(true, EConfigType.Wireguard);
+            });
             AddCustomServerCmd = ReactiveCommand.Create(() =>
             {
                 EditServer(true, EConfigType.Custom);
@@ -397,10 +409,6 @@ namespace v2rayN.ViewModels
             {
                 ServerSpeedtest(ESpeedActionType.Mixedtest);
             });
-            PingServerCmd = ReactiveCommand.Create(() =>
-            {
-                ServerSpeedtest(ESpeedActionType.Ping);
-            }, canEditRemove);
             TcpingServerCmd = ReactiveCommand.Create(() =>
             {
                 ServerSpeedtest(ESpeedActionType.Tcping);
@@ -438,7 +446,11 @@ namespace v2rayN.ViewModels
             });
             AddSubCmd = ReactiveCommand.Create(() =>
             {
-                AddSub();
+                EditSub(true);
+            });
+            EditSubCmd = ReactiveCommand.Create(() =>
+            {
+                EditSub(false);
             });
             SubUpdateCmd = ReactiveCommand.Create(() =>
             {
@@ -496,10 +508,10 @@ namespace v2rayN.ViewModels
             {
                 CheckUpdateN();
             });
-            CheckUpdateV2flyCoreCmd = ReactiveCommand.Create(() =>
-            {
-                CheckUpdateCore(ECoreType.v2fly_v5);
-            });
+            //CheckUpdateV2flyCoreCmd = ReactiveCommand.Create(() =>
+            //{
+            //    CheckUpdateCore(ECoreType.v2fly_v5);
+            //});
             //CheckUpdateSagerNetCoreCmd = ReactiveCommand.Create(() =>
             //{
             //    CheckUpdateCore(ECoreType.SagerNet);
@@ -553,12 +565,16 @@ namespace v2rayN.ViewModels
                 SetListenerType(ESysProxyType.Pac);
             });
 
-            Global.ShowInTaskbar = true;
+            #endregion WhenAnyValue && ReactiveCommand
+
+            AutoHideStartup();
+
+            _showInTaskbar = true;
         }
 
         private void Init()
         {
-            ConfigHandler.InitBuiltinRouting(ref _config);
+            ConfigHandler.InitBuiltinRouting(_config);
             ConfigHandler.InitBuiltinDNS(_config);
             _coreHandler = new CoreHandler(_config, UpdateHandler);
             Locator.CurrentMutable.RegisterLazySingleton(() => _coreHandler, typeof(CoreHandler));
@@ -571,13 +587,17 @@ namespace v2rayN.ViewModels
             MainFormHandler.Instance.UpdateTask(_config, UpdateTaskHandler);
             MainFormHandler.Instance.RegisterGlobalHotkey(_config, OnHotkeyHandler, UpdateTaskHandler);
 
+            InitSubscriptionView();
+            RefreshRoutingsMenu();
+            RefreshServers();
+
             Reload();
             ChangeSystemProxyStatus(_config.sysProxyType, true);
         }
 
         private void OnProgramStarted(object state, bool timeout)
         {
-            Application.Current.Dispatcher.Invoke((Action)(() =>
+            Application.Current?.Dispatcher.Invoke((Action)(() =>
             {
                 ShowHideWindow(true);
             }));
@@ -590,6 +610,10 @@ namespace v2rayN.ViewModels
         private void UpdateHandler(bool notify, string msg)
         {
             _noticeHandler?.SendMessage(msg);
+            if (notify)
+            {
+                _noticeHandler?.Enqueue(msg);
+            }
         }
 
         private void UpdateTaskHandler(bool success, string msg)
@@ -614,15 +638,15 @@ namespace v2rayN.ViewModels
         {
             try
             {
-                Application.Current.Dispatcher.Invoke((Action)(() =>
+                Application.Current?.Dispatcher.Invoke((Action)(() =>
                 {
-                    if (!Global.ShowInTaskbar)
+                    if (!_showInTaskbar)
                     {
                         return;
                     }
 
-                    SpeedProxyDisplay = string.Format(ResUI.SpeedDisplayText, Global.agentTag, Utils.HumanFy(update.proxyUp), Utils.HumanFy(update.proxyDown));
-                    SpeedDirectDisplay = string.Format(ResUI.SpeedDisplayText, Global.directTag, Utils.HumanFy(update.directUp), Utils.HumanFy(update.directDown));
+                    SpeedProxyDisplay = string.Format(ResUI.SpeedDisplayText, Global.ProxyTag, Utils.HumanFy(update.proxyUp), Utils.HumanFy(update.proxyDown));
+                    SpeedDirectDisplay = string.Format(ResUI.SpeedDisplayText, Global.DirectTag, Utils.HumanFy(update.directUp), Utils.HumanFy(update.directDown));
 
                     if (update.proxyUp + update.proxyDown > 0)
                     {
@@ -639,13 +663,13 @@ namespace v2rayN.ViewModels
 
                                 if (SelectedProfile?.indexId == item.indexId)
                                 {
-                                    var temp = Utils.DeepCopy(item);
+                                    var temp = JsonUtils.DeepCopy(item);
                                     _profileItems.Replace(item, temp);
                                     SelectedProfile = temp;
                                 }
                                 else
                                 {
-                                    _profileItems.Replace(item, Utils.DeepCopy(item));
+                                    _profileItems.Replace(item, JsonUtils.DeepCopy(item));
                                 }
                             }
                         }
@@ -654,13 +678,13 @@ namespace v2rayN.ViewModels
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                Logging.SaveLog(ex.Message, ex);
             }
         }
 
         private void UpdateSpeedtestHandler(string indexId, string delay, string speed)
         {
-            Application.Current.Dispatcher.Invoke((Action)(() =>
+            Application.Current?.Dispatcher.Invoke((Action)(() =>
             {
                 SetTestResult(indexId, delay, speed);
             }));
@@ -687,7 +711,7 @@ namespace v2rayN.ViewModels
                 {
                     item.speedVal = $"{speed} {Global.SpeedUnit}";
                 }
-                _profileItems.Replace(item, Utils.DeepCopy(item));
+                _profileItems.Replace(item, JsonUtils.DeepCopy(item));
             }
         }
 
@@ -721,10 +745,9 @@ namespace v2rayN.ViewModels
         {
             try
             {
-                Utils.SaveLog("MyAppExit Begin");
+                Logging.SaveLog("MyAppExit Begin");
 
-                StorageUI();
-                ConfigHandler.SaveConfig(ref _config);
+                ConfigHandler.SaveConfig(_config);
 
                 //HttpProxyHandle.CloseHttpAgent(config);
                 if (blWindowsShutDown)
@@ -742,13 +765,12 @@ namespace v2rayN.ViewModels
                 _statistics?.Close();
 
                 _coreHandler.CoreStop();
-                Utils.SaveLog("MyAppExit End");
+                Logging.SaveLog("MyAppExit End");
             }
             catch { }
             finally
             {
                 Application.Current.Shutdown();
-                Environment.Exit(0);
             }
         }
 
@@ -822,9 +844,9 @@ namespace v2rayN.ViewModels
                             totalDown = t22 == null ? "" : Utils.HumanFy(t22.totalDown),
                             totalUp = t22 == null ? "" : Utils.HumanFy(t22.totalUp)
                         }).OrderBy(t => t.sort).ToList();
-            _lstProfile = Utils.FromJson<List<ProfileItem>>(Utils.ToJson(lstModel));
+            _lstProfile = JsonUtils.Deserialize<List<ProfileItem>>(JsonUtils.Serialize(lstModel));
 
-            Application.Current.Dispatcher.Invoke((Action)(() =>
+            Application.Current?.Dispatcher.Invoke((Action)(() =>
             {
                 _profileItems.Clear();
                 _profileItems.AddRange(lstModel);
@@ -844,16 +866,15 @@ namespace v2rayN.ViewModels
                 RefreshServersMenu();
 
                 //display running server
-                var running = ConfigHandler.GetDefaultServer(ref _config);
+                var running = ConfigHandler.GetDefaultServer(_config);
                 if (running != null)
                 {
-                    var runningSummary = running.GetSummary();
-                    RunningServerDisplay = $"{ResUI.menuServers}:{runningSummary}";
-                    RunningServerToolTipText = runningSummary;
+                    RunningServerDisplay =
+                    RunningServerToolTipText = running.GetSummary();
                 }
                 else
                 {
-                    RunningServerDisplay = ResUI.CheckServerSettings;
+                    RunningServerDisplay =
                     RunningServerToolTipText = ResUI.CheckServerSettings;
                 }
             }));
@@ -928,7 +949,7 @@ namespace v2rayN.ViewModels
             }
             else
             {
-                lstSelecteds = Utils.FromJson<List<ProfileItem>>(Utils.ToJson(orderProfiles));
+                lstSelecteds = JsonUtils.Deserialize<List<ProfileItem>>(JsonUtils.Serialize(orderProfiles));
             }
 
             return 0;
@@ -982,7 +1003,7 @@ namespace v2rayN.ViewModels
         public void AddServerViaClipboard()
         {
             var clipboardData = Utils.GetClipboardData();
-            int ret = ConfigHandler.AddBatchServers(ref _config, clipboardData!, _subId, false);
+            int ret = ConfigHandler.AddBatchServers(_config, clipboardData!, _subId, false);
             if (ret > 0)
             {
                 InitSubscriptionView();
@@ -1009,7 +1030,7 @@ namespace v2rayN.ViewModels
             }
             else
             {
-                int ret = ConfigHandler.AddBatchServers(ref _config, result, _subId, false);
+                int ret = ConfigHandler.AddBatchServers(_config, result, _subId, false);
                 if (ret > 0)
                 {
                     InitSubscriptionView();
@@ -1056,7 +1077,7 @@ namespace v2rayN.ViewModels
             {
                 return;
             }
-            if (ConfigHandler.CopyServer(ref _config, lstSelecteds) == 0)
+            if (ConfigHandler.CopyServer(_config, lstSelecteds) == 0)
             {
                 RefreshServers();
                 _noticeHandler?.Enqueue(ResUI.OperationSuccess);
@@ -1089,7 +1110,7 @@ namespace v2rayN.ViewModels
                 return;
             }
 
-            if (ConfigHandler.SetDefaultServerIndex(ref _config, indexId) == 0)
+            if (ConfigHandler.SetDefaultServerIndex(_config, indexId) == 0)
             {
                 RefreshServers();
                 Reload();
@@ -1121,7 +1142,7 @@ namespace v2rayN.ViewModels
                 _noticeHandler?.Enqueue(ResUI.PleaseSelectServer);
                 return;
             }
-            string url = ShareHandler.GetShareUrl(item);
+            var url = ShareHandler.GetShareUrl(item);
             if (Utils.IsNullOrEmpty(url))
             {
                 return;
@@ -1145,7 +1166,7 @@ namespace v2rayN.ViewModels
 
             _dicHeaderSort.TryAdd(colName, true);
             _dicHeaderSort.TryGetValue(colName, out bool asc);
-            if (ConfigHandler.SortServers(ref _config, _subId, colName, asc) != 0)
+            if (ConfigHandler.SortServers(_config, _subId, colName, asc) != 0)
             {
                 return;
             }
@@ -1155,7 +1176,7 @@ namespace v2rayN.ViewModels
 
         public void TestServerAvailability()
         {
-            var item = ConfigHandler.GetDefaultServer(ref _config);
+            var item = ConfigHandler.GetDefaultServer(_config);
             if (item == null || item.configType == EConfigType.Custom)
             {
                 return;
@@ -1163,9 +1184,9 @@ namespace v2rayN.ViewModels
             (new UpdateHandle()).RunAvailabilityCheck((bool success, string msg) =>
             {
                 _noticeHandler?.SendMessage(msg, true);
-                Application.Current.Dispatcher.Invoke((Action)(() =>
+                Application.Current?.Dispatcher.Invoke((Action)(() =>
                 {
-                    if (!Global.ShowInTaskbar)
+                    if (!_showInTaskbar)
                     {
                         return;
                     }
@@ -1209,7 +1230,7 @@ namespace v2rayN.ViewModels
             {
                 return;
             }
-            if (ConfigHandler.MoveServer(ref _config, ref _lstProfile, index, eMove) == 0)
+            if (ConfigHandler.MoveServer(_config, ref _lstProfile, index, eMove) == 0)
             {
                 RefreshServers();
             }
@@ -1220,7 +1241,7 @@ namespace v2rayN.ViewModels
             var targetIndex = _profileItems.IndexOf(targetItem);
             if (startIndex >= 0 && targetIndex >= 0 && startIndex != targetIndex)
             {
-                if (ConfigHandler.MoveServer(ref _config, ref _lstProfile, startIndex, EMove.Position, targetIndex) == 0)
+                if (ConfigHandler.MoveServer(_config, ref _lstProfile, startIndex, EMove.Position, targetIndex) == 0)
                 {
                     RefreshServers();
                 }
@@ -1315,9 +1336,21 @@ namespace v2rayN.ViewModels
             }
         }
 
-        private void AddSub()
+        private void EditSub(bool blNew)
         {
-            SubItem item = new();
+            SubItem item;
+            if (blNew)
+            {
+                item = new();
+            }
+            else
+            {
+                item = LazyConfig.Instance.GetSubItem(_subId);
+                if (item is null)
+                {
+                    return;
+                }
+            }
             var ret = (new SubEditWindow(item)).ShowDialog();
             if (ret == true)
             {
@@ -1350,7 +1383,7 @@ namespace v2rayN.ViewModels
             var ret = (new RoutingSettingWindow()).ShowDialog();
             if (ret == true)
             {
-                ConfigHandler.InitBuiltinRouting(ref _config);
+                ConfigHandler.InitBuiltinRouting(_config);
                 RefreshRoutingsMenu();
                 //RefreshServers();
                 Reload();
@@ -1373,7 +1406,7 @@ namespace v2rayN.ViewModels
                 UseShellExecute = true,
                 Arguments = Global.RebootAs,
                 WorkingDirectory = Utils.StartupPath(),
-                FileName = Utils.GetExePath(),
+                FileName = Utils.GetExePath().AppendQuotes(),
                 Verb = "runas",
             };
             try
@@ -1386,33 +1419,28 @@ namespace v2rayN.ViewModels
 
         private void ImportOldGuiConfig()
         {
-            OpenFileDialog fileDialog = new()
-            {
-                Multiselect = false,
-                Filter = "guiNConfig|*.json|All|*.*"
-            };
-            if (fileDialog.ShowDialog() != true)
+            if (UI.OpenFileDialog(out string fileName,
+                "guiNConfig|*.json|All|*.*") != true)
             {
                 return;
             }
-            string fileName = fileDialog.FileName;
             if (Utils.IsNullOrEmpty(fileName))
             {
                 return;
             }
 
-            var ret = ConfigHandler.ImportOldGuiConfig(ref _config, fileName);
+            var ret = ConfigHandler.ImportOldGuiConfig(_config, fileName);
             if (ret == 0)
             {
                 RefreshRoutingsMenu();
                 InitSubscriptionView();
                 RefreshServers();
                 Reload();
-                UI.Show(ResUI.OperationSuccess);
+                _noticeHandler?.Enqueue(ResUI.OperationSuccess);
             }
             else
             {
-                _noticeHandler.Enqueue(ResUI.OperationFailed);
+                _noticeHandler?.Enqueue(ResUI.OperationFailed);
             }
         }
 
@@ -1440,10 +1468,10 @@ namespace v2rayN.ViewModels
                 _noticeHandler?.SendMessage(msg);
                 if (success)
                 {
-                    CloseV2ray();
+                    CloseCore();
 
                     string fileName = Utils.GetTempPath(Utils.GetDownloadFileName(msg));
-                    string toPath = Utils.GetBinPath("", type);
+                    string toPath = Utils.GetBinPath("", type.ToString());
 
                     FileManager.ZipExtractToFile(fileName, toPath, _config.guiItem.ignoreGeoUpdateCore ? "geo" : "");
 
@@ -1469,47 +1497,45 @@ namespace v2rayN.ViewModels
 
         #endregion CheckUpdate
 
-        #region v2ray job
+        #region core job
 
         public void Reload()
         {
-            _ = LoadV2ray();
+            BlReloadEnabled = false;
+
+            LoadCore().ContinueWith(task =>
+            {
+                TestServerAvailability();
+
+                Application.Current?.Dispatcher.Invoke((Action)(() =>
+                {
+                    BlReloadEnabled = true;
+                }));
+            });
         }
 
-        private async Task LoadV2ray()
+        private async Task LoadCore()
         {
-            Application.Current.Dispatcher.Invoke((Action)(() =>
-            {
-                BlReloadEnabled = false;
-            }));
-
             await Task.Run(() =>
             {
                 _coreHandler.LoadCore();
 
-                //ConfigHandler.SaveConfig(ref _config, false);
+                //ConfigHandler.SaveConfig(_config, false);
 
                 ChangeSystemProxyStatus(_config.sysProxyType, false);
             });
-
-            TestServerAvailability();
-
-            Application.Current.Dispatcher.Invoke((Action)(() =>
-            {
-                BlReloadEnabled = true;
-            }));
         }
 
-        private void CloseV2ray()
+        private void CloseCore()
         {
-            ConfigHandler.SaveConfig(ref _config, false);
+            ConfigHandler.SaveConfig(_config, false);
 
             ChangeSystemProxyStatus(ESysProxyType.ForcedClear, false);
 
             _coreHandler.CoreStop();
         }
 
-        #endregion v2ray job
+        #endregion core job
 
         #region System proxy and Routings
 
@@ -1523,7 +1549,7 @@ namespace v2rayN.ViewModels
             ChangeSystemProxyStatus(type, true);
 
             SystemProxySelected = (int)_config.sysProxyType;
-            ConfigHandler.SaveConfig(ref _config, false);
+            ConfigHandler.SaveConfig(_config, false);
         }
 
         private void ChangeSystemProxyStatus(ESysProxyType type, bool blChange)
@@ -1531,7 +1557,7 @@ namespace v2rayN.ViewModels
             SysProxyHandle.UpdateSysProxy(_config, _config.tunModeItem.enableTun ? true : false);
             _noticeHandler?.SendMessage(ResUI.TipChangeSystemProxy + _config.sysProxyType.ToString(), true);
 
-            Application.Current.Dispatcher.Invoke((Action)(() =>
+            Application.Current?.Dispatcher.Invoke((Action)(() =>
             {
                 BlSystemProxyClear = (type == ESysProxyType.ForcedClear);
                 BlSystemProxySet = (type == ESysProxyType.ForcedChange);
@@ -1591,10 +1617,12 @@ namespace v2rayN.ViewModels
                 return;
             }
 
-            if (ConfigHandler.SetDefaultRouting(ref _config, item) == 0)
+            if (ConfigHandler.SetDefaultRouting(_config, item) == 0)
             {
                 _noticeHandler?.SendMessage(ResUI.TipChangeRouting, true);
                 Reload();
+                NotifyIcon = MainFormHandler.Instance.GetNotifyIcon(_config);
+                AppIcon = MainFormHandler.Instance.GetAppIcon(_config);
             }
         }
 
@@ -1616,6 +1644,13 @@ namespace v2rayN.ViewModels
             if (_config.tunModeItem.enableTun != EnableTun)
             {
                 _config.tunModeItem.enableTun = EnableTun;
+                // When running as a non-administrator, reboot to administrator mode
+                if (EnableTun && !Utils.IsAdministrator())
+                {
+                    _config.tunModeItem.enableTun = false;
+                    RebootAsAdmin();
+                    return;
+                }
                 Reload();
             }
         }
@@ -1626,7 +1661,7 @@ namespace v2rayN.ViewModels
 
         public void ShowHideWindow(bool? blShow)
         {
-            var bl = blShow ?? !Global.ShowInTaskbar;
+            var bl = blShow ?? !_showInTaskbar;
             if (bl)
             {
                 //Application.Current.MainWindow.ShowInTaskbar = true;
@@ -1643,9 +1678,9 @@ namespace v2rayN.ViewModels
                 Application.Current.MainWindow.Hide();
                 //Application.Current.MainWindow.ShowInTaskbar = false;
                 //IntPtr windowHandle = new WindowInteropHelper(Application.Current.MainWindow).Handle;
-                //Utils.RegWriteValue(Global.MyRegPath, Utils.WindowHwndKey, Convert.ToString((long)windowHandle));
+                //Utile.RegWriteValue(Global.MyRegPath, Utile.WindowHwndKey, Convert.ToString((long)windowHandle));
             }
-            Global.ShowInTaskbar = bl;
+            _showInTaskbar = bl;
         }
 
         private void RestoreUI()
@@ -1671,10 +1706,6 @@ namespace v2rayN.ViewModels
             }
         }
 
-        private void StorageUI()
-        {
-        }
-
         private void BindingUI()
         {
             ColorModeDark = _config.uiItem.colorModeDark;
@@ -1686,7 +1717,6 @@ namespace v2rayN.ViewModels
             }
             CurrentFontSize = _config.uiItem.currentFontSize;
             CurrentLanguage = _config.uiItem.currentLanguage;
-            //BlShowTrayTip = _config.uiItem.showTrayTip;
 
             this.WhenAnyValue(
                   x => x.ColorModeDark,
@@ -1697,7 +1727,7 @@ namespace v2rayN.ViewModels
                           {
                               _config.uiItem.colorModeDark = ColorModeDark;
                               ModifyTheme(ColorModeDark);
-                              ConfigHandler.SaveConfig(ref _config);
+                              ConfigHandler.SaveConfig(_config);
                           }
                       });
 
@@ -1708,11 +1738,15 @@ namespace v2rayN.ViewModels
                         if (_config.uiItem.followSystemTheme != FollowSystemTheme)
                         {
                             _config.uiItem.followSystemTheme = FollowSystemTheme;
-                            ConfigHandler.SaveConfig(ref _config);
+                            ConfigHandler.SaveConfig(_config);
                             if (FollowSystemTheme)
                             {
                                 ModifyTheme(!Utils.IsLightTheme());
                             }
+                            else
+                            {
+                                ModifyTheme(ColorModeDark);
+                            }
                         }
                     });
 
@@ -1732,7 +1766,7 @@ namespace v2rayN.ViewModels
                      {
                          _config.uiItem.colorPrimaryName = SelectedSwatch?.Name;
                          ChangePrimaryColor(SelectedSwatch.ExemplarHue.Color);
-                         ConfigHandler.SaveConfig(ref _config);
+                         ConfigHandler.SaveConfig(_config);
                      }
                  });
 
@@ -1750,7 +1784,7 @@ namespace v2rayN.ViewModels
                           Application.Current.Resources["StdFontSize2"] = size + 2;
                           Application.Current.Resources["StdFontSizeMsg"] = size - 1;
 
-                          ConfigHandler.SaveConfig(ref _config);
+                          ConfigHandler.SaveConfig(_config);
                       }
                   });
 
@@ -1763,7 +1797,7 @@ namespace v2rayN.ViewModels
                     {
                         _config.uiItem.currentLanguage = CurrentLanguage;
                         Thread.CurrentThread.CurrentUICulture = new(CurrentLanguage);
-                        ConfigHandler.SaveConfig(ref _config);
+                        ConfigHandler.SaveConfig(_config);
                     }
                 });
         }
@@ -1771,7 +1805,7 @@ namespace v2rayN.ViewModels
         public void InboundDisplayStaus()
         {
             StringBuilder sb = new();
-            sb.Append($"[{Global.InboundSocks}:{LazyConfig.Instance.GetLocalPort(Global.InboundSocks)}]");
+            sb.Append($"[{EInboundProtocol.socks}:{LazyConfig.Instance.GetLocalPort(EInboundProtocol.socks)}]");
             sb.Append(" | ");
             //if (_config.sysProxyType == ESysProxyType.ForcedChange)
             //{
@@ -1779,7 +1813,7 @@ namespace v2rayN.ViewModels
             //}
             //else
             //{
-            sb.Append($"[{Global.InboundHttp}:{LazyConfig.Instance.GetLocalPort(Global.InboundHttp)}]");
+            sb.Append($"[{EInboundProtocol.http}:{LazyConfig.Instance.GetLocalPort(EInboundProtocol.http)}]");
             //}
             InboundDisplay = $"{ResUI.LabLocal}:{sb}";
 
@@ -1788,9 +1822,9 @@ namespace v2rayN.ViewModels
                 if (_config.inbound[0].newPort4LAN)
                 {
                     StringBuilder sb2 = new();
-                    sb2.Append($"[{Global.InboundSocks}:{LazyConfig.Instance.GetLocalPort(Global.InboundSocks2)}]");
+                    sb2.Append($"[{EInboundProtocol.socks}:{LazyConfig.Instance.GetLocalPort(EInboundProtocol.socks2)}]");
                     sb2.Append(" | ");
-                    sb2.Append($"[{Global.InboundHttp}:{LazyConfig.Instance.GetLocalPort(Global.InboundHttp2)}]");
+                    sb2.Append($"[{EInboundProtocol.http}:{LazyConfig.Instance.GetLocalPort(EInboundProtocol.http2)}]");
                     InboundLanDisplay = $"{ResUI.LabLAN}:{sb2}";
                 }
                 else
@@ -1830,10 +1864,10 @@ namespace v2rayN.ViewModels
             if (_config.uiItem.autoHideStartup)
             {
                 Observable.Range(1, 1)
-                 .Delay(TimeSpan.FromSeconds(2))
+                 .Delay(TimeSpan.FromSeconds(1))
                  .Subscribe(x =>
                  {
-                     Application.Current.Dispatcher.Invoke(() =>
+                     Application.Current?.Dispatcher.Invoke(() =>
                      {
                          ShowHideWindow(false);
                      });

v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs

@@ -4,7 +4,7 @@ using Splat;
 using System.Reactive;
 using System.Windows;
 using v2rayN.Handler;
-using v2rayN.Mode;
+using v2rayN.Model;
 using v2rayN.Resx;
 
 namespace v2rayN.ViewModels
@@ -32,6 +32,8 @@ namespace v2rayN.ViewModels
         [Reactive] public string defFingerprint { get; set; }
         [Reactive] public string defUserAgent { get; set; }
         [Reactive] public string mux4SboxProtocol { get; set; }
+        [Reactive] public int hyUpMbps { get; set; }
+        [Reactive] public int hyDownMbps { get; set; }
 
         #endregion Core
 
@@ -54,6 +56,7 @@ namespace v2rayN.ViewModels
         [Reactive] public bool KeepOlderDedupl { get; set; }
         [Reactive] public bool IgnoreGeoUpdateCore { get; set; }
         [Reactive] public bool EnableAutoAdjustMainLvColWidth { get; set; }
+        [Reactive] public bool EnableUpdateSubOnlyRemarksExist { get; set; }
         [Reactive] public bool EnableSecurityProtocolTls13 { get; set; }
         [Reactive] public bool AutoHideStartup { get; set; }
         [Reactive] public bool EnableCheckPreReleaseUpdate { get; set; }
@@ -64,6 +67,7 @@ namespace v2rayN.ViewModels
         [Reactive] public string currentFontFamily { get; set; }
         [Reactive] public int SpeedTestTimeout { get; set; }
         [Reactive] public string SpeedTestUrl { get; set; }
+        [Reactive] public string SpeedPingTestUrl { get; set; }
         [Reactive] public bool EnableHWA { get; set; }
         [Reactive] public string SubConvertUrl { get; set; }
 
@@ -81,6 +85,8 @@ namespace v2rayN.ViewModels
         [Reactive] public bool TunStrictRoute { get; set; }
         [Reactive] public string TunStack { get; set; }
         [Reactive] public int TunMtu { get; set; }
+        [Reactive] public bool TunEnableExInbound { get; set; }
+        [Reactive] public bool TunEnableIPv6Address { get; set; }
 
         #endregion Tun mode
 
@@ -120,7 +126,9 @@ namespace v2rayN.ViewModels
             defAllowInsecure = _config.coreBasicItem.defAllowInsecure;
             defFingerprint = _config.coreBasicItem.defFingerprint;
             defUserAgent = _config.coreBasicItem.defUserAgent;
-            mux4SboxProtocol = _config.mux4Sbox.protocol;
+            mux4SboxProtocol = _config.mux4SboxItem.protocol;
+            hyUpMbps = _config.hysteriaItem.up_mbps;
+            hyDownMbps = _config.hysteriaItem.down_mbps;
 
             #endregion Core
 
@@ -143,6 +151,7 @@ namespace v2rayN.ViewModels
             KeepOlderDedupl = _config.guiItem.keepOlderDedupl;
             IgnoreGeoUpdateCore = _config.guiItem.ignoreGeoUpdateCore;
             EnableAutoAdjustMainLvColWidth = _config.uiItem.enableAutoAdjustMainLvColWidth;
+            EnableUpdateSubOnlyRemarksExist = _config.uiItem.enableUpdateSubOnlyRemarksExist;
             EnableSecurityProtocolTls13 = _config.guiItem.enableSecurityProtocolTls13;
             AutoHideStartup = _config.uiItem.autoHideStartup;
             EnableCheckPreReleaseUpdate = _config.guiItem.checkPreReleaseUpdate;
@@ -153,6 +162,7 @@ namespace v2rayN.ViewModels
             currentFontFamily = _config.uiItem.currentFontFamily;
             SpeedTestTimeout = _config.speedTestItem.speedTestTimeout;
             SpeedTestUrl = _config.speedTestItem.speedTestUrl;
+            SpeedPingTestUrl = _config.speedTestItem.speedPingTestUrl;
             EnableHWA = _config.guiItem.enableHWA;
             SubConvertUrl = _config.constItem.subConvertUrl;
 
@@ -170,6 +180,8 @@ namespace v2rayN.ViewModels
             TunStrictRoute = _config.tunModeItem.strictRoute;
             TunStack = _config.tunModeItem.stack;
             TunMtu = _config.tunModeItem.mtu;
+            TunEnableExInbound = _config.tunModeItem.enableExInbound;
+            TunEnableIPv6Address = _config.tunModeItem.enableIPv6Address;
 
             #endregion Tun mode
 
@@ -237,21 +249,21 @@ namespace v2rayN.ViewModels
 
         private void SaveSetting()
         {
-            if (Utils.IsNullOrEmpty(localPort.ToString()) || !Utils.IsNumberic(localPort.ToString())
+            if (Utils.IsNullOrEmpty(localPort.ToString()) || !Utils.IsNumeric(localPort.ToString())
                || localPort <= 0 || localPort >= Global.MaxPort)
             {
-                UI.Show(ResUI.FillLocalListeningPort);
+                _noticeHandler?.Enqueue(ResUI.FillLocalListeningPort);
                 return;
             }
 
-            //if (Utils.IsNullOrEmpty(Kcpmtu.ToString()) || !Utils.IsNumberic(Kcpmtu.ToString())
-            //       || Utils.IsNullOrEmpty(Kcptti.ToString()) || !Utils.IsNumberic(Kcptti.ToString())
-            //       || Utils.IsNullOrEmpty(KcpuplinkCapacity.ToString()) || !Utils.IsNumberic(KcpuplinkCapacity.ToString())
-            //       || Utils.IsNullOrEmpty(KcpdownlinkCapacity.ToString()) || !Utils.IsNumberic(KcpdownlinkCapacity.ToString())
-            //       || Utils.IsNullOrEmpty(KcpreadBufferSize.ToString()) || !Utils.IsNumberic(KcpreadBufferSize.ToString())
-            //       || Utils.IsNullOrEmpty(KcpwriteBufferSize.ToString()) || !Utils.IsNumberic(KcpwriteBufferSize.ToString()))
+            //if (Utile.IsNullOrEmpty(Kcpmtu.ToString()) || !Utile.IsNumeric(Kcpmtu.ToString())
+            //       || Utile.IsNullOrEmpty(Kcptti.ToString()) || !Utile.IsNumeric(Kcptti.ToString())
+            //       || Utile.IsNullOrEmpty(KcpuplinkCapacity.ToString()) || !Utile.IsNumeric(KcpuplinkCapacity.ToString())
+            //       || Utile.IsNullOrEmpty(KcpdownlinkCapacity.ToString()) || !Utile.IsNumeric(KcpdownlinkCapacity.ToString())
+            //       || Utile.IsNullOrEmpty(KcpreadBufferSize.ToString()) || !Utile.IsNumeric(KcpreadBufferSize.ToString())
+            //       || Utile.IsNullOrEmpty(KcpwriteBufferSize.ToString()) || !Utile.IsNumeric(KcpwriteBufferSize.ToString()))
             //{
-            //    UI.Show(ResUI.FillKcpParameters);
+            //    _noticeHandler?.Enqueue(ResUI.FillKcpParameters);
             //    return;
             //}
 
@@ -274,7 +286,9 @@ namespace v2rayN.ViewModels
             _config.coreBasicItem.defAllowInsecure = defAllowInsecure;
             _config.coreBasicItem.defFingerprint = defFingerprint;
             _config.coreBasicItem.defUserAgent = defUserAgent;
-            _config.mux4Sbox.protocol = mux4SboxProtocol;
+            _config.mux4SboxItem.protocol = mux4SboxProtocol;
+            _config.hysteriaItem.up_mbps = hyUpMbps;
+            _config.hysteriaItem.down_mbps = hyDownMbps;
 
             //Kcp
             //_config.kcpItem.mtu = Kcpmtu;
@@ -286,12 +300,13 @@ namespace v2rayN.ViewModels
             //_config.kcpItem.congestion = Kcpcongestion;
 
             //UI
-            Utils.SetAutoRun(AutoRun);
+            Utils.SetAutoRun(Global.AutoRunRegPath, Global.AutoRunName, AutoRun);
             _config.guiItem.autoRun = AutoRun;
             _config.guiItem.enableStatistics = EnableStatistics;
             _config.guiItem.keepOlderDedupl = KeepOlderDedupl;
             _config.guiItem.ignoreGeoUpdateCore = IgnoreGeoUpdateCore;
             _config.uiItem.enableAutoAdjustMainLvColWidth = EnableAutoAdjustMainLvColWidth;
+            _config.uiItem.enableUpdateSubOnlyRemarksExist = EnableUpdateSubOnlyRemarksExist;
             _config.guiItem.enableSecurityProtocolTls13 = EnableSecurityProtocolTls13;
             _config.uiItem.autoHideStartup = AutoHideStartup;
             _config.guiItem.autoUpdateInterval = autoUpdateInterval;
@@ -302,6 +317,7 @@ namespace v2rayN.ViewModels
             _config.uiItem.currentFontFamily = currentFontFamily;
             _config.speedTestItem.speedTestTimeout = SpeedTestTimeout;
             _config.speedTestItem.speedTestUrl = SpeedTestUrl;
+            _config.speedTestItem.speedPingTestUrl = SpeedPingTestUrl;
             _config.guiItem.enableHWA = EnableHWA;
             _config.constItem.subConvertUrl = SubConvertUrl;
 
@@ -313,18 +329,20 @@ namespace v2rayN.ViewModels
             _config.tunModeItem.strictRoute = TunStrictRoute;
             _config.tunModeItem.stack = TunStack;
             _config.tunModeItem.mtu = TunMtu;
+            _config.tunModeItem.enableExInbound = TunEnableExInbound;
+            _config.tunModeItem.enableIPv6Address = TunEnableIPv6Address;
 
             //coreType
             SaveCoreType();
 
-            if (ConfigHandler.SaveConfig(ref _config) == 0)
+            if (ConfigHandler.SaveConfig(_config) == 0)
             {
                 _noticeHandler?.Enqueue(ResUI.OperationSuccess);
                 _view.DialogResult = true;
             }
             else
             {
-                UI.ShowWarning(ResUI.OperationFailed);
+                _noticeHandler?.Enqueue(ResUI.OperationFailed);
             }
         }
 
@@ -359,6 +377,9 @@ namespace v2rayN.ViewModels
                     case 6:
                         type = CoreType6;
                         break;
+
+                    default:
+                        continue;
                 }
                 item.coreType = (ECoreType)Enum.Parse(typeof(ECoreType), type);
             }

v2rayN/v2rayN/ViewModels/RoutingRuleDetailsViewModel.cs

@@ -3,9 +3,8 @@ using ReactiveUI.Fody.Helpers;
 using Splat;
 using System.Reactive;
 using System.Windows;
-using v2rayN.Base;
 using v2rayN.Handler;
-using v2rayN.Mode;
+using v2rayN.Model;
 using v2rayN.Resx;
 
 namespace v2rayN.ViewModels
@@ -45,7 +44,7 @@ namespace v2rayN.ViewModels
             if (rulesItem.id.IsNullOrEmpty())
             {
                 rulesItem.id = Utils.GetGUID(false);
-                rulesItem.outboundTag = Global.agentTag;
+                rulesItem.outboundTag = Global.ProxyTag;
                 rulesItem.enabled = true;
                 SelectedSource = rulesItem;
             }
@@ -95,7 +94,7 @@ namespace v2rayN.ViewModels
 
             if (!hasRule)
             {
-                UI.ShowWarning(string.Format(ResUI.RoutingRuleDetailRequiredTips, "Port/Protocol/Domain/IP/Process"));
+                _noticeHandler?.Enqueue(string.Format(ResUI.RoutingRuleDetailRequiredTips, "Port/Protocol/Domain/IP/Process"));
                 return;
             }
             //_noticeHandler?.Enqueue(ResUI.OperationSuccess);

v2rayN/v2rayN/ViewModels/RoutingRuleSettingViewModel.cs

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