Fix Observatory (#7437)

* Enables concurrency for observatory

* Adds burst observatory for least load balancer

.editorconfig

@@ -0,0 +1,170 @@
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+tab_width = 4
+indent_size = 4
+end_of_line = crlf
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.{yml,yaml}]
+indent_style = space
+indent_size = 2
+
+[*.cs]
+dotnet_hide_advanced_members = true
+dotnet_member_insertion_location = with_other_members_of_the_same_kind
+dotnet_property_generation_behavior = prefer_throwing_properties
+dotnet_search_reference_assemblies = true
+dotnet_separate_import_directive_groups = false:warning
+dotnet_sort_system_directives_first = true:warning
+file_header_template = unset
+
+dotnet_style_qualification_for_event = false:warning
+dotnet_style_qualification_for_field = false:warning
+dotnet_style_qualification_for_method = false:warning
+dotnet_style_qualification_for_property = false:warning
+dotnet_style_predefined_type_for_locals_parameters_members = true:warning
+dotnet_style_predefined_type_for_member_access = true:warning
+dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:warning
+dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:warning
+dotnet_style_parentheses_in_other_operators = always_for_clarity:warning
+dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:warning
+dotnet_style_require_accessibility_modifiers = always:warning
+dotnet_prefer_system_hash_code = true:warning
+dotnet_style_coalesce_expression = true:warning
+dotnet_style_collection_initializer = false:warning
+dotnet_style_explicit_tuple_names = true:warning
+dotnet_style_namespace_match_folder = true:warning
+dotnet_style_null_propagation = true:warning
+dotnet_style_object_initializer = true:warning
+dotnet_style_operator_placement_when_wrapping = beginning_of_line
+dotnet_style_prefer_auto_properties = true:warning
+dotnet_style_prefer_collection_expression = false:warning
+dotnet_style_prefer_compound_assignment = true:warning
+dotnet_style_prefer_conditional_expression_over_assignment = false:warning
+dotnet_style_prefer_conditional_expression_over_return = false:warning
+dotnet_style_prefer_foreach_explicit_cast_in_source = always:warning
+dotnet_style_prefer_inferred_anonymous_type_member_names = true:warning
+dotnet_style_prefer_inferred_tuple_names = true:warning
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true:warning
+dotnet_style_prefer_simplified_boolean_expressions = true:warning
+dotnet_style_prefer_simplified_interpolation = true:warning
+dotnet_style_readonly_field = true:warning
+dotnet_code_quality_unused_parameters = all:warning
+dotnet_remove_unnecessary_suppression_exclusions = none
+dotnet_style_allow_multiple_blank_lines_experimental = false:warning
+dotnet_style_allow_statement_immediately_after_block_experimental = true:warning
+
+csharp_style_var_elsewhere = true:warning
+csharp_style_var_for_built_in_types = true:warning
+csharp_style_var_when_type_is_apparent = true:warning
+csharp_style_expression_bodied_accessors = when_on_single_line:warning
+csharp_style_expression_bodied_constructors = false:warning
+csharp_style_expression_bodied_indexers = when_on_single_line:warning
+csharp_style_expression_bodied_lambdas = when_on_single_line:warning
+csharp_style_expression_bodied_local_functions = false:warning
+csharp_style_expression_bodied_methods = false:warning
+csharp_style_expression_bodied_operators = false:warning
+csharp_style_expression_bodied_properties = when_on_single_line:warning
+csharp_style_pattern_matching_over_as_with_null_check = true:warning
+csharp_style_pattern_matching_over_is_with_cast_check = true:warning
+csharp_style_prefer_extended_property_pattern = true:warning
+csharp_style_prefer_not_pattern = true:warning
+csharp_style_prefer_pattern_matching = true:warning
+csharp_style_prefer_switch_expression = false:warning
+csharp_style_conditional_delegate_call = true:warning
+csharp_prefer_static_anonymous_function = true:warning
+csharp_prefer_static_local_function = true:warning
+csharp_preferred_modifier_order = public,internal,private,protected,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,required,volatile,async:warning
+csharp_style_prefer_readonly_struct = true:warning
+csharp_style_prefer_readonly_struct_member = true:warning
+csharp_prefer_braces = true:warning
+csharp_prefer_simple_using_statement = true:warning
+csharp_prefer_system_threading_lock = true:warning
+csharp_style_namespace_declarations = file_scoped:warning
+csharp_style_prefer_method_group_conversion = true:warning
+csharp_style_prefer_primary_constructors = true:warning
+csharp_style_prefer_top_level_statements = false:warning
+csharp_prefer_simple_default_expression = true:warning
+csharp_style_deconstructed_variable_declaration = true:warning
+csharp_style_implicit_object_creation_when_type_is_apparent = true:warning
+csharp_style_inlined_variable_declaration = true:warning
+csharp_style_prefer_index_operator = false:warning
+csharp_style_prefer_local_over_anonymous_function = true:warning
+csharp_style_prefer_null_check_over_type_check = true:warning
+csharp_style_prefer_range_operator = false:warning
+csharp_style_prefer_tuple_swap = true:warning
+csharp_style_prefer_utf8_string_literals = true:warning
+csharp_style_throw_expression = true:warning
+csharp_style_unused_value_assignment_preference = discard_variable:warning
+csharp_style_unused_value_expression_statement_preference = discard_variable:warning
+csharp_using_directive_placement = outside_namespace:warning
+csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = true:warning
+csharp_style_allow_blank_line_after_token_in_arrow_expression_clause_experimental = true:warning
+csharp_style_allow_blank_line_after_token_in_conditional_expression_experimental = false:warning
+csharp_style_allow_blank_lines_between_consecutive_braces_experimental = false:warning
+csharp_style_allow_embedded_statements_on_same_line_experimental = false:warning
+
+csharp_new_line_before_catch = true
+csharp_new_line_before_else = true
+csharp_new_line_before_finally = true
+csharp_new_line_before_members_in_anonymous_types = true
+csharp_new_line_before_members_in_object_initializers = true
+csharp_new_line_before_open_brace = all
+csharp_new_line_between_query_expression_clauses = true
+csharp_indent_block_contents = true
+csharp_indent_braces = false
+csharp_indent_case_contents = true
+csharp_indent_case_contents_when_block = true
+csharp_indent_labels = no_change
+csharp_indent_switch_labels = true
+csharp_space_after_cast = false
+csharp_space_after_colon_in_inheritance_clause = true
+csharp_space_after_comma = true
+csharp_space_after_dot = false
+csharp_space_after_keywords_in_control_flow_statements = true
+csharp_space_after_semicolon_in_for_statement = true
+csharp_space_around_binary_operators = before_and_after
+csharp_space_around_declaration_statements = false:warning
+csharp_space_before_colon_in_inheritance_clause = true
+csharp_space_before_comma = false
+csharp_space_before_dot = false
+csharp_space_before_open_square_brackets = false
+csharp_space_before_semicolon_in_for_statement = false
+csharp_space_between_empty_square_brackets = false
+csharp_space_between_method_call_empty_parameter_list_parentheses = false
+csharp_space_between_method_call_name_and_opening_parenthesis = false
+csharp_space_between_method_call_parameter_list_parentheses = false
+csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
+csharp_space_between_method_declaration_name_and_open_parenthesis = false
+csharp_space_between_method_declaration_parameter_list_parentheses = false
+csharp_space_between_parentheses = false
+csharp_space_between_square_brackets = false
+csharp_preserve_single_line_blocks = true
+csharp_preserve_single_line_statements = false
+
+dotnet_naming_rule.interface_should_be_pascal.severity = warning
+dotnet_naming_rule.interface_should_be_pascal.symbols = interface
+dotnet_naming_rule.interface_should_be_pascal.style = pascal
+dotnet_naming_rule.types_should_be_pascal.severity = warning
+dotnet_naming_rule.types_should_be_pascal.symbols = types
+dotnet_naming_rule.types_should_be_pascal.style = pascal
+dotnet_naming_rule.non_field_members_should_be_pascal.severity = warning
+dotnet_naming_rule.non_field_members_should_be_pascal.symbols = non_field_members
+dotnet_naming_rule.non_field_members_should_be_pascal.style = pascal
+dotnet_naming_symbols.interface.applicable_kinds = interface
+dotnet_naming_symbols.interface.applicable_accessibilities = *
+dotnet_naming_symbols.interface.required_modifiers = 
+dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum
+dotnet_naming_symbols.types.applicable_accessibilities = *
+dotnet_naming_symbols.types.required_modifiers = 
+dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method
+dotnet_naming_symbols.non_field_members.applicable_accessibilities = *
+dotnet_naming_symbols.non_field_members.required_modifiers = 
+dotnet_naming_style.pascal.required_prefix = 
+dotnet_naming_style.pascal.required_suffix = 
+dotnet_naming_style.pascal.word_separator = 
+dotnet_naming_style.pascal.capitalization = pascal_case

.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/dependabot.yml

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

.github/workflows/build-all.yml

@@ -0,0 +1,69 @@
+name: release all platforms
+
+on:
+  workflow_dispatch:
+    inputs:
+      release_tag:
+        required: false
+        type: string
+
+jobs:
+  update:
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: Trigger build windows
+        if: github.event.inputs.release_tag != ''
+        run: |
+          curl -X POST \
+            -H "Accept: application/vnd.github.v3+json" \
+            -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
+            https://api.github.com/repos/${{ github.repository }}/actions/workflows/build-windows.yml/dispatches \
+            -d "{
+              \"ref\": \"master\",
+              \"inputs\": {
+                \"release_tag\": \"${{ github.event.inputs.release_tag }}\"
+              }
+            }"
+
+      - name: Trigger build linux
+        if: github.event.inputs.release_tag != ''
+        run: |
+          curl -X POST \
+            -H "Accept: application/vnd.github.v3+json" \
+            -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
+            https://api.github.com/repos/${{ github.repository }}/actions/workflows/build-linux.yml/dispatches \
+            -d "{
+              \"ref\": \"master\",
+              \"inputs\": {
+                \"release_tag\": \"${{ github.event.inputs.release_tag }}\"
+              }
+            }"
+
+      - name: Trigger build osx
+        if: github.event.inputs.release_tag != ''
+        run: |
+          curl -X POST \
+            -H "Accept: application/vnd.github.v3+json" \
+            -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
+            https://api.github.com/repos/${{ github.repository }}/actions/workflows/build-osx.yml/dispatches \
+            -d "{
+              \"ref\": \"master\",
+              \"inputs\": {
+                \"release_tag\": \"${{ github.event.inputs.release_tag }}\"
+              }
+            }"
+
+      - name: Trigger build windows desktop
+        if: github.event.inputs.release_tag != ''
+        run: |
+          curl -X POST \
+            -H "Accept: application/vnd.github.v3+json" \
+            -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
+            https://api.github.com/repos/${{ github.repository }}/actions/workflows/build-windows-desktop.yml/dispatches \
+            -d "{
+              \"ref\": \"master\",
+              \"inputs\": {
+                \"release_tag\": \"${{ github.event.inputs.release_tag }}\"
+              }
+            }"

.github/workflows/build-linux.yml

@@ -0,0 +1,101 @@
+name: release Linux
+
+on:
+  workflow_dispatch:
+    inputs:
+      release_tag:
+        required: false
+        type: string
+  push:
+    branches:
+      - master
+
+env:
+  OutputArch: "linux-64"
+  OutputArchArm: "linux-arm64"
+  OutputPath64:  "${{ github.workspace }}/v2rayN/Release/linux-64"
+  OutputPathArm64:  "${{ github.workspace }}/v2rayN/Release/linux-arm64"
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        configuration: [Release]
+
+    runs-on: ubuntu-22.04
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4.2.2
+      with:
+        submodules: 'recursive'
+        fetch-depth: '0'
+
+    - name: Setup
+      uses: actions/setup-dotnet@v4.3.1
+      with:
+        dotnet-version: '8.0.x'
+
+    - name: Build
+      run: |
+        cd v2rayN 
+        dotnet publish ./v2rayN.Desktop/v2rayN.Desktop.csproj -c Release -r linux-x64   --self-contained=true -o $OutputPath64
+        dotnet publish ./v2rayN.Desktop/v2rayN.Desktop.csproj -c Release -r linux-arm64 --self-contained=true -o $OutputPathArm64
+        dotnet publish ./AmazTool/AmazTool.csproj             -c Release -r linux-x64   --self-contained=true -p:PublishTrimmed=true -o $OutputPath64
+        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.2
+      with:
+        name: v2rayN-linux
+        path: |
+          ${{ github.workspace }}/v2rayN/Release/linux*
+
+    # release debian package
+    - name: Package debian
+      if: github.event.inputs.release_tag != ''
+      run: |
+        chmod 755 package-debian.sh
+        ./package-debian.sh $OutputArch $OutputPath64 ${{ github.event.inputs.release_tag }}
+        ./package-debian.sh $OutputArchArm $OutputPathArm64 ${{ github.event.inputs.release_tag }}
+
+    - name: Upload deb to release
+      uses: svenstaro/upload-release-action@v2
+      if: github.event.inputs.release_tag != ''
+      with:
+        file: ${{ github.workspace }}/v2rayN*.deb
+        tag: ${{ github.event.inputs.release_tag }}
+        file_glob: true
+        prerelease: true
+
+    - name: Package AppImage
+      if: github.event.inputs.release_tag != ''
+      run: |
+        chmod a+x package-appimage.sh
+        ./package-appimage.sh
+
+    - name: Upload AppImage to release
+      uses: svenstaro/upload-release-action@v2
+      if: github.event.inputs.release_tag != ''
+      with:
+        file: ${{ github.workspace }}/v2rayN*.AppImage
+        tag: ${{ github.event.inputs.release_tag }}
+        file_glob: true
+        prerelease: true
+
+    # release zip archive
+    - name: Package release zip archive
+      if: github.event.inputs.release_tag != ''
+      run: |
+        chmod 755 package-release-zip.sh
+        ./package-release-zip.sh $OutputArch $OutputPath64
+        ./package-release-zip.sh $OutputArchArm $OutputPathArm64
+    
+    - name: Upload zip archive to release
+      uses: svenstaro/upload-release-action@v2
+      if: github.event.inputs.release_tag != ''
+      with:
+        file: ${{ github.workspace }}/v2rayN*.zip
+        tag: ${{ github.event.inputs.release_tag }}
+        file_glob: true
+        prerelease: true

.github/workflows/build-osx.yml

@@ -0,0 +1,87 @@
+name: release macOS
+
+on:
+  workflow_dispatch:
+    inputs:
+      release_tag:
+        required: false
+        type: string
+  push:
+    branches:
+      - master
+
+env:
+  OutputArch: "macos-64"
+  OutputArchArm: "macos-arm64"
+  OutputPath64:  "${{ github.workspace }}/v2rayN/Release/macos-64"
+  OutputPathArm64:  "${{ github.workspace }}/v2rayN/Release/macos-arm64"
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        configuration: [Release]
+
+    runs-on: macos-latest
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4.2.2
+      with:
+        submodules: 'recursive'
+        fetch-depth: '0'
+
+    - name: Setup
+      uses: actions/setup-dotnet@v4.3.1
+      with:
+        dotnet-version: '8.0.x'
+
+    - name: Build
+      run: |
+        cd v2rayN 
+        dotnet publish ./v2rayN.Desktop/v2rayN.Desktop.csproj -c Release -r osx-x64   --self-contained=true -o $OutputPath64
+        dotnet publish ./v2rayN.Desktop/v2rayN.Desktop.csproj -c Release -r osx-arm64 --self-contained=true -o $OutputPathArm64
+        dotnet publish ./AmazTool/AmazTool.csproj             -c Release -r osx-x64   --self-contained=true -p:PublishTrimmed=true -o $OutputPath64
+        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.2
+      with:
+        name: v2rayN-macos
+        path: |
+          ${{ github.workspace }}/v2rayN/Release/macos*
+    
+    # release osx package
+    - name: Package osx
+      if: github.event.inputs.release_tag != ''
+      run: |
+        brew install create-dmg
+        chmod 755 package-osx.sh
+        ./package-osx.sh $OutputArch $OutputPath64 ${{ github.event.inputs.release_tag }}
+        ./package-osx.sh $OutputArchArm $OutputPathArm64 ${{ github.event.inputs.release_tag }}
+    
+    - name: Upload dmg to release
+      uses: svenstaro/upload-release-action@v2
+      if: github.event.inputs.release_tag != ''
+      with:
+        file: ${{ github.workspace }}/v2rayN*.dmg
+        tag: ${{ github.event.inputs.release_tag }}
+        file_glob: true
+        prerelease: true
+
+    # release zip archive
+    - name: Package release zip archive
+      if: github.event.inputs.release_tag != ''
+      run: |
+        chmod 755 package-release-zip.sh
+        ./package-release-zip.sh $OutputArch $OutputPath64
+        ./package-release-zip.sh $OutputArchArm $OutputPathArm64
+    
+    - name: Upload zip archive to release
+      uses: svenstaro/upload-release-action@v2
+      if: github.event.inputs.release_tag != ''
+      with:
+        file: ${{ github.workspace }}/v2rayN*.zip
+        tag: ${{ github.event.inputs.release_tag }}
+        file_glob: true
+        prerelease: true

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

@@ -0,0 +1,71 @@
+name: release Windows desktop (Avalonia UI)
+
+on:
+  workflow_dispatch:
+    inputs:
+      release_tag:
+        required: false
+        type: string
+  push:
+    branches:
+      - master
+
+env:
+  OutputArch: "windows-64"
+  OutputArchArm: "windows-arm64"
+  OutputPath64:  "${{ github.workspace }}/v2rayN/Release/windows-64"
+  OutputPathArm64:  "${{ github.workspace }}/v2rayN/Release/windows-arm64"
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        configuration: [Release]
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4.2.2
+      with:
+        submodules: 'recursive'
+        fetch-depth: '0'
+
+    - name: Setup
+      uses: actions/setup-dotnet@v4.3.1
+      with:
+        dotnet-version: '8.0.x'
+
+    - name: Build
+      run: |
+        cd v2rayN 
+        dotnet publish ./v2rayN.Desktop/v2rayN.Desktop.csproj -c Release -r win-x64   --self-contained=true -p:EnableWindowsTargeting=true -o $OutputPath64
+        dotnet publish ./v2rayN.Desktop/v2rayN.Desktop.csproj -c Release -r win-arm64 --self-contained=true -p:EnableWindowsTargeting=true -o $OutputPathArm64
+        dotnet publish ./AmazTool/AmazTool.csproj             -c Release -r win-x64   --self-contained=true -p:EnableWindowsTargeting=true -p:PublishTrimmed=true -o $OutputPath64
+        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.2
+      with:
+        name: v2rayN-windows-desktop
+        path: |
+          ${{ github.workspace }}/v2rayN/Release/windows*
+
+    # release zip archive
+    - name: Package release zip archive
+      if: github.event.inputs.release_tag != ''
+      run: |
+        chmod 755 package-release-zip.sh
+        ./package-release-zip.sh $OutputArch $OutputPath64
+        mv "v2rayN-${OutputArch}.zip" "v2rayN-${OutputArch}-desktop.zip"
+        ./package-release-zip.sh $OutputArchArm $OutputPathArm64
+        mv "v2rayN-${OutputArchArm}.zip" "v2rayN-${OutputArchArm}-desktop.zip"
+
+    - name: Upload zip archive to release
+      uses: svenstaro/upload-release-action@v2
+      if: github.event.inputs.release_tag != ''
+      with:
+        file: ${{ github.workspace }}/v2rayN*.zip
+        tag: ${{ github.event.inputs.release_tag }}
+        file_glob: true
+        prerelease: true

.github/workflows/build-windows.yml

@@ -0,0 +1,71 @@
+name: release Windows
+
+on:
+  workflow_dispatch:
+    inputs:
+      release_tag:
+        required: false
+        type: string
+  push:
+    branches:
+      - master
+
+env:
+  OutputArch: "windows-64"
+  OutputArchArm: "windows-arm64"
+  OutputPath64:  "${{ github.workspace }}/v2rayN/Release/windows-64"
+  OutputPathArm64:  "${{ github.workspace }}/v2rayN/Release/windows-arm64"
+  OutputPath64Sc:  "${{ github.workspace }}/v2rayN/Release/windows-64-SelfContained"
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        configuration: [Release]
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4.2.2
+
+    - name: Setup
+      uses: actions/setup-dotnet@v4.3.1
+      with:
+        dotnet-version: '8.0.x'
+
+    - name: Build
+      run: |
+        cd v2rayN 
+        dotnet publish ./v2rayN/v2rayN.csproj     -c Release -r win-x64   --self-contained=false -p:EnableWindowsTargeting=true -o $OutputPath64
+        dotnet publish ./v2rayN/v2rayN.csproj     -c Release -r win-arm64 --self-contained=false -p:EnableWindowsTargeting=true -o $OutputPathArm64
+        dotnet publish ./v2rayN/v2rayN.csproj     -c Release -r win-x64   --self-contained=true  -p:EnableWindowsTargeting=true -o $OutputPath64Sc
+        dotnet publish ./AmazTool/AmazTool.csproj -c Release -r win-x64   --self-contained=false -p:EnableWindowsTargeting=true -o $OutputPath64
+        dotnet publish ./AmazTool/AmazTool.csproj -c Release -r win-arm64 --self-contained=false -p:EnableWindowsTargeting=true -o $OutputPathArm64
+        dotnet publish ./AmazTool/AmazTool.csproj -c Release -r win-x64   --self-contained=true  -p:EnableWindowsTargeting=true -p:PublishTrimmed=true -o $OutputPath64Sc
+
+  
+    - name: Upload build artifacts
+      uses: actions/upload-artifact@v4.6.2
+      with:
+        name: v2rayN-windows
+        path: |
+          ${{ github.workspace }}/v2rayN/Release/windows*
+    
+    # release zip archive
+    - name: Package release zip archive
+      if: github.event.inputs.release_tag != ''
+      run: |
+        chmod 755 package-release-zip.sh
+        ./package-release-zip.sh $OutputArch $OutputPath64
+        ./package-release-zip.sh $OutputArchArm $OutputPathArm64
+        ./package-release-zip.sh "windows-64-SelfContained" $OutputPath64Sc
+    
+    - name: Upload zip archive to release
+      uses: svenstaro/upload-release-action@v2
+      if: github.event.inputs.release_tag != ''
+      with:
+        file: ${{ github.workspace }}/v2rayN*.zip
+        tag: ${{ github.event.inputs.release_tag }}
+        file_glob: true
+        prerelease: true

.github/workflows/build.yml

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

.github/workflows/winget-publish.yml

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

.gitignore

@@ -1,19 +1,400 @@
-################################################################################
+## Ignore Visual Studio temporary files, build results, and
-# 此 .gitignore 文件已由 Microsoft(R) Visual Studio 自动创建。
+## files generated by popular Visual Studio add-ons.
-################################################################################
+##
+## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore
 
-/v2rayN/.vs/
+# User-specific files
-/v2rayN/v2rayN/bin/Debug/app.publish
+*.rsuser
-/v2rayN/v2rayN/bin/Debug
+*.suo
-/v2rayN/v2rayN/bin/Release
-/v2rayN/v2rayN/obj/
-/v2rayN/.vs/v2rayN/DesignTimeBuild
-/v2rayN/packages
-.vs/ProjectSettings.json
-.vs/slnx.sqlite
-.vs/VSWorkspaceState.json
-/v2rayN/v2rayUpgrade/bin/Debug
-/v2rayN/v2rayUpgrade/bin/Release
-/v2rayN/v2rayUpgrade/obj/
 *.user
