Try to fix

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

.github/ISSUE_TEMPLATE/01_bug_report.yml

@@ -3,6 +3,13 @@ description: 在提出问题前请先自行排除服务器端问题和升级到
 title: "[Bug]: "
 labels: ["bug"]
 body:
+  - type: input
+    id: "os-version"
+    attributes:
+      label: "操作系统和版本"
+      description: "操作系统和版本"
+    validations:
+      required: true
   - type: input
     id: "expectation"
     attributes:

.github/workflows/build-linux.yml

@@ -27,9 +27,12 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/checkout@v4.2.2
+      with:
+        submodules: 'recursive'
+        fetch-depth: '0'
 
     - name: Setup
-      uses: actions/setup-dotnet@v4.3.0
+      uses: actions/setup-dotnet@v4.3.1
       with:
         dotnet-version: '8.0.x'
 
@@ -42,7 +45,7 @@ jobs:
         dotnet publish ./AmazTool/AmazTool.csproj             -c Release -r linux-arm64 --self-contained=true -p:PublishTrimmed=true -o $OutputPathArm64
 
     - name: Upload build artifacts
-      uses: actions/upload-artifact@v4.6.0
+      uses: actions/upload-artifact@v4.6.2
       with:
         name: v2rayN-linux
         path: |
@@ -68,9 +71,8 @@ jobs:
     - name: Package AppImage
       if: github.event.inputs.release_tag != ''
       run: |
-        chmod 755 package-appimage.sh
-        ./package-appimage.sh $OutputArch $OutputPath64 ${{ github.event.inputs.release_tag }}
-        ./package-appimage.sh $OutputArchArm $OutputPathArm64 ${{ github.event.inputs.release_tag }}
+        chmod a+x package-appimage.sh
+        ./package-appimage.sh
 
     - name: Upload AppImage to release
       uses: svenstaro/upload-release-action@v2

.github/workflows/build-osx.yml

@@ -27,9 +27,12 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/checkout@v4.2.2
+      with:
+        submodules: 'recursive'
+        fetch-depth: '0'
 
     - name: Setup
-      uses: actions/setup-dotnet@v4.3.0
+      uses: actions/setup-dotnet@v4.3.1
       with:
         dotnet-version: '8.0.x'
 
@@ -42,7 +45,7 @@ jobs:
         dotnet publish ./AmazTool/AmazTool.csproj             -c Release -r osx-arm64 --self-contained=true -p:PublishTrimmed=true -o $OutputPathArm64
 
     - name: Upload build artifacts
-      uses: actions/upload-artifact@v4.6.0
+      uses: actions/upload-artifact@v4.6.2
       with:
         name: v2rayN-macos
         path: |

.github/workflows/build-windows-desktop.yml

@@ -27,9 +27,12 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/checkout@v4.2.2
+      with:
+        submodules: 'recursive'
+        fetch-depth: '0'
 
     - name: Setup
-      uses: actions/setup-dotnet@v4.3.0
+      uses: actions/setup-dotnet@v4.3.1
       with:
         dotnet-version: '8.0.x'
 
@@ -42,7 +45,7 @@ jobs:
         dotnet publish ./AmazTool/AmazTool.csproj             -c Release -r win-arm64 --self-contained=true -p:EnableWindowsTargeting=true -p:PublishTrimmed=true -o $OutputPathArm64
 
     - name: Upload build artifacts
-      uses: actions/upload-artifact@v4.6.0
+      uses: actions/upload-artifact@v4.6.2
       with:
         name: v2rayN-windows-desktop
         path: |

.github/workflows/build-windows.yml

@@ -30,7 +30,7 @@ jobs:
       uses: actions/checkout@v4.2.2
 
     - name: Setup
-      uses: actions/setup-dotnet@v4.3.0
+      uses: actions/setup-dotnet@v4.3.1
       with:
         dotnet-version: '8.0.x'
 
@@ -46,7 +46,7 @@ jobs:
 
   
     - name: Upload build artifacts
-      uses: actions/upload-artifact@v4.6.0
+      uses: actions/upload-artifact@v4.6.2
       with:
         name: v2rayN-windows
         path: |

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "v2rayN/GlobalHotKeys"]
+	path = v2rayN/GlobalHotKeys
+	url = https://github.com/2dust/GlobalHotKeys

package-appimage.sh

@@ -1,71 +1,14 @@
 #!/bin/bash
 
