up 7.4.1

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

.github/dependabot.yml

@@ -0,0 +1,10 @@
+# Set update schedule for GitHub Actions
+
+version: 2
+updates:
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      # Check for updates to GitHub Actions every daily
+      interval: "daily"

.github/workflows/build-osx.yml

@@ -0,0 +1,32 @@
+name: release macos
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        configuration: [Release]
+
+    runs-on: macos-latest 
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+
+    - name: Build
+      run:  cd v2rayN && 
+        ./build-osx.sh
+
+    - name: Upload build artifacts
+      uses: actions/upload-artifact@v4
+      with:
+        name: v2rayN-osx
+        path: |
+          ./v2rayN/v2rayN-osx.zip
+
+     

.github/workflows/build.yml

@@ -28,7 +28,7 @@ jobs:
 
     - name: Build
       run:  cd v2rayN && 
-        .\build.ps1
+        ./build.ps1
         
     # - name: Package
     #   shell: pwsh
@@ -40,7 +40,7 @@ jobs:
       with:
         name: v2rayN
         path: |
-          .\v2rayN\v2rayN.zip
+          ./v2rayN/v2rayN.zip
 
     # - name: Release
     #   uses: softprops/action-gh-release@v1

.github/workflows/winget-publish.yml

@@ -0,0 +1,31 @@
+name: WinGet submission on release
+# based off of https://github.com/nushell/nushell/blob/main/.github/workflows/winget-submission.yml
+# inspired by https://github.com/microsoft/PowerToys/blob/main/.github/workflows/package-submissions.yml
+# Modified by @MerrickZ https://github.com/anpho
+
+on:
+  workflow_dispatch:
+  release:
+    types: [released]
+
+jobs:
+  winget:
+    name: Publish winget package
+    runs-on: windows-latest
+    steps:
+      - name: Submit v2ray package to Windows Package Manager Community Repository
+        run: |
+
+          $wingetPackage = "2dust.v2rayN"
+          $gitToken = "${{ secrets.PT_WINGET }}"
+
+          $github = Invoke-RestMethod -uri "https://api.github.com/repos/2dust/v2rayN/releases" 
+
+          $targetRelease = $github | Where-Object -Property prerelease -match 'False' | Select -First 1
+          $installerUrl  = $targetRelease | Select -ExpandProperty assets -First 1 | Where-Object -Property name -match 'v2rayN-windows-64-With-Core\.zip*' | Select -ExpandProperty browser_download_url
+
+          $ver = $targetRelease.tag_name
+
+          # getting latest wingetcreate file
+          iwr https://aka.ms/wingetcreate/latest -OutFile wingetcreate.exe
+          .\wingetcreate.exe update $wingetPackage -s -v $ver -u "$installerUrl|x64" -t $gitToken

README.md

@@ -1,5 +1,5 @@
 # v2rayN