-/.vs/v2rayN
+*.userosscache
+*.sln.docstates
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Mono auto generated files
+mono_crash.*
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+[Ww][Ii][Nn]32/
+[Aa][Rr][Mm]/
+[Aa][Rr][Mm]64/
+bld/
+[Bb]in/
+[Oo]bj/
+[Ll]og/
+[Ll]ogs/
+
+# Visual Studio 2015/2017 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
+
+# Visual Studio 2017 auto generated files
+Generated\ Files/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUnit
+*.VisualState.xml
+TestResult.xml
+nunit-*.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# Benchmark Results
+BenchmarkDotNet.Artifacts/
+
+# .NET Core
+project.lock.json
+project.fragment.lock.json
+artifacts/
+
+# ASP.NET Scaffolding
+ScaffoldingReadMe.txt
+
+# StyleCop
+StyleCopReport.xml
+
+# Files built by Visual Studio
+*_i.c
+*_p.c
+*_h.h
+*.ilk
+*.meta
+*.obj
+*.iobj
+*.pch
+*.pdb
+*.ipdb
+*.pgc
+*.pgd
+*.rsp
+# but not Directory.Build.rsp, as it configures directory-level build defaults
+!Directory.Build.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*_wpftmp.csproj
+*.log
+*.tlog
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+*.VC.db
+*.VC.VC.opendb
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+*.sap
+
+# Visual Studio Trace Files
+*.e2e
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# AxoCover is a Code Coverage Tool
+.axoCover/*
+!.axoCover/settings.json
+
+# Coverlet is a free, cross platform Code Coverage Tool
+coverage*.json
+coverage*.xml
+coverage*.info
+
+# Visual Studio code coverage results
+*.coverage
+*.coveragexml
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+nCrunchTemp_*
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+# Note: Comment the next line if you want to checkin your web deploy settings,
+# but database connection strings (with potential passwords) will be unencrypted
+*.pubxml
+*.publishproj
+
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
+
+# NuGet Packages
+*.nupkg
+# NuGet Symbol Packages
+*.snupkg
+# The packages folder can be ignored because of Package Restore
+**/[Pp]ackages/*
+# except build/, which is used as an MSBuild target.
+!**/[Pp]ackages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/[Pp]ackages/repositories.config
+# NuGet v3's project.json files produces more ignorable files
+*.nuget.props
+*.nuget.targets
+
+# Microsoft Azure Build Output
+csx/
+*.build.csdef
+
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directories and files
+AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+*.appx
+*.appxbundle
+*.appxupload
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!?*.[Cc]ache/
+
+# Others
+ClientBin/
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.jfm
+*.pfx
+*.publishsettings
+orleans.codegen.cs
+
+# Including strong name files can present a security risk
+# (https://github.com/github/gitignore/pull/2483#issue-259490424)
+#*.snk
+
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+ServiceFabricBackup/
+*.rptproj.bak
+
+# SQL Server files
+*.mdf
+*.ldf
+*.ndf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+*.rptproj.rsuser
+*- [Bb]ackup.rdl
+*- [Bb]ackup ([0-9]).rdl
+*- [Bb]ackup ([0-9][0-9]).rdl
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+node_modules/
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
+*.vbw
+
+# Visual Studio 6 auto-generated project file (contains which files were open etc.)
+*.vbp
+
+# Visual Studio 6 workspace and project file (working project files containing files to include in project)
+*.dsw
+*.dsp
+
+# Visual Studio 6 technical files
+*.ncb
+*.aps
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+.paket/paket.exe
+paket-files/
+
+# FAKE - F# Make
+.fake/
+
+# CodeRush personal settings
+.cr/personal
+
+# Python Tools for Visual Studio (PTVS)
+__pycache__/
+*.pyc
+
+# Cake - Uncomment if you are using it
+# tools/**
+# !tools/packages.config
+
+# Tabs Studio
+*.tss
+
+# Telerik's JustMock configuration file
+*.jmconfig
+
+# BizTalk build output
+*.btp.cs
+*.btm.cs
+*.odx.cs
+*.xsd.cs
+
+# OpenCover UI analysis results
+OpenCover/
+
+# Azure Stream Analytics local run output
+ASALocalRun/
+
+# MSBuild Binary and Structured Log
+*.binlog
+
+# NVidia Nsight GPU debugger configuration file
+*.nvuser
+
+# MFractors (Xamarin productivity tool) working folder
+.mfractor/
+
+# Local History for Visual Studio
+.localhistory/
+
+# Visual Studio History (VSHistory) files
+.vshistory/
+
+# BeatPulse healthcheck temp database
+healthchecksdb
+
+# Backup folder for Package Reference Convert tool in Visual Studio 2017
+MigrationBackup/
+
+# Ionide (cross platform F# VS Code tools) working folder
+.ionide/
+
+# Fody - auto-generated XML schema
+FodyWeavers.xsd
+
+# VS Code files for those working on multiple tools
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+*.code-workspace
+
+# Local History for Visual Studio Code
+.history/
+
+# Windows Installer files from build outputs
+*.cab
+*.msi
+*.msix
+*.msm
+*.msp
+
+# JetBrains Rider
+*.sln.iml

.gitmodules

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

LICENSE

@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
+    Copyright (C) 2019-Present  2dust
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    <program>  Copyright (C) <year>  <name of author>
+    v2rayN  Copyright (C) 2019-Present  2dust
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

README.md

@@ -1,23 +1,18 @@
 # v2rayN
