Chore: update dependencies

`header` value is type of string array
header:
  Accept:
    - 'application/vnd.github.v3.raw'
  Authorization:
    - ' token xxxxxxxxxxx'
  User-Agent:
    - 'Clash/v1.10.6'

`prefix-name` add a prefix to proxy name
prefix-name: 'XXX-'

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,76 @@
+name: Bug report
+description: Create a report to help us improve
+title: "[Bug] "
+body:
+  - type: checkboxes
+    id: ensure
+    attributes:
+      label: Verify steps
+      description: "
+在提交之前，请确认
+Please verify that you've followed these steps
+"
+      options:
+        - label: "
+如果你可以自己 debug 并解决的话，提交 PR 吧
+Is this something you can **debug and fix**? Send a pull request! Bug fixes and documentation fixes are welcome.
+"
+          required: true
+        - label: "
+我已经在 [Issue Tracker](……/) 中找过我要提出的问题
+I have searched on the [issue tracker](……/) for a related issue.
+"
+          required: true
+        - label: "
+我已经使用 dev 分支版本测试过，问题依旧存在
+I have tested using the dev branch, and the issue still exists.
+"
+          required: true
+        - label: "
+我已经仔细看过 [Documentation](https://github.com/Dreamacro/clash/wiki/) 并无法自行解决问题
+I have read the [documentation](https://github.com/Dreamacro/clash/wiki/) and was unable to solve the issue.
+"
+          required: true
+        - label: "
+这是 Clash 核心的问题，并非我所使用的 Clash 衍生版本（如 OpenClash、KoolClash 等）的特定问题
+This is an issue of the Clash core *per se*, not to the derivatives of Clash, like OpenClash or KoolClash.
+"
+          required: true
+  - type: input
+    attributes:
+      label: Clash version
+    validations:
+      required: true
+  - type: dropdown
+    id: os
+    attributes:
+      label: What OS are you seeing the problem on?
+      multiple: true
+      options:
+        - macOS
+        - Windows
+        - Linux
+        - OpenBSD/FreeBSD
+  - type: textarea
+    attributes:
+      render: yaml
+      label: "Clash config"
+      description: "
+在下方附上 Clash core 脱敏后配置文件的内容
+Paste the Clash core configuration below.
+"
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      render: shell
+      label: Clash log
+      description: "
+在下方附上 Clash Core 的日志，log level 使用 DEBUG
+Paste the Clash core log below with the log level set to `DEBUG`.
+"
+  - type: textarea
+    attributes:
+      label: Description
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,6 @@
+blank_issues_enabled: false
+
+contact_links:
+  - name: Get help in GitHub Discussions
+    url: https://github.com/Dreamacro/clash/discussions
+    about: Have a question? Not sure if your issue affects everyone reproducibly? The quickest way to get help is on Clash's GitHub Discussions!

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -0,0 +1,36 @@
+name: Feature request
+description: Suggest an idea for this project
+title: "[Feature] "
+body:
+  - type: checkboxes
+    id: ensure
+    attributes:
+      label: Verify steps
+      description: "
+在提交之前，请确认
+Please verify that you've followed these steps
+"
+      options:
+        - label: "
+我已经在 [Issue Tracker](……/) 中找过我要提出的请求
+I have searched on the [issue tracker](……/) for a related feature request.
+"
+          required: true
+        - label: "
+我已经仔细看过 [Documentation](https://github.com/Dreamacro/clash/wiki/) 并无法自行解决问题
+I have read the [documentation](https://github.com/Dreamacro/clash/wiki/) and was unable to solve the issue.
+"
+          required: true
+  - type: textarea
+    attributes:
+      label: Description
+      description: 请详细、清晰地表达你要提出的论述，例如这个问题如何影响到你？你想实现什么功能？目前 Clash Core 的行为是什麽？
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Possible Solution
+      description: "
+此项非必须，但是如果你有想法的话欢迎提出。
+Not obligatory, but suggest a fix/reason for the bug, or ideas how to implement the addition or change
+"

.github/release.sh

@@ -1,26 +0,0 @@
-#!/bin/bash
-
-FILENAMES=$(ls)
-for FILENAME in $FILENAMES
-do
-    if [[ ! ($FILENAME =~ ".exe" || $FILENAME =~ ".sh")]];then
-        gzip -S ".gz" $FILENAME
-    elif [[ $FILENAME =~ ".exe" ]];then
-        zip -m ${FILENAME%.*}.zip $FILENAME
-    else echo "skip $FILENAME"
-    fi
-done
-
-FILENAMES=$(ls)
-for FILENAME in $FILENAMES
-do
-    if [[ $FILENAME =~ ".zip" ]];then
-        echo "rename $FILENAME"
-        mv $FILENAME ${FILENAME%.*}-${VERSION}.zip
-    elif [[ $FILENAME =~ ".gz" ]];then
-        echo "rename $FILENAME"
-        mv $FILENAME ${FILENAME%.*}-${VERSION}.gz
-    else
-        echo "skip $FILENAME"
-    fi
-done

.github/rename-cgo.sh

@@ -1,26 +0,0 @@
-#!/bin/bash
-
-FILENAMES=$(ls)
-for FILENAME in $FILENAMES
-do
-    if [[ $FILENAME =~ "darwin-10.16-arm64" ]];then
-        echo "rename darwin-10.16-arm64 $FILENAME"
-        mv $FILENAME clash.meta-darwin-arm64-cgo
-    elif [[ $FILENAME =~ "darwin-10.16-amd64" ]];then
-        echo "rename darwin-10.16-amd64 $FILENAME"
-        mv $FILENAME clash.meta-darwin-amd64-cgo
-    elif [[ $FILENAME =~ "windows-4.0-386" ]];then
-        echo "rename windows 386 $FILENAME"
-        mv $FILENAME clash.meta-windows-386-cgo.exe
-    elif [[ $FILENAME =~ "windows-4.0-amd64" ]];then
-        echo "rename windows amd64 $FILENAME"
-        mv $FILENAME clash.meta-windows-amd64-cgo.exe
-    elif [[ $FILENAME =~ "linux" ]];then
-        echo "rename linux $FILENAME"
-        mv $FILENAME $FILENAME-cgo
-    elif [[ $FILENAME =~ "android" ]];then
-        echo "rename android $FILENAME"
-        mv $FILENAME $FILENAME-cgo
-    else echo "skip $FILENAME"
-    fi
-done

.github/workflows/build.yml

@@ -1,325 +0,0 @@
-name: Build
-on:
-  workflow_dispatch:
-  push:
-    paths-ignore:
-      - "docs/**"
-      - "README.md"
-    branches:
-      - Alpha
-      - Beta
-      - Meta
-    tags:
-      - "v*"
-  pull_request_target:
-    branches:
-      - Alpha
-      - Beta
-      - Meta
-env:
-  REGISTRY: docker.io
-jobs:
-  Build:
-    permissions: write-all
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        job:
-          - {
-              type: "WithoutCGO",
-              target: "linux-amd64 linux-amd64-compatible",
-              id: "1",
-            }
-          - {
-              type: "WithoutCGO",
-              target: "linux-armv5 linux-armv6 linux-armv7",
-              id: "2",
-            }
-          - {
-              type: "WithoutCGO",
-              target: "linux-arm64 linux-mips64 linux-mips64le",
-              id: "3",
-            }
-          - {
-              type: "WithoutCGO",
-              target: "linux-mips-softfloat linux-mips-hardfloat linux-mipsle-softfloat linux-mipsle-hardfloat",
-              id: "4",
-            }
-          - {
-              type: "WithoutCGO",
-              target: "freebsd-386 freebsd-amd64 freebsd-arm64",
-              id: "5",
-            }
-          - {
-              type: "WithoutCGO",
-              target: "windows-amd64-compatible windows-amd64 windows-386",
-              id: "6",
-            }
-          - {
-              type: "WithoutCGO",
-              target: "windows-arm64 windows-arm32v7",
-              id: "7",
-            }
-          - {
-              type: "WithoutCGO",
-              target: "darwin-amd64 darwin-arm64 android-arm64",
-              id: "8",
-            }
-          - { type: "WithCGO", target: "windows/*", id: "1" }
-          - { type: "WithCGO", target: "linux/386", id: "2" }
-          - { type: "WithCGO", target: "linux/amd64", id: "3" }
-          - { type: "WithCGO", target: "linux/arm64,linux/riscv64", id: "4" }
-          - { type: "WithCGO", target: "linux/arm,", id: "5" }
-          - { type: "WithCGO", target: "linux/arm-6,linux/arm-7", id: "6" }
-          - { type: "WithCGO", target: "linux/mips,linux/mipsle", id: "7" }
-          - { type: "WithCGO", target: "linux/mips64", id: "8" }
-          - { type: "WithCGO", target: "linux/mips64le", id: "9" }
-          - { type: "WithCGO", target: "darwin-10.16/*", id: "10" }
-          - { type: "WithCGO", target: "android", id: "11" }
-
-    steps:
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v3
-
-      - name: Set variables
-        run: echo "VERSION=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
-        shell: bash
-
-      - name: Set variables
-        if: ${{github.ref_name=='Alpha'}}
-        run: echo "VERSION=alpha-$(git rev-parse --short HEAD)" >> $GITHUB_ENV
-        shell: bash
-
-      - name: Set variables
-        if: ${{github.ref_name=='Beta'}}
-        run: echo "VERSION=beta-$(git rev-parse --short HEAD)" >> $GITHUB_ENV
-        shell: bash
-
-      - name: Set variables
-        if: ${{github.ref_name=='Meta'}}
-        run: echo "VERSION=meta-$(git rev-parse --short HEAD)" >> $GITHUB_ENV
-        shell: bash
-
-      - name: Set variables
-        if: ${{github.ref_name=='' || github.ref_type=='tag'}}
-        run: echo "VERSION=$(git describe --tags)" >> $GITHUB_ENV
-        shell: bash
-
-      - name: Set ENV
-        run: |
-          echo "NAME=clash.meta" >> $GITHUB_ENV
-          echo "REPO=${{ github.repository }}" >> $GITHUB_ENV
-          echo "ShortSHA=$(git rev-parse --short ${{ github.sha }})" >> $GITHUB_ENV
-          echo "BUILDTIME=$(date -u)" >> $GITHUB_ENV
-          echo "BRANCH=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_ENV
-        shell: bash
-
-      - name: Set ENV
-        run: |
-          echo "TAGS=with_gvisor,with_lwip" >> $GITHUB_ENV
-          echo "LDFLAGS=-X 'github.com/Dreamacro/clash/constant.Version=${VERSION}' -X 'github.com/Dreamacro/clash/constant.BuildTime=${BUILDTIME}' -w -s -buildid=" >> $GITHUB_ENV
-        shell: bash
-
-      - name: Setup Go
-        uses: actions/setup-go@v3
-        with:
-          go-version: "1.20"
-          check-latest: true
-
-      - name: Test
-        if: ${{ matrix.job.id=='1' && matrix.job.type=='WithoutCGO' }}
-        run: |
-          go test ./...
-
-      - name: Build WithoutCGO
-        if: ${{ matrix.job.type=='WithoutCGO' }}
-        env:
-          NAME: Clash.Meta
-          BINDIR: bin
-        run: make -j$(($(nproc) + 1)) ${{ matrix.job.target }}
-
-      - uses: nttld/setup-ndk@v1
-        if: ${{ matrix.job.type=='WithCGO' && matrix.job.target=='android' }}
-        id: setup-ndk
-        with:
-          ndk-version: r25b
-          add-to-path: false
-          local-cache: true
-
-      - name: Build Android
-        if: ${{ matrix.job.type=='WithCGO' && matrix.job.target=='android' }}
-        env:
-          ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
-        run: |
-          mkdir bin
-          CC=${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android33-clang
-          CGO_ENABLED=1 CC=${CC} GOARCH=arm64 GOOS=android go build -tags ${TAGS} -trimpath -ldflags "${LDFLAGS}" -o bin/${NAME}-android-arm64
-
-      - name: Set up xgo
-        if: ${{ matrix.job.type=='WithCGO' && matrix.job.target!='android' }}
-        run: |
-          docker pull techknowlogick/xgo:latest
-          go install src.techknowlogick.com/xgo@latest
-
-      - name: Build by xgo
-        if: ${{ matrix.job.type=='WithCGO' && matrix.job.target!='android' }}
-        env:
-          ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
-        run: |
-          mkdir bin
-          xgo --targets="${{ matrix.job.target }}" --tags="${TAGS}" -ldflags="${LDFLAGS}" --out bin/${NAME} ./
-
-      - name: Rename
-        if: ${{ matrix.job.type=='WithCGO' }}
-        run: |
-          cd bin
-          ls -la
-          cp ../.github/rename-cgo.sh ./
-          bash ./rename-cgo.sh
-          rm ./rename-cgo.sh
-          ls -la
-          cd ..
-
-      - name: Zip
-        if: ${{  success() }}
-        run: |
-          cd bin
-          ls -la
-          chmod +x *
-          cp ../.github/release.sh ./
-          bash ./release.sh
-          rm ./release.sh
-          ls -la
-          cd ..
-
-      - uses: actions/upload-artifact@v3
-        if: ${{  success() }}
-        with:
-          name: artifact
-          path: bin/
-
-  Upload-Prerelease:
-    permissions: write-all
-    if: ${{ github.ref_type=='branch' }}
-    needs: [ Build ]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/download-artifact@v3
-        with:
-          name: artifact
-          path: bin/
-
-      - name: Display structure of downloaded files
-        run: ls -R
-        working-directory: bin
-
-      - name: Delete current release assets
-        uses: andreaswilli/delete-release-assets-action@v2.0.0
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          tag: Prerelease-${{ github.ref_name }}
-          deleteOnlyFromDrafts: false
-
-      - name: Tag Repo
-        uses: richardsimko/update-tag@v1.0.6
-        with:
-          tag_name: Prerelease-${{ github.ref_name }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Upload Prerelease
-        uses: softprops/action-gh-release@v1
-        if: ${{  success() }}
-        with:
-          tag: ${{ github.ref_name }}
-          tag_name: Prerelease-${{ github.ref_name }}
-          files: bin/*
-          prerelease: true
-          generate_release_notes: true
-
-  Upload-Release:
-    permissions: write-all
-    if: ${{ github.ref_type=='tag' }}
-    needs: [ Build ]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/download-artifact@v3
-        with:
-          name: artifact
-          path: bin/
-
-      - name: Display structure of downloaded files
-        run: ls -R
-        working-directory: bin
-
-      - name: Upload Release
-        uses: softprops/action-gh-release@v1
-        if: ${{  success() }}
-        with:
-          tag: ${{ github.ref_name }}
-          tag_name: ${{ github.ref_name }}
-          files: bin/*
-          generate_release_notes: true
-
-  Docker:
-    permissions: write-all
-    needs: [ Build ]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - uses: actions/download-artifact@v3
-        with:
-          name: artifact
-          path: bin/
-
-      - name: Display structure of downloaded files
-        run: ls -R
-        working-directory: bin
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-
-      - name: Setup Docker buildx
-        uses: docker/setup-buildx-action@v1
-        with:
-          version: latest
-
-      # Extract metadata (tags, labels) for Docker
-      # https://github.com/docker/metadata-action
-      - name: Extract Docker metadata
-        id: meta
-        uses: docker/metadata-action@v3
-        with:
-          images: ${{ env.REGISTRY }}/${{ secrets.DOCKERHUB_ACCOUNT }}/${{secrets.DOCKERHUB_REPO}}
-      - name: Show files
-        run: |
-          ls .
-          ls bin/
-      - name: Log into registry
-        if: github.event_name != 'pull_request'
-        uses: docker/login-action@v1
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ secrets.DOCKER_HUB_USER }}
-          password: ${{ secrets.DOCKER_HUB_TOKEN }}
-
-      # Build and push Docker image with Buildx (don't push on PR)
-      # https://github.com/docker/build-push-action
-      - name: Build and push Docker image
-        id: build-and-push
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          file: ./Dockerfile
-          push: ${{ github.event_name != 'pull_request' }}
-          platforms: |
-            linux/386
-            linux/amd64
-            linux/arm64/v8
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,29 @@
+name: CodeQL
+
+on:
+  push:
+    branches: [ rm ]
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: ['go']
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

.github/workflows/docker.yml

@@ -0,0 +1,79 @@
+name: Publish Docker Image
+on:
+  push:
+    branches:
+      - rm
+
+jobs:
+
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+        with:
+          platforms: all
+
+      - name: Set up docker buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v1
+        with:
+          version: latest
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      
+      - name: Login to Github Package
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: Dreamacro
+          password: ${{ secrets.PACKAGE_TOKEN }}
+
+      - name: Build dev branch and push
+        if: github.ref == 'refs/heads/dev'
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
+          push: true
+          tags: 'dreamacro/clash:dev,ghcr.io/dreamacro/clash:dev'
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+      - name: Get all docker tags
+        if: startsWith(github.ref, 'refs/tags/')
+        uses: actions/github-script@v6
+        id: tags
+        with:
+          script: |
+            const ref = context.payload.ref.replace(/\/?refs\/tags\//, '')
+            const tags = [
+              'dreamacro/clash:latest',
+              `dreamacro/clash:${ref}`,
+              'ghcr.io/dreamacro/clash:latest',
+              `ghcr.io/dreamacro/clash:${ref}`
+            ]
+            return tags.join(',')
+          result-encoding: string
+
+      - name: Build release and push
+        if: startsWith(github.ref, 'refs/tags/')
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
+          push: true
+          tags: ${{steps.tags.outputs.result}}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

.github/workflows/linter.yml

@@ -0,0 +1,22 @@
+name: Linter
+on: [push, pull_request]
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Get latest go version
+        id: version
+        run: |
+          echo ::set-output name=go_version::$(curl -s https://raw.githubusercontent.com/actions/go-versions/main/versions-manifest.json | grep -oE '"version": "[0-9]{1}.[0-9]{1,}(.[0-9]{1,})?"' | head -1 | cut -d':' -f2 | sed 's/ //g; s/"//g')
+
+      - name: Setup Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: ${{ steps.version.outputs.go_version }}
+
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v3
+        with:
+          version: latest

.github/workflows/release.yml

@@ -0,0 +1,73 @@
+name: Release
+on: [push]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Get latest go version
+        id: version
+        run: |
+          echo ::set-output name=go_version::$(curl -s https://raw.githubusercontent.com/actions/go-versions/main/versions-manifest.json | grep -oE '"version": "[0-9]{1}.[0-9]{1,}(.[0-9]{1,})?"' | head -1 | cut -d':' -f2 | sed 's/ //g; s/"//g')
+
+      - name: Setup Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: ${{ steps.version.outputs.go_version }}
+
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v3
+
+      - name: Go cache paths
+        id: go-cache-paths
+        run: |
+          echo "::set-output name=go-build::$(go env GOCACHE)"
+          echo "::set-output name=go-mod::$(go env GOMODCACHE)"
+
+      - name: Cache go module
+        uses: actions/cache@v2
+        with:
+          path: |
+            ${{ steps.go-cache-paths.outputs.go-mod }}
+            ${{ steps.go-cache-paths.outputs.go-build }}
+          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+          restore-keys: |
+            ${{ runner.os }}-go-
+
+      - name: Get dependencies, run test
+        run: |
+          go test ./...
+
+      - name: Build
+        if: startsWith(github.ref, 'refs/tags/')
+        env:
+          NAME: clash
+          BINDIR: bin
+        run: make -j releases
+
+      #- name: Prepare upload
+      #  run: |
+      #    echo "FILE_DATE=_$(date +"%Y%m%d%H%M")" >> $GITHUB_ENV
+      #    echo "FILE_SHA=$(git describe --tags --always 2>/dev/null)" >> $GITHUB_ENV
+      #
+      #- name: Upload files to Artifacts
+      #  uses: actions/upload-artifact@v2
+      #  if: startsWith(github.ref, 'refs/tags/') == false
+      #  with:
+      #    name: clash_${{ env.FILE_SHA }}${{ env.FILE_DATE }}
+      #    path: |
+      #      bin/*
+
+      - name: Upload Release
+        uses: softprops/action-gh-release@v1
+        if: startsWith(github.ref, 'refs/tags/')
+        with:
+          files: bin/*
+          draft: true
+          prerelease: true
+          generate_release_notes: true
+
+      #- name: Delete workflow runs
+      #  uses: GitRML/delete-workflow-runs@main
+      #  with:
+      #    retain_days: 1
+      #    keep_minimum_runs: 2

.github/workflows/stale.yml

@@ -0,0 +1,19 @@
+  
+name: Mark stale issues and pull requests
+
+on:
+  push:
+    branches:
+      - rm
+
+jobs:
+  stale:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/stale@v5
+        with:
+          stale-issue-message: 'This issue is stale because it has been open 60 days with no activity. Remove stale label or comment or this will be closed in 5 days'
+          days-before-stale: 60
+          days-before-close: 5

.gitignore

@@ -23,6 +23,3 @@ vendor
 
 # test suite
 test/config/cache*
-/output
-.vscode/
-.fleet/

.golangci.yaml

@@ -8,10 +8,9 @@ linters:
 
 linters-settings:
   gci:
-    custom-order: true
     sections:
       - standard
       - prefix(github.com/Dreamacro/clash)
       - default
   staticcheck:
-    go: '1.19'
+    go: '1.18'

Dockerfile

@@ -1,25 +1,18 @@
-FROM alpine:latest as builder
+FROM golang:alpine as builder
 
-RUN apk add --no-cache gzip && \
+RUN apk add --no-cache make git && \
-    mkdir /clash-config && \
+    wget -O /Country.mmdb https://github.com/Dreamacro/maxmind-geoip/releases/latest/download/Country.mmdb
-    wget -O /clash-config/Country.mmdb https://raw.githubusercontent.com/Loyalsoldier/geoip/release/Country.mmdb && \
+WORKDIR /clash-src
-    wget -O /clash-config/geosite.dat https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.dat && \
+COPY --from=tonistiigi/xx:golang / /
-    wget -O /clash-config/geoip.dat https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat
+COPY . /clash-src
+RUN go mod download && \
+    make docker && \
+    mv ./bin/clash-docker /clash
 
-COPY docker/file-name.sh /clash/file-name.sh
-WORKDIR /clash
-COPY bin/ bin/
-RUN FILE_NAME=`sh file-name.sh` && echo $FILE_NAME && \
-    FILE_NAME=`ls bin/ | egrep "$FILE_NAME.*"|awk NR==1` && \
-    mv bin/$FILE_NAME clash.gz && gzip -d clash.gz && echo "$FILE_NAME" > /clash-config/test
 FROM alpine:latest
-LABEL org.opencontainers.image.source="https://github.com/MetaCubeX/Clash.Meta"
+LABEL org.opencontainers.image.source="https://github.com/Dreamacro/clash"
 
-RUN apk add --no-cache ca-certificates tzdata iptables
+RUN apk add --no-cache ca-certificates tzdata
-
+COPY --from=builder /Country.mmdb /root/.config/clash/
-VOLUME ["/root/.config/clash/"]
+COPY --from=builder /clash /
-
+ENTRYPOINT ["/clash"]
-COPY --from=builder /clash-config/ /root/.config/clash/
-COPY --from=builder /clash/clash /clash
-RUN chmod +x /clash
-ENTRYPOINT [ "/clash" ]

Makefile

@@ -1,63 +1,50 @@
-NAME=clash.meta
+NAME=clash
 BINDIR=bin
-BRANCH=$(shell git branch --show-current)
+VERSION=$(shell git describe --tags --always 2>/dev/null || echo "unknown version")
-ifeq ($(BRANCH),Alpha)
-VERSION=alpha-$(shell git rev-parse --short HEAD)
-else ifeq ($(BRANCH),Beta)
-VERSION=beta-$(shell git rev-parse --short HEAD)
-else ifeq ($(BRANCH),)
-VERSION=$(shell git describe --tags)
-else
-VERSION=$(shell git rev-parse --short HEAD)
-endif
-
 BUILDTIME=$(shell date -u)
-GOBUILD=CGO_ENABLED=0 go build -tags with_gvisor -trimpath -ldflags '-X "github.com/Dreamacro/clash/constant.Version=$(VERSION)" \
+GOBUILD=CGO_ENABLED=0 go build -trimpath -ldflags '-X "github.com/Dreamacro/clash/constant.Version=$(VERSION)" \
 		-X "github.com/Dreamacro/clash/constant.BuildTime=$(BUILDTIME)" \
 		-w -s -buildid='
 
 PLATFORM_LIST = \
 	darwin-amd64 \
+	darwin-amd64-v3 \
 	darwin-arm64 \
-	linux-amd64-compatible \
+	linux-386 \
 	linux-amd64 \
+	linux-amd64-v3 \
 	linux-armv5 \
 	linux-armv6 \
 	linux-armv7 \
-	linux-arm64 \
+	linux-armv8 \
-	linux-mips64 \
-	linux-mips64le \
 	linux-mips-softfloat \
 	linux-mips-hardfloat \
 	linux-mipsle-softfloat \
 	linux-mipsle-hardfloat \
-	android-arm64 \
+	linux-mips64 \
+	linux-mips64le \
 	freebsd-386 \
 	freebsd-amd64 \
+	freebsd-amd64-v3 \
 	freebsd-arm64
 
 WINDOWS_ARCH_LIST = \
 	windows-386 \
-	windows-amd64-compatible \
 	windows-amd64 \
+	windows-amd64-v3 \
 	windows-arm64 \
 	windows-arm32v7
 
-all:linux-amd64 linux-arm64\
+all: linux-amd64 darwin-amd64 windows-amd64 # Most used
-	darwin-amd64 darwin-arm64\
- 	windows-amd64 windows-arm64\
-
-
-darwin-all: darwin-amd64 darwin-arm64
 
 docker:
-	GOAMD64=v1 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
+	$(GOBUILD) -o $(BINDIR)/$(NAME)-$@
 
 darwin-amd64:
-	GOARCH=amd64 GOOS=darwin GOAMD64=v3 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
+	GOARCH=amd64 GOOS=darwin $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
 
-darwin-amd64-compatible:
+darwin-amd64-v3:
-	GOARCH=amd64 GOOS=darwin GOAMD64=v1 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
+	GOARCH=amd64 GOOS=darwin GOAMD64=v3 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
 
 darwin-arm64:
 	GOARCH=arm64 GOOS=darwin $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
@@ -66,14 +53,11 @@ linux-386:
 	GOARCH=386 GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
 
 linux-amd64:
+	GOARCH=amd64 GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
+
+linux-amd64-v3:
 	GOARCH=amd64 GOOS=linux GOAMD64=v3 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
 
-linux-amd64-compatible:
-	GOARCH=amd64 GOOS=linux GOAMD64=v1 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
-
-linux-arm64:
-	GOARCH=arm64 GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
-
 linux-armv5:
 	GOARCH=arm GOOS=linux GOARM=5 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
 
@@ -83,6 +67,9 @@ linux-armv6:
 linux-armv7:
 	GOARCH=arm GOOS=linux GOARM=7 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
 
+linux-armv8:
+	GOARCH=arm64 GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
+
 linux-mips-softfloat:
 	GOARCH=mips GOMIPS=softfloat GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
 
@@ -101,13 +88,13 @@ linux-mips64:
 linux-mips64le:
 	GOARCH=mips64le GOOS=linux $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
 
-android-arm64:
-	GOARCH=arm64 GOOS=android $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
-
 freebsd-386:
 	GOARCH=386 GOOS=freebsd $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
 
 freebsd-amd64:
+	GOARCH=amd64 GOOS=freebsd $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
+
+freebsd-amd64-v3:
 	GOARCH=amd64 GOOS=freebsd GOAMD64=v3 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@
 
 freebsd-arm64:
@@ -117,10 +104,10 @@ windows-386:
 	GOARCH=386 GOOS=windows $(GOBUILD) -o $(BINDIR)/$(NAME)-$@.exe
 
 windows-amd64:
-	GOARCH=amd64 GOOS=windows GOAMD64=v3 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@.exe
+	GOARCH=amd64 GOOS=windows $(GOBUILD) -o $(BINDIR)/$(NAME)-$@.exe
 
-windows-amd64-compatible:
+windows-amd64-v3:
-	GOARCH=amd64 GOOS=windows GOAMD64=v1 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@.exe
+	GOARCH=amd64 GOOS=windows GOAMD64=v3 $(GOBUILD) -o $(BINDIR)/$(NAME)-$@.exe
 
 windows-arm64:
 	GOARCH=arm64 GOOS=windows $(GOBUILD) -o $(BINDIR)/$(NAME)-$@.exe
@@ -146,15 +133,11 @@ vet:
 	go test ./...
 
 lint:
-	golangci-lint run ./...
+	GOOS=darwin golangci-lint run ./...
+	GOOS=windows golangci-lint run ./...
+	GOOS=linux golangci-lint run ./...
+	GOOS=freebsd golangci-lint run ./...
+	GOOS=openbsd golangci-lint run ./...
 
 clean:
-	rm $(BINDIR)/*
+	rm -rf $(BINDIR)/*
-
-CLANG ?= clang-14
-CFLAGS := -O2 -g -Wall -Werror $(CFLAGS)
-
-ebpf: export BPF_CLANG := $(CLANG)
-ebpf: export BPF_CFLAGS := $(CFLAGS)
-ebpf:
-	cd component/ebpf/ && go generate ./...

README.md

@@ -1,20 +1,23 @@
 <h1 align="center">
-  <img src="Meta.png" alt="Meta Kennel" width="200">
+  <img src="https://github.com/Dreamacro/clash/raw/master/docs/logo.png" alt="Clash" width="200">
-  <br>Meta Kernel<br>
+  <br>Clash<br>
 </h1>
 
-<h3 align="center">Another Clash Kernel.</h3>
+<h4 align="center">A rule-based tunnel in Go.</h4>
 
 <p align="center">
-  <a href="https://goreportcard.com/report/github.com/Clash-Mini/Clash.Meta">
+  <a href="https://github.com/Dreamacro/clash/actions">
-    <img src="https://goreportcard.com/badge/github.com/Clash-Mini/Clash.Meta?style=flat-square">
+    <img src="https://img.shields.io/github/workflow/status/Dreamacro/clash/Go?style=flat-square" alt="Github Actions">
+  </a>
+  <a href="https://goreportcard.com/report/github.com/Dreamacro/clash">
+    <img src="https://goreportcard.com/badge/github.com/Dreamacro/clash?style=flat-square">
   </a>
   <img src="https://img.shields.io/github/go-mod/go-version/Dreamacro/clash?style=flat-square">
-  <a href="https://github.com/Clash-Mini/Clash.Meta/releases">
+  <a href="https://github.com/yaling888/clash/releases">
-    <img src="https://img.shields.io/github/release/Clash-Mini/Clash.Meta/all.svg?style=flat-square">
+    <img src="https://img.shields.io/github/release/yaling888/clash/all.svg?style=flat-square">
   </a>
-  <a href="https://github.com/Clash-Mini/Clash.Meta">
+  <a href="https://github.com/yaling888/clash/releases/tag/plus_pro">
-    <img src="https://img.shields.io/badge/release-Meta-00b4f0?style=flat-square">
+    <img src="https://img.shields.io/badge/release-Plus Pro-00b4f0?style=flat-square">
   </a>
 </p>
 
@@ -29,66 +32,61 @@
 - Netfilter TCP redirecting. Deploy Clash on your Internet gateway with `iptables`.
 - Comprehensive HTTP RESTful API controller
 
-## Wiki
+## Getting Started
+Documentations are now moved to [GitHub Wiki](https://github.com/Dreamacro/clash/wiki).
 
-Documentation and configuring examples are available on [wiki](https://github.com/MetaCubeX/Clash.Meta/wiki) and [Clash.Meta Wiki](https://docs.metacubex.one/).
+## Advanced usage for this branch
+### General configuration
+```yaml
+sniffing: true # Sniff TLS SNI
 
-## Build
+force-cert-verify: true # force verify TLS Certificate, prevent machine-in-the-middle attacks
-
-You should install [golang](https://go.dev) first.
-
-Then get the source code of Clash.Meta:
-
-```shell
-git clone https://github.com/MetaCubeX/Clash.Meta.git
-cd Clash.Meta && go mod download
 ```
 
-If you can't visit github,you should set proxy first:
+### MITM configuration
+A root CA certificate is required, the 
+MITM proxy server will generate a CA certificate file and a CA private key file in your Clash home directory, you can use your own certificate replace it. 
 
-```shell
+Need to install and trust the CA certificate on the client device, open this URL [http://mitm.clash/cert.crt](http://mitm.clash/cert.crt) by the web browser to install the CA certificate, the host name 'mitm.clash' was always been hijacked.
-go env -w GOPROXY=https://goproxy.io,direct
+
+NOTE: this feature cannot work on tls pinning
+
+WARNING: DO NOT USE THIS FEATURE TO BREAK LOCAL LAWS
+
+```yaml
+# Port of MITM proxy server on the local end
+mitm-port: 7894
+
+# Man-In-The-Middle attack
+mitm:
+  hosts: # use for others proxy type. E.g: TUN, socks
+    - +.example.com
+  rules: # rewrite rules
+    - '^https?://www\.example\.com/1 url reject' # The "reject" returns HTTP status code 404 with no content.
+    - '^https?://www\.example\.com/2 url reject-200' # The "reject-200" returns HTTP status code 200 with no content.
+    - '^https?://www\.example\.com/3 url reject-img' # The "reject-img" returns HTTP status code 200 with content of 1px png.
+    - '^https?://www\.example\.com/4 url reject-dict' # The "reject-dict" returns HTTP status code 200 with content of empty json object.
+    - '^https?://www\.example\.com/5 url reject-array' # The "reject-array" returns HTTP status code 200 with content of empty json array.
+    - '^https?://www\.example\.com/(6) url 302 https://www.example.com/new-$1'
+    - '^https?://www\.(example)\.com/7 url 307 https://www.$1.com/new-7'
+    - '^https?://www\.example\.com/8 url request-header (\r\n)User-Agent:.+(\r\n) request-header $1User-Agent: haha-wriohoh$2' # The "request-header" works for all the http headers not just one single header, so you can match two or more headers including CRLF in one regular expression.
+    - '^https?://www\.example\.com/9 url request-body "pos_2":\[.*\],"pos_3" request-body "pos_2":[{"xx": "xx"}],"pos_3"'
+    - '^https?://www\.example\.com/10 url response-header (\r\n)Tracecode:.+(\r\n) response-header $1Tracecode: 88888888888$2'
+    - '^https?://www\.example\.com/11 url response-body "errmsg":"ok" response-body "errmsg":"not-ok"'
 ```
 
-Now you can build it:
+### DNS configuration
-
+Support resolve ip with a proxy tunnel or interface.
-```shell
-go build
-```
-
-If you need gvisor for tun stack, build with:
-
-```shell
-go build -tags with_gvisor
-```
-
-<!-- ## Advanced usage of this fork -->
-
-<!-- ### DNS configuration
 
 Support `geosite` with `fallback-filter`.
 
-Restore `Redir remote resolution`.
+Use `curl -X POST controllerip:port/cache/fakeip/flush` to flush persistence fakeip
-
+ ```yaml
-Support resolve ip with a `Proxy Tunnel`.
+ dns:
-
-```yaml
-proxy-groups:
-  - name: DNS
-    type: url-test
-    use:
-      - HK
-    url: http://cp.cloudflare.com
-    interval: 180
-    lazy: true
-```
-
-```yaml
-dns:
    enable: true
    use-hosts: true
    ipv6: false
-  enhanced-mode: redir-host
+   enhanced-mode: fake-ip
    fake-ip-range: 198.18.0.1/16
    listen: 127.0.0.1:6868
    default-nameserver:
@@ -98,52 +96,98 @@ dns:
      - https://doh.pub/dns-query
      - tls://223.5.5.5:853
    fallback:
-    - "https://1.0.0.1/dns-query#DNS" # append the proxy adapter name or group name to the end of DNS URL with '#' prefix.
+     - 'tls://8.8.4.4:853#proxy or interface'
-    - "tls://8.8.4.4:853#DNS"
+     - 'https://1.0.0.1/dns-query#Proxy'  # append the proxy adapter name to the end of DNS URL with '#' prefix.
    fallback-filter:
      geoip: false
      geosite:
-      - gfw # `geosite` filter only use fallback server to resolve ip, prevent DNS leaks to unsafe DNS providers.
+       - gfw  # `geosite` filter only use fallback server to resolve ip, prevent DNS leaks to untrusted DNS providers.
      domain:
        - +.example.com
      ipcidr:
        - 0.0.0.0/32
-```
+ ```
 
 ### TUN configuration
+Simply add the following to the main configuration:
 
-Supports macOS, Linux and Windows.
+#### NOTE:
-
+> auto-route and auto-detect-interface only available on macOS, Windows and Linux, receive IPv4 traffic
-Built-in [Wintun](https://www.wintun.net) driver.
 
 ```yaml
-# Enable the TUN listener
 tun:
   enable: true
-  stack: system #   system/gvisor
+  stack: system # or gvisor
-  dns-hijack:
+  # device: tun://utun8 # or fd://xxx, it's optional
-    - 0.0.0.0:53 # additional dns server listen on TUN
+  # dns-hijack:
+  #   - 8.8.8.8:53
+  #   - tcp://8.8.8.8:53
+  #   - any:53
+  #   - tcp://any:53
+  auto-route: true # auto set global route
+  auto-detect-interface: true # conflict with interface-name
+```
+or
+```yaml
+interface-name: en0
+
+tun:
+  enable: true
+  stack: system # or gvisor
+  # dns-hijack:
+  #   - 8.8.8.8:53
+  #   - tcp://8.8.8.8:53
   auto-route: true # auto set global route
 ```
+It's recommended to use fake-ip mode for the DNS server.
+
+Clash needs elevated permission to create TUN device:
+```sh
+$ sudo ./clash
+```
+Then manually create the default route and DNS server. If your device already has some TUN device, Clash TUN might not work. In this case, fake-ip-filter may helpful.
+
+Enjoy! :)
+
+#### For Windows:
+```yaml
+tun:
+  enable: true
+  stack: gvisor # or system
+  dns-hijack:
+    - 198.18.0.2:53 # when `fake-ip-range` is 198.18.0.1/16, should hijack 198.18.0.2:53
+  auto-route: true # auto set global route for Windows
+  # It is recommended to use `interface-name`
+  auto-detect-interface: true # auto detect interface, conflict with `interface-name`
+```
+Finally, open the Clash
 
 ### Rules configuration
-
 - Support rule `GEOSITE`.
-- Support rule-providers `RULE-SET`.
+- Support rule `USER-AGENT`.
 - Support `multiport` condition for rule `SRC-PORT` and `DST-PORT`.
 - Support `network` condition for all rules.
+- Support `process` condition for all rules.
 - Support source IPCIDR condition for all rules, just append to the end.
-- The `GEOSITE` databases via https://github.com/Loyalsoldier/v2ray-rules-dat.
 
+The `GEOIP` databases via [https://github.com/Loyalsoldier/geoip](https://raw.githubusercontent.com/Loyalsoldier/geoip/release/Country.mmdb).
+
+The `GEOSITE` databases via [https://github.com/Loyalsoldier/v2ray-rules-dat](https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.dat).
 ```yaml
 rules:
-  # network(tcp/udp) condition for all rules
+  # network condition for all rules
-  - DOMAIN-SUFFIX,bilibili.com,DIRECT,tcp
+  - DOMAIN-SUFFIX,example.com,DIRECT,tcp
-  - DOMAIN-SUFFIX,bilibili.com,REJECT,udp
+  - DOMAIN-SUFFIX,example.com,REJECT,udp
+
+  # process condition for all rules (add 'P:' prefix)
+  - DOMAIN-SUFFIX,example.com,REJECT,P:Google Chrome Helper
 
   # multiport condition for rules SRC-PORT and DST-PORT
   - DST-PORT,123/136/137-139,DIRECT,udp
 
+  # USER-AGENT payload cannot include the comma character, '*' meaning any character.
+  - USER-AGENT,*example*,PROXY
+
   # rule GEOSITE
   - GEOSITE,category-ads-all,REJECT
   - GEOSITE,icloud@cn,DIRECT
@@ -159,127 +203,112 @@ rules:
   #- GEOSITE,geolocation-!cn,REJECT,192.168.1.88/32,192.168.1.99/32
   
   - GEOIP,telegram,PROXY,no-resolve
-  - GEOIP,private,DIRECT,no-resolve
+  - GEOIP,lan,DIRECT,no-resolve
   - GEOIP,cn,DIRECT
 
   - MATCH,PROXY
 ```
 
 ### Proxies configuration
+Support outbound protocol `VLESS`.
 
-Active health detection `urltest / fallback` (based on tcp handshake, multiple failures within a limited time will actively trigger health detection to use the node)
+Support `Trojan` with XTLS.
 
-Support `Policy Group Filter`
+Support relay `UDP` traffic.
 
+Support filtering proxy providers in proxy groups.
+
+Support custom http request header, prefix name and V2Ray subscription URL in proxy providers.
 ```yaml
-proxy-groups:
+proxies:
-  - name: 🚀 HK Group
+  # VLESS
-    type: select
+  - name: "vless-tls"
-    use:
+    type: vless
-      - ALL
+    server: server
-    filter: "HK"
+    port: 443
+    uuid: uuid
+    network: tcp
+    servername: example.com
+    udp: true
+    # skip-cert-verify: true
+  - name: "vless-xtls"
+    type: vless
+    server: server
+    port: 443
+    uuid: uuid
+    network: tcp
+    servername: example.com
+    flow: xtls-rprx-direct # or xtls-rprx-origin
+    # flow-show: true # print the XTLS direction log
+    # udp: true
+    # skip-cert-verify: true
 
-  - name: 🚀 US Group
+  # Trojan
-    type: select
+  - name: "trojan-xtls"
+    type: trojan
+    server: server
+    port: 443
+    password: yourpsk
+    network: tcp
+    flow: xtls-rprx-direct # or xtls-rprx-origin
+    # flow-show: true # print the XTLS direction log
+    # udp: true
+    # sni: example.com # aka server name
+    # skip-cert-verify: true
+
+proxy-groups:
+  # Relay chains the proxies. proxies shall not contain a relay.
+  # Support relay UDP traffic.
+  # Traffic: clash <-> ss1 <-> trojan <-> vmess <-> ss2 <-> Internet
+  - name: "relay-udp-over-tcp"
+    type: relay
+    proxies:
+      - ss1
+      - trojan
+      - vmess
+      - ss2
+
+  - name: "relay-raw-udp"
+    type: relay
+    proxies:
+      - ss1
+      - ss2
+      - ss3
+        
+  - name: "filtering-proxy-providers"
+    type: url-test
+    url: "http://www.gstatic.com/generate_204"
+    interval: 300
+    tolerance: 200
+    # lazy: true
+    filter: "XXX" # a regular expression
     use:
-      - ALL
+      - provider1
-    filter: "US"
 
 proxy-providers:
-  ALL:
+  provider1:
     type: http
-    url: "xxxxx"
+    url: "url" # support V2Ray subscription URL
     interval: 3600
-    path: "xxxxx"
+    path: ./providers/provider1.yaml
+    # filter: "xxx"
+    # prefix-name: "XXX-"
+    header:  # custom http request header
+      User-Agent:
+        - "Clash/v1.10.6"
+    #   Accept:
+    #     - 'application/vnd.github.v3.raw'
+    #   Authorization:
+    #     - ' token xxxxxxxxxxx'
     health-check:
-      enable: true
+      enable: false
-      interval: 600
+      interval: 1200
+      # lazy: false # default value is true
       url: http://www.gstatic.com/generate_204
 ```
 
-Support outbound transport protocol `VLESS`.
-
-The XTLS support (TCP/UDP) transport by the XRAY-CORE.
-
-```yaml
-proxies:
-  - name: "vless"
-    type: vless
-    server: server
-    port: 443
-    uuid: uuid
-    servername: example.com # AKA SNI
-    # flow: xtls-rprx-direct # xtls-rprx-origin  # enable XTLS
-    # skip-cert-verify: true
-
-  - name: "vless-ws"
-    type: vless
-    server: server
-    port: 443
-    uuid: uuid
-    tls: true
-    udp: true
-    network: ws
-    servername: example.com # priority over wss host
-    # skip-cert-verify: true
-    ws-opts:
-      path: /path
-      headers: { Host: example.com, Edge: "12a00c4.fm.huawei.com:82897" }
-
-  - name: "vless-grpc"
-    type: vless
-    server: server
-    port: 443
-    uuid: uuid
-    tls: true
-    udp: true
-    network: grpc
-    servername: example.com # priority over wss host
-    # skip-cert-verify: true
-    grpc-opts:
-      grpc-service-name: grpcname
-```
-
-Support outbound transport protocol `Wireguard`
-
-```yaml
-proxies:
-  - name: "wg"
-    type: wireguard
-    server: 162.159.192.1
-    port: 2480
-    ip: 172.16.0.2
-    ipv6: fd01:5ca1:ab1e:80fa:ab85:6eea:213f:f4a5
-    private-key: eCtXsJZ27+4PbhDkHnB923tkUn2Gj59wZw5wFA75MnU=
-    public-key: Cr8hWlKvtDt7nrvf+f0brNQQzabAqrjfBvas9pmowjo=
-    udp: true
-```
-
-Support outbound transport protocol `Tuic`
-
-```yaml
-proxies:
-  - name: "tuic"
-    server: www.example.com
-    port: 10443
-    type: tuic
-    token: TOKEN
-    # ip: 127.0.0.1 # for overwriting the DNS lookup result of the server address set in option 'server'
-    # heartbeat-interval: 10000
-    # alpn: [h3]
-    # disable-sni: true
-    reduce-rtt: true
-    # request-timeout: 8000
-    udp-relay-mode: native # Available: "native", "quic". Default: "native"
-    # congestion-controller: bbr # Available: "cubic", "new_reno", "bbr". Default: "cubic"
-    # max-udp-relay-packet-size: 1500
-    # fast-open: true
-    # skip-cert-verify: true
-``` -->
-
 ### IPTABLES configuration
-
+Work on Linux OS who's supported `iptables`
-Work on Linux OS which supported `iptables`
 
 ```yaml
 # Enable the TPROXY listener
@@ -289,81 +318,61 @@ iptables:
   enable: true # default is false
   inbound-interface: eth0 # detect the inbound interface, default is 'lo'
 ```
+Run Clash as a daemon.
 
-### General installation guide for Linux
+Create the systemd configuration file at /etc/systemd/system/clash.service:
-
+```sh
-- Create user given name `clash-meta`
-
-- Download and decompress pre-built binaries from [releases](https://github.com/MetaCubeX/Clash.Meta/releases)
-
-- Rename executable file to `Clash-Meta` and move to `/usr/local/bin/`
-
-- Create folder `/etc/Clash-Meta/` as working directory
-
-Run Meta Kernel by user `clash-meta` as a daemon.
-
-Create the systemd configuration file at `/etc/systemd/system/Clash-Meta.service`:
-
-```
 [Unit]
-Description=Clash-Meta Daemon, Another Clash Kernel.
+Description=Clash daemon, A rule-based proxy in Go.
-After=network.target NetworkManager.service systemd-networkd.service iwd.service
+After=network.target
 
 [Service]
 Type=simple
-User=clash-meta
+CapabilityBoundingSet=cap_net_admin
-Group=clash-meta
-LimitNPROC=500
-LimitNOFILE=1000000
-CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_RAW CAP_NET_BIND_SERVICE
-AmbientCapabilities=CAP_NET_ADMIN CAP_NET_RAW CAP_NET_BIND_SERVICE
 Restart=always
-ExecStartPre=/usr/bin/sleep 1s
+ExecStart=/usr/local/bin/clash -d /etc/clash
-ExecStart=/usr/local/bin/Clash-Meta -d /etc/Clash-Meta
 
 [Install]
 WantedBy=multi-user.target
 ```
-
 Launch clashd on system startup with:
-
+```sh
-```shell
+$ systemctl enable clash
-$ systemctl enable Clash-Meta
 ```
-
 Launch clashd immediately with:
-
+```sh
-```shell
+$ systemctl start clash
-$ systemctl start Clash-Meta
 ```
 
 ### Display Process name
+To display process name online by click [http://yacd.clash-plus.cf](http://yacd.clash-plus.cf) for local API by Safari or [https://yacd.clash-plus.cf](https://yacd.clash-plus.cf) for local API by Chrome.
 
-Clash add field `Process` to `Metadata` and prepare to get process name for Restful API `GET /connections`.
+You can download the [Dashboard](https://github.com/yaling888/yacd/archive/gh-pages.zip) into Clash home directory:
+```sh
+$ cd ~/.config/clash
+$ curl -LJ https://github.com/yaling888/yacd/archive/gh-pages.zip -o yacd-gh-pages.zip
+$ unzip yacd-gh-pages.zip
+$ mv yacd-gh-pages dashboard
+```
 
-To display process name in GUI please use [Razord-meta](https://github.com/MetaCubeX/Razord-meta).
+Add to config file:
+```yaml
+external-controller: 127.0.0.1:9090
+external-ui: dashboard
+```
+Open [http://127.0.0.1:9090/ui/](http://127.0.0.1:9090/ui/) by web browser.
 
-### Dashboard
+## Plus Pro Release
-
+[Release](https://github.com/yaling888/clash/releases/tag/plus_pro)
-We also made a custom fork of yacd provide better support for this project, check it out at [Yacd-meta](https://github.com/MetaCubeX/Yacd-meta)
 
 ## Development
-
+If you want to build an application that uses clash as a library, check out the the [GitHub Wiki](https://github.com/Dreamacro/clash/wiki/use-clash-as-a-library)
-If you want to build an application that uses clash as a library, check out the
-the [GitHub Wiki](https://github.com/Dreamacro/clash/wiki/use-clash-as-a-library)
-
-## Debugging
-Check [wiki](https://github.com/MetaCubeX/Clash.Meta/wiki/How-to-use-debug-api) to get an instruction on using debug API.
-
 
 ## Credits
 
-- [Dreamacro/clash](https://github.com/Dreamacro/clash)
+* [riobard/go-shadowsocks2](https://github.com/riobard/go-shadowsocks2)
-- [SagerNet/sing-box](https://github.com/SagerNet/sing-box)
+* [v2ray/v2ray-core](https://github.com/v2ray/v2ray-core)
-- [riobard/go-shadowsocks2](https://github.com/riobard/go-shadowsocks2)
+* [WireGuard/wireguard-go](https://github.com/WireGuard/wireguard-go)
-- [v2ray/v2ray-core](https://github.com/v2ray/v2ray-core)
-- [WireGuard/wireguard-go](https://github.com/WireGuard/wireguard-go)
-- [yaling888/clash-plus-pro](https://github.com/yaling888/clash)
 
 ## License
 

adapter/adapter.go

@@ -4,20 +4,19 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"github.com/Dreamacro/clash/common/queue"
-	"github.com/Dreamacro/clash/component/dialer"
-	C "github.com/Dreamacro/clash/constant"
 	"net"
 	"net/http"
 	"net/netip"
 	"net/url"
 	"time"
 
+	"github.com/Dreamacro/clash/common/queue"
+	"github.com/Dreamacro/clash/component/dialer"
+	C "github.com/Dreamacro/clash/constant"
+
 	"go.uber.org/atomic"
 )
 
-var UnifiedDelay = atomic.NewBool(false)
-
 type Proxy struct {
 	C.ProxyAdapter
 	history *queue.Queue[C.DelayHistory]
@@ -39,6 +38,7 @@ func (p *Proxy) Dial(metadata *C.Metadata) (C.Conn, error) {
 // DialContext implements C.ProxyAdapter
 func (p *Proxy) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.Conn, error) {
 	conn, err := p.ProxyAdapter.DialContext(ctx, metadata, opts...)
+	p.alive.Store(err == nil)
 	return conn, err
 }
 
@@ -52,6 +52,7 @@ func (p *Proxy) DialUDP(metadata *C.Metadata) (C.PacketConn, error) {
 // ListenPacketContext implements C.ProxyAdapter
 func (p *Proxy) ListenPacketContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.PacketConn, error) {
 	pc, err := p.ProxyAdapter.ListenPacketContext(ctx, metadata, opts...)
+	p.alive.Store(err == nil)
 	return pc, err
 }
 
@@ -92,8 +93,6 @@ func (p *Proxy) MarshalJSON() ([]byte, error) {
 	mapping["history"] = p.DelayHistory()
 	mapping["name"] = p.Name()
 	mapping["udp"] = p.SupportUDP()
-	mapping["xudp"] = p.SupportXUDP()
-	mapping["tfo"] = p.SupportTFO()
 	return json.Marshal(mapping)
 }
 
@@ -112,8 +111,6 @@ func (p *Proxy) URLTest(ctx context.Context, url string) (t uint16, err error) {
 		}
 	}()
 
-	unifiedDelay := UnifiedDelay.Load()
-
 	addr, err := urlToMetadata(url)
 	if err != nil {
 		return
@@ -146,32 +143,18 @@ func (p *Proxy) URLTest(ctx context.Context, url string) (t uint16, err error) {
 	}
 
 	client := http.Client{
-		Timeout:   30 * time.Second,
 		Transport: transport,
 		CheckRedirect: func(req *http.Request, via []*http.Request) error {
 			return http.ErrUseLastResponse
 		},
 	}
-
 	defer client.CloseIdleConnections()
 
 	resp, err := client.Do(req)
-
 	if err != nil {
 		return
 	}
-
 	_ = resp.Body.Close()
-
-	if unifiedDelay {
-		second := time.Now()
-		resp, err = client.Do(req)
-		if err == nil {
-			_ = resp.Body.Close()
-			start = second
-		}
-	}
-
 	t = uint16(time.Since(start) / time.Millisecond)
 	return
 }
@@ -200,6 +183,7 @@ func urlToMetadata(rawURL string) (addr C.Metadata, err error) {
 	}
 
 	addr = C.Metadata{
+		AddrType: C.AtypDomainName,
 		Host:     u.Hostname(),
 		DstIP:    netip.Addr{},
 		DstPort:  port,

adapter/inbound/addition.go

@@ -1,29 +0,0 @@
-package inbound
-
-import (
-	C "github.com/Dreamacro/clash/constant"
-)
-
-type Addition func(metadata *C.Metadata)
-
-func (a Addition) Apply(metadata *C.Metadata) {
-	a(metadata)
-}
-
-func WithInName(name string) Addition {
-	return func(metadata *C.Metadata) {
-		metadata.InName = name
-	}
-}
-
-func WithSpecialRules(specialRules string) Addition {
-	return func(metadata *C.Metadata) {
-		metadata.SpecialRules = specialRules
-	}
-}
-
-func WithSpecialProxy(specialProxy string) Addition {
-	return func(metadata *C.Metadata) {
-		metadata.SpecialProxy = specialProxy
-	}
-}

adapter/inbound/http.go

@@ -9,20 +9,13 @@ import (
 )
 
 // NewHTTP receive normal http request and return HTTPContext
-func NewHTTP(target socks5.Addr, source net.Addr, conn net.Conn, additions ...Addition) *context.ConnContext {
+func NewHTTP(target socks5.Addr, source net.Addr, conn net.Conn) *context.ConnContext {
 	metadata := parseSocksAddr(target)
 	metadata.NetWork = C.TCP
 	metadata.Type = C.HTTP
-	for _, addition := range additions {
+	if ip, port, err := parseAddr(source.String()); err == nil {
-		addition.Apply(metadata)
-	}
-	if ip, port, err := parseAddr(source); err == nil {
 		metadata.SrcIP = ip
 		metadata.SrcPort = port
 	}
-	if ip, port, err := parseAddr(conn.LocalAddr()); err == nil {
-		metadata.InIP = ip
-		metadata.InPort = port
-	}
 	return context.NewConnContext(conn, metadata)
 }

adapter/inbound/https.go

@@ -9,19 +9,12 @@ import (
 )
 
 // NewHTTPS receive CONNECT request and return ConnContext
-func NewHTTPS(request *http.Request, conn net.Conn, additions ...Addition) *context.ConnContext {
+func NewHTTPS(request *http.Request, conn net.Conn) *context.ConnContext {
 	metadata := parseHTTPAddr(request)
-	metadata.Type = C.HTTPS
+	metadata.Type = C.HTTPCONNECT
-	for _, addition := range additions {
+	if ip, port, err := parseAddr(conn.RemoteAddr().String()); err == nil {
-		addition.Apply(metadata)
-	}
-	if ip, port, err := parseAddr(conn.RemoteAddr()); err == nil {
 		metadata.SrcIP = ip
 		metadata.SrcPort = port
 	}
-	if ip, port, err := parseAddr(conn.LocalAddr()); err == nil {
-		metadata.InIP = ip
-		metadata.InPort = port
-	}
 	return context.NewConnContext(conn, metadata)
 }

adapter/inbound/listen.go

@@ -1,26 +0,0 @@
-package inbound
-
-import (
-	"context"
-	"net"
-
-	"github.com/sagernet/tfo-go"
-)
-
-var (
-	lc = tfo.ListenConfig{
-		DisableTFO: true,
-	}
-)
-
-func SetTfo(open bool) {
-	lc.DisableTFO = !open
-}
-
-func ListenContext(ctx context.Context, network, address string) (net.Listener, error) {
-	return lc.Listen(ctx, network, address)
-}
-
-func Listen(network, address string) (net.Listener, error) {
-	return ListenContext(context.Background(), network, address)
-}

adapter/inbound/mitm.go

@@ -0,0 +1,22 @@
+package inbound
+
+import (
+	"net"
+
+	C "github.com/Dreamacro/clash/constant"
+	"github.com/Dreamacro/clash/context"
+	"github.com/Dreamacro/clash/transport/socks5"
+)
+
+// NewMitm receive mitm request and return MitmContext
+func NewMitm(target socks5.Addr, source net.Addr, userAgent string, conn net.Conn) *context.ConnContext {
+	metadata := parseSocksAddr(target)
+	metadata.NetWork = C.TCP
+	metadata.Type = C.MITM
+	metadata.UserAgent = userAgent
+	if ip, port, err := parseAddr(source.String()); err == nil {
+		metadata.SrcIP = ip
+		metadata.SrcPort = port
+	}
+	return context.NewConnContext(conn, metadata)
+}

adapter/inbound/packet.go

@@ -17,26 +17,17 @@ func (s *PacketAdapter) Metadata() *C.Metadata {
 }
 
 // NewPacket is PacketAdapter generator
-func NewPacket(target socks5.Addr, packet C.UDPPacket, source C.Type, additions ...Addition) C.PacketAdapter {
+func NewPacket(target socks5.Addr, packet C.UDPPacket, source C.Type) *PacketAdapter {
 	metadata := parseSocksAddr(target)
 	metadata.NetWork = C.UDP
 	metadata.Type = source
-	for _, addition := range additions {
+	if ip, port, err := parseAddr(packet.LocalAddr().String()); err == nil {
-		addition.Apply(metadata)
-	}
-	if ip, port, err := parseAddr(packet.LocalAddr()); err == nil {
 		metadata.SrcIP = ip
 		metadata.SrcPort = port
 	}
-	if p, ok := packet.(C.UDPPacketInAddr); ok {
-		if ip, port, err := parseAddr(p.InAddr()); err == nil {
-			metadata.InIP = ip
-			metadata.InPort = port
-		}
-	}
 
 	return &PacketAdapter{
-		packet,
+		UDPPacket: packet,
-		metadata,
+		metadata:  metadata,
 	}
 }

adapter/inbound/socket.go

@@ -2,7 +2,6 @@ package inbound
 
 import (
 	"net"
-	"net/netip"
 
 	C "github.com/Dreamacro/clash/constant"
 	"github.com/Dreamacro/clash/context"
@@ -10,41 +9,14 @@ import (
 )
 
 // NewSocket receive TCP inbound and return ConnContext
-func NewSocket(target socks5.Addr, conn net.Conn, source C.Type, additions ...Addition) *context.ConnContext {
+func NewSocket(target socks5.Addr, conn net.Conn, source C.Type) *context.ConnContext {
 	metadata := parseSocksAddr(target)
 	metadata.NetWork = C.TCP
 	metadata.Type = source
-	for _, addition := range additions {
+	if ip, port, err := parseAddr(conn.RemoteAddr().String()); err == nil {
-		addition.Apply(metadata)
-	}
-
-	if ip, port, err := parseAddr(conn.RemoteAddr()); err == nil {
 		metadata.SrcIP = ip
 		metadata.SrcPort = port
 	}
-	if ip, port, err := parseAddr(conn.LocalAddr()); err == nil {
-		metadata.InIP = ip
-		metadata.InPort = port
-	}
-
-	return context.NewConnContext(conn, metadata)
-}
-
-func NewInner(conn net.Conn, dst string, host string) *context.ConnContext {
-	metadata := &C.Metadata{}
-	metadata.NetWork = C.TCP
-	metadata.Type = C.INNER
-	metadata.DNSMode = C.DNSNormal
-	metadata.Host = host
-	metadata.Process = C.ClashName
-	if h, port, err := net.SplitHostPort(dst); err == nil {
-		metadata.DstPort = port
-		if host == "" {
-			if ip, err := netip.ParseAddr(h); err == nil {
-				metadata.DstIP = ip
-			}
-		}
-	}
 
 	return context.NewConnContext(conn, metadata)
 }

adapter/inbound/util.go

@@ -1,7 +1,6 @@
 package inbound
 
 import (
-	"errors"
 	"net"
 	"net/http"
 	"net/netip"
@@ -14,7 +13,9 @@ import (
 )
 
 func parseSocksAddr(target socks5.Addr) *C.Metadata {
-	metadata := &C.Metadata{}
+	metadata := &C.Metadata{
+		AddrType: int(target[0]),
+	}
 
 	switch target[0] {
 	case socks5.AtypDomainName:
@@ -25,8 +26,7 @@ func parseSocksAddr(target socks5.Addr) *C.Metadata {
 		metadata.DstIP = nnip.IpToAddr(net.IP(target[1 : 1+net.IPv4len]))
 		metadata.DstPort = strconv.Itoa((int(target[1+net.IPv4len]) << 8) | int(target[1+net.IPv4len+1]))
 	case socks5.AtypIPv6:
-		ip6, _ := netip.AddrFromSlice(target[1 : 1+net.IPv6len])
+		metadata.DstIP = nnip.IpToAddr(net.IP(target[1 : 1+net.IPv6len]))
-		metadata.DstIP = ip6.Unmap()
 		metadata.DstPort = strconv.Itoa((int(target[1+net.IPv6len]) << 8) | int(target[1+net.IPv6len+1]))
 	}
 
@@ -45,6 +45,7 @@ func parseHTTPAddr(request *http.Request) *C.Metadata {
 
 	metadata := &C.Metadata{
 		NetWork:  C.TCP,
+		AddrType: C.AtypDomainName,
 		Host:     host,
 		DstIP:    netip.Addr{},
 		DstPort:  port,
@@ -52,25 +53,20 @@ func parseHTTPAddr(request *http.Request) *C.Metadata {
 
 	ip, err := netip.ParseAddr(host)
 	if err == nil {
+		switch {
+		case ip.Is6():
+			metadata.AddrType = C.AtypIPv6
+		default:
+			metadata.AddrType = C.AtypIPv4
+		}
 		metadata.DstIP = ip
 	}
 
 	return metadata
 }
 
-func parseAddr(addr net.Addr) (netip.Addr, string, error) {
+func parseAddr(addr string) (netip.Addr, string, error) {
-	// Filter when net.Addr interface is nil
+	host, port, err := net.SplitHostPort(addr)
-	if addr == nil {
-		return netip.Addr{}, "", errors.New("nil addr")
-	}
-	if rawAddr, ok := addr.(interface{ RawAddr() net.Addr }); ok {
-		ip, port, err := parseAddr(rawAddr.RawAddr())
-		if err == nil {
-			return ip, port, err
-		}
-	}
-	addrStr := addr.String()
-	host, port, err := net.SplitHostPort(addrStr)
 	if err != nil {
 		return netip.Addr{}, "", err
 	}

adapter/outbound/base.go

@@ -4,14 +4,11 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
+	"io"
 	"net"
-	"strings"
 
-	N "github.com/Dreamacro/clash/common/net"
 	"github.com/Dreamacro/clash/component/dialer"
 	C "github.com/Dreamacro/clash/constant"
-
-	"github.com/gofrs/uuid"
 )
 
 type Base struct {
@@ -20,11 +17,7 @@ type Base struct {
 	iface string
 	tp    C.AdapterType
 	udp   bool
-	xudp   bool
-	tfo    bool
 	rmark int
-	id     string
-	prefer C.DNSPrefer
 }
 
 // Name implements C.ProxyAdapter
@@ -32,79 +25,35 @@ func (b *Base) Name() string {
 	return b.name
 }
 
-// Id implements C.ProxyAdapter
-func (b *Base) Id() string {
-	if b.id == "" {
-		id, err := uuid.NewV6()
-		if err != nil {
-			b.id = b.name
-		} else {
-			b.id = id.String()
-		}
-	}
-
-	return b.id
-}
-
 // Type implements C.ProxyAdapter
 func (b *Base) Type() C.AdapterType {
 	return b.tp
 }
 
 // StreamConn implements C.ProxyAdapter
-func (b *Base) StreamConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) {
+func (b *Base) StreamConn(c net.Conn, _ *C.Metadata) (net.Conn, error) {
 	return c, errors.New("no support")
 }
 
-func (b *Base) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.Conn, error) {
+// StreamPacketConn implements C.ProxyAdapter
-	return nil, errors.New("no support")
+func (b *Base) StreamPacketConn(c net.Conn, _ *C.Metadata) (net.Conn, error) {
-}
+	return c, errors.New("no support")
-
-// DialContextWithDialer implements C.ProxyAdapter
-func (b *Base) DialContextWithDialer(ctx context.Context, dialer C.Dialer, metadata *C.Metadata) (_ C.Conn, err error) {
-	return nil, errors.New("no support")
 }
 
 // ListenPacketContext implements C.ProxyAdapter
-func (b *Base) ListenPacketContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.PacketConn, error) {
+func (b *Base) ListenPacketContext(_ context.Context, _ *C.Metadata, _ ...dialer.Option) (C.PacketConn, error) {
 	return nil, errors.New("no support")
 }
 
-// ListenPacketWithDialer implements C.ProxyAdapter
-func (b *Base) ListenPacketWithDialer(ctx context.Context, dialer C.Dialer, metadata *C.Metadata) (_ C.PacketConn, err error) {
-	return nil, errors.New("no support")
-}
-
-// SupportWithDialer implements C.ProxyAdapter
-func (b *Base) SupportWithDialer() bool {
-	return false
-}
-
-// SupportUOT implements C.ProxyAdapter
-func (b *Base) SupportUOT() bool {
-	return false
-}
-
 // SupportUDP implements C.ProxyAdapter
 func (b *Base) SupportUDP() bool {
 	return b.udp
 }
 
-// SupportXUDP implements C.ProxyAdapter
-func (b *Base) SupportXUDP() bool {
-	return b.xudp
-}
-
-// SupportTFO implements C.ProxyAdapter
-func (b *Base) SupportTFO() bool {
-	return b.tfo
-}
-
 // MarshalJSON implements C.ProxyAdapter
 func (b *Base) MarshalJSON() ([]byte, error) {
 	return json.Marshal(map[string]string{
 		"type": b.Type().String(),
-		"id":   b.Id(),
 	})
 }
 
@@ -114,7 +63,7 @@ func (b *Base) Addr() string {
 }
 
 // Unwrap implements C.ProxyAdapter
-func (b *Base) Unwrap(metadata *C.Metadata, touch bool) C.Proxy {
+func (b *Base) Unwrap(_ *C.Metadata) C.Proxy {
 	return nil
 }
 
@@ -128,30 +77,12 @@ func (b *Base) DialOptions(opts ...dialer.Option) []dialer.Option {
 		opts = append(opts, dialer.WithRoutingMark(b.rmark))
 	}
 
-	switch b.prefer {
-	case C.IPv4Only:
-		opts = append(opts, dialer.WithOnlySingleStack(true))
-	case C.IPv6Only:
-		opts = append(opts, dialer.WithOnlySingleStack(false))
-	case C.IPv4Prefer:
-		opts = append(opts, dialer.WithPreferIPv4())
-	case C.IPv6Prefer:
-		opts = append(opts, dialer.WithPreferIPv6())
-	default:
-	}
-
-	if b.tfo {
-		opts = append(opts, dialer.WithTFO(true))
-	}
-
 	return opts
 }
 
 type BasicOption struct {
-	TFO         bool   `proxy:"tfo,omitempty" group:"tfo,omitempty"`
 	Interface   string `proxy:"interface-name,omitempty" group:"interface-name,omitempty"`
 	RoutingMark int    `proxy:"routing-mark,omitempty" group:"routing-mark,omitempty"`
-	IPVersion   string `proxy:"ip-version,omitempty" group:"ip-version,omitempty"`
 }
 
 type BaseOption struct {
@@ -159,11 +90,8 @@ type BaseOption struct {
 	Addr        string
 	Type        C.AdapterType
 	UDP         bool
-	XUDP        bool
-	TFO         bool
 	Interface   string
 	RoutingMark int
-	Prefer      C.DNSPrefer
 }
 
 func NewBase(opt BaseOption) *Base {
@@ -172,22 +100,14 @@ func NewBase(opt BaseOption) *Base {
 		addr:  opt.Addr,
 		tp:    opt.Type,
 		udp:   opt.UDP,
-		xudp:   opt.XUDP,
-		tfo:    opt.TFO,
 		iface: opt.Interface,
 		rmark: opt.RoutingMark,
-		prefer: opt.Prefer,
 	}
 }
 
 type conn struct {
-	N.ExtendedConn
+	net.Conn
 	chain C.Chain
-	actualRemoteDestination string
-}
-
-func (c *conn) RemoteDestination() string {
-	return c.actualRemoteDestination
 }
 
 // Chains implements C.Connection
@@ -200,22 +120,13 @@ func (c *conn) AppendToChains(a C.ProxyAdapter) {
 	c.chain = append(c.chain, a.Name())
 }
 
-func (c *conn) Upstream() any {
-	return c.ExtendedConn
-}
-
 func NewConn(c net.Conn, a C.ProxyAdapter) C.Conn {
-	return &conn{N.NewExtendedConn(c), []string{a.Name()}, parseRemoteDestination(a.Addr())}
+	return &conn{c, []string{a.Name()}}
 }
 
 type packetConn struct {
 	net.PacketConn
 	chain C.Chain
-	actualRemoteDestination string
-}
-
-func (c *packetConn) RemoteDestination() string {
-	return c.actualRemoteDestination
 }
 
 // Chains implements C.Connection
@@ -228,18 +139,40 @@ func (c *packetConn) AppendToChains(a C.ProxyAdapter) {
 	c.chain = append(c.chain, a.Name())
 }
 
-func newPacketConn(pc net.PacketConn, a C.ProxyAdapter) C.PacketConn {
+func NewPacketConn(pc net.PacketConn, a C.ProxyAdapter) C.PacketConn {
-	return &packetConn{pc, []string{a.Name()}, parseRemoteDestination(a.Addr())}
+	return &packetConn{pc, []string{a.Name()}}
 }
 
-func parseRemoteDestination(addr string) string {
+type wrapConn struct {
-	if dst, _, err := net.SplitHostPort(addr); err == nil {
+	net.PacketConn
-		return dst
+}
-	} else {
+
-		if addrError, ok := err.(*net.AddrError); ok && strings.Contains(addrError.Err, "missing port") {
+func (*wrapConn) Read([]byte) (int, error) {
-			return dst
+	return 0, io.EOF
-		} else {
+}
-			return ""
+
-		}
+func (*wrapConn) Write([]byte) (int, error) {
+	return 0, io.EOF
+}
+
+func (*wrapConn) RemoteAddr() net.Addr {
+	return nil
+}
+
+func WrapConn(packetConn net.PacketConn) net.Conn {
+	return &wrapConn{
+		PacketConn: packetConn,
 	}
 }
+
+func IsPacketConn(c net.Conn) bool {
+	if _, ok := c.(net.PacketConn); !ok {
+		return false
+	}
+
+	if ua, ok := c.LocalAddr().(*net.UnixAddr); ok {
+		return ua.Net == "unixgram"
+	}
+
+	return true
+}

adapter/outbound/direct.go

@@ -3,9 +3,9 @@ package outbound
 import (
 	"context"
 	"net"
+	"net/netip"
 
 	"github.com/Dreamacro/clash/component/dialer"
-	"github.com/Dreamacro/clash/component/resolver"
 	C "github.com/Dreamacro/clash/constant"
 )
 
@@ -15,23 +15,31 @@ type Direct struct {
 
 // DialContext implements C.ProxyAdapter
 func (d *Direct) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.Conn, error) {
-	opts = append(opts, dialer.WithResolver(resolver.DefaultResolver))
+	opts = append(opts, dialer.WithDirect())
 	c, err := dialer.DialContext(ctx, "tcp", metadata.RemoteAddress(), d.Base.DialOptions(opts...)...)
 	if err != nil {
 		return nil, err
 	}
+
 	tcpKeepAlive(c)
+
+	if !metadata.Resolved() && c.RemoteAddr() != nil {
+		if h, _, err := net.SplitHostPort(c.RemoteAddr().String()); err == nil {
+			metadata.DstIP = netip.MustParseAddr(h)
+		}
+	}
+
 	return NewConn(c, d), nil
 }
 
 // ListenPacketContext implements C.ProxyAdapter
-func (d *Direct) ListenPacketContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.PacketConn, error) {
+func (d *Direct) ListenPacketContext(ctx context.Context, _ *C.Metadata, opts ...dialer.Option) (C.PacketConn, error) {
-	opts = append(opts, dialer.WithResolver(resolver.DefaultResolver))
+	opts = append(opts, dialer.WithDirect())
-	pc, err := dialer.ListenPacket(ctx, dialer.ParseNetwork("udp", metadata.DstIP), "", d.Base.DialOptions(opts...)...)
+	pc, err := dialer.ListenPacket(ctx, "udp", "", d.Base.DialOptions(opts...)...)
 	if err != nil {
 		return nil, err
 	}
-	return newPacketConn(&directPacketConn{pc}, d), nil
+	return NewPacketConn(&directPacketConn{pc}, d), nil
 }
 
 type directPacketConn struct {
@@ -44,18 +52,6 @@ func NewDirect() *Direct {
 			name: "DIRECT",
 			tp:   C.Direct,
 			udp:  true,
-			prefer: C.DualStack,
-		},
-	}
-}
-
-func NewCompatible() *Direct {
-	return &Direct{
-		Base: &Base{
-			name:   "COMPATIBLE",
-			tp:     C.Compatible,
-			udp:    true,
-			prefer: C.DualStack,
 		},
 	}
 }

adapter/outbound/http.go

@@ -14,7 +14,6 @@ import (
 	"strconv"
 
 	"github.com/Dreamacro/clash/component/dialer"
-	tlsC "github.com/Dreamacro/clash/component/tls"
 	C "github.com/Dreamacro/clash/constant"
 )
 
@@ -23,7 +22,6 @@ type Http struct {
 	user      string
 	pass      string
 	tlsConfig *tls.Config
-	option    *HttpOption
 }
 
 type HttpOption struct {
@@ -36,17 +34,13 @@ type HttpOption struct {
 	TLS            bool   `proxy:"tls,omitempty"`
 	SNI            string `proxy:"sni,omitempty"`
 	SkipCertVerify bool   `proxy:"skip-cert-verify,omitempty"`
-	Fingerprint    string            `proxy:"fingerprint,omitempty"`
-	Headers        map[string]string `proxy:"headers,omitempty"`
 }
 
 // StreamConn implements C.ProxyAdapter
 func (h *Http) StreamConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) {
 	if h.tlsConfig != nil {
 		cc := tls.Client(c, h.tlsConfig)
-		ctx, cancel := context.WithTimeout(context.Background(), C.DefaultTLSTimeout)
+		err := cc.Handshake()
-		defer cancel()
-		err := cc.HandshakeContext(ctx)
 		c = cc
 		if err != nil {
 			return nil, fmt.Errorf("%s connect error: %w", h.addr, err)
@@ -61,20 +55,13 @@ func (h *Http) StreamConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) {
 
 // DialContext implements C.ProxyAdapter
 func (h *Http) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (_ C.Conn, err error) {
-	return h.DialContextWithDialer(ctx, dialer.NewDialer(h.Base.DialOptions(opts...)...), metadata)
+	c, err := dialer.DialContext(ctx, "tcp", h.addr, h.Base.DialOptions(opts...)...)
-}
-
-// DialContextWithDialer implements C.ProxyAdapter
-func (h *Http) DialContextWithDialer(ctx context.Context, dialer C.Dialer, metadata *C.Metadata) (_ C.Conn, err error) {
-	c, err := dialer.DialContext(ctx, "tcp", h.addr)
 	if err != nil {
 		return nil, fmt.Errorf("%s connect error: %w", h.addr, err)
 	}
 	tcpKeepAlive(c)
 
-	defer func(c net.Conn) {
+	defer safeConnClose(c, err)
-		safeConnClose(c, err)
-	}(c)
 
 	c, err = h.StreamConn(c, metadata)
 	if err != nil {
@@ -84,11 +71,6 @@ func (h *Http) DialContextWithDialer(ctx context.Context, dialer C.Dialer, metad
 	return NewConn(c, h), nil
 }
 
-// SupportWithDialer implements C.ProxyAdapter
-func (h *Http) SupportWithDialer() bool {
-	return true
-}
-
 func (h *Http) shakeHand(metadata *C.Metadata, rw io.ReadWriter) error {
 	addr := metadata.RemoteAddress()
 	req := &http.Request{
@@ -102,18 +84,15 @@ func (h *Http) shakeHand(metadata *C.Metadata, rw io.ReadWriter) error {
 		},
 	}
 
-	//增加headers
-	if len(h.option.Headers) != 0 {
-		for key, value := range h.option.Headers {
-			req.Header.Add(key, value)
-		}
-	}
-
 	if h.user != "" && h.pass != "" {
 		auth := h.user + ":" + h.pass
 		req.Header.Add("Proxy-Authorization", "Basic "+base64.StdEncoding.EncodeToString([]byte(auth)))
 	}
 
+	if metadata.Type == C.MITM {
+		req.Header.Set("Origin-Request-Source-Address", metadata.SourceAddress())
+	}
+
 	if err := req.Write(rw); err != nil {
 		return err
 	}
@@ -142,26 +121,16 @@ func (h *Http) shakeHand(metadata *C.Metadata, rw io.ReadWriter) error {
 	return fmt.Errorf("can not connect remote err code: %d", resp.StatusCode)
 }
 
-func NewHttp(option HttpOption) (*Http, error) {
+func NewHttp(option HttpOption) *Http {
 	var tlsConfig *tls.Config
 	if option.TLS {
 		sni := option.Server
 		if option.SNI != "" {
 			sni = option.SNI
 		}
-		if len(option.Fingerprint) == 0 {
+		tlsConfig = &tls.Config{
-			tlsConfig = tlsC.GetGlobalTLSConfig(&tls.Config{
 			InsecureSkipVerify: option.SkipCertVerify,
 			ServerName:         sni,
-			})
-		} else {
-			var err error
-			if tlsConfig, err = tlsC.GetSpecifiedFingerprintTLSConfig(&tls.Config{
-				InsecureSkipVerify: option.SkipCertVerify,
-				ServerName:         sni,
-			}, option.Fingerprint); err != nil {
-				return nil, err
-			}
 		}
 	}
 
@@ -170,14 +139,11 @@ func NewHttp(option HttpOption) (*Http, error) {
 			name:  option.Name,
 			addr:  net.JoinHostPort(option.Server, strconv.Itoa(option.Port)),
 			tp:    C.Http,
-			tfo:    option.TFO,
 			iface: option.Interface,
 			rmark: option.RoutingMark,
-			prefer: C.NewDNSPrefer(option.IPVersion),
 		},
 		user:      option.UserName,
 		pass:      option.Password,
 		tlsConfig: tlsConfig,
-		option:    &option,
+	}
-	}, nil
 }

adapter/outbound/hysteria.go

@@ -1,344 +0,0 @@
-package outbound
-
-import (
-	"context"
-	"crypto/sha256"
-	"crypto/tls"
-	"encoding/base64"
-	"encoding/hex"
-	"encoding/pem"
-	"fmt"
-	"net"
-	"net/netip"
-	"os"
-	"regexp"
-	"strconv"
-	"time"
-
-	"github.com/metacubex/quic-go"
-	"github.com/metacubex/quic-go/congestion"
-	M "github.com/sagernet/sing/common/metadata"
-
-	"github.com/Dreamacro/clash/component/dialer"
-	tlsC "github.com/Dreamacro/clash/component/tls"
-	C "github.com/Dreamacro/clash/constant"
-	"github.com/Dreamacro/clash/log"
-	hyCongestion "github.com/Dreamacro/clash/transport/hysteria/congestion"
-	"github.com/Dreamacro/clash/transport/hysteria/core"
-	"github.com/Dreamacro/clash/transport/hysteria/obfs"
-	"github.com/Dreamacro/clash/transport/hysteria/pmtud_fix"
-	"github.com/Dreamacro/clash/transport/hysteria/transport"
-)
-
-const (
-	mbpsToBps = 125000
-
-	DefaultStreamReceiveWindow     = 15728640 // 15 MB/s
-	DefaultConnectionReceiveWindow = 67108864 // 64 MB/s
-
-	DefaultALPN        = "hysteria"
-	DefaultProtocol    = "udp"
-	DefaultHopInterval = 10
-)
-
-var rateStringRegexp = regexp.MustCompile(`^(\d+)\s*([KMGT]?)([Bb])ps$`)
-
-type Hysteria struct {
-	*Base
-
-	client *core.Client
-}
-
-func (h *Hysteria) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.Conn, error) {
-	hdc := hyDialerWithContext{
-		ctx: context.Background(),
-		hyDialer: func(network string) (net.PacketConn, error) {
-			return dialer.ListenPacket(ctx, network, "", h.Base.DialOptions(opts...)...)
-		},
-		remoteAddr: func(addr string) (net.Addr, error) {
-			return resolveUDPAddrWithPrefer(ctx, "udp", addr, h.prefer)
-		},
-	}
-
-	tcpConn, err := h.client.DialTCP(metadata.RemoteAddress(), &hdc)
-	if err != nil {
-		return nil, err
-	}
-
-	return NewConn(tcpConn, h), nil
-}
-
-func (h *Hysteria) ListenPacketContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.PacketConn, error) {
-	hdc := hyDialerWithContext{
-		ctx: context.Background(),
-		hyDialer: func(network string) (net.PacketConn, error) {
-			return dialer.ListenPacket(ctx, network, "", h.Base.DialOptions(opts...)...)
-		},
-		remoteAddr: func(addr string) (net.Addr, error) {
-			return resolveUDPAddrWithPrefer(ctx, "udp", addr, h.prefer)
-		},
-	}
-	udpConn, err := h.client.DialUDP(&hdc)
-	if err != nil {
-		return nil, err
-	}
-	return newPacketConn(&hyPacketConn{udpConn}, h), nil
-}
-
-type HysteriaOption struct {
-	BasicOption
-	Name                string   `proxy:"name"`
-	Server              string   `proxy:"server"`
-	Port                int      `proxy:"port,omitempty"`
-	Ports               string   `proxy:"ports,omitempty"`
-	Protocol            string   `proxy:"protocol,omitempty"`
-	ObfsProtocol        string   `proxy:"obfs-protocol,omitempty"` // compatible with Stash
-	Up                  string   `proxy:"up"`
-	UpSpeed             int      `proxy:"up-speed,omitempty"` // compatible with Stash
-	Down                string   `proxy:"down"`
-	DownSpeed           int      `proxy:"down-speed,omitempty"` // compatible with Stash
-	Auth                string   `proxy:"auth,omitempty"`
-	AuthString          string   `proxy:"auth-str,omitempty"`
-	Obfs                string   `proxy:"obfs,omitempty"`
-	SNI                 string   `proxy:"sni,omitempty"`
-	SkipCertVerify      bool     `proxy:"skip-cert-verify,omitempty"`
-	Fingerprint         string   `proxy:"fingerprint,omitempty"`
-	ALPN                []string `proxy:"alpn,omitempty"`
-	CustomCA            string   `proxy:"ca,omitempty"`
-	CustomCAString      string   `proxy:"ca-str,omitempty"`
-	ReceiveWindowConn   int      `proxy:"recv-window-conn,omitempty"`
-	ReceiveWindow       int      `proxy:"recv-window,omitempty"`
-	DisableMTUDiscovery bool     `proxy:"disable-mtu-discovery,omitempty"`
-	FastOpen            bool     `proxy:"fast-open,omitempty"`
-	HopInterval         int      `proxy:"hop-interval,omitempty"`
-}
-
-func (c *HysteriaOption) Speed() (uint64, uint64, error) {
-	var up, down uint64
-	up = stringToBps(c.Up)
-	if up == 0 {
-		return 0, 0, fmt.Errorf("invaild upload speed: %s", c.Up)
-	}
-
-	down = stringToBps(c.Down)
-	if down == 0 {
-		return 0, 0, fmt.Errorf("invaild download speed: %s", c.Down)
-	}
-
-	return up, down, nil
-}
-
-func NewHysteria(option HysteriaOption) (*Hysteria, error) {
-	clientTransport := &transport.ClientTransport{
-		Dialer: &net.Dialer{
-			Timeout: 8 * time.Second,
-		},
-	}
-	addr := net.JoinHostPort(option.Server, strconv.Itoa(option.Port))
-	ports := option.Ports
-
-	serverName := option.Server
-	if option.SNI != "" {
-		serverName = option.SNI
-	}
-
-	tlsConfig := &tls.Config{
-		ServerName:         serverName,
-		InsecureSkipVerify: option.SkipCertVerify,
-		MinVersion:         tls.VersionTLS13,
-	}
-
-	var bs []byte
-	var err error
-	if len(option.CustomCA) > 0 {
-		bs, err = os.ReadFile(option.CustomCA)
-		if err != nil {
-			return nil, fmt.Errorf("hysteria %s load ca error: %w", addr, err)
-		}
-	} else if option.CustomCAString != "" {
-		bs = []byte(option.CustomCAString)
-	}
-
-	if len(bs) > 0 {
-		block, _ := pem.Decode(bs)
-		if block == nil {
-			return nil, fmt.Errorf("CA cert is not PEM")
-		}
-
-		fpBytes := sha256.Sum256(block.Bytes)
-		if len(option.Fingerprint) == 0 {
-			option.Fingerprint = hex.EncodeToString(fpBytes[:])
-		}
-	}
-
-	if len(option.Fingerprint) != 0 {
-		var err error
-		tlsConfig, err = tlsC.GetSpecifiedFingerprintTLSConfig(tlsConfig, option.Fingerprint)
-		if err != nil {
-			return nil, err
-		}
-	} else {
-		tlsConfig = tlsC.GetGlobalTLSConfig(tlsConfig)
-	}
-
-	if len(option.ALPN) > 0 {
-		tlsConfig.NextProtos = option.ALPN
-	} else {
-		tlsConfig.NextProtos = []string{DefaultALPN}
-	}
-	quicConfig := &quic.Config{
-		InitialStreamReceiveWindow:     uint64(option.ReceiveWindowConn),
-		MaxStreamReceiveWindow:         uint64(option.ReceiveWindowConn),
-		InitialConnectionReceiveWindow: uint64(option.ReceiveWindow),
-		MaxConnectionReceiveWindow:     uint64(option.ReceiveWindow),
-		KeepAlivePeriod:                10 * time.Second,
-		DisablePathMTUDiscovery:        option.DisableMTUDiscovery,
-		EnableDatagrams:                true,
-	}
-	if option.ObfsProtocol != "" {
-		option.Protocol = option.ObfsProtocol
-	}
-	if option.Protocol == "" {
-		option.Protocol = DefaultProtocol
-	}
-	if option.HopInterval == 0 {
-		option.HopInterval = DefaultHopInterval
-	}
-	hopInterval := time.Duration(int64(option.HopInterval)) * time.Second
-	if option.ReceiveWindow == 0 {
-		quicConfig.InitialStreamReceiveWindow = DefaultStreamReceiveWindow / 10
-		quicConfig.MaxStreamReceiveWindow = DefaultStreamReceiveWindow
-	}
-	if option.ReceiveWindow == 0 {
-		quicConfig.InitialConnectionReceiveWindow = DefaultConnectionReceiveWindow / 10
-		quicConfig.MaxConnectionReceiveWindow = DefaultConnectionReceiveWindow
-	}
-	if !quicConfig.DisablePathMTUDiscovery && pmtud_fix.DisablePathMTUDiscovery {
-		log.Infoln("hysteria: Path MTU Discovery is not yet supported on this platform")
-	}
-
-	var auth = []byte(option.AuthString)
-	if option.Auth != "" {
-		auth, err = base64.StdEncoding.DecodeString(option.Auth)
-		if err != nil {
-			return nil, err
-		}
-	}
-	var obfuscator obfs.Obfuscator
-	if len(option.Obfs) > 0 {
-		obfuscator = obfs.NewXPlusObfuscator([]byte(option.Obfs))
-	}
-
-	up, down, err := option.Speed()
-	if err != nil {
-		return nil, err
-	}
-	if option.UpSpeed != 0 {
-		up = uint64(option.UpSpeed * mbpsToBps)
-	}
-	if option.DownSpeed != 0 {
-		down = uint64(option.DownSpeed * mbpsToBps)
-	}
-	client, err := core.NewClient(
-		addr, ports, option.Protocol, auth, tlsConfig, quicConfig, clientTransport, up, down, func(refBPS uint64) congestion.CongestionControl {
-			return hyCongestion.NewBrutalSender(congestion.ByteCount(refBPS))
-		}, obfuscator, hopInterval, option.FastOpen,
-	)
-	if err != nil {
-		return nil, fmt.Errorf("hysteria %s create error: %w", addr, err)
-	}
-	return &Hysteria{
-		Base: &Base{
-			name:   option.Name,
-			addr:   addr,
-			tp:     C.Hysteria,
-			udp:    true,
-			tfo:    option.FastOpen,
-			iface:  option.Interface,
-			rmark:  option.RoutingMark,
-			prefer: C.NewDNSPrefer(option.IPVersion),
-		},
-		client: client,
-	}, nil
-}
-
-func stringToBps(s string) uint64 {
-	if s == "" {
-		return 0
-	}
-
-	// when have not unit, use Mbps
-	if v, err := strconv.Atoi(s); err == nil {
-		return stringToBps(fmt.Sprintf("%d Mbps", v))
-	}
-
-	m := rateStringRegexp.FindStringSubmatch(s)
-	if m == nil {
-		return 0
-	}
-	var n uint64
-	switch m[2] {
-	case "K":
-		n = 1 << 10
-	case "M":
-		n = 1 << 20
-	case "G":
-		n = 1 << 30
-	case "T":
-		n = 1 << 40
-	default:
-		n = 1
-	}
-	v, _ := strconv.ParseUint(m[1], 10, 64)
-	n = v * n
-	if m[3] == "b" {
-		// Bits, need to convert to bytes
-		n = n >> 3
-	}
-	return n
-}
-
-type hyPacketConn struct {
-	core.UDPConn
-}
-
-func (c *hyPacketConn) ReadFrom(p []byte) (n int, addr net.Addr, err error) {
-	b, addrStr, err := c.UDPConn.ReadFrom()
-	if err != nil {
-		return
-	}
-	n = copy(p, b)
-	addr = M.ParseSocksaddr(addrStr).UDPAddr()
-	return
-}
-
-func (c *hyPacketConn) WriteTo(p []byte, addr net.Addr) (n int, err error) {
-	err = c.UDPConn.WriteTo(p, M.SocksaddrFromNet(addr).String())
-	if err != nil {
-		return
-	}
-	n = len(p)
-	return
-}
-
-type hyDialerWithContext struct {
-	hyDialer   func(network string) (net.PacketConn, error)
-	ctx        context.Context
-	remoteAddr func(host string) (net.Addr, error)
-}
-
-func (h *hyDialerWithContext) ListenPacket(rAddr net.Addr) (net.PacketConn, error) {
-	network := "udp"
-	if addrPort, err := netip.ParseAddrPort(rAddr.String()); err == nil {
-		network = dialer.ParseNetwork(network, addrPort.Addr())
-	}
-	return h.hyDialer(network)
-}
-
-func (h *hyDialerWithContext) Context() context.Context {
-	return h.ctx
-}
-
-func (h *hyDialerWithContext) RemoteAddr(host string) (net.Addr, error) {
-	return h.remoteAddr(host)
-}

adapter/outbound/mitm.go

@@ -0,0 +1,50 @@
+package outbound
+
+import (
+	"context"
+	"net"
+	"time"
+
+	"github.com/Dreamacro/clash/component/dialer"
+	C "github.com/Dreamacro/clash/constant"
+)
+
+type Mitm struct {
+	*Base
+	serverAddr      *net.TCPAddr
+	httpProxyClient *Http
+}
+
+// DialContext implements C.ProxyAdapter
+func (m *Mitm) DialContext(_ context.Context, metadata *C.Metadata, _ ...dialer.Option) (C.Conn, error) {
+	c, err := net.DialTCP("tcp", nil, m.serverAddr)
+	if err != nil {
+		return nil, err
+	}
+
+	_ = c.SetKeepAlive(true)
+	_ = c.SetKeepAlivePeriod(60 * time.Second)
+	_ = c.SetLinger(0)
+
+	metadata.Type = C.MITM
+
+	hc, err := m.httpProxyClient.StreamConn(c, metadata)
+	if err != nil {
+		_ = c.Close()
+		return nil, err
+	}
+
+	return NewConn(hc, m), nil
+}
+
+func NewMitm(serverAddr string) *Mitm {
+	tcpAddr, _ := net.ResolveTCPAddr("tcp", serverAddr)
+	return &Mitm{
+		Base: &Base{
+			name: "Mitm",
+			tp:   C.Mitm,
+		},
+		serverAddr:      tcpAddr,
+		httpProxyClient: NewHttp(HttpOption{}),
+	}
+}

adapter/outbound/reject.go

@@ -6,22 +6,49 @@ import (
 	"net"
 	"time"
 
+	"github.com/Dreamacro/clash/common/cache"
 	"github.com/Dreamacro/clash/component/dialer"
 	C "github.com/Dreamacro/clash/constant"
 )
 
+const (
+	rejectCountLimit = 50
+	rejectDelay      = time.Second * 35
+)
+
+var rejectCounter = cache.NewLRUCache[string, int](cache.WithAge[string, int](15), cache.WithStale[string, int](false), cache.WithSize[string, int](512))
+
 type Reject struct {
 	*Base
 }
 
 // DialContext implements C.ProxyAdapter
 func (r *Reject) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.Conn, error) {
+	key := metadata.RemoteAddress()
+
+	count, existed := rejectCounter.Get(key)
+	if !existed {
+		count = 0
+	}
+
+	count = count + 1
+
+	rejectCounter.Set(key, count)
+
+	if count > rejectCountLimit {
+		c, _ := net.Pipe()
+
+		_ = c.SetDeadline(time.Now().Add(rejectDelay))
+
+		return NewConn(c, r), nil
+	}
+
 	return NewConn(&nopConn{}, r), nil
 }
 
 // ListenPacketContext implements C.ProxyAdapter
 func (r *Reject) ListenPacketContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.PacketConn, error) {
-	return newPacketConn(&nopPacketConn{}, r), nil
+	return NewPacketConn(&nopPacketConn{}, r), nil
 }
 
 func NewReject() *Reject {
@@ -30,18 +57,6 @@ func NewReject() *Reject {
 			name: "REJECT",
 			tp:   C.Reject,
 			udp:  true,
-			prefer: C.DualStack,
-		},
-	}
-}
-
-func NewPass() *Reject {
-	return &Reject{
-		Base: &Base{
-			name:   "PASS",
-			tp:     C.Pass,
-			udp:    true,
-			prefer: C.DualStack,
 		},
 	}
 }
@@ -53,9 +68,6 @@ func (rw *nopConn) Read(b []byte) (int, error) {
 }
 
 func (rw *nopConn) Write(b []byte) (int, error) {
-	if len(b) == 0 {
-		return 0, nil
-	}
 	return 0, io.EOF
 }
 

adapter/outbound/shadowsocks.go

@@ -10,28 +10,20 @@ import (
 	"github.com/Dreamacro/clash/common/structure"
 	"github.com/Dreamacro/clash/component/dialer"
 	C "github.com/Dreamacro/clash/constant"
+	"github.com/Dreamacro/clash/transport/shadowsocks/core"
 	obfs "github.com/Dreamacro/clash/transport/simple-obfs"
-	shadowtls "github.com/Dreamacro/clash/transport/sing-shadowtls"
 	"github.com/Dreamacro/clash/transport/socks5"
 	v2rayObfs "github.com/Dreamacro/clash/transport/v2ray-plugin"
-
-	shadowsocks "github.com/metacubex/sing-shadowsocks"
-	"github.com/metacubex/sing-shadowsocks/shadowimpl"
-	"github.com/sagernet/sing/common/bufio"
-	M "github.com/sagernet/sing/common/metadata"
-	"github.com/sagernet/sing/common/uot"
 )
 
 type ShadowSocks struct {
 	*Base
-	method shadowsocks.Method
+	cipher core.Cipher
 
-	option *ShadowSocksOption
 	// obfs
 	obfsMode    string
 	obfsOption  *simpleObfsOption
 	v2rayOption *v2rayObfs.Option
-	shadowTLSOption *shadowtls.ShadowTLSOption
 }
 
 type ShadowSocksOption struct {
@@ -44,7 +36,6 @@ type ShadowSocksOption struct {
 	UDP        bool           `proxy:"udp,omitempty"`
 	Plugin     string         `proxy:"plugin,omitempty"`
 	PluginOpts map[string]any `proxy:"plugin-opts,omitempty"`
-	UDPOverTCP bool           `proxy:"udp-over-tcp,omitempty"`
 }
 
 type simpleObfsOption struct {
@@ -57,38 +48,13 @@ type v2rayObfsOption struct {
 	Host           string            `obfs:"host,omitempty"`
 	Path           string            `obfs:"path,omitempty"`
 	TLS            bool              `obfs:"tls,omitempty"`
-	Fingerprint    string            `obfs:"fingerprint,omitempty"`
 	Headers        map[string]string `obfs:"headers,omitempty"`
 	SkipCertVerify bool              `obfs:"skip-cert-verify,omitempty"`
 	Mux            bool              `obfs:"mux,omitempty"`
 }
 
-type shadowTLSOption struct {
-	Password          string `obfs:"password"`
-	Host              string `obfs:"host"`
-	Fingerprint       string `obfs:"fingerprint,omitempty"`
-	ClientFingerprint string `obfs:"client-fingerprint,omitempty"`
-	SkipCertVerify    bool   `obfs:"skip-cert-verify,omitempty"`
-	Version           int    `obfs:"version,omitempty"`
-}
-
 // StreamConn implements C.ProxyAdapter
 func (ss *ShadowSocks) StreamConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) {
-	switch ss.obfsMode {
-	case shadowtls.Mode:
-		// fix tls handshake not timeout
-		ctx, cancel := context.WithTimeout(context.Background(), C.DefaultTLSTimeout)
-		defer cancel()
-		var err error
-		c, err = shadowtls.NewShadowTLS(ctx, c, ss.shadowTLSOption)
-		if err != nil {
-			return nil, err
-		}
-	}
-	return ss.streamConn(c, metadata)
-}
-
-func (ss *ShadowSocks) streamConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) {
 	switch ss.obfsMode {
 	case "tls":
 		c = obfs.NewTLSObfs(c, ss.obfsOption.Host)
@@ -102,96 +68,67 @@ func (ss *ShadowSocks) streamConn(c net.Conn, metadata *C.Metadata) (net.Conn, e
 			return nil, fmt.Errorf("%s connect error: %w", ss.addr, err)
 		}
 	}
-	if metadata.NetWork == C.UDP && ss.option.UDPOverTCP {
+	c = ss.cipher.StreamConn(c)
-		return ss.method.DialEarlyConn(c, M.ParseSocksaddr(uot.UOTMagicAddress+":443")), nil
+	_, err := c.Write(serializesSocksAddr(metadata))
+	return c, err
+}
+
+// StreamPacketConn implements C.ProxyAdapter
+func (ss *ShadowSocks) StreamPacketConn(c net.Conn, _ *C.Metadata) (net.Conn, error) {
+	if !IsPacketConn(c) {
+		return c, fmt.Errorf("%s connect error: can not convert net.Conn to net.PacketConn", ss.addr)
 	}
-	return ss.method.DialEarlyConn(c, M.ParseSocksaddr(metadata.RemoteAddress())), nil
+
+	addr, err := resolveUDPAddr("udp", ss.addr)
+	if err != nil {
+		return c, err
+	}
+
+	pc := ss.cipher.PacketConn(c.(net.PacketConn))
+	return WrapConn(&ssPacketConn{PacketConn: pc, rAddr: addr}), nil
 }
 
 // DialContext implements C.ProxyAdapter
 func (ss *ShadowSocks) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (_ C.Conn, err error) {
-	return ss.DialContextWithDialer(ctx, dialer.NewDialer(ss.Base.DialOptions(opts...)...), metadata)
+	c, err := dialer.DialContext(ctx, "tcp", ss.addr, ss.Base.DialOptions(opts...)...)
-}
-
-// DialContextWithDialer implements C.ProxyAdapter
-func (ss *ShadowSocks) DialContextWithDialer(ctx context.Context, dialer C.Dialer, metadata *C.Metadata) (_ C.Conn, err error) {
-	c, err := dialer.DialContext(ctx, "tcp", ss.addr)
 	if err != nil {
 		return nil, fmt.Errorf("%s connect error: %w", ss.addr, err)
 	}
 	tcpKeepAlive(c)
 
-	defer func(c net.Conn) {
+	defer safeConnClose(c, err)
-		safeConnClose(c, err)
-	}(c)
 
-	switch ss.obfsMode {
+	c, err = ss.StreamConn(c, metadata)
-	case shadowtls.Mode:
-		c, err = shadowtls.NewShadowTLS(ctx, c, ss.shadowTLSOption)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	c, err = ss.streamConn(c, metadata)
 	return NewConn(c, ss), err
 }
 
 // ListenPacketContext implements C.ProxyAdapter
 func (ss *ShadowSocks) ListenPacketContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.PacketConn, error) {
-	return ss.ListenPacketWithDialer(ctx, dialer.NewDialer(ss.Base.DialOptions(opts...)...), metadata)
+	pc, err := dialer.ListenPacket(ctx, "udp", "", ss.Base.DialOptions(opts...)...)
-}
-
-// ListenPacketWithDialer implements C.ProxyAdapter
-func (ss *ShadowSocks) ListenPacketWithDialer(ctx context.Context, dialer C.Dialer, metadata *C.Metadata) (_ C.PacketConn, err error) {
-	if ss.option.UDPOverTCP {
-		tcpConn, err := ss.DialContextWithDialer(ctx, dialer, metadata)
-		if err != nil {
-			return nil, err
-		}
-		return newPacketConn(uot.NewClientConn(tcpConn), ss), nil
-	}
-	addr, err := resolveUDPAddrWithPrefer(ctx, "udp", ss.addr, ss.prefer)
 	if err != nil {
 		return nil, err
 	}
 
-	pc, err := dialer.ListenPacket(ctx, "udp", "", addr.AddrPort())
+	c, err := ss.StreamPacketConn(WrapConn(pc), metadata)
 	if err != nil {
+		_ = pc.Close()
 		return nil, err
 	}
-	pc = ss.method.DialPacketConn(&bufio.BindPacketConn{PacketConn: pc, Addr: addr})
-	return newPacketConn(pc, ss), nil
-}
 
-// SupportWithDialer implements C.ProxyAdapter
+	return NewPacketConn(c.(net.PacketConn), ss), nil
-func (ss *ShadowSocks) SupportWithDialer() bool {
-	return true
-}
-
-// ListenPacketOnStreamConn implements C.ProxyAdapter
-func (ss *ShadowSocks) ListenPacketOnStreamConn(c net.Conn, metadata *C.Metadata) (_ C.PacketConn, err error) {
-	if ss.option.UDPOverTCP {
-		return newPacketConn(uot.NewClientConn(c), ss), nil
-	}
-	return nil, errors.New("no support")
-}
-
-// SupportUOT implements C.ProxyAdapter
-func (ss *ShadowSocks) SupportUOT() bool {
-	return ss.option.UDPOverTCP
 }
 
 func NewShadowSocks(option ShadowSocksOption) (*ShadowSocks, error) {
 	addr := net.JoinHostPort(option.Server, strconv.Itoa(option.Port))
-	method, err := shadowimpl.FetchMethod(option.Cipher, option.Password)
+	cipher := option.Cipher
+	password := option.Password
+	ciph, err := core.PickCipher(cipher, nil, password)
 	if err != nil {
 		return nil, fmt.Errorf("ss %s initialize error: %w", addr, err)
 	}
 
 	var v2rayOption *v2rayObfs.Option
 	var obfsOption *simpleObfsOption
-	var shadowTLSOpt *shadowtls.ShadowTLSOption
 	obfsMode := ""
 
 	decoder := structure.NewDecoder(structure.Option{TagName: "obfs", WeaklyTypedInput: true})
@@ -227,23 +164,6 @@ func NewShadowSocks(option ShadowSocksOption) (*ShadowSocks, error) {
 			v2rayOption.TLS = true
 			v2rayOption.SkipCertVerify = opts.SkipCertVerify
 		}
-	} else if option.Plugin == shadowtls.Mode {
-		obfsMode = shadowtls.Mode
-		opt := &shadowTLSOption{
-			Version: 2,
-		}
-		if err := decoder.Decode(option.PluginOpts, opt); err != nil {
-			return nil, fmt.Errorf("ss %s initialize shadow-tls-plugin error: %w", addr, err)
-		}
-
-		shadowTLSOpt = &shadowtls.ShadowTLSOption{
-			Password:          opt.Password,
-			Host:              opt.Host,
-			Fingerprint:       opt.Fingerprint,
-			ClientFingerprint: opt.ClientFingerprint,
-			SkipCertVerify:    opt.SkipCertVerify,
-			Version:           opt.Version,
-		}
 	}
 
 	return &ShadowSocks{
@@ -252,18 +172,14 @@ func NewShadowSocks(option ShadowSocksOption) (*ShadowSocks, error) {
 			addr:  addr,
 			tp:    C.Shadowsocks,
 			udp:   option.UDP,
-			tfo:    option.TFO,
 			iface: option.Interface,
 			rmark: option.RoutingMark,
-			prefer: C.NewDNSPrefer(option.IPVersion),
 		},
-		method: method,
+		cipher: ciph,
 
-		option:          &option,
 		obfsMode:    obfsMode,
 		v2rayOption: v2rayOption,
 		obfsOption:  obfsOption,
-		shadowTLSOption: shadowTLSOpt,
 	}, nil
 }
 

adapter/outbound/shadowsocksr.go

@@ -58,22 +58,31 @@ func (ssr *ShadowSocksR) StreamConn(c net.Conn, metadata *C.Metadata) (net.Conn,
 	return c, err
 }
 
-// DialContext implements C.ProxyAdapter
+// StreamPacketConn implements C.ProxyAdapter
-func (ssr *ShadowSocksR) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (_ C.Conn, err error) {
+func (ssr *ShadowSocksR) StreamPacketConn(c net.Conn, _ *C.Metadata) (net.Conn, error) {
-	return ssr.DialContextWithDialer(ctx, dialer.NewDialer(ssr.Base.DialOptions(opts...)...), metadata)
+	if !IsPacketConn(c) {
+		return c, fmt.Errorf("%s connect error: can not convert net.Conn to net.PacketConn", ssr.addr)
+	}
+
+	addr, err := resolveUDPAddr("udp", ssr.addr)
+	if err != nil {
+		return c, err
+	}
+
+	pc := ssr.cipher.PacketConn(c.(net.PacketConn))
+	pc = ssr.protocol.PacketConn(pc)
+	return WrapConn(&ssPacketConn{PacketConn: pc, rAddr: addr}), nil
 }
 
-// DialContextWithDialer implements C.ProxyAdapter
+// DialContext implements C.ProxyAdapter
-func (ssr *ShadowSocksR) DialContextWithDialer(ctx context.Context, dialer C.Dialer, metadata *C.Metadata) (_ C.Conn, err error) {
+func (ssr *ShadowSocksR) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (_ C.Conn, err error) {
-	c, err := dialer.DialContext(ctx, "tcp", ssr.addr)
+	c, err := dialer.DialContext(ctx, "tcp", ssr.addr, ssr.Base.DialOptions(opts...)...)
 	if err != nil {
 		return nil, fmt.Errorf("%s connect error: %w", ssr.addr, err)
 	}
 	tcpKeepAlive(c)
 
-	defer func(c net.Conn) {
+	defer safeConnClose(c, err)
-		safeConnClose(c, err)
-	}(c)
 
 	c, err = ssr.StreamConn(c, metadata)
 	return NewConn(c, ssr), err
@@ -81,29 +90,18 @@ func (ssr *ShadowSocksR) DialContextWithDialer(ctx context.Context, dialer C.Dia
 
 // ListenPacketContext implements C.ProxyAdapter
 func (ssr *ShadowSocksR) ListenPacketContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.PacketConn, error) {
-	return ssr.ListenPacketWithDialer(ctx, dialer.NewDialer(ssr.Base.DialOptions(opts...)...), metadata)
+	pc, err := dialer.ListenPacket(ctx, "udp", "", ssr.Base.DialOptions(opts...)...)
-}
-
-// ListenPacketWithDialer implements C.ProxyAdapter
-func (ssr *ShadowSocksR) ListenPacketWithDialer(ctx context.Context, dialer C.Dialer, metadata *C.Metadata) (_ C.PacketConn, err error) {
-	addr, err := resolveUDPAddrWithPrefer(ctx, "udp", ssr.addr, ssr.prefer)
 	if err != nil {
 		return nil, err
 	}
 
-	pc, err := dialer.ListenPacket(ctx, "udp", "", addr.AddrPort())
+	c, err := ssr.StreamPacketConn(WrapConn(pc), metadata)
 	if err != nil {
+		_ = pc.Close()
 		return nil, err
 	}
 
-	pc = ssr.cipher.PacketConn(pc)
+	return NewPacketConn(c.(net.PacketConn), ssr), nil
-	pc = ssr.protocol.PacketConn(pc)
-	return newPacketConn(&ssPacketConn{PacketConn: pc, rAddr: addr}, ssr), nil
-}
-
-// SupportWithDialer implements C.ProxyAdapter
-func (ssr *ShadowSocksR) SupportWithDialer() bool {
-	return true
 }
 
 func NewShadowSocksR(option ShadowSocksROption) (*ShadowSocksR, error) {
@@ -163,10 +161,8 @@ func NewShadowSocksR(option ShadowSocksROption) (*ShadowSocksR, error) {
 			addr:  addr,
 			tp:    C.ShadowsocksR,
 			udp:   option.UDP,
-			tfo:    option.TFO,
 			iface: option.Interface,
 			rmark: option.RoutingMark,
-			prefer: C.NewDNSPrefer(option.IPVersion),
 		},
 		cipher:   coreCiph,
 		obfs:     obfs,

adapter/outbound/snell.go

@@ -53,15 +53,23 @@ func streamConn(c net.Conn, option streamOption) *snell.Snell {
 // StreamConn implements C.ProxyAdapter
 func (s *Snell) StreamConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) {
 	c = streamConn(c, streamOption{s.psk, s.version, s.addr, s.obfsOption})
-	if metadata.NetWork == C.UDP {
-		err := snell.WriteUDPHeader(c, s.version)
-		return c, err
-	}
 	port, _ := strconv.ParseUint(metadata.DstPort, 10, 16)
 	err := snell.WriteHeader(c, metadata.String(), uint(port), s.version)
 	return c, err
 }
 
+// StreamPacketConn implements C.ProxyAdapter
+func (s *Snell) StreamPacketConn(c net.Conn, _ *C.Metadata) (net.Conn, error) {
+	c = streamConn(c, streamOption{s.psk, s.version, s.addr, s.obfsOption})
+
+	err := snell.WriteUDPHeader(c, s.version)
+	if err != nil {
+		return c, err
+	}
+
+	return WrapConn(snell.PacketConn(c)), nil
+}
+
 // DialContext implements C.ProxyAdapter
 func (s *Snell) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (_ C.Conn, err error) {
 	if s.version == snell.Version2 && len(opts) == 0 {
@@ -72,26 +80,19 @@ func (s *Snell) DialContext(ctx context.Context, metadata *C.Metadata, opts ...d
 
 		port, _ := strconv.ParseUint(metadata.DstPort, 10, 16)
 		if err = snell.WriteHeader(c, metadata.String(), uint(port), s.version); err != nil {
-			c.Close()
+			_ = c.Close()
 			return nil, err
 		}
 		return NewConn(c, s), err
 	}
 
-	return s.DialContextWithDialer(ctx, dialer.NewDialer(s.Base.DialOptions(opts...)...), metadata)
+	c, err := dialer.DialContext(ctx, "tcp", s.addr, s.Base.DialOptions(opts...)...)
-}
-
-// DialContextWithDialer implements C.ProxyAdapter
-func (s *Snell) DialContextWithDialer(ctx context.Context, dialer C.Dialer, metadata *C.Metadata) (_ C.Conn, err error) {
-	c, err := dialer.DialContext(ctx, "tcp", s.addr)
 	if err != nil {
 		return nil, fmt.Errorf("%s connect error: %w", s.addr, err)
 	}
 	tcpKeepAlive(c)
 
-	defer func(c net.Conn) {
+	defer safeConnClose(c, err)
-		safeConnClose(c, err)
-	}(c)
 
 	c, err = s.StreamConn(c, metadata)
 	return NewConn(c, s), err
@@ -99,35 +100,19 @@ func (s *Snell) DialContextWithDialer(ctx context.Context, dialer C.Dialer, meta
 
 // ListenPacketContext implements C.ProxyAdapter
 func (s *Snell) ListenPacketContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.PacketConn, error) {
-	return s.ListenPacketWithDialer(ctx, dialer.NewDialer(s.Base.DialOptions(opts...)...), metadata)
+	c, err := dialer.DialContext(ctx, "tcp", s.addr, s.Base.DialOptions(opts...)...)
-}
-
-// ListenPacketWithDialer implements C.ProxyAdapter
-func (s *Snell) ListenPacketWithDialer(ctx context.Context, dialer C.Dialer, metadata *C.Metadata) (C.PacketConn, error) {
-	c, err := dialer.DialContext(ctx, "tcp", s.addr)
 	if err != nil {
 		return nil, err
 	}
 	tcpKeepAlive(c)
-	c = streamConn(c, streamOption{s.psk, s.version, s.addr, s.obfsOption})
 
-	err = snell.WriteUDPHeader(c, s.version)
+	pc, err := s.StreamPacketConn(c, metadata)
 	if err != nil {
+		_ = c.Close()
 		return nil, err
 	}
 
-	pc := snell.PacketConn(c)
+	return NewPacketConn(pc.(net.PacketConn), s), nil
-	return newPacketConn(pc, s), nil
-}
-
-// SupportWithDialer implements C.ProxyAdapter
-func (s *Snell) SupportWithDialer() bool {
-	return true
-}
-
-// SupportUOT implements C.ProxyAdapter
-func (s *Snell) SupportUOT() bool {
-	return true
 }
 
 func NewSnell(option SnellOption) (*Snell, error) {
@@ -167,10 +152,8 @@ func NewSnell(option SnellOption) (*Snell, error) {
 			addr:  addr,
 			tp:    C.Snell,
 			udp:   option.UDP,
-			tfo:    option.TFO,
 			iface: option.Interface,
 			rmark: option.RoutingMark,
-			prefer: C.NewDNSPrefer(option.IPVersion),
 		},
 		psk:        psk,
 		obfsOption: obfsOption,

adapter/outbound/socks5.go

@@ -10,7 +10,6 @@ import (
 	"strconv"
 
 	"github.com/Dreamacro/clash/component/dialer"
-	tlsC "github.com/Dreamacro/clash/component/tls"
 	C "github.com/Dreamacro/clash/constant"
 	"github.com/Dreamacro/clash/transport/socks5"
 )
@@ -34,19 +33,63 @@ type Socks5Option struct {
 	TLS            bool   `proxy:"tls,omitempty"`
 	UDP            bool   `proxy:"udp,omitempty"`
 	SkipCertVerify bool   `proxy:"skip-cert-verify,omitempty"`
-	Fingerprint    string `proxy:"fingerprint,omitempty"`
 }
 
 // StreamConn implements C.ProxyAdapter
 func (ss *Socks5) StreamConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) {
+	var err error
+	c, _, err = ss.streamConn(c, metadata)
+
+	return c, err
+}
+
+func (ss *Socks5) StreamSocks5PacketConn(c net.Conn, pc net.PacketConn, metadata *C.Metadata) (net.PacketConn, error) {
+	if c == nil {
+		return pc, fmt.Errorf("%s connect error: parameter net.Conn is nil", ss.addr)
+	}
+
+	if pc == nil {
+		return pc, fmt.Errorf("%s connect error: parameter net.PacketConn is nil", ss.addr)
+	}
+
+	cc, bindAddr, err := ss.streamConn(c, metadata)
+	if err != nil {
+		return pc, err
+	}
+
+	c = cc
+
+	go func() {
+		_, _ = io.Copy(io.Discard, c)
+		_ = c.Close()
+		// A UDP association terminates when the TCP connection that the UDP
+		// ASSOCIATE request arrived on terminates. RFC1928
+		_ = pc.Close()
+	}()
+
+	// Support unspecified UDP bind address.
+	bindUDPAddr := bindAddr.UDPAddr()
+	if bindUDPAddr == nil {
+		return pc, errors.New("invalid UDP bind address")
+	} else if bindUDPAddr.IP.IsUnspecified() {
+		serverAddr, err := resolveUDPAddr("udp", ss.Addr())
+		if err != nil {
+			return pc, err
+		}
+
+		bindUDPAddr.IP = serverAddr.IP
+	}
+
+	return &socksPacketConn{PacketConn: pc, rAddr: bindUDPAddr, tcpConn: c}, nil
+}
+
+func (ss *Socks5) streamConn(c net.Conn, metadata *C.Metadata) (_ net.Conn, bindAddr socks5.Addr, err error) {
 	if ss.tls {
 		cc := tls.Client(c, ss.tlsConfig)
-		ctx, cancel := context.WithTimeout(context.Background(), C.DefaultTLSTimeout)
+		err := cc.Handshake()
-		defer cancel()
-		err := cc.HandshakeContext(ctx)
 		c = cc
 		if err != nil {
-			return nil, fmt.Errorf("%s connect error: %w", ss.addr, err)
+			return c, nil, fmt.Errorf("%s connect error: %w", ss.addr, err)
 		}
 	}
 
@@ -57,28 +100,25 @@ func (ss *Socks5) StreamConn(c net.Conn, metadata *C.Metadata) (net.Conn, error)
 			Password: ss.pass,
 		}
 	}
-	if _, err := socks5.ClientHandshake(c, serializesSocksAddr(metadata), socks5.CmdConnect, user); err != nil {
+
-		return nil, err
+	if metadata.NetWork == C.UDP {
+		bindAddr, err = socks5.ClientHandshake(c, serializesSocksAddr(metadata), socks5.CmdUDPAssociate, user)
+	} else {
+		bindAddr, err = socks5.ClientHandshake(c, serializesSocksAddr(metadata), socks5.CmdConnect, user)
 	}
-	return c, nil
+
+	return c, bindAddr, err
 }
 
 // DialContext implements C.ProxyAdapter
 func (ss *Socks5) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (_ C.Conn, err error) {
-	return ss.DialContextWithDialer(ctx, dialer.NewDialer(ss.Base.DialOptions(opts...)...), metadata)
+	c, err := dialer.DialContext(ctx, "tcp", ss.addr, ss.Base.DialOptions(opts...)...)
-}
-
-// DialContextWithDialer implements C.ProxyAdapter
-func (ss *Socks5) DialContextWithDialer(ctx context.Context, dialer C.Dialer, metadata *C.Metadata) (_ C.Conn, err error) {
-	c, err := dialer.DialContext(ctx, "tcp", ss.addr)
 	if err != nil {
 		return nil, fmt.Errorf("%s connect error: %w", ss.addr, err)
 	}
 	tcpKeepAlive(c)
 
-	defer func(c net.Conn) {
+	defer safeConnClose(c, err)
-		safeConnClose(c, err)
-	}(c)
 
 	c, err = ss.StreamConn(c, metadata)
 	if err != nil {
@@ -88,92 +128,37 @@ func (ss *Socks5) DialContextWithDialer(ctx context.Context, dialer C.Dialer, me
 	return NewConn(c, ss), nil
 }
 
-// SupportWithDialer implements C.ProxyAdapter
-func (ss *Socks5) SupportWithDialer() bool {
-	return true
-}
-
 // ListenPacketContext implements C.ProxyAdapter
 func (ss *Socks5) ListenPacketContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (_ C.PacketConn, err error) {
 	c, err := dialer.DialContext(ctx, "tcp", ss.addr, ss.Base.DialOptions(opts...)...)
 	if err != nil {
-		err = fmt.Errorf("%s connect error: %w", ss.addr, err)
+		return nil, fmt.Errorf("%s connect error: %w", ss.addr, err)
+	}
+
+	defer safeConnClose(c, err)
+
+	pc, err := dialer.ListenPacket(ctx, "udp", "", ss.Base.DialOptions(opts...)...)
+	if err != nil {
 		return
 	}
 
-	if ss.tls {
-		cc := tls.Client(c, ss.tlsConfig)
-		ctx, cancel := context.WithTimeout(context.Background(), C.DefaultTLSTimeout)
-		defer cancel()
-		err = cc.HandshakeContext(ctx)
-		c = cc
-	}
-
-	defer func(c net.Conn) {
-		safeConnClose(c, err)
-	}(c)
-
 	tcpKeepAlive(c)
-	var user *socks5.User
-	if ss.user != "" {
-		user = &socks5.User{
-			Username: ss.user,
-			Password: ss.pass,
-		}
-	}
 
-	bindAddr, err := socks5.ClientHandshake(c, serializesSocksAddr(metadata), socks5.CmdUDPAssociate, user)
+	pc, err = ss.StreamSocks5PacketConn(c, pc, metadata)
-	if err != nil {
-		err = fmt.Errorf("client hanshake error: %w", err)
-		return
-	}
-
-	// Support unspecified UDP bind address.
-	bindUDPAddr := bindAddr.UDPAddr()
-	if bindUDPAddr == nil {
-		err = errors.New("invalid UDP bind address")
-		return
-	} else if bindUDPAddr.IP.IsUnspecified() {
-		serverAddr, err := resolveUDPAddr(ctx, "udp", ss.Addr())
-		if err != nil {
-			return nil, err
-		}
-
-		bindUDPAddr.IP = serverAddr.IP
-	}
-
-	pc, err := dialer.ListenPacket(ctx, dialer.ParseNetwork("udp", bindUDPAddr.AddrPort().Addr()), "", ss.Base.DialOptions(opts...)...)
 	if err != nil {
 		return
 	}
 
-	go func() {
+	return NewPacketConn(pc, ss), nil
-		io.Copy(io.Discard, c)
-		c.Close()
-		// A UDP association terminates when the TCP connection that the UDP
-		// ASSOCIATE request arrived on terminates. RFC1928
-		pc.Close()
-	}()
-
-	return newPacketConn(&socksPacketConn{PacketConn: pc, rAddr: bindUDPAddr, tcpConn: c}, ss), nil
 }
 
-func NewSocks5(option Socks5Option) (*Socks5, error) {
+func NewSocks5(option Socks5Option) *Socks5 {
 	var tlsConfig *tls.Config
 	if option.TLS {
 		tlsConfig = &tls.Config{
 			InsecureSkipVerify: option.SkipCertVerify,
 			ServerName:         option.Server,
 		}
-
-		if len(option.Fingerprint) == 0 {
-			tlsConfig = tlsC.GetGlobalTLSConfig(tlsConfig)
-		} else {
-			var err error
-			if tlsConfig, err = tlsC.GetSpecifiedFingerprintTLSConfig(tlsConfig, option.Fingerprint); err != nil {
-				return nil, err
-			}
-		}
 	}
 
 	return &Socks5{
@@ -182,17 +167,15 @@ func NewSocks5(option Socks5Option) (*Socks5, error) {
 			addr:  net.JoinHostPort(option.Server, strconv.Itoa(option.Port)),
 			tp:    C.Socks5,
 			udp:   option.UDP,
-			tfo:    option.TFO,
 			iface: option.Interface,
 			rmark: option.RoutingMark,
-			prefer: C.NewDNSPrefer(option.IPVersion),
 		},
 		user:           option.UserName,
 		pass:           option.Password,
 		tls:            option.TLS,
 		skipCertVerify: option.SkipCertVerify,
 		tlsConfig:      tlsConfig,
-	}, nil
+	}
 }
 
 type socksPacketConn struct {
@@ -230,6 +213,6 @@ func (uc *socksPacketConn) ReadFrom(b []byte) (int, net.Addr, error) {
 }
 
 func (uc *socksPacketConn) Close() error {
-	uc.tcpConn.Close()
+	_ = uc.tcpConn.Close()
 	return uc.PacketConn.Close()
 }

adapter/outbound/trojan.go

@@ -8,13 +8,13 @@ import (
 	"net/http"
 	"strconv"
 
-	N "github.com/Dreamacro/clash/common/net"
 	"github.com/Dreamacro/clash/component/dialer"
-	tlsC "github.com/Dreamacro/clash/component/tls"
 	C "github.com/Dreamacro/clash/constant"
 	"github.com/Dreamacro/clash/transport/gun"
 	"github.com/Dreamacro/clash/transport/trojan"
 	"github.com/Dreamacro/clash/transport/vless"
+
+	"golang.org/x/net/http2"
 )
 
 type Trojan struct {
@@ -25,7 +25,7 @@ type Trojan struct {
 	// for gun mux
 	gunTLSConfig *tls.Config
 	gunConfig    *gun.Config
-	transport    *gun.TransportWrap
+	transport    *http2.Transport
 }
 
 type TrojanOption struct {
@@ -37,14 +37,12 @@ type TrojanOption struct {
 	ALPN           []string    `proxy:"alpn,omitempty"`
 	SNI            string      `proxy:"sni,omitempty"`
 	SkipCertVerify bool        `proxy:"skip-cert-verify,omitempty"`
-	Fingerprint       string      `proxy:"fingerprint,omitempty"`
 	UDP            bool        `proxy:"udp,omitempty"`
 	Network        string      `proxy:"network,omitempty"`
 	GrpcOpts       GrpcOptions `proxy:"grpc-opts,omitempty"`
 	WSOpts         WSOptions   `proxy:"ws-opts,omitempty"`
 	Flow           string      `proxy:"flow,omitempty"`
 	FlowShow       bool        `proxy:"flow-show,omitempty"`
-	ClientFingerprint string      `proxy:"client-fingerprint,omitempty"`
 }
 
 func (t *Trojan) plainStream(c net.Conn) (net.Conn, error) {
@@ -74,14 +72,8 @@ func (t *Trojan) plainStream(c net.Conn) (net.Conn, error) {
 	return t.instance.StreamConn(c)
 }
 
-// StreamConn implements C.ProxyAdapter
+func (t *Trojan) trojanStream(c net.Conn, metadata *C.Metadata) (net.Conn, error) {
-func (t *Trojan) StreamConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) {
 	var err error
-
-	if tlsC.HaveGlobalFingerprint() && len(t.option.ClientFingerprint) == 0 {
-		t.option.ClientFingerprint = tlsC.GetGlobalFingerprint()
-	}
-
 	if t.transport != nil {
 		c, err = gun.StreamGunWithConn(c, t.gunTLSConfig, t.gunConfig)
 	} else {
@@ -92,55 +84,69 @@ func (t *Trojan) StreamConn(c net.Conn, metadata *C.Metadata) (net.Conn, error)
 		return nil, fmt.Errorf("%s connect error: %w", t.addr, err)
 	}
 
-	c, err = t.instance.PresetXTLSConn(c)
+	c, err = t.instance.PrepareXTLSConn(c)
 	if err != nil {
-		return nil, err
+		return c, err
 	}
 
 	if metadata.NetWork == C.UDP {
 		err = t.instance.WriteHeader(c, trojan.CommandUDP, serializesSocksAddr(metadata))
 		return c, err
 	}
+
 	err = t.instance.WriteHeader(c, trojan.CommandTCP, serializesSocksAddr(metadata))
-	return N.NewExtendedConn(c), err
+	return c, err
+}
+
+// StreamConn implements C.ProxyAdapter
+func (t *Trojan) StreamConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) {
+	return t.trojanStream(c, metadata)
+}
+
+// StreamPacketConn implements C.ProxyAdapter
+func (t *Trojan) StreamPacketConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) {
+	var err error
+	c, err = t.trojanStream(c, metadata)
+	if err != nil {
+		return c, err
+	}
+
+	pc := t.instance.PacketConn(c)
+	return WrapConn(pc), nil
 }
 
 // DialContext implements C.ProxyAdapter
 func (t *Trojan) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (_ C.Conn, err error) {
+	var c net.Conn
+
 	// gun transport
 	if t.transport != nil && len(opts) == 0 {
-		c, err := gun.StreamGunWithTransport(t.transport, t.gunConfig)
+		c, err = gun.StreamGunWithTransport(t.transport, t.gunConfig)
 		if err != nil {
 			return nil, err
 		}
 
-		c, err = t.instance.PresetXTLSConn(c)
+		defer safeConnClose(c, err)
+
+		c, err = t.instance.PrepareXTLSConn(c)
 		if err != nil {
-			c.Close()
 			return nil, err
 		}
 
 		if err = t.instance.WriteHeader(c, trojan.CommandTCP, serializesSocksAddr(metadata)); err != nil {
-			c.Close()
 			return nil, err
 		}
 
 		return NewConn(c, t), nil
 	}
-	return t.DialContextWithDialer(ctx, dialer.NewDialer(t.Base.DialOptions(opts...)...), metadata)
-}
 
-// DialContextWithDialer implements C.ProxyAdapter
+	c, err = dialer.DialContext(ctx, "tcp", t.addr, t.Base.DialOptions(opts...)...)
-func (t *Trojan) DialContextWithDialer(ctx context.Context, dialer C.Dialer, metadata *C.Metadata) (_ C.Conn, err error) {
-	c, err := dialer.DialContext(ctx, "tcp", t.addr)
 	if err != nil {
 		return nil, fmt.Errorf("%s connect error: %w", t.addr, err)
 	}
 	tcpKeepAlive(c)
 
-	defer func(c net.Conn) {
+	defer safeConnClose(c, err)
-		safeConnClose(c, err)
-	}(c)
 
 	c, err = t.StreamConn(c, metadata)
 	if err != nil {
@@ -154,64 +160,44 @@ func (t *Trojan) DialContextWithDialer(ctx context.Context, dialer C.Dialer, met
 func (t *Trojan) ListenPacketContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (_ C.PacketConn, err error) {
 	var c net.Conn
 
-	// grpc transport
+	// gun transport
 	if t.transport != nil && len(opts) == 0 {
 		c, err = gun.StreamGunWithTransport(t.transport, t.gunConfig)
 		if err != nil {
-			return nil, fmt.Errorf("%s connect error: %w", t.addr, err)
+			return nil, err
 		}
-		defer func(c net.Conn) {
+
-			safeConnClose(c, err)
+		defer safeConnClose(c, err)
-		}(c)
+
-		err = t.instance.WriteHeader(c, trojan.CommandUDP, serializesSocksAddr(metadata))
+		c, err = t.instance.PrepareXTLSConn(c)
 		if err != nil {
 			return nil, err
 		}
 
-		pc := t.instance.PacketConn(c)
+		if err = t.instance.WriteHeader(c, trojan.CommandUDP, serializesSocksAddr(metadata)); err != nil {
-		return newPacketConn(pc, t), err
+			return nil, err
 		}
-	return t.ListenPacketWithDialer(ctx, dialer.NewDialer(t.Base.DialOptions(opts...)...), metadata)
-}
 
-// ListenPacketWithDialer implements C.ProxyAdapter
+		pc := t.instance.PacketConn(c)
-func (t *Trojan) ListenPacketWithDialer(ctx context.Context, dialer C.Dialer, metadata *C.Metadata) (_ C.PacketConn, err error) {
+
-	c, err := dialer.DialContext(ctx, "tcp", t.addr)
+		return NewPacketConn(pc, t), nil
+	}
+
+	c, err = dialer.DialContext(ctx, "tcp", t.addr, t.Base.DialOptions(opts...)...)
 	if err != nil {
 		return nil, fmt.Errorf("%s connect error: %w", t.addr, err)
 	}
-	defer func(c net.Conn) {
+
-		safeConnClose(c, err)
-	}(c)
 	tcpKeepAlive(c)
-	c, err = t.plainStream(c)
-	if err != nil {
-		return nil, fmt.Errorf("%s connect error: %w", t.addr, err)
-	}
 
-	err = t.instance.WriteHeader(c, trojan.CommandUDP, serializesSocksAddr(metadata))
+	defer safeConnClose(c, err)
+
+	c, err = t.StreamPacketConn(c, metadata)
 	if err != nil {
 		return nil, err
 	}
 
-	pc := t.instance.PacketConn(c)
+	return NewPacketConn(c.(net.PacketConn), t), nil
-	return newPacketConn(pc, t), err
-}
-
-// SupportWithDialer implements C.ProxyAdapter
-func (t *Trojan) SupportWithDialer() bool {
-	return true
-}
-
-// ListenPacketOnStreamConn implements C.ProxyAdapter
-func (t *Trojan) ListenPacketOnStreamConn(c net.Conn, metadata *C.Metadata) (_ C.PacketConn, err error) {
-	pc := t.instance.PacketConn(c)
-	return newPacketConn(pc, t), err
-}
-
-// SupportUOT implements C.ProxyAdapter
-func (t *Trojan) SupportUOT() bool {
-	return true
 }
 
 func NewTrojan(option TrojanOption) (*Trojan, error) {
@@ -223,13 +209,9 @@ func NewTrojan(option TrojanOption) (*Trojan, error) {
 		ServerName:     option.Server,
 		SkipCertVerify: option.SkipCertVerify,
 		FlowShow:       option.FlowShow,
-		Fingerprint:       option.Fingerprint,
-		ClientFingerprint: option.ClientFingerprint,
 	}
 
-	switch option.Network {
+	if option.Network != "ws" && len(option.Flow) >= 16 {
-	case "", "tcp":
-		if len(option.Flow) >= 16 {
 		option.Flow = option.Flow[:16]
 		switch option.Flow {
 		case vless.XRO, vless.XRD, vless.XRS:
@@ -238,7 +220,6 @@ func NewTrojan(option TrojanOption) (*Trojan, error) {
 			return nil, fmt.Errorf("unsupported xtls flow type: %s", option.Flow)
 		}
 	}
-	}
 
 	if option.SNI != "" {
 		tOption.ServerName = option.SNI
@@ -250,10 +231,8 @@ func NewTrojan(option TrojanOption) (*Trojan, error) {
 			addr:  addr,
 			tp:    C.Trojan,
 			udp:   option.UDP,
-			tfo:    option.TFO,
 			iface: option.Interface,
 			rmark: option.RoutingMark,
-			prefer: C.NewDNSPrefer(option.IPVersion),
 		},
 		instance: trojan.New(tOption),
 		option:   &option,
@@ -276,16 +255,11 @@ func NewTrojan(option TrojanOption) (*Trojan, error) {
 			ServerName:         tOption.ServerName,
 		}
 
-		if len(option.Fingerprint) == 0 {
+		if t.option.Flow != "" {
-			tlsConfig = tlsC.GetGlobalTLSConfig(tlsConfig)
+			t.transport = gun.NewHTTP2XTLSClient(dialFn, tlsConfig)
 		} else {
-			var err error
+			t.transport = gun.NewHTTP2Client(dialFn, tlsConfig)
-			if tlsConfig, err = tlsC.GetSpecifiedFingerprintTLSConfig(tlsConfig, option.Fingerprint); err != nil {
-				return nil, err
 		}
-		}
-
-		t.transport = gun.NewHTTP2Client(dialFn, tlsConfig, tOption.ClientFingerprint)
 
 		t.gunTLSConfig = tlsConfig
 		t.gunConfig = &gun.Config{

adapter/outbound/tuic.go

@@ -1,251 +0,0 @@
-package outbound
-
-import (
-	"context"
-	"crypto/sha256"
-	"crypto/tls"
-	"encoding/hex"
-	"encoding/pem"
-	"fmt"
-	"math"
-	"net"
-	"os"
-	"strconv"
-	"time"
-
-	"github.com/metacubex/quic-go"
-
-	"github.com/Dreamacro/clash/component/dialer"
-	tlsC "github.com/Dreamacro/clash/component/tls"
-	C "github.com/Dreamacro/clash/constant"
-	"github.com/Dreamacro/clash/transport/tuic"
-)
-
-type Tuic struct {
-	*Base
-	client *tuic.PoolClient
-}
-
-type TuicOption struct {
-	BasicOption
-	Name                  string   `proxy:"name"`
-	Server                string   `proxy:"server"`
-	Port                  int      `proxy:"port"`
-	Token                 string   `proxy:"token"`
-	Ip                    string   `proxy:"ip,omitempty"`
-	HeartbeatInterval     int      `proxy:"heartbeat-interval,omitempty"`
-	ALPN                  []string `proxy:"alpn,omitempty"`
-	ReduceRtt             bool     `proxy:"reduce-rtt,omitempty"`
-	RequestTimeout        int      `proxy:"request-timeout,omitempty"`
-	UdpRelayMode          string   `proxy:"udp-relay-mode,omitempty"`
-	CongestionController  string   `proxy:"congestion-controller,omitempty"`
-	DisableSni            bool     `proxy:"disable-sni,omitempty"`
-	MaxUdpRelayPacketSize int      `proxy:"max-udp-relay-packet-size,omitempty"`
-
-	FastOpen            bool   `proxy:"fast-open,omitempty"`
-	MaxOpenStreams      int    `proxy:"max-open-streams,omitempty"`
-	SkipCertVerify      bool   `proxy:"skip-cert-verify,omitempty"`
-	Fingerprint         string `proxy:"fingerprint,omitempty"`
-	CustomCA            string `proxy:"ca,omitempty"`
-	CustomCAString      string `proxy:"ca-str,omitempty"`
-	ReceiveWindowConn   int    `proxy:"recv-window-conn,omitempty"`
-	ReceiveWindow       int    `proxy:"recv-window,omitempty"`
-	DisableMTUDiscovery bool   `proxy:"disable-mtu-discovery,omitempty"`
-	SNI                 string `proxy:"sni,omitempty"`
-}
-
-// DialContext implements C.ProxyAdapter
-func (t *Tuic) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.Conn, error) {
-	return t.DialContextWithDialer(ctx, dialer.NewDialer(t.Base.DialOptions(opts...)...), metadata)
-}
-
-// DialContextWithDialer implements C.ProxyAdapter
-func (t *Tuic) DialContextWithDialer(ctx context.Context, dialer C.Dialer, metadata *C.Metadata) (C.Conn, error) {
-	conn, err := t.client.DialContextWithDialer(ctx, metadata, dialer, t.dialWithDialer)
-	if err != nil {
-		return nil, err
-	}
-	return NewConn(conn, t), err
-}
-
-// ListenPacketContext implements C.ProxyAdapter
-func (t *Tuic) ListenPacketContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (_ C.PacketConn, err error) {
-	return t.ListenPacketWithDialer(ctx, dialer.NewDialer(t.Base.DialOptions(opts...)...), metadata)
-}
-
-// ListenPacketWithDialer implements C.ProxyAdapter
-func (t *Tuic) ListenPacketWithDialer(ctx context.Context, dialer C.Dialer, metadata *C.Metadata) (_ C.PacketConn, err error) {
-	pc, err := t.client.ListenPacketWithDialer(ctx, metadata, dialer, t.dialWithDialer)
-	if err != nil {
-		return nil, err
-	}
-	return newPacketConn(pc, t), nil
-}
-
-// SupportWithDialer implements C.ProxyAdapter
-func (t *Tuic) SupportWithDialer() bool {
-	return true
-}
-
-func (t *Tuic) dial(ctx context.Context, opts ...dialer.Option) (pc net.PacketConn, addr net.Addr, err error) {
-	return t.dialWithDialer(ctx, dialer.NewDialer(opts...))
-}
-
-func (t *Tuic) dialWithDialer(ctx context.Context, dialer C.Dialer) (pc net.PacketConn, addr net.Addr, err error) {
-	udpAddr, err := resolveUDPAddrWithPrefer(ctx, "udp", t.addr, t.prefer)
-	if err != nil {
-		return nil, nil, err
-	}
-	addr = udpAddr
-	pc, err = dialer.ListenPacket(ctx, "udp", "", udpAddr.AddrPort())
-	if err != nil {
-		return nil, nil, err
-	}
-	return
-}
-
-func NewTuic(option TuicOption) (*Tuic, error) {
-	addr := net.JoinHostPort(option.Server, strconv.Itoa(option.Port))
-	serverName := option.Server
-	tlsConfig := &tls.Config{
-		ServerName:         serverName,
-		InsecureSkipVerify: option.SkipCertVerify,
-		MinVersion:         tls.VersionTLS13,
-	}
-	if option.SNI != "" {
-		tlsConfig.ServerName = option.SNI
-	}
-
-	var bs []byte
-	var err error
-	if len(option.CustomCA) > 0 {
-		bs, err = os.ReadFile(option.CustomCA)
-		if err != nil {
-			return nil, fmt.Errorf("tuic %s load ca error: %w", addr, err)
-		}
-	} else if option.CustomCAString != "" {
-		bs = []byte(option.CustomCAString)
-	}
-
-	if len(bs) > 0 {
-		block, _ := pem.Decode(bs)
-		if block == nil {
-			return nil, fmt.Errorf("CA cert is not PEM")
-		}
-
-		fpBytes := sha256.Sum256(block.Bytes)
-		if len(option.Fingerprint) == 0 {
-			option.Fingerprint = hex.EncodeToString(fpBytes[:])
-		}
-	}
-
-	if len(option.Fingerprint) != 0 {
-		var err error
-		tlsConfig, err = tlsC.GetSpecifiedFingerprintTLSConfig(tlsConfig, option.Fingerprint)
-		if err != nil {
-			return nil, err
-		}
-	} else {
-		tlsConfig = tlsC.GetGlobalTLSConfig(tlsConfig)
-	}
-
-	if len(option.ALPN) > 0 {
-		tlsConfig.NextProtos = option.ALPN
-	} else {
-		tlsConfig.NextProtos = []string{"h3"}
-	}
-
-	if option.RequestTimeout == 0 {
-		option.RequestTimeout = 8000
-	}
-
-	if option.HeartbeatInterval <= 0 {
-		option.HeartbeatInterval = 10000
-	}
-
-	if option.UdpRelayMode != "quic" {
-		option.UdpRelayMode = "native"
-	}
-
-	if option.MaxUdpRelayPacketSize == 0 {
-		option.MaxUdpRelayPacketSize = 1252
-	}
-
-	if option.MaxOpenStreams == 0 {
-		option.MaxOpenStreams = 100
-	}
-
-	// ensure server's incoming stream can handle correctly, increase to 1.1x
-	quicMaxOpenStreams := int64(option.MaxOpenStreams)
-	quicMaxOpenStreams = quicMaxOpenStreams + int64(math.Ceil(float64(quicMaxOpenStreams)/10.0))
-	quicConfig := &quic.Config{
-		InitialStreamReceiveWindow:     uint64(option.ReceiveWindowConn),
-		MaxStreamReceiveWindow:         uint64(option.ReceiveWindowConn),
-		InitialConnectionReceiveWindow: uint64(option.ReceiveWindow),
-		MaxConnectionReceiveWindow:     uint64(option.ReceiveWindow),
-		MaxIncomingStreams:             quicMaxOpenStreams,
-		MaxIncomingUniStreams:          quicMaxOpenStreams,
-		KeepAlivePeriod:                time.Duration(option.HeartbeatInterval) * time.Millisecond,
-		DisablePathMTUDiscovery:        option.DisableMTUDiscovery,
-		EnableDatagrams:                true,
-	}
-	if option.ReceiveWindowConn == 0 {
-		quicConfig.InitialStreamReceiveWindow = tuic.DefaultStreamReceiveWindow / 10
-		quicConfig.MaxStreamReceiveWindow = tuic.DefaultStreamReceiveWindow
-	}
-	if option.ReceiveWindow == 0 {
-		quicConfig.InitialConnectionReceiveWindow = tuic.DefaultConnectionReceiveWindow / 10
-		quicConfig.MaxConnectionReceiveWindow = tuic.DefaultConnectionReceiveWindow
-	}
-
-	if len(option.Ip) > 0 {
-		addr = net.JoinHostPort(option.Ip, strconv.Itoa(option.Port))
-	}
-	host := option.Server
-	if option.DisableSni {
-		host = ""
-		tlsConfig.ServerName = ""
-	}
-	tkn := tuic.GenTKN(option.Token)
-
-	t := &Tuic{
-		Base: &Base{
-			name:   option.Name,
-			addr:   addr,
-			tp:     C.Tuic,
-			udp:    true,
-			tfo:    option.FastOpen,
-			iface:  option.Interface,
-			rmark:  option.RoutingMark,
-			prefer: C.NewDNSPrefer(option.IPVersion),
-		},
-	}
-
-	clientMaxOpenStreams := int64(option.MaxOpenStreams)
-
-	// to avoid tuic's "too many open streams", decrease to 0.9x
-	if clientMaxOpenStreams == 100 {
-		clientMaxOpenStreams = clientMaxOpenStreams - int64(math.Ceil(float64(clientMaxOpenStreams)/10.0))
-	}
-
-	if clientMaxOpenStreams < 1 {
-		clientMaxOpenStreams = 1
-	}
-	clientOption := &tuic.ClientOption{
-		TlsConfig:             tlsConfig,
-		QuicConfig:            quicConfig,
-		Host:                  host,
-		Token:                 tkn,
-		UdpRelayMode:          option.UdpRelayMode,
-		CongestionController:  option.CongestionController,
-		ReduceRtt:             option.ReduceRtt,
-		RequestTimeout:        time.Duration(option.RequestTimeout) * time.Millisecond,
-		MaxUdpRelayPacketSize: option.MaxUdpRelayPacketSize,
-		FastOpen:              option.FastOpen,
-		MaxOpenStreams:        clientMaxOpenStreams,
-	}
-
-	t.client = tuic.NewPoolClient(clientOption)
-
-	return t, nil
-}

adapter/outbound/util.go

@@ -2,13 +2,8 @@ package outbound
 
 import (
 	"bytes"
-	"context"
-	"crypto/tls"
-	xtls "github.com/xtls/go"
 	"net"
-	"net/netip"
 	"strconv"
-	"sync"
 	"time"
 
 	"github.com/Dreamacro/clash/component/resolver"
@@ -16,40 +11,20 @@ import (
 	"github.com/Dreamacro/clash/transport/socks5"
 )
 
-var (
-	globalClientSessionCache  tls.ClientSessionCache
-	globalClientXSessionCache xtls.ClientSessionCache
-	once                      sync.Once
-)
-
 func tcpKeepAlive(c net.Conn) {
 	if tcp, ok := c.(*net.TCPConn); ok {
 		_ = tcp.SetKeepAlive(true)
 		_ = tcp.SetKeepAlivePeriod(30 * time.Second)
+		_ = tcp.SetLinger(0)
 	}
 }
 
-func getClientSessionCache() tls.ClientSessionCache {
-	once.Do(func() {
-		globalClientSessionCache = tls.NewLRUClientSessionCache(128)
-	})
-	return globalClientSessionCache
-}
-
-func getClientXSessionCache() xtls.ClientSessionCache {
-	once.Do(func() {
-		globalClientXSessionCache = xtls.NewLRUClientSessionCache(128)
-	})
-	return globalClientXSessionCache
-}
-
 func serializesSocksAddr(metadata *C.Metadata) []byte {
 	var buf [][]byte
-	addrType := metadata.AddrType()
+	aType := uint8(metadata.AddrType)
-	aType := uint8(addrType)
 	p, _ := strconv.ParseUint(metadata.DstPort, 10, 16)
 	port := []byte{uint8(p >> 8), uint8(p & 0xff)}
-	switch addrType {
+	switch metadata.AddrType {
 	case socks5.AtypDomainName:
 		lenM := uint8(len(metadata.Host))
 		host := []byte(metadata.Host)
@@ -64,69 +39,13 @@ func serializesSocksAddr(metadata *C.Metadata) []byte {
 	return bytes.Join(buf, nil)
 }
 
-func resolveUDPAddr(ctx context.Context, network, address string) (*net.UDPAddr, error) {
+func resolveUDPAddr(network, address string) (*net.UDPAddr, error) {
 	host, port, err := net.SplitHostPort(address)
 	if err != nil {
 		return nil, err
 	}
 
-	ip, err := resolver.ResolveProxyServerHost(ctx, host)
+	ip, err := resolver.ResolveProxyServerHost(host)
-	if err != nil {
-		return nil, err
-	}
-	return net.ResolveUDPAddr(network, net.JoinHostPort(ip.String(), port))
-}
-
-func resolveUDPAddrWithPrefer(ctx context.Context, network, address string, prefer C.DNSPrefer) (*net.UDPAddr, error) {
-	host, port, err := net.SplitHostPort(address)
-	if err != nil {
-		return nil, err
-	}
-	var ip netip.Addr
-	var fallback netip.Addr
-	switch prefer {
-	case C.IPv4Only:
-		ip, err = resolver.ResolveIPv4ProxyServerHost(ctx, host)
-	case C.IPv6Only:
-		ip, err = resolver.ResolveIPv6ProxyServerHost(ctx, host)
-	case C.IPv6Prefer:
-		var ips []netip.Addr
-		ips, err = resolver.LookupIPProxyServerHost(ctx, host)
-		if err == nil {
-			for _, addr := range ips {
-				if addr.Is6() {
-					ip = addr
-					break
-				} else {
-					if !fallback.IsValid() {
-						fallback = addr
-					}
-				}
-			}
-		}
-	default:
-		// C.IPv4Prefer, C.DualStack and other
-		var ips []netip.Addr
-		ips, err = resolver.LookupIPProxyServerHost(ctx, host)
-		if err == nil {
-			for _, addr := range ips {
-				if addr.Is4() {
-					ip = addr
-					break
-				} else {
-					if !fallback.IsValid() {
-						fallback = addr
-					}
-				}
-			}
-
-		}
-	}
-
-	if !ip.IsValid() && fallback.IsValid() {
-		ip = fallback
-	}
-
 	if err != nil {
 		return nil, err
 	}

adapter/outbound/vless.go

@@ -12,19 +12,14 @@ import (
 	"strconv"
 	"sync"
 
-	"github.com/Dreamacro/clash/common/convert"
 	"github.com/Dreamacro/clash/component/dialer"
 	"github.com/Dreamacro/clash/component/resolver"
-	tlsC "github.com/Dreamacro/clash/component/tls"
 	C "github.com/Dreamacro/clash/constant"
 	"github.com/Dreamacro/clash/transport/gun"
-	"github.com/Dreamacro/clash/transport/socks5"
 	"github.com/Dreamacro/clash/transport/vless"
 	"github.com/Dreamacro/clash/transport/vmess"
 
-	vmessSing "github.com/sagernet/sing-vmess"
+	"golang.org/x/net/http2"
-	"github.com/sagernet/sing-vmess/packetaddr"
-	M "github.com/sagernet/sing/common/metadata"
 )
 
 const (
@@ -40,7 +35,7 @@ type Vless struct {
 	// for gun mux
 	gunTLSConfig *tls.Config
 	gunConfig    *gun.Config
-	transport    *gun.TransportWrap
+	transport    *http2.Transport
 }
 
 type VlessOption struct {
@@ -51,11 +46,7 @@ type VlessOption struct {
 	UUID           string            `proxy:"uuid"`
 	Flow           string            `proxy:"flow,omitempty"`
 	FlowShow       bool              `proxy:"flow-show,omitempty"`
-	TLS               bool              `proxy:"tls,omitempty"`
 	UDP            bool              `proxy:"udp,omitempty"`
-	PacketAddr        bool              `proxy:"packet-addr,omitempty"`
-	XUDP              bool              `proxy:"xudp,omitempty"`
-	PacketEncoding    string            `proxy:"packet-encoding,omitempty"`
 	Network        string            `proxy:"network,omitempty"`
 	HTTPOpts       HTTPOptions       `proxy:"http-opts,omitempty"`
 	HTTP2Opts      HTTP2Options      `proxy:"h2-opts,omitempty"`
@@ -64,20 +55,20 @@ type VlessOption struct {
 	WSPath         string            `proxy:"ws-path,omitempty"`
 	WSHeaders      map[string]string `proxy:"ws-headers,omitempty"`
 	SkipCertVerify bool              `proxy:"skip-cert-verify,omitempty"`
-	Fingerprint       string            `proxy:"fingerprint,omitempty"`
 	ServerName     string            `proxy:"servername,omitempty"`
-	ClientFingerprint string            `proxy:"client-fingerprint,omitempty"`
 }
 
+// StreamConn implements C.ProxyAdapter
 func (v *Vless) StreamConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) {
 	var err error
-
-	if tlsC.HaveGlobalFingerprint() && len(v.option.ClientFingerprint) == 0 {
-		v.option.ClientFingerprint = tlsC.GetGlobalFingerprint()
-	}
-
 	switch v.option.Network {
 	case "ws":
+		if v.option.WSOpts.Path == "" {
+			v.option.WSOpts.Path = v.option.WSPath
+		}
+		if len(v.option.WSOpts.Headers) == 0 {
+			v.option.WSOpts.Headers = v.option.WSHeaders
+		}
 
 		host, port, _ := net.SplitHostPort(v.addr)
 		wsOpts := &vmess.WebsocketConfig{
@@ -86,44 +77,29 @@ func (v *Vless) StreamConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) {
 			Path:                v.option.WSOpts.Path,
 			MaxEarlyData:        v.option.WSOpts.MaxEarlyData,
 			EarlyDataHeaderName: v.option.WSOpts.EarlyDataHeaderName,
-			ClientFingerprint:   v.option.ClientFingerprint,
-			Headers:             http.Header{},
 		}
 
 		if len(v.option.WSOpts.Headers) != 0 {
+			header := http.Header{}
 			for key, value := range v.option.WSOpts.Headers {
-				wsOpts.Headers.Add(key, value)
+				header.Add(key, value)
 			}
+			wsOpts.Headers = header
 		}
-		if v.option.TLS {
+
 		wsOpts.TLS = true
-			tlsConfig := &tls.Config{
+		wsOpts.TLSConfig = &tls.Config{
 			MinVersion:         tls.VersionTLS12,
 			ServerName:         host,
 			InsecureSkipVerify: v.option.SkipCertVerify,
 			NextProtos:         []string{"http/1.1"},
 		}
-
-			if len(v.option.Fingerprint) == 0 {
-				wsOpts.TLSConfig = tlsC.GetGlobalTLSConfig(tlsConfig)
-			} else {
-				wsOpts.TLSConfig, err = tlsC.GetSpecifiedFingerprintTLSConfig(tlsConfig, v.option.Fingerprint)
-				if err != nil {
-					return nil, err
-				}
-			}
-
 		if v.option.ServerName != "" {
 			wsOpts.TLSConfig.ServerName = v.option.ServerName
 		} else if host := wsOpts.Headers.Get("Host"); host != "" {
 			wsOpts.TLSConfig.ServerName = host
 		}
-		} else {
+
-			if host := wsOpts.Headers.Get("Host"); host == "" {
-				wsOpts.Headers.Set("Host", convert.RandHost())
-				convert.SetUserAgent(wsOpts.Headers)
-			}
-		}
 		c, err = vmess.StreamWebsocketConn(c, wsOpts)
 	case "http":
 		// readability first, so just copy default TLS logic
@@ -154,7 +130,11 @@ func (v *Vless) StreamConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) {
 
 		c, err = vmess.StreamH2Conn(c, h2Opts)
 	case "grpc":
+		if v.isXTLSEnabled() {
+			c, err = gun.StreamGunWithXTLSConn(c, v.gunTLSConfig, v.gunConfig)
+		} else {
 			c, err = gun.StreamGunWithConn(c, v.gunTLSConfig, v.gunConfig)
+		}
 	default:
 		// default tcp network
 		// handle TLS And XTLS
@@ -165,17 +145,40 @@ func (v *Vless) StreamConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) {
 		return nil, err
 	}
 
-	return v.client.StreamConn(c, parseVlessAddr(metadata, v.option.XUDP))
+	return v.client.StreamConn(c, parseVlessAddr(metadata))
+}
+
+// StreamPacketConn implements C.ProxyAdapter
+func (v *Vless) StreamPacketConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) {
+	// vmess use stream-oriented udp with a special address, so we needs a net.UDPAddr
+	if !metadata.Resolved() {
+		ip, err := resolver.ResolveIP(metadata.Host)
+		if err != nil {
+			return nil, errors.New("can't resolve ip")
+		}
+		metadata.DstIP = ip
+	}
+
+	var err error
+	c, err = v.StreamConn(c, metadata)
+	if err != nil {
+		return nil, fmt.Errorf("new vmess client error: %v", err)
+	}
+
+	return WrapConn(&vlessPacketConn{Conn: c, rAddr: metadata.UDPAddr()}), nil
 }
 
 func (v *Vless) streamTLSOrXTLSConn(conn net.Conn, isH2 bool) (net.Conn, error) {
 	host, _, _ := net.SplitHostPort(v.addr)
 
-	if v.isLegacyXTLSEnabled() && !isH2 {
+	if v.isXTLSEnabled() {
 		xtlsOpts := vless.XTLSConfig{
 			Host:           host,
 			SkipCertVerify: v.option.SkipCertVerify,
-			Fingerprint:    v.option.Fingerprint,
+		}
+
+		if isH2 {
+			xtlsOpts.NextProtos = []string{"h2"}
 		}
 
 		if v.option.ServerName != "" {
@@ -184,12 +187,10 @@ func (v *Vless) streamTLSOrXTLSConn(conn net.Conn, isH2 bool) (net.Conn, error)
 
 		return vless.StreamXTLSConn(conn, &xtlsOpts)
 
-	} else if v.option.TLS {
+	} else {
 		tlsOpts := vmess.TLSConfig{
 			Host:           host,
 			SkipCertVerify: v.option.SkipCertVerify,
-			FingerPrint:       v.option.Fingerprint,
-			ClientFingerprint: v.option.ClientFingerprint,
 		}
 
 		if isH2 {
@@ -202,12 +203,10 @@ func (v *Vless) streamTLSOrXTLSConn(conn net.Conn, isH2 bool) (net.Conn, error)
 
 		return vmess.StreamTLSConn(conn, &tlsOpts)
 	}
-
-	return conn, nil
 }
 
-func (v *Vless) isLegacyXTLSEnabled() bool {
+func (v *Vless) isXTLSEnabled() bool {
-	return v.client.Addons != nil && v.client.Addons.Flow != vless.XRV
+	return v.client.Addons != nil
 }
 
 // DialContext implements C.ProxyAdapter
@@ -218,158 +217,88 @@ func (v *Vless) DialContext(ctx context.Context, metadata *C.Metadata, opts ...d
 		if err != nil {
 			return nil, err
 		}
-		defer func(c net.Conn) {
+		defer safeConnClose(c, err)
-			safeConnClose(c, err)
-		}(c)
 
-		c, err = v.client.StreamConn(c, parseVlessAddr(metadata, v.option.XUDP))
+		c, err = v.client.StreamConn(c, parseVlessAddr(metadata))
 		if err != nil {
 			return nil, err
 		}
 
 		return NewConn(c, v), nil
 	}
-	return v.DialContextWithDialer(ctx, dialer.NewDialer(v.Base.DialOptions(opts...)...), metadata)
-}
 
-// DialContextWithDialer implements C.ProxyAdapter
+	c, err := dialer.DialContext(ctx, "tcp", v.addr, v.Base.DialOptions(opts...)...)
-func (v *Vless) DialContextWithDialer(ctx context.Context, dialer C.Dialer, metadata *C.Metadata) (_ C.Conn, err error) {
-	c, err := dialer.DialContext(ctx, "tcp", v.addr)
 	if err != nil {
 		return nil, fmt.Errorf("%s connect error: %s", v.addr, err.Error())
 	}
 	tcpKeepAlive(c)
-	defer func(c net.Conn) {
+	defer safeConnClose(c, err)
-		safeConnClose(c, err)
-	}(c)
 
 	c, err = v.StreamConn(c, metadata)
-	if err != nil {
-		return nil, fmt.Errorf("%s connect error: %s", v.addr, err.Error())
-	}
 	return NewConn(c, v), err
 }
 
 // ListenPacketContext implements C.ProxyAdapter
 func (v *Vless) ListenPacketContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (_ C.PacketConn, err error) {
-	// vless use stream-oriented udp with a special address, so we need a net.UDPAddr
+	var c net.Conn
+	// gun transport
+	if v.transport != nil && len(opts) == 0 {
+		// vless use stream-oriented udp with a special address, so we needs a net.UDPAddr
 		if !metadata.Resolved() {
-		ip, err := resolver.ResolveIP(ctx, metadata.Host)
+			ip, err := resolver.ResolveIP(metadata.Host)
 			if err != nil {
 				return nil, errors.New("can't resolve ip")
 			}
 			metadata.DstIP = ip
 		}
 
-	var c net.Conn
-	// gun transport
-	if v.transport != nil && len(opts) == 0 {
 		c, err = gun.StreamGunWithTransport(v.transport, v.gunConfig)
 		if err != nil {
 			return nil, err
 		}
-		defer func(c net.Conn) {
+		defer safeConnClose(c, err)
-			safeConnClose(c, err)
-		}(c)
-
-		if v.option.PacketAddr {
-			packetAddrMetadata := *metadata // make a copy
-			packetAddrMetadata.Host = packetaddr.SeqPacketMagicAddress
-			packetAddrMetadata.DstPort = "443"
-
-			c, err = v.client.StreamConn(c, parseVlessAddr(&packetAddrMetadata, false))
-		} else {
-			c, err = v.client.StreamConn(c, parseVlessAddr(metadata, v.option.XUDP))
-		}
 
+		c, err = v.client.StreamConn(c, parseVlessAddr(metadata))
 		if err != nil {
 			return nil, fmt.Errorf("new vless client error: %v", err)
 		}
 
-		return v.ListenPacketOnStreamConn(c, metadata)
+		return NewPacketConn(&vlessPacketConn{Conn: c, rAddr: metadata.UDPAddr()}, v), nil
 	}
-	return v.ListenPacketWithDialer(ctx, dialer.NewDialer(v.Base.DialOptions(opts...)...), metadata)
-}
 
-// ListenPacketWithDialer implements C.ProxyAdapter
+	c, err = dialer.DialContext(ctx, "tcp", v.addr, v.Base.DialOptions(opts...)...)
-func (v *Vless) ListenPacketWithDialer(ctx context.Context, dialer C.Dialer, metadata *C.Metadata) (_ C.PacketConn, err error) {
-	// vless use stream-oriented udp with a special address, so we need a net.UDPAddr
-	if !metadata.Resolved() {
-		ip, err := resolver.ResolveIP(ctx, metadata.Host)
-		if err != nil {
-			return nil, errors.New("can't resolve ip")
-		}
-		metadata.DstIP = ip
-	}
-	c, err := dialer.DialContext(ctx, "tcp", v.addr)
 	if err != nil {
 		return nil, fmt.Errorf("%s connect error: %s", v.addr, err.Error())
 	}
+
 	tcpKeepAlive(c)
-	defer func(c net.Conn) {
+	defer safeConnClose(c, err)
-		safeConnClose(c, err)
-	}(c)
-
-	if v.option.PacketAddr {
-		packetAddrMetadata := *metadata // make a copy
-		packetAddrMetadata.Host = packetaddr.SeqPacketMagicAddress
-		packetAddrMetadata.DstPort = "443"
-
-		c, err = v.StreamConn(c, &packetAddrMetadata)
-	} else {
-		c, err = v.StreamConn(c, metadata)
-	}
 
+	c, err = v.StreamPacketConn(c, metadata)
 	if err != nil {
 		return nil, fmt.Errorf("new vless client error: %v", err)
 	}
 
-	return v.ListenPacketOnStreamConn(c, metadata)
+	return NewPacketConn(c.(net.PacketConn), v), nil
 }
 
-// SupportWithDialer implements C.ProxyAdapter
+func parseVlessAddr(metadata *C.Metadata) *vless.DstAddr {
-func (v *Vless) SupportWithDialer() bool {
-	return true
-}
-
-// ListenPacketOnStreamConn implements C.ProxyAdapter
-func (v *Vless) ListenPacketOnStreamConn(c net.Conn, metadata *C.Metadata) (_ C.PacketConn, err error) {
-	if v.option.XUDP {
-		return newPacketConn(&threadSafePacketConn{
-			PacketConn: vmessSing.NewXUDPConn(c, M.ParseSocksaddr(metadata.RemoteAddress())),
-		}, v), nil
-	} else if v.option.PacketAddr {
-		return newPacketConn(&threadSafePacketConn{
-			PacketConn: packetaddr.NewConn(&vlessPacketConn{
-				Conn: c, rAddr: metadata.UDPAddr(),
-			}, M.ParseSocksaddr(metadata.RemoteAddress())),
-		}, v), nil
-	}
-	return newPacketConn(&vlessPacketConn{Conn: c, rAddr: metadata.UDPAddr()}, v), nil
-}
-
-// SupportUOT implements C.ProxyAdapter
-func (v *Vless) SupportUOT() bool {
-	return true
-}
-
-func parseVlessAddr(metadata *C.Metadata, xudp bool) *vless.DstAddr {
 	var addrType byte
 	var addr []byte
-	switch metadata.AddrType() {
+	switch metadata.AddrType {
-	case socks5.AtypIPv4:
+	case C.AtypIPv4:
-		addrType = vless.AtypIPv4
+		addrType = byte(vless.AtypIPv4)
 		addr = make([]byte, net.IPv4len)
 		copy(addr[:], metadata.DstIP.AsSlice())
-	case socks5.AtypIPv6:
+	case C.AtypIPv6:
-		addrType = vless.AtypIPv6
+		addrType = byte(vless.AtypIPv6)
 		addr = make([]byte, net.IPv6len)
 		copy(addr[:], metadata.DstIP.AsSlice())
-	case socks5.AtypDomainName:
+	case C.AtypDomainName:
-		addrType = vless.AtypDomainName
+		addrType = byte(vless.AtypDomainName)
 		addr = make([]byte, len(metadata.Host)+1)
 		addr[0] = byte(len(metadata.Host))
-		copy(addr[1:], metadata.Host)
+		copy(addr[1:], []byte(metadata.Host))
 	}
 
 	port, _ := strconv.ParseUint(metadata.DstPort, 10, 16)
@@ -377,48 +306,36 @@ func parseVlessAddr(metadata *C.Metadata, xudp bool) *vless.DstAddr {
 		UDP:      metadata.NetWork == C.UDP,
 		AddrType: addrType,
 		Addr:     addr,
-		Port:     uint16(port),
+		Port:     uint(port),
-		Mux:      metadata.NetWork == C.UDP && xudp,
 	}
 }
 
 type vlessPacketConn struct {
 	net.Conn
 	rAddr  net.Addr
+	cache  [2]byte
 	remain int
 	mux    sync.Mutex
-	cache  [2]byte
 }
 
-func (c *vlessPacketConn) writePacket(payload []byte) (int, error) {
+func (vc *vlessPacketConn) WriteTo(b []byte, _ net.Addr) (int, error) {
-	binary.BigEndian.PutUint16(c.cache[:], uint16(len(payload)))
-
-	if _, err := c.Conn.Write(c.cache[:]); err != nil {
-		return 0, err
-	}
-
-	return c.Conn.Write(payload)
-}
-
-func (c *vlessPacketConn) WriteTo(b []byte, addr net.Addr) (int, error) {
 	total := len(b)
 	if total == 0 {
 		return 0, nil
 	}
 
-	if total <= maxLength {
+	if total < maxLength {
-		return c.writePacket(b)
+		return vc.writePacket(b)
 	}
 
 	offset := 0
-
+	for {
-	for offset < total {
 		cursor := offset + maxLength
 		if cursor > total {
 			cursor = total
 		}
 
-		n, err := c.writePacket(b[offset:cursor])
+		n, err := vc.writePacket(b[offset:cursor])
 		if err != nil {
 			return offset + n, err
 		}
@@ -432,32 +349,33 @@ func (c *vlessPacketConn) WriteTo(b []byte, addr net.Addr) (int, error) {
 	return total, nil
 }
 
-func (c *vlessPacketConn) ReadFrom(b []byte) (int, net.Addr, error) {
+func (vc *vlessPacketConn) ReadFrom(b []byte) (int, net.Addr, error) {
-	c.mux.Lock()
+	vc.mux.Lock()
-	defer c.mux.Unlock()
+	defer vc.mux.Unlock()
 
-	if c.remain > 0 {
+	if vc.remain != 0 {
 		length := len(b)
-		if c.remain < length {
+		if length > vc.remain {
-			length = c.remain
+			length = vc.remain
 		}
 
-		n, err := c.Conn.Read(b[:length])
+		n, err := vc.Conn.Read(b[:length])
 		if err != nil {
-			return 0, c.rAddr, err
+			return 0, vc.rAddr, err
 		}
 
-		c.remain -= n
+		vc.remain -= n
-		return n, c.rAddr, nil
+
+		return n, vc.rAddr, nil
 	}
 
-	if _, err := c.Conn.Read(b[:2]); err != nil {
+	if _, err := vc.Conn.Read(b[:2]); err != nil {
-		return 0, c.rAddr, err
+		return 0, vc.rAddr, err
 	}
 
 	total := int(binary.BigEndian.Uint16(b[:2]))
 	if total == 0 {
-		return 0, c.rAddr, nil
+		return 0, vc.rAddr, nil
 	}
 
 	length := len(b)
@@ -465,13 +383,23 @@ func (c *vlessPacketConn) ReadFrom(b []byte) (int, net.Addr, error) {
 		length = total
 	}
 
-	if _, err := io.ReadFull(c.Conn, b[:length]); err != nil {
+	if _, err := io.ReadFull(vc.Conn, b[:length]); err != nil {
-		return 0, c.rAddr, errors.New("read packet error")
+		return 0, vc.rAddr, errors.New("read packet error")
 	}
 
-	c.remain = total - length
+	vc.remain = total - length
 
-	return length, c.rAddr, nil
+	return length, vc.rAddr, nil
+}
+
+func (vc *vlessPacketConn) writePacket(payload []byte) (int, error) {
+	binary.BigEndian.PutUint16(vc.cache[:], uint16(len(payload)))
+
+	if _, err := vc.Conn.Write(vc.cache[:]); err != nil {
+		return 0, err
+	}
+
+	return vc.Conn.Write(payload)
 }
 
 func NewVless(option VlessOption) (*Vless, error) {
@@ -479,7 +407,7 @@ func NewVless(option VlessOption) (*Vless, error) {
 	if option.Network != "ws" && len(option.Flow) >= 16 {
 		option.Flow = option.Flow[:16]
 		switch option.Flow {
-		case vless.XRO, vless.XRD, vless.XRS, vless.XRV:
+		case vless.XRO, vless.XRD, vless.XRS:
 			addons = &vless.Addons{
 				Flow: option.Flow,
 			}
@@ -488,16 +416,6 @@ func NewVless(option VlessOption) (*Vless, error) {
 		}
 	}
 
-	switch option.PacketEncoding {
-	case "packetaddr", "packet":
-		option.PacketAddr = true
-		option.XUDP = false
-	default: // https://github.com/XTLS/Xray-core/pull/1567#issuecomment-1407305458
-		if !option.PacketAddr {
-			option.XUDP = true
-		}
-	}
-
 	client, err := vless.NewClient(option.UUID, addons, option.FlowShow)
 	if err != nil {
 		return nil, err
@@ -509,11 +427,7 @@ func NewVless(option VlessOption) (*Vless, error) {
 			addr:  net.JoinHostPort(option.Server, strconv.Itoa(option.Port)),
 			tp:    C.Vless,
 			udp:   option.UDP,
-			xudp:   option.XUDP,
-			tfo:    option.TFO,
 			iface: option.Interface,
-			rmark:  option.RoutingMark,
-			prefer: C.NewDNSPrefer(option.IPVersion),
 		},
 		client: client,
 		option: &option,
@@ -537,12 +451,11 @@ func NewVless(option VlessOption) (*Vless, error) {
 		gunConfig := &gun.Config{
 			ServiceName: v.option.GrpcOpts.GrpcServiceName,
 			Host:        v.option.ServerName,
-			ClientFingerprint: v.option.ClientFingerprint,
 		}
-		tlsConfig := tlsC.GetGlobalTLSConfig(&tls.Config{
+		tlsConfig := &tls.Config{
 			InsecureSkipVerify: v.option.SkipCertVerify,
 			ServerName:         v.option.ServerName,
-		})
+		}
 
 		if v.option.ServerName == "" {
 			host, _, _ := net.SplitHostPort(v.addr)
@@ -552,9 +465,11 @@ func NewVless(option VlessOption) (*Vless, error) {
 
 		v.gunTLSConfig = tlsConfig
 		v.gunConfig = gunConfig
-
+		if v.isXTLSEnabled() {
-		v.transport = gun.NewHTTP2Client(dialFn, tlsConfig, v.option.ClientFingerprint)
+			v.transport = gun.NewHTTP2XTLSClient(dialFn, tlsConfig)
-
+		} else {
+			v.transport = gun.NewHTTP2Client(dialFn, tlsConfig)
+		}
 	}
 
 	return v, nil

adapter/outbound/vmess.go

@@ -3,28 +3,22 @@ package outbound
 import (
 	"context"
 	"crypto/tls"
-	"errors"
 	"fmt"
 	"net"
 	"net/http"
 	"strconv"
 	"strings"
-	"sync"
 
+	"github.com/Dreamacro/clash/common/convert"
 	"github.com/Dreamacro/clash/component/dialer"
 	"github.com/Dreamacro/clash/component/resolver"
-	tlsC "github.com/Dreamacro/clash/component/tls"
 	C "github.com/Dreamacro/clash/constant"
 	"github.com/Dreamacro/clash/transport/gun"
-	clashVMess "github.com/Dreamacro/clash/transport/vmess"
+	"github.com/Dreamacro/clash/transport/vmess"
 
-	vmess "github.com/sagernet/sing-vmess"
+	"golang.org/x/net/http2"
-	"github.com/sagernet/sing-vmess/packetaddr"
-	M "github.com/sagernet/sing/common/metadata"
 )
 
-var ErrUDPRemoteAddrMismatch = errors.New("udp packet dropped due to mismatched remote address")
-
 type Vmess struct {
 	*Base
 	client *vmess.Client
@@ -33,7 +27,7 @@ type Vmess struct {
 	// for gun mux
 	gunTLSConfig *tls.Config
 	gunConfig    *gun.Config
-	transport    *gun.TransportWrap
+	transport    *http2.Transport
 }
 
 type VmessOption struct {
@@ -48,18 +42,15 @@ type VmessOption struct {
 	Network        string       `proxy:"network,omitempty"`
 	TLS            bool         `proxy:"tls,omitempty"`
 	SkipCertVerify bool         `proxy:"skip-cert-verify,omitempty"`
-	Fingerprint         string       `proxy:"fingerprint,omitempty"`
 	ServerName     string       `proxy:"servername,omitempty"`
 	HTTPOpts       HTTPOptions  `proxy:"http-opts,omitempty"`
 	HTTP2Opts      HTTP2Options `proxy:"h2-opts,omitempty"`
 	GrpcOpts       GrpcOptions  `proxy:"grpc-opts,omitempty"`
 	WSOpts         WSOptions    `proxy:"ws-opts,omitempty"`
-	PacketAddr          bool         `proxy:"packet-addr,omitempty"`
+
-	XUDP                bool         `proxy:"xudp,omitempty"`
+	// TODO: compatible with VMESS WS older version configurations
-	PacketEncoding      string       `proxy:"packet-encoding,omitempty"`
+	WSHeaders map[string]string `proxy:"ws-headers,omitempty"`
-	GlobalPadding       bool         `proxy:"global-padding,omitempty"`
+	WSPath    string            `proxy:"ws-path,omitempty"`
-	AuthenticatedLength bool         `proxy:"authenticated-length,omitempty"`
-	ClientFingerprint   string       `proxy:"client-fingerprint,omitempty"`
 }
 
 type HTTPOptions struct {
@@ -87,23 +78,23 @@ type WSOptions struct {
 // StreamConn implements C.ProxyAdapter
 func (v *Vmess) StreamConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) {
 	var err error
-
-	if tlsC.HaveGlobalFingerprint() && (len(v.option.ClientFingerprint) == 0) {
-		v.option.ClientFingerprint = tlsC.GetGlobalFingerprint()
-	}
-
 	switch v.option.Network {
 	case "ws":
+		if v.option.WSOpts.Path == "" {
+			v.option.WSOpts.Path = v.option.WSPath
+		}
+		if len(v.option.WSOpts.Headers) == 0 {
+			v.option.WSOpts.Headers = v.option.WSHeaders
+		}
 
 		host, port, _ := net.SplitHostPort(v.addr)
-		wsOpts := &clashVMess.WebsocketConfig{
+		wsOpts := &vmess.WebsocketConfig{
 			Host:                host,
 			Port:                port,
+			Headers:             http.Header{},
 			Path:                v.option.WSOpts.Path,
 			MaxEarlyData:        v.option.WSOpts.MaxEarlyData,
 			EarlyDataHeaderName: v.option.WSOpts.EarlyDataHeaderName,
-			ClientFingerprint:   v.option.ClientFingerprint,
-			Headers:             http.Header{},
 		}
 
 		if len(v.option.WSOpts.Headers) != 0 {
@@ -114,112 +105,118 @@ func (v *Vmess) StreamConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) {
 
 		if v.option.TLS {
 			wsOpts.TLS = true
-			tlsConfig := &tls.Config{
+			wsOpts.TLSConfig = &tls.Config{
 				ServerName:         host,
 				InsecureSkipVerify: v.option.SkipCertVerify,
 				NextProtos:         []string{"http/1.1"},
 			}
-
-			if len(v.option.Fingerprint) == 0 {
-				wsOpts.TLSConfig = tlsC.GetGlobalTLSConfig(tlsConfig)
-			} else {
-				if wsOpts.TLSConfig, err = tlsC.GetSpecifiedFingerprintTLSConfig(tlsConfig, v.option.Fingerprint); err != nil {
-					return nil, err
-				}
-			}
-
 			if v.option.ServerName != "" {
 				wsOpts.TLSConfig.ServerName = v.option.ServerName
 			} else if host := wsOpts.Headers.Get("Host"); host != "" {
 				wsOpts.TLSConfig.ServerName = host
 			}
+		} else {
+			if wsOpts.Headers.Get("Host") == "" {
+				wsOpts.Headers.Set("Host", convert.RandHost())
 			}
-		c, err = clashVMess.StreamWebsocketConn(c, wsOpts)
+			convert.SetUserAgent(wsOpts.Headers)
+		}
+		c, err = vmess.StreamWebsocketConn(c, wsOpts)
 	case "http":
 		// readability first, so just copy default TLS logic
 		if v.option.TLS {
 			host, _, _ := net.SplitHostPort(v.addr)
-			tlsOpts := &clashVMess.TLSConfig{
+			tlsOpts := &vmess.TLSConfig{
 				Host:           host,
 				SkipCertVerify: v.option.SkipCertVerify,
-				ClientFingerprint: v.option.ClientFingerprint,
 			}
 
 			if v.option.ServerName != "" {
 				tlsOpts.Host = v.option.ServerName
 			}
 
-			c, err = clashVMess.StreamTLSConn(c, tlsOpts)
+			c, err = vmess.StreamTLSConn(c, tlsOpts)
 			if err != nil {
 				return nil, err
 			}
 		}
 
 		host, _, _ := net.SplitHostPort(v.addr)
-		httpOpts := &clashVMess.HTTPConfig{
+		httpOpts := &vmess.HTTPConfig{
 			Host:    host,
 			Method:  v.option.HTTPOpts.Method,
 			Path:    v.option.HTTPOpts.Path,
 			Headers: v.option.HTTPOpts.Headers,
 		}
 
-		c = clashVMess.StreamHTTPConn(c, httpOpts)
+		c = vmess.StreamHTTPConn(c, httpOpts)
 	case "h2":
 		host, _, _ := net.SplitHostPort(v.addr)
-		tlsOpts := clashVMess.TLSConfig{
+		tlsOpts := vmess.TLSConfig{
 			Host:           host,
 			SkipCertVerify: v.option.SkipCertVerify,
 			NextProtos:     []string{"h2"},
-			ClientFingerprint: v.option.ClientFingerprint,
 		}
 
 		if v.option.ServerName != "" {
 			tlsOpts.Host = v.option.ServerName
 		}
 
-		c, err = clashVMess.StreamTLSConn(c, &tlsOpts)
+		c, err = vmess.StreamTLSConn(c, &tlsOpts)
 		if err != nil {
 			return nil, err
 		}
 
-		h2Opts := &clashVMess.H2Config{
+		h2Opts := &vmess.H2Config{
 			Hosts: v.option.HTTP2Opts.Host,
 			Path:  v.option.HTTP2Opts.Path,
 		}
 
-		c, err = clashVMess.StreamH2Conn(c, h2Opts)
+		c, err = vmess.StreamH2Conn(c, h2Opts)
 	case "grpc":
 		c, err = gun.StreamGunWithConn(c, v.gunTLSConfig, v.gunConfig)
 	default:
 		// handle TLS
 		if v.option.TLS {
 			host, _, _ := net.SplitHostPort(v.addr)
-			tlsOpts := &clashVMess.TLSConfig{
+			tlsOpts := &vmess.TLSConfig{
 				Host:           host,
 				SkipCertVerify: v.option.SkipCertVerify,
-				ClientFingerprint: v.option.ClientFingerprint,
 			}
 
 			if v.option.ServerName != "" {
 				tlsOpts.Host = v.option.ServerName
 			}
 
-			c, err = clashVMess.StreamTLSConn(c, tlsOpts)
+			c, err = vmess.StreamTLSConn(c, tlsOpts)
 		}
 	}
 
 	if err != nil {
 		return nil, err
 	}
-	if metadata.NetWork == C.UDP {
+
-		if v.option.XUDP {
+	return v.client.StreamConn(c, parseVmessAddr(metadata))
-			return v.client.DialEarlyXUDPPacketConn(c, M.ParseSocksaddr(metadata.RemoteAddress())), nil
+}
-		} else {
+
-			return v.client.DialEarlyPacketConn(c, M.ParseSocksaddr(metadata.RemoteAddress())), nil
+// StreamPacketConn implements C.ProxyAdapter
+func (v *Vmess) StreamPacketConn(c net.Conn, metadata *C.Metadata) (net.Conn, error) {
+	// vmess use stream-oriented udp with a special address, so we needs a net.UDPAddr
+	if !metadata.Resolved() {
+		ip, err := resolver.ResolveIP(metadata.Host)
+		if err != nil {
+			return c, fmt.Errorf("can't resolve ip: %w", err)
 		}
-	} else {
+		metadata.DstIP = ip
-		return v.client.DialEarlyConn(c, M.ParseSocksaddr(metadata.RemoteAddress())), nil
 	}
+
+	var err error
+	c, err = v.StreamConn(c, metadata)
+	if err != nil {
+		return c, fmt.Errorf("new vmess client error: %v", err)
+	}
+
+	return WrapConn(&vmessPacketConn{Conn: c, rAddr: metadata.UDPAddr()}), nil
 }
 
 // DialContext implements C.ProxyAdapter
@@ -230,30 +227,22 @@ func (v *Vmess) DialContext(ctx context.Context, metadata *C.Metadata, opts ...d
 		if err != nil {
 			return nil, err
 		}
-		defer func(c net.Conn) {
+		defer safeConnClose(c, err)
-			safeConnClose(c, err)
-		}(c)
 
-		c, err = v.client.DialConn(c, M.ParseSocksaddr(metadata.RemoteAddress()))
+		c, err = v.client.StreamConn(c, parseVmessAddr(metadata))
 		if err != nil {
 			return nil, err
 		}
 
 		return NewConn(c, v), nil
 	}
-	return v.DialContextWithDialer(ctx, dialer.NewDialer(v.Base.DialOptions(opts...)...), metadata)
-}
 
-// DialContextWithDialer implements C.ProxyAdapter
+	c, err := dialer.DialContext(ctx, "tcp", v.addr, v.Base.DialOptions(opts...)...)
-func (v *Vmess) DialContextWithDialer(ctx context.Context, dialer C.Dialer, metadata *C.Metadata) (_ C.Conn, err error) {
-	c, err := dialer.DialContext(ctx, "tcp", v.addr)
 	if err != nil {
 		return nil, fmt.Errorf("%s connect error: %s", v.addr, err.Error())
 	}
 	tcpKeepAlive(c)
-	defer func(c net.Conn) {
+	defer safeConnClose(c, err)
-		safeConnClose(c, err)
-	}(c)
 
 	c, err = v.StreamConn(c, metadata)
 	return NewConn(c, v), err
@@ -261,122 +250,66 @@ func (v *Vmess) DialContextWithDialer(ctx context.Context, dialer C.Dialer, meta
 
 // ListenPacketContext implements C.ProxyAdapter
 func (v *Vmess) ListenPacketContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (_ C.PacketConn, err error) {
-	// vmess use stream-oriented udp with a special address, so we need a net.UDPAddr
+	var c net.Conn
+	// gun transport
+	if v.transport != nil && len(opts) == 0 {
+		// vmess use stream-oriented udp with a special address, so we needs a net.UDPAddr
 		if !metadata.Resolved() {
-		ip, err := resolver.ResolveIP(ctx, metadata.Host)
+			ip, err := resolver.ResolveIP(metadata.Host)
 			if err != nil {
-			return nil, errors.New("can't resolve ip")
+				return nil, fmt.Errorf("can't resolve ip: %w", err)
 			}
 			metadata.DstIP = ip
 		}
 
-	if v.option.PacketAddr {
-		_metadata := *metadata // make a copy
-		metadata = &_metadata
-		metadata.Host = packetaddr.SeqPacketMagicAddress
-		metadata.DstPort = "443"
-	}
-
-	var c net.Conn
-	// gun transport
-	if v.transport != nil && len(opts) == 0 {
 		c, err = gun.StreamGunWithTransport(v.transport, v.gunConfig)
 		if err != nil {
 			return nil, err
 		}
-		defer func(c net.Conn) {
+		defer safeConnClose(c, err)
-			safeConnClose(c, err)
-		}(c)
-
-		if v.option.XUDP {
-			c = v.client.DialEarlyXUDPPacketConn(c, M.ParseSocksaddr(metadata.RemoteAddress()))
-		} else {
-			c = v.client.DialEarlyPacketConn(c, M.ParseSocksaddr(metadata.RemoteAddress()))
-		}
 
+		c, err = v.client.StreamConn(c, parseVmessAddr(metadata))
 		if err != nil {
 			return nil, fmt.Errorf("new vmess client error: %v", err)
 		}
-		return v.ListenPacketOnStreamConn(c, metadata)
-	}
-	return v.ListenPacketWithDialer(ctx, dialer.NewDialer(v.Base.DialOptions(opts...)...), metadata)
-}
 
-// ListenPacketWithDialer implements C.ProxyAdapter
+		return NewPacketConn(&vmessPacketConn{Conn: c, rAddr: metadata.UDPAddr()}, v), nil
-func (v *Vmess) ListenPacketWithDialer(ctx context.Context, dialer C.Dialer, metadata *C.Metadata) (_ C.PacketConn, err error) {
-	// vmess use stream-oriented udp with a special address, so we need a net.UDPAddr
-	if !metadata.Resolved() {
-		ip, err := resolver.ResolveIP(ctx, metadata.Host)
-		if err != nil {
-			return nil, errors.New("can't resolve ip")
-		}
-		metadata.DstIP = ip
 	}
 
-	c, err := dialer.DialContext(ctx, "tcp", v.addr)
+	c, err = dialer.DialContext(ctx, "tcp", v.addr, v.Base.DialOptions(opts...)...)
 	if err != nil {
 		return nil, fmt.Errorf("%s connect error: %s", v.addr, err.Error())
 	}
-	tcpKeepAlive(c)
-	defer func(c net.Conn) {
-		safeConnClose(c, err)
-	}(c)
 
-	c, err = v.StreamConn(c, metadata)
+	tcpKeepAlive(c)
+	defer safeConnClose(c, err)
+
+	c, err = v.StreamPacketConn(c, metadata)
 	if err != nil {
 		return nil, fmt.Errorf("new vmess client error: %v", err)
 	}
-	return v.ListenPacketOnStreamConn(c, metadata)
-}
 
-// SupportWithDialer implements C.ProxyAdapter
+	return NewPacketConn(c.(net.PacketConn), v), nil
-func (v *Vmess) SupportWithDialer() bool {
-	return true
-}
-
-// ListenPacketOnStreamConn implements C.ProxyAdapter
-func (v *Vmess) ListenPacketOnStreamConn(c net.Conn, metadata *C.Metadata) (_ C.PacketConn, err error) {
-	if v.option.PacketAddr {
-		return newPacketConn(&threadSafePacketConn{PacketConn: packetaddr.NewBindConn(c)}, v), nil
-	} else if pc, ok := c.(net.PacketConn); ok {
-		return newPacketConn(&threadSafePacketConn{PacketConn: pc}, v), nil
-	}
-	return newPacketConn(&vmessPacketConn{Conn: c, rAddr: metadata.UDPAddr()}, v), nil
-}
-
-// SupportUOT implements C.ProxyAdapter
-func (v *Vmess) SupportUOT() bool {
-	return true
 }
 
 func NewVmess(option VmessOption) (*Vmess, error) {
 	security := strings.ToLower(option.Cipher)
-	var options []vmess.ClientOption
+	client, err := vmess.NewClient(vmess.Config{
-	if option.GlobalPadding {
+		UUID:     option.UUID,
-		options = append(options, vmess.ClientWithGlobalPadding())
+		AlterID:  uint16(option.AlterID),
-	}
+		Security: security,
-	if option.AuthenticatedLength {
+		HostName: option.Server,
-		options = append(options, vmess.ClientWithAuthenticatedLength())
+		Port:     strconv.Itoa(option.Port),
-	}
+		IsAead:   option.AlterID == 0,
-	client, err := vmess.NewClient(option.UUID, security, option.AlterID, options...)
+	})
 	if err != nil {
 		return nil, err
 	}
 
-	switch option.PacketEncoding {
-	case "packetaddr", "packet":
-		option.PacketAddr = true
-	case "xudp":
-		option.XUDP = true
-	}
-	if option.XUDP {
-		option.PacketAddr = false
-	}
-
 	switch option.Network {
 	case "h2", "grpc":
 		if !option.TLS {
-			option.TLS = true
+			return nil, fmt.Errorf("TLS must be true with h2/grpc network")
 		}
 	}
 
@@ -386,11 +319,8 @@ func NewVmess(option VmessOption) (*Vmess, error) {
 			addr:  net.JoinHostPort(option.Server, strconv.Itoa(option.Port)),
 			tp:    C.Vmess,
 			udp:   option.UDP,
-			xudp:   option.XUDP,
-			tfo:    option.TFO,
 			iface: option.Interface,
 			rmark: option.RoutingMark,
-			prefer: C.NewDNSPrefer(option.IPVersion),
 		},
 		client: client,
 		option: &option,
@@ -414,7 +344,6 @@ func NewVmess(option VmessOption) (*Vmess, error) {
 		gunConfig := &gun.Config{
 			ServiceName: v.option.GrpcOpts.GrpcServiceName,
 			Host:        v.option.ServerName,
-			ClientFingerprint: v.option.ClientFingerprint,
 		}
 		tlsConfig := &tls.Config{
 			InsecureSkipVerify: v.option.SkipCertVerify,
@@ -429,40 +358,46 @@ func NewVmess(option VmessOption) (*Vmess, error) {
 
 		v.gunTLSConfig = tlsConfig
 		v.gunConfig = gunConfig
-
+		v.transport = gun.NewHTTP2Client(dialFn, tlsConfig)
-		v.transport = gun.NewHTTP2Client(dialFn, tlsConfig, v.option.ClientFingerprint)
-
 	}
+
 	return v, nil
 }
 
-type threadSafePacketConn struct {
+func parseVmessAddr(metadata *C.Metadata) *vmess.DstAddr {
-	net.PacketConn
+	var addrType byte
-	access sync.Mutex
+	var addr []byte
-}
+	switch metadata.AddrType {
+	case C.AtypIPv4:
+		addrType = byte(vmess.AtypIPv4)
+		addr = make([]byte, net.IPv4len)
+		copy(addr[:], metadata.DstIP.AsSlice())
+	case C.AtypIPv6:
+		addrType = byte(vmess.AtypIPv6)
+		addr = make([]byte, net.IPv6len)
+		copy(addr[:], metadata.DstIP.AsSlice())
+	case C.AtypDomainName:
+		addrType = byte(vmess.AtypDomainName)
+		addr = make([]byte, len(metadata.Host)+1)
+		addr[0] = byte(len(metadata.Host))
+		copy(addr[1:], []byte(metadata.Host))
+	}
 
-func (c *threadSafePacketConn) WriteTo(b []byte, addr net.Addr) (int, error) {
+	port, _ := strconv.ParseUint(metadata.DstPort, 10, 16)
-	c.access.Lock()
+	return &vmess.DstAddr{
-	defer c.access.Unlock()
+		UDP:      metadata.NetWork == C.UDP,
-	return c.PacketConn.WriteTo(b, addr)
+		AddrType: addrType,
+		Addr:     addr,
+		Port:     uint(port),
+	}
 }
 
 type vmessPacketConn struct {
 	net.Conn
 	rAddr net.Addr
-	access sync.Mutex
 }
 
-// WriteTo implments C.PacketConn.WriteTo
+func (uc *vmessPacketConn) WriteTo(b []byte, _ net.Addr) (int, error) {
-// Since VMess doesn't support full cone NAT by design, we verify if addr matches uc.rAddr, and drop the packet if not.
-func (uc *vmessPacketConn) WriteTo(b []byte, addr net.Addr) (int, error) {
-	allowedAddr := uc.rAddr.(*net.UDPAddr)
-	destAddr := addr.(*net.UDPAddr)
-	if !(allowedAddr.IP.Equal(destAddr.IP) && allowedAddr.Port == destAddr.Port) {
-		return 0, ErrUDPRemoteAddrMismatch
-	}
-	uc.access.Lock()
-	defer uc.access.Unlock()
 	return uc.Conn.Write(b)
 }
 

adapter/outbound/wireguard.go

@@ -1,258 +0,0 @@
-package outbound
-
-import (
-	"context"
-	"encoding/base64"
-	"encoding/hex"
-	"errors"
-	"fmt"
-	"net"
-	"net/netip"
-	"runtime"
-	"strconv"
-	"strings"
-	"sync"
-
-	CN "github.com/Dreamacro/clash/common/net"
-	"github.com/Dreamacro/clash/component/dialer"
-	"github.com/Dreamacro/clash/component/resolver"
-	C "github.com/Dreamacro/clash/constant"
-	"github.com/Dreamacro/clash/log"
-
-	wireguard "github.com/metacubex/sing-wireguard"
-
-	"github.com/sagernet/sing/common"
-	"github.com/sagernet/sing/common/debug"
-	E "github.com/sagernet/sing/common/exceptions"
-	M "github.com/sagernet/sing/common/metadata"
-	N "github.com/sagernet/sing/common/network"
-	"github.com/sagernet/wireguard-go/device"
-)
-
-type WireGuard struct {
-	*Base
-	bind      *wireguard.ClientBind
-	device    *device.Device
-	tunDevice wireguard.Device
-	dialer    *wgDialer
-	startOnce sync.Once
-	startErr  error
-}
-
-type WireGuardOption struct {
-	BasicOption
-	Name                string  `proxy:"name"`
-	Server              string  `proxy:"server"`
-	Port                int     `proxy:"port"`
-	Ip                  string  `proxy:"ip,omitempty"`
-	Ipv6                string  `proxy:"ipv6,omitempty"`
-	PrivateKey          string  `proxy:"private-key"`
-	PublicKey           string  `proxy:"public-key"`
-	PreSharedKey        string  `proxy:"pre-shared-key,omitempty"`
-	Reserved            []uint8 `proxy:"reserved,omitempty"`
-	Workers             int     `proxy:"workers,omitempty"`
-	MTU                 int     `proxy:"mtu,omitempty"`
-	UDP                 bool    `proxy:"udp,omitempty"`
-	PersistentKeepalive int     `proxy:"persistent-keepalive,omitempty"`
-}
-
-type wgDialer struct {
-	options []dialer.Option
-}
-
-func (d *wgDialer) DialContext(ctx context.Context, network string, destination M.Socksaddr) (net.Conn, error) {
-	return dialer.DialContext(ctx, network, destination.String(), d.options...)
-}
-
-func (d *wgDialer) ListenPacket(ctx context.Context, destination M.Socksaddr) (net.PacketConn, error) {
-	return dialer.ListenPacket(ctx, dialer.ParseNetwork("udp", destination.Addr), "", d.options...)
-}
-
-func NewWireGuard(option WireGuardOption) (*WireGuard, error) {
-	outbound := &WireGuard{
-		Base: &Base{
-			name:   option.Name,
-			addr:   net.JoinHostPort(option.Server, strconv.Itoa(option.Port)),
-			tp:     C.WireGuard,
-			udp:    option.UDP,
-			iface:  option.Interface,
-			rmark:  option.RoutingMark,
-			prefer: C.NewDNSPrefer(option.IPVersion),
-		},
-		dialer: &wgDialer{},
-	}
-	runtime.SetFinalizer(outbound, closeWireGuard)
-
-	var reserved [3]uint8
-	if len(option.Reserved) > 0 {
-		if len(option.Reserved) != 3 {
-			return nil, E.New("invalid reserved value, required 3 bytes, got ", len(option.Reserved))
-		}
-		reserved[0] = uint8(option.Reserved[0])
-		reserved[1] = uint8(option.Reserved[1])
-		reserved[2] = uint8(option.Reserved[2])
-	}
-	peerAddr := M.ParseSocksaddrHostPort(option.Server, uint16(option.Port))
-	outbound.bind = wireguard.NewClientBind(context.Background(), outbound.dialer, peerAddr, reserved)
-	localPrefixes := make([]netip.Prefix, 0, 2)
-	if len(option.Ip) > 0 {
-		if !strings.Contains(option.Ip, "/") {
-			option.Ip = option.Ip + "/32"
-		}
-		if prefix, err := netip.ParsePrefix(option.Ip); err == nil {
-			localPrefixes = append(localPrefixes, prefix)
-		} else {
-			return nil, E.Cause(err, "ip address parse error")
-		}
-	}
-	if len(option.Ipv6) > 0 {
-		if !strings.Contains(option.Ipv6, "/") {
-			option.Ipv6 = option.Ipv6 + "/128"
-		}
-		if prefix, err := netip.ParsePrefix(option.Ipv6); err == nil {
-			localPrefixes = append(localPrefixes, prefix)
-		} else {
-			return nil, E.Cause(err, "ipv6 address parse error")
-		}
-	}
-	if len(localPrefixes) == 0 {
-		return nil, E.New("missing local address")
-	}
-	var privateKey, peerPublicKey, preSharedKey string
-	{
-		bytes, err := base64.StdEncoding.DecodeString(option.PrivateKey)
-		if err != nil {
-			return nil, E.Cause(err, "decode private key")
-		}
-		privateKey = hex.EncodeToString(bytes)
-	}
-	{
-		bytes, err := base64.StdEncoding.DecodeString(option.PublicKey)
-		if err != nil {
-			return nil, E.Cause(err, "decode peer public key")
-		}
-		peerPublicKey = hex.EncodeToString(bytes)
-	}
-	if option.PreSharedKey != "" {
-		bytes, err := base64.StdEncoding.DecodeString(option.PreSharedKey)
-		if err != nil {
-			return nil, E.Cause(err, "decode pre shared key")
-		}
-		preSharedKey = hex.EncodeToString(bytes)
-	}
-	ipcConf := "private_key=" + privateKey
-	ipcConf += "\npublic_key=" + peerPublicKey
-	ipcConf += "\nendpoint=" + peerAddr.String()
-	if preSharedKey != "" {
-		ipcConf += "\npreshared_key=" + preSharedKey
-	}
-	var has4, has6 bool
-	for _, address := range localPrefixes {
-		if address.Addr().Is4() {
-			has4 = true
-		} else {
-			has6 = true
-		}
-	}
-	if has4 {
-		ipcConf += "\nallowed_ip=0.0.0.0/0"
-	}
-	if has6 {
-		ipcConf += "\nallowed_ip=::/0"
-	}
-	if option.PersistentKeepalive != 0 {
-		ipcConf += fmt.Sprintf("\npersistent_keepalive_interval=%d", option.PersistentKeepalive)
-	}
-	mtu := option.MTU
-	if mtu == 0 {
-		mtu = 1408
-	}
-	var err error
-	outbound.tunDevice, err = wireguard.NewStackDevice(localPrefixes, uint32(mtu))
-	if err != nil {
-		return nil, E.Cause(err, "create WireGuard device")
-	}
-	outbound.device = device.NewDevice(outbound.tunDevice, outbound.bind, &device.Logger{
-		Verbosef: func(format string, args ...interface{}) {
-			log.SingLogger.Debug(fmt.Sprintf(strings.ToLower(format), args...))
-		},
-		Errorf: func(format string, args ...interface{}) {
-			log.SingLogger.Error(fmt.Sprintf(strings.ToLower(format), args...))
-		},
-	}, option.Workers)
-	if debug.Enabled {
-		log.SingLogger.Trace("created wireguard ipc conf: \n", ipcConf)
-	}
-	err = outbound.device.IpcSet(ipcConf)
-	if err != nil {
-		return nil, E.Cause(err, "setup wireguard")
-	}
-	//err = outbound.tunDevice.Start()
-	return outbound, nil
-}
-
-func closeWireGuard(w *WireGuard) {
-	if w.device != nil {
-		w.device.Close()
-	}
-	_ = common.Close(w.tunDevice)
-}
-
-func (w *WireGuard) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (_ C.Conn, err error) {
-	w.dialer.options = opts
-	var conn net.Conn
-	w.startOnce.Do(func() {
-		w.startErr = w.tunDevice.Start()
-	})
-	if w.startErr != nil {
-		return nil, w.startErr
-	}
-	if !metadata.Resolved() {
-		var addrs []netip.Addr
-		addrs, err = resolver.LookupIP(ctx, metadata.Host)
-		if err != nil {
-			return nil, err
-		}
-		conn, err = N.DialSerial(ctx, w.tunDevice, "tcp", M.ParseSocksaddr(metadata.RemoteAddress()), addrs)
-	} else {
-		port, _ := strconv.Atoi(metadata.DstPort)
-		conn, err = w.tunDevice.DialContext(ctx, "tcp", M.SocksaddrFrom(metadata.DstIP, uint16(port)))
-	}
-	if err != nil {
-		return nil, err
-	}
-	if conn == nil {
-		return nil, E.New("conn is nil")
-	}
-	return NewConn(CN.NewRefConn(conn, w), w), nil
-}
-
-func (w *WireGuard) ListenPacketContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (_ C.PacketConn, err error) {
-	w.dialer.options = opts
-	var pc net.PacketConn
-	w.startOnce.Do(func() {
-		w.startErr = w.tunDevice.Start()
-	})
-	if w.startErr != nil {
-		return nil, w.startErr
-	}
-	if err != nil {
-		return nil, err
-	}
-	if !metadata.Resolved() {
-		ip, err := resolver.ResolveIP(ctx, metadata.Host)
-		if err != nil {
-			return nil, errors.New("can't resolve ip")
-		}
-		metadata.DstIP = ip
-	}
-	port, _ := strconv.Atoi(metadata.DstPort)
-	pc, err = w.tunDevice.ListenPacket(ctx, M.SocksaddrFrom(metadata.DstIP, uint16(port)))
-	if err != nil {
-		return nil, err
-	}
-	if pc == nil {
-		return nil, E.New("packetConn is nil")
-	}
-	return newPacketConn(CN.NewRefPacketConn(pc, w), w), nil
-}

adapter/outboundgroup/common.go

@@ -0,0 +1,24 @@
+package outboundgroup
+
+import (
+	"time"
+
+	C "github.com/Dreamacro/clash/constant"
+	"github.com/Dreamacro/clash/constant/provider"
+)
+
+const (
+	defaultGetProxiesDuration = time.Second * 5
+)
+
+func getProvidersProxies(providers []provider.ProxyProvider, touch bool) []C.Proxy {
+	proxies := []C.Proxy{}
+	for _, provider := range providers {
+		if touch {
+			proxies = append(proxies, provider.ProxiesWithTouch()...)
+		} else {
+			proxies = append(proxies, provider.Proxies()...)
+		}
+	}
+	return proxies
+}

adapter/outboundgroup/fallback.go

@@ -3,21 +3,19 @@ package outboundgroup
 import (
 	"context"
 	"encoding/json"
-	"errors"
-	"time"
 
 	"github.com/Dreamacro/clash/adapter/outbound"
-	"github.com/Dreamacro/clash/common/callback"
+	"github.com/Dreamacro/clash/common/singledo"
 	"github.com/Dreamacro/clash/component/dialer"
 	C "github.com/Dreamacro/clash/constant"
 	"github.com/Dreamacro/clash/constant/provider"
 )
 
 type Fallback struct {
-	*GroupBase
+	*outbound.Base
 	disableUDP bool
-	testUrl    string
+	single     *singledo.Single[[]C.Proxy]
-	selected   string
+	providers  []provider.ProxyProvider
 }
 
 func (f *Fallback) Now() string {
@@ -31,21 +29,7 @@ func (f *Fallback) DialContext(ctx context.Context, metadata *C.Metadata, opts .
 	c, err := proxy.DialContext(ctx, metadata, f.Base.DialOptions(opts...)...)
 	if err == nil {
 		c.AppendToChains(f)
-	} else {
-		f.onDialFailed(proxy.Type(), err)
 	}
-
-	c = &callback.FirstWriteCallBackConn{
-		Conn: c,
-		Callback: func(err error) {
-			if err == nil {
-				f.onDialSuccess()
-			} else {
-				f.onDialFailed(proxy.Type(), err)
-			}
-		},
-	}
-
 	return c, err
 }
 
@@ -56,7 +40,6 @@ func (f *Fallback) ListenPacketContext(ctx context.Context, metadata *C.Metadata
 	if err == nil {
 		pc.AppendToChains(f)
 	}
-
 	return pc, err
 }
 
@@ -72,8 +55,8 @@ func (f *Fallback) SupportUDP() bool {
 
 // MarshalJSON implements C.ProxyAdapter
 func (f *Fallback) MarshalJSON() ([]byte, error) {
-	all := []string{}
+	var all []string
-	for _, proxy := range f.GetProxies(false) {
+	for _, proxy := range f.proxies(false) {
 		all = append(all, proxy.Name())
 	}
 	return json.Marshal(map[string]any{
@@ -84,70 +67,40 @@ func (f *Fallback) MarshalJSON() ([]byte, error) {
 }
 
 // Unwrap implements C.ProxyAdapter
-func (f *Fallback) Unwrap(metadata *C.Metadata, touch bool) C.Proxy {
+func (f *Fallback) Unwrap(metadata *C.Metadata) C.Proxy {
-	proxy := f.findAliveProxy(touch)
+	proxy := f.findAliveProxy(true)
 	return proxy
 }
 
+func (f *Fallback) proxies(touch bool) []C.Proxy {
+	elm, _, _ := f.single.Do(func() ([]C.Proxy, error) {
+		return getProvidersProxies(f.providers, touch), nil
+	})
+
+	return elm
+}
+
 func (f *Fallback) findAliveProxy(touch bool) C.Proxy {
-	proxies := f.GetProxies(touch)
+	proxies := f.proxies(touch)
 	for _, proxy := range proxies {
-		if len(f.selected) == 0 {
 		if proxy.Alive() {
 			return proxy
 		}
-		} else {
-			if proxy.Name() == f.selected {
-				if proxy.Alive() {
-					return proxy
-				} else {
-					f.selected = ""
-				}
-			}
-		}
 	}
 
 	return proxies[0]
 }
 
-func (f *Fallback) Set(name string) error {
-	var p C.Proxy
-	for _, proxy := range f.GetProxies(false) {
-		if proxy.Name() == name {
-			p = proxy
-			break
-		}
-	}
-
-	if p == nil {
-		return errors.New("proxy not exist")
-	}
-
-	f.selected = name
-	if !p.Alive() {
-		ctx, cancel := context.WithTimeout(context.Background(), time.Millisecond*time.Duration(5000))
-		defer cancel()
-		_, _ = p.URLTest(ctx, f.testUrl)
-	}
-
-	return nil
-}
-
 func NewFallback(option *GroupCommonOption, providers []provider.ProxyProvider) *Fallback {
 	return &Fallback{
-		GroupBase: NewGroupBase(GroupBaseOption{
+		Base: outbound.NewBase(outbound.BaseOption{
-			outbound.BaseOption{
 			Name:        option.Name,
 			Type:        C.Fallback,
 			Interface:   option.Interface,
 			RoutingMark: option.RoutingMark,
-			},
-			option.Filter,
-			option.ExcludeFilter,
-			option.ExcludeType,
-			providers,
 		}),
+		single:     singledo.NewSingle[[]C.Proxy](defaultGetProxiesDuration),
+		providers:  providers,
 		disableUDP: option.DisableUDP,
-		testUrl:    option.URL,
 	}
 }

adapter/outboundgroup/groupbase.go

@@ -1,293 +0,0 @@
-package outboundgroup
-
-import (
-	"context"
-	"fmt"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/Dreamacro/clash/adapter/outbound"
-	C "github.com/Dreamacro/clash/constant"
-	"github.com/Dreamacro/clash/constant/provider"
-	types "github.com/Dreamacro/clash/constant/provider"
-	"github.com/Dreamacro/clash/log"
-	"github.com/Dreamacro/clash/tunnel"
-
-	"github.com/dlclark/regexp2"
-	"go.uber.org/atomic"
-)
-
-type GroupBase struct {
-	*outbound.Base
-	filterRegs       []*regexp2.Regexp
-	excludeFilterReg *regexp2.Regexp
-	excludeTypeArray []string
-	providers        []provider.ProxyProvider
-	failedTestMux    sync.Mutex
-	failedTimes      int
-	failedTime       time.Time
-	failedTesting    *atomic.Bool
-	proxies          [][]C.Proxy
-	versions         []atomic.Uint32
-}
-
-type GroupBaseOption struct {
-	outbound.BaseOption
-	filter        string
-	excludeFilter string
-	excludeType   string
-	providers     []provider.ProxyProvider
-}
-
-func NewGroupBase(opt GroupBaseOption) *GroupBase {
-	var excludeFilterReg *regexp2.Regexp
-	if opt.excludeFilter != "" {
-		excludeFilterReg = regexp2.MustCompile(opt.excludeFilter, 0)
-	}
-	var excludeTypeArray []string
-	if opt.excludeType != "" {
-		excludeTypeArray = strings.Split(opt.excludeType, "|")
-	}
-
-	var filterRegs []*regexp2.Regexp
-	if opt.filter != "" {
-		for _, filter := range strings.Split(opt.filter, "`") {
-			filterReg := regexp2.MustCompile(filter, 0)
-			filterRegs = append(filterRegs, filterReg)
-		}
-	}
-
-	gb := &GroupBase{
-		Base:             outbound.NewBase(opt.BaseOption),
-		filterRegs:       filterRegs,
-		excludeFilterReg: excludeFilterReg,
-		excludeTypeArray: excludeTypeArray,
-		providers:        opt.providers,
-		failedTesting:    atomic.NewBool(false),
-	}
-
-	gb.proxies = make([][]C.Proxy, len(opt.providers))
-	gb.versions = make([]atomic.Uint32, len(opt.providers))
-
-	return gb
-}
-
-func (gb *GroupBase) Touch() {
-	for _, pd := range gb.providers {
-		pd.Touch()
-	}
-}
-
-func (gb *GroupBase) GetProxies(touch bool) []C.Proxy {
-	var proxies []C.Proxy
-	if len(gb.filterRegs) == 0 {
-		for _, pd := range gb.providers {
-			if touch {
-				pd.Touch()
-			}
-			proxies = append(proxies, pd.Proxies()...)
-		}
-	} else {
-		for i, pd := range gb.providers {
-			if touch {
-				pd.Touch()
-			}
-
-			if pd.VehicleType() == types.Compatible {
-				gb.versions[i].Store(pd.Version())
-				gb.proxies[i] = pd.Proxies()
-				continue
-			}
-
-			version := gb.versions[i].Load()
-			if version != pd.Version() && gb.versions[i].CompareAndSwap(version, pd.Version()) {
-				var (
-					proxies    []C.Proxy
-					newProxies []C.Proxy
-				)
-
-				proxies = pd.Proxies()
-				proxiesSet := map[string]struct{}{}
-				for _, filterReg := range gb.filterRegs {
-					for _, p := range proxies {
-						name := p.Name()
-						if mat, _ := filterReg.FindStringMatch(name); mat != nil {
-							if _, ok := proxiesSet[name]; !ok {
-								proxiesSet[name] = struct{}{}
-								newProxies = append(newProxies, p)
-							}
-						}
-					}
-				}
-
-				gb.proxies[i] = newProxies
-			}
-		}
-
-		for _, p := range gb.proxies {
-			proxies = append(proxies, p...)
-		}
-	}
-
-	if len(proxies) == 0 {
-		return append(proxies, tunnel.Proxies()["COMPATIBLE"])
-	}
-
-	if len(gb.providers) > 1 && len(gb.filterRegs) > 1 {
-		var newProxies []C.Proxy
-		proxiesSet := map[string]struct{}{}
-		for _, filterReg := range gb.filterRegs {
-			for _, p := range proxies {
-				name := p.Name()
-				if mat, _ := filterReg.FindStringMatch(name); mat != nil {
-					if _, ok := proxiesSet[name]; !ok {
-						proxiesSet[name] = struct{}{}
-						newProxies = append(newProxies, p)
-					}
-				}
-			}
-		}
-		for _, p := range proxies { // add not matched proxies at the end
-			name := p.Name()
-			if _, ok := proxiesSet[name]; !ok {
-				proxiesSet[name] = struct{}{}
-				newProxies = append(newProxies, p)
-			}
-		}
-		proxies = newProxies
-	}
-	if gb.excludeTypeArray != nil {
-		var newProxies []C.Proxy
-		for _, p := range proxies {
-			mType := p.Type().String()
-			flag := false
-			for i := range gb.excludeTypeArray {
-				if strings.EqualFold(mType, gb.excludeTypeArray[i]) {
-					flag = true
-					break
-				}
-
-			}
-			if flag {
-				continue
-			}
-			newProxies = append(newProxies, p)
-		}
-		proxies = newProxies
-	}
-
-	if gb.excludeFilterReg != nil {
-		var newProxies []C.Proxy
-		for _, p := range proxies {
-			name := p.Name()
-			if mat, _ := gb.excludeFilterReg.FindStringMatch(name); mat != nil {
-				continue
-			}
-			newProxies = append(newProxies, p)
-		}
-		proxies = newProxies
-	}
-
-	return proxies
-}
-
-func (gb *GroupBase) URLTest(ctx context.Context, url string) (map[string]uint16, error) {
-	var wg sync.WaitGroup
-	var lock sync.Mutex
-	mp := map[string]uint16{}
-	proxies := gb.GetProxies(false)
-	for _, proxy := range proxies {
-		proxy := proxy
-		wg.Add(1)
-		go func() {
-			delay, err := proxy.URLTest(ctx, url)
-			if err == nil {
-				lock.Lock()
-				mp[proxy.Name()] = delay
-				lock.Unlock()
-			}
-
-			wg.Done()
-		}()
-	}
-	wg.Wait()
-
-	if len(mp) == 0 {
-		return mp, fmt.Errorf("get delay: all proxies timeout")
-	} else {
-		return mp, nil
-	}
-}
-
-func (gb *GroupBase) onDialFailed(adapterType C.AdapterType, err error) {
-	if adapterType == C.Direct || adapterType == C.Compatible || adapterType == C.Reject || adapterType == C.Pass {
-		return
-	}
-
-	if strings.Contains(err.Error(), "connection refused") {
-		go gb.healthCheck()
-		return
-	}
-
-	go func() {
-		gb.failedTestMux.Lock()
-		defer gb.failedTestMux.Unlock()
-
-		gb.failedTimes++
-		if gb.failedTimes == 1 {
-			log.Debugln("ProxyGroup: %s first failed", gb.Name())
-			gb.failedTime = time.Now()
-		} else {
-			if time.Since(gb.failedTime) > gb.failedTimeoutInterval() {
-				gb.failedTimes = 0
-				return
-			}
-
-			log.Debugln("ProxyGroup: %s failed count: %d", gb.Name(), gb.failedTimes)
-			if gb.failedTimes >= gb.maxFailedTimes() {
-				log.Warnln("because %s failed multiple times, active health check", gb.Name())
-				gb.healthCheck()
-			}
-		}
-	}()
-}
-
-func (gb *GroupBase) healthCheck() {
-	if gb.failedTesting.Load() {
-		return
-	}
-
-	gb.failedTesting.Store(true)
-	wg := sync.WaitGroup{}
-	for _, proxyProvider := range gb.providers {
-		wg.Add(1)
-		proxyProvider := proxyProvider
-		go func() {
-			defer wg.Done()
-			proxyProvider.HealthCheck()
-		}()
-	}
-
-	wg.Wait()
-	gb.failedTesting.Store(false)
-	gb.failedTimes = 0
-}
-
-func (gb *GroupBase) failedIntervalTime() int64 {
-	return 5 * time.Second.Milliseconds()
-}
-
-func (gb *GroupBase) onDialSuccess() {
-	if !gb.failedTesting.Load() {
-		gb.failedTimes = 0
-	}
-}
-
-func (gb *GroupBase) maxFailedTimes() int {
-	return 5
-}
-
-func (gb *GroupBase) failedTimeoutInterval() time.Duration {
-	return 5 * time.Second
-}

adapter/outboundgroup/loadbalance.go

@@ -6,12 +6,10 @@ import (
 	"errors"
 	"fmt"
 	"net"
-	"time"
 
 	"github.com/Dreamacro/clash/adapter/outbound"
-	"github.com/Dreamacro/clash/common/cache"
-	"github.com/Dreamacro/clash/common/callback"
 	"github.com/Dreamacro/clash/common/murmur3"
+	"github.com/Dreamacro/clash/common/singledo"
 	"github.com/Dreamacro/clash/component/dialer"
 	C "github.com/Dreamacro/clash/constant"
 	"github.com/Dreamacro/clash/constant/provider"
@@ -22,25 +20,25 @@ import (
 type strategyFn = func(proxies []C.Proxy, metadata *C.Metadata) C.Proxy
 
 type LoadBalance struct {
-	*GroupBase
+	*outbound.Base
 	disableUDP bool
+	single     *singledo.Single[[]C.Proxy]
+	providers  []provider.ProxyProvider
 	strategyFn strategyFn
 }
 
 var errStrategy = errors.New("unsupported strategy")
 
 func parseStrategy(config map[string]any) string {
-	if strategy, ok := config["strategy"].(string); ok {
+	if elm, ok := config["strategy"]; ok {
+		if strategy, ok := elm.(string); ok {
 			return strategy
 		}
+	}
 	return "consistent-hashing"
 }
 
 func getKey(metadata *C.Metadata) string {
-	if metadata == nil {
-		return ""
-	}
-
 	if metadata.Host != "" {
 		// ip host
 		if ip := net.ParseIP(metadata.Host); ip != nil {
@@ -59,16 +57,6 @@ func getKey(metadata *C.Metadata) string {
 	return metadata.DstIP.String()
 }
 
-func getKeyWithSrcAndDst(metadata *C.Metadata) string {
-	dst := getKey(metadata)
-	src := ""
-	if metadata != nil {
-		src = metadata.SrcIP.String()
-	}
-
-	return fmt.Sprintf("%s%s", src, dst)
-}
-
 func jumpHash(key uint64, buckets int32) int32 {
 	var b, j int64
 
@@ -83,25 +71,15 @@ func jumpHash(key uint64, buckets int32) int32 {
 
 // DialContext implements C.ProxyAdapter
 func (lb *LoadBalance) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (c C.Conn, err error) {
-	proxy := lb.Unwrap(metadata, true)
+	defer func() {
-	c, err = proxy.DialContext(ctx, metadata, lb.Base.DialOptions(opts...)...)
-
 		if err == nil {
 			c.AppendToChains(lb)
-	} else {
-		lb.onDialFailed(proxy.Type(), err)
 		}
+	}()
 
-	c = &callback.FirstWriteCallBackConn{
+	proxy := lb.Unwrap(metadata)
-		Conn: c,
+
-		Callback: func(err error) {
+	c, err = proxy.DialContext(ctx, metadata, lb.Base.DialOptions(opts...)...)
-			if err == nil {
-				lb.onDialSuccess()
-			} else {
-				lb.onDialFailed(proxy.Type(), err)
-			}
-		},
-	}
 	return
 }
 
@@ -113,7 +91,7 @@ func (lb *LoadBalance) ListenPacketContext(ctx context.Context, metadata *C.Meta
 		}
 	}()
 
-	proxy := lb.Unwrap(metadata, true)
+	proxy := lb.Unwrap(metadata)
 	return proxy.ListenPacketContext(ctx, metadata, lb.Base.DialOptions(opts...)...)
 }
 
@@ -123,20 +101,11 @@ func (lb *LoadBalance) SupportUDP() bool {
 }
 
 func strategyRoundRobin() strategyFn {
-	flag := true
 	idx := 0
 	return func(proxies []C.Proxy, metadata *C.Metadata) C.Proxy {
 		length := len(proxies)
 		for i := 0; i < length; i++ {
-			flag = !flag
+			idx = (idx + 1) % length
-			if flag {
-				idx = (idx - 1) % length
-			} else {
-				idx = (idx + 2) % length
-			}
-			if idx < 0 {
-				idx = idx + length
-			}
 			proxy := proxies[idx]
 			if proxy.Alive() {
 				return proxy
@@ -160,62 +129,28 @@ func strategyConsistentHashing() strategyFn {
 			}
 		}
 
-		// when availability is poor, traverse the entire list to get the available nodes
-		for _, proxy := range proxies {
-			if proxy.Alive() {
-				return proxy
-			}
-		}
-
-		return proxies[0]
-	}
-}
-
-func strategyStickySessions() strategyFn {
-	ttl := time.Minute * 10
-	maxRetry := 5
-	lruCache := cache.New[uint64, int](
-		cache.WithAge[uint64, int](int64(ttl.Seconds())),
-		cache.WithSize[uint64, int](1000))
-	return func(proxies []C.Proxy, metadata *C.Metadata) C.Proxy {
-		key := uint64(murmur3.Sum32([]byte(getKeyWithSrcAndDst(metadata))))
-		length := len(proxies)
-		idx, has := lruCache.Get(key)
-		if !has {
-			idx = int(jumpHash(key+uint64(time.Now().UnixNano()), int32(length)))
-		}
-
-		nowIdx := idx
-		for i := 1; i < maxRetry; i++ {
-			proxy := proxies[nowIdx]
-			if proxy.Alive() {
-				if nowIdx != idx {
-					lruCache.Delete(key)
-					lruCache.Set(key, nowIdx)
-				}
-
-				return proxy
-			} else {
-				nowIdx = int(jumpHash(key+uint64(time.Now().UnixNano()), int32(length)))
-			}
-		}
-
-		lruCache.Delete(key)
-		lruCache.Set(key, 0)
 		return proxies[0]
 	}
 }
 
 // Unwrap implements C.ProxyAdapter
-func (lb *LoadBalance) Unwrap(metadata *C.Metadata, touch bool) C.Proxy {
+func (lb *LoadBalance) Unwrap(metadata *C.Metadata) C.Proxy {
-	proxies := lb.GetProxies(touch)
+	proxies := lb.proxies(true)
 	return lb.strategyFn(proxies, metadata)
 }
 
+func (lb *LoadBalance) proxies(touch bool) []C.Proxy {
+	elm, _, _ := lb.single.Do(func() ([]C.Proxy, error) {
+		return getProvidersProxies(lb.providers, touch), nil
+	})
+
+	return elm
+}
+
 // MarshalJSON implements C.ProxyAdapter
 func (lb *LoadBalance) MarshalJSON() ([]byte, error) {
 	var all []string
-	for _, proxy := range lb.GetProxies(false) {
+	for _, proxy := range lb.proxies(false) {
 		all = append(all, proxy.Name())
 	}
 	return json.Marshal(map[string]any{
@@ -231,24 +166,18 @@ func NewLoadBalance(option *GroupCommonOption, providers []provider.ProxyProvide
 		strategyFn = strategyConsistentHashing()
 	case "round-robin":
 		strategyFn = strategyRoundRobin()
-	case "sticky-sessions":
-		strategyFn = strategyStickySessions()
 	default:
 		return nil, fmt.Errorf("%w: %s", errStrategy, strategy)
 	}
 	return &LoadBalance{
-		GroupBase: NewGroupBase(GroupBaseOption{
+		Base: outbound.NewBase(outbound.BaseOption{
-			outbound.BaseOption{
 			Name:        option.Name,
 			Type:        C.LoadBalance,
 			Interface:   option.Interface,
 			RoutingMark: option.RoutingMark,
-			},
-			option.Filter,
-			option.ExcludeFilter,
-			option.ExcludeType,
-			providers,
 		}),
+		single:     singledo.NewSingle[[]C.Proxy](defaultGetProxiesDuration),
+		providers:  providers,
 		strategyFn: strategyFn,
 		disableUDP: option.DisableUDP,
 	}, nil

adapter/outboundgroup/parser.go

@@ -3,6 +3,7 @@ package outboundgroup
 import (
 	"errors"
 	"fmt"
+	"regexp"
 
 	"github.com/Dreamacro/clash/adapter/outbound"
 	"github.com/Dreamacro/clash/adapter/provider"
@@ -30,8 +31,6 @@ type GroupCommonOption struct {
 	Lazy       bool     `group:"lazy,omitempty"`
 	DisableUDP bool     `group:"disable-udp,omitempty"`
 	Filter     string   `group:"filter,omitempty"`
-	ExcludeFilter string   `group:"exclude-filter,omitempty"`
-	ExcludeType   string   `group:"exclude-type,omitempty"`
 }
 
 func ParseProxyGroup(config map[string]any, proxyMap map[string]C.Proxy, providersMap map[string]types.ProxyProvider) (C.ProxyAdapter, error) {
@@ -40,10 +39,23 @@ func ParseProxyGroup(config map[string]any, proxyMap map[string]C.Proxy, provide
 	groupOption := &GroupCommonOption{
 		Lazy: true,
 	}
-	if err := decoder.Decode(config, groupOption); err != nil {
+
+	var (
+		filterRegx *regexp.Regexp
+		err        error
+	)
+
+	if err = decoder.Decode(config, groupOption); err != nil {
 		return nil, errFormat
 	}
 
+	if groupOption.Filter != "" {
+		filterRegx, err = regexp.Compile(groupOption.Filter)
+		if err != nil {
+			return nil, fmt.Errorf("invalid filter regex: %w", err)
+		}
+	}
+
 	if groupOption.Type == "" || groupOption.Name == "" {
 		return nil, errFormat
 	}
@@ -77,12 +89,8 @@ func ParseProxyGroup(config map[string]any, proxyMap map[string]C.Proxy, provide
 			providers = append(providers, pd)
 			providersMap[groupName] = pd
 		} else {
-			if groupOption.URL == "" {
+			if groupOption.URL == "" || groupOption.Interval == 0 {
-				groupOption.URL = "https://cp.cloudflare.com/generate_204"
+				return nil, errMissHealthCheck
-			}
-
-			if groupOption.Interval == 0 {
-				groupOption.Interval = 300
 			}
 
 			hc := provider.NewHealthCheck(ps, groupOption.URL, uint(groupOption.Interval), groupOption.Lazy)
@@ -97,13 +105,11 @@ func ParseProxyGroup(config map[string]any, proxyMap map[string]C.Proxy, provide
 	}
 
 	if len(groupOption.Use) != 0 {
-		list, err := getProviders(providersMap, groupOption.Use)
+		list, err := getProviders(providersMap, groupOption, filterRegx)
 		if err != nil {
 			return nil, err
 		}
 		providers = append(providers, list...)
-	} else {
-		groupOption.Filter = ""
 	}
 
 	var group C.ProxyAdapter
@@ -139,8 +145,13 @@ func getProxies(mapping map[string]C.Proxy, list []string) ([]C.Proxy, error) {
 	return ps, nil
 }
 
-func getProviders(mapping map[string]types.ProxyProvider, list []string) ([]types.ProxyProvider, error) {
+func getProviders(mapping map[string]types.ProxyProvider, groupOption *GroupCommonOption, filterRegx *regexp.Regexp) ([]types.ProxyProvider, error) {
-	var ps []types.ProxyProvider
+	var (
+		ps        []types.ProxyProvider
+		list      = groupOption.Use
+		groupName = groupOption.Name
+	)
+
 	for _, name := range list {
 		p, ok := mapping[name]
 		if !ok {
@@ -150,6 +161,27 @@ func getProviders(mapping map[string]types.ProxyProvider, list []string) ([]type
 		if p.VehicleType() == types.Compatible {
 			return nil, fmt.Errorf("proxy group %s can't contains in `use`", name)
 		}
+
+		if filterRegx != nil {
+			var hc *provider.HealthCheck
+			if groupOption.Type == "select" || groupOption.Type == "relay" {
+				hc = provider.NewHealthCheck([]C.Proxy{}, "", 0, true)
+			} else {
+				if groupOption.URL == "" || groupOption.Interval == 0 {
+					return nil, errMissHealthCheck
+				}
+				hc = provider.NewHealthCheck([]C.Proxy{}, groupOption.URL, uint(groupOption.Interval), groupOption.Lazy)
+			}
+
+			if _, ok = mapping[groupName]; ok {
+				groupName += "->" + p.Name()
+			}
+
+			pd := p.(*provider.ProxySetProvider)
+			p = provider.NewProxyFilterProvider(groupName, pd, hc, filterRegx)
+			pd.RegisterProvidersInUse(p)
+		}
+
 		ps = append(ps, p)
 	}
 	return ps, nil

adapter/outboundgroup/relay.go

@@ -3,54 +3,33 @@ package outboundgroup
 import (
 	"context"
 	"encoding/json"
+	"fmt"
 	"net"
 	"net/netip"
-	"strings"
 
+	"github.com/Dreamacro/clash/adapter"
 	"github.com/Dreamacro/clash/adapter/outbound"
-	N "github.com/Dreamacro/clash/common/net"
+	"github.com/Dreamacro/clash/common/singledo"
 	"github.com/Dreamacro/clash/component/dialer"
+	"github.com/Dreamacro/clash/component/resolver"
 	C "github.com/Dreamacro/clash/constant"
 	"github.com/Dreamacro/clash/constant/provider"
 )
 
 type Relay struct {
-	*GroupBase
+	*outbound.Base
-}
+	single    *singledo.Single[[]C.Proxy]
-
+	providers []provider.ProxyProvider
-type proxyDialer struct {
-	proxy  C.Proxy
-	dialer C.Dialer
-}
-
-func (p proxyDialer) DialContext(ctx context.Context, network, address string) (net.Conn, error) {
-	currentMeta, err := addrToMetadata(address)
-	if err != nil {
-		return nil, err
-	}
-	if strings.Contains(network, "udp") { // should not support this operation
-		currentMeta.NetWork = C.UDP
-		pc, err := p.proxy.ListenPacketWithDialer(ctx, p.dialer, currentMeta)
-		if err != nil {
-			return nil, err
-		}
-		return N.NewBindPacketConn(pc, currentMeta.UDPAddr()), nil
-	}
-	return p.proxy.DialContextWithDialer(ctx, p.dialer, currentMeta)
-}
-
-func (p proxyDialer) ListenPacket(ctx context.Context, network, address string, rAddrPort netip.AddrPort) (net.PacketConn, error) {
-	currentMeta, err := addrToMetadata(rAddrPort.String())
-	if err != nil {
-		return nil, err
-	}
-	currentMeta.NetWork = C.UDP
-	return p.proxy.ListenPacketWithDialer(ctx, p.dialer, currentMeta)
 }
 
 // DialContext implements C.ProxyAdapter
 func (r *Relay) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.Conn, error) {
-	proxies, chainProxies := r.proxies(metadata, true)
+	var proxies []C.Proxy
+	for _, proxy := range r.proxies(metadata, true) {
+		if proxy.Type() != C.Direct {
+			proxies = append(proxies, proxy)
+		}
+	}
 
 	switch len(proxies) {
 	case 0:
@@ -58,88 +37,166 @@ func (r *Relay) DialContext(ctx context.Context, metadata *C.Metadata, opts ...d
 	case 1:
 		return proxies[0].DialContext(ctx, metadata, r.Base.DialOptions(opts...)...)
 	}
-	var d C.Dialer
+
-	d = dialer.NewDialer(r.Base.DialOptions(opts...)...)
+	c, err := r.streamContext(ctx, proxies, r.Base.DialOptions(opts...)...)
-	for _, proxy := range proxies[:len(proxies)-1] {
-		d = proxyDialer{
-			proxy:  proxy,
-			dialer: d,
-		}
-	}
-	last := proxies[len(proxies)-1]
-	conn, err := last.DialContextWithDialer(ctx, d, metadata)
 	if err != nil {
 		return nil, err
 	}
 
-	for i := len(chainProxies) - 2; i >= 0; i-- {
+	last := proxies[len(proxies)-1]
-		conn.AppendToChains(chainProxies[i])
+	c, err = last.StreamConn(c, metadata)
+	if err != nil {
+		return nil, fmt.Errorf("%s connect error: %w", last.Addr(), err)
 	}
 
-	conn.AppendToChains(r)
+	return outbound.NewConn(c, r), nil
-
-	return conn, nil
 }
 
 // ListenPacketContext implements C.ProxyAdapter
-func (r *Relay) ListenPacketContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (_ C.PacketConn, err error) {
+func (r *Relay) ListenPacketContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (C.PacketConn, error) {
-	proxies, chainProxies := r.proxies(metadata, true)
+	var proxies []C.Proxy
+	for _, proxy := range r.proxies(metadata, true) {
+		if proxy.Type() != C.Direct {
+			proxies = append(proxies, proxy)
+		}
+	}
 
-	switch len(proxies) {
+	length := len(proxies)
+
+	switch length {
 	case 0:
 		return outbound.NewDirect().ListenPacketContext(ctx, metadata, r.Base.DialOptions(opts...)...)
 	case 1:
-		return proxies[0].ListenPacketContext(ctx, metadata, r.Base.DialOptions(opts...)...)
+		proxy := proxies[0]
+		if !proxy.SupportUDP() {
+			return nil, fmt.Errorf("%s connect error: proxy [%s] UDP is not supported", proxy.Addr(), proxy.Name())
+		}
+		return proxy.ListenPacketContext(ctx, metadata, r.Base.DialOptions(opts...)...)
 	}
 
-	var d C.Dialer
+	var (
-	d = dialer.NewDialer(r.Base.DialOptions(opts...)...)
+		firstIndex          = 0
-	for _, proxy := range proxies[:len(proxies)-1] {
+		nextIndex           = 1
-		d = proxyDialer{
+		lastUDPOverTCPIndex = -1
-			proxy:  proxy,
+		rawUDPRelay         = false
-			dialer: d,
+
+		first = proxies[firstIndex]
+		last  = proxies[length-1]
+
+		c           net.Conn
+		cc          net.Conn
+		err         error
+		currentMeta *C.Metadata
+	)
+
+	if !last.SupportUDP() {
+		return nil, fmt.Errorf("%s connect error: proxy [%s] UDP is not supported in relay chains", last.Addr(), last.Name())
 	}
+
+	rawUDPRelay, lastUDPOverTCPIndex = isRawUDPRelay(proxies)
+
+	if first.Type() == C.Socks5 {
+		cc1, err1 := dialer.DialContext(ctx, "tcp", first.Addr(), r.Base.DialOptions(opts...)...)
+		if err1 != nil {
+			return nil, fmt.Errorf("%s connect error: %w", first.Addr(), err)
 		}
-	last := proxies[len(proxies)-1]
+		cc = cc1
-	pc, err := last.ListenPacketWithDialer(ctx, d, metadata)
+		tcpKeepAlive(cc)
+
+		var pc net.PacketConn
+		pc, err = dialer.ListenPacket(ctx, "udp", "", r.Base.DialOptions(opts...)...)
+		c = outbound.WrapConn(pc)
+	} else if rawUDPRelay {
+		var pc net.PacketConn
+		pc, err = dialer.ListenPacket(ctx, "udp", "", r.Base.DialOptions(opts...)...)
+		c = outbound.WrapConn(pc)
+	} else {
+		firstIndex = lastUDPOverTCPIndex
+		nextIndex = firstIndex + 1
+		first = proxies[firstIndex]
+		c, err = r.streamContext(ctx, proxies[:nextIndex], r.Base.DialOptions(opts...)...)
+	}
+
+	if err != nil {
+		return nil, fmt.Errorf("%s connect error: %w", first.Addr(), err)
+	}
+
+	if nextIndex < length {
+		for i, proxy := range proxies[nextIndex:] { // raw udp in loop
+			currentMeta, err = addrToMetadata(proxy.Addr())
 			if err != nil {
 				return nil, err
 			}
+			currentMeta.NetWork = C.UDP
 
-	for i := len(chainProxies) - 2; i >= 0; i-- {
+			if !isRawUDP(first) && !first.SupportUDP() {
-		pc.AppendToChains(chainProxies[i])
+				return nil, fmt.Errorf("%s connect error: proxy [%s] UDP is not supported in relay chains", first.Addr(), first.Name())
 			}
 
-	pc.AppendToChains(r)
+			if needResolveIP(first, currentMeta) {
+				var ip netip.Addr
+				ip, err = resolver.ResolveProxyServerHost(currentMeta.Host)
+				if err != nil {
+					return nil, fmt.Errorf("can't resolve ip: %w", err)
+				}
+				currentMeta.DstIP = ip
+			}
 
-	return pc, nil
+			if cc != nil { // socks5
+				c, err = streamSocks5PacketConn(first, cc, c, currentMeta)
+				cc = nil
+			} else {
+				c, err = first.StreamPacketConn(c, currentMeta)
+			}
+
+			if err != nil {
+				return nil, fmt.Errorf("%s connect error: %w", first.Addr(), err)
+			}
+
+			if proxy.Type() == C.Socks5 {
+				endIndex := nextIndex + i + 1
+				cc, err = r.streamContext(ctx, proxies[:endIndex], r.Base.DialOptions(opts...)...)
+				if err != nil {
+					return nil, fmt.Errorf("%s connect error: %w", first.Addr(), err)
+				}
+			}
+
+			first = proxy
+		}
+	}
+
+	if cc != nil {
+		c, err = streamSocks5PacketConn(last, cc, c, metadata)
+	} else {
+		c, err = last.StreamPacketConn(c, metadata)
+	}
+
+	if err != nil {
+		return nil, fmt.Errorf("%s connect error: %w", last.Addr(), err)
+	}
+
+	return outbound.NewPacketConn(c.(net.PacketConn), r), nil
 }
 
 // SupportUDP implements C.ProxyAdapter
 func (r *Relay) SupportUDP() bool {
-	proxies, _ := r.proxies(nil, false)
+	proxies := r.rawProxies(true)
-	if len(proxies) == 0 { // C.Direct
+
+	l := len(proxies)
+
+	if l == 0 {
 		return true
 	}
-	for i := len(proxies) - 1; i >= 0; i-- {
+
-		proxy := proxies[i]
+	last := proxies[l-1]
-		if !proxy.SupportUDP() {
+
-			return false
+	return isRawUDP(last) || last.SupportUDP()
-		}
-		if proxy.SupportUOT() {
-			return true
-		}
-		if !proxy.SupportWithDialer() {
-			return false
-		}
-	}
-	return true
 }
 
 // MarshalJSON implements C.ProxyAdapter
 func (r *Relay) MarshalJSON() ([]byte, error) {
-	all := []string{}
+	var all []string
-	for _, proxy := range r.GetProxies(false) {
+	for _, proxy := range r.rawProxies(false) {
 		all = append(all, proxy.Name())
 	}
 	return json.Marshal(map[string]any{
@@ -148,51 +205,114 @@ func (r *Relay) MarshalJSON() ([]byte, error) {
 	})
 }
 
-func (r *Relay) proxies(metadata *C.Metadata, touch bool) ([]C.Proxy, []C.Proxy) {
+func (r *Relay) rawProxies(touch bool) []C.Proxy {
-	rawProxies := r.GetProxies(touch)
+	elm, _, _ := r.single.Do(func() ([]C.Proxy, error) {
+		return getProvidersProxies(r.providers, touch), nil
+	})
 
-	var proxies []C.Proxy
+	return elm
-	var chainProxies []C.Proxy
-	var targetProxies []C.Proxy
-
-	for n, proxy := range rawProxies {
-		proxies = append(proxies, proxy)
-		chainProxies = append(chainProxies, proxy)
-		subproxy := proxy.Unwrap(metadata, touch)
-		for subproxy != nil {
-			chainProxies = append(chainProxies, subproxy)
-			proxies[n] = subproxy
-			subproxy = subproxy.Unwrap(metadata, touch)
-		}
-	}
-
-	for _, proxy := range proxies {
-		if proxy.Type() != C.Direct && proxy.Type() != C.Compatible {
-			targetProxies = append(targetProxies, proxy)
-		}
-	}
-
-	return targetProxies, chainProxies
 }
 
-func (r *Relay) Addr() string {
+func (r *Relay) proxies(metadata *C.Metadata, touch bool) []C.Proxy {
-	proxies, _ := r.proxies(nil, true)
+	proxies := r.rawProxies(touch)
-	return proxies[len(proxies)-1].Addr()
+
+	for n, proxy := range proxies {
+		subproxy := proxy.Unwrap(metadata)
+		for subproxy != nil {
+			proxies[n] = subproxy
+			subproxy = subproxy.Unwrap(metadata)
+		}
+	}
+
+	return proxies
+}
+
+func (r *Relay) streamContext(ctx context.Context, proxies []C.Proxy, opts ...dialer.Option) (net.Conn, error) {
+	first := proxies[0]
+
+	c, err := dialer.DialContext(ctx, "tcp", first.Addr(), opts...)
+	if err != nil {
+		return nil, fmt.Errorf("%s connect error: %w", first.Addr(), err)
+	}
+	tcpKeepAlive(c)
+
+	if len(proxies) > 1 {
+		var currentMeta *C.Metadata
+		for _, proxy := range proxies[1:] {
+			currentMeta, err = addrToMetadata(proxy.Addr())
+			if err != nil {
+				return nil, err
+			}
+
+			c, err = first.StreamConn(c, currentMeta)
+			if err != nil {
+				return nil, fmt.Errorf("%s connect error: %w", first.Addr(), err)
+			}
+
+			first = proxy
+		}
+	}
+
+	return c, nil
+}
+
+func streamSocks5PacketConn(proxy C.Proxy, cc, c net.Conn, metadata *C.Metadata) (net.Conn, error) {
+	pc, err := proxy.(*adapter.Proxy).ProxyAdapter.(*outbound.Socks5).StreamSocks5PacketConn(cc, c.(net.PacketConn), metadata)
+	return outbound.WrapConn(pc), err
+}
+
+func isRawUDPRelay(proxies []C.Proxy) (bool, int) {
+	var (
+		lastIndex           = len(proxies) - 1
+		last                = proxies[lastIndex]
+		isLastRawUDP        = isRawUDP(last)
+		isUDPOverTCP        = false
+		lastUDPOverTCPIndex = -1
+	)
+
+	for i := lastIndex; i >= 0; i-- {
+		p := proxies[i]
+
+		isUDPOverTCP = isUDPOverTCP || !isRawUDP(p)
+
+		if isLastRawUDP && isUDPOverTCP && lastUDPOverTCPIndex == -1 {
+			lastUDPOverTCPIndex = i
+		}
+	}
+
+	if !isLastRawUDP {
+		lastUDPOverTCPIndex = lastIndex
+	}
+
+	return !isUDPOverTCP, lastUDPOverTCPIndex
+}
+
+func isRawUDP(proxy C.ProxyAdapter) bool {
+	if proxy.Type() == C.Shadowsocks || proxy.Type() == C.ShadowsocksR || proxy.Type() == C.Socks5 {
+		return true
+	}
+	return false
+}
+
+func needResolveIP(proxy C.ProxyAdapter, metadata *C.Metadata) bool {
+	if metadata.Resolved() {
+		return false
+	}
+	if proxy.Type() != C.Vmess && proxy.Type() != C.Vless {
+		return false
+	}
+	return true
 }
 
 func NewRelay(option *GroupCommonOption, providers []provider.ProxyProvider) *Relay {
 	return &Relay{
-		GroupBase: NewGroupBase(GroupBaseOption{
+		Base: outbound.NewBase(outbound.BaseOption{
-			outbound.BaseOption{
 			Name:        option.Name,
 			Type:        C.Relay,
 			Interface:   option.Interface,
 			RoutingMark: option.RoutingMark,
-			},
-			"",
-			"",
-			"",
-			providers,
 		}),
+		single:    singledo.NewSingle[[]C.Proxy](defaultGetProxiesDuration),
+		providers: providers,
 	}
 }

adapter/outboundgroup/selector.go

@@ -6,15 +6,18 @@ import (
 	"errors"
 
 	"github.com/Dreamacro/clash/adapter/outbound"
+	"github.com/Dreamacro/clash/common/singledo"
 	"github.com/Dreamacro/clash/component/dialer"
 	C "github.com/Dreamacro/clash/constant"
 	"github.com/Dreamacro/clash/constant/provider"
 )
 
 type Selector struct {
-	*GroupBase
+	*outbound.Base
 	disableUDP bool
+	single     *singledo.Single[C.Proxy]
 	selected   string
+	providers  []provider.ProxyProvider
 }
 
 // DialContext implements C.ProxyAdapter
@@ -46,8 +49,8 @@ func (s *Selector) SupportUDP() bool {
 
 // MarshalJSON implements C.ProxyAdapter
 func (s *Selector) MarshalJSON() ([]byte, error) {
-	all := []string{}
+	var all []string
-	for _, proxy := range s.GetProxies(false) {
+	for _, proxy := range getProvidersProxies(s.providers, false) {
 		all = append(all, proxy.Name())
 	}
 
@@ -63,9 +66,10 @@ func (s *Selector) Now() string {
 }
 
 func (s *Selector) Set(name string) error {
-	for _, proxy := range s.GetProxies(false) {
+	for _, proxy := range getProvidersProxies(s.providers, false) {
 		if proxy.Name() == name {
 			s.selected = name
+			s.single.Reset()
 			return nil
 		}
 	}
@@ -74,36 +78,37 @@ func (s *Selector) Set(name string) error {
 }
 
 // Unwrap implements C.ProxyAdapter
-func (s *Selector) Unwrap(metadata *C.Metadata, touch bool) C.Proxy {
+func (s *Selector) Unwrap(metadata *C.Metadata) C.Proxy {
-	return s.selectedProxy(touch)
+	return s.selectedProxy(true)
 }
 
 func (s *Selector) selectedProxy(touch bool) C.Proxy {
-	proxies := s.GetProxies(touch)
+	elm, _, _ := s.single.Do(func() (C.Proxy, error) {
+		proxies := getProvidersProxies(s.providers, touch)
 		for _, proxy := range proxies {
 			if proxy.Name() == s.selected {
-			return proxy
+				return proxy, nil
 			}
 		}
 
-	return proxies[0]
+		return proxies[0], nil
+	})
+
+	return elm
 }
 
 func NewSelector(option *GroupCommonOption, providers []provider.ProxyProvider) *Selector {
+	selected := providers[0].Proxies()[0].Name()
 	return &Selector{
-		GroupBase: NewGroupBase(GroupBaseOption{
+		Base: outbound.NewBase(outbound.BaseOption{
-			outbound.BaseOption{
 			Name:        option.Name,
 			Type:        C.Selector,
 			Interface:   option.Interface,
 			RoutingMark: option.RoutingMark,
-			},
-			option.Filter,
-			option.ExcludeFilter,
-			option.ExcludeType,
-			providers,
 		}),
-		selected:   "COMPATIBLE",
+		single:     singledo.NewSingle[C.Proxy](defaultGetProxiesDuration),
+		providers:  providers,
+		selected:   selected,
 		disableUDP: option.DisableUDP,
 	}
 }

adapter/outboundgroup/urltest.go

@@ -6,7 +6,6 @@ import (
 	"time"
 
 	"github.com/Dreamacro/clash/adapter/outbound"
-	"github.com/Dreamacro/clash/common/callback"
 	"github.com/Dreamacro/clash/common/singledo"
 	"github.com/Dreamacro/clash/component/dialer"
 	C "github.com/Dreamacro/clash/constant"
@@ -22,11 +21,13 @@ func urlTestWithTolerance(tolerance uint16) urlTestOption {
 }
 
 type URLTest struct {
-	*GroupBase
+	*outbound.Base
 	tolerance  uint16
 	disableUDP bool
 	fastNode   C.Proxy
+	single     *singledo.Single[[]C.Proxy]
 	fastSingle *singledo.Single[C.Proxy]
+	providers  []provider.ProxyProvider
 }
 
 func (u *URLTest) Now() string {
@@ -35,23 +36,9 @@ func (u *URLTest) Now() string {
 
 // DialContext implements C.ProxyAdapter
 func (u *URLTest) DialContext(ctx context.Context, metadata *C.Metadata, opts ...dialer.Option) (c C.Conn, err error) {
-	proxy := u.fast(true)
+	c, err = u.fast(true).DialContext(ctx, metadata, u.Base.DialOptions(opts...)...)
-	c, err = proxy.DialContext(ctx, metadata, u.Base.DialOptions(opts...)...)
 	if err == nil {
 		c.AppendToChains(u)
-	} else {
-		u.onDialFailed(proxy.Type(), err)
-	}
-
-	c = &callback.FirstWriteCallBackConn{
-		Conn: c,
-		Callback: func(err error) {
-			if err == nil {
-				u.onDialSuccess()
-			} else {
-				u.onDialFailed(proxy.Type(), err)
-			}
-		},
 	}
 	return c, err
 }
@@ -62,18 +49,25 @@ func (u *URLTest) ListenPacketContext(ctx context.Context, metadata *C.Metadata,
 	if err == nil {
 		pc.AppendToChains(u)
 	}
-
 	return pc, err
 }
 
 // Unwrap implements C.ProxyAdapter
-func (u *URLTest) Unwrap(metadata *C.Metadata, touch bool) C.Proxy {
+func (u *URLTest) Unwrap(metadata *C.Metadata) C.Proxy {
-	return u.fast(touch)
+	return u.fast(true)
+}
+
+func (u *URLTest) proxies(touch bool) []C.Proxy {
+	elm, _, _ := u.single.Do(func() ([]C.Proxy, error) {
+		return getProvidersProxies(u.providers, touch), nil
+	})
+
+	return elm
 }
 
 func (u *URLTest) fast(touch bool) C.Proxy {
-	elm, _, shared := u.fastSingle.Do(func() (C.Proxy, error) {
+	elm, _, _ := u.fastSingle.Do(func() (C.Proxy, error) {
-		proxies := u.GetProxies(touch)
+		proxies := u.proxies(touch)
 		fast := proxies[0]
 		min := fast.LastDelay()
 		fastNotExist := true
@@ -101,9 +95,6 @@ func (u *URLTest) fast(touch bool) C.Proxy {
 
 		return u.fastNode, nil
 	})
-	if shared && touch { // a shared fastSingle.Do() may cause providers untouched, so we touch them again
-		u.Touch()
-	}
 
 	return elm
 }
@@ -119,8 +110,8 @@ func (u *URLTest) SupportUDP() bool {
 
 // MarshalJSON implements C.ProxyAdapter
 func (u *URLTest) MarshalJSON() ([]byte, error) {
-	all := []string{}
+	var all []string
-	for _, proxy := range u.GetProxies(false) {
+	for _, proxy := range u.proxies(false) {
 		all = append(all, proxy.Name())
 	}
 	return json.Marshal(map[string]any{
@@ -145,20 +136,15 @@ func parseURLTestOption(config map[string]any) []urlTestOption {
 
 func NewURLTest(option *GroupCommonOption, providers []provider.ProxyProvider, options ...urlTestOption) *URLTest {
 	urlTest := &URLTest{
-		GroupBase: NewGroupBase(GroupBaseOption{
+		Base: outbound.NewBase(outbound.BaseOption{
-			outbound.BaseOption{
 			Name:        option.Name,
 			Type:        C.URLTest,
 			Interface:   option.Interface,
 			RoutingMark: option.RoutingMark,
-			},
-
-			option.Filter,
-			option.ExcludeFilter,
-			option.ExcludeType,
-			providers,
 		}),
+		single:     singledo.NewSingle[[]C.Proxy](defaultGetProxiesDuration),
 		fastSingle: singledo.NewSingle[C.Proxy](time.Second * 10),
+		providers:  providers,
 		disableUDP: option.DisableUDP,
 	}
 

adapter/outboundgroup/util.go

@@ -16,19 +16,31 @@ func addrToMetadata(rawAddress string) (addr *C.Metadata, err error) {
 		return
 	}
 
-	if ip, err := netip.ParseAddr(host); err != nil {
+	ip, err := netip.ParseAddr(host)
+	if err != nil {
 		addr = &C.Metadata{
+			AddrType: C.AtypDomainName,
 			Host:     host,
+			DstIP:    netip.Addr{},
 			DstPort:  port,
 		}
-	} else {
+		return addr, nil
+	} else if ip.Is4() {
 		addr = &C.Metadata{
+			AddrType: C.AtypIPv4,
 			Host:     "",
-			DstIP:   ip.Unmap(),
+			DstIP:    ip,
 			DstPort:  port,
 		}
+		return
 	}
 
+	addr = &C.Metadata{
+		AddrType: C.AtypIPv6,
+		Host:     "",
+		DstIP:    ip,
+		DstPort:  port,
+	}
 	return
 }
 
@@ -36,9 +48,6 @@ func tcpKeepAlive(c net.Conn) {
 	if tcp, ok := c.(*net.TCPConn); ok {
 		_ = tcp.SetKeepAlive(true)
 		_ = tcp.SetKeepAlivePeriod(30 * time.Second)
+		_ = tcp.SetLinger(0)
 	}
 }
-
-type SelectAble interface {
-	Set(string) error
-}

adapter/parser.go

@@ -3,15 +3,13 @@ package adapter
 import (
 	"fmt"
 
-	tlsC "github.com/Dreamacro/clash/component/tls"
-
 	"github.com/Dreamacro/clash/adapter/outbound"
 	"github.com/Dreamacro/clash/common/structure"
 	C "github.com/Dreamacro/clash/constant"
 )
 
-func ParseProxy(mapping map[string]any) (C.Proxy, error) {
+func ParseProxy(mapping map[string]any, forceCertVerify bool) (C.Proxy, error) {
-	decoder := structure.NewDecoder(structure.Option{TagName: "proxy", WeaklyTypedInput: true, KeyReplacer: structure.DefaultKeyReplacer})
+	decoder := structure.NewDecoder(structure.Option{TagName: "proxy", WeaklyTypedInput: true})
 	proxyType, existType := mapping["type"].(string)
 	if !existType {
 		return nil, fmt.Errorf("missing type")
@@ -42,42 +40,45 @@ func ParseProxy(mapping map[string]any) (C.Proxy, error) {
 		if err != nil {
 			break
 		}
-		proxy, err = outbound.NewSocks5(*socksOption)
+		if forceCertVerify {
+			socksOption.SkipCertVerify = false
+		}
+		proxy = outbound.NewSocks5(*socksOption)
 	case "http":
 		httpOption := &outbound.HttpOption{}
 		err = decoder.Decode(mapping, httpOption)
 		if err != nil {
 			break
 		}
-		proxy, err = outbound.NewHttp(*httpOption)
+		if forceCertVerify {
+			httpOption.SkipCertVerify = false
+		}
+		proxy = outbound.NewHttp(*httpOption)
 	case "vmess":
 		vmessOption := &outbound.VmessOption{
 			HTTPOpts: outbound.HTTPOptions{
 				Method:  "GET",
 				Path:    []string{"/"},
+				Headers: make(map[string][]string),
 			},
 		}
-
-		if GlobalUtlsClient := tlsC.GetGlobalFingerprint(); len(GlobalUtlsClient) != 0 {
-			vmessOption.ClientFingerprint = GlobalUtlsClient
-		}
-
 		err = decoder.Decode(mapping, vmessOption)
 		if err != nil {
 			break
 		}
+		if forceCertVerify {
+			vmessOption.SkipCertVerify = false
+		}
 		proxy, err = outbound.NewVmess(*vmessOption)
 	case "vless":
 		vlessOption := &outbound.VlessOption{}
-
-		if GlobalUtlsClient := tlsC.GetGlobalFingerprint(); len(GlobalUtlsClient) != 0 {
-			vlessOption.ClientFingerprint = GlobalUtlsClient
-		}
-
 		err = decoder.Decode(mapping, vlessOption)
 		if err != nil {
 			break
 		}
+		if forceCertVerify {
+			vlessOption.SkipCertVerify = false
+		}
 		proxy, err = outbound.NewVless(*vlessOption)
 	case "snell":
 		snellOption := &outbound.SnellOption{}
@@ -88,37 +89,14 @@ func ParseProxy(mapping map[string]any) (C.Proxy, error) {
 		proxy, err = outbound.NewSnell(*snellOption)
 	case "trojan":
 		trojanOption := &outbound.TrojanOption{}
-
-		if GlobalUtlsClient := tlsC.GetGlobalFingerprint(); len(GlobalUtlsClient) != 0 {
-			trojanOption.ClientFingerprint = GlobalUtlsClient
-		}
-
 		err = decoder.Decode(mapping, trojanOption)
 		if err != nil {
 			break
 		}
+		if forceCertVerify {
+			trojanOption.SkipCertVerify = false
+		}
 		proxy, err = outbound.NewTrojan(*trojanOption)
-	case "hysteria":
-		hyOption := &outbound.HysteriaOption{}
-		err = decoder.Decode(mapping, hyOption)
-		if err != nil {
-			break
-		}
-		proxy, err = outbound.NewHysteria(*hyOption)
-	case "wireguard":
-		wgOption := &outbound.WireGuardOption{}
-		err = decoder.Decode(mapping, wgOption)
-		if err != nil {
-			break
-		}
-		proxy, err = outbound.NewWireGuard(*wgOption)
-	case "tuic":
-		tuicOption := &outbound.TuicOption{}
-		err = decoder.Decode(mapping, tuicOption)
-		if err != nil {
-			break
-		}
-		proxy, err = outbound.NewTuic(*tuicOption)
 	default:
 		return nil, fmt.Errorf("unsupport proxy type: %s", proxyType)
 	}

adapter/provider/fetcher.go

@@ -1,4 +1,4 @@
-package resource
+package provider
 
 import (
 	"bytes"
@@ -16,50 +16,38 @@ var (
 	dirMode  os.FileMode = 0o755
 )
 
-type Parser[V any] func([]byte) (V, error)
+type parser[V any] func([]byte) (V, error)
 
-type Fetcher[V any] struct {
+type fetcher[V any] struct {
-	resourceType string
 	name      string
 	vehicle   types.Vehicle
-	UpdatedAt    *time.Time
+	updatedAt *time.Time
 	ticker    *time.Ticker
 	done      chan struct{}
 	hash      [16]byte
-	parser       Parser[V]
+	parser    parser[V]
-	interval     time.Duration
+	onUpdate  func(V)
-	OnUpdate     func(V)
 }
 
-func (f *Fetcher[V]) Name() string {
+func (f *fetcher[V]) Name() string {
 	return f.name
 }
 
-func (f *Fetcher[V]) Vehicle() types.Vehicle {
+func (f *fetcher[V]) VehicleType() types.VehicleType {
-	return f.vehicle
-}
-
-func (f *Fetcher[V]) VehicleType() types.VehicleType {
 	return f.vehicle.Type()
 }
 
-func (f *Fetcher[V]) Initial() (V, error) {
+func (f *fetcher[V]) Initial() (V, error) {
 	var (
 		buf     []byte
 		err     error
 		isLocal bool
-		forceUpdate bool
 	)
-
 	if stat, fErr := os.Stat(f.vehicle.Path()); fErr == nil {
 		buf, err = os.ReadFile(f.vehicle.Path())
 		modTime := stat.ModTime()
-		f.UpdatedAt = &modTime
+		f.updatedAt = &modTime
 		isLocal = true
-		if f.interval != 0 && modTime.Add(f.interval).Before(time.Now()) {
-			log.Warnln("[Provider] %s not updated for a long time, force refresh", f.Name())
-			forceUpdate = true
-		}
 	} else {
 		buf, err = f.vehicle.Read()
 	}
@@ -68,21 +56,7 @@ func (f *Fetcher[V]) Initial() (V, error) {
 		return getZero[V](), err
 	}
 
-	var contents V
+	proxies, err := f.parser(buf)
-	if forceUpdate {
-		var forceBuf []byte
-		if forceBuf, err = f.vehicle.Read(); err == nil {
-			if contents, err = f.parser(forceBuf); err == nil {
-				isLocal = false
-				buf = forceBuf
-			}
-		}
-	}
-
-	if err != nil || !forceUpdate {
-		contents, err = f.parser(buf)
-	}
-
 	if err != nil {
 		if !isLocal {
 			return getZero[V](), err
@@ -94,7 +68,7 @@ func (f *Fetcher[V]) Initial() (V, error) {
 			return getZero[V](), err
 		}
 
-		contents, err = f.parser(buf)
+		proxies, err = f.parser(buf)
 		if err != nil {
 			return getZero[V](), err
 		}
@@ -110,15 +84,15 @@ func (f *Fetcher[V]) Initial() (V, error) {
 
 	f.hash = md5.Sum(buf)
 
-	// pull contents automatically
+	// pull proxies automatically
 	if f.ticker != nil {
 		go f.pullLoop()
 	}
 
-	return contents, nil
+	return proxies, nil
 }
 
-func (f *Fetcher[V]) Update() (V, bool, error) {
+func (f *fetcher[V]) Update() (V, bool, error) {
 	buf, err := f.vehicle.Read()
 	if err != nil {
 		return getZero[V](), false, err
@@ -127,12 +101,12 @@ func (f *Fetcher[V]) Update() (V, bool, error) {
 	now := time.Now()
 	hash := md5.Sum(buf)
 	if bytes.Equal(f.hash[:], hash[:]) {
-		f.UpdatedAt = &now
+		f.updatedAt = &now
 		_ = os.Chtimes(f.vehicle.Path(), now, now)
 		return getZero[V](), true, nil
 	}
 
-	contents, err := f.parser(buf)
+	proxies, err := f.parser(buf)
 	if err != nil {
 		return getZero[V](), false, err
 	}
@@ -143,37 +117,37 @@ func (f *Fetcher[V]) Update() (V, bool, error) {
 		}
 	}
 
-	f.UpdatedAt = &now
+	f.updatedAt = &now
 	f.hash = hash
 
-	return contents, false, nil
+	return proxies, false, nil
 }
 
-func (f *Fetcher[V]) Destroy() error {
+func (f *fetcher[V]) Destroy() error {
 	if f.ticker != nil {
 		f.done <- struct{}{}
 	}
 	return nil
 }
 
-func (f *Fetcher[V]) pullLoop() {
+func (f *fetcher[V]) pullLoop() {
 	for {
 		select {
 		case <-f.ticker.C:
 			elm, same, err := f.Update()
 			if err != nil {
-				log.Errorln("[Provider] %s pull error: %s", f.Name(), err.Error())
+				log.Warnln("[Provider] %s pull error: %s", f.Name(), err.Error())
 				continue
 			}
 
 			if same {
-				log.Debugln("[Provider] %s's content doesn't change", f.Name())
+				log.Debugln("[Provider] %s's proxies doesn't change", f.Name())
 				continue
 			}
 
-			log.Infoln("[Provider] %s's content update", f.Name())
+			log.Infoln("[Provider] %s's proxies update", f.Name())
-			if f.OnUpdate != nil {
+			if f.onUpdate != nil {
-				f.OnUpdate(elm)
+				f.onUpdate(elm)
 			}
 		case <-f.done:
 			f.ticker.Stop()
@@ -194,20 +168,19 @@ func safeWrite(path string, buf []byte) error {
 	return os.WriteFile(path, buf, fileMode)
 }
 
-func NewFetcher[V any](name string, interval time.Duration, vehicle types.Vehicle, parser Parser[V], onUpdate func(V)) *Fetcher[V] {
+func newFetcher[V any](name string, interval time.Duration, vehicle types.Vehicle, parser parser[V], onUpdate func(V)) *fetcher[V] {
 	var ticker *time.Ticker
 	if interval != 0 {
 		ticker = time.NewTicker(interval)
 	}
 
-	return &Fetcher[V]{
+	return &fetcher[V]{
 		name:     name,
 		ticker:   ticker,
 		vehicle:  vehicle,
 		parser:   parser,
 		done:     make(chan struct{}, 1),
-		OnUpdate: onUpdate,
+		onUpdate: onUpdate,
-		interval: interval,
 	}
 }
 

adapter/provider/healthcheck.go

@@ -5,11 +5,8 @@ import (
 	"time"
 
 	"github.com/Dreamacro/clash/common/batch"
-	"github.com/Dreamacro/clash/common/singledo"
 	C "github.com/Dreamacro/clash/constant"
-	"github.com/Dreamacro/clash/log"
 
-	"github.com/gofrs/uuid"
 	"go.uber.org/atomic"
 )
 
@@ -29,21 +26,25 @@ type HealthCheck struct {
 	lazy      bool
 	lastTouch *atomic.Int64
 	done      chan struct{}
-	singleDo  *singledo.Single[struct{}]
 }
 
 func (hc *HealthCheck) process() {
 	ticker := time.NewTicker(time.Duration(hc.interval) * time.Second)
 
 	go func() {
-		time.Sleep(30 * time.Second)
+		t := time.NewTicker(30 * time.Second)
-		hc.lazyCheck()
+		<-t.C
+		t.Stop()
+		hc.check()
 	}()
 
 	for {
 		select {
 		case <-ticker.C:
-			hc.lazyCheck()
+			now := time.Now().Unix()
+			if !hc.lazy || now-hc.lastTouch.Load() < int64(hc.interval) {
+				hc.check()
+			}
 		case <-hc.done:
 			ticker.Stop()
 			return
@@ -51,17 +52,6 @@ func (hc *HealthCheck) process() {
 	}
 }
 
-func (hc *HealthCheck) lazyCheck() bool {
-	now := time.Now().Unix()
-	if !hc.lazy || now-hc.lastTouch.Load() < int64(hc.interval) {
-		hc.check()
-		return true
-	} else {
-		log.Debugln("Skip once health check because we are lazy")
-		return false
-	}
-}
-
 func (hc *HealthCheck) setProxy(proxies []C.Proxy) {
 	hc.proxies = proxies
 }
@@ -75,29 +65,22 @@ func (hc *HealthCheck) touch() {
 }
 
 func (hc *HealthCheck) check() {
-	_, _, _ = hc.singleDo.Do(func() (struct{}, error) {
+	proxies := hc.proxies
-		id := ""
+	if len(proxies) == 0 {
-		if uid, err := uuid.NewV4(); err == nil {
+		return
-			id = uid.String()
 	}
-		log.Debugln("Start New Health Checking {%s}", id)
+
 	b, _ := batch.New[bool](context.Background(), batch.WithConcurrencyNum[bool](10))
-		for _, proxy := range hc.proxies {
+	for _, proxy := range proxies {
 		p := proxy
 		b.Go(p.Name(), func() (bool, error) {
 			ctx, cancel := context.WithTimeout(context.Background(), defaultURLTestTimeout)
 			defer cancel()
-				log.Debugln("Health Checking %s {%s}", p.Name(), id)
 			_, _ = p.URLTest(ctx, hc.url)
-				log.Debugln("Health Checked %s : %t %d ms {%s}", p.Name(), p.Alive(), p.LastDelay(), id)
 			return false, nil
 		})
 	}
-
 	b.Wait()
-		log.Debugln("Finish A Health Checking {%s}", id)
-		return struct{}{}, nil
-	})
 }
 
 func (hc *HealthCheck) close() {
@@ -112,6 +95,5 @@ func NewHealthCheck(proxies []C.Proxy, url string, interval uint, lazy bool) *He
 		lazy:      lazy,
 		lastTouch: atomic.NewInt64(0),
 		done:      make(chan struct{}, 1),
-		singleDo:  singledo.NewSingle[struct{}](time.Second),
 	}
 }

adapter/provider/parser.go

@@ -6,7 +6,6 @@ import (
 	"time"
 
 	"github.com/Dreamacro/clash/common/structure"
-	"github.com/Dreamacro/clash/component/resource"
 	C "github.com/Dreamacro/clash/constant"
 	types "github.com/Dreamacro/clash/constant/provider"
 )
@@ -26,12 +25,13 @@ type proxyProviderSchema struct {
 	URL             string              `provider:"url,omitempty"`
 	Interval        int                 `provider:"interval,omitempty"`
 	Filter          string              `provider:"filter,omitempty"`
-	ExcludeFilter string            `provider:"exclude-filter,omitempty"`
-	ExcludeType   string            `provider:"exclude-type,omitempty"`
 	HealthCheck     healthCheckSchema   `provider:"health-check,omitempty"`
+	ForceCertVerify bool                `provider:"force-cert-verify,omitempty"`
+	PrefixName      string              `provider:"prefix-name,omitempty"`
+	Header          map[string][]string `provider:"header,omitempty"`
 }
 
-func ParseProxyProvider(name string, mapping map[string]any) (types.ProxyProvider, error) {
+func ParseProxyProvider(name string, mapping map[string]any, forceCertVerify bool) (types.ProxyProvider, error) {
 	decoder := structure.NewDecoder(structure.Option{TagName: "provider", WeaklyTypedInput: true})
 
 	schema := &proxyProviderSchema{
@@ -39,6 +39,11 @@ func ParseProxyProvider(name string, mapping map[string]any) (types.ProxyProvide
 			Lazy: true,
 		},
 	}
+
+	if forceCertVerify {
+		schema.ForceCertVerify = true
+	}
+
 	if err := decoder.Decode(mapping, schema); err != nil {
 		return nil, err
 	}
@@ -54,17 +59,14 @@ func ParseProxyProvider(name string, mapping map[string]any) (types.ProxyProvide
 	var vehicle types.Vehicle
 	switch schema.Type {
 	case "file":
-		vehicle = resource.NewFileVehicle(path)
+		vehicle = NewFileVehicle(path)
 	case "http":
-		vehicle = resource.NewHTTPVehicle(schema.URL, path)
+		vehicle = NewHTTPVehicle(schema.URL, path, schema.Header)
 	default:
 		return nil, fmt.Errorf("%w: %s", errVehicleType, schema.Type)
 	}
 
 	interval := time.Duration(uint(schema.Interval)) * time.Second
 	filter := schema.Filter
-	excludeFilter := schema.ExcludeFilter
+	return NewProxySetProvider(name, interval, filter, vehicle, hc, schema.ForceCertVerify, schema.PrefixName)
-	excludeType := schema.ExcludeType
-
-	return NewProxySetProvider(name, interval, filter, excludeFilter, excludeType, vehicle, hc)
 }

adapter/provider/provider.go

@@ -1,24 +1,18 @@
 package provider
 
 import (
-	"context"
 	"encoding/json"
 	"errors"
 	"fmt"
-	"net/http"
+	"regexp"
 	"runtime"
-	"strings"
 	"time"
 
 	"github.com/Dreamacro/clash/adapter"
 	"github.com/Dreamacro/clash/common/convert"
-	clashHttp "github.com/Dreamacro/clash/component/http"
-	"github.com/Dreamacro/clash/component/resource"
 	C "github.com/Dreamacro/clash/constant"
 	types "github.com/Dreamacro/clash/constant/provider"
-	"github.com/Dreamacro/clash/log"
 
-	"github.com/dlclark/regexp2"
 	"gopkg.in/yaml.v3"
 )
 
@@ -36,11 +30,10 @@ type ProxySetProvider struct {
 }
 
 type proxySetProvider struct {
-	*resource.Fetcher[[]C.Proxy]
+	*fetcher[[]C.Proxy]
 	proxies        []C.Proxy
 	healthCheck    *HealthCheck
-	version          uint32
+	providersInUse []types.ProxyProvider
-	subscriptionInfo *SubscriptionInfo
 }
 
 func (pp *proxySetProvider) MarshalJSON() ([]byte, error) {
@@ -49,17 +42,12 @@ func (pp *proxySetProvider) MarshalJSON() ([]byte, error) {
 		"type":        pp.Type().String(),
 		"vehicleType": pp.VehicleType().String(),
 		"proxies":     pp.Proxies(),
-		"updatedAt":        pp.UpdatedAt,
+		"updatedAt":   pp.updatedAt,
-		"subscriptionInfo": pp.subscriptionInfo,
 	})
 }
 
-func (pp *proxySetProvider) Version() uint32 {
-	return pp.version
-}
-
 func (pp *proxySetProvider) Name() string {
-	return pp.Fetcher.Name()
+	return pp.name
 }
 
 func (pp *proxySetProvider) HealthCheck() {
@@ -67,19 +55,20 @@ func (pp *proxySetProvider) HealthCheck() {
 }
 
 func (pp *proxySetProvider) Update() error {
-	elm, same, err := pp.Fetcher.Update()
+	elm, same, err := pp.fetcher.Update()
 	if err == nil && !same {
-		pp.OnUpdate(elm)
+		pp.onUpdate(elm)
 	}
 	return err
 }
 
 func (pp *proxySetProvider) Initial() error {
-	elm, err := pp.Fetcher.Initial()
+	elm, err := pp.fetcher.Initial()
 	if err != nil {
 		return err
 	}
-	pp.OnUpdate(elm)
+
+	pp.onUpdate(elm)
 	return nil
 }
 
@@ -91,75 +80,34 @@ func (pp *proxySetProvider) Proxies() []C.Proxy {
 	return pp.proxies
 }
 
-func (pp *proxySetProvider) Touch() {
+func (pp *proxySetProvider) ProxiesWithTouch() []C.Proxy {
 	pp.healthCheck.touch()
+	return pp.Proxies()
 }
 
 func (pp *proxySetProvider) setProxies(proxies []C.Proxy) {
 	pp.proxies = proxies
 	pp.healthCheck.setProxy(proxies)
-	if pp.healthCheck.auto() {
+
-		defer func() { go pp.healthCheck.lazyCheck() }()
+	for _, use := range pp.providersInUse {
+		_ = use.Update()
 	}
 }
 
-func (pp *proxySetProvider) getSubscriptionInfo() {
+func (pp *proxySetProvider) RegisterProvidersInUse(providers ...types.ProxyProvider) {
-	if pp.VehicleType() != types.HTTP {
+	pp.providersInUse = append(pp.providersInUse, providers...)
-		return
-	}
-	go func() {
-		ctx, cancel := context.WithTimeout(context.Background(), time.Second*90)
-		defer cancel()
-		resp, err := clashHttp.HttpRequest(ctx, pp.Vehicle().(*resource.HTTPVehicle).Url(),
-			http.MethodGet, http.Header{"User-Agent": {"clash"}}, nil)
-		if err != nil {
-			return
-		}
-		defer resp.Body.Close()
-
-		userInfoStr := strings.TrimSpace(resp.Header.Get("subscription-userinfo"))
-		if userInfoStr == "" {
-			resp2, err := clashHttp.HttpRequest(ctx, pp.Vehicle().(*resource.HTTPVehicle).Url(),
-				http.MethodGet, http.Header{"User-Agent": {"Quantumultx"}}, nil)
-			if err != nil {
-				return
-			}
-			defer resp2.Body.Close()
-			userInfoStr = strings.TrimSpace(resp2.Header.Get("subscription-userinfo"))
-			if userInfoStr == "" {
-				return
-			}
-		}
-		pp.subscriptionInfo, err = NewSubscriptionInfo(userInfoStr)
-		if err != nil {
-			log.Warnln("[Provider] get subscription-userinfo: %e", err)
-		}
-	}()
 }
 
 func stopProxyProvider(pd *ProxySetProvider) {
 	pd.healthCheck.close()
-	_ = pd.Fetcher.Destroy()
+	_ = pd.fetcher.Destroy()
 }
 
-func NewProxySetProvider(name string, interval time.Duration, filter string, excludeFilter string, excludeType string, vehicle types.Vehicle, hc *HealthCheck) (*ProxySetProvider, error) {
+func NewProxySetProvider(name string, interval time.Duration, filter string, vehicle types.Vehicle, hc *HealthCheck, forceCertVerify bool, prefixName string) (*ProxySetProvider, error) {
-	excludeFilterReg, err := regexp2.Compile(excludeFilter, 0)
+	filterReg, err := regexp.Compile(filter)
-	if err != nil {
-		return nil, fmt.Errorf("invalid excludeFilter regex: %w", err)
-	}
-	var excludeTypeArray []string
-	if excludeType != "" {
-		excludeTypeArray = strings.Split(excludeType, "|")
-	}
-
-	var filterRegs []*regexp2.Regexp
-	for _, filter := range strings.Split(filter, "`") {
-		filterReg, err := regexp2.Compile(filter, 0)
 	if err != nil {
 		return nil, fmt.Errorf("invalid filter regex: %w", err)
 	}
-		filterRegs = append(filterRegs, filterReg)
-	}
 
 	if hc.auto() {
 		go hc.process()
@@ -170,10 +118,9 @@ func NewProxySetProvider(name string, interval time.Duration, filter string, exc
 		healthCheck: hc,
 	}
 
-	fetcher := resource.NewFetcher[[]C.Proxy](name, interval, vehicle, proxiesParseAndFilter(filter, excludeFilter, excludeTypeArray, filterRegs, excludeFilterReg), proxiesOnUpdate(pd))
+	fetcher := newFetcher[[]C.Proxy](name, interval, vehicle, proxiesParseAndFilter(filter, filterReg, forceCertVerify, prefixName), proxiesOnUpdate(pd))
-	pd.Fetcher = fetcher
+	pd.fetcher = fetcher
 
-	pd.getSubscriptionInfo()
 	wrapper := &ProxySetProvider{pd}
 	runtime.SetFinalizer(wrapper, stopProxyProvider)
 	return wrapper, nil
@@ -188,7 +135,6 @@ type compatibleProvider struct {
 	name        string
 	healthCheck *HealthCheck
 	proxies     []C.Proxy
-	version     uint32
 }
 
 func (cp *compatibleProvider) MarshalJSON() ([]byte, error) {
@@ -200,10 +146,6 @@ func (cp *compatibleProvider) MarshalJSON() ([]byte, error) {
 	})
 }
 
-func (cp *compatibleProvider) Version() uint32 {
-	return cp.version
-}
-
 func (cp *compatibleProvider) Name() string {
 	return cp.name
 }
@@ -232,8 +174,9 @@ func (cp *compatibleProvider) Proxies() []C.Proxy {
 	return cp.proxies
 }
 
-func (cp *compatibleProvider) Touch() {
+func (cp *compatibleProvider) ProxiesWithTouch() []C.Proxy {
 	cp.healthCheck.touch()
+	return cp.Proxies()
 }
 
 func stopCompatibleProvider(pd *CompatibleProvider) {
@@ -260,22 +203,112 @@ func NewCompatibleProvider(name string, proxies []C.Proxy, hc *HealthCheck) (*Co
 	return wrapper, nil
 }
 
+// ProxyFilterProvider for filter provider
+type ProxyFilterProvider struct {
+	*proxyFilterProvider
+}
+
+type proxyFilterProvider struct {
+	name        string
+	psd         *ProxySetProvider
+	proxies     []C.Proxy
+	filter      *regexp.Regexp
+	healthCheck *HealthCheck
+}
+
+func (pf *proxyFilterProvider) MarshalJSON() ([]byte, error) {
+	return json.Marshal(map[string]any{
+		"name":        pf.Name(),
+		"type":        pf.Type().String(),
+		"vehicleType": pf.VehicleType().String(),
+		"proxies":     pf.Proxies(),
+	})
+}
+
+func (pf *proxyFilterProvider) Name() string {
+	return pf.name
+}
+
+func (pf *proxyFilterProvider) HealthCheck() {
+	pf.healthCheck.check()
+}
+
+func (pf *proxyFilterProvider) Update() error {
+	var proxies []C.Proxy
+	if pf.filter != nil {
+		for _, proxy := range pf.psd.Proxies() {
+			if !pf.filter.MatchString(proxy.Name()) {
+				continue
+			}
+			proxies = append(proxies, proxy)
+		}
+	} else {
+		proxies = pf.psd.Proxies()
+	}
+
+	pf.proxies = proxies
+	pf.healthCheck.setProxy(proxies)
+	return nil
+}
+
+func (pf *proxyFilterProvider) Initial() error {
+	return nil
+}
+
+func (pf *proxyFilterProvider) VehicleType() types.VehicleType {
+	return pf.psd.VehicleType()
+}
+
+func (pf *proxyFilterProvider) Type() types.ProviderType {
+	return types.Proxy
+}
+
+func (pf *proxyFilterProvider) Proxies() []C.Proxy {
+	return pf.proxies
+}
+
+func (pf *proxyFilterProvider) ProxiesWithTouch() []C.Proxy {
+	pf.healthCheck.touch()
+	return pf.Proxies()
+}
+
+func stopProxyFilterProvider(pf *ProxyFilterProvider) {
+	pf.healthCheck.close()
+}
+
+func NewProxyFilterProvider(name string, psd *ProxySetProvider, hc *HealthCheck, filterRegx *regexp.Regexp) *ProxyFilterProvider {
+	pd := &proxyFilterProvider{
+		psd:         psd,
+		name:        name,
+		healthCheck: hc,
+		filter:      filterRegx,
+	}
+
+	_ = pd.Update()
+
+	if hc.auto() {
+		go hc.process()
+	}
+
+	wrapper := &ProxyFilterProvider{pd}
+	runtime.SetFinalizer(wrapper, stopProxyFilterProvider)
+	return wrapper
+}
+
 func proxiesOnUpdate(pd *proxySetProvider) func([]C.Proxy) {
 	return func(elm []C.Proxy) {
 		pd.setProxies(elm)
-		pd.version += 1
-		pd.getSubscriptionInfo()
 	}
 }
 
-func proxiesParseAndFilter(filter string, excludeFilter string, excludeTypeArray []string, filterRegs []*regexp2.Regexp, excludeFilterReg *regexp2.Regexp) resource.Parser[[]C.Proxy] {
+func proxiesParseAndFilter(filter string, filterReg *regexp.Regexp, forceCertVerify bool, prefixName string) parser[[]C.Proxy] {
 	return func(buf []byte) ([]C.Proxy, error) {
 		schema := &ProxySchema{}
 
 		if err := yaml.Unmarshal(buf, schema); err != nil {
 			proxies, err1 := convert.ConvertsV2Ray(buf)
 			if err1 != nil {
-				return nil, fmt.Errorf("%s, %w", err.Error(), err1)
+				return nil, fmt.Errorf("%w, %s", err, err1.Error())
 			}
 			schema.Proxies = proxies
 		}
@@ -285,60 +318,21 @@ func proxiesParseAndFilter(filter string, excludeFilter string, excludeTypeArray
 		}
 
 		proxies := []C.Proxy{}
-		proxiesSet := map[string]struct{}{}
-		for _, filterReg := range filterRegs {
 		for idx, mapping := range schema.Proxies {
-				if nil != excludeTypeArray && len(excludeTypeArray) > 0 {
+			if name, ok := mapping["name"]; ok && len(filter) > 0 && !filterReg.MatchString(name.(string)) {
-					mType, ok := mapping["type"]
-					if !ok {
-						continue
-					}
-					pType, ok := mType.(string)
-					if !ok {
-						continue
-					}
-					flag := false
-					for i := range excludeTypeArray {
-						if strings.EqualFold(pType, excludeTypeArray[i]) {
-							flag = true
-							break
-						}
-
-					}
-					if flag {
 				continue
 			}
 
+			if prefixName != "" {
+				mapping["name"] = prefixName + mapping["name"].(string)
 			}
-				mName, ok := mapping["name"]
+
-				if !ok {
+			proxy, err := adapter.ParseProxy(mapping, forceCertVerify)
-					continue
-				}
-				name, ok := mName.(string)
-				if !ok {
-					continue
-				}
-				if len(excludeFilter) > 0 {
-					if mat, _ := excludeFilterReg.FindStringMatch(name); mat != nil {
-						continue
-					}
-				}
-				if len(filter) > 0 {
-					if mat, _ := filterReg.FindStringMatch(name); mat == nil {
-						continue
-					}
-				}
-				if _, ok := proxiesSet[name]; ok {
-					continue
-				}
-				proxy, err := adapter.ParseProxy(mapping)
 			if err != nil {
 				return nil, fmt.Errorf("proxy %d error: %w", idx, err)
 			}
-				proxiesSet[name] = struct{}{}
 			proxies = append(proxies, proxy)
 		}
-		}
 
 		if len(proxies) == 0 {
 			if len(filter) > 0 {

adapter/provider/subscription_info.go

@@ -1,57 +0,0 @@
-package provider
-
-import (
-	"github.com/dlclark/regexp2"
-	"strconv"
-	"strings"
-)
-
-type SubscriptionInfo struct {
-	Upload   int64
-	Download int64
-	Total    int64
-	Expire   int64
-}
-
-func NewSubscriptionInfo(str string) (si *SubscriptionInfo, err error) {
-	si = &SubscriptionInfo{}
-	str = strings.ToLower(str)
-	reTraffic := regexp2.MustCompile("upload=(\\d+); download=(\\d+); total=(\\d+)", 0)
-	reExpire := regexp2.MustCompile("expire=(\\d+)", 0)
-
-	match, err := reTraffic.FindStringMatch(str)
-	if err != nil || match == nil {
-		return nil, err
-	}
-	group := match.Groups()
-	si.Upload, err = str2uint64(group[1].String())
-	if err != nil {
-		return nil, err
-	}
-
-	si.Download, err = str2uint64(group[2].String())
-	if err != nil {
-		return nil, err
-	}
-
-	si.Total, err = str2uint64(group[3].String())
-	if err != nil {
-		return nil, err
-	}
-
-	match, _ = reExpire.FindStringMatch(str)
-	if match != nil {
-		group = match.Groups()
-		si.Expire, err = str2uint64(group[1].String())
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	return
-}
-
-func str2uint64(str string) (int64, error) {
-	i, err := strconv.ParseInt(str, 10, 64)
-	return i, err
-}

adapter/provider/vehicle.go

@@ -0,0 +1,111 @@
+package provider
+
+import (
+	"context"
+	"io"
+	"net"
+	"net/http"
+	"net/url"
+	"os"
+	"time"
+
+	"github.com/Dreamacro/clash/common/convert"
+	"github.com/Dreamacro/clash/component/dialer"
+	types "github.com/Dreamacro/clash/constant/provider"
+)
+
+type FileVehicle struct {
+	path string
+}
+
+func (f *FileVehicle) Type() types.VehicleType {
+	return types.File
+}
+
+func (f *FileVehicle) Path() string {
+	return f.path
+}
+
+func (f *FileVehicle) Read() ([]byte, error) {
+	return os.ReadFile(f.path)
+}
+
+func NewFileVehicle(path string) *FileVehicle {
+	return &FileVehicle{path: path}
+}
+
+type HTTPVehicle struct {
+	url    string
+	path   string
+	header http.Header
+}
+
+func (h *HTTPVehicle) Type() types.VehicleType {
+	return types.HTTP
+}
+
+func (h *HTTPVehicle) Path() string {
+	return h.path
+}
+
+func (h *HTTPVehicle) Read() ([]byte, error) {
+	ctx, cancel := context.WithTimeout(context.Background(), time.Second*20)
+	defer cancel()
+
+	uri, err := url.Parse(h.url)
+	if err != nil {
+		return nil, err
+	}
+
+	req, err := http.NewRequest(http.MethodGet, uri.String(), nil)
+	if err != nil {
+		return nil, err
+	}
+
+	if h.header != nil {
+		req.Header = h.header
+	}
+
+	if user := uri.User; user != nil {
+		password, _ := user.Password()
+		req.SetBasicAuth(user.Username(), password)
+	}
+
+	convert.SetUserAgent(req.Header)
+
+	req = req.WithContext(ctx)
+
+	transport := &http.Transport{
+		// from http.DefaultTransport
+		MaxIdleConns:          100,
+		IdleConnTimeout:       90 * time.Second,
+		TLSHandshakeTimeout:   10 * time.Second,
+		ExpectContinueTimeout: 1 * time.Second,
+		DialContext: func(ctx context.Context, network, address string) (net.Conn, error) {
+			if req.URL.Scheme == "https" {
+				return (&net.Dialer{}).DialContext(ctx, network, address) // forward to tun if tun enabled
+			}
+			return dialer.DialContext(ctx, network, address, dialer.WithDirect()) // with direct
+		},
+	}
+
+	client := http.Client{Transport: transport}
+	resp, err := client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer func() {
+		_ = resp.Body.Close()
+	}()
+
+	buf, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return nil, err
+	}
+
+	return buf, nil
+}
+
+func NewHTTPVehicle(url string, path string, header http.Header) *HTTPVehicle {
+	return &HTTPVehicle{url, path, header}
+}

check_amd64.sh

@@ -1,28 +0,0 @@
-#!/bin/sh
-flags=$(grep '^flags\b' </proc/cpuinfo | head -n 1)
-flags=" ${flags#*:} "
-
-has_flags () {
-  for flag; do
-    case "$flags" in
-      *" $flag "*) :;;
-      *) return 1;;
-    esac
-  done
-}
-
-determine_level () {
-  level=0
-  has_flags lm cmov cx8 fpu fxsr mmx syscall sse2 || return 0
-  level=1
-  has_flags cx16 lahf_lm popcnt sse4_1 sse4_2 ssse3 || return 0
-  level=2
-  has_flags avx avx2 bmi1 bmi2 f16c fma abm movbe xsave || return 0
-  level=3
-  has_flags avx512f avx512bw avx512cd avx512dq avx512vl || return 0
-  level=4
-}
-
-determine_level
-echo "Your CPU supports amd64-v$level"
-return $level

common/buf/sing.go

@@ -1,25 +0,0 @@
-package buf
-
-import (
-	"github.com/sagernet/sing/common"
-	"github.com/sagernet/sing/common/buf"
-)
-
-const BufferSize = buf.BufferSize
-
-type Buffer = buf.Buffer
-
-var New = buf.New
-var StackNew = buf.StackNew
-var StackNewSize = buf.StackNewSize
-var With = buf.With
-
-var KeepAlive = common.KeepAlive
-
-//go:norace
-func Dup[T any](obj T) T {
-	return common.Dup(obj)
-}
-
-var Must = common.Must
-var Error = common.Error

common/cache/cache.go

@@ -0,0 +1,106 @@
+package cache
+
+import (
+	"runtime"
+	"sync"
+	"time"
+)
+
+// Cache store element with a expired time
+type Cache[K comparable, V any] struct {
+	*cache[K, V]
+}
+
+type cache[K comparable, V any] struct {
+	mapping sync.Map
+	janitor *janitor[K, V]
+}
+
+type element[V any] struct {
+	Expired time.Time
+	Payload V
+}
+
+// Put element in Cache with its ttl
+func (c *cache[K, V]) Put(key K, payload V, ttl time.Duration) {
+	c.mapping.Store(key, &element[V]{
+		Payload: payload,
+		Expired: time.Now().Add(ttl),
+	})
+}
+
+// Get element in Cache, and drop when it expired
+func (c *cache[K, V]) Get(key K) V {
+	item, exist := c.mapping.Load(key)
+	if !exist {
+		return getZero[V]()
+	}
+	elm := item.(*element[V])
+	// expired
+	if time.Since(elm.Expired) > 0 {
+		c.mapping.Delete(key)
+		return getZero[V]()
+	}
+	return elm.Payload
+}
+
+// GetWithExpire element in Cache with Expire Time
+func (c *cache[K, V]) GetWithExpire(key K) (payload V, expired time.Time) {
+	item, exist := c.mapping.Load(key)
+	if !exist {
+		return
+	}
+	elm := item.(*element[V])
+	// expired
+	if time.Since(elm.Expired) > 0 {
+		c.mapping.Delete(key)
+		return
+	}
+	return elm.Payload, elm.Expired
+}
+
+func (c *cache[K, V]) cleanup() {
+	c.mapping.Range(func(k, v any) bool {
+		key := k
+		elm := v.(*element[V])
+		if time.Since(elm.Expired) > 0 {
+			c.mapping.Delete(key)
+		}
+		return true
+	})
+}
+
+type janitor[K comparable, V any] struct {
+	interval time.Duration
+	stop     chan struct{}
+}
+
+func (j *janitor[K, V]) process(c *cache[K, V]) {
+	ticker := time.NewTicker(j.interval)
+	for {
+		select {
+		case <-ticker.C:
+			c.cleanup()
+		case <-j.stop:
+			ticker.Stop()
+			return
+		}
+	}
+}
+
+func stopJanitor[K comparable, V any](c *Cache[K, V]) {
+	c.janitor.stop <- struct{}{}
+}
+
+// New return *Cache
+func New[K comparable, V any](interval time.Duration) *Cache[K, V] {
+	j := &janitor[K, V]{
+		interval: interval,
+		stop:     make(chan struct{}),
+	}
+	c := &cache[K, V]{janitor: j}
+	go j.process(c)
+	C := &Cache[K, V]{c}
+	runtime.SetFinalizer(C, stopJanitor[K, V])
+	return C
+}

common/cache/cache_test.go

@@ -0,0 +1,72 @@
+package cache
+
+import (
+	"runtime"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestCache_Basic(t *testing.T) {
+	interval := 200 * time.Millisecond
+	ttl := 20 * time.Millisecond
+	c := New[string, int](interval)
+	c.Put("int", 1, ttl)
+
+	d := New[string, string](interval)
+	d.Put("string", "a", ttl)
+
+	i := c.Get("int")
+	assert.Equal(t, i, 1, "should recv 1")
+
+	s := d.Get("string")
+	assert.Equal(t, s, "a", "should recv 'a'")
+}
+
+func TestCache_TTL(t *testing.T) {
+	interval := 200 * time.Millisecond
+	ttl := 20 * time.Millisecond
+	now := time.Now()
+	c := New[string, int](interval)
+	c.Put("int", 1, ttl)
+	c.Put("int2", 2, ttl)
+
+	i := c.Get("int")
+	_, expired := c.GetWithExpire("int2")
+	assert.Equal(t, i, 1, "should recv 1")
+	assert.True(t, now.Before(expired))
+
+	time.Sleep(ttl * 2)
+	i = c.Get("int")
+	j, _ := c.GetWithExpire("int2")
+	assert.True(t, i == 0, "should recv 0")
+	assert.True(t, j == 0, "should recv 0")
+}
+
+func TestCache_AutoCleanup(t *testing.T) {
+	interval := 10 * time.Millisecond
+	ttl := 15 * time.Millisecond
+	c := New[string, int](interval)
+	c.Put("int", 1, ttl)
+
+	time.Sleep(ttl * 2)
+	i := c.Get("int")
+	j, _ := c.GetWithExpire("int")
+	assert.True(t, i == 0, "should recv 0")
+	assert.True(t, j == 0, "should recv 0")
+}
+
+func TestCache_AutoGC(t *testing.T) {
+	sign := make(chan struct{})
+	go func() {
+		interval := 10 * time.Millisecond
+		ttl := 15 * time.Millisecond
+		c := New[string, int](interval)
+		c.Put("int", 1, ttl)
+		sign <- struct{}{}
+	}()
+
+	<-sign
+	runtime.GC()
+}

common/cache/lrucache.go

@@ -65,8 +65,8 @@ type LruCache[K comparable, V any] struct {
 	onEvict        EvictCallback[K, V]
 }
 
-// New creates an LruCache
+// NewLRUCache creates an LruCache
-func New[K comparable, V any](options ...Option[K, V]) *LruCache[K, V] {
+func NewLRUCache[K comparable, V any](options ...Option[K, V]) *LruCache[K, V] {
 	lc := &LruCache[K, V]{
 		lru:   list.New[*entry[K, V]](),
 		cache: make(map[K]*list.Element[*entry[K, V]]),

common/cache/lrucache_test.go

@@ -19,7 +19,7 @@ var entries = []struct {
 }
 
 func TestLRUCache(t *testing.T) {
-	c := New[string, string]()
+	c := NewLRUCache[string, string]()
 
 	for _, e := range entries {
 		c.Set(e.key, e.value)
@@ -45,7 +45,7 @@ func TestLRUCache(t *testing.T) {
 }
 
 func TestLRUMaxAge(t *testing.T) {
-	c := New[string, string](WithAge[string, string](86400))
+	c := NewLRUCache[string, string](WithAge[string, string](86400))
 
 	now := time.Now().Unix()
 	expected := now + 86400
@@ -88,7 +88,7 @@ func TestLRUMaxAge(t *testing.T) {
 }
 
 func TestLRUpdateOnGet(t *testing.T) {
-	c := New[string, string](WithAge[string, string](86400), WithUpdateAgeOnGet[string, string]())
+	c := NewLRUCache[string, string](WithAge[string, string](86400), WithUpdateAgeOnGet[string, string]())
 
 	now := time.Now().Unix()
 	expires := now + 86400/2
@@ -103,7 +103,7 @@ func TestLRUpdateOnGet(t *testing.T) {
 }
 
 func TestMaxSize(t *testing.T) {
-	c := New[string, string](WithSize[string, string](2))
+	c := NewLRUCache[string, string](WithSize[string, string](2))
 	// Add one expired entry
 	c.Set("foo", "bar")
 	_, ok := c.Get("foo")
@@ -117,7 +117,7 @@ func TestMaxSize(t *testing.T) {
 }
 
 func TestExist(t *testing.T) {
-	c := New[int, int](WithSize[int, int](1))
+	c := NewLRUCache[int, int](WithSize[int, int](1))
 	c.Set(1, 2)
 	assert.True(t, c.Exist(1))
 	c.Set(2, 3)
@@ -130,7 +130,7 @@ func TestEvict(t *testing.T) {
 		temp = key + value
 	}
 
-	c := New[int, int](WithEvict[int, int](evict), WithSize[int, int](1))
+	c := NewLRUCache[int, int](WithEvict[int, int](evict), WithSize[int, int](1))
 	c.Set(1, 2)
 	c.Set(2, 3)
 
@@ -138,7 +138,7 @@ func TestEvict(t *testing.T) {
 }
 
 func TestSetWithExpire(t *testing.T) {
-	c := New[int, *struct{}](WithAge[int, *struct{}](1))
+	c := NewLRUCache[int, *struct{}](WithAge[int, *struct{}](1))
 	now := time.Now().Unix()
 
 	tenSecBefore := time.Unix(now-10, 0)
@@ -153,7 +153,7 @@ func TestSetWithExpire(t *testing.T) {
 }
 
 func TestStale(t *testing.T) {
-	c := New[int, int](WithAge[int, int](1), WithStale[int, int](true))
+	c := NewLRUCache[int, int](WithAge[int, int](1), WithStale[int, int](true))
 	now := time.Now().Unix()
 
 	tenSecBefore := time.Unix(now-10, 0)
@@ -166,11 +166,11 @@ func TestStale(t *testing.T) {
 }
 
 func TestCloneTo(t *testing.T) {
-	o := New[string, int](WithSize[string, int](10))
+	o := NewLRUCache[string, int](WithSize[string, int](10))
 	o.Set("1", 1)
 	o.Set("2", 2)
 
-	n := New[string, int](WithSize[string, int](2))
+	n := NewLRUCache[string, int](WithSize[string, int](2))
 	n.Set("3", 3)
 	n.Set("4", 4)
 

common/callback/callback.go

@@ -1,25 +0,0 @@
-package callback
-
-import (
-	C "github.com/Dreamacro/clash/constant"
-)
-
-type FirstWriteCallBackConn struct {
-	C.Conn
-	Callback func(error)
-	written  bool
-}
-
-func (c *FirstWriteCallBackConn) Write(b []byte) (n int, err error) {
-	defer func() {
-		if !c.written {
-			c.written = true
-			c.Callback(err)
-		}
-	}()
-	return c.Conn.Write(b)
-}
-
-func (c *FirstWriteCallBackConn) Upstream() any {
-	return c.Conn
-}

common/cert/cert.go

@@ -0,0 +1,303 @@
+package cert
+
+import (
+	"crypto/rand"
+	"crypto/rsa"
+	"crypto/sha1"
+	"crypto/tls"
+	"crypto/x509"
+	"crypto/x509/pkix"
+	"encoding/pem"
+	"math/big"
+	"net"
+	"os"
+	"strings"
+	"sync/atomic"
+	"time"
+)
+
+var currentSerialNumber = time.Now().Unix()
+
+type Config struct {
+	ca           *x509.Certificate
+	caPrivateKey *rsa.PrivateKey
+
+	roots *x509.CertPool
+
+	privateKey *rsa.PrivateKey
+
+	validity     time.Duration
+	keyID        []byte
+	organization string
+
+	certsStorage CertsStorage
+}
+
+type CertsStorage interface {
+	Get(key string) (*tls.Certificate, bool)
+
+	Set(key string, cert *tls.Certificate)
+}
+
+func NewAuthority(name, organization string, validity time.Duration) (*x509.Certificate, *rsa.PrivateKey, error) {
+	privateKey, err := rsa.GenerateKey(rand.Reader, 2048)
+	if err != nil {
+		return nil, nil, err
+	}
+	pub := privateKey.Public()
+
+	pkixPub, err := x509.MarshalPKIXPublicKey(pub)
+	if err != nil {
+		return nil, nil, err
+	}
+	h := sha1.New()
+	_, err = h.Write(pkixPub)
+	if err != nil {
+		return nil, nil, err
+	}
+	keyID := h.Sum(nil)
+
+	serial := atomic.AddInt64(&currentSerialNumber, 1)
+
+	tmpl := &x509.Certificate{
+		SerialNumber: big.NewInt(serial),
+		Subject: pkix.Name{
+			CommonName:   name,
+			Organization: []string{organization},
+		},
+		SubjectKeyId:          keyID,
+		KeyUsage:              x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature | x509.KeyUsageCertSign,
+		ExtKeyUsage:           []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth},
+		BasicConstraintsValid: true,
+		NotBefore:             time.Now().Add(-validity),
+		NotAfter:              time.Now().Add(validity),
+		DNSNames:              []string{name},
+		IsCA:                  true,
+	}
+
+	raw, err := x509.CreateCertificate(rand.Reader, tmpl, tmpl, pub, privateKey)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	x509c, err := x509.ParseCertificate(raw)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	return x509c, privateKey, nil
+}
+
+func NewConfig(ca *x509.Certificate, caPrivateKey *rsa.PrivateKey) (*Config, error) {
+	roots := x509.NewCertPool()
+	roots.AddCert(ca)
+
+	privateKey, err := rsa.GenerateKey(rand.Reader, 2048)
+	if err != nil {
+		return nil, err
+	}
+	pub := privateKey.Public()
+
+	pkixPub, err := x509.MarshalPKIXPublicKey(pub)
+	if err != nil {
+		return nil, err
+	}
+	h := sha1.New()
+	_, err = h.Write(pkixPub)
+	if err != nil {
+		return nil, err
+	}
+	keyID := h.Sum(nil)
+
+	return &Config{
+		ca:           ca,
+		caPrivateKey: caPrivateKey,
+		privateKey:   privateKey,
+		keyID:        keyID,
+		validity:     time.Hour,
+		organization: "Clash",
+		certsStorage: NewDomainTrieCertsStorage(),
+		roots:        roots,
+	}, nil
+}
+
+func (c *Config) GetCA() *x509.Certificate {
+	return c.ca
+}
+
+func (c *Config) SetOrganization(organization string) {
+	c.organization = organization
+}
+
+func (c *Config) SetValidity(validity time.Duration) {
+	c.validity = validity
+}
+
+func (c *Config) NewTLSConfigForHost(hostname string) *tls.Config {
+	tlsConfig := &tls.Config{
+		GetCertificate: func(clientHello *tls.ClientHelloInfo) (*tls.Certificate, error) {
+			host := clientHello.ServerName
+			if host == "" {
+				host = hostname
+			}
+
+			return c.GetOrCreateCert(host)
+		},
+		NextProtos: []string{"http/1.1"},
+	}
+
+	tlsConfig.InsecureSkipVerify = true
+
+	return tlsConfig
+}
+
+func (c *Config) GetOrCreateCert(hostname string, ips ...net.IP) (*tls.Certificate, error) {
+	var leaf *x509.Certificate
+	tlsCertificate, ok := c.certsStorage.Get(hostname)
+	if ok {
+		leaf = tlsCertificate.Leaf
+		if _, err := leaf.Verify(x509.VerifyOptions{
+			DNSName: hostname,
+			Roots:   c.roots,
+		}); err == nil {
+			return tlsCertificate, nil
+		}
+	}
+
+	var (
+		key          = hostname
+		topHost      = hostname
+		wildcardHost = "*." + hostname
+		dnsNames     []string
+	)
+
+	if ip := net.ParseIP(hostname); ip != nil {
+		ips = append(ips, ip)
+	} else {
+		parts := strings.Split(hostname, ".")
+		l := len(parts)
+
+		if leaf != nil {
+			dnsNames = append(dnsNames, leaf.DNSNames...)
+		}
+
+		if l > 2 {
+			topIndex := l - 2
+			topHost = strings.Join(parts[topIndex:], ".")
+
+			for i := topIndex; i > 0; i-- {
+				wildcardHost = "*." + strings.Join(parts[i:], ".")
+
+				if i == topIndex && (len(dnsNames) == 0 || dnsNames[0] != topHost) {
+					dnsNames = append(dnsNames, topHost, wildcardHost)
+				} else if !hasDnsNames(dnsNames, wildcardHost) {
+					dnsNames = append(dnsNames, wildcardHost)
+				}
+			}
+		} else {
+			dnsNames = append(dnsNames, topHost, wildcardHost)
+		}
+
+		key = "+." + topHost
+	}
+
+	serial := atomic.AddInt64(&currentSerialNumber, 1)
+
+	tmpl := &x509.Certificate{
+		SerialNumber: big.NewInt(serial),
+		Subject: pkix.Name{
+			CommonName:   topHost,
+			Organization: []string{c.organization},
+		},
+		SubjectKeyId:          c.keyID,
+		KeyUsage:              x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature,
+		ExtKeyUsage:           []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth},
+		BasicConstraintsValid: true,
+		NotBefore:             time.Now().Add(-c.validity),
+		NotAfter:              time.Now().Add(c.validity),
+		DNSNames:              dnsNames,
+		IPAddresses:           ips,
+	}
+
+	raw, err := x509.CreateCertificate(rand.Reader, tmpl, c.ca, c.privateKey.Public(), c.caPrivateKey)
+	if err != nil {
+		return nil, err
+	}
+
+	x509c, err := x509.ParseCertificate(raw)
+	if err != nil {
+		return nil, err
+	}
+
+	tlsCertificate = &tls.Certificate{
+		Certificate: [][]byte{raw, c.ca.Raw},
+		PrivateKey:  c.privateKey,
+		Leaf:        x509c,
+	}
+
+	c.certsStorage.Set(key, tlsCertificate)
+	return tlsCertificate, nil
+}
+
+// GenerateAndSave generate CA private key and CA certificate and dump them to file
+func GenerateAndSave(caPath string, caKeyPath string) error {
+	privateKey, err := rsa.GenerateKey(rand.Reader, 2048)
+	if err != nil {
+		return err
+	}
+
+	tmpl := &x509.Certificate{
+		SerialNumber: big.NewInt(time.Now().Unix()),
+		Subject: pkix.Name{
+			Country:      []string{"US"},
+			CommonName:   "Clash Root CA",
+			Organization: []string{"Clash Trust Services"},
+		},
+		KeyUsage:              x509.KeyUsageCertSign | x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature,
+		ExtKeyUsage:           []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth},
+		NotBefore:             time.Now().Add(-(time.Hour * 24 * 60)),
+		NotAfter:              time.Now().Add(time.Hour * 24 * 365 * 25),
+		BasicConstraintsValid: true,
+		IsCA:                  true,
+	}
+
+	caRaw, err := x509.CreateCertificate(rand.Reader, tmpl, tmpl, privateKey.Public(), privateKey)
+	if err != nil {
+		return err
+	}
+
+	caOut, err := os.OpenFile(caPath, os.O_CREATE|os.O_WRONLY, 0o600)
+	if err != nil {
+		return err
+	}
+	defer func(caOut *os.File) {
+		_ = caOut.Close()
+	}(caOut)
+
+	if err = pem.Encode(caOut, &pem.Block{Type: "CERTIFICATE", Bytes: caRaw}); err != nil {
+		return err
+	}
+
+	caKeyOut, err := os.OpenFile(caKeyPath, os.O_CREATE|os.O_WRONLY, 0o600)
+	if err != nil {
+		return err
+	}
+	defer func(caKeyOut *os.File) {
+		_ = caKeyOut.Close()
+	}(caKeyOut)
+
+	if err = pem.Encode(caKeyOut, &pem.Block{Type: "RSA PRIVATE KEY", Bytes: x509.MarshalPKCS1PrivateKey(privateKey)}); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func hasDnsNames(dnsNames []string, hostname string) bool {
+	for _, name := range dnsNames {
+		if name == hostname {
+			return true
+		}
+	}
+	return false
+}

common/cert/cert_test.go

@@ -0,0 +1,104 @@
+package cert
+
+import (
+	"crypto/tls"
+	"crypto/x509"
+	"net"
+	"os"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestCert(t *testing.T) {
+	ca, privateKey, err := NewAuthority("Clash ca", "Clash", 24*time.Hour)
+
+	assert.Nil(t, err)
+	assert.NotNil(t, ca)
+	assert.NotNil(t, privateKey)
+
+	c, err := NewConfig(ca, privateKey)
+	assert.Nil(t, err)
+
+	c.SetValidity(20 * time.Hour)
+	c.SetOrganization("Test Organization")
+
+	conf := c.NewTLSConfigForHost("example.org")
+	assert.Equal(t, []string{"http/1.1"}, conf.NextProtos)
+	assert.True(t, conf.InsecureSkipVerify)
+
+	// Test generating a certificate
+	clientHello := &tls.ClientHelloInfo{
+		ServerName: "example.org",
+	}
+	tlsCert, err := conf.GetCertificate(clientHello)
+	assert.Nil(t, err)
+	assert.NotNil(t, tlsCert)
+
+	// Assert certificate details
+	x509c := tlsCert.Leaf
+	assert.Equal(t, "example.org", x509c.Subject.CommonName)
+	assert.Nil(t, x509c.VerifyHostname("example.org"))
+	assert.Nil(t, x509c.VerifyHostname("abc.example.org"))
+	assert.Equal(t, []string{"Test Organization"}, x509c.Subject.Organization)
+	assert.NotNil(t, x509c.SubjectKeyId)
+	assert.True(t, x509c.BasicConstraintsValid)
+	assert.True(t, x509c.KeyUsage&x509.KeyUsageKeyEncipherment == x509.KeyUsageKeyEncipherment)
+	assert.True(t, x509c.KeyUsage&x509.KeyUsageDigitalSignature == x509.KeyUsageDigitalSignature)
+	assert.Equal(t, []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth}, x509c.ExtKeyUsage)
+	assert.Equal(t, []string{"example.org", "*.example.org"}, x509c.DNSNames)
+	assert.True(t, x509c.NotBefore.Before(time.Now().Add(-2*time.Hour)))
+	assert.True(t, x509c.NotAfter.After(time.Now().Add(2*time.Hour)))
+
+	// Check that certificate is cached
+	tlsCert2, err := c.GetOrCreateCert("abc.example.org")
+	assert.Nil(t, err)
+	assert.True(t, tlsCert == tlsCert2)
+
+	// Check that certificate is new
+	_, _ = c.GetOrCreateCert("a.b.c.d.e.f.g.h.i.j.example.org")
+	tlsCert3, err := c.GetOrCreateCert("m.k.l.example.org")
+	x509c = tlsCert3.Leaf
+	assert.Nil(t, err)
+	assert.False(t, tlsCert == tlsCert3)
+	assert.Equal(t, []string{"example.org", "*.example.org", "*.j.example.org", "*.i.j.example.org", "*.h.i.j.example.org", "*.g.h.i.j.example.org", "*.f.g.h.i.j.example.org", "*.e.f.g.h.i.j.example.org", "*.d.e.f.g.h.i.j.example.org", "*.c.d.e.f.g.h.i.j.example.org", "*.b.c.d.e.f.g.h.i.j.example.org", "*.l.example.org", "*.k.l.example.org"}, x509c.DNSNames)
+
+	// Check that certificate is cached
+	tlsCert4, err := c.GetOrCreateCert("xyz.example.org")
+	x509c = tlsCert4.Leaf
+	assert.Nil(t, err)
+	assert.True(t, tlsCert3 == tlsCert4)
+	assert.Nil(t, x509c.VerifyHostname("example.org"))
+	assert.Nil(t, x509c.VerifyHostname("jkf.example.org"))
+	assert.Nil(t, x509c.VerifyHostname("n.j.example.org"))
+	assert.Nil(t, x509c.VerifyHostname("c.i.j.example.org"))
+	assert.Nil(t, x509c.VerifyHostname("m.l.example.org"))
+	assert.Error(t, x509c.VerifyHostname("m.l.jkf.example.org"))
+
+	// Check the certificate for an IP
+	tlsCertForIP, err := c.GetOrCreateCert("192.168.0.1")
+	x509c = tlsCertForIP.Leaf
+	assert.Nil(t, err)
+	assert.Equal(t, 1, len(x509c.IPAddresses))
+	assert.True(t, net.ParseIP("192.168.0.1").Equal(x509c.IPAddresses[0]))
+
+	// Check that certificate is cached
+	tlsCertForIP2, err := c.GetOrCreateCert("192.168.0.1")
+	x509c = tlsCertForIP2.Leaf
+	assert.Nil(t, err)
+	assert.True(t, tlsCertForIP == tlsCertForIP2)
+	assert.Nil(t, x509c.VerifyHostname("192.168.0.1"))
+}
+
+func TestGenerateAndSave(t *testing.T) {
+	caPath := "ca.crt"
+	caKeyPath := "ca.key"
+
+	err := GenerateAndSave(caPath, caKeyPath)
+
+	assert.Nil(t, err)
+
+	_ = os.Remove(caPath)
+	_ = os.Remove(caKeyPath)
+}

common/cert/storage.go

@@ -0,0 +1,32 @@
+package cert
+
+import (
+	"crypto/tls"
+
+	"github.com/Dreamacro/clash/component/trie"
+)
+
+// DomainTrieCertsStorage cache wildcard certificates
+type DomainTrieCertsStorage struct {
+	certsCache *trie.DomainTrie[*tls.Certificate]
+}
+
+// Get gets the certificate from the storage
+func (c *DomainTrieCertsStorage) Get(key string) (*tls.Certificate, bool) {
+	ca := c.certsCache.Search(key)
+	if ca == nil {
+		return nil, false
+	}
+	return ca.Data, true
+}
+
+// Set saves the certificate to the storage
+func (c *DomainTrieCertsStorage) Set(key string, cert *tls.Certificate) {
+	_ = c.certsCache.Insert(key, cert)
+}
+
+func NewDomainTrieCertsStorage() *DomainTrieCertsStorage {
+	return &DomainTrieCertsStorage{
+		certsCache: trie.New[*tls.Certificate](),
+	}
+}

common/cmd/cmd.go

@@ -14,9 +14,8 @@ func ExecCmd(cmdStr string) (string, error) {
 		cmd = exec.Command(args[0])
 	} else {
 		cmd = exec.Command(args[0], args[1:]...)
-
 	}
-	prepareBackgroundCommand(cmd)
+
 	out, err := cmd.CombinedOutput()
 	if err != nil {
 		return "", fmt.Errorf("%v, %s", err, string(out))

common/cmd/cmd_other.go

@@ -1,11 +0,0 @@
-//go:build !windows
-
-package cmd
-
-import (
-	"os/exec"
-)
-
-func prepareBackgroundCommand(cmd *exec.Cmd) {
-
-}

common/cmd/cmd_windows.go

@@ -1,12 +0,0 @@
-//go:build windows
-
-package cmd
-
-import (
-	"os/exec"
-	"syscall"
-)
-
-func prepareBackgroundCommand(cmd *exec.Cmd) {
-	cmd.SysProcAttr = &syscall.SysProcAttr{HideWindow: true}
-}

common/collections/stack.go

@@ -1,56 +0,0 @@
-package collections
-
-import "sync"
-
-type (
-	stack struct {
-		top    *node
-		length int
-		lock   *sync.RWMutex
-	}
-
-	node struct {
-		value interface{}
-		prev  *node
-	}
-)
-
-// NewStack Create a new stack
-func NewStack() *stack {
-	return &stack{nil, 0, &sync.RWMutex{}}
-}
-
-// Len Return the number of items in the stack
-func (this *stack) Len() int {
-	return this.length
-}
-
-// Peek View the top item on the stack
-func (this *stack) Peek() interface{} {
-	if this.length == 0 {
-		return nil
-	}
-	return this.top.value
-}
-
-// Pop the top item of the stack and return it
-func (this *stack) Pop() interface{} {
-	this.lock.Lock()
-	defer this.lock.Unlock()
-	if this.length == 0 {
-		return nil
-	}
-	n := this.top
-	this.top = n.prev
-	this.length--
-	return n.value
-}
-
-// Push a value onto the top of the stack
-func (this *stack) Push(value interface{}) {
-	this.lock.Lock()
-	defer this.lock.Unlock()
-	n := &node{value, this.top}
-	this.top = n
-	this.length++
-}

common/convert/base64.go

@@ -1,45 +0,0 @@
-package convert
-
-import (
-	"encoding/base64"
-	"strings"
-)
-
-var (
-	encRaw = base64.RawStdEncoding
-	enc    = base64.StdEncoding
-)
-
-// DecodeBase64 try to decode content from the given bytes,
-// which can be in base64.RawStdEncoding, base64.StdEncoding or just plaintext.
-func DecodeBase64(buf []byte) []byte {
-	result, err := tryDecodeBase64(buf)
-	if err != nil {
-		return buf
-	}
-	return result
-}
-
-func tryDecodeBase64(buf []byte) ([]byte, error) {
-	dBuf := make([]byte, encRaw.DecodedLen(len(buf)))
-	n, err := encRaw.Decode(dBuf, buf)
-	if err != nil {
-		n, err = enc.Decode(dBuf, buf)
-		if err != nil {
-			return nil, err
-		}
-	}
-	return dBuf[:n], nil
-}
-
-func urlSafe(data string) string {
-	return strings.NewReplacer("+", "-", "/", "_").Replace(data)
-}
-
-func decodeUrlSafe(data string) string {
-	dcBuf, err := base64.RawURLEncoding.DecodeString(data)
-	if err != nil {
-		return ""
-	}
-	return string(dcBuf)
-}

common/convert/converter.go

@@ -5,15 +5,41 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
-	"github.com/Dreamacro/clash/log"
 	"net/url"
-	"strconv"
 	"strings"
 )
 
+var enc = base64.StdEncoding
+
+func DecodeBase64(buf []byte) ([]byte, error) {
+	dBuf := make([]byte, enc.DecodedLen(len(buf)))
+	n, err := enc.Decode(dBuf, buf)
+	if err != nil {
+		return nil, err
+	}
+
+	return dBuf[:n], nil
+}
+
+func DecodeRawBase64(buf []byte) ([]byte, error) {
+	dBuf := make([]byte, base64.RawStdEncoding.DecodedLen(len(buf)))
+	n, err := base64.RawStdEncoding.Decode(dBuf, buf)
+	if err != nil {
+		return nil, err
+	}
+
+	return dBuf[:n], nil
+}
+
 // ConvertsV2Ray convert V2Ray subscribe proxies data to clash proxies config
 func ConvertsV2Ray(buf []byte) ([]map[string]any, error) {
-	data := DecodeBase64(buf)
+	data, err := DecodeBase64(buf)
+	if err != nil {
+		data, err = DecodeRawBase64(buf)
+		if err != nil {
+			data = buf
+		}
+	}
 
 	arr := strings.Split(string(data), "\n")
 
@@ -33,39 +59,6 @@ func ConvertsV2Ray(buf []byte) ([]map[string]any, error) {
 
 		scheme = strings.ToLower(scheme)
 		switch scheme {
-		case "hysteria":
-			urlHysteria, err := url.Parse(line)
-			if err != nil {
-				continue
-			}
-
-			query := urlHysteria.Query()
-			name := uniqueName(names, urlHysteria.Fragment)
-			hysteria := make(map[string]any, 20)
-
-			hysteria["name"] = name
-			hysteria["type"] = scheme
-			hysteria["server"] = urlHysteria.Hostname()
-			hysteria["port"] = urlHysteria.Port()
-			hysteria["sni"] = query.Get("peer")
-			hysteria["obfs"] = query.Get("obfs")
-			hysteria["alpn"] = []string{query.Get("alpn")}
-			hysteria["auth_str"] = query.Get("auth")
-			hysteria["protocol"] = query.Get("protocol")
-			up := query.Get("up")
-			down := query.Get("down")
-			if up == "" {
-				up = query.Get("upmbps")
-			}
-			if down == "" {
-				down = query.Get("downmbps")
-			}
-			hysteria["down"] = down
-			hysteria["up"] = up
-			hysteria["skip-cert-verify"], _ = strconv.ParseBool(query.Get("insecure"))
-
-			proxies = append(proxies, hysteria)
-
 		case "trojan":
 			urlTrojan, err := url.Parse(line)
 			if err != nil {
@@ -95,72 +88,23 @@ func ConvertsV2Ray(buf []byte) ([]map[string]any, error) {
 				trojan["network"] = network
 			}
 
-			switch network {
+			if network == "ws" {
-			case "ws":
 				headers := make(map[string]any)
 				wsOpts := make(map[string]any)
 
+				headers["Host"] = RandHost()
 				headers["User-Agent"] = RandUserAgent()
 
 				wsOpts["path"] = query.Get("path")
 				wsOpts["headers"] = headers
 
 				trojan["ws-opts"] = wsOpts
-
-			case "grpc":
-				grpcOpts := make(map[string]any)
-				grpcOpts["grpc-service-name"] = query.Get("serviceName")
-				trojan["grpc-opts"] = grpcOpts
-			}
-
-			if fingerprint := query.Get("fp"); fingerprint == "" {
-				trojan["client-fingerprint"] = "chrome"
-			} else {
-				trojan["client-fingerprint"] = fingerprint
 			}
 
 			proxies = append(proxies, trojan)
-
-		case "vless":
-			urlVLess, err := url.Parse(line)
-			if err != nil {
-				continue
-			}
-			query := urlVLess.Query()
-			vless := make(map[string]any, 20)
-			err = handleVShareLink(names, urlVLess, scheme, vless)
-			if err != nil {
-				log.Warnln("error:%s line:%s", err.Error(), line)
-				continue
-			}
-			if flow := query.Get("flow"); flow != "" {
-				vless["flow"] = strings.ToLower(flow)
-			}
-			proxies = append(proxies, vless)
-
 		case "vmess":
-			// V2RayN-styled share link
+			dcBuf, err := enc.DecodeString(body)
-			// https://github.com/2dust/v2rayN/wiki/%E5%88%86%E4%BA%AB%E9%93%BE%E6%8E%A5%E6%A0%BC%E5%BC%8F%E8%AF%B4%E6%98%8E(ver-2)
-			dcBuf, err := tryDecodeBase64([]byte(body))
 			if err != nil {
-				// Xray VMessAEAD share link
-				urlVMess, err := url.Parse(line)
-				if err != nil {
-					continue
-				}
-				query := urlVMess.Query()
-				vmess := make(map[string]any, 20)
-				err = handleVShareLink(names, urlVMess, scheme, vmess)
-				if err != nil {
-					log.Warnln("error:%s line:%s", err.Error(), line)
-					continue
-				}
-				vmess["alterId"] = 0
-				vmess["cipher"] = "auto"
-				if encryption := query.Get("encryption"); encryption != "" {
-					vmess["cipher"] = encryption
-				}
-				proxies = append(proxies, vmess)
 				continue
 			}
 
@@ -170,11 +114,8 @@ func ConvertsV2Ray(buf []byte) ([]map[string]any, error) {
 			if jsonDc.Decode(&values) != nil {
 				continue
 			}
-			tempName, ok := values["ps"].(string)
+
-			if !ok {
+			name := uniqueName(names, values["ps"].(string))
-				continue
-			}
-			name := uniqueName(names, tempName)
 			vmess := make(map[string]any, 20)
 
 			vmess["name"] = name
@@ -182,86 +123,40 @@ func ConvertsV2Ray(buf []byte) ([]map[string]any, error) {
 			vmess["server"] = values["add"]
 			vmess["port"] = values["port"]
 			vmess["uuid"] = values["id"]
-			if alterId, ok := values["aid"]; ok {
+			vmess["alterId"] = values["aid"]
-				vmess["alterId"] = alterId
+			vmess["cipher"] = "auto"
-			} else {
-				vmess["alterId"] = 0
-			}
 			vmess["udp"] = true
-			vmess["xudp"] = true
-			vmess["tls"] = false
 			vmess["skip-cert-verify"] = false
 
-			vmess["cipher"] = "auto"
+			host := values["host"]
-			if cipher, ok := values["scy"]; ok && cipher != "" {
-				vmess["cipher"] = cipher
-			}
-
-			if sni, ok := values["sni"]; ok && sni != "" {
-				vmess["servername"] = sni
-			}
-
 			network := strings.ToLower(values["net"].(string))
-			if values["type"] == "http" {
+
-				network = "http"
-			} else if network == "http" {
-				network = "h2"
-			}
 			vmess["network"] = network
 
 			tls := strings.ToLower(values["tls"].(string))
-			if strings.HasSuffix(tls, "tls") {
+			if tls != "" && tls != "0" && tls != "null" {
+				if host != nil {
+					vmess["servername"] = host
+				}
 				vmess["tls"] = true
 			}
 
-			switch network {
+			if network == "ws" {
-			case "http":
-				headers := make(map[string]any)
-				httpOpts := make(map[string]any)
-				if host, ok := values["host"]; ok && host != "" {
-					headers["Host"] = []string{host.(string)}
-				}
-				httpOpts["path"] = []string{"/"}
-				if path, ok := values["path"]; ok && path != "" {
-					httpOpts["path"] = []string{path.(string)}
-				}
-				httpOpts["headers"] = headers
-
-				vmess["http-opts"] = httpOpts
-
-			case "h2":
-				headers := make(map[string]any)
-				h2Opts := make(map[string]any)
-				if host, ok := values["host"]; ok && host != "" {
-					headers["Host"] = []string{host.(string)}
-				}
-
-				h2Opts["path"] = values["path"]
-				h2Opts["headers"] = headers
-
-				vmess["h2-opts"] = h2Opts
-
-			case "ws":
 				headers := make(map[string]any)
 				wsOpts := make(map[string]any)
-				wsOpts["path"] = []string{"/"}
+
-				if host, ok := values["host"]; ok && host != "" {
+				headers["Host"] = RandHost()
-					headers["Host"] = host.(string)
+				headers["User-Agent"] = RandUserAgent()
-				}
+
-				if path, ok := values["path"]; ok && path != "" {
+				if values["path"] != nil {
-					wsOpts["path"] = path.(string)
+					wsOpts["path"] = values["path"]
 				}
 				wsOpts["headers"] = headers
-				vmess["ws-opts"] = wsOpts
 
-			case "grpc":
+				vmess["ws-opts"] = wsOpts
-				grpcOpts := make(map[string]any)
-				grpcOpts["grpc-service-name"] = values["path"]
-				vmess["grpc-opts"] = grpcOpts
 			}
 
 			proxies = append(proxies, vmess)
-
 		case "ss":
 			urlSS, err := url.Parse(line)
 			if err != nil {
@@ -272,7 +167,7 @@ func ConvertsV2Ray(buf []byte) ([]map[string]any, error) {
 			port := urlSS.Port()
 
 			if port == "" {
-				dcBuf, err := encRaw.DecodeString(urlSS.Host)
+				dcBuf, err := enc.DecodeString(urlSS.Host)
 				if err != nil {
 					continue
 				}
@@ -284,28 +179,23 @@ func ConvertsV2Ray(buf []byte) ([]map[string]any, error) {
 			}
 
 			var (
-				cipherRaw = urlSS.User.Username()
+				cipher   = urlSS.User.Username()
-				cipher    string
 				password string
 			)
-			cipher = cipherRaw
+
 			if password, found = urlSS.User.Password(); !found {
-				dcBuf, err := base64.RawURLEncoding.DecodeString(cipherRaw)
+				dcBuf, err := enc.DecodeString(cipher)
 				if err != nil {
-					dcBuf, _ = enc.DecodeString(cipherRaw)
+					continue
 				}
+
 				cipher, password, found = strings.Cut(string(dcBuf), ":")
 				if !found {
 					continue
 				}
-				err = VerifyMethod(cipher, password)
-				if err != nil {
-					dcBuf, _ = encRaw.DecodeString(cipherRaw)
-					cipher, password, found = strings.Cut(string(dcBuf), ":")
-				}
 			}
 
-			ss := make(map[string]any, 10)
+			ss := make(map[string]any, 20)
 
 			ss["name"] = name
 			ss["type"] = scheme
@@ -313,22 +203,11 @@ func ConvertsV2Ray(buf []byte) ([]map[string]any, error) {
 			ss["port"] = urlSS.Port()
 			ss["cipher"] = cipher
 			ss["password"] = password
-			query := urlSS.Query()
 			ss["udp"] = true
-			if query.Get("udp-over-tcp") == "true" || query.Get("uot") == "1" {
+
-				ss["udp-over-tcp"] = true
-			}
-			if strings.Contains(query.Get("plugin"), "obfs") {
-				obfsParams := strings.Split(query.Get("plugin"), ";")
-				ss["plugin"] = "obfs"
-				ss["plugin-opts"] = map[string]any{
-					"host": obfsParams[2][10:],
-					"mode": obfsParams[1][5:],
-				}
-			}
 			proxies = append(proxies, ss)
 		case "ssr":
-			dcBuf, err := encRaw.DecodeString(body)
+			dcBuf, err := enc.DecodeString(body)
 			if err != nil {
 				continue
 			}
@@ -385,6 +264,54 @@ func ConvertsV2Ray(buf []byte) ([]map[string]any, error) {
 			}
 
 			proxies = append(proxies, ssr)
+		case "vless":
+			urlVless, err := url.Parse(line)
+			if err != nil {
+				continue
+			}
+
+			query := urlVless.Query()
+
+			name := uniqueName(names, urlVless.Fragment)
+			vless := make(map[string]any, 20)
+
+			vless["name"] = name
+			vless["type"] = scheme
+			vless["server"] = urlVless.Hostname()
+			vless["port"] = urlVless.Port()
+			vless["uuid"] = urlVless.User.Username()
+			vless["udp"] = true
+			vless["skip-cert-verify"] = false
+
+			sni := query.Get("sni")
+			if sni != "" {
+				vless["servername"] = sni
+			}
+
+			flow := strings.ToLower(query.Get("flow"))
+			if flow != "" {
+				vless["flow"] = flow
+			}
+
+			network := strings.ToLower(query.Get("type"))
+			if network != "" {
+				vless["network"] = network
+			}
+
+			if network == "ws" {
+				headers := make(map[string]any)
+				wsOpts := make(map[string]any)
+
+				headers["Host"] = RandHost()
+				headers["User-Agent"] = RandUserAgent()
+
+				wsOpts["path"] = query.Get("path")
+				wsOpts["headers"] = headers
+
+				vless["ws-opts"] = wsOpts
+			}
+
+			proxies = append(proxies, vless)
 		}
 	}
 
@@ -395,6 +322,18 @@ func ConvertsV2Ray(buf []byte) ([]map[string]any, error) {
 	return proxies, nil
 }
 
+func urlSafe(data string) string {
+	return strings.ReplaceAll(strings.ReplaceAll(data, "+", "-"), "/", "_")
+}
+
+func decodeUrlSafe(data string) string {
+	dcBuf, err := base64.URLEncoding.DecodeString(data)
+	if err != nil {
+		return ""
+	}
+	return string(dcBuf)
+}
+
 func uniqueName(names map[string]int, name string) string {
 	if index, ok := names[name]; ok {
 		index++

common/convert/util.go

@@ -2,7 +2,6 @@ package convert
 
 import (
 	"encoding/base64"
-	"github.com/metacubex/sing-shadowsocks/shadowimpl"
 	"math/rand"
 	"net/http"
 	"strings"
@@ -30,7 +29,6 @@ var hostsSuffix = []string{
 	".alidns.com",
 	".cdngslb.com",
 	".mxhichina.com",
-	".alibabadns.com",
 }
 
 var userAgents = []string{
@@ -315,8 +313,3 @@ func SetUserAgent(header http.Header) {
 	userAgent := RandUserAgent()
 	header.Set("User-Agent", userAgent)
 }
-
-func VerifyMethod(cipher, password string) (err error) {
-	_, err = shadowimpl.FetchMethod(cipher, password)
-	return
-}

common/convert/v.go

@@ -1,123 +0,0 @@
-package convert
-
-import (
-	"errors"
-	"fmt"
-	"net/url"
-	"strconv"
-	"strings"
-)
-
-func handleVShareLink(names map[string]int, url *url.URL, scheme string, proxy map[string]any) error {
-	// Xray VMessAEAD / VLESS share link standard
-	// https://github.com/XTLS/Xray-core/discussions/716
-	query := url.Query()
-	proxy["name"] = uniqueName(names, url.Fragment)
-	if url.Hostname() == "" {
-		return errors.New("url.Hostname() is empty")
-	}
-	if url.Port() == "" {
-		return errors.New("url.Port() is empty")
-	}
-	proxy["type"] = scheme
-	proxy["server"] = url.Hostname()
-	proxy["port"] = url.Port()
-	proxy["uuid"] = url.User.Username()
-	proxy["udp"] = true
-	proxy["skip-cert-verify"] = false
-	proxy["tls"] = false
-	tls := strings.ToLower(query.Get("security"))
-	if strings.HasSuffix(tls, "tls") {
-		proxy["tls"] = true
-		if fingerprint := query.Get("fp"); fingerprint == "" {
-			proxy["client-fingerprint"] = "chrome"
-		} else {
-			proxy["client-fingerprint"] = fingerprint
-		}
-	}
-	if sni := query.Get("sni"); sni != "" {
-		proxy["servername"] = sni
-	}
-
-	switch query.Get("packetEncoding") {
-	case "none":
-	case "packet":
-		proxy["packet-addr"] = true
-	default:
-		proxy["xudp"] = true
-	}
-
-	network := strings.ToLower(query.Get("type"))
-	if network == "" {
-		network = "tcp"
-	}
-	fakeType := strings.ToLower(query.Get("headerType"))
-	if fakeType == "http" {
-		network = "http"
-	} else if network == "http" {
-		network = "h2"
-	}
-	proxy["network"] = network
-	switch network {
-	case "tcp":
-		if fakeType != "none" {
-			headers := make(map[string]any)
-			httpOpts := make(map[string]any)
-			httpOpts["path"] = []string{"/"}
-
-			if host := query.Get("host"); host != "" {
-				headers["Host"] = []string{host}
-			}
-
-			if method := query.Get("method"); method != "" {
-				httpOpts["method"] = method
-			}
-
-			if path := query.Get("path"); path != "" {
-				httpOpts["path"] = []string{path}
-			}
-			httpOpts["headers"] = headers
-			proxy["http-opts"] = httpOpts
-		}
-
-	case "http":
-		headers := make(map[string]any)
-		h2Opts := make(map[string]any)
-		h2Opts["path"] = []string{"/"}
-		if path := query.Get("path"); path != "" {
-			h2Opts["path"] = []string{path}
-		}
-		if host := query.Get("host"); host != "" {
-			h2Opts["host"] = []string{host}
-		}
-		h2Opts["headers"] = headers
-		proxy["h2-opts"] = h2Opts
-
-	case "ws":
-		headers := make(map[string]any)
-		wsOpts := make(map[string]any)
-		headers["User-Agent"] = RandUserAgent()
-		headers["Host"] = query.Get("host")
-		wsOpts["path"] = query.Get("path")
-		wsOpts["headers"] = headers
-
-		if earlyData := query.Get("ed"); earlyData != "" {
-			med, err := strconv.Atoi(earlyData)
-			if err != nil {
-				return fmt.Errorf("bad WebSocket max early data size: %v", err)
-			}
-			wsOpts["max-early-data"] = med
-		}
-		if earlyDataHeader := query.Get("eh"); earlyDataHeader != "" {
-			wsOpts["early-data-header-name"] = earlyDataHeader
-		}
-
-		proxy["ws-opts"] = wsOpts
-
-	case "grpc":
-		grpcOpts := make(map[string]any)
-		grpcOpts["grpc-service-name"] = query.Get("serviceName")
-		proxy["grpc-opts"] = grpcOpts
-	}
-	return nil
-}

common/generics/list/list.go

@@ -5,10 +5,10 @@
 // Package list implements a doubly linked list.
 //
 // To iterate over a list (where l is a *List):
-//
 //	for e := l.Front(); e != nil; e = e.Next() {
 //		// do something with e.Value
 //	}
+//
 package list
 
 // Element is an element of a linked list.

common/net/bind.go

@@ -1,36 +0,0 @@
-package net
-
-import "net"
-
-type bindPacketConn struct {
-	net.PacketConn
-	rAddr net.Addr
-}
-
-func (wpc *bindPacketConn) Read(b []byte) (n int, err error) {
-	n, _, err = wpc.PacketConn.ReadFrom(b)
-	return n, err
-}
-
-func (wpc *bindPacketConn) Write(b []byte) (n int, err error) {
-	return wpc.PacketConn.WriteTo(b, wpc.rAddr)
-}
-
-func (wpc *bindPacketConn) RemoteAddr() net.Addr {
-	return wpc.rAddr
-}
-
-func (wpc *bindPacketConn) LocalAddr() net.Addr {
-	if wpc.PacketConn.LocalAddr() == nil {
-		return &net.UDPAddr{IP: net.IPv4zero, Port: 0}
-	} else {
-		return wpc.PacketConn.LocalAddr()
-	}
-}
-
-func NewBindPacketConn(pc net.PacketConn, rAddr net.Addr) net.Conn {
-	return &bindPacketConn{
-		PacketConn: pc,
-		rAddr:      rAddr,
-	}
-}

common/net/bufconn.go

@@ -3,23 +3,18 @@ package net
 import (
 	"bufio"
 	"net"
-
-	"github.com/Dreamacro/clash/common/buf"
 )
 
-var _ ExtendedConn = (*BufferedConn)(nil)
-
 type BufferedConn struct {
 	r *bufio.Reader
-	ExtendedConn
+	net.Conn
-	peeked bool
 }
 
 func NewBufferedConn(c net.Conn) *BufferedConn {
 	if bc, ok := c.(*BufferedConn); ok {
 		return bc
 	}
-	return &BufferedConn{bufio.NewReader(c), NewExtendedConn(c), false}
+	return &BufferedConn{bufio.NewReader(c), c}
 }
 
 // Reader returns the internal bufio.Reader.
@@ -27,24 +22,11 @@ func (c *BufferedConn) Reader() *bufio.Reader {
 	return c.r
 }
 
-func (c *BufferedConn) ResetPeeked() {
-	c.peeked = false
-}
-
-func (c *BufferedConn) Peeked() bool {
-	return c.peeked
-}
-
 // Peek returns the next n bytes without advancing the reader.
 func (c *BufferedConn) Peek(n int) ([]byte, error) {
-	c.peeked = true
 	return c.r.Peek(n)
 }
 
-func (c *BufferedConn) Discard(n int) (discarded int, err error) {
-	return c.r.Discard(n)
-}
-
 func (c *BufferedConn) Read(p []byte) (int, error) {
 	return c.r.Read(p)
 }
@@ -60,22 +42,3 @@ func (c *BufferedConn) UnreadByte() error {
 func (c *BufferedConn) Buffered() int {
 	return c.r.Buffered()
 }
-
-func (c *BufferedConn) ReadBuffer(buffer *buf.Buffer) (err error) {
-	if c.r.Buffered() > 0 {
-		_, err = buffer.ReadOnceFrom(c.r)
-		return
-	}
-	return c.ExtendedConn.ReadBuffer(buffer)
-}
-
-func (c *BufferedConn) Upstream() any {
-	return c.ExtendedConn
-}
-
-func (c *BufferedConn) ReaderReplaceable() bool {
-	if c.r.Buffered() > 0 {
-		return false
-	}
-	return true
-}

common/net/refconn.go

@@ -1,104 +0,0 @@
-package net
-
-import (
-	"net"
-	"runtime"
-	"time"
-)
-
-type refConn struct {
-	conn net.Conn
-	ref  any
-}
-
-func (c *refConn) Read(b []byte) (n int, err error) {
-	defer runtime.KeepAlive(c.ref)
-	return c.conn.Read(b)
-}
-
-func (c *refConn) Write(b []byte) (n int, err error) {
-	defer runtime.KeepAlive(c.ref)
-	return c.conn.Write(b)
-}
-
-func (c *refConn) Close() error {
-	defer runtime.KeepAlive(c.ref)
-	return c.conn.Close()
-}
-
-func (c *refConn) LocalAddr() net.Addr {
-	defer runtime.KeepAlive(c.ref)
-	return c.conn.LocalAddr()
-}
-
-func (c *refConn) RemoteAddr() net.Addr {
-	defer runtime.KeepAlive(c.ref)
-	return c.conn.RemoteAddr()
-}
-
-func (c *refConn) SetDeadline(t time.Time) error {
-	defer runtime.KeepAlive(c.ref)
-	return c.conn.SetDeadline(t)
-}
-
-func (c *refConn) SetReadDeadline(t time.Time) error {
-	defer runtime.KeepAlive(c.ref)
-	return c.conn.SetReadDeadline(t)
-}
-
-func (c *refConn) SetWriteDeadline(t time.Time) error {
-	defer runtime.KeepAlive(c.ref)
-	return c.conn.SetWriteDeadline(t)
-}
-
-func (c *refConn) Upstream() any {
-	return c.conn
-}
-
-func NewRefConn(conn net.Conn, ref any) net.Conn {
-	return &refConn{conn: conn, ref: ref}
-}
-
-type refPacketConn struct {
-	pc  net.PacketConn
-	ref any
-}
-
-func (pc *refPacketConn) ReadFrom(p []byte) (n int, addr net.Addr, err error) {
-	defer runtime.KeepAlive(pc.ref)
-	return pc.pc.ReadFrom(p)
-}
-
-func (pc *refPacketConn) WriteTo(p []byte, addr net.Addr) (n int, err error) {
-	defer runtime.KeepAlive(pc.ref)
-	return pc.pc.WriteTo(p, addr)
-}
-
-func (pc *refPacketConn) Close() error {
-	defer runtime.KeepAlive(pc.ref)
-	return pc.pc.Close()
-}
-
-func (pc *refPacketConn) LocalAddr() net.Addr {
-	defer runtime.KeepAlive(pc.ref)
-	return pc.pc.LocalAddr()
-}
-
-func (pc *refPacketConn) SetDeadline(t time.Time) error {
-	defer runtime.KeepAlive(pc.ref)
-	return pc.pc.SetDeadline(t)
-}
-
-func (pc *refPacketConn) SetReadDeadline(t time.Time) error {
-	defer runtime.KeepAlive(pc.ref)
-	return pc.pc.SetReadDeadline(t)
-}
-
-func (pc *refPacketConn) SetWriteDeadline(t time.Time) error {
-	defer runtime.KeepAlive(pc.ref)
-	return pc.pc.SetWriteDeadline(t)
-}
-
-func NewRefPacketConn(pc net.PacketConn, ref any) net.PacketConn {
-	return &refPacketConn{pc: pc, ref: ref}
-}

common/net/relay.go

@@ -1,24 +1,33 @@
 package net
 
-//import (
+import (
-//	"io"
+	"io"
-//	"net"
+	"net"
-//	"time"
+	"time"
-//)
+)
-//
+
-//// Relay copies between left and right bidirectionally.
+// Relay copies between left and right bidirectionally.
-//func Relay(leftConn, rightConn net.Conn) {
+func Relay(leftConn, rightConn net.Conn) {
-//	ch := make(chan error)
+	ch := make(chan error)
-//
+
-//	go func() {
+	tcpKeepAlive(leftConn)
-//		// Wrapping to avoid using *net.TCPConn.(ReadFrom)
+	tcpKeepAlive(rightConn)
-//		// See also https://github.com/Dreamacro/clash/pull/1209
+
-//		_, err := io.Copy(WriteOnlyWriter{Writer: leftConn}, ReadOnlyReader{Reader: rightConn})
+	go func() {
-//		leftConn.SetReadDeadline(time.Now())
+		// Wrapping to avoid using *net.TCPConn.(ReadFrom)
-//		ch <- err
+		// See also https://github.com/Dreamacro/clash/pull/1209
-//	}()
+		_, err := io.Copy(WriteOnlyWriter{Writer: leftConn}, ReadOnlyReader{Reader: rightConn})
-//
+		_ = leftConn.SetReadDeadline(time.Now())
-//	_, _ = io.Copy(WriteOnlyWriter{Writer: rightConn}, ReadOnlyReader{Reader: leftConn})
+		ch <- err
-//	rightConn.SetReadDeadline(time.Now())
+	}()
-//	<-ch
+
-//}
+	_, _ = io.Copy(WriteOnlyWriter{Writer: rightConn}, ReadOnlyReader{Reader: leftConn})
+	_ = rightConn.SetReadDeadline(time.Now())
+	<-ch
+}
+
+func tcpKeepAlive(c net.Conn) {
+	if tcp, ok := c.(*net.TCPConn); ok {
+		_ = tcp.SetKeepAlive(true)
+	}
+}

common/net/sing.go

@@ -1,22 +0,0 @@
-package net
-
-import (
-	"context"
-	"net"
-
-	"github.com/sagernet/sing/common/bufio"
-	"github.com/sagernet/sing/common/network"
-)
-
-var NewExtendedConn = bufio.NewExtendedConn
-var NewExtendedWriter = bufio.NewExtendedWriter
-var NewExtendedReader = bufio.NewExtendedReader
-
-type ExtendedConn = network.ExtendedConn
-type ExtendedWriter = network.ExtendedWriter
-type ExtendedReader = network.ExtendedReader
-
-// Relay copies between left and right bidirectionally.
-func Relay(leftConn, rightConn net.Conn) {
-	_ = bufio.CopyConn(context.TODO(), leftConn, rightConn)
-}

common/net/tcpip.go

@@ -1,46 +0,0 @@
-package net
-
-import (
-	"fmt"
-	"net"
-	"strings"
-)
-
-func SplitNetworkType(s string) (string, string, error) {
-	var (
-		shecme   string
-		hostPort string
-	)
-	result := strings.Split(s, "://")
-	if len(result) == 2 {
-		shecme = result[0]
-		hostPort = result[1]
-	} else if len(result) == 1 {
-		hostPort = result[0]
-	} else {
-		return "", "", fmt.Errorf("tcp/udp style error")
-	}
-
-	if len(shecme) == 0 {
-		shecme = "udp"
-	}
-
-	if shecme != "tcp" && shecme != "udp" {
-		return "", "", fmt.Errorf("scheme should be tcp:// or udp://")
-	} else {
-		return shecme, hostPort, nil
-	}
-}
-
-func SplitHostPort(s string) (host, port string, hasPort bool, err error) {
-	temp := s
-	hasPort = true
-
-	if !strings.Contains(s, ":") && !strings.Contains(s, "]:") {
-		temp += ":0"
-		hasPort = false
-	}
-
-	host, port, err = net.SplitHostPort(temp)
-	return
-}

common/net/tls.go

@@ -1,52 +0,0 @@
-package net
-
-import (
-	"crypto/rand"
-	"crypto/rsa"
-	"crypto/tls"
-	"crypto/x509"
-	"encoding/pem"
-	"fmt"
-	"math/big"
-)
-
-func ParseCert(certificate, privateKey string) (tls.Certificate, error) {
-	if certificate == "" || privateKey == "" {
-		return newRandomTLSKeyPair()
-	}
-	cert, painTextErr := tls.X509KeyPair([]byte(certificate), []byte(privateKey))
-	if painTextErr == nil {
-		return cert, nil
-	}
-
-	cert, loadErr := tls.LoadX509KeyPair(certificate, privateKey)
-	if loadErr != nil {
-		return tls.Certificate{}, fmt.Errorf("parse certificate failed, maybe format error:%s, or path error: %s", painTextErr.Error(), loadErr.Error())
-	}
-	return cert, nil
-}
-
-func newRandomTLSKeyPair() (tls.Certificate, error) {
-	key, err := rsa.GenerateKey(rand.Reader, 2048)
-	if err != nil {
-		return tls.Certificate{}, err
-	}
-	template := x509.Certificate{SerialNumber: big.NewInt(1)}
-	certDER, err := x509.CreateCertificate(
-		rand.Reader,
-		&template,
-		&template,
-		&key.PublicKey,
-		key)
-	if err != nil {
-		return tls.Certificate{}, err
-	}
-	keyPEM := pem.EncodeToMemory(&pem.Block{Type: "RSA PRIVATE KEY", Bytes: x509.MarshalPKCS1PrivateKey(key)})
-	certPEM := pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE", Bytes: certDER})
-
-	tlsCert, err := tls.X509KeyPair(certPEM, keyPEM)
-	if err != nil {
-		return tls.Certificate{}, err
-	}
-	return tlsCert, nil
-}

common/net/websocket.go

@@ -1,131 +0,0 @@
-package net
-
-import (
-	"encoding/binary"
-	"math/bits"
-)
-
-// kanged from https://github.com/nhooyr/websocket/blob/master/frame.go
-// License: MIT
-
-// MaskWebSocket applies the WebSocket masking algorithm to p
-// with the given key.
-// See https://tools.ietf.org/html/rfc6455#section-5.3
-//
-// The returned value is the correctly rotated key to
-// to continue to mask/unmask the message.
-//
-// It is optimized for LittleEndian and expects the key
-// to be in little endian.
-//
-// See https://github.com/golang/go/issues/31586
-func MaskWebSocket(key uint32, b []byte) uint32 {
-	if len(b) >= 8 {
-		key64 := uint64(key)<<32 | uint64(key)
-
-		// At some point in the future we can clean these unrolled loops up.
-		// See https://github.com/golang/go/issues/31586#issuecomment-487436401
-
-		// Then we xor until b is less than 128 bytes.
-		for len(b) >= 128 {
-			v := binary.LittleEndian.Uint64(b)
-			binary.LittleEndian.PutUint64(b, v^key64)
-			v = binary.LittleEndian.Uint64(b[8:16])
-			binary.LittleEndian.PutUint64(b[8:16], v^key64)
-			v = binary.LittleEndian.Uint64(b[16:24])
-			binary.LittleEndian.PutUint64(b[16:24], v^key64)
-			v = binary.LittleEndian.Uint64(b[24:32])
-			binary.LittleEndian.PutUint64(b[24:32], v^key64)
-			v = binary.LittleEndian.Uint64(b[32:40])
-			binary.LittleEndian.PutUint64(b[32:40], v^key64)
-			v = binary.LittleEndian.Uint64(b[40:48])
-			binary.LittleEndian.PutUint64(b[40:48], v^key64)
-			v = binary.LittleEndian.Uint64(b[48:56])
-			binary.LittleEndian.PutUint64(b[48:56], v^key64)
-			v = binary.LittleEndian.Uint64(b[56:64])
-			binary.LittleEndian.PutUint64(b[56:64], v^key64)
-			v = binary.LittleEndian.Uint64(b[64:72])
-			binary.LittleEndian.PutUint64(b[64:72], v^key64)
-			v = binary.LittleEndian.Uint64(b[72:80])
-			binary.LittleEndian.PutUint64(b[72:80], v^key64)
-			v = binary.LittleEndian.Uint64(b[80:88])
-			binary.LittleEndian.PutUint64(b[80:88], v^key64)
-			v = binary.LittleEndian.Uint64(b[88:96])
-			binary.LittleEndian.PutUint64(b[88:96], v^key64)
-			v = binary.LittleEndian.Uint64(b[96:104])
-			binary.LittleEndian.PutUint64(b[96:104], v^key64)
-			v = binary.LittleEndian.Uint64(b[104:112])
-			binary.LittleEndian.PutUint64(b[104:112], v^key64)
-			v = binary.LittleEndian.Uint64(b[112:120])
-			binary.LittleEndian.PutUint64(b[112:120], v^key64)
-			v = binary.LittleEndian.Uint64(b[120:128])
-			binary.LittleEndian.PutUint64(b[120:128], v^key64)
-			b = b[128:]
-		}
-
-		// Then we xor until b is less than 64 bytes.
-		for len(b) >= 64 {
-			v := binary.LittleEndian.Uint64(b)
-			binary.LittleEndian.PutUint64(b, v^key64)
-			v = binary.LittleEndian.Uint64(b[8:16])
-			binary.LittleEndian.PutUint64(b[8:16], v^key64)
-			v = binary.LittleEndian.Uint64(b[16:24])
-			binary.LittleEndian.PutUint64(b[16:24], v^key64)
-			v = binary.LittleEndian.Uint64(b[24:32])
-			binary.LittleEndian.PutUint64(b[24:32], v^key64)
-			v = binary.LittleEndian.Uint64(b[32:40])
-			binary.LittleEndian.PutUint64(b[32:40], v^key64)
-			v = binary.LittleEndian.Uint64(b[40:48])
-			binary.LittleEndian.PutUint64(b[40:48], v^key64)
-			v = binary.LittleEndian.Uint64(b[48:56])
-			binary.LittleEndian.PutUint64(b[48:56], v^key64)
-			v = binary.LittleEndian.Uint64(b[56:64])
-			binary.LittleEndian.PutUint64(b[56:64], v^key64)
-			b = b[64:]
-		}
-
-		// Then we xor until b is less than 32 bytes.
-		for len(b) >= 32 {
-			v := binary.LittleEndian.Uint64(b)
-			binary.LittleEndian.PutUint64(b, v^key64)
-			v = binary.LittleEndian.Uint64(b[8:16])
-			binary.LittleEndian.PutUint64(b[8:16], v^key64)
-			v = binary.LittleEndian.Uint64(b[16:24])
-			binary.LittleEndian.PutUint64(b[16:24], v^key64)
-			v = binary.LittleEndian.Uint64(b[24:32])
-			binary.LittleEndian.PutUint64(b[24:32], v^key64)
-			b = b[32:]
-		}
-
-		// Then we xor until b is less than 16 bytes.
-		for len(b) >= 16 {
-			v := binary.LittleEndian.Uint64(b)
-			binary.LittleEndian.PutUint64(b, v^key64)
-			v = binary.LittleEndian.Uint64(b[8:16])
-			binary.LittleEndian.PutUint64(b[8:16], v^key64)
-			b = b[16:]
-		}
-
-		// Then we xor until b is less than 8 bytes.
-		for len(b) >= 8 {
-			v := binary.LittleEndian.Uint64(b)
-			binary.LittleEndian.PutUint64(b, v^key64)
-			b = b[8:]
-		}
-	}
-
-	// Then we xor until b is less than 4 bytes.
-	for len(b) >= 4 {
-		v := binary.LittleEndian.Uint32(b)
-		binary.LittleEndian.PutUint32(b, v^key)
-		b = b[4:]
-	}
-
-	// xor remaining bytes.
-	for i := range b {
-		b[i] ^= byte(key)
-		key = bits.RotateLeft32(key, -8)
-	}
-
-	return key
-}

common/pool/sing.go

@@ -1,7 +0,0 @@
-package pool
-
-import "github.com/sagernet/sing/common/buf"
-
-func init() {
-	buf.DefaultAllocator = defaultAllocator
-}

common/snifer/tls/sniff.go

@@ -1,132 +1,107 @@
-package sniffer
+package tls
 
 import (
 	"encoding/binary"
 	"errors"
 	"strings"
-
-	"github.com/Dreamacro/clash/common/utils"
-	C "github.com/Dreamacro/clash/constant"
-	"github.com/Dreamacro/clash/constant/sniffer"
 )
 
+var ErrNoClue = errors.New("not enough information for making a decision")
+
+type SniffHeader struct {
+	domain string
+}
+
+func (h *SniffHeader) Protocol() string {
+	return "tls"
+}
+
+func (h *SniffHeader) Domain() string {
+	return h.domain
+}
+
 var (
 	errNotTLS         = errors.New("not TLS header")
 	errNotClientHello = errors.New("not client hello")
 )
 
-var _ sniffer.Sniffer = (*TLSSniffer)(nil)
-
-type TLSSniffer struct {
-	*BaseSniffer
-}
-
-func NewTLSSniffer(snifferConfig SnifferConfig) (*TLSSniffer, error) {
-	ports := make([]utils.Range[uint16], 0)
-	if len(snifferConfig.Ports) == 0 {
-		ports = append(ports, *utils.NewRange[uint16](443, 443))
-	} else {
-		ports = append(ports, snifferConfig.Ports...)
-	}
-	return &TLSSniffer{
-		BaseSniffer: NewBaseSniffer(ports, C.TCP),
-	}, nil
-}
-
-func (tls *TLSSniffer) Protocol() string {
-	return "tls"
-}
-
-func (tls *TLSSniffer) SupportNetwork() C.NetWork {
-	return C.TCP
-}
-
-func (tls *TLSSniffer) SniffTCP(bytes []byte) (string, error) {
-	domain, err := SniffTLS(bytes)
-	if err == nil {
-		return *domain, nil
-	} else {
-		return "", err
-	}
-}
-
 func IsValidTLSVersion(major, minor byte) bool {
 	return major == 3
 }
 
 // ReadClientHello returns server name (if any) from TLS client hello message.
 // https://github.com/golang/go/blob/master/src/crypto/tls/handshake_messages.go#L300
-func ReadClientHello(data []byte) (*string, error) {
+func ReadClientHello(data []byte, h *SniffHeader) error {
 	if len(data) < 42 {
-		return nil, ErrNoClue
+		return ErrNoClue
 	}
 	sessionIDLen := int(data[38])
 	if sessionIDLen > 32 || len(data) < 39+sessionIDLen {
-		return nil, ErrNoClue
+		return ErrNoClue
 	}
 	data = data[39+sessionIDLen:]
 	if len(data) < 2 {
-		return nil, ErrNoClue
+		return ErrNoClue
 	}
 	// cipherSuiteLen is the number of bytes of cipher suite numbers. Since
 	// they are uint16s, the number must be even.
 	cipherSuiteLen := int(data[0])<<8 | int(data[1])
 	if cipherSuiteLen%2 == 1 || len(data) < 2+cipherSuiteLen {
-		return nil, errNotClientHello
+		return errNotClientHello
 	}
 	data = data[2+cipherSuiteLen:]
 	if len(data) < 1 {
-		return nil, ErrNoClue
+		return ErrNoClue
 	}
 	compressionMethodsLen := int(data[0])
 	if len(data) < 1+compressionMethodsLen {
-		return nil, ErrNoClue
+		return ErrNoClue
 	}
 	data = data[1+compressionMethodsLen:]
 
 	if len(data) == 0 {
-		return nil, errNotClientHello
+		return errNotClientHello
 	}
 	if len(data) < 2 {
-		return nil, errNotClientHello
+		return errNotClientHello
 	}
 
 	extensionsLength := int(data[0])<<8 | int(data[1])
 	data = data[2:]
 	if extensionsLength != len(data) {
-		return nil, errNotClientHello
+		return errNotClientHello
 	}
 
 	for len(data) != 0 {
 		if len(data) < 4 {
-			return nil, errNotClientHello
+			return errNotClientHello
 		}
 		extension := uint16(data[0])<<8 | uint16(data[1])
 		length := int(data[2])<<8 | int(data[3])
 		data = data[4:]
 		if len(data) < length {
-			return nil, errNotClientHello
+			return errNotClientHello
 		}
 
 		if extension == 0x00 { /* extensionServerName */
 			d := data[:length]
 			if len(d) < 2 {
-				return nil, errNotClientHello
+				return errNotClientHello
 			}
 			namesLen := int(d[0])<<8 | int(d[1])
 			d = d[2:]
 			if len(d) != namesLen {
-				return nil, errNotClientHello
+				return errNotClientHello
 			}
 			for len(d) > 0 {
 				if len(d) < 3 {
-					return nil, errNotClientHello
+					return errNotClientHello
 				}
 				nameType := d[0]
 				nameLen := int(d[1])<<8 | int(d[2])
 				d = d[3:]
 				if len(d) < nameLen {
-					return nil, errNotClientHello
+					return errNotClientHello
 				}
 				if nameType == 0 {
 					serverName := string(d[:nameLen])
@@ -134,22 +109,21 @@ func ReadClientHello(data []byte) (*string, error) {
 					// trailing dot. See
 					// https://tools.ietf.org/html/rfc6066#section-3.
 					if strings.HasSuffix(serverName, ".") {
-						return nil, errNotClientHello
+						return errNotClientHello
 					}
-
+					h.domain = serverName
-					return &serverName, nil
+					return nil
 				}
-
 				d = d[nameLen:]
 			}
 		}
 		data = data[length:]
 	}
 
-	return nil, errNotTLS
+	return errNotTLS
 }
 
-func SniffTLS(b []byte) (*string, error) {
+func SniffTLS(b []byte) (*SniffHeader, error) {
 	if len(b) < 5 {
 		return nil, ErrNoClue
 	}
@@ -165,9 +139,10 @@ func SniffTLS(b []byte) (*string, error) {
 		return nil, ErrNoClue
 	}
 
-	domain, err := ReadClientHello(b[5 : 5+headerLen])
+	h := &SniffHeader{}
+	err := ReadClientHello(b[5:5+headerLen], h)
 	if err == nil {
-		return domain, nil
+		return h, nil
 	}
 	return nil, err
 }

common/snifer/tls/sniff_test.go

@@ -1,4 +1,4 @@
-package sniffer
+package tls
 
 import (
 	"testing"
@@ -142,7 +142,7 @@ func TestTLSHeaders(t *testing.T) {
 	}
 
 	for _, test := range cases {
-		domain, err := SniffTLS(test.input)
+		header, err := SniffTLS(test.input)
 		if test.err {
 			if err == nil {
 				t.Errorf("Exepct error but nil in test %v", test)
@@ -151,8 +151,8 @@ func TestTLSHeaders(t *testing.T) {
 			if err != nil {
 				t.Errorf("Expect no error but actually %s in test %v", err.Error(), test)
 			}
-			if *domain != test.domain {
+			if header.Domain() != test.domain {
-				t.Error("expect domain ", test.domain, " but got ", domain)
+				t.Error("expect domain ", test.domain, " but got ", header.Domain())
 			}
 		}
 	}

common/structure/structure.go

@@ -3,7 +3,6 @@ package structure
 // references: https://github.com/mitchellh/mapstructure
 
 import (
-	"encoding/base64"
 	"fmt"
 	"reflect"
 	"strconv"
@@ -14,11 +13,8 @@ import (
 type Option struct {
 	TagName          string
 	WeaklyTypedInput bool
-	KeyReplacer      *strings.Replacer
 }
 
-var DefaultKeyReplacer = strings.NewReplacer("_", "-")
-
 // Decoder is the core of structure
 type Decoder struct {
 	option *Option
@@ -35,7 +31,7 @@ func NewDecoder(option Option) *Decoder {
 // Decode transform a map[string]any to a struct
 func (d *Decoder) Decode(src map[string]any, dst any) error {
 	if reflect.TypeOf(dst).Kind() != reflect.Ptr {
-		return fmt.Errorf("decode must recive a ptr struct")
+		return fmt.Errorf("Decode must recive a ptr struct")
 	}
 	t := reflect.TypeOf(dst).Elem()
 	v := reflect.ValueOf(dst).Elem()
@@ -53,23 +49,6 @@ func (d *Decoder) Decode(src map[string]any, dst any) error {
 		omitempty := found && omitKey == "omitempty"
 
 		value, ok := src[key]
-		if !ok {
-			if d.option.KeyReplacer != nil {
-				key = d.option.KeyReplacer.Replace(key)
-			}
-
-			for _strKey := range src {
-				strKey := _strKey
-				if d.option.KeyReplacer != nil {
-					strKey = d.option.KeyReplacer.Replace(strKey)
-				}
-				if strings.EqualFold(key, strKey) {
-					value = src[_strKey]
-					ok = true
-					break
-				}
-			}
-		}
 		if !ok || value == nil {
 			if omitempty {
 				continue
@@ -86,16 +65,9 @@ func (d *Decoder) Decode(src map[string]any, dst any) error {
 }
 
 func (d *Decoder) decode(name string, data any, val reflect.Value) error {
-	kind := val.Kind()
+	switch val.Kind() {
-	switch {
+	case reflect.Int:
-	case isInt(kind):
 		return d.decodeInt(name, data, val)
-	case isUint(kind):
-		return d.decodeUint(name, data, val)
-	case isFloat(kind):
-		return d.decodeFloat(name, data, val)
-	}
-	switch kind {
 	case reflect.String:
 		return d.decodeString(name, data, val)
 	case reflect.Bool:
@@ -113,42 +85,13 @@ func (d *Decoder) decode(name string, data any, val reflect.Value) error {
 	}
 }
 
-func isInt(kind reflect.Kind) bool {
-	switch kind {
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		return true
-	default:
-		return false
-	}
-}
-
-func isUint(kind reflect.Kind) bool {
-	switch kind {
-	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
-		return true
-	default:
-		return false
-	}
-}
-
-func isFloat(kind reflect.Kind) bool {
-	switch kind {
-	case reflect.Float32, reflect.Float64:
-		return true
-	default:
-		return false
-	}
-}
-
 func (d *Decoder) decodeInt(name string, data any, val reflect.Value) (err error) {
 	dataVal := reflect.ValueOf(data)
 	kind := dataVal.Kind()
 	switch {
-	case isInt(kind):
+	case kind == reflect.Int:
 		val.SetInt(dataVal.Int())
-	case isUint(kind) && d.option.WeaklyTypedInput:
+	case kind == reflect.Float64 && d.option.WeaklyTypedInput:
-		val.SetInt(int64(dataVal.Uint()))
-	case isFloat(kind) && d.option.WeaklyTypedInput:
 		val.SetInt(int64(dataVal.Float()))
 	case kind == reflect.String && d.option.WeaklyTypedInput:
 		var i int64
@@ -167,72 +110,14 @@ func (d *Decoder) decodeInt(name string, data any, val reflect.Value) (err error
 	return err
 }
 
-func (d *Decoder) decodeUint(name string, data any, val reflect.Value) (err error) {
-	dataVal := reflect.ValueOf(data)
-	kind := dataVal.Kind()
-	switch {
-	case isUint(kind):
-		val.SetUint(dataVal.Uint())
-	case isInt(kind) && d.option.WeaklyTypedInput:
-		val.SetUint(uint64(dataVal.Int()))
-	case isFloat(kind) && d.option.WeaklyTypedInput:
-		val.SetUint(uint64(dataVal.Float()))
-	case kind == reflect.String && d.option.WeaklyTypedInput:
-		var i uint64
-		i, err = strconv.ParseUint(dataVal.String(), 0, val.Type().Bits())
-		if err == nil {
-			val.SetUint(i)
-		} else {
-			err = fmt.Errorf("cannot parse '%s' as int: %s", name, err)
-		}
-	default:
-		err = fmt.Errorf(
-			"'%s' expected type '%s', got unconvertible type '%s'",
-			name, val.Type(), dataVal.Type(),
-		)
-	}
-	return err
-}
-
-func (d *Decoder) decodeFloat(name string, data any, val reflect.Value) (err error) {
-	dataVal := reflect.ValueOf(data)
-	kind := dataVal.Kind()
-	switch {
-	case isFloat(kind):
-		val.SetFloat(dataVal.Float())
-	case isUint(kind):
-		val.SetFloat(float64(dataVal.Uint()))
-	case isInt(kind) && d.option.WeaklyTypedInput:
-		val.SetFloat(float64(dataVal.Int()))
-	case kind == reflect.String && d.option.WeaklyTypedInput:
-		var i float64
-		i, err = strconv.ParseFloat(dataVal.String(), val.Type().Bits())
-		if err == nil {
-			val.SetFloat(i)
-		} else {
-			err = fmt.Errorf("cannot parse '%s' as int: %s", name, err)
-		}
-	default:
-		err = fmt.Errorf(
-			"'%s' expected type '%s', got unconvertible type '%s'",
-			name, val.Type(), dataVal.Type(),
-		)
-	}
-	return err
-}
-
 func (d *Decoder) decodeString(name string, data any, val reflect.Value) (err error) {
 	dataVal := reflect.ValueOf(data)
 	kind := dataVal.Kind()
 	switch {
 	case kind == reflect.String:
 		val.SetString(dataVal.String())
-	case isInt(kind) && d.option.WeaklyTypedInput:
+	case kind == reflect.Int && d.option.WeaklyTypedInput:
 		val.SetString(strconv.FormatInt(dataVal.Int(), 10))
-	case isUint(kind) && d.option.WeaklyTypedInput:
-		val.SetString(strconv.FormatUint(dataVal.Uint(), 10))
-	case isFloat(kind) && d.option.WeaklyTypedInput:
-		val.SetString(strconv.FormatFloat(dataVal.Float(), 'E', -1, dataVal.Type().Bits()))
 	default:
 		err = fmt.Errorf(
 			"'%s' expected type '%s', got unconvertible type '%s'",
@@ -248,10 +133,8 @@ func (d *Decoder) decodeBool(name string, data any, val reflect.Value) (err erro
 	switch {
 	case kind == reflect.Bool:
 		val.SetBool(dataVal.Bool())
-	case isInt(kind) && d.option.WeaklyTypedInput:
+	case kind == reflect.Int && d.option.WeaklyTypedInput:
 		val.SetBool(dataVal.Int() != 0)
-	case isUint(kind) && d.option.WeaklyTypedInput:
-		val.SetString(strconv.FormatUint(dataVal.Uint(), 10))
 	default:
 		err = fmt.Errorf(
 			"'%s' expected type '%s', got unconvertible type '%s'",
@@ -266,17 +149,6 @@ func (d *Decoder) decodeSlice(name string, data any, val reflect.Value) error {
 	valType := val.Type()
 	valElemType := valType.Elem()
 
-	if dataVal.Kind() == reflect.String && valElemType.Kind() == reflect.Uint8 { // from encoding/json
-		s := []byte(dataVal.String())
-		b := make([]byte, base64.StdEncoding.DecodedLen(len(s)))
-		n, err := base64.StdEncoding.Decode(b, s)
-		if err != nil {
-			return fmt.Errorf("try decode '%s' by base64 error: %w", name, err)
-		}
-		val.SetBytes(b[:n])
-		return nil
-	}
-
 	if dataVal.Kind() != reflect.Slice {
 		return fmt.Errorf("'%s' is not a slice", name)
 	}
@@ -429,7 +301,7 @@ func (d *Decoder) decodeStructFromMap(name string, dataVal, val reflect.Value) e
 		field reflect.StructField
 		val   reflect.Value
 	}
-	var fields []field
+	fields := []field{}
 	for len(structs) > 0 {
 		structVal := structs[0]
 		structs = structs[1:]
@@ -481,18 +353,12 @@ func (d *Decoder) decodeStructFromMap(name string, dataVal, val reflect.Value) e
 		if !rawMapVal.IsValid() {
 			// Do a slower search by iterating over each key and
 			// doing case-insensitive search.
-			if d.option.KeyReplacer != nil {
-				fieldName = d.option.KeyReplacer.Replace(fieldName)
-			}
 			for dataValKey := range dataValKeys {
 				mK, ok := dataValKey.Interface().(string)
 				if !ok {
 					// Not a string key
 					continue
 				}
-				if d.option.KeyReplacer != nil {
-					mK = d.option.KeyReplacer.Replace(mK)
-				}
 
 				if strings.EqualFold(mK, fieldName) {
 					rawMapKey = dataValKey

common/utils/range.go

@@ -1,44 +0,0 @@
-package utils
-
-import (
-	"golang.org/x/exp/constraints"
-)
-
-type Range[T constraints.Ordered] struct {
-	start T
-	end   T
-}
-
-func NewRange[T constraints.Ordered](start, end T) *Range[T] {
-	if start > end {
-		return &Range[T]{
-			start: end,
-			end:   start,
-		}
-	}
-
-	return &Range[T]{
-		start: start,
-		end:   end,
-	}
-}
-
-func (r *Range[T]) Contains(t T) bool {
-	return t >= r.start && t <= r.end
-}
-
-func (r *Range[T]) LeftContains(t T) bool {
-	return t >= r.start && t < r.end
-}
-
-func (r *Range[T]) RightContains(t T) bool {
-	return t > r.start && t <= r.end
-}
-
-func (r *Range[T]) Start() T {
-	return r.start
-}
-
-func (r *Range[T]) End() T {
-	return r.end
-}

common/utils/uuid.go

@@ -1,16 +0,0 @@
-package utils
-
-import (
-	"github.com/gofrs/uuid"
-)
-
-var uuidNamespace, _ = uuid.FromString("00000000-0000-0000-0000-000000000000")
-
-// UUIDMap https://github.com/XTLS/Xray-core/issues/158#issue-783294090
-func UUIDMap(str string) (uuid.UUID, error) {
-	u, err := uuid.FromString(str)
-	if err != nil {
-		return uuid.NewV5(uuidNamespace, str), nil
-	}
-	return u, nil
-}

common/utils/uuid_test.go

@@ -1,74 +0,0 @@
-package utils
-
-import (
-	"github.com/gofrs/uuid"
-	"reflect"
-	"testing"
-)
-
-func TestUUIDMap(t *testing.T) {
-	type args struct {
-		str string
-	}
-
-	tests := []struct {
-		name    string
-		args    args
-		want    uuid.UUID
-		wantErr bool
-	}{
-		{
-			name: "uuid-test-1",
-			args: args{
-				str: "82410302-039e-41b6-98b0-d964084b4170",
-			},
-			want:    uuid.FromStringOrNil("82410302-039e-41b6-98b0-d964084b4170"),
-			wantErr: false,
-		},
-		{
-			name: "uuid-test-2",
-			args: args{
-				str: "88c502e6-d7eb-4c8e-8259-94cb13d83c77",
-			},
-			want:    uuid.FromStringOrNil("88c502e6-d7eb-4c8e-8259-94cb13d83c77"),
-			wantErr: false,
-		},
-		{
-			name: "uuid-map-1",
-			args: args{
-				str: "123456",
-			},
-			want:    uuid.FromStringOrNil("f8598425-92f2-5508-a071-4fc67f9040ac"),
-			wantErr: false,
-		},
-		// GENERATED BY 'xray uuid -i'
-		{
-			name: "uuid-map-2",
-			args: args{
-				str: "a9dk23bz0",
-			},
-			want:    uuid.FromStringOrNil("c91481b6-fc0f-5d9e-b166-5ddf07b9c3c5"),
-			wantErr: false,
-		},
-		{
-			name: "uuid-map-2",
-			args: args{
-				str: "中文123",
-			},
-			want:    uuid.FromStringOrNil("145c544c-2229-59e5-8dbb-3f33b7610d26"),
-			wantErr: false,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got, err := UUIDMap(tt.args.str)
-			if (err != nil) != tt.wantErr {
-				t.Errorf("UUIDMap() error = %v, wantErr %v", err, tt.wantErr)
-				return
-			}
-			if !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("UUIDMap() got = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}

component/dialer/bind_darwin.go

@@ -1,7 +1,6 @@
 package dialer
 
 import (
-	"context"
 	"net"
 	"net/netip"
 	"syscall"
@@ -11,8 +10,16 @@ import (
 	"golang.org/x/sys/unix"
 )
 
-func bindControl(ifaceIdx int) controlFn {
+type controlFn = func(network, address string, c syscall.RawConn) error
-	return func(ctx context.Context, network, address string, c syscall.RawConn) (err error) {
+
+func bindControl(ifaceIdx int, chain controlFn) controlFn {
+	return func(network, address string, c syscall.RawConn) (err error) {
+		defer func() {
+			if err == nil && chain != nil {
+				err = chain(network, address, c)
+			}
+		}()
+
 		addrPort, err := netip.ParseAddrPort(address)
 		if err == nil && !addrPort.Addr().IsGlobalUnicast() {
 			return
@@ -42,7 +49,7 @@ func bindIfaceToDialer(ifaceName string, dialer *net.Dialer, _ string, _ netip.A
 		return err
 	}
 
-	addControlToDialer(dialer, bindControl(ifaceObj.Index))
+	dialer.Control = bindControl(ifaceObj.Index, dialer.Control)
 	return nil
 }
 
@@ -52,10 +59,6 @@ func bindIfaceToListenConfig(ifaceName string, lc *net.ListenConfig, _, address
 		return "", err
 	}
 
-	addControlToListenConfig(lc, bindControl(ifaceObj.Index))
+	lc.Control = bindControl(ifaceObj.Index, lc.Control)
 	return address, nil
 }
-
-func ParseNetwork(network string, addr netip.Addr) string {
-	return network
-}

component/dialer/bind_linux.go

@@ -1,7 +1,6 @@
 package dialer
 
 import (
-	"context"
 	"net"
 	"net/netip"
 	"syscall"
@@ -9,8 +8,16 @@ import (
 	"golang.org/x/sys/unix"
 )
 
-func bindControl(ifaceName string) controlFn {
+type controlFn = func(network, address string, c syscall.RawConn) error
-	return func(ctx context.Context, network, address string, c syscall.RawConn) (err error) {
+
+func bindControl(ifaceName string, chain controlFn) controlFn {
+	return func(network, address string, c syscall.RawConn) (err error) {
+		defer func() {
+			if err == nil && chain != nil {
+				err = chain(network, address, c)
+			}
+		}()
+
 		addrPort, err := netip.ParseAddrPort(address)
 		if err == nil && !addrPort.Addr().IsGlobalUnicast() {
 			return
@@ -30,17 +37,13 @@ func bindControl(ifaceName string) controlFn {
 }
 
 func bindIfaceToDialer(ifaceName string, dialer *net.Dialer, _ string, _ netip.Addr) error {
-	addControlToDialer(dialer, bindControl(ifaceName))
+	dialer.Control = bindControl(ifaceName, dialer.Control)
 
 	return nil
 }
 
 func bindIfaceToListenConfig(ifaceName string, lc *net.ListenConfig, _, address string) (string, error) {
-	addControlToListenConfig(lc, bindControl(ifaceName))
+	lc.Control = bindControl(ifaceName, lc.Control)
 
 	return address, nil
 }
-
-func ParseNetwork(network string, addr netip.Addr) string {
-	return network
-}

component/dialer/bind_others.go

@@ -1,4 +1,4 @@
-//go:build !linux && !darwin && !windows
+//go:build !linux && !darwin
 
 package dialer
 
@@ -91,13 +91,3 @@ func bindIfaceToListenConfig(ifaceName string, _ *net.ListenConfig, network, add
 
 	return addr.String(), nil
 }
-
-func ParseNetwork(network string, addr netip.Addr) string {
-	// fix bindIfaceToListenConfig() force bind to an ipv4 address
-	if !strings.HasSuffix(network, "4") &&
-		!strings.HasSuffix(network, "6") &&
-		addr.Unmap().Is6() {
-		network += "6"
-	}
-	return network
-}

component/dialer/bind_windows.go

@@ -1,92 +0,0 @@
-package dialer
-
-import (
-	"context"
-	"encoding/binary"
-	"net"
-	"net/netip"
-	"syscall"
-	"unsafe"
-
-	"github.com/Dreamacro/clash/component/iface"
-)
-
-const (
-	IP_UNICAST_IF   = 31
-	IPV6_UNICAST_IF = 31
-)
-
-func bind4(handle syscall.Handle, ifaceIdx int) error {
-	var bytes [4]byte
-	binary.BigEndian.PutUint32(bytes[:], uint32(ifaceIdx))
-	idx := *(*uint32)(unsafe.Pointer(&bytes[0]))
-	return syscall.SetsockoptInt(handle, syscall.IPPROTO_IP, IP_UNICAST_IF, int(idx))
-}
-
-func bind6(handle syscall.Handle, ifaceIdx int) error {
-	return syscall.SetsockoptInt(handle, syscall.IPPROTO_IPV6, IPV6_UNICAST_IF, ifaceIdx)
-}
-
-func bindControl(ifaceIdx int) controlFn {
-	return func(ctx context.Context, network, address string, c syscall.RawConn) (err error) {
-		addrPort, err := netip.ParseAddrPort(address)
-		if err == nil && !addrPort.Addr().IsGlobalUnicast() {
-			return
-		}
-
-		var innerErr error
-		err = c.Control(func(fd uintptr) {
-			handle := syscall.Handle(fd)
-			bind6err := bind6(handle, ifaceIdx)
-			bind4err := bind4(handle, ifaceIdx)
-			switch network {
-			case "ip6", "tcp6":
-				innerErr = bind6err
-			case "ip4", "tcp4", "udp4":
-				innerErr = bind4err
-			case "udp6":
-				// golang will set network to udp6 when listenUDP on wildcard ip (eg: ":0", "")
-				if (!addrPort.Addr().IsValid() || addrPort.Addr().IsUnspecified()) && bind6err != nil {
-					// try bind ipv6, if failed, ignore. it's a workaround for windows disable interface ipv6
-					if bind4err != nil {
-						innerErr = bind6err
-					} else {
-						innerErr = bind4err
-					}
-				} else {
-					innerErr = bind6err
-				}
-			}
-		})
-
-		if innerErr != nil {
-			err = innerErr
-		}
-
-		return
-	}
-}
-
-func bindIfaceToDialer(ifaceName string, dialer *net.Dialer, _ string, _ netip.Addr) error {
-	ifaceObj, err := iface.ResolveInterface(ifaceName)
-	if err != nil {
-		return err
-	}
-
-	addControlToDialer(dialer, bindControl(ifaceObj.Index))
-	return nil
-}
-
-func bindIfaceToListenConfig(ifaceName string, lc *net.ListenConfig, _, address string) (string, error) {
-	ifaceObj, err := iface.ResolveInterface(ifaceName)
-	if err != nil {
-		return "", err
-	}
-
-	addControlToListenConfig(lc, bindControl(ifaceObj.Index))
-	return address, nil
-}
-
-func ParseNetwork(network string, addr netip.Addr) string {
-	return network
-}

component/dialer/control.go

@@ -1,22 +0,0 @@
-package dialer
-
-import (
-	"context"
-	"net"
-	"syscall"
-)
-
-type controlFn = func(ctx context.Context, network, address string, c syscall.RawConn) error
-
-func addControlToListenConfig(lc *net.ListenConfig, fn controlFn) {
-	llc := *lc
-	lc.Control = func(network, address string, c syscall.RawConn) (err error) {
-		switch {
-		case llc.Control != nil:
-			if err = llc.Control(network, address, c); err != nil {
-				return
-			}
-		}
-		return fn(context.Background(), network, address, c)
-	}
-}

component/dialer/control_go119.go

@@ -1,22 +0,0 @@
-//go:build !go1.20
-
-package dialer
-
-import (
-	"context"
-	"net"
-	"syscall"
-)
-
-func addControlToDialer(d *net.Dialer, fn controlFn) {
-	ld := *d
-	d.Control = func(network, address string, c syscall.RawConn) (err error) {
-		switch {
-		case ld.Control != nil:
-			if err = ld.Control(network, address, c); err != nil {
-				return
-			}
-		}
-		return fn(context.Background(), network, address, c)
-	}
-}

component/dialer/control_go120.go

@@ -1,26 +0,0 @@
-//go:build go1.20
-
-package dialer
-
-import (
-	"context"
-	"net"
-	"syscall"
-)
-
-func addControlToDialer(d *net.Dialer, fn controlFn) {
-	ld := *d
-	d.ControlContext = func(ctx context.Context, network, address string, c syscall.RawConn) (err error) {
-		switch {
-		case ld.ControlContext != nil:
-			if err = ld.ControlContext(ctx, network, address, c); err != nil {
-				return
-			}
-		case ld.Control != nil:
-			if err = ld.Control(network, address, c); err != nil {
-				return
-			}
-		}
-		return fn(ctx, network, address, c)
-	}
-}

component/dialer/dialer.go

@@ -3,27 +3,13 @@ package dialer
 import (
 	"context"
 	"errors"
-	"fmt"
 	"net"
 	"net/netip"
-	"strings"
-	"sync"
-	"time"
 
 	"github.com/Dreamacro/clash/component/resolver"
 )
 
-var (
+func DialContext(ctx context.Context, network, address string, options ...Option) (net.Conn, error) {
-	dialMux                      sync.Mutex
-	actualSingleStackDialContext = serialSingleStackDialContext
-	actualDualStackDialContext   = serialDualStackDialContext
-	tcpConcurrent                = false
-	ErrorInvalidedNetworkStack   = errors.New("invalided network stack")
-	ErrorConnTimeout             = errors.New("connect timeout")
-	fallbackTimeout              = 300 * time.Millisecond
-)
-
-func applyOptions(options ...Option) *option {
 	opt := &option{
 		interfaceName: DefaultInterface.Load(),
 		routingMark:   int(DefaultRoutingMark.Load()),
@@ -37,34 +23,53 @@ func applyOptions(options ...Option) *option {
 		o(opt)
 	}
 
-	return opt
-}
-
-func DialContext(ctx context.Context, network, address string, options ...Option) (net.Conn, error) {
-	opt := applyOptions(options...)
-
-	if opt.network == 4 || opt.network == 6 {
-		if strings.Contains(network, "tcp") {
-			network = "tcp"
-		} else {
-			network = "udp"
-		}
-
-		network = fmt.Sprintf("%s%d", network, opt.network)
-	}
-
 	switch network {
 	case "tcp4", "tcp6", "udp4", "udp6":
-		return actualSingleStackDialContext(ctx, network, address, opt)
+		host, port, err := net.SplitHostPort(address)
-	case "tcp", "udp":
+		if err != nil {
-		return actualDualStackDialContext(ctx, network, address, opt)
+			return nil, err
+		}
+
+		var ip netip.Addr
+		switch network {
+		case "tcp4", "udp4":
+			if !opt.direct {
+				ip, err = resolver.ResolveIPv4ProxyServerHost(host)
+			} else {
+				ip, err = resolver.ResolveIPv4(host)
+			}
 		default:
-		return nil, ErrorInvalidedNetworkStack
+			if !opt.direct {
+				ip, err = resolver.ResolveIPv6ProxyServerHost(host)
+			} else {
+				ip, err = resolver.ResolveIPv6(host)
+			}
+		}
+		if err != nil {
+			return nil, err
+		}
+
+		return dialContext(ctx, network, ip, port, opt)
+	case "tcp", "udp":
+		return dualStackDialContext(ctx, network, address, opt)
+	default:
+		return nil, errors.New("network invalid")
 	}
 }
 
 func ListenPacket(ctx context.Context, network, address string, options ...Option) (net.PacketConn, error) {
-	cfg := applyOptions(options...)
+	cfg := &option{
+		interfaceName: DefaultInterface.Load(),
+		routingMark:   int(DefaultRoutingMark.Load()),
+	}
+
+	for _, o := range DefaultOptions {
+		o(cfg)
+	}
+
+	for _, o := range options {
+		o(cfg)
+	}
 
 	lc := &net.ListenConfig{}
 	if cfg.interfaceName != "" {
@@ -84,24 +89,6 @@ func ListenPacket(ctx context.Context, network, address string, options ...Optio
 	return lc.ListenPacket(ctx, network, address)
 }
 
-func SetDial(concurrent bool) {
-	dialMux.Lock()
-	tcpConcurrent = concurrent
-	if concurrent {
-		actualSingleStackDialContext = concurrentSingleStackDialContext
-		actualDualStackDialContext = concurrentDualStackDialContext
-	} else {
-		actualSingleStackDialContext = serialSingleStackDialContext
-		actualDualStackDialContext = serialDualStackDialContext
-	}
-
-	dialMux.Unlock()
-}
-
-func GetDial() bool {
-	return tcpConcurrent
-}
-
 func dialContext(ctx context.Context, network string, destination netip.Addr, port string, opt *option) (net.Conn, error) {
 	dialer := &net.Dialer{}
 	if opt.interfaceName != "" {
@@ -113,238 +100,86 @@ func dialContext(ctx context.Context, network string, destination netip.Addr, po
 		bindMarkToDialer(opt.routingMark, dialer, network, destination)
 	}
 
-	address := net.JoinHostPort(destination.String(), port)
+	return dialer.DialContext(ctx, network, net.JoinHostPort(destination.String(), port))
-	if opt.tfo {
-		return dialTFO(ctx, *dialer, network, address)
-	}
-	return dialer.DialContext(ctx, network, address)
 }
 
-func serialSingleStackDialContext(ctx context.Context, network string, address string, opt *option) (net.Conn, error) {
+func dualStackDialContext(ctx context.Context, network, address string, opt *option) (net.Conn, error) {
-	ips, port, err := parseAddr(ctx, network, address, opt.resolver)
+	host, port, err := net.SplitHostPort(address)
-	if err != nil {
-		return nil, err
-	}
-	return serialDialContext(ctx, network, ips, port, opt)
-}
-
-func serialDualStackDialContext(ctx context.Context, network, address string, opt *option) (net.Conn, error) {
-	ips, port, err := parseAddr(ctx, network, address, opt.resolver)
-	if err != nil {
-		return nil, err
-	}
-	return dualStackDialContext(
-		ctx,
-		func(ctx context.Context) (net.Conn, error) { return serialDialContext(ctx, network, ips, port, opt) },
-		func(ctx context.Context) (net.Conn, error) { return serialDialContext(ctx, network, ips, port, opt) },
-		opt.prefer == 4)
-}
-
-func concurrentSingleStackDialContext(ctx context.Context, network string, address string, opt *option) (net.Conn, error) {
-	ips, port, err := parseAddr(ctx, network, address, opt.resolver)
 	if err != nil {
 		return nil, err
 	}
 
-	if conn, err := parallelDialContext(ctx, network, ips, port, opt); err != nil {
+	returned := make(chan struct{})
-		return nil, err
+	defer close(returned)
+
+	type dialResult struct {
+		net.Conn
+		error
+		resolved bool
+		ipv6     bool
+		done     bool
+	}
+	results := make(chan dialResult)
+	var primary, fallback dialResult
+
+	startRacer := func(ctx context.Context, network, host string, direct bool, ipv6 bool) {
+		result := dialResult{ipv6: ipv6, done: true}
+		defer func() {
+			select {
+			case results <- result:
+			case <-returned:
+				if result.Conn != nil {
+					_ = result.Conn.Close()
+				}
+			}
+		}()
+
+		var ip netip.Addr
+		if ipv6 {
+			if !direct {
+				ip, result.error = resolver.ResolveIPv6ProxyServerHost(host)
 			} else {
-		return conn, nil
+				ip, result.error = resolver.ResolveIPv6(host)
 			}
-}
+		} else {
+			if !direct {
+				ip, result.error = resolver.ResolveIPv4ProxyServerHost(host)
+			} else {
+				ip, result.error = resolver.ResolveIPv4(host)
+			}
+		}
+		if result.error != nil {
+			return
+		}
+		result.resolved = true
 
-func concurrentDualStackDialContext(ctx context.Context, network, address string, opt *option) (net.Conn, error) {
-	ips, port, err := parseAddr(ctx, network, address, opt.resolver)
-	if err != nil {
-		return nil, err
-	}
-	if opt.prefer != 4 && opt.prefer != 6 {
-		return parallelDialContext(ctx, network, ips, port, opt)
-	}
-	ipv4s, ipv6s := sortationAddr(ips)
-	return dualStackDialContext(
-		ctx,
-		func(ctx context.Context) (net.Conn, error) {
-			return parallelDialContext(ctx, network, ipv4s, port, opt)
-		},
-		func(ctx context.Context) (net.Conn, error) {
-			return parallelDialContext(ctx, network, ipv6s, port, opt)
-		},
-		opt.prefer == 4)
-}
-
-type Dialer struct {
-	Opt option
-}
-
-func (d Dialer) DialContext(ctx context.Context, network, address string) (net.Conn, error) {
-	return DialContext(ctx, network, address, WithOption(d.Opt))
-}
-
-func (d Dialer) ListenPacket(ctx context.Context, network, address string, rAddrPort netip.AddrPort) (net.PacketConn, error) {
-	return ListenPacket(ctx, ParseNetwork(network, rAddrPort.Addr()), address, WithOption(d.Opt))
-}
-
-func NewDialer(options ...Option) Dialer {
-	opt := applyOptions(options...)
-	return Dialer{Opt: *opt}
-}
-
-func dualStackDialContext(
-	ctx context.Context,
-	ipv4DialFn func(ctx context.Context) (net.Conn, error),
-	ipv6DialFn func(ctx context.Context) (net.Conn, error),
-	preferIPv4 bool) (net.Conn, error) {
-	fallbackTicker := time.NewTicker(fallbackTimeout)
-	defer fallbackTicker.Stop()
-	results := make(chan dialResult)
-	returned := make(chan struct{})
-	defer close(returned)
-	racer := func(dial func(ctx context.Context) (net.Conn, error), isPrimary bool) {
-		result := dialResult{isPrimary: isPrimary}
-		defer func() {
-			select {
-			case results <- result:
-			case <-returned:
-				if result.Conn != nil {
-					_ = result.Conn.Close()
-				}
-			}
-		}()
-		result.Conn, result.error = dial(ctx)
-	}
-	go racer(ipv4DialFn, preferIPv4)
-	go racer(ipv6DialFn, !preferIPv4)
-	var fallback dialResult
-	var err error
-	for {
-		select {
-		case <-ctx.Done():
-			if fallback.error == nil && fallback.Conn != nil {
-				return fallback.Conn, nil
-			}
-			return nil, fmt.Errorf("dual stack connect failed: %w", err)
-		case <-fallbackTicker.C:
-			if fallback.error == nil && fallback.Conn != nil {
-				return fallback.Conn, nil
-			}
-		case res := <-results:
-			if res.error == nil {
-				if res.isPrimary {
-					return res.Conn, nil
-				}
-				fallback = res
-			}
-			err = res.error
-		}
-	}
-}
-
-func parallelDialContext(ctx context.Context, network string, ips []netip.Addr, port string, opt *option) (net.Conn, error) {
-	results := make(chan dialResult)
-	returned := make(chan struct{})
-	defer close(returned)
-	tcpRacer := func(ctx context.Context, ip netip.Addr, port string) {
-		result := dialResult{isPrimary: true}
-		defer func() {
-			select {
-			case results <- result:
-			case <-returned:
-				if result.Conn != nil {
-					_ = result.Conn.Close()
-				}
-			}
-		}()
-		result.ip = ip
 		result.Conn, result.error = dialContext(ctx, network, ip, port, opt)
 	}
 
-	for _, ip := range ips {
+	go startRacer(ctx, network+"4", host, opt.direct, false)
-		go tcpRacer(ctx, ip, port)
+	go startRacer(ctx, network+"6", host, opt.direct, true)
-	}
+
-	var err error
+	for res := range results {
-	for {
-		select {
-		case <-ctx.Done():
-			if err != nil {
-				return nil, err
-			}
-			if ctx.Err() == context.DeadlineExceeded {
-				return nil, ErrorConnTimeout
-			}
-			return nil, ctx.Err()
-		case res := <-results:
 		if res.error == nil {
 			return res.Conn, nil
 		}
-			err = res.error
-		}
-	}
-}
 
-func serialDialContext(ctx context.Context, network string, ips []netip.Addr, port string, opt *option) (net.Conn, error) {
+		if !res.ipv6 {
-	var (
+			primary = res
-		conn net.Conn
-		err  error
-		errs []error
-	)
-	for _, ip := range ips {
-		if conn, err = dialContext(ctx, network, ip, port, opt); err == nil {
-			return conn, nil
 		} else {
-			errs = append(errs, err)
+			fallback = res
-		}
-	}
-	return nil, errors.Join(errs...)
-}
-
-type dialResult struct {
-	ip netip.Addr
-	net.Conn
-	error
-	isPrimary bool
-}
-
-func parseAddr(ctx context.Context, network, address string, preferResolver resolver.Resolver) ([]netip.Addr, string, error) {
-	host, port, err := net.SplitHostPort(address)
-	if err != nil {
-		return nil, "-1", err
 		}
 
-	var ips []netip.Addr
+		if primary.done && fallback.done {
-	switch network {
+			if primary.resolved {
-	case "tcp4", "udp4":
+				return nil, primary.error
-		if preferResolver == nil {
+			} else if fallback.resolved {
-			ips, err = resolver.LookupIPv4ProxyServerHost(ctx, host)
+				return nil, fallback.error
 			} else {
-			ips, err = resolver.LookupIPv4WithResolver(ctx, host, preferResolver)
+				return nil, primary.error
-		}
-	case "tcp6", "udp6":
-		if preferResolver == nil {
-			ips, err = resolver.LookupIPv6ProxyServerHost(ctx, host)
-		} else {
-			ips, err = resolver.LookupIPv6WithResolver(ctx, host, preferResolver)
-		}
-	default:
-		if preferResolver == nil {
-			ips, err = resolver.LookupIP(ctx, host)
-		} else {
-			ips, err = resolver.LookupIPWithResolver(ctx, host, preferResolver)
 			}
 		}
-	if err != nil {
-		return nil, "-1", fmt.Errorf("dns resolve failed: %w", err)
 	}
-	return ips, port, nil
-}
 
-func sortationAddr(ips []netip.Addr) (ipv4s, ipv6s []netip.Addr) {
+	return nil, errors.New("never touched")
-	for _, v := range ips {
-		if v.Is4() || v.Is4In6() {
-			ipv4s = append(ipv4s, v)
-		} else {
-			ipv6s = append(ipv6s, v)
-		}
-	}
-	return
 }