-A GUI client for Windows, support [Xray core](https://github.com/XTLS/Xray-core) and [v2fly core](https://github.com/v2fly/v2ray-core) and [others](https://github.com/2dust/v2rayN/wiki/List-of-supported-cores)
+A GUI client for Windows and Linux, support [Xray core](https://github.com/XTLS/Xray-core) and [sing-box-core](https://github.com/SagerNet/sing-box/releases) and [others](https://github.com/2dust/v2rayN/wiki/List-of-supported-cores)
 
 
 [![GitHub commit activity](https://img.shields.io/github/commit-activity/m/2dust/v2rayN)](https://github.com/2dust/v2rayN/commits/master)
@@ -9,13 +9,19 @@ A GUI client for Windows, support [Xray core](https://github.com/XTLS/Xray-core)
 
 
 ## How to use
-- If you are new to this, please download v2rayN-With-Core.zip from [releases](https://github.com/2dust/v2rayN/releases)
-- Otherwise please download v2rayN.zip (you will also need to download cores in the bin directory)
-- Run v2rayN.exe
+Check [Release files introduction](https://github.com/2dust/v2rayN/wiki/Release-files-introduction) and select the version you need to download 
+### Windows
+- Run `v2rayN.exe`
+### Linux
+- `chmod +x v2rayN` Run `./v2rayN` under user permissions
+```
+Debian 9+
+Ubuntu 16.04+
+Fedora 30+
+```
 
 ## Requirements  
-- (6.35 and above)[Microsoft .NET 8.0 Desktop Runtime ](https://dotnet.microsoft.com/en-us/download/dotnet/8.0)
-- (6.33 and below)[Microsoft .NET 6.0 Desktop Runtime ](https://dotnet.microsoft.com/en-us/download/dotnet/6.0)
+- [Microsoft .NET 8.0 Desktop Runtime ](https://dotnet.microsoft.com/en-us/download/dotnet/8.0)
 - [Supported cores](https://github.com/2dust/v2rayN/wiki/List-of-supported-cores)
 
 

v2rayN/AmazTool/AmazTool.csproj

@@ -0,0 +1,27 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+	<Copyright>Copyright © 2017-2024 (GPLv3)</Copyright>
+	<FileVersion>1.3.0</FileVersion>
+  </PropertyGroup>
+ 
+  <ItemGroup>
+    <Compile Update="Resx\Resource.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resource.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+ 
+  <ItemGroup>
+    <EmbeddedResource Update="Resx\Resource.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resource.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+
+</Project>

v2rayN/AmazTool/Program.cs

@@ -0,0 +1,22 @@
+namespace AmazTool
+{
+    internal static class Program
+    {
+        /// <summary>
+        /// 应用程序的主入口点。
+        /// </summary>
+        [STAThread]
+        private static void Main(string[] args)
+        {
+            if (args.Length == 0)
+            {
+                Console.WriteLine(Resx.Resource.Guidelines);
+                Thread.Sleep(5000);
+                return;
+            }
+
+            var fileName = Uri.UnescapeDataString(string.Join(" ", args));
+            UpgradeApp.Upgrade(fileName);
+        }
+    }
+}

v2rayN/AmazTool/Resx/Resource.Designer.cs

@@ -0,0 +1,171 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码由工具生成。
+//     运行时版本:4.0.30319.42000
+//
+//     对此文件的更改可能会导致不正确的行为，并且如果
+//     重新生成代码，这些更改将会丢失。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace AmazTool.Resx {
+    using System;
+    
+    
+    /// <summary>
+    ///   一个强类型的资源类，用于查找本地化的字符串等。
+    /// </summary>
+    // 此类是由 StronglyTypedResourceBuilder
+    // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
+    // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
+    // (以 /str 作为命令选项)，或重新生成 VS 项目。
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resource {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resource() {
+        }
+        
+        /// <summary>
+        ///   返回此类使用的缓存的 ResourceManager 实例。
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("AmazTool.Resx.Resource", typeof(Resource).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   重写当前线程的 CurrentUICulture 属性，对
+        ///   使用此强类型资源类的所有资源查找执行重写。
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Failed to terminate the v2rayN.Close it manually,or the upgrade may fail. 的本地化字符串。
+        /// </summary>
+        internal static string FailedTerminateProcess {
+            get {
+                return ResourceManager.GetString("FailedTerminateProcess", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Failed to extract the update package. 的本地化字符串。
+        /// </summary>
+        internal static string FailedUnzipping {
+            get {
+                return ResourceManager.GetString("FailedUnzipping", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Upgrade failed. 的本地化字符串。
+        /// </summary>
+        internal static string FailedUpgrade {
+            get {
+                return ResourceManager.GetString("FailedUpgrade", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Please run it from the main application. 的本地化字符串。
+        /// </summary>
+        internal static string Guidelines {
+            get {
+                return ResourceManager.GetString("Guidelines", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Information 的本地化字符串。
+        /// </summary>
+        internal static string Information {
+            get {
+                return ResourceManager.GetString("Information", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 In progress, please wait... 的本地化字符串。
+        /// </summary>
+        internal static string InProgress {
+            get {
+                return ResourceManager.GetString("InProgress", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Start v2rayN, please wait... 的本地化字符串。
+        /// </summary>
+        internal static string Restartv2rayN {
+            get {
+                return ResourceManager.GetString("Restartv2rayN", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Start extracting the update package... 的本地化字符串。
+        /// </summary>
+        internal static string StartUnzipping {
+            get {
+                return ResourceManager.GetString("StartUnzipping", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Successfully extracted the update package. 的本地化字符串。
+        /// </summary>
+        internal static string SuccessUnzipping {
+            get {
+                return ResourceManager.GetString("SuccessUnzipping", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Upgrade success. 的本地化字符串。
+        /// </summary>
+        internal static string SuccessUpgrade {
+            get {
+                return ResourceManager.GetString("SuccessUpgrade", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Try to terminate the v2rayN process... 的本地化字符串。
+        /// </summary>
+        internal static string TryTerminateProcess {
+            get {
+                return ResourceManager.GetString("TryTerminateProcess", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Upgrade failed, file not found. 的本地化字符串。
+        /// </summary>
+        internal static string UpgradeFileNotFound {
+            get {
+                return ResourceManager.GetString("UpgradeFileNotFound", resourceCulture);
+            }
+        }
+    }
+}

v2rayN/AmazTool/Resx/Resource.resx

@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Restartv2rayN" xml:space="preserve">
+    <value>Start v2rayN, please wait...</value>
+  </data>
+  <data name="Guidelines" xml:space="preserve">
+    <value>Please run it from the main application.</value>
+  </data>
+  <data name="UpgradeFileNotFound" xml:space="preserve">
+    <value>Upgrade failed, file not found.</value>
+  </data>
+  <data name="InProgress" xml:space="preserve">
+    <value>In progress, please wait...</value>
+  </data>
+  <data name="TryTerminateProcess" xml:space="preserve">
+    <value>Try to terminate the v2rayN process...</value>
+  </data>
+  <data name="FailedTerminateProcess" xml:space="preserve">
+    <value>Failed to terminate the v2rayN.Close it manually,or the upgrade may fail.</value>
+  </data>
+  <data name="StartUnzipping" xml:space="preserve">
+    <value>Start extracting the update package...</value>
+  </data>
+  <data name="SuccessUnzipping" xml:space="preserve">
+    <value>Successfully extracted the update package.</value>
+  </data>
+  <data name="FailedUnzipping" xml:space="preserve">
+    <value>Failed to extract the update package.</value>
+  </data>
+  <data name="FailedUpgrade" xml:space="preserve">
+    <value>Upgrade failed.</value>
+  </data>
+  <data name="SuccessUpgrade" xml:space="preserve">
+    <value>Upgrade success.</value>
+  </data>
+  <data name="Information" xml:space="preserve">
+    <value>Information</value>
+  </data>
+</root>

v2rayN/AmazTool/Resx/Resource.zh-Hans.resx

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -117,8 +117,40 @@
   <resheader name="writer">
     <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="pac" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Resources\pac.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;gb2312</value>
+  <data name="Restartv2rayN" xml:space="preserve">
+    <value>正在重启，请等待...</value>
+  </data>
+  <data name="Guidelines" xml:space="preserve">
+    <value>请从主应用运行。</value>
+  </data>
+  <data name="UpgradeFileNotFound" xml:space="preserve">
+    <value>升级失败，文件不存在。</value>
+  </data>
+  <data name="InProgress" xml:space="preserve">
+    <value>正在进行中，请等待...</value>
+  </data>
+  <data name="TryTerminateProcess" xml:space="preserve">
+    <value>尝试结束 v2rayN 进程...</value>
+  </data>
+  <data name="FailedTerminateProcess" xml:space="preserve">
+    <value>请手动关闭正在运行的v2rayN，否则可能升级失败。</value>
+  </data>
+  <data name="StartUnzipping" xml:space="preserve">
+    <value>开始解压缩更新包...</value>
+  </data>
+  <data name="SuccessUnzipping" xml:space="preserve">
+    <value>解压缩更新包成功。</value>
+  </data>
+  <data name="FailedUnzipping" xml:space="preserve">
+    <value>解压缩更新包失败。</value>
+  </data>
+  <data name="FailedUpgrade" xml:space="preserve">
+    <value>升级失败。</value>
+  </data>
+  <data name="SuccessUpgrade" xml:space="preserve">
+    <value>升级成功。</value>
+  </data>
+  <data name="Information" xml:space="preserve">
+    <value>提示</value>
   </data>
 </root>

v2rayN/AmazTool/UpgradeApp.cs

@@ -0,0 +1,138 @@
+using System.Diagnostics;
+using System.IO.Compression;
+using System.Text;
+
+namespace AmazTool
+{
+    internal class UpgradeApp
+    {
+        public static void Upgrade(string fileName)
+        {
+            Console.WriteLine($"{Resx.Resource.StartUnzipping}\n{fileName}");
+
+            Waiting(9);
+
+            if (!File.Exists(fileName))
+            {
+                Console.WriteLine(Resx.Resource.UpgradeFileNotFound);
+                return;
+            }
+
+            Console.WriteLine(Resx.Resource.TryTerminateProcess);
+            try
+            {
+                var existing = Process.GetProcessesByName(V2rayN);
+                foreach (var pp in existing)
+                {
+                    var path = pp.MainModule?.FileName ?? "";
+                    if (path.StartsWith(GetPath(V2rayN)))
+                    {
+                        pp?.Kill();
+                        pp?.WaitForExit(1000);
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                // Access may be denied without admin right. The user may not be an administrator.
+                Console.WriteLine(Resx.Resource.FailedTerminateProcess + ex.StackTrace);
+            }
+
+            Console.WriteLine(Resx.Resource.StartUnzipping);
+            StringBuilder sb = new();
+            try
+            {
+                string thisAppOldFile = $"{GetExePath()}.tmp";
+                File.Delete(thisAppOldFile);
+                string splitKey = "/";
+
+                using ZipArchive archive = ZipFile.OpenRead(fileName);
+                foreach (ZipArchiveEntry entry in archive.Entries)
+                {
+                    try
+                    {
+                        if (entry.Length == 0)
+                        {
+                            continue;
+                        }
+
+                        Console.WriteLine(entry.FullName);
+
+                        var lst = entry.FullName.Split(splitKey);
+                        if (lst.Length == 1) continue;
+                        string fullName = string.Join(splitKey, lst[1..lst.Length]);
+
+                        if (string.Equals(GetExePath(), GetPath(fullName), StringComparison.OrdinalIgnoreCase))
+                        {
+                            File.Move(GetExePath(), thisAppOldFile);
+                        }
+
+                        string entryOutputPath = GetPath(fullName);
+                        Directory.CreateDirectory(Path.GetDirectoryName(entryOutputPath)!);
+                        entry.ExtractToFile(entryOutputPath, true);
+
+                        Console.WriteLine(entryOutputPath);
+                    }
+                    catch (Exception ex)
+                    {
+                        sb.Append(ex.StackTrace);
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine(Resx.Resource.FailedUpgrade + ex.StackTrace);
+                //return;
+            }
+            if (sb.Length > 0)
+            {
+                Console.WriteLine(Resx.Resource.FailedUpgrade + sb.ToString());
+                //return;
+            }
+
+            Console.WriteLine(Resx.Resource.Restartv2rayN);
+            Waiting(9);
+            Process process = new()
+            {
+                StartInfo = new()
+                {
+                    UseShellExecute = true,
+                    FileName = V2rayN,
+                    WorkingDirectory = StartupPath()
+                }
+            };
+            process.Start();
+        }
+
+        private static string GetExePath()
+        {
+            return Environment.ProcessPath ?? Process.GetCurrentProcess().MainModule?.FileName ?? string.Empty;
+        }
+
+        private static string StartupPath()
+        {
+            return AppDomain.CurrentDomain.BaseDirectory;
+        }
+
+        private static string GetPath(string fileName)
+        {
+            string startupPath = StartupPath();
+            if (string.IsNullOrEmpty(fileName))
+            {
+                return startupPath;
+            }
+            return Path.Combine(startupPath, fileName);
+        }
+
+        private static void Waiting(int second)
+        {
+            for (var i = second; i > 0; i--)
+            {
+                Console.WriteLine(i);
+                Thread.Sleep(1000);
+            }
+        }
+
+        private static string V2rayN => "v2rayN";
+    }
+}

v2rayN/PacLib/PacHandler.cs

@@ -1,102 +0,0 @@
-using System;
-using System.IO;
-using System.Net.Sockets;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PacLib;
-
-public class PacHandler
-{
-    private static string _configPath;
-    private static int _httpPort;
-    private static int _pacPort;
-    private static TcpListener? _tcpListener;
-    private static string _pacText;
-    private static bool _isRunning;
-    private static bool _needRestart = true;
-
-    public static void Start(string configPath, int httpPort, int pacPort)
-    {
-        _needRestart = (configPath != _configPath || httpPort != _httpPort || pacPort != _pacPort || !_isRunning);
-
-        _configPath = configPath;
-        _httpPort = httpPort;
-        _pacPort = pacPort;
-
-        InitText();
-
-        if (_needRestart)
-        {
-            Stop();
-            RunListener();
-        }
-    }
-
-    private static void InitText()
-    {
-        var path = Path.Combine(_configPath, "pac.txt");
-        if (!File.Exists(path))
-        {
-            File.AppendAllText(path, Resources.ResourceManager.GetString("pac"));
-        }
-
-        _pacText = File.ReadAllText(path).Replace("__PROXY__", $"PROXY 127.0.0.1:{_httpPort};DIRECT;");
-    }
-
-    private static void RunListener()
-    {
-        _tcpListener = TcpListener.Create(_pacPort);
-        _isRunning = true;
-        _tcpListener.Start();
-        Task.Factory.StartNew(async () =>
-        {
-            while (_isRunning)
-            {
-                try
-                {
-                    if (!_tcpListener.Pending())
-                    {
-                        await Task.Delay(10);
-                        continue;
-                    }
-
-                    var client = _tcpListener.AcceptTcpClient();
-                    await Task.Run(() =>
-                      {
-                          var stream = client.GetStream();
-                          var sb = new StringBuilder();
-                          sb.AppendLine("HTTP/1.0 200 OK");
-                          sb.AppendLine("Content-type:application/x-ns-proxy-autoconfig");
-                          sb.AppendLine("Connection:close");
-                          sb.AppendLine("Content-Length:" + Encoding.UTF8.GetByteCount(_pacText));
-                          sb.AppendLine();
-                          sb.Append(_pacText);
-                          var content = Encoding.UTF8.GetBytes(sb.ToString());
-                          stream.Write(content, 0, content.Length);
-                          stream.Flush();
-                      });
-                }
-                catch (Exception e)
-                {
-                }
-            }
-        }, TaskCreationOptions.LongRunning);
-    }
-
-    public static void Stop()
-    {
-        if (_tcpListener != null)
-        {
-            try
-            {
-                _isRunning = false;
-                _tcpListener.Stop();
-                _tcpListener = null;
-            }
-            catch (Exception e)
-            {
-            }
-        }
-    }
-}

v2rayN/PacLib/PacLib.csproj

@@ -1,20 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Update="Resources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile> 
-    <EmbeddedResource Update="Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-
-</Project>

v2rayN/PacLib/Resources.Designer.cs

@@ -1,95 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace PacLib {
-    using System;
-    
-    
-    /// <summary>
-    ///   一个强类型的资源类，用于查找本地化的字符串等。
-    /// </summary>
-    // 此类是由 StronglyTypedResourceBuilder
-    // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
-    // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
-    // (以 /str 作为命令选项)，或重新生成 VS 项目。
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources {
-        
-        private static global::System.Resources.ResourceManager resourceMan;
-        
-        private static global::System.Globalization.CultureInfo resourceCulture;
-        
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources() {
-        }
-        
-        /// <summary>
-        ///   返回此类使用的缓存的 ResourceManager 实例。
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
-            get {
-                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("PacLib.Resources", typeof(Resources).Assembly);
-                    resourceMan = temp;
-                }
-                return resourceMan;
-            }
-        }
-        
-        /// <summary>
-        ///   重写当前线程的 CurrentUICulture 属性，对
-        ///   使用此强类型资源类的所有资源查找执行重写。
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
-            get {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-        
-        /// <summary>
-        ///   查找类似 var proxy = &apos;__PROXY__&apos;;
-        ///var rules = [
-        ///    [
-        ///        [],
-        ///        []
-        ///    ],
-        ///    [
-        ///        [
-        ///            &quot;aftygh.gov.tw&quot;,
-        ///            &quot;aide.gov.tw&quot;,
-        ///            &quot;aliyun.com&quot;,
-        ///            &quot;arte.gov.tw&quot;,
-        ///            &quot;baidu.com&quot;,
-        ///            &quot;chinaso.com&quot;,
-        ///            &quot;chinaz.com&quot;,
-        ///            &quot;chukuang.gov.tw&quot;,
-        ///            &quot;cycab.gov.tw&quot;,
-        ///            &quot;dbnsa.gov.tw&quot;,
-        ///            &quot;df.gov.tw&quot;,
-        ///            &quot;eastcoast-nsa.gov.tw&quot;,
-        ///            &quot;erv-nsa.gov.tw&quot;,
-        ///            &quot;grb.gov.tw&quot;,
-        ///            &quot;haosou.com&quot;,
-        ///     [字符串的其余部分被截断]&quot;; 的本地化字符串。
-        /// </summary>
-        internal static string pac {
-            get {
-                return ResourceManager.GetString("pac", resourceCulture);
-            }
-        }
-    }
-}

v2rayN/ProtosLib/ProtosLib.csproj

@@ -1,20 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <Nullable>enable</Nullable>	  
-  </PropertyGroup>
-	
-	<ItemGroup>
-		<Protobuf Include="Statistics.proto" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<PackageReference Include="Google.Protobuf" Version="3.28.0" />
-		<PackageReference Include="Grpc.Net.Client" Version="2.65.0" />
-		<PackageReference Include="Grpc.Tools" Version="2.66.0">
-			<PrivateAssets>all</PrivateAssets>
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-		</PackageReference>
-	</ItemGroup>
-	
-</Project>

v2rayN/ProtosLib/Statistics.proto

@@ -1,53 +0,0 @@
-syntax = "proto3";
-
-package v2ray.core.app.stats.command;
-option csharp_namespace = "ProtosLib.Statistics";
-
-message GetStatsRequest {
-  // Name of the stat counter.
-  string name = 1;
-  // Whether or not to reset the counter to fetching its value.
-  bool reset = 2;
-}
-
-message Stat {
-  string name = 1;
-  int64 value = 2;
-}
-
-message GetStatsResponse {
-  Stat stat = 1;
-}
-
-message QueryStatsRequest {
-  string pattern = 1;
-  bool reset = 2;
-}
-
-message QueryStatsResponse {
-  repeated Stat stat = 1;
-}
-
-message SysStatsRequest {
-}
-
-message SysStatsResponse {
-  uint32 NumGoroutine = 1;
-  uint32 NumGC = 2;
-  uint64 Alloc = 3;
-  uint64 TotalAlloc = 4;
-  uint64 Sys = 5;
-  uint64 Mallocs = 6;
-  uint64 Frees = 7;
-  uint64 LiveObjects = 8;
-  uint64 PauseTotalNs = 9;
-  uint32 Uptime = 10;
-}
-
-service StatsService {
-  rpc GetStats(GetStatsRequest) returns (GetStatsResponse) {}
-  rpc QueryStats(QueryStatsRequest) returns (QueryStatsResponse) {}
-  rpc GetSysStats(SysStatsRequest) returns (SysStatsResponse) {}
-}
-
-message Config {}

v2rayN/ProtosLib/Tests.cs

@@ -1,13 +0,0 @@
-using ProtosLib.Statistics;
-
-namespace ProtosLib
-{
-    public class Tests
-    {
-        private StatsService.StatsServiceClient client_;
-
-        public Tests()
-        {
-        }
-    }
-}

v2rayN/ServiceLib/Base/MyReactiveObject.cs

@@ -6,6 +6,5 @@ namespace ServiceLib.Base
     {
         protected static Config? _config;
         protected Func<EViewAction, object?, Task<bool>>? _updateView;
-        protected NoticeHandler? _noticeHandler;
     }
 }

v2rayN/ServiceLib/Common/AesUtils.cs

@@ -0,0 +1,101 @@
+using System.Security.Cryptography;
+using System.Text;
+
+namespace ServiceLib.Common
+{
+    public class AesUtils
+    {
+        private const int KeySize = 256; // AES-256
+        private const int IvSize = 16;   // AES block size
+        private const int Iterations = 10000;
+        private static readonly byte[] Salt = Encoding.ASCII.GetBytes("saltysalt".PadRight(16, ' ')); // google浏览器默认盐值
+        private static readonly string DefaultPassword = Utils.GetMd5(Utils.GetHomePath() + "AesUtils");
+
+        /// <summary>
+        /// Encrypt
+        /// </summary>
+        /// <param name="text">Plain text</param>
+        /// <param name="password">Password for key derivation or direct key in ASCII bytes</param>
+        /// <returns>Base64 encoded cipher text with IV</returns>
+        public static string Encrypt(string text, string? password = null)
+        {
+            if (string.IsNullOrEmpty(text))
+                return string.Empty;
+
+            var plaintext = Encoding.UTF8.GetBytes(text);
+            var key = GetKey(password);
+            var iv = GenerateIv();
+
+            using var aes = Aes.Create();
+            aes.Key = key;
+            aes.IV = iv;
+
+            using var ms = new MemoryStream();
+            ms.Write(iv, 0, iv.Length);
+
+            using (var cs = new CryptoStream(ms, aes.CreateEncryptor(), CryptoStreamMode.Write))
+            {
+                cs.Write(plaintext, 0, plaintext.Length);
+                cs.FlushFinalBlock();
+            }
+
+            var cipherTextWithIv = ms.ToArray();
+            return Convert.ToBase64String(cipherTextWithIv);
+        }
+
+        /// <summary>
+        /// Decrypt
+        /// </summary>
+        /// <param name="cipherTextWithIv">Base64 encoded cipher text with IV</param>
+        /// <param name="password">Password for key derivation or direct key in ASCII bytes</param>
+        /// <returns>Plain text</returns>
+        public static string Decrypt(string cipherTextWithIv, string? password = null)
+        {
+            if (string.IsNullOrEmpty(cipherTextWithIv))
+                return string.Empty;
+
+            var cipherTextWithIvBytes = Convert.FromBase64String(cipherTextWithIv);
+            var key = GetKey(password);
+
+            var iv = new byte[IvSize];
+            Buffer.BlockCopy(cipherTextWithIvBytes, 0, iv, 0, IvSize);
+
+            var cipherText = new byte[cipherTextWithIvBytes.Length - IvSize];
+            Buffer.BlockCopy(cipherTextWithIvBytes, IvSize, cipherText, 0, cipherText.Length);
+
+            using var aes = Aes.Create();
+            aes.Key = key;
+            aes.IV = iv;
+
+            using var ms = new MemoryStream();
+            using (var cs = new CryptoStream(ms, aes.CreateDecryptor(), CryptoStreamMode.Write))
+            {
+                cs.Write(cipherText, 0, cipherText.Length);
+                cs.FlushFinalBlock();
+            }
+
+            var plainText = ms.ToArray();
+            return Encoding.UTF8.GetString(plainText);
+        }
+
+        private static byte[] GetKey(string? password)
+        {
+            if (password.IsNullOrEmpty())
+            {
+                password = DefaultPassword;
+            }
+
+            using var pbkdf2 = new Rfc2898DeriveBytes(password, Salt, Iterations, HashAlgorithmName.SHA256);
+            return pbkdf2.GetBytes(KeySize / 8);
+        }
+
+        private static byte[] GenerateIv()
+        {
+            var randomNumber = new byte[IvSize];
+
+            using var rng = RandomNumberGenerator.Create();
+            rng.GetBytes(randomNumber);
+            return randomNumber;
+        }
+    }
+}

v2rayN/ServiceLib/Common/DesUtils.cs

@@ -0,0 +1,75 @@
+using System.Security.Cryptography;
+using System.Text;
+
+namespace ServiceLib.Common
+{
+    public class DesUtils
+    {
+        /// <summary>
+        /// Encrypt
+        /// </summary>
+        /// <param name="text"></param>
+        /// /// <param name="key"></param>
+        /// <returns></returns>
+        public static string Encrypt(string? text, string? key = null)
+        {
+            if (text.IsNullOrEmpty())
+            {
+                return string.Empty;
+            }
+            GetKeyIv(key ?? GetDefaultKey(), out var rgbKey, out var rgbIv);
+            var dsp = DES.Create();
+            using var memStream = new MemoryStream();
+            using var cryStream = new CryptoStream(memStream, dsp.CreateEncryptor(rgbKey, rgbIv), CryptoStreamMode.Write);
+            using var sWriter = new StreamWriter(cryStream);
+            sWriter.Write(text);
+            sWriter.Flush();
+            cryStream.FlushFinalBlock();
+            memStream.Flush();
+            return Convert.ToBase64String(memStream.GetBuffer(), 0, (int)memStream.Length);
+        }
+
+        /// <summary>
+        /// Decrypt
+        /// </summary>
+        /// <param name="encryptText"></param>
+        /// <param name="key"></param>
+        /// <returns></returns>
+        public static string Decrypt(string? encryptText, string? key = null)
+        {
+            if (encryptText.IsNullOrEmpty())
+            {
+                return string.Empty;
+            }
+            GetKeyIv(key ?? GetDefaultKey(), out var rgbKey, out var rgbIv);
+            var dsp = DES.Create();
+            var buffer = Convert.FromBase64String(encryptText);
+
+            using var memStream = new MemoryStream();
+            using var cryStream = new CryptoStream(memStream, dsp.CreateDecryptor(rgbKey, rgbIv), CryptoStreamMode.Write);
+            cryStream.Write(buffer, 0, buffer.Length);
+            cryStream.FlushFinalBlock();
+            return Encoding.UTF8.GetString(memStream.ToArray());
+        }
+
+        private static void GetKeyIv(string key, out byte[] rgbKey, out byte[] rgbIv)
+        {
+            if (key.IsNullOrEmpty())
+            {
+                throw new ArgumentNullException("The key cannot be null");
+            }
+            if (key.Length <= 8)
+            {
+                throw new ArgumentNullException("The key length cannot be less than 8 characters.");
+            }
+
+            rgbKey = Encoding.ASCII.GetBytes(key.Substring(0, 8));
+            rgbIv = Encoding.ASCII.GetBytes(key.Insert(0, "w").Substring(0, 8));
+        }
+
+        private static string GetDefaultKey()
+        {
+            return Utils.GetMd5(Utils.GetHomePath() + "DesUtils");
+        }
+    }
+}

v2rayN/ServiceLib/Common/DownloaderHelper.cs

@@ -18,7 +18,7 @@ namespace ServiceLib.Common
             Uri uri = new(url);
             //Authorization Header
             var headers = new WebHeaderCollection();
-            if (!Utils.IsNullOrEmpty(uri.UserInfo))
+            if (Utils.IsNotEmpty(uri.UserInfo))
             {
                 headers.Add(HttpRequestHeader.Authorization, "Basic " + Utils.Base64Encode(uri.UserInfo));
             }
@@ -36,7 +36,7 @@ namespace ServiceLib.Common
                 }
             };
 
-            using var downloader = new DownloadService(downloadOpt);
+            await using var downloader = new Downloader.DownloadService(downloadOpt);
             downloader.DownloadFileCompleted += (sender, value) =>
             {
                 if (value.Error != null)
@@ -46,12 +46,12 @@ namespace ServiceLib.Common
             };
 
             using var cts = new CancellationTokenSource();
-            using var stream = await downloader.DownloadFileTaskAsync(address: url, cts.Token).WaitAsync(TimeSpan.FromSeconds(timeout), cts.Token);
+            await using var stream = await downloader.DownloadFileTaskAsync(address: url, cts.Token).WaitAsync(TimeSpan.FromSeconds(timeout), cts.Token);
             using StreamReader reader = new(stream);
 
             downloadOpt = null;
 
-            return reader.ReadToEnd();
+            return await reader.ReadToEndAsync(cts.Token);
         }
 
         public async Task DownloadDataAsync4Speed(IWebProxy webProxy, string url, IProgress<string> progress, int timeout)
@@ -72,11 +72,11 @@ namespace ServiceLib.Common
                 }
             };
 
-            DateTime totalDatetime = DateTime.Now;
-            int totalSecond = 0;
+            var totalDatetime = DateTime.Now;
+            var totalSecond = 0;
             var hasValue = false;
             double maxSpeed = 0;
-            using var downloader = new DownloadService(downloadOpt);
+            await using var downloader = new Downloader.DownloadService(downloadOpt);
             //downloader.DownloadStarted += (sender, value) =>
             //{
             //    if (progress != null)
@@ -86,7 +86,7 @@ namespace ServiceLib.Common
             //};
             downloader.DownloadProgressChanged += (sender, value) =>
             {
-                TimeSpan ts = (DateTime.Now - totalDatetime);
+                var ts = (DateTime.Now - totalDatetime);
                 if (progress != null && ts.Seconds > totalSecond)
                 {
                     hasValue = true;
@@ -112,7 +112,7 @@ namespace ServiceLib.Common
             //progress.Report("......");
             using var cts = new CancellationTokenSource();
             cts.CancelAfter(timeout * 1000);
-            using var stream = await downloader.DownloadFileTaskAsync(address: url, cts.Token);
+            await using var stream = await downloader.DownloadFileTaskAsync(address: url, cts.Token);
 
             downloadOpt = null;
         }
@@ -145,7 +145,7 @@ namespace ServiceLib.Common
 
             var progressPercentage = 0;
             var hasValue = false;
-            using var downloader = new DownloadService(downloadOpt);
+            await using var downloader = new Downloader.DownloadService(downloadOpt);
             downloader.DownloadStarted += (sender, value) =>
             {
                 progress?.Report(0);
@@ -176,7 +176,7 @@ namespace ServiceLib.Common
             };
 
             using var cts = new CancellationTokenSource();
-            await downloader.DownloadFileTaskAsync(url, fileName, cts.Token).WaitAsync(TimeSpan.FromSeconds(timeout), cts.Token);
+            await downloader.DownloadFileTaskAsync(url, fileName, cts.Token);
 
             downloadOpt = null;
         }

v2rayN/ServiceLib/Common/FileManager.cs

@@ -1,4 +1,5 @@
-using System.IO.Compression;
+using System.Formats.Tar;
+using System.IO.Compression;
 using System.Text;
 
 namespace ServiceLib.Common
@@ -19,11 +20,11 @@ namespace ServiceLib.Common
             return false;
         }
 
-        public static void UncompressedFile(string fileName, byte[] content)
+        public static void DecompressFile(string fileName, byte[] content)
         {
             try
             {
-                using FileStream fs = File.Create(fileName);
+                using var fs = File.Create(fileName);
                 using GZipStream input = new(new MemoryStream(content), CompressionMode.Decompress, false);
                 input.CopyTo(fs);
             }
@@ -33,13 +34,13 @@ namespace ServiceLib.Common
             }
         }
 
-        public static void UncompressedFile(string fileName, string toPath, string? toName)
+        public static void DecompressFile(string fileName, string toPath, string? toName)
         {
             try
             {
                 FileInfo fileInfo = new(fileName);
-                using FileStream originalFileStream = fileInfo.OpenRead();
-                using FileStream decompressedFileStream = File.Create(toName != null ? Path.Combine(toPath, toName) : toPath);
+                using var originalFileStream = fileInfo.OpenRead();
+                using var decompressedFileStream = File.Create(toName != null ? Path.Combine(toPath, toName) : toPath);
                 using GZipStream decompressionStream = new(originalFileStream, CompressionMode.Decompress);
                 decompressionStream.CopyTo(decompressedFileStream);
             }
@@ -49,12 +50,26 @@ namespace ServiceLib.Common
             }
         }
 
+        public static void DecompressTarFile(string fileName, string toPath)
+        {
+            try
+            {
+                using var fs = new FileStream(fileName, FileMode.Open, FileAccess.Read);
+                using var gz = new GZipStream(fs, CompressionMode.Decompress, leaveOpen: true);
+                TarFile.ExtractToDirectory(gz, toPath, overwriteFiles: true);
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+            }
+        }
+
         public static string NonExclusiveReadAllText(string path)
         {
             return NonExclusiveReadAllText(path, Encoding.Default);
         }
 
-        public static string NonExclusiveReadAllText(string path, Encoding encoding)
+        private static string NonExclusiveReadAllText(string path, Encoding encoding)
         {
             try
             {
@@ -73,8 +88,8 @@ namespace ServiceLib.Common
         {
             try
             {
-                using ZipArchive archive = ZipFile.OpenRead(fileName);
-                foreach (ZipArchiveEntry entry in archive.Entries)
+                using var archive = ZipFile.OpenRead(fileName);
+                foreach (var entry in archive.Entries)
                 {
                     if (entry.Length == 0)
                     {
@@ -82,7 +97,7 @@ namespace ServiceLib.Common
                     }
                     try
                     {
-                        if (!Utils.IsNullOrEmpty(ignoredName) && entry.Name.Contains(ignoredName))
+                        if (Utils.IsNotEmpty(ignoredName) && entry.Name.Contains(ignoredName))
                         {
                             continue;
                         }
@@ -102,11 +117,34 @@ namespace ServiceLib.Common
             return true;
         }
 
+        public static List<string>? GetFilesFromZip(string fileName)
+        {
+            if (!File.Exists(fileName))
+            {
+                return null;
+            }
+            try
+            {
+                using var archive = ZipFile.OpenRead(fileName);
+                return archive.Entries.Select(entry => entry.FullName).ToList();
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+                return null;
+            }
+        }
+
         public static bool CreateFromDirectory(string sourceDirectoryName, string destinationArchiveFileName)
         {
             try
             {
-                ZipFile.CreateFromDirectory(sourceDirectoryName, destinationArchiveFileName);
+                if (File.Exists(destinationArchiveFileName))
+                {
+                    File.Delete(destinationArchiveFileName);
+                }
+
+                ZipFile.CreateFromDirectory(sourceDirectoryName, destinationArchiveFileName, CompressionLevel.SmallestSize, true);
             }
             catch (Exception ex)
             {
@@ -116,5 +154,45 @@ namespace ServiceLib.Common
             return true;
         }
 
+        public static void CopyDirectory(string sourceDir, string destinationDir, bool recursive, string? ignoredName)
+        {
+            // Get information about the source directory
+            var dir = new DirectoryInfo(sourceDir);
+
+            // Check if the source directory exists
+            if (!dir.Exists)
+                throw new DirectoryNotFoundException($"Source directory not found: {dir.FullName}");
+
+            // Cache directories before we start copying
+            var dirs = dir.GetDirectories();
+
+            // Create the destination directory
+            Directory.CreateDirectory(destinationDir);
+
+            // Get the files in the source directory and copy to the destination directory
+            foreach (var file in dir.GetFiles())
+            {
+                if (Utils.IsNotEmpty(ignoredName) && file.Name.Contains(ignoredName))
+                {
+                    continue;
+                }
+                if (file.Extension == file.Name)
+                {
+                    continue;
+                }
+                var targetFilePath = Path.Combine(destinationDir, file.Name);
+                file.CopyTo(targetFilePath, true);
+            }
+
+            // If recursive and copying subdirectories, recursively call this method
+            if (recursive)
+            {
+                foreach (var subDir in dirs)
+                {
+                    var newDestinationDir = Path.Combine(destinationDir, subDir.Name);
+                    CopyDirectory(subDir.FullName, newDestinationDir, true, ignoredName);
+                }
+            }
+        }
     }
 }

v2rayN/ServiceLib/Common/HttpClientHelper.cs

@@ -1,4 +1,4 @@
-using System.Net.Http.Headers;
+using System.Net.Http.Headers;
 using System.Net.Mime;
 using System.Text;
 
@@ -10,7 +10,7 @@ namespace ServiceLib.Common
     {
         private static readonly Lazy<HttpClientHelper> _instance = new(() =>
         {
-            HttpClientHandler handler = new() { UseCookies = false };
+            SocketsHttpHandler handler = new() { UseCookies = false };
             HttpClientHelper helper = new(new HttpClient(handler));
             return helper;
         });
@@ -22,12 +22,12 @@ namespace ServiceLib.Common
 
         public async Task<string?> TryGetAsync(string url)
         {
-            if (string.IsNullOrEmpty(url))
+            if (Utils.IsNullOrEmpty(url))
                 return null;
 
             try
             {
-                HttpResponseMessage response = await httpClient.GetAsync(url);
+                var response = await httpClient.GetAsync(url);
                 return await response.Content.ReadAsStringAsync();
             }
             catch
@@ -84,8 +84,8 @@ namespace ServiceLib.Common
             var total = response.Content.Headers.ContentLength ?? -1L;
             var canReportProgress = total != -1 && progress != null;
 
-            using var stream = await response.Content.ReadAsStreamAsync(token);
-            using var file = File.Create(fileName);
+            await using var stream = await response.Content.ReadAsStreamAsync(token);
+            await using var file = File.Create(fileName);
             var totalRead = 0L;
             var buffer = new byte[1024 * 1024];
             var progressPercentage = 0;
@@ -98,7 +98,7 @@ namespace ServiceLib.Common
                 totalRead += read;
 
                 if (read == 0) break;
-                file.Write(buffer, 0, read);
+                await file.WriteAsync(buffer.AsMemory(0, read), token);
 
                 if (canReportProgress)
                 {
@@ -133,13 +133,13 @@ namespace ServiceLib.Common
             //var total = response.Content.Headers.ContentLength.HasValue ? response.Content.Headers.ContentLength.Value : -1L;
             //var canReportProgress = total != -1 && progress != null;
 
-            using var stream = await response.Content.ReadAsStreamAsync(token);
+            await using var stream = await response.Content.ReadAsStreamAsync(token);
             var totalRead = 0L;
             var buffer = new byte[1024 * 64];
             var isMoreToRead = true;
-            string progressSpeed = string.Empty;
-            DateTime totalDatetime = DateTime.Now;
-            int totalSecond = 0;
+            var progressSpeed = string.Empty;
+            var totalDatetime = DateTime.Now;
+            var totalSecond = 0;
 
             do
             {
@@ -168,7 +168,7 @@ namespace ServiceLib.Common
 
                     totalRead += read;
 
-                    TimeSpan ts = (DateTime.Now - totalDatetime);
+                    var ts = (DateTime.Now - totalDatetime);
                     if (progress != null && ts.Seconds > totalSecond)
                     {
                         totalSecond = ts.Seconds;

v2rayN/ServiceLib/Common/Job.cs

@@ -8,7 +8,7 @@ namespace ServiceLib.Common
      * http://stackoverflow.com/questions/6266820/working-example-of-createjobobject-setinformationjobobject-pinvoke-in-net
      */
 
-    public class Job : IDisposable
+    public sealed class Job : IDisposable
     {
         private IntPtr handle = IntPtr.Zero;
 
@@ -73,7 +73,7 @@ namespace ServiceLib.Common
             GC.SuppressFinalize(this);
         }
 
-        protected virtual void Dispose(bool disposing)
+        private void Dispose(bool disposing)
         {
             if (disposed) return;
             disposed = true;

v2rayN/ServiceLib/Common/JsonUtils.cs

@@ -31,7 +31,11 @@ namespace ServiceLib.Common
                 {
                     return default;
                 }
-                return JsonSerializer.Deserialize<T>(strJson);
+                var options = new JsonSerializerOptions
+                {
+                    PropertyNameCaseInsensitive = true
+                };
+                return JsonSerializer.Deserialize<T>(strJson, options);
             }
             catch
             {
@@ -66,10 +70,11 @@ namespace ServiceLib.Common
         /// </summary>
         /// <param name="obj"></param>
         /// <param name="indented"></param>
+        /// <param name="nullValue"></param>
         /// <returns></returns>
-        public static string Serialize(object? obj, bool indented = true)
+        public static string Serialize(object? obj, bool indented = true, bool nullValue = false)
         {
-            string result = string.Empty;
+            var result = string.Empty;
             try
             {
                 if (obj == null)
@@ -78,8 +83,8 @@ namespace ServiceLib.Common
                 }
                 var options = new JsonSerializerOptions
                 {
-                    WriteIndented = indented ? true : false,
-                    DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
+                    WriteIndented = indented,
+                    DefaultIgnoreCondition = nullValue ? JsonIgnoreCondition.Never : JsonIgnoreCondition.WhenWritingNull
                 };
                 result = JsonSerializer.Serialize(obj, options);
             }
@@ -96,38 +101,5 @@ namespace ServiceLib.Common
         /// <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)
-        {
-            if (filePath is null)
-            {
-                return -1;
-            }
-            try
-            {
-                using FileStream file = File.Create(filePath);
-
-                var options = new JsonSerializerOptions
-                {
-                    WriteIndented = true,
-                    DefaultIgnoreCondition = nullValue ? JsonIgnoreCondition.Never : JsonIgnoreCondition.WhenWritingNull
-                };
-
-                JsonSerializer.Serialize(file, obj, options);
-                return 0;
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(ex.Message, ex);
-                return -1;
-            }
-        }
     }
 }

v2rayN/ServiceLib/Common/Logging.cs

@@ -37,40 +37,41 @@ namespace ServiceLib.Common
                     foreach (var filePath in files)
                     {
                         var file = new FileInfo(filePath);
-                        if (file.CreationTime < now)
+                        if (file.CreationTime >= now) continue;
+                        try
                         {
-                            try
-                            {
-                                file.Delete();
-                            }
-                            catch { }
+                            file.Delete();
+                        }
+                        catch
+                        {
+                            // ignored
                         }
                     }
                 }
-                catch { }
+                catch
+                {
+                    // ignored
+                }
             });
         }
 
         public static void SaveLog(string strContent)
         {
-            if (LogManager.IsLoggingEnabled())
-            {
-                var logger = LogManager.GetLogger("Log1");
-                logger.Info(strContent);
-            }
+            if (!LogManager.IsLoggingEnabled()) return;
+
+            LogManager.GetLogger("Log1").Info(strContent);
         }
 
         public static void SaveLog(string strTitle, Exception ex)
         {
-            if (LogManager.IsLoggingEnabled())
+            if (!LogManager.IsLoggingEnabled()) return;
+
+            var logger = LogManager.GetLogger("Log2");
+            logger.Debug($"{strTitle},{ex.Message}");
+            logger.Debug(ex.StackTrace);
+            if (ex?.InnerException != null)
             {
-                var logger = LogManager.GetLogger("Log2");
-                logger.Debug($"{strTitle},{ex.Message}");
-                logger.Debug(ex.StackTrace);
-                if (ex?.InnerException != null)
-                {
-                    logger.Error(ex.InnerException);
-                }
+                logger.Error(ex.InnerException);
             }
         }
     }

v2rayN/ServiceLib/Common/QRCodeHelper.cs

@@ -1,4 +1,6 @@
 using QRCoder;
+using SkiaSharp;
+using ZXing.SkiaSharp;
 
 namespace ServiceLib.Common
 {
@@ -7,9 +9,82 @@ namespace ServiceLib.Common
         public static byte[]? GenQRCode(string? url)
         {
             using QRCodeGenerator qrGenerator = new();
-            using QRCodeData qrCodeData = qrGenerator.CreateQrCode(url ?? string.Empty, QRCodeGenerator.ECCLevel.Q);
+            using var qrCodeData = qrGenerator.CreateQrCode(url ?? string.Empty, QRCodeGenerator.ECCLevel.Q);
             using PngByteQRCode qrCode = new(qrCodeData);
             return qrCode.GetGraphic(20);
         }
+
+        public static string? ParseBarcode(string? fileName)
+        {
+            if (fileName == null || !File.Exists(fileName))
+            {
+                return null;
+            }
+
+            try
+            {
+                var image = SKImage.FromEncodedData(fileName);
+                var bitmap = SKBitmap.FromImage(image);
+
+                return ReaderBarcode(bitmap);
+            }
+            catch
+            {
+                // ignored
+            }
+
+            return null;
+        }
+
+        public static string? ParseBarcode(byte[]? bytes)
+        {
+            try
+            {
+                var bitmap = SKBitmap.Decode(bytes);
+                //using var stream = new FileStream("test2.png", FileMode.Create, FileAccess.Write);
+                //using var image = SKImage.FromBitmap(bitmap);
+                //using var encodedImage = image.Encode();
+                //encodedImage.SaveTo(stream);
+                return ReaderBarcode(bitmap);
+            }
+            catch
+            {
+                // ignored
+            }
+
+            return null;
+        }
+
+        private static string? ReaderBarcode(SKBitmap? bitmap)
+        {
+            var reader = new BarcodeReader();
+            var result = reader.Decode(bitmap);
+
+            if (result != null && Utils.IsNotEmpty(result.Text))
+            {
+                return result.Text;
+            }
+
+            //FlipBitmap
+            var result2 = reader.Decode(FlipBitmap(bitmap));
+            return result2?.Text;
+        }
+
+        private static SKBitmap FlipBitmap(SKBitmap bmp)
+        {
+            // Create a bitmap (to return)
+            var flipped = new SKBitmap(bmp.Width, bmp.Height, bmp.Info.ColorType, bmp.Info.AlphaType);
+
+            // Create a canvas to draw into the bitmap
+            using var canvas = new SKCanvas(flipped);
+
+            // Set a transform matrix which moves the bitmap to the right,
+            // and then "scales" it by -1, which just flips the pixels
+            // horizontally
+            canvas.Translate(bmp.Width, 0);
+            canvas.Scale(-1, 1);
+            canvas.DrawBitmap(bmp, 0, 0);
+            return flipped;
+        }
     }
 }

v2rayN/ServiceLib/Common/QueryableExtension.cs

@@ -1,50 +0,0 @@
-using System.Linq.Expressions;
-using System.Reflection;
-
-namespace ServiceLib.Common
-{
-    public static class QueryableExtension
-    {
-        public static IOrderedQueryable<T> OrderBy<T>(this IQueryable<T> query, string propertyName)
-        {
-            return _OrderBy<T>(query, propertyName, false);
-        }
-
-        public static IOrderedQueryable<T> OrderByDescending<T>(this IQueryable<T> query, string propertyName)
-        {
-            return _OrderBy<T>(query, propertyName, true);
-        }
-
-        private static IOrderedQueryable<T> _OrderBy<T>(IQueryable<T> query, string propertyName, bool isDesc)
-        {
-            string methodname = (isDesc) ? "OrderByDescendingInternal" : "OrderByInternal";
-
-            var memberProp = typeof(T).GetProperty(propertyName);
-
-            var method = typeof(QueryableExtension).GetMethod(methodname)
-                                       .MakeGenericMethod(typeof(T), memberProp.PropertyType);
-
-            return (IOrderedQueryable<T>)method.Invoke(null, new object[] { query, memberProp });
-        }
-
-        public static IOrderedQueryable<T> OrderByInternal<T, TProp>(IQueryable<T> query, PropertyInfo memberProperty)
-        {//public
-            return query.OrderBy(_GetLambda<T, TProp>(memberProperty));
-        }
-
-        public static IOrderedQueryable<T> OrderByDescendingInternal<T, TProp>(IQueryable<T> query, PropertyInfo memberProperty)
-        {//public
-            return query.OrderByDescending(_GetLambda<T, TProp>(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 lambda = Expression.Lambda<Func<T, TProp>>(Expression.Property(thisArg, memberProperty), thisArg);
-
-            return lambda;
-        }
-    }
-}

v2rayN/ServiceLib/Common/SemanticVersion.cs

@@ -15,19 +15,27 @@
             this.version = $"{major}.{minor}.{patch}";
         }
 
-        public SemanticVersion(string version)
+        public SemanticVersion(string? version)
         {
-            this.version = version.RemovePrefix('v');
             try
             {
-                string[] parts = this.version.Split('.');
+                if (version.IsNullOrEmpty())
+                {
+                    this.major = 0;
+                    this.minor = 0;
+                    this.patch = 0;
+                    return;
+                }
+                this.version = version.RemovePrefix('v');
+
+                var parts = this.version.Split('.');
                 if (parts.Length == 2)
                 {
-                    this.major = int.Parse(parts[0]);
-                    this.minor = int.Parse(parts[1]);
+                    this.major = int.Parse(parts.First());
+                    this.minor = int.Parse(parts.Last());
                     this.patch = 0;
                 }
-                else if (parts.Length == 3)
+                else if (parts.Length is 3 or 4)
                 {
                     this.major = int.Parse(parts[0]);
                     this.minor = int.Parse(parts[1]);
@@ -43,7 +51,6 @@
                 this.major = 0;
                 this.minor = 0;
                 this.patch = 0;
-                //this.version = "0.0.0";
             }
         }
 

v2rayN/ServiceLib/Common/SqliteHelper.cs

@@ -10,8 +10,7 @@ namespace ServiceLib.Common
         private string _connstr;
         private SQLiteConnection _db;
         private SQLiteAsyncConnection _dbAsync;
-        private static readonly object objLock = new();
-        public readonly string _configDB = "guiNDB.db";
+        private readonly string _configDB = "guiNDB.db";
 
         public SQLiteHelper()
         {
@@ -25,17 +24,9 @@ namespace ServiceLib.Common
             return _db.CreateTable<T>();
         }
 
-        public int Insert(object model)
+        public async Task<int> InsertAllAsync(IEnumerable models)
         {
-            return _db.Insert(model);
-        }
-
-        public int InsertAll(IEnumerable models)
-        {
-            lock (objLock)
-            {
-                return _db.InsertAll(models);
-            }
+            return await _dbAsync.InsertAllAsync(models);
         }
 
         public async Task<int> InsertAsync(object model)
@@ -43,46 +34,19 @@ namespace ServiceLib.Common
             return await _dbAsync.InsertAsync(model);
         }
 
-        public int Replace(object model)
-        {
-            lock (objLock)
-            {
-                return _db.InsertOrReplace(model);
-            }
-        }
-
         public async Task<int> ReplaceAsync(object model)
         {
             return await _dbAsync.InsertOrReplaceAsync(model);
         }
 
-        public int Update(object model)
-        {
-            lock (objLock)
-            {
-                return _db.Update(model);
-            }
-        }
-
         public async Task<int> UpdateAsync(object model)
         {
             return await _dbAsync.UpdateAsync(model);
         }
 
-        public int UpdateAll(IEnumerable models)
+        public async Task<int> UpdateAllAsync(IEnumerable models)
         {
-            lock (objLock)
-            {
-                return _db.UpdateAll(models);
-            }
-        }
-
-        public int Delete(object model)
-        {
-            lock (objLock)
-            {
-                return _db.Delete(model);
-            }
+            return await _dbAsync.UpdateAllAsync(models);
         }
 
         public async Task<int> DeleteAsync(object model)
@@ -90,19 +54,9 @@ namespace ServiceLib.Common
             return await _dbAsync.DeleteAsync(model);
         }
 
-        public List<T> Query<T>(string sql) where T : new()
+        public async Task<int> DeleteAllAsync<T>()
         {
-            return _db.Query<T>(sql);
-        }
-
-        public async Task<List<T>> QueryAsync<T>(string sql) where T : new()
-        {
-            return await _dbAsync.QueryAsync<T>(sql);
-        }
-
-        public int Execute(string sql)
-        {
-            return _db.Execute(sql);
+            return await _dbAsync.DeleteAllAsync<T>();
         }
 
         public async Task<int> ExecuteAsync(string sql)
@@ -110,9 +64,9 @@ namespace ServiceLib.Common
             return await _dbAsync.ExecuteAsync(sql);
         }
 
-        public TableQuery<T> Table<T>() where T : new()
+        public async Task<List<T>> QueryAsync<T>(string sql) where T : new()
         {
-            return _db.Table<T>();
+            return await _dbAsync.QueryAsync<T>(sql);
         }
 
         public AsyncTableQuery<T> TableAsync<T>() where T : new()

v2rayN/ServiceLib/Common/StringEx.cs

@@ -14,27 +14,25 @@ namespace ServiceLib.Common
             return string.IsNullOrWhiteSpace(value);
         }
 
+        public static bool IsNotEmpty([NotNullWhen(false)] this string? value)
+        {
+            return !string.IsNullOrEmpty(value);
+        }
+
         public static bool BeginWithAny(this string s, IEnumerable<char> chars)
         {
             if (s.IsNullOrEmpty()) return false;
-            return chars.Contains(s[0]);
+            return chars.Contains(s.First());
         }
 
-        public static bool IsWhiteSpace(this string value)
+        private static bool IsWhiteSpace(this string value)
         {
-            foreach (char c in value)
-            {
-                if (char.IsWhiteSpace(c)) continue;
-
-                return false;
-            }
-            return true;
+            return value.All(char.IsWhiteSpace);
         }
 
         public static IEnumerable<string> NonWhiteSpaceLines(this TextReader reader)
         {
-            string? line;
-            while ((line = reader.ReadLine()) != null)
+            while (reader.ReadLine() is { } line)
             {
                 if (line.IsWhiteSpace()) continue;
                 yield return line;
@@ -48,26 +46,12 @@ namespace ServiceLib.Common
 
         public static string RemovePrefix(this string value, char prefix)
         {
-            if (value.StartsWith(prefix))
-            {
-                return value.Substring(1);
-            }
-            else
-            {
-                return value;
-            }
+            return value.StartsWith(prefix) ? value[1..] : value;
         }
 
         public static string RemovePrefix(this string value, string prefix)
         {
-            if (value.StartsWith(prefix))
-            {
-                return value.Substring(prefix.Length);
-            }
-            else
-            {
-                return value;
-            }
+            return value.StartsWith(prefix) ? value[prefix.Length..] : value;
         }
 
         public static string UpperFirstChar(this string value)
@@ -77,17 +61,12 @@ namespace ServiceLib.Common
                 return string.Empty;
             }
 
-            return char.ToUpper(value[0]) + value.Substring(1);
+            return char.ToUpper(value.First()) + value[1..];
         }
 
         public static string AppendQuotes(this string value)
         {
-            if (string.IsNullOrEmpty(value))
-            {
-                return string.Empty;
-            }
-
-            return $"\"{value}\"";
+            return string.IsNullOrEmpty(value) ? string.Empty : $"\"{value}\"";
         }
     }
 }

v2rayN/ServiceLib/Common/WindowsUtils.cs

@@ -0,0 +1,52 @@
+using Microsoft.Win32;
+
+namespace ServiceLib.Common
+{
+    internal static class WindowsUtils
+    {
+        public static string? RegReadValue(string path, string name, string def)
+        {
+            RegistryKey? regKey = null;
+            try
+            {
+                regKey = Registry.CurrentUser.OpenSubKey(path, false);
+                var value = regKey?.GetValue(name) as string;
+                return Utils.IsNullOrEmpty(value) ? def : 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 (Utils.IsNullOrEmpty(value.ToString()))
+                {
+                    regKey?.DeleteValue(name, false);
+                }
+                else
+                {
+                    regKey?.SetValue(name, value);
+                }
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+            }
+            finally
+            {
+                regKey?.Close();
+            }
+        }
+    }
+}

v2rayN/ServiceLib/Common/YamlUtils.cs

@@ -1,4 +1,5 @@
-using YamlDotNet.Serialization;
+using YamlDotNet.Core;
+using YamlDotNet.Serialization;
 using YamlDotNet.Serialization.NamingConventions;
 
 namespace ServiceLib.Common
@@ -20,7 +21,7 @@ namespace ServiceLib.Common
                 .Build();
             try
             {
-                T obj = deserializer.Deserialize<T>(str);
+                var obj = deserializer.Deserialize<T>(str);
                 return obj;
             }
             catch (Exception ex)
@@ -35,13 +36,17 @@ namespace ServiceLib.Common
         /// </summary>
         /// <param name="obj"></param>
         /// <returns></returns>
-        public static string ToYaml(Object obj)
+        public static string ToYaml(object? obj)
         {
+            var result = string.Empty;
+            if (obj == null)
+            {
+                return result;
+            }
             var serializer = new SerializerBuilder()
                     .WithNamingConvention(HyphenatedNamingConvention.Instance)
                     .Build();
 
-            string result = string.Empty;
             try
             {
                 result = serializer.Serialize(obj);
@@ -53,6 +58,24 @@ namespace ServiceLib.Common
             return result;
         }
 
+        public static string? PreprocessYaml(string str)
+        {
+            var deserializer = new DeserializerBuilder()
+                .WithNamingConvention(PascalCaseNamingConvention.Instance)
+                .Build();
+            try
+            {
+                var mergingParser = new MergingParser(new Parser(new StringReader(str)));
+                var obj = new DeserializerBuilder().Build().Deserialize(mergingParser);
+                return ToYaml(obj);
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog("PreprocessYaml", ex);
+                return null;
+            }
+        }
+
         #endregion YAML
     }
 }

v2rayN/ServiceLib/Enums/EConfigType.cs

@@ -5,12 +5,12 @@
         VMess = 1,
         Custom = 2,
         Shadowsocks = 3,
-        Socks = 4,
+        SOCKS = 4,
         VLESS = 5,
         Trojan = 6,
         Hysteria2 = 7,
-        Tuic = 8,
-        Wireguard = 9,
-        Http = 10
+        TUIC = 8,
+        WireGuard = 9,
+        HTTP = 10
     }
 }

v2rayN/ServiceLib/Enums/ECoreType.cs

@@ -4,10 +4,7 @@
     {
         v2fly = 1,
         Xray = 2,
-        SagerNet = 3,
         v2fly_v5 = 4,
-        clash = 11,
-        clash_meta = 12,
         mihomo = 13,
         hysteria = 21,
         naiveproxy = 22,

v2rayN/ServiceLib/Enums/EInboundProtocol.cs

@@ -3,12 +3,11 @@
     public enum EInboundProtocol
     {
         socks = 0,
-        http,
         socks2,
-        http2,
         pac,
         api,
         api2,
+        mixed,
         speedtest = 21
     }
 }

v2rayN/ServiceLib/Enums/EMsgCommand.cs

@@ -0,0 +1,12 @@
+namespace ServiceLib.Enums
+{
+    public enum EMsgCommand
+    {
+        ClearMsg,
+        SendMsgView,
+        SendSnackMsg,
+        RefreshProfiles,
+        StopSpeedtest,
+        AppExit
+    }
+}

v2rayN/ServiceLib/Enums/EPresetType.cs

@@ -0,0 +1,8 @@
+namespace ServiceLib.Enums
+{
+    public enum EPresetType
+    {
+        Default = 0,
+        Russia = 1,
+    }
+}

v2rayN/ServiceLib/Enums/EServerColName.cs

@@ -2,20 +2,20 @@
 {
     public enum EServerColName
     {
-        def = 0,
-        configType,
-        remarks,
-        address,
-        port,
-        network,
-        streamSecurity,
-        subRemarks,
-        delayVal,
-        speedVal,
+        Def = 0,
+        ConfigType,
+        Remarks,
+        Address,
+        Port,
+        Network,
+        StreamSecurity,
+        SubRemarks,
+        DelayVal,
+        SpeedVal,
 
-        todayDown,
-        todayUp,
-        totalDown,
-        totalUp
+        TodayDown,
+        TodayUp,
+        TotalDown,
+        TotalUp
     }
 }

v2rayN/ServiceLib/Enums/ETransport.cs

@@ -6,7 +6,7 @@
         kcp,
         ws,
         httpupgrade,
-        splithttp,
+        xhttp,
         h2,
         http,
         quic,

v2rayN/ServiceLib/Enums/EViewAction.cs

@@ -7,7 +7,6 @@
         SaveFileDialog,
         AddBatchRoutingRulesYesNo,
         AdjustMainLvColWidth,
-        UpdateSysProxy,
         SetClipboardData,
         AddServerViaClipboard,
         ImportRulesFromClipboard,
@@ -16,9 +15,11 @@
         ShareServer,
         ShowHideWindow,
         ScanScreenTask,
+        ScanImageTask,
         Shutdown,
         BrowseServer,
         ImportRulesFromFile,
+        InitSettingFont,
         SubEditWindow,
         RoutingRuleSettingWindow,
         RoutingRuleDetailsWindow,
@@ -40,5 +41,6 @@
         DispatcherRefreshIcon,
         DispatcherCheckUpdate,
         DispatcherCheckUpdateFinished,
+        DispatcherShowMsg,
     }
 }

v2rayN/ServiceLib/Global.cs

@@ -9,10 +9,7 @@
         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 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";
@@ -23,6 +20,7 @@
         public const string JuicityCoreUrl = "https://github.com/juicity/juicity/releases";
         public const string CustomRoutingListUrl = @"https://raw.githubusercontent.com/2dust/v2rayCustomRoutingList/master/";
         public const string SingboxRulesetUrl = @"https://raw.githubusercontent.com/2dust/sing-box-rules/rule-set-{0}/{1}.srs";
+        public const string IPAPIUrl = "https://api.ip.sb/geoip";
 
         public const string PromotionUrl = @"aHR0cHM6Ly85LjIzNDQ1Ni54eXovYWJjLmh0bWw=";
         public const string ConfigFileName = "guiNConfig.json";
@@ -31,21 +29,25 @@
         public const string CoreSpeedtestConfigFileName = "configSpeedtest.json";
         public const string CoreMultipleLoadConfigFileName = "configMultipleLoad.json";
         public const string ClashMixinConfigFileName = "Mixin.yaml";
-        public const string V2raySampleClient = "ServiceLib.Sample.SampleClientConfig";
-        public const string SingboxSampleClient = "ServiceLib.Sample.SingboxSampleClientConfig";
-        public const string V2raySampleHttpRequestFileName = "ServiceLib.Sample.SampleHttpRequest";
-        public const string V2raySampleHttpResponseFileName = "ServiceLib.Sample.SampleHttpResponse";
-        public const string V2raySampleInbound = "ServiceLib.Sample.SampleInbound";
-        public const string V2raySampleOutbound = "ServiceLib.Sample.SampleOutbound";
-        public const string SingboxSampleOutbound = "ServiceLib.Sample.SingboxSampleOutbound";
-        public const string CustomRoutingFileName = "ServiceLib.Sample.custom_routing_";
-        public const string TunSingboxDNSFileName = "ServiceLib.Sample.tun_singbox_dns";
-        public const string TunSingboxInboundFileName = "ServiceLib.Sample.tun_singbox_inbound";
-        public const string TunSingboxRulesFileName = "ServiceLib.Sample.tun_singbox_rules";
-        public const string DNSV2rayNormalFileName = "ServiceLib.Sample.dns_v2ray_normal";
-        public const string DNSSingboxNormalFileName = "ServiceLib.Sample.dns_singbox_normal";
-        public const string ClashMixinYaml = "ServiceLib.Sample.clash_mixin_yaml";
-        public const string ClashTunYaml = "ServiceLib.Sample.clash_tun_yaml";
+
+        public const string NamespaceSample = "ServiceLib.Sample.";
+        public const string V2raySampleClient = NamespaceSample + "SampleClientConfig";
+        public const string SingboxSampleClient = NamespaceSample + "SingboxSampleClientConfig";
+        public const string V2raySampleHttpRequestFileName = NamespaceSample + "SampleHttpRequest";
+        public const string V2raySampleHttpResponseFileName = NamespaceSample + "SampleHttpResponse";
+        public const string V2raySampleInbound = NamespaceSample + "SampleInbound";
+        public const string V2raySampleOutbound = NamespaceSample + "SampleOutbound";
+        public const string SingboxSampleOutbound = NamespaceSample + "SingboxSampleOutbound";
+        public const string CustomRoutingFileName = NamespaceSample + "custom_routing_";
+        public const string TunSingboxDNSFileName = NamespaceSample + "tun_singbox_dns";
+        public const string TunSingboxInboundFileName = NamespaceSample + "tun_singbox_inbound";
+        public const string TunSingboxRulesFileName = NamespaceSample + "tun_singbox_rules";
+        public const string DNSV2rayNormalFileName = NamespaceSample + "dns_v2ray_normal";
+        public const string DNSSingboxNormalFileName = NamespaceSample + "dns_singbox_normal";
+        public const string ClashMixinYaml = NamespaceSample + "clash_mixin_yaml";
+        public const string ClashTunYaml = NamespaceSample + "clash_tun_yaml";
+        public const string LinuxAutostartConfig = NamespaceSample + "linux_autostart_config";
+        public const string PacFileName = NamespaceSample + "pac";
 
         public const string DefaultSecurity = "auto";
         public const string DefaultNetwork = "tcp";
@@ -66,20 +68,17 @@
         public const string AutoRunRegPath = @"Software\Microsoft\Windows\CurrentVersion\Run";
         public const string AutoRunName = "v2rayNAutoRun";
         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 SystemProxyExceptionsWindows = "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 SystemProxyExceptionsLinux = "localhost, 127.0.0.0/8, ::1";
         public const string RoutingRuleComma = "<COMMA>";
         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 CommandSendSnackMsg = "CommandSendSnackMsg";
-        public const string CommandStopSpeedTest = "CommandStopSpeedTest";
-        public const string CommandRefreshProfiles = "CommandRefreshProfiles";
         public const string DelayUnit = "";
         public const string SpeedUnit = "";
-        public const int MinFontSize = 10;
+        public const int MinFontSize = 8;
         public const string RebootAs = "rebootas";
+        public const string AvaAssets = "avares://v2rayN/Assets/";
 
         public static readonly List<string> IEProxyProtocols = new() {
                         "{ip}:{http_port}",
@@ -110,9 +109,9 @@
 
         public static readonly List<string> SpeedTestUrls = new() {
             @"https://speed.cloudflare.com/__down?bytes=100000000",
+            @"https://speed.cloudflare.com/__down?bytes=50000000",
             @"https://speed.cloudflare.com/__down?bytes=10000000",
-            @"http://cachefly.cachefly.net/50mb.test",
-            @"http://cachefly.cachefly.net/10mb.test"
+            @"https://cachefly.cachefly.net/50mb.test",
         };
 
         public static readonly List<string> SpeedPingTestUrls = new() {
@@ -122,6 +121,26 @@
             @"http://www.msftconnecttest.com/connecttest.txt",
         };
 
+        public static readonly List<string> GeoFilesSources = new() {
+            "",
+            @"https://github.com/runetfreedom/russia-v2ray-rules-dat/releases/latest/download/{0}.dat",
+        };
+
+        public static readonly List<string> SingboxRulesetSources = new() {
+            "",
+            @"https://cdn.jsdelivr.net/gh/runetfreedom/russia-v2ray-rules-dat@release/sing-box/rule-set-{0}/{1}.srs",
+        };
+
+        public static readonly List<string> RoutingRulesSources = new() {
+            "",
+            @"https://cdn.jsdelivr.net/gh/runetfreedom/russia-v2ray-custom-routing-list@main/v2rayN/template.json",
+        };
+
+        public static readonly List<string> DNSTemplateSources = new() {
+            "",
+            @"https://cdn.jsdelivr.net/gh/runetfreedom/russia-v2ray-custom-routing-list@main/v2rayN/",
+        };
+
         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" },
@@ -137,52 +156,51 @@
         {
             {EConfigType.VMess,"vmess://"},
             {EConfigType.Shadowsocks,"ss://"},
-            {EConfigType.Socks,"socks://"},
+            {EConfigType.SOCKS,"socks://"},
             {EConfigType.VLESS,"vless://"},
             {EConfigType.Trojan,"trojan://"},
             {EConfigType.Hysteria2,"hysteria2://"},
-            {EConfigType.Tuic,"tuic://"},
-            {EConfigType.Wireguard,"wireguard://"}
+            {EConfigType.TUIC,"tuic://"},
+            {EConfigType.WireGuard,"wireguard://"}
         };
 
         public static readonly Dictionary<EConfigType, string> ProtocolTypes = new()
         {
             {EConfigType.VMess,"vmess"},
             {EConfigType.Shadowsocks,"shadowsocks"},
-            {EConfigType.Socks,"socks"},
-            {EConfigType.Http,"http"},
+            {EConfigType.SOCKS,"socks"},
+            {EConfigType.HTTP,"http"},
             {EConfigType.VLESS,"vless"},
             {EConfigType.Trojan,"trojan"},
             {EConfigType.Hysteria2,"hysteria2"},
-            {EConfigType.Tuic,"tuic"},
-            {EConfigType.Wireguard,"wireguard"}
+            {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", "splithttp", "h2", "quic", "grpc" };
+        public static readonly List<string> Networks = new() { "tcp", "kcp", "ws", "httpupgrade", "xhttp", "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> CoreTypes = 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> XhttpMode = new() { "auto", "packet-up", "stream-up", "stream-one" };
 
         public static readonly List<string> AllowInsecure = new() { "true", "false", "" };
         public static readonly List<string> DomainStrategy4Freedoms = new() { "AsIs", "UseIP", "UseIPv4", "UseIPv6", "" };
         public static readonly List<string> SingboxDomainStrategy4Out = new() { "ipv4_only", "prefer_ipv4", "prefer_ipv6", "ipv6_only", "" };
         public static readonly List<string> DomainDNSAddress = ["223.5.5.5", "223.6.6.6", "localhost"];
         public static readonly List<string> SingboxDomainDNSAddress = ["223.5.5.5", "223.6.6.6", "dhcp://auto"];
-        public static readonly List<string> Languages = new() { "zh-Hans", "zh-Hant", "en", "fa-Ir", "ru" };
+        public static readonly List<string> Languages = new() { "zh-Hans", "zh-Hant", "en", "fa-Ir", "ru", "hu" };
         public static readonly List<string> Alpns = new() { "h3", "h2", "http/1.1", "h3,h2", "h2,http/1.1", "h3,h2,http/1.1", "" };
         public static readonly List<string> LogLevels = new() { "debug", "info", "warning", "error", "none" };
-        public static readonly List<string> InboundTags = new() { "socks", "http", "socks2", "http2" };
+        public static readonly List<string> InboundTags = new() { "socks", "socks2" };
         public static readonly List<string> RuleProtocols = new() { "http", "tls", "bittorrent" };
         public static readonly List<string> RuleNetworks = new() { "", "tcp", "udp", "tcp,udp" };
         public static readonly List<string> destOverrideProtocols = ["http", "tls", "quic", "fakedns", "fakedns+others"];
@@ -192,9 +210,9 @@
         public static readonly List<string> SingboxMuxs = new() { "h2mux", "smux", "yamux", "" };
         public static readonly List<string> TuicCongestionControls = new() { "cubic", "new_reno", "bbr" };
 
-        public static readonly List<string> allowSelectType = new List<string> { "selector", "urltest", "loadbalance", "fallback" };
-        public static readonly List<string> notAllowTestType = new List<string> { "selector", "urltest", "direct", "reject", "compatible", "pass", "loadbalance", "fallback" };
-        public static readonly List<string> proxyVehicleType = new List<string> { "file", "http" };
+        public static readonly List<string> allowSelectType = new() { "selector", "urltest", "loadbalance", "fallback" };
+        public static readonly List<string> notAllowTestType = new() { "selector", "urltest", "direct", "reject", "compatible", "pass", "loadbalance", "fallback" };
+        public static readonly List<string> proxyVehicleType = new() { "file", "http" };
 
         #endregion const
     }

v2rayN/ServiceLib/GlobalUsings.cs

@@ -2,8 +2,10 @@
 global using ServiceLib.Common;
 global using ServiceLib.Enums;
 global using ServiceLib.Handler;
-global using ServiceLib.Handler.CoreConfig;
 global using ServiceLib.Handler.Fmt;
-global using ServiceLib.Handler.Statistics;
+global using ServiceLib.Services;
+global using ServiceLib.Services.Statistics;
+global using ServiceLib.Services.CoreConfig;
 global using ServiceLib.Models;
 global using ServiceLib.Resx;
+global using ServiceLib.Handler.SysProxy;

v2rayN/ServiceLib/Handler/AppHandler.cs

@@ -0,0 +1,279 @@
+namespace ServiceLib.Handler
+{
+    public sealed class AppHandler
+    {
+        #region Property
+
+        private static readonly Lazy<AppHandler> _instance = new(() => new());
+        private Config _config;
+        private int? _statePort;
+        private int? _statePort2;
+        private Job? _processJob;
+        private bool? _isAdministrator;
+        public static AppHandler Instance => _instance.Value;
+        public Config Config => _config;
+
+        public int StatePort
+        {
+            get
+            {
+                _statePort ??= Utils.GetFreePort(GetLocalPort(EInboundProtocol.api));
+                return _statePort.Value;
+            }
+        }
+
+        public int StatePort2
+        {
+            get
+            {
+                _statePort2 ??= Utils.GetFreePort(GetLocalPort(EInboundProtocol.api2));
+                return _statePort2.Value + (_config.TunModeItem.EnableTun ? 1 : 0);
+            }
+        }
+
+        public bool IsAdministrator
+        {
+            get
+            {
+                _isAdministrator ??= Utils.IsAdministrator();
+                return _isAdministrator.Value;
+            }
+        }
+
+        #endregion Property
+
+        #region Init
+
+        public bool InitApp()
+        {
+            if (Utils.IsNonWindows() && Utils.HasWritePermission() == false)
+            {
+                Environment.SetEnvironmentVariable("V2RAYN_LOCAL_APPLICATION_DATA", "1", EnvironmentVariableTarget.Process);
+            }
+
+            Logging.Setup();
+            var config = ConfigHandler.LoadConfig();
+            if (config == null)
+            {
+                return false;
+            }
+            _config = config;
+            Thread.CurrentThread.CurrentUICulture = new(_config.UiItem.CurrentLanguage);
+
+            //Under Win10
+            if (Utils.IsWindows() && Environment.OSVersion.Version.Major < 10)
+            {
+                Environment.SetEnvironmentVariable("DOTNET_EnableWriteXorExecute", "0", EnvironmentVariableTarget.User);
+            }
+
+            SQLiteHelper.Instance.CreateTable<SubItem>();
+            SQLiteHelper.Instance.CreateTable<ProfileItem>();
+            SQLiteHelper.Instance.CreateTable<ServerStatItem>();
+            SQLiteHelper.Instance.CreateTable<RoutingItem>();
+            SQLiteHelper.Instance.CreateTable<ProfileExItem>();
+            SQLiteHelper.Instance.CreateTable<DNSItem>();
+            return true;
+        }
+
+        public bool InitComponents()
+        {
+            Logging.SaveLog($"v2rayN start up | {Utils.GetVersion()} | {Utils.GetExePath()}");
+            Logging.SaveLog($"{Environment.OSVersion} - {(Environment.Is64BitOperatingSystem ? 64 : 32)}");
+            Logging.LoggingEnabled(_config.GuiItem.EnableLog);
+            Logging.ClearLogs();
+
+            return true;
+        }
+
+        public bool Reset()
+        {
+            _statePort = null;
+            _statePort2 = null;
+            return true;
+        }
+
+        #endregion Init
+
+        #region Config
+
+        public int GetLocalPort(EInboundProtocol protocol)
+        {
+            var localPort = _config.Inbound.FirstOrDefault(t => t.Protocol == nameof(EInboundProtocol.socks))?.LocalPort ?? 10808;
+            return localPort + (int)protocol;
+        }
+
+        public void AddProcess(IntPtr processHandle)
+        {
+            if (Utils.IsWindows())
+            {
+                _processJob ??= new();
+                _processJob?.AddProcess(processHandle);
+            }
+        }
+
+        #endregion Config
+
+        #region SqliteHelper
+
+        public async Task<List<SubItem>?> SubItems()
+        {
+            return await SQLiteHelper.Instance.TableAsync<SubItem>().OrderBy(t => t.Sort).ToListAsync();
+        }
+
+        public async Task<SubItem?> GetSubItem(string subid)
+        {
+            return await SQLiteHelper.Instance.TableAsync<SubItem>().FirstOrDefaultAsync(t => t.Id == subid);
+        }
+
+        public async Task<List<ProfileItem>?> ProfileItems(string subid)
+        {
+            if (Utils.IsNullOrEmpty(subid))
+            {
+                return await SQLiteHelper.Instance.TableAsync<ProfileItem>().ToListAsync();
+            }
+            else
+            {
+                return await SQLiteHelper.Instance.TableAsync<ProfileItem>().Where(t => t.Subid == subid).ToListAsync();
+            }
+        }
+
+        public async Task<List<string>?> ProfileItemIndexes(string subid)
+        {
+            return (await ProfileItems(subid))?.Select(t => t.IndexId)?.ToList();
+        }
+
+        public async Task<List<ProfileItemModel>?> ProfileItems(string subid, string filter)
+        {
+            var sql = @$"select a.*
+                           ,b.remarks subRemarks
+                        from ProfileItem a
+                        left join SubItem b on a.subid = b.id
+                        where 1=1 ";
+            if (Utils.IsNotEmpty(subid))
+            {
+                sql += $" and a.subid = '{subid}'";
+            }
+            if (Utils.IsNotEmpty(filter))
+            {
+                if (filter.Contains('\''))
+                {
+                    filter = filter.Replace("'", "");
+                }
+                sql += string.Format(" and (a.remarks like '%{0}%' or a.address like '%{0}%') ", filter);
+            }
+
+            return await SQLiteHelper.Instance.QueryAsync<ProfileItemModel>(sql);
+        }
+
+        public async Task<List<ProfileItemModel>?> ProfileItemsEx(string subid, string filter)
+        {
+            var lstModel = await ProfileItems(_config.SubIndexId, filter);
+
+            await ConfigHandler.SetDefaultServer(_config, lstModel);
+
+            var lstServerStat = (_config.GuiItem.EnableStatistics ? StatisticsHandler.Instance.ServerStat : null) ?? [];
+            var lstProfileExs = await ProfileExHandler.Instance.GetProfileExs();
+            lstModel = (from t in lstModel
+                        join t2 in lstServerStat on t.IndexId equals t2.IndexId into t2b
+                        from t22 in t2b.DefaultIfEmpty()
+                        join t3 in lstProfileExs on t.IndexId equals t3.IndexId into t3b
+                        from t33 in t3b.DefaultIfEmpty()
+                        select new ProfileItemModel
+                        {
+                            IndexId = t.IndexId,
+                            ConfigType = t.ConfigType,
+                            Remarks = t.Remarks,
+                            Address = t.Address,
+                            Port = t.Port,
+                            Security = t.Security,
+                            Network = t.Network,
+                            StreamSecurity = t.StreamSecurity,
+                            Subid = t.Subid,
+                            SubRemarks = t.SubRemarks,
+                            IsActive = t.IndexId == _config.IndexId,
+                            Sort = t33 == null ? 0 : t33.Sort,
+                            Delay = t33 == null ? 0 : t33.Delay,
+                            DelayVal = t33?.Delay != 0 ? $"{t33?.Delay} {Global.DelayUnit}" : string.Empty,
+                            SpeedVal = t33?.Speed != 0 ? $"{t33?.Speed} {Global.SpeedUnit}" : string.Empty,
+                            TodayDown = t22 == null ? "" : Utils.HumanFy(t22.TodayDown),
+                            TodayUp = t22 == null ? "" : Utils.HumanFy(t22.TodayUp),
+                            TotalDown = t22 == null ? "" : Utils.HumanFy(t22.TotalDown),
+                            TotalUp = t22 == null ? "" : Utils.HumanFy(t22.TotalUp)
+                        }).OrderBy(t => t.Sort).ToList();
+
+            return lstModel;
+        }
+
+        public async Task<ProfileItem?> GetProfileItem(string indexId)
+        {
+            if (Utils.IsNullOrEmpty(indexId))
+            {
+                return null;
+            }
+            return await SQLiteHelper.Instance.TableAsync<ProfileItem>().FirstOrDefaultAsync(it => it.IndexId == indexId);
+        }
+
+        public async Task<ProfileItem?> GetProfileItemViaRemarks(string? remarks)
+        {
+            if (Utils.IsNullOrEmpty(remarks))
+            {
+                return null;
+            }
+            return await SQLiteHelper.Instance.TableAsync<ProfileItem>().FirstOrDefaultAsync(it => it.Remarks == remarks);
+        }
+
+        public async Task<List<RoutingItem>?> RoutingItems()
+        {
+            return await SQLiteHelper.Instance.TableAsync<RoutingItem>().OrderBy(t => t.Sort).ToListAsync();
+        }
+
+        public async Task<RoutingItem?> GetRoutingItem(string id)
+        {
+            return await SQLiteHelper.Instance.TableAsync<RoutingItem>().FirstOrDefaultAsync(it => it.Id == id);
+        }
+
+        public async Task<List<DNSItem>?> DNSItems()
+        {
+            return await SQLiteHelper.Instance.TableAsync<DNSItem>().ToListAsync();
+        }
+
+        public async Task<DNSItem?> GetDNSItem(ECoreType eCoreType)
+        {
+            return await SQLiteHelper.Instance.TableAsync<DNSItem>().FirstOrDefaultAsync(it => it.CoreType == eCoreType);
+        }
+
+        #endregion SqliteHelper
+
+        #region Core Type
+
+        public List<string> GetShadowsocksSecurities(ProfileItem profileItem)
+        {
+            var coreType = GetCoreType(profileItem, EConfigType.Shadowsocks);
+            switch (coreType)
+            {
+                case ECoreType.v2fly:
+                    return Global.SsSecurities;
+
+                case ECoreType.Xray:
+                    return Global.SsSecuritiesInXray;
+
+                case ECoreType.sing_box:
+                    return Global.SsSecuritiesInSingbox;
+            }
+            return Global.SsSecuritiesInSingbox;
+        }
+
+        public ECoreType GetCoreType(ProfileItem profileItem, EConfigType eConfigType)
+        {
+            if (profileItem?.CoreType != null)
+            {
+                return (ECoreType)profileItem.CoreType;
+            }
+
+            var item = _config.CoreTypeItem?.FirstOrDefault(it => it.ConfigType == eConfigType);
+            return item?.CoreType ?? ECoreType.Xray;
+        }
+
+        #endregion Core Type
+    }
+}

v2rayN/ServiceLib/Handler/AutoStartupHandler.cs

@@ -0,0 +1,159 @@
+using System.Security.Principal;
+using System.Text.RegularExpressions;
+
+namespace ServiceLib.Handler
+{
+    public static class AutoStartupHandler
+    {
+        public static async Task<bool> UpdateTask(Config config)
+        {
+            if (Utils.IsWindows())
+            {
+                await ClearTaskWindows();
+
+                if (config.GuiItem.AutoRun)
+                {
+                    await SetTaskWindows();
+                }
+            }
+            else if (Utils.IsLinux())
+            {
+                await ClearTaskLinux();
+
+                if (config.GuiItem.AutoRun)
+                {
+                    await SetTaskLinux();
+                }
+            }
+            else if (Utils.IsOSX())
+            {
+                //TODO
+            }
+
+            return true;
+        }
+
+        #region Windows
+
+        private static async Task ClearTaskWindows()
+        {
+            var autoRunName = GetAutoRunNameWindows();
+            WindowsUtils.RegWriteValue(Global.AutoRunRegPath, autoRunName, "");
+            if (Utils.IsAdministrator())
+            {
+                AutoStartTaskService(autoRunName, "", "");
+            }
+        }
+
+        private static async Task SetTaskWindows()
+        {
+            try
+            {
+                var autoRunName = GetAutoRunNameWindows();
+                var exePath = Utils.GetExePath();
+                if (Utils.IsAdministrator())
+                {
+                    AutoStartTaskService(autoRunName, exePath, "");
+                }
+                else
+                {
+                    WindowsUtils.RegWriteValue(Global.AutoRunRegPath, autoRunName, exePath.AppendQuotes());
+                }
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+            }
+        }
+
+        /// <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 AutoStartTaskService(string taskName, string fileName, string description)
+        {
+            if (Utils.IsNullOrEmpty(taskName))
+            {
+                return;
+            }
+
+            var logonUser = WindowsIdentity.GetCurrent().Name;
+            using var taskService = new Microsoft.Win32.TaskScheduler.TaskService();
+            var tasks = taskService.RootFolder.GetTasks(new Regex(taskName));
+            if (Utils.IsNullOrEmpty(fileName))
+            {
+                foreach (var t in tasks)
+                {
+                    taskService.RootFolder.DeleteTask(t.Name);
+                }
+                return;
+            }
+
+            var task = taskService.NewTask();
+            task.RegistrationInfo.Description = description;
+            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 Microsoft.Win32.TaskScheduler.LogonTrigger { UserId = logonUser, Delay = TimeSpan.FromSeconds(10) });
+            task.Principal.RunLevel = Microsoft.Win32.TaskScheduler.TaskRunLevel.Highest;
+            task.Actions.Add(new Microsoft.Win32.TaskScheduler.ExecAction(fileName.AppendQuotes(), null, Path.GetDirectoryName(fileName)));
+
+            taskService.RootFolder.RegisterTaskDefinition(taskName, task);
+        }
+
+        private static string GetAutoRunNameWindows()
+        {
+            return $"{Global.AutoRunName}_{Utils.GetMd5(Utils.StartupPath())}";
+        }
+
+        #endregion Windows
+
+        #region Linux
+
+        private static async Task ClearTaskLinux()
+        {
+            try
+            {
+                File.Delete(GetHomePathLinux());
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+            }
+        }
+
+        private static async Task SetTaskLinux()
+        {
+            try
+            {
+                var linuxConfig = Utils.GetEmbedText(Global.LinuxAutostartConfig);
+                if (linuxConfig.IsNotEmpty())
+                {
+                    linuxConfig = linuxConfig.Replace("$ExecPath$", Utils.GetExePath());
+                    Logging.SaveLog(linuxConfig);
+
+                    var homePath = GetHomePathLinux();
+                    await File.WriteAllTextAsync(homePath, linuxConfig);
+                }
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+            }
+        }
+
+        private static string GetHomePathLinux()
+        {
+            var homePath = Path.Combine(Utils.GetHomePath(), ".config", "autostart", $"{Global.AppName}.desktop");
+            Directory.CreateDirectory(Path.GetDirectoryName(homePath));
+            return homePath;
+        }
+
+        #endregion Linux
+    }
+}

v2rayN/ServiceLib/Handler/ClashApiHandler.cs

@@ -7,15 +7,10 @@ namespace ServiceLib.Handler
         private static readonly Lazy<ClashApiHandler> instance = new(() => new());
         public static ClashApiHandler Instance => instance.Value;
 
-        private Dictionary<String, ProxiesItem>? _proxies;
+        private Dictionary<string, ProxiesItem>? _proxies;
         public Dictionary<string, object> ProfileContent { get; set; }
 
-        public void GetClashProxies(Config config, Action<ClashProxies, ClashProviders> update)
-        {
-            Task.Run(() => GetClashProxiesAsync(config, update));
-        }
-
-        private async Task GetClashProxiesAsync(Config config, Action<ClashProxies, ClashProviders> update)
+        public async Task<Tuple<ClashProxies, ClashProviders>?> GetClashProxiesAsync(Config config)
         {
             for (var i = 0; i < 5; i++)
             {
@@ -30,74 +25,75 @@ namespace ServiceLib.Handler
                 if (clashProxies != null || clashProviders != null)
                 {
                     _proxies = clashProxies?.proxies;
-                    update(clashProxies, clashProviders);
-                    return;
+                    return new Tuple<ClashProxies, ClashProviders>(clashProxies, clashProviders);
                 }
-                Task.Delay(5000).Wait();
+
+                await Task.Delay(2000);
             }
-            update(null, null);
+
+            return null;
         }
 
-        public void ClashProxiesDelayTest(bool blAll, List<ClashProxyModel> lstProxy, Action<ClashProxyModel?, string> update)
+        public void ClashProxiesDelayTest(bool blAll, List<ClashProxyModel> lstProxy, Action<ClashProxyModel?, string> updateFunc)
         {
             Task.Run(() =>
+        {
+            if (blAll)
             {
-                if (blAll)
+                for (int i = 0; i < 5; i++)
                 {
-                    for (int i = 0; i < 5; i++)
+                    if (_proxies != null)
                     {
-                        if (_proxies != null)
-                        {
-                            break;
-                        }
-                        Task.Delay(5000).Wait();
-                    }
-                    if (_proxies == null)
-                    {
-                        return;
-                    }
-                    lstProxy = new List<ClashProxyModel>();
-                    foreach (KeyValuePair<string, ProxiesItem> kv in _proxies)
-                    {
-                        if (Global.notAllowTestType.Contains(kv.Value.type.ToLower()))
-                        {
-                            continue;
-                        }
-                        lstProxy.Add(new ClashProxyModel()
-                        {
-                            name = kv.Value.name,
-                            type = kv.Value.type.ToLower(),
-                        });
+                        break;
                     }
+                    Task.Delay(5000).Wait();
                 }
-
-                if (lstProxy == null)
+                if (_proxies == null)
                 {
                     return;
                 }
-                var urlBase = $"{GetApiUrl()}/proxies";
-                urlBase += @"/{0}/delay?timeout=10000&url=" + LazyConfig.Instance.Config.speedTestItem.speedPingTestUrl;
-
-                List<Task> tasks = new List<Task>();
-                foreach (var it in lstProxy)
+                lstProxy = new List<ClashProxyModel>();
+                foreach (KeyValuePair<string, ProxiesItem> kv in _proxies)
                 {
-                    if (Global.notAllowTestType.Contains(it.type.ToLower()))
+                    if (Global.notAllowTestType.Contains(kv.Value.type.ToLower()))
                     {
                         continue;
                     }
-                    var name = it.name;
-                    var url = string.Format(urlBase, name);
-                    tasks.Add(Task.Run(async () =>
+                    lstProxy.Add(new ClashProxyModel()
                     {
-                        var result = await HttpClientHelper.Instance.TryGetAsync(url);
-                        update(it, result);
-                    }));
+                        Name = kv.Value.name,
+                        Type = kv.Value.type.ToLower(),
+                    });
                 }
-                Task.WaitAll(tasks.ToArray());
+            }
 
-                Task.Delay(1000).Wait();
-                update(null, "");
-            });
+            if (lstProxy == null)
+            {
+                return;
+            }
+            var urlBase = $"{GetApiUrl()}/proxies";
+            urlBase += @"/{0}/delay?timeout=10000&url=" + AppHandler.Instance.Config.SpeedTestItem.SpeedPingTestUrl;
+
+            List<Task> tasks = new List<Task>();
+            foreach (var it in lstProxy)
+            {
+                if (Global.notAllowTestType.Contains(it.Type.ToLower()))
+                {
+                    continue;
+                }
+                var name = it.Name;
+                var url = string.Format(urlBase, name);
+                tasks.Add(Task.Run(async () =>
+                {
+                    var result = await HttpClientHelper.Instance.TryGetAsync(url);
+                    updateFunc?.Invoke(it, result);
+                }));
+            }
+            Task.WaitAll(tasks.ToArray());
+
+            Task.Delay(1000).Wait();
+            updateFunc?.Invoke(null, "");
+        });
         }
 
         public List<ProxiesItem>? GetClashProxyGroups()
@@ -118,7 +114,7 @@ namespace ServiceLib.Handler
             }
         }
 
-        public async void ClashSetActiveProxy(string name, string nameNode)
+        public async Task ClashSetActiveProxy(string name, string nameNode)
         {
             try
             {
@@ -133,24 +129,21 @@ namespace ServiceLib.Handler
             }
         }
 
-        public void ClashConfigUpdate(Dictionary<string, string> headers)
+        public async Task ClashConfigUpdate(Dictionary<string, string> headers)
         {
-            Task.Run(async () =>
+            if (_proxies == null)
             {
-                if (_proxies == null)
-                {
-                    return;
-                }
+                return;
+            }
 
-                var urlBase = $"{GetApiUrl()}/configs";
+            var urlBase = $"{GetApiUrl()}/configs";
 
-                await HttpClientHelper.Instance.PatchAsync(urlBase, headers);
-            });
+            await HttpClientHelper.Instance.PatchAsync(urlBase, headers);
         }
 
-        public async void ClashConfigReload(string filePath)
+        public async Task ClashConfigReload(string filePath)
         {
-            ClashConnectionClose("");
+            await ClashConnectionClose("");
             try
             {
                 var url = $"{GetApiUrl()}/configs?force=true";
@@ -164,12 +157,7 @@ namespace ServiceLib.Handler
             }
         }
 
-        public void GetClashConnections(Config config, Action<ClashConnections> update)
-        {
-            Task.Run(() => GetClashConnectionsAsync(config, update));
-        }
-
-        private async Task GetClashConnectionsAsync(Config config, Action<ClashConnections> update)
+        public async Task<ClashConnections?> GetClashConnectionsAsync(Config config)
         {
             try
             {
@@ -177,15 +165,17 @@ namespace ServiceLib.Handler
                 var result = await HttpClientHelper.Instance.TryGetAsync(url);
                 var clashConnections = JsonUtils.Deserialize<ClashConnections>(result);
 
-                update(clashConnections);
+                return clashConnections;
             }
             catch (Exception ex)
             {
                 Logging.SaveLog(ex.Message, ex);
             }
+
+            return null;
         }
 
-        public async void ClashConnectionClose(string id)
+        public async Task ClashConnectionClose(string id)
         {
             try
             {
@@ -200,7 +190,7 @@ namespace ServiceLib.Handler
 
         private string GetApiUrl()
         {
-            return $"{Global.HttpProtocol}{Global.Loopback}:{LazyConfig.Instance.StatePort2}";
+            return $"{Global.HttpProtocol}{Global.Loopback}:{AppHandler.Instance.StatePort2}";
         }
     }
 }

v2rayN/ServiceLib/Handler/CoreConfig/CoreConfigHandler.cs

@@ -1,171 +0,0 @@
-namespace ServiceLib.Handler.CoreConfig
-{
-    /// <summary>
-    /// Core configuration file processing class
-    /// </summary>
-    public class CoreConfigHandler
-    {
-        public static int GenerateClientConfig(ProfileItem node, string? fileName, out string msg, out string content)
-        {
-            content = string.Empty;
-            try
-            {
-                if (node == null)
-                {
-                    msg = ResUI.CheckServerSettings;
-                    return -1;
-                }
-                var config = LazyConfig.Instance.Config;
-
-                msg = ResUI.InitialConfiguration;
-                if (node.configType == EConfigType.Custom)
-                {
-                    if (node.coreType is ECoreType.clash or ECoreType.clash_meta or ECoreType.mihomo)
-                    {
-                        var configGenClash = new CoreConfigClash(config);
-                        return configGenClash.GenerateClientCustomConfig(node, fileName, out msg);
-                    }
-                    if (node.coreType is ECoreType.sing_box)
-                    {
-                        var configGenSingbox = new CoreConfigSingbox(config);
-                        return configGenSingbox.GenerateClientCustomConfig(node, fileName, out msg);
-                    }
-                    else
-                    {
-                        return GenerateClientCustomConfig(node, fileName, out msg);
-                    }
-                }
-                else if (LazyConfig.Instance.GetCoreType(node, node.configType) == ECoreType.sing_box)
-                {
-                    var configGenSingbox = new CoreConfigSingbox(config);
-                    if (configGenSingbox.GenerateClientConfigContent(node, out SingboxConfig? singboxConfig, out msg) != 0)
-                    {
-                        return -1;
-                    }
-                    if (Utils.IsNullOrEmpty(fileName))
-                    {
-                        content = JsonUtils.Serialize(singboxConfig);
-                    }
-                    else
-                    {
-                        JsonUtils.ToFile(singboxConfig, fileName, false);
-                    }
-                }
-                else
-                {
-                    var coreConfigV2ray = new CoreConfigV2ray(config);
-                    if (coreConfigV2ray.GenerateClientConfigContent(node, out V2rayConfig? v2rayConfig, out msg) != 0)
-                    {
-                        return -1;
-                    }
-                    if (Utils.IsNullOrEmpty(fileName))
-                    {
-                        content = JsonUtils.Serialize(v2rayConfig);
-                    }
-                    else
-                    {
-                        JsonUtils.ToFile(v2rayConfig, fileName, false);
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog("GenerateClientConfig", ex);
-                msg = ResUI.FailedGenDefaultConfiguration;
-                return -1;
-            }
-            return 0;
-        }
-
-        private static int GenerateClientCustomConfig(ProfileItem node, string? fileName, out string msg)
-        {
-            try
-            {
-                if (node == null || fileName is null)
-                {
-                    msg = ResUI.CheckServerSettings;
-                    return -1;
-                }
-
-                if (File.Exists(fileName))
-                {
-                    File.SetAttributes(fileName, FileAttributes.Normal); //If the file has a read-only attribute, direct deletion will fail
-                    File.Delete(fileName);
-                }
-
-                string addressFileName = node.address;
-                if (!File.Exists(addressFileName))
-                {
-                    addressFileName = Utils.GetConfigPath(addressFileName);
-                }
-                if (!File.Exists(addressFileName))
-                {
-                    msg = ResUI.FailedGenDefaultConfiguration;
-                    return -1;
-                }
-                File.Copy(addressFileName, fileName);
-                File.SetAttributes(fileName, FileAttributes.Normal); //Copy will keep the attributes of addressFileName, so we need to add write permissions to fileName just in case of addressFileName is a read-only file.
-
-                //check again
-                if (!File.Exists(fileName))
-                {
-                    msg = ResUI.FailedGenDefaultConfiguration;
-                    return -1;
-                }
-
-                msg = string.Format(ResUI.SuccessfulConfiguration, "");
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog("GenerateClientCustomConfig", ex);
-                msg = ResUI.FailedGenDefaultConfiguration;
-                return -1;
-            }
-            return 0;
-        }
-
-        public static int GenerateClientSpeedtestConfig(Config config, string fileName, List<ServerTestItem> selecteds, ECoreType coreType, out string 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;
-        }
-
-        public static int GenerateClientMultipleLoadConfig(Config config, string fileName, List<ProfileItem> selecteds, ECoreType coreType, out string msg)
-        {
-            msg = ResUI.CheckServerSettings;
-            if (coreType == ECoreType.sing_box)
-            {
-                if (new CoreConfigSingbox(config).GenerateClientMultipleLoadConfig(selecteds, out SingboxConfig? singboxConfig, out msg) != 0)
-                {
-                    return -1;
-                }
-                JsonUtils.ToFile(singboxConfig, fileName, false);
-            }
-            else if (coreType == ECoreType.Xray)
-            {
-                if (new CoreConfigV2ray(config).GenerateClientMultipleLoadConfig(selecteds, out V2rayConfig? v2rayConfig, out msg) != 0)
-                {
-                    return -1;
-                }
-                JsonUtils.ToFile(v2rayConfig, fileName, false);
-            }
-
-            return 0;
-        }
-    }
-}

v2rayN/ServiceLib/Handler/CoreConfigHandler.cs

@@ -0,0 +1,130 @@
+namespace ServiceLib.Handler
+{
+    /// <summary>
+    /// Core configuration file processing class
+    /// </summary>
+    public class CoreConfigHandler
+    {
+        public static async Task<RetResult> GenerateClientConfig(ProfileItem node, string? fileName)
+        {
+            var config = AppHandler.Instance.Config;
+            var result = new RetResult();
+
+            if (node.ConfigType == EConfigType.Custom)
+            {
+                result = node.CoreType switch
+                {
+                    ECoreType.mihomo => await new CoreConfigClashService(config).GenerateClientCustomConfig(node, fileName),
+                    ECoreType.sing_box => await new CoreConfigSingboxService(config).GenerateClientCustomConfig(node, fileName),
+                    _ => await GenerateClientCustomConfig(node, fileName)
+                };
+            }
+            else if (AppHandler.Instance.GetCoreType(node, node.ConfigType) == ECoreType.sing_box)
+            {
+                result = await new CoreConfigSingboxService(config).GenerateClientConfigContent(node);
+            }
+            else
+            {
+                result = await new CoreConfigV2rayService(config).GenerateClientConfigContent(node);
+            }
+            if (result.Success != true)
+            {
+                return result;
+            }
+            if (Utils.IsNotEmpty(fileName) && result.Data != null)
+            {
+                await File.WriteAllTextAsync(fileName, result.Data.ToString());
+            }
+
+            return result;
+        }
+
+        private static async Task<RetResult> GenerateClientCustomConfig(ProfileItem node, string? fileName)
+        {
+            var ret = new RetResult();
+            try
+            {
+                if (node == null || fileName is null)
+                {
+                    ret.Msg = ResUI.CheckServerSettings;
+                    return ret;
+                }
+
+                if (File.Exists(fileName))
+                {
+                    File.SetAttributes(fileName, FileAttributes.Normal); //If the file has a read-only attribute, direct deletion will fail
+                    File.Delete(fileName);
+                }
+
+                string addressFileName = node.Address;
+                if (!File.Exists(addressFileName))
+                {
+                    addressFileName = Utils.GetConfigPath(addressFileName);
+                }
+                if (!File.Exists(addressFileName))
+                {
+                    ret.Msg = ResUI.FailedGenDefaultConfiguration;
+                    return ret;
+                }
+                File.Copy(addressFileName, fileName);
+                File.SetAttributes(fileName, FileAttributes.Normal); //Copy will keep the attributes of addressFileName, so we need to add write permissions to fileName just in case of addressFileName is a read-only file.
+
+                //check again
+                if (!File.Exists(fileName))
+                {
+                    ret.Msg = ResUI.FailedGenDefaultConfiguration;
+                    return ret;
+                }
+
+                ret.Msg = string.Format(ResUI.SuccessfulConfiguration, "");
+                ret.Success = true;
+                return ret;
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog("GenerateClientCustomConfig", ex);
+                ret.Msg = ResUI.FailedGenDefaultConfiguration;
+                return ret;
+            }
+        }
+
+        public static async Task<RetResult> GenerateClientSpeedtestConfig(Config config, string fileName, List<ServerTestItem> selecteds, ECoreType coreType)
+        {
+            var result = new RetResult();
+            if (coreType == ECoreType.sing_box)
+            {
+                result = await new CoreConfigSingboxService(config).GenerateClientSpeedtestConfig(selecteds);
+            }
+            else if (coreType == ECoreType.Xray)
+            {
+                result = await new CoreConfigV2rayService(config).GenerateClientSpeedtestConfig(selecteds);
+            }
+            if (result.Success != true)
+            {
+                return result;
+            }
+            await File.WriteAllTextAsync(fileName, result.Data.ToString());
+            return result;
+        }
+
+        public static async Task<RetResult> GenerateClientMultipleLoadConfig(Config config, string fileName, List<ProfileItem> selecteds, ECoreType coreType)
+        {
+            var result = new RetResult();
+            if (coreType == ECoreType.sing_box)
+            {
+                result = await new CoreConfigSingboxService(config).GenerateClientMultipleLoadConfig(selecteds);
+            }
+            else if (coreType == ECoreType.Xray)
+            {
+                result = await new CoreConfigV2rayService(config).GenerateClientMultipleLoadConfig(selecteds);
+            }
+
+            if (result.Success != true)
+            {
+                return result;
+            }
+            await File.WriteAllTextAsync(fileName, result.Data.ToString());
+            return result;
+        }
+    }
+}

v2rayN/ServiceLib/Handler/CoreHandler.cs

@@ -8,21 +8,49 @@ namespace ServiceLib.Handler
     /// </summary>
     public class CoreHandler
     {
+        private static readonly Lazy<CoreHandler> _instance = new(() => new());
+        public static CoreHandler Instance => _instance.Value;
         private Config _config;
         private Process? _process;
         private Process? _processPre;
-        private Action<bool, string> _updateFunc;
+        private int _linuxSudoPid = -1;
+        private Action<bool, string>? _updateFunc;
 
-        public CoreHandler(Config config, Action<bool, string> update)
+        public async Task Init(Config config, Action<bool, string> updateFunc)
         {
             _config = config;
-            _updateFunc = update;
+            _updateFunc = updateFunc;
 
-            Environment.SetEnvironmentVariable("v2ray.location.asset", Utils.GetBinPath(""), EnvironmentVariableTarget.Process);
-            Environment.SetEnvironmentVariable("xray.location.asset", Utils.GetBinPath(""), EnvironmentVariableTarget.Process);
+            Environment.SetEnvironmentVariable("V2RAY_LOCATION_ASSET", Utils.GetBinPath(""), EnvironmentVariableTarget.Process);
+            Environment.SetEnvironmentVariable("XRAY_LOCATION_ASSET", Utils.GetBinPath(""), EnvironmentVariableTarget.Process);
+
+            if (Utils.IsNonWindows())
+            {
+                var coreInfo = CoreInfoHandler.Instance.GetCoreInfo();
+                foreach (var it in coreInfo)
+                {
+                    if (it.CoreType == ECoreType.v2rayN)
+                    {
+                        if (Utils.UpgradeAppExists(out var fileName))
+                        {
+                            await Utils.SetLinuxChmod(fileName);
+                        }
+                        continue;
+                    }
+
+                    foreach (var name in it.CoreExes)
+                    {
+                        var exe = Utils.GetBinPath(Utils.GetExeName(name), it.CoreType.ToString());
+                        if (File.Exists(exe))
+                        {
+                            await Utils.SetLinuxChmod(exe);
+                        }
+                    }
+                }
+            }
         }
 
-        public void LoadCore(ProfileItem? node)
+        public async Task LoadCore(ProfileItem? node)
         {
             if (node == null)
             {
@@ -30,100 +58,58 @@ namespace ServiceLib.Handler
                 return;
             }
 
-            string fileName = Utils.GetConfigPath(Global.CoreConfigFileName);
-            if (CoreConfigHandler.GenerateClientConfig(node, fileName, out string msg, out string content) != 0)
+            var fileName = Utils.GetConfigPath(Global.CoreConfigFileName);
+            var result = await CoreConfigHandler.GenerateClientConfig(node, fileName);
+            if (result.Success != true)
             {
-                ShowMsg(false, msg);
+                ShowMsg(true, result.Msg);
                 return;
             }
-            else
-            {
-                ShowMsg(false, msg);
-                ShowMsg(true, $"{node.GetSummary()}");
-                CoreStop();
-                CoreStart(node);
 
-                //In tun mode, do a delay check and restart the core
-                //if (_config.tunModeItem.enableTun)
-                //{
-                //    Observable.Range(1, 1)
-                //    .Delay(TimeSpan.FromSeconds(15))
-                //    .Subscribe(x =>
-                //    {
-                //        {
-                //            if (_process == null || _process.HasExited)
-                //            {
-                //                CoreStart(node);
-                //                ShowMsg(false, "Tun mode restart the core once");
-                //                Logging.SaveLog("Tun mode restart the core once");
-                //            }
-                //        }
-                //    });
-                //}
-            }
+            ShowMsg(true, $"{node.GetSummary()}");
+            ShowMsg(false, $"{Environment.OSVersion} - {(Environment.Is64BitOperatingSystem ? 64 : 32)}");
+            ShowMsg(false, string.Format(ResUI.StartService, DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss")));
+            await CoreStop();
+            await Task.Delay(100);
+            await CoreStart(node);
+            await CoreStartPreService(node);
         }
 
-        public int LoadCoreConfigSpeedtest(List<ServerTestItem> selecteds)
+        public async Task<int> LoadCoreConfigSpeedtest(List<ServerTestItem> selecteds)
         {
-            int pid = -1;
-            var coreType = selecteds.Exists(t => t.configType == EConfigType.Hysteria2 || t.configType == EConfigType.Tuic || t.configType == EConfigType.Wireguard) ? ECoreType.sing_box : ECoreType.Xray;
-            string configPath = Utils.GetConfigPath(Global.CoreSpeedtestConfigFileName);
-            if (CoreConfigHandler.GenerateClientSpeedtestConfig(_config, configPath, selecteds, coreType, out string msg) != 0)
+            var coreType = selecteds.Exists(t => t.ConfigType is EConfigType.Hysteria2 or EConfigType.TUIC or EConfigType.WireGuard) ? ECoreType.sing_box : ECoreType.Xray;
+            var configPath = Utils.GetConfigPath(Global.CoreSpeedtestConfigFileName);
+            var result = await CoreConfigHandler.GenerateClientSpeedtestConfig(_config, configPath, selecteds, coreType);
+            ShowMsg(false, result.Msg);
+            if (result.Success != true)
             {
-                ShowMsg(false, msg);
+                return -1;
             }
-            else
-            {
-                ShowMsg(false, msg);
-                pid = CoreStartSpeedtest(configPath, coreType);
-            }
-            return pid;
+
+            ShowMsg(false, string.Format(ResUI.StartService, DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss")));
+            ShowMsg(false, configPath);
+            return await CoreStartSpeedtest(configPath, coreType);
         }
 
-        public void CoreStop()
+        public async Task CoreStop()
         {
             try
             {
-                bool hasProc = false;
                 if (_process != null)
                 {
-                    KillProcess(_process);
-                    _process.Dispose();
-                    _process = null;
-                    hasProc = true;
+                    _process = await KillProcess(_process);
                 }
 
                 if (_processPre != null)
                 {
-                    KillProcess(_processPre);
-                    _processPre.Dispose();
-                    _processPre = null;
-                    hasProc = true;
+                    _processPre = await KillProcess(_processPre);
                 }
 
-                if (!hasProc)
+                if (_linuxSudoPid > 0)
                 {
-                    var coreInfo = CoreInfoHandler.Instance.GetCoreInfo();
-                    foreach (var it in coreInfo)
-                    {
-                        if (it.coreType == ECoreType.v2rayN)
-                        {
-                            continue;
-                        }
-                        foreach (string vName in it.coreExes)
-                        {
-                            var existing = Process.GetProcessesByName(vName);
-                            foreach (Process p in existing)
-                            {
-                                string? path = p.MainModule?.FileName;
-                                if (path == Utils.GetExeName(Utils.GetBinPath(vName, it.coreType.ToString())))
-                                {
-                                    KillProcess(p);
-                                }
-                            }
-                        }
-                    }
+                    await KillProcessAsLinuxSudo();
                 }
+                _linuxSudoPid = -1;
             }
             catch (Exception ex)
             {
@@ -131,12 +117,11 @@ namespace ServiceLib.Handler
             }
         }
 
-        public void CoreStopPid(int pid)
+        public async Task CoreStopPid(int pid)
         {
             try
             {
-                var _p = Process.GetProcessById(pid);
-                KillProcess(_p);
+                await KillProcess(Process.GetProcessById(pid));
             }
             catch (Exception ex)
             {
@@ -148,11 +133,10 @@ namespace ServiceLib.Handler
 
         private string CoreFindExe(CoreInfo coreInfo)
         {
-            string fileName = string.Empty;
-            foreach (string name in coreInfo.coreExes)
+            var fileName = string.Empty;
+            foreach (var name in coreInfo.CoreExes)
             {
-                string vName = Utils.GetExeName(name);
-                vName = Utils.GetBinPath(vName, coreInfo.coreType.ToString());
+                var vName = Utils.GetBinPath(Utils.GetExeName(name), coreInfo.CoreType.ToString());
                 if (File.Exists(vName))
                 {
                     fileName = vName;
@@ -161,92 +145,58 @@ namespace ServiceLib.Handler
             }
             if (Utils.IsNullOrEmpty(fileName))
             {
-                string msg = string.Format(ResUI.NotFoundCore, Utils.GetBinPath("", coreInfo.coreType.ToString()), string.Join(", ", coreInfo.coreExes.ToArray()), coreInfo.coreUrl);
+                var msg = string.Format(ResUI.NotFoundCore, Utils.GetBinPath("", coreInfo.CoreType.ToString()), string.Join(", ", coreInfo.CoreExes.ToArray()), coreInfo.Url);
                 Logging.SaveLog(msg);
                 ShowMsg(false, msg);
             }
             return fileName;
         }
 
-        private void CoreStart(ProfileItem node)
+        private async Task 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;
-            //if (node.configType != EConfigType.Custom && _config.tunModeItem.enableTun)
-            //{
-            //    coreType = ECoreType.sing_box;
-            //}
-            //else
-            //{
-            //    coreType = LazyConfig.Instance.GetCoreType(node, node.configType);
-            //}
-            var coreType = LazyConfig.Instance.GetCoreType(node, node.configType);
-            _config.runningCoreType = coreType;
+            var coreType = _config.RunningCoreType = AppHandler.Instance.GetCoreType(node, node.ConfigType);
             var coreInfo = CoreInfoHandler.Instance.GetCoreInfo(coreType);
 
-            var displayLog = node.configType != EConfigType.Custom || node.displayLog;
-            var proc = RunProcess(node, coreInfo, "", displayLog);
+            var displayLog = node.ConfigType != EConfigType.Custom || node.DisplayLog;
+            var proc = await RunProcess(coreInfo, Global.CoreConfigFileName, displayLog, true);
             if (proc is null)
             {
                 return;
             }
             _process = proc;
+        }
 
-            //start a pre service
+        private async Task CoreStartPreService(ProfileItem node)
+        {
             if (_process != null && !_process.HasExited)
             {
-                ProfileItem? itemSocks = null;
-                var preCoreType = ECoreType.sing_box;
-                if (node.configType != EConfigType.Custom && coreType != ECoreType.sing_box && _config.tunModeItem.enableTun)
-                {
-                    itemSocks = new ProfileItem()
-                    {
-                        coreType = preCoreType,
-                        configType = EConfigType.Socks,
-                        address = Global.Loopback,
-                        sni = node.address, //Tun2SocksAddress
-                        port = LazyConfig.Instance.GetLocalPort(EInboundProtocol.socks)
-                    };
-                }
-                else if ((node.configType == EConfigType.Custom && node.preSocksPort > 0))
-                {
-                    preCoreType = _config.tunModeItem.enableTun ? ECoreType.sing_box : ECoreType.Xray;
-                    itemSocks = new ProfileItem()
-                    {
-                        coreType = preCoreType,
-                        configType = EConfigType.Socks,
-                        address = Global.Loopback,
-                        port = node.preSocksPort.Value,
-                    };
-                    _config.runningCoreType = preCoreType;
-                }
+                var coreType = AppHandler.Instance.GetCoreType(node, node.ConfigType);
+                var itemSocks = await ConfigHandler.GetPreSocksItem(_config, node, coreType);
                 if (itemSocks != null)
                 {
-                    string fileName2 = Utils.GetConfigPath(Global.CorePreConfigFileName);
-                    if (CoreConfigHandler.GenerateClientConfig(itemSocks, fileName2, out string msg2, out string configStr) == 0)
+                    var preCoreType = itemSocks.CoreType ?? ECoreType.sing_box;
+                    var fileName = Utils.GetConfigPath(Global.CorePreConfigFileName);
+                    var result = await CoreConfigHandler.GenerateClientConfig(itemSocks, fileName);
+                    if (result.Success)
                     {
-                        var coreInfo2 = CoreInfoHandler.Instance.GetCoreInfo(preCoreType);
-                        var proc2 = RunProcess(node, coreInfo2, $" -c {Global.CorePreConfigFileName}", true);
-                        if (proc2 is not null)
+                        var coreInfo = CoreInfoHandler.Instance.GetCoreInfo(preCoreType);
+                        var proc = await RunProcess(coreInfo, Global.CorePreConfigFileName, true, true);
+                        if (proc is null)
                         {
-                            _processPre = proc2;
+                            return;
                         }
+                        _processPre = proc;
                     }
                 }
             }
         }
 
-        private int CoreStartSpeedtest(string configPath, ECoreType coreType)
+        private async Task<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 = CoreInfoHandler.Instance.GetCoreInfo(coreType);
-                var proc = RunProcess(new(), coreInfo, $" -c {Global.CoreSpeedtestConfigFileName}", true);
+                var proc = await RunProcess(coreInfo, Global.CoreSpeedtestConfigFileName, true, false);
                 if (proc is null)
                 {
                     return -1;
@@ -257,36 +207,45 @@ namespace ServiceLib.Handler
             catch (Exception ex)
             {
                 Logging.SaveLog(ex.Message, ex);
-                string msg = ex.Message;
-                ShowMsg(false, msg);
+                ShowMsg(false, ex.Message);
                 return -1;
             }
         }
 
         private void ShowMsg(bool notify, string msg)
         {
-            _updateFunc(notify, msg);
+            _updateFunc?.Invoke(notify, msg);
+        }
+
+        private bool IsNeedSudo(ECoreType eCoreType)
+        {
+            return _config.TunModeItem.EnableTun
+                   && eCoreType == ECoreType.sing_box
+                   && (Utils.IsNonWindows())
+                //&& _config.TunModeItem.LinuxSudoPwd.IsNotEmpty()
+                ;
         }
 
         #endregion Private
 
         #region Process
 
-        private Process? RunProcess(ProfileItem node, CoreInfo coreInfo, string configPath, bool displayLog)
+        private async Task<Process?> RunProcess(CoreInfo coreInfo, string configPath, bool displayLog, bool mayNeedSudo)
         {
+            var fileName = CoreFindExe(coreInfo);
+            if (Utils.IsNullOrEmpty(fileName))
+            {
+                return null;
+            }
+
             try
             {
-                string fileName = CoreFindExe(coreInfo);
-                if (Utils.IsNullOrEmpty(fileName))
-                {
-                    return null;
-                }
                 Process proc = new()
                 {
                     StartInfo = new()
                     {
                         FileName = fileName,
-                        Arguments = string.Format(coreInfo.arguments, configPath),
+                        Arguments = string.Format(coreInfo.Arguments, configPath),
                         WorkingDirectory = Utils.GetConfigPath(),
                         UseShellExecute = false,
                         RedirectStandardOutput = displayLog,
@@ -296,33 +255,45 @@ namespace ServiceLib.Handler
                         StandardErrorEncoding = displayLog ? Encoding.UTF8 : null,
                     }
                 };
+
+                var isNeedSudo = mayNeedSudo && IsNeedSudo(coreInfo.CoreType);
+                if (isNeedSudo)
+                {
+                    await RunProcessAsLinuxSudo(proc, fileName, coreInfo, configPath);
+                }
+
                 var startUpErrorMessage = new StringBuilder();
                 var startUpSuccessful = false;
                 if (displayLog)
                 {
                     proc.OutputDataReceived += (sender, e) =>
                     {
-                        if (!Utils.IsNullOrEmpty(e.Data))
-                        {
-                            string msg = e.Data + Environment.NewLine;
-                            ShowMsg(false, msg);
-                        }
+                        if (Utils.IsNullOrEmpty(e.Data)) return;
+                        ShowMsg(false, e.Data + Environment.NewLine);
                     };
                     proc.ErrorDataReceived += (sender, e) =>
                     {
-                        if (!Utils.IsNullOrEmpty(e.Data))
-                        {
-                            string msg = e.Data + Environment.NewLine;
-                            ShowMsg(false, msg);
+                        if (Utils.IsNullOrEmpty(e.Data)) return;
+                        ShowMsg(false, e.Data + Environment.NewLine);
 
-                            if (!startUpSuccessful)
-                            {
-                                startUpErrorMessage.Append(msg);
-                            }
+                        if (!startUpSuccessful)
+                        {
+                            startUpErrorMessage.Append(e.Data + Environment.NewLine);
                         }
                     };
                 }
                 proc.Start();
+
+                if (isNeedSudo && _config.TunModeItem.LinuxSudoPwd.IsNotEmpty())
+                {
+                    var pwd = DesUtils.Decrypt(_config.TunModeItem.LinuxSudoPwd);
+                    await Task.Delay(10);
+                    await proc.StandardInput.WriteLineAsync(pwd);
+                    await Task.Delay(10);
+                    await proc.StandardInput.WriteLineAsync(pwd);
+                }
+                if (isNeedSudo) _linuxSudoPid = proc.Id;
+
                 if (displayLog)
                 {
                     proc.BeginOutputReadLine();
@@ -339,40 +310,115 @@ namespace ServiceLib.Handler
                     startUpSuccessful = true;
                 }
 
-                LazyConfig.Instance.AddProcess(proc.Handle);
+                AppHandler.Instance.AddProcess(proc.Handle);
                 return proc;
             }
             catch (Exception ex)
             {
                 Logging.SaveLog(ex.Message, ex);
-                string msg = ex.Message;
-                ShowMsg(true, msg);
+                ShowMsg(true, ex.Message);
                 return null;
             }
         }
 
-        private void KillProcess(Process? proc)
+        private async Task<Process?> KillProcess(Process? proc)
         {
             if (proc is null)
             {
-                return;
-            }
-            try
-            {
-                proc.Kill();
-                proc.WaitForExit(100);
-                if (!proc.HasExited)
-                {
-                    proc.Kill();
-                    proc.WaitForExit(100);
-                }
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(ex.Message, ex);
+                return null;
             }
+            try { proc?.Kill(true); } catch { }
+            try { proc?.Close(); } catch { }
+            try { proc?.Dispose(); } catch { }
+
+            await Task.Delay(100);
+            return null;
         }
 
         #endregion Process
+
+        #region Linux
+
+        private async Task RunProcessAsLinuxSudo(Process proc, string fileName, CoreInfo coreInfo, string configPath)
+        {
+            var cmdLine = $"{fileName.AppendQuotes()} {string.Format(coreInfo.Arguments, Utils.GetConfigPath(configPath).AppendQuotes())}";
+
+            var shFilePath = await CreateLinuxShellFile(cmdLine, "run_as_sudo.sh");
+            proc.StartInfo.FileName = shFilePath;
+            proc.StartInfo.Arguments = "";
+            proc.StartInfo.WorkingDirectory = "";
+            if (_config.TunModeItem.LinuxSudoPwd.IsNotEmpty())
+            {
+                proc.StartInfo.StandardInputEncoding = Encoding.UTF8;
+                proc.StartInfo.RedirectStandardInput = true;
+            }
+        }
+
+        private async Task KillProcessAsLinuxSudo()
+        {
+            var cmdLine = $"kill {_linuxSudoPid}";
+            var shFilePath = await CreateLinuxShellFile(cmdLine, "kill_as_sudo.sh");
+            Process proc = new()
+            {
+                StartInfo = new()
+                {
+                    FileName = shFilePath,
+                    UseShellExecute = false,
+                    CreateNoWindow = true,
+                    StandardInputEncoding = Encoding.UTF8,
+                    RedirectStandardInput = true
+                }
+            };
+            proc.Start();
+
+            if (_config.TunModeItem.LinuxSudoPwd.IsNotEmpty())
+            {
+                try
+                {
+                    var pwd = DesUtils.Decrypt(_config.TunModeItem.LinuxSudoPwd);
+                    await Task.Delay(10);
+                    await proc.StandardInput.WriteLineAsync(pwd);
+                    await Task.Delay(10);
+                    await proc.StandardInput.WriteLineAsync(pwd);
+                }
+                catch (Exception)
+                {
+                    // ignored
+                }
+            }
+
+            var timeout = new CancellationTokenSource(TimeSpan.FromSeconds(10));
+            await proc.WaitForExitAsync(timeout.Token);
+            await Task.Delay(3000);
+        }
+
+        private async Task<string> CreateLinuxShellFile(string cmdLine, string fileName)
+        {
+            //Shell scripts
+            var shFilePath = Utils.GetBinPath(AppHandler.Instance.IsAdministrator ? "root_" + fileName : fileName);
+            File.Delete(shFilePath);
+            var sb = new StringBuilder();
+            sb.AppendLine("#!/bin/sh");
+            if (AppHandler.Instance.IsAdministrator)
+            {
+                sb.AppendLine($"{cmdLine}");
+            }
+            else if (_config.TunModeItem.LinuxSudoPwd.IsNullOrEmpty())
+            {
+                sb.AppendLine($"pkexec {cmdLine}");
+            }
+            else
+            {
+                sb.AppendLine($"sudo -S {cmdLine}");
+            }
+
+            await File.WriteAllTextAsync(shFilePath, sb.ToString());
+            await Utils.SetLinuxChmod(shFilePath);
+            Logging.SaveLog(shFilePath);
+
+            return shFilePath;
+        }
+
+        #endregion Linux
     }
 }

v2rayN/ServiceLib/Handler/CoreInfoHandler.cs

@@ -1,6 +1,4 @@
-using System.Runtime.Intrinsics.X86;
-
-namespace ServiceLib.Handler
+namespace ServiceLib.Handler
 {
     public sealed class CoreInfoHandler
     {
@@ -19,7 +17,7 @@ namespace ServiceLib.Handler
             {
                 InitCoreInfo();
             }
-            return _coreInfo?.FirstOrDefault(t => t.coreType == coreType);
+            return _coreInfo?.FirstOrDefault(t => t.CoreType == coreType);
         }
 
         public List<CoreInfo> GetCoreInfo()
@@ -37,181 +35,145 @@ namespace ServiceLib.Handler
 
             _coreInfo.Add(new CoreInfo
             {
-                coreType = ECoreType.v2rayN,
-                coreUrl = Global.NUrl,
-                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",
-                coreDownloadUrlLinux32 = Global.NUrl + "/download/{0}/v2rayN-linux-32.zip",
-                coreDownloadUrlLinux64 = Global.NUrl + "/download/{0}/v2rayN-linux-64.zip",
-                coreDownloadUrlLinuxArm64 = Global.NUrl + "/download/{0}/v2rayN-linux-arm64.zip",
+                CoreType = ECoreType.v2rayN,
+                Url = Global.NUrl,
+                ReleaseApiUrl = Global.NUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
+                DownloadUrlWin64 = Global.NUrl + "/download/{0}/v2rayN-windows-64.zip",
+                DownloadUrlWinArm64 = Global.NUrl + "/download/{0}/v2rayN-windows-arm64.zip",
+                DownloadUrlLinux64 = Global.NUrl + "/download/{0}/v2rayN-linux-64.zip",
+                DownloadUrlLinuxArm64 = Global.NUrl + "/download/{0}/v2rayN-linux-arm64.zip",
+                DownloadUrlOSX64 = Global.NUrl + "/download/{0}/v2rayN-macos-64.zip",
+                DownloadUrlOSXArm64 = Global.NUrl + "/download/{0}/v2rayN-macos-arm64.zip",
             });
 
             _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),
-                match = "V2Ray",
-                versionArg = "-version",
-                redirectInfo = true,
+                CoreType = ECoreType.v2fly,
+                CoreExes = new List<string> { "wv2ray", "v2ray" },
+                Arguments = "",
+                Url = Global.V2flyCoreUrl,
+                ReleaseApiUrl = Global.V2flyCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
+                Match = "V2Ray",
+                VersionArg = "-version",
+                RedirectInfo = true,
             });
 
             _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),
-                match = "V2Ray",
-                versionArg = "version",
-                redirectInfo = true,
+                CoreType = ECoreType.v2fly_v5,
+                CoreExes = new List<string> { "v2ray" },
+                Arguments = "run -c config.json -format jsonv5",
+                Url = Global.V2flyCoreUrl,
+                ReleaseApiUrl = Global.V2flyCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
+                Match = "V2Ray",
+                VersionArg = "version",
+                RedirectInfo = true,
             });
 
             _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),
-                match = "V2Ray",
-                versionArg = "version",
-                redirectInfo = true,
+                CoreType = ECoreType.Xray,
+                CoreExes = new List<string> { "xray", "wxray" },
+                Arguments = "run -c {0}",
+                Url = Global.XrayCoreUrl,
+                ReleaseApiUrl = Global.XrayCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
+                DownloadUrlWin64 = Global.XrayCoreUrl + "/download/{0}/Xray-windows-64.zip",
+                DownloadUrlWinArm64 = Global.XrayCoreUrl + "/download/{0}/Xray-windows-arm64-v8a.zip",
+                DownloadUrlLinux64 = Global.XrayCoreUrl + "/download/{0}/Xray-linux-64.zip",
+                DownloadUrlLinuxArm64 = Global.XrayCoreUrl + "/download/{0}/Xray-linux-arm64-v8a.zip",
+                DownloadUrlOSX64 = Global.XrayCoreUrl + "/download/{0}/Xray-macos-64.zip",
+                DownloadUrlOSXArm64 = Global.XrayCoreUrl + "/download/{0}/Xray-macos-arm64-v8a.zip",
+                Match = "Xray",
+                VersionArg = "-version",
+                RedirectInfo = true,
             });
 
             _coreInfo.Add(new CoreInfo
             {
-                coreType = ECoreType.Xray,
-                coreExes = new List<string> { "xray", "wxray" },
-                arguments = "run {0}",
-                coreUrl = Global.XrayCoreUrl,
-                coreReleaseApiUrl = Global.XrayCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
-                coreDownloadUrl32 = Global.XrayCoreUrl + "/download/{0}/Xray-windows-32.zip",
-                coreDownloadUrl64 = Global.XrayCoreUrl + "/download/{0}/Xray-windows-64.zip",
-                coreDownloadUrlArm64 = Global.XrayCoreUrl + "/download/{0}/Xray-windows-arm64-v8a.zip",
-                coreDownloadUrlLinux32 = Global.XrayCoreUrl + "/download/{0}/Xray-linux-32.zip",
-                coreDownloadUrlLinux64 = Global.XrayCoreUrl + "/download/{0}/Xray-linux-64.zip",
-                coreDownloadUrlLinuxArm64 = Global.XrayCoreUrl + "/download/{0}/Xray-linux-arm64-v8a.zip",
-                match = "Xray",
-                versionArg = "-version",
-                redirectInfo = true,
+                CoreType = ECoreType.mihomo,
+                CoreExes = new List<string> { "mihomo-windows-amd64-compatible", "mihomo-windows-amd64", "mihomo-linux-amd64", "mihomo", "clash" },
+                Arguments = "-f config.json" + PortableMode(),
+                Url = Global.MihomoCoreUrl,
+                ReleaseApiUrl = Global.MihomoCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
+                DownloadUrlWin64 = Global.MihomoCoreUrl + "/download/{0}/mihomo-windows-amd64-compatible-{0}.zip",
+                DownloadUrlWinArm64 = Global.MihomoCoreUrl + "/download/{0}/mihomo-windows-arm64-{0}.zip",
+                DownloadUrlLinux64 = Global.MihomoCoreUrl + "/download/{0}/mihomo-linux-amd64-compatible-{0}.gz",
+                DownloadUrlLinuxArm64 = Global.MihomoCoreUrl + "/download/{0}/mihomo-linux-arm64-{0}.gz",
+                DownloadUrlOSX64 = Global.MihomoCoreUrl + "/download/{0}/mihomo-darwin-amd64-compatible-{0}.gz",
+                DownloadUrlOSXArm64 = Global.MihomoCoreUrl + "/download/{0}/mihomo-darwin-arm64-{0}.gz",
+                Match = "Mihomo",
+                VersionArg = "-v",
+                RedirectInfo = true,
             });
 
             _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" + PortableMode(),
-                coreUrl = Global.ClashCoreUrl,
-                coreReleaseApiUrl = Global.ClashCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
-                match = "v",
-                versionArg = "-v",
-                redirectInfo = true,
+                CoreType = ECoreType.hysteria,
+                CoreExes = new List<string> { "hysteria-windows-amd64", "hysteria" },
+                Arguments = "",
+                Url = Global.HysteriaCoreUrl,
+                ReleaseApiUrl = Global.HysteriaCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
+                RedirectInfo = true,
             });
 
             _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" + PortableMode(),
-                coreUrl = Global.ClashMetaCoreUrl,
-                coreReleaseApiUrl = Global.ClashMetaCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
-                match = "v",
-                versionArg = "-v",
-                redirectInfo = true,
+                CoreType = ECoreType.naiveproxy,
+                CoreExes = new List<string> { "naiveproxy", "naive" },
+                Arguments = "config.json",
+                Url = Global.NaiveproxyCoreUrl,
+                RedirectInfo = false,
             });
 
             _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" + PortableMode(),
-                coreUrl = Global.MihomoCoreUrl,
-                coreReleaseApiUrl = Global.MihomoCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
-                coreDownloadUrl32 = Global.ClashMetaCoreUrl + "/download/{0}/mihomo-windows-386-{0}.zip",
-                coreDownloadUrl64 = Global.ClashMetaCoreUrl + "/download/{0}/mihomo-windows-amd64-compatible-{0}.zip",
-                coreDownloadUrlArm64 = Global.ClashMetaCoreUrl + "/download/{0}/mihomo-windows-arm64-{0}.zip",
-                coreDownloadUrlLinux32 = Global.ClashMetaCoreUrl + "/download/{0}/mihomo-linux-386-{0}.gz",
-                coreDownloadUrlLinux64 = Global.ClashMetaCoreUrl + "/download/{0}/mihomo-linux-amd64-compatible-{0}.gz",
-                coreDownloadUrlLinuxArm64 = Global.ClashMetaCoreUrl + "/download/{0}/mihomo-linux-arm64-{0}.gz",
-                match = "Mihomo",
-                versionArg = "-v",
-                redirectInfo = true,
+                CoreType = ECoreType.tuic,
+                CoreExes = new List<string> { "tuic-client", "tuic" },
+                Arguments = "-c config.json",
+                Url = Global.TuicCoreUrl,
+                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),
-                redirectInfo = true,
+                CoreType = ECoreType.sing_box,
+                CoreExes = new List<string> { "sing-box-client", "sing-box" },
+                Arguments = "run -c {0} --disable-color",
+                Url = Global.SingboxCoreUrl,
+                RedirectInfo = true,
+                ReleaseApiUrl = Global.SingboxCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
+                DownloadUrlWin64 = Global.SingboxCoreUrl + "/download/{0}/sing-box-{1}-windows-amd64.zip",
+                DownloadUrlWinArm64 = Global.SingboxCoreUrl + "/download/{0}/sing-box-{1}-windows-arm64.zip",
+                DownloadUrlLinux64 = Global.SingboxCoreUrl + "/download/{0}/sing-box-{1}-linux-amd64.tar.gz",
+                DownloadUrlLinuxArm64 = Global.SingboxCoreUrl + "/download/{0}/sing-box-{1}-linux-arm64.tar.gz",
+                DownloadUrlOSX64 = Global.SingboxCoreUrl + "/download/{0}/sing-box-{1}-darwin-amd64.tar.gz",
+                DownloadUrlOSXArm64 = Global.SingboxCoreUrl + "/download/{0}/sing-box-{1}-darwin-arm64.tar.gz",
+                Match = "sing-box",
+                VersionArg = "version",
             });
 
             _coreInfo.Add(new CoreInfo
             {
-                coreType = ECoreType.naiveproxy,
-                coreExes = new List<string> { "naiveproxy", "naive" },
-                arguments = "config.json",
-                coreUrl = Global.NaiveproxyCoreUrl,
-                redirectInfo = false,
+                CoreType = ECoreType.juicity,
+                CoreExes = new List<string> { "juicity-client", "juicity" },
+                Arguments = "run -c config.json",
+                Url = Global.JuicityCoreUrl
             });
 
             _coreInfo.Add(new CoreInfo
             {
-                coreType = ECoreType.tuic,
-                coreExes = new List<string> { "tuic-client", "tuic" },
-                arguments = "-c config.json",
-                coreUrl = Global.TuicCoreUrl,
-                redirectInfo = true,
-            });
-
-            _coreInfo.Add(new CoreInfo
-            {
-                coreType = ECoreType.sing_box,
-                coreExes = new List<string> { "sing-box-client", "sing-box" },
-                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",
-                coreDownloadUrlLinux32 = Global.SingboxCoreUrl + "/download/{0}/sing-box-{1}-linux-386.tar.gz",
-                coreDownloadUrlLinux64 = Global.SingboxCoreUrl + "/download/{0}/sing-box-{1}-linux-amd64.tar.gz",
-                coreDownloadUrlLinuxArm64 = Global.SingboxCoreUrl + "/download/{0}/sing-box-{1}-linux-arm64.tar.gz",
-                match = "sing-box",
-                versionArg = "version",
-            });
-
-            _coreInfo.Add(new CoreInfo
-            {
-                coreType = ECoreType.juicity,
-                coreExes = new List<string> { "juicity-client", "juicity" },
-                arguments = "run -c config.json",
-                coreUrl = Global.JuicityCoreUrl
-            });
-
-            _coreInfo.Add(new CoreInfo
-            {
-                coreType = ECoreType.hysteria2,
-                coreExes = new List<string> { "hysteria-windows-amd64", "hysteria-windows-386", "hysteria" },
-                arguments = "",
-                coreUrl = Global.HysteriaCoreUrl,
-                coreReleaseApiUrl = Global.HysteriaCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
-                redirectInfo = true,
+                CoreType = ECoreType.hysteria2,
+                CoreExes = new List<string> { "hysteria-windows-amd64", "hysteria-linux-amd64", "hysteria" },
+                Arguments = "",
+                Url = Global.HysteriaCoreUrl,
+                ReleaseApiUrl = Global.HysteriaCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
+                RedirectInfo = true,
             });
         }
 
         private string PortableMode()
         {
-            return $" -d \"{Utils.GetBinPath("")}\"";
+            return $" -d {Utils.GetBinPath("").AppendQuotes()}";
         }
     }
 }

v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs

@@ -16,14 +16,14 @@ namespace ServiceLib.Handler.Fmt
 
         protected static int GetStdTransport(ProfileItem item, string? securityDef, ref Dictionary<string, string> dicQuery)
         {
-            if (!Utils.IsNullOrEmpty(item.flow))
+            if (Utils.IsNotEmpty(item.Flow))
             {
-                dicQuery.Add("flow", item.flow);
+                dicQuery.Add("flow", item.Flow);
             }
 
-            if (!Utils.IsNullOrEmpty(item.streamSecurity))
+            if (Utils.IsNotEmpty(item.StreamSecurity))
             {
-                dicQuery.Add("security", item.streamSecurity);
+                dicQuery.Add("security", item.StreamSecurity);
             }
             else
             {
@@ -32,95 +32,113 @@ namespace ServiceLib.Handler.Fmt
                     dicQuery.Add("security", securityDef);
                 }
             }
-            if (!Utils.IsNullOrEmpty(item.sni))
+            if (Utils.IsNotEmpty(item.Sni))
             {
-                dicQuery.Add("sni", item.sni);
+                dicQuery.Add("sni", item.Sni);
             }
-            if (!Utils.IsNullOrEmpty(item.alpn))
+            if (Utils.IsNotEmpty(item.Alpn))
             {
-                dicQuery.Add("alpn", Utils.UrlEncode(item.alpn));
+                dicQuery.Add("alpn", Utils.UrlEncode(item.Alpn));
             }
-            if (!Utils.IsNullOrEmpty(item.fingerprint))
+            if (Utils.IsNotEmpty(item.Fingerprint))
             {
-                dicQuery.Add("fp", Utils.UrlEncode(item.fingerprint));
+                dicQuery.Add("fp", Utils.UrlEncode(item.Fingerprint));
             }
-            if (!Utils.IsNullOrEmpty(item.publicKey))
+            if (Utils.IsNotEmpty(item.PublicKey))
             {
-                dicQuery.Add("pbk", Utils.UrlEncode(item.publicKey));
+                dicQuery.Add("pbk", Utils.UrlEncode(item.PublicKey));
             }
-            if (!Utils.IsNullOrEmpty(item.shortId))
+            if (Utils.IsNotEmpty(item.ShortId))
             {
-                dicQuery.Add("sid", Utils.UrlEncode(item.shortId));
+                dicQuery.Add("sid", Utils.UrlEncode(item.ShortId));
             }
-            if (!Utils.IsNullOrEmpty(item.spiderX))
+            if (Utils.IsNotEmpty(item.SpiderX))
             {
-                dicQuery.Add("spx", Utils.UrlEncode(item.spiderX));
+                dicQuery.Add("spx", Utils.UrlEncode(item.SpiderX));
             }
-            if (item.allowInsecure.Equals("true"))
+            if (item.AllowInsecure.Equals("true"))
             {
                 dicQuery.Add("allowInsecure", "1");
             }
 
-            dicQuery.Add("type", !Utils.IsNullOrEmpty(item.network) ? item.network : nameof(ETransport.tcp));
+            dicQuery.Add("type", Utils.IsNotEmpty(item.Network) ? item.Network : nameof(ETransport.tcp));
 
-            switch (item.network)
+            switch (item.Network)
             {
                 case nameof(ETransport.tcp):
-                    dicQuery.Add("headerType", !Utils.IsNullOrEmpty(item.headerType) ? item.headerType : Global.None);
-                    if (!Utils.IsNullOrEmpty(item.requestHost))
+                    dicQuery.Add("headerType", Utils.IsNotEmpty(item.HeaderType) ? item.HeaderType : Global.None);
+                    if (Utils.IsNotEmpty(item.RequestHost))
                     {
-                        dicQuery.Add("host", Utils.UrlEncode(item.requestHost));
+                        dicQuery.Add("host", Utils.UrlEncode(item.RequestHost));
                     }
                     break;
 
                 case nameof(ETransport.kcp):
-                    dicQuery.Add("headerType", !Utils.IsNullOrEmpty(item.headerType) ? item.headerType : Global.None);
-                    if (!Utils.IsNullOrEmpty(item.path))
+                    dicQuery.Add("headerType", Utils.IsNotEmpty(item.HeaderType) ? item.HeaderType : Global.None);
+                    if (Utils.IsNotEmpty(item.Path))
                     {
-                        dicQuery.Add("seed", Utils.UrlEncode(item.path));
+                        dicQuery.Add("seed", Utils.UrlEncode(item.Path));
                     }
                     break;
 
                 case nameof(ETransport.ws):
                 case nameof(ETransport.httpupgrade):
-                case nameof(ETransport.splithttp):
-                    if (!Utils.IsNullOrEmpty(item.requestHost))
+                    if (Utils.IsNotEmpty(item.RequestHost))
                     {
-                        dicQuery.Add("host", Utils.UrlEncode(item.requestHost));
+                        dicQuery.Add("host", Utils.UrlEncode(item.RequestHost));
                     }
-                    if (!Utils.IsNullOrEmpty(item.path))
+                    if (Utils.IsNotEmpty(item.Path))
                     {
-                        dicQuery.Add("path", Utils.UrlEncode(item.path));
+                        dicQuery.Add("path", Utils.UrlEncode(item.Path));
+                    }
+                    break;
+
+                case nameof(ETransport.xhttp):
+                    if (Utils.IsNotEmpty(item.RequestHost))
+                    {
+                        dicQuery.Add("host", Utils.UrlEncode(item.RequestHost));
+                    }
+                    if (Utils.IsNotEmpty(item.Path))
+                    {
+                        dicQuery.Add("path", Utils.UrlEncode(item.Path));
+                    }
+                    if (Utils.IsNotEmpty(item.HeaderType) && Global.XhttpMode.Contains(item.HeaderType))
+                    {
+                        dicQuery.Add("mode", Utils.UrlEncode(item.HeaderType));
+                    }
+                    if (Utils.IsNotEmpty(item.Extra))
+                    {
+                        dicQuery.Add("extra", Utils.UrlEncode(item.Extra));
                     }
                     break;
 
                 case nameof(ETransport.http):
                 case nameof(ETransport.h2):
                     dicQuery["type"] = nameof(ETransport.http);
-                    if (!Utils.IsNullOrEmpty(item.requestHost))
+                    if (Utils.IsNotEmpty(item.RequestHost))
                     {
-                        dicQuery.Add("host", Utils.UrlEncode(item.requestHost));
+                        dicQuery.Add("host", Utils.UrlEncode(item.RequestHost));
                     }
-                    if (!Utils.IsNullOrEmpty(item.path))
+                    if (Utils.IsNotEmpty(item.Path))
                     {
-                        dicQuery.Add("path", Utils.UrlEncode(item.path));
+                        dicQuery.Add("path", Utils.UrlEncode(item.Path));
                     }
                     break;
 
                 case nameof(ETransport.quic):
-                    dicQuery.Add("headerType", !Utils.IsNullOrEmpty(item.headerType) ? item.headerType : Global.None);
-                    dicQuery.Add("quicSecurity", Utils.UrlEncode(item.requestHost));
-                    dicQuery.Add("key", Utils.UrlEncode(item.path));
+                    dicQuery.Add("headerType", Utils.IsNotEmpty(item.HeaderType) ? item.HeaderType : Global.None);
+                    dicQuery.Add("quicSecurity", Utils.UrlEncode(item.RequestHost));
+                    dicQuery.Add("key", Utils.UrlEncode(item.Path));
                     break;
 
                 case nameof(ETransport.grpc):
-                    if (!Utils.IsNullOrEmpty(item.path))
+                    if (Utils.IsNotEmpty(item.Path))
                     {
-                        dicQuery.Add("authority", Utils.UrlEncode(item.requestHost));
-                        dicQuery.Add("serviceName", Utils.UrlEncode(item.path));
-                        if (item.headerType is Global.GrpcGunMode or Global.GrpcMultiMode)
+                        dicQuery.Add("authority", Utils.UrlEncode(item.RequestHost));
+                        dicQuery.Add("serviceName", Utils.UrlEncode(item.Path));
+                        if (item.HeaderType is Global.GrpcGunMode or Global.GrpcMultiMode)
                         {
-                            dicQuery.Add("mode", Utils.UrlEncode(item.headerType));
+                            dicQuery.Add("mode", Utils.UrlEncode(item.HeaderType));
                         }
                     }
                     break;
@@ -130,54 +148,60 @@ namespace ServiceLib.Handler.Fmt
 
         protected static int ResolveStdTransport(NameValueCollection query, ref ProfileItem item)
         {
-            item.flow = query["flow"] ?? "";
-            item.streamSecurity = query["security"] ?? "";
-            item.sni = query["sni"] ?? "";
-            item.alpn = Utils.UrlDecode(query["alpn"] ?? "");
-            item.fingerprint = Utils.UrlDecode(query["fp"] ?? "");
-            item.publicKey = Utils.UrlDecode(query["pbk"] ?? "");
-            item.shortId = Utils.UrlDecode(query["sid"] ?? "");
-            item.spiderX = Utils.UrlDecode(query["spx"] ?? "");
-            item.allowInsecure = (query["allowInsecure"] ?? "") == "1" ? "true" : "";
+            item.Flow = query["flow"] ?? "";
+            item.StreamSecurity = query["security"] ?? "";
+            item.Sni = query["sni"] ?? "";
+            item.Alpn = Utils.UrlDecode(query["alpn"] ?? "");
+            item.Fingerprint = Utils.UrlDecode(query["fp"] ?? "");
+            item.PublicKey = Utils.UrlDecode(query["pbk"] ?? "");
+            item.ShortId = Utils.UrlDecode(query["sid"] ?? "");
+            item.SpiderX = Utils.UrlDecode(query["spx"] ?? "");
+            item.AllowInsecure = (query["allowInsecure"] ?? "") == "1" ? "true" : "";
 
-            item.network = query["type"] ?? nameof(ETransport.tcp);
-            switch (item.network)
+            item.Network = query["type"] ?? nameof(ETransport.tcp);
+            switch (item.Network)
             {
                 case nameof(ETransport.tcp):
-                    item.headerType = query["headerType"] ?? Global.None;
-                    item.requestHost = Utils.UrlDecode(query["host"] ?? "");
+                    item.HeaderType = query["headerType"] ?? Global.None;
+                    item.RequestHost = Utils.UrlDecode(query["host"] ?? "");
 
                     break;
 
                 case nameof(ETransport.kcp):
-                    item.headerType = query["headerType"] ?? Global.None;
-                    item.path = Utils.UrlDecode(query["seed"] ?? "");
+                    item.HeaderType = query["headerType"] ?? Global.None;
+                    item.Path = Utils.UrlDecode(query["seed"] ?? "");
                     break;
 
                 case nameof(ETransport.ws):
                 case nameof(ETransport.httpupgrade):
-                case nameof(ETransport.splithttp):
-                    item.requestHost = Utils.UrlDecode(query["host"] ?? "");
-                    item.path = Utils.UrlDecode(query["path"] ?? "/");
+                    item.RequestHost = Utils.UrlDecode(query["host"] ?? "");
+                    item.Path = Utils.UrlDecode(query["path"] ?? "/");
+                    break;
+
+                case nameof(ETransport.xhttp):
+                    item.RequestHost = Utils.UrlDecode(query["host"] ?? "");
+                    item.Path = Utils.UrlDecode(query["path"] ?? "/");
+                    item.HeaderType = Utils.UrlDecode(query["mode"] ?? "");
+                    item.Extra = Utils.UrlDecode(query["extra"] ?? "");
                     break;
 
                 case nameof(ETransport.http):
                 case nameof(ETransport.h2):
-                    item.network = nameof(ETransport.h2);
-                    item.requestHost = Utils.UrlDecode(query["host"] ?? "");
-                    item.path = Utils.UrlDecode(query["path"] ?? "/");
+                    item.Network = nameof(ETransport.h2);
+                    item.RequestHost = Utils.UrlDecode(query["host"] ?? "");
+                    item.Path = Utils.UrlDecode(query["path"] ?? "/");
                     break;
 
                 case nameof(ETransport.quic):
-                    item.headerType = query["headerType"] ?? Global.None;
-                    item.requestHost = query["quicSecurity"] ?? Global.None;
-                    item.path = Utils.UrlDecode(query["key"] ?? "");
+                    item.HeaderType = query["headerType"] ?? Global.None;
+                    item.RequestHost = query["quicSecurity"] ?? Global.None;
+                    item.Path = Utils.UrlDecode(query["key"] ?? "");
                     break;
 
                 case nameof(ETransport.grpc):
-                    item.requestHost = Utils.UrlDecode(query["authority"] ?? "");
-                    item.path = Utils.UrlDecode(query["serviceName"] ?? "");
-                    item.headerType = Utils.UrlDecode(query["mode"] ?? Global.GrpcGunMode);
+                    item.RequestHost = Utils.UrlDecode(query["authority"] ?? "");
+                    item.Path = Utils.UrlDecode(query["serviceName"] ?? "");
+                    item.HeaderType = Utils.UrlDecode(query["mode"] ?? Global.GrpcGunMode);
                     break;
 
                 default:
@@ -197,9 +221,19 @@ namespace ServiceLib.Handler.Fmt
 
         protected static string WriteAllText(string strData, string ext = "json")
         {
-            var fileName = Utils.GetTempPath($"{Utils.GetGUID(false)}.{ext}");
+            var fileName = Utils.GetTempPath($"{Utils.GetGuid(false)}.{ext}");
             File.WriteAllText(fileName, strData);
             return fileName;
         }
+
+        protected static string ToUri(EConfigType eConfigType, string address, object port, string userInfo, Dictionary<string, string>? dicQuery, string? remark)
+        {
+            var query = dicQuery != null
+                ? ("?" + string.Join("&", dicQuery.Select(x => x.Key + "=" + x.Value).ToArray()))
+                : string.Empty;
+
+            var url = $"{Utils.UrlEncode(userInfo)}@{GetIpv6(address)}:{port}";
+            return $"{Global.ProtocolShares[eConfigType]}{url}{query}{remark}";
+        }
     }
 }

v2rayN/ServiceLib/Handler/Fmt/ClashFmt.cs

@@ -10,9 +10,9 @@
 
                 var profileItem = new ProfileItem
                 {
-                    coreType = ECoreType.mihomo,
-                    address = fileName,
-                    remarks = subRemarks ?? "clash_custom"
+                    CoreType = ECoreType.mihomo,
+                    Address = fileName,
+                    Remarks = subRemarks ?? "clash_custom"
                 };
                 return profileItem;
             }

v2rayN/ServiceLib/Handler/Fmt/FmtHandler.cs

@@ -6,16 +6,16 @@
         {
             try
             {
-                var url = item.configType switch
+                var url = item.ConfigType switch
                 {
                     EConfigType.VMess => VmessFmt.ToUri(item),
                     EConfigType.Shadowsocks => ShadowsocksFmt.ToUri(item),
-                    EConfigType.Socks => SocksFmt.ToUri(item),
+                    EConfigType.SOCKS => SocksFmt.ToUri(item),
                     EConfigType.Trojan => TrojanFmt.ToUri(item),
                     EConfigType.VLESS => VLESSFmt.ToUri(item),
                     EConfigType.Hysteria2 => Hysteria2Fmt.ToUri(item),
-                    EConfigType.Tuic => TuicFmt.ToUri(item),
-                    EConfigType.Wireguard => WireguardFmt.ToUri(item),
+                    EConfigType.TUIC => TuicFmt.ToUri(item),
+                    EConfigType.WireGuard => WireguardFmt.ToUri(item),
                     _ => null,
                 };
 
@@ -49,7 +49,7 @@
                 {
                     return ShadowsocksFmt.Resolve(str, out msg);
                 }
-                else if (str.StartsWith(Global.ProtocolShares[EConfigType.Socks]))
+                else if (str.StartsWith(Global.ProtocolShares[EConfigType.SOCKS]))
                 {
                     return SocksFmt.Resolve(str, out msg);
                 }
@@ -65,11 +65,11 @@
                 {
                     return Hysteria2Fmt.Resolve(str, out msg);
                 }
-                else if (str.StartsWith(Global.ProtocolShares[EConfigType.Tuic]))
+                else if (str.StartsWith(Global.ProtocolShares[EConfigType.TUIC]))
                 {
                     return TuicFmt.Resolve(str, out msg);
                 }
-                else if (str.StartsWith(Global.ProtocolShares[EConfigType.Wireguard]))
+                else if (str.StartsWith(Global.ProtocolShares[EConfigType.WireGuard]))
                 {
                     return WireguardFmt.Resolve(str, out msg);
                 }

v2rayN/ServiceLib/Handler/Fmt/Hysteria2Fmt.cs

@@ -7,20 +7,21 @@
             msg = ResUI.ConfigurationFormatIncorrect;
             ProfileItem item = new()
             {
-                configType = EConfigType.Hysteria2
+                ConfigType = EConfigType.Hysteria2
             };
 
-            Uri url = new(str);
+            var url = Utils.TryUri(str);
+            if (url == null) return null;
 
-            item.address = url.IdnHost;
-            item.port = url.Port;
-            item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
-            item.id = Utils.UrlDecode(url.UserInfo);
+            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";
+            item.Path = Utils.UrlDecode(query["obfs-password"] ?? "");
+            item.AllowInsecure = (query["insecure"] ?? "") == "1" ? "true" : "false";
 
             return item;
         }
@@ -31,34 +32,27 @@
             string url = string.Empty;
 
             string remark = string.Empty;
-            if (!Utils.IsNullOrEmpty(item.remarks))
+            if (Utils.IsNotEmpty(item.Remarks))
             {
-                remark = "#" + Utils.UrlEncode(item.remarks);
+                remark = "#" + Utils.UrlEncode(item.Remarks);
             }
             var dicQuery = new Dictionary<string, string>();
-            if (!Utils.IsNullOrEmpty(item.sni))
+            if (Utils.IsNotEmpty(item.Sni))
             {
-                dicQuery.Add("sni", item.sni);
+                dicQuery.Add("sni", item.Sni);
             }
-            if (!Utils.IsNullOrEmpty(item.alpn))
+            if (Utils.IsNotEmpty(item.Alpn))
             {
-                dicQuery.Add("alpn", Utils.UrlEncode(item.alpn));
+                dicQuery.Add("alpn", Utils.UrlEncode(item.Alpn));
             }
-            if (!Utils.IsNullOrEmpty(item.path))
+            if (Utils.IsNotEmpty(item.Path))
             {
                 dicQuery.Add("obfs", "salamander");
-                dicQuery.Add("obfs-password", Utils.UrlEncode(item.path));
+                dicQuery.Add("obfs-password", Utils.UrlEncode(item.Path));
             }
-            dicQuery.Add("insecure", item.allowInsecure.ToLower() == "true" ? "1" : "0");
+            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;
+            return ToUri(EConfigType.Hysteria2, item.Address, item.Port, item.Id, dicQuery, remark);
         }
 
         public static ProfileItem? ResolveFull(string strData, string? subRemarks)
@@ -69,9 +63,9 @@
 
                 var profileItem = new ProfileItem
                 {
-                    coreType = ECoreType.hysteria,
-                    address = fileName,
-                    remarks = subRemarks ?? "hysteria_custom"
+                    CoreType = ECoreType.hysteria,
+                    Address = fileName,
+                    Remarks = subRemarks ?? "hysteria_custom"
                 };
                 return profileItem;
             }
@@ -87,9 +81,9 @@
 
                 var profileItem = new ProfileItem
                 {
-                    coreType = ECoreType.hysteria2,
-                    address = fileName,
-                    remarks = subRemarks ?? "hysteria2_custom"
+                    CoreType = ECoreType.hysteria2,
+                    Address = fileName,
+                    Remarks = subRemarks ?? "hysteria2_custom"
                 };
                 return profileItem;
             }

v2rayN/ServiceLib/Handler/Fmt/NaiveproxyFmt.cs

@@ -10,9 +10,9 @@
 
                 var profileItem = new ProfileItem
                 {
-                    coreType = ECoreType.naiveproxy,
-                    address = fileName,
-                    remarks = subRemarks ?? "naiveproxy_custom"
+                    CoreType = ECoreType.naiveproxy,
+                    Address = fileName,
+                    Remarks = subRemarks ?? "naiveproxy_custom"
                 };
                 return profileItem;
             }

v2rayN/ServiceLib/Handler/Fmt/ShadowsocksFmt.cs

@@ -14,12 +14,12 @@ namespace ServiceLib.Handler.Fmt
             {
                 return null;
             }
-            if (item.address.Length == 0 || item.port == 0 || item.security.Length == 0 || item.id.Length == 0)
+            if (item.Address.Length == 0 || item.Port == 0 || item.Security.Length == 0 || item.Id.Length == 0)
             {
                 return null;
             }
 
-            item.configType = EConfigType.Shadowsocks;
+            item.ConfigType = EConfigType.Shadowsocks;
 
             return item;
         }
@@ -30,9 +30,9 @@ namespace ServiceLib.Handler.Fmt
             string url = string.Empty;
 
             string remark = string.Empty;
-            if (!Utils.IsNullOrEmpty(item.remarks))
+            if (Utils.IsNotEmpty(item.Remarks))
             {
-                remark = "#" + Utils.UrlEncode(item.remarks);
+                remark = "#" + Utils.UrlEncode(item.Remarks);
             }
             //url = string.Format("{0}:{1}@{2}:{3}",
             //    item.security,
@@ -41,10 +41,8 @@ namespace ServiceLib.Handler.Fmt
             //    item.port);
             //url = Utile.Base64Encode(url);
             //new Sip002
-            var pw = Utils.Base64Encode($"{item.security}:{item.id}");
-            url = $"{pw}@{GetIpv6(item.address)}:{item.port}";
-            url = $"{Global.ProtocolShares[EConfigType.Shadowsocks]}{url}{remark}";
-            return url;
+            var pw = Utils.Base64Encode($"{item.Security}:{item.Id}");
+            return ToUri(EConfigType.Shadowsocks, item.Address, item.Port, pw, null, remark);
         }
 
         private static readonly Regex UrlFinder = new(@"ss://(?<base64>[A-Za-z0-9+-/=_]+)(?:#(?<tag>\S+))?", RegexOptions.IgnoreCase | RegexOptions.Compiled);
@@ -59,9 +57,9 @@ namespace ServiceLib.Handler.Fmt
             ProfileItem item = new();
             var base64 = match.Groups["base64"].Value.TrimEnd('/');
             var tag = match.Groups["tag"].Value;
-            if (!Utils.IsNullOrEmpty(tag))
+            if (Utils.IsNotEmpty(tag))
             {
-                item.remarks = Utils.UrlDecode(tag);
+                item.Remarks = Utils.UrlDecode(tag);
             }
             Match details;
             try
@@ -74,31 +72,25 @@ namespace ServiceLib.Handler.Fmt
             }
             if (!details.Success)
                 return null;
-            item.security = details.Groups["method"].Value;
-            item.id = details.Groups["password"].Value;
-            item.address = details.Groups["hostname"].Value;
-            item.port = Utils.ToInt(details.Groups["port"].Value);
+            item.Security = details.Groups["method"].Value;
+            item.Id = details.Groups["password"].Value;
+            item.Address = details.Groups["hostname"].Value;
+            item.Port = Utils.ToInt(details.Groups["port"].Value);
             return item;
         }
 
         private static ProfileItem? ResolveSip002(string result)
         {
-            Uri parsedUrl;
-            try
-            {
-                parsedUrl = new Uri(result);
-            }
-            catch (UriFormatException)
-            {
-                return null;
-            }
+            var parsedUrl = Utils.TryUri(result);
+            if (parsedUrl == null) return null;
+
             ProfileItem item = new()
             {
-                remarks = parsedUrl.GetComponents(UriComponents.Fragment, UriFormat.Unescaped),
-                address = parsedUrl.IdnHost,
-                port = parsedUrl.Port,
+                Remarks = parsedUrl.GetComponents(UriComponents.Fragment, UriFormat.Unescaped),
+                Address = parsedUrl.IdnHost,
+                Port = parsedUrl.Port,
             };
-            string rawUserInfo = parsedUrl.GetComponents(UriComponents.UserInfo, UriFormat.UriEscaped);
+            var rawUserInfo = Utils.UrlDecode(parsedUrl.UserInfo);
             //2022-blake3
             if (rawUserInfo.Contains(':'))
             {
@@ -107,8 +99,8 @@ namespace ServiceLib.Handler.Fmt
                 {
                     return null;
                 }
-                item.security = userInfoParts[0];
-                item.id = Utils.UrlDecode(userInfoParts[1]);
+                item.Security = userInfoParts.First();
+                item.Id = Utils.UrlDecode(userInfoParts.Last());
             }
             else
             {
@@ -119,8 +111,8 @@ namespace ServiceLib.Handler.Fmt
                 {
                     return null;
                 }
-                item.security = userInfoParts[0];
-                item.id = userInfoParts[1];
+                item.Security = userInfoParts.First();
+                item.Id = userInfoParts.Last();
             }
 
             var queryParameters = Utils.ParseQueryString(parsedUrl.Query);
@@ -128,12 +120,12 @@ namespace ServiceLib.Handler.Fmt
             {
                 //obfs-host exists
                 var obfsHost = queryParameters["plugin"]?.Split(';').FirstOrDefault(t => t.Contains("obfs-host"));
-                if (queryParameters["plugin"].Contains("obfs=http") && !Utils.IsNullOrEmpty(obfsHost))
+                if (queryParameters["plugin"].Contains("obfs=http") && Utils.IsNotEmpty(obfsHost))
                 {
                     obfsHost = obfsHost?.Replace("obfs-host=", "");
-                    item.network = Global.DefaultNetwork;
-                    item.headerType = Global.TcpHeaderHttp;
-                    item.requestHost = obfsHost ?? "";
+                    item.Network = Global.DefaultNetwork;
+                    item.HeaderType = Global.TcpHeaderHttp;
+                    item.RequestHost = obfsHost ?? "";
                 }
                 else
                 {
@@ -164,11 +156,11 @@ namespace ServiceLib.Handler.Fmt
                 {
                     var ssItem = new ProfileItem()
                     {
-                        remarks = it.remarks,
-                        security = it.method,
-                        id = it.password,
-                        address = it.server,
-                        port = Utils.ToInt(it.server_port)
+                        Remarks = it.remarks,
+                        Security = it.method,
+                        Id = it.password,
+                        Address = it.server,
+                        Port = Utils.ToInt(it.server_port)
                     };
                     lst.Add(ssItem);
                 }

v2rayN/ServiceLib/Handler/Fmt/SingboxFmt.cs

@@ -20,9 +20,9 @@
 
                         var profileIt = new ProfileItem
                         {
-                            coreType = ECoreType.sing_box,
-                            address = fileName,
-                            remarks = subRemarks ?? "singbox_custom",
+                            CoreType = ECoreType.sing_box,
+                            Address = fileName,
+                            Remarks = subRemarks ?? "singbox_custom",
                         };
                         lstResult.Add(profileIt);
                     }
@@ -42,9 +42,9 @@
                 var fileName = WriteAllText(strData);
                 var profileItem = new ProfileItem
                 {
-                    coreType = ECoreType.sing_box,
-                    address = fileName,
-                    remarks = subRemarks ?? "singbox_custom"
+                    CoreType = ECoreType.sing_box,
+                    Address = fileName,
+                    Remarks = subRemarks ?? "singbox_custom"
                 };
 
                 return profileItem;

v2rayN/ServiceLib/Handler/Fmt/SocksFmt.cs

@@ -5,19 +5,18 @@
         public static ProfileItem? Resolve(string str, out string msg)
         {
             msg = ResUI.ConfigurationFormatIncorrect;
-            ProfileItem? item;
 
-            item = ResolveSocksNew(str) ?? ResolveSocks(str);
+            var item = ResolveSocksNew(str) ?? ResolveSocks(str);
             if (item == null)
             {
                 return null;
             }
-            if (item.address.Length == 0 || item.port == 0)
+            if (item.Address.Length == 0 || item.Port == 0)
             {
                 return null;
             }
 
-            item.configType = EConfigType.Socks;
+            item.ConfigType = EConfigType.SOCKS;
 
             return item;
         }
@@ -25,46 +24,38 @@
         public static string? ToUri(ProfileItem? item)
         {
             if (item == null) return null;
-            string url = string.Empty;
+            var url = string.Empty;
 
-            string remark = string.Empty;
-            if (!Utils.IsNullOrEmpty(item.remarks))
+            var remark = string.Empty;
+            if (Utils.IsNotEmpty(item.Remarks))
             {
-                remark = "#" + Utils.UrlEncode(item.remarks);
+                remark = "#" + Utils.UrlEncode(item.Remarks);
             }
-            //url = string.Format("{0}:{1}@{2}:{3}",
-            //    item.security,
-            //    item.id,
-            //    item.address,
-            //    item.port);
-            //url = Utile.Base64Encode(url);
             //new
-            var pw = Utils.Base64Encode($"{item.security}:{item.id}");
-            url = $"{pw}@{GetIpv6(item.address)}:{item.port}";
-            url = $"{Global.ProtocolShares[EConfigType.Socks]}{url}{remark}";
-            return url;
+            var pw = Utils.Base64Encode($"{item.Security}:{item.Id}");
+            return ToUri(EConfigType.SOCKS, item.Address, item.Port, pw, null, remark);
         }
 
         private static ProfileItem? ResolveSocks(string result)
         {
             ProfileItem item = new()
             {
-                configType = EConfigType.Socks
+                ConfigType = EConfigType.SOCKS
             };
-            result = result[Global.ProtocolShares[EConfigType.Socks].Length..];
+            result = result[Global.ProtocolShares[EConfigType.SOCKS].Length..];
             //remark
-            int indexRemark = result.IndexOf("#");
+            var indexRemark = result.IndexOf("#");
             if (indexRemark > 0)
             {
                 try
                 {
-                    item.remarks = Utils.UrlDecode(result.Substring(indexRemark + 1, result.Length - indexRemark - 1));
+                    item.Remarks = Utils.UrlDecode(result.Substring(indexRemark + 1, result.Length - indexRemark - 1));
                 }
                 catch { }
                 result = result[..indexRemark];
             }
             //part decode
-            int indexS = result.IndexOf("@");
+            var indexS = result.IndexOf("@");
             if (indexS > 0)
             {
             }
@@ -73,52 +64,45 @@
                 result = Utils.Base64Decode(result);
             }
 
-            string[] arr1 = result.Split('@');
+            var arr1 = result.Split('@');
             if (arr1.Length != 2)
             {
                 return null;
             }
-            string[] arr21 = arr1[0].Split(':');
-            //string[] arr22 = arr1[1].Split(':');
-            int indexPort = arr1[1].LastIndexOf(":");
+            var arr21 = arr1.First().Split(':');
+            var indexPort = arr1.Last().LastIndexOf(":");
             if (arr21.Length != 2 || indexPort < 0)
             {
                 return null;
             }
-            item.address = arr1[1][..indexPort];
-            item.port = Utils.ToInt(arr1[1][(indexPort + 1)..]);
-            item.security = arr21[0];
-            item.id = arr21[1];
+            item.Address = arr1[1][..indexPort];
+            item.Port = Utils.ToInt(arr1[1][(indexPort + 1)..]);
+            item.Security = arr21.First();
+            item.Id = arr21[1];
 
             return item;
         }
 
         private static ProfileItem? ResolveSocksNew(string result)
         {
-            Uri parsedUrl;
-            try
-            {
-                parsedUrl = new Uri(result);
-            }
-            catch (UriFormatException)
-            {
-                return null;
-            }
+            var parsedUrl = Utils.TryUri(result);
+            if (parsedUrl == null) return null;
+
             ProfileItem item = new()
             {
-                remarks = parsedUrl.GetComponents(UriComponents.Fragment, UriFormat.Unescaped),
-                address = parsedUrl.IdnHost,
-                port = parsedUrl.Port,
+                Remarks = parsedUrl.GetComponents(UriComponents.Fragment, UriFormat.Unescaped),
+                Address = parsedUrl.IdnHost,
+                Port = parsedUrl.Port,
             };
 
             // parse base64 UserInfo
-            string rawUserInfo = parsedUrl.GetComponents(UriComponents.UserInfo, UriFormat.Unescaped);
-            string userInfo = Utils.Base64Decode(rawUserInfo);
-            string[] userInfoParts = userInfo.Split(new[] { ':' }, 2);
+            var rawUserInfo = Utils.UrlDecode(parsedUrl.UserInfo);
+            var userInfo = Utils.Base64Decode(rawUserInfo);
+            var userInfoParts = userInfo.Split([':'], 2);
             if (userInfoParts.Length == 2)
             {
-                item.security = userInfoParts[0];
-                item.id = userInfoParts[1];
+                item.Security = userInfoParts.First();
+                item.Id = userInfoParts[1];
             }
 
             return item;

v2rayN/ServiceLib/Handler/Fmt/TrojanFmt.cs

@@ -8,15 +8,16 @@
 
             ProfileItem item = new()
             {
-                configType = EConfigType.Trojan
+                ConfigType = EConfigType.Trojan
             };
 
-            Uri url = new(str);
+            var url = Utils.TryUri(str);
+            if (url == null) return null;
 
-            item.address = url.IdnHost;
-            item.port = url.Port;
-            item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
-            item.id = Utils.UrlDecode(url.UserInfo);
+            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);
@@ -30,20 +31,14 @@
             string url = string.Empty;
 
             string remark = string.Empty;
-            if (!Utils.IsNullOrEmpty(item.remarks))
+            if (Utils.IsNotEmpty(item.Remarks))
             {
-                remark = "#" + Utils.UrlEncode(item.remarks);
+                remark = "#" + Utils.UrlEncode(item.Remarks);
             }
             var dicQuery = new Dictionary<string, string>();
             GetStdTransport(item, null, ref dicQuery);
-            string query = "?" + string.Join("&", dicQuery.Select(x => x.Key + "=" + x.Value).ToArray());
 
-            url = string.Format("{0}@{1}:{2}",
-            item.id,
-            GetIpv6(item.address),
-            item.port);
-            url = $"{Global.ProtocolShares[EConfigType.Trojan]}{url}{query}{remark}";
-            return url;
+            return ToUri(EConfigType.Trojan, item.Address, item.Port, item.Id, dicQuery, remark);
         }
     }
 }

v2rayN/ServiceLib/Handler/Fmt/TuicFmt.cs

@@ -8,24 +8,26 @@
 
             ProfileItem item = new()
             {
-                configType = EConfigType.Tuic
+                ConfigType = EConfigType.TUIC
             };
 
-            Uri url = new(str);
+            var url = Utils.TryUri(str);
+            if (url == null) return null;
 
-            item.address = url.IdnHost;
-            item.port = url.Port;
-            item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
-            var userInfoParts = url.UserInfo.Split(new[] { ':' }, 2);
+            item.Address = url.IdnHost;
+            item.Port = url.Port;
+            item.Remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
+            var rawUserInfo = Utils.UrlDecode(url.UserInfo);
+            var userInfoParts = rawUserInfo.Split(new[] { ':' }, 2);
             if (userInfoParts.Length == 2)
             {
-                item.id = userInfoParts[0];
-                item.security = userInfoParts[1];
+                item.Id = userInfoParts.First();
+                item.Security = userInfoParts.Last();
             }
 
             var query = Utils.ParseQueryString(url.Query);
             ResolveStdTransport(query, ref item);
-            item.headerType = query["congestion_control"] ?? "";
+            item.HeaderType = query["congestion_control"] ?? "";
 
             return item;
         }
@@ -36,29 +38,22 @@
             string url = string.Empty;
 
             string remark = string.Empty;
-            if (!Utils.IsNullOrEmpty(item.remarks))
+            if (Utils.IsNotEmpty(item.Remarks))
             {
-                remark = "#" + Utils.UrlEncode(item.remarks);
+                remark = "#" + Utils.UrlEncode(item.Remarks);
             }
             var dicQuery = new Dictionary<string, string>();
-            if (!Utils.IsNullOrEmpty(item.sni))
+            if (Utils.IsNotEmpty(item.Sni))
             {
-                dicQuery.Add("sni", item.sni);
+                dicQuery.Add("sni", item.Sni);
             }
-            if (!Utils.IsNullOrEmpty(item.alpn))
+            if (Utils.IsNotEmpty(item.Alpn))
             {
-                dicQuery.Add("alpn", Utils.UrlEncode(item.alpn));
+                dicQuery.Add("alpn", Utils.UrlEncode(item.Alpn));
             }
-            dicQuery.Add("congestion_control", item.headerType);
+            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;
+            return ToUri(EConfigType.TUIC, item.Address, item.Port, $"{item.Id}:{item.Security}", dicQuery, remark);
         }
     }
 }

v2rayN/ServiceLib/Handler/Fmt/V2rayFmt.cs

@@ -20,9 +20,9 @@
 
                         var profileIt = new ProfileItem
                         {
-                            coreType = ECoreType.Xray,
-                            address = fileName,
-                            remarks = v2rayCon.remarks ?? subRemarks ?? "v2ray_custom",
+                            CoreType = ECoreType.Xray,
+                            Address = fileName,
+                            Remarks = v2rayCon.remarks ?? subRemarks ?? "v2ray_custom",
                         };
                         lstResult.Add(profileIt);
                     }
@@ -43,9 +43,9 @@
 
                 var profileItem = new ProfileItem
                 {
-                    coreType = ECoreType.Xray,
-                    address = fileName,
-                    remarks = v2rayConfig.remarks ?? subRemarks ?? "v2ray_custom"
+                    CoreType = ECoreType.Xray,
+                    Address = fileName,
+                    Remarks = v2rayConfig.remarks ?? subRemarks ?? "v2ray_custom"
                 };
 
                 return profileItem;

v2rayN/ServiceLib/Handler/Fmt/VLESSFmt.cs

@@ -8,20 +8,21 @@
 
             ProfileItem item = new()
             {
-                configType = EConfigType.VLESS,
-                security = Global.None
+                ConfigType = EConfigType.VLESS,
+                Security = Global.None
             };
 
-            Uri url = new(str);
+            var url = Utils.TryUri(str);
+            if (url == null) return null;
 
-            item.address = url.IdnHost;
-            item.port = url.Port;
-            item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
-            item.id = Utils.UrlDecode(url.UserInfo);
+            item.Address = url.IdnHost;
+            item.Port = url.Port;
+            item.Remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
+            item.Id = Utils.UrlDecode(url.UserInfo);
 
             var query = Utils.ParseQueryString(url.Query);
-            item.security = query["encryption"] ?? Global.None;
-            item.streamSecurity = query["security"] ?? "";
+            item.Security = query["encryption"] ?? Global.None;
+            item.StreamSecurity = query["security"] ?? "";
             ResolveStdTransport(query, ref item);
 
             return item;
@@ -33,28 +34,22 @@
             string url = string.Empty;
 
             string remark = string.Empty;
-            if (!Utils.IsNullOrEmpty(item.remarks))
+            if (Utils.IsNotEmpty(item.Remarks))
             {
-                remark = "#" + Utils.UrlEncode(item.remarks);
+                remark = "#" + Utils.UrlEncode(item.Remarks);
             }
             var dicQuery = new Dictionary<string, string>();
-            if (!Utils.IsNullOrEmpty(item.security))
+            if (Utils.IsNotEmpty(item.Security))
             {
-                dicQuery.Add("encryption", item.security);
+                dicQuery.Add("encryption", item.Security);
             }
             else
             {
                 dicQuery.Add("encryption", Global.None);
             }
             GetStdTransport(item, Global.None, ref dicQuery);
-            string query = "?" + string.Join("&", dicQuery.Select(x => x.Key + "=" + x.Value).ToArray());
 
-            url = string.Format("{0}@{1}:{2}",
-            item.id,
-            GetIpv6(item.address),
-            item.port);
-            url = $"{Global.ProtocolShares[EConfigType.VLESS]}{url}{query}{remark}";
-            return url;
+            return ToUri(EConfigType.VLESS, item.Address, item.Port, item.Id, dicQuery, remark);
         }
     }
 }