-A GUI client for Windows, support [Xray core](https://github.com/XTLS/Xray-core) and [v2fly core](https://github.com/v2fly/v2ray-core) and [others](https://github.com/2dust/v2rayN/wiki/List-of-supported-cores)
 
+A GUI client for Windows, Linux and macOS, support [Xray](https://github.com/XTLS/Xray-core)
+and [sing-box](https://github.com/SagerNet/sing-box)
+and [others](https://github.com/2dust/v2rayN/wiki/List-of-supported-cores)
 
 [![GitHub commit activity](https://img.shields.io/github/commit-activity/m/2dust/v2rayN)](https://github.com/2dust/v2rayN/commits/master)
 [![CodeFactor](https://www.codefactor.io/repository/github/2dust/v2rayn/badge)](https://www.codefactor.io/repository/github/2dust/v2rayn)
 [![GitHub Releases](https://img.shields.io/github/downloads/2dust/v2rayN/latest/total?logo=github)](https://github.com/2dust/v2rayN/releases)
 [![Chat on Telegram](https://img.shields.io/badge/Chat%20on-Telegram-brightgreen.svg)](https://t.me/v2rayn)
 
-
 ## How to use
-- If you are new to this, please download v2rayN-With-Core.zip from [releases](https://github.com/2dust/v2rayN/releases)
-- Otherwise please download v2rayN.zip (you will also need to download cores in the bin directory)
-- Run v2rayN.exe
-
-## Requirements  
-- (6.35 and above)[Microsoft .NET 8.0 Desktop Runtime ](https://dotnet.microsoft.com/en-us/download/dotnet/8.0)
-- (6.33 and below)[Microsoft .NET 6.0 Desktop Runtime ](https://dotnet.microsoft.com/en-us/download/dotnet/6.0)
-- [Supported cores](https://github.com/2dust/v2rayN/wiki/List-of-supported-cores)
 
+Read the [Wiki](https://github.com/2dust/v2rayN/wiki) for details.
 
 ## Telegram Channel
+
 [github_2dust](https://t.me/github_2dust)

package-appimage.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+sudo apt update -y
+sudo apt install -y libfuse2
+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

package-debian.sh

@@ -0,0 +1,58 @@
+#!/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
+cp -rf v2rayN-${Arch}/* $OutputPath
+
+PackagePath="v2rayN-Package-${Arch}"
+mkdir -p "${PackagePath}/DEBIAN"
+mkdir -p "${PackagePath}/opt"
+cp -rf $OutputPath "${PackagePath}/opt/v2rayN"
+echo "When this file exists, app will not store configs under this folder" > "${PackagePath}/opt/v2rayN/NotStoreConfigHere.txt"
+
+if [ $Arch = "linux-64" ]; then
+    Arch2="amd64" 
+else
+    Arch2="arm64"
+fi
+echo $Arch2
+
+# basic
+cat >"${PackagePath}/DEBIAN/control" <<-EOF
+Package: v2rayN
+Version: $Version
+Architecture: $Arch2
+Maintainer: https://github.com/2dust/v2rayN
+Description: A GUI client for Windows and Linux, support Xray core and sing-box-core and others
+EOF
+
+cat >"${PackagePath}/DEBIAN/postinst" <<-EOF
+if [ ! -s /usr/share/applications/v2rayN.desktop ]; then
+    cat >/usr/share/applications/v2rayN.desktop<<-END
+[Desktop Entry]
+Name=v2rayN
+Comment=A GUI client for Windows and Linux, support Xray core and sing-box-core and others
+Exec=/opt/v2rayN/v2rayN
+Icon=/opt/v2rayN/v2rayN.png
+Terminal=false
+Type=Application
+Categories=Network;Application;
+END
+fi
+
+update-desktop-database
+EOF
+
+sudo chmod 0755 "${PackagePath}/DEBIAN/postinst"
+sudo chmod 0755 "${PackagePath}/opt/v2rayN/v2rayN"
+sudo chmod 0755 "${PackagePath}/opt/v2rayN/AmazTool"
+
+# desktop && PATH
+
+sudo dpkg-deb -Zxz --build $PackagePath
+sudo mv "${PackagePath}.deb" "v2rayN-${Arch}.deb"

package-osx.sh

@@ -0,0 +1,58 @@
+#!/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
+cp -rf v2rayN-${Arch}/* $OutputPath
+
+PackagePath="v2rayN-Package-${Arch}"
+mkdir -p "$PackagePath/v2rayN.app/Contents/Resources"
+cp -rf "$OutputPath" "$PackagePath/v2rayN.app/Contents/MacOS"
+cp -f "$PackagePath/v2rayN.app/Contents/MacOS/v2rayN.icns" "$PackagePath/v2rayN.app/Contents/Resources/AppIcon.icns"
+echo "When this file exists, app will not store configs under this folder" > "$PackagePath/v2rayN.app/Contents/MacOS/NotStoreConfigHere.txt"
+chmod +x "$PackagePath/v2rayN.app/Contents/MacOS/v2rayN"
+
+cat >"$PackagePath/v2rayN.app/Contents/Info.plist" <<-EOF
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>CFBundleDevelopmentRegion</key>
+  <string>English</string>
+  <key>CFBundleDisplayName</key>
+  <string>v2rayN</string>
+  <key>CFBundleExecutable</key>
+  <string>v2rayN</string>
+  <key>CFBundleIconFile</key>
+  <string>AppIcon</string>
+  <key>CFBundleIconName</key>
+  <string>AppIcon</string>
+  <key>CFBundleIdentifier</key>
+  <string>2dust.v2rayN</string>
+  <key>CFBundleName</key>
+  <string>v2rayN</string>
+  <key>CFBundlePackageType</key>
+  <string>APPL</string>
+  <key>CFBundleShortVersionString</key>
+  <string>${Version}</string>
+  <key>CSResourcesFileMapped</key>
+  <true/>
+  <key>NSHighResolutionCapable</key>
+  <true/>
+</dict>
+</plist>
+EOF
+
+create-dmg \
+    --volname "v2rayN Installer" \
+    --window-size 700 420 \
+    --icon-size 100 \
+    --icon "v2rayN.app" 160 185 \
+    --hide-extension "v2rayN.app" \
+    --app-drop-link 500 185 \
+    "v2rayN-${Arch}.dmg" \
+    "$PackagePath/v2rayN.app"

package-release-zip.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+Arch="$1"
+OutputPath="$2"
+
+OutputArch="v2rayN-${Arch}"
+FileName="v2rayN-${Arch}.zip"
+
+wget -nv -O $FileName "https://github.com/2dust/v2rayN-core-bin/raw/refs/heads/master/$FileName"
+
+ZipPath64="./$OutputArch"
+mkdir $ZipPath64
+
+cp -rf $OutputPath "$ZipPath64/$OutputArch"
+7z a -tZip $FileName "$ZipPath64/$OutputArch" -mx1

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/.gitignore

@@ -1,363 +0,0 @@
-## Ignore Visual Studio temporary files, build results, and
-## files generated by popular Visual Studio add-ons.
-##
-## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
-
-# User-specific files
-*.rsuser
-*.suo
-*.user
-*.userosscache
-*.sln.docstates
-
-# User-specific files (MonoDevelop/Xamarin Studio)
-*.userprefs
-
-# Mono auto generated files
-mono_crash.*
-
-# Build results
-[Dd]ebug/
-[Dd]ebugPublic/
-[Rr]elease/
-[Rr]eleases/
-x64/
-x86/
-[Ww][Ii][Nn]32/
-[Aa][Rr][Mm]/
-[Aa][Rr][Mm]64/
-bld/
-[Bb]in/
-[Oo]bj/
-[Oo]ut/
-[Ll]og/
-[Ll]ogs/
-
-# Visual Studio 2015/2017 cache/options directory
-.vs/
-# Uncomment if you have tasks that create the project's static files in wwwroot
-#wwwroot/
-
-# Visual Studio 2017 auto generated files
-Generated\ Files/
-
-# MSTest test Results
-[Tt]est[Rr]esult*/
-[Bb]uild[Ll]og.*
-
-# NUnit
-*.VisualState.xml
-TestResult.xml
-nunit-*.xml
-
-# Build Results of an ATL Project
-[Dd]ebugPS/
-[Rr]eleasePS/
-dlldata.c
-
-# Benchmark Results
-BenchmarkDotNet.Artifacts/
-
-# .NET Core
-project.lock.json
-project.fragment.lock.json
-artifacts/
-
-# ASP.NET Scaffolding
-ScaffoldingReadMe.txt
-
-# StyleCop
-StyleCopReport.xml
-
-# Files built by Visual Studio
-*_i.c
-*_p.c
-*_h.h
-*.ilk
-*.meta
-*.obj
-*.iobj
-*.pch
-*.pdb
-*.ipdb
-*.pgc
-*.pgd
-*.rsp
-*.sbr
-*.tlb
-*.tli
-*.tlh
-*.tmp
-*.tmp_proj
-*_wpftmp.csproj
-*.log
-*.vspscc
-*.vssscc
-.builds
-*.pidb
-*.svclog
-*.scc
-
-# Chutzpah Test files
-_Chutzpah*
-
-# Visual C++ cache files
-ipch/
-*.aps
-*.ncb
-*.opendb
-*.opensdf
-*.sdf
-*.cachefile
-*.VC.db
-*.VC.VC.opendb
-
-# Visual Studio profiler
-*.psess
-*.vsp
-*.vspx
-*.sap
-
-# Visual Studio Trace Files
-*.e2e
-
-# TFS 2012 Local Workspace
-$tf/
-
-# Guidance Automation Toolkit
-*.gpState
-
-# ReSharper is a .NET coding add-in
-_ReSharper*/
-*.[Rr]e[Ss]harper
-*.DotSettings.user
-
-# TeamCity is a build add-in
-_TeamCity*
-
-# DotCover is a Code Coverage Tool
-*.dotCover
-
-# AxoCover is a Code Coverage Tool
-.axoCover/*
-!.axoCover/settings.json
-
-# Coverlet is a free, cross platform Code Coverage Tool
-coverage*.json
-coverage*.xml
-coverage*.info
-
-# Visual Studio code coverage results
-*.coverage
-*.coveragexml
-
-# NCrunch
-_NCrunch_*
-.*crunch*.local.xml
-nCrunchTemp_*
-
-# MightyMoose
-*.mm.*
-AutoTest.Net/
-
-# Web workbench (sass)
-.sass-cache/
-
-# Installshield output folder
-[Ee]xpress/
-
-# DocProject is a documentation generator add-in
-DocProject/buildhelp/
-DocProject/Help/*.HxT
-DocProject/Help/*.HxC
-DocProject/Help/*.hhc
-DocProject/Help/*.hhk
-DocProject/Help/*.hhp
-DocProject/Help/Html2
-DocProject/Help/html
-
-# Click-Once directory
-publish/
-
-# Publish Web Output
-*.[Pp]ublish.xml
-*.azurePubxml
-# Note: Comment the next line if you want to checkin your web deploy settings,
-# but database connection strings (with potential passwords) will be unencrypted
-*.pubxml
-*.publishproj
-
-# Microsoft Azure Web App publish settings. Comment the next line if you want to
-# checkin your Azure Web App publish settings, but sensitive information contained
-# in these scripts will be unencrypted
-PublishScripts/
-
-# NuGet Packages
-*.nupkg
-# NuGet Symbol Packages
-*.snupkg
-# The packages folder can be ignored because of Package Restore
-**/[Pp]ackages/*
-# except build/, which is used as an MSBuild target.
-!**/[Pp]ackages/build/
-# Uncomment if necessary however generally it will be regenerated when needed
-#!**/[Pp]ackages/repositories.config
-# NuGet v3's project.json files produces more ignorable files
-*.nuget.props
-*.nuget.targets
-
-# Microsoft Azure Build Output
-csx/
-*.build.csdef
-
-# Microsoft Azure Emulator
-ecf/
-rcf/
-
-# Windows Store app package directories and files
-AppPackages/
-BundleArtifacts/
-Package.StoreAssociation.xml
-_pkginfo.txt
-*.appx
-*.appxbundle
-*.appxupload
-
-# Visual Studio cache files
-# files ending in .cache can be ignored
-*.[Cc]ache
-# but keep track of directories ending in .cache
-!?*.[Cc]ache/
-
-# Others
-ClientBin/
-~$*
-*~
-*.dbmdl
-*.dbproj.schemaview
-*.jfm
-*.pfx
-*.publishsettings
-orleans.codegen.cs
-
-# Including strong name files can present a security risk
-# (https://github.com/github/gitignore/pull/2483#issue-259490424)
-#*.snk
-
-# Since there are multiple workflows, uncomment next line to ignore bower_components
-# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
-#bower_components/
-
-# RIA/Silverlight projects
-Generated_Code/
-
-# Backup & report files from converting an old project file
-# to a newer Visual Studio version. Backup files are not needed,
-# because we have git ;-)
-_UpgradeReport_Files/
-Backup*/
-UpgradeLog*.XML
-UpgradeLog*.htm
-ServiceFabricBackup/
-*.rptproj.bak
-
-# SQL Server files
-*.mdf
-*.ldf
-*.ndf
-
-# Business Intelligence projects
-*.rdl.data
-*.bim.layout
-*.bim_*.settings
-*.rptproj.rsuser
-*- [Bb]ackup.rdl
-*- [Bb]ackup ([0-9]).rdl
-*- [Bb]ackup ([0-9][0-9]).rdl
-
-# Microsoft Fakes
-FakesAssemblies/
-
-# GhostDoc plugin setting file
-*.GhostDoc.xml
-
-# Node.js Tools for Visual Studio
-.ntvs_analysis.dat
-node_modules/
-
-# Visual Studio 6 build log
-*.plg
-
-# Visual Studio 6 workspace options file
-*.opt
-
-# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
-*.vbw
-
-# Visual Studio LightSwitch build output
-**/*.HTMLClient/GeneratedArtifacts
-**/*.DesktopClient/GeneratedArtifacts
-**/*.DesktopClient/ModelManifest.xml
-**/*.Server/GeneratedArtifacts
-**/*.Server/ModelManifest.xml
-_Pvt_Extensions
-
-# Paket dependency manager
-.paket/paket.exe
-paket-files/
-
-# FAKE - F# Make
-.fake/
-
-# CodeRush personal settings
-.cr/personal
-
-# Python Tools for Visual Studio (PTVS)
-__pycache__/
-*.pyc
-
-# Cake - Uncomment if you are using it
-# tools/**
-# !tools/packages.config
-
-# Tabs Studio
-*.tss
-
-# Telerik's JustMock configuration file
-*.jmconfig
-
-# BizTalk build output
-*.btp.cs
-*.btm.cs
-*.odx.cs
-*.xsd.cs
-
-# OpenCover UI analysis results
-OpenCover/
-
-# Azure Stream Analytics local run output
-ASALocalRun/
-
-# MSBuild Binary and Structured Log
-*.binlog
-
-# NVidia Nsight GPU debugger configuration file
-*.nvuser
-
-# MFractors (Xamarin productivity tool) working folder
-.mfractor/
-
-# Local History for Visual Studio
-.localhistory/
-
-# BeatPulse healthcheck temp database
-healthchecksdb
-
-# Backup folder for Package Reference Convert tool in Visual Studio 2017
-MigrationBackup/
-
-# Ionide (cross platform F# VS Code tools) working folder
-.ionide/
-
-# Fody - auto-generated XML schema
-FodyWeavers.xsd

v2rayN/AmazTool/AmazTool.csproj

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

v2rayN/AmazTool/Program.cs

@@ -1,22 +1,87 @@
-namespace AmazTool
+namespace AmazTool;
+
+internal static class Program
 {
-    internal static class Program
-    {
-        /// <summary>
-        /// 应用程序的主入口点。
-        /// </summary>
     [STAThread]
     private static void Main(string[] args)
     {
+        try
+        {
+            // If no arguments are provided, display usage guidelines and exit
             if (args.Length == 0)
             {
-                Console.WriteLine("Please run it from the main application.(请从主应用运行)");
+                ShowHelp();
-                Thread.Sleep(5000);
                 return;
             }
 
-            var fileName = Uri.UnescapeDataString(string.Join(" ", args));
+            // Log all arguments for debugging purposes
-            UpgradeApp.Upgrade(fileName);
+            foreach (var arg in args)
+            {
+                Console.WriteLine(arg);
             }
+
+            // Parse command based on first argument
+            switch (args[0].ToLowerInvariant())
+            {
+                case "rebootas":
+                    // Handle application restart
+                    HandleRebootAsync();
+                    break;
+
+                case "help":
+                case "--help":
+                case "-h":
+                case "/?":
+                    // Display help information
+                    ShowHelp();
+                    break;
+
+                default:
+                    // Default behavior: handle as upgrade data
+                    // Maintain backward compatibility with existing usage pattern
+                    var argData = Uri.UnescapeDataString(string.Join(" ", args));
+                    HandleUpgrade(argData);
+                    break;
+            }
+        }
+        catch (Exception ex)
+        {
+            // Global exception handling
+            Console.WriteLine($"An error occurred: {ex.Message}");
+            Console.WriteLine("Press any key to exit...");
+            Console.ReadKey();
+        }
+    }
+
+    /// <summary>
+    /// Display help information and usage guidelines
+    /// </summary>
+    private static void ShowHelp()
+    {
+        Console.WriteLine(Resx.Resource.Guidelines);
+        Console.WriteLine("Available commands:");
+        Console.WriteLine("  rebootas             - Restart the application");
+        Console.WriteLine("  help                 - Display this help information");
+        Thread.Sleep(5000);
+    }
+
+    /// <summary>
+    /// Handle application restart
+    /// </summary>
+    private static void HandleRebootAsync()
+    {
+        Console.WriteLine("Restarting application...");
+        Thread.Sleep(1000);
+        Utils.StartV2RayN();
+    }
+
+    /// <summary>
+    /// Handle application upgrade with the provided data
+    /// </summary>
+    /// <param name="upgradeData">Data for the upgrade process</param>
+    private static void HandleUpgrade(string upgradeData)
+    {
+        Console.WriteLine("Upgrading application...");
+        UpgradeApp.Upgrade(upgradeData);
     }
 }

v2rayN/AmazTool/Resx/Resource.Designer.cs

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

v2rayN/AmazTool/Resx/Resource.resx

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

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

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -117,8 +117,40 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="Restartv2rayN" xml:space="preserve">
-  <data name="pac" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>正在重启，请等待...</value>
-    <value>Resources\pac.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;gb2312</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/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

@@ -1,53 +1,53 @@
-using System.Diagnostics;
+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(fileName);
+        Console.WriteLine($"{Resx.Resource.StartUnzipping}\n{fileName}");
-            Console.WriteLine("In progress, please wait...(正在进行中，请等待)");
 
-            Thread.Sleep(5000);
+        Utils.Waiting(5);
 
         if (!File.Exists(fileName))
         {
-                Console.WriteLine("Upgrade Failed, File Not Exist(升级失败,文件不存在).");
+            Console.WriteLine(Resx.Resource.UpgradeFileNotFound);
             return;
         }
 
+        Console.WriteLine(Resx.Resource.TryTerminateProcess);
         try
         {
-                Process[] existing = Process.GetProcessesByName(V2rayN);
+            var existing = Process.GetProcessesByName(Utils.V2rayN);
-                foreach (Process p in existing)
+            foreach (var pp in existing)
             {
-                    var path = p.MainModule?.FileName ?? "";
+                var path = pp.MainModule?.FileName ?? "";
-                    if (path.StartsWith(GetPath(V2rayN)))
+                if (path.StartsWith(Utils.GetPath(Utils.V2rayN)))
                 {
-                        p.Kill();
+                    pp?.Kill();
-                        p.WaitForExit(100);
+                    pp?.WaitForExit(1000);
                 }
             }
         }
         catch (Exception ex)
         {
             // Access may be denied without admin right. The user may not be an administrator.
-                Console.WriteLine("Failed to close v2rayN(关闭v2rayN失败).\n" +
+            Console.WriteLine(Resx.Resource.FailedTerminateProcess + ex.StackTrace);
-                    "Close it manually, or the upgrade may fail.(请手动关闭正在运行的v2rayN，否则可能升级失败。\n\n" + ex.StackTrace);
         }
 
+        Console.WriteLine(Resx.Resource.StartUnzipping);
         StringBuilder sb = new();
         try
         {
-                string thisAppOldFile = $"{GetExePath()}.tmp";
+            var thisAppOldFile = $"{Utils.GetExePath()}.tmp";
             File.Delete(thisAppOldFile);
-                string splitKey = "/";
+            var splitKey = "/";
 
-                using ZipArchive archive = ZipFile.OpenRead(fileName);
+            using var archive = ZipFile.OpenRead(fileName);
-                foreach (ZipArchiveEntry entry in archive.Entries)
+            foreach (var entry in archive.Entries)
             {
                 try
                 {
@@ -56,18 +56,38 @@ namespace AmazTool
                         continue;
                     }
 
-                        var lst = entry.FullName.Split(splitKey);
+                    Console.WriteLine(entry.FullName);
-                        if (lst.Length == 1) continue;
-                        string fullName = string.Join(splitKey, lst[1..lst.Length]);
 
-                        if (string.Equals(GetExePath(), GetPath(fullName), StringComparison.OrdinalIgnoreCase))
+                    var lst = entry.FullName.Split(splitKey);
+                    if (lst.Length == 1)
                     {
-                            File.Move(GetExePath(), thisAppOldFile);
+                        continue;
                     }
 
-                        string entryOutputPath = GetPath(fullName);
+                    var fullName = string.Join(splitKey, lst[1..lst.Length]);
+
+                    if (string.Equals(Utils.GetExePath(), Utils.GetPath(fullName), StringComparison.OrdinalIgnoreCase))
+                    {
+                        File.Move(Utils.GetExePath(), thisAppOldFile);
+                    }
+
+                    var entryOutputPath = Utils.GetPath(fullName);
                     Directory.CreateDirectory(Path.GetDirectoryName(entryOutputPath)!);
+                    //In the bin folder, if the file already exists, it will be skipped
+                    if (fullName.StartsWith("bin") && File.Exists(entryOutputPath))
+                    {
+                        continue;
+                    }
+
+                    try
+                    {
                         entry.ExtractToFile(entryOutputPath, true);
+                    }
+                    catch
+                    {
+                        Thread.Sleep(1000);
+                        entry.ExtractToFile(entryOutputPath, true);
+                    }
 
                     Console.WriteLine(entryOutputPath);
                 }
@@ -79,49 +99,18 @@ namespace AmazTool
         }
         catch (Exception ex)
         {
-                Console.WriteLine("Upgrade Failed(升级失败)." + ex.StackTrace);
+            Console.WriteLine(Resx.Resource.FailedUpgrade + ex.StackTrace);
-                return;
+            //return;
         }
         if (sb.Length > 0)
         {
-                Console.WriteLine("Upgrade Failed.\n" +
+            Console.WriteLine(Resx.Resource.FailedUpgrade + sb.ToString());
-                    "(升级失败)." + sb.ToString());
+            //return;
-                return;
         }
 
-            Console.WriteLine("Start v2rayN, please wait...(正在重启，请等待)");
+        Console.WriteLine(Resx.Resource.Restartv2rayN);
-            Thread.Sleep(3000);
+        Utils.Waiting(2);
-            Process process = new()
-            {
-                StartInfo = new()
-                {
-                    FileName = V2rayN,
-                    WorkingDirectory = StartupPath()
-                }
-            };
-            process.Start();
-        }
 
-        private static string GetExePath()
+        Utils.StartV2RayN();
-        {
-            return Environment.ProcessPath ?? Process.GetCurrentProcess().MainModule?.FileName ?? string.Empty;
-        }
-
-        private static string StartupPath()
-        {
-            return AppDomain.CurrentDomain.BaseDirectory;
-        }
-
-        private static string GetPath(string fileName)
-        {
-            string startupPath = StartupPath();
-            if (string.IsNullOrEmpty(fileName))
-            {
-                return startupPath;
-            }
-            return Path.Combine(startupPath, fileName);
-        }
-
-        private static string V2rayN => "v2rayN";
     }
 }

v2rayN/AmazTool/Utils.cs

@@ -0,0 +1,51 @@
+using System.Diagnostics;
+
+namespace AmazTool;
+
+internal class Utils
+{
+    public static string GetExePath()
+    {
+        return Environment.ProcessPath ?? Process.GetCurrentProcess().MainModule?.FileName ?? string.Empty;
+    }
+
+    public static string StartupPath()
+    {
+        return AppDomain.CurrentDomain.BaseDirectory;
+    }
+
+    public static string GetPath(string fileName)
+    {
+        var startupPath = StartupPath();
+        if (string.IsNullOrEmpty(fileName))
+        {
+            return startupPath;
+        }
+        return Path.Combine(startupPath, fileName);
+    }
+
+    public static string V2rayN => "v2rayN";
+
+    public static void StartV2RayN()
+    {
+        Process process = new()
+        {
+            StartInfo = new()
+            {
+                UseShellExecute = true,
+                FileName = V2rayN,
+                WorkingDirectory = StartupPath()
+            }
+        };
+        process.Start();
+    }
+
+    public static void Waiting(int second)
+    {
+        for (var i = second; i > 0; i--)
+        {
+            Console.WriteLine(i);
+            Thread.Sleep(1000);
+        }
+    }
+}

v2rayN/Directory.Build.props

@@ -0,0 +1,33 @@
+<Project>
+
+    <PropertyGroup>
+        <Version>7.12.6</Version>
+    </PropertyGroup>
+
+    <PropertyGroup>
+        <TargetFramework>net8.0</TargetFramework>
+        <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
+        <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
+        <NoWarn>CA1031;CS1591;NU1507;CA1416;IDE0058</NoWarn>
+        <Nullable>annotations</Nullable>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Authors>2dust</Authors>
+        <PackageLicenseExpression>GPL-3.0</PackageLicenseExpression>
+        <Copyright>Copyright © 2017-$([System.DateTime]::UtcNow.Year) $(Authors)</Copyright>
+        <InvariantGlobalization>false</InvariantGlobalization>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(Configuration)' == 'Release'">
+        <DebugType>embedded</DebugType>
+        <EventSourceSupport>false</EventSourceSupport>
+        <StackTraceSupport>false</StackTraceSupport>
+        <MetricsSupport>false</MetricsSupport>
+        <MetadataUpdaterSupport>false</MetadataUpdaterSupport>
+        <EnableUnsafeBinaryFormatterSerialization>false</EnableUnsafeBinaryFormatterSerialization>
+        <EnableUnsafeUTF7Encoding>false</EnableUnsafeUTF7Encoding>
+
+        <UseSystemResourceKeys>true</UseSystemResourceKeys>
+        <PublishSingleFile>true</PublishSingleFile>
+        <PublishReadyToRun>false</PublishReadyToRun>
+    </PropertyGroup>
+</Project>

v2rayN/Directory.Packages.props

@@ -0,0 +1,30 @@
+<Project>
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
+    <CentralPackageVersionOverrideEnabled>false</CentralPackageVersionOverrideEnabled>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.3.1" />
+    <PackageVersion Include="Avalonia.Desktop" Version="11.3.1" />
+    <PackageVersion Include="Avalonia.Diagnostics" Version="11.3.1" />
+    <PackageVersion Include="Avalonia.ReactiveUI" Version="11.3.1" />
+    <PackageVersion Include="CliWrap" Version="3.9.0" />
+    <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.3.1" />
+    <PackageVersion Include="ReactiveUI.Fody" Version="19.5.41" />
+    <PackageVersion Include="ReactiveUI.WPF" Version="20.3.1" />
+    <PackageVersion Include="Semi.Avalonia" Version="11.2.1.8" />
+    <PackageVersion Include="Semi.Avalonia.DataGrid" Version="11.2.1.8" />
+    <PackageVersion Include="Splat.NLog" Version="15.3.1" />
+    <PackageVersion Include="sqlite-net-pcl" Version="1.9.172" />
+    <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>
+</Project>

v2rayN/PacLib/PacHandler.cs

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

v2rayN/PacLib/PacLib.csproj

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

v2rayN/PacLib/Resources.Designer.cs

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

v2rayN/ProtosLib/ProtosLib.csproj

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

v2rayN/ProtosLib/Statistics.proto

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

v2rayN/ProtosLib/Tests.cs

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

v2rayN/ServiceLib/Base/MyReactiveObject.cs

@@ -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

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

v2rayN/ServiceLib/Common/DesUtils.cs

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

v2rayN/ServiceLib/Common/DownloaderHelper.cs

@@ -1,16 +1,16 @@
-using Downloader;
 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) =>
+        downloader.DownloadStarted += (sender, value) => progress?.Report(0);
-            {
-                progress?.Report(0);
-            };
         downloader.DownloadProgressChanged += (sender, value) =>
         {
             hasValue = true;
@@ -180,5 +177,4 @@ namespace ServiceLib.Common
 
         downloadOpt = null;
     }
-    }
 }

v2rayN/ServiceLib/Common/EmbedUtils.cs

@@ -0,0 +1,61 @@
+using System.Collections.Concurrent;
+using System.Reflection;
+
+namespace ServiceLib.Common;
+
+public static class EmbedUtils
+{
+    private static readonly string _tag = "EmbedUtils";
+    private static readonly ConcurrentDictionary<string, string> _dicEmbedCache = new();
+
+    /// <summary>
+    /// Get embedded text resources
+    /// </summary>
+    /// <param name="res"></param>
+    /// <returns></returns>
+    public static string GetEmbedText(string res)
+    {
+        if (_dicEmbedCache.TryGetValue(res, out var value))
+        {
+            return value;
+        }
+        var result = string.Empty;
+
+        try
+        {
+            var assembly = Assembly.GetExecutingAssembly();
+            using var stream = assembly.GetManifestResourceStream(res);
+            ArgumentNullException.ThrowIfNull(stream);
+            using StreamReader reader = new(stream);
+            result = reader.ReadToEnd();
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+
+        _dicEmbedCache.TryAdd(res, result);
+        return result;
+    }
+
+    /// <summary>
+    /// Get local storage resources
+    /// </summary>
+    /// <returns></returns>
+    public static string? LoadResource(string? res)
+    {
+        try
+        {
+            if (File.Exists(res))
+            {
+                return File.ReadAllText(res);
+            }
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+
+        return null;
+    }
+}

v2rayN/ServiceLib/Common/FileManager.cs

@@ -1,11 +1,13 @@
-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)
     {
         try
@@ -15,7 +17,7 @@ namespace ServiceLib.Common
         }
         catch (Exception ex)
         {
-                Logging.SaveLog(ex.Message, ex);
+            Logging.SaveLog(_tag, ex);
         }
         return false;
     }
@@ -30,7 +32,7 @@ namespace ServiceLib.Common
         }
         catch (Exception ex)
         {
-                Logging.SaveLog(ex.Message, ex);
+            Logging.SaveLog(_tag, ex);
         }
     }
 
@@ -46,7 +48,7 @@ namespace ServiceLib.Common
         }
         catch (Exception ex)
         {
-                Logging.SaveLog(ex.Message, ex);
+            Logging.SaveLog(_tag, ex);
         }
     }
 
@@ -60,7 +62,7 @@ namespace ServiceLib.Common
         }
         catch (Exception ex)
         {
-                Logging.SaveLog(ex.Message, ex);
+            Logging.SaveLog(_tag, ex);
         }
     }
 
@@ -79,7 +81,7 @@ namespace ServiceLib.Common
         }
         catch (Exception ex)
         {
-                Logging.SaveLog(ex.Message, ex);
+            Logging.SaveLog(_tag, ex);
             throw;
         }
     }
@@ -97,7 +99,7 @@ namespace ServiceLib.Common
                 }
                 try
                 {
-                        if (Utils.IsNotEmpty(ignoredName) && entry.Name.Contains(ignoredName))
+                    if (ignoredName.IsNotEmpty() && entry.Name.Contains(ignoredName))
                     {
                         continue;
                     }
@@ -105,13 +107,13 @@ namespace ServiceLib.Common
                 }
                 catch (IOException ex)
                 {
-                        Logging.SaveLog(ex.Message, ex);
+                    Logging.SaveLog(_tag, ex);
                 }
             }
         }
         catch (Exception ex)
         {
-                Logging.SaveLog(ex.Message, ex);
+            Logging.SaveLog(_tag, ex);
             return false;
         }
         return true;
@@ -130,7 +132,7 @@ namespace ServiceLib.Common
         }
         catch (Exception ex)
         {
-                Logging.SaveLog(ex.Message, ex);
+            Logging.SaveLog(_tag, ex);
             return null;
         }
     }
@@ -148,31 +150,33 @@ namespace ServiceLib.Common
         }
         catch (Exception ex)
         {
-                Logging.SaveLog(ex.Message, ex);
+            Logging.SaveLog(_tag, ex);
             return false;
         }
         return true;
     }
 
-        public static void CopyDirectory(string sourceDir, string destinationDir, bool recursive, string? ignoredName)
+    public static void CopyDirectory(string sourceDir, string destinationDir, bool recursive, bool overwrite, string? ignoredName = null)
     {
         // Get information about the source directory
         var dir = new DirectoryInfo(sourceDir);
 
         // Check if the source directory exists
         if (!dir.Exists)
+        {
             throw new DirectoryNotFoundException($"Source directory not found: {dir.FullName}");
+        }
 
         // Cache directories before we start copying
         var dirs = dir.GetDirectories();
 
         // Create the destination directory
-            Directory.CreateDirectory(destinationDir);
+        _ = 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;
             }
@@ -181,7 +185,11 @@ namespace ServiceLib.Common
                 continue;
             }
             var targetFilePath = Path.Combine(destinationDir, file.Name);
-                file.CopyTo(targetFilePath, true);
+            if (!overwrite && File.Exists(targetFilePath))
+            {
+                continue;
+            }
+            _ = file.CopyTo(targetFilePath, overwrite);
         }
 
         // If recursive and copying subdirectories, recursively call this method
@@ -190,9 +198,29 @@ namespace ServiceLib.Common
             foreach (var subDir in dirs)
             {
                 var newDestinationDir = Path.Combine(destinationDir, subDir.Name);
-                    CopyDirectory(subDir.FullName, newDestinationDir, true, ignoredName);
+                CopyDirectory(subDir.FullName, newDestinationDir, true, overwrite, ignoredName);
             }
         }
     }
+
+    public static void DeleteExpiredFiles(string sourceDir, DateTime dtLine)
+    {
+        try
+        {
+            var files = Directory.GetFiles(sourceDir, "*.*");
+            foreach (var filePath in files)
+            {
+                var file = new FileInfo(filePath);
+                if (file.CreationTime >= dtLine)
+                {
+                    continue;
+                }
+                file.Delete();
+            }
+        }
+        catch
+        {
+            // ignored
+        }
     }
 }

v2rayN/ServiceLib/Common/HttpClientHelper.cs

@@ -1,16 +1,16 @@
-using System.Net.Http.Headers;
+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(() =>
     {
-            HttpClientHandler handler = new() { UseCookies = false };
+        SocketsHttpHandler handler = new() { UseCookies = false };
         HttpClientHelper helper = new(new HttpClient(handler));
         return helper;
     });
@@ -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,13 +43,19 @@ namespace ServiceLib.Common
 
     public async Task<string?> GetAsync(string url)
     {
-            if (Utils.IsNullOrEmpty(url)) return null;
+        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)) return null;
+        if (url.IsNullOrEmpty())
+        {
+            return null;
+        }
         return await client.GetStringAsync(url, token);
     }
 
@@ -53,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");
 
@@ -75,11 +86,17 @@ namespace ServiceLib.Common
     {
         ArgumentNullException.ThrowIfNull(url);
         ArgumentNullException.ThrowIfNull(fileName);
-            if (File.Exists(fileName)) File.Delete(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());
+        if (!response.IsSuccessStatusCode)
+        {
+            throw new Exception(response.StatusCode.ToString());
+        }
 
         var total = response.Content.Headers.ContentLength ?? -1L;
         var canReportProgress = total != -1 && progress != null;
@@ -97,8 +114,11 @@ namespace ServiceLib.Common
             var read = await stream.ReadAsync(buffer, token);
             totalRead += read;
 
-                if (read == 0) break;
+            if (read == 0)
-                await file.WriteAsync(buffer, 0, read, token);
+            {
+                break;
+            }
+            await file.WriteAsync(buffer.AsMemory(0, read), token);
 
             if (canReportProgress)
             {
@@ -118,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));
         }
@@ -168,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;
@@ -182,5 +202,4 @@ namespace ServiceLib.Common
             }
         } while (isMoreToRead);
     }
-    }
 }

v2rayN/ServiceLib/Common/Job.cs

@@ -1,8 +1,7 @@
-using System.Diagnostics;
+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;
+            var extendedInfoPtr = IntPtr.Zero;
-            JOBOBJECT_BASIC_LIMIT_INFORMATION info = new()
+            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)
             {
@@ -75,7 +76,10 @@ namespace ServiceLib.Common
 
         private void Dispose(bool disposing)
         {
-            if (disposed) return;
+            if (disposed)
+            {
+                return;
+            }
             disposed = true;
 
             if (disposing)
@@ -103,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);
@@ -120,34 +124,34 @@ namespace ServiceLib.Common
     [StructLayout(LayoutKind.Sequential)]
     internal struct IO_COUNTERS
     {
-        public UInt64 ReadOperationCount;
+        public ulong ReadOperationCount;
-        public UInt64 WriteOperationCount;
+        public ulong WriteOperationCount;
-        public UInt64 OtherOperationCount;
+        public ulong OtherOperationCount;
-        public UInt64 ReadTransferCount;
+        public ulong ReadTransferCount;
-        public UInt64 WriteTransferCount;
+        public ulong WriteTransferCount;
-        public UInt64 OtherTransferCount;
+        public ulong OtherTransferCount;
     }
 
     [StructLayout(LayoutKind.Sequential)]
     internal struct JOBOBJECT_BASIC_LIMIT_INFORMATION
     {
-        public Int64 PerProcessUserTimeLimit;
+        public long PerProcessUserTimeLimit;
-        public Int64 PerJobUserTimeLimit;
+        public long PerJobUserTimeLimit;
-        public UInt32 LimitFlags;
+        public uint LimitFlags;
         public UIntPtr MinimumWorkingSetSize;
         public UIntPtr MaximumWorkingSetSize;
-        public UInt32 ActiveProcessLimit;
+        public uint ActiveProcessLimit;
         public UIntPtr Affinity;
-        public UInt32 PriorityClass;
+        public uint PriorityClass;
-        public UInt32 SchedulingClass;
+        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)]
@@ -173,4 +177,4 @@ namespace ServiceLib.Common
     }
 
     #endregion Helper classes
-}
+

v2rayN/ServiceLib/Common/JsonUtils.cs

@@ -1,11 +1,14 @@
-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>
     /// DeepCopy
     /// </summary>
@@ -70,8 +73,9 @@ namespace ServiceLib.Common
     /// </summary>
     /// <param name="obj"></param>
     /// <param name="indented"></param>
+    /// <param name="nullValue"></param>
     /// <returns></returns>
-        public static string Serialize(object? obj, bool indented = true)
+    public static string Serialize(object? obj, bool indented = true, bool nullValue = false)
     {
         var result = string.Empty;
         try
@@ -82,14 +86,39 @@ namespace ServiceLib.Common
             }
             var options = new JsonSerializerOptions
             {
-                    WriteIndented = indented ? true : false,
+                WriteIndented = indented,
-                    DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
+                DefaultIgnoreCondition = nullValue ? JsonIgnoreCondition.Never : JsonIgnoreCondition.WhenWritingNull,
+                Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping
             };
             result = JsonSerializer.Serialize(obj, options);
         }
         catch (Exception ex)
         {
-                Logging.SaveLog(ex.Message, ex);
+            Logging.SaveLog(_tag, ex);
+        }
+        return result;
+    }
+
+    /// <summary>
+    /// Serialize Object to Json string
+    /// </summary>
+    /// <param name="obj"></param>
+    /// <param name="options"></param>
+    /// <returns></returns>
+    public static string Serialize(object? obj, JsonSerializerOptions options)
+    {
+        var result = string.Empty;
+        try
+        {
+            if (obj == null)
+            {
+                return result;
+            }
+            result = JsonSerializer.Serialize(obj, options);
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
         }
         return result;
     }
@@ -100,38 +129,4 @@ namespace ServiceLib.Common
     /// <param name="obj"></param>
     /// <returns></returns>
     public static JsonNode? SerializeToNode(object? obj) => JsonSerializer.SerializeToNode(obj);
-
-        /// <summary>
-        /// Save as json file
-        /// </summary>
-        /// <param name="obj"></param>
-        /// <param name="filePath"></param>
-        /// <param name="nullValue"></param>
-        /// <returns></returns>
-        public static int ToFile(object? obj, string? filePath, bool nullValue = true)
-        {
-            if (filePath is null)
-            {
-                return -1;
-            }
-            try
-            {
-                using var file = File.Create(filePath);
-
-                var options = new JsonSerializerOptions
-                {
-                    WriteIndented = true,
-                    DefaultIgnoreCondition = nullValue ? JsonIgnoreCondition.Never : JsonIgnoreCondition.WhenWritingNull
-                };
-
-                JsonSerializer.Serialize(file, obj, options);
-                return 0;
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(ex.Message, ex);
-                return -1;
-            }
-        }
-    }
 }

v2rayN/ServiceLib/Common/Logging.cs

@@ -1,11 +1,14 @@
-using NLog;
+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();
@@ -25,53 +28,28 @@ namespace ServiceLib.Common
         }
     }
 
-        public static void ClearLogs()
-        {
-            Task.Run(() =>
-            {
-                try
-                {
-                    var now = DateTime.Now.AddMonths(-1);
-                    var dir = Utils.GetLogPath();
-                    var files = Directory.GetFiles(dir, "*.txt");
-                    foreach (var filePath in files)
-                    {
-                        var file = new FileInfo(filePath);
-                        if (file.CreationTime < now)
-                        {
-                            try
-                            {
-                                file.Delete();
-                            }
-                            catch { }
-                        }
-                    }
-                }
-                catch { }
-            });
-        }
-
     public static void SaveLog(string strContent)
     {
-            if (LogManager.IsLoggingEnabled())
+        if (!LogManager.IsLoggingEnabled())
         {
-                var logger = LogManager.GetLogger("Log1");
+            return;
-                logger.Info(strContent);
         }
+
+        _logger1.Info(strContent);
     }
 
     public static void SaveLog(string strTitle, Exception ex)
     {
-            if (LogManager.IsLoggingEnabled())
+        if (!LogManager.IsLoggingEnabled())
         {
-                var logger = LogManager.GetLogger("Log2");
+            return;
-                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

@@ -0,0 +1,182 @@
+using System.Diagnostics;
+
+namespace ServiceLib.Common;
+
+public static class ProcUtils
+{
+    private static readonly string _tag = "ProcUtils";
+
+    public static void ProcessStart(string? fileName, string arguments = "")
+    {
+        _ = ProcessStart(fileName, arguments, null);
+    }
+
+    public static int? ProcessStart(string? fileName, string arguments, string? dir)
+    {
+        if (fileName.IsNullOrEmpty())
+        {
+            return null;
+        }
+        try
+        {
+            if (fileName.Contains(' '))
+            {
+                fileName = fileName.AppendQuotes();
+            }
+            if (arguments.Contains(' '))
+            {
+                arguments = arguments.AppendQuotes();
+            }
+
+            Process proc = new()
+            {
+                StartInfo = new ProcessStartInfo
+                {
+                    UseShellExecute = true,
+                    FileName = fileName,
+                    Arguments = arguments,
+                    WorkingDirectory = dir ?? string.Empty
+                }
+            };
+            _ = proc.Start();
+            return dir is null ? null : proc.Id;
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+        return null;
+    }
+
+    public static void RebootAsAdmin(bool blAdmin = true)
+    {
+        try
+        {
+            ProcessStartInfo startInfo = new()
+            {
+                UseShellExecute = true,
+                Arguments = Global.RebootAs,
+                WorkingDirectory = Utils.StartupPath(),
+                FileName = Utils.GetExePath().AppendQuotes(),
+                Verb = blAdmin ? "runas" : null,
+            };
+            _ = Process.Start(startInfo);
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+    }
+
+    public static async Task ProcessKill(int pid)
+    {
+        try
+        {
+            await ProcessKill(Process.GetProcessById(pid), false);
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+    }
+
+    public static async Task ProcessKill(Process? proc, bool review)
+    {
+        if (proc is null)
+        {
+            return;
+        }
+
+        GetProcessKeyInfo(proc, review, out var procId, out var fileName, out var processName);
+
+        try
+        {
+            if (Utils.IsNonWindows())
+            {
+                proc?.Kill(true);
+            }
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+
+        try
+        {
+            proc?.Kill();
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+
+        try
+        {
+            proc?.Close();
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+
+        try
+        {
+            proc?.Dispose();
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+
+        await Task.Delay(300);
+        await ProcessKillByKeyInfo(review, procId, fileName, processName);
+    }
+
+    private static void GetProcessKeyInfo(Process? proc, bool review, out int? procId, out string? fileName, out string? processName)
+    {
+        procId = null;
+        fileName = null;
+        processName = null;
+        if (!review)
+        {
+            return;
+        }
+        try
+        {
+            procId = proc?.Id;
+            fileName = proc?.MainModule?.FileName;
+            processName = proc?.ProcessName;
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+    }
+
+    private static async Task ProcessKillByKeyInfo(bool review, int? procId, string? fileName, string? processName)
+    {
+        if (review && procId != null && fileName != null)
+        {
+            try
+            {
+                var lstProc = Process.GetProcessesByName(processName);
+                foreach (var proc2 in lstProc)
+                {
+                    if (proc2.Id == procId)
+                    {
+                        Logging.SaveLog($"{_tag}, KillProcess not completing the job, procId");
+                        await ProcessKill(proc2, false);
+                    }
+                    if (proc2.MainModule != null && proc2.MainModule?.FileName == fileName)
+                    {
+                        Logging.SaveLog($"{_tag}, KillProcess not completing the job, fileName");
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(_tag, ex);
+            }
+        }
+    }
+}

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

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

v2rayN/ServiceLib/Common/SemanticVersion.cs

@@ -1,29 +1,29 @@
-namespace ServiceLib.Common
+namespace ServiceLib.Common;
+
+public class SemanticVersion
 {
-    public class SemanticVersion
+    private readonly int major;
-    {
+    private readonly int minor;
-        private int major;
+    private readonly int patch;
-        private int minor;
+    private readonly string version;
-        private int patch;
-        private string version;
 
     public SemanticVersion(int major, int minor, int patch)
     {
         this.major = major;
         this.minor = minor;
         this.patch = patch;
-            this.version = $"{major}.{minor}.{patch}";
+        version = $"{major}.{minor}.{patch}";
     }
 
     public SemanticVersion(string? version)
     {
         try
         {
-                if (version.IsNullOrEmpty())
+            if (string.IsNullOrEmpty(version))
             {
-                    this.major = 0;
+                major = 0;
-                    this.minor = 0;
+                minor = 0;
-                    this.patch = 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[0]);
+                major = int.Parse(parts.First());
-                    this.minor = int.Parse(parts[1]);
+                minor = int.Parse(parts.Last());
-                    this.patch = 0;
+                patch = 0;
             }
             else if (parts.Length is 3 or 4)
             {
-                    this.major = int.Parse(parts[0]);
+                major = int.Parse(parts[0]);
-                    this.minor = int.Parse(parts[1]);
+                minor = int.Parse(parts[1]);
-                    this.patch = int.Parse(parts[2]);
+                patch = int.Parse(parts[2]);
             }
             else
             {
@@ -48,9 +48,9 @@
         }
         catch
         {
-                this.major = 0;
+            major = 0;
-                this.minor = 0;
+            minor = 0;
-                this.patch = 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 SQLite;
 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";
@@ -73,5 +73,18 @@ namespace ServiceLib.Common
     {
         return _dbAsync.Table<T>();
     }
+
+    public async Task DisposeDbConnectionAsync()
+    {
+        await Task.Factory.StartNew(() =>
+        {
+            _db?.Close();
+            _db?.Dispose();
+            _db = null;
+
+            _dbAsync?.GetConnection()?.Close();
+            _dbAsync?.GetConnection()?.Dispose();
+            _dbAsync = null;
+        });
     }
 }

v2rayN/ServiceLib/Common/StringEx.cs

@@ -1,12 +1,12 @@
-using System.Diagnostics.CodeAnalysis;
+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)
@@ -21,8 +21,11 @@ namespace ServiceLib.Common
 
     public static bool BeginWithAny(this string s, IEnumerable<char> chars)
     {
-            if (s.IsNullOrEmpty()) return false;
+        if (s.IsNullOrEmpty())
-            return chars.Contains(s[0]);
+        {
+            return false;
+        }
+        return chars.Contains(s.First());
     }
 
     private static bool IsWhiteSpace(this string value)
@@ -34,7 +37,10 @@ namespace ServiceLib.Common
     {
         while (reader.ReadLine() is { } line)
         {
-                if (line.IsWhiteSpace()) continue;
+            if (line.IsWhiteSpace())
+            {
+                continue;
+            }
             yield return line;
         }
     }
@@ -61,12 +67,16 @@ namespace ServiceLib.Common
             return string.Empty;
         }
 
-            return char.ToUpper(value[0]) + value[1..];
+        return char.ToUpper(value.First()) + value[1..];
     }
 
     public static string AppendQuotes(this string value)
     {
         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

@@ -1,5 +1,3 @@
-using CliWrap;
-using CliWrap.Buffered;
 using System.Collections.Specialized;
 using System.Diagnostics;
 using System.Net;
@@ -10,138 +8,81 @@ using System.Runtime.InteropServices;
 using System.Security.Cryptography;
 using System.Security.Principal;
 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>
-        /// 获取嵌入文本资源
-        /// </summary>
-        /// <param name="res"></param>
-        /// <returns></returns>
-        public static string GetEmbedText(string res)
-        {
-            var result = string.Empty;
-
-            try
-            {
-                var assembly = Assembly.GetExecutingAssembly();
-                using var stream = assembly.GetManifestResourceStream(res);
-                ArgumentNullException.ThrowIfNull(stream);
-                using StreamReader reader = new(stream);
-                result = reader.ReadToEnd();
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(ex.Message, ex);
-            }
-            return result;
-        }
-
-        /// <summary>
-        /// 取得存储资源
-        /// </summary>
-        /// <returns></returns>
-        public static string? LoadResource(string? res)
-        {
-            try
-            {
-                if (File.Exists(res))
-                {
-                    return File.ReadAllText(res);
-                }
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(ex.Message, ex);
-            }
-            return null;
-        }
-
-        #endregion 资源操作
 
     #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 || lst.Count == 0)
         {
-                if (lst == null)
-                {
-                    return string.Empty;
-                }
-                if (wrap)
-                {
-                    return string.Join("," + Environment.NewLine, lst);
-                }
-                else
-                {
-                    return string.Join(",", lst);
-                }
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(ex.Message, ex);
-            }
             return string.Empty;
         }
 
+        var separator = wrap ? "," + Environment.NewLine : ",";
+
+        try
+        {
+            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 (string.IsNullOrWhiteSpace(str))
-            {
-                if (str == null)
         {
             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(ex.Message, 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
+        var lst = String2List(str);
-            {
+        lst?.Sort();
-                str = str.Replace(Environment.NewLine, "");
+        return lst;
-                List<string> list = new(str.Split(',', StringSplitOptions.RemoveEmptyEntries));
-                list.Sort();
-                return list;
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(ex.Message, ex);
-            }
-            return null;
     }
 
     /// <summary>
-        /// Base64编码
+    /// Base64 Encode
     /// </summary>
     /// <param name="plainText"></param>
     /// <returns></returns>
@@ -154,13 +95,14 @@ namespace ServiceLib.Common
         }
         catch (Exception ex)
         {
-                Logging.SaveLog("Base64Encode", ex);
+            Logging.SaveLog(_tag, ex);
         }
+
         return string.Empty;
     }
 
     /// <summary>
-        /// Base64解码
+    /// Base64 Decode
     /// </summary>
     /// <param name="plainText"></param>
     /// <returns></returns>
@@ -168,7 +110,11 @@ namespace ServiceLib.Common
     {
         try
         {
-                if (plainText.IsNullOrEmpty()) return "";
+            if (plainText.IsNullOrEmpty())
+            {
+                return "";
+            }
+
             plainText = plainText.Trim()
                 .Replace(Environment.NewLine, "")
                 .Replace("\n", "")
@@ -179,7 +125,7 @@ namespace ServiceLib.Common
 
             if (plainText.Length % 4 > 0)
             {
-                    plainText = plainText.PadRight(plainText.Length + 4 - plainText.Length % 4, '=');
+                plainText = plainText.PadRight(plainText.Length + 4 - (plainText.Length % 4), '=');
             }
 
             var data = Convert.FromBase64String(plainText);
@@ -187,21 +133,10 @@ namespace ServiceLib.Common
         }
         catch (Exception ex)
         {
-                Logging.SaveLog("Base64Decode", ex);
+            Logging.SaveLog(_tag, ex);
-            }
-            return string.Empty;
         }
 
-        public static int ToInt(object? obj)
+        return string.Empty;
-        {
-            try
-            {
-                return Convert.ToInt32(obj ?? string.Empty);
-            }
-            catch
-            {
-                return 0;
-            }
     }
 
     public static bool ToBool(object obj)
@@ -228,52 +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);
+        if (amount <= 0)
-            return $"{result:f1} {unit}";
+        {
+            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)
@@ -289,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;
         }
@@ -302,8 +210,9 @@ namespace ServiceLib.Common
             {
                 continue;
             }
-                var key = Uri.UnescapeDataString(keyValue[0]);
+
-                var val = Uri.UnescapeDataString(keyValue[1]);
+            var key = Uri.UnescapeDataString(keyValue.First());
+            var val = Uri.UnescapeDataString(keyValue.Last());
 
             if (result[key] is null)
             {
@@ -315,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);
@@ -323,8 +239,41 @@ namespace ServiceLib.Common
             {
                 sb.Append(b.ToString("x2"));
             }
+
             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
@@ -333,10 +282,11 @@ namespace ServiceLib.Common
     /// <returns></returns>
     public static string GetPunycode(string url)
     {
-            if (Utils.IsNullOrEmpty(url))
+        if (url.IsNullOrEmpty())
         {
             return url;
         }
+
         try
         {
             Uri uri = new(url);
@@ -357,17 +307,19 @@ namespace ServiceLib.Common
 
     public static bool IsBase64String(string? plainText)
     {
-            if (plainText.IsNullOrEmpty()) return false;
+        if (plainText.IsNullOrEmpty())
+            return false;
         var buffer = new Span<byte>(new byte[plainText.Length]);
         return Convert.TryFromBase64String(plainText, buffer, out var _);
     }
 
     public static string Convert2Comma(string text)
     {
-            if (IsNullOrEmpty(text))
+        if (text.IsNullOrEmpty())
         {
             return text;
         }
+
         return text.Replace("，", ",").Replace(Environment.NewLine, ",");
     }
 
@@ -376,7 +328,7 @@ namespace ServiceLib.Common
     #region 数据检查
 
     /// <summary>
-        /// 判断输入的是否是数字
+    /// Determine if the input is a number
     /// </summary>
     /// <param name="oText"></param>
     /// <returns></returns>
@@ -385,27 +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;
         }
@@ -424,6 +362,7 @@ namespace ServiceLib.Common
                 _ => false,
             };
         }
+
         return false;
     }
 
@@ -444,10 +383,14 @@ namespace ServiceLib.Common
         if (IPAddress.TryParse(ip, out var address))
         {
             var ipBytes = address.GetAddressBytes();
-                if (ipBytes[0] == 10) return true;
+            if (ipBytes[0] == 10)
-                if (ipBytes[0] == 172 && ipBytes[1] >= 16 && ipBytes[1] <= 31) return true;
+                return true;
-                if (ipBytes[0] == 192 && ipBytes[1] == 168) return true;
+            if (ipBytes[0] == 172 && ipBytes[1] >= 16 && ipBytes[1] <= 31)
+                return true;
+            if (ipBytes[0] == 192 && ipBytes[1] == 168)
+                return true;
         }
+
         return false;
     }
 
@@ -459,15 +402,28 @@ namespace ServiceLib.Common
     {
         try
         {
-                var ipProperties = IPGlobalProperties.GetIPGlobalProperties();
+            List<IPEndPoint> lstIpEndPoints = new();
-                var ipEndPoints = ipProperties.GetActiveTcpListeners();
+            List<TcpConnectionInformation> lstTcpConns = new();
-                //var lstIpEndPoints = new List<IPEndPoint>(IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpListeners());
+
-                return ipEndPoints.Any(endPoint => endPoint.Port == port);
+            lstIpEndPoints.AddRange(IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpListeners());
+            lstIpEndPoints.AddRange(IPGlobalProperties.GetIPGlobalProperties().GetActiveUdpListeners());
+            lstTcpConns.AddRange(IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpConnections());
+
+            if (lstIpEndPoints?.FindIndex(it => it.Port == port) >= 0)
+            {
+                return true;
+            }
+
+            if (lstTcpConns?.FindIndex(it => it.LocalEndPoint.Port == port) >= 0)
+            {
+                return true;
+            }
         }
         catch (Exception ex)
         {
-                Logging.SaveLog(ex.Message, ex);
+            Logging.SaveLog(_tag, ex);
         }
+
         return false;
     }
 
@@ -489,6 +445,7 @@ namespace ServiceLib.Common
         catch
         {
         }
+
         return 59090;
     }
 
@@ -496,33 +453,29 @@ namespace ServiceLib.Common
 
     #region 杂项
 
-        public static bool UpgradeAppExists(out string fileName)
+    public static bool UpgradeAppExists(out string upgradeFileName)
     {
-            fileName = Path.Combine(Utils.StartupPath(), GetExeName("AmazTool"));
+        upgradeFileName = Path.Combine(GetBaseDirectory(), GetExeName("AmazTool"));
-            return File.Exists(fileName);
+        return File.Exists(upgradeFileName);
     }
 
     /// <summary>
-        /// 取得版本
+    /// Get version
     /// </summary>
     /// <returns></returns>
     public static string GetVersion(bool blFull = true)
     {
         try
         {
-                if (blFull)
+            return blFull
-                {
+                ? $"{Global.AppName} - V{GetVersionInfo()} - {RuntimeInformation.ProcessArchitecture}"
-                    return $"{Global.AppName} - V{GetVersionInfo()} - {RuntimeInformation.ProcessArchitecture} - {File.GetLastWriteTime(GetExePath()):yyyy/MM/dd}";
+                : $"{Global.AppName}/{GetVersionInfo()}";
-                }
-                else
-                {
-                    return $"{Global.AppName}/{GetVersionInfo()}";
-                }
         }
         catch (Exception ex)
         {
-                Logging.SaveLog(ex.Message, ex);
+            Logging.SaveLog(_tag, ex);
         }
+
         return Global.AppName;
     }
 
@@ -534,13 +487,18 @@ namespace ServiceLib.Common
         }
         catch (Exception ex)
         {
-                Logging.SaveLog(ex.Message, ex);
+            Logging.SaveLog(_tag, ex);
             return "0.0";
         }
     }
 
+    public static string GetRuntimeInfo()
+    {
+        return $"{Utils.GetVersion()} | {Utils.StartupPath()} | {Utils.GetExePath()} | {Environment.OSVersion}";
+    }
+
     /// <summary>
-        /// 取得GUID
+    /// GUID
     /// </summary>
     /// <returns></returns>
     public static string GetGuid(bool full = true)
@@ -558,8 +516,9 @@ namespace ServiceLib.Common
         }
         catch (Exception ex)
         {
-                Logging.SaveLog(ex.Message, ex);
+            Logging.SaveLog(_tag, ex);
         }
+
         return string.Empty;
     }
 
@@ -568,19 +527,6 @@ namespace ServiceLib.Common
         return Guid.TryParse(strSrc, out _);
     }
 
-        public static void ProcessStart(string? fileName, string arguments = "")
-        {
-            try
-            {
-                if (fileName.IsNullOrEmpty()) { return; }
-                Process.Start(new ProcessStartInfo(fileName, arguments) { UseShellExecute = true });
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(ex.Message, ex);
-            }
-        }
-
     public static Dictionary<string, string> GetSystemHosts()
     {
         var systemHosts = new Dictionary<string, string>();
@@ -594,17 +540,20 @@ namespace ServiceLib.Common
 
                 foreach (var host in hostsList)
                 {
-                        if (host.StartsWith("#")) continue;
+                    if (host.StartsWith("#"))
+                        continue;
                     var hostItem = host.Split(new[] { ' ', '\t' }, StringSplitOptions.RemoveEmptyEntries);
-                        if (hostItem.Length < 2) continue;
+                    if (hostItem.Length != 2)
-                        systemHosts.Add(hostItem[1], hostItem[0]);
+                        continue;
+                    systemHosts.Add(hostItem.Last(), hostItem.First());
                 }
             }
         }
         catch (Exception ex)
         {
-                Logging.SaveLog(ex.Message, ex);
+            Logging.SaveLog(_tag, ex);
         }
+
         return systemHosts;
     }
 
@@ -629,17 +578,20 @@ namespace ServiceLib.Common
                     cmd = cmd.WithArguments(args);
                 }
             }
+
             var result = await cmd.ExecuteBufferedAsync();
             if (result.IsSuccess)
             {
-                    return result.StandardOutput.ToString();
+                return result.StandardOutput ?? "";
             }
+
             Logging.SaveLog(result.ToString() ?? "");
         }
         catch (Exception ex)
         {
             Logging.SaveLog("GetCliWrapOutput", ex);
         }
+
         return null;
     }
 
@@ -647,16 +599,56 @@ namespace ServiceLib.Common
 
     #region TempPath
 
+    public static bool HasWritePermission()
+    {
+        try
+        {
+            var basePath = GetBaseDirectory();
+            //When this file exists, it is equivalent to having no permission to read and write
+            if (File.Exists(Path.Combine(basePath, "NotStoreConfigHere.txt")))
+            {
+                return false;
+            }
+
+            //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);
+            }
+            var fileName = Path.Combine(tempPath, GetGuid());
+            File.Create(fileName).Close();
+            File.Delete(fileName);
+        }
+        catch (Exception)
+        {
+            return false;
+        }
+
+        return true;
+    }
+
     public static string GetPath(string fileName)
     {
         var startupPath = StartupPath();
-            if (IsNullOrEmpty(fileName))
+        if (fileName.IsNullOrEmpty())
         {
             return startupPath;
         }
+
         return Path.Combine(startupPath, fileName);
     }
 
+    public static string GetBaseDirectory(string fileName = "")
+    {
+        return Path.Combine(AppDomain.CurrentDomain.BaseDirectory, fileName);
+    }
+
     public static string GetExePath()
     {
         return Environment.ProcessPath ?? Process.GetCurrentProcess().MainModule?.FileName ?? string.Empty;
@@ -664,7 +656,12 @@ namespace ServiceLib.Common
 
     public static string StartupPath()
     {
-            return AppDomain.CurrentDomain.BaseDirectory;
+        if (Environment.GetEnvironmentVariable(Global.LocalAppData) == "1")
+        {
+            return Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "v2rayN");
+        }
+
+        return GetBaseDirectory();
     }
 
     public static string GetTempPath(string filename = "")
@@ -674,7 +671,8 @@ namespace ServiceLib.Common
         {
             Directory.CreateDirectory(tempPath);
         }
-            if (IsNullOrEmpty(filename))
+
+        if (filename.IsNullOrEmpty())
         {
             return tempPath;
         }
@@ -691,6 +689,7 @@ namespace ServiceLib.Common
         {
             Directory.CreateDirectory(tempPath);
         }
+
         return Path.Combine(tempPath, filename);
     }
 
@@ -701,7 +700,8 @@ namespace ServiceLib.Common
         {
             Directory.CreateDirectory(tempPath);
         }
-            if (Utils.IsNullOrEmpty(filename))
+
+        if (filename.IsNullOrEmpty())
         {
             return tempPath;
         }
@@ -718,6 +718,7 @@ namespace ServiceLib.Common
         {
             Directory.CreateDirectory(tempPath);
         }
+
         if (coreType != null)
         {
             tempPath = Path.Combine(tempPath, coreType.ToLower().ToString());
@@ -726,7 +727,8 @@ namespace ServiceLib.Common
                 Directory.CreateDirectory(tempPath);
             }
         }
-            if (IsNullOrEmpty(filename))
+
+        if (filename.IsNullOrEmpty())
         {
             return tempPath;
         }
@@ -743,7 +745,8 @@ namespace ServiceLib.Common
         {
             Directory.CreateDirectory(tempPath);
         }
-            if (Utils.IsNullOrEmpty(filename))
+
+        if (filename.IsNullOrEmpty())
         {
             return tempPath;
         }
@@ -760,7 +763,26 @@ namespace ServiceLib.Common
         {
             Directory.CreateDirectory(tempPath);
         }
-            if (Utils.IsNullOrEmpty(filename))
+
+        if (filename.IsNullOrEmpty())
+        {
+            return tempPath;
+        }
+        else
+        {
+            return Path.Combine(tempPath, filename);
+        }
+    }
+
+    public static string GetBinConfigPath(string filename = "")
+    {
+        var tempPath = Path.Combine(StartupPath(), "binConfigs");
+        if (!Directory.Exists(tempPath))
+        {
+            Directory.CreateDirectory(tempPath);
+        }
+
+        if (filename.IsNullOrEmpty())
         {
             return tempPath;
         }
@@ -780,6 +802,8 @@ namespace ServiceLib.Common
 
     public static bool IsOSX() => RuntimeInformation.IsOSPlatform(OSPlatform.OSX);
 
+    public static bool IsNonWindows() => !RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
+
     public static string GetExeName(string name)
     {
         return IsWindows() ? $"{name}.exe" : name;
@@ -791,33 +815,83 @@ namespace ServiceLib.Common
         {
             return new WindowsPrincipal(WindowsIdentity.GetCurrent()).IsInRole(WindowsBuiltInRole.Administrator);
         }
-            else
-            {
-                var id = GetLinuxUserId().Result ?? "1000";
-                if (int.TryParse(id, out var userId))
-                {
-                    return userId == 0;
-                }
-                else
-                {
         return false;
-                }
+        //else
-            }
+        //{
+        //    var id = GetLinuxUserId().Result ?? "1000";
+        //    if (int.TryParse(id, out var userId))
+        //    {
+        //        return userId == 0;
+        //    }
+        //    else
+        //    {
+        //        return false;
+        //    }
+        //}
     }
 
     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)
     {
-            if (fileName.IsNullOrEmpty()) return null;
+        if (fileName.IsNullOrEmpty())
+        {
+            return null;
+        }
+        if (SetUnixFileMode(fileName))
+        {
+            Logging.SaveLog($"Successfully set the file execution permission, {fileName}");
+            return "";
+        }
+
+        if (fileName.Contains(' '))
+        {
+            fileName = fileName.AppendQuotes();
+        }
         var arg = new List<string>() { "-c", $"chmod +x {fileName}" };
-            return await GetCliWrapOutput("/bin/bash", arg);
+        return await GetCliWrapOutput(Global.LinuxBash, arg);
+    }
+
+    public static bool SetUnixFileMode(string? fileName)
+    {
+        try
+        {
+            if (fileName.IsNullOrEmpty())
+            {
+                return false;
+            }
+
+            if (File.Exists(fileName))
+            {
+                var currentMode = File.GetUnixFileMode(fileName);
+                File.SetUnixFileMode(fileName, currentMode | UnixFileMode.UserExecute | UnixFileMode.GroupExecute | UnixFileMode.OtherExecute);
+                return true;
+            }
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog("SetUnixFileMode", ex);
+        }
+        return false;
+    }
+
+    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(Global.LinuxBash, arg);
+    }
+
+    public static string? GetHomePath()
+    {
+        return IsWindows()
+            ? Environment.ExpandEnvironmentVariables("%HOMEDRIVE%%HOMEPATH%")
+            : Environment.GetEnvironmentVariable("HOME");
     }
 
     #endregion Platform
-    }
 }

v2rayN/ServiceLib/Common/WindowsUtils.cs

@@ -0,0 +1,73 @@
+using System.Security.Cryptography;
+using System.Text;
+using Microsoft.Win32;
+
+namespace ServiceLib.Common;
+
+internal static class WindowsUtils
+{
+    private static readonly string _tag = "WindowsUtils";
+
+    public static string? RegReadValue(string path, string name, string def)
+    {
+        RegistryKey? regKey = null;
+        try
+        {
+            regKey = Registry.CurrentUser.OpenSubKey(path, false);
+            var value = regKey?.GetValue(name) as string;
+            return value.IsNullOrEmpty() ? def : value;
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+        finally
+        {
+            regKey?.Close();
+        }
+        return def;
+    }
+
+    public static void RegWriteValue(string path, string name, object value)
+    {
+        RegistryKey? regKey = null;
+        try
+        {
+            regKey = Registry.CurrentUser.CreateSubKey(path);
+            if (value.ToString().IsNullOrEmpty())
+            {
+                regKey?.DeleteValue(name, false);
+            }
+            else
+            {
+                regKey?.SetValue(name, value);
+            }
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+        finally
+        {
+            regKey?.Close();
+        }
+    }
+
+    public static async Task RemoveTunDevice()
+    {
+        try
+        {
+            var sum = MD5.HashData(Encoding.UTF8.GetBytes("wintunsingbox_tun"));
+            var guid = new Guid(sum);
+            var pnpUtilPath = @"C:\Windows\System32\pnputil.exe";
+            var arg = $$""" /remove-device  "SWD\Wintun\{{{guid}}}" """;
+
+            // Try to remove the device
+            _ = await Utils.GetCliWrapOutput(pnpUtilPath, arg);
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+    }
+}

v2rayN/ServiceLib/Common/YamlUtils.cs

@@ -1,15 +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>
@@ -26,13 +28,13 @@ namespace ServiceLib.Common
         }
         catch (Exception ex)
         {
-                Logging.SaveLog("FromYaml", ex);
+            Logging.SaveLog(_tag, ex);
             return deserializer.Deserialize<T>("");
         }
     }
 
     /// <summary>
-        /// 序列化
+    /// Serialize
     /// </summary>
     /// <param name="obj"></param>
     /// <returns></returns>
@@ -53,16 +55,13 @@ namespace ServiceLib.Common
         }
         catch (Exception ex)
         {
-                Logging.SaveLog(ex.Message, ex);
+            Logging.SaveLog(_tag, ex);
         }
         return result;
     }
 
     public static string? PreprocessYaml(string str)
     {
-            var deserializer = new DeserializerBuilder()
-                .WithNamingConvention(PascalCaseNamingConvention.Instance)
-                .Build();
         try
         {
             var mergingParser = new MergingParser(new Parser(new StringReader(str)));
@@ -71,11 +70,10 @@ namespace ServiceLib.Common
         }
         catch (Exception ex)
         {
-                Logging.SaveLog("PreprocessYaml", ex);
+            Logging.SaveLog(_tag, ex);
             return null;
         }
     }
 
     #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,23 +1,18 @@
-namespace ServiceLib.Enums
+namespace ServiceLib.Enums;
+
+public enum ECoreType
 {
-    public enum ECoreType
-    {
     v2fly = 1,
     Xray = 2,
-
-        //SagerNet = 3,
     v2fly_v5 = 4,
-
-        //clash = 11,
-        //clash_meta = 12,
     mihomo = 13,
-
     hysteria = 21,
     naiveproxy = 22,
     tuic = 23,
     sing_box = 24,
     juicity = 25,
     hysteria2 = 26,
+    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,14 +1,13 @@
-namespace ServiceLib.Enums
+namespace ServiceLib.Enums;
+
+public enum EInboundProtocol
 {
-    public enum EInboundProtocol
-    {
     socks = 0,
-        http,
     socks2,
-        http2,
+    socks3,
     pac,
     api,
     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,10 +1,10 @@
-namespace ServiceLib.Enums
+namespace ServiceLib.Enums;
+
+public enum EMsgCommand
 {
-    public enum EMsgCommand
-    {
     ClearMsg,
     SendMsgView,
     SendSnackMsg,
-        RefreshProfiles
+    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,8 +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

@@ -0,0 +1,12 @@
+namespace ServiceLib.Enums;
+
+public enum ETheme
+{
+    FollowSystem,
+    Dark,
+    Light,
+    Aquatic,
+    Desert,
+    Dusk,
+    NightSky
+}

v2rayN/ServiceLib/Enums/ETransport.cs

@@ -1,15 +1,14 @@
-namespace ServiceLib.Enums
+namespace ServiceLib.Enums;
+
+public enum ETransport
 {
-    public enum ETransport
-    {
     tcp,
     kcp,
     ws,
     httpupgrade,
-        splithttp,
+    xhttp,
     h2,
     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,
@@ -19,6 +19,8 @@
     Shutdown,
     BrowseServer,
     ImportRulesFromFile,
+    InitSettingFont,
+    PasswordInput,
     SubEditWindow,
     RoutingRuleSettingWindow,
     RoutingRuleDetailsWindow,
@@ -41,5 +43,4 @@
     DispatcherCheckUpdate,
     DispatcherCheckUpdateFinished,
     DispatcherShowMsg,
-    }
 }

v2rayN/ServiceLib/Global.cs

@@ -1,48 +1,43 @@
-namespace ServiceLib
+namespace ServiceLib;
+
+public class Global
 {
-    public class Global
-    {
     #region const
 
     public const string AppName = "v2rayN";
     public const string GithubUrl = "https://github.com";
     public const string GithubApiUrl = "https://api.github.com/repos";
-        public const string V2flyCoreUrl = "https://github.com/v2fly/v2ray-core/releases";
-        public const string XrayCoreUrl = "https://github.com/XTLS/Xray-core/releases";
-        public const string NUrl = @"https://github.com/2dust/v2rayN/releases";
-        public const string MihomoCoreUrl = "https://github.com/MetaCubeX/mihomo/releases";
-        public const string HysteriaCoreUrl = "https://github.com/apernet/hysteria/releases";
-        public const string NaiveproxyCoreUrl = "https://github.com/klzgrad/naiveproxy/releases";
-        public const string TuicCoreUrl = "https://github.com/EAimTY/tuic/releases";
-        public const string SingboxCoreUrl = "https://github.com/SagerNet/sing-box/releases";
     public const string GeoUrl = "https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/{0}.dat";
-        public const string SpeedPingTestUrl = @"https://www.google.com/generate_204";
-        public const string JuicityCoreUrl = "https://github.com/juicity/juicity/releases";
-        public const string CustomRoutingListUrl = @"https://raw.githubusercontent.com/2dust/v2rayCustomRoutingList/master/";
     public const string SingboxRulesetUrl = @"https://raw.githubusercontent.com/2dust/sing-box-rules/rule-set-{0}/{1}.srs";
 
     public const string PromotionUrl = @"aHR0cHM6Ly85LjIzNDQ1Ni54eXovYWJjLmh0bWw=";
     public const string ConfigFileName = "guiNConfig.json";
     public const string CoreConfigFileName = "config.json";
     public const string CorePreConfigFileName = "configPre.json";
-        public const string CoreSpeedtestConfigFileName = "configSpeedtest.json";
+    public const string CoreSpeedtestConfigFileName = "configTest{0}.json";
     public const string CoreMultipleLoadConfigFileName = "configMultipleLoad.json";
     public const string ClashMixinConfigFileName = "Mixin.yaml";
-        public const string V2raySampleClient = "ServiceLib.Sample.SampleClientConfig";
+
-        public const string SingboxSampleClient = "ServiceLib.Sample.SingboxSampleClientConfig";
+    public const string NamespaceSample = "ServiceLib.Sample.";
-        public const string V2raySampleHttpRequestFileName = "ServiceLib.Sample.SampleHttpRequest";
+    public const string V2raySampleClient = NamespaceSample + "SampleClientConfig";
-        public const string V2raySampleHttpResponseFileName = "ServiceLib.Sample.SampleHttpResponse";
+    public const string SingboxSampleClient = NamespaceSample + "SingboxSampleClientConfig";
-        public const string V2raySampleInbound = "ServiceLib.Sample.SampleInbound";
+    public const string V2raySampleHttpRequestFileName = NamespaceSample + "SampleHttpRequest";
-        public const string V2raySampleOutbound = "ServiceLib.Sample.SampleOutbound";
+    public const string V2raySampleHttpResponseFileName = NamespaceSample + "SampleHttpResponse";
-        public const string SingboxSampleOutbound = "ServiceLib.Sample.SingboxSampleOutbound";
+    public const string V2raySampleInbound = NamespaceSample + "SampleInbound";
-        public const string CustomRoutingFileName = "ServiceLib.Sample.custom_routing_";
+    public const string V2raySampleOutbound = NamespaceSample + "SampleOutbound";
-        public const string TunSingboxDNSFileName = "ServiceLib.Sample.tun_singbox_dns";
+    public const string SingboxSampleOutbound = NamespaceSample + "SingboxSampleOutbound";
-        public const string TunSingboxInboundFileName = "ServiceLib.Sample.tun_singbox_inbound";
+    public const string CustomRoutingFileName = NamespaceSample + "custom_routing_";
-        public const string TunSingboxRulesFileName = "ServiceLib.Sample.tun_singbox_rules";
+    public const string TunSingboxDNSFileName = NamespaceSample + "tun_singbox_dns";
-        public const string DNSV2rayNormalFileName = "ServiceLib.Sample.dns_v2ray_normal";
+    public const string TunSingboxInboundFileName = NamespaceSample + "tun_singbox_inbound";
-        public const string DNSSingboxNormalFileName = "ServiceLib.Sample.dns_singbox_normal";
+    public const string TunSingboxRulesFileName = NamespaceSample + "tun_singbox_rules";
-        public const string ClashMixinYaml = "ServiceLib.Sample.clash_mixin_yaml";
+    public const string DNSV2rayNormalFileName = NamespaceSample + "dns_v2ray_normal";
-        public const string ClashTunYaml = "ServiceLib.Sample.clash_tun_yaml";
+    public const string DNSSingboxNormalFileName = NamespaceSample + "dns_singbox_normal";
+    public const string ClashMixinYaml = NamespaceSample + "clash_mixin_yaml";
+    public const string ClashTunYaml = NamespaceSample + "clash_tun_yaml";
+    public const string LinuxAutostartConfig = NamespaceSample + "linux_autostart_config";
+    public const string PacFileName = NamespaceSample + "pac";
+    public const string 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";
@@ -58,81 +53,99 @@
     public const string HttpProtocol = "http://";
     public const string HttpsProtocol = "https://";
     public const string SocksProtocol = "socks://";
+    public const string Socks5Protocol = "socks5://";
 
     public const string UserEMail = "t@t.tt";
     public const string AutoRunRegPath = @"Software\Microsoft\Windows\CurrentVersion\Run";
     public const string AutoRunName = "v2rayNAutoRun";
-        public const string CustomIconName = "v2rayN.ico";
+    public const string SystemProxyExceptionsWindows = "localhost;127.*;10.*;172.16.*;172.17.*;172.18.*;172.19.*;172.20.*;172.21.*;172.22.*;172.23.*;172.24.*;172.25.*;172.26.*;172.27.*;172.28.*;172.29.*;172.30.*;172.31.*;192.168.*";
-        public const string IEProxyExceptions = "localhost;127.*;10.*;172.16.*;172.17.*;172.18.*;172.19.*;172.20.*;172.21.*;172.22.*;172.23.*;172.24.*;172.25.*;172.26.*;172.27.*;172.28.*;172.29.*;172.30.*;172.31.*;192.168.*";
+    public const string SystemProxyExceptionsLinux = "localhost,127.0.0.0/8,::1";
     public const string RoutingRuleComma = "<COMMA>";
     public const string GrpcGunMode = "gun";
     public const string GrpcMultiMode = "multi";
     public const int MaxPort = 65536;
-        public const string DelayUnit = "";
+    public const int MinFontSize = 8;
-        public const string SpeedUnit = "";
-        public const int MinFontSize = 10;
     public const string RebootAs = "rebootas";
+    public const string AvaAssets = "avares://v2rayN/Assets/";
+    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 = new() {
+    public static readonly List<string> IEProxyProtocols =
+    [
         "{ip}:{http_port}",
             "socks={ip}:{socks_port}",
             "http={ip}:{http_port};https={ip}:{http_port};ftp={ip}:{http_port};socks={ip}:{socks_port}",
             "http=http://{ip}:{http_port};https=http://{ip}:{http_port}",
             ""
-                    };
+    ];
 
-        public static readonly List<string> SubConvertUrls = new List<string> {
+    public static readonly List<string> SubConvertUrls =
+    [
         @"https://sub.xeton.dev/sub?url={0}",
             @"https://api.dler.io/sub?url={0}",
             @"http://127.0.0.1:25500/sub?url={0}",
             ""
-            };
+    ];
 
-        public static readonly List<string> SubConvertConfig = new List<string> {
+    public static readonly List<string> SubConvertConfig =
-                @"https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/config/ACL4SSR_Online.ini"
+        [@"https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/config/ACL4SSR_Online.ini"];
-            };
 
-        public static readonly List<string> SubConvertTargets = new List<string> {
+    public static readonly List<string> SubConvertTargets =
+    [
         "",
             "mixed",
             "v2ray",
             "clash",
-                "ss",
+            "ss"
-            };
+    ];
 
-        public static readonly List<string> SpeedTestUrls = new() {
+    public static readonly List<string> SpeedTestUrls =
-            @"https://speed.cloudflare.com/__down?bytes=100000000",
+    [
+        @"https://cachefly.cachefly.net/50mb.test",
             @"https://speed.cloudflare.com/__down?bytes=10000000",
-            @"http://cachefly.cachefly.net/50mb.test",
+            @"https://speed.cloudflare.com/__down?bytes=50000000",
-            @"http://cachefly.cachefly.net/10mb.test"
+            @"https://speed.cloudflare.com/__down?bytes=100000000",
-        };
+        ];
 
-        public static readonly List<string> SpeedPingTestUrls = new() {
+    public static readonly List<string> SpeedPingTestUrls =
+    [
         @"https://www.google.com/generate_204",
             @"https://www.gstatic.com/generate_204",
             @"https://www.apple.com/library/test/success.html",
-            @"http://www.msftconnecttest.com/connecttest.txt",
+            @"http://www.msftconnecttest.com/connecttest.txt"
-        };
+    ];
 
-        public static readonly List<string> GeoFilesSources = new() {
+    public static readonly List<string> GeoFilesSources =
+    [
         "",
             @"https://github.com/runetfreedom/russia-v2ray-rules-dat/releases/latest/download/{0}.dat",
-        };
+            @"https://github.com/Chocolate4U/Iran-v2ray-rules/releases/latest/download/{0}.dat"
+    ];
 
-        public static readonly List<string> SingboxRulesetSources = new() {
+    public static readonly List<string> SingboxRulesetSources =
+    [
         "",
             @"https://cdn.jsdelivr.net/gh/runetfreedom/russia-v2ray-rules-dat@release/sing-box/rule-set-{0}/{1}.srs",
-        };
+            @"https://cdn.jsdelivr.net/gh/chocolate4u/Iran-sing-box-rules@rule-set/{1}.srs"
+    ];
 
-        public static readonly List<string> RoutingRulesSources = new() {
+    public static readonly List<string> RoutingRulesSources =
+    [
         "",
             @"https://cdn.jsdelivr.net/gh/runetfreedom/russia-v2ray-custom-routing-list@main/v2rayN/template.json",
-        };
+            @"https://cdn.jsdelivr.net/gh/Chocolate4U/Iran-v2ray-rules@main/v2rayN/template.json"
+    ];
 
-        public static readonly List<string> DNSTemplateSources = new() {
+    public static readonly List<string> DNSTemplateSources =
+    [
         "",
             @"https://cdn.jsdelivr.net/gh/runetfreedom/russia-v2ray-custom-routing-list@main/v2rayN/",
-        };
+            @"https://cdn.jsdelivr.net/gh/Chocolate4U/Iran-v2ray-rules@main/v2rayN/"
+    ];
 
     public static readonly Dictionary<string, string> UserAgentTexts = new()
         {
@@ -147,67 +160,372 @@
 
     public static readonly Dictionary<EConfigType, string> ProtocolShares = new()
         {
-            {EConfigType.VMess,"vmess://"},
+            { EConfigType.VMess, "vmess://" },
-            {EConfigType.Shadowsocks,"ss://"},
+            { EConfigType.Shadowsocks, "ss://" },
-            {EConfigType.SOCKS,"socks://"},
+            { EConfigType.SOCKS, "socks://" },
-            {EConfigType.VLESS,"vless://"},
+            { EConfigType.VLESS, "vless://" },
-            {EConfigType.Trojan,"trojan://"},
+            { EConfigType.Trojan, "trojan://" },
-            {EConfigType.Hysteria2,"hysteria2://"},
+            { EConfigType.Hysteria2, "hysteria2://" },
-            {EConfigType.TUIC,"tuic://"},
+            { EConfigType.TUIC, "tuic://" },
-            {EConfigType.WireGuard,"wireguard://"}
+            { EConfigType.WireGuard, "wireguard://" }
         };
 
     public static readonly Dictionary<EConfigType, string> ProtocolTypes = new()
         {
-            {EConfigType.VMess,"vmess"},
+            { EConfigType.VMess, "vmess" },
-            {EConfigType.Shadowsocks,"shadowsocks"},
+            { EConfigType.Shadowsocks, "shadowsocks" },
-            {EConfigType.SOCKS,"socks"},
+            { EConfigType.SOCKS, "socks" },
-            {EConfigType.HTTP,"http"},
+            { EConfigType.HTTP, "http" },
-            {EConfigType.VLESS,"vless"},
+            { EConfigType.VLESS, "vless" },
-            {EConfigType.Trojan,"trojan"},
+            { EConfigType.Trojan, "trojan" },
-            {EConfigType.Hysteria2,"hysteria2"},
+            { EConfigType.Hysteria2, "hysteria2" },
-            {EConfigType.TUIC,"tuic"},
+            { EConfigType.TUIC, "tuic" },
-            {EConfigType.WireGuard,"wireguard"}
+            { EConfigType.WireGuard, "wireguard" }
         };
 
-        public static readonly List<string> VmessSecurities = new() { "aes-128-gcm", "chacha20-poly1305", "auto", "none", "zero" };
+    public static readonly List<string> VmessSecurities =
-        public static readonly List<string> SsSecurities = new() { "aes-256-gcm", "aes-128-gcm", "chacha20-poly1305", "chacha20-ietf-poly1305", "none", "plain" };
+    [
-        public static readonly List<string> SsSecuritiesInSagerNet = new() { "none", "2022-blake3-aes-128-gcm", "2022-blake3-aes-256-gcm", "2022-blake3-chacha20-poly1305", "aes-128-gcm", "aes-192-gcm", "aes-256-gcm", "chacha20-ietf-poly1305", "xchacha20-ietf-poly1305", "rc4", "rc4-md5", "aes-128-ctr", "aes-192-ctr", "aes-256-ctr", "aes-128-cfb", "aes-192-cfb", "aes-256-cfb", "aes-128-cfb8", "aes-192-cfb8", "aes-256-cfb8", "aes-128-ofb", "aes-192-ofb", "aes-256-ofb", "bf-cfb", "cast5-cfb", "des-cfb", "idea-cfb", "rc2-cfb", "seed-cfb", "camellia-128-cfb", "camellia-192-cfb", "camellia-256-cfb", "camellia-128-cfb8", "camellia-192-cfb8", "camellia-256-cfb8", "salsa20", "chacha20", "chacha20-ietf", "xchacha20" };
+        "aes-128-gcm",
-        public static readonly List<string> SsSecuritiesInXray = new() { "aes-256-gcm", "aes-128-gcm", "chacha20-poly1305", "chacha20-ietf-poly1305", "xchacha20-poly1305", "xchacha20-ietf-poly1305", "none", "plain", "2022-blake3-aes-128-gcm", "2022-blake3-aes-256-gcm", "2022-blake3-chacha20-poly1305" };
+            "chacha20-poly1305",
-        public static readonly List<string> SsSecuritiesInSingbox = new() { "aes-256-gcm", "aes-192-gcm", "aes-128-gcm", "chacha20-ietf-poly1305", "xchacha20-ietf-poly1305", "none", "2022-blake3-aes-128-gcm", "2022-blake3-aes-256-gcm", "2022-blake3-chacha20-poly1305", "aes-128-ctr", "aes-192-ctr", "aes-256-ctr", "aes-128-cfb", "aes-192-cfb", "aes-256-cfb", "rc4-md5", "chacha20-ietf", "xchacha20" };
+            "auto",
-        public static readonly List<string> Flows = new() { "", "xtls-rprx-vision", "xtls-rprx-vision-udp443" };
+            "none",
-        public static readonly List<string> Networks = new() { "tcp", "kcp", "ws", "httpupgrade", "splithttp", "h2", "quic", "grpc" };
+            "zero"
-        public static readonly List<string> KcpHeaderTypes = new() { "srtp", "utp", "wechat-video", "dtls", "wireguard" };
+    ];
-        public static readonly List<string> CoreTypes = new() { "v2fly", "Xray", "sing_box" };
-        public static readonly List<string> CoreTypes4VLESS = new() { "Xray", "sing_box" };
-        public static readonly List<string> DomainStrategies = new() { "AsIs", "IPIfNonMatch", "IPOnDemand" };
-        public static readonly List<string> DomainStrategies4Singbox = new() { "ipv4_only", "ipv6_only", "prefer_ipv4", "prefer_ipv6", "" };
-        public static readonly List<string> DomainMatchers = new() { "linear", "mph", "" };
-        public static readonly List<string> Fingerprints = new() { "chrome", "firefox", "safari", "ios", "android", "edge", "360", "qq", "random", "randomized", "" };
-        public static readonly List<string> UserAgent = new() { "chrome", "firefox", "safari", "edge", "none" };
 
-        public static readonly List<string> AllowInsecure = new() { "true", "false", "" };
+    public static readonly List<string> SsSecurities =
-        public static readonly List<string> DomainStrategy4Freedoms = new() { "AsIs", "UseIP", "UseIPv4", "UseIPv6", "" };
+    [
-        public static readonly List<string> SingboxDomainStrategy4Out = new() { "ipv4_only", "prefer_ipv4", "prefer_ipv6", "ipv6_only", "" };
+        "aes-256-gcm",
-        public static readonly List<string> DomainDNSAddress = ["223.5.5.5", "223.6.6.6", "localhost"];
+            "aes-128-gcm",
-        public static readonly List<string> SingboxDomainDNSAddress = ["223.5.5.5", "223.6.6.6", "dhcp://auto"];
+            "chacha20-poly1305",
-        public static readonly List<string> Languages = new() { "zh-Hans", "zh-Hant", "en", "fa-Ir", "ru" };
+            "chacha20-ietf-poly1305",
-        public static readonly List<string> Alpns = new() { "h3", "h2", "http/1.1", "h3,h2", "h2,http/1.1", "h3,h2,http/1.1", "" };
+            "none",
-        public static readonly List<string> LogLevels = new() { "debug", "info", "warning", "error", "none" };
+            "plain"
-        public static readonly List<string> InboundTags = new() { "socks", "http", "socks2", "http2" };
+    ];
-        public static readonly List<string> RuleProtocols = new() { "http", "tls", "bittorrent" };
-        public static readonly List<string> RuleNetworks = new() { "", "tcp", "udp", "tcp,udp" };
-        public static readonly List<string> destOverrideProtocols = ["http", "tls", "quic", "fakedns", "fakedns+others"];
-        public static readonly List<string> TunMtus = new() { "1280", "1408", "1500", "9000" };
-        public static readonly List<string> TunStacks = new() { "gvisor", "system" };
-        public static readonly List<string> PresetMsgFilters = new() { "proxy", "direct", "block", "" };
-        public static readonly List<string> SingboxMuxs = new() { "h2mux", "smux", "yamux", "" };
-        public static readonly List<string> TuicCongestionControls = new() { "cubic", "new_reno", "bbr" };
 
-        public static readonly List<string> allowSelectType = new List<string> { "selector", "urltest", "loadbalance", "fallback" };
+    public static readonly List<string> SsSecuritiesInXray =
-        public static readonly List<string> notAllowTestType = new List<string> { "selector", "urltest", "direct", "reject", "compatible", "pass", "loadbalance", "fallback" };
+    [
-        public static readonly List<string> proxyVehicleType = new List<string> { "file", "http" };
+        "aes-256-gcm",
+            "aes-128-gcm",
+            "chacha20-poly1305",
+            "chacha20-ietf-poly1305",
+            "xchacha20-poly1305",
+            "xchacha20-ietf-poly1305",
+            "none",
+            "plain",
+            "2022-blake3-aes-128-gcm",
+            "2022-blake3-aes-256-gcm",
+            "2022-blake3-chacha20-poly1305"
+    ];
+
+    public static readonly List<string> SsSecuritiesInSingbox =
+    [
+        "aes-256-gcm",
+            "aes-192-gcm",
+            "aes-128-gcm",
+            "chacha20-ietf-poly1305",
+            "xchacha20-ietf-poly1305",
+            "none",
+            "2022-blake3-aes-128-gcm",
+            "2022-blake3-aes-256-gcm",
+            "2022-blake3-chacha20-poly1305",
+            "aes-128-ctr",
+            "aes-192-ctr",
+            "aes-256-ctr",
+            "aes-128-cfb",
+            "aes-192-cfb",
+            "aes-256-cfb",
+            "rc4-md5",
+            "chacha20-ietf",
+            "xchacha20"
+    ];
+
+    public static readonly List<string> Flows =
+    [
+        "",
+            "xtls-rprx-vision",
+            "xtls-rprx-vision-udp443"
+    ];
+
+    public static readonly List<string> Networks =
+    [
+        "tcp",
+            "kcp",
+            "ws",
+            "httpupgrade",
+            "xhttp",
+            "h2",
+            "quic",
+            "grpc"
+    ];
+
+    public static readonly List<string> KcpHeaderTypes =
+    [
+        "srtp",
+            "utp",
+            "wechat-video",
+            "dtls",
+            "wireguard",
+            "dns"
+    ];
+
+    public static readonly List<string> CoreTypes =
+    [
+        "Xray",
+            "sing_box"
+    ];
+
+    public static readonly List<string> DomainStrategies =
+    [
+        "AsIs",
+            "IPIfNonMatch",
+            "IPOnDemand"
+    ];
+
+    public static readonly List<string> DomainStrategies4Singbox =
+    [
+        "ipv4_only",
+            "ipv6_only",
+            "prefer_ipv4",
+            "prefer_ipv6",
+            ""
+    ];
+
+    public static readonly List<string> DomainMatchers =
+    [
+        "linear",
+            "mph",
+            ""
+    ];
+
+    public static readonly List<string> Fingerprints =
+    [
+        "chrome",
+            "firefox",
+            "safari",
+            "ios",
+            "android",
+            "edge",
+            "360",
+            "qq",
+            "random",
+            "randomized",
+            ""
+    ];
+
+    public static readonly List<string> UserAgent =
+    [
+        "chrome",
+            "firefox",
+            "safari",
+            "edge",
+            "none"
+    ];
+
+    public static readonly List<string> XhttpMode =
+    [
+        "auto",
+            "packet-up",
+            "stream-up",
+            "stream-one"
+    ];
+
+    public static readonly List<string> AllowInsecure =
+    [
+        "true",
+            "false",
+            ""
+    ];
+
+    public static readonly List<string> DomainStrategy4Freedoms =
+    [
+        "AsIs",
+            "UseIP",
+            "UseIPv4",
+            "UseIPv6",
+            ""
+    ];
+
+    public static readonly List<string> SingboxDomainStrategy4Out =
+    [
+        "ipv4_only",
+            "prefer_ipv4",
+            "prefer_ipv6",
+            "ipv6_only",
+            ""
+    ];
+
+    public static readonly List<string> DomainDNSAddress =
+    [
+        "223.5.5.5",
+            "223.6.6.6",
+            "localhost"
+    ];
+
+    public static readonly List<string> SingboxDomainDNSAddress =
+    [
+        "223.5.5.5",
+            "223.6.6.6",
+            "dhcp://auto"
+    ];
+
+    public static readonly List<string> Languages =
+    [
+        "zh-Hans",
+            "zh-Hant",
+            "en",
+            "fa-Ir",
+            "ru",
+            "hu"
+    ];
+
+    public static readonly List<string> Alpns =
+    [
+        "h3",
+            "h2",
+            "http/1.1",
+            "h3,h2",
+            "h2,http/1.1",
+            "h3,h2,http/1.1",
+            ""
+    ];
+
+    public static readonly List<string> LogLevels =
+    [
+        "debug",
+            "info",
+            "warning",
+            "error",
+            "none"
+    ];
+
+    public static readonly List<string> InboundTags =
+    [
+        "socks",
+            "socks2",
+            "socks3"
+    ];
+
+    public static readonly List<string> RuleProtocols =
+    [
+        "http",
+            "tls",
+            "bittorrent"
+    ];
+
+    public static readonly List<string> RuleNetworks =
+    [
+        "",
+            "tcp",
+            "udp",
+            "tcp,udp"
+    ];
+
+    public static readonly List<string> destOverrideProtocols =
+    [
+        "http",
+            "tls",
+            "quic",
+            "fakedns",
+            "fakedns+others"
+    ];
+
+    public static readonly List<int> TunMtus =
+    [
+        1280,
+            1408,
+            1500,
+            9000
+    ];
+
+    public static readonly List<string> TunStacks =
+    [
+        "gvisor",
+            "system",
+            "mixed"
+    ];
+
+    public static readonly List<string> PresetMsgFilters =
+    [
+        "proxy",
+            "direct",
+            "block",
+            ""
+    ];
+
+    public static readonly List<string> SingboxMuxs =
+    [
+        "h2mux",
+            "smux",
+            "yamux",
+            ""
+    ];
+
+    public static readonly List<string> TuicCongestionControls =
+    [
+        "cubic",
+            "new_reno",
+            "bbr"
+    ];
+
+    public static readonly List<string> allowSelectType =
+    [
+        "selector",
+            "urltest",
+            "loadbalance",
+            "fallback"
+    ];
+
+    public static readonly List<string> notAllowTestType =
+    [
+        "selector",
+            "urltest",
+            "direct",
+            "reject",
+            "compatible",
+            "pass",
+            "loadbalance",
+            "fallback"
+    ];
+
+    public static readonly List<string> proxyVehicleType =
+    [
+        "file",
+            "http"
+    ];
+
+    public static readonly Dictionary<ECoreType, string> CoreUrls = new()
+        {
+            { ECoreType.v2fly, "v2fly/v2ray-core" },
+            { ECoreType.v2fly_v5, "v2fly/v2ray-core" },
+            { ECoreType.Xray, "XTLS/Xray-core" },
+            { ECoreType.sing_box, "SagerNet/sing-box" },
+            { ECoreType.mihomo, "MetaCubeX/mihomo" },
+            { ECoreType.hysteria, "apernet/hysteria" },
+            { ECoreType.hysteria2, "apernet/hysteria" },
+            { ECoreType.naiveproxy, "klzgrad/naiveproxy" },
+            { ECoreType.tuic, "EAimTY/tuic" },
+            { ECoreType.juicity, "juicity/juicity" },
+            { ECoreType.brook, "txthinking/brook" },
+            { ECoreType.overtls, "ShadowsocksR-Live/overtls" },
+            { ECoreType.v2rayN, "2dust/v2rayN" },
+        };
+
+    public static readonly List<string> OtherGeoUrls =
+    [
+        @"https://raw.githubusercontent.com/Loyalsoldier/geoip/release/geoip-only-cn-private.dat",
+            @"https://raw.githubusercontent.com/Loyalsoldier/geoip/release/Country.mmdb",
+            @"https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/geoip.metadb"
+    ];
+
+    public static readonly List<string> IPAPIUrls =
+    [
+        @"https://speed.cloudflare.com/meta",
+        @"https://api.ip.sb/geoip",
+        @"https://api-ipv4.ip.sb/geoip",
+        @"https://api-ipv6.ip.sb/geoip",
+        @"https://api.ipapi.is",
+        @""
+    ];
 
     #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());
@@ -9,7 +9,6 @@
     private int? _statePort;
     private int? _statePort2;
     private Job? _processJob;
-        private bool? _isAdministrator;
     public static AppHandler Instance => _instance.Value;
     public Config Config => _config;
 
@@ -27,18 +26,11 @@
         get
         {
             _statePort2 ??= Utils.GetFreePort(GetLocalPort(EInboundProtocol.api2));
-                return _statePort2.Value;
+            return _statePort2.Value + (_config.TunModeItem.EnableTun ? 1 : 0);
         }
     }
 
-        public bool IsAdministrator
+    public string LinuxSudoPwd { get; set; }
-        {
-            get
-            {
-                _isAdministrator ??= Utils.IsAdministrator();
-                return _isAdministrator.Value;
-            }
-        }
 
     #endregion Property
 
@@ -46,11 +38,18 @@
 
     public bool InitApp()
     {
-            _config = ConfigHandler.LoadConfig();
+        if (Utils.HasWritePermission() == false)
-            if (_config == null)
+        {
+            Environment.SetEnvironmentVariable(Global.LocalAppData, "1", EnvironmentVariableTarget.Process);
+        }
+
+        Logging.Setup();
+        var config = ConfigHandler.LoadConfig();
+        if (config == null)
         {
             return false;
         }
+        _config = config;
         Thread.CurrentThread.CurrentUICulture = new(_config.UiItem.CurrentLanguage);
 
         //Under Win10
@@ -70,12 +69,20 @@
 
     public bool InitComponents()
     {
-            Logging.Setup();
+        Logging.SaveLog($"v2rayN start up | {Utils.GetRuntimeInfo()}");
-            Logging.LoggingEnabled(true);
+        Logging.LoggingEnabled(_config.GuiItem.EnableLog);
-            Logging.SaveLog($"v2rayN start up | {Utils.GetVersion()} | {Utils.GetExePath()}");
-            Logging.SaveLog($"{Environment.OSVersion} - {(Environment.Is64BitOperatingSystem ? 64 : 32)}");
-            Logging.ClearLogs();
 
+        //First determine the port value
+        _ = StatePort;
+        _ = StatePort2;
+
+        return true;
+    }
+
+    public bool Reset()
+    {
+        _statePort = null;
+        _statePort2 = null;
         return true;
     }
 
@@ -94,8 +101,14 @@
         if (Utils.IsWindows())
         {
             _processJob ??= new();
+            try
+            {
                 _processJob?.AddProcess(processHandle);
             }
+            catch
+            {
+            }
+        }
     }
 
     #endregion Config
@@ -107,14 +120,14 @@
         return await SQLiteHelper.Instance.TableAsync<SubItem>().OrderBy(t => t.Sort).ToListAsync();
     }
 
-        public async Task<SubItem?> GetSubItem(string subid)
+    public async Task<SubItem?> GetSubItem(string? subid)
     {
         return await SQLiteHelper.Instance.TableAsync<SubItem>().FirstOrDefaultAsync(t => t.Id == subid);
     }
 
     public async Task<List<ProfileItem>?> ProfileItems(string subid)
     {
-            if (Utils.IsNullOrEmpty(subid))
+        if (subid.IsNullOrEmpty())
         {
             return await SQLiteHelper.Instance.TableAsync<ProfileItem>().ToListAsync();
         }
@@ -136,11 +149,11 @@
                         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('\''))
             {
@@ -152,48 +165,9 @@
         return await SQLiteHelper.Instance.QueryAsync<ProfileItemModel>(sql);
     }
 
-        public async Task<List<ProfileItemModel>?> ProfileItemsEx(string subid, string filter)
-        {
-            var lstModel = await ProfileItems(_config.SubIndexId, filter);
-
-            await ConfigHandler.SetDefaultServer(_config, lstModel);
-
-            var lstServerStat = (_config.GuiItem.EnableStatistics ? StatisticsHandler.Instance.ServerStat : null) ?? [];
-            var lstProfileExs = ProfileExHandler.Instance.ProfileExs;
-            lstModel = (from t in lstModel
-                        join t2 in lstServerStat on t.IndexId equals t2.IndexId into t2b
-                        from t22 in t2b.DefaultIfEmpty()
-                        join t3 in lstProfileExs on t.IndexId equals t3.IndexId into t3b
-                        from t33 in t3b.DefaultIfEmpty()
-                        select new ProfileItemModel
-                        {
-                            IndexId = t.IndexId,
-                            ConfigType = t.ConfigType,
-                            Remarks = t.Remarks,
-                            Address = t.Address,
-                            Port = t.Port,
-                            Security = t.Security,
-                            Network = t.Network,
-                            StreamSecurity = t.StreamSecurity,
-                            Subid = t.Subid,
-                            SubRemarks = t.SubRemarks,
-                            IsActive = t.IndexId == _config.IndexId,
-                            Sort = t33 == null ? 0 : t33.Sort,
-                            Delay = t33 == null ? 0 : t33.Delay,
-                            DelayVal = t33?.Delay != 0 ? $"{t33?.Delay} {Global.DelayUnit}" : string.Empty,
-                            SpeedVal = t33?.Speed != 0 ? $"{t33?.Speed} {Global.SpeedUnit}" : string.Empty,
-                            TodayDown = t22 == null ? "" : Utils.HumanFy(t22.TodayDown),
-                            TodayUp = t22 == null ? "" : Utils.HumanFy(t22.TodayUp),
-                            TotalDown = t22 == null ? "" : Utils.HumanFy(t22.TotalDown),
-                            TotalUp = t22 == null ? "" : Utils.HumanFy(t22.TotalUp)
-                        }).OrderBy(t => t.Sort).ToList();
-
-            return lstModel;
-        }
-
     public async Task<ProfileItem?> GetProfileItem(string indexId)
     {
-            if (Utils.IsNullOrEmpty(indexId))
+        if (indexId.IsNullOrEmpty())
         {
             return null;
         }
@@ -202,7 +176,7 @@
 
     public async Task<ProfileItem?> GetProfileItemViaRemarks(string? remarks)
     {
-            if (Utils.IsNullOrEmpty(remarks))
+        if (remarks.IsNullOrEmpty())
         {
             return null;
         }
@@ -211,12 +185,12 @@
 
     public async Task<List<RoutingItem>?> RoutingItems()
     {
-            return await SQLiteHelper.Instance.TableAsync<RoutingItem>().Where(it => it.Locked == false).OrderBy(t => t.Sort).ToListAsync();
+        return await SQLiteHelper.Instance.TableAsync<RoutingItem>().OrderBy(t => t.Sort).ToListAsync();
     }
 
     public async Task<RoutingItem?> GetRoutingItem(string id)
     {
-            return await SQLiteHelper.Instance.TableAsync<RoutingItem>().FirstOrDefaultAsync(it => it.Locked == false && it.Id == id);
+        return await SQLiteHelper.Instance.TableAsync<RoutingItem>().FirstOrDefaultAsync(it => it.Id == id);
     }
 
     public async Task<List<DNSItem>?> DNSItems()
@@ -247,7 +221,7 @@
             case ECoreType.sing_box:
                 return Global.SsSecuritiesInSingbox;
         }
-            return Global.SsSecuritiesInSagerNet;
+        return Global.SsSecuritiesInSingbox;
     }
 
     public ECoreType GetCoreType(ProfileItem profileItem, EConfigType eConfigType)
@@ -257,18 +231,9 @@
             return (ECoreType)profileItem.CoreType;
         }
 
-            if (_config.CoreTypeItem == null)
+        var item = _config.CoreTypeItem?.FirstOrDefault(it => it.ConfigType == eConfigType);
-            {
+        return item?.CoreType ?? ECoreType.Xray;
-                return ECoreType.Xray;
-            }
-            var item = _config.CoreTypeItem.FirstOrDefault(it => it.ConfigType == eConfigType);
-            if (item == null)
-            {
-                return ECoreType.Xray;
-            }
-            return item.CoreType;
     }
 
     #endregion Core Type
-    }
 }

v2rayN/ServiceLib/Handler/AutoStartupHandler.cs

@@ -0,0 +1,241 @@
+using System.Security.Principal;
+using System.Text.RegularExpressions;
+
+namespace ServiceLib.Handler;
+
+public static class AutoStartupHandler
+{
+    private static readonly string _tag = "AutoStartupHandler";
+
+    public static async Task<bool> UpdateTask(Config config)
+    {
+        if (Utils.IsWindows())
+        {
+            await ClearTaskWindows();
+
+            if (config.GuiItem.AutoRun)
+            {
+                await SetTaskWindows();
+            }
+        }
+        else if (Utils.IsLinux())
+        {
+            await ClearTaskLinux();
+
+            if (config.GuiItem.AutoRun)
+            {
+                await SetTaskLinux();
+            }
+        }
+        else if (Utils.IsOSX())
+        {
+            await ClearTaskOSX();
+
+            if (config.GuiItem.AutoRun)
+            {
+                await SetTaskOSX();
+            }
+        }
+
+        return true;
+    }
+
+    #region Windows
+
+    private static async Task ClearTaskWindows()
+    {
+        var autoRunName = GetAutoRunNameWindows();
+        WindowsUtils.RegWriteValue(Global.AutoRunRegPath, autoRunName, "");
+        if (Utils.IsAdministrator())
+        {
+            AutoStartTaskService(autoRunName, "", "");
+        }
+
+        await Task.CompletedTask;
+    }
+
+    private static async Task SetTaskWindows()
+    {
+        try
+        {
+            var autoRunName = GetAutoRunNameWindows();
+            var exePath = Utils.GetExePath();
+            if (Utils.IsAdministrator())
+            {
+                AutoStartTaskService(autoRunName, exePath, "");
+            }
+            else
+            {
+                WindowsUtils.RegWriteValue(Global.AutoRunRegPath, autoRunName, exePath.AppendQuotes());
+            }
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+        await Task.CompletedTask;
+    }
+
+    /// <summary>
+    /// Auto Start via TaskService
+    /// </summary>
+    /// <param name="taskName"></param>
+    /// <param name="fileName"></param>
+    /// <param name="description"></param>
+    /// <exception cref="ArgumentNullException"></exception>
+    public static void AutoStartTaskService(string taskName, string fileName, string description)
+    {
+        if (taskName.IsNullOrEmpty())
+        {
+            return;
+        }
+
+        var logonUser = WindowsIdentity.GetCurrent().Name;
+        using var taskService = new Microsoft.Win32.TaskScheduler.TaskService();
+        var tasks = taskService.RootFolder.GetTasks(new Regex(taskName));
+        if (fileName.IsNullOrEmpty())
+        {
+            foreach (var t in tasks)
+            {
+                taskService.RootFolder.DeleteTask(t.Name);
+            }
+            return;
+        }
+
+        var task = taskService.NewTask();
+        task.RegistrationInfo.Description = description;
+        task.Settings.DisallowStartIfOnBatteries = false;
+        task.Settings.StopIfGoingOnBatteries = false;
+        task.Settings.RunOnlyIfIdle = false;
+        task.Settings.IdleSettings.StopOnIdleEnd = false;
+        task.Settings.ExecutionTimeLimit = TimeSpan.Zero;
+        task.Triggers.Add(new Microsoft.Win32.TaskScheduler.LogonTrigger { UserId = logonUser, Delay = TimeSpan.FromSeconds(30) });
+        task.Principal.RunLevel = Microsoft.Win32.TaskScheduler.TaskRunLevel.Highest;
+        task.Actions.Add(new Microsoft.Win32.TaskScheduler.ExecAction(fileName.AppendQuotes(), null, Path.GetDirectoryName(fileName)));
+
+        taskService.RootFolder.RegisterTaskDefinition(taskName, task);
+    }
+
+    private static string GetAutoRunNameWindows()
+    {
+        return $"{Global.AutoRunName}_{Utils.GetMd5(Utils.StartupPath())}";
+    }
+
+    #endregion Windows
+
+    #region Linux
+
+    private static async Task ClearTaskLinux()
+    {
+        try
+        {
+            File.Delete(GetHomePathLinux());
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+        await Task.CompletedTask;
+    }
+
+    private static async Task SetTaskLinux()
+    {
+        try
+        {
+            var linuxConfig = EmbedUtils.GetEmbedText(Global.LinuxAutostartConfig);
+            if (linuxConfig.IsNotEmpty())
+            {
+                linuxConfig = linuxConfig.Replace("$ExecPath$", Utils.GetExePath());
+                Logging.SaveLog(linuxConfig);
+
+                var homePath = GetHomePathLinux();
+                await File.WriteAllTextAsync(homePath, linuxConfig);
+            }
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+    }
+
+    private static string GetHomePathLinux()
+    {
+        var homePath = Path.Combine(Utils.GetHomePath(), ".config", "autostart", $"{Global.AppName}.desktop");
+        Directory.CreateDirectory(Path.GetDirectoryName(homePath));
+        return homePath;
+    }
+
+    #endregion Linux
+
+    #region macOS
+
+    private static async Task ClearTaskOSX()
+    {
+        try
+        {
+            var launchAgentPath = GetLaunchAgentPathMacOS();
+            if (File.Exists(launchAgentPath))
+            {
+                var args = new[] { "-c", $"launchctl unload -w \"{launchAgentPath}\"" };
+                await Utils.GetCliWrapOutput(Global.LinuxBash, args);
+
+                File.Delete(launchAgentPath);
+            }
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+    }
+
+    private static async Task SetTaskOSX()
+    {
+        try
+        {
+            var plistContent = GenerateLaunchAgentPlist();
+            var launchAgentPath = GetLaunchAgentPathMacOS();
+            await File.WriteAllTextAsync(launchAgentPath, plistContent);
+
+            var args = new[] { "-c", $"launchctl load -w \"{launchAgentPath}\"" };
+            await Utils.GetCliWrapOutput(Global.LinuxBash, args);
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+    }
+
+    private static string GetLaunchAgentPathMacOS()
+    {
+        var homePath = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
+        var launchAgentPath = Path.Combine(homePath, "Library", "LaunchAgents", $"{Global.AppName}-LaunchAgent.plist");
+        Directory.CreateDirectory(Path.GetDirectoryName(launchAgentPath));
+        return launchAgentPath;
+    }
+
+    private static string GenerateLaunchAgentPlist()
+    {
+        var exePath = Utils.GetExePath();
+        var appName = Path.GetFileNameWithoutExtension(exePath);
+        return $@"<?xml version=""1.0"" encoding=""UTF-8""?>
+<!DOCTYPE plist PUBLIC ""-//Apple//DTD PLIST 1.0//EN"" ""http://www.apple.com/DTDs/PropertyList-1.0.dtd"">
+<plist version=""1.0"">
+<dict>
+    <key>Label</key>
+    <string>{Global.AppName}-LaunchAgent</string>
+    <key>ProgramArguments</key>
+    <array>
+        <string>/bin/sh</string>
+        <string>-c</string>
+        <string>if ! pgrep -x ""{appName}"" > /dev/null; then ""{exePath}""; fi</string>
+    </array>
+    <key>RunAtLoad</key>
+    <true/>
+    <key>KeepAlive</key>
+    <false/>
+</dict>
+</plist>";
+    }
+
+    #endregion macOS
+}

v2rayN/ServiceLib/Handler/ClashApiHandler.cs

@@ -1,18 +1,19 @@
-using static ServiceLib.Models.ClashProxies;
+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; }
 
-        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);
@@ -28,7 +29,7 @@ namespace ServiceLib.Handler
                 return new Tuple<ClashProxies, ClashProviders>(clashProxies, clashProviders);
             }
 
-                await Task.Delay(5000);
+            await Task.Delay(2000);
         }
 
         return null;
@@ -36,45 +37,37 @@ namespace ServiceLib.Handler
 
     public void ClashProxiesDelayTest(bool blAll, List<ClashProxyModel> lstProxy, Action<ClashProxyModel?, string> updateFunc)
     {
-            Task.Run(() =>
+        Task.Run(async () =>
         {
             if (blAll)
             {
-                for (int 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;
             }
             var urlBase = $"{GetApiUrl()}/proxies";
             urlBase += @"/{0}/delay?timeout=10000&url=" + AppHandler.Instance.Config.SpeedTestItem.SpeedPingTestUrl;
 
-            List<Task> tasks = new List<Task>();
+            var tasks = new List<Task>();
             foreach (var it in lstProxy)
             {
                 if (Global.notAllowTestType.Contains(it.Type.ToLower()))
@@ -89,9 +82,8 @@ namespace ServiceLib.Handler
                     updateFunc?.Invoke(it, result);
                 }));
             }
-            Task.WaitAll(tasks.ToArray());
+            await Task.WhenAll(tasks);
-
+            await Task.Delay(1000);
-            Task.Delay(1000).Wait();
             updateFunc?.Invoke(null, "");
         });
     }
@@ -109,7 +101,7 @@ namespace ServiceLib.Handler
         }
         catch (Exception ex)
         {
-                Logging.SaveLog("GetClashProxyGroups", ex);
+            Logging.SaveLog(_tag, ex);
             return null;
         }
     }
@@ -119,13 +111,13 @@ namespace ServiceLib.Handler
         try
         {
             var url = $"{GetApiUrl()}/proxies/{name}";
-                Dictionary<string, string> headers = new Dictionary<string, string>();
+            var headers = new Dictionary<string, string>();
             headers.Add("name", nameNode);
             await HttpClientHelper.Instance.PutAsync(url, headers);
         }
         catch (Exception ex)
         {
-                Logging.SaveLog(ex.Message, ex);
+            Logging.SaveLog(_tag, ex);
         }
     }
 
@@ -147,17 +139,17 @@ namespace ServiceLib.Handler
         try
         {
             var url = $"{GetApiUrl()}/configs?force=true";
-                Dictionary<string, string> headers = new Dictionary<string, string>();
+            var headers = new Dictionary<string, string>();
             headers.Add("path", filePath);
             await HttpClientHelper.Instance.PutAsync(url, headers);
         }
         catch (Exception ex)
         {
-                Logging.SaveLog(ex.Message, ex);
+            Logging.SaveLog(_tag, ex);
         }
     }
 
-        public async Task<ClashConnections?> GetClashConnectionsAsync(Config config)
+    public async Task<ClashConnections?> GetClashConnectionsAsync()
     {
         try
         {
@@ -169,7 +161,7 @@ namespace ServiceLib.Handler
         }
         catch (Exception ex)
         {
-                Logging.SaveLog(ex.Message, ex);
+            Logging.SaveLog(_tag, ex);
         }
 
         return null;
@@ -184,7 +176,7 @@ namespace ServiceLib.Handler
         }
         catch (Exception ex)
         {
-                Logging.SaveLog(ex.Message, ex);
+            Logging.SaveLog(_tag, ex);
         }
     }
 
@@ -192,5 +184,4 @@ namespace ServiceLib.Handler
     {
         return $"{Global.HttpProtocol}{Global.Loopback}:{AppHandler.Instance.StatePort2}";
     }
-    }
 }

v2rayN/ServiceLib/Handler/ConnectionHandler.cs

@@ -0,0 +1,42 @@
+namespace ServiceLib.Handler;
+
+public class ConnectionHandler
+{
+    private static readonly Lazy<ConnectionHandler> _instance = new(() => new());
+    public static ConnectionHandler Instance => _instance.Value;
+
+    public async Task<string> RunAvailabilityCheck()
+    {
+        var downloadHandle = new DownloadService();
+        var time = await downloadHandle.RunAvailabilityCheck(null);
+        var ip = time > 0 ? await GetIPInfo(downloadHandle) ?? Global.None : Global.None;
+
+        return string.Format(ResUI.TestMeOutput, time, ip);
+    }
+
+    private async Task<string?> GetIPInfo(DownloadService downloadHandle)
+    {
+        var url = AppHandler.Instance.Config.SpeedTestItem.IPAPIUrl;
+        if (url.IsNullOrEmpty())
+        {
+            return null;
+        }
+
+        var result = await downloadHandle.TryDownloadString(url, true, "");
+        if (result == null)
+        {
+            return null;
+        }
+
+        var ipInfo = JsonUtils.Deserialize<IPAPIInfo>(result);
+        if (ipInfo == null)
+        {
+            return null;
+        }
+
+        var ip = ipInfo.ip ?? ipInfo.clientIp ?? ipInfo.ip_addr ?? ipInfo.query;
+        var country = ipInfo.country_code ?? ipInfo.country ?? ipInfo.countryCode ?? ipInfo.location?.country_code;
+
+        return $"({country ?? "unknown"}) {ip}";
+    }
+}

v2rayN/ServiceLib/Handler/CoreAdminHandler.cs

@@ -0,0 +1,126 @@
+using System.Diagnostics;
+using System.Text;
+using CliWrap;
+
+namespace ServiceLib.Handler;
+
+public class CoreAdminHandler
+{
+    private static readonly Lazy<CoreAdminHandler> _instance = new(() => new());
+    public static CoreAdminHandler Instance => _instance.Value;
+    private Config _config;
+    private Action<bool, string>? _updateFunc;
+    private int _linuxSudoPid = -1;
+
+    public async Task Init(Config config, Action<bool, string> updateFunc)
+    {
+        if (_config != null)
+        {
+            return;
+        }
+        _config = config;
+        _updateFunc = updateFunc;
+    }
+
+    private void UpdateFunc(bool notify, string msg)
+    {
+        _updateFunc?.Invoke(notify, msg);
+    }
+
+    public async Task<Process?> RunProcessAsLinuxSudo(string fileName, CoreInfo coreInfo, string configPath)
+    {
+        var cmdLine = $"{fileName.AppendQuotes()} {string.Format(coreInfo.Arguments, Utils.GetBinConfigPath(configPath).AppendQuotes())}";
+        var shFilePath = await CreateLinuxShellFile(cmdLine, "run_as_sudo.sh");
+
+        Process proc = new()
+        {
+            StartInfo = new()
+            {
+                FileName = shFilePath,
+                Arguments = "",
+                WorkingDirectory = Utils.GetBinConfigPath(),
+                UseShellExecute = false,
+                RedirectStandardInput = true,
+                RedirectStandardOutput = true,
+                RedirectStandardError = true,
+                CreateNoWindow = true,
+                StandardInputEncoding = Encoding.UTF8,
+                StandardOutputEncoding = Encoding.UTF8,
+                StandardErrorEncoding = Encoding.UTF8,
+            }
+        };
+
+        proc.OutputDataReceived += (sender, e) =>
+        {
+            if (e.Data.IsNotEmpty())
+            {
+                UpdateFunc(false, e.Data + Environment.NewLine);
+            }
+        };
+        proc.ErrorDataReceived += (sender, e) =>
+        {
+            if (e.Data.IsNotEmpty())
+            {
+                UpdateFunc(false, e.Data + Environment.NewLine);
+            }
+        };
+
+        proc.Start();
+        proc.BeginOutputReadLine();
+        proc.BeginErrorReadLine();
+
+        await Task.Delay(10);
+        await proc.StandardInput.WriteLineAsync();
+        await Task.Delay(10);
+        await proc.StandardInput.WriteLineAsync(AppHandler.Instance.LinuxSudoPwd);
+
+        await Task.Delay(100);
+        if (proc is null or { HasExited: true })
+        {
+            throw new Exception(ResUI.FailedToRunCore);
+        }
+
+        _linuxSudoPid = proc.Id;
+
+        return proc;
+    }
+
+    public async Task KillProcessAsLinuxSudo()
+    {
+        if (_linuxSudoPid < 0)
+        {
+            return;
+        }
+
+        var cmdLine = $"pkill -P {_linuxSudoPid} ; kill {_linuxSudoPid}";
+        var shFilePath = await CreateLinuxShellFile(cmdLine, "kill_as_sudo.sh");
+
+        await Cli.Wrap(shFilePath)
+           .WithStandardInputPipe(PipeSource.FromString(AppHandler.Instance.LinuxSudoPwd))
+           .ExecuteAsync();
+
+        _linuxSudoPid = -1;
+    }
+
+    private async Task<string> CreateLinuxShellFile(string cmdLine, string fileName)
+    {
+        var shFilePath = Utils.GetBinConfigPath(fileName);
+        File.Delete(shFilePath);
+
+        var sb = new StringBuilder();
+        sb.AppendLine("#!/bin/sh");
+        if (Utils.IsAdministrator())
+        {
+            sb.AppendLine($"{cmdLine}");
+        }
+        else
+        {
+            sb.AppendLine($"sudo -S {cmdLine}");
+        }
+
+        await File.WriteAllTextAsync(shFilePath, sb.ToString());
+        await Utils.SetLinuxChmod(shFilePath);
+
+        return shFilePath;
+    }
+}

v2rayN/ServiceLib/Handler/CoreConfigHandler.cs

@@ -1,10 +1,12 @@
-namespace ServiceLib.Handler
+namespace ServiceLib.Handler;
+
+/// <summary>
+/// Core configuration file processing class
+/// </summary>
+public class CoreConfigHandler
 {
-    /// <summary>
+    private static readonly string _tag = "CoreConfigHandler";
-    /// Core configuration file processing class
+
-    /// </summary>
-    public class CoreConfigHandler
-    {
     public static async Task<RetResult> GenerateClientConfig(ProfileItem node, string? fileName)
     {
         var config = AppHandler.Instance.Config;
@@ -12,18 +14,12 @@
 
         if (node.ConfigType == EConfigType.Custom)
         {
-                if (node.CoreType is ECoreType.mihomo)
+            result = node.CoreType switch
             {
-                    result = await new CoreConfigClashService(config).GenerateClientCustomConfig(node, fileName);
+                ECoreType.mihomo => await new CoreConfigClashService(config).GenerateClientCustomConfig(node, fileName),
-                }
+                ECoreType.sing_box => await new CoreConfigSingboxService(config).GenerateClientCustomConfig(node, fileName),
-                if (node.CoreType is ECoreType.sing_box)
+                _ => await GenerateClientCustomConfig(node, fileName)
-                {
+            };
-                    result = await new CoreConfigSingboxService(config).GenerateClientCustomConfig(node, fileName);
-                }
-                else
-                {
-                    result = await GenerateClientCustomConfig(node, fileName);
-                }
         }
         else if (AppHandler.Instance.GetCoreType(node, node.ConfigType) == ECoreType.sing_box)
         {
@@ -37,7 +33,7 @@
         {
             return result;
         }
-            if (Utils.IsNotEmpty(fileName) && result.Data != null)
+        if (fileName.IsNotEmpty() && result.Data != null)
         {
             await File.WriteAllTextAsync(fileName, result.Data.ToString());
         }
@@ -84,11 +80,11 @@
 
             ret.Msg = string.Format(ResUI.SuccessfulConfiguration, "");
             ret.Success = true;
-                return ret;
+            return await Task.FromResult(ret);
         }
         catch (Exception ex)
         {
-                Logging.SaveLog("GenerateClientCustomConfig", ex);
+            Logging.SaveLog(_tag, ex);
             ret.Msg = ResUI.FailedGenDefaultConfiguration;
             return ret;
         }
@@ -113,16 +109,40 @@
         return result;
     }
 
-        public static async Task<RetResult> GenerateClientMultipleLoadConfig(Config config, string fileName, List<ProfileItem> selecteds, ECoreType coreType)
+    public static async Task<RetResult> GenerateClientSpeedtestConfig(Config config, ProfileItem node, ServerTestItem testItem, string fileName)
+    {
+        var result = new RetResult();
+        var initPort = AppHandler.Instance.GetLocalPort(EInboundProtocol.speedtest);
+        var port = Utils.GetFreePort(initPort + testItem.QueueNum);
+        testItem.Port = port;
+
+        if (AppHandler.Instance.GetCoreType(node, node.ConfigType) == ECoreType.sing_box)
+        {
+            result = await new CoreConfigSingboxService(config).GenerateClientSpeedtestConfig(node, port);
+        }
+        else
+        {
+            result = await new CoreConfigV2rayService(config).GenerateClientSpeedtestConfig(node, port);
+        }
+        if (result.Success != true)
+        {
+            return result;
+        }
+
+        await File.WriteAllTextAsync(fileName, result.Data.ToString());
+        return result;
+    }
+
+    public static async Task<RetResult> GenerateClientMultipleLoadConfig(Config config, string fileName, List<ProfileItem> selecteds, ECoreType coreType, 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)
@@ -132,5 +152,4 @@
         await File.WriteAllTextAsync(fileName, result.Data.ToString());
         return result;
     }
-    }
 }

v2rayN/ServiceLib/Handler/CoreHandler.cs

@@ -1,41 +1,59 @@
-using System.Diagnostics;
+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;
     private Process? _process;
     private Process? _processPre;
+    private bool _linuxSudo = false;
     private Action<bool, string>? _updateFunc;
+    private const string _tag = "CoreHandler";
 
     public async Task Init(Config config, Action<bool, string> updateFunc)
     {
         _config = config;
         _updateFunc = updateFunc;
 
-            Environment.SetEnvironmentVariable("V2RAY_LOCATION_ASSET", Utils.GetBinPath(""), EnvironmentVariableTarget.Process);
+        Environment.SetEnvironmentVariable(Global.V2RayLocalAsset, Utils.GetBinPath(""), EnvironmentVariableTarget.Process);
-            Environment.SetEnvironmentVariable("XRAY_LOCATION_ASSET", Utils.GetBinPath(""), EnvironmentVariableTarget.Process);
+        Environment.SetEnvironmentVariable(Global.XrayLocalAsset, Utils.GetBinPath(""), EnvironmentVariableTarget.Process);
+        Environment.SetEnvironmentVariable(Global.XrayLocalCert, Utils.GetBinPath(""), EnvironmentVariableTarget.Process);
 
-            if (Utils.IsLinux())
+        //Copy the bin folder to the storage location (for init)
+        if (Environment.GetEnvironmentVariable(Global.LocalAppData) == "1")
+        {
+            var fromPath = Utils.GetBaseDirectory("bin");
+            var toPath = Utils.GetBinPath("");
+            if (fromPath != toPath)
+            {
+                FileManager.CopyDirectory(fromPath, toPath, true, false);
+            }
+        }
+
+        if (Utils.IsNonWindows())
         {
             var coreInfo = CoreInfoHandler.Instance.GetCoreInfo();
             foreach (var it in coreInfo)
             {
                 if (it.CoreType == ECoreType.v2rayN)
                 {
+                    if (Utils.UpgradeAppExists(out var upgradeFileName))
+                    {
+                        await Utils.SetLinuxChmod(upgradeFileName);
+                    }
                     continue;
                 }
 
-                    foreach (var vName in it.CoreExes)
+                foreach (var name in it.CoreExes)
                 {
-                        var exe = Utils.GetExeName(Utils.GetBinPath(vName, it.CoreType.ToString()));
+                    var exe = Utils.GetBinPath(Utils.GetExeName(name), it.CoreType.ToString());
                     if (File.Exists(exe))
                     {
                         await Utils.SetLinuxChmod(exe);
@@ -49,225 +67,55 @@ namespace ServiceLib.Handler
     {
         if (node == null)
         {
-                ShowMsg(false, ResUI.CheckServerSettings);
+            UpdateFunc(false, ResUI.CheckServerSettings);
             return;
         }
 
-            var fileName = Utils.GetConfigPath(Global.CoreConfigFileName);
+        var fileName = Utils.GetBinConfigPath(Global.CoreConfigFileName);
         var result = await CoreConfigHandler.GenerateClientConfig(node, fileName);
-            ShowMsg(false, result.Msg);
         if (result.Success != true)
         {
+            UpdateFunc(true, result.Msg);
             return;
         }
-            else
-            {
-                ShowMsg(true, $"{node.GetSummary()}");
-                await CoreStop();
-                await CoreStart(node);
 
-                //In tun mode, do a delay check and restart the core
+        UpdateFunc(false, $"{node.GetSummary()}");
-                //if (_config.tunModeItem.enableTun)
+        UpdateFunc(false, $"{Utils.GetRuntimeInfo()}");
-                //{
+        UpdateFunc(false, string.Format(ResUI.StartService, DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss")));
-                //    Observable.Range(1, 1)
+        await CoreStop();
-                //    .Delay(TimeSpan.FromSeconds(15))
+        await Task.Delay(100);
-                //    .Subscribe(x =>
+
-                //    {
+        if (Utils.IsWindows() && _config.TunModeItem.EnableTun)
-                //        {
+        {
-                //            if (_process == null || _process.HasExited)
+            await Task.Delay(100);
-                //            {
+            await WindowsUtils.RemoveTunDevice();
-                //                CoreStart(node);
+        }
-                //                ShowMsg(false, "Tun mode restart the core once");
+
-                //                Logging.SaveLog("Tun mode restart the core once");
+        await CoreStart(node);
-                //            }
+        await CoreStartPreService(node);
-                //        }
+        if (_process != null)
-                //    });
+        {
-                //}
+            UpdateFunc(true, $"{node.GetSummary()}");
         }
     }
 
     public async Task<int> LoadCoreConfigSpeedtest(List<ServerTestItem> selecteds)
     {
-            var pid = -1;
+        var coreType = selecteds.Exists(t => t.ConfigType is EConfigType.Hysteria2 or EConfigType.TUIC) ? ECoreType.sing_box : ECoreType.Xray;
-            var coreType = selecteds.Exists(t => t.ConfigType is EConfigType.Hysteria2 or EConfigType.TUIC or EConfigType.WireGuard) ? ECoreType.sing_box : ECoreType.Xray;
+        var fileName = string.Format(Global.CoreSpeedtestConfigFileName, Utils.GetGuid(false));
-            var configPath = Utils.GetConfigPath(Global.CoreSpeedtestConfigFileName);
+        var configPath = Utils.GetBinConfigPath(fileName);
         var result = await CoreConfigHandler.GenerateClientSpeedtestConfig(_config, configPath, selecteds, coreType);
-            ShowMsg(false, result.Msg);
+        UpdateFunc(false, result.Msg);
-            if (result.Success)
+        if (result.Success != true)
         {
-                pid = await CoreStartSpeedtest(configPath, coreType);
+            return -1;
-            }
-            return pid;
         }
 
-        public async Task CoreStop()
+        UpdateFunc(false, string.Format(ResUI.StartService, DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss")));
-        {
+        UpdateFunc(false, configPath);
-            try
-            {
-                bool hasProc = false;
-                if (_process != null)
-                {
-                    await KillProcess(_process);
-                    _process.Dispose();
-                    _process = null;
-                    hasProc = true;
-                }
 
-                if (_processPre != null)
-                {
-                    await KillProcess(_processPre);
-                    _processPre.Dispose();
-                    _processPre = null;
-                    hasProc = true;
-                }
-
-                if (!hasProc)
-                {
-                    var coreInfo = CoreInfoHandler.Instance.GetCoreInfo();
-                    foreach (var it in coreInfo)
-                    {
-                        if (it.CoreType == ECoreType.v2rayN)
-                        {
-                            continue;
-                        }
-                        foreach (string vName in it.CoreExes)
-                        {
-                            var existing = Process.GetProcessesByName(vName);
-                            foreach (Process p in existing)
-                            {
-                                string? path = p.MainModule?.FileName;
-                                if (path == Utils.GetExeName(Utils.GetBinPath(vName, it.CoreType.ToString())))
-                                {
-                                    await KillProcess(p);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(ex.Message, ex);
-            }
-        }
-
-        public async Task CoreStopPid(int pid)
-        {
-            try
-            {
-                var _p = Process.GetProcessById(pid);
-                await KillProcess(_p);
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(ex.Message, ex);
-            }
-        }
-
-        #region Private
-
-        private string CoreFindExe(CoreInfo coreInfo)
-        {
-            string fileName = string.Empty;
-            foreach (string name in coreInfo.CoreExes)
-            {
-                string vName = Utils.GetExeName(name);
-                vName = Utils.GetBinPath(vName, coreInfo.CoreType.ToString());
-                if (File.Exists(vName))
-                {
-                    fileName = vName;
-                    break;
-                }
-            }
-            if (Utils.IsNullOrEmpty(fileName))
-            {
-                string msg = string.Format(ResUI.NotFoundCore, Utils.GetBinPath("", coreInfo.CoreType.ToString()), string.Join(", ", coreInfo.CoreExes.ToArray()), coreInfo.Url);
-                Logging.SaveLog(msg);
-                ShowMsg(false, msg);
-            }
-            return fileName;
-        }
-
-        private async Task CoreStart(ProfileItem node)
-        {
-            ShowMsg(false, $"{Environment.OSVersion} - {(Environment.Is64BitOperatingSystem ? 64 : 32)}");
-            ShowMsg(false, string.Format(ResUI.StartService, DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss")));
-
-            //ECoreType coreType;
-            //if (node.configType != EConfigType.Custom && _config.tunModeItem.enableTun)
-            //{
-            //    coreType = ECoreType.sing_box;
-            //}
-            //else
-            //{
-            //    coreType = LazyConfig.Instance.GetCoreType(node, node.configType);
-            //}
-            var coreType = AppHandler.Instance.GetCoreType(node, node.ConfigType);
-            _config.RunningCoreType = coreType;
         var coreInfo = CoreInfoHandler.Instance.GetCoreInfo(coreType);
-
+        var proc = await RunProcess(coreInfo, fileName, true, false);
-            var displayLog = node.ConfigType != EConfigType.Custom || node.DisplayLog;
-            var proc = await RunProcess(node, coreInfo, "", displayLog);
-            if (proc is null)
-            {
-                return;
-            }
-            _process = proc;
-
-            //start a pre service
-            if (_process != null && !_process.HasExited)
-            {
-                ProfileItem? itemSocks = null;
-                var preCoreType = ECoreType.sing_box;
-                if (node.ConfigType != EConfigType.Custom && coreType != ECoreType.sing_box && _config.TunModeItem.EnableTun)
-                {
-                    itemSocks = new ProfileItem()
-                    {
-                        CoreType = preCoreType,
-                        ConfigType = EConfigType.SOCKS,
-                        Address = Global.Loopback,
-                        Sni = node.Address, //Tun2SocksAddress
-                        Port = AppHandler.Instance.GetLocalPort(EInboundProtocol.socks)
-                    };
-                }
-                else if ((node.ConfigType == EConfigType.Custom && node.PreSocksPort > 0))
-                {
-                    preCoreType = _config.TunModeItem.EnableTun ? ECoreType.sing_box : ECoreType.Xray;
-                    itemSocks = new ProfileItem()
-                    {
-                        CoreType = preCoreType,
-                        ConfigType = EConfigType.SOCKS,
-                        Address = Global.Loopback,
-                        Port = node.PreSocksPort.Value,
-                    };
-                    _config.RunningCoreType = preCoreType;
-                }
-                if (itemSocks != null)
-                {
-                    string fileName2 = Utils.GetConfigPath(Global.CorePreConfigFileName);
-                    var result = await CoreConfigHandler.GenerateClientConfig(itemSocks, fileName2);
-                    if (result.Success)
-                    {
-                        var coreInfo2 = CoreInfoHandler.Instance.GetCoreInfo(preCoreType);
-                        var proc2 = await RunProcess(node, coreInfo2, $" -c {Global.CorePreConfigFileName}", true);
-                        if (proc2 is not null)
-                        {
-                            _processPre = proc2;
-                        }
-                    }
-                }
-            }
-        }
-
-        private async Task<int> CoreStartSpeedtest(string configPath, ECoreType coreType)
-        {
-            ShowMsg(false, string.Format(ResUI.StartService, DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss")));
-
-            ShowMsg(false, configPath);
-            try
-            {
-                var coreInfo = CoreInfoHandler.Instance.GetCoreInfo(coreType);
-                var proc = await RunProcess(new(), coreInfo, $" -c {Global.CoreSpeedtestConfigFileName}", true);
         if (proc is null)
         {
             return -1;
@@ -275,16 +123,104 @@ namespace ServiceLib.Handler
 
         return proc.Id;
     }
+
+    public async Task<int> LoadCoreConfigSpeedtest(ServerTestItem testItem)
+    {
+        var node = await AppHandler.Instance.GetProfileItem(testItem.IndexId);
+        if (node is null)
+        {
+            return -1;
+        }
+
+        var fileName = string.Format(Global.CoreSpeedtestConfigFileName, Utils.GetGuid(false));
+        var configPath = Utils.GetBinConfigPath(fileName);
+        var result = await CoreConfigHandler.GenerateClientSpeedtestConfig(_config, node, testItem, configPath);
+        if (result.Success != true)
+        {
+            return -1;
+        }
+
+        var coreType = AppHandler.Instance.GetCoreType(node, node.ConfigType);
+        var coreInfo = CoreInfoHandler.Instance.GetCoreInfo(coreType);
+        var proc = await RunProcess(coreInfo, fileName, true, false);
+        if (proc is null)
+        {
+            return -1;
+        }
+
+        return proc.Id;
+    }
+
+    public async Task CoreStop()
+    {
+        try
+        {
+            if (_linuxSudo)
+            {
+                await CoreAdminHandler.Instance.KillProcessAsLinuxSudo();
+                _linuxSudo = false;
+            }
+
+            if (_process != null)
+            {
+                await ProcUtils.ProcessKill(_process, Utils.IsWindows());
+                _process = null;
+            }
+
+            if (_processPre != null)
+            {
+                await ProcUtils.ProcessKill(_processPre, Utils.IsWindows());
+                _processPre = null;
+            }
+        }
         catch (Exception ex)
         {
-                Logging.SaveLog(ex.Message, ex);
+            Logging.SaveLog(_tag, ex);
-                string msg = ex.Message;
-                ShowMsg(false, msg);
-                return -1;
         }
     }
 
-        private void ShowMsg(bool notify, string msg)
+    #region Private
+
+    private async Task CoreStart(ProfileItem node)
+    {
+        var coreType = _config.RunningCoreType = AppHandler.Instance.GetCoreType(node, node.ConfigType);
+        var coreInfo = CoreInfoHandler.Instance.GetCoreInfo(coreType);
+
+        var displayLog = node.ConfigType != EConfigType.Custom || node.DisplayLog;
+        var proc = await RunProcess(coreInfo, Global.CoreConfigFileName, displayLog, true);
+        if (proc is null)
+        {
+            return;
+        }
+        _process = proc;
+    }
+
+    private async Task CoreStartPreService(ProfileItem node)
+    {
+        if (_process != null && !_process.HasExited)
+        {
+            var coreType = AppHandler.Instance.GetCoreType(node, node.ConfigType);
+            var itemSocks = await ConfigHandler.GetPreSocksItem(_config, node, coreType);
+            if (itemSocks != null)
+            {
+                var preCoreType = itemSocks.CoreType ?? ECoreType.sing_box;
+                var fileName = Utils.GetBinConfigPath(Global.CorePreConfigFileName);
+                var result = await CoreConfigHandler.GenerateClientConfig(itemSocks, fileName);
+                if (result.Success)
+                {
+                    var coreInfo = CoreInfoHandler.Instance.GetCoreInfo(preCoreType);
+                    var proc = await RunProcess(coreInfo, Global.CorePreConfigFileName, true, true);
+                    if (proc is null)
+                    {
+                        return;
+                    }
+                    _processPre = proc;
+                }
+            }
+        }
+    }
+
+    private void UpdateFunc(bool notify, string msg)
     {
         _updateFunc?.Invoke(notify, msg);
     }
@@ -293,22 +229,46 @@ namespace ServiceLib.Handler
 
     #region Process
 
-        private async Task<Process?> RunProcess(ProfileItem node, CoreInfo coreInfo, string configPath, bool displayLog)
+    private async Task<Process?> RunProcess(CoreInfo? coreInfo, string configPath, bool displayLog, bool mayNeedSudo)
     {
-            try
+        var fileName = CoreInfoHandler.Instance.GetCoreExecFile(coreInfo, out var msg);
-            {
+        if (fileName.IsNullOrEmpty())
-                string fileName = CoreFindExe(coreInfo);
-                if (Utils.IsNullOrEmpty(fileName))
         {
+            UpdateFunc(false, msg);
             return null;
         }
+
+        try
+        {
+            if (mayNeedSudo
+                && _config.TunModeItem.EnableTun
+                && coreInfo.CoreType == ECoreType.sing_box
+                && Utils.IsNonWindows())
+            {
+                _linuxSudo = true;
+                await CoreAdminHandler.Instance.Init(_config, _updateFunc);
+                return await CoreAdminHandler.Instance.RunProcessAsLinuxSudo(fileName, coreInfo, configPath);
+            }
+
+            return await RunProcessNormal(fileName, coreInfo, configPath, displayLog);
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+            UpdateFunc(mayNeedSudo, ex.Message);
+            return null;
+        }
+    }
+
+    private async Task<Process?> RunProcessNormal(string fileName, CoreInfo? coreInfo, string configPath, bool displayLog)
+    {
         Process proc = new()
         {
             StartInfo = new()
             {
                 FileName = fileName,
-                        Arguments = string.Format(coreInfo.Arguments, configPath),
+                Arguments = string.Format(coreInfo.Arguments, coreInfo.AbsolutePath ? Utils.GetBinConfigPath(configPath).AppendQuotes() : configPath),
-                        WorkingDirectory = Utils.GetConfigPath(),
+                WorkingDirectory = Utils.GetBinConfigPath(),
                 UseShellExecute = false,
                 RedirectStandardOutput = displayLog,
                 RedirectStandardError = displayLog,
@@ -317,83 +277,40 @@ namespace ServiceLib.Handler
                 StandardErrorEncoding = displayLog ? Encoding.UTF8 : null,
             }
         };
-                var startUpErrorMessage = new StringBuilder();
+
-                var startUpSuccessful = false;
         if (displayLog)
         {
             proc.OutputDataReceived += (sender, e) =>
             {
-                        if (Utils.IsNotEmpty(e.Data))
+                if (e.Data.IsNotEmpty())
                 {
-                            string msg = e.Data + Environment.NewLine;
+                    UpdateFunc(false, e.Data + Environment.NewLine);
-                            ShowMsg(false, msg);
                 }
             };
             proc.ErrorDataReceived += (sender, e) =>
             {
-                        if (Utils.IsNotEmpty(e.Data))
+                if (e.Data.IsNotEmpty())
                 {
-                            string msg = e.Data + Environment.NewLine;
+                    UpdateFunc(false, e.Data + Environment.NewLine);
-                            ShowMsg(false, msg);
-
-                            if (!startUpSuccessful)
-                            {
-                                startUpErrorMessage.Append(msg);
-                            }
                 }
             };
         }
         proc.Start();
+
         if (displayLog)
         {
             proc.BeginOutputReadLine();
             proc.BeginErrorReadLine();
         }
 
-                if (proc.WaitForExit(1000))
+        await Task.Delay(100);
-                {
-                    proc.CancelErrorRead();
-                    throw new Exception(displayLog ? startUpErrorMessage.ToString() : "启动进程失败并退出 (Failed to start the process and exited)");
-                }
-                else
-                {
-                    startUpSuccessful = true;
-                }
-
         AppHandler.Instance.AddProcess(proc.Handle);
+        if (proc is null or { HasExited: true })
+        {
+            throw new Exception(ResUI.FailedToRunCore);
+        }
         return proc;
     }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(ex.Message, ex);
-                string msg = ex.Message;
-                ShowMsg(true, msg);
-                return null;
-            }
-        }
-
-        private async Task KillProcess(Process? proc)
-        {
-            if (proc is null)
-            {
-                return;
-            }
-            try
-            {
-                proc.Kill();
-                proc.WaitForExit(100);
-                if (!proc.HasExited)
-                {
-                    proc.Kill();
-                    proc.WaitForExit(100);
-                }
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(ex.Message, ex);
-            }
-        }
 
     #endregion Process
-    }
 }

v2rayN/ServiceLib/Handler/CoreInfoHandler.cs

@@ -1,9 +1,7 @@
-using System.Runtime.Intrinsics.X86;
+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;
@@ -31,143 +29,189 @@ namespace ServiceLib.Handler
         return _coreInfo ?? [];
     }
 
+    public string GetCoreExecFile(CoreInfo? coreInfo, out string msg)
+    {
+        var fileName = string.Empty;
+        msg = string.Empty;
+        foreach (var name in coreInfo?.CoreExes)
+        {
+            var vName = Utils.GetBinPath(Utils.GetExeName(name), coreInfo.CoreType.ToString());
+            if (File.Exists(vName))
+            {
+                fileName = vName;
+                break;
+            }
+        }
+        if (fileName.IsNullOrEmpty())
+        {
+            msg = string.Format(ResUI.NotFoundCore, Utils.GetBinPath("", coreInfo?.CoreType.ToString()), coreInfo?.CoreExes?.LastOrDefault(), coreInfo?.Url);
+            Logging.SaveLog(msg);
+        }
+        return fileName;
+    }
+
     private void InitCoreInfo()
     {
-            _coreInfo = [];
+        var urlN = GetCoreUrl(ECoreType.v2rayN);
+        var urlXray = GetCoreUrl(ECoreType.Xray);
+        var urlMihomo = GetCoreUrl(ECoreType.mihomo);
+        var urlSingbox = GetCoreUrl(ECoreType.sing_box);
 
-            _coreInfo.Add(new CoreInfo
+        _coreInfo =
+        [
+            new CoreInfo
                 {
                     CoreType = ECoreType.v2rayN,
-                Url = Global.NUrl,
+                    Url = GetCoreUrl(ECoreType.v2rayN),
-                ReleaseApiUrl = Global.NUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
+                    ReleaseApiUrl = urlN.Replace(Global.GithubUrl, Global.GithubApiUrl),
-                DownloadUrlWin64 = Global.NUrl + "/download/{0}/v2rayN-windows-64.zip",
+                    DownloadUrlWin64 = urlN + "/download/{0}/v2rayN-windows-64.zip",
-                DownloadUrlWinArm64 = Global.NUrl + "/download/{0}/v2rayN-windows-arm64.zip",
+                    DownloadUrlWinArm64 = urlN + "/download/{0}/v2rayN-windows-arm64.zip",
-                DownloadUrlLinux64 = Global.NUrl + "/download/{0}/v2rayN-linux-64.zip",
+                    DownloadUrlLinux64 = urlN + "/download/{0}/v2rayN-linux-64.zip",
-                DownloadUrlLinuxArm64 = Global.NUrl + "/download/{0}/v2rayN-linux-arm64.zip",
+                    DownloadUrlLinuxArm64 = urlN + "/download/{0}/v2rayN-linux-arm64.zip",
-            });
+                    DownloadUrlOSX64 = urlN + "/download/{0}/v2rayN-macos-64.zip",
+                    DownloadUrlOSXArm64 = urlN + "/download/{0}/v2rayN-macos-arm64.zip",
+                },
 
-            _coreInfo.Add(new CoreInfo
+                new CoreInfo
                 {
                     CoreType = ECoreType.v2fly,
-                CoreExes = new List<string> { "wv2ray", "v2ray" },
+                    CoreExes = ["v2ray"],
-                Arguments = "",
+                    Arguments = "{0}",
-                Url = Global.V2flyCoreUrl,
+                    Url = GetCoreUrl(ECoreType.v2fly),
-                ReleaseApiUrl = Global.V2flyCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
                     Match = "V2Ray",
                     VersionArg = "-version",
-                RedirectInfo = true,
+                },
-            });
 
-            _coreInfo.Add(new CoreInfo
+                new CoreInfo
                 {
                     CoreType = ECoreType.v2fly_v5,
-                CoreExes = new List<string> { "v2ray" },
+                    CoreExes = ["v2ray"],
-                Arguments = "run -c config.json -format jsonv5",
+                    Arguments = "run -c {0} -format jsonv5",
-                Url = Global.V2flyCoreUrl,
+                    Url = GetCoreUrl(ECoreType.v2fly_v5),
-                ReleaseApiUrl = Global.V2flyCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
                     Match = "V2Ray",
                     VersionArg = "version",
-                RedirectInfo = true,
+                },
-            });
 
-            _coreInfo.Add(new CoreInfo
+                new CoreInfo
                 {
                     CoreType = ECoreType.Xray,
-                CoreExes = new List<string> { "xray", "wxray" },
+                    CoreExes = ["xray"],
-                Arguments = "run {0}",
+                    Arguments = "run -c {0}",
-                Url = Global.XrayCoreUrl,
+                    Url = GetCoreUrl(ECoreType.Xray),
-                ReleaseApiUrl = Global.XrayCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
+                    ReleaseApiUrl = urlXray.Replace(Global.GithubUrl, Global.GithubApiUrl),
-                DownloadUrlWin64 = Global.XrayCoreUrl + "/download/{0}/Xray-windows-64.zip",
+                    DownloadUrlWin64 = urlXray + "/download/{0}/Xray-windows-64.zip",
-                DownloadUrlWinArm64 = Global.XrayCoreUrl + "/download/{0}/Xray-windows-arm64-v8a.zip",
+                    DownloadUrlWinArm64 = urlXray + "/download/{0}/Xray-windows-arm64-v8a.zip",
-                DownloadUrlLinux64 = Global.XrayCoreUrl + "/download/{0}/Xray-linux-64.zip",
+                    DownloadUrlLinux64 = urlXray + "/download/{0}/Xray-linux-64.zip",
-                DownloadUrlLinuxArm64 = Global.XrayCoreUrl + "/download/{0}/Xray-linux-arm64-v8a.zip",
+                    DownloadUrlLinuxArm64 = urlXray + "/download/{0}/Xray-linux-arm64-v8a.zip",
+                    DownloadUrlOSX64 = urlXray + "/download/{0}/Xray-macos-64.zip",
+                    DownloadUrlOSXArm64 = urlXray + "/download/{0}/Xray-macos-arm64-v8a.zip",
                     Match = "Xray",
                     VersionArg = "-version",
-                RedirectInfo = true,
+                },
-            });
 
-            _coreInfo.Add(new CoreInfo
+                new CoreInfo
                 {
                     CoreType = ECoreType.mihomo,
-                CoreExes = new List<string> { $"mihomo-windows-amd64{(Avx2.X64.IsSupported ? "" : "-compatible")}", "mihomo-windows-amd64-compatible", "mihomo-windows-amd64", "mihomo-windows-386", "mihomo", "clash" },
+                    CoreExes = ["mihomo-windows-amd64-compatible", "mihomo-windows-amd64", "mihomo-linux-amd64", "clash", "mihomo"],
-                Arguments = "-f config.json" + PortableMode(),
+                    Arguments = "-f {0}" + PortableMode(),
-                Url = Global.MihomoCoreUrl,
+                    Url = GetCoreUrl(ECoreType.mihomo),
-                ReleaseApiUrl = Global.MihomoCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
+                    ReleaseApiUrl = urlMihomo.Replace(Global.GithubUrl, Global.GithubApiUrl),
-                DownloadUrlWin64 = Global.MihomoCoreUrl + "/download/{0}/mihomo-windows-amd64-compatible-{0}.zip",
+                    DownloadUrlWin64 = urlMihomo + "/download/{0}/mihomo-windows-amd64-compatible-{0}.zip",
-                DownloadUrlWinArm64 = Global.MihomoCoreUrl + "/download/{0}/mihomo-windows-arm64-{0}.zip",
+                    DownloadUrlWinArm64 = urlMihomo + "/download/{0}/mihomo-windows-arm64-{0}.zip",
-                DownloadUrlLinux64 = Global.MihomoCoreUrl + "/download/{0}/mihomo-linux-amd64-compatible-{0}.gz",
+                    DownloadUrlLinux64 = urlMihomo + "/download/{0}/mihomo-linux-amd64-compatible-{0}.gz",
-                DownloadUrlLinuxArm64 = Global.MihomoCoreUrl + "/download/{0}/mihomo-linux-arm64-{0}.gz",
+                    DownloadUrlLinuxArm64 = urlMihomo + "/download/{0}/mihomo-linux-arm64-{0}.gz",
+                    DownloadUrlOSX64 = urlMihomo + "/download/{0}/mihomo-darwin-amd64-compatible-{0}.gz",
+                    DownloadUrlOSXArm64 = urlMihomo + "/download/{0}/mihomo-darwin-arm64-{0}.gz",
                     Match = "Mihomo",
                     VersionArg = "-v",
-                RedirectInfo = true,
+                },
-            });
 
-            _coreInfo.Add(new CoreInfo
+                new CoreInfo
                 {
                     CoreType = ECoreType.hysteria,
-                CoreExes = new List<string> { "hysteria-windows-amd64", "hysteria-windows-386", "hysteria" },
+                    CoreExes = ["hysteria"],
                     Arguments = "",
-                Url = Global.HysteriaCoreUrl,
+                    Url = GetCoreUrl(ECoreType.hysteria),
-                ReleaseApiUrl = Global.HysteriaCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
+                },
-                RedirectInfo = true,
-            });
 
-            _coreInfo.Add(new CoreInfo
+                new CoreInfo
                 {
                     CoreType = ECoreType.naiveproxy,
-                CoreExes = new List<string> { "naiveproxy", "naive" },
+                    CoreExes = [ "naive", "naiveproxy"],
-                Arguments = "config.json",
+                    Arguments = "{0}",
-                Url = Global.NaiveproxyCoreUrl,
+                    Url = GetCoreUrl(ECoreType.naiveproxy),
-                RedirectInfo = false,
+                },
-            });
 
-            _coreInfo.Add(new CoreInfo
+                new CoreInfo
                 {
                     CoreType = ECoreType.tuic,
-                CoreExes = new List<string> { "tuic-client", "tuic" },
+                    CoreExes = ["tuic-client", "tuic"],
-                Arguments = "-c config.json",
+                    Arguments = "-c {0}",
-                Url = Global.TuicCoreUrl,
+                    Url = GetCoreUrl(ECoreType.tuic),
-                RedirectInfo = true,
+                },
-            });
 
-            _coreInfo.Add(new CoreInfo
+                new CoreInfo
                 {
                     CoreType = ECoreType.sing_box,
-                CoreExes = new List<string> { "sing-box-client", "sing-box" },
+                    CoreExes = ["sing-box-client", "sing-box"],
-                Arguments = "run {0} --disable-color",
+                    Arguments = "run -c {0} --disable-color",
-                Url = Global.SingboxCoreUrl,
+                    Url = GetCoreUrl(ECoreType.sing_box),
-                RedirectInfo = true,
+
-                ReleaseApiUrl = Global.SingboxCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
+                    ReleaseApiUrl = urlSingbox.Replace(Global.GithubUrl, Global.GithubApiUrl),
-                DownloadUrlWin64 = Global.SingboxCoreUrl + "/download/{0}/sing-box-{1}-windows-amd64.zip",
+                    DownloadUrlWin64 = urlSingbox + "/download/{0}/sing-box-{1}-windows-amd64.zip",
-                DownloadUrlWinArm64 = Global.SingboxCoreUrl + "/download/{0}/sing-box-{1}-windows-arm64.zip",
+                    DownloadUrlWinArm64 = urlSingbox + "/download/{0}/sing-box-{1}-windows-arm64.zip",
-                DownloadUrlLinux64 = Global.SingboxCoreUrl + "/download/{0}/sing-box-{1}-linux-amd64.tar.gz",
+                    DownloadUrlLinux64 = urlSingbox + "/download/{0}/sing-box-{1}-linux-amd64.tar.gz",
-                DownloadUrlLinuxArm64 = Global.SingboxCoreUrl + "/download/{0}/sing-box-{1}-linux-arm64.tar.gz",
+                    DownloadUrlLinuxArm64 = urlSingbox + "/download/{0}/sing-box-{1}-linux-arm64.tar.gz",
+                    DownloadUrlOSX64 = urlSingbox + "/download/{0}/sing-box-{1}-darwin-amd64.tar.gz",
+                    DownloadUrlOSXArm64 = urlSingbox + "/download/{0}/sing-box-{1}-darwin-arm64.tar.gz",
                     Match = "sing-box",
                     VersionArg = "version",
-            });
+                },
 
-            _coreInfo.Add(new CoreInfo
+                new CoreInfo
                 {
                     CoreType = ECoreType.juicity,
-                CoreExes = new List<string> { "juicity-client", "juicity" },
+                    CoreExes = ["juicity-client", "juicity"],
-                Arguments = "run -c config.json",
+                    Arguments = "run -c {0}",
-                Url = Global.JuicityCoreUrl
+                    Url = GetCoreUrl(ECoreType.juicity)
-            });
+                },
 
-            _coreInfo.Add(new CoreInfo
+                new CoreInfo
                 {
                     CoreType = ECoreType.hysteria2,
-                CoreExes = new List<string> { "hysteria-windows-amd64", "hysteria-windows-386", "hysteria" },
+                    CoreExes = ["hysteria-windows-amd64", "hysteria-linux-amd64", "hysteria"],
                     Arguments = "",
-                Url = Global.HysteriaCoreUrl,
+                    Url = GetCoreUrl(ECoreType.hysteria2),
-                ReleaseApiUrl = Global.HysteriaCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
+                },
-                RedirectInfo = true,
+
-            });
+                new CoreInfo
+                {
+                    CoreType = ECoreType.brook,
+                    CoreExes = ["brook_windows_amd64", "brook_linux_amd64", "brook"],
+                    Arguments = " {0}",
+                    Url = GetCoreUrl(ECoreType.brook),
+                    AbsolutePath = true,
+                },
+
+                new CoreInfo
+                {
+                    CoreType = ECoreType.overtls,
+                    CoreExes = [ "overtls-bin", "overtls"],
+                    Arguments = "-r client -c {0}",
+                    Url =  GetCoreUrl(ECoreType.overtls),
+                    AbsolutePath = false,
                 }
 
-        private string PortableMode()
+        ];
-        {
-            return $" -d \"{Utils.GetBinPath("")}\"";
     }
+
+    private static string PortableMode()
+    {
+        return $" -d {Utils.GetBinPath("").AppendQuotes()}";
+    }
+
+    private static string GetCoreUrl(ECoreType eCoreType)
+    {
+        return $"{Global.GithubUrl}/{Global.CoreUrls[eCoreType]}/releases";
     }
 }

v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs

@@ -1,27 +1,30 @@
-using System.Collections.Specialized;
+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);
+                dicQuery.Add("headerType", item.HeaderType.IsNotEmpty() ? item.HeaderType : Global.None);
-                    if (Utils.IsNotEmpty(item.RequestHost))
+                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);
+                dicQuery.Add("headerType", item.HeaderType.IsNotEmpty() ? item.HeaderType : Global.None);
-                    if (Utils.IsNotEmpty(item.Path))
+                if (item.Path.IsNotEmpty())
                 {
                     dicQuery.Add("seed", Utils.UrlEncode(item.Path));
                 }
@@ -83,38 +86,56 @@ namespace ServiceLib.Handler.Fmt
 
             case nameof(ETransport.ws):
             case nameof(ETransport.httpupgrade):
-                case nameof(ETransport.splithttp):
+                if (item.RequestHost.IsNotEmpty())
-                    if (Utils.IsNotEmpty(item.RequestHost))
                 {
                     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 (item.RequestHost.IsNotEmpty())
+                {
+                    dicQuery.Add("host", Utils.UrlEncode(item.RequestHost));
+                }
+                if (item.Path.IsNotEmpty())
+                {
+                    dicQuery.Add("path", Utils.UrlEncode(item.Path));
+                }
+                if (item.HeaderType.IsNotEmpty() && Global.XhttpMode.Contains(item.HeaderType))
+                {
+                    dicQuery.Add("mode", Utils.UrlEncode(item.HeaderType));
+                }
+                if (item.Extra.IsNotEmpty())
+                {
+                    dicQuery.Add("extra", Utils.UrlEncode(item.Extra));
+                }
+                break;
+
             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));
@@ -156,11 +177,17 @@ namespace ServiceLib.Handler.Fmt
 
             case nameof(ETransport.ws):
             case nameof(ETransport.httpupgrade):
-                case nameof(ETransport.splithttp):
                 item.RequestHost = Utils.UrlDecode(query["host"] ?? "");
                 item.Path = Utils.UrlDecode(query["path"] ?? "/");
                 break;
 
+            case nameof(ETransport.xhttp):
+                item.RequestHost = Utils.UrlDecode(query["host"] ?? "");
+                item.Path = Utils.UrlDecode(query["path"] ?? "/");
+                item.HeaderType = Utils.UrlDecode(query["mode"] ?? "");
+                item.Extra = Utils.UrlDecode(query["extra"] ?? "");
+                break;
+
             case nameof(ETransport.http):
             case nameof(ETransport.h2):
                 item.Network = nameof(ETransport.h2);
@@ -190,7 +217,10 @@ namespace ServiceLib.Handler.Fmt
     {
         foreach (var item in s)
         {
-                if (str.Contains(item, StringComparison.OrdinalIgnoreCase)) return true;
+            if (str.Contains(item, StringComparison.OrdinalIgnoreCase))
+            {
+                return true;
+            }
         }
         return false;
     }
@@ -211,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,9 @@
-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)
     {
         try
@@ -23,7 +25,7 @@
         }
         catch (Exception ex)
         {
-                Logging.SaveLog(ex.Message, ex);
+            Logging.SaveLog(_tag, ex);
             return "";
         }
     }
@@ -35,7 +37,7 @@
         try
         {
             string str = config.TrimEx();
-                if (Utils.IsNullOrEmpty(str))
+            if (str.IsNullOrEmpty())
             {
                 msg = ResUI.FailedReadConfiguration;
                 return null;
@@ -81,10 +83,9 @@
         }
         catch (Exception ex)
         {
-                Logging.SaveLog(ex.Message, ex);
+            Logging.SaveLog(_tag, ex);
             msg = ResUI.Incorrectconfiguration;
             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;
@@ -11,7 +11,8 @@
         };
 
         var url = Utils.TryUri(str);
-            if (url == null) return null;
+        if (url == null)
+            return null;
 
         item.Address = url.IdnHost;
         item.Port = url.Port;
@@ -23,34 +24,41 @@
         item.Path = Utils.UrlDecode(query["obfs-password"] ?? "");
         item.AllowInsecure = (query["insecure"] ?? "") == "1" ? "true" : "false";
 
+        item.Ports = Utils.UrlDecode(query["mport"] ?? "").Replace('-', ':');
+
         return item;
     }
 
     public static string? ToUri(ProfileItem? item)
     {
-            if (item == null) return null;
+        if (item == null)
+            return null;
         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);
     }
@@ -90,5 +98,4 @@
 
         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;
+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;
@@ -26,11 +26,12 @@ namespace ServiceLib.Handler.Fmt
 
     public static string? ToUri(ProfileItem? item)
     {
-            if (item == null) return null;
+        if (item == null)
-            string url = string.Empty;
+        {
-
+            return null;
-            string remark = string.Empty;
+        }
-            if (Utils.IsNotEmpty(item.Remarks))
+        var remark = string.Empty;
+        if (item.Remarks.IsNotEmpty())
         {
             remark = "#" + Utils.UrlEncode(item.Remarks);
         }
@@ -52,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);
         }
@@ -71,18 +74,23 @@ 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;
     }
 
     private static ProfileItem? ResolveSip002(string result)
     {
         var parsedUrl = Utils.TryUri(result);
-            if (parsedUrl == null) return null;
+        if (parsedUrl == null)
+        {
+            return null;
+        }
 
         ProfileItem item = new()
         {
@@ -94,25 +102,25 @@ 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;
             }
-                item.Security = userInfoParts[0];
+            item.Security = userInfoParts.First();
-                item.Id = Utils.UrlDecode(userInfoParts[1]);
+            item.Id = Utils.UrlDecode(userInfoParts.Last());
         }
         else
         {
             // parse base64 UserInfo
-                string userInfo = Utils.Base64Decode(rawUserInfo);
+            var userInfo = Utils.Base64Decode(rawUserInfo);
-                string[] userInfoParts = userInfo.Split(new[] { ':' }, 2);
+            var userInfoParts = userInfo.Split(new[] { ':' }, 2);
             if (userInfoParts.Length != 2)
             {
                 return null;
             }
-                item.Security = userInfoParts[0];
+            item.Security = userInfoParts.First();
-                item.Id = userInfoParts[1];
+            item.Id = userInfoParts.Last();
         }
 
         var queryParameters = Utils.ParseQueryString(parsedUrl.Query);
@@ -120,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;
@@ -160,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);
             }
@@ -168,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);
+        var configObjects = JsonUtils.Deserialize<object[]>(strData);
-            if (configObjects != null && configObjects.Length > 0)
+        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);
+            var profileIt = ResolveFull(objectString, subRemarks);
-                    if (singboxCon?.inbounds?.Count > 0
+            if (profileIt != null)
-                        && singboxCon.outbounds?.Count > 0
-                        && singboxCon.route != 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);
+        var config = JsonUtils.ParseJson(strData);
-            if (singboxConfig?.inbounds?.Count > 0
+        if (config?["inbounds"] == null
-                && singboxConfig.outbounds?.Count > 0
+            || config["outbounds"] == null
-                && singboxConfig.route != 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,13 +1,12 @@
-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;
-            ProfileItem? item;
 
-            item = ResolveSocksNew(str) ?? ResolveSocks(str);
+        var item = ResolveSocksNew(str) ?? ResolveSocks(str);
         if (item == null)
         {
             return null;
@@ -24,20 +23,15 @@
 
     public static string? ToUri(ProfileItem? item)
     {
-            if (item == null) return null;
+        if (item == null)
-            string url = string.Empty;
+        {
-
+            return null;
-            string remark = string.Empty;
+        }
-            if (Utils.IsNotEmpty(item.Remarks))
+        var remark = string.Empty;
+        if (item.Remarks.IsNotEmpty())
         {
             remark = "#" + Utils.UrlEncode(item.Remarks);
         }
-            //url = string.Format("{0}:{1}@{2}:{3}",
-            //    item.security,
-            //    item.id,
-            //    item.address,
-            //    item.port);
-            //url = Utile.Base64Encode(url);
         //new
         var pw = Utils.Base64Encode($"{item.Security}:{item.Id}");
         return ToUri(EConfigType.SOCKS, item.Address, item.Port, pw, null, remark);
@@ -51,7 +45,7 @@
         };
         result = result[Global.ProtocolShares[EConfigType.SOCKS].Length..];
         //remark
-            int indexRemark = result.IndexOf("#");
+        var indexRemark = result.IndexOf("#");
         if (indexRemark > 0)
         {
             try
@@ -62,7 +56,7 @@
             result = result[..indexRemark];
         }
         //part decode
-            int indexS = result.IndexOf("@");
+        var indexS = result.IndexOf("@");
         if (indexS > 0)
         {
         }
@@ -71,21 +65,20 @@
             result = Utils.Base64Decode(result);
         }
 
-            string[] arr1 = result.Split('@');
+        var arr1 = result.Split('@');
         if (arr1.Length != 2)
         {
             return null;
         }
-            string[] arr21 = arr1[0].Split(':');
+        var arr21 = arr1.First().Split(':');
-            //string[] arr22 = arr1[1].Split(':');
+        var indexPort = arr1.Last().LastIndexOf(":");
-            int indexPort = arr1[1].LastIndexOf(":");
         if (arr21.Length != 2 || indexPort < 0)
         {
             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[0];
+        item.Security = arr21.First();
         item.Id = arr21[1];
 
         return item;
@@ -94,7 +87,10 @@
     private static ProfileItem? ResolveSocksNew(string result)
     {
         var parsedUrl = Utils.TryUri(result);
-            if (parsedUrl == null) return null;
+        if (parsedUrl == null)
+        {
+            return null;
+        }
 
         ProfileItem item = new()
         {
@@ -106,14 +102,13 @@
         // parse base64 UserInfo
         var rawUserInfo = Utils.UrlDecode(parsedUrl.UserInfo);
         var userInfo = Utils.Base64Decode(rawUserInfo);
-            var userInfoParts = userInfo.Split(new[] { ':' }, 2);
+        var userInfoParts = userInfo.Split([':'], 2);
         if (userInfoParts.Length == 2)
         {
-                item.Security = userInfoParts[0];
+            item.Security = userInfoParts.First();
             item.Id = userInfoParts[1];
         }
 
         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;
@@ -12,7 +12,10 @@
         };
 
         var url = Utils.TryUri(str);
-            if (url == null) return null;
+        if (url == null)
+        {
+            return null;
+        }
 
         item.Address = url.IdnHost;
         item.Port = url.Port;
@@ -20,25 +23,25 @@
         item.Id = Utils.UrlDecode(url.UserInfo);
 
         var query = Utils.ParseQueryString(url.Query);
-            ResolveStdTransport(query, ref item);
+        _ = ResolveStdTransport(query, ref item);
 
         return item;
     }
 
     public static string? ToUri(ProfileItem? item)
     {
-            if (item == null) return null;
+        if (item == null)
-            string url = string.Empty;
+        {
-
+            return null;
-            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;
@@ -12,7 +12,10 @@
         };
 
         var url = Utils.TryUri(str);
-            if (url == null) return null;
+        if (url == null)
+        {
+            return null;
+        }
 
         item.Address = url.IdnHost;
         item.Port = url.Port;
@@ -21,8 +24,8 @@
         var userInfoParts = rawUserInfo.Split(new[] { ':' }, 2);
         if (userInfoParts.Length == 2)
         {
-                item.Id = userInfoParts[0];
+            item.Id = userInfoParts.First();
-                item.Security = userInfoParts[1];
+            item.Security = userInfoParts.Last();
         }
 
         var query = Utils.ParseQueryString(url.Query);
@@ -34,20 +37,22 @@
 
     public static string? ToUri(ProfileItem? item)
     {
-            if (item == null) return null;
+        if (item == null)
-            string url = string.Empty;
+        {
+            return null;
+        }
 
-            string remark = string.Empty;
+        var 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));
         }
@@ -55,5 +60,4 @@
 
         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);
+        var configObjects = JsonUtils.Deserialize<object[]>(strData);
-            if (configObjects != null && configObjects.Length > 0)
+        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);
+            var profileIt = ResolveFull(objectString, subRemarks);
-                    if (v2rayCon?.inbounds?.Count > 0
+            if (profileIt != null)
-                        && v2rayCon.outbounds?.Count > 0
-                        && v2rayCon.routing != 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);
+        var config = JsonUtils.ParseJson(strData);
-            if (v2rayConfig?.inbounds?.Count > 0
+        if (config?["inbounds"] == null
-                && v2rayConfig.outbounds?.Count > 0
+            || config["outbounds"] == null
-                && v2rayConfig.routing != 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;
@@ -13,7 +13,10 @@
         };
 
         var url = Utils.TryUri(str);
-            if (url == null) return null;
+        if (url == null)
+        {
+            return null;
+        }
 
         item.Address = url.IdnHost;
         item.Port = url.Port;
@@ -23,23 +26,25 @@
         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;
     }
 
     public static string? ToUri(ProfileItem? item)
     {
-            if (item == null) return null;
+        if (item == null)
-            string url = string.Empty;
+        {
+            return null;
+        }
 
-            string remark = string.Empty;
+        var 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.Security))
+        if (item.Security.IsNotEmpty())
         {
             dicQuery.Add("encryption", item.Security);
         }
@@ -47,9 +52,8 @@
         {
             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,14 +1,14 @@
-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;
         ProfileItem? item;
-            if (str.IndexOf('?') > 0 && str.IndexOf('&') > 0)
+        if (str.IndexOf('@') > 0)
         {
-                item = ResolveStdVmess(str);
+            item = ResolveStdVmess(str) ?? ResolveVmess(str, out msg);
         }
         else
         {
@@ -19,10 +19,11 @@
 
     public static string? ToUri(ProfileItem? item)
     {
-            if (item == null) return null;
+        if (item == null)
-            string url = string.Empty;
+        {
-
+            return null;
-            VmessQRCode vmessQRCode = new()
+        }
+        var vmessQRCode = new VmessQRCode
         {
             v = item.ConfigVersion,
             ps = item.Remarks.TrimEx(),
@@ -41,7 +42,7 @@
             fp = item.Fingerprint
         };
 
-            url = JsonUtils.Serialize(vmessQRCode);
+        var url = JsonUtils.Serialize(vmessQRCode);
         url = Utils.Base64Encode(url);
         url = $"{Global.ProtocolShares[EConfigType.VMess]}{url}";
 
@@ -59,7 +60,7 @@
         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;
@@ -77,12 +78,12 @@
         item.AlterId = vmessQRCode.aid;
         item.Security = Utils.ToString(vmessQRCode.scy);
 
-            item.Security = Utils.IsNotEmpty(vmessQRCode.scy) ? vmessQRCode.scy : Global.DefaultSecurity;
+        item.Security = vmessQRCode.scy.IsNotEmpty() ? vmessQRCode.scy : Global.DefaultSecurity;
-            if (Utils.IsNotEmpty(vmessQRCode.net))
+        if (vmessQRCode.net.IsNotEmpty())
         {
             item.Network = vmessQRCode.net;
         }
-            if (Utils.IsNotEmpty(vmessQRCode.type))
+        if (vmessQRCode.type.IsNotEmpty())
         {
             item.HeaderType = vmessQRCode.type;
         }
@@ -99,14 +100,17 @@
 
     public static ProfileItem? ResolveStdVmess(string str)
     {
-            ProfileItem item = new()
+        var item = new ProfileItem
         {
             ConfigType = EConfigType.VMess,
             Security = "auto"
         };
 
         var url = Utils.TryUri(str);
-            if (url == null) return null;
+        if (url == null)
+        {
+            return null;
+        }
 
         item.Address = url.IdnHost;
         item.Port = url.Port;
@@ -118,5 +122,4 @@
 
         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;
@@ -12,7 +12,10 @@
         };
 
         var url = Utils.TryUri(str);
-            if (url == null) return null;
+        if (url == null)
+        {
+            return null;
+        }
 
         item.Address = url.IdnHost;
         item.Port = url.Port;
@@ -31,33 +34,34 @@
 
     public static string? ToUri(ProfileItem? item)
     {
-            if (item == null) return null;
+        if (item == null)
-            string url = string.Empty;
+        {
+            return null;
+        }
 
-            string remark = string.Empty;
+        var 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.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

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