-Arch="$1"
-OutputPath="$2"
-Version="$3"
-
-FileName="v2rayN-${Arch}.zip"
-wget -nv -O $FileName "https://github.com/2dust/v2rayN-core-bin/raw/refs/heads/master/$FileName"
-7z x $FileName -aoa
-cp -rf v2rayN-${Arch}/* $OutputPath
-
-PackagePath="v2rayN-Package-${Arch}"
-mkdir -p "${PackagePath}/AppDir/opt"
-cp -rf $OutputPath "${PackagePath}/AppDir/opt/v2rayN"
-echo "When this file exists, app will not store configs under this folder" >"${PackagePath}/AppDir/opt/v2rayN/NotStoreConfigHere.txt"
-
-if [ $Arch = "linux-64" ]; then
-    Arch2="x86_64"
-    Arch3="amd64"
-else
-    Arch2="aarch64"
-    Arch3="arm64"
-fi
-echo $Arch2
-
-# basic
-cat >"${PackagePath}/AppDir/AppRun" <<-EOF
-#!/bin/sh
-HERE="\$(dirname "\$(readlink -f "\${0}")")"
-export PATH="\${HERE}"/opt/v2rayN/:"\${PATH}"
-export LD_LIBRARY_PATH="\${HERE}"/opt/v2rayN/:"\${LD_LIBRARY_PATH}"
-exec "\${HERE}/opt/v2rayN/v2rayN" \$@
-EOF
-
-cat >"${PackagePath}/AppDir/v2rayN.desktop" <<-EOF
-[Desktop Entry]
-Name=v2rayN
-Comment=A GUI client for Windows and Linux, support Xray core and sing-box-core and others
-Exec=v2rayN
-Icon=v2rayN
-Terminal=false
-Type=Application
-Categories=Network;
-EOF
-
-sudo cp "${PackagePath}/AppDir/opt/v2rayN/v2rayN.png" "${PackagePath}/AppDir/v2rayN.png"
-sudo dpkg --add-architecture ${Arch3}
-mkdir deb_folder
-cd deb_folder
-apt download libicu74:${Arch3}
-apt download libfontconfig1:${Arch3} || true
-apt download libfontconfig:${Arch3} || true
-mkdir ../output_folder
-for deb in *.deb; do
-    dpkg-deb -x "$deb" ../output_folder/
-done
-cd ..
-find output_folder -type f -name "*.so*" -exec cp {} ${PackagePath}/AppDir/opt/v2rayN/ \;
-find output_folder -type l -name "*.so*" -exec cp {} ${PackagePath}/AppDir/opt/v2rayN/ \;
-rm -rf deb_folder output_folder
-
-sudo chmod 0755 "${PackagePath}/AppDir/opt/v2rayN/v2rayN"
-sudo chmod 0755 "${PackagePath}/AppDir/AppRun"
-
-# desktop && PATH
-
-wget "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage"
-chmod a+x appimagetool-x86_64.AppImage
+sudo apt update -y
 sudo apt install -y libfuse2
-sudo ./appimagetool-x86_64.AppImage "${PackagePath}/AppDir"
-sudo mv "v2rayN-${Arch2}.AppImage" "v2rayN-${Arch}.AppImage"
+wget -O pkg2appimage https://github.com/AppImageCommunity/pkg2appimage/releases/download/continuous/pkg2appimage-1eceb30-x86_64.AppImage
+chmod a+x pkg2appimage
+export AppImageOutputArch=$OutputArch
+export OutputPath=$OutputPath64
+./pkg2appimage ./pkg2appimage.yml
+mv out/*.AppImage v2rayN-${AppImageOutputArch}.AppImage
+export AppImageOutputArch=$OutputArchArm
+export OutputPath=$OutputPathArm64
+./pkg2appimage ./pkg2appimage.yml
+mv out/*.AppImage v2rayN-${AppImageOutputArch}.AppImage

pkg2appimage.yml

@@ -0,0 +1,37 @@
+app: v2rayN
+binpatch: true
+
+ingredients:
+  script:
+    - export FileName="v2rayN-${AppImageOutputArch}.zip"
+    - wget -nv -O $FileName "https://github.com/2dust/v2rayN-core-bin/raw/refs/heads/master/${FileName}"
+    - 7z x $FileName -aoa
+    - cp -rf v2rayN-${AppImageOutputArch}/* $OutputPath
+
+script:
+  - mkdir -p usr/bin usr/lib
+  - cp -rf $OutputPath usr/lib/v2rayN
+  - echo "When this file exists, app will not store configs under this folder" > usr/lib/v2rayN/NotStoreConfigHere.txt
+  - ln -sf usr/lib/v2rayN/v2rayN usr/bin/v2rayN
+  - chmod a+x usr/lib/v2rayN/v2rayN
+  - find usr -type f -exec sh -c 'file "{}" | grep -qi "executable" && chmod +x "{}"' \;
+  - install -Dm644 usr/lib/v2rayN/v2rayN.png v2rayN.png
+  - install -Dm644 usr/lib/v2rayN/v2rayN.png usr/share/pixmaps/v2rayN.png
+  - cat > v2rayN.desktop <<EOF
+  - [Desktop Entry]
+  - Name=v2rayN
+  - Comment=A GUI client for Windows and Linux, support Xray core and sing-box-core and others
+  - Exec=v2rayN
+  - Icon=v2rayN
+  - Terminal=false
+  - Type=Application
+  - Categories=Network;
+  - EOF
+  - install -Dm644 v2rayN.desktop usr/share/applications/v2rayN.desktop
+  - cat > AppRun <<\EOF
+  - #!/bin/sh
+  - HERE="$(dirname "$(readlink -f "${0}")")"
+  - cd ${HERE}/usr/lib/v2rayN
+  - exec ${HERE}/usr/lib/v2rayN/v2rayN $@
+  - EOF
+  - chmod a+x AppRun

v2rayN/AmazTool/Program.cs

@@ -1,10 +1,7 @@
-namespace AmazTool
+namespace AmazTool;
+
+internal static class Program
 {
-    internal static class Program
-    {
-        /// <summary>
-        /// 应用程序的主入口点。
-        /// </summary>
     [STAThread]
     private static void Main(string[] args)
     {
@@ -25,5 +22,4 @@
 
         UpgradeApp.Upgrade(argData);
     }
-    }
 }

v2rayN/AmazTool/Resx/Resource.Designer.cs

@@ -61,7 +61,7 @@ namespace AmazTool.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Failed to terminate the v2rayN.Close it manually,or the upgrade may fail. 的本地化字符串。
+        ///   查找类似 Failed to terminate the v2rayN. Close it manually, or the upgrade may fail. 的本地化字符串。
         /// </summary>
         internal static string FailedTerminateProcess {
             get {

v2rayN/AmazTool/Resx/Resource.resx

@@ -133,7 +133,7 @@
     <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>
+    <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>

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

@@ -133,7 +133,7 @@
     <value>尝试结束 v2rayN 进程...</value>
   </data>
   <data name="FailedTerminateProcess" xml:space="preserve">
-    <value>请手动关闭正在运行的v2rayN，否则可能升级失败。</value>
+    <value>请手动关闭正在运行的 v2rayN，否则可能升级失败。</value>
   </data>
   <data name="StartUnzipping" xml:space="preserve">
     <value>开始解压缩更新包...</value>

v2rayN/AmazTool/Resx/Resource.zh-Hant.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>正在重啟，請等待...</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

@@ -2,10 +2,10 @@ using System.Diagnostics;
 using System.IO.Compression;
 using System.Text;
 
-namespace AmazTool
+namespace AmazTool;
+
+internal class UpgradeApp
 {
-    internal class UpgradeApp
-    {
     public static void Upgrade(string fileName)
     {
         Console.WriteLine($"{Resx.Resource.StartUnzipping}\n{fileName}");
@@ -60,7 +60,10 @@ namespace AmazTool
 
                     var lst = entry.FullName.Split(splitKey);
                     if (lst.Length == 1)
+                    {
                         continue;
+                    }
+
                     var fullName = string.Join(splitKey, lst[1..lst.Length]);
 
                     if (string.Equals(Utils.GetExePath(), Utils.GetPath(fullName), StringComparison.OrdinalIgnoreCase))
@@ -75,7 +78,16 @@ namespace AmazTool
                     {
                         continue;
                     }
+
+                    try
+                    {
                         entry.ExtractToFile(entryOutputPath, true);
+                    }
+                    catch
+                    {
+                        Thread.Sleep(1000);
+                        entry.ExtractToFile(entryOutputPath, true);
+                    }
 
                     Console.WriteLine(entryOutputPath);
                 }
@@ -101,5 +113,4 @@ namespace AmazTool
 
         Utils.StartV2RayN();
     }
-    }
 }

v2rayN/AmazTool/Utils.cs

@@ -1,9 +1,9 @@
-using System.Diagnostics;
+using System.Diagnostics;
 
-namespace AmazTool
+namespace AmazTool;
+
+internal class Utils
 {
-    internal class Utils
-    {
     public static string GetExePath()
     {
         return Environment.ProcessPath ?? Process.GetCurrentProcess().MainModule?.FileName ?? string.Empty;
@@ -16,7 +16,7 @@ namespace AmazTool
 
     public static string GetPath(string fileName)
     {
-            string startupPath = StartupPath();
+        var startupPath = StartupPath();
         if (string.IsNullOrEmpty(fileName))
         {
             return startupPath;
@@ -48,5 +48,4 @@ namespace AmazTool
             Thread.Sleep(1000);
         }
     }
-    }
 }

v2rayN/Directory.Build.props

@@ -1,14 +1,14 @@
 <Project>
 
     <PropertyGroup>
-        <Version>7.9.3</Version>
+        <Version>7.11.2</Version>
     </PropertyGroup>
 
     <PropertyGroup>
         <TargetFramework>net8.0</TargetFramework>
         <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
         <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
-        <NoWarn>CA1031;CS1591;NU1507;CA1416</NoWarn>
+        <NoWarn>CA1031;CS1591;NU1507;CA1416;IDE0058</NoWarn>
         <Nullable>annotations</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
         <Authors>2dust</Authors>

v2rayN/Directory.Packages.props

@@ -5,25 +5,25 @@
     <CentralPackageVersionOverrideEnabled>false</CentralPackageVersionOverrideEnabled>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.2.4" />
-    <PackageVersion Include="Avalonia.Desktop" Version="11.2.4" />
-    <PackageVersion Include="Avalonia.Diagnostics" Version="11.2.4" />
-    <PackageVersion Include="Avalonia.ReactiveUI" Version="11.2.4" />
-    <PackageVersion Include="CliWrap" Version="3.8.0" />
-    <PackageVersion Include="Downloader" Version="3.3.3" />
-    <PackageVersion Include="H.NotifyIcon.Wpf" Version="2.2.0" />
+    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.2.7" />
+    <PackageVersion Include="Avalonia.Desktop" Version="11.2.7" />
+    <PackageVersion Include="Avalonia.Diagnostics" Version="11.2.7" />
+    <PackageVersion Include="Avalonia.ReactiveUI" Version="11.2.7" />
+    <PackageVersion Include="CliWrap" Version="3.8.2" />
+    <PackageVersion Include="Downloader" Version="3.3.4" />
+    <PackageVersion Include="H.NotifyIcon.Wpf" Version="2.3.0" />
     <PackageVersion Include="MaterialDesignThemes" Version="5.2.1" />
     <PackageVersion Include="MessageBox.Avalonia" Version="3.2.0" />
     <PackageVersion Include="QRCoder" Version="1.6.0" />
-    <PackageVersion Include="ReactiveUI" Version="20.1.63" />
+    <PackageVersion Include="ReactiveUI" Version="20.2.45" />
     <PackageVersion Include="ReactiveUI.Fody" Version="19.5.41" />
-    <PackageVersion Include="ReactiveUI.WPF" Version="20.1.63" />
-    <PackageVersion Include="Semi.Avalonia" Version="11.2.1.4" />
-    <PackageVersion Include="Semi.Avalonia.DataGrid" Version="11.2.1.4" />
+    <PackageVersion Include="ReactiveUI.WPF" Version="20.2.45" />
+    <PackageVersion Include="Semi.Avalonia" Version="11.2.1.6" />
+    <PackageVersion Include="Semi.Avalonia.DataGrid" Version="11.2.1.6" />
     <PackageVersion Include="Splat.NLog" Version="15.3.1" />
     <PackageVersion Include="sqlite-net-pcl" Version="1.9.172" />
-    <PackageVersion Include="TaskScheduler" Version="2.11.0" />
-    <PackageVersion Include="WebDav.Client" Version="2.8.0" />
+    <PackageVersion Include="TaskScheduler" Version="2.12.1" />
+    <PackageVersion Include="WebDav.Client" Version="2.9.0" />
     <PackageVersion Include="YamlDotNet" Version="16.3.0" />
     <PackageVersion Include="ZXing.Net.Bindings.SkiaSharp" Version="0.16.14" />
   </ItemGroup>

v2rayN/GlobalHotKeys

@@ -0,0 +1 @@
+Subproject commit ef73fa22c46cfc7d1ec192ffe8497f6e61b4f0db

v2rayN/ServiceLib/Base/MyReactiveObject.cs

@@ -1,10 +1,9 @@
-using ReactiveUI;
+using ReactiveUI;
 
-namespace ServiceLib.Base
+namespace ServiceLib.Base;
+
+public class MyReactiveObject : ReactiveObject
 {
-    public class MyReactiveObject : ReactiveObject
-    {
     protected static Config? _config;
     protected Func<EViewAction, object?, Task<bool>>? _updateView;
-    }
 }

v2rayN/ServiceLib/Common/AesUtils.cs

@@ -1,14 +1,14 @@
 using System.Security.Cryptography;
 using System.Text;
 
-namespace ServiceLib.Common
+namespace ServiceLib.Common;
+
+public class AesUtils
 {
-    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 byte[] Salt = Encoding.ASCII.GetBytes("saltysalt".PadRight(16, ' ')); 
     private static readonly string DefaultPassword = Utils.GetMd5(Utils.GetHomePath() + "AesUtils");
 
     /// <summary>
@@ -97,5 +97,4 @@ namespace ServiceLib.Common
         rng.GetBytes(randomNumber);
         return randomNumber;
     }
-    }
 }

v2rayN/ServiceLib/Common/DesUtils.cs

@@ -1,10 +1,10 @@
 using System.Security.Cryptography;
 using System.Text;
 
-namespace ServiceLib.Common
+namespace ServiceLib.Common;
+
+public class DesUtils
 {
-    public class DesUtils
-    {
     /// <summary>
     /// Encrypt
     /// </summary>
@@ -71,5 +71,4 @@ namespace ServiceLib.Common
     {
         return Utils.GetMd5(Utils.GetHomePath() + "DesUtils");
     }
-    }
 }

v2rayN/ServiceLib/Common/DownloaderHelper.cs

@@ -1,16 +1,16 @@
 using System.Net;
 using Downloader;
 
-namespace ServiceLib.Common
+namespace ServiceLib.Common;
+
+public class DownloaderHelper
 {
-    public class DownloaderHelper
-    {
     private static readonly Lazy<DownloaderHelper> _instance = new(() => new());
     public static DownloaderHelper Instance => _instance.Value;
 
     public async Task<string?> DownloadStringAsync(IWebProxy? webProxy, string url, string? userAgent, int timeout)
     {
-            if (Utils.IsNullOrEmpty(url))
+        if (url.IsNullOrEmpty())
         {
             return null;
         }
@@ -18,7 +18,7 @@ namespace ServiceLib.Common
         Uri uri = new(url);
         //Authorization Header
         var headers = new WebHeaderCollection();
-            if (Utils.IsNotEmpty(uri.UserInfo))
+        if (uri.UserInfo.IsNotEmpty())
         {
             headers.Add(HttpRequestHeader.Authorization, "Basic " + Utils.Base64Encode(uri.UserInfo));
         }
@@ -56,7 +56,7 @@ namespace ServiceLib.Common
 
     public async Task DownloadDataAsync4Speed(IWebProxy webProxy, string url, IProgress<string> progress, int timeout)
     {
-            if (Utils.IsNullOrEmpty(url))
+        if (url.IsNullOrEmpty())
         {
             throw new ArgumentNullException(nameof(url));
         }
@@ -86,7 +86,7 @@ namespace ServiceLib.Common
         //};
         downloader.DownloadProgressChanged += (sender, value) =>
         {
-                var ts = (DateTime.Now - totalDatetime);
+            var ts = DateTime.Now - totalDatetime;
             if (progress != null && ts.Seconds > totalSecond)
             {
                 hasValue = true;
@@ -119,11 +119,11 @@ namespace ServiceLib.Common
 
     public async Task DownloadFileAsync(IWebProxy? webProxy, string url, string fileName, IProgress<double> progress, int timeout)
     {
-            if (Utils.IsNullOrEmpty(url))
+        if (url.IsNullOrEmpty())
         {
             throw new ArgumentNullException(nameof(url));
         }
-            if (Utils.IsNullOrEmpty(fileName))
+        if (fileName.IsNullOrEmpty())
         {
             throw new ArgumentNullException(nameof(fileName));
         }
@@ -146,10 +146,7 @@ namespace ServiceLib.Common
         var progressPercentage = 0;
         var hasValue = false;
         await using var downloader = new Downloader.DownloadService(downloadOpt);
-            downloader.DownloadStarted += (sender, value) =>
-            {
-                progress?.Report(0);
-            };
+        downloader.DownloadStarted += (sender, value) => progress?.Report(0);
         downloader.DownloadProgressChanged += (sender, value) =>
         {
             hasValue = true;
@@ -180,5 +177,4 @@ namespace ServiceLib.Common
 
         downloadOpt = null;
     }
-    }
 }

v2rayN/ServiceLib/Common/FileManager.cs

@@ -1,11 +1,11 @@
-using System.Formats.Tar;
+using System.Formats.Tar;
 using System.IO.Compression;
 using System.Text;
 
-namespace ServiceLib.Common
+namespace ServiceLib.Common;
+
+public static class FileManager
 {
-    public static class FileManager
-    {
     private static readonly string _tag = "FileManager";
 
     public static bool ByteArrayToFile(string fileName, byte[] content)
@@ -99,7 +99,7 @@ namespace ServiceLib.Common
                 }
                 try
                 {
-                        if (Utils.IsNotEmpty(ignoredName) && entry.Name.Contains(ignoredName))
+                    if (ignoredName.IsNotEmpty() && entry.Name.Contains(ignoredName))
                     {
                         continue;
                     }
@@ -163,18 +163,20 @@ namespace ServiceLib.Common
 
         // 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);
+        _ = 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))
+            if (ignoredName.IsNotEmpty() && file.Name.Contains(ignoredName))
             {
                 continue;
             }
@@ -187,7 +189,7 @@ namespace ServiceLib.Common
             {
                 continue;
             }
-                file.CopyTo(targetFilePath, overwrite);
+            _ = file.CopyTo(targetFilePath, overwrite);
         }
 
         // If recursive and copying subdirectories, recursively call this method
@@ -221,5 +223,4 @@ namespace ServiceLib.Common
             // ignored
         }
     }
-    }
 }

v2rayN/ServiceLib/Common/HttpClientHelper.cs

@@ -2,12 +2,12 @@ using System.Net.Http.Headers;
 using System.Net.Mime;
 using System.Text;
 
-namespace ServiceLib.Common
+namespace ServiceLib.Common;
+
+/// <summary>
+/// </summary>
+public class HttpClientHelper
 {
-    /// <summary>
-    /// </summary>
-    public class HttpClientHelper
-    {
     private static readonly Lazy<HttpClientHelper> _instance = new(() =>
     {
         SocketsHttpHandler handler = new() { UseCookies = false };
@@ -18,12 +18,17 @@ namespace ServiceLib.Common
     public static HttpClientHelper Instance => _instance.Value;
     private readonly HttpClient httpClient;
 
-        private HttpClientHelper(HttpClient httpClient) => this.httpClient = httpClient;
+    private HttpClientHelper(HttpClient httpClient)
+    {
+        this.httpClient = httpClient;
+    }
 
     public async Task<string?> TryGetAsync(string url)
     {
-            if (Utils.IsNullOrEmpty(url))
+        if (url.IsNullOrEmpty())
+        {
             return null;
+        }
 
         try
         {
@@ -38,15 +43,19 @@ namespace ServiceLib.Common
 
     public async Task<string?> GetAsync(string url)
     {
-            if (Utils.IsNullOrEmpty(url))
+        if (url.IsNullOrEmpty())
+        {
             return null;
+        }
         return await httpClient.GetStringAsync(url);
     }
 
     public async Task<string?> GetAsync(HttpClient client, string url, CancellationToken token = default)
     {
-            if (Utils.IsNullOrEmpty(url))
+        if (url.IsNullOrEmpty())
+        {
             return null;
+        }
         return await client.GetStringAsync(url, token);
     }
 
@@ -55,13 +64,13 @@ namespace ServiceLib.Common
         var jsonContent = JsonUtils.Serialize(headers);
         var content = new StringContent(jsonContent, Encoding.UTF8, MediaTypeNames.Application.Json);
 
-            var result = await httpClient.PutAsync(url, content);
+        await httpClient.PutAsync(url, content);
     }
 
     public async Task PatchAsync(string url, Dictionary<string, string> headers)
     {
         var myContent = JsonUtils.Serialize(headers);
-            var buffer = System.Text.Encoding.UTF8.GetBytes(myContent);
+        var buffer = Encoding.UTF8.GetBytes(myContent);
         var byteContent = new ByteArrayContent(buffer);
         byteContent.Headers.ContentType = new MediaTypeHeaderValue("application/json");
 
@@ -78,12 +87,16 @@ namespace ServiceLib.Common
         ArgumentNullException.ThrowIfNull(url);
         ArgumentNullException.ThrowIfNull(fileName);
         if (File.Exists(fileName))
+        {
             File.Delete(fileName);
+        }
 
         using var response = await client.GetAsync(url, HttpCompletionOption.ResponseHeadersRead, token);
 
         if (!response.IsSuccessStatusCode)
+        {
             throw new Exception(response.StatusCode.ToString());
+        }
 
         var total = response.Content.Headers.ContentLength ?? -1L;
         var canReportProgress = total != -1 && progress != null;
@@ -102,7 +115,9 @@ namespace ServiceLib.Common
             totalRead += read;
 
             if (read == 0)
+            {
                 break;
+            }
             await file.WriteAsync(buffer.AsMemory(0, read), token);
 
             if (canReportProgress)
@@ -123,7 +138,7 @@ namespace ServiceLib.Common
 
     public async Task DownloadDataAsync4Speed(HttpClient client, string url, IProgress<string> progress, CancellationToken token = default)
     {
-            if (Utils.IsNullOrEmpty(url))
+        if (url.IsNullOrEmpty())
         {
             throw new ArgumentNullException(nameof(url));
         }
@@ -173,7 +188,7 @@ namespace ServiceLib.Common
 
                 totalRead += read;
 
-                    var ts = (DateTime.Now - totalDatetime);
+                var ts = DateTime.Now - totalDatetime;
                 if (progress != null && ts.Seconds > totalSecond)
                 {
                     totalSecond = ts.Seconds;
@@ -187,5 +202,4 @@ namespace ServiceLib.Common
             }
         } while (isMoreToRead);
     }
-    }
 }

v2rayN/ServiceLib/Common/Job.cs

@@ -1,8 +1,7 @@
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 
-namespace ServiceLib.Common
-{
+namespace ServiceLib.Common;
     /*
      * See:
      * http://stackoverflow.com/questions/6266820/working-example-of-createjobobject-setinformationjobobject-pinvoke-in-net
@@ -15,28 +14,30 @@ namespace ServiceLib.Common
         public Job()
         {
             handle = CreateJobObject(IntPtr.Zero, null);
-            IntPtr extendedInfoPtr = IntPtr.Zero;
-            JOBOBJECT_BASIC_LIMIT_INFORMATION info = new()
+            var extendedInfoPtr = IntPtr.Zero;
+            var info = new JOBOBJECT_BASIC_LIMIT_INFORMATION
             {
                 LimitFlags = 0x2000
             };
 
-            JOBOBJECT_EXTENDED_LIMIT_INFORMATION extendedInfo = new()
+            var extendedInfo = new JOBOBJECT_EXTENDED_LIMIT_INFORMATION
             {
                 BasicLimitInformation = info
             };
 
             try
             {
-                int length = Marshal.SizeOf(typeof(JOBOBJECT_EXTENDED_LIMIT_INFORMATION));
+                var length = Marshal.SizeOf(typeof(JOBOBJECT_EXTENDED_LIMIT_INFORMATION));
                 extendedInfoPtr = Marshal.AllocHGlobal(length);
                 Marshal.StructureToPtr(extendedInfo, extendedInfoPtr, false);
 
                 if (!SetInformationJobObject(handle, JobObjectInfoType.ExtendedLimitInformation, extendedInfoPtr,
                         (uint)length))
+                {
                     throw new Exception(string.Format("Unable to set information.  Error: {0}",
                         Marshal.GetLastWin32Error()));
                 }
+            }
             finally
             {
                 if (extendedInfoPtr != IntPtr.Zero)
@@ -48,7 +49,7 @@ namespace ServiceLib.Common
 
         public bool AddProcess(IntPtr processHandle)
         {
-            bool succ = AssignProcessToJobObject(handle, processHandle);
+            var succ = AssignProcessToJobObject(handle, processHandle);
 
             if (!succ)
             {
@@ -76,7 +77,9 @@ namespace ServiceLib.Common
         private void Dispose(bool disposing)
         {
             if (disposed)
+            {
                 return;
+            }
             disposed = true;
 
             if (disposing)
@@ -104,7 +107,7 @@ namespace ServiceLib.Common
         private static extern IntPtr CreateJobObject(IntPtr a, string? lpName);
 
         [DllImport("kernel32.dll", SetLastError = true)]
-        private static extern bool SetInformationJobObject(IntPtr hJob, JobObjectInfoType infoType, IntPtr lpJobObjectInfo, UInt32 cbJobObjectInfoLength);
+        private static extern bool SetInformationJobObject(IntPtr hJob, JobObjectInfoType infoType, IntPtr lpJobObjectInfo, uint cbJobObjectInfoLength);
 
         [DllImport("kernel32.dll", SetLastError = true)]
         private static extern bool AssignProcessToJobObject(IntPtr job, IntPtr process);
@@ -121,34 +124,34 @@ namespace ServiceLib.Common
     [StructLayout(LayoutKind.Sequential)]
     internal struct IO_COUNTERS
     {
-        public UInt64 ReadOperationCount;
-        public UInt64 WriteOperationCount;
-        public UInt64 OtherOperationCount;
-        public UInt64 ReadTransferCount;
-        public UInt64 WriteTransferCount;
-        public UInt64 OtherTransferCount;
+        public ulong ReadOperationCount;
+        public ulong WriteOperationCount;
+        public ulong OtherOperationCount;
+        public ulong ReadTransferCount;
+        public ulong WriteTransferCount;
+        public ulong OtherTransferCount;
     }
 
     [StructLayout(LayoutKind.Sequential)]
     internal struct JOBOBJECT_BASIC_LIMIT_INFORMATION
     {
-        public Int64 PerProcessUserTimeLimit;
-        public Int64 PerJobUserTimeLimit;
-        public UInt32 LimitFlags;
+        public long PerProcessUserTimeLimit;
+        public long PerJobUserTimeLimit;
+        public uint LimitFlags;
         public UIntPtr MinimumWorkingSetSize;
         public UIntPtr MaximumWorkingSetSize;
-        public UInt32 ActiveProcessLimit;
+        public uint ActiveProcessLimit;
         public UIntPtr Affinity;
-        public UInt32 PriorityClass;
-        public UInt32 SchedulingClass;
+        public uint PriorityClass;
+        public uint SchedulingClass;
     }
 
     [StructLayout(LayoutKind.Sequential)]
     public struct SECURITY_ATTRIBUTES
     {
-        public UInt32 nLength;
+        public uint nLength;
         public IntPtr lpSecurityDescriptor;
-        public Int32 bInheritHandle;
+        public int bInheritHandle;
     }
 
     [StructLayout(LayoutKind.Sequential)]
@@ -174,4 +177,4 @@ namespace ServiceLib.Common
     }
 
     #endregion Helper classes
-}
+

v2rayN/ServiceLib/Common/JsonUtils.cs

@@ -1,11 +1,12 @@
-using System.Text.Json;
+using System.Text.Encodings.Web;
+using System.Text.Json;
 using System.Text.Json.Nodes;
 using System.Text.Json.Serialization;
 
-namespace ServiceLib.Common
+namespace ServiceLib.Common;
+
+public class JsonUtils
 {
-    public class JsonUtils
-    {
     private static readonly string _tag = "JsonUtils";
 
     /// <summary>
@@ -86,7 +87,8 @@ namespace ServiceLib.Common
             var options = new JsonSerializerOptions
             {
                 WriteIndented = indented,
-                    DefaultIgnoreCondition = nullValue ? JsonIgnoreCondition.Never : JsonIgnoreCondition.WhenWritingNull
+                DefaultIgnoreCondition = nullValue ? JsonIgnoreCondition.Never : JsonIgnoreCondition.WhenWritingNull,
+                Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping
             };
             result = JsonSerializer.Serialize(obj, options);
         }
@@ -127,5 +129,4 @@ namespace ServiceLib.Common
     /// <param name="obj"></param>
     /// <returns></returns>
     public static JsonNode? SerializeToNode(object? obj) => JsonSerializer.SerializeToNode(obj);
-    }
 }

v2rayN/ServiceLib/Common/Logging.cs

@@ -2,10 +2,13 @@ using NLog;
 using NLog.Config;
 using NLog.Targets;
 
-namespace ServiceLib.Common
+namespace ServiceLib.Common;
+
+public class Logging
 {
-    public class Logging
-    {
+    private static readonly Logger _logger1 = LogManager.GetLogger("Log1");
+    private static readonly Logger _logger2 = LogManager.GetLogger("Log2");
+
     public static void Setup()
     {
         LoggingConfiguration config = new();
@@ -28,23 +31,25 @@ namespace ServiceLib.Common
     public static void SaveLog(string strContent)
     {
         if (!LogManager.IsLoggingEnabled())
+        {
             return;
+        }
 
-            LogManager.GetLogger("Log1").Info(strContent);
+        _logger1.Info(strContent);
     }
 
     public static void SaveLog(string strTitle, Exception ex)
     {
         if (!LogManager.IsLoggingEnabled())
+        {
             return;
+        }
 
-            var logger = LogManager.GetLogger("Log2");
-            logger.Debug($"{strTitle},{ex.Message}");
-            logger.Debug(ex.StackTrace);
+        _logger2.Debug($"{strTitle},{ex.Message}");
+        _logger2.Debug(ex.StackTrace);
         if (ex?.InnerException != null)
         {
-                logger.Error(ex.InnerException);
-            }
+            _logger2.Error(ex.InnerException);
         }
     }
 }

v2rayN/ServiceLib/Common/ProcUtils.cs

@@ -8,7 +8,7 @@ public static class ProcUtils
 
     public static void ProcessStart(string? fileName, string arguments = "")
     {
-        ProcessStart(fileName, arguments, null);
+        _ = ProcessStart(fileName, arguments, null);
     }
 
     public static int? ProcessStart(string? fileName, string arguments, string? dir)
@@ -20,9 +20,13 @@ public static class ProcUtils
         try
         {
             if (fileName.Contains(' '))
+            {
                 fileName = fileName.AppendQuotes();
+            }
             if (arguments.Contains(' '))
+            {
                 arguments = arguments.AppendQuotes();
+            }
 
             Process proc = new()
             {
@@ -34,7 +38,7 @@ public static class ProcUtils
                     WorkingDirectory = dir ?? string.Empty
                 }
             };
-            proc.Start();
+            _ = proc.Start();
             return dir is null ? null : proc.Id;
         }
         catch (Exception ex)
@@ -56,7 +60,7 @@ public static class ProcUtils
                 FileName = Utils.GetExePath().AppendQuotes(),
                 Verb = blAdmin ? "runas" : null,
             };
-            Process.Start(startInfo);
+            _ = Process.Start(startInfo);
         }
         catch (Exception ex)
         {
@@ -134,7 +138,9 @@ public static class ProcUtils
         fileName = null;
         processName = null;
         if (!review)
+        {
             return;
+        }
         try
         {
             procId = proc?.Id;

v2rayN/ServiceLib/Common/QRCodeHelper.cs

@@ -1,11 +1,11 @@
-using QRCoder;
+using QRCoder;
 using SkiaSharp;
 using ZXing.SkiaSharp;
 
-namespace ServiceLib.Common
+namespace ServiceLib.Common;
+
+public class QRCodeHelper
 {
-    public class QRCodeHelper
-    {
     public static byte[]? GenQRCode(string? url)
     {
         using QRCodeGenerator qrGenerator = new();
@@ -60,7 +60,7 @@ namespace ServiceLib.Common
         var reader = new BarcodeReader();
         var result = reader.Decode(bitmap);
 
-            if (result != null && Utils.IsNotEmpty(result.Text))
+        if (result != null && result.Text.IsNotEmpty())
         {
             return result.Text;
         }
@@ -86,5 +86,4 @@ namespace ServiceLib.Common
         canvas.DrawBitmap(bmp, 0, 0);
         return flipped;
     }
-    }
 }

v2rayN/ServiceLib/Common/SemanticVersion.cs

@@ -1,29 +1,29 @@
-namespace ServiceLib.Common
+namespace ServiceLib.Common;
+
+public class SemanticVersion
 {
-    public class SemanticVersion
-    {
-        private int major;
-        private int minor;
-        private int patch;
-        private string version;
+    private readonly int major;
+    private readonly int minor;
+    private readonly int patch;
+    private readonly string version;
 
     public SemanticVersion(int major, int minor, int patch)
     {
         this.major = major;
         this.minor = minor;
         this.patch = patch;
-            this.version = $"{major}.{minor}.{patch}";
+        version = $"{major}.{minor}.{patch}";
     }
 
     public SemanticVersion(string? version)
     {
         try
         {
-                if (version.IsNullOrEmpty())
+            if (string.IsNullOrEmpty(version))
             {
-                    this.major = 0;
-                    this.minor = 0;
-                    this.patch = 0;
+                major = 0;
+                minor = 0;
+                patch = 0;
                 return;
             }
             this.version = version.RemovePrefix('v');
@@ -31,15 +31,15 @@
             var parts = this.version.Split('.');
             if (parts.Length == 2)
             {
-                    this.major = int.Parse(parts.First());
-                    this.minor = int.Parse(parts.Last());
-                    this.patch = 0;
+                major = int.Parse(parts.First());
+                minor = int.Parse(parts.Last());
+                patch = 0;
             }
             else if (parts.Length is 3 or 4)
             {
-                    this.major = int.Parse(parts[0]);
-                    this.minor = int.Parse(parts[1]);
-                    this.patch = int.Parse(parts[2]);
+                major = int.Parse(parts[0]);
+                minor = int.Parse(parts[1]);
+                patch = int.Parse(parts[2]);
             }
             else
             {
@@ -48,9 +48,9 @@
         }
         catch
         {
-                this.major = 0;
-                this.minor = 0;
-                this.patch = 0;
+            major = 0;
+            minor = 0;
+            patch = 0;
         }
     }
 
@@ -58,7 +58,7 @@
     {
         if (obj is SemanticVersion other)
         {
-                return this.major == other.major && this.minor == other.minor && this.patch == other.patch;
+            return major == other.major && minor == other.minor && patch == other.patch;
         }
         else
         {
@@ -68,7 +68,7 @@
 
     public override int GetHashCode()
     {
-            return this.major.GetHashCode() ^ this.minor.GetHashCode() ^ this.patch.GetHashCode();
+        return major.GetHashCode() ^ minor.GetHashCode() ^ patch.GetHashCode();
     }
 
     /// <summary>
@@ -77,18 +77,18 @@
     /// <returns>major.minor.patch</returns>
     public override string ToString()
     {
-            return this.version;
+        return version;
     }
 
     public string ToVersionString(string? prefix = null)
     {
         if (prefix == null)
         {
-                return this.version;
+            return version;
         }
         else
         {
-                return $"{prefix}{this.version}";
+            return $"{prefix}{version}";
         }
     }
 
@@ -108,31 +108,31 @@
 
     private bool GreaterEquals(SemanticVersion other)
     {
-            if (this.major < other.major)
+        if (major < other.major)
         {
             return false;
         }
-            else if (this.major > other.major)
+        else if (major > other.major)
         {
             return true;
         }
         else
         {
-                if (this.minor < other.minor)
+            if (minor < other.minor)
             {
                 return false;
             }
-                else if (this.minor > other.minor)
+            else if (minor > other.minor)
             {
                 return true;
             }
             else
             {
-                    if (this.patch < other.patch)
+                if (patch < other.patch)
                 {
                     return false;
                 }
-                    else if (this.patch > other.patch)
+                else if (patch > other.patch)
                 {
                     return true;
                 }
@@ -146,31 +146,31 @@
 
     private bool LessEquals(SemanticVersion other)
     {
-            if (this.major < other.major)
+        if (major < other.major)
         {
             return true;
         }
-            else if (this.major > other.major)
+        else if (major > other.major)
         {
             return false;
         }
         else
         {
-                if (this.minor < other.minor)
+            if (minor < other.minor)
             {
                 return true;
             }
-                else if (this.minor > other.minor)
+            else if (minor > other.minor)
             {
                 return false;
             }
             else
             {
-                    if (this.patch < other.patch)
+                if (patch < other.patch)
                 {
                     return true;
                 }
-                    else if (this.patch > other.patch)
+                else if (patch > other.patch)
                 {
                     return false;
                 }
@@ -183,5 +183,4 @@
     }
 
     #endregion Private
-    }
 }

v2rayN/ServiceLib/Common/SqliteHelper.cs

@@ -1,13 +1,13 @@
 using System.Collections;
 using SQLite;
 
-namespace ServiceLib.Common
+namespace ServiceLib.Common;
+
+public sealed class SQLiteHelper
 {
-    public sealed class SQLiteHelper
-    {
     private static readonly Lazy<SQLiteHelper> _instance = new(() => new());
     public static SQLiteHelper Instance => _instance.Value;
-        private string _connstr;
+    private readonly string _connstr;
     private SQLiteConnection _db;
     private SQLiteAsyncConnection _dbAsync;
     private readonly string _configDB = "guiNDB.db";
@@ -87,5 +87,4 @@ namespace ServiceLib.Common
             _dbAsync = null;
         });
     }
-    }
 }

v2rayN/ServiceLib/Common/StringEx.cs

@@ -1,12 +1,12 @@
 using System.Diagnostics.CodeAnalysis;
 
-namespace ServiceLib.Common
+namespace ServiceLib.Common;
+
+public static class StringEx
 {
-    public static class StringEx
-    {
     public static bool IsNullOrEmpty([NotNullWhen(false)] this string? value)
     {
-            return string.IsNullOrEmpty(value);
+        return string.IsNullOrEmpty(value) || string.IsNullOrWhiteSpace(value);
     }
 
     public static bool IsNullOrWhiteSpace([NotNullWhen(false)] this string? value)
@@ -22,7 +22,9 @@ namespace ServiceLib.Common
     public static bool BeginWithAny(this string s, IEnumerable<char> chars)
     {
         if (s.IsNullOrEmpty())
+        {
             return false;
+        }
         return chars.Contains(s.First());
     }
 
@@ -36,7 +38,9 @@ namespace ServiceLib.Common
         while (reader.ReadLine() is { } line)
         {
             if (line.IsWhiteSpace())
+            {
                 continue;
+            }
             yield return line;
         }
     }
@@ -70,5 +74,9 @@ namespace ServiceLib.Common
     {
         return string.IsNullOrEmpty(value) ? string.Empty : $"\"{value}\"";
     }
+
+    public static int ToInt(this string? value, int defaultValue = 0)
+    {
+        return int.TryParse(value, out var result) ? result : defaultValue;
     }
 }

v2rayN/ServiceLib/Common/Utils.cs

@@ -11,94 +11,78 @@ using System.Text;
 using CliWrap;
 using CliWrap.Buffered;
 
-namespace ServiceLib.Common
+namespace ServiceLib.Common;
+
+public class Utils
 {
-    public class Utils
-    {
     private static readonly string _tag = "Utils";
 
     #region 转换函数
 
     /// <summary>
-        /// 转逗号分隔的字符串
+    /// Convert to comma-separated string
     /// </summary>
     /// <param name="lst"></param>
     /// <param name="wrap"></param>
     /// <returns></returns>
     public static string List2String(List<string>? lst, bool wrap = false)
     {
-            try
-            {
-                if (lst == null)
+        if (lst == null || lst.Count == 0)
         {
             return string.Empty;
         }
-                if (wrap)
+
+        var separator = wrap ? "," + Environment.NewLine : ",";
+
+        try
         {
-                    return string.Join("," + Environment.NewLine, lst);
-                }
-                else
-                {
-                    return string.Join(",", lst);
-                }
+            return string.Join(separator, lst);
         }
         catch (Exception ex)
         {
             Logging.SaveLog(_tag, ex);
-            }
-
             return string.Empty;
         }
+    }
 
     /// <summary>
-        /// 逗号分隔的字符串
+    /// Comma-separated string
     /// </summary>
     /// <param name="str"></param>
     /// <returns></returns>
     public static List<string>? String2List(string? str)
     {
-            try
-            {
-                if (str == null)
+        if (string.IsNullOrWhiteSpace(str))
         {
             return null;
         }
 
-                str = str.Replace(Environment.NewLine, "");
+        try
+        {
+            str = str.Replace(Environment.NewLine, string.Empty);
             return new List<string>(str.Split(',', StringSplitOptions.RemoveEmptyEntries));
         }
         catch (Exception ex)
         {
             Logging.SaveLog(_tag, ex);
-            }
-
             return null;
         }
+    }
 
     /// <summary>
-        /// 逗号分隔的字符串,先排序后转List
+    /// Comma-separated string, sorted and then converted to List
     /// </summary>
     /// <param name="str"></param>
     /// <returns></returns>
     public static List<string>? String2ListSorted(string str)
     {
-            try
-            {
-                str = str.Replace(Environment.NewLine, "");
-                List<string> list = new(str.Split(',', StringSplitOptions.RemoveEmptyEntries));
-                list.Sort();
-                return list;
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(_tag, ex);
-            }
-
-            return null;
+        var lst = String2List(str);
+        lst?.Sort();
+        return lst;
     }
 
     /// <summary>
-        /// Base64编码
+    /// Base64 Encode
     /// </summary>
     /// <param name="plainText"></param>
     /// <returns></returns>
@@ -118,7 +102,7 @@ namespace ServiceLib.Common
     }
 
     /// <summary>
-        /// Base64解码
+    /// Base64 Decode
     /// </summary>
     /// <param name="plainText"></param>
     /// <returns></returns>
@@ -127,7 +111,10 @@ namespace ServiceLib.Common
         try
         {
             if (plainText.IsNullOrEmpty())
+            {
                 return "";
+            }
+
             plainText = plainText.Trim()
                 .Replace(Environment.NewLine, "")
                 .Replace("\n", "")
@@ -152,18 +139,6 @@ namespace ServiceLib.Common
         return string.Empty;
     }
 
-        public static int ToInt(object? obj)
-        {
-            try
-            {
-                return Convert.ToInt32(obj ?? string.Empty);
-            }
-            catch
-            {
-                return 0;
-            }
-        }
-
     public static bool ToBool(object obj)
     {
         try
@@ -188,55 +163,25 @@ namespace ServiceLib.Common
         }
     }
 
-        private static void ToHumanReadable(long amount, out double result, out string unit)
-        {
-            var factor = 1024u;
-            //long KBs = amount / factor;
-            var KBs = amount;
-            if (KBs > 0)
-            {
-                // multi KB
-                var MBs = KBs / factor;
-                if (MBs > 0)
-                {
-                    // multi MB
-                    var GBs = MBs / factor;
-                    if (GBs > 0)
-                    {
-                        // multi GB
-                        var TBs = GBs / factor;
-                        if (TBs > 0)
-                        {
-                            result = TBs + ((GBs % factor) / (factor + 0.0));
-                            unit = "TB";
-                            return;
-                        }
-
-                        result = GBs + ((MBs % factor) / (factor + 0.0));
-                        unit = "GB";
-                        return;
-                    }
-
-                    result = MBs + ((KBs % factor) / (factor + 0.0));
-                    unit = "MB";
-                    return;
-                }
-
-                result = KBs + ((amount % factor) / (factor + 0.0));
-                unit = "KB";
-                return;
-            }
-            else
-            {
-                result = amount;
-                unit = "B";
-            }
-        }
-
     public static string HumanFy(long amount)
     {
-            ToHumanReadable(amount, out var result, out var unit);
-            return $"{result:f1} {unit}";
+        if (amount <= 0)
+        {
+            return $"{amount:f1} B";
+        }
+
+        string[] units = ["KB", "MB", "GB", "TB", "PB"];
+        var unitIndex = 0;
+        double size = amount;
+
+        // Loop and divide by 1024 until a suitable unit is found
+        while (size >= 1024 && unitIndex < units.Length - 1)
+        {
+            size /= 1024;
+            unitIndex++;
+        }
+
+        return $"{size:f1} {units[unitIndex]}";
     }
 
     public static string UrlEncode(string url)
@@ -252,7 +197,7 @@ namespace ServiceLib.Common
     public static NameValueCollection ParseQueryString(string query)
     {
         var result = new NameValueCollection(StringComparer.OrdinalIgnoreCase);
-            if (IsNullOrEmpty(query))
+        if (query.IsNullOrEmpty())
         {
             return result;
         }
@@ -279,6 +224,13 @@ namespace ServiceLib.Common
     }
 
     public static string GetMd5(string str)
+    {
+        if (string.IsNullOrEmpty(str))
+        {
+            return string.Empty;
+        }
+
+        try
         {
             var byteOld = Encoding.UTF8.GetBytes(str);
             var byteNew = MD5.HashData(byteOld);
@@ -290,6 +242,38 @@ namespace ServiceLib.Common
 
             return sb.ToString();
         }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+            return string.Empty;
+        }
+    }
+
+    public static string GetFileHash(string filePath)
+    {
+        if (string.IsNullOrEmpty(filePath))
+        {
+            return string.Empty;
+        }
+
+        if (!File.Exists(filePath))
+        {
+            return string.Empty;
+        }
+
+        try
+        {
+            using var md5 = MD5.Create();
+            using var stream = File.OpenRead(filePath);
+            var hash = md5.ComputeHash(stream);
+            return BitConverter.ToString(hash).Replace("-", "").ToLowerInvariant();
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+            return string.Empty;
+        }
+    }
 
     /// <summary>
     /// idn to idc
@@ -298,7 +282,7 @@ namespace ServiceLib.Common
     /// <returns></returns>
     public static string GetPunycode(string url)
     {
-            if (Utils.IsNullOrEmpty(url))
+        if (url.IsNullOrEmpty())
         {
             return url;
         }
@@ -331,7 +315,7 @@ namespace ServiceLib.Common
 
     public static string Convert2Comma(string text)
     {
-            if (IsNullOrEmpty(text))
+        if (text.IsNullOrEmpty())
         {
             return text;
         }
@@ -344,7 +328,7 @@ namespace ServiceLib.Common
     #region 数据检查
 
     /// <summary>
-        /// 判断输入的是否是数字
+    /// Determine if the input is a number
     /// </summary>
     /// <param name="oText"></param>
     /// <returns></returns>
@@ -353,28 +337,13 @@ namespace ServiceLib.Common
         return oText.All(char.IsNumber);
     }
 
-        public static bool IsNullOrEmpty(string? text)
-        {
-            if (string.IsNullOrWhiteSpace(text))
-            {
-                return true;
-            }
-
-            return text == "null";
-        }
-
-        public static bool IsNotEmpty(string? text)
-        {
-            return !string.IsNullOrEmpty(text);
-        }
-
     /// <summary>
-        /// 验证Domain地址是否合法
+    /// Validate if the domain address is valid
     /// </summary>
     /// <param name="domain"></param>
     public static bool IsDomain(string? domain)
     {
-            if (IsNullOrEmpty(domain))
+        if (domain.IsNullOrEmpty())
         {
             return false;
         }
@@ -491,7 +460,7 @@ namespace ServiceLib.Common
     }
 
     /// <summary>
-        /// 取得版本
+    /// Get version
     /// </summary>
     /// <returns></returns>
     public static string GetVersion(bool blFull = true)
@@ -529,7 +498,7 @@ namespace ServiceLib.Common
     }
 
     /// <summary>
-        /// 取得GUID
+    /// GUID
     /// </summary>
     /// <returns></returns>
     public static string GetGuid(bool full = true)
@@ -634,13 +603,20 @@ namespace ServiceLib.Common
     {
         try
         {
+            var basePath = GetBaseDirectory();
             //When this file exists, it is equivalent to having no permission to read and write
-                if (File.Exists(Path.Combine(GetBaseDirectory(), "NotStoreConfigHere.txt")))
+            if (File.Exists(Path.Combine(basePath, "NotStoreConfigHere.txt")))
             {
                 return false;
             }
 
-                var tempPath = Path.Combine(GetBaseDirectory(), "guiTemps");
+            //Check if it is installed by Windows WinGet
+            if (IsWindows() && basePath.Contains("Users") && basePath.Contains("WinGet"))
+            {
+                return false;
+            }
+
+            var tempPath = Path.Combine(basePath, "guiTemps");
             if (!Directory.Exists(tempPath))
             {
                 Directory.CreateDirectory(tempPath);
@@ -660,7 +636,7 @@ namespace ServiceLib.Common
     public static string GetPath(string fileName)
     {
         var startupPath = StartupPath();
-            if (IsNullOrEmpty(fileName))
+        if (fileName.IsNullOrEmpty())
         {
             return startupPath;
         }
@@ -696,7 +672,7 @@ namespace ServiceLib.Common
             Directory.CreateDirectory(tempPath);
         }
 
-            if (IsNullOrEmpty(filename))
+        if (filename.IsNullOrEmpty())
         {
             return tempPath;
         }
@@ -725,7 +701,7 @@ namespace ServiceLib.Common
             Directory.CreateDirectory(tempPath);
         }
 
-            if (Utils.IsNullOrEmpty(filename))
+        if (filename.IsNullOrEmpty())
         {
             return tempPath;
         }
@@ -752,7 +728,7 @@ namespace ServiceLib.Common
             }
         }
 
-            if (IsNullOrEmpty(filename))
+        if (filename.IsNullOrEmpty())
         {
             return tempPath;
         }
@@ -770,7 +746,7 @@ namespace ServiceLib.Common
             Directory.CreateDirectory(tempPath);
         }
 
-            if (Utils.IsNullOrEmpty(filename))
+        if (filename.IsNullOrEmpty())
         {
             return tempPath;
         }
@@ -788,7 +764,7 @@ namespace ServiceLib.Common
             Directory.CreateDirectory(tempPath);
         }
 
-            if (Utils.IsNullOrEmpty(filename))
+        if (filename.IsNullOrEmpty())
         {
             return tempPath;
         }
@@ -806,7 +782,7 @@ namespace ServiceLib.Common
             Directory.CreateDirectory(tempPath);
         }
 
-            if (Utils.IsNullOrEmpty(filename))
+        if (filename.IsNullOrEmpty())
         {
             return tempPath;
         }
@@ -857,7 +833,7 @@ namespace ServiceLib.Common
     private static async Task<string?> GetLinuxUserId()
     {
         var arg = new List<string>() { "-c", "id -u" };
-            return await GetCliWrapOutput("/bin/bash", arg);
+        return await GetCliWrapOutput(Global.LinuxBash, arg);
     }
 
     public static async Task<string?> SetLinuxChmod(string? fileName)
@@ -868,14 +844,14 @@ namespace ServiceLib.Common
             fileName = fileName.AppendQuotes();
         //File.SetUnixFileMode(fileName, UnixFileMode.UserRead | UnixFileMode.UserWrite | UnixFileMode.UserExecute);
         var arg = new List<string>() { "-c", $"chmod +x {fileName}" };
-            return await GetCliWrapOutput("/bin/bash", arg);
+        return await GetCliWrapOutput(Global.LinuxBash, arg);
     }
 
     public static async Task<string?> GetLinuxFontFamily(string lang)
     {
         // var arg = new List<string>() { "-c", $"fc-list :lang={lang} family" };
         var arg = new List<string>() { "-c", $"fc-list : family" };
-            return await GetCliWrapOutput("/bin/bash", arg);
+        return await GetCliWrapOutput(Global.LinuxBash, arg);
     }
 
     public static string? GetHomePath()
@@ -885,12 +861,5 @@ namespace ServiceLib.Common
             : Environment.GetEnvironmentVariable("HOME");
     }
 
-        public static async Task<string?> GetListNetworkServices()
-        {
-            var arg = new List<string>() { "-c", $"networksetup -listallnetworkservices" };
-            return await GetCliWrapOutput("/bin/bash", arg);
-        }
-
     #endregion Platform
-    }
 }

v2rayN/ServiceLib/Common/WindowsUtils.cs

@@ -2,10 +2,10 @@ using System.Security.Cryptography;
 using System.Text;
 using Microsoft.Win32;
 
-namespace ServiceLib.Common
+namespace ServiceLib.Common;
+
+internal static class WindowsUtils
 {
-    internal static class WindowsUtils
-    {
     private static readonly string _tag = "WindowsUtils";
 
     public static string? RegReadValue(string path, string name, string def)
@@ -15,7 +15,7 @@ namespace ServiceLib.Common
         {
             regKey = Registry.CurrentUser.OpenSubKey(path, false);
             var value = regKey?.GetValue(name) as string;
-                return Utils.IsNullOrEmpty(value) ? def : value;
+            return value.IsNullOrEmpty() ? def : value;
         }
         catch (Exception ex)
         {
@@ -34,7 +34,7 @@ namespace ServiceLib.Common
         try
         {
             regKey = Registry.CurrentUser.CreateSubKey(path);
-                if (Utils.IsNullOrEmpty(value.ToString()))
+            if (value.ToString().IsNullOrEmpty())
             {
                 regKey?.DeleteValue(name, false);
             }
@@ -63,12 +63,11 @@ namespace ServiceLib.Common
             var arg = $$""" /remove-device  "SWD\Wintun\{{{guid}}}" """;
 
             // Try to remove the device
-                await Utils.GetCliWrapOutput(pnpUtilPath, arg);
+            _ = await Utils.GetCliWrapOutput(pnpUtilPath, arg);
         }
         catch (Exception ex)
         {
             Logging.SaveLog(_tag, ex);
         }
     }
-    }
 }

v2rayN/ServiceLib/Common/YamlUtils.cs

@@ -1,17 +1,17 @@
-using YamlDotNet.Core;
+using YamlDotNet.Core;
 using YamlDotNet.Serialization;
 using YamlDotNet.Serialization.NamingConventions;
 
-namespace ServiceLib.Common
+namespace ServiceLib.Common;
+
+public class YamlUtils
 {
-    public class YamlUtils
-    {
     private static readonly string _tag = "YamlUtils";
 
     #region YAML
 
     /// <summary>
-        /// 反序列化成对象
+    /// Deserialize
     /// </summary>
     /// <typeparam name="T"></typeparam>
     /// <param name="str"></param>
@@ -34,7 +34,7 @@ namespace ServiceLib.Common
     }
 
     /// <summary>
-        /// 序列化
+    /// Serialize
     /// </summary>
     /// <param name="obj"></param>
     /// <returns></returns>
@@ -62,9 +62,6 @@ namespace ServiceLib.Common
 
     public static string? PreprocessYaml(string str)
     {
-            var deserializer = new DeserializerBuilder()
-                .WithNamingConvention(PascalCaseNamingConvention.Instance)
-                .Build();
         try
         {
             var mergingParser = new MergingParser(new Parser(new StringReader(str)));
@@ -79,5 +76,4 @@ namespace ServiceLib.Common
     }
 
     #endregion YAML
-    }
 }

v2rayN/ServiceLib/Enums/EConfigType.cs

@@ -1,7 +1,7 @@
-namespace ServiceLib.Enums
+namespace ServiceLib.Enums;
+
+public enum EConfigType
 {
-    public enum EConfigType
-    {
     VMess = 1,
     Custom = 2,
     Shadowsocks = 3,
@@ -12,5 +12,4 @@
     TUIC = 8,
     WireGuard = 9,
     HTTP = 10
-    }
 }

v2rayN/ServiceLib/Enums/ECoreType.cs

@@ -1,7 +1,7 @@
-namespace ServiceLib.Enums
+namespace ServiceLib.Enums;
+
+public enum ECoreType
 {
-    public enum ECoreType
-    {
     v2fly = 1,
     Xray = 2,
     v2fly_v5 = 4,
@@ -15,5 +15,4 @@ namespace ServiceLib.Enums
     brook = 27,
     overtls = 28,
     v2rayN = 99
-    }
 }

v2rayN/ServiceLib/Enums/EGirdOrientation.cs

@@ -1,9 +1,8 @@
-namespace ServiceLib.Enums
+namespace ServiceLib.Enums;
+
+public enum EGirdOrientation
 {
-    public enum EGirdOrientation
-    {
     Horizontal,
     Vertical,
     Tab,
-    }
 }

v2rayN/ServiceLib/Enums/EGlobalHotkey.cs

@@ -1,11 +1,10 @@
-namespace ServiceLib.Enums
+namespace ServiceLib.Enums;
+
+public enum EGlobalHotkey
 {
-    public enum EGlobalHotkey
-    {
     ShowForm = 0,
     SystemProxyClear = 1,
     SystemProxySet = 2,
     SystemProxyUnchanged = 3,
     SystemProxyPac = 4,
-    }
 }

v2rayN/ServiceLib/Enums/EInboundProtocol.cs

@@ -1,7 +1,7 @@
-namespace ServiceLib.Enums
+namespace ServiceLib.Enums;
+
+public enum EInboundProtocol
 {
-    public enum EInboundProtocol
-    {
     socks = 0,
     socks2,
     socks3,
@@ -10,5 +10,4 @@
     api2,
     mixed,
     speedtest = 21
-    }
 }

v2rayN/ServiceLib/Enums/EMove.cs

@@ -1,11 +1,10 @@
-namespace ServiceLib.Enums
+namespace ServiceLib.Enums;
+
+public enum EMove
 {
-    public enum EMove
-    {
     Top = 1,
     Up = 2,
     Down = 3,
     Bottom = 4,
     Position = 5
-    }
 }

v2rayN/ServiceLib/Enums/EMsgCommand.cs

@@ -1,11 +1,10 @@
-namespace ServiceLib.Enums
+namespace ServiceLib.Enums;
+
+public enum EMsgCommand
 {
-    public enum EMsgCommand
-    {
     ClearMsg,
     SendMsgView,
     SendSnackMsg,
     RefreshProfiles,
     AppExit
-    }
 }

v2rayN/ServiceLib/Enums/EMultipleLoad.cs

@@ -0,0 +1,9 @@
+namespace ServiceLib.Enums;
+
+public enum EMultipleLoad
+{
+    Random,
+    RoundRobin,
+    LeastPing,
+    LeastLoad
+}

v2rayN/ServiceLib/Enums/EPresetType.cs

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

v2rayN/ServiceLib/Enums/ERuleMode.cs

@@ -1,10 +1,9 @@
-namespace ServiceLib.Enums
+namespace ServiceLib.Enums;
+
+public enum ERuleMode
 {
-    public enum ERuleMode
-    {
     Rule = 0,
     Global = 1,
     Direct = 2,
     Unchanged = 3
-    }
 }

v2rayN/ServiceLib/Enums/EServerColName.cs

@@ -1,7 +1,7 @@
-namespace ServiceLib.Enums
+namespace ServiceLib.Enums;
+
+public enum EServerColName
 {
-    public enum EServerColName
-    {
     Def = 0,
     ConfigType,
     Remarks,
@@ -17,5 +17,4 @@
     TodayUp,
     TotalDown,
     TotalUp
-    }
 }

v2rayN/ServiceLib/Enums/ESpeedActionType.cs

@@ -1,10 +1,9 @@
-namespace ServiceLib.Enums
+namespace ServiceLib.Enums;
+
+public enum ESpeedActionType
 {
-    public enum ESpeedActionType
-    {
     Tcping,
     Realping,
     Speedtest,
     Mixedtest
-    }
 }

v2rayN/ServiceLib/Enums/ESysProxyType.cs

@@ -1,10 +1,9 @@
-namespace ServiceLib.Enums
+namespace ServiceLib.Enums;
+
+public enum ESysProxyType
 {
-    public enum ESysProxyType
-    {
     ForcedClear = 0,
     ForcedChange = 1,
     Unchanged = 2,
     Pac = 3
-    }
 }

v2rayN/ServiceLib/Enums/ETheme.cs

@@ -1,7 +1,7 @@
-namespace ServiceLib.Enums
+namespace ServiceLib.Enums;
+
+public enum ETheme
 {
-    public enum ETheme
-    {
     FollowSystem,
     Dark,
     Light,
@@ -9,5 +9,4 @@
     Desert,
     Dusk,
     NightSky
-    }
 }

v2rayN/ServiceLib/Enums/ETransport.cs

@@ -1,7 +1,7 @@
-namespace ServiceLib.Enums
+namespace ServiceLib.Enums;
+
+public enum ETransport
 {
-    public enum ETransport
-    {
     tcp,
     kcp,
     ws,
@@ -11,5 +11,4 @@
     http,
     quic,
     grpc
-    }
 }

v2rayN/ServiceLib/Enums/EViewAction.cs

@@ -1,7 +1,7 @@
-namespace ServiceLib.Enums
+namespace ServiceLib.Enums;
+
+public enum EViewAction
 {
-    public enum EViewAction
-    {
     CloseWindow,
     ShowYesNo,
     SaveFileDialog,
@@ -42,5 +42,4 @@
     DispatcherCheckUpdate,
     DispatcherCheckUpdateFinished,
     DispatcherShowMsg,
-    }
 }

v2rayN/ServiceLib/Global.cs

@@ -1,7 +1,7 @@
-namespace ServiceLib
+namespace ServiceLib;
+
+public class Global
 {
-    public class Global
-    {
     #region const
 
     public const string AppName = "v2rayN";
@@ -38,6 +38,8 @@ namespace ServiceLib
     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 ProxySetOSXShellFileName = NamespaceSample + "proxy_set_osx_sh";
+    public const string ProxySetLinuxShellFileName = NamespaceSample + "proxy_set_linux_sh";
 
     public const string DefaultSecurity = "auto";
     public const string DefaultNetwork = "tcp";
@@ -67,10 +69,12 @@ namespace ServiceLib
     public const int MinFontSize = 8;
     public const string RebootAs = "rebootas";
     public const string AvaAssets = "avares://v2rayN/Assets/";
-        public const string LocalAppData = "V2RAYN_LOCAL_APPLICATION_DATA";
+    public const string LocalAppData = "V2RAYN_LOCAL_APPLICATION_DATA_V2";
     public const string V2RayLocalAsset = "V2RAY_LOCATION_ASSET";
     public const string XrayLocalAsset = "XRAY_LOCATION_ASSET";
+    public const string XrayLocalCert = "XRAY_LOCATION_CERT";
     public const int SpeedTestPageSize = 1000;
+    public const string LinuxBash = "/bin/bash";
 
     public static readonly List<string> IEProxyProtocols =
     [
@@ -121,7 +125,7 @@ namespace ServiceLib
     [
         "",
             @"https://github.com/runetfreedom/russia-v2ray-rules-dat/releases/latest/download/{0}.dat",
-            @"https://cdn.jsdelivr.net/gh/chocolate4u/Iran-v2ray-rules@release/{0}.dat"
+            @"https://github.com/Chocolate4U/Iran-v2ray-rules/releases/latest/download/{0}.dat"
     ];
 
     public static readonly List<string> SingboxRulesetSources =
@@ -262,7 +266,8 @@ namespace ServiceLib
             "utp",
             "wechat-video",
             "dtls",
-            "wireguard"
+            "wireguard",
+            "dns"
     ];
 
     public static readonly List<string> CoreTypes =
@@ -426,12 +431,12 @@ namespace ServiceLib
             "fakedns+others"
     ];
 
-        public static readonly List<string> TunMtus =
+    public static readonly List<int> TunMtus =
     [
-            "1280",
-            "1408",
-            "1500",
-            "9000"
+        1280,
+            1408,
+            1500,
+            9000
     ];
 
     public static readonly List<string> TunStacks =
@@ -515,5 +520,4 @@ namespace ServiceLib
     ];
 
     #endregion const
-    }
 }

v2rayN/ServiceLib/Handler/AppHandler.cs

@@ -1,7 +1,7 @@
-namespace ServiceLib.Handler
+namespace ServiceLib.Handler;
+
+public sealed class AppHandler
 {
-    public sealed class AppHandler
-    {
     #region Property
 
     private static readonly Lazy<AppHandler> _instance = new(() => new());
@@ -80,7 +80,9 @@ namespace ServiceLib.Handler
         Logging.SaveLog($"v2rayN start up | {Utils.GetRuntimeInfo()}");
         Logging.LoggingEnabled(_config.GuiItem.EnableLog);
 
-            ClearExpiredFiles();
+        //First determine the port value
+        _ = StatePort;
+        _ = StatePort2;
 
         return true;
     }
@@ -92,16 +94,6 @@ namespace ServiceLib.Handler
         return true;
     }
 
-        private void ClearExpiredFiles()
-        {
-            Task.Run(() =>
-            {
-                FileManager.DeleteExpiredFiles(Utils.GetLogPath(), DateTime.Now.AddMonths(-1));
-                FileManager.DeleteExpiredFiles(Utils.GetTempPath(), DateTime.Now.AddMonths(-1));
-                FileManager.DeleteExpiredFiles(Utils.GetBinConfigPath(), DateTime.Now.AddHours(-1));
-            });
-        }
-
     #endregion Init
 
     #region Config
@@ -143,7 +135,7 @@ namespace ServiceLib.Handler
 
     public async Task<List<ProfileItem>?> ProfileItems(string subid)
     {
-            if (Utils.IsNullOrEmpty(subid))
+        if (subid.IsNullOrEmpty())
         {
             return await SQLiteHelper.Instance.TableAsync<ProfileItem>().ToListAsync();
         }
@@ -165,11 +157,11 @@ namespace ServiceLib.Handler
                         from ProfileItem a
                         left join SubItem b on a.subid = b.id
                         where 1=1 ";
-            if (Utils.IsNotEmpty(subid))
+        if (subid.IsNotEmpty())
         {
             sql += $" and a.subid = '{subid}'";
         }
-            if (Utils.IsNotEmpty(filter))
+        if (filter.IsNotEmpty())
         {
             if (filter.Contains('\''))
             {
@@ -183,7 +175,7 @@ namespace ServiceLib.Handler
 
     public async Task<ProfileItem?> GetProfileItem(string indexId)
     {
-            if (Utils.IsNullOrEmpty(indexId))
+        if (indexId.IsNullOrEmpty())
         {
             return null;
         }
@@ -192,7 +184,7 @@ namespace ServiceLib.Handler
 
     public async Task<ProfileItem?> GetProfileItemViaRemarks(string? remarks)
     {
-            if (Utils.IsNullOrEmpty(remarks))
+        if (remarks.IsNullOrEmpty())
         {
             return null;
         }
@@ -252,5 +244,4 @@ namespace ServiceLib.Handler
     }
 
     #endregion Core Type
-    }
 }

v2rayN/ServiceLib/Handler/AutoStartupHandler.cs

@@ -1,10 +1,10 @@
 using System.Security.Principal;
 using System.Text.RegularExpressions;
 
-namespace ServiceLib.Handler
+namespace ServiceLib.Handler;
+
+public static class AutoStartupHandler
 {
-    public static class AutoStartupHandler
-    {
     private static readonly string _tag = "AutoStartupHandler";
 
     public static async Task<bool> UpdateTask(Config config)
@@ -85,7 +85,7 @@ namespace ServiceLib.Handler
     /// <exception cref="ArgumentNullException"></exception>
     public static void AutoStartTaskService(string taskName, string fileName, string description)
     {
-            if (Utils.IsNullOrEmpty(taskName))
+        if (taskName.IsNullOrEmpty())
         {
             return;
         }
@@ -93,7 +93,7 @@ namespace ServiceLib.Handler
         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))
+        if (fileName.IsNullOrEmpty())
         {
             foreach (var t in tasks)
             {
@@ -109,7 +109,7 @@ namespace ServiceLib.Handler
         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.Triggers.Add(new Microsoft.Win32.TaskScheduler.LogonTrigger { UserId = logonUser, Delay = TimeSpan.FromSeconds(30) });
         task.Principal.RunLevel = Microsoft.Win32.TaskScheduler.TaskRunLevel.Highest;
         task.Actions.Add(new Microsoft.Win32.TaskScheduler.ExecAction(fileName.AppendQuotes(), null, Path.GetDirectoryName(fileName)));
 
@@ -177,7 +177,7 @@ namespace ServiceLib.Handler
             if (File.Exists(launchAgentPath))
             {
                 var args = new[] { "-c", $"launchctl unload -w \"{launchAgentPath}\"" };
-                    await Utils.GetCliWrapOutput("/bin/bash", args);
+                await Utils.GetCliWrapOutput(Global.LinuxBash, args);
 
                 File.Delete(launchAgentPath);
             }
@@ -197,7 +197,7 @@ namespace ServiceLib.Handler
             await File.WriteAllTextAsync(launchAgentPath, plistContent);
 
             var args = new[] { "-c", $"launchctl load -w \"{launchAgentPath}\"" };
-                await Utils.GetCliWrapOutput("/bin/bash", args);
+            await Utils.GetCliWrapOutput(Global.LinuxBash, args);
         }
         catch (Exception ex)
         {
@@ -238,5 +238,4 @@ namespace ServiceLib.Handler
     }
 
     #endregion macOS
-    }
 }

v2rayN/ServiceLib/Handler/ClashApiHandler.cs

@@ -1,19 +1,19 @@
 using static ServiceLib.Models.ClashProxies;
 
-namespace ServiceLib.Handler
+namespace ServiceLib.Handler;
+
+public sealed class ClashApiHandler
 {
-    public sealed class ClashApiHandler
-    {
     private static readonly Lazy<ClashApiHandler> instance = new(() => new());
     public static ClashApiHandler Instance => instance.Value;
 
+    private static readonly string _tag = "ClashApiHandler";
     private Dictionary<string, ProxiesItem>? _proxies;
     public Dictionary<string, object> ProfileContent { get; set; }
-        private static readonly string _tag = "ClashApiHandler";
 
-        public async Task<Tuple<ClashProxies, ClashProviders>?> GetClashProxiesAsync(Config config)
+    public async Task<Tuple<ClashProxies, ClashProviders>?> GetClashProxiesAsync()
     {
-            for (var i = 0; i < 5; i++)
+        for (var i = 0; i < 3; i++)
         {
             var url = $"{GetApiUrl()}/proxies";
             var result = await HttpClientHelper.Instance.TryGetAsync(url);
@@ -37,38 +37,30 @@ namespace ServiceLib.Handler
 
     public void ClashProxiesDelayTest(bool blAll, List<ClashProxyModel> lstProxy, Action<ClashProxyModel?, string> updateFunc)
     {
-            Task.Run(() =>
+        Task.Run(async () =>
         {
             if (blAll)
             {
-                    for (var i = 0; i < 5; i++)
-                    {
-                        if (_proxies != null)
-                        {
-                            break;
-                        }
-                        Task.Delay(5000).Wait();
-                    }
                 if (_proxies == null)
                 {
-                        return;
+                    await GetClashProxiesAsync();
                 }
                 lstProxy = new List<ClashProxyModel>();
-                    foreach (KeyValuePair<string, ProxiesItem> kv in _proxies)
+                foreach (var kv in _proxies ?? [])
                 {
-                        if (Global.notAllowTestType.Contains(kv.Value.type.ToLower()))
+                    if (Global.notAllowTestType.Contains(kv.Value.type?.ToLower()))
                     {
                         continue;
                     }
                     lstProxy.Add(new ClashProxyModel()
                     {
                         Name = kv.Value.name,
-                            Type = kv.Value.type.ToLower(),
+                        Type = kv.Value.type?.ToLower(),
                     });
                 }
             }
 
-                if (lstProxy == null)
+            if (lstProxy is not { Count: > 0 })
             {
                 return;
             }
@@ -90,9 +82,8 @@ namespace ServiceLib.Handler
                     updateFunc?.Invoke(it, result);
                 }));
             }
-                Task.WaitAll(tasks.ToArray());
-
-                Task.Delay(1000).Wait();
+            await Task.WhenAll(tasks);
+            await Task.Delay(1000);
             updateFunc?.Invoke(null, "");
         });
     }
@@ -158,7 +149,7 @@ namespace ServiceLib.Handler
         }
     }
 
-        public async Task<ClashConnections?> GetClashConnectionsAsync(Config config)
+    public async Task<ClashConnections?> GetClashConnectionsAsync()
     {
         try
         {
@@ -193,5 +184,4 @@ namespace ServiceLib.Handler
     {
         return $"{Global.HttpProtocol}{Global.Loopback}:{AppHandler.Instance.StatePort2}";
     }
-    }
 }

v2rayN/ServiceLib/Handler/CoreConfigHandler.cs

@@ -1,10 +1,10 @@
-namespace ServiceLib.Handler
+namespace ServiceLib.Handler;
+
+/// <summary>
+/// Core configuration file processing class
+/// </summary>
+public class CoreConfigHandler
 {
-    /// <summary>
-    /// Core configuration file processing class
-    /// </summary>
-    public class CoreConfigHandler
-    {
     private static readonly string _tag = "CoreConfigHandler";
 
     public static async Task<RetResult> GenerateClientConfig(ProfileItem node, string? fileName)
@@ -33,7 +33,7 @@ namespace ServiceLib.Handler
         {
             return result;
         }
-            if (Utils.IsNotEmpty(fileName) && result.Data != null)
+        if (fileName.IsNotEmpty() && result.Data != null)
         {
             await File.WriteAllTextAsync(fileName, result.Data.ToString());
         }
@@ -133,16 +133,16 @@ namespace ServiceLib.Handler
         return result;
     }
 
-        public static async Task<RetResult> GenerateClientMultipleLoadConfig(Config config, string fileName, List<ProfileItem> selecteds, ECoreType coreType)
+    public static async Task<RetResult> GenerateClientMultipleLoadConfig(Config config, string fileName, List<ProfileItem> selecteds, ECoreType coreType, EMultipleLoad multipleLoad)
     {
         var result = new RetResult();
         if (coreType == ECoreType.sing_box)
         {
             result = await new CoreConfigSingboxService(config).GenerateClientMultipleLoadConfig(selecteds);
         }
-            else if (coreType == ECoreType.Xray)
+        else
         {
-                result = await new CoreConfigV2rayService(config).GenerateClientMultipleLoadConfig(selecteds);
+            result = await new CoreConfigV2rayService(config).GenerateClientMultipleLoadConfig(selecteds, multipleLoad);
         }
 
         if (result.Success != true)
@@ -152,5 +152,4 @@ namespace ServiceLib.Handler
         await File.WriteAllTextAsync(fileName, result.Data.ToString());
         return result;
     }
-    }
 }

v2rayN/ServiceLib/Handler/CoreHandler.cs

@@ -1,13 +1,13 @@
 using System.Diagnostics;
 using System.Text;
 
-namespace ServiceLib.Handler
+namespace ServiceLib.Handler;
+
+/// <summary>
+/// Core process processing class
+/// </summary>
+public class CoreHandler
 {
-    /// <summary>
-    /// Core process processing class
-    /// </summary>
-    public class CoreHandler
-    {
     private static readonly Lazy<CoreHandler> _instance = new(() => new());
     public static CoreHandler Instance => _instance.Value;
     private Config _config;
@@ -24,6 +24,7 @@ namespace ServiceLib.Handler
 
         Environment.SetEnvironmentVariable(Global.V2RayLocalAsset, Utils.GetBinPath(""), EnvironmentVariableTarget.Process);
         Environment.SetEnvironmentVariable(Global.XrayLocalAsset, Utils.GetBinPath(""), EnvironmentVariableTarget.Process);
+        Environment.SetEnvironmentVariable(Global.XrayLocalCert, Utils.GetBinPath(""), EnvironmentVariableTarget.Process);
 
         //Copy the bin folder to the storage location (for init)
         if (Environment.GetEnvironmentVariable(Global.LocalAppData) == "1")
@@ -100,7 +101,7 @@ namespace ServiceLib.Handler
 
     public async Task<int> LoadCoreConfigSpeedtest(List<ServerTestItem> selecteds)
     {
-            var coreType = selecteds.Exists(t => t.ConfigType is EConfigType.Hysteria2 or EConfigType.TUIC or EConfigType.WireGuard) ? ECoreType.sing_box : ECoreType.Xray;
+        var coreType = selecteds.Exists(t => t.ConfigType is EConfigType.Hysteria2 or EConfigType.TUIC) ? ECoreType.sing_box : ECoreType.Xray;
         var fileName = string.Format(Global.CoreSpeedtestConfigFileName, Utils.GetGuid(false));
         var configPath = Utils.GetBinConfigPath(fileName);
         var result = await CoreConfigHandler.GenerateClientSpeedtestConfig(_config, configPath, selecteds, coreType);
@@ -240,7 +241,7 @@ namespace ServiceLib.Handler
     private async Task<Process?> RunProcess(CoreInfo? coreInfo, string configPath, bool displayLog, bool mayNeedSudo)
     {
         var fileName = CoreInfoHandler.Instance.GetCoreExecFile(coreInfo, out var msg);
-            if (Utils.IsNullOrEmpty(fileName))
+        if (fileName.IsNullOrEmpty())
         {
             UpdateFunc(false, msg);
             return null;
@@ -253,7 +254,7 @@ namespace ServiceLib.Handler
                 StartInfo = new()
                 {
                     FileName = fileName,
-                        Arguments = string.Format(coreInfo.Arguments, coreInfo.AbsolutePath ? Utils.GetBinConfigPath(configPath) : configPath),
+                    Arguments = string.Format(coreInfo.Arguments, coreInfo.AbsolutePath ? Utils.GetBinConfigPath(configPath).AppendQuotes() : configPath),
                     WorkingDirectory = Utils.GetBinConfigPath(),
                     UseShellExecute = false,
                     RedirectStandardOutput = displayLog,
@@ -274,13 +275,13 @@ namespace ServiceLib.Handler
             {
                 proc.OutputDataReceived += (sender, e) =>
                 {
-                        if (Utils.IsNullOrEmpty(e.Data))
+                    if (e.Data.IsNullOrEmpty())
                         return;
                     UpdateFunc(false, e.Data + Environment.NewLine);
                 };
                 proc.ErrorDataReceived += (sender, e) =>
                 {
-                        if (Utils.IsNullOrEmpty(e.Data))
+                    if (e.Data.IsNullOrEmpty())
                         return;
                     UpdateFunc(false, e.Data + Environment.NewLine);
                 };
@@ -380,7 +381,7 @@ namespace ServiceLib.Handler
     private async Task<string> CreateLinuxShellFile(string cmdLine, string fileName)
     {
         //Shell scripts
-            var shFilePath = Utils.GetBinPath(AppHandler.Instance.IsAdministrator ? "root_" + fileName : fileName);
+        var shFilePath = Utils.GetBinConfigPath(AppHandler.Instance.IsAdministrator ? "root_" + fileName : fileName);
         File.Delete(shFilePath);
         var sb = new StringBuilder();
         sb.AppendLine("#!/bin/sh");
@@ -405,5 +406,4 @@ namespace ServiceLib.Handler
     }
 
     #endregion Linux
-    }
 }

v2rayN/ServiceLib/Handler/CoreInfoHandler.cs

@@ -1,7 +1,7 @@
-namespace ServiceLib.Handler
+namespace ServiceLib.Handler;
+
+public sealed class CoreInfoHandler
 {
-    public sealed class CoreInfoHandler
-    {
     private static readonly Lazy<CoreInfoHandler> _instance = new(() => new());
     private List<CoreInfo>? _coreInfo;
     public static CoreInfoHandler Instance => _instance.Value;
@@ -214,5 +214,4 @@ namespace ServiceLib.Handler
     {
         return $"{Global.GithubUrl}/{Global.CoreUrls[eCoreType]}/releases";
     }
-    }
 }

v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs

@@ -1,27 +1,30 @@
 using System.Collections.Specialized;
 
-namespace ServiceLib.Handler.Fmt
+namespace ServiceLib.Handler.Fmt;
+
+public class BaseFmt
 {
-    public class BaseFmt
-    {
     protected static string GetIpv6(string address)
     {
         if (Utils.IsIpv6(address))
         {
-                // 检查地址是否已经被方括号包围，如果没有，则添加方括号
+            // Check if the address is already surrounded by square brackets, if not, add square brackets
             return address.StartsWith('[') && address.EndsWith(']') ? address : $"[{address}]";
         }
-            return address;  // 如果不是IPv6地址，直接返回原地址
+        else
+        {
+            return address;
+        }
     }
 
     protected static int GetStdTransport(ProfileItem item, string? securityDef, ref Dictionary<string, string> dicQuery)
     {
-            if (Utils.IsNotEmpty(item.Flow))
+        if (item.Flow.IsNotEmpty())
         {
             dicQuery.Add("flow", item.Flow);
         }
 
-            if (Utils.IsNotEmpty(item.StreamSecurity))
+        if (item.StreamSecurity.IsNotEmpty())
         {
             dicQuery.Add("security", item.StreamSecurity);
         }
@@ -32,27 +35,27 @@ namespace ServiceLib.Handler.Fmt
                 dicQuery.Add("security", securityDef);
             }
         }
-            if (Utils.IsNotEmpty(item.Sni))
+        if (item.Sni.IsNotEmpty())
         {
             dicQuery.Add("sni", item.Sni);
         }
-            if (Utils.IsNotEmpty(item.Alpn))
+        if (item.Alpn.IsNotEmpty())
         {
             dicQuery.Add("alpn", Utils.UrlEncode(item.Alpn));
         }
-            if (Utils.IsNotEmpty(item.Fingerprint))
+        if (item.Fingerprint.IsNotEmpty())
         {
             dicQuery.Add("fp", Utils.UrlEncode(item.Fingerprint));
         }
-            if (Utils.IsNotEmpty(item.PublicKey))
+        if (item.PublicKey.IsNotEmpty())
         {
             dicQuery.Add("pbk", Utils.UrlEncode(item.PublicKey));
         }
-            if (Utils.IsNotEmpty(item.ShortId))
+        if (item.ShortId.IsNotEmpty())
         {
             dicQuery.Add("sid", Utils.UrlEncode(item.ShortId));
         }
-            if (Utils.IsNotEmpty(item.SpiderX))
+        if (item.SpiderX.IsNotEmpty())
         {
             dicQuery.Add("spx", Utils.UrlEncode(item.SpiderX));
         }
@@ -61,21 +64,21 @@ namespace ServiceLib.Handler.Fmt
             dicQuery.Add("allowInsecure", "1");
         }
 
-            dicQuery.Add("type", Utils.IsNotEmpty(item.Network) ? item.Network : nameof(ETransport.tcp));
+        dicQuery.Add("type", item.Network.IsNotEmpty() ? item.Network : nameof(ETransport.tcp));
 
         switch (item.Network)
         {
             case nameof(ETransport.tcp):
-                    dicQuery.Add("headerType", Utils.IsNotEmpty(item.HeaderType) ? item.HeaderType : Global.None);
-                    if (Utils.IsNotEmpty(item.RequestHost))
+                dicQuery.Add("headerType", item.HeaderType.IsNotEmpty() ? item.HeaderType : Global.None);
+                if (item.RequestHost.IsNotEmpty())
                 {
                     dicQuery.Add("host", Utils.UrlEncode(item.RequestHost));
                 }
                 break;
 
             case nameof(ETransport.kcp):
-                    dicQuery.Add("headerType", Utils.IsNotEmpty(item.HeaderType) ? item.HeaderType : Global.None);
-                    if (Utils.IsNotEmpty(item.Path))
+                dicQuery.Add("headerType", item.HeaderType.IsNotEmpty() ? item.HeaderType : Global.None);
+                if (item.Path.IsNotEmpty())
                 {
                     dicQuery.Add("seed", Utils.UrlEncode(item.Path));
                 }
@@ -83,30 +86,30 @@ namespace ServiceLib.Handler.Fmt
 
             case nameof(ETransport.ws):
             case nameof(ETransport.httpupgrade):
-                    if (Utils.IsNotEmpty(item.RequestHost))
+                if (item.RequestHost.IsNotEmpty())
                 {
                     dicQuery.Add("host", Utils.UrlEncode(item.RequestHost));
                 }
-                    if (Utils.IsNotEmpty(item.Path))
+                if (item.Path.IsNotEmpty())
                 {
                     dicQuery.Add("path", Utils.UrlEncode(item.Path));
                 }
                 break;
 
             case nameof(ETransport.xhttp):
-                    if (Utils.IsNotEmpty(item.RequestHost))
+                if (item.RequestHost.IsNotEmpty())
                 {
                     dicQuery.Add("host", Utils.UrlEncode(item.RequestHost));
                 }
-                    if (Utils.IsNotEmpty(item.Path))
+                if (item.Path.IsNotEmpty())
                 {
                     dicQuery.Add("path", Utils.UrlEncode(item.Path));
                 }
-                    if (Utils.IsNotEmpty(item.HeaderType) && Global.XhttpMode.Contains(item.HeaderType))
+                if (item.HeaderType.IsNotEmpty() && Global.XhttpMode.Contains(item.HeaderType))
                 {
                     dicQuery.Add("mode", Utils.UrlEncode(item.HeaderType));
                 }
-                    if (Utils.IsNotEmpty(item.Extra))
+                if (item.Extra.IsNotEmpty())
                 {
                     dicQuery.Add("extra", Utils.UrlEncode(item.Extra));
                 }
@@ -115,24 +118,24 @@ namespace ServiceLib.Handler.Fmt
             case nameof(ETransport.http):
             case nameof(ETransport.h2):
                 dicQuery["type"] = nameof(ETransport.http);
-                    if (Utils.IsNotEmpty(item.RequestHost))
+                if (item.RequestHost.IsNotEmpty())
                 {
                     dicQuery.Add("host", Utils.UrlEncode(item.RequestHost));
                 }
-                    if (Utils.IsNotEmpty(item.Path))
+                if (item.Path.IsNotEmpty())
                 {
                     dicQuery.Add("path", Utils.UrlEncode(item.Path));
                 }
                 break;
 
             case nameof(ETransport.quic):
-                    dicQuery.Add("headerType", Utils.IsNotEmpty(item.HeaderType) ? item.HeaderType : Global.None);
+                dicQuery.Add("headerType", item.HeaderType.IsNotEmpty() ? 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.IsNotEmpty(item.Path))
+                if (item.Path.IsNotEmpty())
                 {
                     dicQuery.Add("authority", Utils.UrlEncode(item.RequestHost));
                     dicQuery.Add("serviceName", Utils.UrlEncode(item.Path));
@@ -215,8 +218,10 @@ namespace ServiceLib.Handler.Fmt
         foreach (var item in s)
         {
             if (str.Contains(item, StringComparison.OrdinalIgnoreCase))
+            {
                 return true;
             }
+        }
         return false;
     }
 
@@ -236,5 +241,4 @@ namespace ServiceLib.Handler.Fmt
         var url = $"{Utils.UrlEncode(userInfo)}@{GetIpv6(address)}:{port}";
         return $"{Global.ProtocolShares[eConfigType]}{url}{query}{remark}";
     }
-    }
 }

v2rayN/ServiceLib/Handler/Fmt/ClashFmt.cs

@@ -1,7 +1,7 @@
-namespace ServiceLib.Handler.Fmt
+namespace ServiceLib.Handler.Fmt;
+
+public class ClashFmt : BaseFmt
 {
-    public class ClashFmt : BaseFmt
-    {
     public static ProfileItem? ResolveFull(string strData, string? subRemarks)
     {
         if (Contains(strData, "port", "socks-port", "proxies"))
@@ -19,5 +19,4 @@
 
         return null;
     }
-    }
 }

v2rayN/ServiceLib/Handler/Fmt/FmtHandler.cs

@@ -1,7 +1,7 @@
-namespace ServiceLib.Handler.Fmt
+namespace ServiceLib.Handler.Fmt;
+
+public class FmtHandler
 {
-    public class FmtHandler
-    {
     private static readonly string _tag = "FmtHandler";
 
     public static string? GetShareUri(ProfileItem item)
@@ -37,7 +37,7 @@
         try
         {
             string str = config.TrimEx();
-                if (Utils.IsNullOrEmpty(str))
+            if (str.IsNullOrEmpty())
             {
                 msg = ResUI.FailedReadConfiguration;
                 return null;
@@ -88,5 +88,4 @@
             return null;
         }
     }
-    }
 }

v2rayN/ServiceLib/Handler/Fmt/Hysteria2Fmt.cs

@@ -1,7 +1,7 @@
-namespace ServiceLib.Handler.Fmt
+namespace ServiceLib.Handler.Fmt;
+
+public class Hysteria2Fmt : BaseFmt
 {
-    public class Hysteria2Fmt : BaseFmt
-    {
     public static ProfileItem? Resolve(string str, out string msg)
     {
         msg = ResUI.ConfigurationFormatIncorrect;
@@ -24,6 +24,8 @@ namespace ServiceLib.Handler.Fmt
         item.Path = Utils.UrlDecode(query["obfs-password"] ?? "");
         item.AllowInsecure = (query["insecure"] ?? "") == "1" ? "true" : "false";
 
+        item.Ports = Utils.UrlDecode(query["mport"] ?? "").Replace('-', ':');
+
         return item;
     }
 
@@ -34,25 +36,29 @@ namespace ServiceLib.Handler.Fmt
         string url = string.Empty;
 
         string remark = string.Empty;
-            if (Utils.IsNotEmpty(item.Remarks))
+        if (item.Remarks.IsNotEmpty())
         {
             remark = "#" + Utils.UrlEncode(item.Remarks);
         }
         var dicQuery = new Dictionary<string, string>();
-            if (Utils.IsNotEmpty(item.Sni))
+        if (item.Sni.IsNotEmpty())
         {
             dicQuery.Add("sni", item.Sni);
         }
-            if (Utils.IsNotEmpty(item.Alpn))
+        if (item.Alpn.IsNotEmpty())
         {
             dicQuery.Add("alpn", Utils.UrlEncode(item.Alpn));
         }
-            if (Utils.IsNotEmpty(item.Path))
+        if (item.Path.IsNotEmpty())
         {
             dicQuery.Add("obfs", "salamander");
             dicQuery.Add("obfs-password", Utils.UrlEncode(item.Path));
         }
         dicQuery.Add("insecure", item.AllowInsecure.ToLower() == "true" ? "1" : "0");
+        if (item.Ports.IsNotEmpty())
+        {
+            dicQuery.Add("mport", Utils.UrlEncode(item.Ports.Replace(':', '-')));
+        }
 
         return ToUri(EConfigType.Hysteria2, item.Address, item.Port, item.Id, dicQuery, remark);
     }
@@ -92,5 +98,4 @@ namespace ServiceLib.Handler.Fmt
 
         return null;
     }
-    }
 }

v2rayN/ServiceLib/Handler/Fmt/NaiveproxyFmt.cs

@@ -1,7 +1,7 @@
-namespace ServiceLib.Handler.Fmt
+namespace ServiceLib.Handler.Fmt;
+
+public class NaiveproxyFmt : BaseFmt
 {
-    public class NaiveproxyFmt : BaseFmt
-    {
     public static ProfileItem? ResolveFull(string strData, string? subRemarks)
     {
         if (Contains(strData, "listen", "proxy", "<html>", "<body>"))
@@ -19,5 +19,4 @@
 
         return null;
     }
-    }
 }

v2rayN/ServiceLib/Handler/Fmt/ShadowsocksFmt.cs

@@ -1,9 +1,9 @@
 using System.Text.RegularExpressions;
 
-namespace ServiceLib.Handler.Fmt
+namespace ServiceLib.Handler.Fmt;
+
+public class ShadowsocksFmt : BaseFmt
 {
-    public class ShadowsocksFmt : BaseFmt
-    {
     public static ProfileItem? Resolve(string str, out string msg)
     {
         msg = ResUI.ConfigurationFormatIncorrect;
@@ -27,11 +27,11 @@ namespace ServiceLib.Handler.Fmt
     public static string? ToUri(ProfileItem? item)
     {
         if (item == null)
+        {
             return null;
-            string url = string.Empty;
-
-            string remark = string.Empty;
-            if (Utils.IsNotEmpty(item.Remarks))
+        }
+        var remark = string.Empty;
+        if (item.Remarks.IsNotEmpty())
         {
             remark = "#" + Utils.UrlEncode(item.Remarks);
         }
@@ -53,12 +53,14 @@ namespace ServiceLib.Handler.Fmt
     {
         var match = UrlFinder.Match(result);
         if (!match.Success)
+        {
             return null;
+        }
 
         ProfileItem item = new();
         var base64 = match.Groups["base64"].Value.TrimEnd('/');
         var tag = match.Groups["tag"].Value;
-            if (Utils.IsNotEmpty(tag))
+        if (tag.IsNotEmpty())
         {
             item.Remarks = Utils.UrlDecode(tag);
         }
@@ -72,11 +74,13 @@ namespace ServiceLib.Handler.Fmt
             return null;
         }
         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.Port = details.Groups["port"].Value.ToInt();
         return item;
     }
 
@@ -84,7 +88,9 @@ namespace ServiceLib.Handler.Fmt
     {
         var parsedUrl = Utils.TryUri(result);
         if (parsedUrl == null)
+        {
             return null;
+        }
 
         ProfileItem item = new()
         {
@@ -96,7 +102,7 @@ namespace ServiceLib.Handler.Fmt
         //2022-blake3
         if (rawUserInfo.Contains(':'))
         {
-                string[] userInfoParts = rawUserInfo.Split(new[] { ':' }, 2);
+            var userInfoParts = rawUserInfo.Split(new[] { ':' }, 2);
             if (userInfoParts.Length != 2)
             {
                 return null;
@@ -107,8 +113,8 @@ namespace ServiceLib.Handler.Fmt
         else
         {
             // parse base64 UserInfo
-                string userInfo = Utils.Base64Decode(rawUserInfo);
-                string[] userInfoParts = userInfo.Split(new[] { ':' }, 2);
+            var userInfo = Utils.Base64Decode(rawUserInfo);
+            var userInfoParts = userInfo.Split(new[] { ':' }, 2);
             if (userInfoParts.Length != 2)
             {
                 return null;
@@ -122,7 +128,7 @@ 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.IsNotEmpty(obfsHost))
+            if (queryParameters["plugin"].Contains("obfs=http") && obfsHost.IsNotEmpty())
             {
                 obfsHost = obfsHost?.Replace("obfs-host=", "");
                 item.Network = Global.DefaultNetwork;
@@ -162,7 +168,7 @@ namespace ServiceLib.Handler.Fmt
                     Security = it.method,
                     Id = it.password,
                     Address = it.server,
-                        Port = Utils.ToInt(it.server_port)
+                    Port = it.server_port.ToInt()
                 };
                 lst.Add(ssItem);
             }
@@ -170,5 +176,4 @@ namespace ServiceLib.Handler.Fmt
         }
         return null;
     }
-    }
 }

v2rayN/ServiceLib/Handler/Fmt/SingboxFmt.cs

@@ -1,44 +1,39 @@
-namespace ServiceLib.Handler.Fmt
+namespace ServiceLib.Handler.Fmt;
+
+public class SingboxFmt : BaseFmt
 {
-    public class SingboxFmt : BaseFmt
-    {
     public static List<ProfileItem>? ResolveFullArray(string strData, string? subRemarks)
     {
-            var configObjects = JsonUtils.Deserialize<Object[]>(strData);
-            if (configObjects != null && configObjects.Length > 0)
+        var configObjects = JsonUtils.Deserialize<object[]>(strData);
+        if (configObjects is not { Length: > 0 })
         {
+            return null;
+        }
+
         List<ProfileItem> lstResult = [];
         foreach (var configObject in configObjects)
         {
             var objectString = JsonUtils.Serialize(configObject);
-                    var singboxCon = JsonUtils.Deserialize<SingboxConfig>(objectString);
-                    if (singboxCon?.inbounds?.Count > 0
-                        && singboxCon.outbounds?.Count > 0
-                        && singboxCon.route != null)
+            var profileIt = ResolveFull(objectString, subRemarks);
+            if (profileIt != null)
             {
-                        var fileName = WriteAllText(objectString);
-
-                        var profileIt = new ProfileItem
-                        {
-                            CoreType = ECoreType.sing_box,
-                            Address = fileName,
-                            Remarks = subRemarks ?? "singbox_custom",
-                        };
                 lstResult.Add(profileIt);
             }
         }
         return lstResult;
     }
-            return null;
-        }
 
     public static ProfileItem? ResolveFull(string strData, string? subRemarks)
     {
-            var singboxConfig = JsonUtils.Deserialize<SingboxConfig>(strData);
-            if (singboxConfig?.inbounds?.Count > 0
-                && singboxConfig.outbounds?.Count > 0
-                && singboxConfig.route != null)
+        var config = JsonUtils.ParseJson(strData);
+        if (config?["inbounds"] == null
+            || config["outbounds"] == null
+            || config["route"] == null
+            || config["dns"] == null)
         {
+            return null;
+        }
+
         var fileName = WriteAllText(strData);
         var profileItem = new ProfileItem
         {
@@ -49,7 +44,4 @@
 
         return profileItem;
     }
-            return null;
-        }
-    }
 }

v2rayN/ServiceLib/Handler/Fmt/SocksFmt.cs

@@ -1,7 +1,7 @@
-namespace ServiceLib.Handler.Fmt
+namespace ServiceLib.Handler.Fmt;
+
+public class SocksFmt : BaseFmt
 {
-    public class SocksFmt : BaseFmt
-    {
     public static ProfileItem? Resolve(string str, out string msg)
     {
         msg = ResUI.ConfigurationFormatIncorrect;
@@ -24,11 +24,11 @@ namespace ServiceLib.Handler.Fmt
     public static string? ToUri(ProfileItem? item)
     {
         if (item == null)
+        {
             return null;
-            var url = string.Empty;
-
+        }
         var remark = string.Empty;
-            if (Utils.IsNotEmpty(item.Remarks))
+        if (item.Remarks.IsNotEmpty())
         {
             remark = "#" + Utils.UrlEncode(item.Remarks);
         }
@@ -77,7 +77,7 @@ namespace ServiceLib.Handler.Fmt
             return null;
         }
         item.Address = arr1[1][..indexPort];
-            item.Port = Utils.ToInt(arr1[1][(indexPort + 1)..]);
+        item.Port = arr1[1][(indexPort + 1)..].ToInt();
         item.Security = arr21.First();
         item.Id = arr21[1];
 
@@ -88,7 +88,9 @@ namespace ServiceLib.Handler.Fmt
     {
         var parsedUrl = Utils.TryUri(result);
         if (parsedUrl == null)
+        {
             return null;
+        }
 
         ProfileItem item = new()
         {
@@ -109,5 +111,4 @@ namespace ServiceLib.Handler.Fmt
 
         return item;
     }
-    }
 }

v2rayN/ServiceLib/Handler/Fmt/TrojanFmt.cs

@@ -1,7 +1,7 @@
-namespace ServiceLib.Handler.Fmt
+namespace ServiceLib.Handler.Fmt;
+
+public class TrojanFmt : BaseFmt
 {
-    public class TrojanFmt : BaseFmt
-    {
     public static ProfileItem? Resolve(string str, out string msg)
     {
         msg = ResUI.ConfigurationFormatIncorrect;
@@ -13,7 +13,9 @@ namespace ServiceLib.Handler.Fmt
 
         var url = Utils.TryUri(str);
         if (url == null)
+        {
             return null;
+        }
 
         item.Address = url.IdnHost;
         item.Port = url.Port;
@@ -21,7 +23,7 @@ namespace ServiceLib.Handler.Fmt
         item.Id = Utils.UrlDecode(url.UserInfo);
 
         var query = Utils.ParseQueryString(url.Query);
-            ResolveStdTransport(query, ref item);
+        _ = ResolveStdTransport(query, ref item);
 
         return item;
     }
@@ -29,18 +31,17 @@ namespace ServiceLib.Handler.Fmt
     public static string? ToUri(ProfileItem? item)
     {
         if (item == null)
+        {
             return null;
-            string url = string.Empty;
-
-            string remark = string.Empty;
-            if (Utils.IsNotEmpty(item.Remarks))
+        }
+        var remark = string.Empty;
+        if (item.Remarks.IsNotEmpty())
         {
             remark = "#" + Utils.UrlEncode(item.Remarks);
         }
         var dicQuery = new Dictionary<string, string>();
-            GetStdTransport(item, null, ref dicQuery);
+        _ = GetStdTransport(item, null, ref dicQuery);
 
         return ToUri(EConfigType.Trojan, item.Address, item.Port, item.Id, dicQuery, remark);
     }
-    }
 }

v2rayN/ServiceLib/Handler/Fmt/TuicFmt.cs

@@ -1,7 +1,7 @@
-namespace ServiceLib.Handler.Fmt
+namespace ServiceLib.Handler.Fmt;
+
+public class TuicFmt : BaseFmt
 {
-    public class TuicFmt : BaseFmt
-    {
     public static ProfileItem? Resolve(string str, out string msg)
     {
         msg = ResUI.ConfigurationFormatIncorrect;
@@ -13,7 +13,9 @@ namespace ServiceLib.Handler.Fmt
 
         var url = Utils.TryUri(str);
         if (url == null)
+        {
             return null;
+        }
 
         item.Address = url.IdnHost;
         item.Port = url.Port;
@@ -36,20 +38,21 @@ namespace ServiceLib.Handler.Fmt
     public static string? ToUri(ProfileItem? item)
     {
         if (item == null)
+        {
             return null;
-            string url = string.Empty;
+        }
 
-            string remark = string.Empty;
-            if (Utils.IsNotEmpty(item.Remarks))
+        var remark = string.Empty;
+        if (item.Remarks.IsNotEmpty())
         {
             remark = "#" + Utils.UrlEncode(item.Remarks);
         }
         var dicQuery = new Dictionary<string, string>();
-            if (Utils.IsNotEmpty(item.Sni))
+        if (item.Sni.IsNotEmpty())
         {
             dicQuery.Add("sni", item.Sni);
         }
-            if (Utils.IsNotEmpty(item.Alpn))
+        if (item.Alpn.IsNotEmpty())
         {
             dicQuery.Add("alpn", Utils.UrlEncode(item.Alpn));
         }
@@ -57,5 +60,4 @@ namespace ServiceLib.Handler.Fmt
 
         return ToUri(EConfigType.TUIC, item.Address, item.Port, $"{item.Id}:{item.Security}", dicQuery, remark);
     }
-    }
 }

v2rayN/ServiceLib/Handler/Fmt/V2rayFmt.cs

@@ -1,56 +1,48 @@
-namespace ServiceLib.Handler.Fmt
+namespace ServiceLib.Handler.Fmt;
+
+public class V2rayFmt : BaseFmt
 {
-    public class V2rayFmt : BaseFmt
-    {
     public static List<ProfileItem>? ResolveFullArray(string strData, string? subRemarks)
     {
-            var configObjects = JsonUtils.Deserialize<Object[]>(strData);
-            if (configObjects != null && configObjects.Length > 0)
+        var configObjects = JsonUtils.Deserialize<object[]>(strData);
+        if (configObjects is not { Length: > 0 })
         {
+            return null;
+        }
+
         List<ProfileItem> lstResult = [];
         foreach (var configObject in configObjects)
         {
             var objectString = JsonUtils.Serialize(configObject);
-                    var v2rayCon = JsonUtils.Deserialize<V2rayConfig>(objectString);
-                    if (v2rayCon?.inbounds?.Count > 0
-                        && v2rayCon.outbounds?.Count > 0
-                        && v2rayCon.routing != null)
+            var profileIt = ResolveFull(objectString, subRemarks);
+            if (profileIt != null)
             {
-                        var fileName = WriteAllText(objectString);
-
-                        var profileIt = new ProfileItem
-                        {
-                            CoreType = ECoreType.Xray,
-                            Address = fileName,
-                            Remarks = v2rayCon.remarks ?? subRemarks ?? "v2ray_custom",
-                        };
                 lstResult.Add(profileIt);
             }
         }
+
         return lstResult;
     }
-            return null;
-        }
 
     public static ProfileItem? ResolveFull(string strData, string? subRemarks)
     {
-            var v2rayConfig = JsonUtils.Deserialize<V2rayConfig>(strData);
-            if (v2rayConfig?.inbounds?.Count > 0
-                && v2rayConfig.outbounds?.Count > 0
-                && v2rayConfig.routing != null)
+        var config = JsonUtils.ParseJson(strData);
+        if (config?["inbounds"] == null
+            || config["outbounds"] == null
+            || config["routing"] == null)
         {
+            return null;
+        }
+
         var fileName = WriteAllText(strData);
 
         var profileItem = new ProfileItem
         {
             CoreType = ECoreType.Xray,
             Address = fileName,
-                    Remarks = v2rayConfig.remarks ?? subRemarks ?? "v2ray_custom"
+            Remarks = config?["remarks"]?.ToString() ?? subRemarks ?? "v2ray_custom"
         };
 
         return profileItem;
     }
-            return null;
-        }
-    }
 }

v2rayN/ServiceLib/Handler/Fmt/VLESSFmt.cs

@@ -1,7 +1,7 @@
-namespace ServiceLib.Handler.Fmt
+namespace ServiceLib.Handler.Fmt;
+
+public class VLESSFmt : BaseFmt
 {
-    public class VLESSFmt : BaseFmt
-    {
     public static ProfileItem? Resolve(string str, out string msg)
     {
         msg = ResUI.ConfigurationFormatIncorrect;
@@ -14,7 +14,9 @@ namespace ServiceLib.Handler.Fmt
 
         var url = Utils.TryUri(str);
         if (url == null)
+        {
             return null;
+        }
 
         item.Address = url.IdnHost;
         item.Port = url.Port;
@@ -24,7 +26,7 @@ namespace ServiceLib.Handler.Fmt
         var query = Utils.ParseQueryString(url.Query);
         item.Security = query["encryption"] ?? Global.None;
         item.StreamSecurity = query["security"] ?? "";
-            ResolveStdTransport(query, ref item);
+        _ = ResolveStdTransport(query, ref item);
 
         return item;
     }
@@ -32,16 +34,17 @@ namespace ServiceLib.Handler.Fmt
     public static string? ToUri(ProfileItem? item)
     {
         if (item == null)
+        {
             return null;
-            string url = string.Empty;
+        }
 
-            string remark = string.Empty;
-            if (Utils.IsNotEmpty(item.Remarks))
+        var remark = string.Empty;
+        if (item.Remarks.IsNotEmpty())
         {
             remark = "#" + Utils.UrlEncode(item.Remarks);
         }
         var dicQuery = new Dictionary<string, string>();
-            if (Utils.IsNotEmpty(item.Security))
+        if (item.Security.IsNotEmpty())
         {
             dicQuery.Add("encryption", item.Security);
         }
@@ -49,9 +52,8 @@ namespace ServiceLib.Handler.Fmt
         {
             dicQuery.Add("encryption", Global.None);
         }
-            GetStdTransport(item, Global.None, ref dicQuery);
+        _ = GetStdTransport(item, Global.None, ref dicQuery);
 
         return ToUri(EConfigType.VLESS, item.Address, item.Port, item.Id, dicQuery, remark);
     }
-    }
 }

v2rayN/ServiceLib/Handler/Fmt/VmessFmt.cs

@@ -1,7 +1,7 @@
-namespace ServiceLib.Handler.Fmt
+namespace ServiceLib.Handler.Fmt;
+
+public class VmessFmt : BaseFmt
 {
-    public class VmessFmt : BaseFmt
-    {
     public static ProfileItem? Resolve(string str, out string msg)
     {
         msg = ResUI.ConfigurationFormatIncorrect;
@@ -20,10 +20,10 @@ namespace ServiceLib.Handler.Fmt
     public static string? ToUri(ProfileItem? item)
     {
         if (item == null)
+        {
             return null;
-            string url = string.Empty;
-
-            VmessQRCode vmessQRCode = new()
+        }
+        var vmessQRCode = new VmessQRCode
         {
             v = item.ConfigVersion,
             ps = item.Remarks.TrimEx(),
@@ -42,7 +42,7 @@ namespace ServiceLib.Handler.Fmt
             fp = item.Fingerprint
         };
 
-            url = JsonUtils.Serialize(vmessQRCode);
+        var url = JsonUtils.Serialize(vmessQRCode);
         url = Utils.Base64Encode(url);
         url = $"{Global.ProtocolShares[EConfigType.VMess]}{url}";
 
@@ -60,7 +60,7 @@ namespace ServiceLib.Handler.Fmt
         result = result[Global.ProtocolShares[EConfigType.VMess].Length..];
         result = Utils.Base64Decode(result);
 
-            VmessQRCode? vmessQRCode = JsonUtils.Deserialize<VmessQRCode>(result);
+        var vmessQRCode = JsonUtils.Deserialize<VmessQRCode>(result);
         if (vmessQRCode == null)
         {
             msg = ResUI.FailedConversionConfiguration;
@@ -78,12 +78,12 @@ namespace ServiceLib.Handler.Fmt
         item.AlterId = vmessQRCode.aid;
         item.Security = Utils.ToString(vmessQRCode.scy);
 
-            item.Security = Utils.IsNotEmpty(vmessQRCode.scy) ? vmessQRCode.scy : Global.DefaultSecurity;
-            if (Utils.IsNotEmpty(vmessQRCode.net))
+        item.Security = vmessQRCode.scy.IsNotEmpty() ? vmessQRCode.scy : Global.DefaultSecurity;
+        if (vmessQRCode.net.IsNotEmpty())
         {
             item.Network = vmessQRCode.net;
         }
-            if (Utils.IsNotEmpty(vmessQRCode.type))
+        if (vmessQRCode.type.IsNotEmpty())
         {
             item.HeaderType = vmessQRCode.type;
         }
@@ -100,7 +100,7 @@ namespace ServiceLib.Handler.Fmt
 
     public static ProfileItem? ResolveStdVmess(string str)
     {
-            ProfileItem item = new()
+        var item = new ProfileItem
         {
             ConfigType = EConfigType.VMess,
             Security = "auto"
@@ -108,7 +108,9 @@ namespace ServiceLib.Handler.Fmt
 
         var url = Utils.TryUri(str);
         if (url == null)
+        {
             return null;
+        }
 
         item.Address = url.IdnHost;
         item.Port = url.Port;
@@ -120,5 +122,4 @@ namespace ServiceLib.Handler.Fmt
 
         return item;
     }
-    }
 }

v2rayN/ServiceLib/Handler/Fmt/WireguardFmt.cs

@@ -1,7 +1,7 @@
-namespace ServiceLib.Handler.Fmt
+namespace ServiceLib.Handler.Fmt;
+
+public class WireguardFmt : BaseFmt
 {
-    public class WireguardFmt : BaseFmt
-    {
     public static ProfileItem? Resolve(string str, out string msg)
     {
         msg = ResUI.ConfigurationFormatIncorrect;
@@ -13,7 +13,9 @@ namespace ServiceLib.Handler.Fmt
 
         var url = Utils.TryUri(str);
         if (url == null)
+        {
             return null;
+        }
 
         item.Address = url.IdnHost;
         item.Port = url.Port;
@@ -33,33 +35,33 @@ namespace ServiceLib.Handler.Fmt
     public static string? ToUri(ProfileItem? item)
     {
         if (item == null)
+        {
             return null;
-            string url = string.Empty;
+        }
 
-            string remark = string.Empty;
-            if (Utils.IsNotEmpty(item.Remarks))
+        var remark = string.Empty;
+        if (item.Remarks.IsNotEmpty())
         {
             remark = "#" + Utils.UrlEncode(item.Remarks);
         }
 
         var dicQuery = new Dictionary<string, string>();
-            if (Utils.IsNotEmpty(item.PublicKey))
+        if (item.PublicKey.IsNotEmpty())
         {
             dicQuery.Add("publickey", Utils.UrlEncode(item.PublicKey));
         }
-            if (Utils.IsNotEmpty(item.Path))
+        if (item.Path.IsNotEmpty())
         {
             dicQuery.Add("reserved", Utils.UrlEncode(item.Path));
         }
-            if (Utils.IsNotEmpty(item.RequestHost))
+        if (item.RequestHost.IsNotEmpty())
         {
             dicQuery.Add("address", Utils.UrlEncode(item.RequestHost));
         }
-            if (Utils.IsNotEmpty(item.ShortId))
+        if (item.ShortId.IsNotEmpty())
         {
             dicQuery.Add("mtu", Utils.UrlEncode(item.ShortId));
         }
         return ToUri(EConfigType.WireGuard, item.Address, item.Port, item.Id, dicQuery, remark);
     }
-    }
 }

v2rayN/ServiceLib/Handler/NoticeHandler.cs

@@ -1,9 +1,9 @@
-using ReactiveUI;
+using ReactiveUI;
 
-namespace ServiceLib.Handler
+namespace ServiceLib.Handler;
+
+public class NoticeHandler
 {
-    public class NoticeHandler
-    {
     private static readonly Lazy<NoticeHandler> _instance = new(() => new());
     public static NoticeHandler Instance => _instance.Value;
 
@@ -40,5 +40,4 @@ namespace ServiceLib.Handler
         Enqueue(msg);
         SendMessage(msg);
     }
-    }
 }

v2rayN/ServiceLib/Handler/PacHandler.cs

@@ -1,10 +1,10 @@
 using System.Net.Sockets;
 using System.Text;
 
-namespace ServiceLib.Handler
+namespace ServiceLib.Handler;
+
+public class PacHandler
 {
-    public class PacHandler
-    {
     private static string _configPath;
     private static int _httpPort;
     private static int _pacPort;
@@ -15,7 +15,7 @@ namespace ServiceLib.Handler
 
     public static async Task Start(string configPath, int httpPort, int pacPort)
     {
-            _needRestart = (configPath != _configPath || httpPort != _httpPort || pacPort != _pacPort || !_isRunning);
+        _needRestart = configPath != _configPath || httpPort != _httpPort || pacPort != _pacPort || !_isRunning;
 
         _configPath = configPath;
         _httpPort = httpPort;
@@ -33,6 +33,13 @@ namespace ServiceLib.Handler
     private static async Task InitText()
     {
         var path = Path.Combine(_configPath, "pac.txt");
+
+        // Delete the old pac file
+        if (File.Exists(path) && Utils.GetFileHash(path).Equals("b590c07280f058ef05d5394aa2f927fe"))
+        {
+            File.Delete(path);
+        }
+
         if (!File.Exists(path))
         {
             var pac = EmbedUtils.GetEmbedText(Global.PacFileName);
@@ -70,7 +77,7 @@ namespace ServiceLib.Handler
                     }
 
                     var client = await _tcpListener.AcceptTcpClientAsync();
-                        await Task.Run(() => { WriteContent(client); });
+                    await Task.Run(() => WriteContent(client));
                 }
                 catch
                 {
@@ -90,7 +97,9 @@ namespace ServiceLib.Handler
     public static void Stop()
     {
         if (_tcpListener == null)
+        {
             return;
+        }
         try
         {
             _isRunning = false;
@@ -102,5 +111,4 @@ namespace ServiceLib.Handler
             // ignored
         }
     }
-    }
 }

v2rayN/ServiceLib/Handler/ProfileExHandler.cs

@@ -2,10 +2,10 @@ using System.Collections.Concurrent;
 
 //using System.Reactive.Linq;
 
-namespace ServiceLib.Handler
+namespace ServiceLib.Handler;
+
+public class ProfileExHandler
 {
-    public class ProfileExHandler
-    {
     private static readonly Lazy<ProfileExHandler> _instance = new(() => new());
     private ConcurrentBag<ProfileExItem> _lstProfileEx = [];
     private readonly Queue<string> _queIndexIds = new();
@@ -20,14 +20,6 @@ namespace ServiceLib.Handler
     public async Task Init()
     {
         await InitData();
-            _ = Task.Run(async () =>
-            {
-                while (true)
-                {
-                    await Task.Delay(1000 * 600);
-                    await SaveQueueIndexIds();
-                }
-            });
     }
 
     public async Task<ConcurrentBag<ProfileExItem>> GetProfileExs()
@@ -44,7 +36,7 @@ namespace ServiceLib.Handler
 
     private void IndexIdEnqueue(string indexId)
     {
-            if (Utils.IsNotEmpty(indexId) && !_queIndexIds.Contains(indexId))
+        if (indexId.IsNotEmpty() && !_queIndexIds.Contains(indexId))
         {
             _queIndexIds.Enqueue(indexId);
         }
@@ -186,5 +178,4 @@ namespace ServiceLib.Handler
         }
         return _lstProfileEx.Max(t => t == null ? 0 : t.Sort);
     }
-    }
 }

v2rayN/ServiceLib/Handler/StatisticsHandler.cs

@@ -1,7 +1,7 @@
-namespace ServiceLib.Handler
+namespace ServiceLib.Handler;
+
+public class StatisticsHandler
 {
-    public class StatisticsHandler
-    {
     private static readonly Lazy<StatisticsHandler> instance = new(() => new());
     public static StatisticsHandler Instance => instance.Value;
 
@@ -160,5 +160,4 @@
             _serverStatItem.DateNow = ticks;
         }
     }
-    }
 }

v2rayN/ServiceLib/Handler/SysProxy/ProxySettingLinux.cs

@@ -1,202 +1,32 @@
-namespace ServiceLib.Handler.SysProxy
+namespace ServiceLib.Handler.SysProxy;
+
+public class ProxySettingLinux
 {
-    public class ProxySettingLinux
-    {
+    private static readonly string _proxySetFileName = $"{Global.ProxySetLinuxShellFileName.Replace(Global.NamespaceSample, "")}.sh";
+
     public static async Task SetProxy(string host, int port, string exceptions)
     {
-            var lstCmd = GetSetCmds(host, port, exceptions);
-
-            await ExecCmd(lstCmd);
+        List<string> args = ["manual", host, port.ToString(), exceptions];
+        await ExecCmd(args);
     }
 
     public static async Task UnsetProxy()
     {
-            var lstCmd = GetUnsetCmds();
-
-            await ExecCmd(lstCmd);
+        List<string> args = ["none"];
+        await ExecCmd(args);
     }
 
-        private static async Task ExecCmd(List<CmdItem> lstCmd)
+    private static async Task ExecCmd(List<string> args)
     {
-            foreach (var cmd in lstCmd)
+        var fileName = Utils.GetBinConfigPath(_proxySetFileName);
+        if (!File.Exists(fileName))
         {
-                if (cmd is null || cmd.Cmd.IsNullOrEmpty() || cmd.Arguments is null)
-                {
-                    continue;
-                }
-                await Task.Delay(10);
-                await Utils.GetCliWrapOutput(cmd.Cmd, cmd.Arguments);
-            }
+            var contents = EmbedUtils.GetEmbedText(Global.ProxySetLinuxShellFileName);
+            await File.AppendAllTextAsync(fileName, contents);
+
+            await Utils.SetLinuxChmod(fileName);
         }
 
-        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 = [];
-
-            //GNOME
-            foreach (var type in lstType)
-            {
-                lstCmd.AddRange(GetSetCmd4Gnome(type, host, port));
-            }
-            if (exceptions.IsNotEmpty())
-            {
-                lstCmd.AddRange(GetSetCmd4Gnome("exceptions", exceptions, 0));
-            }
-
-            if (isKde)
-            {
-                foreach (var type in lstType)
-                {
-                    lstCmd.AddRange(GetSetCmd4Kde(type, host, port, configDir));
-                }
-                if (exceptions.IsNotEmpty())
-                {
-                    lstCmd.AddRange(GetSetCmd4Kde("exceptions", exceptions, 0, configDir));
-                }
-
-                // Notify system to reload
-                lstCmd.Add(new CmdItem()
-                {
-                    Cmd = "dbus-send",
-                    Arguments = ["--type=signal", "/KIO/Scheduler", "org.kde.KIO.Scheduler.reparseSlaveConfiguration", "string:''"]
-                });
-            }
-            return lstCmd;
-        }
-
-        private static List<CmdItem> GetUnsetCmds()
-        {
-            var isKde = IsKde(out var configDir);
-            List<CmdItem> lstCmd = [];
-
-            //GNOME
-            lstCmd.Add(new CmdItem()
-            {
-                Cmd = "gsettings",
-                Arguments = ["set", "org.gnome.system.proxy", "mode", "none"]
-            });
-
-            if (isKde)
-            {
-                lstCmd.Add(new CmdItem()
-                {
-                    Cmd = GetKdeVersion(),
-                    Arguments = ["--file", $"{configDir}/kioslaverc", "--group", "Proxy Settings", "--key", "ProxyType", "0"]
-                });
-
-                // Notify system to reload
-                lstCmd.Add(new CmdItem()
-                {
-                    Cmd = "dbus-send",
-                    Arguments = ["--type=signal", "/KIO/Scheduler", "org.kde.KIO.Scheduler.reparseSlaveConfiguration", "string:''"]
-                });
-            }
-            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 desktop2 = Environment.GetEnvironmentVariable("XDG_SESSION_DESKTOP");
-            var isKde = string.Equals(desktop, "KDE", StringComparison.OrdinalIgnoreCase)
-                        || string.Equals(desktop, "plasma", StringComparison.OrdinalIgnoreCase)
-                        || string.Equals(desktop2, "KDE", StringComparison.OrdinalIgnoreCase)
-                        || string.Equals(desktop2, "plasma", 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"
-            };
-        }
+        await Utils.GetCliWrapOutput(fileName, args);
     }
 }

v2rayN/ServiceLib/Handler/SysProxy/ProxySettingOSX.cs

@@ -1,101 +1,37 @@
-namespace ServiceLib.Handler.SysProxy
-{
-    public class ProxySettingOSX
-    {
-        /// <summary>
-        /// 应用接口类型
-        /// </summary>
-        private static readonly List<string> LstInterface = ["Ethernet", "Wi-Fi", "Thunderbolt Bridge", "USB 10/100/1000 LAN"];
+namespace ServiceLib.Handler.SysProxy;
 
-        /// <summary>
-        /// 代理类型，对应 http,https,socks
-        /// </summary>
-        private static readonly List<string> LstTypes = ["setwebproxy", "setsecurewebproxy", "setsocksfirewallproxy"];
+public class ProxySettingOSX
+{
+    private static readonly string _proxySetFileName = $"{Global.ProxySetOSXShellFileName.Replace(Global.NamespaceSample, "")}.sh";
 
     public static async Task SetProxy(string host, int port, string exceptions)
     {
-            var lstInterface = await GetListNetworkServices();
-            var lstCmd = GetSetCmds(lstInterface, host, port, exceptions);
-            await ExecCmd(lstCmd);
+        List<string> args = ["set", host, port.ToString()];
+        if (exceptions.IsNotEmpty())
+        {
+            args.AddRange(exceptions.Split(','));
+        }
+
+        await ExecCmd(args);
     }
 
     public static async Task UnsetProxy()
     {
-            var lstInterface = await GetListNetworkServices();
-            var lstCmd = GetUnsetCmds(lstInterface);
-            await ExecCmd(lstCmd);
+        List<string> args = ["clear"];
+        await ExecCmd(args);
     }
 
-        private static async Task ExecCmd(List<CmdItem> lstCmd)
+    private static async Task ExecCmd(List<string> args)
     {
-            foreach (var cmd in lstCmd)
+        var fileName = Utils.GetBinConfigPath(_proxySetFileName);
+        if (!File.Exists(fileName))
         {
-                if (cmd is null || cmd.Cmd.IsNullOrEmpty() || cmd.Arguments is null)
-                {
-                    continue;
+            var contents = EmbedUtils.GetEmbedText(Global.ProxySetOSXShellFileName);
+            await File.AppendAllTextAsync(fileName, contents);
+
+            await Utils.SetLinuxChmod(fileName);
         }
 
-                await Task.Delay(10);
-                await Utils.GetCliWrapOutput(cmd.Cmd, cmd.Arguments);
-            }
-        }
-
-        private static List<CmdItem> GetSetCmds(List<string> lstInterface, 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<string> lstInterface)
-        {
-            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;
-        }
-
-        public static async Task<List<string>> GetListNetworkServices()
-        {
-            var services = await Utils.GetListNetworkServices();
-            if (services.IsNullOrEmpty())
-            {
-                return LstInterface;
-            }
-
-            var lst = services.Split(Environment.NewLine).Where(t => t.Length > 0 && t.Contains('*') == false);
-            return lst.ToList();
-        }
+        await Utils.GetCliWrapOutput(fileName, args);
     }
 }

v2rayN/ServiceLib/Handler/SysProxy/ProxySettingWindows.cs

@@ -1,10 +1,10 @@
 using System.Runtime.InteropServices;
 using static ServiceLib.Handler.SysProxy.ProxySettingWindows.InternetConnectionOption;
 
-namespace ServiceLib.Handler.SysProxy
+namespace ServiceLib.Handler.SysProxy;
+
+public class ProxySettingWindows
 {
-    public class ProxySettingWindows
-    {
     private const string _regPath = @"Software\Microsoft\Windows\CurrentVersion\Internet Settings";
 
     private static bool SetProxyFallback(string? strProxy, string? exceptions, int type)
@@ -60,7 +60,7 @@ namespace ServiceLib.Handler.SysProxy
         try
         {
             // set proxy for LAN
-                bool result = SetConnectionProxy(null, strProxy, exceptions, type);
+            var result = SetConnectionProxy(null, strProxy, exceptions, type);
             // set proxy for dial up connections
             var connections = EnumerateRasEntries();
             foreach (var connection in connections)
@@ -71,27 +71,27 @@ namespace ServiceLib.Handler.SysProxy
         }
         catch
         {
-                SetProxyFallback(strProxy, exceptions, type);
+            _ = SetProxyFallback(strProxy, exceptions, type);
             return false;
         }
     }
 
     private static bool SetConnectionProxy(string? connectionName, string? strProxy, string? exceptions, int type)
     {
-            InternetPerConnOptionList list = new();
+        var list = new InternetPerConnOptionList();
 
-            int optionCount = 1;
+        var optionCount = 1;
         if (type == 1) // No proxy
         {
             optionCount = 1;
         }
         else if (type is 2 or 4) // named proxy or autoproxy script URL
         {
-                optionCount = string.IsNullOrEmpty(exceptions) ? 2 : 3;
+            optionCount = exceptions.IsNullOrEmpty() ? 2 : 3;
         }
 
-            int m_Int = (int)PerConnFlags.PROXY_TYPE_DIRECT;
-            PerConnOption m_Option = PerConnOption.INTERNET_PER_CONN_FLAGS;
+        var m_Int = (int)PerConnFlags.PROXY_TYPE_DIRECT;
+        var m_Option = PerConnOption.INTERNET_PER_CONN_FLAGS;
         if (type == 2) // named proxy
         {
             m_Int = (int)(PerConnFlags.PROXY_TYPE_DIRECT | PerConnFlags.PROXY_TYPE_PROXY);
@@ -103,11 +103,9 @@ namespace ServiceLib.Handler.SysProxy
             m_Option = PerConnOption.INTERNET_PER_CONN_AUTOCONFIG_URL;
         }
 
-            //int optionCount = Utile.IsNullOrEmpty(strProxy) ? 1 : (Utile.IsNullOrEmpty(exceptions) ? 2 : 3);
-            InternetConnectionOption[] options = new InternetConnectionOption[optionCount];
+        var options = new InternetConnectionOption[optionCount];
         // USE a proxy server ...
         options[0].m_Option = PerConnOption.INTERNET_PER_CONN_FLAGS;
-            //options[0].m_Value.m_Int = (int)((optionCount < 2) ? PerConnFlags.PROXY_TYPE_DIRECT : (PerConnFlags.PROXY_TYPE_DIRECT | PerConnFlags.PROXY_TYPE_PROXY));
         options[0].m_Value.m_Int = m_Int;
         // use THIS proxy server
         if (optionCount > 1)
@@ -135,20 +133,20 @@ namespace ServiceLib.Handler.SysProxy
         list.dwOptionCount = options.Length;
         list.dwOptionError = 0;
 
-            int optSize = Marshal.SizeOf(typeof(InternetConnectionOption));
+        var optSize = Marshal.SizeOf(typeof(InternetConnectionOption));
         // make a pointer out of all that ...
-            nint optionsPtr = Marshal.AllocCoTaskMem(optSize * options.Length); // !! remember to deallocate memory 4
+        var optionsPtr = Marshal.AllocCoTaskMem(optSize * options.Length); // !! remember to deallocate memory 4
                                                                            // copy the array over into that spot in memory ...
-            for (int i = 0; i < options.Length; ++i)
+        for (var i = 0; i < options.Length; ++i)
         {
             if (Environment.Is64BitOperatingSystem)
             {
-                    nint opt = new(optionsPtr.ToInt64() + (i * optSize));
+                var opt = new nint(optionsPtr.ToInt64() + (i * optSize));
                 Marshal.StructureToPtr(options[i], opt, false);
             }
             else
             {
-                    nint opt = new(optionsPtr.ToInt32() + (i * optSize));
+                var opt = new nint(optionsPtr.ToInt32() + (i * optSize));
                 Marshal.StructureToPtr(options[i], opt, false);
             }
         }
@@ -156,14 +154,14 @@ namespace ServiceLib.Handler.SysProxy
         list.options = optionsPtr;
 
         // and then make a pointer out of the whole list
-            nint ipcoListPtr = Marshal.AllocCoTaskMem(list.dwSize); // !! remember to deallocate memory 5
+        var ipcoListPtr = Marshal.AllocCoTaskMem(list.dwSize); // !! remember to deallocate memory 5
         Marshal.StructureToPtr(list, ipcoListPtr, false);
 
         // and finally, call the API method!
-            bool isSuccess = NativeMethods.InternetSetOption(nint.Zero,
+        var isSuccess = NativeMethods.InternetSetOption(nint.Zero,
            InternetOption.INTERNET_OPTION_PER_CONNECTION_OPTION,
            ipcoListPtr, list.dwSize);
-            int returnvalue = 0; // ERROR_SUCCESS
+        var returnvalue = 0; // ERROR_SUCCESS
         if (!isSuccess)
         {  // get the error codes, they might be helpful
             returnvalue = Marshal.GetLastPInvokeError();
@@ -171,13 +169,15 @@ namespace ServiceLib.Handler.SysProxy
         else
         {
             // Notify the system that the registry settings have been changed and cause them to be refreshed
-                NativeMethods.InternetSetOption(nint.Zero, InternetOption.INTERNET_OPTION_SETTINGS_CHANGED, nint.Zero, 0);
-                NativeMethods.InternetSetOption(nint.Zero, InternetOption.INTERNET_OPTION_REFRESH, nint.Zero, 0);
+            _ = NativeMethods.InternetSetOption(nint.Zero, InternetOption.INTERNET_OPTION_SETTINGS_CHANGED, nint.Zero, 0);
+            _ = NativeMethods.InternetSetOption(nint.Zero, InternetOption.INTERNET_OPTION_REFRESH, nint.Zero, 0);
         }
 
         // FREE the data ASAP
         if (list.szConnection != nint.Zero)
+        {
             Marshal.FreeHGlobal(list.szConnection); // release mem 3
+        }
         if (optionCount > 1)
         {
             Marshal.FreeHGlobal(options[1].m_Value.m_StringPtr); // release mem 1
@@ -204,18 +204,18 @@ namespace ServiceLib.Handler.SysProxy
     /// <exception cref="ApplicationException">Error message with win32 error code</exception>
     private static IEnumerable<string> EnumerateRasEntries()
     {
-            int entries = 0;
+        var entries = 0;
         // attempt to query with 1 entry buffer
-            RASENTRYNAME[] rasEntryNames = new RASENTRYNAME[1];
-            int bufferSize = Marshal.SizeOf(typeof(RASENTRYNAME));
+        var rasEntryNames = new RASENTRYNAME[1];
+        var bufferSize = Marshal.SizeOf(typeof(RASENTRYNAME));
         rasEntryNames[0].dwSize = Marshal.SizeOf(typeof(RASENTRYNAME));
 
-            uint result = NativeMethods.RasEnumEntries(null, null, rasEntryNames, ref bufferSize, ref entries);
+        var result = NativeMethods.RasEnumEntries(null, null, rasEntryNames, ref bufferSize, ref entries);
         // increase buffer if the buffer is not large enough
         if (result == (uint)ErrorCode.ERROR_BUFFER_TOO_SMALL)
         {
             rasEntryNames = new RASENTRYNAME[bufferSize / Marshal.SizeOf(typeof(RASENTRYNAME))];
-                for (int i = 0; i < rasEntryNames.Length; i++)
+            for (var i = 0; i < rasEntryNames.Length; i++)
             {
                 rasEntryNames[i].dwSize = Marshal.SizeOf(typeof(RASENTRYNAME));
             }
@@ -225,7 +225,7 @@ namespace ServiceLib.Handler.SysProxy
         if (result == 0)
         {
             var entryNames = new List<string>();
-                for (int i = 0; i < entries; i++)
+            for (var i = 0; i < entries; i++)
             {
                 entryNames.Add(rasEntryNames[i].szEntryName);
             }
@@ -356,5 +356,4 @@ namespace ServiceLib.Handler.SysProxy
             ref int lpcEntries        // Number of entries written to the buffer
         );
     }
-    }
 }

v2rayN/ServiceLib/Handler/SysProxy/SysProxyHandler.cs

@@ -1,7 +1,7 @@
-namespace ServiceLib.Handler.SysProxy
+namespace ServiceLib.Handler.SysProxy;
+
+public static class SysProxyHandler
 {
-    public static class SysProxyHandler
-    {
     private static readonly string _tag = "SysProxyHandler";
 
     public static async Task<bool> UpdateSysProxy(Config config, bool forceDisable)
@@ -75,7 +75,7 @@
         }
 
         strProxy = string.Empty;
-            if (Utils.IsNullOrEmpty(config.SystemProxyItem.SystemProxyAdvancedProtocol))
+        if (config.SystemProxyItem.SystemProxyAdvancedProtocol.IsNullOrEmpty())
         {
             strProxy = $"{Global.Loopback}:{port}";
         }
@@ -95,5 +95,4 @@
         var strProxy = $"{Global.HttpProtocol}{Global.Loopback}:{portPac}/pac?t={DateTime.Now.Ticks}";
         ProxySettingWindows.SetProxy(strProxy, "", 4);
     }
-    }
 }

v2rayN/ServiceLib/Handler/TaskHandler.cs

@@ -1,72 +1,97 @@
-namespace ServiceLib.Handler
+namespace ServiceLib.Handler;
+
+public class TaskHandler
 {
-    public class TaskHandler
-    {
     private static readonly Lazy<TaskHandler> _instance = new(() => new());
     public static TaskHandler Instance => _instance.Value;
 
     public void RegUpdateTask(Config config, Action<bool, string> updateFunc)
     {
-            Task.Run(() => UpdateTaskRunSubscription(config, updateFunc));
-            Task.Run(() => UpdateTaskRunGeo(config, updateFunc));
+        Task.Run(() => ScheduledTasks(config, updateFunc));
+    }
+
+    private async Task ScheduledTasks(Config config, Action<bool, string> updateFunc)
+    {
+        Logging.SaveLog("Setup Scheduled Tasks");
+
+        var numOfExecuted = 1;
+        while (true)
+        {
+            //1 minute
+            await Task.Delay(1000 * 60);
+
+            //Execute once 1 minute
+            await UpdateTaskRunSubscription(config, updateFunc);
+
+            //Execute once 20 minute
+            if (numOfExecuted % 20 == 0)
+            {
+                //Logging.SaveLog("Execute save config");
+
+                await ConfigHandler.SaveConfig(config);
+                await ProfileExHandler.Instance.SaveTo();
+            }
+
+            //Execute once 1 hour
+            if (numOfExecuted % 60 == 0)
+            {
+                //Logging.SaveLog("Execute delete expired files");
+
+                FileManager.DeleteExpiredFiles(Utils.GetBinConfigPath(), DateTime.Now.AddHours(-1));
+                FileManager.DeleteExpiredFiles(Utils.GetLogPath(), DateTime.Now.AddMonths(-1));
+                FileManager.DeleteExpiredFiles(Utils.GetTempPath(), DateTime.Now.AddMonths(-1));
+
+                //Check once 1 hour
+                await UpdateTaskRunGeo(config, numOfExecuted / 60, updateFunc);
+            }
+
+            numOfExecuted++;
+        }
     }
 
     private async Task UpdateTaskRunSubscription(Config config, Action<bool, string> updateFunc)
-        {
-            await Task.Delay(60000);
-            Logging.SaveLog("UpdateTaskRunSubscription");
-
-            var updateHandle = new UpdateService();
-            while (true)
     {
         var updateTime = ((DateTimeOffset)DateTime.Now).ToUnixTimeSeconds();
-                var lstSubs = (await AppHandler.Instance.SubItems())
+        var lstSubs = (await AppHandler.Instance.SubItems())?
             .Where(t => t.AutoUpdateInterval > 0)
             .Where(t => updateTime - t.UpdateTime >= t.AutoUpdateInterval * 60)
             .ToList();
 
+        if (lstSubs is not { Count: > 0 })
+        {
+            return;
+        }
+
+        Logging.SaveLog("Execute update subscription");
+        var updateHandle = new UpdateService();
+
         foreach (var item in lstSubs)
         {
             await updateHandle.UpdateSubscriptionProcess(config, item.Id, true, (bool success, string msg) =>
             {
                 updateFunc?.Invoke(success, msg);
                 if (success)
-                                Logging.SaveLog("subscription" + msg);
+                {
+                    Logging.SaveLog($"Update subscription end. {msg}");
+                }
             });
             item.UpdateTime = updateTime;
             await ConfigHandler.AddSubItem(config, item);
-
-                    await Task.Delay(5000);
-                }
-                await Task.Delay(60000);
+            await Task.Delay(1000);
         }
     }
 
-        private async Task UpdateTaskRunGeo(Config config, Action<bool, string> updateFunc)
+    private async Task UpdateTaskRunGeo(Config config, int hours, Action<bool, string> updateFunc)
     {
-            var autoUpdateGeoTime = DateTime.Now;
-
-            //await Task.Delay(1000 * 120);
-            Logging.SaveLog("UpdateTaskRunGeo");
+        if (config.GuiItem.AutoUpdateInterval > 0 && hours > 0 && hours % config.GuiItem.AutoUpdateInterval == 0)
+        {
+            Logging.SaveLog("Execute update geo files");
 
             var updateHandle = new UpdateService();
-            while (true)
-            {
-                await Task.Delay(1000 * 3600);
-
-                var dtNow = DateTime.Now;
-                if (config.GuiItem.AutoUpdateInterval > 0)
-                {
-                    if ((dtNow - autoUpdateGeoTime).Hours % config.GuiItem.AutoUpdateInterval == 0)
-                    {
             await updateHandle.UpdateGeoFileAll(config, (bool success, string msg) =>
             {
                 updateFunc?.Invoke(false, msg);
             });
-                        autoUpdateGeoTime = dtNow;
-                    }
-                }
-            }
         }
     }
 }

v2rayN/ServiceLib/Handler/WebDavHandler.cs

@@ -1,14 +1,14 @@
 using System.Net;
 using WebDav;
 
-namespace ServiceLib.Handler
+namespace ServiceLib.Handler;
+
+public sealed class WebDavHandler
 {
-    public sealed class WebDavHandler
-    {
     private static readonly Lazy<WebDavHandler> _instance = new(() => new());
     public static WebDavHandler Instance => _instance.Value;
 
-        private Config? _config;
+    private readonly Config? _config;
     private WebDavClient? _client;
     private string? _lastDescription;
     private string _webDir = Global.AppName + "_backup";
@@ -62,7 +62,9 @@ namespace ServiceLib.Handler
     private async Task<bool> TryCreateDir()
     {
         if (_client is null)
+        {
             return false;
+        }
         try
         {
             var result2 = await _client.Mkcol(_webDir);
@@ -176,5 +178,4 @@ namespace ServiceLib.Handler
     }
 
     public string GetLastError() => _lastDescription ?? string.Empty;
-    }
 }

v2rayN/ServiceLib/Models/CheckUpdateModel.cs

@@ -1,11 +1,10 @@
-namespace ServiceLib.Models
+namespace ServiceLib.Models;
+
+public class CheckUpdateModel
 {
-    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

@@ -1,7 +1,7 @@
-namespace ServiceLib.Models
+namespace ServiceLib.Models;
+
+public class ClashConnectionModel
 {
-    public class ClashConnectionModel
-    {
     public string? Id { get; set; }
     public string? Network { get; set; }
     public string? Type { get; set; }
@@ -13,5 +13,4 @@
     public double Time { get; set; }
     public string? Elapsed { get; set; }
     public string? Chain { get; set; }
-    }
 }

v2rayN/ServiceLib/Models/ClashConnections.cs

@@ -1,14 +1,14 @@
-namespace ServiceLib.Models
+namespace ServiceLib.Models;
+
+public class ClashConnections
 {
-    public class ClashConnections
-    {
     public ulong downloadTotal { get; set; }
     public ulong uploadTotal { get; set; }
     public List<ConnectionItem>? connections { get; set; }
-    }
+}
 
-    public class ConnectionItem
-    {
+public class ConnectionItem
+{
     public string? id { get; set; }
     public MetadataItem? metadata { get; set; }
     public ulong upload { get; set; }
@@ -17,10 +17,10 @@
     public List<string>? chains { get; set; }
     public string? rule { get; set; }
     public string? rulePayload { get; set; }
-    }
+}
 
-    public class MetadataItem
-    {
+public class MetadataItem
+{
     public string? network { get; set; }
     public string? type { get; set; }
     public string? sourceIP { get; set; }
@@ -33,5 +33,4 @@
     public string? process { get; set; }
     public string? processPath { get; set; }
     public string? remoteDestination { get; set; }
-    }
 }

v2rayN/ServiceLib/Models/ClashProviders.cs

@@ -1,9 +1,9 @@
-using static ServiceLib.Models.ClashProxies;
+using static ServiceLib.Models.ClashProxies;
 
-namespace ServiceLib.Models
+namespace ServiceLib.Models;
+
+public class ClashProviders
 {
-    public class ClashProviders
-    {
     public Dictionary<string, ProvidersItem>? providers { get; set; }
 
     public class ProvidersItem
@@ -13,5 +13,4 @@ namespace ServiceLib.Models
         public string? type { get; set; }
         public string? vehicleType { get; set; }
     }
-    }
 }

v2rayN/ServiceLib/Models/ClashProxies.cs

@@ -1,7 +1,7 @@
-namespace ServiceLib.Models
+namespace ServiceLib.Models;
+
+public class ClashProxies
 {
-    public class ClashProxies
-    {
     public Dictionary<string, ProxiesItem>? proxies { get; set; }
 
     public class ProxiesItem
@@ -20,5 +20,4 @@
         public string? time { get; set; }
         public int delay { get; set; }
     }
-    }
 }

v2rayN/ServiceLib/Models/ClashProxyModel.cs

@@ -1,8 +1,8 @@
-namespace ServiceLib.Models
+namespace ServiceLib.Models;
+
+[Serializable]
+public class ClashProxyModel
 {
-    [Serializable]
-    public class ClashProxyModel
-    {
     public string? Name { get; set; }
 
     public string? Type { get; set; }
@@ -14,5 +14,4 @@
     public string? DelayName { get; set; }
 
     public bool IsActive { get; set; }
-    }
 }

v2rayN/ServiceLib/Models/CmdItem.cs

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

v2rayN/ServiceLib/Models/ComboItem.cs

@@ -1,7 +1,7 @@
-namespace ServiceLib.Models
+namespace ServiceLib.Models;
+
+public class ComboItem
 {
-    public class ComboItem
-    {
     public string? ID
     {
         get; set;
@@ -11,5 +11,4 @@
     {
         get; set;
     }
-    }
 }

v2rayN/ServiceLib/Models/Config.cs

@@ -1,11 +1,8 @@
-namespace ServiceLib.Models
+namespace ServiceLib.Models;
+
+[Serializable]
+public class Config
 {
-    /// <summary>
-    /// 本软件配置文件实体类
-    /// </summary>
-    [Serializable]
-    public class Config
-    {
     #region property
 
     public string IndexId { get; set; }
@@ -53,5 +50,4 @@
     public List<CoreTypeItem> CoreTypeItem { get; set; }
 
     #endregion other entities
-    }
 }

v2rayN/ServiceLib/Models/ConfigItems.cs

@@ -1,8 +1,8 @@
-namespace ServiceLib.Models
+namespace ServiceLib.Models;
+
+[Serializable]
+public class CoreBasicItem
 {
-    [Serializable]
-    public class CoreBasicItem
-    {
     public bool LogEnabled { get; set; }
 
     public string Loglevel { get; set; }
@@ -18,11 +18,11 @@ namespace ServiceLib.Models
     public bool EnableFragment { get; set; }
 
     public bool EnableCacheFile4Sbox { get; set; } = true;
-    }
+}
 
-    [Serializable]
-    public class InItem
-    {
+[Serializable]
+public class InItem
+{
     public int LocalPort { get; set; }
     public string Protocol { get; set; }
     public bool UdpEnabled { get; set; }
@@ -34,11 +34,11 @@ namespace ServiceLib.Models
     public string User { get; set; }
     public string Pass { get; set; }
     public bool SecondLocalPortEnabled { get; set; }
-    }
+}
 
-    [Serializable]
-    public class KcpItem
-    {
+[Serializable]
+public class KcpItem
+{
     public int Mtu { get; set; }
 
     public int Tti { get; set; }
@@ -52,20 +52,20 @@ namespace ServiceLib.Models
     public int ReadBufferSize { get; set; }
 
     public int WriteBufferSize { get; set; }
-    }
+}
 
-    [Serializable]
-    public class GrpcItem
-    {
+[Serializable]
+public class GrpcItem
+{
     public int? IdleTimeout { get; set; }
     public int? HealthCheckTimeout { get; set; }
     public bool? PermitWithoutStream { get; set; }
     public int? InitialWindowsSize { get; set; }
-    }
+}
 
-    [Serializable]
-    public class GUIItem
-    {
+[Serializable]
+public class GUIItem
+{
     public bool AutoRun { get; set; }
     public bool EnableStatistics { get; set; }
     public bool DisplayRealTimeSpeed { get; set; }
@@ -75,18 +75,18 @@ namespace ServiceLib.Models
     public int TrayMenuServersLimit { get; set; } = 20;
     public bool EnableHWA { get; set; } = false;
     public bool EnableLog { get; set; } = true;
-    }
+}
 
-    [Serializable]
-    public class MsgUIItem
-    {
+[Serializable]
+public class MsgUIItem
+{
     public string? MainMsgFilter { get; set; }
     public bool? AutoRefresh { get; set; }
-    }
+}
 
-    [Serializable]
-    public class UIItem
-    {
+[Serializable]
+public class UIItem
+{
     public bool EnableAutoAdjustMainLvColWidth { get; set; }
     public bool EnableUpdateSubOnlyRemarksExist { get; set; }
     public double MainWidth { get; set; }
@@ -105,20 +105,20 @@ namespace ServiceLib.Models
     public bool Hide2TrayWhenClose { get; set; }
     public List<ColumnItem> MainColumnItem { get; set; }
     public bool ShowInTaskbar { get; set; }
-    }
+}
 
-    [Serializable]
-    public class ConstItem
-    {
+[Serializable]
+public class ConstItem
+{
     public string? SubConvertUrl { get; set; }
     public string? GeoSourceUrl { get; set; }
     public string? SrsSourceUrl { get; set; }
     public string? RouteRulesTemplateSourceUrl { get; set; }
-    }
+}
 
-    [Serializable]
-    public class KeyEventItem
-    {
+[Serializable]
+public class KeyEventItem
+{
     public EGlobalHotkey EGlobalHotkey { get; set; }
 
     public bool Alt { get; set; }
@@ -128,19 +128,19 @@ namespace ServiceLib.Models
     public bool Shift { get; set; }
 
     public int? KeyCode { get; set; }
-    }
+}
 
-    [Serializable]
-    public class CoreTypeItem
-    {
+[Serializable]
+public class CoreTypeItem
+{
     public EConfigType ConfigType { get; set; }
 
     public ECoreType CoreType { get; set; }
-    }
+}
 
-    [Serializable]
-    public class TunModeItem
-    {
+[Serializable]
+public class TunModeItem
+{
     public bool EnableTun { get; set; }
     public bool StrictRoute { get; set; } = true;
     public string Stack { get; set; }
@@ -148,60 +148,61 @@ namespace ServiceLib.Models
     public bool EnableExInbound { get; set; }
     public bool EnableIPv6Address { get; set; }
     public string? LinuxSudoPwd { get; set; }
-    }
+}
 
-    [Serializable]
-    public class SpeedTestItem
-    {
+[Serializable]
+public class SpeedTestItem
+{
     public int SpeedTestTimeout { get; set; }
     public string SpeedTestUrl { get; set; }
     public string SpeedPingTestUrl { get; set; }
     public int MixedConcurrencyCount { get; set; }
-    }
+}
 
-    [Serializable]
-    public class RoutingBasicItem
-    {
+[Serializable]
+public class RoutingBasicItem
+{
     public string DomainStrategy { get; set; }
     public string DomainStrategy4Singbox { get; set; }
     public string DomainMatcher { get; set; }
     public string RoutingIndexId { get; set; }
-    }
+}
 
-    [Serializable]
-    public class ColumnItem
-    {
+[Serializable]
+public class ColumnItem
+{
     public string Name { get; set; }
     public int Width { get; set; }
     public int Index { get; set; }
-    }
+}
 
-    [Serializable]
-    public class Mux4RayItem
-    {
+[Serializable]
+public class Mux4RayItem
+{
     public int? Concurrency { get; set; }
     public int? XudpConcurrency { get; set; }
     public string? XudpProxyUDP443 { get; set; }
-    }
+}
 
-    [Serializable]
-    public class Mux4SboxItem
-    {
+[Serializable]
+public class Mux4SboxItem
+{
     public string Protocol { get; set; }
     public int MaxConnections { get; set; }
     public bool? Padding { get; set; }
-    }
+}
 
-    [Serializable]
-    public class HysteriaItem
-    {
+[Serializable]
+public class HysteriaItem
+{
     public int UpMbps { get; set; }
     public int DownMbps { get; set; }
-    }
+    public int HopInterval { get; set; } = 30;
+}
 
-    [Serializable]
-    public class ClashUIItem
-    {
+[Serializable]
+public class ClashUIItem
+{
     public ERuleMode RuleMode { get; set; }
     public bool EnableIPv6 { get; set; }
     public bool EnableMixinContent { get; set; }
@@ -210,38 +211,37 @@ namespace ServiceLib.Models
     public int ProxiesAutoDelayTestInterval { get; set; } = 10;
     public bool ConnectionsAutoRefresh { get; set; }
     public int ConnectionsRefreshInterval { get; set; } = 2;
-    }
+}
 
-    [Serializable]
-    public class SystemProxyItem
-    {
+[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; }
-    }
+}
 
-    [Serializable]
-    public class WebDavItem
-    {
+[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
-    {
+[Serializable]
+public class CheckUpdateItem
+{
     public bool CheckPreReleaseUpdate { get; set; }
     public List<string>? SelectedCoreTypes { get; set; }
-    }
+}
 
-    [Serializable]
-    public class Fragment4RayItem
-    {
+[Serializable]
+public class Fragment4RayItem
+{
     public string? Packets { get; set; }
     public string? Length { get; set; }
     public string? Interval { get; set; }
-    }
 }

v2rayN/ServiceLib/Models/CoreInfo.cs

@@ -1,8 +1,8 @@
-namespace ServiceLib.Models
+namespace ServiceLib.Models;
+
+[Serializable]
+public class CoreInfo
 {
-    [Serializable]
-    public class CoreInfo
-    {
     public ECoreType CoreType { get; set; }
     public List<string>? CoreExes { get; set; }
     public string? Arguments { get; set; }
@@ -17,5 +17,4 @@ namespace ServiceLib.Models
     public string? Match { get; set; }
     public string? VersionArg { get; set; }
     public bool AbsolutePath { get; set; }
-    }
 }

v2rayN/ServiceLib/Models/DNSItem.cs

@@ -1,10 +1,10 @@
-using SQLite;
+using SQLite;
 
-namespace ServiceLib.Models
+namespace ServiceLib.Models;
+
+[Serializable]
+public class DNSItem
 {
-    [Serializable]
-    public class DNSItem
-    {
     [PrimaryKey]
     public string Id { get; set; }
 
@@ -16,5 +16,4 @@ namespace ServiceLib.Models
     public string? TunDNS { get; set; }
     public string? DomainStrategy4Freedom { get; set; }
     public string? DomainDNSAddress { get; set; }
-    }
 }

v2rayN/ServiceLib/Models/GitHubRelease.cs

@@ -1,9 +1,9 @@
-using System.Text.Json.Serialization;
+using System.Text.Json.Serialization;
 
-namespace ServiceLib.Models
+namespace ServiceLib.Models;
+
+public class GitHubReleaseAsset
 {
-    public class GitHubReleaseAsset
-    {
     [JsonPropertyName("url")] public string? Url { get; set; }
 
     [JsonPropertyName("id")] public int Id { get; set; }
@@ -27,10 +27,10 @@ namespace ServiceLib.Models
     [JsonPropertyName("updated_at")] public DateTime UpdatedAt { get; set; }
 
     [JsonPropertyName("browser_download_url")] public string? BrowserDownloadUrl { get; set; }
-    }
+}
 
-    public class GitHubRelease
-    {
+public class GitHubRelease
+{
     [JsonPropertyName("url")] public string? Url { get; set; }
 
     [JsonPropertyName("assets_url")] public string? AssetsUrl { get; set; }
@@ -64,5 +64,4 @@ namespace ServiceLib.Models
     [JsonPropertyName("zipball_url")] public string? ZipballUrl { get; set; }
 
     [JsonPropertyName("body")] public string? Body { get; set; }
-    }
 }

v2rayN/ServiceLib/Models/IPAPIInfo.cs

@@ -1,7 +1,7 @@
-namespace ServiceLib.Models
+namespace ServiceLib.Models;
+
+internal class IPAPIInfo
 {
-    internal class IPAPIInfo
-    {
     public string? ip { get; set; }
     public string? city { get; set; }
     public string? region { get; set; }
@@ -9,5 +9,4 @@
     public string? country { get; set; }
     public string? country_name { get; set; }
     public string? country_code { get; set; }
-    }
 }

v2rayN/ServiceLib/Models/ProfileExItem.cs

@@ -1,10 +1,10 @@
 using SQLite;
 
-namespace ServiceLib.Models
+namespace ServiceLib.Models;
+
+[Serializable]
+public class ProfileExItem
 {
-    [Serializable]
-    public class ProfileExItem
-    {
     [PrimaryKey]
     public string IndexId { get; set; }
 
@@ -12,5 +12,4 @@ namespace ServiceLib.Models
     public decimal Speed { get; set; }
     public int Sort { get; set; }
     public string? Message { get; set; }
-    }
 }

v2rayN/ServiceLib/Models/ProfileItem.cs

@@ -1,10 +1,10 @@
-using SQLite;
+using SQLite;
 
-namespace ServiceLib.Models
+namespace ServiceLib.Models;
+
+[Serializable]
+public class ProfileItem
 {
-    [Serializable]
-    public class ProfileItem
-    {
     public ProfileItem()
     {
         IndexId = string.Empty;
@@ -48,12 +48,12 @@ namespace ServiceLib.Models
 
     public List<string>? GetAlpn()
     {
-            return Utils.IsNullOrEmpty(Alpn) ? null : Utils.String2List(Alpn);
+        return Alpn.IsNullOrEmpty() ? null : Utils.String2List(Alpn);
     }
 
     public string GetNetwork()
     {
-            if (Utils.IsNullOrEmpty(Network) || !Global.Networks.Contains(Network))
+        if (Network.IsNullOrEmpty() || !Global.Networks.Contains(Network))
         {
             return Global.DefaultNetwork;
         }
@@ -69,6 +69,7 @@ namespace ServiceLib.Models
     public int ConfigVersion { get; set; }
     public string Address { get; set; }
     public int Port { get; set; }
+    public string Ports { get; set; }
     public string Id { get; set; }
     public int AlterId { get; set; }
     public string Security { get; set; }
@@ -92,5 +93,4 @@ namespace ServiceLib.Models
     public string ShortId { get; set; }
     public string SpiderX { get; set; }
     public string Extra { get; set; }
-    }
 }

v2rayN/ServiceLib/Models/ProfileItemModel.cs

@@ -1,8 +1,8 @@
-namespace ServiceLib.Models
+namespace ServiceLib.Models;
+
+[Serializable]
+public class ProfileItemModel : ProfileItem
 {
-    [Serializable]
-    public class ProfileItemModel : ProfileItem
-    {
     public bool IsActive { get; set; }
     public string SubRemarks { get; set; }
     public int Delay { get; set; }
@@ -14,5 +14,4 @@
     public string TodayDown { get; set; }
     public string TotalUp { get; set; }
     public string TotalDown { get; set; }
-    }
 }