v2rayN/ServiceLib/Handler/Fmt/VmessFmt.cs

@@ -24,21 +24,21 @@
 
             VmessQRCode vmessQRCode = new()
             {
-                v = item.configVersion,
-                ps = item.remarks.TrimEx(),
-                add = item.address,
-                port = item.port,
-                id = item.id,
-                aid = item.alterId,
-                scy = item.security,
-                net = item.network,
-                type = item.headerType,
-                host = item.requestHost,
-                path = item.path,
-                tls = item.streamSecurity,
-                sni = item.sni,
-                alpn = item.alpn,
-                fp = item.fingerprint
+                v = item.ConfigVersion,
+                ps = item.Remarks.TrimEx(),
+                add = item.Address,
+                port = item.Port,
+                id = item.Id,
+                aid = item.AlterId,
+                scy = item.Security,
+                net = item.Network,
+                type = item.HeaderType,
+                host = item.RequestHost,
+                path = item.Path,
+                tls = item.StreamSecurity,
+                sni = item.Sni,
+                alpn = item.Alpn,
+                fp = item.Fingerprint
             };
 
             url = JsonUtils.Serialize(vmessQRCode);
@@ -53,13 +53,12 @@
             msg = string.Empty;
             var item = new ProfileItem
             {
-                configType = EConfigType.VMess
+                ConfigType = EConfigType.VMess
             };
 
             result = result[Global.ProtocolShares[EConfigType.VMess].Length..];
             result = Utils.Base64Decode(result);
 
-            //转成Json
             VmessQRCode? vmessQRCode = JsonUtils.Deserialize<VmessQRCode>(result);
             if (vmessQRCode == null)
             {
@@ -67,33 +66,33 @@
                 return null;
             }
 
-            item.network = Global.DefaultNetwork;
-            item.headerType = Global.None;
+            item.Network = Global.DefaultNetwork;
+            item.HeaderType = Global.None;
 
-            item.configVersion = Utils.ToInt(vmessQRCode.v);
-            item.remarks = Utils.ToString(vmessQRCode.ps);
-            item.address = Utils.ToString(vmessQRCode.add);
-            item.port = Utils.ToInt(vmessQRCode.port);
-            item.id = Utils.ToString(vmessQRCode.id);
-            item.alterId = Utils.ToInt(vmessQRCode.aid);
-            item.security = Utils.ToString(vmessQRCode.scy);
+            item.ConfigVersion = vmessQRCode.v;
+            item.Remarks = Utils.ToString(vmessQRCode.ps);
+            item.Address = Utils.ToString(vmessQRCode.add);
+            item.Port = vmessQRCode.port;
+            item.Id = Utils.ToString(vmessQRCode.id);
+            item.AlterId = vmessQRCode.aid;
+            item.Security = Utils.ToString(vmessQRCode.scy);
 
-            item.security = !Utils.IsNullOrEmpty(vmessQRCode.scy) ? vmessQRCode.scy : Global.DefaultSecurity;
-            if (!Utils.IsNullOrEmpty(vmessQRCode.net))
+            item.Security = Utils.IsNotEmpty(vmessQRCode.scy) ? vmessQRCode.scy : Global.DefaultSecurity;
+            if (Utils.IsNotEmpty(vmessQRCode.net))
             {
-                item.network = vmessQRCode.net;
+                item.Network = vmessQRCode.net;
             }
-            if (!Utils.IsNullOrEmpty(vmessQRCode.type))
+            if (Utils.IsNotEmpty(vmessQRCode.type))
             {
-                item.headerType = vmessQRCode.type;
+                item.HeaderType = vmessQRCode.type;
             }
 
-            item.requestHost = Utils.ToString(vmessQRCode.host);
-            item.path = Utils.ToString(vmessQRCode.path);
-            item.streamSecurity = Utils.ToString(vmessQRCode.tls);
-            item.sni = Utils.ToString(vmessQRCode.sni);
-            item.alpn = Utils.ToString(vmessQRCode.alpn);
-            item.fingerprint = Utils.ToString(vmessQRCode.fp);
+            item.RequestHost = Utils.ToString(vmessQRCode.host);
+            item.Path = Utils.ToString(vmessQRCode.path);
+            item.StreamSecurity = Utils.ToString(vmessQRCode.tls);
+            item.Sni = Utils.ToString(vmessQRCode.sni);
+            item.Alpn = Utils.ToString(vmessQRCode.alpn);
+            item.Fingerprint = Utils.ToString(vmessQRCode.fp);
 
             return item;
         }
@@ -102,16 +101,17 @@
         {
             ProfileItem item = new()
             {
-                configType = EConfigType.VMess,
-                security = "auto"
+                ConfigType = EConfigType.VMess,
+                Security = "auto"
             };
 
-            Uri url = new(str);
+            var url = Utils.TryUri(str);
+            if (url == null) return null;
 
-            item.address = url.IdnHost;
-            item.port = url.Port;
-            item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
-            item.id = Utils.UrlDecode(url.UserInfo);
+            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);

v2rayN/ServiceLib/Handler/Fmt/WireguardFmt.cs

@@ -8,22 +8,23 @@
 
             ProfileItem item = new()
             {
-                configType = EConfigType.Wireguard
+                ConfigType = EConfigType.WireGuard
             };
 
-            Uri url = new(str);
+            var url = Utils.TryUri(str);
+            if (url == null) return null;
 
-            item.address = url.IdnHost;
-            item.port = url.Port;
-            item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
-            item.id = Utils.UrlDecode(url.UserInfo);
+            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"] ?? "");
+            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;
         }
@@ -34,36 +35,29 @@
             string url = string.Empty;
 
             string remark = string.Empty;
-            if (!Utils.IsNullOrEmpty(item.remarks))
+            if (Utils.IsNotEmpty(item.Remarks))
             {
-                remark = "#" + Utils.UrlEncode(item.remarks);
+                remark = "#" + Utils.UrlEncode(item.Remarks);
             }
 
             var dicQuery = new Dictionary<string, string>();
-            if (!Utils.IsNullOrEmpty(item.publicKey))
+            if (Utils.IsNotEmpty(item.PublicKey))
             {
-                dicQuery.Add("publickey", Utils.UrlEncode(item.publicKey));
+                dicQuery.Add("publickey", Utils.UrlEncode(item.PublicKey));
             }
-            if (!Utils.IsNullOrEmpty(item.path))
+            if (Utils.IsNotEmpty(item.Path))
             {
-                dicQuery.Add("reserved", Utils.UrlEncode(item.path));
+                dicQuery.Add("reserved", Utils.UrlEncode(item.Path));
             }
-            if (!Utils.IsNullOrEmpty(item.requestHost))
+            if (Utils.IsNotEmpty(item.RequestHost))
             {
-                dicQuery.Add("address", Utils.UrlEncode(item.requestHost));
+                dicQuery.Add("address", Utils.UrlEncode(item.RequestHost));
             }
-            if (!Utils.IsNullOrEmpty(item.shortId))
+            if (Utils.IsNotEmpty(item.ShortId))
             {
-                dicQuery.Add("mtu", Utils.UrlEncode(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;
+            return ToUri(EConfigType.WireGuard, item.Address, item.Port, item.Id, dicQuery, remark);
         }
     }
 }

v2rayN/ServiceLib/Handler/LazyConfig.cs

@@ -1,244 +0,0 @@
-using System.Runtime.InteropServices;
-
-namespace ServiceLib.Handler
-{
-    public sealed class LazyConfig
-    {
-        private static readonly Lazy<LazyConfig> _instance = new(() => new());
-        private Config _config;
-        private int? _statePort;
-        private int? _statePort2;
-
-        public static LazyConfig Instance => _instance.Value;
-        public Config Config => _config;
-
-        public int StatePort
-        {
-            get
-            {
-                _statePort ??= Utils.GetFreePort(GetLocalPort(EInboundProtocol.api));
-                return _statePort.Value;
-            }
-        }
-
-        public int StatePort2
-        {
-            get
-            {
-                _statePort2 ??= Utils.GetFreePort(GetLocalPort(EInboundProtocol.api2));
-                return _statePort2.Value;
-            }
-        }
-
-        private Job? _processJob;
-
-        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>();
-        }
-
-        #region Config
-
-        public void SetConfig(Config config) => _config = config;
-
-        public int GetLocalPort(EInboundProtocol protocol)
-        {
-            var localPort = _config.inbound.FirstOrDefault(t => t.protocol == nameof(EInboundProtocol.socks))?.localPort ?? 10808;
-            return localPort + (int)protocol;
-        }
-
-        public void AddProcess(IntPtr processHandle)
-        {
-            if (Utils.IsWindows())
-            {
-                _processJob ??= new();
-                _processJob?.AddProcess(processHandle);
-            }
-        }
-
-        #endregion Config
-
-        #region SqliteHelper
-
-        public List<SubItem> SubItems()
-        {
-            return SQLiteHelper.Instance.Table<SubItem>().ToList();
-        }
-
-        public SubItem GetSubItem(string 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();
-            }
-            else
-            {
-                return SQLiteHelper.Instance.Table<ProfileItem>().Where(t => t.subid == subid).ToList();
-            }
-        }
-
-        public List<string> ProfileItemIndexes(string subid)
-        {
-            if (Utils.IsNullOrEmpty(subid))
-            {
-                return SQLiteHelper.Instance.Table<ProfileItem>().Select(t => t.indexId).ToList();
-            }
-            else
-            {
-                return SQLiteHelper.Instance.Table<ProfileItem>().Where(t => t.subid == subid).Select(t => t.indexId).ToList();
-            }
-        }
-
-        public List<ProfileItemModel> ProfileItems(string subid, string filter)
-        {
-            var sql = @$"select a.*
-                           ,b.remarks subRemarks
-                        from ProfileItem a
-                        left join SubItem b on a.subid = b.id
-                        where 1=1 ";
-            if (!Utils.IsNullOrEmpty(subid))
-            {
-                sql += $" and a.subid = '{subid}'";
-            }
-            if (!Utils.IsNullOrEmpty(filter))
-            {
-                if (filter.Contains('\''))
-                {
-                    filter = filter.Replace("'", "");
-                }
-                sql += String.Format(" and (a.remarks like '%{0}%' or a.address like '%{0}%') ", filter);
-            }
-
-            return SQLiteHelper.Instance.Query<ProfileItemModel>(sql).ToList();
-        }
-
-        public List<ProfileItemModel> ProfileItemsEx(string subid, string filter)
-        {
-            var lstModel = ProfileItems(_config.subIndexId, filter);
-
-            ConfigHandler.SetDefaultServer(_config, lstModel);
-
-            var lstServerStat = (_config.guiItem.enableStatistics ? StatisticsHandler.Instance.ServerStat : null) ?? [];
-            var lstProfileExs = ProfileExHandler.Instance.ProfileExs;
-            lstModel = (from t in lstModel
-                        join t2 in lstServerStat on t.indexId equals t2.indexId into t2b
-                        from t22 in t2b.DefaultIfEmpty()
-                        join t3 in lstProfileExs on t.indexId equals t3.indexId into t3b
-                        from t33 in t3b.DefaultIfEmpty()
-                        select new ProfileItemModel
-                        {
-                            indexId = t.indexId,
-                            configType = t.configType,
-                            remarks = t.remarks,
-                            address = t.address,
-                            port = t.port,
-                            security = t.security,
-                            network = t.network,
-                            streamSecurity = t.streamSecurity,
-                            subid = t.subid,
-                            subRemarks = t.subRemarks,
-                            isActive = t.indexId == _config.indexId,
-                            sort = t33 == null ? 0 : t33.sort,
-                            delay = t33 == null ? 0 : t33.delay,
-                            delayVal = t33?.delay != 0 ? $"{t33?.delay} {Global.DelayUnit}" : string.Empty,
-                            speedVal = t33?.speed != 0 ? $"{t33?.speed} {Global.SpeedUnit}" : string.Empty,
-                            todayDown = t22 == null ? "" : Utils.HumanFy(t22.todayDown),
-                            todayUp = t22 == null ? "" : Utils.HumanFy(t22.todayUp),
-                            totalDown = t22 == null ? "" : Utils.HumanFy(t22.totalDown),
-                            totalUp = t22 == null ? "" : Utils.HumanFy(t22.totalUp)
-                        }).OrderBy(t => t.sort).ToList();
-
-            return lstModel;
-        }
-
-        public ProfileItem? GetProfileItem(string indexId)
-        {
-            if (Utils.IsNullOrEmpty(indexId))
-            {
-                return null;
-            }
-            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();
-        }
-
-        public RoutingItem GetRoutingItem(string id)
-        {
-            return SQLiteHelper.Instance.Table<RoutingItem>().FirstOrDefault(it => it.locked == false && it.id == id);
-        }
-
-        public List<DNSItem> DNSItems()
-        {
-            return SQLiteHelper.Instance.Table<DNSItem>().ToList();
-        }
-
-        public DNSItem GetDNSItem(ECoreType eCoreType)
-        {
-            return SQLiteHelper.Instance.Table<DNSItem>().FirstOrDefault(it => it.coreType == eCoreType);
-        }
-
-        #endregion SqliteHelper
-
-        #region Core Type
-
-        public List<string> GetShadowsocksSecurities(ProfileItem profileItem)
-        {
-            var coreType = GetCoreType(profileItem, EConfigType.Shadowsocks);
-            switch (coreType)
-            {
-                case ECoreType.v2fly:
-                    return Global.SsSecurities;
-
-                case ECoreType.Xray:
-                    return Global.SsSecuritiesInXray;
-
-                case ECoreType.sing_box:
-                    return Global.SsSecuritiesInSingbox;
-            }
-            return Global.SsSecuritiesInSagerNet;
-        }
-
-        public ECoreType GetCoreType(ProfileItem profileItem, EConfigType eConfigType)
-        {
-            if (profileItem?.coreType != null)
-            {
-                return (ECoreType)profileItem.coreType;
-            }
-
-            if (_config.coreTypeItem == null)
-            {
-                return ECoreType.Xray;
-            }
-            var item = _config.coreTypeItem.FirstOrDefault(it => it.configType == eConfigType);
-            if (item == null)
-            {
-                return ECoreType.Xray;
-            }
-            return item.coreType;
-        }
-
-        #endregion Core Type
-    }
-}

v2rayN/ServiceLib/Handler/NoticeHandler.cs

@@ -4,13 +4,16 @@ namespace ServiceLib.Handler
 {
     public class NoticeHandler
     {
+        private static readonly Lazy<NoticeHandler> _instance = new(() => new());
+        public static NoticeHandler Instance => _instance.Value;
+
         public void Enqueue(string? content)
         {
             if (content.IsNullOrEmpty())
             {
                 return;
             }
-            MessageBus.Current.SendMessage(content, Global.CommandSendSnackMsg);
+            MessageBus.Current.SendMessage(content, EMsgCommand.SendSnackMsg.ToString());
         }
 
         public void SendMessage(string? content)
@@ -19,16 +22,16 @@ namespace ServiceLib.Handler
             {
                 return;
             }
-            MessageBus.Current.SendMessage(content, Global.CommandSendMsgView);
+            MessageBus.Current.SendMessage(content, EMsgCommand.SendMsgView.ToString());
         }
 
-        public void SendMessage(string? content, bool time)
+        public void SendMessageEx(string? content)
         {
             if (content.IsNullOrEmpty())
             {
                 return;
             }
-            content = $"{DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss")} {content}";
+            content = $"{DateTime.Now:yyyy/MM/dd HH:mm:ss} {content}";
             SendMessage(content);
         }
 

v2rayN/ServiceLib/Handler/PacHandler.cs

@@ -0,0 +1,105 @@
+using System.Net.Sockets;
+using System.Text;
+
+namespace ServiceLib.Handler
+{
+    public class PacHandler
+    {
+        private static string _configPath;
+        private static int _httpPort;
+        private static int _pacPort;
+        private static TcpListener? _tcpListener;
+        private static byte[] _writeContent;
+        private static bool _isRunning;
+        private static bool _needRestart = true;
+
+        public static async Task Start(string configPath, int httpPort, int pacPort)
+        {
+            _needRestart = (configPath != _configPath || httpPort != _httpPort || pacPort != _pacPort || !_isRunning);
+
+            _configPath = configPath;
+            _httpPort = httpPort;
+            _pacPort = pacPort;
+
+            await InitText();
+
+            if (_needRestart)
+            {
+                Stop();
+                RunListener();
+            }
+        }
+
+        private static async Task InitText()
+        {
+            var path = Path.Combine(_configPath, "pac.txt");
+            if (!File.Exists(path))
+            {
+                var pac = Utils.GetEmbedText(Global.PacFileName);
+                await File.AppendAllTextAsync(path, pac);
+            }
+
+            var pacText =
+                (await File.ReadAllTextAsync(path)).Replace("__PROXY__", $"PROXY 127.0.0.1:{_httpPort};DIRECT;");
+
+            var sb = new StringBuilder();
+            sb.AppendLine("HTTP/1.0 200 OK");
+            sb.AppendLine("Content-type:application/x-ns-proxy-autoconfig");
+            sb.AppendLine("Connection:close");
+            sb.AppendLine("Content-Length:" + Encoding.UTF8.GetByteCount(pacText));
+            sb.AppendLine();
+            sb.Append(pacText);
+            _writeContent = Encoding.UTF8.GetBytes(sb.ToString());
+        }
+
+        private static void RunListener()
+        {
+            _tcpListener = TcpListener.Create(_pacPort);
+            _isRunning = true;
+            _tcpListener.Start();
+            Task.Factory.StartNew(async () =>
+            {
+                while (_isRunning)
+                {
+                    try
+                    {
+                        if (!_tcpListener.Pending())
+                        {
+                            await Task.Delay(10);
+                            continue;
+                        }
+
+                        var client = await _tcpListener.AcceptTcpClientAsync();
+                        await Task.Run(() => { WriteContent(client); });
+                    }
+                    catch
+                    {
+                        // ignored
+                    }
+                }
+            }, TaskCreationOptions.LongRunning);
+        }
+
+        private static void WriteContent(TcpClient client)
+        {
+            var stream = client.GetStream();
+            stream.Write(_writeContent, 0, _writeContent.Length);
+            stream.Flush();
+        }
+
+        public static void Stop()
+        {
+            if (_tcpListener == null) return;
+            try
+            {
+                _isRunning = false;
+                _tcpListener.Stop();
+                _tcpListener = null;
+            }
+            catch
+            {
+                // ignored
+            }
+        }
+    }
+}

v2rayN/ServiceLib/Handler/ProfileExHandler.cs

@@ -9,52 +9,60 @@ namespace ServiceLib.Handler
         private static readonly Lazy<ProfileExHandler> _instance = new(() => new());
         private ConcurrentBag<ProfileExItem> _lstProfileEx = [];
         private Queue<string> _queIndexIds = new();
-        public ConcurrentBag<ProfileExItem> ProfileExs => _lstProfileEx;
         public static ProfileExHandler Instance => _instance.Value;
 
         public ProfileExHandler()
         {
-            Init();
+            //Init();
+        }
 
+        public async Task Init()
+        {
+            await InitData();
             Task.Run(async () =>
             {
                 while (true)
                 {
-                    SaveQueueIndexIds();
                     await Task.Delay(1000 * 600);
+                    await SaveQueueIndexIds();
                 }
             });
         }
 
-        private void Init()
+        public async Task<ConcurrentBag<ProfileExItem>> GetProfileExs()
         {
-            SQLiteHelper.Instance.Execute($"delete from ProfileExItem where indexId not in ( select indexId from ProfileItem )");
+            return _lstProfileEx;
+        }
 
-            _lstProfileEx = new(SQLiteHelper.Instance.Table<ProfileExItem>());
+        private async Task InitData()
+        {
+            await SQLiteHelper.Instance.ExecuteAsync($"delete from ProfileExItem where indexId not in ( select indexId from ProfileItem )");
+
+            _lstProfileEx = new(await SQLiteHelper.Instance.TableAsync<ProfileExItem>().ToListAsync());
         }
 
         private void IndexIdEnqueue(string indexId)
         {
-            if (!Utils.IsNullOrEmpty(indexId) && !_queIndexIds.Contains(indexId))
+            if (Utils.IsNotEmpty(indexId) && !_queIndexIds.Contains(indexId))
             {
                 _queIndexIds.Enqueue(indexId);
             }
         }
 
-        private void SaveQueueIndexIds()
+        private async Task SaveQueueIndexIds()
         {
             var cnt = _queIndexIds.Count;
             if (cnt > 0)
             {
-                var lstExists = SQLiteHelper.Instance.Table<ProfileExItem>();
+                var lstExists = await SQLiteHelper.Instance.TableAsync<ProfileExItem>().ToListAsync();
                 List<ProfileExItem> lstInserts = [];
                 List<ProfileExItem> lstUpdates = [];
 
                 for (int i = 0; i < cnt; i++)
                 {
                     var id = _queIndexIds.Dequeue();
-                    var item = lstExists.FirstOrDefault(t => t.indexId == id);
-                    var itemNew = _lstProfileEx?.FirstOrDefault(t => t.indexId == id);
+                    var item = lstExists.FirstOrDefault(t => t.IndexId == id);
+                    var itemNew = _lstProfileEx?.FirstOrDefault(t => t.IndexId == id);
                     if (itemNew is null)
                     {
                         continue;
@@ -72,10 +80,10 @@ namespace ServiceLib.Handler
                 try
                 {
                     if (lstInserts.Count() > 0)
-                        SQLiteHelper.Instance.InsertAll(lstInserts);
+                        await SQLiteHelper.Instance.InsertAllAsync(lstInserts);
 
                     if (lstUpdates.Count() > 0)
-                        SQLiteHelper.Instance.UpdateAll(lstUpdates);
+                        await SQLiteHelper.Instance.UpdateAllAsync(lstUpdates);
                 }
                 catch (Exception ex)
                 {
@@ -88,26 +96,26 @@ namespace ServiceLib.Handler
         {
             profileEx = new()
             {
-                indexId = indexId,
-                delay = 0,
-                speed = 0,
-                sort = 0
+                IndexId = indexId,
+                Delay = 0,
+                Speed = 0,
+                Sort = 0
             };
             _lstProfileEx.Add(profileEx);
             IndexIdEnqueue(indexId);
         }
 
-        public void ClearAll()
+        public async Task ClearAll()
         {
-            SQLiteHelper.Instance.Execute($"delete from ProfileExItem ");
+            await SQLiteHelper.Instance.ExecuteAsync($"delete from ProfileExItem ");
             _lstProfileEx = new();
         }
 
-        public void SaveTo()
+        public async Task SaveTo()
         {
             try
             {
-                SaveQueueIndexIds();
+                await SaveQueueIndexIds();
             }
             catch (Exception ex)
             {
@@ -117,49 +125,49 @@ namespace ServiceLib.Handler
 
         public void SetTestDelay(string indexId, string delayVal)
         {
-            var profileEx = _lstProfileEx.FirstOrDefault(t => t.indexId == indexId);
+            var profileEx = _lstProfileEx.FirstOrDefault(t => t.IndexId == indexId);
             if (profileEx == null)
             {
                 AddProfileEx(indexId, ref profileEx);
             }
 
             int.TryParse(delayVal, out int delay);
-            profileEx.delay = delay;
+            profileEx.Delay = delay;
             IndexIdEnqueue(indexId);
         }
 
         public void SetTestSpeed(string indexId, string speedVal)
         {
-            var profileEx = _lstProfileEx.FirstOrDefault(t => t.indexId == indexId);
+            var profileEx = _lstProfileEx.FirstOrDefault(t => t.IndexId == indexId);
             if (profileEx == null)
             {
                 AddProfileEx(indexId, ref profileEx);
             }
 
             decimal.TryParse(speedVal, out decimal speed);
-            profileEx.speed = speed;
+            profileEx.Speed = speed;
             IndexIdEnqueue(indexId);
         }
 
         public void SetSort(string indexId, int sort)
         {
-            var profileEx = _lstProfileEx.FirstOrDefault(t => t.indexId == indexId);
+            var profileEx = _lstProfileEx.FirstOrDefault(t => t.IndexId == indexId);
             if (profileEx == null)
             {
                 AddProfileEx(indexId, ref profileEx);
             }
-            profileEx.sort = sort;
+            profileEx.Sort = sort;
             IndexIdEnqueue(indexId);
         }
 
         public int GetSort(string indexId)
         {
-            var profileEx = _lstProfileEx.FirstOrDefault(t => t.indexId == indexId);
+            var profileEx = _lstProfileEx.FirstOrDefault(t => t.IndexId == indexId);
             if (profileEx == null)
             {
                 return 0;
             }
-            return profileEx.sort;
+            return profileEx.Sort;
         }
 
         public int GetMaxSort()
@@ -168,7 +176,7 @@ namespace ServiceLib.Handler
             {
                 return 0;
             }
-            return _lstProfileEx.Max(t => t == null ? 0 : t.sort);
+            return _lstProfileEx.Max(t => t == null ? 0 : t.Sort);
         }
     }
 }

v2rayN/ServiceLib/Handler/SpeedtestHandler.cs

@@ -1,390 +0,0 @@
-using System.Diagnostics;
-using System.Net;
-using System.Net.Sockets;
-
-namespace ServiceLib.Handler
-{
-    public class SpeedtestHandler
-    {
-        private Config? _config;
-        private CoreHandler _coreHandler;
-        private List<ServerTestItem> _selecteds;
-        private ESpeedActionType _actionType;
-        private Action<SpeedTestResult> _updateFunc;
-        private bool _exitLoop = false;
-
-        public SpeedtestHandler(Config config, CoreHandler coreHandler, List<ProfileItem> selecteds, ESpeedActionType actionType, Action<SpeedTestResult> update)
-        {
-            _config = config;
-            _coreHandler = coreHandler;
-            _actionType = actionType;
-            _updateFunc = update;
-
-            _selecteds = new List<ServerTestItem>();
-            foreach (var it in selecteds)
-            {
-                if (it.configType == EConfigType.Custom)
-                {
-                    continue;
-                }
-                if (it.port <= 0)
-                {
-                    continue;
-                }
-                _selecteds.Add(new ServerTestItem()
-                {
-                    indexId = it.indexId,
-                    address = it.address,
-                    port = it.port,
-                    configType = it.configType
-                });
-            }
-            //clear test result
-            foreach (var it in _selecteds)
-            {
-                switch (actionType)
-                {
-                    case ESpeedActionType.Tcping:
-                    case ESpeedActionType.Realping:
-                        UpdateFunc(it.indexId, ResUI.Speedtesting, "");
-                        ProfileExHandler.Instance.SetTestDelay(it.indexId, "0");
-                        break;
-
-                    case ESpeedActionType.Speedtest:
-                        UpdateFunc(it.indexId, "", ResUI.SpeedtestingWait);
-                        ProfileExHandler.Instance.SetTestSpeed(it.indexId, "0");
-                        break;
-
-                    case ESpeedActionType.Mixedtest:
-                        UpdateFunc(it.indexId, ResUI.Speedtesting, ResUI.SpeedtestingWait);
-                        ProfileExHandler.Instance.SetTestDelay(it.indexId, "0");
-                        ProfileExHandler.Instance.SetTestSpeed(it.indexId, "0");
-                        break;
-                }
-            }
-
-            switch (actionType)
-            {
-                case ESpeedActionType.Tcping:
-                    Task.Run(RunTcping);
-                    break;
-
-                case ESpeedActionType.Realping:
-                    Task.Run(RunRealPing);
-                    break;
-
-                case ESpeedActionType.Speedtest:
-                    Task.Run(RunSpeedTestAsync);
-                    break;
-
-                case ESpeedActionType.Mixedtest:
-                    Task.Run(RunMixedtestAsync);
-                    break;
-            }
-        }
-
-        public void ExitLoop()
-        {
-            _exitLoop = true;
-            UpdateFunc("", ResUI.SpeedtestingStop);
-        }
-
-        private Task RunTcping()
-        {
-            try
-            {
-                List<Task> tasks = [];
-                foreach (var it in _selecteds)
-                {
-                    if (it.configType == EConfigType.Custom)
-                    {
-                        continue;
-                    }
-                    tasks.Add(Task.Run(() =>
-                    {
-                        try
-                        {
-                            int time = GetTcpingTime(it.address, it.port);
-                            var output = FormatOut(time, Global.DelayUnit);
-
-                            ProfileExHandler.Instance.SetTestDelay(it.indexId, output);
-                            UpdateFunc(it.indexId, output);
-                        }
-                        catch (Exception ex)
-                        {
-                            Logging.SaveLog(ex.Message, ex);
-                        }
-                    }));
-                }
-                Task.WaitAll([.. tasks]);
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(ex.Message, ex);
-            }
-            finally
-            {
-                ProfileExHandler.Instance.SaveTo();
-            }
-
-            return Task.CompletedTask;
-        }
-
-        private Task RunRealPing()
-        {
-            int pid = -1;
-            try
-            {
-                string msg = string.Empty;
-
-                pid = _coreHandler.LoadCoreConfigSpeedtest(_selecteds);
-                if (pid < 0)
-                {
-                    UpdateFunc("", ResUI.FailedToRunCore);
-                    return Task.CompletedTask;
-                }
-
-                DownloadHandler downloadHandle = new DownloadHandler();
-
-                List<Task> tasks = new();
-                foreach (var it in _selecteds)
-                {
-                    if (!it.allowTest)
-                    {
-                        continue;
-                    }
-                    if (it.configType == EConfigType.Custom)
-                    {
-                        continue;
-                    }
-                    tasks.Add(Task.Run(async () =>
-                    {
-                        try
-                        {
-                            WebProxy webProxy = new(Global.Loopback, it.port);
-                            string output = await GetRealPingTime(downloadHandle, webProxy);
-
-                            ProfileExHandler.Instance.SetTestDelay(it.indexId, output);
-                            UpdateFunc(it.indexId, output);
-                            int.TryParse(output, out int delay);
-                            it.delay = delay;
-                        }
-                        catch (Exception ex)
-                        {
-                            Logging.SaveLog(ex.Message, ex);
-                        }
-                    }));
-                }
-                Task.WaitAll(tasks.ToArray());
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(ex.Message, ex);
-            }
-            finally
-            {
-                if (pid > 0)
-                {
-                    _coreHandler.CoreStopPid(pid);
-                }
-                ProfileExHandler.Instance.SaveTo();
-            }
-
-            return Task.CompletedTask;
-        }
-
-        private async Task RunSpeedTestAsync()
-        {
-            int pid = -1;
-            //if (_actionType == ESpeedActionType.Mixedtest)
-            //{
-            //    _selecteds = _selecteds.OrderBy(t => t.delay).ToList();
-            //}
-
-            pid = _coreHandler.LoadCoreConfigSpeedtest(_selecteds);
-            if (pid < 0)
-            {
-                UpdateFunc("", ResUI.FailedToRunCore);
-                return;
-            }
-
-            string url = _config.speedTestItem.speedTestUrl;
-            var timeout = _config.speedTestItem.speedTestTimeout;
-
-            DownloadHandler downloadHandle = new();
-
-            foreach (var it in _selecteds)
-            {
-                if (_exitLoop)
-                {
-                    UpdateFunc(it.indexId, "", ResUI.SpeedtestingSkip);
-                    continue;
-                }
-                if (!it.allowTest)
-                {
-                    continue;
-                }
-                if (it.configType == EConfigType.Custom)
-                {
-                    continue;
-                }
-                //if (it.delay < 0)
-                //{
-                //    UpdateFunc(it.indexId, "", ResUI.SpeedtestingSkip);
-                //    continue;
-                //}
-                ProfileExHandler.Instance.SetTestSpeed(it.indexId, "-1");
-                UpdateFunc(it.indexId, "", ResUI.Speedtesting);
-
-                var item = LazyConfig.Instance.GetProfileItem(it.indexId);
-                if (item is null) continue;
-
-                WebProxy webProxy = new(Global.Loopback, it.port);
-
-                await downloadHandle.DownloadDataAsync(url, webProxy, timeout, (bool success, string msg) =>
-                {
-                    decimal.TryParse(msg, out decimal dec);
-                    if (dec > 0)
-                    {
-                        ProfileExHandler.Instance.SetTestSpeed(it.indexId, msg);
-                    }
-                    UpdateFunc(it.indexId, "", msg);
-                });
-            }
-
-            if (pid > 0)
-            {
-                _coreHandler.CoreStopPid(pid);
-            }
-            UpdateFunc("", ResUI.SpeedtestingCompleted);
-            ProfileExHandler.Instance.SaveTo();
-        }
-
-        private async Task RunSpeedTestMulti()
-        {
-            int pid = -1;
-            pid = _coreHandler.LoadCoreConfigSpeedtest(_selecteds);
-            if (pid < 0)
-            {
-                UpdateFunc("", ResUI.FailedToRunCore);
-                return;
-            }
-
-            string url = _config.speedTestItem.speedTestUrl;
-            var timeout = _config.speedTestItem.speedTestTimeout;
-
-            DownloadHandler downloadHandle = new();
-
-            foreach (var it in _selecteds)
-            {
-                if (_exitLoop)
-                {
-                    UpdateFunc(it.indexId, "", ResUI.SpeedtestingSkip);
-                    continue;
-                }
-
-                if (!it.allowTest)
-                {
-                    continue;
-                }
-                if (it.configType == EConfigType.Custom)
-                {
-                    continue;
-                }
-                if (it.delay < 0)
-                {
-                    UpdateFunc(it.indexId, "", ResUI.SpeedtestingSkip);
-                    continue;
-                }
-                ProfileExHandler.Instance.SetTestSpeed(it.indexId, "-1");
-                UpdateFunc(it.indexId, "", ResUI.Speedtesting);
-
-                var item = LazyConfig.Instance.GetProfileItem(it.indexId);
-                if (item is null) continue;
-
-                WebProxy webProxy = new(Global.Loopback, it.port);
-                _ = downloadHandle.DownloadDataAsync(url, webProxy, timeout, (bool success, string msg) =>
-                {
-                    decimal.TryParse(msg, out decimal dec);
-                    if (dec > 0)
-                    {
-                        ProfileExHandler.Instance.SetTestSpeed(it.indexId, msg);
-                    }
-                    UpdateFunc(it.indexId, "", msg);
-                });
-                await Task.Delay(2000);
-            }
-
-            await Task.Delay((timeout + 2) * 1000);
-
-            if (pid > 0)
-            {
-                _coreHandler.CoreStopPid(pid);
-            }
-            UpdateFunc("", ResUI.SpeedtestingCompleted);
-            ProfileExHandler.Instance.SaveTo();
-        }
-
-        private async Task RunMixedtestAsync()
-        {
-            await RunRealPing();
-
-            await Task.Delay(1000);
-
-            await RunSpeedTestMulti();
-        }
-
-        private async Task<string> GetRealPingTime(DownloadHandler downloadHandle, IWebProxy webProxy)
-        {
-            int responseTime = await downloadHandle.GetRealPingTime(_config.speedTestItem.speedPingTestUrl, webProxy, 10);
-            //string output = Utile.IsNullOrEmpty(status) ? FormatOut(responseTime, "ms") : status;
-            return FormatOut(responseTime, Global.DelayUnit);
-        }
-
-        private int GetTcpingTime(string url, int port)
-        {
-            int responseTime = -1;
-
-            try
-            {
-                if (!IPAddress.TryParse(url, out IPAddress? ipAddress))
-                {
-                    IPHostEntry ipHostInfo = System.Net.Dns.GetHostEntry(url);
-                    ipAddress = ipHostInfo.AddressList[0];
-                }
-
-                var timer = Stopwatch.StartNew();
-
-                IPEndPoint endPoint = new(ipAddress, port);
-                using Socket clientSocket = new(endPoint.AddressFamily, SocketType.Stream, ProtocolType.Tcp);
-
-                var result = clientSocket.BeginConnect(endPoint, null, null);
-                if (!result.AsyncWaitHandle.WaitOne(TimeSpan.FromSeconds(5)))
-                    throw new TimeoutException("connect timeout (5s): " + url);
-                clientSocket.EndConnect(result);
-
-                timer.Stop();
-                responseTime = (int)timer.Elapsed.TotalMilliseconds;
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(ex.Message, ex);
-            }
-            return responseTime;
-        }
-
-        private string FormatOut(object time, string unit)
-        {
-            //if (time.ToString().Equals("-1"))
-            //{
-            //    return "Timeout";
-            //}
-            return $"{time}";
-        }
-
-        private void UpdateFunc(string indexId, string delay, string speed = "")
-        {
-            _updateFunc(new() { IndexId = indexId, Delay = delay, Speed = speed });
-        }
-    }
-}

v2rayN/ServiceLib/Handler/Statistics/StatisticsHandler.cs

@@ -1,136 +0,0 @@
-namespace ServiceLib.Handler.Statistics
-{
-    public class StatisticsHandler
-    {
-        private static readonly Lazy<StatisticsHandler> instance = new(() => new());
-        public static StatisticsHandler Instance => instance.Value;
-
-        private Config _config;
-        private ServerStatItem? _serverStatItem;
-        private List<ServerStatItem> _lstServerStat;
-        private Action<ServerSpeedItem> _updateFunc;
-        private StatisticsV2ray? _statisticsV2Ray;
-        private StatisticsSingbox? _statisticsSingbox;
-
-        public List<ServerStatItem> ServerStat => _lstServerStat;
-
-        public void Init(Config config, Action<ServerSpeedItem> update)
-        {
-            _config = config;
-            _updateFunc = update;
-            if (!config.guiItem.enableStatistics)
-            {
-                return;
-            }
-
-            InitData();
-
-            _statisticsV2Ray = new StatisticsV2ray(config, UpdateServerStat);
-            _statisticsSingbox = new StatisticsSingbox(config, UpdateServerStat);
-        }
-
-        public void Close()
-        {
-            try
-            {
-                _statisticsV2Ray?.Close();
-                _statisticsSingbox?.Close();
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(ex.Message, ex);
-            }
-        }
-
-        public void ClearAllServerStatistics()
-        {
-            SQLiteHelper.Instance.Execute($"delete from ServerStatItem ");
-            _serverStatItem = null;
-            _lstServerStat = new();
-        }
-
-        public void SaveTo()
-        {
-            try
-            {
-                if (_lstServerStat != null)
-                {
-                    SQLiteHelper.Instance.UpdateAll(_lstServerStat);
-                }
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(ex.Message, ex);
-            }
-        }
-
-        private void InitData()
-        {
-            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}");
-
-            _lstServerStat = SQLiteHelper.Instance.Table<ServerStatItem>().ToList();
-        }
-
-        private void UpdateServerStat(ServerSpeedItem server)
-        {
-            GetServerStatItem(_config.indexId);
-
-            if (_serverStatItem is null)
-            {
-                return;
-            }
-            if (server.proxyUp != 0 || server.proxyDown != 0)
-            {
-                _serverStatItem.todayUp += server.proxyUp;
-                _serverStatItem.todayDown += server.proxyDown;
-                _serverStatItem.totalUp += server.proxyUp;
-                _serverStatItem.totalDown += server.proxyDown;
-            }
-
-            server.indexId = _config.indexId;
-            server.todayUp = _serverStatItem.todayUp;
-            server.todayDown = _serverStatItem.todayDown;
-            server.totalUp = _serverStatItem.totalUp;
-            server.totalDown = _serverStatItem.totalDown;
-            _updateFunc(server);
-        }
-
-        private void GetServerStatItem(string indexId)
-        {
-            long ticks = DateTime.Now.Date.Ticks;
-            if (_serverStatItem != null && _serverStatItem.indexId != indexId)
-            {
-                _serverStatItem = null;
-            }
-
-            if (_serverStatItem == null)
-            {
-                _serverStatItem = _lstServerStat.FirstOrDefault(t => t.indexId == indexId);
-                if (_serverStatItem == null)
-                {
-                    _serverStatItem = new ServerStatItem
-                    {
-                        indexId = indexId,
-                        totalUp = 0,
-                        totalDown = 0,
-                        todayUp = 0,
-                        todayDown = 0,
-                        dateNow = ticks
-                    };
-                    SQLiteHelper.Instance.Replace(_serverStatItem);
-                    _lstServerStat.Add(_serverStatItem);
-                }
-            }
-
-            if (_serverStatItem.dateNow != ticks)
-            {
-                _serverStatItem.todayUp = 0;
-                _serverStatItem.todayDown = 0;
-                _serverStatItem.dateNow = ticks;
-            }
-        }
-    }
-}

v2rayN/ServiceLib/Handler/Statistics/StatisticsV2ray.cs

@@ -1,135 +0,0 @@
-using Grpc.Core;
-using Grpc.Net.Client;
-using ProtosLib.Statistics;
-
-namespace ServiceLib.Handler.Statistics
-{
-    public class StatisticsV2ray
-    {
-        private Models.Config _config;
-        private GrpcChannel? _channel;
-        private StatsService.StatsServiceClient? _client;
-        private bool _exitFlag;
-        private Action<ServerSpeedItem> _updateFunc;
-
-        public StatisticsV2ray(Models.Config config, Action<ServerSpeedItem> update)
-        {
-            _config = config;
-            _updateFunc = update;
-            _exitFlag = false;
-
-            GrpcInit();
-
-            Task.Run(Run);
-        }
-
-        private void GrpcInit()
-        {
-            if (_channel is null)
-            {
-                try
-                {
-                    _channel = GrpcChannel.ForAddress($"{Global.HttpProtocol}{Global.Loopback}:{LazyConfig.Instance.StatePort}");
-                    _client = new StatsService.StatsServiceClient(_channel);
-                }
-                catch (Exception ex)
-                {
-                    Logging.SaveLog(ex.Message, ex);
-                }
-            }
-        }
-
-        public void Close()
-        {
-            _exitFlag = true;
-        }
-
-        private async void Run()
-        {
-            while (!_exitFlag)
-            {
-                await Task.Delay(1000);
-                try
-                {
-                    if (!(_config.IsRunningCore(ECoreType.Xray)))
-                    {
-                        continue;
-                    }
-                    if (_channel?.State == ConnectivityState.Ready)
-                    {
-                        QueryStatsResponse? res = null;
-                        try
-                        {
-                            if (_client != null)
-                                res = await _client.QueryStatsAsync(new QueryStatsRequest() { Pattern = "", Reset = true });
-                        }
-                        catch
-                        {
-                        }
-
-                        if (res != null)
-                        {
-                            ParseOutput(res.Stat, out ServerSpeedItem server);
-                            _updateFunc(server);
-                        }
-                    }
-                    if (_channel != null)
-                        await _channel.ConnectAsync();
-                }
-                catch
-                {
-                }
-            }
-        }
-
-        private void ParseOutput(Google.Protobuf.Collections.RepeatedField<Stat> source, out ServerSpeedItem server)
-        {
-            server = new();
-            long aggregateProxyUp = 0;
-            long aggregateProxyDown = 0;
-            try
-            {
-                foreach (Stat stat in source)
-                {
-                    string name = stat.Name;
-                    long value = stat.Value / 1024;    //KByte
-                    string[] nStr = name.Split(">>>".ToCharArray(), StringSplitOptions.RemoveEmptyEntries);
-                    string type = "";
-
-                    name = name.Trim();
-
-                    name = nStr[1];
-                    type = nStr[3];
-
-                    if (name.StartsWith(Global.ProxyTag))
-                    {
-                        if (type == "uplink")
-                        {
-                            aggregateProxyUp += value;
-                        }
-                        else if (type == "downlink")
-                        {
-                            aggregateProxyDown += value;
-                        }
-                    }
-                    else if (name == Global.DirectTag)
-                    {
-                        if (type == "uplink")
-                        {
-                            server.directUp = value;
-                        }
-                        else if (type == "downlink")
-                        {
-                            server.directDown = value;
-                        }
-                    }
-                }
-                server.proxyUp = aggregateProxyUp;
-                server.proxyDown = aggregateProxyDown;
-            }
-            catch
-            {
-            }
-        }
-    }
-}

v2rayN/ServiceLib/Handler/StatisticsHandler.cs

@@ -0,0 +1,161 @@
+namespace ServiceLib.Handler
+{
+    public class StatisticsHandler
+    {
+        private static readonly Lazy<StatisticsHandler> instance = new(() => new());
+        public static StatisticsHandler Instance => instance.Value;
+
+        private Config _config;
+        private ServerStatItem? _serverStatItem;
+        private List<ServerStatItem> _lstServerStat;
+        private Action<ServerSpeedItem>? _updateFunc;
+
+        private StatisticsXrayService? _statisticsXray;
+        private StatisticsSingboxService? _statisticsSingbox;
+
+        public List<ServerStatItem> ServerStat => _lstServerStat;
+
+        public async Task Init(Config config, Action<ServerSpeedItem> updateFunc)
+        {
+            _config = config;
+            _updateFunc = updateFunc;
+            if (!config.GuiItem.EnableStatistics)
+            {
+                return;
+            }
+
+            await InitData();
+
+            _statisticsXray = new StatisticsXrayService(config, UpdateServerStatHandler);
+            _statisticsSingbox = new StatisticsSingboxService(config, UpdateServerStatHandler);
+        }
+
+        public void Close()
+        {
+            try
+            {
+                _statisticsXray?.Close();
+                _statisticsSingbox?.Close();
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+            }
+        }
+
+        public async Task ClearAllServerStatistics()
+        {
+            await SQLiteHelper.Instance.ExecuteAsync($"delete from ServerStatItem ");
+            _serverStatItem = null;
+            _lstServerStat = new();
+        }
+
+        public async Task SaveTo()
+        {
+            try
+            {
+                if (_lstServerStat != null)
+                {
+                    await SQLiteHelper.Instance.UpdateAllAsync(_lstServerStat);
+                }
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+            }
+        }
+
+        public async Task CloneServerStatItem(string indexId, string toIndexId)
+        {
+            if (_lstServerStat == null)
+            {
+                return;
+            }
+
+            var stat = _lstServerStat.FirstOrDefault(t => t.IndexId == indexId);
+            if (stat == null)
+            {
+                return;
+            }
+
+            var toStat = JsonUtils.DeepCopy(stat);
+            toStat.IndexId = toIndexId;
+            await SQLiteHelper.Instance.ReplaceAsync(toStat);
+            _lstServerStat.Add(toStat);
+        }
+
+        private async Task InitData()
+        {
+            await SQLiteHelper.Instance.ExecuteAsync($"delete from ServerStatItem where indexId not in ( select indexId from ProfileItem )");
+
+            long ticks = DateTime.Now.Date.Ticks;
+            await SQLiteHelper.Instance.ExecuteAsync($"update ServerStatItem set todayUp = 0,todayDown=0,dateNow={ticks} where dateNow<>{ticks}");
+
+            _lstServerStat = await SQLiteHelper.Instance.TableAsync<ServerStatItem>().ToListAsync();
+        }
+
+        private void UpdateServerStatHandler(ServerSpeedItem server)
+        {
+            UpdateServerStat(server);
+        }
+
+        private async Task UpdateServerStat(ServerSpeedItem server)
+        {
+            await GetServerStatItem(_config.IndexId);
+
+            if (_serverStatItem is null)
+            {
+                return;
+            }
+            if (server.ProxyUp != 0 || server.ProxyDown != 0)
+            {
+                _serverStatItem.TodayUp += server.ProxyUp;
+                _serverStatItem.TodayDown += server.ProxyDown;
+                _serverStatItem.TotalUp += server.ProxyUp;
+                _serverStatItem.TotalDown += server.ProxyDown;
+            }
+
+            server.IndexId = _config.IndexId;
+            server.TodayUp = _serverStatItem.TodayUp;
+            server.TodayDown = _serverStatItem.TodayDown;
+            server.TotalUp = _serverStatItem.TotalUp;
+            server.TotalDown = _serverStatItem.TotalDown;
+            _updateFunc?.Invoke(server);
+        }
+
+        private async Task GetServerStatItem(string indexId)
+        {
+            long ticks = DateTime.Now.Date.Ticks;
+            if (_serverStatItem != null && _serverStatItem.IndexId != indexId)
+            {
+                _serverStatItem = null;
+            }
+
+            if (_serverStatItem == null)
+            {
+                _serverStatItem = _lstServerStat.FirstOrDefault(t => t.IndexId == indexId);
+                if (_serverStatItem == null)
+                {
+                    _serverStatItem = new ServerStatItem
+                    {
+                        IndexId = indexId,
+                        TotalUp = 0,
+                        TotalDown = 0,
+                        TodayUp = 0,
+                        TodayDown = 0,
+                        DateNow = ticks
+                    };
+                    await SQLiteHelper.Instance.ReplaceAsync(_serverStatItem);
+                    _lstServerStat.Add(_serverStatItem);
+                }
+            }
+
+            if (_serverStatItem.DateNow != ticks)
+            {
+                _serverStatItem.TodayUp = 0;
+                _serverStatItem.TodayDown = 0;
+                _serverStatItem.DateNow = ticks;
+            }
+        }
+    }
+}

v2rayN/ServiceLib/Handler/SysProxy/ProxySettingLinux.cs

@@ -0,0 +1,186 @@
+namespace ServiceLib.Handler.SysProxy
+{
+    public class ProxySettingLinux
+    {
+        public static async Task SetProxy(string host, int port, string exceptions)
+        {
+            var lstCmd = GetSetCmds(host, port, exceptions);
+
+            await ExecCmd(lstCmd);
+        }
+
+        public static async Task UnsetProxy()
+        {
+            var lstCmd = GetUnsetCmds();
+
+            await ExecCmd(lstCmd);
+        }
+
+        private static async Task ExecCmd(List<CmdItem> lstCmd)
+        {
+            foreach (var cmd in lstCmd)
+            {
+                if (cmd is null || cmd.Cmd.IsNullOrEmpty() || cmd.Arguments is null)
+                {
+                    continue;
+                }
+                await Task.Delay(10);
+                await Utils.GetCliWrapOutput(cmd.Cmd, cmd.Arguments);
+            }
+        }
+
+        private static List<CmdItem> GetSetCmds(string host, int port, string exceptions)
+        {
+            var isKde = IsKde(out var configDir);
+            List<string> lstType = ["", "http", "https", "socks", "ftp"];
+            List<CmdItem> lstCmd = [];
+
+            if (isKde)
+            {
+                foreach (var type in lstType)
+                {
+                    lstCmd.AddRange(GetSetCmd4Kde(type, host, port, configDir));
+                }
+                if (exceptions.IsNotEmpty())
+                {
+                    lstCmd.AddRange(GetSetCmd4Kde("exceptions", exceptions, 0, configDir));
+                }
+            }
+            else
+            {
+                foreach (var type in lstType)
+                {
+                    lstCmd.AddRange(GetSetCmd4Gnome(type, host, port));
+                }
+                if (exceptions.IsNotEmpty())
+                {
+                    lstCmd.AddRange(GetSetCmd4Gnome("exceptions", exceptions, 0));
+                }
+            }
+            return lstCmd;
+        }
+
+        private static List<CmdItem> GetUnsetCmds()
+        {
+            var isKde = IsKde(out var configDir);
+            List<CmdItem> lstCmd = [];
+
+            if (isKde)
+            {
+                lstCmd.Add(new CmdItem()
+                {
+                    Cmd = GetKdeVersion(),
+                    Arguments = ["--file", $"{configDir}/kioslaverc", "--group", "Proxy Settings", "--key", "ProxyType", "0"]
+                });
+            }
+            else
+            {
+                lstCmd.Add(new CmdItem()
+                {
+                    Cmd = "gsettings",
+                    Arguments = ["set", "org.gnome.system.proxy", "mode", "none"]
+                });
+            }
+
+            return lstCmd;
+        }
+
+        private static List<CmdItem> GetSetCmd4Kde(string type, string host, int port, string configDir)
+        {
+            List<CmdItem> lstCmd = [];
+            var cmd = GetKdeVersion();
+
+            if (type.IsNullOrEmpty())
+            {
+                lstCmd.Add(new()
+                {
+                    Cmd = cmd,
+                    Arguments = ["--file", $"{configDir}/kioslaverc", "--group", "Proxy Settings", "--key", "ProxyType", "1"]
+                });
+            }
+            else if (type == "exceptions")
+            {
+                lstCmd.Add(new()
+                {
+                    Cmd = cmd,
+                    Arguments = ["--file", $"{configDir}/kioslaverc", "--group", "Proxy Settings", "--key", "NoProxyFor", host]
+                });
+            }
+            else
+            {
+                var type2 = type.Equals("https") ? "http" : type;
+                lstCmd.Add(new CmdItem()
+                {
+                    Cmd = cmd,
+                    Arguments = ["--file", $"{configDir}/kioslaverc", "--group", "Proxy Settings", "--key", $"{type}Proxy", $"{type2}://{host}:{port}"]
+                });
+            }
+
+            return lstCmd;
+        }
+
+        private static List<CmdItem> GetSetCmd4Gnome(string type, string host, int port)
+        {
+            List<CmdItem> lstCmd = [];
+
+            if (type.IsNullOrEmpty())
+            {
+                lstCmd.Add(new()
+                {
+                    Cmd = "gsettings",
+                    Arguments = ["set", "org.gnome.system.proxy", "mode", "manual"]
+                });
+            }
+            else if (type == "exceptions")
+            {
+                lstCmd.Add(new()
+                {
+                    Cmd = "gsettings",
+                    Arguments = ["set", $"org.gnome.system.proxy", "ignore-hosts", JsonUtils.Serialize(host.Split(','), false)]
+                });
+            }
+            else
+            {
+                lstCmd.Add(new()
+                {
+                    Cmd = "gsettings",
+                    Arguments = ["set", $"org.gnome.system.proxy.{type}", "host", host]
+                });
+
+                lstCmd.Add(new()
+                {
+                    Cmd = "gsettings",
+                    Arguments = ["set", $"org.gnome.system.proxy.{type}", "port", $"{port}"]
+                });
+            }
+
+            return lstCmd;
+        }
+
+        private static bool IsKde(out string configDir)
+        {
+            configDir = "/home";
+            var desktop = Environment.GetEnvironmentVariable("XDG_CURRENT_DESKTOP");
+            var isKde = string.Equals(desktop, "KDE", StringComparison.OrdinalIgnoreCase);
+            if (isKde)
+            {
+                var homeDir = Environment.GetEnvironmentVariable("HOME");
+                if (homeDir != null)
+                {
+                    configDir = Path.Combine(homeDir, ".config");
+                }
+            }
+
+            return isKde;
+        }
+        private static string GetKdeVersion()
+        {
+            var ver = Environment.GetEnvironmentVariable("KDE_SESSION_VERSION") ?? "0";
+            return ver switch
+            {
+                "6" => "kwriteconfig6",
+                _ => "kwriteconfig5"
+            };
+        }
+    }
+}

v2rayN/ServiceLib/Handler/SysProxy/ProxySettingOSX.cs

@@ -0,0 +1,91 @@
+namespace ServiceLib.Handler.SysProxy
+{
+    public class ProxySettingOSX
+    {
+        /*
+         * 仅测试了，MacOS 13.7.1 x86 版本，其他版本有待确认
+         */
+
+        /// <summary>
+        /// 应用接口类型
+        /// </summary>
+        private static readonly List<string> LstInterface = ["Ethernet", "Wi-Fi", "Thunderbolt Bridge"];
+
+        /// <summary>
+        /// 代理类型，对应 http,https,socks
+        /// </summary>
+        private static readonly List<string> LstTypes = ["setwebproxy", "setsecurewebproxy", "setsocksfirewallproxy"];
+
+        public static async Task SetProxy(string host, int port, string exceptions)
+        {
+            var lstCmd = GetSetCmds(host, port, exceptions);
+            await ExecCmd(lstCmd);
+        }
+
+        public static async Task UnsetProxy()
+        {
+            var lstCmd = GetUnsetCmds();
+            await ExecCmd(lstCmd);
+        }
+
+        private static async Task ExecCmd(List<CmdItem> lstCmd)
+        {
+            foreach (var cmd in lstCmd)
+            {
+                if (cmd is null || cmd.Cmd.IsNullOrEmpty() || cmd.Arguments is null)
+                {
+                    continue;
+                }
+
+                await Task.Delay(10);
+                await Utils.GetCliWrapOutput(cmd.Cmd, cmd.Arguments);
+            }
+        }
+
+        private static List<CmdItem> GetSetCmds(string host, int port, string exceptions)
+        {
+            List<CmdItem> lstCmd = [];
+            foreach (var interf in LstInterface)
+            {
+                foreach (var type in LstTypes)
+                {
+                    lstCmd.Add(new CmdItem()
+                    {
+                        Cmd = "networksetup",
+                        Arguments = [$"-{type}", interf, host, port.ToString()]
+                    });
+                }
+                if (exceptions.IsNotEmpty())
+                {
+                    List<string> args = [$"-setproxybypassdomains", interf];
+                    args.AddRange(exceptions.Split(','));
+                    lstCmd.Add(new CmdItem()
+                    {
+                        Cmd = "networksetup",
+                        Arguments = args
+                    });
+                }
+            }
+
+            return lstCmd;
+        }
+
+        private static List<CmdItem> GetUnsetCmds()
+        {
+            List<CmdItem> lstCmd = [];
+            foreach (var interf in LstInterface)
+            {
+                foreach (var type in LstTypes)
+                {
+                    lstCmd.Add(new CmdItem()
+                    {
+                        Cmd = "networksetup",
+                        Arguments = [$"-{type}state", interf, "off"]
+                    });
+                }
+            }
+
+            return lstCmd;
+        }
+    }
+}

v2rayN/ServiceLib/Handler/SysProxy/ProxySettingWindows.cs

@@ -1,9 +1,9 @@
-using System.Runtime.InteropServices;
-using static v2rayN.Common.ProxySetting.InternetConnectionOption;
+using System.Runtime.InteropServices;
+using static ServiceLib.Handler.SysProxy.ProxySettingWindows.InternetConnectionOption;
 
-namespace v2rayN.Common
+namespace ServiceLib.Handler.SysProxy
 {
-    internal class ProxySetting
+    public class ProxySettingWindows
     {
         private const string _regPath = @"Software\Microsoft\Windows\CurrentVersion\Internet Settings";
 
@@ -72,7 +72,7 @@ namespace v2rayN.Common
             catch (Exception ex)
             {
                 SetProxyFallback(strProxy, exceptions, type);
-                Logging.SaveLog(ex.Message, ex);
+                //Logging.SaveLog(ex.Message, ex);
                 return false;
             }
         }
@@ -88,7 +88,7 @@ namespace v2rayN.Common
             }
             else if (type is 2 or 4) // named proxy or autoproxy script URL
             {
-                optionCount = Utils.IsNullOrEmpty(exceptions) ? 2 : 3;
+                optionCount = string.IsNullOrEmpty(exceptions) ? 2 : 3;
             }
 
             int m_Int = (int)PerConnFlags.PROXY_TYPE_DIRECT;
@@ -144,12 +144,12 @@ namespace v2rayN.Common
             {
                 if (Environment.Is64BitOperatingSystem)
                 {
-                    nint opt = new(optionsPtr.ToInt64() + i * optSize);
+                    nint opt = new(optionsPtr.ToInt64() + (i * optSize));
                     Marshal.StructureToPtr(options[i], opt, false);
                 }
                 else
                 {
-                    nint opt = new(optionsPtr.ToInt32() + i * optSize);
+                    nint opt = new(optionsPtr.ToInt32() + (i * optSize));
                     Marshal.StructureToPtr(options[i], opt, false);
                 }
             }
@@ -247,7 +247,7 @@ namespace v2rayN.Common
 
             //[MarshalAs(UnmanagedType.)]
             public nint options;
-        };
+        }
 
         [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
         public struct InternetConnectionOption

v2rayN/ServiceLib/Handler/SysProxy/SysProxyHandler.cs

@@ -0,0 +1,97 @@
+namespace ServiceLib.Handler.SysProxy
+{
+    public static class SysProxyHandler
+    {
+        public static async Task<bool> UpdateSysProxy(Config config, bool forceDisable)
+        {
+            var type = config.SystemProxyItem.SysProxyType;
+
+            if (forceDisable && type != ESysProxyType.Unchanged)
+            {
+                type = ESysProxyType.ForcedClear;
+            }
+
+            try
+            {
+                var port = AppHandler.Instance.GetLocalPort(EInboundProtocol.socks);
+                var exceptions = config.SystemProxyItem.SystemProxyExceptions;
+                if (port <= 0)
+                {
+                    return false;
+                }
+                switch (type)
+                {
+                    case ESysProxyType.ForcedChange when Utils.IsWindows():
+                        {
+                            GetWindowsProxyString(config, port, out var strProxy, out var strExceptions);
+                            ProxySettingWindows.SetProxy(strProxy, strExceptions, 2);
+                            break;
+                        }
+                    case ESysProxyType.ForcedChange when Utils.IsLinux():
+                        await ProxySettingLinux.SetProxy(Global.Loopback, port, exceptions);
+                        break;
+
+                    case ESysProxyType.ForcedChange when Utils.IsOSX():
+                        await ProxySettingOSX.SetProxy(Global.Loopback, port, exceptions);
+                        break;
+
+                    case ESysProxyType.ForcedClear when Utils.IsWindows():
+                        ProxySettingWindows.UnsetProxy();
+                        break;
+
+                    case ESysProxyType.ForcedClear when Utils.IsLinux():
+                        await ProxySettingLinux.UnsetProxy();
+                        break;
+
+                    case ESysProxyType.ForcedClear when Utils.IsOSX():
+                        await ProxySettingOSX.UnsetProxy();
+                        break;
+
+                    case ESysProxyType.Pac when Utils.IsWindows():
+                        await SetWindowsProxyPac(port);
+                        break;
+                }
+
+                if (type != ESysProxyType.Pac && Utils.IsWindows())
+                {
+                    PacHandler.Stop();
+                }
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+            }
+            return true;
+        }
+
+        private static void GetWindowsProxyString(Config config, int port, out string strProxy, out string strExceptions)
+        {
+            strExceptions = config.SystemProxyItem.SystemProxyExceptions;
+            if (config.SystemProxyItem.NotProxyLocalAddress)
+            {
+                strExceptions = $"<local>;{strExceptions}";
+            }
+
+            strProxy = string.Empty;
+            if (Utils.IsNullOrEmpty(config.SystemProxyItem.SystemProxyAdvancedProtocol))
+            {
+                strProxy = $"{Global.Loopback}:{port}";
+            }
+            else
+            {
+                strProxy = config.SystemProxyItem.SystemProxyAdvancedProtocol
+                    .Replace("{ip}", Global.Loopback)
+                    .Replace("{http_port}", port.ToString())
+                    .Replace("{socks_port}", port.ToString());
+            }
+        }
+
+        private static async Task SetWindowsProxyPac(int port)
+        {
+            var portPac = AppHandler.Instance.GetLocalPort(EInboundProtocol.pac);
+            await PacHandler.Start(Utils.GetConfigPath(), port, portPac);
+            var strProxy = $"{Global.HttpProtocol}{Global.Loopback}:{portPac}/pac?t={DateTime.Now.Ticks}";
+            ProxySettingWindows.SetProxy(strProxy, "", 4);
+        }
+    }
+}

v2rayN/ServiceLib/Handler/TaskHandler.cs

@@ -5,40 +5,36 @@
         private static readonly Lazy<TaskHandler> _instance = new(() => new());
         public static TaskHandler Instance => _instance.Value;
 
-        public TaskHandler()
+        public void RegUpdateTask(Config config, Action<bool, string> updateFunc)
         {
+            Task.Run(() => UpdateTaskRunSubscription(config, updateFunc));
+            Task.Run(() => UpdateTaskRunGeo(config, updateFunc));
         }
 
-        public void RegUpdateTask(Config config, Action<bool, string> update)
-        {
-            Task.Run(() => UpdateTaskRunSubscription(config, update));
-            Task.Run(() => UpdateTaskRunGeo(config, update));
-        }
-
-        private async Task UpdateTaskRunSubscription(Config config, Action<bool, string> update)
+        private async Task UpdateTaskRunSubscription(Config config, Action<bool, string> updateFunc)
         {
             await Task.Delay(60000);
             Logging.SaveLog("UpdateTaskRunSubscription");
 
-            var updateHandle = new UpdateHandler();
+            var updateHandle = new UpdateService();
             while (true)
             {
                 var updateTime = ((DateTimeOffset)DateTime.Now).ToUnixTimeSeconds();
-                var lstSubs = LazyConfig.Instance.SubItems()
-                            .Where(t => t.autoUpdateInterval > 0)
-                            .Where(t => updateTime - t.updateTime >= t.autoUpdateInterval * 60)
+                var lstSubs = (await AppHandler.Instance.SubItems())
+                            .Where(t => t.AutoUpdateInterval > 0)
+                            .Where(t => updateTime - t.UpdateTime >= t.AutoUpdateInterval * 60)
                             .ToList();
 
                 foreach (var item in lstSubs)
                 {
-                    updateHandle.UpdateSubscriptionProcess(config, item.id, true, (bool success, string msg) =>
-                    {
-                        update(success, msg);
-                        if (success)
-                            Logging.SaveLog("subscription" + msg);
-                    });
-                    item.updateTime = updateTime;
-                    ConfigHandler.AddSubItem(config, item);
+                    await updateHandle.UpdateSubscriptionProcess(config, item.Id, true, (bool success, string msg) =>
+                        {
+                            updateFunc?.Invoke(success, msg);
+                            if (success)
+                                Logging.SaveLog("subscription" + msg);
+                        });
+                    item.UpdateTime = updateTime;
+                    await ConfigHandler.AddSubItem(config, item);
 
                     await Task.Delay(5000);
                 }
@@ -46,30 +42,30 @@
             }
         }
 
-        private async Task UpdateTaskRunGeo(Config config, Action<bool, string> update)
+        private async Task UpdateTaskRunGeo(Config config, Action<bool, string> updateFunc)
         {
             var autoUpdateGeoTime = DateTime.Now;
 
-            await Task.Delay(1000 * 120);
+            //await Task.Delay(1000 * 120);
             Logging.SaveLog("UpdateTaskRunGeo");
 
-            var updateHandle = new UpdateHandler();
+            var updateHandle = new UpdateService();
             while (true)
             {
+                await Task.Delay(1000 * 3600);
+
                 var dtNow = DateTime.Now;
-                if (config.guiItem.autoUpdateInterval > 0)
+                if (config.GuiItem.AutoUpdateInterval > 0)
                 {
-                    if ((dtNow - autoUpdateGeoTime).Hours % config.guiItem.autoUpdateInterval == 0)
+                    if ((dtNow - autoUpdateGeoTime).Hours % config.GuiItem.AutoUpdateInterval == 0)
                     {
-                        updateHandle.UpdateGeoFileAll(config, (bool success, string msg) =>
+                        await updateHandle.UpdateGeoFileAll(config, (bool success, string msg) =>
                         {
-                            update(false, msg);
+                            updateFunc?.Invoke(false, msg);
                         });
                         autoUpdateGeoTime = dtNow;
                     }
                 }
-
-                await Task.Delay(1000 * 3600);
             }
         }
     }

v2rayN/ServiceLib/Handler/UpdateHandler.cs

@@ -1,539 +0,0 @@
-using System.Diagnostics;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Text.RegularExpressions;
-
-namespace ServiceLib.Handler
-{
-    public class UpdateHandler
-    {
-        private Action<bool, string> _updateFunc;
-        private Config _config;
-
-        public event EventHandler<ResultEventArgs> AbsoluteCompleted;
-
-        public class ResultEventArgs : EventArgs
-        {
-            public bool Success;
-            public string Msg;
-            public string Url;
-
-            public ResultEventArgs(bool success, string msg, string url = "")
-            {
-                Success = success;
-                Msg = msg;
-                Url = url;
-            }
-        }
-
-        public void CheckUpdateGuiN(Config config, Action<bool, string> update, bool preRelease)
-        {
-            _config = config;
-            _updateFunc = update;
-            var url = string.Empty;
-
-            DownloadHandler downloadHandle = new();
-            downloadHandle.UpdateCompleted += (sender2, args) =>
-            {
-                if (args.Success)
-                {
-                    _updateFunc(false, ResUI.MsgDownloadV2rayCoreSuccessfully);
-                    string fileName = Utils.GetTempPath(Utils.GetDownloadFileName(url));
-                    fileName = Utils.UrlEncode(fileName);
-                    _updateFunc(true, fileName);
-                }
-                else
-                {
-                    _updateFunc(false, args.Msg);
-                }
-            };
-            downloadHandle.Error += (sender2, args) =>
-            {
-                _updateFunc(false, args.GetException().Message);
-                _updateFunc(false, "");
-            };
-            AbsoluteCompleted += (sender2, args) =>
-            {
-                if (args.Success)
-                {
-                    _updateFunc(false, string.Format(ResUI.MsgParsingSuccessfully, ECoreType.v2rayN));
-                    _updateFunc(false, args.Msg);
-
-                    url = args.Url;
-                    AskToDownload(downloadHandle, url, true).ContinueWith(task =>
-                    {
-                        _updateFunc(false, "");
-                    });
-                }
-                else
-                {
-                    _updateFunc(false, args.Msg);
-                    _updateFunc(false, "");
-                }
-            };
-            _updateFunc(false, string.Format(ResUI.MsgStartUpdating, ECoreType.v2rayN));
-            CheckUpdateAsync(downloadHandle, ECoreType.v2rayN, preRelease);
-        }
-
-        public async void CheckUpdateCore(ECoreType type, Config config, Action<bool, string> update, bool preRelease)
-        {
-            _config = config;
-            _updateFunc = update;
-            var url = string.Empty;
-
-            DownloadHandler downloadHandle = new();
-            downloadHandle.UpdateCompleted += (sender2, args) =>
-            {
-                if (args.Success)
-                {
-                    _updateFunc(false, ResUI.MsgDownloadV2rayCoreSuccessfully);
-                    _updateFunc(false, ResUI.MsgUnpacking);
-
-                    try
-                    {
-                        _updateFunc(true, url);
-                    }
-                    catch (Exception ex)
-                    {
-                        _updateFunc(false, ex.Message);
-                    }
-                }
-                else
-                {
-                    _updateFunc(false, args.Msg);
-                }
-            };
-            downloadHandle.Error += (sender2, args) =>
-            {
-                _updateFunc(false, args.GetException().Message); 
-                _updateFunc(false, "");
-            };
-
-            AbsoluteCompleted += (sender2, args) =>
-            {
-                if (args.Success)
-                {
-                    _updateFunc(false, string.Format(ResUI.MsgParsingSuccessfully, type));
-                    _updateFunc(false, args.Msg);
-
-                    url = args.Url;
-                    AskToDownload(downloadHandle, url, true).ContinueWith(task =>
-                    {
-                        _updateFunc(false, "");
-                    });
-                }
-                else
-                {
-                    _updateFunc(false, args.Msg);
-                    _updateFunc(false, "");
-                }
-            };
-            _updateFunc(false, string.Format(ResUI.MsgStartUpdating, type));
-            CheckUpdateAsync(downloadHandle, type, preRelease);
-        }
-
-        public void UpdateSubscriptionProcess(Config config, string subId, bool blProxy, Action<bool, string> update)
-        {
-            _config = config;
-            _updateFunc = update;
-
-            _updateFunc(false, ResUI.MsgUpdateSubscriptionStart);
-            var subItem = LazyConfig.Instance.SubItems().OrderBy(t => t.sort).ToList();
-
-            if (subItem == null || subItem.Count <= 0)
-            {
-                _updateFunc(false, ResUI.MsgNoValidSubscription);
-                return;
-            }
-
-            Task.Run(async () =>
-            {
-                foreach (var item in subItem)
-                {
-                    string id = item.id.TrimEx();
-                    string url = item.url.TrimEx();
-                    string userAgent = item.userAgent.TrimEx();
-                    string hashCode = $"{item.remarks}->";
-                    if (Utils.IsNullOrEmpty(id) || Utils.IsNullOrEmpty(url) || (!Utils.IsNullOrEmpty(subId) && item.id != subId))
-                    {
-                        //_updateFunc(false, $"{hashCode}{ResUI.MsgNoValidSubscription}");
-                        continue;
-                    }
-                    if (!url.StartsWith(Global.HttpsProtocol) && !url.StartsWith(Global.HttpProtocol))
-                    {
-                        continue;
-                    }
-                    if (item.enabled == false)
-                    {
-                        _updateFunc(false, $"{hashCode}{ResUI.MsgSkipSubscriptionUpdate}");
-                        continue;
-                    }
-
-                    var downloadHandle = new DownloadHandler();
-                    downloadHandle.Error += (sender2, args) =>
-                    {
-                        _updateFunc(false, $"{hashCode}{args.GetException().Message}");
-                    };
-
-                    _updateFunc(false, $"{hashCode}{ResUI.MsgStartGettingSubscriptions}");
-
-                    //one url
-                    url = Utils.GetPunycode(url);
-                    //convert
-                    if (!Utils.IsNullOrEmpty(item.convertTarget))
-                    {
-                        var subConvertUrl = Utils.IsNullOrEmpty(config.constItem.subConvertUrl) ? Global.SubConvertUrls.FirstOrDefault() : config.constItem.subConvertUrl;
-                        url = string.Format(subConvertUrl!, Utils.UrlEncode(url));
-                        if (!url.Contains("target="))
-                        {
-                            url += string.Format("&target={0}", item.convertTarget);
-                        }
-                        if (!url.Contains("config="))
-                        {
-                            url += string.Format("&config={0}", Global.SubConvertConfig.FirstOrDefault());
-                        }
-                    }
-                    var result = await downloadHandle.TryDownloadString(url, blProxy, userAgent);
-                    if (blProxy && Utils.IsNullOrEmpty(result))
-                    {
-                        result = await downloadHandle.TryDownloadString(url, false, userAgent);
-                    }
-
-                    //more url
-                    if (Utils.IsNullOrEmpty(item.convertTarget) && !Utils.IsNullOrEmpty(item.moreUrl.TrimEx()))
-                    {
-                        if (!Utils.IsNullOrEmpty(result) && Utils.IsBase64String(result!))
-                        {
-                            result = Utils.Base64Decode(result);
-                        }
-
-                        var lstUrl = item.moreUrl.TrimEx().Split(",") ?? [];
-                        foreach (var it in lstUrl)
-                        {
-                            var url2 = Utils.GetPunycode(it);
-                            if (Utils.IsNullOrEmpty(url2))
-                            {
-                                continue;
-                            }
-
-                            var result2 = await downloadHandle.TryDownloadString(url2, blProxy, userAgent);
-                            if (blProxy && Utils.IsNullOrEmpty(result2))
-                            {
-                                result2 = await downloadHandle.TryDownloadString(url2, false, userAgent);
-                            }
-                            if (!Utils.IsNullOrEmpty(result2))
-                            {
-                                if (Utils.IsBase64String(result2!))
-                                {
-                                    result += Utils.Base64Decode(result2);
-                                }
-                                else
-                                {
-                                    result += result2;
-                                }
-                            }
-                        }
-                    }
-
-                    if (Utils.IsNullOrEmpty(result))
-                    {
-                        _updateFunc(false, $"{hashCode}{ResUI.MsgSubscriptionDecodingFailed}");
-                    }
-                    else
-                    {
-                        _updateFunc(false, $"{hashCode}{ResUI.MsgGetSubscriptionSuccessfully}");
-                        if (result?.Length < 99)
-                        {
-                            _updateFunc(false, $"{hashCode}{result}");
-                        }
-
-                        int ret = ConfigHandler.AddBatchServers(config, result, id, true);
-                        if (ret <= 0)
-                        {
-                            Logging.SaveLog("FailedImportSubscription");
-                            Logging.SaveLog(result);
-                        }
-                        _updateFunc(false,
-                            ret > 0
-                                ? $"{hashCode}{ResUI.MsgUpdateSubscriptionEnd}"
-                                : $"{hashCode}{ResUI.MsgFailedImportSubscription}");
-                    }
-                    _updateFunc(false, "-------------------------------------------------------");
-                }
-
-                _updateFunc(true, $"{ResUI.MsgUpdateSubscriptionEnd}");
-            });
-        }
-
-        public void UpdateGeoFileAll(Config config, Action<bool, string> update)
-        {
-            Task.Run(async () =>
-            {
-                await UpdateGeoFile("geosite", _config, update);
-                await UpdateGeoFile("geoip", _config, update);
-                _updateFunc(true, string.Format(ResUI.MsgDownloadGeoFileSuccessfully, "geo"));
-            });
-        }
-
-        public void RunAvailabilityCheck(Action<bool, string> update)
-        {
-            Task.Run(async () =>
-            {
-                var time = await (new DownloadHandler()).RunAvailabilityCheck(null);
-
-                update(false, string.Format(ResUI.TestMeOutput, time));
-            });
-        }
-
-        #region private
-
-        private async void CheckUpdateAsync(DownloadHandler downloadHandle, ECoreType type, bool preRelease)
-        {
-            try
-            {
-                var coreInfo = CoreInfoHandler.Instance.GetCoreInfo(type);
-                string url = coreInfo.coreReleaseApiUrl;
-
-                var result = await downloadHandle.DownloadStringAsync(url, true, Global.AppName);
-                if (!Utils.IsNullOrEmpty(result))
-                {
-                    ResponseHandler(type, result, preRelease);
-                }
-                else
-                {
-                    Logging.SaveLog("StatusCode error: " + url);
-                    return;
-                }
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(ex.Message, ex);
-                _updateFunc(false, ex.Message);
-            }
-        }
-
-        /// <summary>
-        /// 获取Core版本
-        /// </summary>
-        private SemanticVersion GetCoreVersion(ECoreType type)
-        {
-            try
-            {
-                var coreInfo = CoreInfoHandler.Instance.GetCoreInfo(type);
-                string filePath = string.Empty;
-                foreach (string name in coreInfo.coreExes)
-                {
-                    string vName = Utils.GetExeName(name);
-                    vName = Utils.GetBinPath(vName, coreInfo.coreType.ToString());
-                    if (File.Exists(vName))
-                    {
-                        filePath = vName;
-                        break;
-                    }
-                }
-
-                if (!File.Exists(filePath))
-                {
-                    string msg = string.Format(ResUI.NotFoundCore, @"", "", "");
-                    //ShowMsg(true, msg);
-                    return new SemanticVersion("");
-                }
-
-                using Process p = new();
-                p.StartInfo.FileName = filePath.AppendQuotes();
-                p.StartInfo.Arguments = coreInfo.versionArg;
-                p.StartInfo.WorkingDirectory = Utils.StartupPath();
-                p.StartInfo.UseShellExecute = false;
-                p.StartInfo.RedirectStandardOutput = true;
-                p.StartInfo.CreateNoWindow = true;
-                p.StartInfo.StandardOutputEncoding = Encoding.UTF8;
-                p.Start();
-                p.WaitForExit(5000);
-                string echo = p.StandardOutput.ReadToEnd();
-                string version = string.Empty;
-                switch (type)
-                {
-                    case ECoreType.v2fly:
-                    case ECoreType.SagerNet:
-                    case ECoreType.Xray:
-                    case ECoreType.v2fly_v5:
-                        version = Regex.Match(echo, $"{coreInfo.match} ([0-9.]+) \\(").Groups[1].Value;
-                        break;
-
-                    case ECoreType.clash:
-                    case ECoreType.clash_meta:
-                    case ECoreType.mihomo:
-                        version = Regex.Match(echo, $"v[0-9.]+").Groups[0].Value;
-                        break;
-
-                    case ECoreType.sing_box:
-                        version = Regex.Match(echo, $"([0-9.]+)").Groups[1].Value;
-                        break;
-                }
-                return new SemanticVersion(version);
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(ex.Message, ex);
-                _updateFunc(false, ex.Message);
-                return new SemanticVersion("");
-            }
-        }
-
-        private void ResponseHandler(ECoreType type, string gitHubReleaseApi, bool preRelease)
-        {
-            try
-            {
-                var gitHubReleases = JsonUtils.Deserialize<List<GitHubRelease>>(gitHubReleaseApi);
-                var gitHubRelease = preRelease ? gitHubReleases?.First() : gitHubReleases?.First(r => r.Prerelease == false);
-                var version = new SemanticVersion(gitHubRelease?.TagName!);
-                var body = gitHubRelease?.Body;
-
-                var coreInfo = CoreInfoHandler.Instance.GetCoreInfo(type);
-                SemanticVersion curVersion;
-                string message;
-                string? url;
-                switch (type)
-                {
-                    case ECoreType.v2fly:
-                    case ECoreType.SagerNet:
-                    case ECoreType.Xray:
-                    case ECoreType.v2fly_v5:
-                        {
-                            curVersion = GetCoreVersion(type);
-                            message = string.Format(ResUI.IsLatestCore, type, curVersion.ToVersionString("v"));
-                            url = string.Format(GetUrlFromCore(coreInfo), version.ToVersionString("v"));
-                            break;
-                        }
-                    case ECoreType.clash:
-                    case ECoreType.clash_meta:
-                    case ECoreType.mihomo:
-                        {
-                            curVersion = GetCoreVersion(type);
-                            message = string.Format(ResUI.IsLatestCore, type, curVersion);
-                            url = string.Format(GetUrlFromCore(coreInfo), version.ToVersionString("v"));
-                            break;
-                        }
-                    case ECoreType.sing_box:
-                        {
-                            curVersion = GetCoreVersion(type);
-                            message = string.Format(ResUI.IsLatestCore, type, curVersion.ToVersionString("v"));
-                            url = string.Format(GetUrlFromCore(coreInfo), version.ToVersionString("v"), version);
-                            break;
-                        }
-                    case ECoreType.v2rayN:
-                        {
-                            curVersion = new SemanticVersion(Utils.GetVersionInfo());
-                            message = string.Format(ResUI.IsLatestN, type, curVersion);
-                            url = string.Format(GetUrlFromCore(coreInfo), version);
-                            break;
-                        }
-                    default:
-                        throw new ArgumentException("Type");
-                }
-
-                if (curVersion >= version && version != new SemanticVersion(0, 0, 0))
-                {
-                    AbsoluteCompleted?.Invoke(this, new ResultEventArgs(false, message));
-                    return;
-                }
-
-                AbsoluteCompleted?.Invoke(this, new ResultEventArgs(true, body, url));
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(ex.Message, ex);
-                _updateFunc(false, ex.Message);
-            }
-        }
-
-        private string? GetUrlFromCore(CoreInfo? coreInfo)
-        {
-            if (Utils.IsWindows())
-            {
-                return RuntimeInformation.ProcessArchitecture switch
-                {
-                    Architecture.Arm64 => coreInfo?.coreDownloadUrlArm64,
-                    Architecture.X86 => coreInfo?.coreDownloadUrl32,
-                    Architecture.X64 => coreInfo?.coreDownloadUrl64,
-                    _ => null,
-                };
-            }
-            else if (Utils.IsLinux())
-            {
-                return RuntimeInformation.ProcessArchitecture switch
-                {
-                    Architecture.Arm64 => coreInfo?.coreDownloadUrlLinuxArm64,
-                    Architecture.X86 => coreInfo?.coreDownloadUrlLinux32,
-                    Architecture.X64 => coreInfo?.coreDownloadUrlLinux64,
-                    _ => null,
-                };
-            }
-            return null;
-        }
-
-        private async Task AskToDownload(DownloadHandler downloadHandle, string url, bool blAsk)
-        {
-            //bool blDownload = false;
-            //if (blAsk)
-            //{
-            //    if (UI.ShowYesNo(string.Format(ResUI.DownloadYesNo, url)) == MessageBoxResult.Yes)
-            //    {
-            //        blDownload = true;
-            //    }
-            //}
-            //else
-            //{
-            //    blDownload = true;
-            //}
-            //if (blDownload)
-            //{
-            await downloadHandle.DownloadFileAsync(url, true, 60);
-            //}
-        }
-
-        private async Task UpdateGeoFile(string geoName, Config config, Action<bool, string> update)
-        {
-            _config = config;
-            _updateFunc = update;
-            var url = string.Format(Global.GeoUrl, geoName);
-
-            DownloadHandler downloadHandle = new();
-            downloadHandle.UpdateCompleted += (sender2, args) =>
-            {
-                if (args.Success)
-                {
-                    _updateFunc(false, string.Format(ResUI.MsgDownloadGeoFileSuccessfully, geoName));
-
-                    try
-                    {
-                        string fileName = Utils.GetTempPath(Utils.GetDownloadFileName(url));
-                        if (File.Exists(fileName))
-                        {
-                            string targetPath = Utils.GetBinPath($"{geoName}.dat");
-                            File.Copy(fileName, targetPath, true);
-
-                            File.Delete(fileName);
-                            //_updateFunc(true, "");
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        _updateFunc(false, ex.Message);
-                    }
-                }
-                else
-                {
-                    _updateFunc(false, args.Msg);
-                }
-            };
-            downloadHandle.Error += (sender2, args) =>
-            {
-                _updateFunc(false, args.GetException().Message);
-            };
-            await AskToDownload(downloadHandle, url, false);
-        }
-
-        #endregion private
-    }
-}

v2rayN/ServiceLib/Handler/WebDavHandler.cs

@@ -0,0 +1,179 @@
+using System.Net;
+using WebDav;
+
+namespace ServiceLib.Handler
+{
+    public sealed class WebDavHandler
+    {
+        private static readonly Lazy<WebDavHandler> _instance = new(() => new());
+        public static WebDavHandler Instance => _instance.Value;
+
+        private Config? _config;
+        private WebDavClient? _client;
+        private string? _lastDescription;
+        private string _webDir = Global.AppName + "_backup";
+        private readonly string _webFileName = "backup.zip";
+        private string _logTitle = "WebDav--";
+
+        public WebDavHandler()
+        {
+            _config = AppHandler.Instance.Config;
+        }
+
+        private async Task<bool> GetClient()
+        {
+            try
+            {
+                if (_config.WebDavItem.Url.IsNullOrEmpty()
+                || _config.WebDavItem.UserName.IsNullOrEmpty()
+                || _config.WebDavItem.Password.IsNullOrEmpty())
+                {
+                    throw new ArgumentException("webdav parameter error or null");
+                }
+                if (_client != null)
+                {
+                    _client?.Dispose();
+                    _client = null;
+                }
+                if (_config.WebDavItem.DirName.IsNullOrEmpty())
+                {
+                    _webDir = Global.AppName + "_backup";
+                }
+                else
+                {
+                    _webDir = _config.WebDavItem.DirName.TrimEx();
+                }
+
+                var clientParams = new WebDavClientParams
+                {
+                    BaseAddress = new Uri(_config.WebDavItem.Url),
+                    Credentials = new NetworkCredential(_config.WebDavItem.UserName, _config.WebDavItem.Password)
+                };
+                _client = new WebDavClient(clientParams);
+            }
+            catch (Exception ex)
+            {
+                SaveLog(ex);
+                return false;
+            }
+            return await Task.FromResult(true);
+        }
+
+        private async Task<bool> TryCreateDir()
+        {
+            if (_client is null) return false;
+            try
+            {
+                var result2 = await _client.Mkcol(_webDir);
+                if (result2.IsSuccessful)
+                {
+                    return true;
+                }
+                SaveLog(result2.Description);
+            }
+            catch (Exception ex)
+            {
+                SaveLog(ex);
+            }
+            return false;
+        }
+
+        private void SaveLog(string desc)
+        {
+            _lastDescription = desc;
+            Logging.SaveLog(_logTitle + desc);
+        }
+
+        private void SaveLog(Exception ex)
+        {
+            _lastDescription = ex.Message;
+            Logging.SaveLog(_logTitle, ex);
+        }
+
+        public async Task<bool> CheckConnection()
+        {
+            if (await GetClient() == false)
+            {
+                return false;
+            }
+            await TryCreateDir();
+
+            try
+            {
+                var testName = "readme_test";
+                var myContent = new StringContent(testName);
+                var result = await _client.PutFile($"{_webDir}/{testName}", myContent);
+                if (result.IsSuccessful)
+                {
+                    await _client.Delete($"{_webDir}/{testName}");
+                    return true;
+                }
+                else
+                {
+                    SaveLog(result.Description);
+                }
+            }
+            catch (Exception ex)
+            {
+                SaveLog(ex);
+            }
+            return false;
+        }
+
+        public async Task<bool> PutFile(string fileName)
+        {
+            if (await GetClient() == false)
+            {
+                return false;
+            }
+            await TryCreateDir();
+
+            try
+            {
+                await using var fs = File.OpenRead(fileName);
+                var result = await _client.PutFile($"{_webDir}/{_webFileName}", fs); // upload a resource
+                if (result.IsSuccessful)
+                {
+                    return true;
+                }
+
+                SaveLog(result.Description);
+            }
+            catch (Exception ex)
+            {
+                SaveLog(ex);
+            }
+            return false;
+        }
+
+        public async Task<bool> GetRawFile(string fileName)
+        {
+            if (await GetClient() == false)
+            {
+                return false;
+            }
+            await TryCreateDir();
+
+            try
+            {
+                var response = await _client.GetRawFile($"{_webDir}/{_webFileName}");
+                if (!response.IsSuccessful)
+                {
+                    SaveLog(response.Description);
+                    return false;
+                }
+
+                await using var outputFileStream = new FileStream(fileName, FileMode.Create);
+                await response.Stream.CopyToAsync(outputFileStream);
+                return true;
+            }
+            catch (Exception ex)
+            {
+                SaveLog(ex);
+            }
+            return false;
+        }
+
+        public string GetLastError() => _lastDescription ?? string.Empty;
+    }
+}

v2rayN/ServiceLib/Models/CheckUpdateItem.cs

@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ServiceLib.Models
-{
-    public class CheckUpdateItem
-    {
-        public bool? isSelected { get; set; }
-        public string coreType { get; set; }
-        public string? remarks { get; set; }
-        public string? fileName { get; set; }
-        public bool? isFinished { get; set; }
-    }
-}

v2rayN/ServiceLib/Models/CheckUpdateModel.cs

@@ -0,0 +1,11 @@
+namespace ServiceLib.Models
+{
+    public class CheckUpdateModel
+    {
+        public bool? IsSelected { get; set; }
+        public string? CoreType { get; set; }
+        public string? Remarks { get; set; }
+        public string? FileName { get; set; }
+        public bool? IsFinished { get; set; }
+    }
+}

v2rayN/ServiceLib/Models/ClashConnectionModel.cs

@@ -2,16 +2,16 @@
 {
     public class ClashConnectionModel
     {
-        public string id { get; set; }
-        public string network { get; set; }
-        public string type { get; set; }
-        public string host { get; set; }
-        public ulong upload { get; set; }
-        public ulong download { get; set; }
-        public string uploadTraffic { get; set; }
-        public string downloadTraffic { get; set; }
-        public double time { get; set; }
-        public string elapsed { get; set; }
-        public string chain { get; set; }
+        public string? Id { get; set; }
+        public string? Network { get; set; }
+        public string? Type { get; set; }
+        public string? Host { get; set; }
+        public ulong Upload { get; set; }
+        public ulong Download { get; set; }
+        public string? UploadTraffic { get; set; }
+        public string? DownloadTraffic { get; set; }
+        public double Time { get; set; }
+        public string? Elapsed { get; set; }
+        public string? Chain { get; set; }
     }
 }

v2rayN/ServiceLib/Models/ClashConnections.cs

@@ -9,29 +9,29 @@
 
     public class ConnectionItem
     {
-        public string id { get; set; } = string.Empty;
-        public MetadataItem metadata { get; set; }
+        public string? id { get; set; }
+        public MetadataItem? metadata { get; set; }
         public ulong upload { get; set; }
         public ulong download { get; set; }
         public DateTime start { get; set; }
         public List<string>? chains { get; set; }
-        public string rule { get; set; }
-        public string rulePayload { get; set; }
+        public string? rule { get; set; }
+        public string? rulePayload { get; set; }
     }
 
     public class MetadataItem
     {
-        public string network { get; set; }
-        public string type { get; set; }
-        public string sourceIP { get; set; }
-        public string destinationIP { get; set; }
-        public string sourcePort { get; set; }
-        public string destinationPort { get; set; }
-        public string host { get; set; }
-        public string nsMode { get; set; }
+        public string? network { get; set; }
+        public string? type { get; set; }
+        public string? sourceIP { get; set; }
+        public string? destinationIP { get; set; }
+        public string? sourcePort { get; set; }
+        public string? destinationPort { get; set; }
+        public string? host { get; set; }
+        public string? nsMode { get; set; }
         public object uid { get; set; }
-        public string process { get; set; }
-        public string processPath { get; set; }
-        public string remoteDestination { get; set; }
+        public string? process { get; set; }
+        public string? processPath { get; set; }
+        public string? remoteDestination { get; set; }
     }
 }

v2rayN/ServiceLib/Models/ClashProviders.cs

@@ -4,14 +4,14 @@ namespace ServiceLib.Models
 {
     public class ClashProviders
     {
-        public Dictionary<String, ProvidersItem> providers { get; set; }
+        public Dictionary<string, ProvidersItem>? providers { get; set; }
 
         public class ProvidersItem
         {
-            public string name { get; set; }
-            public ProxiesItem[] proxies { get; set; }
-            public string type { get; set; }
-            public string vehicleType { get; set; }
+            public string? name { get; set; }
+            public List<ProxiesItem>? proxies { get; set; }
+            public string? type { get; set; }
+            public string? vehicleType { get; set; }
         }
     }
 }

v2rayN/ServiceLib/Models/ClashProxies.cs

@@ -2,22 +2,22 @@
 {
     public class ClashProxies
     {
-        public Dictionary<String, ProxiesItem> proxies { get; set; }
+        public Dictionary<string, ProxiesItem>? proxies { get; set; }
 
         public class ProxiesItem
         {
-            public string[] all { get; set; }
-            public List<HistoryItem> history { get; set; }
-            public string name { get; set; }
-            public string type { get; set; }
+            public List<string>? all { get; set; }
+            public List<HistoryItem>? history { get; set; }
+            public string? name { get; set; }
+            public string? type { get; set; }
             public bool udp { get; set; }
-            public string now { get; set; }
+            public string? now { get; set; }
             public int delay { get; set; }
         }
 
         public class HistoryItem
         {
-            public string time { get; set; }
+            public string? time { get; set; }
             public int delay { get; set; }
         }
     }

v2rayN/ServiceLib/Models/ClashProxyModel.cs

@@ -3,16 +3,16 @@
     [Serializable]
     public class ClashProxyModel
     {
-        public string name { get; set; }
+        public string? Name { get; set; }
 
-        public string type { get; set; }
+        public string? Type { get; set; }
 
-        public string now { get; set; }
+        public string? Now { get; set; }
 
-        public int delay { get; set; }
+        public int Delay { get; set; }
 
-        public string delayName { get; set; }
+        public string? DelayName { get; set; }
 
-        public bool isActive { get; set; }
+        public bool IsActive { get; set; }
     }
 }

v2rayN/ServiceLib/Models/CmdItem.cs

@@ -0,0 +1,8 @@
+namespace ServiceLib.Models
+{
+    public class CmdItem
+    {
+        public string? Cmd { get; set; }
+        public List<string>? Arguments { get; set; }
+    }
+}

v2rayN/ServiceLib/Models/ComboItem.cs

@@ -2,12 +2,12 @@
 {
     public class ComboItem
     {
-        public string ID
+        public string? ID
         {
             get; set;
         }
 
-        public string Text
+        public string? Text
         {
             get; set;
         }

v2rayN/ServiceLib/Models/Config.cs

@@ -8,47 +8,48 @@
     {
         #region property
 
-        public string indexId { get; set; }
-        public string subIndexId { get; set; }
-        public string systemProxyExceptions { get; set; }
-        public string systemProxyAdvancedProtocol { get; set; }
+        public string IndexId { get; set; }
+        public string SubIndexId { get; set; }
 
-        public ECoreType runningCoreType { get; set; }
+        public ECoreType RunningCoreType { get; set; }
 
         public bool IsRunningCore(ECoreType type)
         {
-            if (type == ECoreType.Xray && runningCoreType is ECoreType.Xray or ECoreType.v2fly or ECoreType.v2fly_v5 or ECoreType.SagerNet)
+            switch (type)
             {
-                return true;
+                case ECoreType.Xray when RunningCoreType is ECoreType.Xray or ECoreType.v2fly or ECoreType.v2fly_v5:
+                case ECoreType.sing_box when RunningCoreType is ECoreType.sing_box or ECoreType.mihomo:
+                    return true;
+
+                default:
+                    return false;
             }
-            if (type == ECoreType.clash && runningCoreType is ECoreType.sing_box or ECoreType.clash or ECoreType.clash_meta or ECoreType.mihomo)
-            {
-                return true;
-            }
-            return false;
         }
 
         #endregion property
 
         #region other entities
 
-        public CoreBasicItem coreBasicItem { get; set; }
-        public TunModeItem tunModeItem { get; set; }
-        public KcpItem kcpItem { get; set; }
-        public GrpcItem grpcItem { get; set; }
-        public RoutingBasicItem routingBasicItem { get; set; }
-        public GUIItem guiItem { get; set; }
-        public UIItem uiItem { get; set; }
-        public ConstItem constItem { get; set; }
-        public SpeedTestItem speedTestItem { get; set; }
-        public Mux4RayItem mux4RayItem { get; set; }
-        public Mux4SboxItem mux4SboxItem { get; set; }
-        public HysteriaItem hysteriaItem { get; set; }
-        public ClashUIItem clashUIItem { get; set; }
-        public SystemProxyItem systemProxyItem { get; set; }
-        public List<InItem> inbound { get; set; }
-        public List<KeyEventItem> globalHotkeys { get; set; }
-        public List<CoreTypeItem> coreTypeItem { get; set; }
+        public CoreBasicItem CoreBasicItem { get; set; }
+        public TunModeItem TunModeItem { get; set; }
+        public KcpItem KcpItem { get; set; }
+        public GrpcItem GrpcItem { get; set; }
+        public RoutingBasicItem RoutingBasicItem { get; set; }
+        public GUIItem GuiItem { get; set; }
+        public MsgUIItem MsgUIItem { get; set; }
+        public UIItem UiItem { get; set; }
+        public ConstItem ConstItem { get; set; }
+        public SpeedTestItem SpeedTestItem { get; set; }
+        public Mux4RayItem Mux4RayItem { get; set; }
+        public Mux4SboxItem Mux4SboxItem { get; set; }
+        public HysteriaItem HysteriaItem { get; set; }
+        public ClashUIItem ClashUIItem { get; set; }
+        public SystemProxyItem SystemProxyItem { get; set; }
+        public WebDavItem WebDavItem { get; set; }
+        public CheckUpdateItem CheckUpdateItem { get; set; }
+        public List<InItem> Inbound { get; set; }
+        public List<KeyEventItem> GlobalHotkeys { get; set; }
+        public List<CoreTypeItem> CoreTypeItem { get; set; }
 
         #endregion other entities
     }

v2rayN/ServiceLib/Models/ConfigItems.cs

@@ -3,145 +3,138 @@
     [Serializable]
     public class CoreBasicItem
     {
-        /// <summary>
-        /// 允许日志
-        /// </summary>
-        public bool logEnabled { get; set; }
+        public bool LogEnabled { get; set; }
 
-        /// <summary>
-        /// 日志等级
-        /// </summary>
-        public string loglevel { get; set; }
+        public string Loglevel { get; set; }
 
-        /// <summary>
-        /// 允许Mux多路复用
-        /// </summary>
-        public bool muxEnabled { get; set; }
+        public bool MuxEnabled { get; set; }
 
-        /// <summary>
-        /// 是否允许不安全连接
-        /// </summary>
-        public bool defAllowInsecure { get; set; }
+        public bool DefAllowInsecure { get; set; }
 
-        public string defFingerprint { get; set; }
+        public string DefFingerprint { get; set; }
 
-        /// <summary>
-        /// 默认用户代理
-        /// </summary>
-        public string defUserAgent { get; set; }
+        public string DefUserAgent { get; set; }
 
-        public bool enableFragment { get; set; }
+        public bool EnableFragment { get; set; }
 
-        public bool enableCacheFile4Sbox { get; set; } = true;
+        public bool EnableCacheFile4Sbox { get; set; } = true;
     }
 
     [Serializable]
     public class InItem
     {
-        public int localPort { get; set; }
+        public int LocalPort { get; set; }
 
-        public string protocol { get; set; }
+        public string Protocol { get; set; }
 
-        public bool udpEnabled { get; set; }
+        public bool UdpEnabled { get; set; }
 
-        public bool sniffingEnabled { get; set; } = true;
-        public List<string>? destOverride { get; set; } = ["http", "tls"];
-        public bool routeOnly { get; set; }
-        public bool allowLANConn { get; set; }
+        public bool SniffingEnabled { get; set; } = true;
+        public List<string>? DestOverride { get; set; } = ["http", "tls"];
+        public bool RouteOnly { get; set; }
+        public bool AllowLANConn { get; set; }
 
-        public bool newPort4LAN { get; set; }
+        public bool NewPort4LAN { get; set; }
 
-        public string user { get; set; }
+        public string User { get; set; }
 
-        public string pass { get; set; }
+        public string Pass { get; set; }
     }
 
     [Serializable]
     public class KcpItem
     {
-        public int mtu { get; set; }
+        public int Mtu { get; set; }
 
-        public int tti { get; set; }
+        public int Tti { get; set; }
 
-        public int uplinkCapacity { get; set; }
+        public int UplinkCapacity { get; set; }
 
-        public int downlinkCapacity { get; set; }
+        public int DownlinkCapacity { get; set; }
 
-        public bool congestion { get; set; }
+        public bool Congestion { get; set; }
 
-        public int readBufferSize { get; set; }
+        public int ReadBufferSize { get; set; }
 
-        public int writeBufferSize { get; set; }
+        public int WriteBufferSize { get; set; }
     }
 
     [Serializable]
     public class GrpcItem
     {
-        public int idle_timeout { get; set; }
-        public int health_check_timeout { get; set; }
-        public bool permit_without_stream { get; set; }
-        public int initial_windows_size { get; set; }
+        public int? IdleTimeout { get; set; }
+        public int? HealthCheckTimeout { get; set; }
+        public bool? PermitWithoutStream { get; set; }
+        public int? InitialWindowsSize { get; set; }
     }
 
     [Serializable]
     public class GUIItem
     {
-        public bool autoRun { get; set; }
+        public bool AutoRun { get; set; }
 
-        public bool enableStatistics { get; set; }
+        public bool EnableStatistics { get; set; }
 
-        public bool keepOlderDedupl { get; set; }
+        public bool KeepOlderDedupl { get; set; }
 
-        public bool ignoreGeoUpdateCore { get; set; } = true;
+        public bool IgnoreGeoUpdateCore { get; set; } = true;
 
-        public int autoUpdateInterval { get; set; } = 10;
+        public int AutoUpdateInterval { get; set; }
 
-        public bool checkPreReleaseUpdate { get; set; } = false;
+        public bool EnableSecurityProtocolTls13 { get; set; }
 
-        public bool enableSecurityProtocolTls13 { get; set; }
+        public int TrayMenuServersLimit { get; set; } = 20;
 
-        public int trayMenuServersLimit { get; set; } = 20;
+        public bool EnableHWA { get; set; } = false;
 
-        public bool enableHWA { get; set; } = false;
+        public bool EnableLog { get; set; } = true;
+    }
 
-        public bool enableLog { get; set; } = true;
+    [Serializable]
+    public class MsgUIItem
+    {
+        public string? MainMsgFilter { get; set; }
+        public bool? AutoRefresh { get; set; }
     }
 
     [Serializable]
     public class UIItem
     {
-        public bool enableAutoAdjustMainLvColWidth { get; set; }
-        public bool enableUpdateSubOnlyRemarksExist { get; set; }
-        public double mainWidth { get; set; }
-        public double mainHeight { get; set; }
-        public double mainGirdHeight1 { get; set; }
-        public double mainGirdHeight2 { get; set; }
-        public EGirdOrientation mainGirdOrientation { get; set; } = EGirdOrientation.Vertical;
-        public bool colorModeDark { get; set; }
-        public bool followSystemTheme { get; set; }
-        public string? colorPrimaryName { get; set; }
-        public string currentLanguage { get; set; }
-        public string currentFontFamily { get; set; }
-        public int currentFontSize { get; set; }
-        public bool enableDragDropSort { get; set; }
-        public bool doubleClick2Activate { get; set; }
-        public bool autoHideStartup { get; set; }
-        public string mainMsgFilter { get; set; }
-        public List<ColumnItem> mainColumnItem { get; set; }
-        public bool showInTaskbar { get; set; }
+        public bool EnableAutoAdjustMainLvColWidth { get; set; }
+        public bool EnableUpdateSubOnlyRemarksExist { get; set; }
+        public double MainWidth { get; set; }
+        public double MainHeight { get; set; }
+        public double MainGirdHeight1 { get; set; }
+        public double MainGirdHeight2 { get; set; }
+        public EGirdOrientation MainGirdOrientation { get; set; } = EGirdOrientation.Vertical;
+        public bool ColorModeDark { get; set; }
+        public bool FollowSystemTheme { get; set; }
+        public string? ColorPrimaryName { get; set; }
+        public string CurrentLanguage { get; set; }
+        public string CurrentFontFamily { get; set; }
+        public int CurrentFontSize { get; set; }
+        public bool EnableDragDropSort { get; set; }
+        public bool DoubleClick2Activate { get; set; }
+        public bool AutoHideStartup { get; set; }
+        public bool Hide2TrayWhenClose { get; set; }
+        public List<ColumnItem> MainColumnItem { get; set; }
+        public bool ShowInTaskbar { get; set; }
     }
 
     [Serializable]
     public class ConstItem
     {
-        public string defIEProxyExceptions { get; set; }
-        public string subConvertUrl { get; set; } = string.Empty;
+        public string DefIEProxyExceptions { get; set; }
+        public string SubConvertUrl { get; set; } = string.Empty;
+        public string? GeoSourceUrl { get; set; }
+        public string? SrsSourceUrl { get; set; }
+        public string? RouteRulesTemplateSourceUrl { get; set; }
     }
 
     [Serializable]
     public class KeyEventItem
     {
-        public EGlobalHotkey eGlobalHotkey { get; set; }
+        public EGlobalHotkey EGlobalHotkey { get; set; }
 
         public bool Alt { get; set; }
 
@@ -155,38 +148,39 @@
     [Serializable]
     public class CoreTypeItem
     {
-        public EConfigType configType { get; set; }
+        public EConfigType ConfigType { get; set; }
 
-        public ECoreType coreType { get; set; }
+        public ECoreType CoreType { get; set; }
     }
 
     [Serializable]
     public class TunModeItem
     {
-        public bool enableTun { get; set; }
-        public bool strictRoute { get; set; } = true;
-        public string stack { get; set; }
-        public int mtu { get; set; }
-        public bool enableExInbound { get; set; }
-        public bool enableIPv6Address { get; set; }
+        public bool EnableTun { get; set; }
+        public bool StrictRoute { get; set; } = true;
+        public string Stack { get; set; }
+        public int Mtu { get; set; }
+        public bool EnableExInbound { get; set; }
+        public bool EnableIPv6Address { get; set; }
+        public string? LinuxSudoPwd { get; set; }
     }
 
     [Serializable]
     public class SpeedTestItem
     {
-        public int speedTestTimeout { get; set; }
-        public string speedTestUrl { get; set; }
-        public string speedPingTestUrl { get; set; }
+        public int SpeedTestTimeout { get; set; }
+        public string SpeedTestUrl { get; set; }
+        public string SpeedPingTestUrl { get; set; }
+        public int SpeedTestPageSize { get; set; }
     }
 
     [Serializable]
     public class RoutingBasicItem
     {
-        public string domainStrategy { get; set; }
-        public string domainStrategy4Singbox { get; set; }
-        public string domainMatcher { get; set; }
-        public string routingIndexId { get; set; }
-        public bool enableRoutingAdvanced { get; set; }
+        public string DomainStrategy { get; set; }
+        public string DomainStrategy4Singbox { get; set; }
+        public string DomainMatcher { get; set; }
+        public string RoutingIndexId { get; set; }
     }
 
     [Serializable]
@@ -200,46 +194,61 @@
     [Serializable]
     public class Mux4RayItem
     {
-        public int? concurrency { get; set; }
-        public int? xudpConcurrency { get; set; }
-        public string? xudpProxyUDP443 { get; set; }
+        public int? Concurrency { get; set; }
+        public int? XudpConcurrency { get; set; }
+        public string? XudpProxyUDP443 { get; set; }
     }
 
     [Serializable]
     public class Mux4SboxItem
     {
-        public string protocol { get; set; }
-        public int max_connections { get; set; }
-        public bool? padding { get; set; }
+        public string Protocol { get; set; }
+        public int MaxConnections { get; set; }
+        public bool? Padding { get; set; }
     }
 
     [Serializable]
     public class HysteriaItem
     {
-        public int up_mbps { get; set; }
-        public int down_mbps { get; set; }
+        public int UpMbps { get; set; }
+        public int DownMbps { get; set; }
     }
 
     [Serializable]
     public class ClashUIItem
     {
-        public ERuleMode ruleMode { get; set; }
-        public bool enableIPv6 { get; set; }
-        public bool enableMixinContent { get; set; }
-        public int proxiesSorting { get; set; }
-        public bool proxiesAutoRefresh { get; set; }
-        public int proxiesAutoDelayTestInterval { get; set; } = 10;
-        public int connectionsSorting { get; set; }
-        public bool connectionsAutoRefresh { get; set; }
-        public int connectionsRefreshInterval { get; set; } = 2;
+        public ERuleMode RuleMode { get; set; }
+        public bool EnableIPv6 { get; set; }
+        public bool EnableMixinContent { get; set; }
+        public int ProxiesSorting { get; set; }
+        public bool ProxiesAutoRefresh { get; set; }
+        public int ProxiesAutoDelayTestInterval { get; set; } = 10;
+        public bool ConnectionsAutoRefresh { get; set; }
+        public int ConnectionsRefreshInterval { get; set; } = 2;
     }
 
     [Serializable]
     public class SystemProxyItem
     {
-        public ESysProxyType sysProxyType { get; set; }
-        public string systemProxyExceptions { get; set; }
-        public bool notProxyLocalAddress { get; set; } = true;
-        public string systemProxyAdvancedProtocol { get; set; }
+        public ESysProxyType SysProxyType { get; set; }
+        public string SystemProxyExceptions { get; set; }
+        public bool NotProxyLocalAddress { get; set; } = true;
+        public string SystemProxyAdvancedProtocol { get; set; }
+    }
+
+    [Serializable]
+    public class WebDavItem
+    {
+        public string? Url { get; set; }
+        public string? UserName { get; set; }
+        public string? Password { get; set; }
+        public string? DirName { get; set; }
+    }
+
+    [Serializable]
+    public class CheckUpdateItem
+    {
+        public bool CheckPreReleaseUpdate { get; set; }
+        public List<string>? SelectedCoreTypes { get; set; }
     }
 }

v2rayN/ServiceLib/Models/CoreInfo.cs

@@ -3,28 +3,19 @@
     [Serializable]
     public class CoreInfo
     {
-        public ECoreType coreType { get; set; }
-
-        public List<string> coreExes { get; set; }
-
-        public string arguments { get; set; }
-
-        public string coreUrl { get; set; }
-
-        public string coreReleaseApiUrl { get; set; }
-
-        public string coreDownloadUrl32 { get; set; }
-
-        public string coreDownloadUrl64 { get; set; }
-
-        public string coreDownloadUrlArm64 { get; set; }
-        public string? coreDownloadUrlLinux32 { get; set; }
-        public string? coreDownloadUrlLinux64 { get; set; }
-        public string? coreDownloadUrlLinuxArm64 { get; set; }
-
-        public string match { get; set; }
-        public string versionArg { get; set; }
-
-        public bool redirectInfo { get; set; }
+        public ECoreType CoreType { get; set; }
+        public List<string>? CoreExes { get; set; }
+        public string? Arguments { get; set; }
+        public string? Url { get; set; }
+        public string? ReleaseApiUrl { get; set; }
+        public string? DownloadUrlWin64 { get; set; }
+        public string? DownloadUrlWinArm64 { get; set; }
+        public string? DownloadUrlLinux64 { get; set; }
+        public string? DownloadUrlLinuxArm64 { get; set; }
+        public string? DownloadUrlOSX64 { get; set; }
+        public string? DownloadUrlOSXArm64 { get; set; }
+        public string? Match { get; set; }
+        public string? VersionArg { get; set; }
+        public bool RedirectInfo { get; set; }
     }
 }

v2rayN/ServiceLib/Models/DNSItem.cs

@@ -6,15 +6,15 @@ namespace ServiceLib.Models
     public class DNSItem
     {
         [PrimaryKey]
-        public string id { get; set; }
+        public string Id { get; set; }
 
-        public string remarks { get; set; }
-        public bool enabled { get; set; } = true;
-        public ECoreType coreType { get; set; }
-        public bool useSystemHosts { get; set; }
-        public string? normalDNS { get; set; }
-        public string? tunDNS { get; set; }
-        public string? domainStrategy4Freedom { get; set; }
-        public string? domainDNSAddress { get; set; }
+        public string Remarks { get; set; }
+        public bool Enabled { get; set; } = true;
+        public ECoreType CoreType { get; set; }
+        public bool UseSystemHosts { get; set; }
+        public string? NormalDNS { get; set; }
+        public string? TunDNS { get; set; }
+        public string? DomainStrategy4Freedom { get; set; }
+        public string? DomainDNSAddress { get; set; }
     }
 }

v2rayN/ServiceLib/Models/GitHubRelease.cs

@@ -4,19 +4,19 @@ namespace ServiceLib.Models
 {
     public class GitHubReleaseAsset
     {
-        [JsonPropertyName("url")] public string Url { get; set; }
+        [JsonPropertyName("url")] public string? Url { get; set; }
 
         [JsonPropertyName("id")] public int Id { get; set; }
 
-        [JsonPropertyName("node_id")] public string NodeId { get; set; }
+        [JsonPropertyName("node_id")] public string? NodeId { get; set; }
 
-        [JsonPropertyName("name")] public string Name { 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("content_type")] public string? ContentType { get; set; }
 
-        [JsonPropertyName("state")] public string State { get; set; }
+        [JsonPropertyName("state")] public string? State { get; set; }
 
         [JsonPropertyName("size")] public int Size { get; set; }
 
@@ -26,28 +26,28 @@ namespace ServiceLib.Models
 
         [JsonPropertyName("updated_at")] public DateTime UpdatedAt { get; set; }
 
-        [JsonPropertyName("browser_download_url")] public string BrowserDownloadUrl { get; set; }
+        [JsonPropertyName("browser_download_url")] public string? BrowserDownloadUrl { get; set; }
     }
 
     public class GitHubRelease
     {
-        [JsonPropertyName("url")] public string Url { get; set; }
+        [JsonPropertyName("url")] public string? Url { get; set; }
 
-        [JsonPropertyName("assets_url")] public string AssetsUrl { get; set; }
+        [JsonPropertyName("assets_url")] public string? AssetsUrl { get; set; }
 
-        [JsonPropertyName("upload_url")] public string UploadUrl { get; set; }
+        [JsonPropertyName("upload_url")] public string? UploadUrl { get; set; }
 
-        [JsonPropertyName("html_url")] public string HtmlUrl { 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("node_id")] public string? NodeId { get; set; }
 
-        [JsonPropertyName("tag_name")] public string TagName { get; set; }
+        [JsonPropertyName("tag_name")] public string? TagName { get; set; }
 
-        [JsonPropertyName("target_commitish")] public string TargetCommitish { get; set; }
+        [JsonPropertyName("target_commitish")] public string? TargetCommitish { get; set; }
 
-        [JsonPropertyName("name")] public string Name { get; set; }
+        [JsonPropertyName("name")] public string? Name { get; set; }
 
         [JsonPropertyName("draft")] public bool Draft { get; set; }
 
@@ -59,10 +59,10 @@ namespace ServiceLib.Models
 
         [JsonPropertyName("assets")] public List<GitHubReleaseAsset> Assets { get; set; }
 
-        [JsonPropertyName("tarball_url")] public string TarballUrl { get; set; }
+        [JsonPropertyName("tarball_url")] public string? TarballUrl { get; set; }
 
-        [JsonPropertyName("zipball_url")] public string ZipballUrl { get; set; }
+        [JsonPropertyName("zipball_url")] public string? ZipballUrl { get; set; }
 
-        [JsonPropertyName("body")] public string Body { get; set; }
+        [JsonPropertyName("body")] public string? Body { get; set; }
     }
 }

v2rayN/ServiceLib/Models/IPAPIInfo.cs

@@ -0,0 +1,13 @@
+namespace ServiceLib.Models
+{
+    internal class IPAPIInfo
+    {
+        public string? ip { get; set; }
+        public string? city { get; set; }
+        public string? region { get; set; }
+        public string? region_code { get; set; }
+        public string? country { get; set; }
+        public string? country_name { get; set; }
+        public string? country_code { get; set; }
+    }
+}

v2rayN/ServiceLib/Models/ProfileExItem.cs

@@ -6,10 +6,10 @@ namespace ServiceLib.Models
     public class ProfileExItem
     {
         [PrimaryKey]
-        public string indexId { get; set; }
+        public string IndexId { get; set; }
 
-        public int delay { get; set; }
-        public decimal speed { get; set; }
-        public int sort { get; set; }
+        public int Delay { get; set; }
+        public decimal Speed { get; set; }
+        public int Sort { get; set; }
     }
 }

v2rayN/ServiceLib/Models/ProfileItem.cs

@@ -7,184 +7,90 @@ namespace ServiceLib.Models
     {
         public ProfileItem()
         {
-            indexId = string.Empty;
-            configType = EConfigType.VMess;
-            configVersion = 2;
-            address = string.Empty;
-            port = 0;
-            id = string.Empty;
-            alterId = 0;
-            security = string.Empty;
-            network = string.Empty;
-            remarks = string.Empty;
-            headerType = string.Empty;
-            requestHost = string.Empty;
-            path = string.Empty;
-            streamSecurity = string.Empty;
-            allowInsecure = string.Empty;
-            subid = string.Empty;
-            flow = string.Empty;
+            IndexId = string.Empty;
+            ConfigType = EConfigType.VMess;
+            ConfigVersion = 2;
+            Address = string.Empty;
+            Port = 0;
+            Id = string.Empty;
+            AlterId = 0;
+            Security = string.Empty;
+            Network = string.Empty;
+            Remarks = string.Empty;
+            HeaderType = string.Empty;
+            RequestHost = string.Empty;
+            Path = string.Empty;
+            StreamSecurity = string.Empty;
+            AllowInsecure = string.Empty;
+            Subid = string.Empty;
+            Flow = string.Empty;
         }
 
         #region function
 
         public string GetSummary()
         {
-            string summary = string.Format("[{0}] ", (configType).ToString());
-            string[] arrAddr = address.Split('.');
-            string addr;
-            if (arrAddr.Length > 2)
+            var summary = $"[{(ConfigType).ToString()}] ";
+            var arrAddr = Address.Split('.');
+            var addr = arrAddr.Length switch
             {
-                addr = $"{arrAddr[0]}***{arrAddr[arrAddr.Length - 1]}";
-            }
-            else if (arrAddr.Length > 1)
+                > 2 => $"{arrAddr.First()}***{arrAddr.Last()}",
+                > 1 => $"***{arrAddr.Last()}",
+                _ => Address
+            };
+            summary += ConfigType switch
             {
-                addr = $"***{arrAddr[arrAddr.Length - 1]}";
-            }
-            else
-            {
-                addr = address;
-            }
-            switch (configType)
-            {
-                case EConfigType.Custom:
-                    summary += string.Format("[{1}]{0}", remarks, coreType.ToString());
-                    break;
-
-                default:
-                    summary += string.Format("{0}({1}:{2})", remarks, addr, port);
-                    break;
-            }
+                EConfigType.Custom => $"[{CoreType.ToString()}]{Remarks}",
+                _ => $"{Remarks}({addr}:{Port})"
+            };
             return summary;
         }
 
-        public List<string> GetAlpn()
+        public List<string>? GetAlpn()
         {
-            if (Utils.IsNullOrEmpty(alpn))
-            {
-                return null;
-            }
-            else
-            {
-                return Utils.String2List(alpn);
-            }
+            return Utils.IsNullOrEmpty(Alpn) ? null : Utils.String2List(Alpn);
         }
 
         public string GetNetwork()
         {
-            if (Utils.IsNullOrEmpty(network) || !Global.Networks.Contains(network))
+            if (Utils.IsNullOrEmpty(Network) || !Global.Networks.Contains(Network))
             {
                 return Global.DefaultNetwork;
             }
-            return network.TrimEx();
+            return Network.TrimEx();
         }
 
         #endregion function
 
         [PrimaryKey]
-        public string indexId { get; set; }
+        public string IndexId { get; set; }
 
-        /// <summary>
-        /// config type(1=normal,2=custom)
-        /// </summary>
-        public EConfigType configType { get; set; }
-
-        /// <summary>
-        /// 版本(现在=2)
-        /// </summary>
-        public int configVersion { get; set; }
-
-        /// <summary>
-        /// 远程服务器地址
-        /// </summary>
-        public string address { get; set; }
-
-        /// <summary>
-        /// 远程服务器端口
-        /// </summary>
-        public int port { get; set; }
-
-        /// <summary>
-        /// 远程服务器ID
-        /// </summary>
-        public string id { get; set; }
-
-        /// <summary>
-        /// 远程服务器额外ID
-        /// </summary>
-        public int alterId { get; set; }
-
-        /// <summary>
-        /// 本地安全策略
-        /// </summary>
-        public string security { get; set; }
-
-        /// <summary>
-        /// tcp,kcp,ws,h2,quic
-        /// </summary>
-        public string network { get; set; }
-
-        /// <summary>
-        ///
-        /// </summary>
-        public string remarks { get; set; }
-
-        /// <summary>
-        /// 伪装类型
-        /// </summary>
-        public string headerType { get; set; }
-
-        /// <summary>
-        /// 伪装的域名
-        /// </summary>
-        public string requestHost { get; set; }
-
-        /// <summary>
-        /// ws h2 path
-        /// </summary>
-        public string path { get; set; }
-
-        /// <summary>
-        /// 传输层安全
-        /// </summary>
-        public string streamSecurity { get; set; }
-
-        /// <summary>
-        /// 是否允许不安全连接（用于客户端）
-        /// </summary>
-        public string allowInsecure { get; set; }
-
-        /// <summary>
-        /// SubItem id
-        /// </summary>
-        public string subid { get; set; }
-
-        public bool isSub { get; set; } = true;
-
-        /// <summary>
-        /// VLESS flow
-        /// </summary>
-        public string flow { get; set; }
-
-        /// <summary>
-        /// tls sni
-        /// </summary>
-        public string sni { get; set; }
-
-        /// <summary>
-        /// tls alpn
-        /// </summary>
-        public string alpn { get; set; } = string.Empty;
-
-        public ECoreType? coreType { get; set; }
-
-        public int? preSocksPort { get; set; }
-
-        public string fingerprint { get; set; }
-
-        public bool displayLog { get; set; } = true;
-        public string publicKey { get; set; }
-        public string shortId { get; set; }
-        public string spiderX { get; set; }
+        public EConfigType ConfigType { get; set; }
+        public int ConfigVersion { get; set; }
+        public string Address { get; set; }
+        public int Port { get; set; }
+        public string Id { get; set; }
+        public int AlterId { get; set; }
+        public string Security { get; set; }
+        public string Network { get; set; }
+        public string Remarks { get; set; }
+        public string HeaderType { get; set; }
+        public string RequestHost { get; set; }
+        public string Path { get; set; }
+        public string StreamSecurity { get; set; }
+        public string AllowInsecure { get; set; }
+        public string Subid { get; set; }
+        public bool IsSub { get; set; } = true;
+        public string Flow { get; set; }
+        public string Sni { get; set; }
+        public string Alpn { get; set; } = string.Empty;
+        public ECoreType? CoreType { get; set; }
+        public int? PreSocksPort { get; set; }
+        public string Fingerprint { get; set; }
+        public bool DisplayLog { get; set; } = true;
+        public string PublicKey { get; set; }
+        public string ShortId { get; set; }
+        public string SpiderX { get; set; }
+        public string Extra { get; set; }
     }
 }

v2rayN/ServiceLib/Models/ProfileItemModel.cs

@@ -3,16 +3,16 @@
     [Serializable]
     public class ProfileItemModel : ProfileItem
     {
-        public bool isActive { get; set; }
-        public string subRemarks { get; set; }
-        public int delay { get; set; }
-        public decimal speed { get; set; }
-        public int sort { get; set; }
-        public string delayVal { get; set; }
-        public string speedVal { get; set; }
-        public string todayUp { get; set; }
-        public string todayDown { get; set; }
-        public string totalUp { get; set; }
-        public string totalDown { get; set; }
+        public bool IsActive { get; set; }
+        public string SubRemarks { get; set; }
+        public int Delay { get; set; }
+        public decimal Speed { get; set; }
+        public int Sort { get; set; }
+        public string DelayVal { get; set; }
+        public string SpeedVal { get; set; }
+        public string TodayUp { get; set; }
+        public string TodayDown { get; set; }
+        public string TotalUp { get; set; }
+        public string TotalDown { get; set; }
     }
 }